Changeset 623

Timestamp:

01/24/10 18:20:25 (2 years ago)

Author:

octorian

Message:

Minor field border/separator cleanup

Location:

trunk/LogicMail/src/org/logicprobe/LogicMail/ui

Files:

• AccountConfigScreen.java (modified) (3 diffs)
• BorderedFieldManager.java (modified) (5 diffs)
• OutgoingConfigScreen.java (modified) (2 diffs)

trunk/LogicMail/src/org/logicprobe/LogicMail/ui/AccountConfigScreen.java

@@ -44 +44 @@
 import net.rim.device.api.ui.component.ObjectChoiceField;
 import net.rim.device.api.ui.component.PasswordEditField;
+import net.rim.device.api.ui.component.SeparatorField;
 import net.rim.device.api.ui.component.TextField;
 import net.rim.device.api.ui.container.VerticalFieldManager;
@@ -270 +271 @@
         manager.add(serverUserField);
         manager.add(serverPassField);
-        manager.add(new LabelField());
+        manager.add(new SeparatorField());
         manager.add(identityField);
         manager.add(outgoingServerField);
@@ -328 +329 @@
         manager.add(enableWiFiCheckboxField);
         
+        manager.add(new SeparatorField());
+        
         if(accountConfig instanceof ImapConfig) {
             ImapConfig imapConfig = (ImapConfig)accountConfig;

trunk/LogicMail/src/org/logicprobe/LogicMail/ui/BorderedFieldManager.java

@@ -43 +43 @@
 public class BorderedFieldManager extends Manager {
         /** The border width. */
-        private static int borderWidth = 4;
+        private static final int borderWidth = 4;
+        
+        private static final int borderMargin = borderWidth * 2;
         
         /**
          * Show a normal border on the bottom.
          */
-        public static long BOTTOM_BORDER_NORMAL = 0x0000000000000L;
+        public static final long BOTTOM_BORDER_NORMAL = 0x0000000000000L;
         
         /**
@@ -55 +57 @@
          * vertically stacked instances.
          */
-        public static long BOTTOM_BORDER_NONE = 0x0000000000020L;
+        public static final long BOTTOM_BORDER_NONE = 0x0000000000020L;
         
         /**
          * Show a line on the bottom of the border.
          */
-        public static long BOTTOM_BORDER_LINE = 0x0000000000040L;
+        public static final long BOTTOM_BORDER_LINE = 0x0000000000040L;
         
         private boolean bottomBorderNone;
@@ -114 +116 @@
         // Paint the rounded rectangular cutout section for the contents
         graphics.setColor(backgroundColor);
-        graphics.fillRoundRect(borderWidth, borderWidth, width - (borderWidth * 2), height - (bottomBorderNone ? borderWidth : (borderWidth * 2)), 10, 10);
+        graphics.fillRoundRect(borderWidth, borderWidth, width - borderMargin, height - (bottomBorderNone ? borderWidth : borderMargin), 10, 10);
 
         // Paint the inner border of the cutout section
         graphics.setColor(Color.DARKGRAY);
-        graphics.drawRoundRect(borderWidth, borderWidth, width - (borderWidth * 2), height - (bottomBorderNone ? borderWidth : (borderWidth * 2)), 10, 10);
+        graphics.drawRoundRect(borderWidth, borderWidth, width - borderMargin, height - (bottomBorderNone ? borderWidth : borderMargin), 10, 10);
     }
     
@@ -136 +138 @@
                 y += 2;
             Field field = this.getField(i);
-            this.setPositionChild(field, 8, y);
-            this.layoutChild(field, maxWidth - (borderWidth * 2) - 6, getPreferredHeightOfChild(field));
+            this.setPositionChild(field, borderMargin, y);
+            this.layoutChild(field, maxWidth - (borderMargin * 2), getPreferredHeightOfChild(field));
             y += field.getHeight();
         }
@@ -170 +172 @@
      */
     public int getPreferredHeight() {
-        int sum = (bottomBorderNone ? borderWidth : (borderWidth * 2));
+        int sum = (bottomBorderNone ? borderWidth : borderMargin);
         int count = this.getFieldCount();
         for(int i=0; i<count; i++) {

trunk/LogicMail/src/org/logicprobe/LogicMail/ui/OutgoingConfigScreen.java

@@ -38 +38 @@
 import net.rim.device.api.ui.component.CheckboxField;
 import net.rim.device.api.ui.component.Dialog;
-import net.rim.device.api.ui.component.LabelField;
 import net.rim.device.api.ui.component.ObjectChoiceField;
 import net.rim.device.api.ui.component.PasswordEditField;
+import net.rim.device.api.ui.component.SeparatorField;
 import net.rim.device.api.ui.text.TextFilter;
 
@@ -170 +170 @@
         contentFieldManager.add(serverUserField);
         contentFieldManager.add(serverPassField);
-        contentFieldManager.add(new LabelField());
+        contentFieldManager.add(new SeparatorField());
         contentFieldManager.add(networkTransportChoiceField);
         contentFieldManager.add(enableWiFiCheckboxField);