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 pull request #2767 from branch agilob:chat_window_icon

Browse Source 
* Set status icon on separate chat window, closes #2210
This commit is contained in:
Nils Fenner 2016-01-04 22:34:30 +01:00
parent b25faf0426
commit e952d1a654
No known key found for this signature in database
GPG Key ID: 9591A163FF9BE04C
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/widget/contentdialog.cpp
View File

@ -120,7 +120,7 @@ ContentDialog::ContentDialog(SettingsWidget* settingsWidget, QWidget* parent)
new QShortcut(Qt::CTRL + Qt::Key_PageUp, this, SLOT(previousContact())); new QShortcut(Qt::CTRL + Qt::Key_PageUp, this, SLOT(previousContact()));
new QShortcut(Qt::CTRL + Qt::Key_PageDown, this, SLOT(nextContact())); new QShortcut(Qt::CTRL + Qt::Key_PageDown, this, SLOT(nextContact()));
connect(Core::getInstance(), &Core::usernameSet, this, &ContentDialog::updateTitleUsername); connect(Core::getInstance(), &Core::usernameSet, this, &ContentDialog::updateTitleAndStatusIcon);
Translator::registerHandler(std::bind(&ContentDialog::retranslateUi, this), this); Translator::registerHandler(std::bind(&ContentDialog::retranslateUi, this), this);
} }
@ -214,11 +214,9 @@ void ContentDialog::removeFriend(int friendId)
FriendWidget* chatroomWidget = static_cast<FriendWidget*>(std::get<1>(iter.value())); FriendWidget* chatroomWidget = static_cast<FriendWidget*>(std::get<1>(iter.value()));
disconnect(chatroomWidget->getFriend(), &Friend::displayedNameChanged, this, &ContentDialog::updateFriendWidget); disconnect(chatroomWidget->getFriend(), &Friend::displayedNameChanged, this, &ContentDialog::updateFriendWidget);
// Need to find replacement to show here instead.
if (activeChatroomWidget == chatroomWidget) if (activeChatroomWidget == chatroomWidget)
{
// Need to find replacement to show here instead.
cycleContacts(true, false); cycleContacts(true, false);
}
friendLayout->removeFriendWidget(chatroomWidget, Status::Offline); friendLayout->removeFriendWidget(chatroomWidget, Status::Offline);
friendLayout->removeFriendWidget(chatroomWidget, Status::Online); friendLayout->removeFriendWidget(chatroomWidget, Status::Online);
@ -255,11 +253,9 @@ void ContentDialog::removeGroup(int groupId)
GenericChatroomWidget* chatroomWidget = std::get<1>(iter.value()); GenericChatroomWidget* chatroomWidget = std::get<1>(iter.value());
// Need to find replacement to show here instead.
if (activeChatroomWidget == chatroomWidget) if (activeChatroomWidget == chatroomWidget)
{
// Need to find replacement to show here instead.
cycleContacts(true, false); cycleContacts(true, false);
}
groupLayout.removeSortedWidget(chatroomWidget); groupLayout.removeSortedWidget(chatroomWidget);
chatroomWidget->deleteLater(); chatroomWidget->deleteLater();
@ -425,10 +421,37 @@ ContentDialog* ContentDialog::getGroupDialog(int groupId)
return getDialog(groupId, groupList); return getDialog(groupId, groupList);
} }
void ContentDialog::updateTitleUsername(const QString& username) void ContentDialog::updateTitleAndStatusIcon(const QString& username)
{ {
if (displayWidget != nullptr) if (displayWidget != nullptr)
{
setWindowTitle(displayWidget->getTitle() + QStringLiteral(" - ") + username); setWindowTitle(displayWidget->getTitle() + QStringLiteral(" - ") + username);
// it's null when it's a groupchat
if(displayWidget->getFriend() == nullptr)
{
setWindowIcon(QIcon(":/img/group.svg"));
return;
}
Status currentStatus = displayWidget->getFriend()->getStatus();
switch(currentStatus) {
case Status::Online:
setWindowIcon(QIcon(":/img/status/dot_online.svg"));
break;
case Status::Away:
setWindowIcon(QIcon(":/img/status/dot_away.svg"));
break;
case Status::Busy:
setWindowIcon(QIcon(":/img/status/dot_busy.svg"));
break;
case Status::Offline:
setWindowIcon(QIcon(":/img/status/dot_offline.svg"));
break;
}
}
else else
setWindowTitle(username); setWindowTitle(username);
} }
@ -436,7 +459,7 @@ void ContentDialog::updateTitleUsername(const QString& username)
void ContentDialog::updateTitle(GenericChatroomWidget* chatroomWidget) void ContentDialog::updateTitle(GenericChatroomWidget* chatroomWidget)
{ {
displayWidget = chatroomWidget; displayWidget = chatroomWidget;
updateTitleUsername(Core::getInstance()->getUsername()); updateTitleAndStatusIcon(Core::getInstance()->getUsername());
} }
void ContentDialog::previousContact() void ContentDialog::previousContact()
@ -636,7 +659,7 @@ void ContentDialog::onGroupchatPositionChanged(bool top)
void ContentDialog::retranslateUi() void ContentDialog::retranslateUi()
{ {
updateTitleUsername(Core::getInstance()->getUsername()); updateTitleAndStatusIcon(Core::getInstance()->getUsername());
} }
void ContentDialog::saveDialogGeometry() void ContentDialog::saveDialogGeometry()

2
src/widget/contentdialog.h
View File

@ -72,7 +72,7 @@ signals:
#endif #endif
public slots: public slots:
void updateTitleUsername(const QString& username); void updateTitleAndStatusIcon(const QString& username);
void updateTitle(GenericChatroomWidget* chatroomWidget); void updateTitle(GenericChatroomWidget* chatroomWidget);
void previousContact(); void previousContact();
void nextContact(); void nextContact();