diff --git a/bundles/org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF index f10c193edbe..779d1ad1941 100644 --- a/bundles/org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.e4.ui.css.swt.theme;singleton:=true -Bundle-Version: 0.15.0.qualifier +Bundle-Version: 0.15.100.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin diff --git a/bundles/org.eclipse.e4.ui.css.swt.theme/schema/org.eclipse.e4.ui.css.swt.theme.exsd b/bundles/org.eclipse.e4.ui.css.swt.theme/schema/org.eclipse.e4.ui.css.swt.theme.exsd index 8a0f8358ec6..5df13746187 100644 --- a/bundles/org.eclipse.e4.ui.css.swt.theme/schema/org.eclipse.e4.ui.css.swt.theme.exsd +++ b/bundles/org.eclipse.e4.ui.css.swt.theme/schema/org.eclipse.e4.ui.css.swt.theme.exsd @@ -239,8 +239,8 @@ A stylesheet contributed to all Systems: The CSS theme and the legacy Colors and Fonts association: <pre> <themeAssociation - themeId="org.eclipse.e4.ui.css.theme.e4_classic" - colorAndFontId="org.eclipse.ui.defaultTheme"> + themeId="org.eclipse.e4.ui.css.theme.e4_default" + colorAndFontId="org.eclipse.ui.defaultTheme"> </themeassociation> </pre> </p> diff --git a/bundles/org.eclipse.e4.ui.css.swt.theme/src/org/eclipse/e4/ui/css/swt/internal/theme/ThemeEngine.java b/bundles/org.eclipse.e4.ui.css.swt.theme/src/org/eclipse/e4/ui/css/swt/internal/theme/ThemeEngine.java index 1b80e53e34e..2fd6ad064a2 100644 --- a/bundles/org.eclipse.e4.ui.css.swt.theme/src/org/eclipse/e4/ui/css/swt/internal/theme/ThemeEngine.java +++ b/bundles/org.eclipse.e4.ui.css.swt.theme/src/org/eclipse/e4/ui/css/swt/internal/theme/ThemeEngine.java @@ -578,15 +578,6 @@ void copyFile(String from, String to) throws IOException { public void restore(String alternateTheme) { String prefThemeId = getPreferenceThemeId(); - // Bug 562794, 563601: Eclipse once contained two identical themes named - // "Classic" and "Windows Classic" and the second was removed with bug 562794. - // An old workspace using the removed "Windows Classic" theme would be reseted - // to the default theme on update. Since both themes are identical we silently - // change the theme to the remaining "Classic" theme and don't disturb the user. - if ("org.eclipse.e4.ui.css.theme.e4_classic6.0,6.1,6.2,6.3".equals(prefThemeId)) { //$NON-NLS-1$ - prefThemeId = "org.eclipse.e4.ui.css.theme.e4_classic"; //$NON-NLS-1$ - } - // use theme from preferences if it exists if (prefThemeId != null) { for (ITheme t : getThemes()) { diff --git a/bundles/org.eclipse.ui.themes/css/e4_classic.css b/bundles/org.eclipse.ui.themes/css/e4_classic.css deleted file mode 100644 index 776ff662336..00000000000 --- a/bundles/org.eclipse.ui.themes/css/e4_classic.css +++ /dev/null @@ -1,68 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010, 2014 IBM Corporation and others. - * - * This program and the accompanying materials - * are made available under the terms of the Eclipse Public License 2.0 - * which accompanies this distribution, and is available at - * https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * IBM Corporation - initial API and implementation - * Lars Vogel - Bug 420836 - *******************************************************************************/ - -.MPart.busy { - font-style: italic; -} - -.MPart.highlighted { - font-weight: bold; -} - -.MPartStack, .MPart { - font-family: '#org-eclipse-ui-workbench-TAB_TEXT_FONT'; -} - -CTabItem:selected { - color: '#org-eclipse-ui-workbench-ACTIVE_TAB_TEXT_COLOR'; -} - -.MTrimmedWindow { - margin-top: 0px; - margin-bottom: 0px; - margin-left: 2px; - margin-right: 2px; -} - -.MPartStack { - swt-tab-renderer: null; - swt-selected-tabs-background: '#org-eclipse-ui-workbench-INACTIVE_TAB_BG_START' '#org-eclipse-ui-workbench-INACTIVE_TAB_BG_END' 100%; - swt-simple: false; - color: '#org-eclipse-ui-workbench-INACTIVE_TAB_TEXT_COLOR'; -} - -.MPartStack.active { - swt-selected-tabs-background: '#org-eclipse-ui-workbench-ACTIVE_TAB_BG_START' '#org-eclipse-ui-workbench-ACTIVE_TAB_BG_END' 100%; -} - -.MPartStack.active.noFocus { - swt-selected-tabs-background: '#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_BG_START' '#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_BG_END' 100%; -} - -.MPartStack.active.noFocus > CTabItem:selected { - color: '#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_TEXT_COLOR'; -} - -.DragFeedback { - background-color: COLOR-WIDGET-NORMAL-SHADOW; -} - -.ModifiedDragFeedback { - background-color: #A0A000; -} - -#org-eclipse-ui-editorss { - swt-tab-height: 8px; -} diff --git a/bundles/org.eclipse.ui.themes/plugin.properties b/bundles/org.eclipse.ui.themes/plugin.properties index 3cde2c3aa23..2479e46ebf4 100644 --- a/bundles/org.eclipse.ui.themes/plugin.properties +++ b/bundles/org.eclipse.ui.themes/plugin.properties @@ -15,7 +15,6 @@ Plugin.name = Eclipse SDK Themes Plugin.providerName = Eclipse.org -theme.classic = Classic theme.light = Light theme.dark = Dark diff --git a/bundles/org.eclipse.ui.themes/plugin.xml b/bundles/org.eclipse.ui.themes/plugin.xml index ec8a70d4f24..d4dab3dd42c 100644 --- a/bundles/org.eclipse.ui.themes/plugin.xml +++ b/bundles/org.eclipse.ui.themes/plugin.xml @@ -3,11 +3,6 @@ - - - -