[Themes] Remove our copies of Eclipse themes and reference the originals

- Plus side: we don't have to maintain our copies of the theme files - Down side: we have less control over possibly unwanted upstream changes, although we can over-ride some things in our stylesheets - Down side: not easy to change original css files quickly when testing - Add our specific css files to plugin.xml as stylesheet extensions - Keep the "System" Eclipse theme as it no longer ships with Eclipse - Don't show the "High Contrast" theme in Preferences combo
archimatetool · Feb 18, 2024 · 32168a8 · 32168a8
1 parent e4a4e71
commit 32168a8
Show file tree

Hide file tree

Showing 28 changed files with 78 additions and 2,066 deletions.
diff --git a/com.archimatetool.editor.themes/META-INF/MANIFEST.MF b/com.archimatetool.editor.themes/META-INF/MANIFEST.MF
@@ -9,4 +9,5 @@ Bundle-Vendor: Archi
 Eclipse-BundleShape: dir
 Automatic-Module-Name: com.archimatetool.editor.themes
 Require-Bundle: org.eclipse.e4.ui.css.swt.theme,
- org.eclipse.ui
+ org.eclipse.ui,
+ org.eclipse.ui.themes
diff --git a/com.archimatetool.editor.themes/plugin.properties b/com.archimatetool.editor.themes/plugin.properties
@@ -1,9 +1,6 @@
 themeCategory.archi=Archi
 
 theme.basic=Basic
-theme.classic=Classic
-theme.light=Light
-theme.dark=Dark
 theme.system=System
 
 PALETTE_BACKGROUND=Palette background
@@ -17,33 +14,3 @@ PALETTE_ARROW_BUTTON_FOREGROUND=Palette arrow button foreground
 
 VIEW_BACKGROUND=View background
 VISUALISER_BACKGROUND=Visualiser background
-
-#New theme element definitions
-DARK_BACKGROUND=Dark Background Color
-DARK_FOREGROUND=Dark Foreground Color
-INACTIVE_UNSELECTED_TABS_COLOR_START=Inactive, unselected part color begin
-INACTIVE_UNSELECTED_TABS_COLOR_START=Inactive, unselected part color begin
-INACTIVE_UNSELECTED_TABS_COLOR_END=Inactive, unselected part color end
-INACTIVE_TAB_TEXT_COLOR=Inactive part text color
-INACTIVE_TAB_OUTER_KEYLINE_COLOR=Inactive part outer keyline color
-INACTIVE_TAB_INNER_KEYLINE_COLOR=Inactive part inner keyline color
-INACTIVE_TAB_OUTLINE_COLOR=Inactive part outline color
-ACTIVE_UNSELECTED_TABS_COLOR_START=Active, unselected part color begin
-ACTIVE_UNSELECTED_TABS_COLOR_END=Active, unselected part color end
-ACTIVE_TAB_TEXT_COLOR=Active part text color
-ACTIVE_TAB_OUTER_KEYLINE_COLOR=Active part outer keyline color
-ACTIVE_TAB_INNER_KEYLINE_COLOR=Active part inner keyline color
-ACTIVE_TAB_OUTLINE_COLOR=Active part outline color
-INACTIVE_TAB_BG_START=Inactive, selected part background begin
-INACTIVE_TAB_BG_END=Inactive, selected part background end
-INACTIVE_TAB_UNSELECTED_TEXT_COLOR=Inactive, unselected part foreground
-INACTIVE_TAB_SELECTED_TEXT_COLOR=Inactive, selected part foreground
-ACTIVE_TAB_BG_START=Active, selected part background begin
-ACTIVE_TAB_BG_END=Active, selected part background end
-ACTIVE_TAB_UNSELECTED_TEXT_COLOR=Active, unselected part foreground
-ACTIVE_TAB_SELECTED_TEXT_COLOR=Active, selected part foreground
-ACTIVE_NOFOCUS_TAB_TEXT_COLOR=Active (no focus), selected part text color
-ACTIVE_NOFOCUS_TAB_BG_START=Active (no focus), selected part background begin
-ACTIVE_NOFOCUS_TAB_BG_END=Active (no focus), selected part background end
-ACTIVE_NOFOCUS_TAB_SELECTED_TEXT_COLOR=Active (no focus), selected part foreground
-LINK_COLOR=Link color
diff --git a/com.archimatetool.editor.themes/plugin.xml b/com.archimatetool.editor.themes/plugin.xml
@@ -1,116 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
-
-	<extension
-       name="Themes"
-       point="org.eclipse.e4.ui.css.swt.theme">
-        <theme
-              basestylesheeturi="themes/archi/css/basic/basic.css"
-              id="com.archimatetool.editor.theme.basic"
-              label="%theme.basic">
-        </theme>
-		<theme
-			basestylesheeturi="themes/eclipse/css/e4_classic.css"
-			id="org.eclipse.e4.ui.css.theme.e4_classic"
-			label="%theme.classic">
-		</theme>
-		<theme
-			basestylesheeturi="themes/eclipse/css/e4_default_gtk.css"
-			id="org.eclipse.e4.ui.css.theme.e4_default"
-			label="%theme.light"
-			os="linux">
-		</theme>
-		<theme
-			basestylesheeturi="themes/eclipse/css/e4_default_mac.css"
-			id="org.eclipse.e4.ui.css.theme.e4_default"
-			label="%theme.light"
-			os="macosx">
-		</theme>
-        <theme
-            basestylesheeturi="themes/eclipse/css/e4_default_win.css"
-            id="org.eclipse.e4.ui.css.theme.e4_default"
-            label="%theme.light"
-            os="win32">
-        </theme>
-        <theme
-            basestylesheeturi="themes/eclipse/css/e4-dark_win.css"
-            id="org.eclipse.e4.ui.css.theme.e4_dark"
-            label="%theme.dark"
-            os="win32">
-        </theme>
-        <theme
-            basestylesheeturi="themes/eclipse/css/e4-dark_linux.css"
-            id="org.eclipse.e4.ui.css.theme.e4_dark"
-            label="%theme.dark"
-            os="linux">
-        </theme>
-        <theme
-            basestylesheeturi="themes/eclipse/css/e4-dark_mac1013.css"
-            id="org.eclipse.e4.ui.css.theme.e4_dark"
-            label="%theme.dark"
-            os="macosx"
-            os_version="10.11,10.12,10.13">
-        </theme>
-        <theme
-            basestylesheeturi="themes/eclipse/css/e4-dark_mac.css"
-            id="org.eclipse.e4.ui.css.theme.e4_dark"
-            label="%theme.dark"
-            os="macosx">
-        </theme>
-        <theme
-            basestylesheeturi="themes/eclipse/css/e4_system.css"
-            id="org.eclipse.e4.ui.css.theme.e4_system"
-            label="%theme.system">
-        </theme>
-	</extension>
     <extension
-          name="StyleSheets"
+          name="Themes"
           point="org.eclipse.e4.ui.css.swt.theme">
-       <stylesheet
-             uri="themes/eclipse/css/dark/e4-dark_preferencestyle.css">
-          <themeid
-                refid="org.eclipse.e4.ui.css.theme.e4_dark">
-          </themeid>
-       </stylesheet>
-       <stylesheet
-             uri="themes/archi/css/common/archi-globalstyle.css">
-          <themeid
-                refid="org.eclipse.e4.ui.css.theme.e4_classic">
-          </themeid>
-       </stylesheet>
-       <stylesheet
-             uri="themes/eclipse/css/dark/archi-dark-styling.css">
-          <themeid
-                refid="org.eclipse.e4.ui.css.theme.e4_dark">
-          </themeid>
-       </stylesheet>
-       <stylesheet
-             uri="themes/eclipse/css/light/archi-light-styling.css">
-          <themeid
-                refid="org.eclipse.e4.ui.css.theme.e4_default">
-          </themeid>
-       </stylesheet>
-       <stylesheet
-             uri="themes/eclipse/css/system/archi-light-styling.css">
-          <themeid
-                refid="org.eclipse.e4.ui.css.theme.e4_system">
-          </themeid>
-       </stylesheet>
-       <stylesheet
-             os="macosx"
-             uri="themes/eclipse/css/system/archi-system-mac.css">
-          <themeid
-                refid="org.eclipse.e4.ui.css.theme.e4_system">
-          </themeid>
-       </stylesheet>
+      <theme
+            basestylesheeturi="themes/archi/css/basic/basic.css"
+            id="com.archimatetool.editor.theme.basic"
+            label="%theme.basic">
+      </theme>
+      <theme
+            basestylesheeturi="themes/eclipse/css/system/e4_system.css"
+            id="org.eclipse.e4.ui.css.theme.e4_system"
+            label="%theme.system">
+      </theme>
 
     </extension>
+
+	<extension
+       name="StyleSheets"
+       point="org.eclipse.e4.ui.css.swt.theme">
+    <stylesheet
+          uri="themes/eclipse/css/light/archi-light-styling.css">
+       <themeid
+             refid="org.eclipse.e4.ui.css.theme.e4_default">
+       </themeid>
+    </stylesheet>
+    <stylesheet
+          uri="themes/eclipse/css/dark/archi-dark-styling.css">
+       <themeid
+             refid="org.eclipse.e4.ui.css.theme.e4_dark">
+       </themeid>
+    </stylesheet>
+    <stylesheet
+          uri="themes/archi/css/common/archi-globalstyle.css">
+       <themeid
+             refid="org.eclipse.e4.ui.css.theme.e4_classic">
+       </themeid>
+    </stylesheet>
+    <stylesheet
+          uri="themes/eclipse/css/system/archi-light-styling.css">
+       <themeid
+             refid="org.eclipse.e4.ui.css.theme.e4_system">
+       </themeid>
+    </stylesheet>
+    <stylesheet
+          os="macosx"
+          uri="themes/eclipse/css/system/archi-system-mac.css">
+       <themeid
+             refid="org.eclipse.e4.ui.css.theme.e4_system">
+       </themeid>
+    </stylesheet>
+	</extension>
  <extension
        point="org.eclipse.ui.themes">
     <themeElementCategory
           id="com.archimatetool.editor.themes"
-          label="%themeCategory.archi">
+          label="%themeCategory.archi"
+          parentId="org.eclipse.ui.themes.CssTheme">
     </themeElementCategory>
     <colorDefinition
           categoryId="com.archimatetool.editor.themes"

diff --git a/com.archimatetool.editor.themes/themes/eclipse/css/common/e4_globalstyle.css b/com.archimatetool.editor.themes/themes/eclipse/css/common/e4_globalstyle.css
diff --git a/com.archimatetool.editor.themes/themes/eclipse/css/dark/e4-dark-drag-styling.css b/com.archimatetool.editor.themes/themes/eclipse/css/dark/e4-dark-drag-styling.css