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@36683 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2010-05-06 23:16:37 +00:00
parent 241ad40bd3
commit 05f7d43e06
5 changed files with 129 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/cpufrequency/CPUFrequencyView.cpp
+9 -7
View File
@@ -44,21 +44,22 @@ CPUFrequencyView::CPUFrequencyView(BRect frame,
BRect rect = Bounds(); BRect rect = Bounds();
rect.InsetBy(5, 5); rect.InsetBy(5, 5);
BBox *policyBox = new BBox(rect, "policyBox"); BBox *policyBox = new BBox(rect, "policyBox");
policyBox->SetLabel(TR("Stepping policy")); policyBox->SetLabel(B_TRANSLATE("Stepping policy"));
BGroupLayout* policyLayout = new BGroupLayout(B_VERTICAL); BGroupLayout* policyLayout = new BGroupLayout(B_VERTICAL);
policyLayout->SetInsets(10, policyBox->TopBorderOffset() * 2 + 10, 10, 10); policyLayout->SetInsets(10, policyBox->TopBorderOffset() * 2 + 10, 10, 10);
policyLayout->SetSpacing(10); policyLayout->SetSpacing(10);
policyBox->SetLayout(policyLayout); policyBox->SetLayout(policyLayout);
mainLayout->AddView(policyBox); mainLayout->AddView(policyBox);
fPolicyMenu = new BMenu(TR("Stepping policy: ")); fPolicyMenu = new BMenu(B_TRANSLATE("Stepping policy: "));
BMenuField *menuField = new BMenuField(TR("Stepping policy: "), fPolicyMenu); BMenuField *menuField = new BMenuField(
B_TRANSLATE("Stepping policy: "), fPolicyMenu);
policyLayout->AddView(menuField); policyLayout->AddView(menuField);
// dynamic stepping // dynamic stepping
BBox *dynamicBox = new BBox(rect, "dynamicBox"); BBox *dynamicBox = new BBox(rect, "dynamicBox");
dynamicBox->SetLabel(TR("Dynamic stepping")); dynamicBox->SetLabel(B_TRANSLATE("Dynamic stepping"));
BGroupLayout* dynamicLayout = new BGroupLayout(B_VERTICAL); BGroupLayout* dynamicLayout = new BGroupLayout(B_VERTICAL);
dynamicLayout->SetInsets(10, dynamicBox->TopBorderOffset() * 2 + 10, dynamicLayout->SetInsets(10, dynamicBox->TopBorderOffset() * 2 + 10,
10, 10); 10, 10);
@@ -71,7 +72,8 @@ CPUFrequencyView::CPUFrequencyView(BRect frame,
fIntegrationTime = new BTextControl(BRect(0,0,Bounds().Width(),10), fIntegrationTime = new BTextControl(BRect(0,0,Bounds().Width(),10),
"intergal", "intergal",
TR("Integration time [ms]: "), "", B_TRANSLATE("Integration time [ms]: "),
"",
new BMessage(kIntegrationTimeChanged)); new BMessage(kIntegrationTimeChanged));
dynamicLayout->AddView(fColorStepView); dynamicLayout->AddView(fColorStepView);
@@ -79,7 +81,7 @@ CPUFrequencyView::CPUFrequencyView(BRect frame,
// status view // status view
BBox *statusBox = new BBox(rect, "statusBox"); BBox *statusBox = new BBox(rect, "statusBox");
statusBox->SetLabel(TR("CPU frequency status view")); statusBox->SetLabel(B_TRANSLATE("CPU frequency status view"));
BGroupLayout* statusLayout = new BGroupLayout(B_HORIZONTAL); BGroupLayout* statusLayout = new BGroupLayout(B_HORIZONTAL);
statusLayout->SetInsets(10, statusBox->TopBorderOffset() * 2 + 10, 10, 10); statusLayout->SetInsets(10, statusBox->TopBorderOffset() * 2 + 10, 10, 10);
statusLayout->SetSpacing(10); statusLayout->SetSpacing(10);
@@ -91,7 +93,7 @@ CPUFrequencyView::CPUFrequencyView(BRect frame,
fStatusView->ShowPopUpMenu(false); fStatusView->ShowPopUpMenu(false);
fInstallButton = new BButton("installButton", fInstallButton = new BButton("installButton",
TR("Install replicant into Deskbar"), B_TRANSLATE("Install replicant into Deskbar"),
new BMessage(kInstallIntoDeskbar)); new BMessage(kInstallIntoDeskbar));
statusLayout->AddView(fStatusView); statusLayout->AddView(fStatusView);
src/preferences/cpufrequency/ColorStepView.cpp
+2 -1
View File
@@ -285,7 +285,8 @@ ColorStepView::_InitView()
BRect sliderFrame(Bounds()); BRect sliderFrame(Bounds());
fSlider = new BSlider(sliderFrame, "StepSlider", TR("Step up by CPU usage"), fSlider = new BSlider(sliderFrame, "StepSlider",
B_TRANSLATE("Step up by CPU usage"),
new BMessage(kSteppingChanged), 0, 100); new BMessage(kSteppingChanged), 0, 100);
fSlider->SetModificationMessage(new BMessage(kMSGSliderChanged)); fSlider->SetModificationMessage(new BMessage(kMSGSliderChanged));
src/preferences/cpufrequency/PreferencesWindow.h
+6 -3
View File
@@ -333,11 +333,14 @@ PreferencesWindow<Preferences>::PreferencesWindow(const char* title,
fPreferencesView(NULL) fPreferencesView(NULL)
{ {
BGroupView* buttonView = new BGroupView(B_HORIZONTAL); BGroupView* buttonView = new BGroupView(B_HORIZONTAL);
fDefaultButton = new BButton(TR("Defaults"), new BMessage(kDefaultMsg)); fDefaultButton = new BButton(B_TRANSLATE("Defaults"),
new BMessage(kDefaultMsg));
buttonView->AddChild(fDefaultButton); buttonView->AddChild(fDefaultButton);
buttonView->GetLayout()->AddItem(BSpaceLayoutItem::CreateHorizontalStrut(7)); buttonView->GetLayout()->AddItem(
fRevertButton = new BButton(TR("Revert"), new BMessage(kRevertMsg)); BSpaceLayoutItem::CreateHorizontalStrut(7));
fRevertButton = new BButton(B_TRANSLATE("Revert"),
new BMessage(kRevertMsg));
fRevertButton->SetEnabled(false); fRevertButton->SetEnabled(false);
buttonView->AddChild(fRevertButton); buttonView->AddChild(fRevertButton);
src/preferences/cpufrequency/StatusView.cpp
+20 -19
View File
@@ -41,16 +41,16 @@ extern "C" _EXPORT BView *instantiate_deskbar_item(void);
* So we mark them explicitly here. * So we mark them explicitly here.
*/ */
void notUsed() { void notUsed() {
TR_MARK("Dynamic performance"); B_TRANSLATE_MARK("Dynamic performance");
TR_MARK("High performance"); B_TRANSLATE_MARK("High performance");
TR_MARK("Low energy"); B_TRANSLATE_MARK("Low energy");
TR_MARK("Set state"); B_TRANSLATE_MARK("Set state");
TR_MARK("CPUFrequency\n" B_TRANSLATE_MARK("CPUFrequency\n"
"\twritten by Clemens Zeidler\n" "\twritten by Clemens Zeidler\n"
"\tCopyright 2009, Haiku, Inc.\n"); "\tCopyright 2009, Haiku, Inc.\n");
TR_MARK("Ok"); B_TRANSLATE_MARK("Ok");
TR_MARK("Open Speedstep preferences" B_UTF8_ELLIPSIS); B_TRANSLATE_MARK("Open Speedstep preferences" B_UTF8_ELLIPSIS);
TR_MARK("Quit"); B_TRANSLATE_MARK("Quit");
} }
// messages FrequencySwitcher // messages FrequencySwitcher
@@ -218,19 +218,20 @@ FrequencyMenu::FrequencyMenu(BMenu* menu, BHandler* target,
{ {
BCatalog catalog("x-vnd.Haiku-CPUFrequencyPref"); BCatalog catalog("x-vnd.Haiku-CPUFrequencyPref");
fDynamicPerformance = new BMenuItem( fDynamicPerformance = new BMenuItem(
catalog.GetString("Dynamic performance",TR_CONTEXT), catalog.GetString("Dynamic performance", TR_CONTEXT),
new BMessage(kMsgPolicyDynamic)); new BMessage(kMsgPolicyDynamic));
fHighPerformance = new BMenuItem( fHighPerformance = new BMenuItem(
catalog.GetString("High performance",TR_CONTEXT), catalog.GetString("High performance", TR_CONTEXT),
new BMessage(kMsgPolicyPerformance)); new BMessage(kMsgPolicyPerformance));
fLowEnergie = new BMenuItem(catalog.GetString("Low energy",TR_CONTEXT), fLowEnergie = new BMenuItem(catalog.GetString("Low energy",
new BMessage(kMsgPolicyLowEnergy)); TR_CONTEXT), new BMessage(kMsgPolicyLowEnergy));
menu->AddItem(fDynamicPerformance); menu->AddItem(fDynamicPerformance);
menu->AddItem(fHighPerformance); menu->AddItem(fHighPerformance);
menu->AddItem(fLowEnergie); menu->AddItem(fLowEnergie);
fCustomStateMenu = new BMenu(catalog.GetString("Set state",TR_CONTEXT)); fCustomStateMenu = new BMenu(catalog.GetString("Set state",
TR_CONTEXT));
StateList* stateList = fInterface->GetCpuFrequencyStates(); StateList* stateList = fInterface->GetCpuFrequencyStates();
for (int i = 0; i < stateList->CountItems(); i++) { for (int i = 0; i < stateList->CountItems(); i++) {
@@ -506,8 +507,8 @@ StatusView::AttachedToWindow()
// perferences menu // perferences menu
fPreferencesMenu = new BPopUpMenu(B_EMPTY_STRING, false, false); fPreferencesMenu = new BPopUpMenu(B_EMPTY_STRING, false, false);
fPreferencesMenuFilter = new FrequencyMenu(fPreferencesMenu, this, fStorage, fPreferencesMenuFilter = new FrequencyMenu(fPreferencesMenu, this,
&fDriverInterface); fStorage, &fDriverInterface);
fPreferencesMenu->SetFont(be_plain_font); fPreferencesMenu->SetFont(be_plain_font);
@@ -519,8 +520,8 @@ StatusView::AttachedToWindow()
fOpenPrefItem->SetTarget(this); fOpenPrefItem->SetTarget(this);
if (fInDeskbar) { if (fInDeskbar) {
fQuitItem= new BMenuItem(fCatalog.GetString("Quit", TR_CONTEXT), fQuitItem= new BMenuItem(fCatalog.GetString("Quit",
new BMessage(B_QUIT_REQUESTED)); TR_CONTEXT), new BMessage(B_QUIT_REQUESTED));
fPreferencesMenu->AddItem(fQuitItem); fPreferencesMenu->AddItem(fQuitItem);
fQuitItem->SetTarget(this); fQuitItem->SetTarget(this);
} }
@@ -684,8 +685,8 @@ StatusView::_OpenPreferences()
ret = be_roster->ActivateApp(info.team); ret = be_roster->ActivateApp(info.team);
} }
if (ret < B_OK) { if (ret < B_OK) {
BString errorMessage(TR("Launching the CPU frequency preflet failed.\n\n" BString errorMessage(B_TRANSLATE(
"Error: ")); "Launching the CPU frequency preflet failed.\n\nError: "));
errorMessage << strerror(ret); errorMessage << strerror(ret);
BAlert* alert = new BAlert("launch error", errorMessage.String(), BAlert* alert = new BAlert("launch error", errorMessage.String(),
"Ok"); "Ok");
src/preferences/cpufrequency/main.cpp
+2 -1
View File
@@ -23,7 +23,8 @@ main(int argc, char* argv[])
be_locale->GetAppCatalog(&cat); be_locale->GetAppCatalog(&cat);
PreferencesWindow<freq_preferences> *window; PreferencesWindow<freq_preferences> *window;
window = new PreferencesWindow<freq_preferences>(TR("CPU Frequency"), window = new PreferencesWindow<freq_preferences>(
B_TRANSLATE("CPU Frequency"),
kPreferencesFileName, kPreferencesFileName,
kDefaultPreferences); kDefaultPreferences);
CPUFrequencyView* prefView = new CPUFrequencyView(BRect(0, 0, 400, 350), CPUFrequencyView* prefView = new CPUFrequencyView(BRect(0, 0, 400, 350),