[Theme] Revert default light palette and only include AppColors (#7342)

* [Theme] Revert default light palette and only include AppColors

* [Style] Also remove dark mode palette

---------

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

cockatrice/src/interface/theme_manager.cpp

@@ -109,7 +109,10 @@ ThemeManager::ThemeManager(QObject *parent) : QObject(parent)
     ensureThemeDirectoryExists();
 #if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0))
     connect(QGuiApplication::styleHints(), &QStyleHints::colorSchemeChanged, this, [this] {
-        defaultPalette = qApp->palette();
+        // Reload so scheme-qualified assets and palettes follow the OS, but do
+        // NOT recapture defaultPalette: qApp->palette() already carries the
+        // currently-applied theme palette at this point, so recapturing it
+        // would contaminate the base for every later theme switch.
         themeChangedSlot();
     });
 #endif

cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp

@@ -505,7 +505,7 @@ void AppearanceSettingsPage::retranslateUi()
     openThemeButton.setText(tr("Open themes folder"));
     schemeComboLabel.setText(tr("Active theme palette:"));
     styleComboLabel.setText(tr("Active theme style:"));
-    styleCombo.setToolTip(tr("Qt widget style saved to this theme (\"Default\" lets the application decide)"));
+    styleCombo.setToolTip(tr("Qt widget style saved to this theme (\"System\" lets the application decide)"));
     editPaletteButton.setText(tr("Edit theme palette"));
 
     homeTabGroupBox->setTitle(tr("Home tab settings"));

cockatrice/themes/System/palette-default-dark.toml

@@ -1,67 +1,7 @@
-[Palette]
+# The System theme derives all of its colors from the platform palette
-WindowText           = #ffffffff
+# (e.g. qt6ct's custom color scheme on Linux), so it must NOT ship palette
-Button               = #ff383838
+# overrides. Only the identity app colors are provided here, so buttons keep
-Light                = #ff737373
+# their classic greens while the actual palette stays native to the OS.
-Midlight             = #ff525252
-Dark                 = #ff161616
-Mid                  = #ff252525
-Text                 = #ffffffff
-BrightText           = #ffb4dd8b
-ButtonText           = #ffffffff
-Base                 = #ff2b2b2b
-Window               = #ff1c1c1c
-Shadow               = #ff000000
-HighlightedText      = #ff000000
-Link                 = #ffcde4b6
-LinkVisited          = #ff99d999
-AlternateBase        = #ff242424
-ToolTipBase          = #ffffffdc
-ToolTipText          = #ff000000
-PlaceholderText      = #6effffff
-
-[Palette.Disabled]
-WindowText           = #ff9d9d9d
-Button               = #ff1c1c1c
-Light                = #ff737373
-Midlight             = #ff525252
-Dark                 = #ff161616
-Mid                  = #ff252525
-Text                 = #ff9d9d9d
-BrightText           = #ffb4dd8b
-ButtonText           = #ff787878
-Base                 = #ff1c1c1c
-Window               = #ff1c1c1c
-Shadow               = #ff000000
-HighlightedText      = #ff9d9d9d
-Link                 = #ff308cc6
-LinkVisited          = #ffb450ff
-AlternateBase        = #ff242424
-ToolTipBase          = #ffffffdc
-ToolTipText          = #ff000000
-PlaceholderText      = #46ffffff
-
-[Palette.Inactive]
-WindowText           = #ffffffff
-Button               = #ff383838
-Light                = #ff737373
-Midlight             = #ff525252
-Dark                 = #ff161616
-Mid                  = #ff252525
-Text                 = #ffffffff
-BrightText           = #ffb4dd8b
-ButtonText           = #ffffffff
-Base                 = #ff2b2b2b
-Window               = #ff1c1c1c
-Shadow               = #ff000000
-HighlightedText      = #ffffffff
-Link                 = #ffcde4b6
-LinkVisited          = #ff99d999
-AlternateBase        = #ff242424
-ToolTipBase          = #ffffffdc
-ToolTipText          = #ff000000
-PlaceholderText      = #6effffff
-
-
 [AppColors]
 AccentStrong        = #ff148c3c
 AccentSoft          = #ff78c850

cockatrice/themes/System/palette-default-light.toml

@@ -1,67 +1,7 @@
-[Palette]
+# The System theme derives all of its colors from the platform palette
-WindowText           = #ff000000
+# (e.g. qt6ct's custom color scheme on Linux), so it must NOT ship palette
-Button               = #fff0f0f0
+# overrides. Only the identity app colors are provided here, so buttons keep
-Light                = #ffffffff
+# their classic greens while the actual palette stays native to the OS.
-Midlight             = #ffe3e3e3
-Dark                 = #ffa0a0a0
-Mid                  = #ffa0a0a0
-Text                 = #ff000000
-BrightText           = #ffffffff
-ButtonText           = #ff000000
-Base                 = #ffffffff
-Window               = #fff0f0f0
-Shadow               = #ff696969
-HighlightedText      = #ffffffff
-Link                 = #ff0d5f28
-LinkVisited          = #ff08401b
-AlternateBase        = #ffe9e7e3
-ToolTipBase          = #ffffffdc
-ToolTipText          = #ff000000
-PlaceholderText      = #80000000
-
-[Palette.Disabled]
-WindowText           = #ff787878
-Button               = #fff0f0f0
-Light                = #ffffffff
-Midlight             = #fff7f7f7
-Dark                 = #ffa0a0a0
-Mid                  = #ffa0a0a0
-Text                 = #ff787878
-BrightText           = #ffffffff
-ButtonText           = #ff787878
-Base                 = #fff0f0f0
-Window               = #fff0f0f0
-Shadow               = #ff000000
-HighlightedText      = #ffffffff
-Link                 = #ff0000ff
-LinkVisited          = #ffff00ff
-AlternateBase        = #fff7f7f7
-ToolTipBase          = #ffffffdc
-ToolTipText          = #ff000000
-PlaceholderText      = #80000000
-
-[Palette.Inactive]
-WindowText           = #ff000000
-Button               = #fff0f0f0
-Light                = #ffffffff
-Midlight             = #ffe3e3e3
-Dark                 = #ffa0a0a0
-Mid                  = #ffa0a0a0
-Text                 = #ff000000
-BrightText           = #ffffffff
-ButtonText           = #ff000000
-Base                 = #ffffffff
-Window               = #fff0f0f0
-Shadow               = #ff696969
-HighlightedText      = #ff000000
-Link                 = #ff0d5f28
-LinkVisited          = #ff08401b
-AlternateBase        = #ffe9e7e3
-ToolTipBase          = #ffffffdc
-ToolTipText          = #ff000000
-PlaceholderText      = #80000000
-
-
 [AppColors]
 AccentStrong        = #ff148c3c
-AccentSoft          = #ff78c850
+AccentSoft          = #ff78c850

cockatrice/themes/System/theme.cfg

@@ -1,5 +1,5 @@
 [Appearance]
-ColorScheme = Light
+ColorScheme = System
 
 [Style]
 Name = System