Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 143913 Details for
Bug 278064
[FastView] Ability to hide fast view toolbar
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Suggested patch
patch278064 (text/plain), 15.08 KB, created by
Semion Chichelnitsky
on 2009-08-10 10:29:55 EDT
(
hide
)
Description:
Suggested patch
Filename:
MIME Type:
Creator:
Semion Chichelnitsky
Created:
2009-08-10 10:29:55 EDT
Size:
15.08 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.ui.ide.application >Index: src/org/eclipse/ui/internal/ide/application/IDEWorkbenchWindowAdvisor.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEWorkbenchWindowAdvisor.java,v >retrieving revision 1.10 >diff -u -r1.10 IDEWorkbenchWindowAdvisor.java >--- src/org/eclipse/ui/internal/ide/application/IDEWorkbenchWindowAdvisor.java 25 May 2009 20:51:57 -0000 1.10 >+++ src/org/eclipse/ui/internal/ide/application/IDEWorkbenchWindowAdvisor.java 10 Aug 2009 13:25:44 -0000 >@@ -48,6 +48,7 @@ > import org.eclipse.ui.IWorkbenchPage; > import org.eclipse.ui.IWorkbenchPartConstants; > import org.eclipse.ui.IWorkbenchPartReference; >+import org.eclipse.ui.IWorkbenchPreferenceConstants; > import org.eclipse.ui.IWorkbenchWindow; > import org.eclipse.ui.PartInitException; > import org.eclipse.ui.PerspectiveAdapter; >@@ -65,6 +66,7 @@ > import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin; > import org.eclipse.ui.internal.ide.WorkbenchActionBuilder; > import org.eclipse.ui.internal.ide.dialogs.WelcomeEditorInput; >+import org.eclipse.ui.internal.util.PrefUtil; > import org.eclipse.ui.part.EditorInputTransfer; > import org.eclipse.ui.part.MarkerTransfer; > import org.eclipse.ui.part.ResourceTransfer; >@@ -202,7 +204,9 @@ > // show the shortcut bar and progress indicator, which are hidden by > // default > configurer.setShowPerspectiveBar(true); >- configurer.setShowFastViewBars(true); >+ IPreferenceStore store = PrefUtil.getAPIPreferenceStore(); >+ boolean showFastViewBar = store.getBoolean(IWorkbenchPreferenceConstants.SHOW_FAST_VIEW_BAR); >+ configurer.setShowFastViewBars(showFastViewBar); > configurer.setShowProgressIndicator(true); > > // add the drag and drop support for the editor area >#P org.eclipse.ui >Index: src/org/eclipse/ui/internal/UIPreferenceInitializer.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.ui/src/org/eclipse/ui/internal/UIPreferenceInitializer.java,v >retrieving revision 1.48 >diff -u -r1.48 UIPreferenceInitializer.java >--- src/org/eclipse/ui/internal/UIPreferenceInitializer.java 7 May 2008 16:29:48 -0000 1.48 >+++ src/org/eclipse/ui/internal/UIPreferenceInitializer.java 10 Aug 2009 13:25:45 -0000 >@@ -86,6 +86,7 @@ > true); > > // the fast view bar should be on the bottom of a fresh workspace >+ node.putBoolean(IWorkbenchPreferenceConstants.SHOW_FAST_VIEW_BAR, true); > node.put(IWorkbenchPreferenceConstants.INITIAL_FAST_VIEW_BAR_LOCATION, > IWorkbenchPreferenceConstants.BOTTOM); > >#P org.eclipse.ui.workbench >Index: Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java,v >retrieving revision 1.411 >diff -u -r1.411 WorkbenchWindow.java >--- Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java 25 May 2009 20:52:10 -0000 1.411 >+++ Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java 10 Aug 2009 13:25:50 -0000 >@@ -3718,16 +3718,16 @@ > } > > if (fastViewBar != null) { >- if (getFastViewBarVisible() >- && getWindowConfigurer().getShowFastViewBars()) { >- int side = fastViewBar.getSide(); >+ int side = fastViewBar.getSide(); > >- if (defaultLayout.getTrim(fastViewBar.getId()) == null) { >- defaultLayout.addTrim(side, fastViewBar); >- } >+ if (defaultLayout.getTrim(fastViewBar.getId()) == null) { >+ defaultLayout.addTrim(side, fastViewBar); >+ } >+ if (getFastViewBarVisible() >+ && getWindowConfigurer().getShowFastViewBars()) > fastViewBar.getControl().setVisible(true); >- } else { >- defaultLayout.removeTrim(fastViewBar); >+ else { >+ // defaultLayout.removeTrim(fastViewBar); > fastViewBar.getControl().setVisible(false); > } > } >@@ -3782,6 +3782,7 @@ > trimMgr2.update(true, false, !topBar.getVisible()); > if (trimContributionMgr != null) > trimContributionMgr.update(true, !topBar.getVisible()); >+ defaultLayout.forceLayout(); > } > > public boolean getShowFastViewBars() { >Index: Eclipse UI/org/eclipse/ui/internal/PlatformUIPreferenceListener.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PlatformUIPreferenceListener.java,v >retrieving revision 1.26 >diff -u -r1.26 PlatformUIPreferenceListener.java >--- Eclipse UI/org/eclipse/ui/internal/PlatformUIPreferenceListener.java 8 May 2006 20:55:38 -0000 1.26 >+++ Eclipse UI/org/eclipse/ui/internal/PlatformUIPreferenceListener.java 10 Aug 2009 13:25:48 -0000 >@@ -97,6 +97,25 @@ > return; > } > >+ if (IWorkbenchPreferenceConstants.SHOW_FAST_VIEW_BAR >+ .equals(propertyName)) { >+ IPreferenceStore apiStore = PrefUtil.getAPIPreferenceStore(); >+ IWorkbench workbench = PlatformUI.getWorkbench(); >+ IWorkbenchWindow[] workbenchWindows = workbench >+ .getWorkbenchWindows(); >+ for (int i = 0; i < workbenchWindows.length; i++) { >+ IWorkbenchWindow window = workbenchWindows[i]; >+ if (window instanceof WorkbenchWindow) { >+ ((WorkbenchWindow) window) >+ .getWindowConfigurer() >+ .setShowFastViewBars( >+ apiStore >+ .getBoolean(IWorkbenchPreferenceConstants.SHOW_FAST_VIEW_BAR)); >+ } >+ } >+ return; >+ } >+ > // TODO the banner apperance should have its own preference > if (IWorkbenchPreferenceConstants.SHOW_TRADITIONAL_STYLE_TABS > .equals(propertyName)) { >Index: Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java,v >retrieving revision 1.118 >diff -u -r1.118 WorkbenchMessages.java >--- Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java 14 May 2009 17:48:26 -0000 1.118 >+++ Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java 10 Aug 2009 13:25:48 -0000 >@@ -430,6 +430,7 @@ > public static String WorkbenchPreference_useIPersistableEditorButton; > public static String WorkbenchPreference_promptWhenStillOpenButton; > public static String WorkbenchPreference_showTextOnPerspectiveBar; >+ public static String WorkbenchPreference_showFastViewBar; > public static String WorkbenchPreference_stickyCycleButton; > public static String WorkbenchPreference_RunInBackgroundButton; > public static String WorkbenchPreference_RunInBackgroundToolTip; >Index: Eclipse UI/org/eclipse/ui/internal/messages.properties >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/messages.properties,v >retrieving revision 1.400 >diff -u -r1.400 messages.properties >--- Eclipse UI/org/eclipse/ui/internal/messages.properties 14 May 2009 17:48:26 -0000 1.400 >+++ Eclipse UI/org/eclipse/ui/internal/messages.properties 10 Aug 2009 13:25:51 -0000 >@@ -383,6 +383,7 @@ > WorkbenchPreference_useIPersistableEditorButton = Restore &editor state on startup > WorkbenchPreference_promptWhenStillOpenButton = Pr&ompt to save on close even if still open elsewhere > WorkbenchPreference_showTextOnPerspectiveBar = S&how text on the perspective bar >+WorkbenchPreference_showFastViewBar = Show &Fast View bar > WorkbenchPreference_stickyCycleButton = Keep &next/previous editor, view and perspectives dialog open > WorkbenchPreference_RunInBackgroundButton=Always r&un in background > WorkbenchPreference_RunInBackgroundToolTip=Run long operations in the background where possible >Index: Eclipse UI/org/eclipse/ui/internal/FastViewManager.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/FastViewManager.java,v >retrieving revision 1.28 >diff -u -r1.28 FastViewManager.java >--- Eclipse UI/org/eclipse/ui/internal/FastViewManager.java 25 May 2009 20:52:11 -0000 1.28 >+++ Eclipse UI/org/eclipse/ui/internal/FastViewManager.java 10 Aug 2009 13:25:48 -0000 >@@ -323,8 +323,8 @@ > } > > // Ensure that the trim is displayed >- if (!trim.getControl().getVisible()) { >- tbm.setTrimVisible(trim, true); >+ if (!(trim instanceof FastViewBar) && !trim.getControl().getVisible()) { >+ tbm.setTrimVisible(trim, true); > } > > if (trim instanceof FastViewBar) { >Index: META-INF/MANIFEST.MF >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/META-INF/MANIFEST.MF,v >retrieving revision 1.64 >diff -u -r1.64 MANIFEST.MF >--- META-INF/MANIFEST.MF 24 Jun 2009 08:03:36 -0000 1.64 >+++ META-INF/MANIFEST.MF 10 Aug 2009 13:25:51 -0000 >@@ -70,7 +70,7 @@ > org.eclipse.ui.internal.testing;x-internal:=true, > org.eclipse.ui.internal.themes;x-friends:="org.eclipse.ui", > org.eclipse.ui.internal.tweaklets;x-internal:=true, >- org.eclipse.ui.internal.util;x-friends:="org.eclipse.ui,org.eclipse.ui.presentations.r21,org.eclipse.ui.ide", >+ org.eclipse.ui.internal.util;x-friends:="org.eclipse.ui,org.eclipse.ui.presentations.r21,org.eclipse.ui.ide,org.eclipse.ui.ide.application", > org.eclipse.ui.internal.wizards;x-internal:=true, > org.eclipse.ui.internal.wizards.preferences;x-internal:=true, > org.eclipse.ui.intro, >Index: Eclipse UI/org/eclipse/ui/internal/dialogs/ViewsPreferencePage.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/dialogs/ViewsPreferencePage.java,v >retrieving revision 1.74 >diff -u -r1.74 ViewsPreferencePage.java >--- Eclipse UI/org/eclipse/ui/internal/dialogs/ViewsPreferencePage.java 25 May 2009 20:52:12 -0000 1.74 >+++ Eclipse UI/org/eclipse/ui/internal/dialogs/ViewsPreferencePage.java 10 Aug 2009 13:25:51 -0000 >@@ -11,10 +11,10 @@ > > package org.eclipse.ui.internal.dialogs; > >+import com.ibm.icu.text.Collator; > import java.util.Arrays; > import java.util.Comparator; > import java.util.Locale; >- > import org.eclipse.core.runtime.IConfigurationElement; > import org.eclipse.core.runtime.IProgressMonitor; > import org.eclipse.core.runtime.IStatus; >@@ -65,8 +65,6 @@ > import org.eclipse.ui.themes.ITheme; > import org.eclipse.ui.themes.IThemeManager; > >-import com.ibm.icu.text.Collator; >- > /** > * The ViewsPreferencePage is the page used to set preferences for the > * appearance of the workbench. Originally this applied only to views but now >@@ -76,6 +74,8 @@ > IWorkbenchPreferencePage { > > private Button showTextOnPerspectiveBar; >+ >+ private Button showFastViewBarButton; > > /* > * change the tab style of the workbench >@@ -138,6 +138,8 @@ > > private String showTextOnPerspBar = INITIAL_VAL; > >+ private String showFastViewBar = INITIAL_VAL; >+ > private int editorAlignment; > > private boolean editorAlignmentChanged = false; >@@ -231,6 +233,7 @@ > createViewTabButtonGroup(composite); > createPerspBarTabButtonGroup(composite); > createShowTextOnPerspectiveBarPref(composite); >+ createShowFastViewBarPref(composite); > createThemeCombo(composite); > createThemeDescriptionText(composite); > createShowTraditionalStyleTabsPref(composite); >@@ -613,6 +616,7 @@ > perspLeftButton.setEnabled(override); > perspTopRightButton.setEnabled(override); > showTextOnPerspectiveBar.setEnabled(override); >+ showFastViewBarButton.setEnabled(override); > } > > private void refreshPresentationCombo() { >@@ -778,6 +782,10 @@ > .getDefaultBoolean(IWorkbenchPreferenceConstants.SHOW_TEXT_ON_PERSPECTIVE_BAR)); > // text on perspective bar should be set to default on OK or Apply > showTextOnPerspBar = INITIAL_VAL; >+ showFastViewBarButton >+ .setSelection(apiStore >+ .getDefaultBoolean(IWorkbenchPreferenceConstants.SHOW_FAST_VIEW_BAR)); >+ showFastViewBar = INITIAL_VAL; > > // fast view bar should be set to default on OK or Apply > fastViewLoc = INITIAL_VAL; >@@ -855,6 +863,9 @@ > showTextOnPerspectiveBar.setSelection(false); > showTextOnPerspBar = String.valueOf(false); > >+ showFastViewBarButton.setSelection(true); >+ showFastViewBar = String.valueOf(true); >+ > // fast view bar on the left (hidden pref, set it directly) > fastViewLoc = IWorkbenchPreferenceConstants.LEFT; > >@@ -917,6 +928,20 @@ > > /** > * Create the button and text that support setting the preference for >+ * showing fast view bar. >+ */ >+ protected void createShowFastViewBarPref(Composite composite) { >+ IPreferenceStore apiStore = PrefUtil.getAPIPreferenceStore(); >+ >+ showFastViewBarButton = createCheckButton( >+ composite, >+ WorkbenchMessages.WorkbenchPreference_showFastViewBar, >+ apiStore >+ .getBoolean(IWorkbenchPreferenceConstants.SHOW_FAST_VIEW_BAR)); >+ } >+ >+ /** >+ * Create the button and text that support setting the preference for > * showing text labels on the perspective switching bar > */ > protected void createShowTraditionalStyleTabsPref(Composite composite) { >@@ -974,6 +999,9 @@ > showTextOnPerspectiveBar > .setSelection(apiStore > .getDefaultBoolean(IWorkbenchPreferenceConstants.SHOW_TEXT_ON_PERSPECTIVE_BAR)); >+ showFastViewBarButton >+ .setSelection(apiStore >+ .getDefaultBoolean(IWorkbenchPreferenceConstants.SHOW_FAST_VIEW_BAR)); > showTraditionalStyleTabs > .setSelection(apiStore > .getDefaultBoolean(IWorkbenchPreferenceConstants.SHOW_TRADITIONAL_STYLE_TABS)); >@@ -1039,6 +1067,14 @@ > showTextOnPerspectiveBar.getSelection()); > } > >+ if (showFastViewBar.equals(INITIAL_VAL) && !override) { >+ apiStore >+ .setToDefault(IWorkbenchPreferenceConstants.SHOW_FAST_VIEW_BAR); >+ } else { >+ apiStore.setValue(IWorkbenchPreferenceConstants.SHOW_FAST_VIEW_BAR, >+ showFastViewBarButton.getSelection()); >+ } >+ > if (editorAlignmentChanged) { > if (editorAlignment == INITIAL_LOC_INT) { > apiStore >Index: Eclipse UI/org/eclipse/ui/IWorkbenchPreferenceConstants.java >=================================================================== >RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/IWorkbenchPreferenceConstants.java,v >retrieving revision 1.65 >diff -u -r1.65 IWorkbenchPreferenceConstants.java >--- Eclipse UI/org/eclipse/ui/IWorkbenchPreferenceConstants.java 24 Nov 2008 12:32:34 -0000 1.65 >+++ Eclipse UI/org/eclipse/ui/IWorkbenchPreferenceConstants.java 10 Aug 2009 13:25:47 -0000 >@@ -282,6 +282,20 @@ > public static String SHOW_TEXT_ON_PERSPECTIVE_BAR = "SHOW_TEXT_ON_PERSPECTIVE_BAR"; //$NON-NLS-1$ > > /** >+ * A named preference for whether the workbench should show fast view bar. >+ * >+ * Boolean-valued: <code>true</code>, if editors should show fast view bar, >+ * <code>false</code> otherwise. >+ * <p> >+ * The default value for this preference is: <code>true</code> (show fast >+ * view bar) >+ * </p> >+ * >+ * @since 3.6 >+ */ >+ public static String SHOW_FAST_VIEW_BAR = "SHOW_FAST_VIEW_BAR"; //$NON-NLS-1$ >+ >+ /** > * A named preference for whether the workbench should show the "open > * perspective" button on the perspective bar. > *
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 278064
:
143913
|
144617
|
145353
|
145463