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 'pr2769'

Browse Source
This commit is contained in:
tux3 2016-01-16 15:44:51 +01:00
commit d07bef21a3
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mainwindow.ui
View File

@ -1094,7 +1094,7 @@ QSplitter:handle{
<x>0</x>
<y>0</y>
<width>775</width>
<height>284</height>
<height>279</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_5"/>

5
src/widget/widget.cpp
View File

@ -682,7 +682,7 @@ void Widget::setWindowTitle(const QString& title)
void Widget::forceShow()
{
hide(); // Workaround to force minimized window to be restored
hide(); // Workaround to force minimized window to be restored
show();
activateWindow();
}
@ -785,6 +785,7 @@ void Widget::onSettingsClicked()
settingsWidget->show(createContentDialog(SettingDialog));
setActiveToolMenuButton(Widget::None);
settingsWidget->setWindowIcon(QIcon(":/img/icons/qtox.svg"));
}
else
{
@ -803,6 +804,7 @@ void Widget::showProfile() // onAvatarClicked, onUsernameClicked
profileForm->show(createContentDialog(ProfileDialog));
setActiveToolMenuButton(Widget::None);
settingsWidget->setWindowIcon(QIcon(":/img/icons/qtox.svg"));
}
else
{
@ -1368,6 +1370,7 @@ ContentLayout* Widget::createContentDialog(DialogType type)
void retranslateUi()
{
setWindowTitle(Core::getInstance()->getUsername() + QStringLiteral(" - ") + Widget::fromDialogType(type));
setWindowIcon(QIcon(":/img/icons/qtox.svg"));
}
protected: