From 5d56d10b23bc72ab18899521f75817f0a87149e0 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Thu, 31 Oct 2024 23:30:21 +0100
Subject: [PATCH] Themes: Reorganize display names of themes

This change reorganizes the display names of the themes.
The new themes and related files are renamed.

Task-number: QTCREATORBUG-31747
Change-Id: I5b52e640b5590cc263a68b68c7a8538fc84c9926
Reviewed-by: hjk <hjk@qt.io>
---
 share/qtcreator/styles/{broccoli-dark.xml => dark-2024.xml} | 2 +-
 .../qtcreator/styles/{broccoli-light.xml => light-2024.xml} | 2 +-
 .../themes/{broccoli.tokenmapping => 2024.tokenmapping}     | 0
 .../{broccoli-dark.creatortheme => dark-2024.creatortheme}  | 6 +++---
 share/qtcreator/themes/dark.creatortheme                    | 2 +-
 share/qtcreator/themes/default.creatortheme                 | 2 +-
 share/qtcreator/themes/flat-dark.creatortheme               | 2 +-
 share/qtcreator/themes/flat-light.creatortheme              | 2 +-
 share/qtcreator/themes/flat.creatortheme                    | 2 +-
 ...{broccoli-light.creatortheme => light-2024.creatortheme} | 6 +++---
 tests/manual/widgets/common/themes.qrc                      | 6 +++---
 11 files changed, 16 insertions(+), 16 deletions(-)
 rename share/qtcreator/styles/{broccoli-dark.xml => dark-2024.xml} (98%)
 rename share/qtcreator/styles/{broccoli-light.xml => light-2024.xml} (86%)
 rename share/qtcreator/themes/{broccoli.tokenmapping => 2024.tokenmapping} (100%)
 rename share/qtcreator/themes/{broccoli-dark.creatortheme => dark-2024.creatortheme} (98%)
 rename share/qtcreator/themes/{broccoli-light.creatortheme => light-2024.creatortheme} (98%)

diff --git a/share/qtcreator/styles/broccoli-dark.xml b/share/qtcreator/styles/dark-2024.xml
similarity index 98%
rename from share/qtcreator/styles/broccoli-dark.xml
rename to share/qtcreator/styles/dark-2024.xml
index 418406e269e..b576eb4fb81 100644
--- a/share/qtcreator/styles/broccoli-dark.xml
+++ b/share/qtcreator/styles/dark-2024.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<style-scheme version="1.0" name="Broccoli Dark">
+<style-scheme version="1.0" name="Dark (2024)">
   <style name="Text" foreground="#d6cf9a" background="#1f1f1f"/>
   <style name="Link" foreground="#d6c540"/>
   <style name="Selection" background="#3f3f3f"/>
diff --git a/share/qtcreator/styles/broccoli-light.xml b/share/qtcreator/styles/light-2024.xml
similarity index 86%
rename from share/qtcreator/styles/broccoli-light.xml
rename to share/qtcreator/styles/light-2024.xml
index c7f3d88d1a1..962663c49ea 100644
--- a/share/qtcreator/styles/broccoli-light.xml
+++ b/share/qtcreator/styles/light-2024.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<style-scheme version="1.0" name="Broccoli Light">
+<style-scheme version="1.0" name="Light (2024)">
   <style name="Text" foreground="#0a0a0a" background="#fcfcfc"/>
   <style name="Selection" background="#cdcdcd"/>
   <style name="LineNumber" foreground="#595959" background="#f2f2f2" bold="true"/>
diff --git a/share/qtcreator/themes/broccoli.tokenmapping b/share/qtcreator/themes/2024.tokenmapping
similarity index 100%
rename from share/qtcreator/themes/broccoli.tokenmapping
rename to share/qtcreator/themes/2024.tokenmapping
diff --git a/share/qtcreator/themes/broccoli-dark.creatortheme b/share/qtcreator/themes/dark-2024.creatortheme
similarity index 98%
rename from share/qtcreator/themes/broccoli-dark.creatortheme
rename to share/qtcreator/themes/dark-2024.creatortheme
index 21f09f2c82b..459f18e1bdd 100644
--- a/share/qtcreator/themes/broccoli-dark.creatortheme
+++ b/share/qtcreator/themes/dark-2024.creatortheme
@@ -1,8 +1,8 @@
 [General]
-Includes=dark.figmatokens, broccoli.tokenmapping
-ThemeName=Broccoli Dark
+Includes=dark.figmatokens, 2024.tokenmapping
+ThemeName=Dark (2024)
 PreferredStyles=
-DefaultTextEditorColorScheme=broccoli-dark.xml
+DefaultTextEditorColorScheme=dark-2024.xml
 DefaultToolbarStyle=Relaxed
 
 [Palette]
diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme
index 1c699bfa20d..c5834e3e104 100644
--- a/share/qtcreator/themes/dark.creatortheme
+++ b/share/qtcreator/themes/dark.creatortheme
@@ -1,6 +1,6 @@
 [General]
 Includes=dark.figmatokens
-ThemeName=Dark
+ThemeName=Contrast Dark (2016)
 PreferredStyles=
 DefaultTextEditorColorScheme=dark.xml
 EnforceAccentColorOnMacOS=selectedBackground
diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme
index bd438033a63..28200acfd7a 100644
--- a/share/qtcreator/themes/default.creatortheme
+++ b/share/qtcreator/themes/default.creatortheme
@@ -1,6 +1,6 @@
 [General]
 Includes=light.figmatokens, light-palette.inc
-ThemeName=Classic
+ThemeName=Classic (2009)
 PreferredStyles=
 
 [Palette]
diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme
index 011df88353d..3a6e8fa6b05 100644
--- a/share/qtcreator/themes/flat-dark.creatortheme
+++ b/share/qtcreator/themes/flat-dark.creatortheme
@@ -1,6 +1,6 @@
 [General]
 Includes=dark.figmatokens
-ThemeName=Flat Dark
+ThemeName=Dark (2016)
 PreferredStyles=
 DefaultTextEditorColorScheme=creator-dark.xml
 
diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme
index 0cd2fb625d0..df98e8b31e5 100644
--- a/share/qtcreator/themes/flat-light.creatortheme
+++ b/share/qtcreator/themes/flat-light.creatortheme
@@ -1,6 +1,6 @@
 [General]
 Includes=light.figmatokens, light-palette.inc
-ThemeName=Flat Light
+ThemeName=Light (2016)
 PreferredStyles=
 
 [Palette]
diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme
index 57f690d6a9e..4b89f096101 100644
--- a/share/qtcreator/themes/flat.creatortheme
+++ b/share/qtcreator/themes/flat.creatortheme
@@ -1,6 +1,6 @@
 [General]
 Includes=light.figmatokens, light-palette.inc
-ThemeName=Flat
+ThemeName=Hybrid (2016)
 PreferredStyles=
 
 [Palette]
diff --git a/share/qtcreator/themes/broccoli-light.creatortheme b/share/qtcreator/themes/light-2024.creatortheme
similarity index 98%
rename from share/qtcreator/themes/broccoli-light.creatortheme
rename to share/qtcreator/themes/light-2024.creatortheme
index c6e635ad8cf..dacf51d6317 100644
--- a/share/qtcreator/themes/broccoli-light.creatortheme
+++ b/share/qtcreator/themes/light-2024.creatortheme
@@ -1,8 +1,8 @@
 [General]
-Includes=light.figmatokens, broccoli.tokenmapping
-ThemeName=Broccoli Light
+Includes=light.figmatokens, 2024.tokenmapping
+ThemeName=Light (2024)
 PreferredStyles=
-DefaultTextEditorColorScheme=broccoli-light.xml
+DefaultTextEditorColorScheme=light-2024.xml
 DefaultToolbarStyle=Relaxed
 
 [Palette]
diff --git a/tests/manual/widgets/common/themes.qrc b/tests/manual/widgets/common/themes.qrc
index 6fe0cf4d7cb..bdd8b45efba 100644
--- a/tests/manual/widgets/common/themes.qrc
+++ b/tests/manual/widgets/common/themes.qrc
@@ -1,8 +1,7 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource prefix="/themes">
-    <file alias="broccoli-dark.creatortheme">../../../../share/qtcreator/themes/broccoli-dark.creatortheme</file>
-    <file alias="broccoli-light.creatortheme">../../../../share/qtcreator/themes/broccoli-light.creatortheme</file>
-    <file alias="broccoli.tokenmapping">../../../../share/qtcreator/themes/broccoli.tokenmapping</file>
+    <file alias="2024.tokenmapping">../../../../share/qtcreator/themes/2024.tokenmapping</file>
+    <file alias="dark-2024.creatortheme">../../../../share/qtcreator/themes/dark-2024.creatortheme</file>
     <file alias="dark.creatortheme">../../../../share/qtcreator/themes/dark.creatortheme</file>
     <file alias="dark.figmatokens">../../../../share/qtcreator/themes/dark.figmatokens</file>
     <file alias="default.creatortheme">../../../../share/qtcreator/themes/default.creatortheme</file>
@@ -10,6 +9,7 @@
     <file alias="flat-dark.creatortheme">../../../../share/qtcreator/themes/flat-dark.creatortheme</file>
     <file alias="flat-light.creatortheme">../../../../share/qtcreator/themes/flat-light.creatortheme</file>
     <file alias="flat.creatortheme">../../../../share/qtcreator/themes/flat.creatortheme</file>
+    <file alias="light-2024.creatortheme">../../../../share/qtcreator/themes/light-2024.creatortheme</file>
     <file alias="light-palette.inc">../../../../share/qtcreator/themes/light-palette.inc</file>
     <file alias="light.figmatokens">../../../../share/qtcreator/themes/light.figmatokens</file>
 </qresource>