fix misuse of ... with B_UTF8_ELLIPSIS

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25261 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2008-04-29 21:48:36 +00:00
parent b1d749f8f1
commit e6b421a98e
12 changed files with 19 additions and 19 deletions
@@ -38,7 +38,7 @@ CannaLooper::CannaLooper( CannaMethod *method )
theMenu = new BMenu( B_EMPTY_STRING ); theMenu = new BMenu( B_EMPTY_STRING );
theMenu->SetFont( be_plain_font ); theMenu->SetFont( be_plain_font );
theMenu->AddItem( new BMenuItem( "About CannaIM", new BMessage( B_ABOUT_REQUESTED ))); theMenu->AddItem( new BMenuItem( "About CannaIM" B_UTF8_ELLIPSIS, new BMessage( B_ABOUT_REQUESTED )));
theMenu->AddSeparatorItem(); theMenu->AddSeparatorItem();
theMenu->AddItem( new BMenuItem( "Convert arrow keys", new BMessage( ARROW_KEYS_FLIPPED ))); theMenu->AddItem( new BMenuItem( "Convert arrow keys", new BMessage( ARROW_KEYS_FLIPPED )));
theMenu->AddItem( new BMenuItem( "Reload Init file", new BMessage( RELOAD_INIT_FILE ))); theMenu->AddItem( new BMenuItem( "Reload Init file", new BMessage( RELOAD_INIT_FILE )));
@@ -318,7 +318,7 @@ PageSetupWindow::PageSetupWindow(BMessage *msg, const char *printerName)
panel->AddChild(button); panel->AddChild(button);
// add a "Fonts" button // add a "Fonts" button
button = new BButton(r, NULL, "Fonts…", new BMessage(FONTS_MSG), button = new BButton(r, NULL, "Fonts" B_UTF8_ELLIPSIS, new BMessage(FONTS_MSG),
B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM); B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
button->GetPreferredSize(&w, &h); button->GetPreferredSize(&w, &h);
button->ResizeToPreferred(); button->ResizeToPreferred();
@@ -327,7 +327,7 @@ PageSetupWindow::PageSetupWindow(BMessage *msg, const char *printerName)
// add a "Fonts" button // add a "Fonts" button
BButton* font = button; BButton* font = button;
button = new BButton(r, NULL, "Advanced…", new BMessage(ADVANCED_MSG), button = new BButton(r, NULL, "Advanced" B_UTF8_ELLIPSIS, new BMessage(ADVANCED_MSG),
B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM); B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
button->GetPreferredSize(&w, &h); button->GetPreferredSize(&w, &h);
button->ResizeToPreferred(); button->ResizeToPreferred();
@@ -128,7 +128,7 @@ SlideShowConfigView::SlideShowConfigView(const BRect &frame, const char *name,
// Choose Image Folder button // Choose Image Folder button
pMsg = new BMessage(CHOOSE_DIRECTORY); pMsg = new BMessage(CHOOSE_DIRECTORY);
fChooseFolder = new BButton(BRect(50, 160, 180, 180), fChooseFolder = new BButton(BRect(50, 160, 180, 180),
"Choose Folder", "Choose Image Folder...", pMsg); "Choose Folder", "Choose Image Folder" B_UTF8_ELLIPSIS, pMsg);
AddChild(fChooseFolder); AddChild(fChooseFolder);
// Setup choose folder file panel // Setup choose folder file panel
+1 -1
View File
@@ -238,7 +238,7 @@ SGIView::AttachedToWindow()
} }
// The same with "Info..." button, except redrawing, which isn't needed // The same with "Info..." button, except redrawing, which isn't needed
view = window->FindView("Info…"); view = window->FindView("Info" B_UTF8_ELLIPSIS);
if (view) if (view)
view->SetResizingMode(B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM); view->SetResizingMode(B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
@@ -107,7 +107,7 @@ WonderBrushView::AttachedToWindow()
} }
// The same with "Info..." button, except redrawing, which isn't needed // The same with "Info..." button, except redrawing, which isn't needed
view = window->FindView("Info…"); view = window->FindView("Info" B_UTF8_ELLIPSIS);
if (view) if (view)
view->SetResizingMode(B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM); view->SetResizingMode(B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM);
+1 -1
View File
@@ -173,7 +173,7 @@ int32 ScopeView::Thread()
void ScopeView::DrawLoading() void ScopeView::DrawLoading()
{ {
DrawText("Loading instruments..."); DrawText("Loading instruments" B_UTF8_ELLIPSIS);
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
+2 -2
View File
@@ -53,9 +53,9 @@ ResView::ResView(const BRect &frame, const char *name, const int32 &resize,
} }
BMenu *menu = new BMenu("File"); BMenu *menu = new BMenu("File");
menu->AddItem(new BMenuItem("New…", new BMessage(M_NEW_FILE), 'N')); menu->AddItem(new BMenuItem("New" B_UTF8_ELLIPSIS, new BMessage(M_NEW_FILE), 'N'));
menu->AddSeparatorItem(); menu->AddSeparatorItem();
menu->AddItem(new BMenuItem("Open…", new BMessage(M_OPEN_FILE), 'O')); menu->AddItem(new BMenuItem("Open" B_UTF8_ELLIPSIS, new BMessage(M_OPEN_FILE), 'O'));
menu->AddItem(new BMenuItem("Quit", new BMessage(M_QUIT), 'Q')); menu->AddItem(new BMenuItem("Quit", new BMessage(M_QUIT), 'Q'));
BRect r(Bounds()); BRect r(Bounds());
+1 -1
View File
@@ -55,7 +55,7 @@ BAboutWindow::~BAboutWindow()
void void
BAboutWindow::Show() BAboutWindow::Show()
{ {
BAlert *alert = new BAlert("About...", fText->String(), "Close"); BAlert *alert = new BAlert("About" B_UTF8_ELLIPSIS, fText->String(), "Close");
BTextView *view = alert->TextView(); BTextView *view = alert->TextView();
BFont font; BFont font;
view->SetStylable(true); view->SetStylable(true);
+2 -2
View File
@@ -476,7 +476,7 @@ DevicesWindow::UpdateDeviceInfo()
} }
if (text.Length()>70) { if (text.Length()>70) {
text.Truncate(70); text.Truncate(70);
text += "..."; text += B_UTF8_ELLIPSIS;
} }
stvIORanges->SetText(text.String()); stvIORanges->SetText(text.String());
} }
@@ -496,7 +496,7 @@ DevicesWindow::UpdateDeviceInfo()
} }
if (text.Length()>70) { if (text.Length()>70) {
text.Truncate(70); text.Truncate(70);
text += "..."; text += B_UTF8_ELLIPSIS;
} }
stvMemoryRanges->SetText(text.String()); stvMemoryRanges->SetText(text.String());
} }
+5 -5
View File
@@ -278,7 +278,7 @@ MediaWindow::InitMedia(bool first)
return B_ERROR; return B_ERROR;
fAlert = new MediaAlert(BRect(0, 0, 300, 60), fAlert = new MediaAlert(BRect(0, 0, 300, 60),
"restart_alert", "Restarting Media Services\nStarting Media Server...\n"); "restart_alert", "Restarting Media Services\nStarting Media Server" B_UTF8_ELLIPSIS "\n");
fAlert->Show(); fAlert->Show();
Show(); Show();
@@ -295,7 +295,7 @@ MediaWindow::InitMedia(bool first)
if ((!first || (first && err) ) && fAlert) { if ((!first || (first && err) ) && fAlert) {
BAutolock locker(fAlert); BAutolock locker(fAlert);
if (locker.IsLocked()) if (locker.IsLocked())
fAlert->TextView()->SetText("Ready For Use..."); fAlert->TextView()->SetText("Ready For Use" B_UTF8_ELLIPSIS);
} }
void *listItem; void *listItem;
@@ -653,7 +653,7 @@ MediaWindow::MessageReceived (BMessage *message)
&& (strcmp(mimeSig, "application/x-vnd.Be.addon-host")==0 && (strcmp(mimeSig, "application/x-vnd.Be.addon-host")==0
|| strcmp(mimeSig, "application/x-vnd.Be.media-server")==0)) { || strcmp(mimeSig, "application/x-vnd.Be.media-server")==0)) {
fAlert->Lock(); fAlert->Lock();
fAlert->TextView()->SetText("Starting Media Server..."); fAlert->TextView()->SetText("Starting Media Server" B_UTF8_ELLIPSIS);
fAlert->Unlock(); fAlert->Unlock();
} }
} }
@@ -693,7 +693,7 @@ MediaWindow::RestartMediaServices(void *data)
{ {
BAutolock locker(window->fAlert); BAutolock locker(window->fAlert);
if (locker.IsLocked()) if (locker.IsLocked())
window->fAlert->TextView()->SetText("Starting Media Server..."); window->fAlert->TextView()->SetText("Starting Media Server" B_UTF8_ELLIPSIS);
} }
launch_media_server(); launch_media_server();
@@ -708,7 +708,7 @@ MediaWindow::UpdateProgress(int stage, const char * message, void * cookie)
char *string = "Unknown stage"; char *string = "Unknown stage";
switch (stage) { switch (stage) {
case 10: case 10:
string = "Stopping Media Server..."; string = "Stopping Media Server" B_UTF8_ELLIPSIS;
break; break;
case 20: case 20:
string = "Telling media_addon_server to quit."; string = "Telling media_addon_server to quit.";
+1 -1
View File
@@ -635,7 +635,7 @@ ScreenWindow::_UpdateRefreshControl()
item->SetMarked(true); item->SetMarked(true);
// "Other…" items only contains a refresh rate when active // "Other…" items only contains a refresh rate when active
fOtherRefresh->SetLabel("Other…"); fOtherRefresh->SetLabel("Other" B_UTF8_ELLIPSIS);
return; return;
} }
+1 -1
View File
@@ -124,7 +124,7 @@ HWindow::InitGUI()
menu->AddSeparatorItem(); menu->AddSeparatorItem();
menu->AddItem(new BMenuItem("<none>", new BMessage(M_NONE_MESSAGE))); menu->AddItem(new BMenuItem("<none>", new BMessage(M_NONE_MESSAGE)));
menu->AddItem(new BMenuItem("Other…", new BMessage(M_OTHER_MESSAGE))); menu->AddItem(new BMenuItem("Other" B_UTF8_ELLIPSIS, new BMessage(M_OTHER_MESSAGE)));
BMenuField *menuField = new BMenuField(rect BMenuField *menuField = new BMenuField(rect
,"filemenu" ,"filemenu"
,"Sound File:" ,"Sound File:"