Changeset 192

Timestamp:

02/23/10 21:56:41 (2 years ago)

Author:

stefan

Message:

implemented issue #176: add a menu for managing programs

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• src/org/jergometer/gui/MainWindow.java (modified) (11 diffs)
• src/org/jergometer/translation/jergometer_de.properties (modified) (1 diff)
• src/org/jergometer/translation/jergometer.properties (modified) (1 diff)

trunk/CHANGELOG

@@ -6 +6 @@
 2010-02-23
 * [stefan]  * implemented feature #177: extend timeline automatically when reaching end of traning program
+            * implemented issue #176: add a menu for managing programs
 
 2010-02-20

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

@@ -53 +53 @@
   private JCheckBoxMenuItem showOnlyCompletedSessionsMenuItem;
   private JCheckBoxMenuItem showFullSessionLength;
+  private JMenuItem editProgramMenuItem;
+  private JMenuItem renameProgramMenuItem;
+  private JMenuItem createNewProgramDirectory;
+  private JMenuItem copyProgramMenuItem;
+  private JMenuItem cutProgramDataMenuItem;
+  private JMenuItem deleteProgramMenuItem;
+  private JMenuItem updateProgramMenuItem;
   private JMenu userMenu;
   private ButtonGroup userButtonGroup;
@@ -85 +92 @@
     this.jergometer = jergometer;
     setContentPane(mainPanel);
+    createPopups();
     setJMenuBar(createMenuBar());
-    createPopups();
 
     // set icon
@@ -179 +186 @@
       userMenu.setMnemonic(I18n.getMnemonic("menu.user_mn"));
       menuBar.add(userMenu);
+    }
+
+    // Programs
+    {
+      JMenu programsMenu = new JMenu(I18n.getString("menu.programs"));
+      programsMenu.setMnemonic(I18n.getMnemonic("menu.programs_mn"));
+      menuBar.add(programsMenu);
+      programsMenu.add(editProgramMenuItem);
+      programsMenu.add(renameProgramMenuItem);
+      programsMenu.add(createNewProgramDirectory);
+      programsMenu.add(copyProgramMenuItem);
+      programsMenu.add(cutProgramDataMenuItem);
+      programsMenu.add(insertProgramMenuItem);
+      programsMenu.add(deleteProgramMenuItem);
+      programsMenu.add(updateProgramMenuItem);
     }
 
@@ -273 +295 @@
     {
       programTreePopup = new JPopupMenu();
-      JMenuItem editProgramMenuItem = new JMenuItem(I18n.getString("menu.programs.edit"));
+      editProgramMenuItem = new JMenuItem(I18n.getString("menu.programs.edit"));
       editProgramMenuItem.setActionCommand(AC_EDIT_PROGRAM);
       editProgramMenuItem.setMnemonic(I18n.getMnemonic("menu.programs.edit_mn"));
@@ -279 +301 @@
       editProgramMenuItem.addActionListener(this);
       programTreePopup.add(editProgramMenuItem);
-      JMenuItem renameProgramMenuItem = new JMenuItem(I18n.getString("menu.programs.rename"));
+      renameProgramMenuItem = new JMenuItem(I18n.getString("menu.programs.rename"));
       renameProgramMenuItem.setActionCommand(AC_RENAME_PROGRAM);
       renameProgramMenuItem.setMnemonic(I18n.getMnemonic("menu.programs.rename_mn"));
@@ -285 +307 @@
       renameProgramMenuItem.addActionListener(this);
       programTreePopup.add(renameProgramMenuItem);
-      JMenuItem createNewProgramDirectory = new JMenuItem(I18n.getString("menu.programs.create_new_directory"));
+      createNewProgramDirectory = new JMenuItem(I18n.getString("menu.programs.create_new_directory"));
       createNewProgramDirectory.setActionCommand(AC_CREATE_NEW_PROGRAM_DIRECTORY);
       createNewProgramDirectory.setMnemonic(I18n.getMnemonic("menu.programs.create_new_directory_mn"));
@@ -291 +313 @@
       createNewProgramDirectory.addActionListener(this);
       programTreePopup.add(createNewProgramDirectory);
-      JMenuItem copyProgramMenuItem = new JMenuItem(I18n.getString("menu.programs.copy"));
+      copyProgramMenuItem = new JMenuItem(I18n.getString("menu.programs.copy"));
       copyProgramMenuItem.setActionCommand(AC_COPY_PROGRAM);
       copyProgramMenuItem.setMnemonic(I18n.getMnemonic("menu.programs.copy_mn"));
@@ -297 +319 @@
       copyProgramMenuItem.addActionListener(this);
       programTreePopup.add(copyProgramMenuItem);
-      JMenuItem cutProgramDataMenuItem = new JMenuItem(I18n.getString("menu.programs.cut"));
+      cutProgramDataMenuItem = new JMenuItem(I18n.getString("menu.programs.cut"));
       cutProgramDataMenuItem.setActionCommand(AC_CUT_PROGRAM);
       cutProgramDataMenuItem.setMnemonic(I18n.getMnemonic("menu.programs.cut_mn"));
@@ -310 +332 @@
       insertProgramMenuItem.addActionListener(this);
       programTreePopup.add(insertProgramMenuItem);
-      JMenuItem deleteProgramMenuItem = new JMenuItem(I18n.getString("menu.programs.delete"));
+      deleteProgramMenuItem = new JMenuItem(I18n.getString("menu.programs.delete"));
       deleteProgramMenuItem.setActionCommand(AC_DELETE_PROGRAM);
       deleteProgramMenuItem.setMnemonic(I18n.getMnemonic("menu.programs.delete_mn"));
@@ -316 +338 @@
       deleteProgramMenuItem.addActionListener(this);
       programTreePopup.add(deleteProgramMenuItem);
-      JMenuItem updateProgramMenuItem = new JMenuItem(I18n.getString("menu.programs.update"));
+      updateProgramMenuItem = new JMenuItem(I18n.getString("menu.programs.update"));
       updateProgramMenuItem.setActionCommand(AC_UPDATE_PROGRAM);
       updateProgramMenuItem.setMnemonic(I18n.getMnemonic("menu.programs.update_mn"));
@@ -728 +750 @@
       if (e.getKeyCode() == KeyEvent.VK_DELETE && e.getModifiers() == 0) {
         deleteSelectedSessions();
+        e.consume();
       }
     } else if (src == programTree) {
-      if (e.getKeyCode() == KeyEvent.VK_F4) {
-        editProgram();
+      if (e.getKeyCode() == KeyEvent.VK_DELETE && e.getModifiers() == 0) {
+        deleteProgram();
+        e.consume();
       } else if (e.getKeyCode() == KeyEvent.VK_F2) {
         renameProgram();
+        e.consume();
       } else if (e.getKeyCode() == KeyEvent.VK_C && e.getModifiers() == KeyEvent.CTRL_MASK) {
         copyProgram();
+        e.consume();
       } else if (e.getKeyCode() == KeyEvent.VK_X && e.getModifiers() == KeyEvent.CTRL_MASK) {
         cutProgram();
+        e.consume();
       } else if (e.getKeyCode() == KeyEvent.VK_V && e.getModifiers() == KeyEvent.CTRL_MASK) {
         insertProgram();
-      } else if (e.getKeyCode() == KeyEvent.VK_DELETE && e.getModifiers() == 0) {
-        deleteProgram();
-      } else if (e.getKeyCode() == KeyEvent.VK_F5) {
-        updateProgram();
+        e.consume();
       }
     }

trunk/src/org/jergometer/translation/jergometer_de.properties

@@ -22 +22 @@
 menu.user=Nutzer
 menu.user_mn=N
+menu.programs=Programme
+menu.programs_mn=P
 menu.help=Hilfe
 menu.help_mn=H

trunk/src/org/jergometer/translation/jergometer.properties

@@ -22 +22 @@
 menu.user=User
 menu.user_mn=U
+menu.programs=Programs
+menu.programs_mn=P
 menu.help=Help
 menu.help_mn=H