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

Renamed a few strings as discussed in #7327 by applying xray's patch with a few additions. Closing #7327.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41207 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Joachim Seemer
2011-04-09 12:21:04 +00:00
parent e9e50497fc
commit fe02d18b1d
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/screensaver/ScreenSaverWindow.cpp
+9 -9
View File
@@ -291,7 +291,7 @@ ModulesView::ModulesView(BRect rect, const char* name,
rect.left = fAddButton->Frame().right + 8; rect.left = fAddButton->Frame().right + 8;
AddChild(fSettingsBox = new BBox(rect, "SettingsBox", B_FOLLOW_ALL, AddChild(fSettingsBox = new BBox(rect, "SettingsBox", B_FOLLOW_ALL,
B_WILL_DRAW)); B_WILL_DRAW));
fSettingsBox->SetLabel(B_TRANSLATE("Module settings")); fSettingsBox->SetLabel(B_TRANSLATE("Screensaver settings"));
PopulateScreenSaverList(); PopulateScreenSaverList();
fFilePanel = new BFilePanel(); fFilePanel = new BFilePanel();
@@ -634,7 +634,7 @@ ScreenSaverWindow::ScreenSaverWindow()
// Create the controls inside the tabs // Create the controls inside the tabs
rect = fTabView->ContainerView()->Bounds(); rect = fTabView->ContainerView()->Bounds();
_SetupFadeTab(rect); _SetupFadeTab(rect);
fModulesView = new ModulesView(rect, B_TRANSLATE("Modules"), fSettings); fModulesView = new ModulesView(rect, B_TRANSLATE("Screensavers"), fSettings);
fTabView->AddTab(fFadeView); fTabView->AddTab(fFadeView);
fTabView->AddTab(fModulesView); fTabView->AddTab(fModulesView);
@@ -677,11 +677,11 @@ ScreenSaverWindow::~ScreenSaverWindow()
} }
//! Create the controls for the fade tab //! Create the controls for the "General" tab
void void
ScreenSaverWindow::_SetupFadeTab(BRect rect) ScreenSaverWindow::_SetupFadeTab(BRect rect)
{ {
fFadeView = new FadeView(rect, B_TRANSLATE("Fade"), fSettings); fFadeView = new FadeView(rect, B_TRANSLATE("General"), fSettings);
float labelWidth = be_plain_font->StringWidth(B_TRANSLATE("Turn off " float labelWidth = be_plain_font->StringWidth(B_TRANSLATE("Turn off "
"screen")) + 20.0f; "screen")) + 20.0f;
@@ -695,7 +695,7 @@ ScreenSaverWindow::_SetupFadeTab(BRect rect)
+ floorf(textHeight / 2); + floorf(textHeight / 2);
fEnableCheckBox = new BCheckBox(BRect(0, 0, 1, 1), "EnableCheckBox", fEnableCheckBox = new BCheckBox(BRect(0, 0, 1, 1), "EnableCheckBox",
B_TRANSLATE("Enable screen saver"), B_TRANSLATE("Enable screensaver"),
new BMessage(kMsgEnableScreenSaverBox)); new BMessage(kMsgEnableScreenSaverBox));
fEnableCheckBox->ResizeToPreferred(); fEnableCheckBox->ResizeToPreferred();
@@ -709,7 +709,7 @@ ScreenSaverWindow::_SetupFadeTab(BRect rect)
rect.top = fEnableCheckBox->Bounds().bottom + 8.0f; rect.top = fEnableCheckBox->Bounds().bottom + 8.0f;
rect.right = box->Bounds().right - 8; rect.right = box->Bounds().right - 8;
BStringView* stringView = new BStringView(rect, NULL, BStringView* stringView = new BStringView(rect, NULL,
B_TRANSLATE("Run module")); B_TRANSLATE("Start screensaver"));
stringView->ResizeToPreferred(); stringView->ResizeToPreferred();
box->AddChild(stringView); box->AddChild(stringView);
@@ -913,7 +913,7 @@ ScreenSaverWindow::SetMinimalSizeLimit(float width, float height)
void void
ScreenSaverWindow::MessageReceived(BMessage *msg) ScreenSaverWindow::MessageReceived(BMessage *msg)
{ {
// "Fade" tab, slider updates // "Settings" tab, slider updates
switch (msg->what) { switch (msg->what) {
case kMsgRunSliderChanged: case kMsgRunSliderChanged:
@@ -939,7 +939,7 @@ ScreenSaverWindow::MessageReceived(BMessage *msg)
} }
switch (msg->what) { switch (msg->what) {
// "Fade" tab // "General" tab
case kMsgTurnOffCheckBox: case kMsgTurnOffCheckBox:
fTurnOffSlider->SetEnabled( fTurnOffSlider->SetEnabled(
@@ -961,7 +961,7 @@ ScreenSaverWindow::MessageReceived(BMessage *msg)
fPasswordWindow->Show(); fPasswordWindow->Show();
break; break;
// "Modules" tab // "Screensavers" tab
case kMsgUpdateList: case kMsgUpdateList:
fModulesView->PopulateScreenSaverList(); fModulesView->PopulateScreenSaverList();