Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36681 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia 2010-05-06 22:59:37 +00:00
parent c31c1fef4f
commit ea8a1f5804
3 changed files with 48 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/preferences/backgrounds/Backgrounds.cpp
View File

@ -91,7 +91,7 @@ BackgroundsApplication::RefsReceived(BMessage* message)
BackgroundsWindow::BackgroundsWindow()
:
BWindow(BRect(0, 0, 0, 0), TR("Backgrounds"), B_TITLED_WINDOW,
BWindow(BRect(0, 0, 0, 0), B_TRANSLATE("Backgrounds"), B_TITLED_WINDOW,
B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS,
B_ALL_WORKSPACES)
{

85
src/preferences/backgrounds/BackgroundsView.cpp
View File

@ -110,8 +110,8 @@ BackgroundsView::BackgroundsView()
SetBorder(B_NO_BORDER);
fPreview = new BBox("preview");
fPreview->SetLabel(TR("Preview"));
fPreview->SetLabel(B_TRANSLATE("Preview"));
fPreView = new PreView();
fTopLeft = new FramePart(FRAME_TOP_LEFT);
@ -123,9 +123,9 @@ BackgroundsView::BackgroundsView()
fBottom = new FramePart(FRAME_BOTTOM);
fBottomRight = new FramePart(FRAME_BOTTOM_RIGHT);
fXPlacementText = new BTextControl(TR("X:"), NULL,
fXPlacementText = new BTextControl(B_TRANSLATE("X:"), NULL,
new BMessage(kMsgImagePlacement));
fYPlacementText = new BTextControl(TR("Y:"), NULL,
fYPlacementText = new BTextControl(B_TRANSLATE("Y:"), NULL,
new BMessage(kMsgImagePlacement));
fXPlacementText->TextView()->SetMaxBytes(5);
@ -165,23 +165,26 @@ BackgroundsView::BackgroundsView()
.End()
.AddGlue()
.View();
fPreview->AddChild(view);
BBox* rightbox = new BBox("rightbox");
fWorkspaceMenu = new BPopUpMenu(TR("pick one"));
fWorkspaceMenu->AddItem(new BMenuItem(TR("All workspaces"),
fWorkspaceMenu = new BPopUpMenu(B_TRANSLATE("pick one"));
fWorkspaceMenu->AddItem(new BMenuItem(B_TRANSLATE("All workspaces"),
new BMessage(kMsgAllWorkspaces)));
BMenuItem* menuItem;
fWorkspaceMenu->AddItem(menuItem = new BMenuItem(TR("Current workspace"),
fWorkspaceMenu->AddItem(menuItem = new BMenuItem(
B_TRANSLATE("Current workspace"),
new BMessage(kMsgCurrentWorkspace)));
menuItem->SetMarked(true);
fLastWorkspaceIndex = fWorkspaceMenu->IndexOf(fWorkspaceMenu->FindMarked());
fLastWorkspaceIndex =
fWorkspaceMenu->IndexOf(fWorkspaceMenu->FindMarked());
fWorkspaceMenu->AddSeparatorItem();
fWorkspaceMenu->AddItem(new BMenuItem(TR("Default folder"),
fWorkspaceMenu->AddItem(new BMenuItem(B_TRANSLATE("Default folder"),
new BMessage(kMsgDefaultFolder)));
fWorkspaceMenu->AddItem(new BMenuItem(TR("Other folder" B_UTF8_ELLIPSIS),
fWorkspaceMenu->AddItem(new BMenuItem(
B_TRANSLATE("Other folder" B_UTF8_ELLIPSIS),
new BMessage(kMsgOtherFolder)));
BMenuField* workspaceMenuField = new BMenuField(BRect(0, 0, 130, 18),
@ -189,39 +192,41 @@ BackgroundsView::BackgroundsView()
workspaceMenuField->ResizeToPreferred();
rightbox->SetLabel(workspaceMenuField);
fImageMenu = new BPopUpMenu(TR("pick one"));
fImageMenu->AddItem(new BGImageMenuItem(TR("None"), -1,
fImageMenu = new BPopUpMenu(B_TRANSLATE("pick one"));
fImageMenu->AddItem(new BGImageMenuItem(B_TRANSLATE("None"), -1,
new BMessage(kMsgNoImage)));
fImageMenu->AddSeparatorItem();
fImageMenu->AddItem(new BMenuItem(TR("Other" B_UTF8_ELLIPSIS),
fImageMenu->AddItem(new BMenuItem(B_TRANSLATE("Other" B_UTF8_ELLIPSIS),
new BMessage(kMsgOtherImage)));
BMenuField* imageMenuField = new BMenuField(NULL, fImageMenu);
imageMenuField->SetAlignment(B_ALIGN_RIGHT);
imageMenuField->ResizeToPreferred();
fPlacementMenu = new BPopUpMenu(TR("pick one"));
fPlacementMenu->AddItem(new BMenuItem(TR("Manual"),
fPlacementMenu = new BPopUpMenu(B_TRANSLATE("pick one"));
fPlacementMenu->AddItem(new BMenuItem(B_TRANSLATE("Manual"),
new BMessage(kMsgManualPlacement)));
fPlacementMenu->AddItem(new BMenuItem(TR("Center"),
fPlacementMenu->AddItem(new BMenuItem(B_TRANSLATE("Center"),
new BMessage(kMsgCenterPlacement)));
fPlacementMenu->AddItem(new BMenuItem(TR("Scale to fit"),
fPlacementMenu->AddItem(new BMenuItem(B_TRANSLATE("Scale to fit"),
new BMessage(kMsgScalePlacement)));
fPlacementMenu->AddItem(new BMenuItem(TR("Tile"),
fPlacementMenu->AddItem(new BMenuItem(B_TRANSLATE("Tile"),
new BMessage(kMsgTilePlacement)));
BMenuField* placementMenuField = new BMenuField(NULL, fPlacementMenu);
placementMenuField->SetAlignment(B_ALIGN_RIGHT);
fIconLabelOutline = new BCheckBox(TR("Icon label outline"),
fIconLabelOutline = new BCheckBox(B_TRANSLATE("Icon label outline"),
new BMessage(kMsgIconLabelOutline));
fIconLabelOutline->SetValue(B_CONTROL_OFF);
fPicker = new BColorControl(BPoint(0, 0), B_CELLS_32x8, 7.0, "Picker",
new BMessage(kMsgUpdateColor));
BStringView* imageStringView = new BStringView(NULL, TR("Image:"));
BStringView* placementStringView = new BStringView(NULL, TR("Placement:"));
BStringView* imageStringView =
new BStringView(NULL, B_TRANSLATE("Image:"));
BStringView* placementStringView =
new BStringView(NULL, B_TRANSLATE("Placement:"));
imageStringView->SetExplicitAlignment(BAlignment(B_ALIGN_RIGHT,
B_ALIGN_NO_VERTICAL));
@ -243,11 +248,13 @@ BackgroundsView::BackgroundsView()
.SetInsets(10, 10, 10, 10)
.End()
.View();
rightbox->AddChild(view);
fRevert = new BButton(TR("Revert"), new BMessage(kMsgRevertSettings));
fApply = new BButton(TR("Apply"), new BMessage(kMsgApplySettings));
fRevert = new BButton(B_TRANSLATE("Revert"),
new BMessage(kMsgRevertSettings));
fApply = new BButton(B_TRANSLATE("Apply"),
new BMessage(kMsgApplySettings));
fRevert->SetExplicitAlignment(BAlignment(B_ALIGN_LEFT,
B_ALIGN_NO_VERTICAL));
@ -304,11 +311,11 @@ BackgroundsView::AllAttached()
BMessenger messenger(this);
fPanel = new ImageFilePanel(B_OPEN_PANEL, &messenger, &ref,
B_FILE_NODE, false, NULL, new CustomRefFilter(true));
fPanel->SetButtonLabel(B_DEFAULT_BUTTON, TR("Select"));
fPanel->SetButtonLabel(B_DEFAULT_BUTTON, B_TRANSLATE("Select"));
fFolderPanel = new BFilePanel(B_OPEN_PANEL, &messenger, NULL,
B_DIRECTORY_NODE, false, NULL, new CustomRefFilter(false));
fFolderPanel->SetButtonLabel(B_DEFAULT_BUTTON, TR("Select"));
fFolderPanel->SetButtonLabel(B_DEFAULT_BUTTON, B_TRANSLATE("Select"));
_LoadSettings();
_LoadDesktopFolder();
@ -369,7 +376,7 @@ BackgroundsView::MessageReceived(BMessage* msg)
case kMsgCurrentWorkspace:
case kMsgAllWorkspaces:
fImageMenu->FindItem(kMsgNoImage)->SetLabel(TR("None"));
fImageMenu->FindItem(kMsgNoImage)->SetLabel(B_TRANSLATE("None"));
fLastWorkspaceIndex = fWorkspaceMenu->IndexOf(
fWorkspaceMenu->FindMarked());
if (fCurrent && fCurrent->IsDesktop()) {
@ -381,7 +388,7 @@ BackgroundsView::MessageReceived(BMessage* msg)
break;
case kMsgDefaultFolder:
fImageMenu->FindItem(kMsgNoImage)->SetLabel(TR("None"));
fImageMenu->FindItem(kMsgNoImage)->SetLabel(B_TRANSLATE("None"));
fLastWorkspaceIndex = fWorkspaceMenu->IndexOf(
fWorkspaceMenu->FindMarked());
_SetDesktop(false);
@ -423,7 +430,7 @@ BackgroundsView::MessageReceived(BMessage* msg)
break;
case kMsgFolderSelected:
fImageMenu->FindItem(kMsgNoImage)->SetLabel(TR("Default"));
fImageMenu->FindItem(kMsgNoImage)->SetLabel(B_TRANSLATE("Default"));
fLastWorkspaceIndex = fWorkspaceMenu->IndexOf(
fWorkspaceMenu->FindMarked());
_SetDesktop(false);
@ -524,9 +531,9 @@ BackgroundsView::_UpdateWithCurrent(void)
->SetEnabled(fCurrent->IsDesktop());
if (fWorkspaceMenu->IndexOf(fWorkspaceMenu->FindMarked()) > 5)
fImageMenu->FindItem(kMsgNoImage)->SetLabel(TR("Default"));
fImageMenu->FindItem(kMsgNoImage)->SetLabel(B_TRANSLATE("Default"));
else
fImageMenu->FindItem(kMsgNoImage)->SetLabel(TR("None"));
fImageMenu->FindItem(kMsgNoImage)->SetLabel(B_TRANSLATE("None"));
for (int32 i = fImageMenu->CountItems() - 5; i >= 0; i--) {
fImageMenu->RemoveItem(2);
@ -548,7 +555,7 @@ BackgroundsView::_UpdateWithCurrent(void)
} else {
fIconLabelOutline->SetValue(fCurrentInfo->fTextWidgetLabelOutline
? B_CONTROL_ON : B_CONTROL_OFF);
fLastImageIndex = fCurrentInfo->fImageIndex;
_FindImageItem(fLastImageIndex)->SetMarked(true);
@ -572,7 +579,7 @@ BackgroundsView::_UpdateWithCurrent(void)
cmd = kMsgTilePlacement;
break;
}
if (cmd != 0)
fPlacementMenu->FindItem(cmd)->SetMarked(true);
@ -647,7 +654,7 @@ BackgroundsView::_Save()
}
} else {
fCurrent->RemoveAll();
fCurrentInfo = new BackgroundImage::BackgroundImageInfo(
B_ALL_WORKSPACES, fLastImageIndex, mode, offset,
textWidgetLabelOutline, fCurrent->GetShowingImageSet(),
@ -847,7 +854,7 @@ BackgroundsView::_LoadSettings()
path.SetTo(string.String());
int32 i = _AddPath(path);
BString s;
s << TR("Folder: ") << path.Leaf();
s << B_TRANSLATE("Folder: ") << path.Leaf();
BMenuItem* item = new BMenuItem(s.String(),
new BMessage(kMsgFolderSelected));
fWorkspaceMenu->AddItem(item, -i - 1 + 6);
@ -1052,7 +1059,7 @@ BackgroundsView::RefsReceived(BMessage* msg)
if (fWorkspaceMenu->CountItems() <= 5)
fWorkspaceMenu->AddSeparatorItem();
BString s;
s << TR("Folder: ") << path.Leaf();
s << B_TRANSLATE("Folder: ") << path.Leaf();
item = new BMenuItem(s.String(),
new BMessage(kMsgFolderSelected));
fWorkspaceMenu->AddItem(item, -index - 1 + 6);
@ -1178,7 +1185,7 @@ PreView::PreView()
fMoveHandCursor(kHandCursorData)
{
float aspectRatio = BScreen().Frame().Width() / BScreen().Frame().Height();
float previewWidth = 120.0f;
float previewWidth = 120.0f;
float previewHeight = ceil(previewWidth / aspectRatio);
ResizeTo(previewWidth, previewHeight);

2
src/preferences/backgrounds/ImageFilePanel.cpp
View File

@ -131,7 +131,7 @@ ImageFilePanel::SelectionChanged()
B_FOLLOW_LEFT | B_FOLLOW_TOP, 0);
BString resolution;
resolution << TR("Resolution: ")
resolution << B_TRANSLATE("Resolution: ")
<< (int)(bitmap->Bounds().Width() + 1)
<< "x" << (int)(bitmap->Bounds().Height() + 1);
fResolutionView->SetText(resolution.String());