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@36691 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2010-05-07 00:09:00 +00:00
parent 176fb40f5b
commit 49039b4ef3
3 changed files with 48 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/mouse/Mouse.cpp
+4 -4
View File
@@ -23,10 +23,10 @@ const char* kSignature = "application/x-vnd.Haiku-Mouse";
MouseApplication::MouseApplication() MouseApplication::MouseApplication()
: :
BApplication(kSignature) BApplication(kSignature)
{ {
be_locale->GetAppCatalog(&fCatalog); be_locale->GetAppCatalog(&fCatalog);
BRect rect(0, 0, 397, 293); BRect rect(0, 0, 397, 293);
MouseWindow *window = new MouseWindow(rect); MouseWindow *window = new MouseWindow(rect);
window->Show(); window->Show();
@@ -36,8 +36,8 @@ MouseApplication::MouseApplication()
void void
MouseApplication::AboutRequested() MouseApplication::AboutRequested()
{ {
(new BAlert("about", TR("...by Andrew Edward McCall"), (new BAlert("about", B_TRANSLATE("...by Andrew Edward McCall"),
TR("Dig Deal")))->Go(); B_TRANSLATE("Dig Deal")))->Go();
} }
src/preferences/mouse/MouseWindow.cpp
+9 -7
View File
@@ -33,8 +33,8 @@
#define TR_CONTEXT "MouseWindow" #define TR_CONTEXT "MouseWindow"
MouseWindow::MouseWindow(BRect _rect) MouseWindow::MouseWindow(BRect _rect)
: :
BWindow(_rect, TR("Mouse"), B_TITLED_WINDOW, BWindow(_rect, B_TRANSLATE("Mouse"), B_TITLED_WINDOW,
B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS | B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS |
B_AUTO_UPDATE_SIZE_LIMITS) B_AUTO_UPDATE_SIZE_LIMITS)
{ {
@@ -44,11 +44,13 @@ MouseWindow::MouseWindow(BRect _rect)
fSettingsBox->AddChild(fSettingsView); fSettingsBox->AddChild(fSettingsView);
// Add the "Default" button // Add the "Default" button
fDefaultsButton = new BButton(TR("Defaults"), new BMessage(kMsgDefaults)); fDefaultsButton = new BButton(B_TRANSLATE("Defaults"),
new BMessage(kMsgDefaults));
fDefaultsButton->SetEnabled(fSettings.IsDefaultable()); fDefaultsButton->SetEnabled(fSettings.IsDefaultable());
// Add the "Revert" button // Add the "Revert" button
fRevertButton = new BButton(TR("Revert"), new BMessage(kMsgRevert)); fRevertButton = new BButton(B_TRANSLATE("Revert"),
new BMessage(kMsgRevert));
fRevertButton->SetEnabled(false); fRevertButton->SetEnabled(false);
SetPulseRate(100000); SetPulseRate(100000);
@@ -91,7 +93,7 @@ bool
MouseWindow::QuitRequested() MouseWindow::QuitRequested()
{ {
fSettings.SetWindowPosition(Frame().LeftTop()); fSettings.SetWindowPosition(Frame().LeftTop());
be_app->PostMessage(B_QUIT_REQUESTED); be_app->PostMessage(B_QUIT_REQUESTED);
return true; return true;
} }
@@ -147,7 +149,7 @@ MouseWindow::MessageReceived(BMessage* message)
} }
break; break;
} }
case kMsgFollowsMouseMode: case kMsgFollowsMouseMode:
{ {
int32 mode; int32 mode;
@@ -160,7 +162,7 @@ MouseWindow::MessageReceived(BMessage* message)
} }
break; break;
} }
case kMsgAcceptFirstClick: case kMsgAcceptFirstClick:
{ {
BHandler *handler; BHandler *handler;
src/preferences/mouse/SettingsView.cpp
+35 -30
View File
@@ -73,53 +73,57 @@ SettingsView::SettingsView(MouseSettings &settings)
{ {
// Add the "Mouse Type" pop up menu // Add the "Mouse Type" pop up menu
fTypeMenu = new BPopUpMenu("unknown"); fTypeMenu = new BPopUpMenu("unknown");
fTypeMenu->AddItem(new BMenuItem(TR("1-Button"), fTypeMenu->AddItem(new BMenuItem(B_TRANSLATE("1-Button"),
new BMessage(kMsgMouseType))); new BMessage(kMsgMouseType)));
fTypeMenu->AddItem(new BMenuItem(TR("2-Button"), fTypeMenu->AddItem(new BMenuItem(B_TRANSLATE("2-Button"),
new BMessage(kMsgMouseType))); new BMessage(kMsgMouseType)));
fTypeMenu->AddItem(new BMenuItem(TR("3-Button"), fTypeMenu->AddItem(new BMenuItem(B_TRANSLATE("3-Button"),
new BMessage(kMsgMouseType))); new BMessage(kMsgMouseType)));
BMenuField *fTypeField = new BMenuField(TR("Mouse type:"), BMenuField *fTypeField = new BMenuField(B_TRANSLATE("Mouse type:"),
fTypeMenu, NULL); fTypeMenu, NULL);
fTypeField->SetAlignment(B_ALIGN_RIGHT); fTypeField->SetAlignment(B_ALIGN_RIGHT);
// Create the "Double-click speed slider... // Create the "Double-click speed slider...
fClickSpeedSlider = new BSlider("double_click_speed", fClickSpeedSlider = new BSlider("double_click_speed",
TR("Double-click speed"), new BMessage(kMsgDoubleClickSpeed), B_TRANSLATE("Double-click speed"), new BMessage(kMsgDoubleClickSpeed),
0, 1000, B_HORIZONTAL); 0, 1000, B_HORIZONTAL);
fClickSpeedSlider->SetHashMarks(B_HASH_MARKS_BOTTOM); fClickSpeedSlider->SetHashMarks(B_HASH_MARKS_BOTTOM);
fClickSpeedSlider->SetHashMarkCount(5); fClickSpeedSlider->SetHashMarkCount(5);
fClickSpeedSlider->SetLimitLabels(TR("Slow"), TR("Fast")); fClickSpeedSlider->SetLimitLabels(B_TRANSLATE("Slow"),
B_TRANSLATE("Fast"));
// Create the "Mouse Speed" slider... // Create the "Mouse Speed" slider...
fMouseSpeedSlider = new BSlider("mouse_speed", TR("Mouse speed"), fMouseSpeedSlider = new BSlider("mouse_speed", B_TRANSLATE("Mouse speed"),
new BMessage(kMsgMouseSpeed), 0, 1000, B_HORIZONTAL); new BMessage(kMsgMouseSpeed), 0, 1000, B_HORIZONTAL);
fMouseSpeedSlider->SetHashMarks(B_HASH_MARKS_BOTTOM); fMouseSpeedSlider->SetHashMarks(B_HASH_MARKS_BOTTOM);
fMouseSpeedSlider->SetHashMarkCount(7); fMouseSpeedSlider->SetHashMarkCount(7);
fMouseSpeedSlider->SetLimitLabels(TR("Slow"), TR("Fast")); fMouseSpeedSlider->SetLimitLabels(B_TRANSLATE("Slow"),
B_TRANSLATE("Fast"));
// Create the "Mouse Acceleration" slider... // Create the "Mouse Acceleration" slider...
fAccelerationSlider = new BSlider("mouse_acceleration", fAccelerationSlider = new BSlider("mouse_acceleration",
TR("Mouse acceleration"), new BMessage(kMsgAccelerationFactor), B_TRANSLATE("Mouse acceleration"),
0, 1000, B_HORIZONTAL); new BMessage(kMsgAccelerationFactor), 0, 1000, B_HORIZONTAL);
fAccelerationSlider->SetHashMarks(B_HASH_MARKS_BOTTOM); fAccelerationSlider->SetHashMarks(B_HASH_MARKS_BOTTOM);
fAccelerationSlider->SetHashMarkCount(5); fAccelerationSlider->SetHashMarkCount(5);
fAccelerationSlider->SetLimitLabels(TR("Slow"), TR("Fast")); fAccelerationSlider->SetLimitLabels(B_TRANSLATE("Slow"),
B_TRANSLATE("Fast"));
// Mouse image... // Mouse image...
fMouseView = new MouseView(fSettings); fMouseView = new MouseView(fSettings);
// Create the "Double-click test area" text box... // Create the "Double-click test area" text box...
BTextControl *fDoubleClick = new BTextControl(NULL, BTextControl *fDoubleClick = new BTextControl(NULL,
TR("Double-click test area"), NULL); B_TRANSLATE("Double-click test area"), NULL);
fDoubleClick->SetAlignment(B_ALIGN_LEFT, B_ALIGN_CENTER); fDoubleClick->SetAlignment(B_ALIGN_LEFT, B_ALIGN_CENTER);
// Add the "Mouse focus mode" pop up menu // Add the "Mouse focus mode" pop up menu
fFocusMenu = new BPopUpMenu(TR("Click to activate")); fFocusMenu = new BPopUpMenu(B_TRANSLATE("Click to activate"));
const char *focusLabels[] = {TR_MARK("Click to activate"), const char *focusLabels[] = {B_TRANSLATE_MARK("Click to activate"),
TR_MARK("Click to focus"),TR_MARK("Focus follows mouse")}; B_TRANSLATE_MARK("Click to focus"),
B_TRANSLATE_MARK("Focus follows mouse")};
const mode_mouse focusModes[] = {B_NORMAL_MOUSE, B_CLICK_TO_FOCUS_MOUSE, const mode_mouse focusModes[] = {B_NORMAL_MOUSE, B_CLICK_TO_FOCUS_MOUSE,
B_FOCUS_FOLLOWS_MOUSE}; B_FOCUS_FOLLOWS_MOUSE};
@@ -127,18 +131,19 @@ SettingsView::SettingsView(MouseSettings &settings)
BMessage *message = new BMessage(kMsgMouseFocusMode); BMessage *message = new BMessage(kMsgMouseFocusMode);
message->AddInt32("mode", focusModes[i]); message->AddInt32("mode", focusModes[i]);
fFocusMenu->AddItem(new BMenuItem(TR(focusLabels[i]), message)); fFocusMenu->AddItem(new BMenuItem(B_TRANSLATE(focusLabels[i]),
message));
} }
BMenuField *fFocusField = new BMenuField(TR("Focus mode:"), BMenuField *fFocusField = new BMenuField(B_TRANSLATE("Focus mode:"),
fFocusMenu, NULL); fFocusMenu, NULL);
fFocusField->SetAlignment(B_ALIGN_RIGHT); fFocusField->SetAlignment(B_ALIGN_RIGHT);
// Add the "Focus follows mouse mode" pop up menu // Add the "Focus follows mouse mode" pop up menu
fFocusFollowsMouseMenu = new BPopUpMenu(TR("Normal")); fFocusFollowsMouseMenu = new BPopUpMenu(B_TRANSLATE("Normal"));
const char *focusFollowsMouseLabels[] = {TR_MARK("Normal"), const char *focusFollowsMouseLabels[] = {B_TRANSLATE_MARK("Normal"),
TR_MARK("Warp"), TR_MARK("Instant warp")}; B_TRANSLATE_MARK("Warp"), B_TRANSLATE_MARK("Instant warp")};
const mode_focus_follows_mouse focusFollowsMouseModes[] = const mode_focus_follows_mouse focusFollowsMouseModes[] =
{B_NORMAL_FOCUS_FOLLOWS_MOUSE, B_WARP_FOCUS_FOLLOWS_MOUSE, {B_NORMAL_FOCUS_FOLLOWS_MOUSE, B_WARP_FOCUS_FOLLOWS_MOUSE,
B_INSTANT_WARP_FOCUS_FOLLOWS_MOUSE}; B_INSTANT_WARP_FOCUS_FOLLOWS_MOUSE};
@@ -149,7 +154,7 @@ SettingsView::SettingsView(MouseSettings &settings)
focusFollowsMouseModes[i]); focusFollowsMouseModes[i]);
fFocusFollowsMouseMenu->AddItem(new BMenuItem( fFocusFollowsMouseMenu->AddItem(new BMenuItem(
TR(focusFollowsMouseLabels[i]), message)); B_TRANSLATE(focusFollowsMouseLabels[i]), message));
} }
BMenuField *fFocusFollowsMouseField = new BMenuField( BMenuField *fFocusFollowsMouseField = new BMenuField(
@@ -157,7 +162,7 @@ SettingsView::SettingsView(MouseSettings &settings)
fFocusFollowsMouseField->SetAlignment(B_ALIGN_RIGHT); fFocusFollowsMouseField->SetAlignment(B_ALIGN_RIGHT);
// Add the "Click-through" check box // Add the "Click-through" check box
fAcceptFirstClickBox = new BCheckBox(TR("Accept first click"), fAcceptFirstClickBox = new BCheckBox(B_TRANSLATE("Accept first click"),
new BMessage(kMsgAcceptFirstClick)); new BMessage(kMsgAcceptFirstClick));
// dividers // dividers
@@ -165,7 +170,7 @@ SettingsView::SettingsView(MouseSettings &settings)
BRect(0, 0, 1, 1), B_EMPTY_STRING, B_FOLLOW_ALL_SIDES, BRect(0, 0, 1, 1), B_EMPTY_STRING, B_FOLLOW_ALL_SIDES,
B_WILL_DRAW | B_FRAME_EVENTS, B_FANCY_BORDER); B_WILL_DRAW | B_FRAME_EVENTS, B_FANCY_BORDER);
hdivider->SetExplicitMaxSize(BSize(1, B_SIZE_UNLIMITED)); hdivider->SetExplicitMaxSize(BSize(1, B_SIZE_UNLIMITED));
BBox* vdivider = new BBox( BBox* vdivider = new BBox(
BRect(0, 0, 1, 1), B_EMPTY_STRING, B_FOLLOW_ALL_SIDES, BRect(0, 0, 1, 1), B_EMPTY_STRING, B_FOLLOW_ALL_SIDES,
B_WILL_DRAW | B_FRAME_EVENTS, B_FANCY_BORDER); B_WILL_DRAW | B_FRAME_EVENTS, B_FANCY_BORDER);
@@ -231,7 +236,7 @@ SettingsView::AttachedToWindow()
} }
void void
SettingsView::SetMouseType(int32 type) SettingsView::SetMouseType(int32 type)
{ {
fMouseView->SetMouseType(type); fMouseView->SetMouseType(type);
@@ -245,7 +250,7 @@ SettingsView::MouseMapUpdated()
} }
void void
SettingsView::UpdateFromSettings() SettingsView::UpdateFromSettings()
{ {
int32 value = int32(fSettings.ClickSpeed() / 1000); int32 value = int32(fSettings.ClickSpeed() / 1000);
@@ -269,7 +274,7 @@ SettingsView::UpdateFromSettings()
item = fFocusMenu->ItemAt(mouse_mode_to_index(fSettings.MouseMode())); item = fFocusMenu->ItemAt(mouse_mode_to_index(fSettings.MouseMode()));
if (item != NULL) if (item != NULL)
item->SetMarked(true); item->SetMarked(true);
item = fFocusFollowsMouseMenu->ItemAt( item = fFocusFollowsMouseMenu->ItemAt(
focus_follows_mouse_mode_to_index(fSettings.FocusFollowsMouseMode())); focus_follows_mouse_mode_to_index(fSettings.FocusFollowsMouseMode()));
if (item != NULL) if (item != NULL)
@@ -277,7 +282,7 @@ SettingsView::UpdateFromSettings()
fFocusFollowsMouseMenu->SetEnabled(fSettings.MouseMode() fFocusFollowsMouseMenu->SetEnabled(fSettings.MouseMode()
== B_FOCUS_FOLLOWS_MOUSE); == B_FOCUS_FOLLOWS_MOUSE);
fAcceptFirstClickBox->SetValue(fSettings.AcceptFirstClick() fAcceptFirstClickBox->SetValue(fSettings.AcceptFirstClick()
? B_CONTROL_ON : B_CONTROL_OFF); ? B_CONTROL_ON : B_CONTROL_OFF);
fAcceptFirstClickBox->SetEnabled(fSettings.MouseMode() fAcceptFirstClickBox->SetEnabled(fSettings.MouseMode()