Bug 562867 - Retire huge description box in Appearance preference page

Change-Id: I1f5a8268548f4d6a858a3bcb23d945f34f06463c
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>

3 files changed, 0 insertions, 41 deletions

diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java
index fd3538bea20..ec0f0847be4 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java
@@ -459,7 +459,6 @@ public class WorkbenchMessages extends NLS {
 	// --- Appearance ---
 	public static String ViewsPreferencePage_Theme;
 	public static String ViewsPreference_currentTheme;
-	public static String ViewsPreference_currentThemeDescription;
 	public static String ViewsPreference_currentThemeFormat;
 	public static String ViewsPreference_useRoundTabs;
 	public static String ViewsPreference_visibleTabs_description;
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewsPreferencePage.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewsPreferencePage.java
index 004805b56a0..7c60019e4d6 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewsPreferencePage.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewsPreferencePage.java
@@ -57,7 +57,6 @@ import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
@@ -65,7 +64,6 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferenceConstants;
 import org.eclipse.ui.IWorkbenchPreferencePage;
@@ -95,7 +93,6 @@ public class ViewsPreferencePage extends PreferencePage implements IWorkbenchPre
 	private Button enableMru;
 	private Button useColoredLabels;
 
-	private Text colorsAndFontsThemeDescriptionText;
 	private ComboViewer colorsAndFontsThemeCombo;
 	private ControlDecoration colorFontsDecorator;
 	private ColorsAndFontsTheme currentColorsAndFontsTheme;
@@ -156,7 +153,6 @@ public class ViewsPreferencePage extends PreferencePage implements IWorkbenchPre
 
 		currentColorsAndFontsTheme = getCurrentColorsAndFontsTheme();
 		createColorsAndFontsThemeCombo(comp);
-		createColorsAndFontsThemeDescriptionText(comp);
 
 		createThemeIndependentComposits(comp);
 
@@ -388,31 +384,10 @@ public class ViewsPreferencePage extends PreferencePage implements IWorkbenchPre
 				colorFontsDecorator.show();
 			} else
 				colorFontsDecorator.hide();
-			refreshColorsAndFontsThemeDescriptionText(colorsAndFontsTheme);
 			setColorsAndFontsTheme(colorsAndFontsTheme);
 		});
 	}
 
-	/**
-	 * Create the text box that will contain the current theme description text (if
-	 * any).
-	 *
-	 * @param parent the parent <code>Composite</code>.
-	 */
-	private void createColorsAndFontsThemeDescriptionText(Composite parent) {
-		new Label(parent, SWT.NONE).setText(WorkbenchMessages.ViewsPreference_currentThemeDescription);
-
-		colorsAndFontsThemeDescriptionText = new Text(parent,
-				SWT.H_SCROLL | SWT.V_SCROLL | SWT.READ_ONLY | SWT.BORDER | SWT.WRAP);
-		GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, true);
-		// give a height hint that'll show at least two lines (and let the
-		// scroll bars draw nicely if necessary)
-		GC gc = new GC(parent);
-		layoutData.heightHint = Dialog.convertHeightInCharsToPixels(gc.getFontMetrics(), 2);
-		gc.dispose();
-		colorsAndFontsThemeDescriptionText.setLayoutData(layoutData);
-	}
-
 	@SuppressWarnings("unchecked")
 	private void selectColorsAndFontsTheme(String colorAndFontThemeId) {
 		if (colorAndFontThemeId == null) {
@@ -490,20 +465,6 @@ public class ViewsPreferencePage extends PreferencePage implements IWorkbenchPre
 		return result;
 	}
 
-	private void refreshColorsAndFontsThemeDescriptionText(ColorsAndFontsTheme theme) {
-		String description = ""; //$NON-NLS-1$
-		if (theme != null) {
-			IThemeDescriptor[] descs = WorkbenchPlugin.getDefault().getThemeRegistry().getThemes();
-			for (IThemeDescriptor desc : descs) {
-				if (desc.getId().equals(theme.getId()) && desc.getDescription() != null) {
-					description = desc.getDescription();
-					break;
-				}
-			}
-		}
-		colorsAndFontsThemeDescriptionText.setText(description);
-	}
-
 	private ColorsAndFontsTheme getSelectedColorsAndFontsTheme() {
 		return (ColorsAndFontsTheme) colorsAndFontsThemeCombo.getStructuredSelection().getFirstElement();
 	}
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/messages.properties b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/messages.properties
index 310a9a98d56..e46681a9067 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/messages.properties
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/messages.properties
@@ -430,7 +430,6 @@ WorkbenchPreference_HeapStatusButtonToolTip = Show the heap status area on the b
 # --- Appearance ---
 ViewsPreferencePage_Theme=&Theme:
 ViewsPreference_currentTheme = &Color and Font theme:
-ViewsPreference_currentThemeDescription = Descr&iption:
 ViewsPreference_currentThemeFormat = {0} (current)
 ViewsPreference_useRoundTabs=&Use round tabs
 ViewsPreference_useColoredLabels = &Use mixed fonts and colors for labels