Skip to content

Assign app name in NetworkStyle::NetworkStyle() #761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eduffield222 merged 1 commit into from
May 9, 2016
Merged

Assign app name in NetworkStyle::NetworkStyle() #761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/qt/dash.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ int main(int argc, char *argv[])
QScopedPointer<const NetworkStyle> networkStyle(NetworkStyle::instantiate(QString::fromStdString(Params().NetworkIDString())));
assert(!networkStyle.isNull());
// Allow for separate UI settings for testnets
QApplication::setApplicationName(networkStyle->getAppName());
// QApplication::setApplicationName(networkStyle->getAppName()); // moved to NetworkStyle::NetworkStyle
// Re-initialize translations after changing application name (language in network-specific settings can be different)
initTranslations(qtTranslatorBase, qtTranslator, translatorBase, translator);

Expand Down
3 changes: 3 additions & 0 deletions src/qt/networkstyle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ NetworkStyle::NetworkStyle(const QString &appName, const int iconColorHueShift,
appName(appName),
titleAddText(qApp->translate("SplashScreen", titleAddText))
{
// Allow for separate UI settings for testnets
QApplication::setApplicationName(appName);
// Grab theme from settings
QString theme = GUIUtil::getThemeName();
// load pixmap
QPixmap appIconPixmap(":/icons/bitcoin");
Expand Down