Style workspace selection dialog with default theme setting

Author: vogella

bundles/org.eclipse.ui.ide.application/META-INF/MANIFEST.MF

@@ -19,7 +19,8 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.21.0,4.0.0)",
  org.eclipse.e4.core.services;bundle-version="2.4.0",
  org.eclipse.e4.core.contexts;bundle-version="[1.12.0,2.0.0)",
  org.eclipse.urischeme;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.e4.ui.di
+ org.eclipse.e4.ui.di,
+ org.eclipse.e4.ui.css.swt.theme
 Export-Package: org.eclipse.ui.internal.ide.application;x-internal:=true,
  org.eclipse.ui.internal.ide.application.addons;x-internal:=true,
  org.eclipse.ui.internal.ide.application.dialogs;x-internal:=true

bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java

@@ -42,6 +42,9 @@
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.core.runtime.preferences.ConfigurationScope;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
+import org.eclipse.e4.ui.css.swt.theme.IThemeEngine;
+import org.eclipse.e4.ui.css.swt.theme.IThemeManager;
 import org.eclipse.equinox.app.IApplication;
 import org.eclipse.equinox.app.IApplicationContext;
 import org.eclipse.jface.dialogs.IDialogConstants;
@@ -71,6 +74,9 @@
 import org.eclipse.ui.internal.ide.StatusUtil;
 import org.eclipse.ui.preferences.ScopedPreferenceStore;
 import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
 import org.osgi.framework.Version;
 
 /**
@@ -94,6 +100,8 @@ public class IDEApplication implements IApplication, IExecutableExtension {
 
 	private static final String USER_NAME = "user.name"; //$NON-NLS-1$
 
+	private IThemeEngine themeEngine;
+
 	// Use the branding plug-in of the platform feature since this is most likely
 	// to change on an update of the IDE.
 	private static final String WORKSPACE_CHECK_REFERENCE_BUNDLE_NAME = "org.eclipse.platform"; //$NON-NLS-1$
@@ -145,6 +153,31 @@ public Object start(IApplicationContext appContext) throws Exception {
 		Job.getJobManager().suspend();
 
 		Display display = createDisplay();
+
+		IEclipsePreferences configurationScopeNode = ConfigurationScope.INSTANCE
+				.getNode("org.eclipse.e4.ui.css.swt.theme"); //$NON-NLS-1$
+		String defaultThemeId = configurationScopeNode.get("themeid", null); //$NON-NLS-1$
+		if (defaultThemeId != null) {
+			Bundle bundle = FrameworkUtil.getBundle(IThemeManager.class);
+			if (bundle != null) {
+				BundleContext bundleContext = bundle.getBundleContext();
+				ServiceReference<IThemeManager> ref = bundleContext.getServiceReference(IThemeManager.class);
+				if (ref != null) {
+					try {
+						IThemeManager mgr = bundleContext.getService(ref);
+						if (mgr != null) {
+							themeEngine = mgr.getEngineForDisplay(display);
+							if (themeEngine != null) {
+								themeEngine.setTheme(defaultThemeId, false);
+							}
+						}
+					} finally {
+						bundleContext.ungetService(ref);
+					}
+				}
+			}
+		}
+
 		// processor must be created before we start event loop
 		DelayedEventsProcessor processor = new DelayedEventsProcessor(display);
 
@@ -587,6 +620,14 @@ protected Shell getParentShell() {
 				return null;
 			}
 
+			@Override
+			protected Control createContents(Composite parent) {
+				Control contents = super.createContents(parent);
+				if (themeEngine != null) {
+					themeEngine.applyStyles(getShell(), true);
+				}
+				return contents;
+			}
 		}.prompt(force);
 	}