Qt: Disambiguate toolbar and menu bar items

pcsx2-qt/MainWindow.cpp

@@ -293,7 +293,6 @@ void MainWindow::connectSignals()
 	connect(m_ui.actionStartFile, &QAction::triggered, this, &MainWindow::onStartFileActionTriggered);
 	connect(m_ui.actionStartDisc, &QAction::triggered, this, &MainWindow::onStartDiscActionTriggered);
 	connect(m_ui.actionStartBios, &QAction::triggered, this, &MainWindow::onStartBIOSActionTriggered);
-	connect(m_ui.actionChangeDisc, &QAction::triggered, [this] { m_ui.menuChangeDisc->exec(QCursor::pos()); });
 	connect(m_ui.actionChangeDiscFromFile, &QAction::triggered, this, &MainWindow::onChangeDiscFromFileActionTriggered);
 	connect(m_ui.actionChangeDiscFromDevice, &QAction::triggered, this, &MainWindow::onChangeDiscFromDeviceActionTriggered);
 	connect(m_ui.actionChangeDiscFromGameList, &QAction::triggered, this, &MainWindow::onChangeDiscFromGameListActionTriggered);
@@ -302,14 +301,22 @@ void MainWindow::connectSignals()
 	connect(m_ui.menuChangeDisc, &QMenu::aboutToHide, this, &MainWindow::onChangeDiscMenuAboutToHide);
 	connect(m_ui.actionPowerOff, &QAction::triggered, this, [this]() { requestShutdown(true, true, EmuConfig.SaveStateOnShutdown); });
 	connect(m_ui.actionPowerOffWithoutSaving, &QAction::triggered, this, [this]() { requestShutdown(false, false, false); });
-	connect(m_ui.actionLoadState, &QAction::triggered, this, [this]() { m_ui.menuLoadState->exec(QCursor::pos()); });
-	connect(m_ui.actionSaveState, &QAction::triggered, this, [this]() { m_ui.menuSaveState->exec(QCursor::pos()); });
+	connect(m_ui.actionToolbarStartFile, &QAction::triggered, this, &MainWindow::onStartFileActionTriggered);
+	connect(m_ui.actionToolbarStartDisc, &QAction::triggered, this, &MainWindow::onStartDiscActionTriggered);
+	connect(m_ui.actionToolbarStartBios, &QAction::triggered, this, &MainWindow::onStartBIOSActionTriggered);
+	connect(m_ui.actionToolbarChangeDisc, &QAction::triggered, [this] { m_ui.menuChangeDisc->exec(QCursor::pos()); });
+	connect(m_ui.actionToolbarPowerOff, &QAction::triggered, this, [this]() { requestShutdown(true, true, EmuConfig.SaveStateOnShutdown); });
+	connect(m_ui.actionToolbarLoadState, &QAction::triggered, this, [this]() { m_ui.menuLoadState->exec(QCursor::pos()); });
+	connect(m_ui.actionToolbarSaveState, &QAction::triggered, this, [this]() { m_ui.menuSaveState->exec(QCursor::pos()); });
+	connect(m_ui.actionToolbarSettings, &QAction::triggered, this, &MainWindow::onSettingsTriggeredFromToolbar);
+	connect(m_ui.actionToolbarControllerSettings, &QAction::triggered,
+		[this]() { doControllerSettings(ControllerSettingsDialog::Category::GlobalSettings); });
+	connect(m_ui.actionToolbarScreenshot, &QAction::triggered, this, &MainWindow::onScreenshotActionTriggered);
 	connect(m_ui.actionExit, &QAction::triggered, this, &MainWindow::close);
 	connect(m_ui.actionScreenshot, &QAction::triggered, this, &MainWindow::onScreenshotActionTriggered);
 	connect(m_ui.menuLoadState, &QMenu::aboutToShow, this, &MainWindow::onLoadStateMenuAboutToShow);
 	connect(m_ui.menuSaveState, &QMenu::aboutToShow, this, &MainWindow::onSaveStateMenuAboutToShow);
 	connect(m_ui.actionSettings, &QAction::triggered, [this]() { doSettings(); });
-	connect(m_ui.actionSettings2, &QAction::triggered, this, &MainWindow::onSettingsTriggeredFromToolbar);
 	connect(m_ui.actionInterfaceSettings, &QAction::triggered, [this]() { doSettings("Interface"); });
 	connect(m_ui.actionGameListSettings, &QAction::triggered, [this]() { doSettings("Game List"); });
 	connect(m_ui.actionEmulationSettings, &QAction::triggered, [this]() { doSettings("Emulation"); });
@@ -402,7 +409,7 @@ void MainWindow::connectSignals()
 void MainWindow::connectVMThreadSignals(EmuThread* thread)
 {
 	connect(m_ui.actionStartFullscreenUI, &QAction::triggered, thread, &EmuThread::startFullscreenUI);
-	connect(m_ui.actionStartFullscreenUI2, &QAction::triggered, thread, &EmuThread::startFullscreenUI);
+	connect(m_ui.actionToolbarStartFullscreenUI, &QAction::triggered, thread, &EmuThread::startFullscreenUI);
 	connect(thread, &EmuThread::messageConfirmed, this, &MainWindow::confirmMessage, Qt::BlockingQueuedConnection);
 	connect(thread, &EmuThread::onAcquireRenderWindowRequested, this, &MainWindow::acquireRenderWindow, Qt::BlockingQueuedConnection);
 	connect(thread, &EmuThread::onReleaseRenderWindowRequested, this, &MainWindow::releaseRenderWindow, Qt::BlockingQueuedConnection);
@@ -418,6 +425,9 @@ void MainWindow::connectVMThreadSignals(EmuThread* thread)
 	connect(m_ui.actionReset, &QAction::triggered, thread, &EmuThread::resetVM);
 	connect(m_ui.actionPause, &QAction::toggled, thread, &EmuThread::setVMPaused);
 	connect(m_ui.actionFullscreen, &QAction::triggered, thread, &EmuThread::toggleFullscreen);
+	connect(m_ui.actionToolbarReset, &QAction::triggered, thread, &EmuThread::resetVM);
+	connect(m_ui.actionToolbarPause, &QAction::toggled, thread, &EmuThread::setVMPaused);
+	connect(m_ui.actionToolbarFullscreen, &QAction::triggered, thread, &EmuThread::toggleFullscreen);
 	connect(m_ui.actionToggleSoftwareRendering, &QAction::triggered, thread, &EmuThread::toggleSoftwareRendering);
 	connect(m_ui.actionDebugger, &QAction::triggered, this, &MainWindow::openDebugger);
 	connect(m_ui.actionReloadPatches, &QAction::triggered, thread, &EmuThread::reloadPatches);
@@ -672,18 +682,25 @@ void MainWindow::updateEmulationActions(bool starting, bool running, bool stoppi
 	m_ui.actionStartFile->setDisabled(starting_or_running || stopping);
 	m_ui.actionStartDisc->setDisabled(starting_or_running || stopping);
 	m_ui.actionStartBios->setDisabled(starting_or_running || stopping);
+	m_ui.actionToolbarStartFile->setDisabled(starting_or_running || stopping);
+	m_ui.actionToolbarStartDisc->setDisabled(starting_or_running || stopping);
+	m_ui.actionToolbarStartBios->setDisabled(starting_or_running || stopping);
 
 	m_ui.actionPowerOff->setEnabled(running);
 	m_ui.actionPowerOffWithoutSaving->setEnabled(running);
 	m_ui.actionReset->setEnabled(running);
 	m_ui.actionPause->setEnabled(running);
-	m_ui.actionChangeDisc->setEnabled(running);
 	m_ui.actionScreenshot->setEnabled(running);
 	m_ui.menuChangeDisc->setEnabled(running);
-
-	m_ui.actionSaveState->setEnabled(running);
 	m_ui.menuSaveState->setEnabled(running);
 
+	m_ui.actionToolbarPowerOff->setEnabled(running);
+	m_ui.actionToolbarReset->setEnabled(running);
+	m_ui.actionToolbarPause->setEnabled(running);
+	m_ui.actionToolbarScreenshot->setEnabled(running);
+	m_ui.actionToolbarChangeDisc->setEnabled(running);
+	m_ui.actionToolbarSaveState->setEnabled(running);
+
 	m_ui.actionViewGameProperties->setEnabled(running);
 
 	m_ui.actionToolsVideoCapture->setEnabled(running);
@@ -697,8 +714,15 @@ void MainWindow::updateEmulationActions(bool starting, bool running, bool stoppi
 
 	if (!starting && !running)
 	{
-		QSignalBlocker sb(m_ui.actionPause);
-		m_ui.actionPause->setChecked(false);
+		{
+			QSignalBlocker sb(m_ui.actionPause);
+			m_ui.actionPause->setChecked(false);
+		}
+
+		{
+			QSignalBlocker sb(m_ui.actionToolbarPause);
+			m_ui.actionToolbarPause->setChecked(false);
+		}
 	}
 
 	// scanning needs to be disabled while running
@@ -712,11 +736,17 @@ void MainWindow::updateDisplayRelatedActions(bool has_surface, bool render_to_ma
 	m_ui.actionViewSystemDisplay->setEnabled((has_surface && render_to_main) || (!has_surface && MTGS::IsOpen()));
 	m_ui.menuWindowSize->setEnabled(has_surface && !fullscreen);
 	m_ui.actionFullscreen->setEnabled(has_surface);
+	m_ui.actionToolbarFullscreen->setEnabled(has_surface);
 
 	{
 		QSignalBlocker blocker(m_ui.actionFullscreen);
 		m_ui.actionFullscreen->setChecked(fullscreen);
 	}
+
+	{
+		QSignalBlocker blocker(m_ui.actionToolbarFullscreen);
+		m_ui.actionToolbarFullscreen->setChecked(fullscreen);
+	}
 }
 
 void MainWindow::updateStatusBarWidgetVisibility()
@@ -1423,6 +1453,7 @@ void MainWindow::onInputRecNewActionTriggered()
 						m_ui.actionInputRecNew->setEnabled(false);
 						m_ui.actionInputRecStop->setEnabled(true);
 						m_ui.actionReset->setEnabled(!g_InputRecording.isTypeSavestate());
+						m_ui.actionToolbarReset->setEnabled(!g_InputRecording.isTypeSavestate());
 					});
 				}
 			});
@@ -1475,6 +1506,7 @@ void MainWindow::onInputRecPlayActionTriggered()
 					m_ui.actionInputRecNew->setEnabled(false);
 					m_ui.actionInputRecStop->setEnabled(true);
 					m_ui.actionReset->setEnabled(!g_InputRecording.isTypeSavestate());
+					m_ui.actionToolbarReset->setEnabled(!g_InputRecording.isTypeSavestate());
 				});
 			}
 		});
@@ -1491,6 +1523,7 @@ void MainWindow::onInputRecStopActionTriggered()
 				m_ui.actionInputRecNew->setEnabled(true);
 				m_ui.actionInputRecStop->setEnabled(false);
 				m_ui.actionReset->setEnabled(true);
+				m_ui.actionToolbarReset->setEnabled(true);
 			});
 		});
 	}
@@ -1554,6 +1587,10 @@ void MainWindow::onVMPaused()
 		QSignalBlocker sb(m_ui.actionPause);
 		m_ui.actionPause->setChecked(true);
 	}
+	{
+		QSignalBlocker sb(m_ui.actionToolbarPause);
+		m_ui.actionToolbarPause->setChecked(true);
+	}
 
 	s_vm_paused = true;
 	updateWindowTitle();
@@ -1571,6 +1608,10 @@ void MainWindow::onVMResumed()
 		QSignalBlocker sb(m_ui.actionPause);
 		m_ui.actionPause->setChecked(false);
 	}
+	{
+		QSignalBlocker sb(m_ui.actionToolbarPause);
+		m_ui.actionToolbarPause->setChecked(false);
+	}
 
 	s_vm_paused = false;
 	m_was_disc_change_request = false;
@@ -1832,7 +1873,7 @@ std::optional<WindowInfo> MainWindow::acquireRenderWindow(bool recreate_window,
 	updateWindowState();
 
 	m_ui.actionStartFullscreenUI->setEnabled(false);
-	m_ui.actionStartFullscreenUI2->setEnabled(false);
+	m_ui.actionToolbarStartFullscreenUI->setEnabled(false);
 
 	updateDisplayWidgetCursor();
 	m_display_widget->setFocus();
@@ -1952,7 +1993,7 @@ void MainWindow::releaseRenderWindow()
 	m_ui.actionViewSystemDisplay->setEnabled(false);
 	m_ui.actionFullscreen->setEnabled(false);
 	m_ui.actionStartFullscreenUI->setEnabled(true);
-	m_ui.actionStartFullscreenUI2->setEnabled(true);
+	m_ui.actionToolbarStartFullscreenUI->setEnabled(true);
 }
 
 void MainWindow::destroyDisplayWidget(bool show_game_list)
@@ -2432,9 +2473,9 @@ void MainWindow::updateSaveStateMenusEnableState(bool enable)
 	const bool load_enabled = enable;
 	const bool save_enabled = enable && s_vm_valid;
 	m_ui.menuLoadState->setEnabled(load_enabled);
-	m_ui.actionLoadState->setEnabled(load_enabled);
+	m_ui.actionToolbarLoadState->setEnabled(load_enabled);
 	m_ui.menuSaveState->setEnabled(save_enabled);
-	m_ui.actionSaveState->setEnabled(save_enabled);
+	m_ui.actionToolbarSaveState->setEnabled(save_enabled);
 }
 
 void MainWindow::doStartFile(std::optional<CDVD_SourceType> source, const QString& path)

pcsx2-qt/MainWindow.ui

@@ -239,24 +239,24 @@
    <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
-   <addaction name="actionStartFile"/>
-   <addaction name="actionStartDisc"/>
-   <addaction name="actionStartBios"/>
-   <addaction name="actionStartFullscreenUI2"/>
+   <addaction name="actionToolbarStartFile"/>
+   <addaction name="actionToolbarStartDisc"/>
+   <addaction name="actionToolbarStartBios"/>
+   <addaction name="actionToolbarStartFullscreenUI"/>
    <addaction name="separator"/>
-   <addaction name="actionPowerOff"/>
-   <addaction name="actionReset"/>
-   <addaction name="actionPause"/>
-   <addaction name="actionChangeDisc"/>
-   <addaction name="actionScreenshot"/>
+   <addaction name="actionToolbarPowerOff"/>
+   <addaction name="actionToolbarReset"/>
+   <addaction name="actionToolbarPause"/>
+   <addaction name="actionToolbarChangeDisc"/>
+   <addaction name="actionToolbarScreenshot"/>
    <addaction name="separator"/>
-   <addaction name="actionLoadState"/>
-   <addaction name="actionSaveState"/>
+   <addaction name="actionToolbarLoadState"/>
+   <addaction name="actionToolbarSaveState"/>
    <addaction name="separator"/>
-   <addaction name="actionFullscreen"/>
+   <addaction name="actionToolbarFullscreen"/>
    <addaction name="separator"/>
-   <addaction name="actionSettings2"/>
-   <addaction name="actionControllerSettings"/>
+   <addaction name="actionToolbarSettings"/>
+   <addaction name="actionToolbarControllerSettings"/>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>
   <action name="actionStartFile">
@@ -268,6 +268,15 @@
     <string>Start &amp;File...</string>
    </property>
   </action>
+  <action name="actionToolbarStartFile">
+   <property name="icon">
+    <iconset theme="file-line">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string comment="In Toolbar">Start &amp;File...</string>
+   </property>
+  </action>
   <action name="actionStartDisc">
    <property name="icon">
     <iconset theme="disc-2-line">
@@ -277,6 +286,15 @@
     <string>Start &amp;Disc...</string>
    </property>
   </action>
+  <action name="actionToolbarStartDisc">
+   <property name="icon">
+    <iconset theme="disc-2-line">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string comment="In Toolbar">Start &amp;Disc...</string>
+   </property>
+  </action>
   <action name="actionStartBios">
    <property name="icon">
     <iconset theme="chip-line">
@@ -286,6 +304,15 @@
     <string>Start &amp;BIOS</string>
    </property>
   </action>
+  <action name="actionToolbarStartBios">
+   <property name="icon">
+    <iconset theme="chip-line">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string comment="In Toolbar">Start &amp;BIOS</string>
+   </property>
+  </action>
   <action name="actionScanForNewGames">
    <property name="icon">
     <iconset theme="file-search-line">
@@ -313,6 +340,15 @@
     <string>Shut &amp;Down</string>
    </property>
   </action>
+  <action name="actionToolbarPowerOff">
+   <property name="icon">
+    <iconset theme="shut-down-line">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string comment="In Toolbar">Shut &amp;Down</string>
+   </property>
+  </action>
   <action name="actionPowerOffWithoutSaving">
    <property name="icon">
     <iconset theme="close-line">
@@ -331,6 +367,15 @@
     <string>&amp;Reset</string>
    </property>
   </action>
+  <action name="actionToolbarReset">
+   <property name="icon">
+    <iconset theme="restart-line">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string comment="In Toolbar">&amp;Reset</string>
+   </property>
+  </action>
   <action name="actionPause">
    <property name="checkable">
     <bool>true</bool>
@@ -343,22 +388,34 @@
     <string>&amp;Pause</string>
    </property>
   </action>
-  <action name="actionLoadState">
+  <action name="actionToolbarPause">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset theme="pause-line">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string comment="In Toolbar">&amp;Pause</string>
+   </property>
+  </action>
+  <action name="actionToolbarLoadState">
    <property name="icon">
     <iconset theme="floppy-out-line">
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>&amp;Load State</string>
+    <string comment="In Toolbar">&amp;Load State</string>
    </property>
   </action>
-  <action name="actionSaveState">
+  <action name="actionToolbarSaveState">
    <property name="icon">
     <iconset theme="floppy-in-line">
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>&amp;Save State</string>
+    <string comment="In Toolbar">&amp;Save State</string>
    </property>
   </action>
   <action name="actionExit">
@@ -397,6 +454,15 @@
     <string>&amp;Controllers</string>
    </property>
   </action>
+  <action name="actionToolbarControllerSettings">
+   <property name="icon">
+    <iconset theme="controller-line">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string comment="In Toolbar">&amp;Controllers</string>
+   </property>
+  </action>
   <action name="actionHotkeySettings">
    <property name="icon">
     <iconset theme="keyboard-line">
@@ -438,37 +504,46 @@
     <string>Fullscreen</string>
    </property>
   </action>
+  <action name="actionToolbarFullscreen">
+   <property name="icon">
+    <iconset theme="fullscreen-line">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string comment="In Toolbar">Fullscreen</string>
+   </property>
+  </action>
   <action name="actionResolution_Scale">
    <property name="text">
     <string>Resolution Scale</string>
    </property>
   </action>
   <action name="actionGitHubRepository">
-   <property name="text">
-    <string>&amp;GitHub Repository...</string>
-   </property>
    <property name="icon">
     <iconset theme="github">
      <normaloff>.</normaloff>.</iconset>
    </property>
+   <property name="text">
+    <string>&amp;GitHub Repository...</string>
+   </property>
   </action>
   <action name="actionSupportForums">
-   <property name="text">
-    <string>Support &amp;Forums...</string>
-   </property>
    <property name="icon">
     <iconset theme="at">
      <normaloff>.</normaloff>.</iconset>
    </property>
+   <property name="text">
+    <string>Support &amp;Forums...</string>
+   </property>
   </action>
   <action name="actionDiscordServer">
-   <property name="text">
-    <string>&amp;Discord Server...</string>
-   </property>
    <property name="icon">
     <iconset theme="discord">
      <normaloff>.</normaloff>.</iconset>
    </property>
+   <property name="text">
+    <string>&amp;Discord Server...</string>
+   </property>
   </action>
   <action name="actionCheckForUpdates">
    <property name="icon">
@@ -497,13 +572,13 @@
     <string>&amp;About PCSX2...</string>
    </property>
   </action>
-  <action name="actionChangeDisc">
+  <action name="actionToolbarChangeDisc">
    <property name="icon">
     <iconset theme="disc-eject-line">
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>Change Disc...</string>
+    <string comment="In Toolbar">Change Disc...</string>
    </property>
   </action>
   <action name="actionAudioSettings">
@@ -554,13 +629,13 @@
     <enum>QAction::PreferencesRole</enum>
    </property>
   </action>
-  <action name="actionSettings2">
+  <action name="actionToolbarSettings">
    <property name="icon">
     <iconset theme="settings-3-line">
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>&amp;Settings</string>
+    <string comment="In Toolbar">&amp;Settings</string>
    </property>
    <property name="menuRole">
     <enum>QAction::PreferencesRole</enum>
@@ -600,6 +675,15 @@
     <string>&amp;Screenshot</string>
    </property>
   </action>
+  <action name="actionToolbarScreenshot">
+   <property name="icon">
+    <iconset theme="screenshot-2-line">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
+   <property name="text">
+    <string comment="In Toolbar">&amp;Screenshot</string>
+   </property>
+  </action>
   <action name="actionMemoryCardSettings">
    <property name="icon">
     <iconset theme="memcard-line">
@@ -725,55 +809,55 @@
    </property>
   </action>
   <action name="actionGridViewZoomIn">
+   <property name="icon">
+    <iconset theme="zoom-in-line">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
    <property name="text">
     <string>Zoom &amp;In (Grid View)</string>
    </property>
    <property name="shortcut">
     <string>Ctrl++</string>
    </property>
-   <property name="icon">
-    <iconset theme="zoom-in-line">
-     <normaloff>.</normaloff>.</iconset>
-   </property>
   </action>
   <action name="actionGridViewZoomOut">
+   <property name="icon">
+    <iconset theme="zoom-out-line">
+     <normaloff>.</normaloff>.</iconset>
+   </property>
    <property name="text">
     <string>Zoom &amp;Out (Grid View)</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+-</string>
    </property>
-   <property name="icon">
-    <iconset theme="zoom-out-line">
-     <normaloff>.</normaloff>.</iconset>
-   </property>
   </action>
   <action name="actionGridViewRefreshCovers">
-   <property name="text">
-    <string>Refresh &amp;Covers (Grid View)</string>
-   </property>
    <property name="icon">
     <iconset theme="refresh-line">
      <normaloff>.</normaloff>.</iconset>
    </property>
+   <property name="text">
+    <string>Refresh &amp;Covers (Grid View)</string>
+   </property>
   </action>
   <action name="actionOpen_Memory_Card_Directory">
-   <property name="text">
-    <string>Open Memory Card Directory...</string>
-   </property>
    <property name="icon">
     <iconset theme="memcard-line">
      <normaloff>.</normaloff>.</iconset>
    </property>
+   <property name="text">
+    <string>Open Memory Card Directory...</string>
+   </property>
   </action>
   <action name="actionOpenDataDirectory">
-   <property name="text">
-    <string>Open Data Directory...</string>
-   </property>
    <property name="icon">
     <iconset theme="folder-open-line">
      <normaloff>.</normaloff>.</iconset>
    </property>
+   <property name="text">
+    <string>Open Data Directory...</string>
+   </property>
   </action>
   <action name="actionToggleSoftwareRendering">
    <property name="text">
@@ -781,13 +865,13 @@
    </property>
   </action>
   <action name="actionDebugger">
-   <property name="text">
-    <string>Open Debugger</string>
-   </property>
    <property name="icon">
     <iconset theme="heart-circle-line">
      <normaloff>.</normaloff>.</iconset>
    </property>
+   <property name="text">
+    <string>Open Debugger</string>
+   </property>
   </action>
   <action name="actionReloadPatches">
    <property name="text">
@@ -925,23 +1009,23 @@
     <string>Start Big Picture Mode</string>
    </property>
   </action>
-  <action name="actionStartFullscreenUI2">
+  <action name="actionToolbarStartFullscreenUI">
    <property name="icon">
     <iconset theme="tv-2-line">
      <normaloff>.</normaloff>.</iconset>
    </property>
    <property name="text">
-    <string>Big Picture</string>
+    <string comment="In Toolbar">Big Picture</string>
    </property>
   </action>
   <action name="actionCoverDownloader">
-   <property name="text">
-    <string>Cover Downloader...</string>
-   </property>
    <property name="icon">
     <iconset theme="artboard-2-line">
      <normaloff>.</normaloff>.</iconset>
    </property>
+   <property name="text">
+    <string>Cover Downloader...</string>
+   </property>
   </action>
   <action name="actionShowAdvancedSettings">
    <property name="checkable">