From af8c63fcc2291a09d5f51c9c4f7ac358e16b1d77 Mon Sep 17 00:00:00 2001 From: mjbudd77 Date: Sun, 13 Dec 2020 14:51:04 -0500 Subject: [PATCH 1/5] Added a few standard icons to menu entries and buttons in Qt GUI. --- icons/power.png | Bin 0 -> 20887 bytes resources.qrc | 1 + src/drivers/Qt/ConsoleVideoConf.cpp | 5 +++++ src/drivers/Qt/ConsoleWindow.cpp | 31 +++++++++++++++++++++++----- src/drivers/Qt/ConsoleWindow.h | 1 + 5 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 icons/power.png diff --git a/icons/power.png b/icons/power.png new file mode 100644 index 0000000000000000000000000000000000000000..2429e9ed43557050419a22ea82a38bdb00d649b0 GIT binary patch literal 20887 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

YDCkW`XI+hI3{bwr|#) zdsfEw%_FYc)n(JVA)U;iRZgZ%T3%H`{z?Z+6`WXr!*j6jDC|30bL8X#N9QAl4to{{ z8O{Z?>C?-*Xq{;C5GrCwkZKgQI`jm{q$gfN%cPG{%dt|oeV2O|P+|$8{e4~Ie98;R zY@g+FNWVD2JFjv4!drLBPu=uGKd`TuUOj&M>BvX#TIS>T9N?M5J!bpoQE1PJ`D0|g z3H-~92My8CkRu9|YjA!*t{OU7%9Lq*MCm?NEez`#Unda=N}+RwF@`33v{B?%D6&Xb zJ2K-^Z>u;)Wkus7Rb?oh!G)a0XT)G3Mta6$@hQ7kDS||TZ)ie^3yyByNrzWCQ-Qns zM7LPBk0zywwR(8nY80ba)ZWw03|4FEFiii3?h>h4TG`KgZoPA6d(^RER5b~#$#SZu!k9z+b7Wl9X~O_#Fb6Sk2WJ0*^ZtmHXdDTSzVlrC5t z%+c$V+4vE$_(a6WYSn=t5PqFuzfR-NKzr33) zMvb)vW$kgUPRAaVQny5W8y}`oqT7%k(=MwKd@^{X_R6FMjL|1BiI8&gSHT+aA>x8U zVg}fx$kEX0MM7*CmJL;%5V$-q$X5&J>oX+Js}k%r^6W8(9@nIC>kwBDm0lEqoUCKf zYK6)Eaenfu34Zpr4RYh2SKLDOiaAloLtl=~TSTnHx#53ga^m0cp?WWej=|7Ry}Vmf zJmvBUGMmvWEHMf`n4~sU(l$sMe1xWPgisQLYXu5mOh(-#ydWrzAowI7+ov#ntkQVrks!F>h@r-gkE_a~$Ix|5!qg;)49Qdx6Jii! zVkljEljb&KSPtlSI>fMmHHUfc4cqvwcTdZfb6yqS;Hz#%j0cWKe&atp!?*V4EH{pR z_bj~REUc8oD0K1;fjX5PYJ;eZ(2Nx@X&2lOc)fmf^eu^C7`TFM0Cnmv8~*-vfb_Un*yW?r@Vy!wNm8{Ec$gLm<%FO_`a>j!w`ASk_&>B(s{ zp22XAPTr@iONccB6FLf#MNiv-?SU!c;iiwWK zT20lI)B%D_B1$9eyZ!Y#cqJXYFA=|pH5O}UsJ$?%B1N{yw%KF6@0P9n^esKPeD{xJ zCO>lDdHmWVk&k`p6n}N!9Q%(>;{1Bn_YHLgjbEnrC5WNhpF)XZdALkrH4x-SmGL&T++s@V=Wj@{a5Ka>=2dNnWhS0*zZC(~dmLsOr~mx@C+SV+!h~LF6Ro zpHuUWYkJ(YXB}_4SjncD*W~B=vACG=p+k{R-d*vjZyw~SgBlmk!s-b^4OLx|<>3{p zDfyA_>a}BO@EqrFH{5)g<(A9O=AAb_BpZ5H0gPPyaL33m{y#bR)9?SsBcJ{dr$F|2NzM* zEL0iR1ahm$Y$QZSFD~Az}(H<*;QkK#cR3X*1Mzz31caF<;!dv!i;`+<_a>unlcGvmG>I*Hz z=B=yY3~3Ws@$~Zl zCg#&(kSOEsn* z!(~%kxw|9R?E10Ym%J`EO!4^K{Tw)UC42Wp_8uJYoo5_R9gQ45;b0}uo!&$U4KyWM z9A+GH;3M7#I-O$mNlueJbH6aEtHhg|B-V|sXgA#)sWh{Rk=l8Ds8c|1?&B2sj@65PrSI+M3$d=h3`|J9;82o&!e;r^(vOkOq3p;rB_%rO?4-fCFdHSg4JI~B9 zzg)1iEQH2@7>vo1mRbVdk6LDK%~HNv_ND3fdbp5MrW+TM2x2uLPlIT;siGwe7!uxF=|E$h#?mT?q6ARYOm|3COwb4B>>(~*NG;mK#=>E~*W%#Ap5 zvgE|lfcd3JE*ofEma4x(>S#%Qxk-H$d=28z%2C)zx1;G7hHjoS*(?_yBFpn|8LT4pdRa6U4s)4RELlF}q%WU_Ct y3VL~Dq9d%IhS_PDnS^ftZ8F>c;y<)&^nU@c_vXccGo@Sr0000 fceux.png fceux1.png + icons/power.png diff --git a/src/drivers/Qt/ConsoleVideoConf.cpp b/src/drivers/Qt/ConsoleVideoConf.cpp index b2278421..8c82cf51 100644 --- a/src/drivers/Qt/ConsoleVideoConf.cpp +++ b/src/drivers/Qt/ConsoleVideoConf.cpp @@ -19,6 +19,9 @@ ConsoleVideoConfDialog_t::ConsoleVideoConfDialog_t(QWidget *parent) QHBoxLayout *hbox1; QLabel *lbl; QPushButton *button; + QStyle *style; + + style = this->style(); setWindowTitle( tr("Video Config") ); @@ -205,9 +208,11 @@ ConsoleVideoConfDialog_t::ConsoleVideoConfDialog_t(QWidget *parent) button = new QPushButton( tr("Apply") ); hbox1->addWidget( button ); connect(button, SIGNAL(clicked()), this, SLOT(applyChanges(void)) ); + button->setIcon( style->standardIcon( QStyle::SP_DialogApplyButton ) ); button = new QPushButton( tr("Close") ); hbox1->addWidget( button ); + button->setIcon( style->standardIcon( QStyle::SP_DialogCloseButton ) ); connect(button, SIGNAL(clicked()), this, SLOT(closeWindow(void)) ); main_vbox->addLayout( hbox1 ); diff --git a/src/drivers/Qt/ConsoleWindow.cpp b/src/drivers/Qt/ConsoleWindow.cpp index 68f8800f..29f99510 100644 --- a/src/drivers/Qt/ConsoleWindow.cpp +++ b/src/drivers/Qt/ConsoleWindow.cpp @@ -243,6 +243,9 @@ void consoleWin_t::createMainMenu(void) QMenu *subMenu; QActionGroup *group; int useNativeMenuBar; + QStyle *style; + + style = this->style(); // This is needed for menu bar to show up on MacOS g_config->getOption( "SDL.UseNativeMenuBar", &useNativeMenuBar ); @@ -257,6 +260,8 @@ void consoleWin_t::createMainMenu(void) openROM = new QAction(tr("Open ROM"), this); openROM->setShortcuts(QKeySequence::Open); openROM->setStatusTip(tr("Open ROM File")); + //openROM->setIcon( QIcon(":icons/rom.png") ); + openROM->setIcon( style->standardIcon( QStyle::SP_FileIcon ) ); connect(openROM, SIGNAL(triggered()), this, SLOT(openROMFile(void)) ); fileMenu->addAction(openROM); @@ -293,6 +298,7 @@ void consoleWin_t::createMainMenu(void) saveStateAct = new QAction(tr("Save State As"), this); //loadStateAct->setShortcut( QKeySequence(tr("Ctrl+N"))); saveStateAct->setStatusTip(tr("Save State As")); + saveStateAct->setIcon( style->standardIcon( QStyle::SP_DialogSaveButton ) ); connect(saveStateAct, SIGNAL(triggered()), this, SLOT(saveStateAs(void)) ); fileMenu->addAction(saveStateAct); @@ -364,6 +370,7 @@ void consoleWin_t::createMainMenu(void) scrShotAct = new QAction(tr("Screenshot"), this); scrShotAct->setShortcut( QKeySequence(tr("F12"))); scrShotAct->setStatusTip(tr("Screenshot")); + //scrShotAct->setIcon( QIcon(":icons/camera.png") ); connect(scrShotAct, SIGNAL(triggered()), this, SLOT(takeScreenShot())); fileMenu->addAction(scrShotAct); @@ -372,6 +379,7 @@ void consoleWin_t::createMainMenu(void) quitAct = new QAction(tr("Quit"), this); quitAct->setShortcut( QKeySequence(tr("Ctrl+Q"))); quitAct->setStatusTip(tr("Quit the Application")); + quitAct->setIcon( style->standardIcon( QStyle::SP_DialogCloseButton ) ); connect(quitAct, SIGNAL(triggered()), this, SLOT(closeApp())); fileMenu->addAction(quitAct); @@ -381,17 +389,19 @@ void consoleWin_t::createMainMenu(void) optMenu = menuBar()->addMenu(tr("Options")); // Options -> Input Config - gamePadConfig = new QAction(tr("Input Config"), this); - //gamePadConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); - gamePadConfig->setStatusTip(tr("Input Configure")); - connect(gamePadConfig, SIGNAL(triggered()), this, SLOT(openInputConfWin(void)) ); + inputConfig = new QAction(tr("Input Config"), this); + //inputConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); + inputConfig->setStatusTip(tr("Input Configure")); + //inputConfig->setIcon( QIcon(":icons/zapper.png") ); + connect(inputConfig, SIGNAL(triggered()), this, SLOT(openInputConfWin(void)) ); - optMenu->addAction(gamePadConfig); + optMenu->addAction(inputConfig); // Options -> GamePad Config gamePadConfig = new QAction(tr("GamePad Config"), this); //gamePadConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); gamePadConfig->setStatusTip(tr("GamePad Configure")); + //gamePadConfig->setIcon( QIcon(":icons/gamepad.png") ); connect(gamePadConfig, SIGNAL(triggered()), this, SLOT(openGamePadConfWin(void)) ); optMenu->addAction(gamePadConfig); @@ -400,6 +410,7 @@ void consoleWin_t::createMainMenu(void) gameSoundConfig = new QAction(tr("Sound Config"), this); //gameSoundConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); gameSoundConfig->setStatusTip(tr("Sound Configure")); + gameSoundConfig->setIcon( style->standardIcon( QStyle::SP_MediaVolume ) ); connect(gameSoundConfig, SIGNAL(triggered()), this, SLOT(openGameSndConfWin(void)) ); optMenu->addAction(gameSoundConfig); @@ -408,6 +419,7 @@ void consoleWin_t::createMainMenu(void) gameVideoConfig = new QAction(tr("Video Config"), this); //gameVideoConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); gameVideoConfig->setStatusTip(tr("Video Preferences")); + gameVideoConfig->setIcon( style->standardIcon( QStyle::SP_ComputerIcon ) ); connect(gameVideoConfig, SIGNAL(triggered()), this, SLOT(openGameVideoConfWin(void)) ); optMenu->addAction(gameVideoConfig); @@ -416,6 +428,7 @@ void consoleWin_t::createMainMenu(void) hotkeyConfig = new QAction(tr("Hotkey Config"), this); //hotkeyConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); hotkeyConfig->setStatusTip(tr("Hotkey Configure")); + //hotkeyConfig->setIcon( QIcon(":icons/keyboard.png") ); connect(hotkeyConfig, SIGNAL(triggered()), this, SLOT(openHotkeyConfWin(void)) ); optMenu->addAction(hotkeyConfig); @@ -468,6 +481,7 @@ void consoleWin_t::createMainMenu(void) fullscreen->setShortcut( QKeySequence(tr("Alt+Return"))); //fullscreen->setCheckable(true); fullscreen->setStatusTip(tr("Fullscreen")); + fullscreen->setIcon( style->standardIcon( QStyle::SP_TitleBarMaxButton ) ); connect(fullscreen, SIGNAL(triggered()), this, SLOT(toggleFullscreen(void)) ); optMenu->addAction(fullscreen); @@ -480,6 +494,7 @@ void consoleWin_t::createMainMenu(void) powerAct = new QAction(tr("Power"), this); //powerAct->setShortcut( QKeySequence(tr("Ctrl+P"))); powerAct->setStatusTip(tr("Power On Console")); + powerAct->setIcon( QIcon(":icons/power.png") ); connect(powerAct, SIGNAL(triggered()), this, SLOT(powerConsoleCB(void)) ); emuMenu->addAction(powerAct); @@ -504,6 +519,7 @@ void consoleWin_t::createMainMenu(void) pauseAct = new QAction(tr("Pause"), this); pauseAct->setShortcut( QKeySequence(tr("Pause"))); pauseAct->setStatusTip(tr("Pause Console")); + pauseAct->setIcon( style->standardIcon( QStyle::SP_MediaPause ) ); connect(pauseAct, SIGNAL(triggered()), this, SLOT(consolePause(void)) ); emuMenu->addAction(pauseAct); @@ -745,6 +761,7 @@ void consoleWin_t::createMainMenu(void) openMovAct = new QAction(tr("Play"), this); openMovAct->setShortcut( QKeySequence(tr("Shift+F7"))); openMovAct->setStatusTip(tr("Play Movie File")); + openMovAct->setIcon( style->standardIcon( QStyle::SP_MediaPlay ) ); connect(openMovAct, SIGNAL(triggered()), this, SLOT(openMovie(void)) ); movieMenu->addAction(openMovAct); @@ -753,6 +770,7 @@ void consoleWin_t::createMainMenu(void) stopMovAct = new QAction(tr("Stop"), this); //stopMovAct->setShortcut( QKeySequence(tr("Shift+F7"))); stopMovAct->setStatusTip(tr("Stop Movie Recording")); + stopMovAct->setIcon( style->standardIcon( QStyle::SP_MediaStop ) ); connect(stopMovAct, SIGNAL(triggered()), this, SLOT(stopMovie(void)) ); movieMenu->addAction(stopMovAct); @@ -782,6 +800,7 @@ void consoleWin_t::createMainMenu(void) // Help -> About FCEUX aboutAct = new QAction(tr("About FCEUX"), this); aboutAct->setStatusTip(tr("About FCEUX")); + aboutAct->setIcon( style->standardIcon( QStyle::SP_MessageBoxInformation ) ); connect(aboutAct, SIGNAL(triggered()), this, SLOT(aboutFCEUX(void)) ); helpMenu->addAction(aboutAct); @@ -789,6 +808,7 @@ void consoleWin_t::createMainMenu(void) // Help -> About Qt aboutActQt = new QAction(tr("About Qt"), this); aboutActQt->setStatusTip(tr("About Qt")); + aboutActQt->setIcon( style->standardIcon( QStyle::SP_TitleBarMenuButton ) ); connect(aboutActQt, SIGNAL(triggered()), this, SLOT(aboutQt(void)) ); helpMenu->addAction(aboutActQt); @@ -796,6 +816,7 @@ void consoleWin_t::createMainMenu(void) // Help -> Message Log msgLogAct = new QAction(tr("Message Log"), this); msgLogAct->setStatusTip(tr("Message Log")); + msgLogAct->setIcon( style->standardIcon( QStyle::SP_MessageBoxWarning ) ); connect(msgLogAct, SIGNAL(triggered()), this, SLOT(openMsgLogWin(void)) ); helpMenu->addAction(msgLogAct); diff --git a/src/drivers/Qt/ConsoleWindow.h b/src/drivers/Qt/ConsoleWindow.h index 9ba6b168..4acb75d9 100644 --- a/src/drivers/Qt/ConsoleWindow.h +++ b/src/drivers/Qt/ConsoleWindow.h @@ -107,6 +107,7 @@ class consoleWin_t : public QMainWindow QAction *loadLuaAct; QAction *scrShotAct; QAction *quitAct; + QAction *inputConfig; QAction *gamePadConfig; QAction *gameSoundConfig; QAction *gameVideoConfig; From 58624be83b67c8c9e8477a64f1040fa2194027be Mon Sep 17 00:00:00 2001 From: mjbudd77 Date: Sun, 13 Dec 2020 15:02:23 -0500 Subject: [PATCH 2/5] Added a few more icons to Qt GUI menu. --- icons/record.png | Bin 0 -> 9873 bytes resources.qrc | 1 + src/drivers/Qt/ConsoleWindow.cpp | 6 ++++++ 3 files changed, 7 insertions(+) create mode 100644 icons/record.png diff --git a/icons/record.png b/icons/record.png new file mode 100644 index 0000000000000000000000000000000000000000..d25752bfba230a01f649b8ade849a4c3f7da039f GIT binary patch literal 9873 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 DwWITX literal 0 HcmV?d00001 diff --git a/resources.qrc b/resources.qrc index ab4515d5..7a5b080f 100644 --- a/resources.qrc +++ b/resources.qrc @@ -3,5 +3,6 @@ fceux.png fceux1.png icons/power.png + icons/record.png diff --git a/src/drivers/Qt/ConsoleWindow.cpp b/src/drivers/Qt/ConsoleWindow.cpp index 29f99510..fbab841a 100644 --- a/src/drivers/Qt/ConsoleWindow.cpp +++ b/src/drivers/Qt/ConsoleWindow.cpp @@ -593,6 +593,7 @@ void consoleWin_t::createMainMenu(void) act = new QAction(tr("Speed Up"), this); act->setShortcut( QKeySequence(tr("="))); act->setStatusTip(tr("Speed Up")); + act->setIcon( style->standardIcon( QStyle::SP_MediaSeekForward ) ); connect(act, SIGNAL(triggered()), this, SLOT(emuSpeedUp(void)) ); subMenu->addAction(act); @@ -601,6 +602,7 @@ void consoleWin_t::createMainMenu(void) act = new QAction(tr("Slow Down"), this); act->setShortcut( QKeySequence(tr("-"))); act->setStatusTip(tr("Slow Down")); + act->setIcon( style->standardIcon( QStyle::SP_MediaSeekBackward ) ); connect(act, SIGNAL(triggered()), this, SLOT(emuSlowDown(void)) ); subMenu->addAction(act); @@ -611,6 +613,7 @@ void consoleWin_t::createMainMenu(void) act = new QAction(tr("Slowest"), this); //act->setShortcut( QKeySequence(tr("-"))); act->setStatusTip(tr("Slowest")); + act->setIcon( style->standardIcon( QStyle::SP_MediaSkipBackward ) ); connect(act, SIGNAL(triggered()), this, SLOT(emuSlowestSpd(void)) ); subMenu->addAction(act); @@ -619,6 +622,7 @@ void consoleWin_t::createMainMenu(void) act = new QAction(tr("Normal"), this); //act->setShortcut( QKeySequence(tr("-"))); act->setStatusTip(tr("Normal")); + act->setIcon( style->standardIcon( QStyle::SP_MediaPlay ) ); connect(act, SIGNAL(triggered()), this, SLOT(emuNormalSpd(void)) ); subMenu->addAction(act); @@ -627,6 +631,7 @@ void consoleWin_t::createMainMenu(void) act = new QAction(tr("Turbo"), this); //act->setShortcut( QKeySequence(tr("-"))); act->setStatusTip(tr("Turbo (Fastest)")); + act->setIcon( style->standardIcon( QStyle::SP_MediaSkipForward ) ); connect(act, SIGNAL(triggered()), this, SLOT(emuFastestSpd(void)) ); subMenu->addAction(act); @@ -781,6 +786,7 @@ void consoleWin_t::createMainMenu(void) recMovAct = new QAction(tr("Record"), this); recMovAct->setShortcut( QKeySequence(tr("Shift+F5"))); recMovAct->setStatusTip(tr("Record Movie")); + recMovAct->setIcon( QIcon(":icons/record.png") ); connect(recMovAct, SIGNAL(triggered()), this, SLOT(recordMovie(void)) ); movieMenu->addAction(recMovAct); From 380fc7291771530f0b6c38e8cb8081245c50c607 Mon Sep 17 00:00:00 2001 From: mjbudd77 Date: Sun, 13 Dec 2020 15:24:48 -0500 Subject: [PATCH 3/5] Added a few more menu icons to Qt gui. --- src/drivers/Qt/ConsoleWindow.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/drivers/Qt/ConsoleWindow.cpp b/src/drivers/Qt/ConsoleWindow.cpp index fbab841a..06522e9b 100644 --- a/src/drivers/Qt/ConsoleWindow.cpp +++ b/src/drivers/Qt/ConsoleWindow.cpp @@ -261,7 +261,8 @@ void consoleWin_t::createMainMenu(void) openROM->setShortcuts(QKeySequence::Open); openROM->setStatusTip(tr("Open ROM File")); //openROM->setIcon( QIcon(":icons/rom.png") ); - openROM->setIcon( style->standardIcon( QStyle::SP_FileIcon ) ); + //openROM->setIcon( style->standardIcon( QStyle::SP_FileIcon ) ); + openROM->setIcon( style->standardIcon( QStyle::SP_FileDialogStart ) ); connect(openROM, SIGNAL(triggered()), this, SLOT(openROMFile(void)) ); fileMenu->addAction(openROM); @@ -270,6 +271,7 @@ void consoleWin_t::createMainMenu(void) closeROM = new QAction(tr("Close ROM"), this); closeROM->setShortcut( QKeySequence(tr("Ctrl+C"))); closeROM->setStatusTip(tr("Close Loaded ROM")); + closeROM->setIcon( style->standardIcon( QStyle::SP_BrowserStop ) ); connect(closeROM, SIGNAL(triggered()), this, SLOT(closeROMCB(void)) ); fileMenu->addAction(closeROM); @@ -290,6 +292,7 @@ void consoleWin_t::createMainMenu(void) loadStateAct = new QAction(tr("Load State From"), this); //loadStateAct->setShortcut( QKeySequence(tr("Ctrl+N"))); loadStateAct->setStatusTip(tr("Load State From")); + loadStateAct->setIcon( style->standardIcon( QStyle::SP_FileDialogStart ) ); connect(loadStateAct, SIGNAL(triggered()), this, SLOT(loadStateFrom(void)) ); fileMenu->addAction(loadStateAct); @@ -503,6 +506,7 @@ void consoleWin_t::createMainMenu(void) resetAct = new QAction(tr("Reset"), this); //resetAct->setShortcut( QKeySequence(tr("Ctrl+R"))); resetAct->setStatusTip(tr("Reset Console")); + resetAct->setIcon( style->standardIcon( QStyle::SP_DialogResetButton ) ); connect(resetAct, SIGNAL(triggered()), this, SLOT(consoleHardReset(void)) ); emuMenu->addAction(resetAct); @@ -511,6 +515,7 @@ void consoleWin_t::createMainMenu(void) sresetAct = new QAction(tr("Soft Reset"), this); //sresetAct->setShortcut( QKeySequence(tr("Ctrl+R"))); sresetAct->setStatusTip(tr("Soft Reset of Console")); + sresetAct->setIcon( style->standardIcon( QStyle::SP_BrowserReload ) ); connect(sresetAct, SIGNAL(triggered()), this, SLOT(consoleSoftReset(void)) ); emuMenu->addAction(sresetAct); From 6f78a086d26184dcb4d6fbcb468200d69efd9666 Mon Sep 17 00:00:00 2001 From: mjbudd77 Date: Sun, 13 Dec 2020 17:48:51 -0500 Subject: [PATCH 4/5] Added more button icons to Qt gui game pad and palette config windows. --- src/drivers/Qt/GamePadConf.cpp | 10 ++++++++++ src/drivers/Qt/PaletteConf.cpp | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/src/drivers/Qt/GamePadConf.cpp b/src/drivers/Qt/GamePadConf.cpp index 1365ea32..835aeb2c 100644 --- a/src/drivers/Qt/GamePadConf.cpp +++ b/src/drivers/Qt/GamePadConf.cpp @@ -81,9 +81,12 @@ GamePadConfDialog_t::GamePadConfDialog_t(QWidget *parent) QPushButton *closebutton; QPushButton *clearButton[GAMEPAD_NUM_BUTTONS]; QScrollArea *scroll; + QStyle *style; std::string prefix; char stmp[256]; + style = this->style(); + gamePadConfWin = this; // Ensure that joysticks are enabled, no harm calling init again. @@ -174,10 +177,12 @@ GamePadConfDialog_t::GamePadConfDialog_t(QWidget *parent) applyProfileButton = new QPushButton( tr("Load") ); applyProfileButton->setWhatsThis(tr("Sets Current Active Map to the Selected Profile")); + applyProfileButton->setIcon( style->standardIcon( QStyle::SP_DialogApplyButton ) ); hbox->addWidget( applyProfileButton ); saveProfileButton = new QPushButton( tr("Save") ); saveProfileButton->setWhatsThis(tr("Stores Current Active Map to the Selected Profile")); + saveProfileButton->setIcon( style->standardIcon( QStyle::SP_DialogSaveButton ) ); hbox->addWidget( saveProfileButton ); hbox = new QHBoxLayout(); @@ -185,10 +190,12 @@ GamePadConfDialog_t::GamePadConfDialog_t(QWidget *parent) newProfileButton = new QPushButton( tr("New") ); newProfileButton->setWhatsThis(tr("Create a New Map Profile")); + newProfileButton->setIcon( style->standardIcon( QStyle::SP_FileIcon ) ); hbox->addWidget( newProfileButton ); removeProfileButton = new QPushButton( tr("Delete") ); removeProfileButton->setWhatsThis(tr("Deletes the Selected Map Profile")); + removeProfileButton->setIcon( style->standardIcon( QStyle::SP_TrashIcon ) ); hbox->addWidget( removeProfileButton ); mapMsg = new QLabel(); @@ -242,6 +249,9 @@ GamePadConfDialog_t::GamePadConfDialog_t(QWidget *parent) clearAllButton = new QPushButton(tr("Clear All")); closebutton = new QPushButton(tr("Close")); + clearAllButton->setIcon( style->standardIcon( QStyle::SP_LineEditClearButton ) ); + closebutton->setIcon( style->standardIcon( QStyle::SP_DialogCloseButton ) ); + hbox4->addWidget( clearAllButton ); hbox4->addWidget( closebutton ); diff --git a/src/drivers/Qt/PaletteConf.cpp b/src/drivers/Qt/PaletteConf.cpp index c8a6845c..7908aaab 100644 --- a/src/drivers/Qt/PaletteConf.cpp +++ b/src/drivers/Qt/PaletteConf.cpp @@ -32,10 +32,13 @@ PaletteConfDialog_t::PaletteConfDialog_t(QWidget *parent) //QPushButton *closebutton; QPushButton *button; QTextEdit *comments; + QStyle *style; int hue, tint; char stmp[64]; std::string paletteFile; + style = this->style(); + resize( 512, 600 ); // sync with config @@ -63,6 +66,7 @@ PaletteConfDialog_t::PaletteConfDialog_t(QWidget *parent) connect(deemphSwap, SIGNAL(stateChanged(int)), this, SLOT(deemphswap_Changed(int)) ); button = new QPushButton( tr("Open Palette") ); + button->setIcon( style->standardIcon( QStyle::SP_FileDialogStart ) ); hbox1->addWidget( button ); connect( button, SIGNAL(clicked(void)), this, SLOT(openPaletteFile(void)) ); @@ -81,6 +85,7 @@ PaletteConfDialog_t::PaletteConfDialog_t(QWidget *parent) button = new QPushButton( tr("Clear") ); + button->setIcon( style->standardIcon( QStyle::SP_LineEditClearButton ) ); hbox1->addWidget( button ); connect( button, SIGNAL(clicked(void)), this, SLOT(clearPalette(void)) ); From 2e4fae6de6a11c77da6f89164dd564de7cbcb8e5 Mon Sep 17 00:00:00 2001 From: mjbudd77 Date: Sun, 13 Dec 2020 21:45:39 -0500 Subject: [PATCH 5/5] Added more button and menu icons to Qt GUI. --- icons/application-exit.png | Bin 0 -> 1526 bytes icons/camera.png | Bin 0 -> 403 bytes icons/graphics-palette.png | Bin 0 -> 2428 bytes icons/input-gaming-symbolic.png | Bin 0 -> 464 bytes icons/input-gaming.png | Bin 0 -> 1441 bytes icons/input-keyboard.png | Bin 0 -> 235 bytes icons/media-record.png | Bin 0 -> 1142 bytes icons/movie.png | Bin 0 -> 1586 bytes icons/record.png | Bin 9873 -> 0 bytes icons/timer.png | Bin 0 -> 2212 bytes icons/view-fullscreen.png | Bin 0 -> 739 bytes resources.qrc | 11 ++++++++++- src/drivers/Qt/ConsoleWindow.cpp | 22 ++++++++++++++-------- 13 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 icons/application-exit.png create mode 100644 icons/camera.png create mode 100644 icons/graphics-palette.png create mode 100644 icons/input-gaming-symbolic.png create mode 100644 icons/input-gaming.png create mode 100644 icons/input-keyboard.png create mode 100644 icons/media-record.png create mode 100644 icons/movie.png delete mode 100644 icons/record.png create mode 100644 icons/timer.png create mode 100644 icons/view-fullscreen.png diff --git a/icons/application-exit.png b/icons/application-exit.png new file mode 100644 index 0000000000000000000000000000000000000000..9512d7e1ff217194a886171c1f80dcd2b0fb0aaa GIT binary patch literal 1526 zcmVyz!9sZ6G^d0%o;%>BN@ zx}|K}rgESP<^ntgGYalVpj^oF!1?&1Omal`SEzX z7)l{9Et7OQL%`?%*>}JD{VxEiaw6P9{^mEnm9uBh5|778rBY-v8S?kZ<#LFbriok| zE*EaYO(+oNbD#Sxg9i^rDFY3OW+IW`hd=tkM}Y4XB9SdA03aHT5(1A^qkT4k)QqB?S6Gh0YF75a28^J zxcsx95#P9qxz8F;aL#K8)xCgevqxdu);CJFAyATZ;J|^r^rbJQt*wotM~@-`q&;n0 zOd)96v4cxr`6ADH@dR8ok76~nVc)xgOh+vHemMapQ=t31zP_IE`Z9I5H2U zZIgHJa^Nj*VewN_D}|p+lKJe?Av3T;R@~J1nvna^u&(rgOszrY;#tcI09@wrsimDp`n3&`}Q$x*f0c^g0y9kN~dXh<|$H* z9SE9Fo}?I*2z+8LRys|_Cg&7TGzCkRERhtjb?esNQH)~T``$9gF}wVJULBDA(D z!gCi8stG~Y1&SdNyUF#7U1Z?5T0qe#$Twe(JMwKN`vRGUa;<03;$QxPbJ z&8nj3$`t~Szk}@67UBtE+kL z-~Z0;)17!m`tf91N$uT-Z^Cn!K4mZ|%X)d)IZ&(}o#Zl*Wbnwndw1{S_XqOVZc)vs z#~x$m7r(-e?|+?_EFMAn>Sav73)^F08fsL<0{V_+ZJJo7pF2;Q&ZLRO;zS}5c?LGj zc+b1IbNm=v_iW;^*;S;CYaGwlKu#H7uUtT%LKM%1RF7jDGk@(P6b#9(ScZ{wh&-1% z;jtfnpQpbb;ona_b=5L+4VG!IF~0Pre?61{O)LxQIndeFfl^RYTSHAvEmhGdUau!l zo&gl_KtMK^#hf&eFU1ot1{#4RU_Dd~2)tgecuGUVeR|?O)aFU6YsL_X3=lymLkStV zyn#Z>QKBJR`czUl$vBBC5}8?e^)vJW<@DzYPnC&%rbn$Fo^^%!$2S& zTY86G5p2YvbUKCpB`X_&d|to(r$7Dq^Uj|O=iX1Oav%|qTKTT%FGntL{+=s+6yyJc c?XZ&gA8?Oju}uBX2mk;807*qoM6N<$g8fb6od5s; literal 0 HcmV?d00001 diff --git a/icons/camera.png b/icons/camera.png new file mode 100644 index 0000000000000000000000000000000000000000..37075dc1c8f2c72cb24df954cd0a45785702f931 GIT binary patch literal 403 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 literal 0 HcmV?d00001 diff --git a/icons/input-keyboard.png b/icons/input-keyboard.png new file mode 100644 index 0000000000000000000000000000000000000000..631587b1e7f064c66c750ca6f58afec9d2233eb5 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmSQK*5Dp-y;YjHK@)vo!IEF;D zzMXcE_pkzwtGwjGooNe~{MHxP*cc1rE6~U{FW5SNQqiIhCXKh2dp`#l$pFe z4qmC9otorvcZOkv-oJ-y&OXl0do$s@n`cu%#)tVod5Sr`czfnP<|$|Vvu|a{oq)*> zM|qzKU6BeXY~Iaq%Wr>6NcoxgN^X@UyLj^y9A8H(C|;GdEI)YQpYk>(CLPTS|E8@! gaHqEW+}lcKL)&_vLn~*T2fCKQ)78&qol`;+064N*VgLXD literal 0 HcmV?d00001 diff --git a/icons/media-record.png b/icons/media-record.png new file mode 100644 index 0000000000000000000000000000000000000000..072ed7f905593a5e43f3a498a22a4ef24d2aaef2 GIT binary patch literal 1142 zcmV-+1d02JP)d#c2ny$Y6`kcmt0N@{m zS%6uzp9{h}IkvWCKUi8eGxD6BCEvQZ zeEhPN)g+D~SQ}LU{hY=KLfm&&R{OVmdpDl#)~%ytIl* zdNlF_198#M50!%lqo`j$kch_PAAB&9a~LAP`v-gb11Hkc+bV|+#RV@fs8+1Nl`p@< zIV@74`U5+(NR z303#*5W94Nf{3JaCsYz?skb*cHlM~&OtIOvwk;#=u~keSF3-QbJWq3br~sx2V7P;&WO;Z@nHwIXO8A2RnDJJQ^I_s?5lM zk`i;JT=f+qz8)6`2HWi8GmcRtCgP~Se=A=LV7?(wLaW;R{AGFcY%d}r4ef)Li0Xe4 zaD#jdw%MnpE~tsTfd2WK`_U3U;^&`#ac1)56Z_)gw0RB=jSRNg$7cZM z5!_7nNhXS-4?S4Al0BKQ_7||-v#F^m41k6CtJo~SEa0!;M{~rg)EWE)@Bjb+07*qo IM6N<$f?W9>Jpcdz literal 0 HcmV?d00001 diff --git a/icons/movie.png b/icons/movie.png new file mode 100644 index 0000000000000000000000000000000000000000..376ff3a593c2e97ba154cb7f94c600eeecf865ab GIT binary patch literal 1586 zcmV-22F>}2P)DA;f0n1NuHNCog$qrMjEq!%2b_Vk0D$*1@N^Az^<^@dp6)n95#|^dEn3uny-R>T z4Xh!1a0cc-FJNG_R3?|1VZ<*mE?%}^f`3%PIvQBR^^h}uUclIRvqGWpFcb=XFvqye zWEr#n&`|{qtRZ`F2IfC6U}O{)pAeH`Zf)ZKJKzkQ^$T~va93PH>?H%C@C@b{t!yp! zuk_t{p9a>DJvak%94hrvyCn2bwfZ3eZ3Dxz(XsM$jQ9mcW|h^G&EW^KX+0QB#K;S@3=E!Oj?r$lZGlh12`X4a_TUW6Ie|-+Q4n^+ z;?pGWCY2%=)hYD~jMUUl#bz8x5`E}8m74W917~ppm!HdFf9Yn}n_~})BYWa$#IUE) zxR$`sF&b6P7&&m@(JPOsU=7*B&ENzsRz!hUrXGakOoIKzTVV51;d}OOTvG_l8V~lVgCI0}GVIFV1a><{zm1&tUMi7!U8JtpwfqS|p>@EHqf^RMUDsmINQVL+?z=3Pzx2a$a z*;7*>F_!_UM`IZ0(qNL4rYYau(JtfN%og$I_^90!Uo~5t(z9 z0vtkD6`{mSwRrtu?e}NOLI?qcyntD0U5!0g^QhFU#~GwRQ2Jz$xHnV^aIm+(3Eqw4 zCEnEqFmm9)OHWFvU=7(*Q^5P#SP;9ZkpfCk;ApWYAwV>90_jDss9+7*Q&Yh8sTPRb zRO=L&;Mo-R7uwTL;MKcNR93CAE0{EWX7LhJvr)J`F}KP0X=!72!9MA3etpE9%`BVY*YV5A!eBU2><5R6oZ(23JH+Q$ zgMXS7*4}Fe%#}7Ea_7IVPXO0cDG;9!a}Fbixs}=OkOL30>m%iSdf|!y^-??m`8_+3 zJu!oTr;}jq^ME^5NQ|k)m z7#A&FurM<>?-UKJA$xEJ=E{raDTrCB=>A5zB_$DXx*!7ny>A2dmkeR^!~Wj{*yb2T zjKXx`(uLyR0cYSWPGFi}+c)2~#1{?~*4~meH`@byDxZ0yv~;$~6teLey1LGoW1PEa z?x?T>cT;F!4cUV;Fjt;{hah%|qWfEJO9G!wh7H$ygZYV;uw+j&81Ex^GtP-0%p0kx zGcO_{XfQ@>#JF(bj4rYRHy9dNL-vp}kQOa?Ep*nXY&3S@9~Zg_3h}RH??mNT2f+iq zjVdWa<~1Gm_dDw>r){s3o19MJ*{l{l%!_tdo kD2qCa*8dSdcV}t#A3N(iw6+KDJ^%m!07*qoM6N<$f}^nUe*gdg literal 0 HcmV?d00001 diff --git a/icons/record.png b/icons/record.png deleted file mode 100644 index d25752bfba230a01f649b8ade849a4c3f7da039f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9873 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 DwWITX diff --git a/icons/timer.png b/icons/timer.png new file mode 100644 index 0000000000000000000000000000000000000000..4e539e1fbd0adebc935563116e80ea7d14f300ab GIT binary patch literal 2212 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 Q6i_<#boFyt=akR{02;1wv;Y7A literal 0 HcmV?d00001 diff --git a/resources.qrc b/resources.qrc index 7a5b080f..58ea0097 100644 --- a/resources.qrc +++ b/resources.qrc @@ -3,6 +3,15 @@ fceux.png fceux1.png icons/power.png - icons/record.png + icons/media-record.png + icons/application-exit.png + icons/graphics-palette.png + icons/view-fullscreen.png + icons/input-keyboard.png + icons/input-gaming.png + icons/input-gaming-symbolic.png + icons/timer.png + icons/movie.png + icons/camera.png diff --git a/src/drivers/Qt/ConsoleWindow.cpp b/src/drivers/Qt/ConsoleWindow.cpp index 06522e9b..df1220ff 100644 --- a/src/drivers/Qt/ConsoleWindow.cpp +++ b/src/drivers/Qt/ConsoleWindow.cpp @@ -360,6 +360,7 @@ void consoleWin_t::createMainMenu(void) loadLuaAct = new QAction(tr("Load Lua Script"), this); //loadLuaAct->setShortcut( QKeySequence(tr("F5"))); loadLuaAct->setStatusTip(tr("Load Lua Script")); + //loadLuaAct->setIcon( QIcon(":icons/lua-logo.png") ); connect(loadLuaAct, SIGNAL(triggered()), this, SLOT(loadLua(void)) ); fileMenu->addAction(loadLuaAct); @@ -373,7 +374,7 @@ void consoleWin_t::createMainMenu(void) scrShotAct = new QAction(tr("Screenshot"), this); scrShotAct->setShortcut( QKeySequence(tr("F12"))); scrShotAct->setStatusTip(tr("Screenshot")); - //scrShotAct->setIcon( QIcon(":icons/camera.png") ); + scrShotAct->setIcon( QIcon(":icons/camera.png") ); connect(scrShotAct, SIGNAL(triggered()), this, SLOT(takeScreenShot())); fileMenu->addAction(scrShotAct); @@ -382,7 +383,8 @@ void consoleWin_t::createMainMenu(void) quitAct = new QAction(tr("Quit"), this); quitAct->setShortcut( QKeySequence(tr("Ctrl+Q"))); quitAct->setStatusTip(tr("Quit the Application")); - quitAct->setIcon( style->standardIcon( QStyle::SP_DialogCloseButton ) ); + //quitAct->setIcon( style->standardIcon( QStyle::SP_DialogCloseButton ) ); + quitAct->setIcon( QIcon(":icons/application-exit.png") ); connect(quitAct, SIGNAL(triggered()), this, SLOT(closeApp())); fileMenu->addAction(quitAct); @@ -395,7 +397,7 @@ void consoleWin_t::createMainMenu(void) inputConfig = new QAction(tr("Input Config"), this); //inputConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); inputConfig->setStatusTip(tr("Input Configure")); - //inputConfig->setIcon( QIcon(":icons/zapper.png") ); + inputConfig->setIcon( QIcon(":icons/input-gaming.png") ); connect(inputConfig, SIGNAL(triggered()), this, SLOT(openInputConfWin(void)) ); optMenu->addAction(inputConfig); @@ -404,7 +406,7 @@ void consoleWin_t::createMainMenu(void) gamePadConfig = new QAction(tr("GamePad Config"), this); //gamePadConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); gamePadConfig->setStatusTip(tr("GamePad Configure")); - //gamePadConfig->setIcon( QIcon(":icons/gamepad.png") ); + gamePadConfig->setIcon( QIcon(":icons/input-gaming-symbolic.png") ); connect(gamePadConfig, SIGNAL(triggered()), this, SLOT(openGamePadConfWin(void)) ); optMenu->addAction(gamePadConfig); @@ -431,7 +433,7 @@ void consoleWin_t::createMainMenu(void) hotkeyConfig = new QAction(tr("Hotkey Config"), this); //hotkeyConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); hotkeyConfig->setStatusTip(tr("Hotkey Configure")); - //hotkeyConfig->setIcon( QIcon(":icons/keyboard.png") ); + hotkeyConfig->setIcon( QIcon(":icons/input-keyboard.png") ); connect(hotkeyConfig, SIGNAL(triggered()), this, SLOT(openHotkeyConfWin(void)) ); optMenu->addAction(hotkeyConfig); @@ -440,6 +442,7 @@ void consoleWin_t::createMainMenu(void) paletteConfig = new QAction(tr("Palette Config"), this); //paletteConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); paletteConfig->setStatusTip(tr("Palette Configure")); + paletteConfig->setIcon( QIcon(":icons/graphics-palette.png") ); connect(paletteConfig, SIGNAL(triggered()), this, SLOT(openPaletteConfWin(void)) ); optMenu->addAction(paletteConfig); @@ -448,6 +451,7 @@ void consoleWin_t::createMainMenu(void) guiConfig = new QAction(tr("GUI Config"), this); //guiConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); guiConfig->setStatusTip(tr("GUI Configure")); + guiConfig->setIcon( style->standardIcon( QStyle::SP_TitleBarNormalButton ) ); connect(guiConfig, SIGNAL(triggered()), this, SLOT(openGuiConfWin(void)) ); optMenu->addAction(guiConfig); @@ -456,6 +460,7 @@ void consoleWin_t::createMainMenu(void) timingConfig = new QAction(tr("Timing Config"), this); //timingConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); timingConfig->setStatusTip(tr("Timing Configure")); + timingConfig->setIcon( QIcon(":icons/timer.png") ); connect(timingConfig, SIGNAL(triggered()), this, SLOT(openTimingConfWin(void)) ); optMenu->addAction(timingConfig); @@ -464,6 +469,7 @@ void consoleWin_t::createMainMenu(void) movieConfig = new QAction(tr("Movie Options"), this); //movieConfig->setShortcut( QKeySequence(tr("Ctrl+C"))); movieConfig->setStatusTip(tr("Movie Options")); + movieConfig->setIcon( QIcon(":icons/movie.png") ); connect(movieConfig, SIGNAL(triggered()), this, SLOT(openMovieOptWin(void)) ); optMenu->addAction(movieConfig); @@ -482,9 +488,9 @@ void consoleWin_t::createMainMenu(void) // Options -> Full Screen fullscreen = new QAction(tr("Fullscreen"), this); fullscreen->setShortcut( QKeySequence(tr("Alt+Return"))); - //fullscreen->setCheckable(true); fullscreen->setStatusTip(tr("Fullscreen")); - fullscreen->setIcon( style->standardIcon( QStyle::SP_TitleBarMaxButton ) ); + //fullscreen->setIcon( style->standardIcon( QStyle::SP_TitleBarMaxButton ) ); + fullscreen->setIcon( QIcon(":icons/view-fullscreen.png") ); connect(fullscreen, SIGNAL(triggered()), this, SLOT(toggleFullscreen(void)) ); optMenu->addAction(fullscreen); @@ -791,7 +797,7 @@ void consoleWin_t::createMainMenu(void) recMovAct = new QAction(tr("Record"), this); recMovAct->setShortcut( QKeySequence(tr("Shift+F5"))); recMovAct->setStatusTip(tr("Record Movie")); - recMovAct->setIcon( QIcon(":icons/record.png") ); + recMovAct->setIcon( QIcon(":icons/media-record.png") ); connect(recMovAct, SIGNAL(triggered()), this, SLOT(recordMovie(void)) ); movieMenu->addAction(recMovAct);