i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix default "check interval" and "show status window" values.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40898 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler
2011-03-10 07:47:49 +00:00
parent 7f10625e83
commit 00413d511c
2 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/mail/MailSettings.cpp
+12 -3
View File
@@ -151,7 +151,13 @@ BMailSettings::SetWindowFollowsCorner(int32 which_corner)
uint32 uint32
BMailSettings::ShowStatusWindow() 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 @@ BMailSettings::SetStatusWindowLook(int32 look)
bigtime_t bigtime_t
BMailSettings::AutoCheckInterval() BMailSettings::AutoCheckInterval()
{ {
bigtime_t value = B_INFINITE_TIMEOUT; bigtime_t value;
fData.FindInt64("AutoCheckInterval",&value); if (fData.FindInt64("AutoCheckInterval", &value) != B_OK) {
// every 5 min
return 5 * 60 * 1000 * 1000;
}
return value; return value;
} }
src/preferences/mail/ConfigWindow.cpp
+13 -17
View File
@@ -391,18 +391,17 @@ ConfigWindow::ConfigWindow()
fIntervalControl->SetDivider(labelWidth); fIntervalControl->SetDivider(labelWidth);
box->AddChild(fIntervalControl); box->AddChild(fIntervalControl);
BPopUpMenu *frequencyPopUp = new BPopUpMenu(B_EMPTY_STRING); BPopUpMenu* frequencyPopUp = new BPopUpMenu(B_EMPTY_STRING);
const char *frequencyStrings[] = { const char* frequencyStrings[] = {
B_TRANSLATE("never"), B_TRANSLATE("never"),
B_TRANSLATE("minutes"), B_TRANSLATE("minutes"),
B_TRANSLATE("hours"), B_TRANSLATE("hours"),
B_TRANSLATE("days")}; B_TRANSLATE("days")};
BMenuItem *item;
for (int32 i = 0; i < 4; i++) { for (int32 i = 0; i < 4; i++) {
frequencyPopUp->AddItem(item = new BMenuItem(frequencyStrings[i], BMenuItem* item = new BMenuItem(frequencyStrings[i],
new BMessage(kMsgIntervalUnitChanged))); new BMessage(kMsgIntervalUnitChanged));
if (i == 1) frequencyPopUp->AddItem(item);
item->SetMarked(true);
} }
tile.left = tile.right + 5; tile.left = tile.right + 5;
tile.right = rect.right; tile.right = rect.right;
@@ -438,20 +437,17 @@ ConfigWindow::ConfigWindow()
B_TRANSLATE("While sending"), B_TRANSLATE("While sending"),
B_TRANSLATE("While sending and receiving"), B_TRANSLATE("While sending and receiving"),
B_TRANSLATE("Always")}; B_TRANSLATE("Always")};
BMessage *msg;
for (int32 i = 0; i < 4; i++) { for (int32 i = 0; i < 4; i++) {
statusPopUp->AddItem(item = new BMenuItem(statusModes[i], BMessage* msg = new BMessage(kMsgShowStatusWindowChanged);
msg = new BMessage(kMsgShowStatusWindowChanged))); BMenuItem* item = new BMenuItem(statusModes[i], msg);
statusPopUp->AddItem(item);
msg->AddInt32("ShowStatusWindow", i); msg->AddInt32("ShowStatusWindow", i);
if (i == 0)
item->SetMarked(true);
} }
rect = box->Bounds().InsetByCopy(8,8); rect = box->Bounds().InsetByCopy(8,8);
rect.top += 7; rect.top += 7;
rect.bottom = rect.top + height + 5; rect.bottom = rect.top + height + 5;
labelWidth labelWidth = (int32)view->StringWidth(
= (int32)view->StringWidth( B_TRANSLATE("Show connection status window:")) + 8;
B_TRANSLATE("Show connection status window:")) + 8;
fStatusModeField = new BMenuField(rect, "show status", fStatusModeField = new BMenuField(rect, "show status",
B_TRANSLATE("Show connection status window:"), statusPopUp); B_TRANSLATE("Show connection status window:"), statusPopUp);
fStatusModeField->SetDivider(labelWidth); fStatusModeField->SetDivider(labelWidth);
@@ -459,9 +455,9 @@ ConfigWindow::ConfigWindow()
rect = fStatusModeField->Frame();; rect = fStatusModeField->Frame();;
rect.OffsetBy(0, rect.Height() + 10); rect.OffsetBy(0, rect.Height() + 10);
BMessage* msg = new BMessage(B_REFS_RECEIVED);
BButton *button = new BButton(rect, B_EMPTY_STRING, BButton *button = new BButton(rect, B_EMPTY_STRING,
B_TRANSLATE("Edit mailbox menu…"), B_TRANSLATE("Edit mailbox menu…"), msg);
msg = new BMessage(B_REFS_RECEIVED));
button->ResizeToPreferred(); button->ResizeToPreferred();
box->AddChild(button); box->AddChild(button);
button->SetTarget(BMessenger("application/x-vnd.Be-TRAK")); button->SetTarget(BMessenger("application/x-vnd.Be-TRAK"));