From e81564813df6742d34b77b78bc8874e8d27188e5 Mon Sep 17 00:00:00 2001 From: Dmugetsu Date: Sat, 15 Mar 2025 10:44:31 -0600 Subject: [PATCH] New icons and final Push to review --- src/images/fullscreen_icon.png | Bin 2722 -> 2590 bytes src/images/refreshlist_icon.png | Bin 0 -> 3247 bytes src/qt_gui/main_window.cpp | 29 +++++++++---- src/qt_gui/main_window_ui.h | 11 +++-- src/shadps4.qrc | 74 ++++++++++++++++---------------- 5 files changed, 65 insertions(+), 49 deletions(-) create mode 100644 src/images/refreshlist_icon.png diff --git a/src/images/fullscreen_icon.png b/src/images/fullscreen_icon.png index d8a6d3c554ef94f9cf5284aedf869b5b461760d2..719ffe4a19b842f711a4cd6be61fcbfb668b6ef1 100644 GIT binary patch delta 2395 zcmV-h38eO-6`mB3NG}e+000ia0czHX2><{97<5HgbW?9;ba!ELWdKlNX>N2bPDNB8 zH7+qOHvG}YuaS3BAHQ}10O$h%0Kawt0O$h%08n9RZgehAMN}X)E-@}Pk?2W(CE)x# zn{{Y_000QhNkl0lAirBGtS$jcj*cBBO8;Tcpv0Ml$f>$;W%Y_X^ zFBJ90-mh%CVi(sgiej%|uh>?_uJ1FM{LbY6P9~G&WKPNh50hE;pULD)PQFt!)zQ(B z!UFx*qVPEjN1L_cZ~0HO83uWO1G22#LGC0sl`G4|Wmy5Pir?io@?H6?d{TZQYs0$o za`~zJw}JjB?~*&qpqVAllk=tZLz?Jqa&;LTv*k0=+UchIx!hX@!{(AQ)!Ny%_@_Kd zP8_a`wg)4YZ0tbk9amPwJ>v%S&hMtUhR1_MHW22JP|RQlQor2>`RB-C5HWShw%%T>#^cB&1~WWqfo3CGDx zi$vCZ+RK;MfV2~lM#s__JkZoqUzHp6-VJk{ydm231}DdIlA9%eMZ%=vfNvo0mdWmE z0(FplM{?Y_is*f$i2Fh2X3_y!Lhd2=m0L?XgqD<{^v`pAT>C;$28%NSLXYEzlKvwy zG+uM}*%OdAWt?jddaNuH4*F^G18IFelx()rTd`{9{o?K+cxd z=eNP{n*PE?U)anG0= zZ93s{zE4utz9)Z{oKbav{ai@Wl(LCDK<*_uo-P>8vaO`i)`^cIi)?Dt4g4w@t zeHKzowFR1iT%%cNW?4f{<1@>mImCh+cx7Fn0YEqK`O)SKXtx_0*zGIJBG8-_+}x7f zD9fnV_+l-2eE*fRcoZB%Qr|}Zz1EWwBmHls{lk2YuUM*lSzZ4bye!AM>a z=g5zLqRnY8kuOD?`Dk-M=&8#a44@&Bl^qz!ahYV{fzxGal-WT=GqyE@m47RviMuFF zdtj7$a{mS;n@Vf79v6y-7BWk(FabVafY1ulCf%m|^NcmWp-Xetdr!?qXay1n0F6(eY^+*<3JSD(_meCM@ z)*rDL)wx82W?EB8P$UDwBO5HZLV{WYy-$|@47y!^jW+8C)2oCyV zMp1GHgw)ac!&n;OMv*5VuI0@cXFEuL9fJY6JE)$LJj}!eU6xG4+N$@?CeKZjE5u^$ z{wt(qQ!(*S9e!->aFwt04YT}%i#;U?0PEVGD7mUwR)Tu~k42*FANLG(9l-eC#~C+O z%V3Oxtco+8AD2b`FGUi%{w}S^x?Wm;bG6(?jw+_;Tngm|Zc(^TowYjnkgR=w1dQb4 zgR#s}ecQ{dqeCX%pHY-iXA}#h94sfKs0a-3_&Q4lSnYa=fjk{-L zEpwTB#~M&P%!GvBWB#2AP-%PpYX}jL-Qn+IR*;EH*?Io!dhOKpK*dD zlk+kPz0Pp6rLGVU79j2AIV4tprj;klvZN7|VLS}yBun8$aeZzmS3p=#k>V){JLP&13hPZ3e=%V4WEs%;ce%Lw=EOf&I#wvmP z6OSpib_BEZJk}jni{o*Bwbt)P9#Bvzw0&7S5=$R_sKbkj!j+L0jGrVG=*pqH*V>_2 zMzgSheNzI%4V-(1tC)&Sjuq(PGs}u0V`2)~s0T69E=7MnO$nsT>~tMqKdE0)&mgs> ztJ%t?2BG_VH|b@)lq|69c>GMjw#$utwwyReN>^WdTO=5+3gSe5pp$D<+1gYowu87b zlJM{r`s%HnZld!gg8*mAprPVO`_-u7J$03yRO%UHrM6XMS)*WpH*H=F_hEn?YoU92 z60=7L03+UlDg?y!Wa*BMj*^&~`VTofs1*sg@T>p; N002ovPDHLkV1lF1g3JH_ delta 2529 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 literal 0 HcmV?d00001 diff --git a/src/qt_gui/main_window.cpp b/src/qt_gui/main_window.cpp index 4bd6d88c2..b97e10954 100644 --- a/src/qt_gui/main_window.cpp +++ b/src/qt_gui/main_window.cpp @@ -196,17 +196,27 @@ void MainWindow::AddUiWidgets() { QHBoxLayout* buttonLayout = new QHBoxLayout(buttonGroup); buttonLayout->setSpacing(2); - buttonLayout->addWidget(createButtonWithLabel(ui->playButton, tr("Play"), showLabels)); - buttonLayout->addWidget(createButtonWithLabel(ui->pauseButton, tr("Pause"), showLabels)); - buttonLayout->addWidget(createButtonWithLabel(ui->stopButton, tr("Stop"), showLabels)); - buttonLayout->addWidget(createButtonWithLabel(ui->settingsButton, tr("Settings"), showLabels)); - buttonLayout->addWidget( - createButtonWithLabel(ui->fullscreenButton, tr("Full Screen"), showLabels)); - buttonLayout->addWidget( - createButtonWithLabel(ui->controllerButton, tr("Controllers"), showLabels)); - buttonLayout->addWidget(createButtonWithLabel(ui->keyboardButton, tr("Keyboard"), showLabels)); buttonLayout->addWidget( createButtonWithLabel(ui->refreshButton, tr("Refresh List"), showLabels)); + + buttonLayout->addWidget(createButtonWithLabel(ui->playButton, tr("Play"), showLabels)); + + buttonLayout->addWidget(createButtonWithLabel(ui->pauseButton, tr("Pause"), showLabels)); + + buttonLayout->addWidget(createButtonWithLabel(ui->stopButton, tr("Stop"), showLabels)); + + buttonLayout->addWidget(createButtonWithLabel(ui->restartButton, tr("Restart"), showLabels)); + + buttonLayout->addWidget(createButtonWithLabel(ui->settingsButton, tr("Settings"), showLabels)); + + buttonLayout->addWidget( + createButtonWithLabel(ui->fullscreenButton, tr("Full Screen"), showLabels)); + + buttonLayout->addWidget( + createButtonWithLabel(ui->controllerButton, tr("Controllers"), showLabels)); + + buttonLayout->addWidget(createButtonWithLabel(ui->keyboardButton, tr("Keyboard"), showLabels)); + if (showLabels) { QLabel* pauseButtonLabel = ui->pauseButton->parentWidget()->findChild(); if (pauseButtonLabel) @@ -1331,6 +1341,7 @@ void MainWindow::SetUiIcons(bool isWhite) { ui->pauseButton->setIcon(RecolorIcon(ui->pauseButton->icon(), isWhite)); ui->stopButton->setIcon(RecolorIcon(ui->stopButton->icon(), isWhite)); ui->refreshButton->setIcon(RecolorIcon(ui->refreshButton->icon(), isWhite)); + ui->restartButton->setIcon(RecolorIcon(ui->restartButton->icon(), isWhite)); ui->settingsButton->setIcon(RecolorIcon(ui->settingsButton->icon(), isWhite)); ui->fullscreenButton->setIcon(RecolorIcon(ui->fullscreenButton->icon(), isWhite)); ui->controllerButton->setIcon(RecolorIcon(ui->controllerButton->icon(), isWhite)); diff --git a/src/qt_gui/main_window_ui.h b/src/qt_gui/main_window_ui.h index 2cf3d0ae8..dda8c8de0 100644 --- a/src/qt_gui/main_window_ui.h +++ b/src/qt_gui/main_window_ui.h @@ -52,6 +52,7 @@ public: QPushButton* controllerButton; QPushButton* keyboardButton; QPushButton* fullscreenButton; + QPushButton* restartButton; QWidget* sizeSliderContainer; QHBoxLayout* sizeSliderContainer_layout; @@ -106,7 +107,7 @@ public: showGameListAct->setCheckable(true); refreshGameListAct = new QAction(MainWindow); refreshGameListAct->setObjectName("refreshGameListAct"); - refreshGameListAct->setIcon(QIcon(":images/refresh_icon.png")); + refreshGameListAct->setIcon(QIcon(":images/refreshlist_icon.png")); toggleLabelsAct = new QAction(MainWindow); toggleLabelsAct->setObjectName("toggleLabelsAct"); @@ -220,8 +221,8 @@ public: stopButton->setIconSize(QSize(40, 40)); refreshButton = new QPushButton(centralWidget); refreshButton->setFlat(true); - refreshButton->setIcon(QIcon(":images/refresh_icon.png")); - refreshButton->setIconSize(QSize(38, 38)); + refreshButton->setIcon(QIcon(":images/refreshlist_icon.png")); + refreshButton->setIconSize(QSize(40, 40)); fullscreenButton = new QPushButton(centralWidget); fullscreenButton->setFlat(true); fullscreenButton->setIcon(QIcon(":images/fullscreen_icon.png")); @@ -238,6 +239,10 @@ public: keyboardButton->setFlat(true); keyboardButton->setIcon(QIcon(":images/keyboard_icon.png")); keyboardButton->setIconSize(QSize(50, 50)); + restartButton = new QPushButton(centralWidget); + restartButton->setFlat(true); + restartButton->setIcon(QIcon(":images/refresh_icon.png")); + restartButton->setIconSize(QSize(40, 40)); sizeSliderContainer = new QWidget(centralWidget); sizeSliderContainer->setObjectName("sizeSliderContainer"); diff --git a/src/shadps4.qrc b/src/shadps4.qrc index c37e7d5de..73e201d3e 100644 --- a/src/shadps4.qrc +++ b/src/shadps4.qrc @@ -1,39 +1,39 @@ - - images/shadps4.ico - images/about_icon.png - images/dump_icon.png - images/play_icon.png - images/pause_icon.png - images/stop_icon.png - images/utils_icon.png - images/file_icon.png - images/trophy_icon.png - images/folder_icon.png - images/themes_icon.png - images/iconsize_icon.png - images/list_icon.png - images/grid_icon.png - images/exit_icon.png - images/settings_icon.png - images/controller_icon.png - images/refresh_icon.png - images/update_icon.png - images/list_mode_icon.png - images/flag_jp.png - images/flag_eu.png - images/flag_unk.png - images/flag_us.png - images/flag_world.png - images/flag_china.png - images/github.png - images/discord.png - images/ko-fi.png - images/youtube.png - images/website.png - images/ps4_controller.png - images/keyboard_icon.png - images/KBM.png - images/fullscreen_icon.png - + + images/shadps4.ico + images/about_icon.png + images/dump_icon.png + images/play_icon.png + images/pause_icon.png + images/stop_icon.png + images/utils_icon.png + images/file_icon.png + images/folder_icon.png + images/themes_icon.png + images/iconsize_icon.png + images/list_icon.png + images/grid_icon.png + images/exit_icon.png + images/settings_icon.png + images/controller_icon.png + images/refresh_icon.png + images/update_icon.png + images/list_mode_icon.png + images/flag_jp.png + images/flag_eu.png + images/flag_unk.png + images/flag_us.png + images/flag_world.png + images/flag_china.png + images/github.png + images/discord.png + images/ko-fi.png + images/youtube.png + images/website.png + images/ps4_controller.png + images/keyboard_icon.png + images/KBM.png + images/fullscreen_icon.png + images/refreshlist_icon.png +