FSUI/BPM: Fix icon

pcsx2-qt/Debugger/Docking/DockManager.cpp

@@ -298,7 +298,10 @@ void DockManager::resetAllLayouts()
 	m_layouts.clear();
 
 	for (const DockTables::DefaultDockLayout& layout : DockTables::DEFAULT_DOCK_LAYOUTS)
-		createLayout(tr(layout.name.c_str()), layout.cpu, true, layout.name);
+	{
+		QString name = QCoreApplication::translate("DebuggerLayout", layout.name.c_str());
+		createLayout(name, layout.cpu, true, layout.name);
+	}
 
 	switchToLayout(0);
 	updateLayoutSwitcher();
@@ -313,7 +316,10 @@ void DockManager::resetDefaultLayouts()
 	m_layouts = std::vector<DockLayout>();
 
 	for (const DockTables::DefaultDockLayout& layout : DockTables::DEFAULT_DOCK_LAYOUTS)
-		createLayout(tr(layout.name.c_str()), layout.cpu, true, layout.name);
+	{
+		QString name = QCoreApplication::translate("DebuggerLayout", layout.name.c_str());
+		createLayout(name, layout.cpu, true, layout.name);
+	}
 
 	for (DockLayout& layout : old_layouts)
 		if (!layout.isDefault())

pcsx2-qt/Translations/pcsx2-qt_en.ts

@@ -5031,13 +5031,13 @@ Do you want to overwrite?</source>
     </message>
     <message>
         <location filename="../Debugger/DebuggerWindow.ui" line="32"/>
-        <location filename="../Debugger/DebuggerWindow.ui" line="103"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="105"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../Debugger/DebuggerWindow.ui" line="42"/>
-        <location filename="../Debugger/DebuggerWindow.ui" line="85"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="87"/>
         <source>Debug</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5047,134 +5047,134 @@ Do you want to overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="56"/>
-        <location filename="../Debugger/DebuggerWindow.ui" line="136"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="57"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="138"/>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="66"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="67"/>
         <source>Layouts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="73"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="74"/>
         <source>Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="120"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="122"/>
         <source>System</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="157"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="159"/>
         <location filename="../Debugger/DebuggerWindow.cpp" line="319"/>
         <source>Run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="165"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="167"/>
         <source>Step Into</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="168"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="170"/>
         <source>F11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="176"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="178"/>
         <source>Step Over</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="179"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="181"/>
         <source>F10</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="187"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="189"/>
         <source>Step Out</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="190"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="192"/>
         <source>Shift+F11</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="201"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="203"/>
         <source>Always On Top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="204"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="206"/>
         <source>Show this window on top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="212"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="214"/>
         <source>Analyze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="217"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="219"/>
         <source>Reset All Layouts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="222"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="224"/>
         <source>Reset Default Layouts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="227"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="229"/>
         <source>Reset Splitter Positions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="235"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="237"/>
         <source>Shut Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="246"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="248"/>
         <source>Reset</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="257"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="259"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="268"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="270"/>
         <source>Increase Font Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="279"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="281"/>
         <source>Decrease Font Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="282"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="284"/>
         <source>Ctrl+-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="293"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="295"/>
         <source>Reset Font Size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="304"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="306"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/DebuggerWindow.ui" line="315"/>
+        <location filename="../Debugger/DebuggerWindow.ui" line="317"/>
         <source>Game Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5410,38 +5410,38 @@ Do you want to overwrite?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/Docking/DockManager.cpp" line="360"/>
+        <location filename="../Debugger/Docking/DockManager.cpp" line="366"/>
         <source>Add Another...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/Docking/DockManager.cpp" line="574"/>
+        <location filename="../Debugger/Docking/DockManager.cpp" line="580"/>
         <source>Edit Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/Docking/DockManager.cpp" line="579"/>
+        <location filename="../Debugger/Docking/DockManager.cpp" line="585"/>
         <source>Reset Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/Docking/DockManager.cpp" line="629"/>
+        <location filename="../Debugger/Docking/DockManager.cpp" line="635"/>
         <source>Are you sure you want to reset layout &apos;%1&apos;?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/Docking/DockManager.cpp" line="630"/>
-        <location filename="../Debugger/Docking/DockManager.cpp" line="653"/>
+        <location filename="../Debugger/Docking/DockManager.cpp" line="636"/>
+        <location filename="../Debugger/Docking/DockManager.cpp" line="659"/>
         <source>Confirmation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/Docking/DockManager.cpp" line="585"/>
+        <location filename="../Debugger/Docking/DockManager.cpp" line="591"/>
         <source>Delete Layout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../Debugger/Docking/DockManager.cpp" line="652"/>
+        <location filename="../Debugger/Docking/DockManager.cpp" line="658"/>
         <source>Are you sure you want to delete layout &apos;%1&apos;?</source>
         <translation type="unfinished"></translation>
     </message>

pcsx2/ImGui/FullscreenUI.cpp

@@ -1054,7 +1054,7 @@ bool FullscreenUI::LoadResources()
 	for (u32 i = static_cast<u32>(GameDatabaseSchema::Compatibility::Nothing);
 		 i <= static_cast<u32>(GameDatabaseSchema::Compatibility::Perfect); i++)
 	{
-		s_game_compatibility_textures[i - 1] = LoadTexture(fmt::format("icons/star-{}.png", i - 1).c_str());
+		s_game_compatibility_textures[i - 1] = LoadTexture(fmt::format("fullscreenui/star-{}.png", i - 1).c_str());
 	}
 
 	return true;
@@ -6499,7 +6499,7 @@ void FullscreenUI::DrawGameList(const ImVec2& heading_size)
 
 			// region
 			{
-				std::string flag_texture(fmt::format("icons/flags/{}.png", GameList::RegionToString(selected_entry->region)));
+				std::string flag_texture(fmt::format("fullscreenui/flags/{}.png", GameList::RegionToString(selected_entry->region)));
 				ImGui::TextUnformatted(FSUI_CSTR("Region: "));
 				ImGui::SameLine();
 				ImGui::Image(reinterpret_cast<ImTextureID>(GetCachedTextureAsync(flag_texture.c_str())->GetNativeHandle()), LayoutScale(23.0f, 16.0f));