[jsword-svn] r1294 - in trunk/bibledesktop: . src/main/java/org/crosswire/bibledesktop/desktop

[dmsmith at www.crosswire.org]

Author: dmsmith
Date: 2007-04-22 18:08:56 -0700 (Sun, 22 Apr 2007)
New Revision: 1294

Modified:
   trunk/bibledesktop/.classpath
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/StatusBar.java
Log:
More Mac changes.

Modified: trunk/bibledesktop/.classpath
===================================================================
--- trunk/bibledesktop/.classpath	2007-04-22 11:19:22 UTC (rev 1293)
+++ trunk/bibledesktop/.classpath	2007-04-23 01:08:56 UTC (rev 1294)
@@ -7,5 +7,6 @@
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="lib" path="jar/jsword-common-aqua-1.0.6/jsword-common-aqua-1.0.6.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java	2007-04-22 11:19:22 UTC (rev 1293)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java	2007-04-23 01:08:56 UTC (rev 1294)
@@ -521,7 +521,12 @@
         //menuTools.add(actions.getAction(DesktopActions.DIFF)).addMouseListener(barStatus);
         //menuTools.addSeparator();
         menuTools.add(actions.getAction(DesktopActions.BOOKS)).addMouseListener(barStatus);
-        menuTools.add(actions.getAction(DesktopActions.OPTIONS)).addMouseListener(barStatus);
+
+        if (!OSType.MAC.equals(OSType.getOSType()))
+        {
+            menuTools.add(actions.getAction(DesktopActions.OPTIONS)).addMouseListener(barStatus);
+        }
+
         menuTools.setToolTipText(null);
         return menuTools;
     }

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/StatusBar.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/StatusBar.java	2007-04-22 11:19:22 UTC (rev 1293)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/StatusBar.java	2007-04-23 01:08:56 UTC (rev 1294)
@@ -80,7 +80,7 @@
         panelProgress.setPreferredSize(dim);
         */
 
-        labelName.setText(' ' + Msg.getVersionedApplicationTitle() + ' ');
+        labelName.setText(Msg.getVersionedApplicationTitle());
 
         this.setBorder(BorderFactory.createEtchedBorder());
         this.setLayout(new GridBagLayout());
@@ -92,7 +92,9 @@
         this.add(separator,     new GridBagConstraints(1, 0, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.VERTICAL, new Insets(0, 0, 0, 0), 0, 0));
         this.add(panelProgress, new GridBagConstraints(2, 0, 1, 1, 0.5, 0.0, GridBagConstraints.EAST, GridBagConstraints.BOTH, new Insets(0, 0, 0, 0), 0, 0));
         this.add(separator2,    new GridBagConstraints(3, 0, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.VERTICAL, new Insets(0, 0, 0, 0), 0, 0));
-        this.add(labelName,     new GridBagConstraints(4, 0, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 0, 0));
+        // Right pad this so that it stays away from the corner.
+        // On the Mac, the "grow" handle is in the corner of the app.
+        this.add(labelName,     new GridBagConstraints(4, 0, 1, 1, 0.0, 0.0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 0), 20, 5));
     }
 
     /* (non-Javadoc)