80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #3915 from lemondrops/qt_icons

Browse Source 
Qt: Application icon fixes
This commit is contained in:
Miran Grča
2023-12-20 18:56:20 +01:00
committed by GitHub
parent 69d38811a6 fdae410884
commit 2ccc46d28a
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/qt/qt_main.cpp
View File

@@ -194,6 +194,21 @@ main(int argc, char *argv[])
QApplication::setFont(QFont(font_name, font_size.toInt()));
SetCurrentProcessExplicitAppUserModelID(L"86Box.86Box");
#endif
#ifdef RELEASE_BUILD
app.setWindowIcon(QIcon(":/settings/win/icons/86Box-green.ico"));
#elif defined ALPHA_BUILD
app.setWindowIcon(QIcon(":/settings/win/icons/86Box-red.ico"));
#elif defined BETA_BUILD
app.setWindowIcon(QIcon(":/settings/win/icons/86Box-yellow.ico"));
#else
app.setWindowIcon(QIcon(":/settings/win/icons/86Box-gray.ico"));
#endif
#if (!defined(Q_OS_WINDOWS) && !defined(__APPLE__))
app.setDesktopFileName("net.86box.86Box");
#endif
if (!pc_init_modules()) {
ui_msgbox_header(MBX_FATAL, (void *) IDS_2121, (void *) IDS_2056);
return 6;

9
src/qt/qt_mainwindow.cpp
View File

@@ -196,15 +196,6 @@ MainWindow::MainWindow(QWidget *parent)
auto toolbar_label = new QLabel();
ui->toolBar->addWidget(toolbar_label);
#ifdef RELEASE_BUILD
this->setWindowIcon(QIcon(":/settings/win/icons/86Box-green.ico"));
#elif defined ALPHA_BUILD
this->setWindowIcon(QIcon(":/settings/win/icons/86Box-red.ico"));
#elif defined BETA_BUILD
this->setWindowIcon(QIcon(":/settings/win/icons/86Box-yellow.ico"));
#else
this->setWindowIcon(QIcon(":/settings/win/icons/86Box-gray.ico"));
#endif
this->setWindowFlag(Qt::MSWindowsFixedSizeDialogHint, vid_resize != 1);
this->setWindowFlag(Qt::WindowMaximizeButtonHint, vid_resize == 1);