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@36696 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2010-05-07 00:27:23 +00:00
parent dd4b6c23f6
commit dccc528d64
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/touchpad/TouchpadPrefView.cpp
+21 -16
View File
@@ -355,37 +355,41 @@ TouchpadPrefView::SetupView()
{ {
SetLayout(new BGroupLayout(B_VERTICAL)); SetLayout(new BGroupLayout(B_VERTICAL));
BBox* scrollBox = new BBox("Touchpad"); BBox* scrollBox = new BBox("Touchpad");
scrollBox->SetLabel(TR("Scrolling")); scrollBox->SetLabel(B_TRANSLATE("Scrolling"));
fTouchpadView = new TouchpadView(BRect(0, 0, 130, 120)); fTouchpadView = new TouchpadView(BRect(0, 0, 130, 120));
fTouchpadView->SetExplicitMaxSize(BSize(130, 120)); fTouchpadView->SetExplicitMaxSize(BSize(130, 120));
// Create the "Mouse Speed" slider... // Create the "Mouse Speed" slider...
fScrollAccelSlider = new BSlider("scroll_accel", fScrollAccelSlider = new BSlider("scroll_accel",
TR("Scroll acceleration"), new BMessage(SCROLL_CONTROL_CHANGED), B_TRANSLATE("Scroll acceleration"),
0, 20, B_HORIZONTAL); new BMessage(SCROLL_CONTROL_CHANGED), 0, 20, B_HORIZONTAL);
fScrollAccelSlider->SetHashMarks(B_HASH_MARKS_BOTTOM); fScrollAccelSlider->SetHashMarks(B_HASH_MARKS_BOTTOM);
fScrollAccelSlider->SetHashMarkCount(7); fScrollAccelSlider->SetHashMarkCount(7);
fScrollAccelSlider->SetLimitLabels(TR("Slow"), TR("Fast")); fScrollAccelSlider->SetLimitLabels(B_TRANSLATE("Slow"),
B_TRANSLATE("Fast"));
fScrollStepXSlider = new BSlider("scroll_stepX", fScrollStepXSlider = new BSlider("scroll_stepX",
TR("Horizontal scroll speed"), B_TRANSLATE("Horizontal scroll speed"),
new BMessage(SCROLL_CONTROL_CHANGED), new BMessage(SCROLL_CONTROL_CHANGED),
0, 20, B_HORIZONTAL); 0, 20, B_HORIZONTAL);
fScrollStepXSlider->SetHashMarks(B_HASH_MARKS_BOTTOM); fScrollStepXSlider->SetHashMarks(B_HASH_MARKS_BOTTOM);
fScrollStepXSlider->SetHashMarkCount(7); fScrollStepXSlider->SetHashMarkCount(7);
fScrollStepXSlider->SetLimitLabels(TR("Slow"), TR("Fast")); fScrollStepXSlider->SetLimitLabels(B_TRANSLATE("Slow"),
B_TRANSLATE("Fast"));
fScrollStepYSlider = new BSlider("scroll_stepY", fScrollStepYSlider = new BSlider("scroll_stepY",
TR("Vertical scroll speed"), new BMessage(SCROLL_CONTROL_CHANGED), B_TRANSLATE("Vertical scroll speed"),
0, 20, B_HORIZONTAL); new BMessage(SCROLL_CONTROL_CHANGED), 0, 20, B_HORIZONTAL);
fScrollStepYSlider->SetHashMarks(B_HASH_MARKS_BOTTOM); fScrollStepYSlider->SetHashMarks(B_HASH_MARKS_BOTTOM);
fScrollStepYSlider->SetHashMarkCount(7); fScrollStepYSlider->SetHashMarkCount(7);
fScrollStepYSlider->SetLimitLabels(TR("Slow"), TR("Fast")); fScrollStepYSlider->SetLimitLabels(B_TRANSLATE("Slow"),
B_TRANSLATE("Fast"));
fTwoFingerBox = new BCheckBox(TR("Two finger scrolling"), fTwoFingerBox = new BCheckBox(B_TRANSLATE("Two finger scrolling"),
new BMessage(SCROLL_CONTROL_CHANGED)); new BMessage(SCROLL_CONTROL_CHANGED));
fTwoFingerHorizontalBox = new BCheckBox(TR("Horizontal scrolling"), fTwoFingerHorizontalBox = new BCheckBox(
B_TRANSLATE("Horizontal scrolling"),
new BMessage(SCROLL_CONTROL_CHANGED)); new BMessage(SCROLL_CONTROL_CHANGED));
BGroupView* scrollPrefLeftLayout = new BGroupView(B_VERTICAL); BGroupView* scrollPrefLeftLayout = new BGroupView(B_VERTICAL);
@@ -412,28 +416,29 @@ TouchpadPrefView::SetupView()
scrollPrefLayout->AddView(scrollPrefRightLayout); scrollPrefLayout->AddView(scrollPrefRightLayout);
BBox* tapBox = new BBox("tapbox"); BBox* tapBox = new BBox("tapbox");
tapBox->SetLabel(TR("Tap gesture")); tapBox->SetLabel(B_TRANSLATE("Tap gesture"));
BGroupLayout* tapPrefLayout = new BGroupLayout(B_HORIZONTAL); BGroupLayout* tapPrefLayout = new BGroupLayout(B_HORIZONTAL);
tapPrefLayout->SetInsets(10, tapBox->TopBorderOffset() * 2 + 10, 10, 10); tapPrefLayout->SetInsets(10, tapBox->TopBorderOffset() * 2 + 10, 10, 10);
tapBox->SetLayout(tapPrefLayout); tapBox->SetLayout(tapPrefLayout);
fTapSlider = new BSlider("tap_sens", TR("Tap click sensitivity"), fTapSlider = new BSlider("tap_sens", B_TRANSLATE("Tap click sensitivity"),
new BMessage(TAP_CONTROL_CHANGED), 0, 20, B_HORIZONTAL); new BMessage(TAP_CONTROL_CHANGED), 0, 20, B_HORIZONTAL);
fTapSlider->SetHashMarks(B_HASH_MARKS_BOTTOM); fTapSlider->SetHashMarks(B_HASH_MARKS_BOTTOM);
fTapSlider->SetHashMarkCount(7); fTapSlider->SetHashMarkCount(7);
fTapSlider->SetLimitLabels(TR("Off"), TR("High")); fTapSlider->SetLimitLabels(B_TRANSLATE("Off"), B_TRANSLATE("High"));
tapPrefLayout->AddView(fTapSlider); tapPrefLayout->AddView(fTapSlider);
BGroupView* buttonView = new BGroupView(B_HORIZONTAL); BGroupView* buttonView = new BGroupView(B_HORIZONTAL);
fDefaultButton = new BButton(TR("Defaults"), fDefaultButton = new BButton(B_TRANSLATE("Defaults"),
new BMessage(DEFAULT_SETTINGS)); new BMessage(DEFAULT_SETTINGS));
buttonView->AddChild(fDefaultButton); buttonView->AddChild(fDefaultButton);
buttonView->GetLayout()->AddItem( buttonView->GetLayout()->AddItem(
BSpaceLayoutItem::CreateHorizontalStrut(7)); BSpaceLayoutItem::CreateHorizontalStrut(7));
fRevertButton = new BButton(TR("Revert"), new BMessage(REVERT_SETTINGS)); fRevertButton = new BButton(B_TRANSLATE("Revert"),
new BMessage(REVERT_SETTINGS));
fRevertButton->SetEnabled(false); fRevertButton->SetEnabled(false);
buttonView->AddChild(fRevertButton); buttonView->AddChild(fRevertButton);
buttonView->GetLayout()->AddItem(BSpaceLayoutItem::CreateGlue()); buttonView->GetLayout()->AddItem(BSpaceLayoutItem::CreateGlue());
src/preferences/touchpad/main.cpp
+2 -1
View File
@@ -48,7 +48,8 @@ main(int argc, char* argv[])
be_locale->GetAppCatalog(&catalog); be_locale->GetAppCatalog(&catalog);
TouchpadPrefWindow* window = new TouchpadPrefWindow(BRect(50, 50, 450, 350), TouchpadPrefWindow* window = new TouchpadPrefWindow(BRect(50, 50, 450, 350),
TR("Touchpad"), B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE B_TRANSLATE("Touchpad"), B_TITLED_WINDOW,
B_NOT_RESIZABLE | B_NOT_ZOOMABLE
| B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS); | B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS);
window->SetLayout(new BGroupLayout(B_HORIZONTAL)); window->SetLayout(new BGroupLayout(B_HORIZONTAL));
window->AddChild(BGroupLayoutBuilder(B_VERTICAL, 10) window->AddChild(BGroupLayoutBuilder(B_VERTICAL, 10)