diff options
| -rw-r--r-- | java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java index e12098dfd28..9db20ea5f21 100644 --- a/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java +++ b/java/src/IceGridGUI/src/main/java/IceGridGUI/Coordinator.java @@ -501,8 +501,11 @@ public class Coordinator helpMenu.add(_helpContents); - helpMenu.addSeparator(); - helpMenu.add(_about); + if(!System.getProperty("os.name").startsWith("Mac OS")) + { + helpMenu.addSeparator(); + helpMenu.add(_about); + } } } @@ -3340,14 +3343,19 @@ public class Coordinator private void helpContents() { - int pos = Ice.Util.stringVersion().indexOf('b'); + String version = Ice.Util.stringVersion(); + + int pos = version.indexOf('a'); if(pos == -1) { - pos = Ice.Util.stringVersion().lastIndexOf('.'); - assert(pos != -1); + pos = version.indexOf('b'); } - String version = Ice.Util.stringVersion().substring(0, pos); + if(pos != -1) + { + // 3.7a3 or 3.7b1 becomes simply 3.7 + version = version.substring(0, pos); + } Desktop desktop = Desktop.isDesktopSupported() ? Desktop.getDesktop() : null; if(desktop != null && desktop.isSupported(Desktop.Action.BROWSE)) |