Qt: update toolbar icons

rpcs3/resources.qrc

@@ -8,24 +8,15 @@
         <file>Icons/controller.png</file>
         <file>Icons/insignia.png</file>
         <file>Icons/configure.png</file>
-        <file>Icons/context.png</file>
         <file>Icons/controllers.png</file>
-        <file>Icons/controls.png</file>
-        <file>Icons/disc.png</file>
         <file>Icons/fullscreen.png</file>
         <file>Icons/grid.png</file>
         <file>Icons/list.png</file>
         <file>Icons/refresh.png</file>
-        <file>Icons/screenshot.png</file>
-        <file>Icons/separator.png</file>
-        <file>Icons/sort.png</file>
-        <file>Icons/fullscreen_invert.png</file>
         <file>Json/tooltips.json</file>
-        <file>Icons/pause_blue.png</file>
+        <file>Icons/exit_fullscreen.png</file>
-        <file>Icons/play_blue.png</file>
+        <file>Icons/open.png</file>
-        <file>Icons/restart_blue.png</file>
+        <file>Icons/custom_config.png</file>
-        <file>Icons/stop_blue.png</file>
+        <file>Icons/custom_config_2.png</file>
-        <file>Icons/cog_black.png</file>
-        <file>Icons/cog_gray.png</file>
     </qresource>
 </RCC>

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

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);

rpcs3/rpcs3qt/main_window.ui

@@ -324,17 +324,15 @@
    <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
-   <addaction name="toolbar_disc"/>
+   <addaction name="toolbar_open"/>
    <addaction name="toolbar_refresh"/>
    <addaction name="toolbar_fullscreen"/>
-   <addaction name="toolbar_snap"/>
    <addaction name="toolbar_stop"/>
    <addaction name="toolbar_start"/>
    <addaction name="toolbar_config"/>
    <addaction name="toolbar_controls"/>
    <addaction name="toolbar_list"/>
    <addaction name="toolbar_grid"/>
-   <addaction name="toolbar_sort"/>
   </widget>
   <action name="bootElfAct">
    <property name="text">
@@ -808,7 +806,7 @@
   <action name="toolbar_controls">
    <property name="icon">
     <iconset resource="../resources.qrc">
-     <normaloff>:/Icons/controls.png</normaloff>:/Icons/controls.png</iconset>
+     <normaloff>:/Icons/controllers.png</normaloff>:/Icons/controllers.png</iconset>
    </property>
    <property name="text">
     <string>Pads</string>
@@ -817,27 +815,6 @@
     <string>Configure controls</string>
    </property>
   </action>
-  <action name="toolbar_snap">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="icon">
-    <iconset resource="../resources.qrc">
-     <normaloff>:/Icons/screenshot.png</normaloff>:/Icons/screenshot.png</iconset>
-   </property>
-   <property name="text">
-    <string>snap</string>
-   </property>
-   <property name="toolTip">
-    <string>Capture frame</string>
-   </property>
-   <property name="visible">
-    <bool>false</bool>
-   </property>
-   <property name="iconVisibleInMenu">
-    <bool>true</bool>
-   </property>
-  </action>
   <action name="toolbar_fullscreen">
    <property name="icon">
     <iconset resource="../resources.qrc">
@@ -874,27 +851,6 @@
     <string>Switch to grid mode</string>
    </property>
   </action>
-  <action name="toolbar_sort">
-   <property name="enabled">
-    <bool>false</bool>
-   </property>
-   <property name="icon">
-    <iconset resource="../resources.qrc">
-     <normaloff>:/Icons/sort.png</normaloff>:/Icons/sort.png</iconset>
-   </property>
-   <property name="text">
-    <string>sort</string>
-   </property>
-   <property name="toolTip">
-    <string>Sort options</string>
-   </property>
-   <property name="visible">
-    <bool>false</bool>
-   </property>
-   <property name="iconVisibleInMenu">
-    <bool>true</bool>
-   </property>
-  </action>
   <action name="toolbar_refresh">
    <property name="icon">
     <iconset resource="../resources.qrc">
@@ -907,13 +863,13 @@
     <string>Refresh gamelist</string>
    </property>
   </action>
-  <action name="toolbar_disc">
+  <action name="toolbar_open">
    <property name="icon">
     <iconset resource="../resources.qrc">
-     <normaloff>:/Icons/disc.png</normaloff>:/Icons/disc.png</iconset>
+     <normaloff>:/Icons/open.png</normaloff>:/Icons/open.png</iconset>
    </property>
    <property name="text">
-    <string>Disc</string>
+    <string>Open</string>
    </property>
    <property name="toolTip">
     <string>Boot game</string>