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

Updated to use B_TRANSLATE* macros. relates to #5408.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36692 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2010-05-07 00:12:56 +00:00
parent 49039b4ef3
commit 0f4ad67280
2 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/network/EthernetSettingsView.cpp
+29 -21
View File
@@ -126,21 +126,23 @@ EthernetSettingsView::EthernetSettingsView()
} }
BPopUpMenu* modeMenu = new BPopUpMenu("modes"); BPopUpMenu* modeMenu = new BPopUpMenu("modes");
modeMenu->AddItem(new BMenuItem(TR("Static"), new BMessage(kMsgMode))); modeMenu->AddItem(new BMenuItem(B_TRANSLATE("Static"),
modeMenu->AddItem(new BMenuItem(TR("DHCP"), new BMessage(kMsgMode))); new BMessage(kMsgMode)));
modeMenu->AddItem(new BMenuItem(B_TRANSLATE("DHCP"),
new BMessage(kMsgMode)));
//modeMenu->AddSeparatorItem(); //modeMenu->AddSeparatorItem();
//BMenuItem* offItem = new BMenuItem("Disabled", NULL); //BMenuItem* offItem = new BMenuItem("Disabled", NULL);
//modeMenu->AddItem(offItem); //modeMenu->AddItem(offItem);
fDeviceMenuField = new BMenuField(TR("Adapter:"), deviceMenu); fDeviceMenuField = new BMenuField(B_TRANSLATE("Adapter:"), deviceMenu);
layout->AddItem(fDeviceMenuField->CreateLabelLayoutItem(), 0, 0); layout->AddItem(fDeviceMenuField->CreateLabelLayoutItem(), 0, 0);
layout->AddItem(fDeviceMenuField->CreateMenuBarLayoutItem(), 1, 0); layout->AddItem(fDeviceMenuField->CreateMenuBarLayoutItem(), 1, 0);
fTypeMenuField = new BMenuField(TR("Mode:"), modeMenu); fTypeMenuField = new BMenuField(B_TRANSLATE("Mode:"), modeMenu);
layout->AddItem(fTypeMenuField->CreateLabelLayoutItem(), 0, 1); layout->AddItem(fTypeMenuField->CreateLabelLayoutItem(), 0, 1);
layout->AddItem(fTypeMenuField->CreateMenuBarLayoutItem(), 1, 1); layout->AddItem(fTypeMenuField->CreateMenuBarLayoutItem(), 1, 1);
fIPTextControl = new BTextControl(TR("IP address:"), "", NULL); fIPTextControl = new BTextControl(B_TRANSLATE("IP address:"), "", NULL);
SetupTextControl(fIPTextControl); SetupTextControl(fIPTextControl);
BLayoutItem* layoutItem = fIPTextControl->CreateTextViewLayoutItem(); BLayoutItem* layoutItem = fIPTextControl->CreateTextViewLayoutItem();
@@ -151,29 +153,31 @@ EthernetSettingsView::EthernetSettingsView()
layout->AddItem(fIPTextControl->CreateLabelLayoutItem(), 0, 2); layout->AddItem(fIPTextControl->CreateLabelLayoutItem(), 0, 2);
layout->AddItem(layoutItem, 1, 2); layout->AddItem(layoutItem, 1, 2);
fNetMaskTextControl = new BTextControl(TR("Netmask:"), "", NULL); fNetMaskTextControl = new BTextControl(B_TRANSLATE("Netmask:"), "", NULL);
SetupTextControl(fNetMaskTextControl); SetupTextControl(fNetMaskTextControl);
layout->AddItem(fNetMaskTextControl->CreateLabelLayoutItem(), 0, 3); layout->AddItem(fNetMaskTextControl->CreateLabelLayoutItem(), 0, 3);
layout->AddItem(fNetMaskTextControl->CreateTextViewLayoutItem(), 1, 3); layout->AddItem(fNetMaskTextControl->CreateTextViewLayoutItem(), 1, 3);
fGatewayTextControl = new BTextControl(TR("Gateway:"), "", NULL); fGatewayTextControl = new BTextControl(B_TRANSLATE("Gateway:"), "", NULL);
SetupTextControl(fGatewayTextControl); SetupTextControl(fGatewayTextControl);
layout->AddItem(fGatewayTextControl->CreateLabelLayoutItem(), 0, 4); layout->AddItem(fGatewayTextControl->CreateLabelLayoutItem(), 0, 4);
layout->AddItem(fGatewayTextControl->CreateTextViewLayoutItem(), 1, 4); layout->AddItem(fGatewayTextControl->CreateTextViewLayoutItem(), 1, 4);
// TODO: Replace the DNS text controls by a BListView with add/remove // TODO: Replace the DNS text controls by a BListView with add/remove
// functionality and so on... // functionality and so on...
fPrimaryDNSTextControl = new BTextControl(TR("DNS #1:"), "", NULL); fPrimaryDNSTextControl = new BTextControl(B_TRANSLATE("DNS #1:"), "",
NULL);
SetupTextControl(fPrimaryDNSTextControl); SetupTextControl(fPrimaryDNSTextControl);
layout->AddItem(fPrimaryDNSTextControl->CreateLabelLayoutItem(), 0, 5); layout->AddItem(fPrimaryDNSTextControl->CreateLabelLayoutItem(), 0, 5);
layout->AddItem(fPrimaryDNSTextControl->CreateTextViewLayoutItem(), 1, 5); layout->AddItem(fPrimaryDNSTextControl->CreateTextViewLayoutItem(), 1, 5);
fSecondaryDNSTextControl = new BTextControl(TR("DNS #2:"), "", NULL); fSecondaryDNSTextControl = new BTextControl(B_TRANSLATE("DNS #2:"), "",
NULL);
SetupTextControl(fSecondaryDNSTextControl); SetupTextControl(fSecondaryDNSTextControl);
layout->AddItem(fSecondaryDNSTextControl->CreateLabelLayoutItem(), 0, 6); layout->AddItem(fSecondaryDNSTextControl->CreateLabelLayoutItem(), 0, 6);
layout->AddItem(fSecondaryDNSTextControl->CreateTextViewLayoutItem(), 1, 6); layout->AddItem(fSecondaryDNSTextControl->CreateTextViewLayoutItem(), 1, 6);
fDomainTextControl = new BTextControl(TR("Domain:"), "", NULL); fDomainTextControl = new BTextControl(B_TRANSLATE("Domain:"), "", NULL);
SetupTextControl(fDomainTextControl); SetupTextControl(fDomainTextControl);
layout->AddItem(fDomainTextControl->CreateLabelLayoutItem(), 0, 7); layout->AddItem(fDomainTextControl->CreateLabelLayoutItem(), 0, 7);
layout->AddItem(fDomainTextControl->CreateTextViewLayoutItem(), 1, 7); layout->AddItem(fDomainTextControl->CreateTextViewLayoutItem(), 1, 7);
@@ -189,13 +193,14 @@ EthernetSettingsView::EthernetSettingsView()
// enabling/disabling) // enabling/disabling)
BGroupView* buttonGroup = new BGroupView(B_HORIZONTAL); BGroupView* buttonGroup = new BGroupView(B_HORIZONTAL);
fRevertButton = new BButton(TR("Revert"), new BMessage(kMsgRevert)); fRevertButton = new BButton(B_TRANSLATE("Revert"),
new BMessage(kMsgRevert));
fRevertButton->SetEnabled(false); fRevertButton->SetEnabled(false);
buttonGroup->GroupLayout()->AddView(fRevertButton); buttonGroup->GroupLayout()->AddView(fRevertButton);
buttonGroup->GroupLayout()->AddItem(BSpaceLayoutItem::CreateGlue()); buttonGroup->GroupLayout()->AddItem(BSpaceLayoutItem::CreateGlue());
fApplyButton = new BButton(TR("Apply"), new BMessage(kMsgApply)); fApplyButton = new BButton(B_TRANSLATE("Apply"), new BMessage(kMsgApply));
buttonGroup->GroupLayout()->AddView(fApplyButton); buttonGroup->GroupLayout()->AddView(fApplyButton);
rootLayout->AddView(controlsGroup); rootLayout->AddView(controlsGroup);
@@ -316,9 +321,9 @@ EthernetSettingsView::_ShowConfiguration(Settings* settings)
fNetMaskTextControl->SetText(settings->Netmask()); fNetMaskTextControl->SetText(settings->Netmask());
if (settings->AutoConfigure() == true) if (settings->AutoConfigure() == true)
item = fTypeMenuField->Menu()->FindItem(TR("DHCP")); item = fTypeMenuField->Menu()->FindItem(B_TRANSLATE("DHCP"));
else else
item = fTypeMenuField->Menu()->FindItem(TR("Static")); item = fTypeMenuField->Menu()->FindItem(B_TRANSLATE("Static"));
if (item) if (item)
item->SetMarked(true); item->SetMarked(true);
@@ -363,7 +368,8 @@ EthernetSettingsView::_ApplyControlsToConfiguration()
fCurrentSettings->SetGateway(fGatewayTextControl->Text()); fCurrentSettings->SetGateway(fGatewayTextControl->Text());
fCurrentSettings->SetAutoConfigure( fCurrentSettings->SetAutoConfigure(
strcmp(fTypeMenuField->Menu()->FindMarked()->Label(), TR("DHCP")) == 0); strcmp(fTypeMenuField->Menu()->FindMarked()->Label(),
B_TRANSLATE("DHCP")) == 0);
fCurrentSettings->NameServers().MakeEmpty(); fCurrentSettings->NameServers().MakeEmpty();
fCurrentSettings->NameServers().AddItem(new BString( fCurrentSettings->NameServers().AddItem(new BString(
@@ -476,8 +482,8 @@ EthernetSettingsView::_TriggerAutoConfig(const char* device)
{ {
BMessenger networkServer(kNetServerSignature); BMessenger networkServer(kNetServerSignature);
if (!networkServer.IsValid()) { if (!networkServer.IsValid()) {
(new BAlert("error", TR("The net_server needs to run for the auto " (new BAlert("error", B_TRANSLATE("The net_server needs to run for "
"configuration!"), TR("OK")))->Go(); "the auto configuration!"), B_TRANSLATE("OK")))->Go();
return B_ERROR; return B_ERROR;
} }
@@ -491,13 +497,14 @@ EthernetSettingsView::_TriggerAutoConfig(const char* device)
BMessage reply; BMessage reply;
status_t status = networkServer.SendMessage(&message, &reply); status_t status = networkServer.SendMessage(&message, &reply);
if (status != B_OK) { if (status != B_OK) {
BString errorMessage(TR("Sending auto-config message failed: ")); BString errorMessage(
B_TRANSLATE("Sending auto-config message failed: "));
errorMessage << strerror(status); errorMessage << strerror(status);
(new BAlert("error", errorMessage.String(), TR("OK")))->Go(); (new BAlert("error", errorMessage.String(), B_TRANSLATE("OK")))->Go();
return status; return status;
} else if (reply.FindInt32("status", &status) == B_OK } else if (reply.FindInt32("status", &status) == B_OK
&& status != B_OK) { && status != B_OK) {
BString errorMessage(TR("Auto-configuring failed: ")); BString errorMessage(B_TRANSLATE("Auto-configuring failed: "));
errorMessage << strerror(status); errorMessage << strerror(status);
(new BAlert("error", errorMessage.String(), "OK"))->Go(); (new BAlert("error", errorMessage.String(), "OK"))->Go();
return status; return status;
@@ -560,7 +567,8 @@ EthernetSettingsView::MessageReceived(BMessage* message)
switch (message->what) { switch (message->what) {
case kMsgMode: case kMsgMode:
if (BMenuItem* item = fTypeMenuField->Menu()->FindMarked()) if (BMenuItem* item = fTypeMenuField->Menu()->FindMarked())
_EnableTextControls(strcmp(item->Label(), TR("DHCP")) != 0); _EnableTextControls(strcmp(item->Label(),
B_TRANSLATE("DHCP")) != 0);
fApplyButton->SetEnabled(true); fApplyButton->SetEnabled(true);
fRevertButton->SetEnabled(true); fRevertButton->SetEnabled(true);
break; break;
src/preferences/network/NetworkWindow.cpp
+1 -1
View File
@@ -19,7 +19,7 @@
#define TR_CONTEXT "NetworkWindow" #define TR_CONTEXT "NetworkWindow"
NetworkWindow::NetworkWindow() NetworkWindow::NetworkWindow()
: BWindow(BRect(50, 50, 269, 302), TR("Network"), B_TITLED_WINDOW, : BWindow(BRect(50, 50, 269, 302), B_TRANSLATE("Network"), B_TITLED_WINDOW,
B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE
| B_AUTO_UPDATE_SIZE_LIMITS) | B_AUTO_UPDATE_SIZE_LIMITS)
{ {