Fixes issue #1578

Update build number in version 2.8.9
bardsoftware · Aug 21, 2018 · c881025 · c881025
1 parent 4f1e531
commit c881025
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/ganttproject-builder/ganttproject.exe b/ganttproject-builder/ganttproject.exe
diff --git a/ganttproject/data/resources/keyboard.macos.properties b/ganttproject/data/resources/keyboard.macos.properties
@@ -0,0 +1 @@
+resource.new=ctrl R
diff --git a/ganttproject/src/net/sourceforge/ganttproject/GPVersion.java b/ganttproject/src/net/sourceforge/ganttproject/GPVersion.java
@@ -19,7 +19,7 @@
 package net.sourceforge.ganttproject;
 
 public abstract class GPVersion {
-  public static String BUILD = "2334"; // BUILD NUMBER
+  public static String BUILD = "2335"; // BUILD NUMBER
   public static String V2_0_1 = "2.0.1";
   public static String V2_0_2 = "2.0.2";
   public static String V2_0_3 = "2.0.3";

diff --git a/ganttproject/src/net/sourceforge/ganttproject/action/GPAction.java b/ganttproject/src/net/sourceforge/ganttproject/action/GPAction.java
@@ -60,7 +60,9 @@ public String asString() {
 
   public static final int MENU_MASK = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
 
-  /** Location of the icon files */
+  /**
+   * Location of the icon files
+   */
   public static final String ICON_FILE_DIRECTORY = "/icons";
 
   protected boolean iconVisible = true;
@@ -157,9 +159,10 @@ public static final Icon getIcon(String iconSize, String iconFileName) {
     return resource == null ? null : new ImageIcon(resource);
 
   }
+
   /**
    * @return translation of "ID.description" if available, otherwise translation
-   *         of "ID"
+   * of "ID"
    */
   protected String getLocalizedDescription() {
     if (getID() == null) {
@@ -172,7 +175,9 @@ protected String getLocalizedDescription() {
     return description == null ? "" : description;
   }
 
-  /** @return translation of ID */
+  /**
+   * @return translation of ID
+   */
   protected String getLocalizedName() {
     return getID() == null ? null : getI18n(getID());
   }
@@ -321,6 +326,7 @@ public static String getKeyStrokeText(String keystrokeID) {
       PropertiesUtil.loadProperties(ourKeyboardProperties, "/keyboard.properties");
       if (DesktopIntegration.isMacOs()) {
         PropertiesUtil.loadProperties(ourKeyboardProperties, "/mouse.macos.properties");
+        PropertiesUtil.loadProperties(ourKeyboardProperties, "/keyboard.macos.properties");
       } else {
         PropertiesUtil.loadProperties(ourKeyboardProperties, "/mouse.properties");
       }