[haiku-commits] r40898 - in haiku/trunk/src: kits/mail preferences/mail

From: clemens.zeidler@xxxxxxxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Thu, 10 Mar 2011 08:47:50 +0100 (CET)
Author: czeidler
Date: 2011-03-10 08:47:49 +0100 (Thu, 10 Mar 2011)
New Revision: 40898
Changeset: http://dev.haiku-os.org/changeset/40898

Modified:
   haiku/trunk/src/kits/mail/MailSettings.cpp
   haiku/trunk/src/preferences/mail/ConfigWindow.cpp
Log:
Fix default "check interval" and "show status window" values.



Modified: haiku/trunk/src/kits/mail/MailSettings.cpp
===================================================================
--- haiku/trunk/src/kits/mail/MailSettings.cpp  2011-03-10 07:29:47 UTC (rev 
40897)
+++ haiku/trunk/src/kits/mail/MailSettings.cpp  2011-03-10 07:47:49 UTC (rev 
40898)
@@ -151,7 +151,13 @@
 uint32
 BMailSettings::ShowStatusWindow()
 {
-       return fData.FindInt32("ShowStatusWindow");
+       int32 showStatusWindow;
+       if (fData.FindInt32("ShowStatusWindow", &showStatusWindow) != B_OK) {
+               // show during send and receive
+               return 2;
+       }
+
+       return showStatusWindow;
 }
 
 
@@ -257,8 +263,11 @@
 bigtime_t
 BMailSettings::AutoCheckInterval()
 {
-       bigtime_t value = B_INFINITE_TIMEOUT;
-       fData.FindInt64("AutoCheckInterval",&value);
+       bigtime_t value;
+       if (fData.FindInt64("AutoCheckInterval", &value) != B_OK) {
+               // every 5 min
+               return 5 * 60 * 1000 * 1000;
+       }
        return value;
 }
 

Modified: haiku/trunk/src/preferences/mail/ConfigWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/mail/ConfigWindow.cpp   2011-03-10 07:29:47 UTC 
(rev 40897)
+++ haiku/trunk/src/preferences/mail/ConfigWindow.cpp   2011-03-10 07:47:49 UTC 
(rev 40898)
@@ -391,18 +391,17 @@
        fIntervalControl->SetDivider(labelWidth);
        box->AddChild(fIntervalControl);
 
-       BPopUpMenu *frequencyPopUp = new BPopUpMenu(B_EMPTY_STRING);
-       const char *frequencyStrings[] = {
+       BPopUpMenu* frequencyPopUp = new BPopUpMenu(B_EMPTY_STRING);
+       const char* frequencyStrings[] = {
                B_TRANSLATE("never"),
                B_TRANSLATE("minutes"),
                B_TRANSLATE("hours"),
                B_TRANSLATE("days")};
-       BMenuItem *item;
+
        for (int32 i = 0; i < 4; i++) {
-               frequencyPopUp->AddItem(item = new 
BMenuItem(frequencyStrings[i],
-                       new BMessage(kMsgIntervalUnitChanged)));
-               if (i == 1)
-                       item->SetMarked(true);
+               BMenuItem* item = new BMenuItem(frequencyStrings[i],
+                       new BMessage(kMsgIntervalUnitChanged));
+               frequencyPopUp->AddItem(item);
        }
        tile.left = tile.right + 5;
        tile.right = rect.right;
@@ -438,20 +437,17 @@
                B_TRANSLATE("While sending"),
                B_TRANSLATE("While sending and receiving"),
                B_TRANSLATE("Always")};
-       BMessage *msg;
        for (int32 i = 0; i < 4; i++) {
-               statusPopUp->AddItem(item = new BMenuItem(statusModes[i],
-                       msg = new BMessage(kMsgShowStatusWindowChanged)));
+               BMessage* msg = new BMessage(kMsgShowStatusWindowChanged);
+               BMenuItem* item = new BMenuItem(statusModes[i], msg);
+               statusPopUp->AddItem(item);
                msg->AddInt32("ShowStatusWindow", i);
-               if (i == 0)
-                       item->SetMarked(true);
        }
        rect = box->Bounds().InsetByCopy(8,8);
        rect.top += 7;
        rect.bottom = rect.top + height + 5;
-       labelWidth
-               = (int32)view->StringWidth(
-                       B_TRANSLATE("Show connection status window:"))  + 8;
+       labelWidth = (int32)view->StringWidth(
+               B_TRANSLATE("Show connection status window:"))  + 8;
        fStatusModeField = new BMenuField(rect, "show status",
                B_TRANSLATE("Show connection status window:"), statusPopUp);
        fStatusModeField->SetDivider(labelWidth);
@@ -459,9 +455,9 @@
 
        rect = fStatusModeField->Frame();;
        rect.OffsetBy(0, rect.Height() + 10);
+       BMessage* msg = new BMessage(B_REFS_RECEIVED);
        BButton *button = new BButton(rect, B_EMPTY_STRING,
-               B_TRANSLATE("Edit mailbox menu…"),
-               msg = new BMessage(B_REFS_RECEIVED));
+               B_TRANSLATE("Edit mailbox menu…"), msg);
        button->ResizeToPreferred();
        box->AddChild(button);
        button->SetTarget(BMessenger("application/x-vnd.Be-TRAK"));
[haiku-commits] r40898 - in haiku/trunk/src: kits/mail preferences/mail

Other related posts:
