diff --git a/src/add-ons/input_server/methods/canna/CannaLooper.cpp b/src/add-ons/input_server/methods/canna/CannaLooper.cpp index 4a2d36e480..8bf1b3d780 100644 --- a/src/add-ons/input_server/methods/canna/CannaLooper.cpp +++ b/src/add-ons/input_server/methods/canna/CannaLooper.cpp @@ -38,7 +38,7 @@ CannaLooper::CannaLooper( CannaMethod *method ) theMenu = new BMenu( B_EMPTY_STRING ); 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->AddItem( new BMenuItem( "Convert arrow keys", new BMessage( ARROW_KEYS_FLIPPED ))); theMenu->AddItem( new BMenuItem( "Reload Init file", new BMessage( RELOAD_INIT_FILE ))); diff --git a/src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp b/src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp index 5c074a77e7..de41ab951b 100644 --- a/src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp +++ b/src/add-ons/print/drivers/pdf/source/PageSetupWindow.cpp @@ -318,7 +318,7 @@ PageSetupWindow::PageSetupWindow(BMessage *msg, const char *printerName) panel->AddChild(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); button->GetPreferredSize(&w, &h); button->ResizeToPreferred(); @@ -327,7 +327,7 @@ PageSetupWindow::PageSetupWindow(BMessage *msg, const char *printerName) // add a "Fonts" 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); button->GetPreferredSize(&w, &h); button->ResizeToPreferred(); diff --git a/src/add-ons/screen_savers/slideshowsaver/SlideShowConfigView.cpp b/src/add-ons/screen_savers/slideshowsaver/SlideShowConfigView.cpp index a405edab02..650ee27917 100644 --- a/src/add-ons/screen_savers/slideshowsaver/SlideShowConfigView.cpp +++ b/src/add-ons/screen_savers/slideshowsaver/SlideShowConfigView.cpp @@ -128,7 +128,7 @@ SlideShowConfigView::SlideShowConfigView(const BRect &frame, const char *name, // Choose Image Folder button pMsg = new BMessage(CHOOSE_DIRECTORY); 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); // Setup choose folder file panel diff --git a/src/add-ons/translators/sgi/SGIView.cpp b/src/add-ons/translators/sgi/SGIView.cpp index 512f246aee..75da8dfd20 100644 --- a/src/add-ons/translators/sgi/SGIView.cpp +++ b/src/add-ons/translators/sgi/SGIView.cpp @@ -238,7 +238,7 @@ SGIView::AttachedToWindow() } // The same with "Info..." button, except redrawing, which isn't needed - view = window->FindView("Info…"); + view = window->FindView("Info" B_UTF8_ELLIPSIS); if (view) view->SetResizingMode(B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM); diff --git a/src/add-ons/translators/wonderbrush/WonderBrushView.cpp b/src/add-ons/translators/wonderbrush/WonderBrushView.cpp index df96c025f0..097dc6efe7 100644 --- a/src/add-ons/translators/wonderbrush/WonderBrushView.cpp +++ b/src/add-ons/translators/wonderbrush/WonderBrushView.cpp @@ -107,7 +107,7 @@ WonderBrushView::AttachedToWindow() } // The same with "Info..." button, except redrawing, which isn't needed - view = window->FindView("Info…"); + view = window->FindView("Info" B_UTF8_ELLIPSIS); if (view) view->SetResizingMode(B_FOLLOW_RIGHT | B_FOLLOW_BOTTOM); diff --git a/src/apps/midiplayer/ScopeView.cpp b/src/apps/midiplayer/ScopeView.cpp index 47f9399f1d..9eb809c24d 100644 --- a/src/apps/midiplayer/ScopeView.cpp +++ b/src/apps/midiplayer/ScopeView.cpp @@ -173,7 +173,7 @@ int32 ScopeView::Thread() void ScopeView::DrawLoading() { - DrawText("Loading instruments..."); + DrawText("Loading instruments" B_UTF8_ELLIPSIS); } //------------------------------------------------------------------------------ diff --git a/src/apps/resedit/ResView.cpp b/src/apps/resedit/ResView.cpp index 379ba31b21..53e82ff431 100644 --- a/src/apps/resedit/ResView.cpp +++ b/src/apps/resedit/ResView.cpp @@ -53,9 +53,9 @@ ResView::ResView(const BRect &frame, const char *name, const int32 &resize, } 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->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')); BRect r(Bounds()); diff --git a/src/kits/shared/AboutWindow.cpp b/src/kits/shared/AboutWindow.cpp index 934063c561..6cb9fcd84f 100644 --- a/src/kits/shared/AboutWindow.cpp +++ b/src/kits/shared/AboutWindow.cpp @@ -55,7 +55,7 @@ BAboutWindow::~BAboutWindow() void 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(); BFont font; view->SetStylable(true); diff --git a/src/preferences/devices/DevicesWindow.cpp b/src/preferences/devices/DevicesWindow.cpp index fd659a259f..a4c5e68882 100644 --- a/src/preferences/devices/DevicesWindow.cpp +++ b/src/preferences/devices/DevicesWindow.cpp @@ -476,7 +476,7 @@ DevicesWindow::UpdateDeviceInfo() } if (text.Length()>70) { text.Truncate(70); - text += "..."; + text += B_UTF8_ELLIPSIS; } stvIORanges->SetText(text.String()); } @@ -496,7 +496,7 @@ DevicesWindow::UpdateDeviceInfo() } if (text.Length()>70) { text.Truncate(70); - text += "..."; + text += B_UTF8_ELLIPSIS; } stvMemoryRanges->SetText(text.String()); } diff --git a/src/preferences/media/MediaWindow.cpp b/src/preferences/media/MediaWindow.cpp index 14efd99ade..3cf0d33481 100644 --- a/src/preferences/media/MediaWindow.cpp +++ b/src/preferences/media/MediaWindow.cpp @@ -278,7 +278,7 @@ MediaWindow::InitMedia(bool first) return B_ERROR; 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(); Show(); @@ -295,7 +295,7 @@ MediaWindow::InitMedia(bool first) if ((!first || (first && err) ) && fAlert) { BAutolock locker(fAlert); if (locker.IsLocked()) - fAlert->TextView()->SetText("Ready For Use..."); + fAlert->TextView()->SetText("Ready For Use" B_UTF8_ELLIPSIS); } 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.media-server")==0)) { fAlert->Lock(); - fAlert->TextView()->SetText("Starting Media Server..."); + fAlert->TextView()->SetText("Starting Media Server" B_UTF8_ELLIPSIS); fAlert->Unlock(); } } @@ -693,7 +693,7 @@ MediaWindow::RestartMediaServices(void *data) { BAutolock locker(window->fAlert); if (locker.IsLocked()) - window->fAlert->TextView()->SetText("Starting Media Server..."); + window->fAlert->TextView()->SetText("Starting Media Server" B_UTF8_ELLIPSIS); } launch_media_server(); @@ -708,7 +708,7 @@ MediaWindow::UpdateProgress(int stage, const char * message, void * cookie) char *string = "Unknown stage"; switch (stage) { case 10: - string = "Stopping Media Server..."; + string = "Stopping Media Server" B_UTF8_ELLIPSIS; break; case 20: string = "Telling media_addon_server to quit."; diff --git a/src/preferences/screen/ScreenWindow.cpp b/src/preferences/screen/ScreenWindow.cpp index d5f87e4726..8f17db71c1 100644 --- a/src/preferences/screen/ScreenWindow.cpp +++ b/src/preferences/screen/ScreenWindow.cpp @@ -635,7 +635,7 @@ ScreenWindow::_UpdateRefreshControl() item->SetMarked(true); // "Other…" items only contains a refresh rate when active - fOtherRefresh->SetLabel("Other…"); + fOtherRefresh->SetLabel("Other" B_UTF8_ELLIPSIS); return; } diff --git a/src/preferences/sounds/HWindow.cpp b/src/preferences/sounds/HWindow.cpp index 6d5cf6c970..6b687eb0b1 100644 --- a/src/preferences/sounds/HWindow.cpp +++ b/src/preferences/sounds/HWindow.cpp @@ -124,7 +124,7 @@ HWindow::InitGUI() menu->AddSeparatorItem(); menu->AddItem(new BMenuItem("", 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 ,"filemenu" ,"Sound File:"