Merge lp:~tapaal-contributor/tapaal/fix-934132-cmdvsctrl-redone into lp:tapaal

[Jiri Srba]

Redone the assignment of hotkeys, for win+linux using crtl for mac using cmd.

Redone the assignment of hotkeys, for win+linux using crtl for mac using cmd.

[Jiri Srba (srba)]

review: Approve

[Kenneth Yrke Jørgensen (yrke)]

review: Approve (code review)

=== modified file 'src/pipe/gui/GuiFrame.java'
--- src/pipe/gui/GuiFrame.java	2012-02-20 10:20:43 +0000
+++ src/pipe/gui/GuiFrame.java	2012-02-23 21:26:18 +0000
@@ -8,6 +8,7 @@
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.InputEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.beans.PropertyChangeEvent;
@@ -83,8 +84,7 @@
 import dk.aau.cs.model.tapn.NetworkMarking;
 import dk.aau.cs.model.tapn.TimedArcPetriNet;
 import dk.aau.cs.model.tapn.TimedPlace;
-import dk.aau.cs.verification.UPPAAL.Verifyta;
-import dk.aau.cs.verification.VerifyTAPN.VerifyTAPN;
+
 
 public class GuiFrame extends JFrame implements Observer {
 
@@ -111,6 +111,7 @@
 
 	private EditAction /* copyAction, cutAction, pasteAction, */undoAction, redoAction;
 	private GridAction toggleGrid;
+	private ToolAction netStatisticsAction, batchProcessingAction, engineSelectionAction;
 	private ZoomAction zoomOutAction, zoomInAction;
 	private DeleteAction deleteAction;
 	private TypeAction annotationAction, arcAction, inhibarcAction,
@@ -246,18 +247,27 @@
 		JMenu fileMenu = new JMenu("File");
 		fileMenu.setMnemonic('F');
 
+		int shortcutkey = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
+		
 		addMenuItem(fileMenu, createAction = new FileAction("New",
 				"Create a new Petri net", "ctrl N"));
+		createAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('N', shortcutkey));
+		
 		addMenuItem(fileMenu, openAction = new FileAction("Open", "Open",
 		"ctrl O"));
+		openAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('O', shortcutkey));
+		
 		addMenuItem(fileMenu, closeAction = new FileAction("Close",
 				"Close the current tab", "ctrl W"));
+		closeAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('W', shortcutkey));
 		fileMenu.addSeparator();
 
 		addMenuItem(fileMenu, saveAction = new FileAction("Save", "Save",
 		"ctrl S"));
+		saveAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('S', shortcutkey));
 		addMenuItem(fileMenu, saveAsAction = new FileAction("Save as",
-				"Save as...", "shift ctrl S"));
+				"Save as...", null));
+		saveAsAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('S', (shortcutkey + InputEvent.SHIFT_MASK)));
 
 		// Export menu
 		exportMenu = new JMenu("Export");
@@ -267,16 +277,20 @@
 						CreateGui.imgPath + "Export.png")));
 		addMenuItem(exportMenu, exportPNGAction = new FileAction("PNG",
 				"Export the net to PNG format", "ctrl G"));
+		exportPNGAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('G', shortcutkey));
 		addMenuItem(exportMenu, exportPSAction = new FileAction("PostScript",
 				"Export the net to PostScript format", "ctrl T"));
+		exportPSAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('T', shortcutkey));
 		addMenuItem(exportMenu, exportToTikZAction = new FileAction("TikZ",
 				"Export the net to PNG format", "ctrl L"));
+		exportToTikZAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('L', shortcutkey));
 
 		fileMenu.add(exportMenu);
 
 		fileMenu.addSeparator();
 		addMenuItem(fileMenu, printAction = new FileAction("Print", "Print",
 		"ctrl P"));
+		printAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('P', shortcutkey));
 		fileMenu.addSeparator();
 
 		// Example files menu
@@ -356,7 +370,14 @@
 					if (nets[i].toLowerCase().endsWith(".xml")) {
 						//addMenuItem(exampleMenu, new ExampleFileAction(nets[i], (k < 10) ? "ctrl " + (k++) : null));
 						
-						ExampleFileAction tmp = new ExampleFileAction(nets[i], nets[i].replace(".xml", ""), (k < 10) ? "ctrl " + (k++) : null);
+						ExampleFileAction tmp = new ExampleFileAction(nets[i], nets[i].replace(".xml", ""), null);
+						if (k < 10) {
+						
+							//tmp.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyStroke.getKeyStroke(""+k).getKeyCode(), shortcutkey));
+							
+						}
+						k++;
+						
 						addMenuItem(exampleMenu, tmp);
 					}
 				}
@@ -369,14 +390,17 @@
 		}
 		addMenuItem(fileMenu, exitAction = new FileAction("Exit",
 				"Close the program", "ctrl Q"));
+		exitAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('Q', shortcutkey));
 
 		/* Edit Menu */
 		JMenu editMenu = new JMenu("Edit");
 		editMenu.setMnemonic('E');
 		addMenuItem(editMenu, undoAction = new EditAction("Undo",
-				"Undo (Ctrl-Z)", "ctrl Z"));
+				"Undo", "ctrl Z"));
+		undoAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('Z', shortcutkey));
 		addMenuItem(editMenu, redoAction = new EditAction("Redo",
-				"Redo (Ctrl-Y)", "ctrl Y"));
+				"Redo", "ctrl Y"));
+		redoAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('Y', shortcutkey));
 		editMenu.addSeparator();
 
 		 addMenuItem(editMenu, deleteAction = new DeleteAction("Delete",
@@ -432,10 +456,13 @@
 						 CreateGui.imgPath + "Zoom.png")));
 		 addZoomMenuItems(zoomMenu);
 
+		 addMenuItem(viewMenu, zoomInAction = new ZoomAction("Zoom in",
+				 "Zoom in by 10% ", "ctrl J"));
+		 zoomInAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyStroke.getKeyStroke("J").getKeyCode(), shortcutkey));
+
 		 addMenuItem(viewMenu, zoomOutAction = new ZoomAction("Zoom out",
-				 "Zoom out by 10% ", "ctrl MINUS"));
-		 addMenuItem(viewMenu, zoomInAction = new ZoomAction("Zoom in",
-				 "Zoom in by 10% ", "ctrl PLUS"));
+				 "Zoom out by 10% ", "ctrl K"));
+		 zoomOutAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyStroke.getKeyStroke("K").getKeyCode(), shortcutkey));
 		 viewMenu.add(zoomMenu);
 
 		 viewMenu.addSeparator();
@@ -446,16 +473,26 @@
 		 
 		 viewMenu.addSeparator();
 		 
-		 		 addCheckboxMenuItem(viewMenu, showComponentsAction = new ViewAction("Display components", 
-				 453243, "Show/hide the list of components.", "C", true));
-		 addCheckboxMenuItem(viewMenu, showConstantsAction = new ViewAction("Display constants", 
-				 453245, "Show/hide global constants.", "O", true));
-		 addCheckboxMenuItem(viewMenu, showQueriesAction = new ViewAction("Display queries", 
-				 453244, "Show/hide verification queries.", "Q", true));
-		 addCheckboxMenuItem(viewMenu, showZeroToInfinityIntervalsAction = new ViewAction("Display intervals [0,inf)",
-				 453246, "Show/hide intervals [0,inf) that do not restrict transition firing in any way.","F",true));
-		 addCheckboxMenuItem(viewMenu, showEnabledTransitionsAction = new ViewAction("Display Enabled transitions",
-				 453247, "Show/hide the list of enabled transitions","E",true));
+		 	addCheckboxMenuItem(viewMenu, showComponentsAction = new ViewAction("Display components", 
+				 453243, "Show/hide the list of components.", "ctrl 1", true));
+                                 showComponentsAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('1', shortcutkey));
+
+		 	addCheckboxMenuItem(viewMenu, showQueriesAction = new ViewAction("Display queries", 
+				 453244, "Show/hide verification queries.", "ctrl 2", true));
+				 showQueriesAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('2', shortcutkey));
+
+		 	addCheckboxMenuItem(viewMenu, showConstantsAction = new ViewAction("Display constants", 
+				 453245, "Show/hide global constants.", "ctrl 3", true));
+	  	         	 showConstantsAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('3', shortcutkey));
+			
+		 	addCheckboxMenuItem(viewMenu, showEnabledTransitionsAction = new ViewAction("Display enabled transitions",
+				 453247, "Show/hide the list of enabled transitions","ctrl 4",true));
+				 showEnabledTransitionsAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('4', shortcutkey));
+
+		 	addCheckboxMenuItem(viewMenu, showZeroToInfinityIntervalsAction = new ViewAction("Display intervals [0,inf)",
+				 453246, "Show/hide intervals [0,inf) that do not restrict transition firing in any way.","ctrl 5",true));
+    				 showZeroToInfinityIntervalsAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('5', shortcutkey));
+
 		 
 		 /* Simulator */
 		 JMenu animateMenu = new JMenu("Simulator");
@@ -523,7 +560,25 @@
 		JMenu toolsMenu = new JMenu("Tools");
 		toolsMenu.setMnemonic('t');
 		
-		JMenuItem batchProcessing = new JMenuItem("Batch processing");
+		int shortcutkey = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
+		
+
+        //statistics = new JMenuItem("Net statistics");	
+		statistics = new JMenuItem(netStatisticsAction = new ToolAction("Net statistics", "Shows information about the number of transitions, places, arcs, etc.","ctrl I"));				
+		netStatisticsAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('I', shortcutkey));
+		statistics.setMnemonic('n');		
+		statistics.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent arg0) {
+				StatisticsPanel.showStatisticsPanel();
+			}
+		});		
+		toolsMenu.add(statistics);		
+		
+		
+		//JMenuItem batchProcessing = new JMenuItem("Batch processing");
+		JMenuItem batchProcessing = new JMenuItem(batchProcessingAction = new ToolAction("Batch processing", "Batch verification of multiple nets and queries","ctrl B"));				
+		batchProcessingAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('B', shortcutkey));
+		
 		batchProcessing.setMnemonic('b');				
 		batchProcessing.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
@@ -540,18 +595,13 @@
 		});
 		toolsMenu.add(batchProcessing);
 		
-		statistics = new JMenuItem("Net statistics");
-		statistics.setMnemonic('n');		
-		statistics.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				StatisticsPanel.showStatisticsPanel();
-			}
-		});		
-		toolsMenu.add(statistics);		
 		
 		toolsMenu.addSeparator();
 		
-		JMenuItem engineSelection = new JMenuItem("Verification engines");
+		//JMenuItem engineSelection = new JMenuItem("Verification engines");
+		JMenuItem engineSelection = new JMenuItem(engineSelectionAction = new ToolAction("Engine selection", "View and modify the location of verification engines","ctrl E"));				
+		engineSelectionAction.putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke('E', shortcutkey));
+		
 		engineSelection.setMnemonic('v');		
 		engineSelection.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
@@ -659,8 +709,10 @@
 	 */
 	private void addZoomMenuItems(JMenu zoomMenu) {
 		for (int i = 0; i <= zoomExamples.length - 1; i++) {
-			JMenuItem newItem = new JMenuItem(new ZoomAction(zoomExamples[i],
-					"Select zoom percentage", i < 10 ? "ctrl shift " + i : ""));
+			ZoomAction a = new ZoomAction(zoomExamples[i], "Select zoom percentage", "");
+			
+			JMenuItem newItem = new JMenuItem(a);
+			
 			zoomMenu.add(newItem);
 		}
 	}
@@ -1767,6 +1819,24 @@
 		}
 
 	}
+	
+	class ToolAction extends GuiAction {
+
+		/**
+		 * 
+		 */
+		private static final long serialVersionUID = 8910743226610517225L;
+
+		ToolAction(String name, String tooltip, String keystroke) {
+			super(name, tooltip, keystroke);
+		}
+
+
+		public void actionPerformed(ActionEvent e) {
+			// TODO Auto-generated method stub
+			
+		}
+	}
 
 	class ZoomAction extends GuiAction {
 

=== modified file 'src/pipe/gui/widgets/EngineDialogPanel.java'
--- src/pipe/gui/widgets/EngineDialogPanel.java	2012-02-14 18:20:28 +0000
+++ src/pipe/gui/widgets/EngineDialogPanel.java	2012-02-23 21:26:18 +0000
@@ -354,17 +354,19 @@
 		gbc.gridy = 2;
 		gbc.anchor = GridBagConstraints.EAST;
 		gbc.insets = new Insets(0,5,2,5);
-		enginePanel.add(closeButtonPanel,gbc);		
+		enginePanel.add(closeButtonPanel,gbc);	
+		
 	}
 	
 	public void showDialog() {
 		dialog = new EscapableDialog(CreateGui.getApp(),
-				"Select verification engines", true);
+				"Selection of Verification Engines", true);
 		dialog.add(enginePanel);
 		dialog.setResizable(false);
 		dialog.setMinimumSize(minimumSize);
 		dialog.pack();
 		dialog.setLocationRelativeTo(null);
 		dialog.setVisible(true);
+	
 	}
 }