Skip to content

Commit e1f22b1

Browse files
PhillipusPhillipus
committed
[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
1 parent 4d67a42 commit e1f22b1

28 files changed

+78
-2066
lines changed

‎com.archimatetool.editor.themes/META-INF/MANIFEST.MF

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ Bundle-Vendor: Archi
99
Eclipse-BundleShape: dir
1010
Automatic-Module-Name: com.archimatetool.editor.themes
1111
Require-Bundle: org.eclipse.e4.ui.css.swt.theme,
12-
org.eclipse.ui
12+
org.eclipse.ui,
13+
org.eclipse.ui.themes

‎com.archimatetool.editor.themes/plugin.properties

-33
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
themeCategory.archi=Archi
22

33
theme.basic=Basic
4-
theme.classic=Classic
5-
theme.light=Light
6-
theme.dark=Dark
74
theme.system=System
85

96
PALETTE_BACKGROUND=Palette background
@@ -17,33 +14,3 @@ PALETTE_ARROW_BUTTON_FOREGROUND=Palette arrow button foreground
1714

1815
VIEW_BACKGROUND=View background
1916
VISUALISER_BACKGROUND=Visualiser background
20-
21-
#New theme element definitions
22-
DARK_BACKGROUND=Dark Background Color
23-
DARK_FOREGROUND=Dark Foreground Color
24-
INACTIVE_UNSELECTED_TABS_COLOR_START=Inactive, unselected part color begin
25-
INACTIVE_UNSELECTED_TABS_COLOR_START=Inactive, unselected part color begin
26-
INACTIVE_UNSELECTED_TABS_COLOR_END=Inactive, unselected part color end
27-
INACTIVE_TAB_TEXT_COLOR=Inactive part text color
28-
INACTIVE_TAB_OUTER_KEYLINE_COLOR=Inactive part outer keyline color
29-
INACTIVE_TAB_INNER_KEYLINE_COLOR=Inactive part inner keyline color
30-
INACTIVE_TAB_OUTLINE_COLOR=Inactive part outline color
31-
ACTIVE_UNSELECTED_TABS_COLOR_START=Active, unselected part color begin
32-
ACTIVE_UNSELECTED_TABS_COLOR_END=Active, unselected part color end
33-
ACTIVE_TAB_TEXT_COLOR=Active part text color
34-
ACTIVE_TAB_OUTER_KEYLINE_COLOR=Active part outer keyline color
35-
ACTIVE_TAB_INNER_KEYLINE_COLOR=Active part inner keyline color
36-
ACTIVE_TAB_OUTLINE_COLOR=Active part outline color
37-
INACTIVE_TAB_BG_START=Inactive, selected part background begin
38-
INACTIVE_TAB_BG_END=Inactive, selected part background end
39-
INACTIVE_TAB_UNSELECTED_TEXT_COLOR=Inactive, unselected part foreground
40-
INACTIVE_TAB_SELECTED_TEXT_COLOR=Inactive, selected part foreground
41-
ACTIVE_TAB_BG_START=Active, selected part background begin
42-
ACTIVE_TAB_BG_END=Active, selected part background end
43-
ACTIVE_TAB_UNSELECTED_TEXT_COLOR=Active, unselected part foreground
44-
ACTIVE_TAB_SELECTED_TEXT_COLOR=Active, selected part foreground
45-
ACTIVE_NOFOCUS_TAB_TEXT_COLOR=Active (no focus), selected part text color
46-
ACTIVE_NOFOCUS_TAB_BG_START=Active (no focus), selected part background begin
47-
ACTIVE_NOFOCUS_TAB_BG_END=Active (no focus), selected part background end
48-
ACTIVE_NOFOCUS_TAB_SELECTED_TEXT_COLOR=Active (no focus), selected part foreground
49-
LINK_COLOR=Link color

‎com.archimatetool.editor.themes/plugin.xml

+49-102
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,63 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<?eclipse version="3.4"?>
33
<plugin>
4-
5-
<extension
6-
name="Themes"
7-
point="org.eclipse.e4.ui.css.swt.theme">
8-
<theme
9-
basestylesheeturi="themes/archi/css/basic/basic.css"
10-
id="com.archimatetool.editor.theme.basic"
11-
label="%theme.basic">
12-
</theme>
13-
<theme
14-
basestylesheeturi="themes/eclipse/css/e4_classic.css"
15-
id="org.eclipse.e4.ui.css.theme.e4_classic"
16-
label="%theme.classic">
17-
</theme>
18-
<theme
19-
basestylesheeturi="themes/eclipse/css/e4_default_gtk.css"
20-
id="org.eclipse.e4.ui.css.theme.e4_default"
21-
label="%theme.light"
22-
os="linux">
23-
</theme>
24-
<theme
25-
basestylesheeturi="themes/eclipse/css/e4_default_mac.css"
26-
id="org.eclipse.e4.ui.css.theme.e4_default"
27-
label="%theme.light"
28-
os="macosx">
29-
</theme>
30-
<theme
31-
basestylesheeturi="themes/eclipse/css/e4_default_win.css"
32-
id="org.eclipse.e4.ui.css.theme.e4_default"
33-
label="%theme.light"
34-
os="win32">
35-
</theme>
36-
<theme
37-
basestylesheeturi="themes/eclipse/css/e4-dark_win.css"
38-
id="org.eclipse.e4.ui.css.theme.e4_dark"
39-
label="%theme.dark"
40-
os="win32">
41-
</theme>
42-
<theme
43-
basestylesheeturi="themes/eclipse/css/e4-dark_linux.css"
44-
id="org.eclipse.e4.ui.css.theme.e4_dark"
45-
label="%theme.dark"
46-
os="linux">
47-
</theme>
48-
<theme
49-
basestylesheeturi="themes/eclipse/css/e4-dark_mac1013.css"
50-
id="org.eclipse.e4.ui.css.theme.e4_dark"
51-
label="%theme.dark"
52-
os="macosx"
53-
os_version="10.11,10.12,10.13">
54-
</theme>
55-
<theme
56-
basestylesheeturi="themes/eclipse/css/e4-dark_mac.css"
57-
id="org.eclipse.e4.ui.css.theme.e4_dark"
58-
label="%theme.dark"
59-
os="macosx">
60-
</theme>
61-
<theme
62-
basestylesheeturi="themes/eclipse/css/e4_system.css"
63-
id="org.eclipse.e4.ui.css.theme.e4_system"
64-
label="%theme.system">
65-
</theme>
66-
</extension>
674
<extension
68-
name="StyleSheets"
5+
name="Themes"
696
point="org.eclipse.e4.ui.css.swt.theme">
70-
<stylesheet
71-
uri="themes/eclipse/css/dark/e4-dark_preferencestyle.css">
72-
<themeid
73-
refid="org.eclipse.e4.ui.css.theme.e4_dark">
74-
</themeid>
75-
</stylesheet>
76-
<stylesheet
77-
uri="themes/archi/css/common/archi-globalstyle.css">
78-
<themeid
79-
refid="org.eclipse.e4.ui.css.theme.e4_classic">
80-
</themeid>
81-
</stylesheet>
82-
<stylesheet
83-
uri="themes/eclipse/css/dark/archi-dark-styling.css">
84-
<themeid
85-
refid="org.eclipse.e4.ui.css.theme.e4_dark">
86-
</themeid>
87-
</stylesheet>
88-
<stylesheet
89-
uri="themes/eclipse/css/light/archi-light-styling.css">
90-
<themeid
91-
refid="org.eclipse.e4.ui.css.theme.e4_default">
92-
</themeid>
93-
</stylesheet>
94-
<stylesheet
95-
uri="themes/eclipse/css/system/archi-light-styling.css">
96-
<themeid
97-
refid="org.eclipse.e4.ui.css.theme.e4_system">
98-
</themeid>
99-
</stylesheet>
100-
<stylesheet
101-
os="macosx"
102-
uri="themes/eclipse/css/system/archi-system-mac.css">
103-
<themeid
104-
refid="org.eclipse.e4.ui.css.theme.e4_system">
105-
</themeid>
106-
</stylesheet>
7+
<theme
8+
basestylesheeturi="themes/archi/css/basic/basic.css"
9+
id="com.archimatetool.editor.theme.basic"
10+
label="%theme.basic">
11+
</theme>
12+
<theme
13+
basestylesheeturi="themes/eclipse/css/system/e4_system.css"
14+
id="org.eclipse.e4.ui.css.theme.e4_system"
15+
label="%theme.system">
16+
</theme>
10717

10818
</extension>
19+
20+
<extension
21+
name="StyleSheets"
22+
point="org.eclipse.e4.ui.css.swt.theme">
23+
<stylesheet
24+
uri="themes/eclipse/css/light/archi-light-styling.css">
25+
<themeid
26+
refid="org.eclipse.e4.ui.css.theme.e4_default">
27+
</themeid>
28+
</stylesheet>
29+
<stylesheet
30+
uri="themes/eclipse/css/dark/archi-dark-styling.css">
31+
<themeid
32+
refid="org.eclipse.e4.ui.css.theme.e4_dark">
33+
</themeid>
34+
</stylesheet>
35+
<stylesheet
36+
uri="themes/archi/css/common/archi-globalstyle.css">
37+
<themeid
38+
refid="org.eclipse.e4.ui.css.theme.e4_classic">
39+
</themeid>
40+
</stylesheet>
41+
<stylesheet
42+
uri="themes/eclipse/css/system/archi-light-styling.css">
43+
<themeid
44+
refid="org.eclipse.e4.ui.css.theme.e4_system">
45+
</themeid>
46+
</stylesheet>
47+
<stylesheet
48+
os="macosx"
49+
uri="themes/eclipse/css/system/archi-system-mac.css">
50+
<themeid
51+
refid="org.eclipse.e4.ui.css.theme.e4_system">
52+
</themeid>
53+
</stylesheet>
54+
</extension>
10955
<extension
11056
point="org.eclipse.ui.themes">
11157
<themeElementCategory
11258
id="com.archimatetool.editor.themes"
113-
label="%themeCategory.archi">
59+
label="%themeCategory.archi"
60+
parentId="org.eclipse.ui.themes.CssTheme">
11461
</themeElementCategory>
11562
<colorDefinition
11663
categoryId="com.archimatetool.editor.themes"

‎com.archimatetool.editor.themes/themes/eclipse/css/common/e4_globalstyle.css

-24
This file was deleted.

‎com.archimatetool.editor.themes/themes/eclipse/css/dark/e4-dark-drag-styling.css

-25
This file was deleted.

0 commit comments

Comments
 (0)