svn commit: r604729 - in /cayenne/main/trunk: framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenn...

[mg...@apache.org]

Author: mgentry
Date: Sun Dec 16 14:38:13 2007
New Revision: 604729

URL: http://svn.apache.org/viewvc?rev=604729&view=rev
Log:
Removed Tools->Preferences when running under OS X (still shows up for non-OS X) and enabled the standard OS X Preferences menu option (under the application menu) with the standard shortcut for activating preferences.

Modified:
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java
    cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ConfigurePreferencesAction.java
    cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/MacOSXSetup.java

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java?rev=604729&r1=604728&r2=604729&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java Sun Dec 16 14:38:13 2007
@@ -169,10 +169,15 @@
         toolMenu.add(getAction(GenerateCodeAction.getActionName()).buildMenu());
         toolMenu.add(getAction(GenerateDBAction.getActionName()).buildMenu());
         toolMenu.add(getAction(MigrateAction.getActionName()).buildMenu());
-        toolMenu.addSeparator();
-        toolMenu.add(getAction(ConfigurePreferencesAction.getActionName()).buildMenu());
+        // Mac OS X has it's own Preferences menu item under the application menu
+        if (!SystemUtils.IS_OS_MAC_OSX) {
+            toolMenu.addSeparator();
+            toolMenu.add(getAction(ConfigurePreferencesAction.getActionName()).buildMenu());
+        }
 
-        helpMenu.add(getAction(AboutAction.getActionName()).buildMenu());
+        // Mac OS X "About CayenneModeler" appears under the application menu, per Apple GUI standards
+        if (!SystemUtils.IS_OS_MAC_OSX)
+            helpMenu.add(getAction(AboutAction.getActionName()).buildMenu());
         helpMenu.add(getAction(DocumentationAction.getActionName()).buildMenu());
         
         JMenuBar menuBar = new JMenuBar();

Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ConfigurePreferencesAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ConfigurePreferencesAction.java?rev=604729&r1=604728&r2=604729&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ConfigurePreferencesAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ConfigurePreferencesAction.java Sun Dec 16 14:38:13 2007
@@ -39,7 +39,12 @@
     }
 
     public void performAction(ActionEvent e) {
-        new PreferenceDialog(getApplication().getFrameController()).startupAction(null);
+        showPreferencesDialog();
     }
 
+    public void showPreferencesDialog() {
+        new PreferenceDialog(getApplication().getFrameController()).startupAction(null);
+        
+    }
+    
 }

Modified: cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/MacOSXSetup.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/MacOSXSetup.java?rev=604729&r1=604728&r2=604729&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/MacOSXSetup.java (original)
+++ cayenne/main/trunk/modeler/cayenne-modeler-mac-ext/src/main/java/org/apache/cayenne/modeler/MacOSXSetup.java Sun Dec 16 14:38:13 2007
@@ -21,6 +21,7 @@
 package org.apache.cayenne.modeler;
 
 import org.apache.cayenne.modeler.action.AboutAction;
+import org.apache.cayenne.modeler.action.ConfigurePreferencesAction;
 import org.apache.cayenne.modeler.action.ExitAction;
 import org.apache.cayenne.modeler.util.CayenneAction;
 
@@ -37,9 +38,12 @@
 class MacOSXSetup {
 
     static void configureMacOSX() {
-        // Application.getApplication().setEnabledPreferencesMenu(true);
-        com.apple.eawt.Application.getApplication().addApplicationListener(
-                new MacEventsAdapter());
+        com.apple.eawt.Application.getApplication().addAboutMenuItem();
+        com.apple.eawt.Application.getApplication().addPreferencesMenuItem();
+        com.apple.eawt.Application.getApplication().setEnabledAboutMenu(true);
+        com.apple.eawt.Application.getApplication().setEnabledPreferencesMenu(true);
+
+        com.apple.eawt.Application.getApplication().addApplicationListener(new MacEventsAdapter());
     }
 
     static class MacEventsAdapter extends ApplicationAdapter {
@@ -49,6 +53,11 @@
                 ((AboutAction) getAction(AboutAction.getActionName())).showAboutDialog();
                 e.setHandled(true);
             }
+        }
+
+        public void handlePreferences(ApplicationEvent e) {
+            ((ConfigurePreferencesAction) getAction(ConfigurePreferencesAction.getActionName())).showPreferencesDialog();
+            e.setHandled(true);
         }
 
         public void handleQuit(ApplicationEvent e) {