svn commit: r15193 - trunk/src/argouml-app/src/org/argouml/ui/cmd

Author: mvw
Date: 2008-07-07 11:20:53-0700
New Revision: 15193

Modified:
   trunk/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java
   trunk/src/argouml-app/src/org/argouml/ui/cmd/SettingsTabShortcuts.java

Log:
Remaining fix for issue 5207: Configure Shortcuts broken - well it works when you quit and restart ArgoUML first, which is now clarified.

Modified: trunk/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java?view=diff&rev=15193&p1=trunk/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java&p2=trunk/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java&r1=15192&r2=15193
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/ui/cmd/GenericArgoMenuBar.java	2008-07-07 11:20:53-0700
@@ -367,7 +367,9 @@
         file.addSeparator();
         JMenuItem exitItem = file.add(new ActionExit());
         setMnemonic(exitItem, "Exit");
-        // exit shortcut is not user configurable!
+        /* The "Close window" shortcut (ALT+F4) actually can't 
+         * be registered as a shortcut, 
+         * because it closes the configuration dialog! */
         exitItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_F4,
               InputEvent.ALT_MASK));
 

Modified: trunk/src/argouml-app/src/org/argouml/ui/cmd/SettingsTabShortcuts.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/cmd/SettingsTabShortcuts.java?view=diff&rev=15193&p1=trunk/src/argouml-app/src/org/argouml/ui/cmd/SettingsTabShortcuts.java&p2=trunk/src/argouml-app/src/org/argouml/ui/cmd/SettingsTabShortcuts.java&r1=15192&r2=15193
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/cmd/SettingsTabShortcuts.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/ui/cmd/SettingsTabShortcuts.java	2008-07-07 11:20:53-0700
@@ -43,6 +43,7 @@
 import javax.swing.JTable;
 import javax.swing.KeyStroke;
 import javax.swing.ListSelectionModel;
+import javax.swing.SwingConstants;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.table.AbstractTableModel;
@@ -207,6 +208,19 @@
             panelConstraints.weighty = 1;
             add(selectedContainer, panelConstraints);
 
+            JLabel restart =
+                new JLabel(Translator.localize("label.restart-application"));
+            restart.setHorizontalAlignment(SwingConstants.CENTER);
+            restart.setVerticalAlignment(SwingConstants.CENTER);
+            restart.setBorder(BorderFactory.createEmptyBorder(10, 2, 10, 2));
+            
+            panelConstraints.gridy = 2;
+            panelConstraints.anchor = GridBagConstraints.CENTER;
+            panelConstraints.fill = GridBagConstraints.BOTH;
+            panelConstraints.weightx = 1;
+            panelConstraints.weighty = 0;
+            add(restart, panelConstraints);
+            
             this.enableFields(false);
         }