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@36695 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2010-05-07 00:25:49 +00:00
parent cd59396f27
commit dd4b6c23f6
3 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/sounds/HApp.cpp
+4 -4
View File
@@ -30,7 +30,7 @@ HApp::HApp()
BRect rect;
rect.Set(200, 150, 590, 570);
HWindow* window = new HWindow(rect, TR("Sounds"));
HWindow* window = new HWindow(rect, B_TRANSLATE("Sounds"));
window->Show();
}
@@ -43,14 +43,14 @@ HApp::~HApp()
void
HApp::AboutRequested()
{
BAlert* alert = new BAlert(TR("About Sounds"),
TR("Sounds\n"
BAlert* alert = new BAlert(B_TRANSLATE("About Sounds"),
B_TRANSLATE("Sounds\n"
" Brought to you by :\n"
"\tOliver Ruiz Dorantes\n"
"\tJérôme DUVAL.\n"
" Original work from Atsushi Takamatsu.\n"
"Copyright ©2003-2006 Haiku"),
TR("OK"));
B_TRANSLATE("OK"));
alert->Go();
}
src/preferences/sounds/HEventList.cpp
+10 -10
View File
@@ -43,7 +43,7 @@ HEventRow::SetPath(const char* _path)
{
fPath = _path;
BPath path(_path);
SetField(new BStringField(_path ? path.Leaf() : TR("<none>")),
SetField(new BStringField(_path ? path.Leaf() : B_TRANSLATE("<none>")),
kSoundColumn);
}
@@ -60,10 +60,10 @@ HEventList::HEventList(const char* name)
BColumnListView(name, 0, B_PLAIN_BORDER, true),
fType(NULL)
{
AddColumn(new BStringColumn(TR("Event"), 150, 50, 500, B_TRUNCATE_MIDDLE),
kEventColumn);
AddColumn(new BStringColumn(TR("Sound"), 150, 50, 500, B_TRUNCATE_END),
kSoundColumn);
AddColumn(new BStringColumn(B_TRANSLATE("Event"), 150, 50, 500,
B_TRUNCATE_MIDDLE), kEventColumn);
AddColumn(new BStringColumn(B_TRANSLATE("Sound"), 150, 50, 500,
B_TRUNCATE_END), kSoundColumn);
}
@@ -82,7 +82,7 @@ HEventList::SetType(const char* type)
mfiles.RewindRefs(type);
delete fType;
fType = strdup(type);
BString name;
entry_ref ref;
while (mfiles.GetNextRef(&name,&ref) == B_OK) {
@@ -111,12 +111,12 @@ void
HEventList::SelectionChanged()
{
BColumnListView::SelectionChanged();
HEventRow* row = (HEventRow*)CurrentSelection();
if (row != NULL) {
entry_ref ref;
BMediaFiles().GetRefFor(fType, row->Name(), &ref);
BPath path(&ref);
if (path.InitCheck() == B_OK || ref.name == NULL
|| strcmp(ref.name, "") == 0) {
@@ -126,7 +126,7 @@ HEventList::SelectionChanged()
printf("name %s\n", ref.name);
BMediaFiles().RemoveRefFor(fType, row->Name(), ref);
BAlert* alert = new BAlert("alert",
TR("No such file or directory"), TR("OK"));
B_TRANSLATE("No such file or directory"), B_TRANSLATE("OK"));
alert->Go();
return;
}
@@ -147,7 +147,7 @@ HEventList::SetPath(const char* path)
BEntry entry(path);
entry.GetRef(&ref);
BMediaFiles().SetRefFor(fType, row->Name(), ref);
row->SetPath(path);
UpdateRow(row);
}
src/preferences/sounds/HWindow.cpp
+24 -20
View File
@@ -53,10 +53,10 @@ HWindow::HWindow(BRect rect, const char* name)
fFilePanel = new BFilePanel();
fFilePanel->SetTarget(this);
BPath path;
BMessage msg;
if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) == B_OK) {
path.Append(kSettingsFile);
BFile file(path.Path(), B_READ_ONLY);
@@ -74,7 +74,7 @@ HWindow::~HWindow()
{
delete fFilePanel;
delete fPlayer;
BPath path;
BMessage msg;
if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) == B_OK) {
@@ -104,20 +104,23 @@ HWindow::InitGUI()
menu->SetRadioMode(true);
menu->SetLabelFromMarked(true);
menu->AddSeparatorItem();
menu->AddItem(new BMenuItem(TR("<none>"), new BMessage(M_NONE_MESSAGE)));
menu->AddItem(new BMenuItem(TR("Other" B_UTF8_ELLIPSIS),
menu->AddItem(new BMenuItem(B_TRANSLATE("<none>"),
new BMessage(M_NONE_MESSAGE)));
menu->AddItem(new BMenuItem(B_TRANSLATE("Other" B_UTF8_ELLIPSIS),
new BMessage(M_OTHER_MESSAGE)));
BMenuField* menuField = new BMenuField("filemenu", TR("Sound File:"), menu);
menuField->SetDivider(menuField->StringWidth(TR("Sound File:")) + 10);
BMenuField* menuField = new BMenuField("filemenu",
B_TRANSLATE("Sound File:"), menu);
menuField->SetDivider(menuField->StringWidth(B_TRANSLATE("Sound File:"))
+ 10);
BButton* stopbutton = new BButton("stop", TR("Stop"),
BButton* stopbutton = new BButton("stop", B_TRANSLATE("Stop"),
new BMessage(M_STOP_MESSAGE));
stopbutton->SetEnabled(false);
BButton* playbutton = new BButton("play", TR("Play"),
BButton* playbutton = new BButton("play", B_TRANSLATE("Play"),
new BMessage(M_PLAY_MESSAGE));
playbutton->SetEnabled(false);
view->SetLayout(new BGroupLayout(B_HORIZONTAL));
view->AddChild(BGroupLayoutBuilder(B_VERTICAL, 15)
.AddGroup(B_HORIZONTAL)
@@ -145,7 +148,7 @@ HWindow::InitGUI()
// setup file menu
SetupMenuField();
menu->FindItem(TR("<none>"))->SetMarked(true);
menu->FindItem(B_TRANSLATE("<none>"))->SetMarked(true);
}
@@ -165,7 +168,7 @@ HWindow::MessageReceived(BMessage* message)
if (row != NULL) {
BPath path(row->Path());
if (path.InitCheck() != B_OK) {
BMenuItem* item = menu->FindItem(TR("<none>"));
BMenuItem* item = menu->FindItem(B_TRANSLATE("<none>"));
if (item != NULL)
item->SetMarked(true);
} else {
@@ -187,7 +190,7 @@ HWindow::MessageReceived(BMessage* message)
BMenuField* menufield
= dynamic_cast<BMenuField*>(FindView("filemenu"));
if (menufield == NULL)
return;
return;
BMenu* menu = menufield->Menu();
// check audio file
@@ -201,9 +204,10 @@ HWindow::MessageReceived(BMessage* message)
if (superType.Type() == NULL
|| strcmp(superType.Type(), "audio") != 0) {
beep();
BAlert* alert = new BAlert("", TR("This is not an audio "
"file."), TR("OK"), NULL, NULL, B_WIDTH_AS_USUAL,
B_STOP_ALERT);
BAlert* alert = new BAlert("",
B_TRANSLATE("This is not an audio file."),
B_TRANSLATE("OK"), NULL, NULL,
B_WIDTH_AS_USUAL, B_STOP_ALERT);
alert->Go();
break;
}
@@ -264,7 +268,7 @@ HWindow::MessageReceived(BMessage* message)
if (message->FindString("path", &path) == B_OK) {
BPath path(path);
if (path.InitCheck() != B_OK) {
BMenuItem* item = menu->FindItem(TR("<none>"));
BMenuItem* item = menu->FindItem(B_TRANSLATE("<none>"));
if (item != NULL)
item->SetMarked(true);
} else {
@@ -326,7 +330,7 @@ HWindow::SetupMenuField()
BDirectory dir;
BEntry entry;
BPath item_path;
status_t err = find_directory(B_BEOS_SOUNDS_DIRECTORY, &path);
if (err == B_OK)
err = dir.SetTo(path.Path());
@@ -370,7 +374,7 @@ HWindow::SetupMenuField()
err = find_directory(B_COMMON_SOUNDS_DIRECTORY, &path);
if (err == B_OK)
err = dir.SetTo(path.Path());
err = dir.SetTo(path.Path());
while (err == B_OK) {
err = dir.GetNextEntry(&entry, true);
if (entry.InitCheck() != B_NO_ERROR)
@@ -439,7 +443,7 @@ bool
HWindow::QuitRequested()
{
fFrame = Frame();
fEventList->RemoveAll();
be_app->PostMessage(B_QUIT_REQUESTED);
return true;