Changeset 629

Timestamp:

02/03/10 17:50:05 (2 years ago)

Author:

octorian

Message:

Added basic configurable prompts. (still need checkboxes on prompt dialogs)

Location:

trunk/LogicMail

Files:

• res/org/logicprobe/LogicMail/LogicMail.rrc (modified) (2 diffs)
• res/org/logicprobe/LogicMail/LogicMail.rrh (modified) (1 diff)
• src/org/logicprobe/LogicMail/conf/GlobalConfig.java (modified) (7 diffs)
• src/org/logicprobe/LogicMail/ui/ConfigScreen.java (modified) (4 diffs)
• src/org/logicprobe/LogicMail/ui/MailboxScreen.java (modified) (2 diffs)
• src/org/logicprobe/LogicMail/ui/MessageActions.java (modified) (1 diff)

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

@@ -35 +35 @@
 CONFIG_GLOBAL_CONNECTION_DEBUGGING#0="Connection debugging";
 CONFIG_GLOBAL_ENABLE_WIFI#0="Use WiFi if available";
+CONFIG_GLOBAL_EXPUNGE_ALWAYS#0="Always";
+CONFIG_GLOBAL_EXPUNGE_BEHAVIOR#0="Remove deleted messages?";
+CONFIG_GLOBAL_EXPUNGE_NEVER#0="Never";
+CONFIG_GLOBAL_EXPUNGE_PROMPT#0="Prompt";
 CONFIG_GLOBAL_HIDE_DELETED_MESSAGES#0="Hide deleted messages";
 CONFIG_GLOBAL_HOSTNAME#0="Hostname:";
@@ -48 +52 @@
 CONFIG_GLOBAL_NETWORK_TRANSPORT#0="Connection method:";
 CONFIG_GLOBAL_OVERRIDE_HOSTNAME#0="Override hostname";
+CONFIG_GLOBAL_PROMPT_ON_MESSAGE_DELETE#0="Prompt on message delete?";
 CONFIG_GLOBAL_SECTION_MESSAGE_DISPLAY#0="Message display";
 CONFIG_GLOBAL_SECTION_NETWORKING#0="Networking";

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

@@ -201 +201 @@
 ERROR_UNABLE_TO_OPEN_CONNECTION#0=204;
 MENUITEM_SAVE_DRAFT#0=205;
+CONFIG_GLOBAL_PROMPT_ON_MESSAGE_DELETE#0=206;
+CONFIG_GLOBAL_EXPUNGE_BEHAVIOR#0=207;
+CONFIG_GLOBAL_EXPUNGE_PROMPT#0=208;
+CONFIG_GLOBAL_EXPUNGE_ALWAYS#0=209;
+CONFIG_GLOBAL_EXPUNGE_NEVER#0=210;

trunk/LogicMail/src/org/logicprobe/LogicMail/conf/GlobalConfig.java

@@ -54 +54 @@
     /** Global data storage settings. */
     public static final int CHANGE_TYPE_DATA = 0x02;
+    /** Global prompt settings. */
+    public static final int CHANGE_TYPE_PROMPTS = 0x04;
     /** Global other settings. */
-    public static final int CHANGE_TYPE_OTHER = 0x04;
+    public static final int CHANGE_TYPE_OTHER = 0x08;
 
     /** Prefer plain text display for messages */
@@ -62 +64 @@
     public static final int MESSAGE_DISPLAY_HTML = 1;
 
+    public static final int EXPUNGE_PROMPT = 0;
+    public static final int EXPUNGE_ALWAYS = 1;
+    public static final int EXPUNGE_NEVER = 2;
+    
     /** language code to use for the UI, or null for system default */
     private String languageCode;
@@ -84 +90 @@
     /** Local host name override */
     private String localHostname;
+    /** Whether to prompt on deleting messages. */
+    private boolean promptOnDelete;
+    /** The expunge-related behavior when leaving a mailbox. */
+    private int expungeMode;
 
     public static String FILE_URL_PREFIX = "file:///";
@@ -122 +132 @@
         this.localHostname = "";
         this.localDataLocation = "";
+        this.promptOnDelete = true;
+        this.expungeMode = GlobalConfig.EXPUNGE_PROMPT;
         changeType = 0;
     }
@@ -362 +374 @@
     }
 
+    /**
+     * Gets whether to prompt on message delete.
+     * 
+     * @return the prompt on delete setting
+     */
+    public boolean getPromptOnDelete() {
+        return promptOnDelete;
+    }
+    
+    /**
+     * Sets whether to prompt on message delete.
+     * 
+     * @param promptOnDelete the new prompt on delete setting
+     */
+    public void setPromptOnDelete(boolean promptOnDelete) {
+        if(this.promptOnDelete != promptOnDelete) {
+            this.promptOnDelete = promptOnDelete;
+            changeType |= CHANGE_TYPE_PROMPTS;
+        }
+    }
+
+    /**
+     * Gets the expunge mode.
+     * 
+     * @return the expunge mode
+     */
+    public int getExpungeMode() {
+        return expungeMode;
+    }
+    
+    /**
+     * Sets the expunge mode.
+     * 
+     * @param expungeMode the new expunge mode
+     */
+    public void setExpungeMode(int expungeMode) {
+        if(this.expungeMode != expungeMode) {
+            this.expungeMode = expungeMode;
+            changeType |= CHANGE_TYPE_PROMPTS;
+        }
+    }
+    
     /* (non-Javadoc)
      * @see org.logicprobe.LogicMail.util.Serializable#serialize(java.io.DataOutput)
@@ -381 +435 @@
         table.put("global_hideDeletedMsg", new Boolean(hideDeletedMsg));
         table.put("global_localHostname", localHostname);
+        table.put("global_promptOnDelete", new Boolean(promptOnDelete));
+        table.put("global_expungeMode", new Integer(expungeMode));
 
         table.serialize(output);
@@ -447 +503 @@
         if (value instanceof String) {
             localHostname = (String) value;
+        }
+        value = table.get("global_promptOnDelete");
+        if(value instanceof Boolean) {
+            promptOnDelete = ((Boolean)value).booleanValue();
+        }
+        value = table.get("global_expungeMode");
+        if(value instanceof Integer) {
+            expungeMode = ((Integer)value).intValue();
         }
         changeType = 0;

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

@@ -95 +95 @@
     private ObjectChoiceField displayOrderChoiceField;
     private CheckboxField hideDeletedMessagesCheckboxField;
+    private CheckboxField promptOnDeleteCheckboxField;
+    private ObjectChoiceField expungeModeChoiceField;
     
     // Networking
@@ -336 +338 @@
                 existingGlobalConfig.getHideDeletedMsg());
         
+        promptOnDeleteCheckboxField = new CheckboxField(
+                resources.getString(LogicMailResource.CONFIG_GLOBAL_PROMPT_ON_MESSAGE_DELETE),
+                existingGlobalConfig.getPromptOnDelete());
+        
+        expungeModeChoiceField = new ObjectChoiceField(
+                resources.getString(LogicMailResource.CONFIG_GLOBAL_EXPUNGE_BEHAVIOR),
+                new Object[] {
+                    resources.getString(LogicMailResource.CONFIG_GLOBAL_EXPUNGE_PROMPT),
+                    resources.getString(LogicMailResource.CONFIG_GLOBAL_EXPUNGE_ALWAYS),
+                    resources.getString(LogicMailResource.CONFIG_GLOBAL_EXPUNGE_NEVER)
+                },
+                existingGlobalConfig.getExpungeMode());
+
         messageDisplayFieldManager.add(new LabeledSeparatorField(
                 resources.getString(LogicMailResource.CONFIG_GLOBAL_SECTION_MESSAGE_DISPLAY),
@@ -343 +358 @@
         messageDisplayFieldManager.add(displayOrderChoiceField);
         messageDisplayFieldManager.add(hideDeletedMessagesCheckboxField);
+        messageDisplayFieldManager.add(promptOnDeleteCheckboxField);
+        messageDisplayFieldManager.add(expungeModeChoiceField);
         messageDisplayFieldManager.add(new BlankSeparatorField(separatorHeight));
         add(messageDisplayFieldManager);
@@ -972 +989 @@
         config.setHideDeletedMsg(hideDeletedMessagesCheckboxField.getChecked());
 
+        config.setPromptOnDelete(promptOnDeleteCheckboxField.getChecked());
+        config.setExpungeMode(expungeModeChoiceField.getSelectedIndex());
+        
         config.setTransportType(getTransportSetting(networkTransportChoiceField.getSelectedIndex()));
         

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

@@ -47 +47 @@
 
 import org.logicprobe.LogicMail.LogicMailResource;
+import org.logicprobe.LogicMail.conf.GlobalConfig;
 import org.logicprobe.LogicMail.conf.MailSettings;
 import org.logicprobe.LogicMail.model.MailboxNode;
@@ -248 +249 @@
         if(mailboxNode.getParentAccount().hasExpunge()
                 && mailboxNode.hasDeletedMessages()) {
-            // Prompt for expunge if possible and supported
-            int choice = Dialog.ask(
-                    Dialog.D_YES_NO,
-                    resources.getString(LogicMailResource.MAILBOX_EXPUNGE_PROMPT),
-                    Dialog.YES);
-            
-            // Request expunge if desired
-            if(choice == Dialog.YES) {
+            int expungeMode = MailSettings.getInstance().getGlobalConfig().getExpungeMode();
+            if(expungeMode == GlobalConfig.EXPUNGE_PROMPT) {
+                // Prompt for expunge if possible and supported
+                int choice = Dialog.ask(
+                        Dialog.D_YES_NO,
+                        resources.getString(LogicMailResource.MAILBOX_EXPUNGE_PROMPT),
+                        Dialog.YES);
+
+                // Request expunge if desired
+                if(choice == Dialog.YES) {
+                    mailboxNode.expungeDeletedMessages();
+                }
+            }
+            else if(expungeMode == GlobalConfig.EXPUNGE_ALWAYS) {
                 mailboxNode.expungeDeletedMessages();
             }
         }
-        
+
         // Close the screen
         screen.close();

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

@@ -328 +328 @@
      */
     public void deleteMessage(MessageNode messageNode) {
-        if(Dialog.ask(Dialog.D_YES_NO, resources.getString(LogicMailResource.MAILBOX_DELETE_PROMPT)) == Dialog.YES) {
-                messageNode.deleteMessage();
+        if(MailSettings.getInstance().getGlobalConfig().getPromptOnDelete()) {
+            if(Dialog.ask(Dialog.D_YES_NO, resources.getString(LogicMailResource.MAILBOX_DELETE_PROMPT)) == Dialog.YES) {
+                messageNode.deleteMessage();
+            }
+        }
+        else {
+            messageNode.deleteMessage();
         }
     }