directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r758643 - /directory/studio/trunk/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java
Date Thu, 26 Mar 2009 13:45:05 GMT
Author: pamarcelot
Date: Thu Mar 26 13:44:58 2009
New Revision: 758643

URL: http://svn.apache.org/viewvc?rev=758643&view=rev
Log:
Fix for DIRSTUDIO-478 (The 'Exit' menu item from the 'File' menu should be removed when running
on Mac OS X).

Modified:
    directory/studio/trunk/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java

Modified: directory/studio/trunk/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java?rev=758643&r1=758642&r2=758643&view=diff
==============================================================================
--- directory/studio/trunk/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java
(original)
+++ directory/studio/trunk/rcp/src/main/java/org/apache/directory/studio/ApplicationActionBarAdvisor.java
Thu Mar 26 13:44:58 2009
@@ -277,7 +277,7 @@
         MenuManager navigateMenu = new MenuManager( Messages.getString("ApplicationActionBarAdvisor.navigate"),
IWorkbenchActionConstants.M_NAVIGATE ); //$NON-NLS-1$
         MenuManager windowMenu = new MenuManager( Messages.getString("ApplicationActionBarAdvisor.windows"),
IWorkbenchActionConstants.M_WINDOW ); //$NON-NLS-1$
         MenuManager helpMenu = new MenuManager( Messages.getString("ApplicationActionBarAdvisor.help"),
IWorkbenchActionConstants.M_HELP ); //$NON-NLS-1$
-        MenuManager hiddenMenu = new MenuManager( "Hidden", IWorkbenchActionConstants.M_HELP
); //$NON-NLS-1$
+        MenuManager hiddenMenu = new MenuManager( "Hidden", "org.apache.directory.studio.rcp.hidden"
); //$NON-NLS-1$ //$NON-NLS-2$
         hiddenMenu.setVisible( false );
 
         // Adding menus
@@ -317,8 +317,16 @@
         fileMenu.add( propertiesAction );
         fileMenu.add( reopenEditorsList );
         fileMenu.add( new GroupMarker( IWorkbenchActionConstants.MRU ) );
-        fileMenu.add( new Separator() );
-        fileMenu.add( exitAction );
+        if ( ApplicationActionBarAdvisor.OS_MACOSX.equalsIgnoreCase( os ) )
+        {
+            // We hide the exit (quit) action, it will be added by the "Carbon" plugin
+            hiddenMenu.add( exitAction );
+        }
+        else
+        {
+            fileMenu.add( new Separator() );
+            fileMenu.add( exitAction );
+        }
 
         // Populating Edit Menu
         editMenu.add( undoAction );



Mime
View raw message