Changeset 187

Timestamp:

02/20/10 17:40:55 (2 years ago)

Author:

stefan

Message:

implemented issue #178: save and restore last window position and size

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• scripts/create_versions_xml (modified) (1 diff)
• src/org/jergometer/gui/MainWindow.java (modified) (1 diff)
• src/org/jergometer/Jergometer.java (modified) (6 diffs)
• src/org/jergometer/JergometerSettings.java (modified) (7 diffs)

trunk/CHANGELOG

@@ -3 +3 @@
 
 //== 0.7.9 ==
+
+2010-02-20
+* [stefan]  * implemented issue #178: save and restore last window position and size
 
 == 0.7.8 ==

trunk/scripts/create_versions_xml

@@ -6 +6 @@
 echo '<?xml version="1.0" encoding="UTF-8"?>'
 echo '<files>'
-for file in `print **/(*~versions.xml)(.)`; do
+for file in `print **/(*~versions.xml)(.D)`; do
   md5=`md5sum $file | cut -d " " -f 1`
   len=`du --apparent-size -b $file | cut -f 1`

trunk/src/org/jergometer/gui/MainWindow.java

@@ -374 +374 @@
       openSettingsWindow();
     } else if (e.getSource() == quitMenuItem) {
-      jergometer.quit();
+      System.exit(0);
     } else if (e.getSource() == aboutMenuItem) {
       new AboutDialog().showMe();

trunk/src/org/jergometer/Jergometer.java

@@ -15 +15 @@
 
 import javax.swing.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
+import java.awt.event.*;
+import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -132 +130 @@
     mainWindow.getProgramTree().setModel(programTree);
     // maximize the main window
-    mainWindow.pack();
-    mainWindow.setExtendedState(mainWindow.getExtendedState()|JFrame.MAXIMIZED_BOTH);
+    mainWindow.setBounds(jergometerSettings.getMainWindowBounds());
+    mainWindow.setExtendedState(mainWindow.getExtendedState() | jergometerSettings.getMainWindowMaximizedState());
     mainWindow.addWindowListener(this);
     mainWindow.setVisible(true);
@@ -143 +141 @@
     switchToUser(jergometerSettings.getLastUserName());
 
-    /*
-    int u = 130;
-    int v = 80;
-    int w = 100;
-    for(int i = 0; i < 3600; i++) {
-      u += Math.random() *3 - 1;
-      if(u < 30) u = 30;
-      if(u > 210) u = 210;
-      mainWindow.getDiagram().addValue("pulse", i, u);
-      v += Math.random() *3 - 1;
-      if(v < 30) v = 30;
-      if(v > 210) v = 210;
-      mainWindow.getDiagram().addValue("pedalRPM", i, v);
-      w += Math.random() *3 - 1;
-      if(w < 30) w = 30;
-      if(w > 210) w = 210;
-      mainWindow.getDiagram().addValue("power", i, w);
-    }
-    */
+    Runtime.getRuntime().addShutdownHook(new Thread(){
+      @Override
+      public void run() {
+        quit();
+      }
+    });
   }
 
@@ -209 +194 @@
   private void save() {
     stopRecording();
+    jergometerSettings.setMainWindowBounds(mainWindow.getBounds());
+    jergometerSettings.setMainWindowMaximizedState(mainWindow.getExtendedState() & JFrame.MAXIMIZED_BOTH);
     jergometerSettings.save();
     userSettings.save();
@@ -575 +562 @@
   public void quit() {
     save();
-    mainWindow.dispose();
-
-    System.exit(0);
+    //mainWindow.dispose();
   }
 
@@ -640 +625 @@
 
   public void windowClosing(WindowEvent e) {
-    quit();
+    System.exit(0);
   }
 

trunk/src/org/jergometer/JergometerSettings.java

@@ -1 +1 @@
 package org.jergometer;
 
+import de.endrullis.utils.BetterProperties2;
 import de.endrullis.utils.StreamUtils;
 import de.endrullis.xml.XMLDocument;
@@ -6 +7 @@
 import de.endrullis.xml.XMLParser;
 
+import javax.swing.*;
+import java.awt.*;
 import java.io.*;
 import java.util.ArrayList;
@@ -22 +25 @@
   public static final String jergometerExampleProgramsDirName = "programs";
   // files
-  public static final String settingsFileName = jergometerDirName + "/settings.xml";
+  public static final File oldSettingsFile = new File(jergometerDirName + "/settings.xml");
+  public static final File settingsFile = new File(jergometerDirName + "/settings.properties");
+
+  // BetterProperties2 constants
+  public static final BetterProperties2.Range INT           = BetterProperties2.INT;
+  public static final BetterProperties2.Range INT_GT_0      = BetterProperties2.INT_GT_0;
+  public static final BetterProperties2.Range DOUBLE        = BetterProperties2.DOUBLE;
+  public static final BetterProperties2.Range DOUBLE_GT_0   = BetterProperties2.DOUBLE_GT_0;
+  public static final BetterProperties2.Range DOUBLE_0_TO_1 = BetterProperties2.DOUBLE_0_TO_1;
+  public static final BetterProperties2.Range BOOLEAN       = BetterProperties2.BOOLEAN;
+  public static final BetterProperties2.Range STRING        = BetterProperties2.STRING;
+  public static final BetterProperties2.Range SHORTCUT      = BetterProperties2.SHORTCUT;
 
 
 // dynamic
 
+  private BetterProperties2 properties = new BetterProperties2();
   private boolean checkForUpdatesOnStart = true;
+  private Rectangle mainWindowBounds;
+  private int mainWindowMaximizedState;
   private ArrayList<String> userNames = new ArrayList<String>();
   private String lastUserName;
@@ -59 +76 @@
     }
 
+    defineProperties();
+
     // load settings
     load();
   }
 
+  private void defineProperties() {
+    // set default for the properties file
+    properties.addEntry(new BetterProperties2.Comment("\n## General properties"));
+    //properties.addEntry(new BetterProperties2.Comment(" Check for updates"));
+    properties.addEntry(new BetterProperties2.Def("check_for_updates", BOOLEAN, "true"));
+    properties.addEntry(new BetterProperties2.Def("last_user", STRING, null));
+    properties.addEntry(new BetterProperties2.Def("comport", STRING, null));
+    properties.addEntry(new BetterProperties2.Def("xml_editor", STRING, null));
+
+    properties.addEntry(new BetterProperties2.Comment("\n## Window properties"));
+    properties.addEntry(new BetterProperties2.Comment(" Position, width, and height of the main window"));
+    properties.addEntry(new BetterProperties2.Def("main_window.x", INT_GT_0, "0"));
+    properties.addEntry(new BetterProperties2.Def("main_window.y", INT_GT_0, "0"));
+    properties.addEntry(new BetterProperties2.Def("main_window.width", INT_GT_0, "700"));
+    properties.addEntry(new BetterProperties2.Def("main_window.height", INT_GT_0, "500"));
+    properties.addEntry(new BetterProperties2.Def("main_window.maximized", INT_GT_0, "" + JFrame.MAXIMIZED_BOTH));
+    /*
+    properties.addEntry(new BetterProperties2.Comment(" Width of the symbols panel as part of the main window"));
+    properties.addEntry(new BetterProperties2.Def("symbols_panel.width", DOUBLE_0_TO_1, "0.25"));
+    properties.addEntry(new BetterProperties2.Comment(" Height of the tools panel as part of the main window"));
+    properties.addEntry(new BetterProperties2.Def("tools_panel.height", DOUBLE_0_TO_1, "0.15"));
+    */
+
+    properties.addEntry(new BetterProperties2.Comment("\n## Shortcuts"));
+    properties.addEntry(new BetterProperties2.Comment(" File menu"));
+    properties.addEntry(new BetterProperties2.Def("shortcut.new", SHORTCUT, "control N"));
+    properties.addEntry(new BetterProperties2.Def("shortcut.open", SHORTCUT, "control O"));
+    properties.addEntry(new BetterProperties2.Def("shortcut.save", SHORTCUT, "control S"));
+    properties.addEntry(new BetterProperties2.Def("shortcut.close", SHORTCUT, "control W"));
+    properties.addEntry(new BetterProperties2.Def("shortcut.exit", SHORTCUT, ""));
+
+  }
+
   public void load() {
-    File settingsFile = new File(settingsFileName);
     if (settingsFile.exists()) {
+      try {
+        properties.load(new FileReader(settingsFile));
+      } catch (IOException e) {
+        properties.loadDefaults();
+        e.printStackTrace();
+      }
+    } else {
+      properties.loadDefaults();
+    }
+
+    // extract variables
+    checkForUpdatesOnStart = properties.getBoolean("check_for_updates");
+    mainWindowBounds = new Rectangle(
+        properties.getInt("main_window.x"),
+        properties.getInt("main_window.y"),
+        properties.getInt("main_window.width"),
+        properties.getInt("main_window.height")
+    );
+    mainWindowMaximizedState = properties.getInt("main_window.maximized");
+
+    lastUserName = properties.getString("last_user");
+    comPort = properties.getString("comport");
+    xmlEditor = properties.getString("xml_editor");
+
+    if (oldSettingsFile.exists()) {
       XMLParser parser = new XMLParser();
       try {
-        XMLDocument doc = parser.parse(StreamUtils.readXmlStream(new FileInputStream(settingsFile)));
+        XMLDocument doc = parser.parse(StreamUtils.readXmlStream(new FileInputStream(oldSettingsFile)));
         XMLElement root = doc.getRootElement();
 
@@ -81 +157 @@
       } catch (Exception ignored) {
       }
-    }
-  }
+      save();
+      oldSettingsFile.delete();
+    }
+  }
+
+  /*
+  */
 
   public void save() {
-    XMLElement root = new XMLElement("settings");
-    root.setAttribute("version", "1");
-
-    {
-      XMLElement update = new XMLElement("update");
-      root.addChildElement(update);
-      update.setAttribute("checkOnStart", checkForUpdatesOnStart ? "true" : "false");
-
-      XMLElement users = new XMLElement("users");
-      root.addChildElement(users);
-      if (lastUserName != null) {
-        users.setAttribute("lastUser", lastUserName);
-      }
-
-      XMLElement comport = new XMLElement("comport");
-      root.addChildElement(comport);
-      if (comPort != null) {
-        comport.setAttribute("name", comPort);
-      }
-      
-      XMLElement xmlEditor = new XMLElement("xmlEditor");
-      root.addChildElement(xmlEditor);
-      if (this.xmlEditor != null) {
-        xmlEditor.setAttribute("name", this.xmlEditor);
-      }
-    }
-
+    properties.setBoolean("check_for_updates", checkForUpdatesOnStart);
+    properties.setInt("main_window.x", mainWindowBounds.x);
+    properties.setInt("main_window.y", mainWindowBounds.y);
+    properties.setInt("main_window.width", mainWindowBounds.width);
+    properties.setInt("main_window.height", mainWindowBounds.height);
+    properties.setInt("main_window.maximized", mainWindowMaximizedState);
+
+    properties.setString("last_user", lastUserName);
+    properties.setString("comport", comPort);
+    properties.setString("xml_editor", xmlEditor);
+
+    settingsFile.getParentFile().mkdirs();
+    try {
+      properties.store(new FileOutputStream(settingsFile),
+          " JErgometer properties\n" +
+          " Default values will be automatically commented out.\n");
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+
+    /*
     // write the document
     XMLDocument doc = new XMLDocument();
@@ -121 +196 @@
     } catch (IOException ignored) {
     }
+    */
   }
 
@@ -133 +209 @@
   }
 
+  public Rectangle getMainWindowBounds() {
+    return mainWindowBounds;
+  }
+
+  public void setMainWindowBounds(Rectangle mainWindowBounds) {
+    this.mainWindowBounds = mainWindowBounds;
+  }
+
+  public int getMainWindowMaximizedState() {
+    return mainWindowMaximizedState;
+  }
+
+  public void setMainWindowMaximizedState(int mainWindowMaximizedState) {
+    this.mainWindowMaximizedState = mainWindowMaximizedState;
+  }
+
   public ArrayList<String> getUserNames() {
     return userNames;