Migrate theme asset loads to scheme-variant resolution (#7209-2) (#7276)

Replace remaining QPixmap("theme:...") call sites with themePixmap() so icons, replay controls, card backs, and other images resolve to -dark/-light variants under theme schemes. Stem-exact 1:1 migration; behavior unchanged for non-variant themes.

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>

cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp

@@ -1,6 +1,7 @@
 #include "tab_archidekt.h"
 
 #include "../../../../../client/settings/cache_settings.h"
+#include "../../../../pixel_map_generator.h"
 #include "../../../cards/additional_info/mana_symbol_widget.h"
 #include "../../../utility/completer_utils.h"
 #include "../../tab_supervisor.h"
@@ -213,7 +214,7 @@ void TabArchidekt::setupFilterWidgets()
     // Format filter (collapsible)
     formatButton = new SettingsButtonWidget(secondaryToolbar);
     formatButton->setButtonText(tr("Formats"));
-    formatButton->setButtonIcon(QPixmap("theme:icons/scale_balanced"));
+    formatButton->setButtonIcon(themePixmap(QStringLiteral("icons/scale_balanced")));
 
     QWidget *formatContainer = new QWidget(secondaryToolbar);
     QGridLayout *formatLayout = new QGridLayout(formatContainer);

cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp

@@ -1,6 +1,7 @@
 #include "commander_bracket_widget.h"
 
 #include "../../../../../client/settings/cache_settings.h"
+#include "../../../../pixel_map_generator.h"
 #include "commander_bracket_service.h"
 
 #include <QComboBox>
@@ -30,7 +31,7 @@ CommanderBracketWidget::CommanderBracketWidget(QWidget *parent) : QWidget(parent
     bracketInfoButton->setEnabled(false);
 
     bracketRefreshButton = new QToolButton(this);
-    bracketRefreshButton->setIcon(QPixmap("theme:icons/reload"));
+    bracketRefreshButton->setIcon(themePixmap(QStringLiteral("icons/reload")));
     bracketRefreshButton->setAutoRaise(true);
 
     connect(bracketRefreshButton, &QToolButton::clicked, this, &CommanderBracketWidget::requestBracketEstimate);

cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp

@@ -2,6 +2,7 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../deck_loader/deck_loader.h"
+#include "../../pixel_map_generator.h"
 #include "../interface/widgets/server/remote/remote_decklist_tree_widget.h"
 #include "../interface/widgets/utility/get_text_with_max.h"
 
@@ -105,19 +106,19 @@ TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor,
 
     // Left side actions
     aOpenLocalDeck = new QAction(this);
-    aOpenLocalDeck->setIcon(QPixmap("theme:icons/pencil"));
+    aOpenLocalDeck->setIcon(themePixmap(QStringLiteral("icons/pencil")));
     connect(aOpenLocalDeck, &QAction::triggered, this, &TabDeckStorage::actOpenLocalDeck);
     aRenameLocal = new QAction(this);
-    aRenameLocal->setIcon(QPixmap("theme:icons/rename"));
+    aRenameLocal->setIcon(themePixmap(QStringLiteral("icons/rename")));
     connect(aRenameLocal, &QAction::triggered, this, &TabDeckStorage::actRenameLocal);
     aUpload = new QAction(this);
-    aUpload->setIcon(QPixmap("theme:icons/arrow_right_green"));
+    aUpload->setIcon(themePixmap(QStringLiteral("icons/arrow_right_green")));
     connect(aUpload, &QAction::triggered, this, &TabDeckStorage::actUpload);
     aNewLocalFolder = new QAction(this);
     aNewLocalFolder->setIcon(qApp->style()->standardIcon(QStyle::SP_FileDialogNewFolder));
     connect(aNewLocalFolder, &QAction::triggered, this, &TabDeckStorage::actNewLocalFolder);
     aDeleteLocalDeck = new QAction(this);
-    aDeleteLocalDeck->setIcon(QPixmap("theme:icons/remove_row"));
+    aDeleteLocalDeck->setIcon(themePixmap(QStringLiteral("icons/remove_row")));
     connect(aDeleteLocalDeck, &QAction::triggered, this, &TabDeckStorage::actDeleteLocalDeck);
 
     aOpenDecksFolder = new QAction(this);
@@ -126,16 +127,16 @@ TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor,
 
     // Right side actions
     aOpenRemoteDeck = new QAction(this);
-    aOpenRemoteDeck->setIcon(QPixmap("theme:icons/pencil"));
+    aOpenRemoteDeck->setIcon(themePixmap(QStringLiteral("icons/pencil")));
     connect(aOpenRemoteDeck, &QAction::triggered, this, &TabDeckStorage::actOpenRemoteDeck);
     aDownload = new QAction(this);
-    aDownload->setIcon(QPixmap("theme:icons/arrow_left_green"));
+    aDownload->setIcon(themePixmap(QStringLiteral("icons/arrow_left_green")));
     connect(aDownload, &QAction::triggered, this, &TabDeckStorage::actDownload);
     aNewFolder = new QAction(this);
     aNewFolder->setIcon(qApp->style()->standardIcon(QStyle::SP_FileDialogNewFolder));
     connect(aNewFolder, &QAction::triggered, this, &TabDeckStorage::actNewFolder);
     aDeleteRemoteDeck = new QAction(this);
-    aDeleteRemoteDeck->setIcon(QPixmap("theme:icons/remove_row"));
+    aDeleteRemoteDeck->setIcon(themePixmap(QStringLiteral("icons/remove_row")));
     connect(aDeleteRemoteDeck, &QAction::triggered, this, &TabDeckStorage::actDeleteRemoteDeck);
 
     // Add actions to toolbars

cockatrice/src/interface/widgets/tabs/tab_replays.cpp

@@ -1,6 +1,7 @@
 #include "tab_replays.h"
 
 #include "../../../client/settings/cache_settings.h"
+#include "../../pixel_map_generator.h"
 #include "../interface/widgets/server/remote/remote_replay_list_tree_widget.h"
 #include "tab_game.h"
 
@@ -102,17 +103,17 @@ QGroupBox *TabReplays::createLeftLayout()
 
     // Left side actions
     aOpenLocalReplay = new QAction(this);
-    aOpenLocalReplay->setIcon(QPixmap("theme:icons/view"));
+    aOpenLocalReplay->setIcon(themePixmap(QStringLiteral("icons/view")));
     connect(aOpenLocalReplay, &QAction::triggered, this, &TabReplays::actOpenLocalReplay);
     connect(localDirView, &QTreeView::doubleClicked, this, &TabReplays::actOpenLocalReplay);
     aRenameLocal = new QAction(this);
-    aRenameLocal->setIcon(QPixmap("theme:icons/rename"));
+    aRenameLocal->setIcon(themePixmap(QStringLiteral("icons/rename")));
     connect(aRenameLocal, &QAction::triggered, this, &TabReplays::actRenameLocal);
     aNewLocalFolder = new QAction(this);
     aNewLocalFolder->setIcon(qApp->style()->standardIcon(QStyle::SP_FileDialogNewFolder));
     connect(aNewLocalFolder, &QAction::triggered, this, &TabReplays::actNewLocalFolder);
     aDeleteLocalReplay = new QAction(this);
-    aDeleteLocalReplay->setIcon(QPixmap("theme:icons/remove_row"));
+    aDeleteLocalReplay->setIcon(themePixmap(QStringLiteral("icons/remove_row")));
     connect(aDeleteLocalReplay, &QAction::triggered, this, &TabReplays::actDeleteLocalReplay);
 
     aOpenReplaysFolder = new QAction(this);
@@ -164,24 +165,24 @@ QGroupBox *TabReplays::createRightLayout()
 
     // Right side actions
     aOpenRemoteReplay = new QAction(this);
-    aOpenRemoteReplay->setIcon(QPixmap("theme:icons/view"));
+    aOpenRemoteReplay->setIcon(themePixmap(QStringLiteral("icons/view")));
     connect(aOpenRemoteReplay, &QAction::triggered, this, &TabReplays::actOpenRemoteReplay);
     connect(serverDirView, &QTreeView::doubleClicked, this, &TabReplays::actOpenRemoteReplay);
     aDownload = new QAction(this);
-    aDownload->setIcon(QPixmap("theme:icons/arrow_left_green"));
+    aDownload->setIcon(themePixmap(QStringLiteral("icons/arrow_left_green")));
     connect(aDownload, &QAction::triggered, this, &TabReplays::actDownload);
     aKeep = new QAction(this);
-    aKeep->setIcon(QPixmap("theme:icons/lock"));
+    aKeep->setIcon(themePixmap(QStringLiteral("icons/lock")));
     connect(aKeep, &QAction::triggered, this, &TabReplays::actKeepRemoteReplay);
     aDeleteRemoteReplay = new QAction(this);
-    aDeleteRemoteReplay->setIcon(QPixmap("theme:icons/remove_row"));
+    aDeleteRemoteReplay->setIcon(themePixmap(QStringLiteral("icons/remove_row")));
     connect(aDeleteRemoteReplay, &QAction::triggered, this, &TabReplays::actDeleteRemoteReplay);
     aGetReplayCode = new QAction(this);
-    aGetReplayCode->setIcon(QPixmap("theme:icons/share"));
+    aGetReplayCode->setIcon(themePixmap(QStringLiteral("icons/share")));
     connect(aGetReplayCode, &QAction::triggered, this, &TabReplays::actGetReplayCode);
 
     aSubmitReplayCode = new QAction(this);
-    aSubmitReplayCode->setIcon(QPixmap("theme:icons/search"));
+    aSubmitReplayCode->setIcon(themePixmap(QStringLiteral("icons/search")));
     connect(aSubmitReplayCode, &QAction::triggered, this, &TabReplays::actSubmitReplayCode);
 
     // Add actions to toolbars

cockatrice/src/interface/widgets/tabs/tab_room.cpp

@@ -2,6 +2,7 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
+#include "../../pixel_map_generator.h"
 #include "../interface/widgets/dialogs/dlg_settings.h"
 #include "../interface/widgets/server/chat_view/chat_view.h"
 #include "../interface/widgets/server/game_link.h"
@@ -98,7 +99,7 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor,
     connect(aOpenChatSettings, &QAction::triggered, this, &TabRoom::actOpenChatSettings);
 
     auto *chatSettingsButton = new QToolButton;
-    chatSettingsButton->setIcon(QPixmap("theme:icons/settings"));
+    chatSettingsButton->setIcon(themePixmap(QStringLiteral("icons/settings")));
     chatSettingsButton->setMenu(chatSettingsMenu);
     chatSettingsButton->setPopupMode(QToolButton::InstantPopup);
 

cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp

@@ -1300,7 +1300,7 @@ void TabSupervisor::tabUserEvent(bool globalEvent)
     auto *tab = static_cast<Tab *>(sender());
     if (tab != currentWidget()) {
         tab->setContentsChanged(true);
-        setTabIcon(indexOf(tab), QPixmap("theme:icons/tab_changed"));
+        setTabIcon(indexOf(tab), themePixmap(QStringLiteral("icons/tab_changed")));
     }
     if (globalEvent && SettingsCache::instance().userInterface().getNotificationsEnabled()) {
         QApplication::alert(this);