Changeset 630

Timestamp:

02/03/10 20:27:00 (2 years ago)

Author:

octorian

Message:

Implemented "Don't Ask Again" checkboxes on delete and expunge dialogs

Location:

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

Files:

• MailboxScreen.java (modified) (2 diffs)
• MessageActions.java (modified) (2 diffs)

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

@@ -35 +35 @@
 import java.util.Vector;
 
+import net.rim.device.api.system.Bitmap;
 import net.rim.device.api.ui.Field;
 import net.rim.device.api.ui.Keypad;
@@ -249 +250 @@
         if(mailboxNode.getParentAccount().hasExpunge()
                 && mailboxNode.hasDeletedMessages()) {
-            int expungeMode = MailSettings.getInstance().getGlobalConfig().getExpungeMode();
+            MailSettings mailSettings = MailSettings.getInstance();
+            int expungeMode = mailSettings.getGlobalConfig().getExpungeMode();
             if(expungeMode == GlobalConfig.EXPUNGE_PROMPT) {
-                // Prompt for expunge if possible and supported
-                int choice = Dialog.ask(
+                Dialog dialog = new Dialog(
                         Dialog.D_YES_NO,
                         resources.getString(LogicMailResource.MAILBOX_EXPUNGE_PROMPT),
-                        Dialog.YES);
+                        Dialog.NO,
+                        Bitmap.getPredefinedBitmap(Bitmap.QUESTION), 0, true);
+                int choice = dialog.doModal();
 
                 // Request expunge if desired
                 if(choice == Dialog.YES) {
                     mailboxNode.expungeDeletedMessages();
+                }
+
+                if(dialog.getDontAskAgainValue()) {
+                    if(choice == Dialog.YES) {
+                        mailSettings.getGlobalConfig().setExpungeMode(GlobalConfig.EXPUNGE_ALWAYS);
+                        mailSettings.saveSettings();
+                    }
+                    else if(choice == Dialog.NO) {
+                        mailSettings.getGlobalConfig().setExpungeMode(GlobalConfig.EXPUNGE_NEVER);
+                        mailSettings.saveSettings();
+                    }
                 }
             }

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

@@ -34 +34 @@
 
 import net.rim.device.api.i18n.ResourceBundle;
+import net.rim.device.api.system.Bitmap;
 import net.rim.device.api.ui.MenuItem;
 import net.rim.device.api.ui.UiApplication;
@@ -328 +329 @@
      */
     public void deleteMessage(MessageNode messageNode) {
-        if(MailSettings.getInstance().getGlobalConfig().getPromptOnDelete()) {
-            if(Dialog.ask(Dialog.D_YES_NO, resources.getString(LogicMailResource.MAILBOX_DELETE_PROMPT)) == Dialog.YES) {
+        MailSettings mailSettings = MailSettings.getInstance();
+        if(mailSettings.getGlobalConfig().getPromptOnDelete()) {
+            Dialog dialog = new Dialog(
+                    Dialog.D_YES_NO,
+                    resources.getString(LogicMailResource.MAILBOX_DELETE_PROMPT),
+                    Dialog.NO,
+                    Bitmap.getPredefinedBitmap(Bitmap.QUESTION), 0, true);
+            if(dialog.doModal() == Dialog.YES) {
                 messageNode.deleteMessage();
+                if(dialog.getDontAskAgainValue()) {
+                    mailSettings.getGlobalConfig().setPromptOnDelete(false);
+                    mailSettings.saveSettings();
+                }
             }
         }