diff --git a/bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringPluginImages.java b/bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringPluginImages.java index 24a34778aac..70461c60642 100644 --- a/bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringPluginImages.java +++ b/bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/RefactoringPluginImages.java @@ -140,10 +140,6 @@ public static void setLocalImageDescriptors(IAction action, String iconName) { //---- Helper methods to access icons on the file system -------------------------------------- private static void setImageDescriptors(IAction action, String type, String relPath) { - ImageDescriptor id= create("d" + type, relPath, false); //$NON-NLS-1$ - if (id != null) - action.setDisabledImageDescriptor(id); - ImageDescriptor descriptor= create("e" + type, relPath, true); //$NON-NLS-1$ action.setImageDescriptor(descriptor); } diff --git a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPluginImages.java b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPluginImages.java index 902c63481fd..cc3ef0e75b8 100644 --- a/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPluginImages.java +++ b/bundles/org.eclipse.search/search/org/eclipse/search/internal/ui/SearchPluginImages.java @@ -109,8 +109,6 @@ private static ImageDescriptor create(String prefix, String name, boolean useMis public static void setImageDescriptors(IAction action, String type, String relPath) { relPath= relPath.substring(NAME_PREFIX_LENGTH); - action.setDisabledImageDescriptor(create("d" + type, relPath, false)); //$NON-NLS-1$ - ImageDescriptor desc= create("e" + type, relPath, true); //$NON-NLS-1$ action.setImageDescriptor(desc); } diff --git a/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java b/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java index f564dadd3d5..5edd8d59a31 100644 --- a/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java +++ b/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchAdvisor.java @@ -702,31 +702,17 @@ protected static void setWorkspaceNameDefault() { protected void declareWorkbenchImages() { final String ICONS_PATH = "$nl$/icons/full/";//$NON-NLS-1$ - final String PATH_ELOCALTOOL = ICONS_PATH + "elcl16/"; // Enabled //$NON-NLS-1$ - - // toolbar - // icons. - final String PATH_DLOCALTOOL = ICONS_PATH + "dlcl16/"; // Disabled //$NON-NLS-1$ - // //$NON-NLS-1$ - // toolbar - // icons. - final String PATH_ETOOL = ICONS_PATH + "etool16/"; // Enabled toolbar //$NON-NLS-1$ - // //$NON-NLS-1$ - // icons. - final String PATH_DTOOL = ICONS_PATH + "dtool16/"; // Disabled toolbar //$NON-NLS-1$ - // //$NON-NLS-1$ - // icons. - final String PATH_OBJECT = ICONS_PATH + "obj16/"; // Model object //$NON-NLS-1$ - // //$NON-NLS-1$ - // icons - final String PATH_WIZBAN = ICONS_PATH + "wizban/"; // Wizard //$NON-NLS-1$ - // //$NON-NLS-1$ - // icons - + // Local toolbar icons + final String PATH_ELOCALTOOL = ICONS_PATH + "elcl16/"; //$NON-NLS-1$ + // Toolbar icons + final String PATH_ETOOL = ICONS_PATH + "etool16/"; //$NON-NLS-1$ + // Model objects + final String PATH_OBJECT = ICONS_PATH + "obj16/"; //$NON-NLS-1$ + // Wizard icons + final String PATH_WIZBAN = ICONS_PATH + "wizban/"; //$NON-NLS-1$ // View icons final String PATH_EVIEW= ICONS_PATH + "eview16/"; //$NON-NLS-1$ - Bundle ideBundle = Platform.getBundle(IDEWorkbenchPlugin.IDE_WORKBENCH); declareWorkbenchImage(ideBundle, @@ -734,20 +720,16 @@ protected void declareWorkbenchImages() { + "build_exec.svg", false); //$NON-NLS-1$ declareWorkbenchImage(ideBundle, IDEInternalWorkbenchImages.IMG_ETOOL_BUILD_EXEC_HOVER, - PATH_ETOOL + "build_exec.svg", false); //$NON-NLS-1$ - declareWorkbenchImage(ideBundle, IDEInternalWorkbenchImages.IMG_ETOOL_BUILD_EXEC_DISABLED, - PATH_DTOOL + "build_exec.png", false); //$NON-NLS-1$ + PATH_ETOOL + "build_exec.svg", false); //$NON-NLS-1$ declareWorkbenchImage(ideBundle, IDEInternalWorkbenchImages.IMG_ETOOL_SEARCH_SRC, PATH_ETOOL + "search_src.svg", false); //$NON-NLS-1$ declareWorkbenchImage(ideBundle, IDEInternalWorkbenchImages.IMG_ETOOL_SEARCH_SRC_HOVER, - PATH_ETOOL + "search_src.svg", false); //$NON-NLS-1$ - declareWorkbenchImage(ideBundle, IDEInternalWorkbenchImages.IMG_ETOOL_SEARCH_SRC_DISABLED, - PATH_DTOOL + "search_src.png", false); //$NON-NLS-1$ + PATH_ETOOL + "search_src.svg", false); //$NON-NLS-1$ declareWorkbenchImage(ideBundle, IDEInternalWorkbenchImages.IMG_ETOOL_NEXT_NAV, PATH_ETOOL @@ -812,11 +794,8 @@ protected void declareWorkbenchImages() { // Quick fix icons declareWorkbenchImage(ideBundle, IDEInternalWorkbenchImages.IMG_ELCL_QUICK_FIX_ENABLED, - PATH_ELOCALTOOL + "smartmode_co.svg", true); //$NON-NLS-1$ - - declareWorkbenchImage(ideBundle, IDEInternalWorkbenchImages.IMG_DLCL_QUICK_FIX_DISABLED, - PATH_DLOCALTOOL + "smartmode_co.png", true); //$NON-NLS-1$ + PATH_ELOCALTOOL + "smartmode_co.svg", true); //$NON-NLS-1$ declareWorkbenchImage(ideBundle, IDEInternalWorkbenchImages.IMG_OBJS_FIXABLE_WARNING, @@ -904,9 +883,18 @@ protected void declareWorkbenchImages() { */ protected void declareWorkbenchImage(Bundle ideBundle, String symbolicName, String path, boolean shared) { + declareWorkbenchImage(ideBundle, symbolicName, null, path, shared); + } + + private void declareWorkbenchImage(Bundle ideBundle, String symbolicName, String disabledSymbolicName, String path, + boolean shared) { URL url = FileLocator.find(ideBundle, IPath.fromOSString(path), null); ImageDescriptor desc = ImageDescriptor.createFromURL(url); getWorkbenchConfigurer().declareImage(symbolicName, desc, shared); + if (disabledSymbolicName != null) { + ImageDescriptor disabledDescriptor = ImageDescriptor.createWithFlags(desc, SWT.IMAGE_DISABLE); + getWorkbenchConfigurer().declareImage(disabledSymbolicName, disabledDescriptor, shared); + } } @Override diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/ExtendedMarkersView.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/ExtendedMarkersView.java index 6fd00a4b0c8..fae0d8d85b0 100644 --- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/ExtendedMarkersView.java +++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/views/markers/ExtendedMarkersView.java @@ -367,10 +367,6 @@ public void run() { if (id != null) { filterAction.setImageDescriptor(id); } - id = IDEWorkbenchPlugin.getIDEImageDescriptor("/dlcl16/filter_ps.png"); //$NON-NLS-1$ - if (id != null) { - filterAction.setDisabledImageDescriptor(id); - } } /** diff --git a/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ResourceMgmtActionProvider.java b/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ResourceMgmtActionProvider.java index 69cfc04ca0d..df0b7ce6151 100644 --- a/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ResourceMgmtActionProvider.java +++ b/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ResourceMgmtActionProvider.java @@ -251,7 +251,6 @@ public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException { job.schedule(); } }; - refreshAction.setDisabledImageDescriptor(getImageDescriptor("dlcl16/refresh_nav.png"));//$NON-NLS-1$ refreshAction.setImageDescriptor(getImageDescriptor("elcl16/refresh_nav.svg"));//$NON-NLS-1$ refreshAction.setActionDefinitionId(IWorkbenchCommandConstants.FILE_REFRESH); diff --git a/tests/org.eclipse.ui.tests.views.properties.tabbed/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests.views.properties.tabbed/META-INF/MANIFEST.MF index fa91168a549..1365c01fc77 100644 --- a/tests/org.eclipse.ui.tests.views.properties.tabbed/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.ui.tests.views.properties.tabbed/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Plugin.name Bundle-SymbolicName: org.eclipse.ui.tests.views.properties.tabbed;singleton:=true -Bundle-Version: 3.8.400.qualifier +Bundle-Version: 3.8.500.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/dynamic/views/DynamicTestsView.java b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/dynamic/views/DynamicTestsView.java index c47230611f4..55d47f84337 100644 --- a/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/dynamic/views/DynamicTestsView.java +++ b/tests/org.eclipse.ui.tests.views.properties.tabbed/src/org/eclipse/ui/tests/views/properties/tabbed/dynamic/views/DynamicTestsView.java @@ -161,7 +161,6 @@ public void run() { }; staticAction.setToolTipText(staticText); staticAction.setImageDescriptor(imageDescriptor); - staticAction.setDisabledImageDescriptor(imageDescriptor); dynamicSectionsAction = new Action(dynamicSectionsText, IAction.AS_CHECK_BOX) { @@ -178,7 +177,6 @@ public void run() { }; dynamicSectionsAction.setToolTipText(dynamicSectionsText); dynamicSectionsAction.setImageDescriptor(imageDescriptor); - dynamicSectionsAction.setDisabledImageDescriptor(imageDescriptor); dynamicTabsAction = new Action(dynamicTabsText, IAction.AS_CHECK_BOX) { @Override