new images from Dave Daoust

build/org.eclipse.cdt.make.ui/plugin.xml

@@ -33,7 +33,7 @@
          point="org.eclipse.ui.newWizards">
       <wizard
             name="%WizardNewCMakeProject.name"
-            icon="icons/ctool16/newc_app.gif"
+            icon="icons/etool16/newc_app.gif"
             category="org.eclipse.cdt.ui.newCWizards"
             class="org.eclipse.cdt.make.ui.wizards.NewMakeCProjectWizard"
             project="true"
@@ -45,7 +45,7 @@
       </wizard>
       <wizard
             name="%WizardConvertMakeProject.name"
-            icon="icons/ctool16/convert-normal.gif"
+            icon="icons/etool16/convert-normal.gif"
             category="org.eclipse.cdt.ui.newCWizards"
             class="org.eclipse.cdt.make.ui.wizards.ConvertToMakeProjectWizard"
             finalPerspective="org.eclipse.cdt.ui.CPerspective"
@@ -60,7 +60,7 @@
 <!-- For C++ Wizards -->
       <wizard
             name="%WizardNewCCMakeProject.name"
-            icon="icons/ctool16/newcc_app.gif"
+            icon="icons/etool16/newcc_app.gif"
             category="org.eclipse.cdt.ui.newCCWizards"
             class="org.eclipse.cdt.make.ui.wizards.NewMakeCCProjectWizard"
             project="true"
@@ -72,7 +72,7 @@
       </wizard>
       <wizard
             name="%WizardConvertMakeProject.name"
-            icon="icons/ctool16/convert-normal.gif"
+            icon="icons/etool16/convert-normal.gif"
             category="org.eclipse.cdt.ui.newCCWizards"
             class="org.eclipse.cdt.make.ui.wizards.ConvertToMakeProjectWizard"
             finalPerspective="org.eclipse.cdt.ui.CPerspective"
@@ -227,7 +227,7 @@
                value="org.eclipse.cdt.make.core.makeNature">
          </filter>
       </page> 
-      <!-- page
+      <!--page
             objectClass="org.eclipse.cdt.core.model.ICContainer"
             name="%IncludeSymbolProperties.name"
             class="org.eclipse.cdt.internal.ui.dialogs.cpaths.IncludesSymbolsPropertyPage"
@@ -246,7 +246,7 @@
                name="projectNature"
                value="org.eclipse.cdt.make.core.makeNature">
          </filter>
-      </page -->
+      </page-->
       <page
             objectClass="org.eclipse.core.resources.IProject"
             adaptable="true"
@@ -268,7 +268,7 @@
       </category>
       <view
             name="%ViewMake.name"
-            icon="icons/cview16/make_target.gif"
+            icon="icons/view16/make_target.gif"
             category="org.eclipse.cdt.make.ui"
             class="org.eclipse.cdt.make.ui.views.MakeView"
             id="org.eclipse.cdt.make.ui.views.MakeView">
@@ -281,7 +281,7 @@
             id="org.eclipse.cdt.make.ui.updateActionSet">
          <action
                label="%ActionMakeUpdate.label"
-               icon="icons/ctool16/update_old.gif"
+               icon="icons/etool16/update_old.gif"
                tooltip="%ActionMakeUpdate.tooltip"
                class="org.eclipse.cdt.make.ui.actions.UpdateMakeProjectAction"
                toolbarPath="Normal"
@@ -357,7 +357,7 @@
          point="org.eclipse.ui.editors">
       <editor
             name="%MakefileEditor.name"
-            icon="icons/obj16/makefile.gif"
+            icon="icons/etool16/makefile.gif"
             extensions="mk"
             filenames="Makefile,makefile,GNUMakefile"
             contributorClass="org.eclipse.cdt.make.internal.ui.editor.MakefileEditorActionContributor"

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeUIImages.java

@@ -77,6 +77,9 @@ public class MakeUIImages {
 
 	public static final String IMG_TOOLS_MAKEFILE_SEGMENT_EDIT= NAME_PREFIX + "segment_edit.gif"; //$NON-NLS-1$
 
+	public static final String IMG_OBJS_ENV_VAR = NAME_PREFIX + "environment_obj.gif"; //$NON-NLS-1$
+	public static final ImageDescriptor DESC_ENV_VAR = createManaged(OBJ, IMG_OBJS_ENV_VAR);
+
 	private static ImageDescriptor createManaged(String prefix, String name) {
 		return createManaged(imageRegistry, prefix, name);
 	}
@@ -112,7 +115,7 @@ public class MakeUIImages {
 	public static void setImageDescriptors(IAction action, String type, String relPath) {
 		relPath = relPath.substring(NAME_PREFIX_LENGTH);
 		action.setDisabledImageDescriptor(create("d" + type + "/", relPath)); //$NON-NLS-1$ //$NON-NLS-2$
-		action.setHoverImageDescriptor(create("c" + type + "/", relPath)); //$NON-NLS-1$ //$NON-NLS-2$
+//		action.setHoverImageDescriptor(create("e" + type + "/", relPath)); //$NON-NLS-1$ //$NON-NLS-2$
 		action.setImageDescriptor(create("e" + type + "/", relPath)); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/LexicalSortingAction.java

@@ -34,7 +34,7 @@ public class LexicalSortingAction extends Action {
 
 		setDescription(MakeUIPlugin.getResourceString(ACTION_NAME + ".description")); //$NON-NLS-1$
 		setToolTipText(MakeUIPlugin.getResourceString(ACTION_NAME + ".tooltip")); //$NON-NLS-1$
-		MakeUIImages.setImageDescriptors(this, "tool16", MakeUIImages.IMG_TOOLS_ALPHA_SORTING); //$NON-NLS-1$
+		MakeUIImages.setImageDescriptors(this, MakeUIImages.T_TOOL, MakeUIImages.IMG_TOOLS_ALPHA_SORTING);
 
 		fTreeViewer = treeViewer;
 		fSorter = new LexicalMakefileSorter();

launch/org.eclipse.cdt.launch/ChangeLog

@@ -1,3 +1,6 @@
+2005-04-07 David Daoust
+	Update icons
+	
 2005-02-24 Alain Magloire
 	Fix for PR 86443
 

launch/org.eclipse.cdt.launch/plugin.xml

@@ -56,17 +56,17 @@
    <extension
          point="org.eclipse.debug.ui.launchConfigurationTypeImages">
       <launchConfigurationTypeImage
-            icon="icons/c_app.gif"
+            icon="icons/obj16/c_app.gif"
             configTypeID="org.eclipse.cdt.launch.localCLaunch"
             id="org.eclipse.cdt.launch.localRunLaunchImage">
       </launchConfigurationTypeImage>
       <launchConfigurationTypeImage
-            icon="icons/c_app.gif"
+            icon="icons/obj16/c_app.gif"
             configTypeID="org.eclipse.cdt.launch.localAttachCLaunch"
             id="org.eclipse.cdt.launch.localAttachLaunchImage">
       </launchConfigurationTypeImage>
       <launchConfigurationTypeImage
-            icon="icons/c_app.gif"
+            icon="icons/obj16/c_app.gif"
             configTypeID="org.eclipse.cdt.launch.coreFileCLaunch"
             id="org.eclipse.cdt.launch.coreFileLaunchImage">
       </launchConfigurationTypeImage>
@@ -93,7 +93,7 @@
          point="org.eclipse.debug.ui.launchShortcuts">
       <shortcut
             label="%CApplicationShortcut.label"
-            icon="icons/c_app.gif"
+            icon="icons/obj16/c_app.gif"
             modes="run, debug"
             class="org.eclipse.cdt.launch.internal.CApplicationLaunchShortcut"
             id="org.eclipse.cdt.debug.ui.localCShortcut">

launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/ui/LaunchImages.java

@@ -32,7 +32,7 @@ public class LaunchImages {
 		fgIconBaseURL= Platform.getBundle(LaunchUIPlugin.getUniqueIdentifier()).getEntry("/icons/"); //$NON-NLS-1$
 	}	
 
-	private static final String T_TABS = "tabs/"; //$NON-NLS-1$
+	private static final String T_TABS = "view16/"; //$NON-NLS-1$
 	private static final String T_OBJS = "obj16/"; //$NON-NLS-1$
 
 	public static String IMG_VIEW_MAIN_TAB = NAME_PREFIX + "main_tab.gif"; //$NON-NLS-1$