diff --git a/core/org.eclipse.cdt.ui/icons/dlcl16/config-tool.gif b/core/org.eclipse.cdt.ui/icons/dlcl16/config-tool.gif index c984fba7039..4539ebd91f4 100644 Binary files a/core/org.eclipse.cdt.ui/icons/dlcl16/config-tool.gif and b/core/org.eclipse.cdt.ui/icons/dlcl16/config-tool.gif differ diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractExportTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractExportTab.java index 0b83fba5148..27818b238fb 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractExportTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/AbstractExportTab.java @@ -60,11 +60,11 @@ public abstract class AbstractExportTab extends AbstractCPropertyTab { // boolean savedShowBI = false; // List incs; + public static final Image IMG_FS = CPluginImages.get(CPluginImages.IMG_FILESYSTEM); + public static final Image IMG_WS = CPluginImages.get(CPluginImages.IMG_WORKSPACE); + public static final Image IMG_MK = CPluginImages.get(CPluginImages.IMG_OBJS_MACRO); private static final String ALL = "[All]"; //$NON-NLS-1$ private static final String LIST = "[List]"; //$NON-NLS-1$ - private static final Image IMG_FS = CPluginImages.get(CPluginImages.IMG_FILESYSTEM); - private static final Image IMG_WS = CPluginImages.get(CPluginImages.IMG_WORKSPACE); - private static final Image IMG_MK = CPluginImages.get(CPluginImages.IMG_OBJS_MACRO); private static Map names_l = new HashMap(); private static Map names_t = new HashMap(); private static String[] names_ls; @@ -158,8 +158,8 @@ public abstract class AbstractExportTab extends AbstractCPropertyTab { * Methods to be implemented in descendants */ public abstract int getKind(); - public abstract ICLanguageSettingEntry doAdd(String s1, String s2); - public abstract ICLanguageSettingEntry doEdit(String s1, String s2); + public abstract ICLanguageSettingEntry doAdd(String s1, String s2, boolean isWsp); + public abstract ICLanguageSettingEntry doEdit(String s1, String s2, boolean isWsp); public abstract boolean hasValues(); /** @@ -175,6 +175,7 @@ public abstract class AbstractExportTab extends AbstractCPropertyTab { ICExternalSetting[] vals = cfg.getExternalSettings(); if (vals == null || vals.length == 0) { tv.setInput(null); + setButtons(); return; } for (int i=0; i 0 ) { toAll = dlg.check1; int flags = 0; - if (dlg.text1.equals(dlg.text2)) { // see IncludeDialog why. + if (dlg.check2) { // isWsp flags = ICSettingEntry.VALUE_WORKSPACE_PATH; } return new CIncludePathEntry(dlg.text1, flags); @@ -50,7 +50,7 @@ public class IncludeTab extends AbstractLangsListTab { (ent.getFlags() & ICSettingEntry.VALUE_WORKSPACE_PATH)); if (dlg.open()) { int flags = 0; - if (dlg.text1.equals(dlg.text2)) flags = ICSettingEntry.VALUE_WORKSPACE_PATH; + if (dlg.check2) flags = ICSettingEntry.VALUE_WORKSPACE_PATH; return new CIncludePathEntry(dlg.text1, flags); } else return null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryPathTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryPathTab.java index 0e26e671fd3..8aefca012c8 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryPathTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryPathTab.java @@ -48,7 +48,7 @@ public class LibraryPathTab extends AbstractLangsListTab implements IPathEntrySt EMPTY_STR, getResDesc().getConfiguration(), 0); if (dlg.open() && dlg.text1.trim().length() > 0 ) { int flags = 0; - if (dlg.text1.equals(dlg.text2)) flags = ICSettingEntry.VALUE_WORKSPACE_PATH; + if (dlg.check2) flags = ICSettingEntry.VALUE_WORKSPACE_PATH; return new CLibraryPathEntry(dlg.text1, flags); } return null; @@ -62,7 +62,7 @@ public class LibraryPathTab extends AbstractLangsListTab implements IPathEntrySt (ent.getFlags() & ICSettingEntry.VALUE_WORKSPACE_PATH)); if (dlg.open() && dlg.text1.trim().length() > 0 ) { int flags = 0; - if (dlg.text1.equals(dlg.text2)) flags = ICSettingEntry.VALUE_WORKSPACE_PATH; + if (dlg.check2) flags = ICSettingEntry.VALUE_WORKSPACE_PATH; return new CLibraryPathEntry(dlg.text1, flags); } return null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryTab.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryTab.java index d8111a312c7..c9c8d0b6c7a 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryTab.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/LibraryTab.java @@ -48,7 +48,7 @@ public class LibraryTab extends AbstractLangsListTab implements IPathEntryStoreL EMPTY_STR, getResDesc().getConfiguration(), 0); if (dlg.open() && dlg.text1.trim().length() > 0 ) { int flags = 0; - if (dlg.text1.equals(dlg.text2)) flags = ICSettingEntry.VALUE_WORKSPACE_PATH; + if (dlg.check2) flags = ICSettingEntry.VALUE_WORKSPACE_PATH; return new CLibraryFileEntry(dlg.text1, flags); } return null; @@ -62,7 +62,7 @@ public class LibraryTab extends AbstractLangsListTab implements IPathEntryStoreL (ent.getFlags() & ICSettingEntry.VALUE_WORKSPACE_PATH)); if (dlg.open() && dlg.text1.trim().length() > 0 ) { int flags = 0; - if (dlg.text1.equals(dlg.text2)) flags = ICSettingEntry.VALUE_WORKSPACE_PATH; + if (dlg.check2) flags = ICSettingEntry.VALUE_WORKSPACE_PATH; return new CLibraryFileEntry(dlg.text1, flags); } return null; diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties index 4b0abb9f176..5a8a886e93e 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/newui/PluginResources.properties @@ -479,6 +479,12 @@ ExpDialog.0=To all configurations ExpDialog.1=Save to: ExpDialog.2=Languages ExpDialog.3=Content types +ExpDialog.4=Is workspace path +ExpDialog.5=Apply to all +ExpDialog.6=Name: +ExpDialog.7=Value: +ExpDialog.8=Name cannot be empty \! +ExpDialog.9=The same name already exists \! ConfigMultiSelectionDialog.0=Select configurations ConfigMultiSelectionDialog.1=At least 2 configurations should be selected SymbolDialog.0=Name: