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

Make sure there's a space in front of B_UTF8_ELLIPSIS.

Browse Source 
As PulkoMandy said in hrev47388: C++11 safe and reads better.
This commit is contained in:
Humdinger 2014-06-16 17:55:34 +02:00
parent 2860fecc80
commit 991dadd632
23 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/apps/bsnow/SnowView.cpp
View File

@ -237,7 +237,7 @@ void SnowView::Draw(BRect ur)
SetLowColor(ViewColor());
SetHighColor(0,0,0);
SetFontSize(12);
DrawString(B_TRANSLATE("Drag me on your desktop"B_UTF8_ELLIPSIS),
DrawString(B_TRANSLATE("Drag me on your desktop" B_UTF8_ELLIPSIS),
BPoint(15,25));
BPoint arrowHead(Bounds().RightBottom() + BPoint(-10,-10));
StrokeLine(arrowHead, arrowHead - BPoint(7,0));
@ -248,7 +248,7 @@ void SnowView::Draw(BRect ur)
SetLowColor(ViewColor());
SetHighColor(0,0,0);
SetFontSize(12);
DrawString(B_TRANSLATE("Click me to remove BSnow"B_UTF8_ELLIPSIS),
DrawString(B_TRANSLATE("Click me to remove BSnow" B_UTF8_ELLIPSIS),
BPoint(15,25));
return;
}

8
src/apps/icon-o-matic/MainWindow.cpp
View File

@ -1172,24 +1172,24 @@ MainWindow::_CreateMenuBar()
new BMessage(MSG_NEW), 'N');
fileMenu->AddItem(item);
item->SetTarget(be_app);
item = new BMenuItem(B_TRANSLATE("Open"B_UTF8_ELLIPSIS),
item = new BMenuItem(B_TRANSLATE("Open" B_UTF8_ELLIPSIS),
new BMessage(MSG_OPEN), 'O');
fileMenu->AddItem(item);
BMessage* appendMessage = new BMessage(MSG_APPEND);
appendMessage->AddPointer("window", this);
item = new BMenuItem(B_TRANSLATE("Append"B_UTF8_ELLIPSIS),
item = new BMenuItem(B_TRANSLATE("Append" B_UTF8_ELLIPSIS),
appendMessage, 'O', B_SHIFT_KEY);
fileMenu->AddItem(item);
item->SetTarget(be_app);
fileMenu->AddSeparatorItem();
fileMenu->AddItem(new BMenuItem(B_TRANSLATE("Save"),
new BMessage(MSG_SAVE), 'S'));
fileMenu->AddItem(new BMenuItem(B_TRANSLATE("Save as"B_UTF8_ELLIPSIS),
fileMenu->AddItem(new BMenuItem(B_TRANSLATE("Save as" B_UTF8_ELLIPSIS),
new BMessage(MSG_SAVE_AS), 'S', B_SHIFT_KEY));
fileMenu->AddSeparatorItem();
fileMenu->AddItem(new BMenuItem(B_TRANSLATE("Export"),
new BMessage(MSG_EXPORT), 'P'));
fileMenu->AddItem(new BMenuItem(B_TRANSLATE("Export as"B_UTF8_ELLIPSIS),
fileMenu->AddItem(new BMenuItem(B_TRANSLATE("Export as" B_UTF8_ELLIPSIS),
new BMessage(MSG_EXPORT_AS), 'P', B_SHIFT_KEY));
fileMenu->AddSeparatorItem();
fileMenu->AddItem(new BMenuItem(B_TRANSLATE("Close"),

2
src/apps/icon-o-matic/gui/PathListView.cpp
View File

@ -808,7 +808,7 @@ PathListView::SetMenu(BMenu* menu)
new BMessage(MSG_ADD_RECT));
fAddCircleMI = new BMenuItem(B_TRANSLATE("Add circle"/*B_UTF8_ELLIPSIS*/),
new BMessage(MSG_ADD_CIRCLE));
// fAddArcMI = new BMenuItem("Add arc"B_UTF8_ELLIPSIS,
// fAddArcMI = new BMenuItem("Add arc" B_UTF8_ELLIPSIS,
// new BMessage(MSG_ADD_ARC));
fDuplicateMI = new BMenuItem(B_TRANSLATE("Duplicate"),
new BMessage(MSG_DUPLICATE));

2
src/apps/icon-o-matic/gui/SavePanel.cpp
View File

@ -130,7 +130,7 @@ SavePanel::SavePanel(const char* name,
rect = cancel->Frame();
rect.OffsetTo(fFormatMF->Frame().right + 5.0, rect.top);
fSettingsB = new BButton(rect, "settings",
B_TRANSLATE("Settings"B_UTF8_ELLIPSIS),
B_TRANSLATE("Settings" B_UTF8_ELLIPSIS),
new BMessage(MSG_SETTINGS),
B_FOLLOW_LEFT | B_FOLLOW_BOTTOM,
B_WILL_DRAW | B_NAVIGABLE);

2
src/apps/launchbox/PadView.cpp
View File

@ -353,7 +353,7 @@ PadView::DisplayMenu(BPoint where, LaunchButton* button) const
if (button->Ref()) {
message = new BMessage(MSG_SET_DESCRIPTION);
message->AddPointer("be:source", (void*)button);
item = new BMenuItem(B_TRANSLATE("Set description"B_UTF8_ELLIPSIS),
item = new BMenuItem(B_TRANSLATE("Set description" B_UTF8_ELLIPSIS),
message);
item->SetTarget(window);
menu->AddItem(item);

10
src/apps/mediaplayer/MainWin.cpp
View File

@ -1461,7 +1461,7 @@ void
MainWin::_CreateMenu()
{
fFileMenu = new BMenu(kApplicationName);
fPlaylistMenu = new BMenu(B_TRANSLATE("Playlist"B_UTF8_ELLIPSIS));
fPlaylistMenu = new BMenu(B_TRANSLATE("Playlist" B_UTF8_ELLIPSIS));
fAudioMenu = new BMenu(B_TRANSLATE("Audio"));
fVideoMenu = new BMenu(B_TRANSLATE("Video"));
fVideoAspectMenu = new BMenu(B_TRANSLATE("Aspect ratio"));
@ -1477,7 +1477,7 @@ MainWin::_CreateMenu()
fMenuBar->AddItem(fVideoMenu);
fMenuBar->AddItem(fAttributesMenu);
BMenuItem* item = new BMenuItem(B_TRANSLATE("New player"B_UTF8_ELLIPSIS),
BMenuItem* item = new BMenuItem(B_TRANSLATE("New player" B_UTF8_ELLIPSIS),
new BMessage(M_NEW_PLAYER), 'N');
fFileMenu->AddItem(item);
item->SetTarget(be_app);
@ -1485,14 +1485,14 @@ MainWin::_CreateMenu()
// Add recent files to "Open File" entry as sub-menu.
BRecentFilesList recentFiles(10, false, NULL, kAppSig);
item = new BMenuItem(recentFiles.NewFileListMenu(
B_TRANSLATE("Open file"B_UTF8_ELLIPSIS), NULL, NULL, this, 10, true,
B_TRANSLATE("Open file" B_UTF8_ELLIPSIS), NULL, NULL, this, 10, true,
NULL, kAppSig), new BMessage(M_FILE_OPEN));
item->SetShortcut('O', 0);
fFileMenu->AddItem(item);
fFileMenu->AddSeparatorItem();
fFileMenu->AddItem(new BMenuItem(B_TRANSLATE("File info"B_UTF8_ELLIPSIS),
fFileMenu->AddItem(new BMenuItem(B_TRANSLATE("File info" B_UTF8_ELLIPSIS),
new BMessage(M_FILE_INFO), 'I'));
fFileMenu->AddItem(fPlaylistMenu);
fPlaylistMenu->Superitem()->SetShortcut('P', B_COMMAND_KEY);
@ -1506,7 +1506,7 @@ MainWin::_CreateMenu()
fFileMenu->AddItem(new BMenuItem(B_TRANSLATE("Always on top"),
new BMessage(M_TOGGLE_ALWAYS_ON_TOP), 'A'));
item = new BMenuItem(B_TRANSLATE("Settings"B_UTF8_ELLIPSIS),
item = new BMenuItem(B_TRANSLATE("Settings" B_UTF8_ELLIPSIS),
new BMessage(M_SETTINGS), 'S');
fFileMenu->AddItem(item);
item->SetTarget(be_app);

4
src/apps/mediaplayer/playlist/PlaylistWindow.cpp
View File

@ -245,9 +245,9 @@ PlaylistWindow::_CreateMenu(BRect& frame)
BMenuBar* menuBar = new BMenuBar(frame, "main menu");
BMenu* fileMenu = new BMenu(B_TRANSLATE("Playlist"));
menuBar->AddItem(fileMenu);
fileMenu->AddItem(new BMenuItem(B_TRANSLATE("Open"B_UTF8_ELLIPSIS),
fileMenu->AddItem(new BMenuItem(B_TRANSLATE("Open" B_UTF8_ELLIPSIS),
new BMessage(M_PLAYLIST_OPEN), 'O'));
fileMenu->AddItem(new BMenuItem(B_TRANSLATE("Save as"B_UTF8_ELLIPSIS),
fileMenu->AddItem(new BMenuItem(B_TRANSLATE("Save as" B_UTF8_ELLIPSIS),
new BMessage(M_PLAYLIST_SAVE_AS), 'S', B_SHIFT_KEY));
// fileMenu->AddItem(new BMenuItem("Save",
// new BMessage(M_PLAYLIST_SAVE), 'S'));

2
src/apps/people/PersonWindow.cpp
View File

@ -67,7 +67,7 @@ PersonWindow::PersonWindow(BRect frame, const char* title,
new BMessage(M_SAVE), 'S'));
fSave->SetEnabled(FALSE);
menu->AddItem(new BMenuItem(
B_TRANSLATE("Save as"B_UTF8_ELLIPSIS),
B_TRANSLATE("Save as" B_UTF8_ELLIPSIS),
new BMessage(M_SAVE_AS)));
menu->AddItem(fRevert = new BMenuItem(B_TRANSLATE("Revert"),
new BMessage(M_REVERT), 'R'));

2
src/apps/processcontroller/NoiseBarMenuItem.cpp
View File

@ -27,7 +27,7 @@
#define B_TRANSLATION_CONTEXT "ProcessController"
NoiseBarMenuItem::NoiseBarMenuItem()
: BMenuItem(B_TRANSLATE("Gone teams"B_UTF8_ELLIPSIS), NULL)
: BMenuItem(B_TRANSLATE("Gone teams" B_UTF8_ELLIPSIS), NULL)
{
fBusyWaiting = -1;
fLost = -1;

6
src/apps/processcontroller/ProcessController.cpp
View File

@ -325,7 +325,7 @@ ProcessController::MessageReceived(BMessage *message)
}
} else {
alert = new BAlert(B_TRANSLATE("Info"),
B_TRANSLATE("This team is already gone"B_UTF8_ELLIPSIS),
B_TRANSLATE("This team is already gone" B_UTF8_ELLIPSIS),
B_TRANSLATE("Ok!"), NULL, NULL, B_WIDTH_AS_USUAL,
B_STOP_ALERT);
alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE);
@ -370,7 +370,7 @@ ProcessController::MessageReceived(BMessage *message)
#endif
} else {
alert = new BAlert(B_TRANSLATE("Info"),
B_TRANSLATE("This thread is already gone"B_UTF8_ELLIPSIS),
B_TRANSLATE("This thread is already gone" B_UTF8_ELLIPSIS),
B_TRANSLATE("Ok!"), NULL, NULL,
B_WIDTH_AS_USUAL, B_STOP_ALERT);
alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE);
@ -882,7 +882,7 @@ thread_popup(void *arg)
item = new IconMenuItem(gPCView->fProcessControllerIcon,
B_TRANSLATE("About ProcessController"B_UTF8_ELLIPSIS),
B_TRANSLATE("About ProcessController" B_UTF8_ELLIPSIS),
new BMessage(B_ABOUT_REQUESTED));
item->SetTarget(gPCView);
addtopbottom(item);

4
src/apps/showimage/ShowImageWindow.cpp
View File

@ -175,7 +175,7 @@ ShowImageWindow::ShowImageWindow(BRect frame, const entry_ref& ref,
// Add the tool icons.
// fToolBarView->AddAction(MSG_FILE_OPEN, be_app,
// tool_bar_icon(kIconDocumentOpen), B_TRANSLATE("Open"B_UTF8_ELLIPSIS));
// tool_bar_icon(kIconDocumentOpen), B_TRANSLATE("Open" B_UTF8_ELLIPSIS));
fToolBarView->AddAction(MSG_FILE_PREV, this,
tool_bar_icon(kIconGoPrevious), B_TRANSLATE("Previous file"), false);
fToolBarView->AddAction(MSG_FILE_NEXT, this, tool_bar_icon(kIconGoNext),
@ -397,7 +397,7 @@ ShowImageWindow::_AddMenus(BMenuBar* bar)
// Add recent files to "Open File" entry as sub-menu.
BMenuItem* item = new BMenuItem(BRecentFilesList::NewFileListMenu(
B_TRANSLATE("Open"B_UTF8_ELLIPSIS), NULL, NULL, be_app, 10, true,
B_TRANSLATE("Open" B_UTF8_ELLIPSIS), NULL, NULL, be_app, 10, true,
NULL, kApplicationSignature), new BMessage(MSG_FILE_OPEN));
item->SetShortcut('O', 0);
item->SetTarget(be_app);

2
src/apps/stylededit/StyledEditWindow.cpp
View File

@ -1114,7 +1114,7 @@ StyledEditWindow::_InitWindow(uint32 encoding)
menuItem->SetTarget(be_app);
menu->AddItem(menuItem = new BMenuItem(BRecentFilesList::NewFileListMenu(
B_TRANSLATE("Open"B_UTF8_ELLIPSIS), NULL, NULL, be_app, 9, true,
B_TRANSLATE("Open" B_UTF8_ELLIPSIS), NULL, NULL, be_app, 9, true,
NULL, APP_SIGNATURE), new BMessage(MENU_OPEN)));
menuItem->SetShortcut('O', 0);
menuItem->SetTarget(be_app);

2
src/apps/tv/MainWin.cpp
View File

@ -210,7 +210,7 @@ MainWin::CreateMenu()
fSettingsMenu->AddItem(new BMenuItem(B_TRANSLATE("Keep aspect ratio"),
new BMessage(M_TOGGLE_KEEP_ASPECT_RATIO), 'K', B_COMMAND_KEY));
fSettingsMenu->AddSeparatorItem();
fSettingsMenu->AddItem(new BMenuItem(B_TRANSLATE("Settings"B_UTF8_ELLIPSIS)
fSettingsMenu->AddItem(new BMenuItem(B_TRANSLATE("Settings" B_UTF8_ELLIPSIS)
, new BMessage(M_PREFERENCES), 'P', B_COMMAND_KEY));
const char* pixel_ratio = B_TRANSLATE("pixel aspect ratio");

2
src/kits/print/JobSetupPanel.cpp
View File

@ -267,7 +267,7 @@ BJobSetupPanel::_SetupInterface()
if (fPrinterPopUp->FindMarked() == NULL)
pdf->SetMarked(true);
fProperties = new BButton("Properties"B_UTF8_ELLIPSIS , new BMessage('prop'));
fProperties = new BButton("Properties" B_UTF8_ELLIPSIS , new BMessage('prop'));
fPrinterInfo = new BStringView("label", "");
fPrinterInfo->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNSET));
BBox* divider = new BBox(B_FANCY_BORDER, NULL);

8
src/kits/tracker/ContainerWindow.cpp
View File

@ -1945,7 +1945,7 @@ BContainerWindow::AddFileMenu(BMenu* menu)
menu->AddItem(new BSeparatorItem(), 1);
}
} else if (IsPrintersDir()) {
menu->AddItem(new BMenuItem(B_TRANSLATE("Add printer"B_UTF8_ELLIPSIS),
menu->AddItem(new BMenuItem(B_TRANSLATE("Add printer" B_UTF8_ELLIPSIS),
new BMessage(kAddPrinter), 'N'), 0);
menu->AddItem(new BSeparatorItem(), 1);
menu->AddItem(new BMenuItem(B_TRANSLATE("Make active printer"),
@ -2082,7 +2082,7 @@ BContainerWindow::AddWindowMenu(BMenu* menu)
fArrangeByMenu = new BMenu(B_TRANSLATE("Arrange by"));
menu->AddItem(fArrangeByMenu);
item = new BMenuItem(B_TRANSLATE("Select"B_UTF8_ELLIPSIS),
item = new BMenuItem(B_TRANSLATE("Select" B_UTF8_ELLIPSIS),
new BMessage(kShowSelectionWindow), 'A', B_SHIFT_KEY);
item->SetTarget(PoseView());
menu->AddItem(item);
@ -2874,7 +2874,7 @@ BContainerWindow::AddWindowContextMenus(BMenu* menu)
menu->AddItem(new BMenuItem(B_TRANSLATE("Empty Trash"),
new BMessage(kEmptyTrash)));
} else if (IsPrintersDir()) {
menu->AddItem(new BMenuItem(B_TRANSLATE("Add printer"B_UTF8_ELLIPSIS),
menu->AddItem(new BMenuItem(B_TRANSLATE("Add printer" B_UTF8_ELLIPSIS),
new BMessage(kAddPrinter), 'N'));
} else if (InTrash())
needSeparator = false;
@ -2899,7 +2899,7 @@ BContainerWindow::AddWindowContextMenus(BMenu* menu)
menu->AddItem(arrangeBy);
menu->AddItem(new BMenuItem(B_TRANSLATE("Select"B_UTF8_ELLIPSIS),
menu->AddItem(new BMenuItem(B_TRANSLATE("Select" B_UTF8_ELLIPSIS),
new BMessage(kShowSelectionWindow), 'A', B_SHIFT_KEY));
menu->AddItem(new BMenuItem(B_TRANSLATE("Select all"),
new BMessage(B_SELECT_ALL), 'A'));

2
src/kits/tracker/DeskWindow.cpp
View File

@ -533,7 +533,7 @@ BDeskWindow::AddWindowContextMenus(BMenu* menu)
#endif
menu->AddItem(new BMenuItem(B_TRANSLATE("Clean up"),
new BMessage(kCleanup), 'K'));
menu->AddItem(new BMenuItem(B_TRANSLATE("Select"B_UTF8_ELLIPSIS),
menu->AddItem(new BMenuItem(B_TRANSLATE("Select" B_UTF8_ELLIPSIS),
new BMessage(kShowSelectionWindow), 'A', B_SHIFT_KEY));
menu->AddItem(new BMenuItem(B_TRANSLATE("Select all"),
new BMessage(B_SELECT_ALL), 'A'));

4
src/kits/tracker/FilePanelPriv.cpp
View File

@ -616,7 +616,7 @@ TFilePanel::Init(const BMessage*)
favorites->AddItem(new BMenuItem(B_TRANSLATE("Add current folder"),
new BMessage(kAddCurrentDir)));
favorites->AddItem(new BMenuItem(
B_TRANSLATE("Edit favorites"B_UTF8_ELLIPSIS),
B_TRANSLATE("Edit favorites" B_UTF8_ELLIPSIS),
new BMessage(kEditFavorites)));
fMenuBar->AddItem(favorites);
@ -938,7 +938,7 @@ TFilePanel::AddWindowContextMenus(BMenu* menu)
menu->AddItem(item);
menu->AddSeparatorItem();
item = new BMenuItem(B_TRANSLATE("Select"B_UTF8_ELLIPSIS),
item = new BMenuItem(B_TRANSLATE("Select" B_UTF8_ELLIPSIS),
new BMessage(kShowSelectionWindow), 'A', B_SHIFT_KEY);
item->SetTarget(PoseView());
menu->AddItem(item);

4
src/kits/tracker/QueryContainerWindow.cpp
View File

@ -96,7 +96,7 @@ BQueryContainerWindow::AddWindowMenu(BMenu* menu)
item->SetTarget(this);
menu->AddItem(item);
item = new BMenuItem(B_TRANSLATE("Select"B_UTF8_ELLIPSIS),
item = new BMenuItem(B_TRANSLATE("Select" B_UTF8_ELLIPSIS),
new BMessage(kShowSelectionWindow), 'A', B_SHIFT_KEY);
item->SetTarget(PoseView());
menu->AddItem(item);
@ -124,7 +124,7 @@ BQueryContainerWindow::AddWindowContextMenus(BMenu* menu)
BMenuItem* resizeItem = new BMenuItem(B_TRANSLATE("Resize to fit"),
new BMessage(kResizeToFit), 'Y');
menu->AddItem(resizeItem);
menu->AddItem(new BMenuItem(B_TRANSLATE("Select"B_UTF8_ELLIPSIS),
menu->AddItem(new BMenuItem(B_TRANSLATE("Select" B_UTF8_ELLIPSIS),
new BMessage(kShowSelectionWindow), 'A', B_SHIFT_KEY));
menu->AddItem(new BMenuItem(B_TRANSLATE("Select all"),
new BMessage(B_SELECT_ALL), 'A'));

4
src/kits/tracker/VirtualDirectoryWindow.cpp
View File

@ -129,7 +129,7 @@ VirtualDirectoryWindow::AddWindowMenu(BMenu* menu)
item->SetTarget(this);
menu->AddItem(item);
item = new BMenuItem(B_TRANSLATE("Select"B_UTF8_ELLIPSIS),
item = new BMenuItem(B_TRANSLATE("Select" B_UTF8_ELLIPSIS),
new BMessage(kShowSelectionWindow), 'A', B_SHIFT_KEY);
item->SetTarget(PoseView());
menu->AddItem(item);
@ -162,7 +162,7 @@ VirtualDirectoryWindow::AddWindowContextMenus(BMenu* menu)
BMenuItem* resizeItem = new BMenuItem(B_TRANSLATE("Resize to fit"),
new BMessage(kResizeToFit), 'Y');
menu->AddItem(resizeItem);
menu->AddItem(new BMenuItem(B_TRANSLATE("Select"B_UTF8_ELLIPSIS),
menu->AddItem(new BMenuItem(B_TRANSLATE("Select" B_UTF8_ELLIPSIS),
new BMessage(kShowSelectionWindow), 'A', B_SHIFT_KEY));
menu->AddItem(new BMenuItem(B_TRANSLATE("Select all"),
new BMessage(B_SELECT_ALL), 'A'));

4
src/kits/tracker/VolumeWindow.cpp
View File

@ -97,7 +97,7 @@ BVolumeWindow::MenusBeginning()
void
BVolumeWindow::AddFileMenu(BMenu* menu)
{
menu->AddItem(new BMenuItem(B_TRANSLATE("Find"B_UTF8_ELLIPSIS),
menu->AddItem(new BMenuItem(B_TRANSLATE("Find" B_UTF8_ELLIPSIS),
new BMessage(kFindButton), 'F'));
menu->AddSeparatorItem();
@ -144,7 +144,7 @@ BVolumeWindow::AddWindowContextMenus(BMenu* menu)
menu->AddItem(resizeItem);
menu->AddItem(new BMenuItem(B_TRANSLATE("Clean up"),
new BMessage(kCleanup), 'K'));
menu->AddItem(new BMenuItem(B_TRANSLATE("Select"B_UTF8_ELLIPSIS),
menu->AddItem(new BMenuItem(B_TRANSLATE("Select" B_UTF8_ELLIPSIS),
new BMessage(kShowSelectionWindow), 'A', B_SHIFT_KEY));
menu->AddItem(new BMenuItem(B_TRANSLATE("Select all"),
new BMessage(B_SELECT_ALL), 'A'));

4
src/tests/kits/interface/bprintjob/PrintTestWindow.cpp
View File

@ -32,8 +32,8 @@ void PrintTestWindow::BuildGUI()
BMenuBar* mb = new BMenuBar(Bounds(), "menubar");
BMenu* m = new BMenu("File");
m->AddItem(new BMenuItem("Page Setup"B_UTF8_ELLIPSIS, new BMessage('PStp'), 'P', B_SHIFT_KEY));
m->AddItem(new BMenuItem("Print"B_UTF8_ELLIPSIS, new BMessage('Prnt'), 'P'));
m->AddItem(new BMenuItem("Page Setup" B_UTF8_ELLIPSIS, new BMessage('PStp'), 'P', B_SHIFT_KEY));
m->AddItem(new BMenuItem("Print" B_UTF8_ELLIPSIS, new BMessage('Prnt'), 'P'));
m->AddSeparatorItem();
m->AddItem(new BMenuItem("Quit", new BMessage(B_QUIT_REQUESTED), 'Q'));
m->SetTargetForItems(be_app_messenger);

4
src/tests/kits/support/bstring/StringAccessTest.cpp
View File

@ -21,7 +21,7 @@ StringAccessTest::PerformTest(void)
{
//CountChars(), Length(), String()
NextSubTest();
BString string("Something"B_UTF8_ELLIPSIS);
BString string("Something" B_UTF8_ELLIPSIS);
CPPUNIT_ASSERT(string.CountChars() == 10);
CPPUNIT_ASSERT((unsigned)string.Length() == strlen(string.String()));
@ -48,7 +48,7 @@ StringAccessTest::PerformTest(void)
//Truncate the string at end so we are left with an invalid
//UTF8 character
NextSubTest();
BString invalid("some text with utf8 characters"B_UTF8_ELLIPSIS);
BString invalid("some text with utf8 characters" B_UTF8_ELLIPSIS);
invalid.Truncate(invalid.Length() -1);
CPPUNIT_ASSERT(invalid.CountChars() == 31);

22
src/tests/kits/support/string_utf8_tests.cpp
View File

@ -35,7 +35,7 @@ main(int argc, char *argv[])
printf("replacing ü and ö by ellipsis\n");
string.ReplaceCharsSet("üö", B_UTF8_ELLIPSIS"");
expect(string, B_UTF8_ELLIPSIS"-ä-"B_UTF8_ELLIPSIS, 10, 5);
expect(string, B_UTF8_ELLIPSIS"-ä-" B_UTF8_ELLIPSIS, 10, 5);
printf("moving the last char (ellipsis) to a seperate string\n");
BString ellipsis;
@ -44,35 +44,35 @@ main(int argc, char *argv[])
expect(ellipsis, B_UTF8_ELLIPSIS, 3, 1);
printf("removing all - and ellipsis chars\n");
string.RemoveCharsSet("-"B_UTF8_ELLIPSIS);
string.RemoveCharsSet("-" B_UTF8_ELLIPSIS);
expect(string, "ä", 2, 1);
printf("reset the string to öäü"B_UTF8_ELLIPSIS"öäü\n");
string.SetToChars("öäü"B_UTF8_ELLIPSIS"öäü", 5);
expect(string, "öäü"B_UTF8_ELLIPSIS"ö", 11, 5);
printf("reset the string to öäü" B_UTF8_ELLIPSIS"öäü\n");
string.SetToChars("öäü" B_UTF8_ELLIPSIS"öäü", 5);
expect(string, "öäü" B_UTF8_ELLIPSIS"ö", 11, 5);
printf("truncating string to 4 characters\n");
string.TruncateChars(4);
expect(string, "öäü"B_UTF8_ELLIPSIS, 9, 4);
expect(string, "öäü" B_UTF8_ELLIPSIS, 9, 4);
printf("appending 2 chars out of \"öäü\"\n");
string.AppendChars("öäü", 2);
expect(string, "öäü"B_UTF8_ELLIPSIS"öä", 13, 6);
expect(string, "öäü" B_UTF8_ELLIPSIS"öä", 13, 6);
printf("removing chars 1 through 4\n");
string.RemoveChars(1, 3);
expect(string, "ööä", 6, 3);
printf("inserting 2 ellipsis out of 6 chars at offset 1\n");
string.InsertChars("öäü"B_UTF8_ELLIPSIS B_UTF8_ELLIPSIS"ä", 3, 2, 1);
expect(string, "ö"B_UTF8_ELLIPSIS B_UTF8_ELLIPSIS"öä", 12, 5);
string.InsertChars("öäü" B_UTF8_ELLIPSIS B_UTF8_ELLIPSIS"ä", 3, 2, 1);
expect(string, "ö" B_UTF8_ELLIPSIS B_UTF8_ELLIPSIS"öä", 12, 5);
printf("prepending 3 out of 5 chars\n");
string.PrependChars("ää+üü", 3);
expect(string, "ää+ö"B_UTF8_ELLIPSIS B_UTF8_ELLIPSIS"öä", 17, 8);
expect(string, "ää+ö" B_UTF8_ELLIPSIS B_UTF8_ELLIPSIS"öä", 17, 8);
printf("comparing first 5 chars which should succeed\n");
const char *compare = "ää+ö"B_UTF8_ELLIPSIS"different";
const char *compare = "ää+ö" B_UTF8_ELLIPSIS"different";
if (string.CompareChars(compare, 5) != 0) {
printf("comparison failed\n");
return 1;