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 remote-tracking branch 'thenain38/patch-2'

Browse Source
This commit is contained in:
agilob 2015-11-10 19:41:13 +00:00
commit 6bc8127ad3
No known key found for this signature in database
GPG Key ID: 296F0B764741106C
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/widget/widget.cpp
View File

@ -414,13 +414,13 @@ void Widget::updateIcons()
QString status;
if (eventIcon)
{
status = "event";
status = QStringLiteral("event");
}
else
{
status = ui->statusButton->property("status").toString();
if (!status.length())
status = "offline";
status = QStringLiteral("offline");
}
QIcon ico;
@ -502,6 +502,11 @@ void Widget::closeEvent(QCloseEvent *event)
}
else
{
if (autoAwayActive)
{
emit statusSet(Status::Online);
autoAwayActive = false;
}
saveWindowGeometry();
saveSplitterGeometry();
qApp->exit(0);
@ -889,13 +894,13 @@ void Widget::addFriend(int friendId, const QString &userId)
if (chatDate > activityDate && chatDate.isValid())
Settings::getInstance().setFriendActivity(newfriend->getToxId(), chatDate);
contactListWidget->addFriendWidget(newfriend->getFriendWidget(),Status::Offline,Settings::getInstance().getFriendCircleID(newfriend->getToxId()));
contactListWidget->addFriendWidget(newfriend->getFriendWidget(), Status::Offline, Settings::getInstance().getFriendCircleID(newfriend->getToxId()));
Core* core = Nexus::getCore();
CoreAV* coreav = core->getAv();
connect(newfriend, &Friend::displayedNameChanged, this, &Widget::onFriendDisplayChanged);
connect(settingsWidget, &SettingsWidget::compactToggled, newfriend->getFriendWidget(), &GenericChatroomWidget::compactChange);
connect(newfriend->getFriendWidget(), SIGNAL(chatroomWidgetClicked(GenericChatroomWidget*,bool)), this, SLOT(onChatroomWidgetClicked(GenericChatroomWidget*,bool)));
connect(newfriend->getFriendWidget(), SIGNAL(chatroomWidgetClicked(GenericChatroomWidget*, bool)), this, SLOT(onChatroomWidgetClicked(GenericChatroomWidget*, bool)));
connect(newfriend->getFriendWidget(), SIGNAL(removeFriend(int)), this, SLOT(removeFriend(int)));
connect(newfriend->getFriendWidget(), SIGNAL(copyFriendIdToClipboard(int)), this, SLOT(copyFriendIdToClipboard(int)));
connect(newfriend->getFriendWidget(), SIGNAL(chatroomWidgetClicked(GenericChatroomWidget*)), newfriend->getChatForm(), SLOT(focusInput()));
@ -1922,25 +1927,25 @@ QString Widget::getStatusTitle(Status status)
switch (status)
{
case Status::Online:
return "online";
return QStringLiteral("online");
case Status::Away:
return "away";
return QStringLiteral("away");
case Status::Busy:
return "busy";
return QStringLiteral("busy");
case Status::Offline:
default:
return "offline";
return QStringLiteral("offline");
}
}
Status Widget::getStatusFromString(QString status)
{
if (status == "online")
if (status == QStringLiteral("online"))
return Status::Online;
else if (status == "busy")
return Status::Busy;
else if (status == "away")
else if (status == QStringLiteral("away"))
return Status::Away;
else if (status == QStringLiteral("busy"))
return Status::Busy;
else
return Status::Offline;
}