Changeset 555

Timestamp:

11/22/09 15:47:25 (2 years ago)

Author:

octorian

Message:

 

Location:

trunk/LogicMail

Files:

• res/org/logicprobe/LogicMail/LogicMail.rrc (modified) (1 diff)
• res/org/logicprobe/LogicMail/LogicMail.rrh (modified) (1 diff)
• src/org/logicprobe/LogicMail/ui/AccountConfigScreen.java (modified) (22 diffs)
• src/org/logicprobe/LogicMail/ui/ConfigScreen.java (modified) (25 diffs)
• src/org/logicprobe/LogicMail/ui/GlobalConfigScreen.java (modified) (6 diffs)
• src/org/logicprobe/LogicMail/ui/IdentityConfigScreen.java (modified) (6 diffs)

trunk/LogicMail/res/org/logicprobe/LogicMail/LogicMail.rrc

@@ -42 +42 @@
 CONFIG_GLOBAL_MESSAGE_ORDER#0="Message order:";
 CONFIG_GLOBAL_OVERRIDE_HOSTNAME#0="Override hostname";
+CONFIG_GLOBAL_SECTION_MESSAGE_DISPLAY#0="Message display";
+CONFIG_GLOBAL_SECTION_NETWORKING#0="Networking";
+CONFIG_GLOBAL_SECTION_OTHER#0="Other";
 CONFIG_GLOBAL_SETTINGS#0="Global settings";
 CONFIG_GLOBAL_TITLE#0="Global";

trunk/LogicMail/res/org/logicprobe/LogicMail/LogicMail.rrh

@@ -178 +178 @@
 MENUITEM_SCROLL_DOWN#0=179;
 MAILCONNECTION_REQUEST_MESSAGE_COPY#0=180;
+CONFIG_GLOBAL_SECTION_MESSAGE_DISPLAY#0=181;
+CONFIG_GLOBAL_SECTION_NETWORKING#0=182;
+CONFIG_GLOBAL_SECTION_OTHER#0=183;

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

@@ -65 +65 @@
  */
 public class AccountConfigScreen extends AbstractConfigScreen {
-        // Top-level fields
+    // Top-level fields
     private BasicEditField acctNameField;
-    private LabelField accountTypeLabel;
-        private ObjectChoiceField pageField;
-        private VerticalFieldManager contentFieldManager;
-        
-        // Basic settings fields
+    private ObjectChoiceField pageField;
+    private VerticalFieldManager contentFieldManager;
+
+    // Basic settings fields
     private BasicEditField serverNameField;
     private ObjectChoiceField serverSecurityField;
@@ -80 +79 @@
     private ObjectChoiceField identityField;
     private ObjectChoiceField outgoingServerField;
-    
+
     // Folder settings fields
     private LabelField sentFolderChoiceLabel;
@@ -86 +85 @@
     private LabelField draftFolderChoiceLabel;
     private LabelField draftFolderChoiceButtonLabel;
-    
+
     // Advanced settings fields (IMAP)
     private BasicEditField imapFolderPrefixField;
@@ -93 +92 @@
     // Advanced settings fields (POP)
     private BasicEditField popMaxLinesEditField;
-    
-        private Manager[] pageFieldManagers;
+
+    private Manager[] pageFieldManagers;
     private boolean acctSaved;
     private boolean createDefaultIdentity;
@@ -103 +102 @@
     private MailboxNode selectedDraftFolder;
     private FieldChangeListener fieldChangeListener;
-    
+
     private class NullOutgoingConfig extends OutgoingConfig {
         public String toString() {
@@ -120 +119 @@
     public AccountConfigScreen(AccountConfig acctConfig) {
         super("LogicMail - " + resources.getString(LogicMailResource.CONFIG_ACCOUNT_TITLE));
-        
+
         this.acctConfig = acctConfig;
         this.acctSaved = false;
-        
+
         MailSettings mailSettings = MailSettings.getInstance();
 
@@ -141 +140 @@
             this.setDirty(true);
         }
-        
+
         int numOutgoing = mailSettings.getNumOutgoing();
         outgoingConfigs = new OutgoingConfig[numOutgoing+1];
@@ -148 +147 @@
             outgoingConfigs[i+1] = mailSettings.getOutgoingConfig(i);
         }
-        
+
         fieldChangeListener = new FieldChangeListener() {
             public void fieldChanged(Field field, int context) {
@@ -154 +153 @@
             }};
 
-        initFields();
-
-        IdentityConfig selectedIdentityConfig = acctConfig.getIdentityConfig();
-        if(selectedIdentityConfig != null) {
-            identityField.setSelectedIndex(selectedIdentityConfig);
-        }
-
-        OutgoingConfig selectedOutgoingConfig = acctConfig.getOutgoingConfig();
-        if(selectedOutgoingConfig != null) {
-            outgoingServerField.setSelectedIndex(selectedOutgoingConfig);
-        }
+            initFields();
+
+            IdentityConfig selectedIdentityConfig = acctConfig.getIdentityConfig();
+            if(selectedIdentityConfig != null) {
+                identityField.setSelectedIndex(selectedIdentityConfig);
+            }
+
+            OutgoingConfig selectedOutgoingConfig = acctConfig.getOutgoingConfig();
+            if(selectedOutgoingConfig != null) {
+                outgoingServerField.setSelectedIndex(selectedOutgoingConfig);
+            }
     }
 
@@ -171 +170 @@
      */
     private void initFields() {
-        acctNameField = new BasicEditField(resources.getString(LogicMailResource.CONFIG_ACCOUNT_NAME) + ' ', acctConfig.getAcctName());
-
-        String accountType = resources.getString(LogicMailResource.CONFIG_ACCOUNT_PROTOCOL);
+        String accountType;
         if(acctConfig instanceof ImapConfig) {
-                accountType += " IMAP";
+            accountType = "IMAP ";
         }
         else if(acctConfig instanceof PopConfig) {
-                accountType += " POP";
-        }
-        accountTypeLabel = new LabelField(accountType, Field.NON_FOCUSABLE);
+            accountType = "POP ";
+        }
+        else {
+            accountType = "";
+        }
         
+        acctNameField = new BasicEditField(
+                accountType
+                + resources.getString(LogicMailResource.CONFIG_ACCOUNT_NAME)
+                + ' ',
+                acctConfig.getAcctName());
+
         pageField = new ObjectChoiceField(
-                        resources.getString(LogicMailResource.CONFIG_ACCOUNT_PAGE),
-                        new String[] {
-                                resources.getString(LogicMailResource.CONFIG_ACCOUNT_PAGE_BASIC),
-                                resources.getString(LogicMailResource.CONFIG_ACCOUNT_PAGE_FOLDER),
-                                resources.getString(LogicMailResource.CONFIG_ACCOUNT_PAGE_ADVANCED)
-                        });
-
-        
+                resources.getString(LogicMailResource.CONFIG_ACCOUNT_PAGE),
+                new String[] {
+                    resources.getString(LogicMailResource.CONFIG_ACCOUNT_PAGE_BASIC),
+                    resources.getString(LogicMailResource.CONFIG_ACCOUNT_PAGE_FOLDER),
+                    resources.getString(LogicMailResource.CONFIG_ACCOUNT_PAGE_ADVANCED)
+                });
+
         pageField.setChangeListener(fieldChangeListener);
 
-        pageFieldManagers = new Manager[3];
-        pageFieldManagers[0] = initFieldsBasic();
-        pageFieldManagers[1] = initFieldsFolder();
-        pageFieldManagers[2] = initFieldsAdvanced();
-        
-        // Container for the active settings page
-        contentFieldManager = new VerticalFieldManager();
-        contentFieldManager.add(pageFieldManagers[0]);
-        
+        pageFieldManagers = new Manager[3];
+        pageFieldManagers[0] = initFieldsBasic();
+        pageFieldManagers[1] = initFieldsFolder();
+        pageFieldManagers[2] = initFieldsAdvanced();
+
+        // Container for the active settings page
+        contentFieldManager = new VerticalFieldManager();
+        contentFieldManager.add(pageFieldManagers[0]);
+
         add(acctNameField);
-        add(accountTypeLabel);
         add(pageField);
         add(new SeparatorField());
@@ -209 +212 @@
         add(new LabelField());
     }
-    
+
     /**
      * Initializes the UI fields for the basic settings page.
      */
     private Manager initFieldsBasic() {
-        Manager manager = new VerticalFieldManager();
+        Manager manager = new VerticalFieldManager();
         serverNameField = new BasicEditField(resources.getString(LogicMailResource.CONFIG_ACCOUNT_SERVER) + ' ', acctConfig.getServerName(),
-                        256, TextField.NO_NEWLINE);
+                256, TextField.NO_NEWLINE);
         serverSecurityField = new ObjectChoiceField(
-                        resources.getString(LogicMailResource.CONFIG_ACCOUNT_SECURITY),
-                        new Object[] {
-                                resources.getString(LogicMailResource.CONFIG_ACCOUNT_SECURITY_NEVER),
-                                resources.getString(LogicMailResource.CONFIG_ACCOUNT_SECURITY_TLS_IF_AVAILABLE),
-                                resources.getString(LogicMailResource.CONFIG_ACCOUNT_SECURITY_TLS),
-                                resources.getString(LogicMailResource.CONFIG_ACCOUNT_SECURITY_SSL)},
-                        acctConfig.getServerSecurity());
+                resources.getString(LogicMailResource.CONFIG_ACCOUNT_SECURITY),
+                new Object[] {
+                    resources.getString(LogicMailResource.CONFIG_ACCOUNT_SECURITY_NEVER),
+                    resources.getString(LogicMailResource.CONFIG_ACCOUNT_SECURITY_TLS_IF_AVAILABLE),
+                    resources.getString(LogicMailResource.CONFIG_ACCOUNT_SECURITY_TLS),
+                    resources.getString(LogicMailResource.CONFIG_ACCOUNT_SECURITY_SSL)},
+                    acctConfig.getServerSecurity());
         serverSecurityField.setChangeListener(fieldChangeListener);
         serverPortField = new BasicEditField(resources.getString(LogicMailResource.CONFIG_ACCOUNT_PORT) + ' ', Integer.toString(acctConfig.getServerPort()),
-                        5, TextField.NO_NEWLINE);
+                5, TextField.NO_NEWLINE);
         serverPortField.setFilter(TextFilter.get(TextFilter.NUMERIC));
         serverUserField = new BasicEditField(resources.getString(LogicMailResource.CONFIG_ACCOUNT_USERNAME) + ' ', acctConfig.getServerUser(),
-                        256, TextField.NO_NEWLINE);
+                256, TextField.NO_NEWLINE);
         serverPassField = new PasswordEditField(resources.getString(LogicMailResource.CONFIG_ACCOUNT_PASSWORD) + ' ', acctConfig.getServerPass(),
-                        256, TextField.NO_NEWLINE);
+                256, TextField.NO_NEWLINE);
         useMdsField = new CheckboxField(resources.getString(LogicMailResource.CONFIG_ACCOUNT_USEMDSPROXY), !acctConfig.getDeviceSide());
         identityField = new ObjectChoiceField(resources.getString(LogicMailResource.CONFIG_ACCOUNT_IDENTITY) + ' ', identityConfigs, 0);
@@ -247 +250 @@
         manager.add(identityField);
         manager.add(outgoingServerField);
-        
+
         return manager;
     }
-    
+
     /**
      * Initializes the UI fields for the folder settings page.
      */
     private Manager initFieldsFolder() {
-        Manager manager = new VerticalFieldManager();
+        Manager manager = new VerticalFieldManager();
         selectedSentFolder = acctConfig.getSentMailbox();
         selectedDraftFolder = acctConfig.getDraftMailbox();
-        
+
         sentFolderChoiceLabel = new LabelField(resources.getString(LogicMailResource.CONFIG_ACCOUNT_SENT_MESSAGE_FOLDER) + ' ');
         sentFolderChoiceButtonLabel = new LabelField(createSelectedMailboxString(selectedSentFolder), Field.FOCUSABLE | Field.HIGHLIGHT_FOCUS | Field.FIELD_RIGHT | LabelField.ELLIPSIS);
@@ -270 +273 @@
         return manager;
     }
-    
+
     /**
      * Initializes the UI fields for the advanced settings page.
      */
     private Manager initFieldsAdvanced() {
-        Manager manager = new VerticalFieldManager();
+        Manager manager = new VerticalFieldManager();
         if(acctConfig instanceof ImapConfig) {
             ImapConfig imapConfig = (ImapConfig)acctConfig;
-            
+
             imapFolderPrefixField = new BasicEditField(
-                        resources.getString(LogicMailResource.CONFIG_ACCOUNT_IMAP_FOLDER_PREFIX) + ' ',
-                        imapConfig.getFolderPrefix());
-
-            imapMaxMessageSizeEditField = new BasicEditField(
-                        resources.getString(LogicMailResource.CONFIG_ACCOUNT_IMAP_DOWNLOAD_LIMIT) + ' ',
-                    Integer.toString(imapConfig.getMaxMessageSize() / 1024));
-            imapMaxMessageSizeEditField.setFilter(TextFilter.get(TextFilter.NUMERIC));
-        
-            imapMaxFolderDepthEditField = new BasicEditField(
-                        resources.getString(LogicMailResource.CONFIG_ACCOUNT_IMAP_FOLDER_LIMIT) + ' ',
-                    Integer.toString(imapConfig.getMaxFolderDepth()));
-            imapMaxFolderDepthEditField.setFilter(TextFilter.get(TextFilter.NUMERIC));
-            
+                    resources.getString(LogicMailResource.CONFIG_ACCOUNT_IMAP_FOLDER_PREFIX) + ' ',
+                    imapConfig.getFolderPrefix());
+
+            imapMaxMessageSizeEditField = new BasicEditField(
+                    resources.getString(LogicMailResource.CONFIG_ACCOUNT_IMAP_DOWNLOAD_LIMIT) + ' ',
+                    Integer.toString(imapConfig.getMaxMessageSize() / 1024));
+            imapMaxMessageSizeEditField.setFilter(TextFilter.get(TextFilter.NUMERIC));
+
+            imapMaxFolderDepthEditField = new BasicEditField(
+                    resources.getString(LogicMailResource.CONFIG_ACCOUNT_IMAP_FOLDER_LIMIT) + ' ',
+                    Integer.toString(imapConfig.getMaxFolderDepth()));
+            imapMaxFolderDepthEditField.setFilter(TextFilter.get(TextFilter.NUMERIC));
+
             manager.add(imapFolderPrefixField);
             manager.add(imapMaxMessageSizeEditField);
@@ -298 +301 @@
         }
         else if(acctConfig instanceof PopConfig) {
-                PopConfig popConfig = (PopConfig)acctConfig;
-                
-            popMaxLinesEditField = new BasicEditField(
-                        resources.getString(LogicMailResource.CONFIG_ACCOUNT_POP_DOWNLOAD_LIMIT) + ' ',
-                    Integer.toString(popConfig.getMaxMessageLines()));
-            popMaxLinesEditField.setFilter(TextFilter.get(TextFilter.NUMERIC));
-            
-            manager.add(popMaxLinesEditField);
-        }
-        return manager;
-    }
-    
+            PopConfig popConfig = (PopConfig)acctConfig;
+
+            popMaxLinesEditField = new BasicEditField(
+                    resources.getString(LogicMailResource.CONFIG_ACCOUNT_POP_DOWNLOAD_LIMIT) + ' ',
+                    Integer.toString(popConfig.getMaxMessageLines()));
+            popMaxLinesEditField.setFilter(TextFilter.get(TextFilter.NUMERIC));
+
+            manager.add(popMaxLinesEditField);
+        }
+        return manager;
+    }
+
     public void AcctCfgScreen_fieldChanged(Field field, int context) {
         if(field == serverSecurityField) {
@@ -330 +333 @@
         }
         else if(field == pageField) {
-                int index = pageField.getSelectedIndex();
-                if(contentFieldManager.getField(0) != pageFieldManagers[index]) {
-                        contentFieldManager.deleteAll();
-                        contentFieldManager.add(pageFieldManagers[index]);
-                }
+            int index = pageField.getSelectedIndex();
+            if(contentFieldManager.getField(0) != pageFieldManagers[index]) {
+                contentFieldManager.deleteAll();
+                contentFieldManager.add(pageFieldManagers[index]);
+            }
         }
     }
@@ -342 +345 @@
      */
     protected boolean trackwheelUnclick(int status, int time) {
-        if(getFieldWithFocus() == contentFieldManager && contentFieldManager.getField(0) == pageFieldManagers[1]) {
-                if(pageFieldManagers[1].getFieldWithFocus() == sentFolderChoiceButtonLabel) {
-                        showFolderSelection(sentFolderChoiceButtonLabel);
-                        return true;
-                }
-                else if(pageFieldManagers[1].getFieldWithFocus() == draftFolderChoiceButtonLabel) {
-                        showFolderSelection(draftFolderChoiceButtonLabel);
-                        return true;
-                }
-                else {
-                        return super.trackwheelUnclick(status, time);
-                }
-        }
-        else {
-                return super.trackwheelUnclick(status, time);
-        }
-    }
-    
+        if(getFieldWithFocus() == contentFieldManager && contentFieldManager.getField(0) == pageFieldManagers[1]) {
+            if(pageFieldManagers[1].getFieldWithFocus() == sentFolderChoiceButtonLabel) {
+                showFolderSelection(sentFolderChoiceButtonLabel);
+                return true;
+            }
+            else if(pageFieldManagers[1].getFieldWithFocus() == draftFolderChoiceButtonLabel) {
+                showFolderSelection(draftFolderChoiceButtonLabel);
+                return true;
+            }
+            else {
+                return super.trackwheelUnclick(status, time);
+            }
+        }
+        else {
+            return super.trackwheelUnclick(status, time);
+        }
+    }
+
     private void showFolderSelection(LabelField choiceButtonLabel) {
-        String titleText;
-        if(choiceButtonLabel == sentFolderChoiceButtonLabel) {
-                titleText = resources.getString(LogicMailResource.CONFIG_ACCOUNT_SENT_MESSAGE_FOLDER); 
-        }
-        else if(choiceButtonLabel == draftFolderChoiceButtonLabel) {
-                titleText = resources.getString(LogicMailResource.CONFIG_ACCOUNT_DRAFT_MESSAGE_FOLDER);
-        }
-        else {
-                return;
-        }
-        
-        // Build an array containing the current account node, if it already exists,
-        // and any local account nodes.
-        AccountNode[] accountNodes = MailManager.getInstance().getMailRootNode().getAccounts();
-        Vector accountNodeVector = new Vector();
-        for(int i=0; i<accountNodes.length; i++) {
-                if(accountNodes[i].getStatus() == AccountNode.STATUS_LOCAL ||
-                           accountNodes[i].getAccountConfig() == acctConfig) {
-                        accountNodeVector.addElement(accountNodes[i]);
-                }
-        }
-        accountNodes = new AccountNode[accountNodeVector.size()];
-        accountNodeVector.copyInto(accountNodes);
-        
-        MailboxSelectionDialog dialog = new MailboxSelectionDialog(titleText, accountNodes);
-        if(choiceButtonLabel == sentFolderChoiceButtonLabel) {
-                dialog.setSelectedMailboxNode(selectedSentFolder);
-        }
-        else if(choiceButtonLabel == draftFolderChoiceButtonLabel) {
-                dialog.setSelectedMailboxNode(selectedDraftFolder);
-        }
-        dialog.doModal();
-        
-        MailboxNode selectedNode = dialog.getSelectedMailboxNode();
-        if(selectedNode != null) {
-                choiceButtonLabel.setText(createSelectedMailboxString(selectedNode));
-                if(choiceButtonLabel == sentFolderChoiceButtonLabel) {
-                        if(selectedSentFolder != selectedNode) {
-                                selectedSentFolder = selectedNode;
-                                this.setDirty(true);
-                        }
-                }
-                else if(choiceButtonLabel == draftFolderChoiceButtonLabel) {
-                        if(selectedDraftFolder != selectedNode) {
-                                selectedDraftFolder = selectedNode;
-                                this.setDirty(true);
-                        }
-                }
-        }
-    }
-    
+        String titleText;
+        if(choiceButtonLabel == sentFolderChoiceButtonLabel) {
+            titleText = resources.getString(LogicMailResource.CONFIG_ACCOUNT_SENT_MESSAGE_FOLDER); 
+        }
+        else if(choiceButtonLabel == draftFolderChoiceButtonLabel) {
+            titleText = resources.getString(LogicMailResource.CONFIG_ACCOUNT_DRAFT_MESSAGE_FOLDER);
+        }
+        else {
+            return;
+        }
+
+        // Build an array containing the current account node, if it already exists,
+        // and any local account nodes.
+        AccountNode[] accountNodes = MailManager.getInstance().getMailRootNode().getAccounts();
+        Vector accountNodeVector = new Vector();
+        for(int i=0; i<accountNodes.length; i++) {
+            if(accountNodes[i].getStatus() == AccountNode.STATUS_LOCAL ||
+                    accountNodes[i].getAccountConfig() == acctConfig) {
+                accountNodeVector.addElement(accountNodes[i]);
+            }
+        }
+        accountNodes = new AccountNode[accountNodeVector.size()];
+        accountNodeVector.copyInto(accountNodes);
+
+        MailboxSelectionDialog dialog = new MailboxSelectionDialog(titleText, accountNodes);
+        if(choiceButtonLabel == sentFolderChoiceButtonLabel) {
+            dialog.setSelectedMailboxNode(selectedSentFolder);
+        }
+        else if(choiceButtonLabel == draftFolderChoiceButtonLabel) {
+            dialog.setSelectedMailboxNode(selectedDraftFolder);
+        }
+        dialog.doModal();
+
+        MailboxNode selectedNode = dialog.getSelectedMailboxNode();
+        if(selectedNode != null) {
+            choiceButtonLabel.setText(createSelectedMailboxString(selectedNode));
+            if(choiceButtonLabel == sentFolderChoiceButtonLabel) {
+                if(selectedSentFolder != selectedNode) {
+                    selectedSentFolder = selectedNode;
+                    this.setDirty(true);
+                }
+            }
+            else if(choiceButtonLabel == draftFolderChoiceButtonLabel) {
+                if(selectedDraftFolder != selectedNode) {
+                    selectedDraftFolder = selectedNode;
+                    this.setDirty(true);
+                }
+            }
+        }
+    }
+
     private String createSelectedMailboxString(MailboxNode mailboxNode) {
-                StringBuffer buf = new StringBuffer();
-        if(mailboxNode != null) {
-                        buf.append(mailboxNode.getParentAccount().toString());
-                        buf.append(": ");
-                        buf.append(mailboxNode.toString());
-        }
-        else {
-                buf.append('<' + resources.getString(LogicMailResource.CONFIG_ACCOUNT_NONE) + '>');
-        }
-                return buf.toString();
-    }
-    
+        StringBuffer buf = new StringBuffer();
+        if(mailboxNode != null) {
+            buf.append(mailboxNode.getParentAccount().toString());
+            buf.append(": ");
+            buf.append(mailboxNode.toString());
+        }
+        else {
+            buf.append('<' + resources.getString(LogicMailResource.CONFIG_ACCOUNT_NONE) + '>');
+        }
+        return buf.toString();
+    }
+
     /**
      * Determines if this screen is dirty.
@@ -433 +436 @@
      */
     public boolean isDirty() {
-        if(acctNameField.isDirty()) { return true; }
-        
-        for(int i=0; i<pageFieldManagers.length; i++) {
-                if(pageFieldManagers[i].isDirty()) {
-                        return true;
-                }
-        }
-        
-        return false;
-    }
-    
+        if(acctNameField.isDirty()) { return true; }
+
+        for(int i=0; i<pageFieldManagers.length; i++) {
+            if(pageFieldManagers[i].isDirty()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /* (non-Javadoc)
      * @see net.rim.device.api.ui.container.MainScreen#onSavePrompt()
@@ -449 +452 @@
     protected boolean onSavePrompt() {
         if(acctNameField.getText().length() > 0 &&
-           serverNameField.getText().length() > 0 &&
-           serverPortField.getText().length() > 0) {
+                serverNameField.getText().length() > 0 &&
+                serverPortField.getText().length() > 0) {
             return super.onSavePrompt();
         }
         else {
             int result =
-                Dialog.ask(resources.getString(LogicMailResource.CONFIG_PROMPT_INCOMPLETE),
-                                new String[] {
-                                        resources.getString(LogicMailResource.MENUITEM_DISCARD),
-                                        resources.getString(LogicMailResource.MENUITEM_CANCEL) }, 0);
+                Dialog.ask(resources.getString(LogicMailResource.CONFIG_PROMPT_INCOMPLETE),
+                        new String[] {
+                    resources.getString(LogicMailResource.MENUITEM_DISCARD),
+                    resources.getString(LogicMailResource.MENUITEM_CANCEL) }, 0);
             if(result == 0) {
                 return true;
@@ -479 +482 @@
         this.acctConfig.setServerPass(serverPassField.getText());
         this.acctConfig.setDeviceSide(!useMdsField.getChecked());
-        
+
         IdentityConfig selectedIdentityConfig = (IdentityConfig)identityField.getChoice(identityField.getSelectedIndex());
         if(createDefaultIdentity) {
@@ -486 +489 @@
                 userName = "user";
             }
-            selectedIdentityConfig.setEmailAddress(userName + "@" + serverNameField.getText());
+            selectedIdentityConfig.setEmailAddress(userName + '@' + serverNameField.getText());
             MailSettings.getInstance().addIdentityConfig(selectedIdentityConfig);
             createDefaultIdentity = false;
@@ -505 +508 @@
         if(acctConfig instanceof ImapConfig) {
             ImapConfig imapConfig = (ImapConfig)acctConfig;
-            
+
             String folderPrefix = imapFolderPrefixField.getText().trim();
             if(folderPrefix.length() == 0) {
@@ -515 +518 @@
 
             try {
-                imapConfig.setMaxMessageSize(Integer.parseInt(
+                imapConfig.setMaxMessageSize(Integer.parseInt(
                         imapMaxMessageSizeEditField.getText()) * 1024);
             } catch (Exception e) { }
 
             try {
-                imapConfig.setMaxFolderDepth(Integer.parseInt(
+                imapConfig.setMaxFolderDepth(Integer.parseInt(
                         imapMaxFolderDepthEditField.getText()));
             } catch (Exception e) { }
         }
         else if(acctConfig instanceof PopConfig) {
-                PopConfig popConfig = (PopConfig)acctConfig;
-                
+            PopConfig popConfig = (PopConfig)acctConfig;
+
             try {
-                popConfig.setMaxMessageLines(Integer.parseInt(popMaxLinesEditField.getText()));
+                popConfig.setMaxMessageLines(Integer.parseInt(popMaxLinesEditField.getText()));
             } catch (Exception e) { }
         }
-        
+
         acctSaved = true;
     }
-    
+
     public boolean acctSaved() {
         return acctSaved;

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

@@ -70 +70 @@
     private Hashtable outgoingIndexMap;
     private boolean configurationChanged;
-    
+
     /**
      * Instantiates a new configuration screen.
@@ -80 +80 @@
         accountIndexMap = new Hashtable();
         outgoingIndexMap = new Hashtable();
-        
+
         initFields();
-        
+
         buildAccountsList();
     }
-    
+
     /**
      * Initializes the fields.
@@ -91 +91 @@
     private void initFields() {
         configTreeField = FieldFactory.getInstance().getScreenTreeField(
-            new TreeFieldCallback() {
-                public void drawTreeItem(TreeField treeField, Graphics graphics, int node, int y, int width, int indent) {
-                    configTreeFieldDrawTreeItem(treeField, graphics, node, y, width, indent);
-                }
-            },
-            Field.FOCUSABLE);
+                new TreeFieldCallback() {
+                    public void drawTreeItem(TreeField treeField, Graphics graphics, int node, int y, int width, int indent) {
+                        configTreeFieldDrawTreeItem(treeField, graphics, node, y, width, indent);
+                    }
+                },
+                Field.FOCUSABLE);
         configTreeField.setDefaultExpanded(true);
         configTreeField.setIndentWidth(20);
-        
+
         globalId = configTreeField.addChildNode(0, new ConfigTreeNode(resources.getString(LogicMailResource.CONFIG_GLOBAL_SETTINGS)));
         identitiesId = configTreeField.addSiblingNode(globalId, new ConfigTreeNode(resources.getString(LogicMailResource.CONFIG_IDENTITIES)));
@@ -112 +112 @@
      */
     protected void onDisplay() {
-                configurationChanged = false;
-        super.onDisplay();
-        }
-        
-        /* (non-Javadoc)
-         * @see net.rim.device.api.ui.Screen#onUndisplay()
-         */
-        protected void onUndisplay() {
-                if(configurationChanged) {
-                        configurationChanged = false;
-                }
-                super.onUndisplay();
-        }
-    
+        configurationChanged = false;
+        super.onDisplay();
+    }
+
+    /* (non-Javadoc)
+     * @see net.rim.device.api.ui.Screen#onUndisplay()
+     */
+    protected void onUndisplay() {
+        if(configurationChanged) {
+            configurationChanged = false;
+        }
+        super.onUndisplay();
+    }
+
     /**
      * Draws tree items in the TreeField
@@ -140 +140 @@
         graphics.drawText(cookie.toString(), indent + 2, y, Graphics.ELLIPSIS, width);
     }
-    
+
     private MenuItem selectItem = new MenuItem(resources, LogicMailResource.MENUITEM_EDIT, 100, 10) {
         public void run() {
@@ -161 +161 @@
     private MenuItem newAccountWizardItem = new MenuItem(resources, LogicMailResource.MENUITEM_NEW_ACCOUNT_WIZARD, 110, 10) {
         public void run() {
-                newAccountWizard();
-        }
-    };
-    
+            newAccountWizard();
+        }
+    };
+
     private MenuItem addIdentityItem = new MenuItem(resources, LogicMailResource.MENUITEM_ADD_IDENTITY, 120, 10) {
         public void run() {
@@ -206 +206 @@
     protected void makeMenu(Menu menu, int instance) {
         int id = configTreeField.getCurrentNode();
-        
+
         Object cookie;
         Object rawCookie = configTreeField.getCookie(id);
         if(rawCookie instanceof ConfigTreeNode) {
-                cookie = ((ConfigTreeNode)rawCookie).cookie;
+            cookie = ((ConfigTreeNode)rawCookie).cookie;
         }
         else {
-                cookie = null;
-        }
-        
+            cookie = null;
+        }
+
         if(id != identitiesId && id != accountsId && id != outgoingId) {
             menu.add(selectItem);
             if(cookie instanceof ConnectionConfig) {
-                    if(configTreeField.getPreviousSibling(id) != -1) {
-                        menu.add(moveUpItem);
-                    }
-                    if(configTreeField.getNextSibling(id) != -1) {
-                        menu.add(moveDownItem);
-                    }
+                if(configTreeField.getPreviousSibling(id) != -1) {
+                    menu.add(moveUpItem);
+                }
+                if(configTreeField.getNextSibling(id) != -1) {
+                    menu.add(moveDownItem);
+                }
             }
             menu.addSeparator();
         }
-        
+
         if(id == identitiesId) {
             menu.add(addIdentityItem);
@@ -237 +237 @@
         }
         else if(id == accountsId) {
-                menu.add(newAccountWizardItem);
+            menu.add(newAccountWizardItem);
             menu.add(addAccountItem);
         }
         else if(cookie instanceof AccountConfig) {
-                menu.add(newAccountWizardItem);
+            menu.add(newAccountWizardItem);
             menu.add(addAccountItem);
             menu.add(deleteAccountItem);
@@ -254 +254 @@
         super.makeMenu(menu, instance);
     }
-    
-        /* (non-Javadoc)
+
+    /* (non-Javadoc)
      * @see net.rim.device.api.ui.Screen#keyChar(char, int, int)
      */
@@ -261 +261 @@
         boolean retval = false;
         switch(key) {
-            case Keypad.KEY_SPACE:
-                toggleSelectedNode();
-                retval = true;
-                break;
-            case Keypad.KEY_ENTER:
-                openSelectedNode();
-                retval = true;
-                break;
+        case Keypad.KEY_SPACE:
+            toggleSelectedNode();
+            retval = true;
+            break;
+        case Keypad.KEY_ENTER:
+            openSelectedNode();
+            retval = true;
+            break;
         }
         return retval;
     }
-    
+
     /* (non-Javadoc)
      * @see net.rim.device.api.ui.Screen#navigationClick(int, int)
      */
     protected boolean navigationClick(int status, int time) {
-        return openSelectedNode();
-    }
-    
+        return openSelectedNode();
+    }
+
     /**
      * Toggle selected node's expansion state
@@ -285 +285 @@
     private void toggleSelectedNode() {
         int curNode = configTreeField.getCurrentNode();
-        
+
         // Make sure a node is selected
         if(curNode == -1) {
             return;
         }
-        
+
         // Make sure the selected node has children
         if(configTreeField.getFirstChild(curNode) == -1) {
@@ -299 +299 @@
         configTreeField.setExpanded(curNode, !configTreeField.getExpanded(curNode));
     }
-    
+
     /**
      * Open selected node.
@@ -306 +306 @@
      */
     private boolean openSelectedNode() {
-        boolean result = false;
+        boolean result = false;
         int curNode = configTreeField.getCurrentNode();
         if(curNode == globalId) {
@@ -347 +347 @@
         }
         if(result) {
-                buildAccountsList();
+            buildAccountsList();
         }
         return result;
     }
 
-        private void moveSelectedNodeUp() {
+    private void moveSelectedNodeUp() {
         int curNode = configTreeField.getCurrentNode();
         if(curNode == -1) { return; }
@@ -360 +360 @@
         Object cookie = ((ConfigTreeNode)configTreeField.getCookie(curNode)).cookie;
         Object prevCookie = ((ConfigTreeNode)configTreeField.getCookie(prevNode)).cookie;
-        
+
         boolean result = false;
-        
+
         if(cookie instanceof IdentityConfig) {
-                IdentityConfig curConfig = (IdentityConfig)cookie;
-                IdentityConfig prevConfig = (IdentityConfig)prevCookie;
-                
-                int curConfigIndex = mailSettings.indexOfIdentityConfig(curConfig);
-                mailSettings.removeAccountConfig(curConfigIndex);
-
-                int prevConfigIndex = mailSettings.indexOfIdentityConfig(prevConfig);
-                mailSettings.insertIdentityConfigAt(curConfig, prevConfigIndex);
-                result = true;
+            IdentityConfig curConfig = (IdentityConfig)cookie;
+            IdentityConfig prevConfig = (IdentityConfig)prevCookie;
+
+            int curConfigIndex = mailSettings.indexOfIdentityConfig(curConfig);
+            mailSettings.removeAccountConfig(curConfigIndex);
+
+            int prevConfigIndex = mailSettings.indexOfIdentityConfig(prevConfig);
+            mailSettings.insertIdentityConfigAt(curConfig, prevConfigIndex);
+            result = true;
         }
         else if(cookie instanceof AccountConfig) {
-                AccountConfig curConfig = (AccountConfig)cookie;
-                AccountConfig prevConfig = (AccountConfig)prevCookie;
-                
-                int curConfigIndex = mailSettings.indexOfAccountConfig(curConfig);
-                mailSettings.removeAccountConfig(curConfigIndex);
-
-                int prevConfigIndex = mailSettings.indexOfAccountConfig(prevConfig);
-                mailSettings.insertAccountConfigAt(curConfig, prevConfigIndex);
-                result = true;
+            AccountConfig curConfig = (AccountConfig)cookie;
+            AccountConfig prevConfig = (AccountConfig)prevCookie;
+
+            int curConfigIndex = mailSettings.indexOfAccountConfig(curConfig);
+            mailSettings.removeAccountConfig(curConfigIndex);
+
+            int prevConfigIndex = mailSettings.indexOfAccountConfig(prevConfig);
+            mailSettings.insertAccountConfigAt(curConfig, prevConfigIndex);
+            result = true;
         }
         else if(cookie instanceof OutgoingConfig) {
-                OutgoingConfig curConfig = (OutgoingConfig)cookie;
-                OutgoingConfig prevConfig = (OutgoingConfig)prevCookie;
-                
-                int curConfigIndex = mailSettings.indexOfOutgoingConfig(curConfig);
-                mailSettings.removeAccountConfig(curConfigIndex);
-
-                int prevConfigIndex = mailSettings.indexOfOutgoingConfig(prevConfig);
-                mailSettings.insertOutgoingConfigAt(curConfig, prevConfigIndex);
-                result = true;
-        }
-        
+            OutgoingConfig curConfig = (OutgoingConfig)cookie;
+            OutgoingConfig prevConfig = (OutgoingConfig)prevCookie;
+
+            int curConfigIndex = mailSettings.indexOfOutgoingConfig(curConfig);
+            mailSettings.removeAccountConfig(curConfigIndex);
+
+            int prevConfigIndex = mailSettings.indexOfOutgoingConfig(prevConfig);
+            mailSettings.insertOutgoingConfigAt(curConfig, prevConfigIndex);
+            result = true;
+        }
+
         if(result) {
             mailSettings.saveSettings();
             configurationChanged = true;
-                buildAccountsList();
-        }
-        }
-
-        private void moveSelectedNodeDown() {
+            buildAccountsList();
+        }
+    }
+
+    private void moveSelectedNodeDown() {
         int curNode = configTreeField.getCurrentNode();
         if(curNode == -1) { return; }
@@ -412 +412 @@
         Object cookie = ((ConfigTreeNode)configTreeField.getCookie(curNode)).cookie;
         Object nextCookie = ((ConfigTreeNode)configTreeField.getCookie(nextNode)).cookie;
-        
+
         boolean result = false;
 
         if(cookie instanceof IdentityConfig) {
-                IdentityConfig curConfig = (IdentityConfig)cookie;
-                IdentityConfig nextConfig = (IdentityConfig)nextCookie;
-                
-                int curConfigIndex = mailSettings.indexOfIdentityConfig(curConfig);
-                mailSettings.removeAccountConfig(curConfigIndex);
-
-                int nextConfigIndex = mailSettings.indexOfIdentityConfig(nextConfig);
-                mailSettings.insertIdentityConfigAt(curConfig, nextConfigIndex + 1);
-                result = true;
+            IdentityConfig curConfig = (IdentityConfig)cookie;
+            IdentityConfig nextConfig = (IdentityConfig)nextCookie;
+
+            int curConfigIndex = mailSettings.indexOfIdentityConfig(curConfig);
+            mailSettings.removeAccountConfig(curConfigIndex);
+
+            int nextConfigIndex = mailSettings.indexOfIdentityConfig(nextConfig);
+            mailSettings.insertIdentityConfigAt(curConfig, nextConfigIndex + 1);
+            result = true;
         }
         else if(cookie instanceof AccountConfig) {
-                AccountConfig curConfig = (AccountConfig)cookie;
-                AccountConfig nextConfig = (AccountConfig)nextCookie;
-                
-                int curConfigIndex = mailSettings.indexOfAccountConfig(curConfig);
-                mailSettings.removeAccountConfig(curConfigIndex);
-
-                int nextConfigIndex = mailSettings.indexOfAccountConfig(nextConfig);
-                mailSettings.insertAccountConfigAt(curConfig, nextConfigIndex + 1);
-                result = true;
+            AccountConfig curConfig = (AccountConfig)cookie;
+            AccountConfig nextConfig = (AccountConfig)nextCookie;
+
+            int curConfigIndex = mailSettings.indexOfAccountConfig(curConfig);
+            mailSettings.removeAccountConfig(curConfigIndex);
+
+            int nextConfigIndex = mailSettings.indexOfAccountConfig(nextConfig);
+            mailSettings.insertAccountConfigAt(curConfig, nextConfigIndex + 1);
+            result = true;
         }
         else if(cookie instanceof OutgoingConfig) {
-                OutgoingConfig curConfig = (OutgoingConfig)cookie;
-                OutgoingConfig nextConfig = (OutgoingConfig)nextCookie;
-                
-                int curConfigIndex = mailSettings.indexOfOutgoingConfig(curConfig);
-                mailSettings.removeAccountConfig(curConfigIndex);
-
-                int nextConfigIndex = mailSettings.indexOfOutgoingConfig(nextConfig);
-                mailSettings.insertOutgoingConfigAt(curConfig, nextConfigIndex + 1);
-                result = true;
-        }
-        
+            OutgoingConfig curConfig = (OutgoingConfig)cookie;
+            OutgoingConfig nextConfig = (OutgoingConfig)nextCookie;
+
+            int curConfigIndex = mailSettings.indexOfOutgoingConfig(curConfig);
+            mailSettings.removeAccountConfig(curConfigIndex);
+
+            int nextConfigIndex = mailSettings.indexOfOutgoingConfig(nextConfig);
+            mailSettings.insertOutgoingConfigAt(curConfig, nextConfigIndex + 1);
+            result = true;
+        }
+
         if(result) {
             mailSettings.saveSettings();
             configurationChanged = true;
-                buildAccountsList();
-        }
-        }
+            buildAccountsList();
+        }
+    }
 
     /**
@@ -460 +460 @@
      */
     private void buildAccountsList() {
-        Object curCookie;
-        int curNode = configTreeField.getCurrentNode();
-        if(curNode != -1) {
-                curCookie = ((ConfigTreeNode)configTreeField.getCookie(curNode)).cookie;
-        }
-        else {
-                curCookie = null;
-        }
-        
+        Object curCookie;
+        int curNode = configTreeField.getCurrentNode();
+        if(curNode != -1) {
+            curCookie = ((ConfigTreeNode)configTreeField.getCookie(curNode)).cookie;
+        }
+        else {
+            curCookie = null;
+        }
+
         int numIdentities = mailSettings.getNumIdentities();
         identityIndexMap.clear();
@@ -485 +485 @@
             configTreeField.deleteSubtree(id);
         }
-        
+
         IdentityConfig identityConfig;
         for(int i = numIdentities-1; i >= 0; i--) {
@@ -506 +506 @@
             outgoingIndexMap.put(outgoingConfig, new Integer(i));
         }
-        
+
         if(curCookie != null) {
-                int node = configTreeField.nextNode(0, 0, true);
-                while(node != -1) {
-                        if(((ConfigTreeNode)configTreeField.getCookie(node)).cookie == curCookie) {
-                                configTreeField.setCurrentNode(node);
-                                break;
-                        }
-                        else {
-                                node = configTreeField.nextNode(node, 0, true);
-                        }
-                }
-        }
-    }
-    
+            int node = configTreeField.nextNode(0, 0, true);
+            while(node != -1) {
+                if(((ConfigTreeNode)configTreeField.getCookie(node)).cookie == curCookie) {
+                    configTreeField.setCurrentNode(node);
+                    break;
+                }
+                else {
+                    node = configTreeField.nextNode(node, 0, true);
+                }
+            }
+        }
+    }
+
     /**
      * Starts the new account wizard.
      */
     private void newAccountWizard() {
-                AccountConfigWizard wizard = new AccountConfigWizard();
-                if(wizard.start()) {
-                        AccountConfig newAccountConfig = wizard.getAccountConfig();
-                        
-                        // Find the newly created account, and trigger a folder refresh (if applicable)
-                        AccountNode[] accounts = MailManager.getInstance().getMailRootNode().getAccounts();
-                        for(int i=0; i<accounts.length; i++) {
-                                if(accounts[i].getAccountConfig() == newAccountConfig) {
-                                        if(accounts[i].hasFolders()) {
-                                                accounts[i].refreshMailboxes();
-                                        }
-                                        break;
-                                }
-                        }
-                }
-    }
-    
+        AccountConfigWizard wizard = new AccountConfigWizard();
+        if(wizard.start()) {
+            AccountConfig newAccountConfig = wizard.getAccountConfig();
+
+            // Find the newly created account, and trigger a folder refresh (if applicable)
+            AccountNode[] accounts = MailManager.getInstance().getMailRootNode().getAccounts();
+            for(int i=0; i<accounts.length; i++) {
+                if(accounts[i].getAccountConfig() == newAccountConfig) {
+                    if(accounts[i].hasFolders()) {
+                        accounts[i].refreshMailboxes();
+                    }
+                    break;
+                }
+            }
+        }
+    }
+
     /**
      * Adds a new identity.
@@ -556 +556 @@
         }
     }
-    
+
     /**
      * Delete the currently selected identity.
@@ -563 +563 @@
         IdentityConfig identityConfig =
             (IdentityConfig)((ConfigTreeNode)configTreeField.getCookie(configTreeField.getCurrentNode())).cookie;
-        
+
         int index = ((Integer)identityIndexMap.get(identityConfig)).intValue();
         int response = Dialog.ask(Dialog.D_DELETE);
@@ -606 +606 @@
         AccountConfig acctConfig =
             (AccountConfig)((ConfigTreeNode)configTreeField.getCookie(configTreeField.getCurrentNode())).cookie;
-        
+
         int index = ((Integer)accountIndexMap.get(acctConfig)).intValue();
         int response = Dialog.ask(Dialog.D_DELETE);
@@ -633 +633 @@
         }
     }
-    
+
     /**
      * Delete the currently selected outgoing server.
@@ -640 +640 @@
         OutgoingConfig outgoingConfig =
             (OutgoingConfig)((ConfigTreeNode)configTreeField.getCookie(configTreeField.getCurrentNode())).cookie;
-        
+
         int index = ((Integer)outgoingIndexMap.get(outgoingConfig)).intValue();
         int response = Dialog.ask(Dialog.D_DELETE);
@@ -652 +652 @@
         }
     }
-    
-        private static class ConfigTreeNode implements TreeFieldNode {
-                public Object cookie;
-                
-                public ConfigTreeNode(Object cookie) {
-                        this.cookie = cookie;
-                }
-
-                public String toString() {
-                        return cookie.toString();
-                }
-                
-                public boolean isNodeSelectable() {
-                        if((cookie instanceof GlobalConfig)
-                        || (cookie instanceof IdentityConfig)
-                        || (cookie instanceof AccountConfig)
-                        || (cookie instanceof OutgoingConfig)) {
-                                return true;
-                        }
-                        else {
-                                return false;
-                        }
-                }
-        }
+
+    private static class ConfigTreeNode implements TreeFieldNode {
+        public Object cookie;
+
+        public ConfigTreeNode(Object cookie) {
+            this.cookie = cookie;
+        }
+
+        public String toString() {
+            return cookie.toString();
+        }
+
+        public boolean isNodeSelectable() {
+            if((cookie instanceof GlobalConfig)
+                    || (cookie instanceof IdentityConfig)
+                    || (cookie instanceof AccountConfig)
+                    || (cookie instanceof OutgoingConfig)) {
+                return true;
+            }
+            else {
+                return false;
+            }
+        }
+    }
 }

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

@@ -61 +61 @@
 
     private static String LOCAL_FILE_BASE = "LogicMail/";
-    
+
     private ObjectChoiceField languageChoiceField;
     private CheckboxField unicodeNormalizationCheckboxField;
-    
+
     private ObjectChoiceField messageDisplayChoiceField;
     private BasicEditField messageCountEditField;
@@ -77 +77 @@
     public GlobalConfigScreen() {
         super("LogicMail - " +
-            resources.getString(LogicMailResource.CONFIG_GLOBAL_TITLE));
+                resources.getString(LogicMailResource.CONFIG_GLOBAL_TITLE));
 
         mailSettings = MailSettings.getInstance();
@@ -115 +115 @@
         Enumeration e = FileSystemRegistry.listRoots();
         while(e.hasMoreElements()) {
-                String root = (String)e.nextElement();
-                if(selectedFileSystemRoot.endsWith(root + LOCAL_FILE_BASE)) {
-                        selectedFileSystemRootIndex = i;
-                }
-                resultsVector.addElement(root);
-                i++;
+            String root = (String)e.nextElement();
+            if(selectedFileSystemRoot.endsWith(root + LOCAL_FILE_BASE)) {
+                selectedFileSystemRootIndex = i;
+            }
+            resultsVector.addElement(root);
+            i++;
         }
         fileSystemRoots = new String[resultsVector.size()];
         resultsVector.copyInto(fileSystemRoots);
-        
+
         initFields();
     }
@@ -140 +140 @@
         }
         languageChoiceField = new ObjectChoiceField(
-                        resources.getString(LogicMailResource.CONFIG_GLOBAL_LANGUAGE),
-                        languageChoices,
-                        languageIndex);
-        
-                unicodeNormalizationCheckboxField = new CheckboxField(
-                                resources.getString(LogicMailResource.CONFIG_GLOBAL_UNICODE_NORMALIZATION),
-                                existingConfig.getUnicodeNormalization());
-
-                messageDisplayChoiceField = new ObjectChoiceField(
-                                resources.getString(LogicMailResource.CONFIG_GLOBAL_MESSAGE_FORMAT),
-                                new String[] {
-                                        resources.getString(LogicMailResource.CONFIG_GLOBAL_MESSAGE_FORMAT_PLAIN_TEXT),
-                                        "HTML" },
-                                existingConfig.getMessageDisplayFormat());
-                
-            messageCountEditField = new BasicEditField(
-                        resources.getString(LogicMailResource.CONFIG_GLOBAL_MESSAGE_COUNT) + ' ',
-                    Integer.toString(existingConfig.getRetMsgCount()));
-            messageCountEditField.setFilter(TextFilter.get(TextFilter.NUMERIC));
-        
-            String[] orderTypes = {
-                    resources.getString(LogicMailResource.MENUITEM_ORDER_ASCENDING),
-                    resources.getString(LogicMailResource.MENUITEM_ORDER_DESCENDING)
-                };
-        
-            if (existingConfig.getDispOrder()) {
-                displayOrderChoiceField = new ObjectChoiceField(
-                                resources.getString(LogicMailResource.CONFIG_GLOBAL_MESSAGE_ORDER) + ' ',
-                        orderTypes, 0);
-            } else {
-                displayOrderChoiceField = new ObjectChoiceField(
-                                resources.getString(LogicMailResource.CONFIG_GLOBAL_MESSAGE_ORDER) + ' ',
-                        orderTypes, 1);
-            }
-        
-            hideDeletedMessagesCheckboxField = new CheckboxField(
-                        resources.getString(LogicMailResource.CONFIG_GLOBAL_HIDE_DELETED_MESSAGES),
+                resources.getString(LogicMailResource.CONFIG_GLOBAL_LANGUAGE),
+                languageChoices,
+                languageIndex);
+
+        unicodeNormalizationCheckboxField = new CheckboxField(
+                resources.getString(LogicMailResource.CONFIG_GLOBAL_UNICODE_NORMALIZATION),
+                existingConfig.getUnicodeNormalization());
+
+        messageDisplayChoiceField = new ObjectChoiceField(
+                resources.getString(LogicMailResource.CONFIG_GLOBAL_MESSAGE_FORMAT),
+                new String[] {
+                    resources.getString(LogicMailResource.CONFIG_GLOBAL_MESSAGE_FORMAT_PLAIN_TEXT),
+                "HTML" },
+                existingConfig.getMessageDisplayFormat());
+
+        messageCountEditField = new BasicEditField(
+                resources.getString(LogicMailResource.CONFIG_GLOBAL_MESSAGE_COUNT) + ' ',
+                Integer.toString(existingConfig.getRetMsgCount()));
+        messageCountEditField.setFilter(TextFilter.get(TextFilter.NUMERIC));
+
+        String[] orderTypes = {
+                resources.getString(LogicMailResource.MENUITEM_ORDER_ASCENDING),
+                resources.getString(LogicMailResource.MENUITEM_ORDER_DESCENDING)
+        };
+
+        if (existingConfig.getDispOrder()) {
+            displayOrderChoiceField = new ObjectChoiceField(
+                    resources.getString(LogicMailResource.CONFIG_GLOBAL_MESSAGE_ORDER) + ' ',
+                    orderTypes, 0);
+        } else {
+            displayOrderChoiceField = new ObjectChoiceField(
+                    resources.getString(LogicMailResource.CONFIG_GLOBAL_MESSAGE_ORDER) + ' ',
+                    orderTypes, 1);
+        }
+
+        hideDeletedMessagesCheckboxField = new CheckboxField(
+                resources.getString(LogicMailResource.CONFIG_GLOBAL_HIDE_DELETED_MESSAGES),
                 existingConfig.getHideDeletedMsg());
-        
-            String[] wifiModes = {
-                    resources.getString(LogicMailResource.MENUITEM_DISABLED),
-                    resources.getString(LogicMailResource.MENUITEM_PROMPT),
-                    resources.getString(LogicMailResource.MENUITEM_ALWAYS)
-                };
-            wifiModeChoiceField = new ObjectChoiceField(
-                        resources.getString(LogicMailResource.CONFIG_GLOBAL_WIFI_MODE) + ' ',
-                        wifiModes,
-                        existingConfig.getWifiMode());
-
-            localDataLocationChoiceLabel = new ObjectChoiceField(
-                        resources.getString(LogicMailResource.CONFIG_GLOBAL_LOCAL_DATA_LOCATION) + ' ',
-                        fileSystemRoots,
-                        selectedFileSystemRootIndex);
-        
-            boolean overrideHostname = localHostname.length() > 0;
-            overrideHostnameCheckboxField = new CheckboxField(
-                        resources.getString(LogicMailResource.CONFIG_GLOBAL_OVERRIDE_HOSTNAME),
-                    overrideHostname);
-            overrideHostnameCheckboxField.setChangeListener(this);
-        
-            if (overrideHostname) {
-                localHostnameEditField = new BasicEditField(
-                                resources.getString(LogicMailResource.CONFIG_GLOBAL_HOSTNAME) + ' ',
-                        localHostname);
-            } else {
-                String hostname = System.getProperty("microedition.hostname");
-                localHostnameEditField = new BasicEditField(
-                                resources.getString(LogicMailResource.CONFIG_GLOBAL_HOSTNAME) + ' ',
-                        ((hostname != null) ? hostname : "localhost"));
-                localHostnameEditField.setEditable(false);
-            }
-        
-            connectionDebuggingCheckboxField = new CheckboxField(
-                        resources.getString(LogicMailResource.CONFIG_GLOBAL_CONNECTION_DEBUGGING),
+
+        String[] wifiModes = {
+                resources.getString(LogicMailResource.MENUITEM_DISABLED),
+                resources.getString(LogicMailResource.MENUITEM_PROMPT),
+                resources.getString(LogicMailResource.MENUITEM_ALWAYS)
+        };
+        wifiModeChoiceField = new ObjectChoiceField(
+                resources.getString(LogicMailResource.CONFIG_GLOBAL_WIFI_MODE) + ' ',
+                wifiModes,
+                existingConfig.getWifiMode());
+
+        localDataLocationChoiceLabel = new ObjectChoiceField(
+                resources.getString(LogicMailResource.CONFIG_GLOBAL_LOCAL_DATA_LOCATION) + ' ',
+                fileSystemRoots,
+                selectedFileSystemRootIndex);
+
+        boolean overrideHostname = localHostname.length() > 0;
+        overrideHostnameCheckboxField = new CheckboxField(
+                resources.getString(LogicMailResource.CONFIG_GLOBAL_OVERRIDE_HOSTNAME),
+                overrideHostname);
+        overrideHostnameCheckboxField.setChangeListener(this);
+
+        if (overrideHostname) {
+            localHostnameEditField = new BasicEditField(
+                    resources.getString(LogicMailResource.CONFIG_GLOBAL_HOSTNAME) + ' ',
+                    localHostname);
+        } else {
+            String hostname = System.getProperty("microedition.hostname");
+            localHostnameEditField = new BasicEditField(
+                    resources.getString(LogicMailResource.CONFIG_GLOBAL_HOSTNAME) + ' ',
+                    ((hostname != null) ? hostname : "localhost"));
+            localHostnameEditField.setEditable(false);
+        }
+
+        connectionDebuggingCheckboxField = new CheckboxField(
+                resources.getString(LogicMailResource.CONFIG_GLOBAL_CONNECTION_DEBUGGING),
                 existingConfig.getConnDebug());
 
 
-                add(new LabeledSeparatorField("Message display", Field.NON_FOCUSABLE | LabeledSeparatorField.BOTTOM_BORDER));
-                add(messageDisplayChoiceField);
-            add(messageCountEditField);
-            add(displayOrderChoiceField);
-            add(hideDeletedMessagesCheckboxField);
-
-                add(new LabeledSeparatorField("Networking", Field.NON_FOCUSABLE | LabeledSeparatorField.TOP_BORDER | LabeledSeparatorField.BOTTOM_BORDER));
-            add(wifiModeChoiceField);
-            add(overrideHostnameCheckboxField);
-            add(localHostnameEditField);
-            
-            add(new LabeledSeparatorField("Other", Field.NON_FOCUSABLE | LabeledSeparatorField.TOP_BORDER | LabeledSeparatorField.BOTTOM_BORDER));
-            add(localDataLocationChoiceLabel);
-                add(languageChoiceField);
-                add(unicodeNormalizationCheckboxField);
-            add(connectionDebuggingCheckboxField);
+        add(new LabeledSeparatorField(
+                resources.getString(LogicMailResource.CONFIG_GLOBAL_SECTION_MESSAGE_DISPLAY),
+                Field.NON_FOCUSABLE | LabeledSeparatorField.BOTTOM_BORDER));
+        add(messageDisplayChoiceField);
+        add(messageCountEditField);
+        add(displayOrderChoiceField);
+        add(hideDeletedMessagesCheckboxField);
+
+        add(new LabeledSeparatorField(
+                resources.getString(LogicMailResource.CONFIG_GLOBAL_SECTION_NETWORKING),
+                Field.NON_FOCUSABLE | LabeledSeparatorField.TOP_BORDER | LabeledSeparatorField.BOTTOM_BORDER));
+        add(wifiModeChoiceField);
+        add(overrideHostnameCheckboxField);
+        add(localHostnameEditField);
+
+        add(new LabeledSeparatorField(
+                resources.getString(LogicMailResource.CONFIG_GLOBAL_SECTION_OTHER),
+                Field.NON_FOCUSABLE | LabeledSeparatorField.TOP_BORDER | LabeledSeparatorField.BOTTOM_BORDER));
+        add(localDataLocationChoiceLabel);
+        add(languageChoiceField);
+        add(unicodeNormalizationCheckboxField);
+        add(connectionDebuggingCheckboxField);
     }
-    
+
     public void fieldChanged(Field field, int context) {
         if (field == overrideHostnameCheckboxField) {
@@ -243 +249 @@
                 String hostname = System.getProperty("microedition.hostname");
                 localHostnameEditField.setText((hostname != null) ? hostname
-                                                            : "localhost");
+                        : "localhost");
                 localHostnameEditField.setEditable(false);
             }
@@ -263 +269 @@
             config.setLanguageCode("");
         }
-        
+
         config.setUnicodeNormalization(unicodeNormalizationCheckboxField.getChecked());
-        
+
         config.setMessageDisplayFormat(messageDisplayChoiceField.getSelectedIndex());
-        
+
         try {
             config.setRetMsgCount(Integer.parseInt(messageCountEditField.getText()));

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

@@ -33 +33 @@
 
 import net.rim.device.api.ui.Field;
-import net.rim.device.api.ui.FieldChangeListener;
 import net.rim.device.api.ui.component.AutoTextEditField;
 import net.rim.device.api.ui.component.BasicEditField;
-import net.rim.device.api.ui.component.ButtonField;
 import net.rim.device.api.ui.component.Dialog;
 import net.rim.device.api.ui.component.EmailAddressEditField;
@@ -57 +55 @@
     private EmailAddressEditField replyToAddressField;
     private AutoTextEditField msgSignatureField;
-    private ButtonField saveButton;
-    
+
     /**
      * Creates a new instance of IdentityConfigScreen
@@ -77 +74 @@
         msgSignatureField.setText(identityConfig.getMsgSignature());
 
-        saveButton = new ButtonField(resources.getString(LogicMailResource.MENUITEM_SAVE), Field.FIELD_HCENTER);
-        saveButton.setChangeListener(new FieldChangeListener() {
-            public void fieldChanged(Field field, int context) {
-                saveButton_FieldChanged(field, context);
-            }});
-
         add(identityNameField);
-        add(new SeparatorField());
         add(fullNameField);
         add(emailAddressField);
@@ -91 +81 @@
         add(new RichTextField(resources.getString(LogicMailResource.CONFIG_IDENTITY_SIGNATURE), Field.NON_FOCUSABLE));
         add(msgSignatureField);
-        add(new SeparatorField());
-        add(saveButton);
-    }
-
-    private void saveButton_FieldChanged(Field field, int context) {
-        field.setDirty(false);
-        onClose();
     }
 
     protected boolean onSavePrompt() {
         if(identityNameField.getText().length() > 0 &&
-           emailAddressField.getText().length() > 0) {
+                emailAddressField.getText().length() > 0) {
             return super.onSavePrompt();
         }
         else {
             int result = Dialog.ask(
-                        resources.getString(LogicMailResource.CONFIG_PROMPT_INCOMPLETE),
-                        new String[] {
-                                resources.getString(LogicMailResource.MENUITEM_DISCARD),
-                                resources.getString(LogicMailResource.MENUITEM_CANCEL) }, 0);
+                    resources.getString(LogicMailResource.CONFIG_PROMPT_INCOMPLETE),
+                    new String[] {
+                        resources.getString(LogicMailResource.MENUITEM_DISCARD),
+                        resources.getString(LogicMailResource.MENUITEM_CANCEL) }, 0);
             if(result == 0) {
                 return true;
@@ -119 +102 @@
         }
     }
-    
+
     public void save() {
         identityConfig.setIdentityName(identityNameField.getText());
@@ -128 +111 @@
         configSaved = true;
     }
-    
+
     public boolean configSaved() {
         return configSaved;