diff --git a/rpcs3/Icons/cog_black.png b/rpcs3/Icons/cog_black.png deleted file mode 100644 index 960f1adc13..0000000000 Binary files a/rpcs3/Icons/cog_black.png and /dev/null differ diff --git a/rpcs3/Icons/cog_gray.png b/rpcs3/Icons/cog_gray.png deleted file mode 100644 index b9cf31f05e..0000000000 Binary files a/rpcs3/Icons/cog_gray.png and /dev/null differ diff --git a/rpcs3/Icons/configure.png b/rpcs3/Icons/configure.png index 8d6437a4a1..c023e773df 100644 Binary files a/rpcs3/Icons/configure.png and b/rpcs3/Icons/configure.png differ diff --git a/rpcs3/Icons/context.png b/rpcs3/Icons/context.png deleted file mode 100644 index 3555ce5c4e..0000000000 Binary files a/rpcs3/Icons/context.png and /dev/null differ diff --git a/rpcs3/Icons/controllers.png b/rpcs3/Icons/controllers.png index 78143ad8cd..03d7e5ac38 100644 Binary files a/rpcs3/Icons/controllers.png and b/rpcs3/Icons/controllers.png differ diff --git a/rpcs3/Icons/controls.png b/rpcs3/Icons/controls.png deleted file mode 100644 index 6af961cf3b..0000000000 Binary files a/rpcs3/Icons/controls.png and /dev/null differ diff --git a/rpcs3/Icons/custom_config.png b/rpcs3/Icons/custom_config.png new file mode 100644 index 0000000000..228b4dfbaa Binary files /dev/null and b/rpcs3/Icons/custom_config.png differ diff --git a/rpcs3/Icons/custom_config_2.png b/rpcs3/Icons/custom_config_2.png new file mode 100644 index 0000000000..b096f6a116 Binary files /dev/null and b/rpcs3/Icons/custom_config_2.png differ diff --git a/rpcs3/Icons/disc.png b/rpcs3/Icons/disc.png deleted file mode 100644 index b4e6ca2ea5..0000000000 Binary files a/rpcs3/Icons/disc.png and /dev/null differ diff --git a/rpcs3/Icons/exit_fullscreen.png b/rpcs3/Icons/exit_fullscreen.png new file mode 100644 index 0000000000..d2f5a46070 Binary files /dev/null and b/rpcs3/Icons/exit_fullscreen.png differ diff --git a/rpcs3/Icons/fullscreen.png b/rpcs3/Icons/fullscreen.png index 8572454053..f75326efa3 100644 Binary files a/rpcs3/Icons/fullscreen.png and b/rpcs3/Icons/fullscreen.png differ diff --git a/rpcs3/Icons/fullscreen_invert.png b/rpcs3/Icons/fullscreen_invert.png deleted file mode 100644 index b63c3e3521..0000000000 Binary files a/rpcs3/Icons/fullscreen_invert.png and /dev/null differ diff --git a/rpcs3/Icons/grid.png b/rpcs3/Icons/grid.png index df4925b1fe..128e32adf9 100644 Binary files a/rpcs3/Icons/grid.png and b/rpcs3/Icons/grid.png differ diff --git a/rpcs3/Icons/list.png b/rpcs3/Icons/list.png index 96f3a5669a..059afae886 100644 Binary files a/rpcs3/Icons/list.png and b/rpcs3/Icons/list.png differ diff --git a/rpcs3/Icons/open.png b/rpcs3/Icons/open.png new file mode 100644 index 0000000000..354171345a Binary files /dev/null and b/rpcs3/Icons/open.png differ diff --git a/rpcs3/Icons/pause.png b/rpcs3/Icons/pause.png index cb4d119374..e5a22b88ca 100644 Binary files a/rpcs3/Icons/pause.png and b/rpcs3/Icons/pause.png differ diff --git a/rpcs3/Icons/pause_blue.png b/rpcs3/Icons/pause_blue.png deleted file mode 100644 index 0c004aa232..0000000000 Binary files a/rpcs3/Icons/pause_blue.png and /dev/null differ diff --git a/rpcs3/Icons/play.png b/rpcs3/Icons/play.png index 359380bf95..8675cd3b69 100644 Binary files a/rpcs3/Icons/play.png and b/rpcs3/Icons/play.png differ diff --git a/rpcs3/Icons/play_blue.png b/rpcs3/Icons/play_blue.png deleted file mode 100644 index 62184e71d6..0000000000 Binary files a/rpcs3/Icons/play_blue.png and /dev/null differ diff --git a/rpcs3/Icons/refresh.png b/rpcs3/Icons/refresh.png index dac1903261..425e147ecc 100644 Binary files a/rpcs3/Icons/refresh.png and b/rpcs3/Icons/refresh.png differ diff --git a/rpcs3/Icons/restart.png b/rpcs3/Icons/restart.png index bf9f4e36c0..6c231205ef 100644 Binary files a/rpcs3/Icons/restart.png and b/rpcs3/Icons/restart.png differ diff --git a/rpcs3/Icons/restart_blue.png b/rpcs3/Icons/restart_blue.png deleted file mode 100644 index 725d683356..0000000000 Binary files a/rpcs3/Icons/restart_blue.png and /dev/null differ diff --git a/rpcs3/Icons/screenshot.png b/rpcs3/Icons/screenshot.png deleted file mode 100644 index 183bdd6b90..0000000000 Binary files a/rpcs3/Icons/screenshot.png and /dev/null differ diff --git a/rpcs3/Icons/separator.png b/rpcs3/Icons/separator.png deleted file mode 100644 index 6b1bef6b58..0000000000 Binary files a/rpcs3/Icons/separator.png and /dev/null differ diff --git a/rpcs3/Icons/sort.png b/rpcs3/Icons/sort.png deleted file mode 100644 index 92001514b3..0000000000 Binary files a/rpcs3/Icons/sort.png and /dev/null differ diff --git a/rpcs3/Icons/stop.png b/rpcs3/Icons/stop.png index 99deaaad98..e9ed61ea2c 100644 Binary files a/rpcs3/Icons/stop.png and b/rpcs3/Icons/stop.png differ diff --git a/rpcs3/Icons/stop_blue.png b/rpcs3/Icons/stop_blue.png deleted file mode 100644 index 6523830c7d..0000000000 Binary files a/rpcs3/Icons/stop_blue.png and /dev/null differ diff --git a/rpcs3/resources.qrc b/rpcs3/resources.qrc index bfc06c2dd9..3574e9ded1 100644 --- a/rpcs3/resources.qrc +++ b/rpcs3/resources.qrc @@ -8,24 +8,15 @@ Icons/controller.png Icons/insignia.png Icons/configure.png - Icons/context.png Icons/controllers.png - Icons/controls.png - Icons/disc.png Icons/fullscreen.png Icons/grid.png Icons/list.png Icons/refresh.png - Icons/screenshot.png - Icons/separator.png - Icons/sort.png - Icons/fullscreen_invert.png Json/tooltips.json - Icons/pause_blue.png - Icons/play_blue.png - Icons/restart_blue.png - Icons/stop_blue.png - Icons/cog_black.png - Icons/cog_gray.png + Icons/exit_fullscreen.png + Icons/open.png + Icons/custom_config.png + Icons/custom_config_2.png diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp index 6f5864cb3c..abd904e58b 100644 --- a/rpcs3/rpcs3qt/game_list_frame.cpp +++ b/rpcs3/rpcs3qt/game_list_frame.cpp @@ -925,7 +925,7 @@ QPixmap game_list_frame::PaintedPixmap(const QImage& img, bool paintConfigIcon) { int width = m_Icon_Size.width() * 0.2; QPoint origin = QPoint(m_Icon_Size.width() - width, 0); - painter.drawImage(origin, QImage(":/Icons/cog_gray.png").scaled(QSize(width, width), Qt::KeepAspectRatio, Qt::TransformationMode::SmoothTransformation)); + painter.drawImage(origin, QImage(":/Icons/custom_config_2.png").scaled(QSize(width, width), Qt::KeepAspectRatio, Qt::TransformationMode::SmoothTransformation)); } painter.end(); @@ -952,7 +952,7 @@ void game_list_frame::ShowCustomConfigIcon(QTableWidgetItem* item, bool enabled) } else if (enabled) { - m_gameList->item(item->row(), gui::column_name)->setIcon(QIcon(":/Icons/cog_black.png")); + m_gameList->item(item->row(), gui::column_name)->setIcon(QIcon(":/Icons/custom_config.png")); } else { @@ -1150,7 +1150,7 @@ int game_list_frame::PopulateGameList() custom_table_widget_item* title_item = new custom_table_widget_item(game->info.name); if (game->hasCustomConfig) { - title_item->setIcon(QIcon(":/Icons/cog_black.png")); + title_item->setIcon(QIcon(":/Icons/custom_config.png")); } // Serial diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index 902efb894c..63edcd3a63 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -701,7 +701,7 @@ void main_window::RepaintThumbnailIcons() auto icon = [&newColor](const QString& path) { - return gui::utils::get_colorized_icon(QPixmap::fromImage(gui::utils::get_opaque_image_area(path)), gui::mw_tool_icon_color, newColor); + return gui::utils::get_colorized_icon(QPixmap::fromImage(gui::utils::get_opaque_image_area(path)), Qt::black, newColor); }; #ifdef _WIN32 @@ -733,7 +733,7 @@ void main_window::RepaintToolBarIcons() auto icon = [&newColor](const QString& path) { - return gui::utils::get_colorized_icon(QIcon(path), gui::mw_tool_icon_color, newColor); + return gui::utils::get_colorized_icon(QIcon(path), Qt::black, newColor); }; m_icon_play = icon(":/Icons/play.png"); @@ -741,16 +741,14 @@ void main_window::RepaintToolBarIcons() m_icon_stop = icon(":/Icons/stop.png"); m_icon_restart = icon(":/Icons/restart.png"); m_icon_fullscreen_on = icon(":/Icons/fullscreen.png"); - m_icon_fullscreen_off = icon(":/Icons/fullscreen_invert.png"); + m_icon_fullscreen_off = icon(":/Icons/exit_fullscreen.png"); ui->toolbar_config ->setIcon(icon(":/Icons/configure.png")); ui->toolbar_controls->setIcon(icon(":/Icons/controllers.png")); - ui->toolbar_disc ->setIcon(icon(":/Icons/disc.png")); + ui->toolbar_open ->setIcon(icon(":/Icons/open.png")); ui->toolbar_grid ->setIcon(icon(":/Icons/grid.png")); ui->toolbar_list ->setIcon(icon(":/Icons/list.png")); ui->toolbar_refresh ->setIcon(icon(":/Icons/refresh.png")); - ui->toolbar_snap ->setIcon(icon(":/Icons/screenshot.png")); - ui->toolbar_sort ->setIcon(icon(":/Icons/sort.png")); ui->toolbar_stop ->setIcon(icon(":/Icons/stop.png")); if (Emu.IsRunning()) @@ -1382,7 +1380,7 @@ void main_window::CreateConnects() m_categoryVisibleActGroup->setEnabled(m_is_list_mode); }); - connect(ui->toolbar_disc, &QAction::triggered, this, &main_window::BootGame); + connect(ui->toolbar_open, &QAction::triggered, this, &main_window::BootGame); connect(ui->toolbar_refresh, &QAction::triggered, [=]() { m_gameListFrame->Refresh(true); }); connect(ui->toolbar_stop, &QAction::triggered, [=]() { Emu.Stop(); }); connect(ui->toolbar_start, &QAction::triggered, this, &main_window::OnPlayOrPause); diff --git a/rpcs3/rpcs3qt/main_window.ui b/rpcs3/rpcs3qt/main_window.ui index ec047b9d51..b1cfec4023 100644 --- a/rpcs3/rpcs3qt/main_window.ui +++ b/rpcs3/rpcs3qt/main_window.ui @@ -324,17 +324,15 @@ false - + - - @@ -808,7 +806,7 @@ - :/Icons/controls.png:/Icons/controls.png + :/Icons/controllers.png:/Icons/controllers.png Pads @@ -817,27 +815,6 @@ Configure controls - - - false - - - - :/Icons/screenshot.png:/Icons/screenshot.png - - - snap - - - Capture frame - - - false - - - true - - @@ -874,27 +851,6 @@ Switch to grid mode - - - false - - - - :/Icons/sort.png:/Icons/sort.png - - - sort - - - Sort options - - - false - - - true - - @@ -907,13 +863,13 @@ Refresh gamelist - + - :/Icons/disc.png:/Icons/disc.png + :/Icons/open.png:/Icons/open.png - Disc + Open Boot game