Info dialog for Mac & zipped Jar file

OSUCartography · Apr 3, 2015 · 4fc7658 · 4fc7658
1 parent a6a5468
commit 4fc7658
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 2 deletions.
diff --git a/build.xml b/build.xml
@@ -84,6 +84,12 @@
         <zip destfile="win/ScreePainterWin32.zip">
             <fileset dir="win/" includes="ScreePainter32Bit.exe"/>
         </zip>
+
+
+        <!-- zip the jar file -->
+        <zip destfile="dist/ScreePainterJar.zip" level="9">
+            <fileset dir="dist/" includes="ScreePainter.jar"/>
+        </zip>
 
     </target>
 

diff --git a/dist/ScreePainter.jar b/dist/ScreePainter.jar
diff --git a/dist/ScreePainterJar.zip b/dist/ScreePainterJar.zip
diff --git a/mac/Scree Painter.app/Contents/Java/ScreePainter.jar b/mac/Scree Painter.app/Contents/Java/ScreePainter.jar
diff --git a/mac/ScreePainterMac.zip b/mac/ScreePainterMac.zip
diff --git a/src/ika/app/Application.properties b/src/ika/app/Application.properties
@@ -5,7 +5,7 @@ MainWindow=ika.gui.ScreeWindow
 ApplicationName=Scree Painter
 
 #the version of the application
-ApplicationVersion=1.1.10
+ApplicationVersion=1.1.11
 
 #a small icon for display in information dialogs
 ApplicationIcon=logo64x64.png
@@ -14,7 +14,7 @@ ApplicationIcon=logo64x64.png
 LargeApplicationIcon=logo128x128.png
 
 #a formatted html copyright string
-CopyrightHTML=<html><center>Copyright 2009-2013 by<br>Bernhard Jenny</center></html>
+CopyrightHTML=<html><center>Copyright 2009-2015 by<br>Bernhard Jenny</center></html>
 
 #a formatted html information string
 InformationHTML=<html><center>All rights reserved;<br>GNU General Public License, version 2.<br><br>Scree Painter uses<br>iText, Jama,<br>launch4j, and MRJ Adapter.<br>Thanks to the authors.</center></html>

diff --git a/src/ika/gui/ScreeWindow.form b/src/ika/gui/ScreeWindow.form
@@ -388,6 +388,20 @@
             <Property name="text" type="java.lang.String" value="Help"/>
           </Properties>
           <SubComponents>
+            <MenuItem class="javax.swing.JMenuItem" name="macInfoMenuItem">
+              <Properties>
+                <Property name="text" type="java.lang.String" value="Info"/>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="macInfoMenuItemActionPerformed"/>
+              </Events>
+            </MenuItem>
+            <MenuItem class="javax.swing.JPopupMenu$Separator" name="jSeparator3">
+              <AuxValues>
+                <AuxValue name="JavaCodeGenerator_VariableLocal" type="java.lang.Boolean" value="true"/>
+                <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
+              </AuxValues>
+            </MenuItem>
             <MenuItem class="javax.swing.JMenuItem" name="macHelpMenuItem">
               <Properties>
                 <Property name="text" type="java.lang.String" value="Scree Painter Online Help"/>
@@ -408,6 +422,7 @@
   <SyntheticProperties>
     <SyntheticProperty name="menuBar" type="java.lang.String" value="menuBar"/>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
   </SyntheticProperties>
   <Events>
     <EventHandler event="windowClosing" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="closeWindow"/>

diff --git a/src/ika/gui/ScreeWindow.java b/src/ika/gui/ScreeWindow.java
@@ -632,6 +632,8 @@ private void initComponents() {
         winHelpMenuItem = new javax.swing.JMenuItem();
         infoMenuItem = new javax.swing.JMenuItem();
         macHelpMenu = new javax.swing.JMenu();
+        macInfoMenuItem = new javax.swing.JMenuItem();
+        javax.swing.JPopupMenu.Separator jSeparator3 = new javax.swing.JPopupMenu.Separator();
         macHelpMenuItem = new javax.swing.JMenuItem();
 
         viewScreeCheckBoxMenuItem.setSelected(true);
@@ -1173,6 +1175,15 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
 
     macHelpMenu.setText("Help");
 
+    macInfoMenuItem.setText("Info");
+    macInfoMenuItem.addActionListener(new java.awt.event.ActionListener() {
+        public void actionPerformed(java.awt.event.ActionEvent evt) {
+            macInfoMenuItemActionPerformed(evt);
+        }
+    });
+    macHelpMenu.add(macInfoMenuItem);
+    macHelpMenu.add(jSeparator3);
+
     macHelpMenuItem.setText("Scree Painter Online Help");
     macHelpMenuItem.addActionListener(new java.awt.event.ActionListener() {
         public void actionPerformed(java.awt.event.ActionEvent evt) {
@@ -1568,6 +1579,10 @@ private void zoomOnUpdateAreaMenuItemActionPerformed(java.awt.event.ActionEvent
     this.mapComponent.zoomOnRectangle(this.areaOfInterest.getBounds2D(GeoObject.UNDEFINED_SCALE));
 }//GEN-LAST:event_zoomOnUpdateAreaMenuItemActionPerformed
 
+    private void macInfoMenuItemActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_macInfoMenuItemActionPerformed
+        ika.gui.ProgramInfoPanel.showApplicationInfo();
+    }//GEN-LAST:event_macInfoMenuItemActionPerformed
+
     /**
      * A property change listener for the root pane that adjusts the enabled
      * state of the save menu depending on the windowModified property attached
@@ -1626,6 +1641,7 @@ private void windowModifiedPropertyChange(java.beans.PropertyChangeEvent evt) {
     private javax.swing.JMenuItem loadSettingsMenuItem;
     private javax.swing.JMenu macHelpMenu;
     private javax.swing.JMenuItem macHelpMenuItem;
+    private javax.swing.JMenuItem macInfoMenuItem;
     private ika.gui.MapComponent mapComponent;
     private javax.swing.JMenuBar menuBar;
     private javax.swing.JMenuItem minimizeMenuItem;

diff --git a/win/ScreePainter32Bit.exe b/win/ScreePainter32Bit.exe
diff --git a/win/ScreePainter64Bit.exe b/win/ScreePainter64Bit.exe
diff --git a/win/ScreePainterWin32.zip b/win/ScreePainterWin32.zip
diff --git a/win/ScreePainterWin64.zip b/win/ScreePainterWin64.zip