You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2007/01/28 21:39:12 UTC
svn commit: r500877 - in /directory/ldapstudio/trunk:
dependencies/eclipse/3.2/plugins/ ldapstudio-rcp/
ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/
Author: seelmann
Date: Sun Jan 28 12:39:11 2007
New Revision: 500877
URL: http://svn.apache.org/viewvc?view=rev&rev=500877
Log:
Added Navigation menu, actions and toolbar
Modified:
directory/ldapstudio/trunk/dependencies/eclipse/3.2/plugins/org.eclipse.ui.editors_3.2.1.r321_v20060721.plugin.xml
directory/ldapstudio/trunk/ldapstudio-rcp/build.xml
directory/ldapstudio/trunk/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/ApplicationActionBarAdvisor.java
Modified: directory/ldapstudio/trunk/dependencies/eclipse/3.2/plugins/org.eclipse.ui.editors_3.2.1.r321_v20060721.plugin.xml
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/dependencies/eclipse/3.2/plugins/org.eclipse.ui.editors_3.2.1.r321_v20060721.plugin.xml?view=diff&rev=500877&r1=500876&r2=500877
==============================================================================
--- directory/ldapstudio/trunk/dependencies/eclipse/3.2/plugins/org.eclipse.ui.editors_3.2.1.r321_v20060721.plugin.xml (original)
+++ directory/ldapstudio/trunk/dependencies/eclipse/3.2/plugins/org.eclipse.ui.editors_3.2.1.r321_v20060721.plugin.xml Sun Jan 28 12:39:11 2007
@@ -741,5 +741,96 @@
class="org.eclipse.ui.texteditor.ResourceMarkerAnnotationModelFactory">
</factory>
</extension>
+
+ <extension
+ point="org.eclipse.ui.actionSets">
+ <actionSet
+ label="%textEditorAnnotationNavigationActionSet.label"
+ visible="true"
+ id="org.eclipse.ui.edit.text.actionSet.annotationNavigation">
+ <action
+ allowLabelUpdate="true"
+ style="pulldown"
+ id="org.eclipse.ui.edit.text.gotoPreviousAnnotation"
+ toolbarPath="org.eclipse.ui.workbench.navigate/history.group"
+ hoverIcon="$nl$/icons/full/ctool16/prev_nav.gif"
+ class="org.eclipse.ui.internal.editors.text.PreviousPulldownActionDelegate"
+ definitionId="org.eclipse.ui.navigate.previous"
+ disabledIcon="$nl$/icons/full/dtool16/prev_nav.gif"
+ icon="$nl$/icons/full/etool16/prev_nav.gif"
+ label="%goToPreviousAnnotation.label"
+ retarget="true"
+ tooltip="%goToPreviousAnnotation.tooltip">
+ </action>
+ <action
+ allowLabelUpdate="true"
+ style="pulldown"
+ id="org.eclipse.ui.edit.text.gotoNextAnnotation"
+ toolbarPath="org.eclipse.ui.workbench.navigate/history.group"
+ hoverIcon="$nl$/icons/full/ctool16/next_nav.gif"
+ class="org.eclipse.ui.internal.editors.text.NextPulldownActionDelegate"
+ definitionId="org.eclipse.ui.navigate.next"
+ disabledIcon="$nl$/icons/full/dtool16/next_nav.gif"
+ icon="$nl$/icons/full/etool16/next_nav.gif"
+ label="%goToNextAnnotation.label"
+ retarget="true"
+ tooltip="%goToNextAnnotation.tooltip">
+ </action>
+ </actionSet>
+ <actionSet
+ label="%textEditorNavigationActionSet.label"
+ visible="true"
+ id="org.eclipse.ui.edit.text.actionSet.navigation">
+ <action
+ toolbarPath="org.eclipse.ui.workbench.navigate/history.group"
+ id="org.eclipse.ui.edit.text.gotoLastEditPosition"
+ hoverIcon="$nl$/icons/full/ctool16/last_edit_pos.gif"
+ class="org.eclipse.ui.internal.texteditor.GotoLastEditPositionAction"
+ definitionId="org.eclipse.ui.edit.text.gotoLastEditPosition"
+ disabledIcon="$nl$/icons/full/dtool16/last_edit_pos.gif"
+ icon="$nl$/icons/full/etool16/last_edit_pos.gif"
+ helpContextId="goto_last_edit_position_action_context"
+ label="%goToLastEditPosition.label"
+ menubarPath="navigate/"
+ tooltip="%goToLastEditPosition.tooltip">
+ </action>
+ </actionSet>
+ <actionSet
+ label="%conversionActionSet.label"
+ visible="true"
+ id="org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo">
+ <menu
+ label="%conversionSubMenu.label"
+ path="file/save.ext"
+ id="converstLineDelimitersTo">
+ <separator name="lineDelimitersConversion"/>
+ <separator name="encoding"/>
+ </menu>
+ <action
+ definitionId="org.eclipse.ui.edit.text.delimiter.macOS9"
+ label="%convertDelimiters.MacOS9.label"
+ class="org.eclipse.ui.internal.editors.text.ConvertLineDelimitersToMacOS9"
+ tooltip="%convertDelimiters.MacOS9.description"
+ menubarPath="file/converstLineDelimitersTo/lineDelimitersConversion"
+ id="org.eclipse.ui.edit.text.delimiter.macOS9">
+ </action>
+ <action
+ definitionId="org.eclipse.ui.edit.text.delimiter.unix"
+ label="%convertDelimiters.Unix.label"
+ class="org.eclipse.ui.internal.editors.text.ConvertLineDelimitersToUnix"
+ tooltip="%convertDelimiters.Unix.description"
+ menubarPath="file/converstLineDelimitersTo/lineDelimitersConversion"
+ id="org.eclipse.ui.edit.text.delimiter.unix">
+ </action>
+ <action
+ definitionId="org.eclipse.ui.edit.text.delimiter.windows"
+ label="%convertDelimiters.Windows.label"
+ class="org.eclipse.ui.internal.editors.text.ConvertLineDelimitersToWindows"
+ tooltip="%convertDelimiters.Unix.description"
+ menubarPath="file/converstLineDelimitersTo/lineDelimitersConversion"
+ id="org.eclipse.ui.edit.text.delimiter.windows">
+ </action>
+ </actionSet>
+ </extension>
</plugin>
Modified: directory/ldapstudio/trunk/ldapstudio-rcp/build.xml
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-rcp/build.xml?view=diff&rev=500877&r1=500876&r2=500877
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-rcp/build.xml (original)
+++ directory/ldapstudio/trunk/ldapstudio-rcp/build.xml Sun Jan 28 12:39:11 2007
@@ -174,7 +174,7 @@
</copy>
<!-- Replace some plugin.xml to get rid of unused actions, menus, wizard, views, ... -->
- <!--<move
+ <move
file="${ldapstudio-rcp.application}/plugins/${ldapstudio-rcp.eclipse.searchplugin.filename}.plugin.xml"
tofile="${ldapstudio-rcp.application}/plugins/plugin.xml" />
<zip destfile="${ldapstudio-rcp.application}/plugins/${ldapstudio-rcp.eclipse.searchplugin.filename}.jar"
@@ -197,7 +197,7 @@
basedir="${ldapstudio-rcp.application}/plugins"
includes="plugin.xml"
update="true"/>
- <delete file="${ldapstudio-rcp.application}/plugins/plugin.xml" />-->
+ <delete file="${ldapstudio-rcp.application}/plugins/plugin.xml" />
<move file="${ldapstudio-rcp.application}/eclipse${ldapstudio-rcp.os.extension}" tofile="${ldapstudio-rcp.application}/LDAP Studio${ldapstudio-rcp.os.extension}">
</move>
Modified: directory/ldapstudio/trunk/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/ApplicationActionBarAdvisor.java
URL: http://svn.apache.org/viewvc/directory/ldapstudio/trunk/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/ApplicationActionBarAdvisor.java?view=diff&rev=500877&r1=500876&r2=500877
==============================================================================
--- directory/ldapstudio/trunk/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/ApplicationActionBarAdvisor.java (original)
+++ directory/ldapstudio/trunk/ldapstudio-rcp/src/main/java/org/apache/directory/ldapstudio/ApplicationActionBarAdvisor.java Sun Jan 28 12:39:11 2007
@@ -40,6 +40,7 @@
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.actions.ActionFactory;
import org.eclipse.ui.actions.ContributionItemFactory;
+import org.eclipse.ui.actions.NewWizardDropDownAction;
import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
import org.eclipse.ui.application.ActionBarAdvisor;
import org.eclipse.ui.application.IActionBarConfigurer;
@@ -74,6 +75,7 @@
private UpdateAction updateAction;
private ManageConfigurationAction manageConfigurationAction;
private IWorkbenchAction newAction;
+ private IWorkbenchAction newDropDownAction;
private IWorkbenchAction importAction;
private IWorkbenchAction exportAction;
private IWorkbenchAction propertiesAction;
@@ -91,7 +93,10 @@
private IContributionItem viewsList;
private IContributionItem reopenEditorsList;
private ReportABugAction reportABug;
-
+ private IWorkbenchAction backwardHistoryAction;
+ private IWorkbenchAction forwardHistoryAction;
+ private IWorkbenchAction nextAction;
+ private IWorkbenchAction previousAction;
/**
* Creates a new instance of ApplicationActionBarAdvisor.
@@ -124,6 +129,9 @@
register( newAction );
newAction.setText( "New..." );
+ newDropDownAction = new NewWizardDropDownAction( window );
+// new NavigationHistoryAction( window, false );
+
openFileAction = new OpenFileAction( window );
register(openFileAction);
@@ -231,6 +239,18 @@
ImageKeys.REPORT_BUG ) );
register( reportABug );
+ forwardHistoryAction = ActionFactory.FORWARD_HISTORY.create( window );
+ register( forwardHistoryAction );
+
+ backwardHistoryAction = ActionFactory.BACKWARD_HISTORY.create( window );
+ register( backwardHistoryAction );
+
+ nextAction = ActionFactory.NEXT.create( window );
+ register( nextAction );
+
+ previousAction = ActionFactory.PREVIOUS.create( window );
+ register( previousAction );
+
}
@@ -241,12 +261,14 @@
{
MenuManager fileMenu = new MenuManager( "&File", IWorkbenchActionConstants.M_FILE ); //$NON-NLS-1$
MenuManager editMenu = new MenuManager( "&Edit", IWorkbenchActionConstants.M_EDIT ); //$NON-NLS-1$
+ MenuManager navigateMenu = new MenuManager( "&Navigate", IWorkbenchActionConstants.M_NAVIGATE ); //$NON-NLS-1$
MenuManager windowMenu = new MenuManager( "&Window", IWorkbenchActionConstants.M_WINDOW ); //$NON-NLS-1$
MenuManager helpMenu = new MenuManager( "&Help", IWorkbenchActionConstants.M_HELP ); //$NON-NLS-1$
// Adding menus
menuBar.add( fileMenu );
menuBar.add( editMenu );
+ menuBar.add( navigateMenu );
// Add a group marker indicating where action set menus will appear.
menuBar.add( new GroupMarker( IWorkbenchActionConstants.MB_ADDITIONS ) );
menuBar.add( windowMenu );
@@ -282,7 +304,7 @@
fileMenu.add( new Separator() );
fileMenu.add( exitAction );
- // Population Edit Menu
+ // Populating Edit Menu
editMenu.add( undoAction );
editMenu.add( redoAction );
editMenu.add( new Separator() );
@@ -298,6 +320,14 @@
editMenu.add( new Separator() );
editMenu.add( findAction );
+ // Populating Navigate Menu
+ navigateMenu.add( nextAction );
+ navigateMenu.add( previousAction );
+ navigateMenu.add( new Separator( IWorkbenchActionConstants.MB_ADDITIONS ) );
+ navigateMenu.add( new GroupMarker( IWorkbenchActionConstants.NAV_END ) );
+ navigateMenu.add( new Separator() );
+ navigateMenu.add( backwardHistoryAction );
+ navigateMenu.add( forwardHistoryAction );
// Window
MenuManager perspectiveMenu = new MenuManager("Open Perspective", "openPerspective");
@@ -332,10 +362,23 @@
*/
protected void fillCoolBar( ICoolBarManager coolBar )
{
+ // add main tool bar
IToolBarManager toolbar = new ToolBarManager( SWT.FLAT | SWT.RIGHT );
- coolBar.add( new ToolBarContributionItem( toolbar, Application.PLUGIN_ID + ".toolbar" ) ); //$NON-NLS-1$
-
- toolbar.add( newAction );
+ toolbar.add( newDropDownAction );
toolbar.add( preferencesAction );
+ coolBar.add( new ToolBarContributionItem( toolbar, Application.PLUGIN_ID + ".toolbar" ) ); //$NON-NLS-1$
+
+ // add marker for additions
+ coolBar.add( new GroupMarker( IWorkbenchActionConstants.MB_ADDITIONS ) );
+
+ // add navigation tool bar
+ // some actions are added from org.eclipse.ui.editor to the HISTORY_GROUP
+ IToolBarManager navToolBar = new ToolBarManager( SWT.FLAT | SWT.RIGHT );
+ navToolBar.add( new Separator( IWorkbenchActionConstants.HISTORY_GROUP ) );
+ navToolBar.add( backwardHistoryAction );
+ navToolBar.add( forwardHistoryAction );
+ coolBar.add( new ToolBarContributionItem( navToolBar, IWorkbenchActionConstants.TOOLBAR_NAVIGATE ) );
+
}
+
}