From aa64aaa0a2573d0539a63e526845e963a61383a3 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Thu, 26 Feb 2026 22:37:25 +0500 Subject: [PATCH 1/4] Qt: Move the program icon path to qt_defs.hpp --- src/qt/qt_about.cpp | 11 ++--------- src/qt/qt_defs.hpp | 14 ++++++++++++-- src/qt/qt_main.cpp | 12 ++---------- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/src/qt/qt_about.cpp b/src/qt/qt_about.cpp index f36282797..c47acd055 100644 --- a/src/qt/qt_about.cpp +++ b/src/qt/qt_about.cpp @@ -19,6 +19,7 @@ * Copyright 2022 dob205 */ #include "qt_about.hpp" +#include "qt_defs.hpp" extern "C" { #include <86box/86box.h> @@ -57,15 +58,7 @@ About::About(QWidget *parent) webSiteButton->connect(webSiteButton, &QPushButton::released, []() { QDesktopServices::openUrl(QUrl("https://" EMU_SITE)); }); -#ifdef RELEASE_BUILD - setIconPixmap(QIcon(":/settings/qt/icons/86Box-green.ico").pixmap(32, 32)); -#elif defined ALPHA_BUILD - setIconPixmap(QIcon(":/settings/qt/icons/86Box-red.ico").pixmap(32, 32)); -#elif defined BETA_BUILD - setIconPixmap(QIcon(":/settings/qt/icons/86Box-yellow.ico").pixmap(32, 32)); -#else - setIconPixmap(QIcon(":/settings/qt/icons/86Box-gray.ico").pixmap(32, 32)); -#endif + setIconPixmap(QIcon(EMU_ICON_PATH).pixmap(32, 32)); setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint); } diff --git a/src/qt/qt_defs.hpp b/src/qt/qt_defs.hpp index 58de88b67..c96c15256 100644 --- a/src/qt/qt_defs.hpp +++ b/src/qt/qt_defs.hpp @@ -2,9 +2,19 @@ #define QT_DEFS_HPP #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0) -#define CHECK_STATE_CHANGED checkStateChanged +# define CHECK_STATE_CHANGED checkStateChanged #else -#define CHECK_STATE_CHANGED stateChanged +# define CHECK_STATE_CHANGED stateChanged +#endif + +#ifdef RELEASE_BUILD +# define EMU_ICON_PATH ":/settings/qt/icons/86Box-green.ico" +#elif defined ALPHA_BUILD +# define EMU_ICON_PATH ":/settings/qt/icons/86Box-red.ico" +#elif defined BETA_BUILD +# define EMU_ICON_PATH ":/settings/qt/icons/86Box-yellow.ico" +#else +# define EMU_ICON_PATH ":/settings/qt/icons/86Box-gray.ico" #endif #endif // QT_DEFS_HPP diff --git a/src/qt/qt_main.cpp b/src/qt/qt_main.cpp index fd4bc5610..4b79c3acc 100644 --- a/src/qt/qt_main.cpp +++ b/src/qt/qt_main.cpp @@ -75,6 +75,7 @@ extern "C" { #include #include +#include "qt_defs.hpp" #include "qt_mainwindow.hpp" #include "qt_progsettings.hpp" #include "qt_settings.hpp" @@ -627,16 +628,7 @@ main(int argc, char *argv[]) #endif #ifndef Q_OS_MACOS -# ifdef RELEASE_BUILD - app.setWindowIcon(QIcon(":/settings/qt/icons/86Box-green.ico")); -# elif defined ALPHA_BUILD - app.setWindowIcon(QIcon(":/settings/qt/icons/86Box-red.ico")); -# elif defined BETA_BUILD - app.setWindowIcon(QIcon(":/settings/qt/icons/86Box-yellow.ico")); -# else - app.setWindowIcon(QIcon(":/settings/qt/icons/86Box-gray.ico")); -# endif - + app.setWindowIcon(QIcon(EMU_ICON_PATH)); # ifdef Q_OS_UNIX app.setDesktopFileName("net.86box.86Box"); # endif From d76c07fa8893cf818ca658175a00f3876d61a56d Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Thu, 26 Feb 2026 22:39:52 +0500 Subject: [PATCH 2/4] Qt: Replace the remaining use of 86box.png with .ico --- src/qt/assets/86box.png | Bin 846 -> 0 bytes src/qt/qt_updatedetails.cpp | 3 ++- src/qt/qt_vmmanager_addmachine.cpp | 5 ----- src/qt_resources.qrc | 1 - 4 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 src/qt/assets/86box.png diff --git a/src/qt/assets/86box.png b/src/qt/assets/86box.png deleted file mode 100644 index a90f63040182356ec829d792faf8994bf84f9f97..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 846 zcmV-U1F`&xP) zprqQ`+5i9m|NsAhfPlcj!2bXM0DyodCMN%mjy^s<0RR90Yij`9-2X^O0J*uj006eO zwg6C2l9G~cZf;6SN&r>=06n>DkN^MTvHz+7vB&@aRRDkh001R(0RI30xd16g(@FpU z00DGTPE!Ct=GbNc0004Ra!ynM&!Tsl0007sNkl+WUl;xd=t!Nad*TrOFH`_?5p>J|NTY0doC&fT}X2e1NL5 z7ElEINmdAON>mjDMC+zJop}5Lpk|%GsA0igEducO!2{IwnN`;>P1CWO=EcjXfckg$rWAT=BSj7_e@GuQJG088oQXW?~~2HZMIV*ntY2R{TX zWUzS@(4h7-ySI0z|${#;-t(^A-^PNTB~6#5mhN0m4H63}T!c>KlJ_ z1nA!YwsGzo({K9j5?cfE&mhGaYZ&8jiEM(oAE18)XeZ7T1Bydz0OYrT0=SB)o`GXP zpC>5qLCsr0fmKWbC@}^kfcyPDC>MYT5{=IG*)9xT1PC`I{&_xy_+CR@hyXqwkB_qa zG&B5M{VRZ0{t)o^`g*c+-T>U&l>=Ck0Pg;80gKuLp3jGInm^tD1HQl4HP}yKQ7XEK zvjzOc14LMZMI8Z%;K$Gc7Ig$z5waGQ06;`YDh+UO*>(Vm?(nINg8g0Dj6gw^+*C+# z{Rm8M=u~(8RRxgTl)oCklKk1@-}_C0B{zaUPu^Q6>$S@zw0kRM1H1=oru-*2Ygh8vp #include @@ -52,7 +53,7 @@ UpdateDetails:: connect(ui->buttonBox, &QDialogButtonBox::accepted, [updateResult] { visitDownloadPage(updateResult.channel); }); - const auto logo = QPixmap(":/assets/86box.png").scaled(QSize(64, 64), Qt::KeepAspectRatio, Qt::SmoothTransformation); + const auto logo = QIcon(EMU_ICON_PATH).pixmap(QSize(64, 64)); ui->icon->setPixmap(logo); } diff --git a/src/qt/qt_vmmanager_addmachine.cpp b/src/qt/qt_vmmanager_addmachine.cpp index b8bed2fe5..6ff2a87a7 100644 --- a/src/qt/qt_vmmanager_addmachine.cpp +++ b/src/qt/qt_vmmanager_addmachine.cpp @@ -38,11 +38,6 @@ VMManagerAddMachine:: setPage(Page_NameAndLocation, new NameAndLocationPage); setPage(Page_Conclusion, new ConclusionPage); - // Need to create a better image - // QPixmap originalPixmap(":/assets/86box.png"); - // QPixmap scaledPixmap = originalPixmap.scaled(150, 150, Qt::KeepAspectRatio); - QPixmap wizardPixmap(":/assets/86box-wizard.png"); - #ifndef Q_OS_MACOS setWizardStyle(ModernStyle); setPixmap(LogoPixmap, QPixmap(":assets/addvm-logo.png")); diff --git a/src/qt_resources.qrc b/src/qt_resources.qrc index 1d6581fa9..5c125a9ba 100644 --- a/src/qt_resources.qrc +++ b/src/qt_resources.qrc @@ -83,7 +83,6 @@ qt/texture_frag.spv - qt/assets/86box.png qt/assets/86box-wizard.png qt/assets/addvm-logo.png qt/assets/addvm-watermark.png From 958761a67fb91a53f970831b9c571b2ff1bea279 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Fri, 27 Feb 2026 06:21:30 +0500 Subject: [PATCH 3/4] Remove unused icons --- src/qt/icons/green-square-16.png | Bin 115 -> 0 bytes src/qt/icons/pause-16.png | Bin 123 -> 0 bytes src/qt/icons/play-16.png | Bin 156 -> 0 bytes src/qt/icons/red-power-16.png | Bin 174 -> 0 bytes src/qt/icons/red-square-16.png | Bin 118 -> 0 bytes src/qt/icons/stop-16.png | Bin 120 -> 0 bytes src/qt/icons/yellow-square-16.png | Bin 117 -> 0 bytes 7 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/qt/icons/green-square-16.png delete mode 100644 src/qt/icons/pause-16.png delete mode 100644 src/qt/icons/play-16.png delete mode 100644 src/qt/icons/red-power-16.png delete mode 100644 src/qt/icons/red-square-16.png delete mode 100644 src/qt/icons/stop-16.png delete mode 100644 src/qt/icons/yellow-square-16.png diff --git a/src/qt/icons/green-square-16.png b/src/qt/icons/green-square-16.png deleted file mode 100644 index cb42c38ebbff15c1ca2a3a7289ee07d33323e338..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|bUj@hLo9le z6BY;<9E$ue`ET-y$%2UtD`!pQNmTMy7LqVcxYBSik>Tjf&LjqgJppV|iMIStfEpP* MUHx3vIVCg!0AmUubN~PV diff --git a/src/qt/icons/pause-16.png b/src/qt/icons/pause-16.png deleted file mode 100644 index 3757802324fb8df5973d732727932094a9ab89d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|Og&v3Lo9le z6C_F=9PK{vUq6oJpL*CF!B|0~c&8*=WxGN)AW-v)waGfLf-!<|rDx>>Mux(biXx8< Sw`~R*z~JfX=d#Wzp$Py=TOw)z diff --git a/src/qt/icons/play-16.png b/src/qt/icons/play-16.png deleted file mode 100644 index bde40f503b155bffc67ccfaf035a058548575617..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|!aQ9ZLo9mF zUOLFjpuoZGV3PM>9?#)<=N7~>3*DOkH%s49$EI%u(&^R7bDqA5BI3}!*r V&Z{Hy#ejA)c)I$ztaD0e0swvyH(CGy diff --git a/src/qt/icons/red-square-16.png b/src/qt/icons/red-square-16.png deleted file mode 100644 index 32faa7cdcaaa5a44fa8c83ecab644de555e449ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|3_M*NLo9le z6BY;<9Fq7S8S!uOl8@)*-F7f8$#OGm>6Ga`k#MCUkeRKWQ6ychi;+S4BahUYq$`hs PdKo-j{an^LB{Ts54p}2u diff --git a/src/qt/icons/stop-16.png b/src/qt/icons/stop-16.png deleted file mode 100644 index d73cad140126d6c37246844369798397e90e4722..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|j67W&Lo9le z6C^SYbe#DqBJpFsgm2C3>xaJ{lsuBIl@z N;OXk;vd$@?2>@swA6@_e From c660e3589d6bc5e9d1bcfd8d9317a2f6941bdf27 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Fri, 27 Feb 2026 06:23:13 +0500 Subject: [PATCH 4/4] Fix floppy icon changing to ZIP if a removable drive is present --- src/qt/qt_machinestatus.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qt/qt_machinestatus.cpp b/src/qt/qt_machinestatus.cpp index 668ebaf62..751506e76 100644 --- a/src/qt/qt_machinestatus.cpp +++ b/src/qt/qt_machinestatus.cpp @@ -772,9 +772,9 @@ MachineStatus::refresh(QStatusBar *sbar) if (rdisk_drives[i].bus_type == RDISK_BUS_DISABLED) { d->rdisk[i].pixmaps = &d->pixmaps.rdisk_disabled; } else if ((t == RDISK_TYPE_ZIP_100) || (t == RDISK_TYPE_ZIP_250)) { - d->fdd[i].pixmaps = &d->pixmaps.zip; + d->rdisk[i].pixmaps = &d->pixmaps.zip; } else { - d->fdd[i].pixmaps = &d->pixmaps.rdisk; + d->rdisk[i].pixmaps = &d->pixmaps.rdisk; } d->rdisk[i].label = std::make_unique(); d->rdisk[i].setEmpty(QString(rdisk_drives[i].image_path).isEmpty());