[haiku-commits] r40569 - haiku/trunk/src/kits/mail
- From: clemens.zeidler@xxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 20 Feb 2011 04:27:43 +0100 (CET)
Author: czeidler
Date: 2011-02-20 04:27:42 +0100 (Sun, 20 Feb 2011)
New Revision: 40569
Changeset: http://dev.haiku-os.org/changeset/40569
Modified:
haiku/trunk/src/kits/mail/ProtocolConfigView.cpp
Log:
Some cleanup in the config view.
Modified: haiku/trunk/src/kits/mail/ProtocolConfigView.cpp
===================================================================
--- haiku/trunk/src/kits/mail/ProtocolConfigView.cpp 2011-02-20 02:19:34 UTC
(rev 40568)
+++ haiku/trunk/src/kits/mail/ProtocolConfigView.cpp 2011-02-20 03:27:42 UTC
(rev 40569)
@@ -235,8 +235,12 @@
}
if (options_mask & B_MAIL_PROTOCOL_CAN_LEAVE_MAIL_ON_SERVER) {
-
AddChild(AddCheckBox(rect,"leave_mail_remote",MDR_DIALECT_CHOICE ("Leave mail
on server","受信後にサーバ内のメールを削除しない"),new BMessage('lmos')));
- BCheckBox *box =
AddCheckBox(rect,"delete_remote_when_local",MDR_DIALECT_CHOICE ("Remove mail
from server when deleted","端末で削除されたらサーバ保存分も削除"));
+ AddChild(AddCheckBox(rect, "leave_mail_on_server",
+ MDR_DIALECT_CHOICE ("Leave mail on server",
+ "受信後にサーバ内のメールを削除しない"), new BMessage('lmos')));
+ BCheckBox* box = AddCheckBox(rect, "delete_remote_when_local",
+ MDR_DIALECT_CHOICE ("Remove mail from server when
deleted",
+ "端末で削除されたらサーバ保存分も削除"));
box->SetEnabled(false);
AddChild(box);
}
@@ -305,7 +309,7 @@
}
- BCheckBox *box = (BCheckBox *)(FindView("leave_mail_remote"));
+ BCheckBox *box = (BCheckBox *)(FindView("leave_mail_on_server"));
if (box != NULL)
box->SetValue(archive->FindBool("leave_mail_on_server") ?
B_CONTROL_ON : B_CONTROL_OFF);
@@ -360,7 +364,7 @@
if (menu != NULL)
menu->Menu()->SetTargetForItems(this);
- BCheckBox *box = (BCheckBox *)(FindView("leave_mail_remote"));
+ BCheckBox *box = (BCheckBox *)(FindView("leave_mail_on_server"));
if (box != NULL)
box->SetTarget(this);
}
@@ -440,18 +444,23 @@
if (into->ReplaceInt32("auth_method",index) != B_OK)
into->AddInt32("auth_method",index);
- if (FindView("leave_mail_remote") != NULL) {
- if (into->ReplaceBool("leave_mail_on_server",((BControl
*)(FindView("leave_mail_remote")))->Value() == B_CONTROL_ON) != B_OK)
- into->AddBool("leave_mail_on_server",((BControl
*)(FindView("leave_mail_remote")))->Value() == B_CONTROL_ON);
-
- if (into->ReplaceBool("delete_remote_when_local",((BControl
*)(FindView("delete_remote_when_local")))->Value() == B_CONTROL_ON) != B_OK)
- into->AddBool("delete_remote_when_local",((BControl
*)(FindView("delete_remote_when_local")))->Value() == B_CONTROL_ON);
+ if (FindView("leave_mail_on_server") != NULL) {
+ BControl* control = (BControl*)FindView("leave_mail_on_server");
+ bool on = (control->Value() == B_CONTROL_ON);
+ if (into->ReplaceBool("leave_mail_on_server", on) != B_OK)
+ into->AddBool("leave_mail_on_server", on);
+
+ control = (BControl*)FindView("delete_remote_when_local");
+ on = (control->Value() == B_CONTROL_ON);
+ if (into->ReplaceBool("delete_remote_when_local", on)) {
+ into->AddBool("delete_remote_when_local", on);
+ }
} else {
- if (into->ReplaceBool("leave_mail_on_server",false) != B_OK)
- into->AddBool("leave_mail_on_server",false);
+ if (into->ReplaceBool("leave_mail_on_server", false) != B_OK)
+ into->AddBool("leave_mail_on_server", false);
- if (into->ReplaceBool("delete_remote_when_local",false) != B_OK)
- into->AddBool("delete_remote_when_local",false);
+ if (into->ReplaceBool("delete_remote_when_local", false) !=
B_OK)
+ into->AddBool("delete_remote_when_local", false);
}
if (fBodyDownloadConfig)
Other related posts:
- » [haiku-commits] r40569 - haiku/trunk/src/kits/mail - clemens . zeidler
