Remove explicit hover and disabled icons from terminal bundles

The recently added terminal bundles contain explicit icons for the hover
and disabled state of UI elements. The hover icons are equal to the
ordinary enabled icons and the disabled icons can be generated by SWT
on-the-fly.

This change removes the just added hover and disabled icons. The hover
icons are removed from the image registry and the registry's disabled
icons are generated on-the-fly instead.

Author: HeikoKlare

terminal/bundles/org.eclipse.terminal.control/icons/clcl16/clear_co.gif

@@ -21,20 +21,21 @@
 package org.eclipse.terminal.control.actions;
 
 import org.eclipse.terminal.control.ITerminalViewControl;
+import org.eclipse.terminal.internal.control.impl.ImageConsts;
 
 public class TerminalActionClearAll extends AbstractTerminalAction {
 	public TerminalActionClearAll() {
 		super(TerminalActionClearAll.class.getName());
 
-		setupAction(ActionMessages.CLEARALL, ActionMessages.CLEARALL, ImageConsts.IMAGE_CLCL_CLEAR_ALL,
-				ImageConsts.IMAGE_ELCL_CLEAR_ALL, ImageConsts.IMAGE_DLCL_CLEAR_ALL, false);
+		setupAction(ActionMessages.CLEARALL, ActionMessages.CLEARALL, null, ImageConsts.IMAGE_ELCL_CLEAR_ALL,
+				ImageConsts.IMAGE_DLCL_CLEAR_ALL, false);
 	}
 
 	public TerminalActionClearAll(ITerminalViewControl target) {
 		super(target, TerminalActionClearAll.class.getName());
 
-		setupAction(ActionMessages.CLEARALL, ActionMessages.CLEARALL, ImageConsts.IMAGE_CLCL_CLEAR_ALL,
-				ImageConsts.IMAGE_ELCL_CLEAR_ALL, ImageConsts.IMAGE_DLCL_CLEAR_ALL, false);
+		setupAction(ActionMessages.CLEARALL, ActionMessages.CLEARALL, null, ImageConsts.IMAGE_ELCL_CLEAR_ALL,
+				ImageConsts.IMAGE_DLCL_CLEAR_ALL, false);
 	}
 
 	@Override

terminal/bundles/org.eclipse.terminal.control/icons/dlcl16/clear_co.gif

@@ -17,16 +17,12 @@
  * Martin Oberhuber (Wind River) - fixed copyright headers and beautified
  * Anna Dushistova (MontaVista) - [227537] moved actions from terminal.view to terminal plugin
  *******************************************************************************/
-package org.eclipse.terminal.control.actions;
+package org.eclipse.terminal.internal.control.impl;
 
 public interface ImageConsts {
 	public final static String IMAGE_DIR_ROOT = "icons/"; //$NON-NLS-1$
-	public final static String IMAGE_DIR_LOCALTOOL = IMAGE_DIR_ROOT + "clcl16/"; // basic colors - size 16x16 //$NON-NLS-1$
-	public final static String IMAGE_DIR_DLCL = IMAGE_DIR_ROOT + "dlcl16/"; // disabled - size 16x16 //$NON-NLS-1$
 	public final static String IMAGE_DIR_ELCL = IMAGE_DIR_ROOT + "elcl16/"; // enabled - size 16x16 //$NON-NLS-1$
 
-	public static final String IMAGE_CLCL_CLEAR_ALL = "ImageClclClearAll"; //$NON-NLS-1$
-
 	public static final String IMAGE_DLCL_CLEAR_ALL = "ImageDlclClearAll"; //$NON-NLS-1$
 
 	public static final String IMAGE_ELCL_CLEAR_ALL = "ImageElclClearAll"; //$NON-NLS-1$

terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/control/actions/TerminalActionClearAll.java

@@ -25,7 +25,7 @@
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.terminal.control.actions.ImageConsts;
+import org.eclipse.swt.SWT;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
 
@@ -71,15 +71,12 @@ public static boolean isOptionEnabled(String strOption) {
 	@Override
 	protected void initializeImageRegistry(ImageRegistry imageRegistry) {
 		try {
-			// Local toolbars
-			putImageInRegistry(imageRegistry, ImageConsts.IMAGE_CLCL_CLEAR_ALL,
-					ImageConsts.IMAGE_DIR_LOCALTOOL + "clear_co.gif"); //$NON-NLS-1$
 			// Enabled local toolbars
 			putImageInRegistry(imageRegistry, ImageConsts.IMAGE_ELCL_CLEAR_ALL,
 					ImageConsts.IMAGE_DIR_ELCL + "clear_co.gif"); //$NON-NLS-1$
 			// Disabled local toolbars
-			putImageInRegistry(imageRegistry, ImageConsts.IMAGE_DLCL_CLEAR_ALL,
-					ImageConsts.IMAGE_DIR_DLCL + "clear_co.gif"); //$NON-NLS-1$
+			putDisabledImageInRegistry(imageRegistry, ImageConsts.IMAGE_ELCL_CLEAR_ALL,
+					ImageConsts.IMAGE_DLCL_CLEAR_ALL);
 		} catch (MalformedURLException malformedURLException) {
 			malformedURLException.printStackTrace();
 		}
@@ -91,4 +88,10 @@ protected void putImageInRegistry(ImageRegistry imageRegistry, String strKey, St
 		ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(url);
 		imageRegistry.put(strKey, imageDescriptor);
 	}
+
+	private void putDisabledImageInRegistry(ImageRegistry imageRegistry, String enabledKey, String disabledKey)
+			throws MalformedURLException {
+		ImageDescriptor enabledImageDescriptor = imageRegistry.getDescriptor(enabledKey);
+		imageRegistry.put(disabledKey, ImageDescriptor.createWithFlags(enabledImageDescriptor, SWT.IMAGE_DISABLE));
+	}
 }