Merge lp:~tapaal-contributor/tapaal/bug959196 into lp:tapaal

[Mathias Andersen]

The buttons of the edit annotation dialog has been modified to have a look and feel similar to other dialogs.

The buttons of the edit annotation dialog has been modified to have a look and feel similar to other dialogs.

[Jiri Srba (srba)]

Make new annotation, don't write anything and click "Cancel". The dialog is closed
but an empty square is created on the editing panel.

review: Needs Fixing

[Jiri Srba (srba)]

I will make a separate bug report for this. The branch improves the layout of the
buttons, so it can be merged to trunk and 2.1 now.

review: Approve

[Kenneth Yrke Jørgensen (yrke)]

review: Approve

=== modified file 'src/pipe/gui/widgets/AnnotationPanel.java'
--- src/pipe/gui/widgets/AnnotationPanel.java	2011-09-23 21:23:31 +0000
+++ src/pipe/gui/widgets/AnnotationPanel.java	2012-04-29 12:32:18 +0000
@@ -1,8 +1,14 @@
 package pipe.gui.widgets;
 
 import java.awt.BorderLayout;
+import java.awt.Color;
 import java.awt.Dimension;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.KeyEvent;
 
+import javax.swing.JPanel;
 import javax.swing.JSplitPane;
 
 import pipe.gui.graphicElements.AnnotationNote;
@@ -41,6 +47,10 @@
 	// <editor-fold defaultstate="collapsed"
 	// desc=" Generated Code ">//GEN-BEGIN:initComponents
 	private void initComponents() {
+		JPanel container;
+		container = new JPanel();
+		container.setLayout(new GridBagLayout());
+		
 		java.awt.GridBagConstraints gridBagConstraints;
 
 		panel = new javax.swing.JPanel();
@@ -66,11 +76,11 @@
 		gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
 		gridBagConstraints.insets = new java.awt.Insets(3, 3, 3, 3);
 		buttonPanel.setLayout(new java.awt.GridBagLayout());
-
 		okButton.setText("OK");
-		okButton.setMaximumSize(new java.awt.Dimension(75, 25));
-		okButton.setMinimumSize(new java.awt.Dimension(75, 25));
-		okButton.setPreferredSize(new java.awt.Dimension(75, 25));
+		okButton.setMaximumSize(new java.awt.Dimension(100, 25));
+		okButton.setMinimumSize(new java.awt.Dimension(100, 25));
+		okButton.setPreferredSize(new java.awt.Dimension(100, 25));
+		okButton.setMnemonic(KeyEvent.VK_O);
 		okButton.addActionListener(new java.awt.event.ActionListener() {
 			public void actionPerformed(java.awt.event.ActionEvent evt) {
 				okButtonActionPerformed(evt);
@@ -78,50 +88,47 @@
 		});
 
 		gridBagConstraints = new java.awt.GridBagConstraints();
-		gridBagConstraints.gridx = 6;
+		gridBagConstraints.gridx = 1;
 		gridBagConstraints.gridy = 0;
-		gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
-		gridBagConstraints.insets = new java.awt.Insets(6, 6, 6, 6);
+		gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
+		gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
 		buttonPanel.add(okButton, gridBagConstraints);
-
+		
 		cancelButton.setText("Cancel");
-		cancelButton.setMaximumSize(new java.awt.Dimension(75, 25));
-		cancelButton.setMinimumSize(new java.awt.Dimension(75, 25));
-		cancelButton.setPreferredSize(new java.awt.Dimension(75, 25));
+		cancelButton.setMaximumSize(new java.awt.Dimension(100, 25));
+		cancelButton.setMinimumSize(new java.awt.Dimension(100, 25));
+		cancelButton.setPreferredSize(new java.awt.Dimension(100, 25));
+		cancelButton.setMnemonic(KeyEvent.VK_C);
 		cancelButton.addActionListener(new java.awt.event.ActionListener() {
 			public void actionPerformed(java.awt.event.ActionEvent evt) {
 				cancelButtonActionPerformed(evt);
 			}
 		});
-
 		gridBagConstraints = new java.awt.GridBagConstraints();
+		gridBagConstraints.gridx = 0;
+		gridBagConstraints.gridy = 0;
+		gridBagConstraints.gridwidth = java.awt.GridBagConstraints.RELATIVE;
 		gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
 		gridBagConstraints.insets = new java.awt.Insets(0, 0, 0, 6);
 		buttonPanel.add(cancelButton, gridBagConstraints);
-
-		JSplitPaneFix split = new JSplitPaneFix(JSplitPane.VERTICAL_SPLIT,
-				panel, buttonPanel) {
-			/**
-		 * 
-		 */
-			private static final long serialVersionUID = -3436043116983340340L;
-
-			@Override
-			public int getMinimumDividerLocation() {
-				return lastDividerLocation;
-			}
-
-			@Override
-			public int getMaximumDividerLocation() {
-				return lastDividerLocation;
-			}
-		};
-		split.setResizeWeight(1.0);
-		split.setDividerLocation(0.88);
-		split.setContinuousLayout(true);
-		split.setDividerSize(0);
-		add(split);
-		this.setPreferredSize(new Dimension(400, 300));
+		
+		GridBagConstraints gbc = new GridBagConstraints();
+		gbc.gridx = 0;
+		gbc.gridy = 0;
+		gbc.weightx = 3;
+		gbc.weighty= 3;
+		gbc.gridwidth = 2;
+		gbc.fill = GridBagConstraints.BOTH;
+		container.add(panel,gbc);
+		
+		gbc = new GridBagConstraints();
+		gbc.gridx = 1;
+		gbc.gridy = 1;
+		gbc.gridwidth = 1;
+		gbc.anchor = GridBagConstraints.EAST;
+		container.add(buttonPanel,gbc);
+
+		add(container);		this.setPreferredSize(new Dimension(400, 300));
 	}// </editor-fold>//GEN-END:initComponents
 
 	private void cancelButtonActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_cancelButtonActionPerformed

=== modified file 'src/pipe/gui/widgets/ConstantsDialogPanel.java'
--- src/pipe/gui/widgets/ConstantsDialogPanel.java	2012-02-28 21:26:27 +0000
+++ src/pipe/gui/widgets/ConstantsDialogPanel.java	2012-04-29 12:32:18 +0000
@@ -1,5 +1,6 @@
 package pipe.gui.widgets;
 
+import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;