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

refactor(ui): set icon in dialog constructor

Browse Source 
Fixes #4430.
Moved `setWindowIcon` to dialog constructor and removed all other occurrences.
This commit is contained in:
ezavod 2017-05-31 17:16:55 +02:00
parent 65b1463933
commit b518aa8488
No known key found for this signature in database
GPG Key ID: 5DFDD9A0D8E5A9B6
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widget/widget.cpp
View File

@ -841,7 +841,6 @@ void Widget::onShowSettings()
} }
setActiveToolMenuButton(ActiveToolMenuButton::None); setActiveToolMenuButton(ActiveToolMenuButton::None);
settingsWidget->setWindowIcon(QIcon(":/img/icons/qtox.svg"));
} else { } else {
hideMainForms(nullptr); hideMainForms(nullptr);
settingsWidget->show(contentLayout); settingsWidget->show(contentLayout);
@ -858,7 +857,6 @@ void Widget::showProfile() // onAvatarClicked, onUsernameClicked
} }
setActiveToolMenuButton(ActiveToolMenuButton::None); setActiveToolMenuButton(ActiveToolMenuButton::None);
settingsWidget->setWindowIcon(QIcon(":/img/icons/qtox.svg"));
} else { } else {
hideMainForms(nullptr); hideMainForms(nullptr);
profileForm->show(contentLayout); profileForm->show(contentLayout);
@ -1521,6 +1519,7 @@ ContentLayout* Widget::createContentDialog(DialogType type) const
restoreGeometry(Settings::getInstance().getDialogSettingsGeometry()); restoreGeometry(Settings::getInstance().getDialogSettingsGeometry());
Translator::registerHandler(std::bind(&Dialog::retranslateUi, this), this); Translator::registerHandler(std::bind(&Dialog::retranslateUi, this), this);
retranslateUi(); retranslateUi();
setWindowIcon(QIcon(":/img/icons/qtox.svg"));
connect(Core::getInstance(), &Core::usernameSet, this, &Dialog::retranslateUi); connect(Core::getInstance(), &Core::usernameSet, this, &Dialog::retranslateUi);
} }
@ -1536,7 +1535,6 @@ ContentLayout* Widget::createContentDialog(DialogType type) const
{ {
setWindowTitle(Core::getInstance()->getUsername() + QStringLiteral(" - ") setWindowTitle(Core::getInstance()->getUsername() + QStringLiteral(" - ")
+ Widget::fromDialogType(type)); + Widget::fromDialogType(type));
setWindowIcon(QIcon(":/img/icons/qtox.svg"));
} }
protected: protected: