diff options
author | Curtis D'Entremont | 2006-06-01 19:00:32 +0000 |
---|---|---|
committer | Curtis D'Entremont | 2006-06-01 19:00:32 +0000 |
commit | 76ae9ecb6202de1669f86c5cd28851baead3b2ca (patch) | |
tree | b6f2edfb56adb9a91058943999cf5280eeba904a /org.eclipse.ui.intro.universal/src | |
parent | dcf9b68c623c75db029aa3e96f2282995fd874b0 (diff) | |
download | eclipse.platform.ua-76ae9ecb6202de1669f86c5cd28851baead3b2ca.tar.gz eclipse.platform.ua-76ae9ecb6202de1669f86c5cd28851baead3b2ca.tar.xz eclipse.platform.ua-76ae9ecb6202de1669f86c5cd28851baead3b2ca.zip |
144549 [Intro] TVT3.2:TCT793: KO: Extra mnemonicv20060601
Diffstat (limited to 'org.eclipse.ui.intro.universal/src')
3 files changed, 36 insertions, 24 deletions
diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/Messages.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/Messages.java index 1d9d6e54b..85e39094b 100644 --- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/Messages.java +++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/Messages.java @@ -67,6 +67,13 @@ public class Messages extends NLS { public static String WelcomeCustomizationPreferencePage_webresources; public static String WelcomeCustomizationPreferencePage_migrate; public static String WelcomeCustomizationPreferencePage_applyToAll; + public static String WelcomeCustomizationPreferencePage_NoMnemonic_overview; + public static String WelcomeCustomizationPreferencePage_NoMnemonic_firststeps; + public static String WelcomeCustomizationPreferencePage_NoMnemonic_tutorials; + public static String WelcomeCustomizationPreferencePage_NoMnemonic_samples; + public static String WelcomeCustomizationPreferencePage_NoMnemonic_whatsnew; + public static String WelcomeCustomizationPreferencePage_NoMnemonic_webresources; + public static String WelcomeCustomizationPreferencePage_NoMnemonic_migrate; public static String ExtensionData_callout; public static String ExtensionData_low; public static String ExtensionData_medium; diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/Messages.properties b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/Messages.properties index 517cf6371..85660509a 100644 --- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/Messages.properties +++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/Messages.properties @@ -80,6 +80,13 @@ WelcomeCustomizationPreferencePage_serialize = Sa&ve As... WelcomeCustomizationPreferencePage_menu_top_left=Top Left WelcomeCustomizationPreferencePage_serializeTitle=Save the page layout data as a file WelcomeCustomizationPreferencePage_menu_available=Available +WelcomeCustomizationPreferencePage_NoMnemonic_overview= Overview +WelcomeCustomizationPreferencePage_NoMnemonic_firststeps= First Steps +WelcomeCustomizationPreferencePage_NoMnemonic_tutorials= Tutorials +WelcomeCustomizationPreferencePage_NoMnemonic_samples= Samples +WelcomeCustomizationPreferencePage_NoMnemonic_whatsnew= What's New +WelcomeCustomizationPreferencePage_NoMnemonic_webresources= Web Resources +WelcomeCustomizationPreferencePage_NoMnemonic_migrate= Migrate #Importance levels ExtensionData_callout=Callout diff --git a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/WelcomeCustomizationPreferencePage.java b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/WelcomeCustomizationPreferencePage.java index 2224a8995..6694a3fef 100644 --- a/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/WelcomeCustomizationPreferencePage.java +++ b/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/WelcomeCustomizationPreferencePage.java @@ -125,36 +125,45 @@ public class WelcomeCustomizationPreferencePage extends PreferencePage implement private static final RootPage ROOT_PAGE_TABLE[] = new RootPage[] { new RootPage(IUniversalIntroConstants.ID_OVERVIEW, - Messages.WelcomeCustomizationPreferencePage_overview), + Messages.WelcomeCustomizationPreferencePage_overview, + Messages.WelcomeCustomizationPreferencePage_NoMnemonic_overview), new RootPage(IUniversalIntroConstants.ID_FIRSTSTEPS, - Messages.WelcomeCustomizationPreferencePage_firststeps), + Messages.WelcomeCustomizationPreferencePage_firststeps, + Messages.WelcomeCustomizationPreferencePage_NoMnemonic_firststeps), new RootPage(IUniversalIntroConstants.ID_TUTORIALS, - Messages.WelcomeCustomizationPreferencePage_tutorials), + Messages.WelcomeCustomizationPreferencePage_tutorials, + Messages.WelcomeCustomizationPreferencePage_NoMnemonic_tutorials), new RootPage(IUniversalIntroConstants.ID_SAMPLES, - Messages.WelcomeCustomizationPreferencePage_samples), + Messages.WelcomeCustomizationPreferencePage_samples, + Messages.WelcomeCustomizationPreferencePage_NoMnemonic_samples), new RootPage(IUniversalIntroConstants.ID_WHATSNEW, - Messages.WelcomeCustomizationPreferencePage_whatsnew), + Messages.WelcomeCustomizationPreferencePage_whatsnew, + Messages.WelcomeCustomizationPreferencePage_NoMnemonic_whatsnew), new RootPage(IUniversalIntroConstants.ID_WEBRESOURCES, - Messages.WelcomeCustomizationPreferencePage_webresources), + Messages.WelcomeCustomizationPreferencePage_webresources, + Messages.WelcomeCustomizationPreferencePage_NoMnemonic_webresources), new RootPage(IUniversalIntroConstants.ID_MIGRATE, - Messages.WelcomeCustomizationPreferencePage_migrate) }; + Messages.WelcomeCustomizationPreferencePage_migrate, + Messages.WelcomeCustomizationPreferencePage_NoMnemonic_migrate) }; static class RootPage { public String id; public String name; + public String nameNoMnemonic; - public RootPage(String id, String name) { + public RootPage(String id, String name, String nameNoMnemonic) { this.id = id; this.name = name; + this.nameNoMnemonic = nameNoMnemonic; } - public String getRawName() { + public String getName() { return name; } - public String getName() { - return stripMnemonic(name); + public String getNameNoMnemonic() { + return nameNoMnemonic; } public boolean equals(Object obj) { @@ -172,17 +181,6 @@ public class WelcomeCustomizationPreferencePage extends PreferencePage implement public String toString() { return name; } - - private String stripMnemonic(String src) { - if (src==null) - return ""; //$NON-NLS-1$ - int loc = src.indexOf('&'); - if (loc!=-1) { - return src.substring(0,loc)+src.substring(loc+1); - } - else - return src; - } } class TableContentProvider implements IStructuredContentProvider { @@ -307,7 +305,7 @@ public class WelcomeCustomizationPreferencePage extends PreferencePage implement public String getText(Object obj) { if (obj instanceof RootPage) { - return ((RootPage) obj).getName(); + return ((RootPage) obj).getNameNoMnemonic(); } if (obj instanceof ExtensionData) { ExtensionData ed = (ExtensionData) obj; @@ -903,7 +901,7 @@ public class WelcomeCustomizationPreferencePage extends PreferencePage implement private String getRootPageName(String id) { for (int i = 0; i < ROOT_PAGE_TABLE.length; i++) { if (ROOT_PAGE_TABLE[i].id.equals(id)) - return ROOT_PAGE_TABLE[i].getRawName(); + return ROOT_PAGE_TABLE[i].getName(); } return "?"; //$NON-NLS-1$ } |