[power-architect] r3437 committed - Text fields now span the whole width of the window in user and group e...

Tue, 06 Apr 2010 15:01:06 -0700 

Revision: 3437
Author: ferguson.sebastian
Date: Tue Apr  6 14:59:57 2010
Log: Text fields now span the whole width of the window in user and group editor panels 
http://code.google.com/p/power-architect/source/detail?r=3437

Modified:
/trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/GroupEditorPanel.java /trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/SecurityPanel.java /trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/UserEditorPanel.java 

=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/GroupEditorPanel.java Mon Apr 5 14:24:45 2010 +++ /trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/GroupEditorPanel.java Tue Apr 6 14:59:57 2010 
@@ -181,7 +181,7 @@

         CellConstraints cc = new CellConstraints();
DefaultFormBuilder upperPanelBuilder = new DefaultFormBuilder(new FormLayout( 
-                "pref, 5dlu, pref", "pref, 5dlu"));
+                "pref, 5dlu, pref:grow", "pref, 5dlu"));
         upperPanelBuilder.add(nameLabel, cc.xy(1, 1));
         upperPanelBuilder.add(nameTextField, cc.xyw(3, 1, 1));

=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/SecurityPanel.java Tue Apr 6 14:37:05 2010 +++ /trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/SecurityPanel.java Tue Apr 6 14:59:57 2010 
@@ -105,9 +105,9 @@
     private final MouseListener popupListener = new MouseListener() {
         public void mouseReleased(MouseEvent e) { maybeShowPopup(e); }
         public void mousePressed(MouseEvent e)  { maybeShowPopup(e); }
-        public void mouseClicked(MouseEvent e) {}
-        public void mouseEntered(MouseEvent e) {}
-        public void mouseExited(MouseEvent e) {}
+        public void mouseClicked(MouseEvent e)  { maybeShowPopup(e); }
+        public void mouseEntered(MouseEvent e)  { maybeShowPopup(e); }
+        public void mouseExited(MouseEvent e)   { maybeShowPopup(e); }

         private void maybeShowPopup(MouseEvent e) {
             if (e.isPopupTrigger()) {
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/UserEditorPanel.java Tue Apr 6 14:37:05 2010 +++ /trunk/src/main/java/ca/sqlpower/architect/swingui/enterprise/UserEditorPanel.java Tue Apr 6 14:59:57 2010 
@@ -221,17 +221,17 @@
         final Dimension prefScrollPaneDimension = new Dimension(250, 300);

         usernameLabel = new JLabel("User Name");
-        usernameField = new JTextField(25);
+        usernameField = new JTextField();
         usernameField.setText(user.getUsername());
         usernameField.getDocument().addDocumentListener(textFieldListener);

         fullnameLabel = new JLabel("Full Name");
-        fullnameField = new JTextField(25);
+        fullnameField = new JTextField();
         fullnameField.setText(user.getFullName());
         fullnameField.getDocument().addDocumentListener(textFieldListener);

         emailLabel = new JLabel("Email");
-        emailField = new JTextField(25);
+        emailField = new JTextField();
         emailField.setText(user.getEmail());
         emailField.getDocument().addDocumentListener(textFieldListener);

@@ -271,14 +271,17 @@

         CellConstraints cc = new CellConstraints();
DefaultFormBuilder upperPanelBuilder = new DefaultFormBuilder(new FormLayout( 
-                "pref, 5dlu, pref", "pref, pref, pref, pref, pref, 5dlu"));
+ "pref, 5dlu, pref:grow", "pref, pref, pref, pref, pref, 5dlu")); 
         upperPanelBuilder.add(usernameLabel, cc.xy(1, 1));
         upperPanelBuilder.add(usernameField, cc.xyw(3, 1, 1));
         upperPanelBuilder.add(fullnameLabel, cc.xy(1, 3));
         upperPanelBuilder.add(fullnameField, cc.xyw(3, 3, 1));
         upperPanelBuilder.add(emailLabel, cc.xy(1, 4));
         upperPanelBuilder.add(emailField, cc.xy(3, 4));
- upperPanelBuilder.add(new JButton(changePasswordAction), cc.xy(3, 5)); 
+
+ ButtonBarBuilder passwordBuilder = ButtonBarBuilder.createLeftToRightBuilder(); 
+        passwordBuilder.addGlue();
+        passwordBuilder.addGridded(new JButton(changePasswordAction));
DefaultFormBuilder buttonPanelBuilder = new DefaultFormBuilder(new FormLayout( 
                 "pref", "pref:grow, pref, 5dlu, pref, pref:grow"));
@@ -293,9 +296,10 @@
         centrePanelBuilder.add(buttonPanelBuilder.getPanel(), cc.xy(3, 2));
         centrePanelBuilder.add(currentGroupsScrollPane, cc.xy(5, 2));
- DefaultFormBuilder builder = new DefaultFormBuilder(new FormLayout("pref:grow", "pref, 3dlu, pref:grow, 5dlu, pref")); + DefaultFormBuilder builder = new DefaultFormBuilder(new FormLayout("pref:grow", "pref, pref, 3dlu, pref:grow, 5dlu, pref")); 
         builder.add(upperPanelBuilder.getPanel(), cc.xy(1, 1));
-        builder.add(centrePanelBuilder.getPanel(), cc.xy(1, 3));
+        builder.add(passwordBuilder.getPanel(), cc.xy(1, 2));
+        builder.add(centrePanelBuilder.getPanel(), cc.xy(1, 4));
DefaultFormBuilder bottomBuilder = new DefaultFormBuilder(new FormLayout("pref:grow, 5dlu, pref:grow", "pref, 3dlu, pref")); 
         bottomBuilder.add(new JLabel("System Privileges"), cc.xy(1, 1));
@@ -308,7 +312,7 @@
         bbb.addGridded(new JButton(cancelAction));

         bottomBuilder.add(bbb.getPanel(), cc.xy(3, 3));
-        builder.add(bottomBuilder.getPanel(), cc.xy(1, 5));
+        builder.add(bottomBuilder.getPanel(), cc.xy(1, 6));
         builder.setDefaultDialogBorder();

         panel = builder.getPanel();


--
To unsubscribe, reply using "remove me" as the subject.

Reply via email to