StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'origin/master'

Browse Source
This commit is contained in:
retux 2014-09-07 19:23:51 +02:00
commit 3bbe1eaee3
18 changed files with 528 additions and 651 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core.cpp
View File

@ -882,7 +882,8 @@ void Core::saveConfiguration()
return; return;
} }
qDebug() << "Core: writing tox_save"; qDebug() << "Core: Saving";
uint32_t fileSize = tox_size(tox); uint32_t fileSize = tox_size(tox);
if (fileSize > 0 && fileSize <= INT32_MAX) { if (fileSize > 0 && fileSize <= INT32_MAX) {
uint8_t *data = new uint8_t[fileSize]; uint8_t *data = new uint8_t[fileSize];
@ -892,7 +893,6 @@ void Core::saveConfiguration()
delete[] data; delete[] data;
} }
qDebug() << "Core: writing settings";
Settings::getInstance().save(); Settings::getInstance().save();
} }

4
debian/control vendored
View File

@ -9,4 +9,6 @@ Package: qtox
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Tox client Description: Tox client
qTox is a powerful Tox client that follows the Tox design guidelines qTox is a powerful Tox client that follows the Tox design guidelines.
Tox is a decentralized and encrypted replacement for Skype, supporting
chats, audio, and video calls.

6
qtox.pro
View File

@ -101,7 +101,8 @@ HEADERS += widget/form/addfriendform.h \
widget/adjustingscrollarea.h \ widget/adjustingscrollarea.h \
widget/croppinglabel.h \ widget/croppinglabel.h \
widget/friendlistwidget.h \ widget/friendlistwidget.h \
widget/genericchatroomwidget.h widget/genericchatroomwidget.h \
widget/form/genericchatform.h
SOURCES += \ SOURCES += \
widget/form/addfriendform.cpp \ widget/form/addfriendform.cpp \
@ -134,4 +135,5 @@ SOURCES += \
widget/croppinglabel.cpp \ widget/croppinglabel.cpp \
widget/friendlistwidget.cpp \ widget/friendlistwidget.cpp \
coreav.cpp \ coreav.cpp \
widget/genericchatroomwidget.cpp widget/genericchatroomwidget.cpp \
widget/form/genericchatform.cpp

1
res.qrc
View File

@ -124,5 +124,6 @@
<file>ui/micButton/micButtonPressed.png</file> <file>ui/micButton/micButtonPressed.png</file>
<file>ui/micButton/micButton.css</file> <file>ui/micButton/micButton.css</file>
<file>ui/volButton/volButton.css</file> <file>ui/volButton/volButton.css</file>
<file>ui/fileButton/fileButtonDisabled.png</file>
</qresource> </qresource>
</RCC> </RCC>

6
res/settings.ini
View File

@ -1,6 +1,6 @@
[DHT%20Server] [DHT%20Server]
dhtServerList\size=9 dhtServerList\size=9
dhtServerList\1\name=stqism dhtServerList\1\name=Nikolai Toryzin
dhtServerList\1\userId=951C88B7E75C867418ACDB5D273821372BB5BD652740BCDF623A4FA293E75D2F dhtServerList\1\userId=951C88B7E75C867418ACDB5D273821372BB5BD652740BCDF623A4FA293E75D2F
dhtServerList\1\address=192.254.75.98 dhtServerList\1\address=192.254.75.98
dhtServerList\1\port=33445 dhtServerList\1\port=33445
@ -36,3 +36,7 @@ dhtServerList\9\name=SylvieLorxu
dhtServerList\9\userId=4B2C19E924972CB9B57732FB172F8A8604DE13EEDA2A6234E348983344B23057 dhtServerList\9\userId=4B2C19E924972CB9B57732FB172F8A8604DE13EEDA2A6234E348983344B23057
dhtServerList\9\address=178.21.112.187 dhtServerList\9\address=178.21.112.187
dhtServerList\9\port=33445 dhtServerList\9\port=33445
dhtServerList\10\name=Unknown (uTox)
dhtServerList\10\userId=7187969BB10B54C98538BAE94C069CE5C84E650D54F7E596543D8FB1ECF4CF23
dhtServerList\10\address=95.85.13.245
dhtServerList\10\port=33445

63
settings.cpp
View File

@ -30,7 +30,7 @@ const QString Settings::FILENAME = "settings.ini";
bool Settings::makeToxPortable{false}; bool Settings::makeToxPortable{false};
Settings::Settings() : Settings::Settings() :
loaded(false) loaded(false), useCustomDhtList{false}
{ {
load(); load();
} }
@ -54,7 +54,14 @@ void Settings::load()
QFile portableSettings(FILENAME); QFile portableSettings(FILENAME);
if (portableSettings.exists()) if (portableSettings.exists())
makeToxPortable=true; {
QSettings ps(FILENAME, QSettings::IniFormat);
ps.beginGroup("General");
makeToxPortable = ps.value("makeToxPortable", false).toBool();
ps.endGroup();
}
else
makeToxPortable = false;
QString filePath = QDir(getSettingsDirPath()).filePath(FILENAME); QString filePath = QDir(getSettingsDirPath()).filePath(FILENAME);
@ -65,19 +72,28 @@ void Settings::load()
filePath = ":/conf/" + FILENAME; filePath = ":/conf/" + FILENAME;
} }
qDebug() << "Settings: Loading from "<<filePath;
QSettings s(filePath, QSettings::IniFormat); QSettings s(filePath, QSettings::IniFormat);
s.beginGroup("DHT Server"); s.beginGroup("DHT Server");
int serverListSize = s.beginReadArray("dhtServerList"); if (s.value("useCustomList").toBool())
for (int i = 0; i < serverListSize; i ++) { {
s.setArrayIndex(i); useCustomDhtList = true;
DhtServer server; qDebug() << "Using custom bootstrap nodes list";
server.name = s.value("name").toString(); int serverListSize = s.beginReadArray("dhtServerList");
server.userId = s.value("userId").toString(); for (int i = 0; i < serverListSize; i ++) {
server.address = s.value("address").toString(); s.setArrayIndex(i);
server.port = s.value("port").toInt(); DhtServer server;
dhtServerList << server; server.name = s.value("name").toString();
server.userId = s.value("userId").toString();
server.address = s.value("address").toString();
server.port = s.value("port").toInt();
dhtServerList << server;
}
s.endArray();
} }
s.endArray(); else
useCustomDhtList=false;
s.endGroup(); s.endGroup();
friendAddresses.clear(); friendAddresses.clear();
@ -131,6 +147,26 @@ void Settings::load()
if (!SmileyPack::isValid(smileyPack) && !SmileyPack::listSmileyPacks().isEmpty()) if (!SmileyPack::isValid(smileyPack) && !SmileyPack::listSmileyPacks().isEmpty())
smileyPack = SmileyPack::listSmileyPacks()[0].second; smileyPack = SmileyPack::listSmileyPacks()[0].second;
// Read the embedded DHT bootsrap nodes list if needed
if (dhtServerList.isEmpty())
{
qDebug() << "Using embeded bootstrap nodes list";
QSettings rcs(":/conf/settings.ini", QSettings::IniFormat);
rcs.beginGroup("DHT Server");
int serverListSize = rcs.beginReadArray("dhtServerList");
for (int i = 0; i < serverListSize; i ++) {
rcs.setArrayIndex(i);
DhtServer server;
server.name = rcs.value("name").toString();
server.userId = rcs.value("userId").toString();
server.address = rcs.value("address").toString();
server.port = rcs.value("port").toInt();
dhtServerList << server;
}
rcs.endArray();
rcs.endGroup();
}
loaded = true; loaded = true;
} }
@ -142,11 +178,14 @@ void Settings::save()
void Settings::save(QString path) void Settings::save(QString path)
{ {
qDebug() << "Settings: Saving in "<<path;
QSettings s(path, QSettings::IniFormat); QSettings s(path, QSettings::IniFormat);
s.clear(); s.clear();
s.beginGroup("DHT Server"); s.beginGroup("DHT Server");
s.setValue("useCustomList", useCustomDhtList);
s.beginWriteArray("dhtServerList", dhtServerList.size()); s.beginWriteArray("dhtServerList", dhtServerList.size());
for (int i = 0; i < dhtServerList.size(); i ++) { for (int i = 0; i < dhtServerList.size(); i ++) {
s.setArrayIndex(i); s.setArrayIndex(i);

1
settings.h
View File

@ -142,6 +142,7 @@ private:
bool loaded; bool loaded;
bool useCustomDhtList;
QList<DhtServer> dhtServerList; QList<DhtServer> dhtServerList;
int dhtServerId; int dhtServerId;
bool dontShowDhtDialog; bool dontShowDhtDialog;

BIN
translations/it.qm
View File

Binary file not shown.

95
translations/it.ts
View File

@ -75,41 +75,20 @@
<translation>La risposta del server DNS non contiene un Tox ID valido</translation> <translation>La risposta del server DNS non contiene un Tox ID valido</translation>
</message> </message>
</context> </context>
<context>
<name>Camera</name>
<message>
<location filename="../widget/camera.cpp" line="161"/>
<source>Camera eror</source>
<translation>Errore webcam</translation>
</message>
<message>
<location filename="../widget/camera.cpp" line="162"/>
<source>Camera format %1 not supported, can&apos;t use the camera</source>
<translation>Formato webcam %1 non supportato, impossibile usare la webcam</translation>
</message>
</context>
<context> <context>
<name>ChatForm</name> <name>ChatForm</name>
<message> <message>
<location filename="../widget/form/chatform.cpp" line="283"/> <location filename="../widget/form/chatform.cpp" line="282"/>
<source>Send a file</source> <source>Send a file</source>
<translation>Invia un file</translation> <translation>Invia un file</translation>
</message> </message>
<message> <message>
<location filename="../widget/form/chatform.cpp" line="620"/> <location filename="../widget/form/chatform.cpp" line="669"/>
<location filename="../widget/form/chatform.cpp" line="626"/> <location filename="../widget/form/chatform.cpp" line="675"/>
<source>Save chat log</source> <source>Save chat log</source>
<translation>Salva il log della chat</translation> <translation>Salva il log della chat</translation>
</message> </message>
</context> </context>
<context>
<name>CopyableElideLabel</name>
<message>
<location filename="../widget/tool/copyableelidelabel.cpp" line="29"/>
<source>Copy</source>
<translation>Copia</translation>
</message>
</context>
<context> <context>
<name>FileTransfertWidget</name> <name>FileTransfertWidget</name>
<message> <message>
@ -189,19 +168,19 @@
<context> <context>
<name>FriendWidget</name> <name>FriendWidget</name>
<message> <message>
<location filename="../widget/friendwidget.cpp" line="86"/> <location filename="../widget/friendwidget.cpp" line="83"/>
<source>Copy friend ID</source> <source>Copy friend ID</source>
<comment>Menu to copy the Tox ID of that friend</comment> <comment>Menu to copy the Tox ID of that friend</comment>
<translation>Copia Tox ID del contatto</translation> <translation>Copia Tox ID del contatto</translation>
</message> </message>
<message> <message>
<location filename="../widget/friendwidget.cpp" line="87"/> <location filename="../widget/friendwidget.cpp" line="84"/>
<source>Invite in group</source> <source>Invite in group</source>
<comment>Menu to invite a friend in a groupchat</comment> <comment>Menu to invite a friend in a groupchat</comment>
<translation>Invita nel gruppo</translation> <translation>Invita nel gruppo</translation>
</message> </message>
<message> <message>
<location filename="../widget/friendwidget.cpp" line="97"/> <location filename="../widget/friendwidget.cpp" line="94"/>
<source>Remove friend</source> <source>Remove friend</source>
<comment>Menu to remove the friend from our friendlist</comment> <comment>Menu to remove the friend from our friendlist</comment>
<translation>Rimuovi contatto</translation> <translation>Rimuovi contatto</translation>
@ -234,19 +213,19 @@
<context> <context>
<name>GroupWidget</name> <name>GroupWidget</name>
<message> <message>
<location filename="../widget/groupwidget.cpp" line="54"/> <location filename="../widget/groupwidget.cpp" line="58"/>
<location filename="../widget/groupwidget.cpp" line="141"/> <location filename="../widget/groupwidget.cpp" line="100"/>
<source>%1 users in chat</source> <source>%1 users in chat</source>
<translation>%1 utenti in chat</translation> <translation>%1 utenti in chat</translation>
</message> </message>
<message> <message>
<location filename="../widget/groupwidget.cpp" line="56"/> <location filename="../widget/groupwidget.cpp" line="60"/>
<location filename="../widget/groupwidget.cpp" line="143"/> <location filename="../widget/groupwidget.cpp" line="102"/>
<source>0 users in chat</source> <source>0 users in chat</source>
<translation>0 utenti in chat</translation> <translation>0 utenti in chat</translation>
</message> </message>
<message> <message>
<location filename="../widget/groupwidget.cpp" line="84"/> <location filename="../widget/groupwidget.cpp" line="83"/>
<source>Quit group</source> <source>Quit group</source>
<comment>Menu to quit a groupchat</comment> <comment>Menu to quit a groupchat</comment>
<translation>Esci dal gruppo</translation> <translation>Esci dal gruppo</translation>
@ -303,7 +282,7 @@
<context> <context>
<name>SelfCamView</name> <name>SelfCamView</name>
<message> <message>
<location filename="../widget/selfcamview.cpp" line="32"/> <location filename="../widget/selfcamview.cpp" line="30"/>
<source>Tox video test</source> <source>Tox video test</source>
<comment>Title of the window to test the video/webcam</comment> <comment>Title of the window to test the video/webcam</comment>
<translation>qTox video test</translation> <translation>qTox video test</translation>
@ -371,67 +350,23 @@
<comment>Text on smiley pack label</comment> <comment>Text on smiley pack label</comment>
<translation>Emoticons</translation> <translation>Emoticons</translation>
</message> </message>
<message>
<source>Select smiley pack</source>
<translation type="obsolete">Scegli pacchetto emoticons</translation>
</message>
</context> </context>
<context> <context>
<name>Widget</name> <name>Widget</name>
<message> <message>
<source>Tox</source> <location filename="../widget/widget.cpp" line="129"/>
<translation type="obsolete">Tox</translation>
</message>
<message>
<source>Your name</source>
<translation type="obsolete">Tox User</translation>
</message>
<message>
<source>Your status</source>
<translation type="obsolete">Toxin on qTox</translation>
</message>
<message>
<source>Add friends</source>
<translation type="obsolete">Aggiungi contatto</translation>
</message>
<message>
<source>Create a group chat</source>
<translation type="obsolete">Crea un gruppo</translation>
</message>
<message>
<source>View completed file transfers</source>
<translation type="obsolete">Visualizza i trasferimenti completati</translation>
</message>
<message>
<source>(button inactive currently)</source>
<translation type="obsolete">(bottone attualmente inattivo)</translation>
</message>
<message>
<source>Change your settings</source>
<translation type="obsolete">Cambia le impostazioni</translation>
</message>
<message>
<source>Close</source>
<translation type="obsolete">Chiudi</translation>
</message>
<message>
<source>Ctrl+Q</source>
<translation type="obsolete">Ctrl+Q</translation>
</message>
<message>
<location filename="../widget/widget.cpp" line="128"/>
<source>Online</source> <source>Online</source>
<comment>Button to set your status to &apos;Online&apos;</comment> <comment>Button to set your status to &apos;Online&apos;</comment>
<translation>Online</translation> <translation>Online</translation>
</message> </message>
<message> <message>
<location filename="../widget/widget.cpp" line="130"/> <location filename="../widget/widget.cpp" line="131"/>
<source>Away</source> <source>Away</source>
<comment>Button to set your status to &apos;Away&apos;</comment> <comment>Button to set your status to &apos;Away&apos;</comment>
<translation>Assente</translation> <translation>Assente</translation>
</message> </message>
<message> <message>
<location filename="../widget/widget.cpp" line="132"/> <location filename="../widget/widget.cpp" line="133"/>
<source>Busy</source> <source>Busy</source>
<comment>Button to set your status to &apos;Busy&apos;</comment> <comment>Button to set your status to &apos;Busy&apos;</comment>
<translation>Occupato</translation> <translation>Occupato</translation>

5
ui/fileButton/fileButton.css
View File

@ -17,6 +17,11 @@ QPushButton:pressed
background-image: url(":/ui/fileButton/fileButtonPressed.png"); background-image: url(":/ui/fileButton/fileButtonPressed.png");
} }
QPushButton[enabled="false"]
{
background-image: url(":/ui/fileButton/fileButtonDisabled.png");
}
QPushButton:focus { QPushButton:focus {
outline: none; outline: none;
} }

BIN
ui/fileButton/fileButtonDisabled.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 457 B

301
widget/form/chatform.cpp
View File

@ -16,140 +16,24 @@
#include "chatform.h" #include "chatform.h"
#include "friend.h" #include "friend.h"
#include "smileypack.h"
#include "widget/friendwidget.h" #include "widget/friendwidget.h"
#include "widget/widget.h" #include "widget/widget.h"
#include "widget/filetransfertwidget.h" #include "widget/filetransfertwidget.h"
#include "widget/emoticonswidget.h"
#include "style.h"
#include <QFont>
#include <QTime>
#include <QScrollBar> #include <QScrollBar>
#include <QFileDialog> #include <QFileDialog>
#include <QMenu>
#include <QWidgetAction>
#include <QGridLayout>
#include <QMessageBox> #include <QMessageBox>
ChatForm::ChatForm(Friend* chatFriend) ChatForm::ChatForm(Friend* chatFriend)
: f(chatFriend), curRow{0}, lockSliderToBottom{true} : f(chatFriend)
{ {
main = new QWidget(), head = new QWidget(), chatAreaWidget = new QWidget(); nameLabel->setText(f->getName());
name = new QLabel(), avatar = new QLabel(), statusMessage = new QLabel(); avatarLabel->setPixmap(QPixmap(":/img/contact_dark.png"));
headLayout = new QHBoxLayout(), mainFootLayout = new QHBoxLayout();
headTextLayout = new QVBoxLayout(), mainLayout = new QVBoxLayout(), statusMessageLabel = new QLabel();
footButtonsSmall = new QVBoxLayout(), volMicLayout = new QVBoxLayout();
mainChatLayout = new QGridLayout();
msgEdit = new ChatTextEdit();
sendButton = new QPushButton(), fileButton = new QPushButton(), emoteButton = new QPushButton(),
callButton = new QPushButton(), videoButton = new QPushButton(),
volButton = new QPushButton(), micButton = new QPushButton();
chatArea = new QScrollArea();
netcam = new NetCamView(); netcam = new NetCamView();
audioInputFlag = false;
QFont bold;
bold.setBold(true);
name->setText(chatFriend->widget->name.text());
name->setFont(bold);
statusMessage->setText(chatFriend->widget->statusMessage.text());
// No real avatar support in toxcore, better draw a pretty picture
//avatar->setPixmap(*chatFriend->widget->avatar.pixmap());
avatar->setPixmap(QPixmap(":/img/contact_dark.png"));
chatAreaWidget->setLayout(mainChatLayout);
chatAreaWidget->setStyleSheet(Style::get(":/ui/chatArea/chatArea.css"));
chatArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
chatArea->setWidgetResizable(true);
chatArea->setContextMenuPolicy(Qt::CustomContextMenu);
chatArea->setFrameStyle(QFrame::NoFrame);
mainChatLayout->setColumnStretch(1,1);
mainChatLayout->setSpacing(5);
footButtonsSmall->setSpacing(2);
msgEdit->setStyleSheet(Style::get(":/ui/msgEdit/msgEdit.css"));
msgEdit->setFixedHeight(50);
msgEdit->setFrameStyle(QFrame::NoFrame);
sendButton->setStyleSheet(Style::get(":/ui/sendButton/sendButton.css"));
fileButton->setStyleSheet(Style::get(":/ui/fileButton/fileButton.css"));
emoteButton->setStyleSheet(Style::get(":/ui/emoteButton/emoteButton.css"));
callButton->setObjectName("green");
callButton->setStyleSheet(Style::get(":/ui/callButton/callButton.css"));
videoButton->setObjectName("green");
videoButton->setStyleSheet(Style::get(":/ui/videoButton/videoButton.css"));
QString volButtonStylesheet = "";
try
{
QFile f(":/ui/volButton/volButton.css");
f.open(QFile::ReadOnly | QFile::Text);
QTextStream volButtonStylesheetStream(&f);
volButtonStylesheet = volButtonStylesheetStream.readAll();
}
catch (int e) {}
volButton->setObjectName("green");
volButton->setStyleSheet(volButtonStylesheet);
QString micButtonStylesheet = "";
try
{
QFile f(":/ui/micButton/micButton.css");
f.open(QFile::ReadOnly | QFile::Text);
QTextStream micButtonStylesheetStream(&f);
micButtonStylesheet = micButtonStylesheetStream.readAll();
}
catch (int e) {}
micButton->setObjectName("green");
micButton->setStyleSheet(micButtonStylesheet);
main->setLayout(mainLayout);
mainLayout->addWidget(chatArea);
mainLayout->addLayout(mainFootLayout);
mainLayout->setMargin(0);
footButtonsSmall->addWidget(emoteButton);
footButtonsSmall->addWidget(fileButton);
mainFootLayout->addWidget(msgEdit);
mainFootLayout->addLayout(footButtonsSmall);
mainFootLayout->addSpacing(5);
mainFootLayout->addWidget(sendButton);
mainFootLayout->setSpacing(0);
head->setLayout(headLayout);
headLayout->addWidget(avatar);
headLayout->addLayout(headTextLayout);
headLayout->addStretch();
headLayout->addLayout(volMicLayout);
headLayout->addWidget(callButton);
headLayout->addWidget(videoButton);
volMicLayout->addWidget(micButton);
volMicLayout->addWidget(volButton);
headTextLayout->addWidget(statusMessageLabel);
headTextLayout->addStretch(); headTextLayout->addStretch();
headTextLayout->addWidget(name);
headTextLayout->addWidget(statusMessage);
headTextLayout->addStretch();
chatArea->setWidget(chatAreaWidget);
//Fix for incorrect layouts on OS X as per
//https://bugreports.qt-project.org/browse/QTBUG-14591
sendButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
fileButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
emoteButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
// callButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
// videoButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
// msgEdit->setAttribute(Qt::WA_LayoutUsesWidgetRect);
// chatArea->setAttribute(Qt::WA_LayoutUsesWidgetRect);
connect(Widget::getInstance()->getCore(), &Core::fileSendStarted, this, &ChatForm::startFileSend); connect(Widget::getInstance()->getCore(), &Core::fileSendStarted, this, &ChatForm::startFileSend);
connect(Widget::getInstance()->getCore(), &Core::videoFrameReceived, netcam, &NetCamView::updateDisplay); connect(Widget::getInstance()->getCore(), &Core::videoFrameReceived, netcam, &NetCamView::updateDisplay);
@ -158,37 +42,18 @@ ChatForm::ChatForm(Friend* chatFriend)
connect(callButton, &QPushButton::clicked, this, &ChatForm::onCallTriggered); connect(callButton, &QPushButton::clicked, this, &ChatForm::onCallTriggered);
connect(videoButton, &QPushButton::clicked, this, &ChatForm::onVideoCallTriggered); connect(videoButton, &QPushButton::clicked, this, &ChatForm::onVideoCallTriggered);
connect(msgEdit, &ChatTextEdit::enterPressed, this, &ChatForm::onSendTriggered); connect(msgEdit, &ChatTextEdit::enterPressed, this, &ChatForm::onSendTriggered);
connect(chatArea->verticalScrollBar(), &QScrollBar::rangeChanged, this, &ChatForm::onSliderRangeChanged);
connect(chatArea, &QScrollArea::customContextMenuRequested, this, &ChatForm::onChatContextMenuRequested);
connect(emoteButton, &QPushButton::clicked, this, &ChatForm::onEmoteButtonClicked);
connect(micButton, SIGNAL(clicked()), this, SLOT(onMicMuteToggle())); connect(micButton, SIGNAL(clicked()), this, SLOT(onMicMuteToggle()));
} }
ChatForm::~ChatForm() ChatForm::~ChatForm()
{ {
delete main;
delete head;
delete netcam; delete netcam;
} }
void ChatForm::show(Ui::MainWindow &ui)
{
ui.mainContent->layout()->addWidget(main);
ui.mainHead->layout()->addWidget(head);
main->show();
head->show();
}
void ChatForm::setName(QString newName)
{
name->setText(newName);
name->setToolTip(newName); // for overlength names
}
void ChatForm::setStatusMessage(QString newMessage) void ChatForm::setStatusMessage(QString newMessage)
{ {
statusMessage->setText(newMessage); statusMessageLabel->setText(newMessage);
statusMessage->setToolTip(newMessage); // for overlength messsages statusMessageLabel->setToolTip(newMessage); // for overlength messsages
} }
void ChatForm::onSendTriggered() void ChatForm::onSendTriggered()
@ -202,81 +67,6 @@ void ChatForm::onSendTriggered()
emit sendMessage(f->friendId, msg); emit sendMessage(f->friendId, msg);
} }
void ChatForm::addFriendMessage(QString message)
{
QLabel *msgAuthor = new QLabel(name->text());
QLabel *msgText = new QLabel(message);
QLabel *msgDate = new QLabel(QTime::currentTime().toString("hh:mm"));
addMessage(msgAuthor, msgText, msgDate);
}
void ChatForm::addMessage(QString author, QString message, QString date)
{
addMessage(new QLabel(author), new QLabel(message), new QLabel(date));
}
void ChatForm::addMessage(QLabel* author, QLabel* message, QLabel* date)
{
QScrollBar* scroll = chatArea->verticalScrollBar();
lockSliderToBottom = scroll && scroll->value() == scroll->maximum();
author->setAlignment(Qt::AlignTop | Qt::AlignRight);
date->setAlignment(Qt::AlignTop);
message->setWordWrap(true);
message->setTextInteractionFlags(Qt::TextBrowserInteraction);
author->setTextInteractionFlags(Qt::TextBrowserInteraction);
date->setTextInteractionFlags(Qt::TextBrowserInteraction);
if (author->text() == Widget::getInstance()->getUsername())
{
QPalette pal;
pal.setColor(QPalette::WindowText, QColor(100,100,100));
author->setPalette(pal);
message->setPalette(pal);
}
if (previousName.isEmpty() || previousName != author->text())
{
if (curRow)
{
mainChatLayout->setRowStretch(curRow, 0);
mainChatLayout->addItem(new QSpacerItem(0,AUTHOR_CHANGE_SPACING),curRow,0,1,3);
}
previousName = author->text();
curRow++;
}
else if (curRow)// onSaveLogClicked expects 0 or 3 QLabel per line
author->setText("");
QColor greentext(61,204,61);
QString fontTemplate = "<font color='%1'>%2</font>";
QString finalMessage;
QStringList messageLines = message->text().split("\n");
for (QString& s : messageLines)
{
if (QRegExp("^[ ]*>.*").exactMatch(s))
finalMessage += fontTemplate.arg(greentext.name(), s.replace(" ", "&nbsp;"));
else
finalMessage += s.replace(" ", "&nbsp;");
finalMessage += "<br>";
}
message->setText(finalMessage.left(finalMessage.length()-4));
message->setText(SmileyPack::getInstance().smileyfied(message->text()));
message->setTextFormat(Qt::RichText);
mainChatLayout->addWidget(author, curRow, 0);
mainChatLayout->addWidget(message, curRow, 1);
mainChatLayout->addWidget(date, curRow, 3);
mainChatLayout->setRowStretch(curRow+1, 1);
mainChatLayout->setRowStretch(curRow, 0);
curRow++;
author->setContextMenuPolicy(Qt::CustomContextMenu);
message->setContextMenuPolicy(Qt::CustomContextMenu);
date->setContextMenuPolicy(Qt::CustomContextMenu);
connect(author, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onChatContextMenuRequested(QPoint)));
connect(message, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onChatContextMenuRequested(QPoint)));
connect(date, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onChatContextMenuRequested(QPoint)));
}
void ChatForm::onAttachClicked() void ChatForm::onAttachClicked()
{ {
QString path = QFileDialog::getOpenFileName(0,tr("Send a file")); QString path = QFileDialog::getOpenFileName(0,tr("Send a file"));
@ -299,13 +89,6 @@ void ChatForm::onAttachClicked()
emit sendFile(f->friendId, fi.fileName(), path, filesize); emit sendFile(f->friendId, fi.fileName(), path, filesize);
} }
void ChatForm::onSliderRangeChanged()
{
QScrollBar* scroll = chatArea->verticalScrollBar();
if (lockSliderToBottom)
scroll->setValue(scroll->maximum());
}
void ChatForm::startFileSend(ToxFile file) void ChatForm::startFileSend(ToxFile file)
{ {
if (file.friendId != f->friendId) if (file.friendId != f->friendId)
@ -661,74 +444,6 @@ void ChatForm::onCancelCallTriggered()
emit cancelCall(callId, f->friendId); emit cancelCall(callId, f->friendId);
} }
void ChatForm::onChatContextMenuRequested(QPoint pos)
{
QWidget* sender = (QWidget*)QObject::sender();
pos = sender->mapToGlobal(pos);
QMenu menu;
menu.addAction(tr("Save chat log"), this, SLOT(onSaveLogClicked()));
menu.exec(pos);
}
void ChatForm::onSaveLogClicked()
{
QString path = QFileDialog::getSaveFileName(0,tr("Save chat log"));
if (path.isEmpty())
return;
QFile file(path);
if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
return;
QString log;
QList<QLabel*> labels = chatAreaWidget->findChildren<QLabel*>();
int i=0;
for (QLabel* label : labels)
{
log += label->text();
if (i==2)
{
i=0;
log += '\n';
}
else
{
log += '\t';
i++;
}
}
file.write(log.toUtf8());
file.close();
}
void ChatForm::onEmoteButtonClicked()
{
// don't show the smiley selection widget if there are no smileys available
if (SmileyPack::getInstance().getEmoticons().empty())
return;
EmoticonsWidget widget;
connect(&widget, &EmoticonsWidget::insertEmoticon, this, &ChatForm::onEmoteInsertRequested);
QWidget* sender = qobject_cast<QWidget*>(QObject::sender());
if (sender)
{
QPoint pos = -QPoint(widget.sizeHint().width() / 2, widget.sizeHint().height()) - QPoint(0, 10);
widget.exec(sender->mapToGlobal(pos));
}
}
void ChatForm::onEmoteInsertRequested(QString str)
{
// insert the emoticon
QWidget* sender = qobject_cast<QWidget*>(QObject::sender());
if (sender)
msgEdit->insertPlainText(str);
msgEdit->setFocus(); // refocus so that we can continue typing
}
void ChatForm::onMicMuteToggle() void ChatForm::onMicMuteToggle()
{ {
if (audioInputFlag == true) if (audioInputFlag == true)

42
widget/form/chatform.h
View File

@ -17,41 +17,21 @@
#ifndef CHATFORM_H #ifndef CHATFORM_H
#define CHATFORM_H #define CHATFORM_H
#include <QLabel> #include "genericchatform.h"
#include <QWidget>
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QGridLayout>
#include <QTextEdit>
#include <QScrollArea>
#include <QTime>
#include <QPoint>
#include "widget/tool/chattextedit.h"
#include "ui_mainwindow.h"
#include "core.h" #include "core.h"
#include "widget/netcamview.h" #include "widget/netcamview.h"
// Spacing in px inserted when the author of the last message changes
#define AUTHOR_CHANGE_SPACING 5
struct Friend; struct Friend;
class ChatForm : public QObject class ChatForm : public GenericChatForm
{ {
Q_OBJECT Q_OBJECT
public: public:
ChatForm(Friend* chatFriend); ChatForm(Friend* chatFriend);
~ChatForm(); ~ChatForm();
void show(Ui::MainWindow &ui);
void setName(QString newName);
void setStatusMessage(QString newMessage); void setStatusMessage(QString newMessage);
void addFriendMessage(QString message);
void addMessage(QString author, QString message, QString date=QTime::currentTime().toString("hh:mm"));
void addMessage(QLabel* author, QLabel* message, QLabel* date);
signals: signals:
void sendMessage(int, QString);
void sendFile(int32_t friendId, QString, QString, long long); void sendFile(int32_t friendId, QString, QString, long long);
void startCall(int friendId); void startCall(int friendId);
void startVideoCall(int friendId, bool video); void startVideoCall(int friendId, bool video);
@ -78,31 +58,17 @@ public slots:
private slots: private slots:
void onSendTriggered(); void onSendTriggered();
void onAttachClicked(); void onAttachClicked();
void onSliderRangeChanged();
void onCallTriggered(); void onCallTriggered();
void onVideoCallTriggered(); void onVideoCallTriggered();
void onAnswerCallTriggered(); void onAnswerCallTriggered();
void onHangupCallTriggered(); void onHangupCallTriggered();
void onCancelCallTriggered(); void onCancelCallTriggered();
void onChatContextMenuRequested(QPoint pos);
void onSaveLogClicked();
void onEmoteButtonClicked();
void onEmoteInsertRequested(QString str);
private: private:
Friend* f; Friend* f;
QHBoxLayout *headLayout, *mainFootLayout; QLabel *statusMessageLabel;
QVBoxLayout *headTextLayout, *mainLayout, *footButtonsSmall, *volMicLayout;
QGridLayout *mainChatLayout;
QLabel *avatar, *name, *statusMessage;
ChatTextEdit *msgEdit;
QPushButton *sendButton, *fileButton, *emoteButton, *callButton, *videoButton, *volButton, *micButton;
QScrollArea *chatArea;
QWidget *main, *head, *chatAreaWidget;
QString previousName;
NetCamView* netcam; NetCamView* netcam;
int curRow; bool audioInputFlag;
bool lockSliderToBottom, audioInputFlag;
int callId; int callId;
}; };

323
widget/form/genericchatform.cpp Normal file
View File

@ -0,0 +1,323 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the COPYING file for more details.
*/
#include "genericchatform.h"
#include "ui_mainwindow.h"
#include <QScrollBar>
#include <QFileDialog>
#include <QTextStream>
#include "smileypack.h"
#include "widget/emoticonswidget.h"
#include "style.h"
#include "widget/widget.h"
GenericChatForm::GenericChatForm(QObject *parent) :
QObject(parent)
{
lockSliderToBottom = true;
curRow = 0;
mainWidget = new QWidget(); headWidget = new QWidget(); chatAreaWidget = new QWidget();
nameLabel = new QLabel();
avatarLabel = new QLabel();
QHBoxLayout *headLayout = new QHBoxLayout(), *mainFootLayout = new QHBoxLayout();
headTextLayout = new QVBoxLayout();
QVBoxLayout *mainLayout = new QVBoxLayout();
QVBoxLayout *footButtonsSmall = new QVBoxLayout(), *volMicLayout = new QVBoxLayout();
mainChatLayout = new QGridLayout();
msgEdit = new ChatTextEdit();
sendButton = new QPushButton();
emoteButton = new QPushButton();
fileButton = new QPushButton();
callButton = new QPushButton();
videoButton = new QPushButton();
volButton = new QPushButton();
micButton = new QPushButton();
chatArea = new QScrollArea();
QFont bold;
bold.setBold(true);
nameLabel->setFont(bold);
chatAreaWidget->setLayout(mainChatLayout);
chatAreaWidget->setStyleSheet(Style::get(":/ui/chatArea/chatArea.css"));
chatArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
chatArea->setWidgetResizable(true);
chatArea->setContextMenuPolicy(Qt::CustomContextMenu);
chatArea->setFrameStyle(QFrame::NoFrame);
mainChatLayout->setColumnStretch(1,1);
mainChatLayout->setSpacing(5);
footButtonsSmall->setSpacing(2);
msgEdit->setStyleSheet(Style::get(":/ui/msgEdit/msgEdit.css"));
msgEdit->setFixedHeight(50);
msgEdit->setFrameStyle(QFrame::NoFrame);
sendButton->setStyleSheet(Style::get(":/ui/sendButton/sendButton.css"));
fileButton->setStyleSheet(Style::get(":/ui/fileButton/fileButton.css"));
emoteButton->setStyleSheet(Style::get(":/ui/emoteButton/emoteButton.css"));
callButton->setObjectName("green");
callButton->setStyleSheet(Style::get(":/ui/callButton/callButton.css"));
videoButton->setObjectName("green");
videoButton->setStyleSheet(Style::get(":/ui/videoButton/videoButton.css"));
QString volButtonStylesheet = "";
try
{
QFile f(":/ui/volButton/volButton.css");
f.open(QFile::ReadOnly | QFile::Text);
QTextStream volButtonStylesheetStream(&f);
volButtonStylesheet = volButtonStylesheetStream.readAll();
}
catch (int e) {}
volButton->setObjectName("green");
volButton->setStyleSheet(volButtonStylesheet);
QString micButtonStylesheet = "";
try
{
QFile f(":/ui/micButton/micButton.css");
f.open(QFile::ReadOnly | QFile::Text);
QTextStream micButtonStylesheetStream(&f);
micButtonStylesheet = micButtonStylesheetStream.readAll();
}
catch (int e) {}
micButton->setObjectName("green");
micButton->setStyleSheet(micButtonStylesheet);
mainWidget->setLayout(mainLayout);
mainLayout->addWidget(chatArea);
mainLayout->addLayout(mainFootLayout);
mainLayout->setMargin(0);
footButtonsSmall->addWidget(emoteButton);
footButtonsSmall->addWidget(fileButton);
mainFootLayout->addWidget(msgEdit);
mainFootLayout->addLayout(footButtonsSmall);
mainFootLayout->addSpacing(5);
mainFootLayout->addWidget(sendButton);
mainFootLayout->setSpacing(0);
headWidget->setLayout(headLayout);
headLayout->addWidget(avatarLabel);
headLayout->addLayout(headTextLayout);
headLayout->addStretch();
headLayout->addLayout(volMicLayout);
headLayout->addWidget(callButton);
headLayout->addWidget(videoButton);
volMicLayout->addWidget(micButton);
volMicLayout->addWidget(volButton);
headTextLayout->addStretch();
headTextLayout->addWidget(nameLabel);
chatArea->setWidget(chatAreaWidget);
//Fix for incorrect layouts on OS X as per
//https://bugreports.qt-project.org/browse/QTBUG-14591
sendButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
fileButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
emoteButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
connect(emoteButton, SIGNAL(clicked()), this, SLOT(onEmoteButtonClicked()));
connect(chatArea, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onChatContextMenuRequested(QPoint)));
connect(chatArea->verticalScrollBar(), SIGNAL(rangeChanged(int,int)), this, SLOT(onSliderRangeChanged()));
}
void GenericChatForm::setName(const QString &newName)
{
nameLabel->setText(newName);
nameLabel->setToolTip(newName); // for overlength names
}
void GenericChatForm::show(Ui::MainWindow &ui)
{
ui.mainContent->layout()->addWidget(mainWidget);
ui.mainHead->layout()->addWidget(headWidget);
mainWidget->show();
headWidget->show();
}
void GenericChatForm::onChatContextMenuRequested(QPoint pos)
{
QWidget* sender = (QWidget*)QObject::sender();
pos = sender->mapToGlobal(pos);
QMenu menu;
menu.addAction(tr("Save chat log"), this, SLOT(onSaveLogClicked()));
menu.exec(pos);
}
void GenericChatForm::onSliderRangeChanged()
{
QScrollBar* scroll = chatArea->verticalScrollBar();
if (lockSliderToBottom)
scroll->setValue(scroll->maximum());
}
void GenericChatForm::onSaveLogClicked()
{
QString path = QFileDialog::getSaveFileName(0,tr("Save chat log"));
if (path.isEmpty())
return;
QFile file(path);
if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
return;
QString log;
QList<QLabel*> labels = chatAreaWidget->findChildren<QLabel*>();
int i=0;
for (QLabel* label : labels)
{
log += label->text();
if (i==2)
{
i=0;
log += '\n';
}
else
{
log += '\t';
i++;
}
}
file.write(log.toUtf8());
file.close();
}
void GenericChatForm::addMessage(QString author, QString message, QString date)
{
QLabel *authorLabel = new QLabel(author);
QLabel *messageLabel = new QLabel();
QLabel *dateLabel = new QLabel(date);
QScrollBar* scroll = chatArea->verticalScrollBar();
lockSliderToBottom = scroll && scroll->value() == scroll->maximum();
authorLabel->setAlignment(Qt::AlignTop | Qt::AlignRight);
dateLabel->setAlignment(Qt::AlignTop);
messageLabel->setWordWrap(true);
messageLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
authorLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
dateLabel->setTextInteractionFlags(Qt::TextBrowserInteraction);
if (author == Widget::getInstance()->getUsername())
{
QPalette pal;
pal.setColor(QPalette::WindowText, QColor(100,100,100));
authorLabel->setPalette(pal);
messageLabel->setPalette(pal);
}
if (previousName.isEmpty() || previousName != author)
{
if (curRow)
{
mainChatLayout->setRowStretch(curRow, 0);
mainChatLayout->addItem(new QSpacerItem(0,AUTHOR_CHANGE_SPACING),curRow,0,1,3);
}
previousName = author;
curRow++;
}
else if (curRow)// onSaveLogClicked expects 0 or 3 QLabel per line
authorLabel->setText("");
QColor greentext(61,204,61);
QString fontTemplate = "<font color='%1'>%2</font>";
QString finalMessage;
QStringList messageLines = message.split("\n");
for (QString& s : messageLines)
{
if (QRegExp("^[ ]*>.*").exactMatch(s))
finalMessage += fontTemplate.arg(greentext.name(), toHtmlChars(s));
else
finalMessage += toHtmlChars(s);
finalMessage += "<br>";
}
messageLabel->setText(finalMessage.left(finalMessage.length()-4));
messageLabel->setText(SmileyPack::getInstance().smileyfied(messageLabel->text()));
messageLabel->setTextFormat(Qt::RichText);
mainChatLayout->addWidget(authorLabel, curRow, 0);
mainChatLayout->addWidget(messageLabel, curRow, 1);
mainChatLayout->addWidget(dateLabel, curRow, 3);
mainChatLayout->setRowStretch(curRow+1, 1);
mainChatLayout->setRowStretch(curRow, 0);
curRow++;
authorLabel->setContextMenuPolicy(Qt::CustomContextMenu);
messageLabel->setContextMenuPolicy(Qt::CustomContextMenu);
dateLabel->setContextMenuPolicy(Qt::CustomContextMenu);
connect(authorLabel, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onChatContextMenuRequested(QPoint)));
connect(messageLabel, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onChatContextMenuRequested(QPoint)));
connect(dateLabel, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onChatContextMenuRequested(QPoint)));
}
GenericChatForm::~GenericChatForm()
{
delete mainWidget;
delete headWidget;
}
void GenericChatForm::onEmoteButtonClicked()
{
// don't show the smiley selection widget if there are no smileys available
if (SmileyPack::getInstance().getEmoticons().empty())
return;
EmoticonsWidget widget;
connect(&widget, SIGNAL(insertEmoticon(QString)), this, SLOT(onEmoteInsertRequested(QString)));
QWidget* sender = qobject_cast<QWidget*>(QObject::sender());
if (sender)
{
QPoint pos = -QPoint(widget.sizeHint().width() / 2, widget.sizeHint().height()) - QPoint(0, 10);
widget.exec(sender->mapToGlobal(pos));
}
}
void GenericChatForm::onEmoteInsertRequested(QString str)
{
// insert the emoticon
QWidget* sender = qobject_cast<QWidget*>(QObject::sender());
if (sender)
msgEdit->insertPlainText(str);
msgEdit->setFocus(); // refocus so that we can continue typing
}
QString GenericChatForm::toHtmlChars(const QString &str)
{
static QList<QPair<QString, QString>> replaceList = {{"&","&amp;"}, {" ","&nbsp;"}, {">","&gt;"}, {"<","&lt;"}};
QString res = str;
for (auto &it : replaceList)
res = res.replace(it.first,it.second);
return res;
}

80
widget/form/genericchatform.h Normal file
View File

@ -0,0 +1,80 @@
/*
Copyright (C) 2014 by Project Tox <https://tox.im>
This file is part of qTox, a Qt-based graphical interface for Tox.
This program is libre software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the COPYING file for more details.
*/
#ifndef GENERICCHATFORM_H
#define GENERICCHATFORM_H
#include <QObject>
#include <QLabel>
#include <QPoint>
#include <QScrollArea>
#include <QTime>
#include <QLabel>
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QPushButton>
#include <QGridLayout>
#include "widget/tool/chattextedit.h"
// Spacing in px inserted when the author of the last message changes
#define AUTHOR_CHANGE_SPACING 5
namespace Ui {
class MainWindow;
}
class GenericChatForm : public QObject
{
Q_OBJECT
public:
GenericChatForm(QObject *parent = 0);
virtual ~GenericChatForm();
virtual void setName(const QString &newName);
virtual void show(Ui::MainWindow &ui);
void addMessage(QString author, QString message, QString date=QTime::currentTime().toString("hh:mm"));
signals:
void sendMessage(int, QString);
public slots:
protected slots:
void onChatContextMenuRequested(QPoint pos);
void onSliderRangeChanged();
void onSaveLogClicked();
void onEmoteButtonClicked();
void onEmoteInsertRequested(QString str);
protected:
QLabel *nameLabel, *avatarLabel;
QWidget *mainWidget, *headWidget, *chatAreaWidget;
QScrollArea *chatArea;
QPushButton *fileButton, *emoteButton, *callButton, *videoButton, *volButton, *micButton;
QGridLayout *mainChatLayout;
QVBoxLayout *headTextLayout;
ChatTextEdit *msgEdit;
QPushButton *sendButton;
QString previousName;
int curRow;
bool lockSliderToBottom;
private:
QString toHtmlChars(const QString &str);
};
#endif // GENERICCHATFORM_H

209
widget/form/groupchatform.cpp
View File

@ -18,36 +18,27 @@
#include "group.h" #include "group.h"
#include "widget/groupwidget.h" #include "widget/groupwidget.h"
#include "widget/widget.h" #include "widget/widget.h"
#include "friend.h"
#include "friendlist.h"
#include "style.h"
#include <QFont>
#include <QTime>
#include <QScrollBar>
#include <QMenu>
#include <QFile>
#include <QFileDialog>
GroupChatForm::GroupChatForm(Group* chatGroup) GroupChatForm::GroupChatForm(Group* chatGroup)
: group(chatGroup), curRow{0}, lockSliderToBottom{true} : group(chatGroup)
{ {
main = new QWidget(), head = new QWidget(), chatAreaWidget = new QWidget(); nusersLabel = new QLabel();
headLayout = new QHBoxLayout(), mainFootLayout = new QHBoxLayout(); namesList = new QLabel();
headTextLayout = new QVBoxLayout(), mainLayout = new QVBoxLayout();
mainChatLayout = new QGridLayout(); fileButton->setEnabled(false);
avatar = new QLabel(), name = new QLabel(), nusers = new QLabel(), namesList = new QLabel(); callButton->setVisible(false);
msgEdit = new ChatTextEdit(); videoButton->setVisible(false);
sendButton = new QPushButton(); volButton->setVisible(false);
chatArea = new QScrollArea(); micButton->setVisible(false);
QFont bold;
bold.setBold(true);
QFont small; QFont small;
small.setPixelSize(10); small.setPixelSize(10);
name->setText(group->widget->name.text());
name->setFont(bold); nameLabel->setText(group->widget->name.text());
nusers->setFont(small); nusersLabel->setFont(small);
nusers->setText(GroupChatForm::tr("%1 users in chat","Number of users in chat").arg(group->peers.size())); nusersLabel->setText(GroupChatForm::tr("%1 users in chat","Number of users in chat").arg(group->peers.size()));
avatar->setPixmap(QPixmap(":/img/group.png")); avatarLabel->setPixmap(QPixmap(":/img/group_dark.png"));
QString names; QString names;
for (QString& s : group->peers) for (QString& s : group->peers)
names.append(s+", "); names.append(s+", ");
@ -55,77 +46,24 @@ GroupChatForm::GroupChatForm(Group* chatGroup)
namesList->setText(names); namesList->setText(names);
namesList->setFont(small); namesList->setFont(small);
chatAreaWidget->setLayout(mainChatLayout);
chatArea->setStyleSheet(Style::get(":/ui/chatArea/chatArea.css"));
chatArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
chatArea->setWidgetResizable(true);
chatArea->setContextMenuPolicy(Qt::CustomContextMenu);
chatArea->setFrameStyle(QFrame::NoFrame);
mainChatLayout->setColumnStretch(1,1);
mainChatLayout->setSpacing(10);
msgEdit->setObjectName("group"); msgEdit->setObjectName("group");
msgEdit->setStyleSheet(Style::get(":/ui/msgEdit/msgEdit.css"));
msgEdit->setFixedHeight(50);
msgEdit->setFrameStyle(QFrame::NoFrame);
mainChatLayout->setColumnStretch(1,1); mainChatLayout->setColumnStretch(1,1);
mainChatLayout->setHorizontalSpacing(10); mainChatLayout->setHorizontalSpacing(10);
sendButton->setStyleSheet(Style::get(":/ui/sendButton/sendButton.css")); headTextLayout->addWidget(nusersLabel);
sendButton->setFixedSize(50, 50);
main->setLayout(mainLayout);
mainLayout->addWidget(chatArea);
mainLayout->addLayout(mainFootLayout);
mainLayout->setMargin(0);
mainFootLayout->addWidget(msgEdit);
mainFootLayout->addWidget(sendButton);
head->setLayout(headLayout);
headLayout->addWidget(avatar);
headLayout->addLayout(headTextLayout);
headLayout->addStretch();
headLayout->setMargin(0);
headTextLayout->addStretch();
headTextLayout->addWidget(name);
headTextLayout->addWidget(nusers);
headTextLayout->addWidget(namesList); headTextLayout->addWidget(namesList);
headTextLayout->setMargin(0); headTextLayout->setMargin(0);
headTextLayout->setSpacing(0); headTextLayout->setSpacing(0);
headTextLayout->addStretch(); headTextLayout->addStretch();
chatArea->setWidget(chatAreaWidget);
sendButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
connect(sendButton, SIGNAL(clicked()), this, SLOT(onSendTriggered())); connect(sendButton, SIGNAL(clicked()), this, SLOT(onSendTriggered()));
connect(msgEdit, SIGNAL(enterPressed()), this, SLOT(onSendTriggered())); connect(msgEdit, SIGNAL(enterPressed()), this, SLOT(onSendTriggered()));
connect(chatArea->verticalScrollBar(), SIGNAL(rangeChanged(int,int)), this, SLOT(onSliderRangeChanged()));
connect(chatArea, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onChatContextMenuRequested(QPoint)));
} }
GroupChatForm::~GroupChatForm() GroupChatForm::~GroupChatForm()
{ {
delete head;
delete main;
}
void GroupChatForm::show(Ui::MainWindow &ui)
{
ui.mainContent->layout()->addWidget(main);
ui.mainHead->layout()->addWidget(head);
main->show();
head->show();
}
void GroupChatForm::setName(QString newName)
{
name->setText(newName);
} }
void GroupChatForm::onSendTriggered() void GroupChatForm::onSendTriggered()
@ -139,124 +77,21 @@ void GroupChatForm::onSendTriggered()
void GroupChatForm::addGroupMessage(QString message, int peerId) void GroupChatForm::addGroupMessage(QString message, int peerId)
{ {
QLabel *msgAuthor; QString msgAuthor;
if (group->peers.contains(peerId)) if (group->peers.contains(peerId))
msgAuthor = new QLabel(group->peers[peerId]); msgAuthor = group->peers[peerId];
else else
msgAuthor = new QLabel(tr("<Unknown>")); msgAuthor = tr("<Unknown>");
QLabel *msgText = new QLabel(message); addMessage(msgAuthor, message);
QLabel *msgDate = new QLabel(QTime::currentTime().toString("hh:mm"));
addMessage(msgAuthor, msgText, msgDate);
}
void GroupChatForm::addMessage(QString author, QString message, QString date)
{
addMessage(new QLabel(author), new QLabel(message), new QLabel(date));
}
void GroupChatForm::addMessage(QLabel* author, QLabel* message, QLabel* date)
{
QPalette greentext;
greentext.setColor(QPalette::WindowText, QColor(61,204,61));
QScrollBar* scroll = chatArea->verticalScrollBar();
lockSliderToBottom = scroll && scroll->value() == scroll->maximum();
author->setAlignment(Qt::AlignTop | Qt::AlignLeft);
date->setAlignment(Qt::AlignTop);
message->setWordWrap(true);
message->setTextInteractionFlags(Qt::TextBrowserInteraction);
author->setTextInteractionFlags(Qt::TextBrowserInteraction);
date->setTextInteractionFlags(Qt::TextBrowserInteraction);
if (author->text() == Widget::getInstance()->getUsername())
{
QPalette pal;
pal.setColor(QPalette::WindowText, Qt::gray);
author->setPalette(pal);
message->setPalette(pal);
}
if (previousName.isEmpty() || previousName != author->text())
{
if (curRow)
{
mainChatLayout->setRowStretch(curRow, 0);
mainChatLayout->addItem(new QSpacerItem(0,AUTHOR_CHANGE_SPACING),curRow,0,1,3);
}
previousName = author->text();
curRow++;
}
else if (curRow)// onSaveLogClicked expects 0 or 3 QLabel per line
author->setText("");
if (message->text()[0] == '>')
message->setPalette(greentext);
mainChatLayout->addWidget(author, curRow, 0);
mainChatLayout->addWidget(message, curRow, 1);
mainChatLayout->addWidget(date, curRow, 3);
mainChatLayout->setRowStretch(curRow+1, 1);
mainChatLayout->setRowStretch(curRow, 0);
curRow++;
author->setContextMenuPolicy(Qt::CustomContextMenu);
message->setContextMenuPolicy(Qt::CustomContextMenu);
date->setContextMenuPolicy(Qt::CustomContextMenu);
connect(author, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onChatContextMenuRequested(QPoint)));
connect(message, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onChatContextMenuRequested(QPoint)));
connect(date, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(onChatContextMenuRequested(QPoint)));
}
void GroupChatForm::onSliderRangeChanged()
{
QScrollBar* scroll = chatArea->verticalScrollBar();
if (lockSliderToBottom)
scroll->setValue(scroll->maximum());
} }
void GroupChatForm::onUserListChanged() void GroupChatForm::onUserListChanged()
{ {
nusers->setText(tr("%1 users in chat").arg(group->nPeers)); nusersLabel->setText(tr("%1 users in chat").arg(group->nPeers));
QString names; QString names;
for (QString& s : group->peers) for (QString& s : group->peers)
names.append(s+", "); names.append(s+", ");
names.chop(2); names.chop(2);
namesList->setText(names); namesList->setText(names);
} }
void GroupChatForm::onChatContextMenuRequested(QPoint pos)
{
QWidget* sender = (QWidget*)QObject::sender();
pos = sender->mapToGlobal(pos);
QMenu menu;
menu.addAction("Save chat log", this, SLOT(onSaveLogClicked()));
menu.exec(pos);
}
void GroupChatForm::onSaveLogClicked()
{
QString path = QFileDialog::getSaveFileName(0,tr("Save chat log"));
if (path.isEmpty())
return;
QFile file(path);
if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
return;
QString log;
QList<QLabel*> labels = chatAreaWidget->findChildren<QLabel*>();
int i=0;
for (QLabel* label : labels)
{
log += label->text();
if (i==2)
{
i=0;
log += '\n';
}
else
{
log += '\t';
i++;
}
}
file.write(log.toUtf8());
file.close();
}

37
widget/form/groupchatform.h
View File

@ -17,58 +17,27 @@
#ifndef GROUPCHATFORM_H #ifndef GROUPCHATFORM_H
#define GROUPCHATFORM_H #define GROUPCHATFORM_H
#include <QLabel> #include "genericchatform.h"
#include <QWidget>
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QGridLayout>
#include <QTextEdit>
#include <QScrollArea>
#include <QTime>
#include "widget/tool/chattextedit.h" #include "widget/tool/chattextedit.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"
// Spacing in px inserted when the author of the last message changes
#define AUTHOR_CHANGE_SPACING 5
class Group; class Group;
class GroupChatForm : public QObject class GroupChatForm : public GenericChatForm
{ {
Q_OBJECT Q_OBJECT
public: public:
GroupChatForm(Group* chatGroup); GroupChatForm(Group* chatGroup);
~GroupChatForm(); ~GroupChatForm();
void show(Ui::MainWindow &ui);
void setName(QString newName);
void addGroupMessage(QString message, int peerId); void addGroupMessage(QString message, int peerId);
void addMessage(QString author, QString message, QString date=QTime::currentTime().toString("hh:mm"));
void addMessage(QLabel* author, QLabel* message, QLabel* date);
void onUserListChanged(); void onUserListChanged();
signals:
void sendMessage(int, QString);
private slots: private slots:
void onSendTriggered(); void onSendTriggered();
void onSliderRangeChanged();
void onChatContextMenuRequested(QPoint pos);
void onSaveLogClicked();
private: private:
Group* group; Group* group;
QHBoxLayout *headLayout, *mainFootLayout; QLabel *nusersLabel, *namesList;
QVBoxLayout *headTextLayout, *mainLayout;
QGridLayout *mainChatLayout;
QLabel *avatar, *name, *nusers, *namesList;
ChatTextEdit *msgEdit;
QPushButton *sendButton;
QScrollArea *chatArea;
QWidget *main, *head, *chatAreaWidget;
QString previousName;
int curRow;
bool lockSliderToBottom;
}; };
#endif // GROUPCHATFORM_H #endif // GROUPCHATFORM_H

2
widget/widget.cpp
View File

@ -509,7 +509,7 @@ void Widget::onFriendMessageReceived(int friendId, const QString& message)
if (!f) if (!f)
return; return;
f->chatForm->addFriendMessage(message); f->chatForm->addMessage(f->getName(), message);
if (activeChatroomWidget != nullptr) if (activeChatroomWidget != nullptr)
{ {