From 7974d3dcf39ce78e5885b481eee12e561ad6e096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Wed, 13 Jan 2010 14:33:35 +0000 Subject: [PATCH] Patch by Humdinger: Updated Haiku apps to use sentence-case. What a huge undertaking... The files where I had to apply the patch manually (for mysterious reasons) have also gotten a whitespace cleanup. I've proof-read everything so hopefully there should be no problems. This should be the final part of #5169. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35049 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/3dmov/GLMovStrings.h | 6 +- src/apps/aboutsystem/AboutSystem.cpp | 24 +-- src/apps/activitymonitor/ActivityMonitor.cpp | 2 +- src/apps/activitymonitor/ActivityView.cpp | 6 +- src/apps/activitymonitor/ActivityWindow.cpp | 2 +- src/apps/activitymonitor/DataSource.cpp | 32 +-- src/apps/activitymonitor/SettingsWindow.cpp | 4 +- src/apps/autoraise/AutoRaiseApp.cpp | 2 +- src/apps/autoraise/AutoRaiseIcon.cpp | 88 ++++---- src/apps/bootman/BootManager.cpp | 4 +- src/apps/bootman/BootManagerController.cpp | 138 ++++++------- src/apps/bootman/EntryPage.cpp | 32 +-- src/apps/charactermap/CharacterMap.cpp | 2 +- src/apps/charactermap/CharacterView.cpp | 4 +- src/apps/charactermap/CharacterWindow.cpp | 6 +- src/apps/charactermap/UnicodeBlocks.cpp | 194 +++++++++--------- src/apps/codycam/CodyCam.cpp | 159 +++++++------- .../DormantNodeView/DormantNodeListItem.cpp | 2 +- .../DormantNodeView/DormantNodeWindow.cpp | 2 +- .../cortex/InfoView/DormantNodeInfoView.cpp | 16 +- src/apps/cortex/InfoView/EndPointInfoView.cpp | 36 ++-- .../cortex/MediaRoutingView/MediaJack.cpp | 4 +- .../MediaRoutingView/MediaNodePanel.cpp | 12 +- .../MediaRoutingView/MediaRoutingView.cpp | 16 +- .../cortex/MediaRoutingView/MediaWire.cpp | 2 +- .../cortex/ParameterView/ParameterWindow.cpp | 10 +- .../cortex/RouteApp/RouteAppNodeManager.cpp | 4 +- src/apps/cortex/RouteApp/RouteWindow.cpp | 10 +- .../cortex/TransportView/TransportView.cpp | 18 +- .../AudioAdapter/AudioAdapterParams.cpp | 8 +- .../cortex/addons/Flanger/FlangerNode.cpp | 12 +- .../LoggingConsumer/LoggingConsumer.cpp | 10 +- .../addons/common/MediaNodeControlApp.cpp | 6 +- src/apps/cortex/support/MediaString.cpp | 156 +++++++------- .../gui/running_teams_window/hdb.cpp | 4 +- src/apps/deskbar/BeMenu.cpp | 14 +- src/apps/deskbar/PreferencesWindow.cpp | 28 +-- src/apps/deskbar/TimeView.cpp | 6 +- src/apps/deskbar/WindowMenu.cpp | 10 +- src/apps/deskcalc/CalcView.cpp | 10 +- src/apps/devices/DevicePCI.cpp | 4 +- src/apps/devices/DevicesApplication.cpp | 2 +- src/apps/devices/DevicesView.cpp | 30 +-- src/apps/diskprobe/AttributeWindow.cpp | 6 +- src/apps/diskprobe/DiskProbe.cpp | 4 +- src/apps/diskprobe/FileWindow.cpp | 4 +- src/apps/diskprobe/OpenWindow.cpp | 6 +- src/apps/diskprobe/ProbeView.cpp | 22 +- src/apps/diskprobe/TypeEditors.cpp | 62 +++--- src/apps/drivesetup/CreateParamsPanel.cpp | 6 +- src/apps/drivesetup/MainWindow.cpp | 28 +-- src/apps/drivesetup/PartitionList.cpp | 6 +- src/apps/expander/ExpanderApp.cpp | 2 +- src/apps/expander/ExpanderPreferences.cpp | 4 +- src/apps/expander/ExpanderWindow.cpp | 24 +-- src/apps/fontdemo/ControlView.cpp | 8 +- src/apps/glteapot/TeapotWindow.cpp | 2 +- src/apps/gradients/GradientsWindow.cpp | 2 +- src/apps/haiku3d/App.cpp | 2 +- src/apps/icon-o-matic/MainWindow.cpp | 12 +- .../panel/color_picker/ColorPickerPanel.cpp | 6 +- .../property/view/PropertyListView.cpp | 8 +- src/apps/icon-o-matic/gui/PathListView.cpp | 14 +- src/apps/icon-o-matic/gui/ShapeListView.cpp | 14 +- src/apps/icon-o-matic/gui/StyleListView.cpp | 4 +- src/apps/icon-o-matic/gui/StyleView.cpp | 12 +- .../icon-o-matic/gui/TransformerListView.cpp | 4 +- .../styled_text/StyledTextImporter.cpp | 18 +- .../import_export/svg/SVGImporter.cpp | 6 +- src/apps/installer/InstallerApp.cpp | 4 +- src/apps/installer/InstallerWindow.cpp | 22 +- src/apps/installer/WorkerThread.cpp | 2 +- src/apps/launchbox/NamePanel.cpp | 2 +- src/apps/launchbox/PadView.cpp | 20 +- src/apps/login/LoginApp.cpp | 31 ++- src/apps/login/LoginView.cpp | 36 ++-- src/apps/magnify/Magnify.cpp | 50 ++--- src/apps/mandelbrot/Mandelbrot.cpp | 8 +- .../mediaconverter/MediaConverterWindow.cpp | 4 +- src/apps/mediaconverter/Strings.h | 22 +- .../languages/MediaConverter.frFR | 16 +- .../languages/MediaConverter.itIT | 12 +- .../languages/MediaConverter.jaJP | 12 +- src/apps/mediaplayer/InfoWin.cpp | 2 +- src/apps/mediaplayer/MainApp.cpp | 8 +- src/apps/mediaplayer/MainWin.cpp | 28 +-- .../media_node_framework/NodeManager.cpp | 6 +- .../playlist/ImportPLItemsCommand.cpp | 2 +- .../mediaplayer/playlist/PlaylistWindow.cpp | 16 +- .../playlist/RemovePLItemsCommand.cpp | 4 +- .../mediaplayer/settings/SettingsWindow.cpp | 6 +- src/apps/midiplayer/MidiPlayerWindow.cpp | 6 +- src/apps/networkstatus/NetworkStatusView.cpp | 14 +- src/apps/packageinstaller/PackageInfo.cpp | 41 ++-- src/apps/packageinstaller/PackageView.cpp | 14 +- src/apps/packageinstaller/PackageWindow.cpp | 4 +- src/apps/packageinstaller/main.cpp | 4 +- src/apps/pairs/PairsView.cpp | 2 +- src/apps/people/PeopleApp.cpp | 12 +- src/apps/people/PeopleWindow.cpp | 6 +- src/apps/poorman/PoorManAdvancedView.cpp | 24 +-- src/apps/poorman/PoorManWindow.cpp | 4 +- src/apps/poorman/constants.cpp | 91 ++++---- src/apps/powerstatus/ExtendedInfoWindow.cpp | 28 +-- src/apps/powerstatus/PowerStatusView.cpp | 10 +- .../KernelMemoryBarMenuItem.cpp | 2 +- .../processcontroller/NoiseBarMenuItem.cpp | 2 +- src/apps/processcontroller/PriorityMenu.cpp | 10 +- .../processcontroller/ProcessController.cpp | 14 +- src/apps/pulse/ConfigView.cpp | 4 +- src/apps/pulse/DeskbarPulseView.cpp | 27 +-- src/apps/pulse/MiniPulseView.cpp | 4 +- src/apps/pulse/NormalPulseView.cpp | 6 +- src/apps/pulse/PrefsWindow.cpp | 12 +- src/apps/pulse/PulseView.cpp | 2 +- src/apps/pulse/PulseWindow.cpp | 2 +- src/apps/screenshot/ScreenshotWindow.cpp | 10 +- src/apps/showimage/PrintOptionsWindow.cpp | 42 ++-- src/apps/showimage/ProgressWindow.cpp | 2 +- src/apps/showimage/ResizerWindow.cpp | 2 +- src/apps/showimage/ShowImageView.cpp | 2 +- src/apps/showimage/ShowImageWindow.cpp | 72 +++---- src/apps/soundrecorder/RecorderWindow.cpp | 18 +- src/apps/soundrecorder/SoundListView.cpp | 12 +- src/apps/stylededit/ReplaceWindow.cpp | 4 +- src/apps/stylededit/StyledEditWindow.cpp | 26 +-- src/apps/sudoku/ProgressWindow.cpp | 2 +- src/apps/sudoku/Sudoku.cpp | 2 +- src/apps/sudoku/SudokuWindow.cpp | 20 +- src/apps/terminal/FindWindow.cpp | 12 +- src/apps/terminal/PrefWindow.cpp | 10 +- src/apps/terminal/Shell.cpp | 4 +- src/apps/terminal/SmartTabView.cpp | 2 +- src/apps/terminal/TermApp.cpp | 4 +- src/apps/terminal/TermConst.h | 38 ++-- src/apps/terminal/TermView.cpp | 12 +- src/apps/terminal/TermWindow.cpp | 34 +-- src/apps/text_search/GrepWindow.cpp | 39 ++-- src/apps/tv/MainWin.cpp | 184 ++++++++--------- src/apps/webwatch/WatchView.cpp | 4 +- src/apps/workspaces/Workspaces.cpp | 16 +- 141 files changed, 1328 insertions(+), 1326 deletions(-) diff --git a/src/apps/3dmov/GLMovStrings.h b/src/apps/3dmov/GLMovStrings.h index a274829601..6f58dd0fe7 100644 --- a/src/apps/3dmov/GLMovStrings.h +++ b/src/apps/3dmov/GLMovStrings.h @@ -1,5 +1,5 @@ -/* - * Copyright 2004-2007, Haiku Inc. All rights reserved. +/* + * Copyright 2004-2009, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. * * Authors: @@ -10,7 +10,7 @@ #define _GLMOVSTRINGS_H #define STR_ABOUT_TEXT "3DMov reloaded.\n\n Demonstrates OpenGL and the Media Kit." -#define STR_OK "Ok" +#define STR_OK "OK" #define STR_MENU "File" //not really related.... "Object" ? diff --git a/src/apps/aboutsystem/AboutSystem.cpp b/src/apps/aboutsystem/AboutSystem.cpp index f19c1a78b0..94b9537185 100644 --- a/src/apps/aboutsystem/AboutSystem.cpp +++ b/src/apps/aboutsystem/AboutSystem.cpp @@ -174,7 +174,7 @@ AboutApp::AboutApp() AboutWindow::AboutWindow() - : BWindow(BRect(0, 0, 500, 300), "About This System", B_TITLED_WINDOW, + : BWindow(BRect(0, 0, 500, 300), "About this system", B_TITLED_WINDOW, B_AUTO_UPDATE_SIZE_LIMITS | B_NOT_ZOOMABLE) { SetLayout(new BGroupLayout(B_VERTICAL)); @@ -447,7 +447,7 @@ AboutView::AboutView() .Add(_CreateLabel("kernellabel", "Kernel:")) .Add(kernelView) .AddStrut(offset) - .Add(_CreateLabel("uptimelabel", "Time Running:")) + .Add(_CreateLabel("uptimelabel", "Time running:")) .Add(fUptimeView) .SetInsets(5, 5, 5, 5) .End() @@ -481,7 +481,7 @@ AboutView::MouseDown(BPoint point) { BRect r(92, 26, 105, 31); if (r.Contains(point)) { - printf("Easter Egg\n"); + printf("Easter egg\n"); PickRandomHaiku(); } @@ -728,7 +728,7 @@ AboutView::_CreateCreditsView() font.SetFace(B_BOLD_FACE | B_ITALIC_FACE); fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuOrange); - fCreditsView->Insert("Current Maintainers:\n"); + fCreditsView->Insert("Current maintainers:\n"); fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey); fCreditsView->Insert( @@ -772,7 +772,7 @@ AboutView::_CreateCreditsView() "\n"); fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuOrange); - fCreditsView->Insert("Past Maintainers:\n"); + fCreditsView->Insert("Past maintainers:\n"); fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey); fCreditsView->Insert( @@ -799,7 +799,7 @@ AboutView::_CreateCreditsView() "\n"); fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuOrange); - fCreditsView->Insert("Website, Marketing & Documentation:\n"); + fCreditsView->Insert("Website, marketing & documentation:\n"); fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey); fCreditsView->Insert( @@ -930,7 +930,7 @@ AboutView::_CreateCreditsView() fCreditsView->Insert("\nGerman\n\n"); fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey); fCreditsView->Insert( - "Colin Gunther\n" + "Colin Günther\n" "svend\n" "leszek\n" ); @@ -984,14 +984,14 @@ AboutView::_CreateCreditsView() ); fCreditsView->SetFontAndColor(&font, B_FONT_ALL, &kHaikuOrange); - fCreditsView->Insert("Special Thanks To:\n"); + fCreditsView->Insert("Special thanks to:\n"); fCreditsView->SetFontAndColor(be_plain_font, B_FONT_ALL, &kDarkGrey); fCreditsView->Insert("Travis Geiselbrecht (and his NewOS kernel)\n"); fCreditsView->Insert("Michael Phipps (project founder)\n\n"); - fCreditsView->Insert("The Haiku-Ports Team\n"); - fCreditsView->Insert("The Haikuware Team and their Bounty Program\n"); - fCreditsView->Insert("The BeGeistert Team\n\n"); + fCreditsView->Insert("The Haiku-Ports team\n"); + fCreditsView->Insert("The Haikuware team and their bounty program\n"); + fCreditsView->Insert("The BeGeistert team\n\n"); fCreditsView->Insert("... and the many community members making " "donations!\n\n"); @@ -1085,7 +1085,7 @@ AboutView::_CreateCreditsView() // Mesa3D (http://www.mesa3d.org) copyrights _AddPackageCredit(PackageCredit("Mesa") .SetCopyright(COPYRIGHT_STRING "1999-2006 Brian Paul. " - "Mesa3D project. All rights reserved.") + "Mesa3D Project. All rights reserved.") .SetURL("http://www.mesa3d.org")); // TODO: License! diff --git a/src/apps/activitymonitor/ActivityMonitor.cpp b/src/apps/activitymonitor/ActivityMonitor.cpp index 543cd53491..b96db5a08f 100644 --- a/src/apps/activitymonitor/ActivityMonitor.cpp +++ b/src/apps/activitymonitor/ActivityMonitor.cpp @@ -63,7 +63,7 @@ ActivityMonitor::ShowAbout() { BAlert *alert = new BAlert("about", "ActivityMonitor\n" "\twritten by Axel Dörfler\n" - "\tCopyright 2008, Haiku Inc.\n", "Ok"); + "\tCopyright 2008, Haiku Inc.\n", "OK"); BTextView *view = alert->TextView(); BFont font; diff --git a/src/apps/activitymonitor/ActivityView.cpp b/src/apps/activitymonitor/ActivityView.cpp index 689f79053f..ba21af034c 100644 --- a/src/apps/activitymonitor/ActivityView.cpp +++ b/src/apps/activitymonitor/ActivityView.cpp @@ -978,7 +978,7 @@ ActivityView::MouseDown(BPoint where) BPopUpMenu *menu = new BPopUpMenu(B_EMPTY_STRING, false, false); menu->SetFont(be_plain_font); - BMenu* additionalMenu = new BMenu("Additional Items"); + BMenu* additionalMenu = new BMenu("Additional items"); additionalMenu->SetFont(be_plain_font); SystemInfo info; @@ -1005,7 +1005,7 @@ ActivityView::MouseDown(BPoint where) menu->AddItem(new BMenuItem(additionalMenu)); menu->AddSeparatorItem(); - menu->AddItem(new BMenuItem(fShowLegend ? "Hide Legend" : "Show Legend", + menu->AddItem(new BMenuItem(fShowLegend ? "Hide legend" : "Show legend", new BMessage(kMsgToggleLegend))); menu->SetTargetForItems(this); @@ -1016,7 +1016,7 @@ ActivityView::MouseDown(BPoint where) menu->AddSeparatorItem(); BMessage* message = new BMessage(kMsgRemoveView); message->AddPointer("view", this); - menu->AddItem(item = new BMenuItem("Remove View", message)); + menu->AddItem(item = new BMenuItem("Remove graph", message)); item->SetTarget(window); } diff --git a/src/apps/activitymonitor/ActivityWindow.cpp b/src/apps/activitymonitor/ActivityWindow.cpp index 103c06caa8..bf551d65e9 100644 --- a/src/apps/activitymonitor/ActivityWindow.cpp +++ b/src/apps/activitymonitor/ActivityWindow.cpp @@ -116,7 +116,7 @@ ActivityWindow::ActivityWindow() BMenu* menu = new BMenu("File"); BMenuItem* item; - menu->AddItem(new BMenuItem("Add View", new BMessage(kMsgAddView))); + menu->AddItem(new BMenuItem("Add graph", new BMessage(kMsgAddView))); menu->AddSeparatorItem(); menu->AddItem(item = new BMenuItem("About ActivityMonitor" B_UTF8_ELLIPSIS, diff --git a/src/apps/activitymonitor/DataSource.cpp b/src/apps/activitymonitor/DataSource.cpp index 42b605c4f3..4cf8c6b473 100644 --- a/src/apps/activitymonitor/DataSource.cpp +++ b/src/apps/activitymonitor/DataSource.cpp @@ -329,7 +329,7 @@ UsedMemoryDataSource::NextValue(SystemInfo& info) const char* UsedMemoryDataSource::Label() const { - return "Used Memory"; + return "Used memory"; } @@ -378,7 +378,7 @@ CachedMemoryDataSource::NextValue(SystemInfo& info) const char* CachedMemoryDataSource::Label() const { - return "Cached Memory"; + return "Cached memory"; } @@ -430,7 +430,7 @@ SwapSpaceDataSource::NextValue(SystemInfo& info) const char* SwapSpaceDataSource::Label() const { - return "Swap Space"; + return "Swap space"; } @@ -485,14 +485,14 @@ BlockCacheDataSource::NextValue(SystemInfo& info) const char* BlockCacheDataSource::Label() const { - return "Block Cache Memory"; + return "Block cache memory"; } const char* BlockCacheDataSource::ShortLabel() const { - return "Block Cache"; + return "Block cache"; } @@ -727,7 +727,7 @@ RunningAppsDataSource::NextValue(SystemInfo& info) const char* RunningAppsDataSource::Label() const { - return "Running Applications"; + return "Running applications"; } @@ -839,7 +839,7 @@ CPUUsageDataSource::ShortLabel() const const char* CPUUsageDataSource::Name() const { - return "CPU Usage"; + return "CPU usage"; } @@ -873,7 +873,7 @@ CPUUsageDataSource::_SetCPU(int32 cpu) fLabel << " " << cpu; fShortLabel = fLabel; - fLabel << " Usage"; + fLabel << " usage"; const rgb_color kColors[] = { // TODO: find some better defaults... @@ -963,7 +963,7 @@ CPUCombinedUsageDataSource::NextValue(SystemInfo& info) const char* CPUCombinedUsageDataSource::Label() const { - return "CPU Usage"; + return "CPU usage"; } @@ -977,7 +977,7 @@ CPUCombinedUsageDataSource::ShortLabel() const const char* CPUCombinedUsageDataSource::Name() const { - return "CPU Usage (combined)"; + return "CPU usage (combined)"; } @@ -1061,21 +1061,21 @@ PageFaultsDataSource::NextValue(SystemInfo& info) const char* PageFaultsDataSource::Label() const { - return "Page Faults"; + return "Page faults"; } const char* PageFaultsDataSource::ShortLabel() const { - return "P-Faults"; + return "P-faults"; } const char* PageFaultsDataSource::Name() const { - return "Page Faults"; + return "Page faults"; } @@ -1176,7 +1176,7 @@ NetworkUsageDataSource::ShortLabel() const const char* NetworkUsageDataSource::Name() const { - return fIn ? "Network Receive" : "Network Send"; + return fIn ? "Network receive" : "Network send"; } @@ -1246,7 +1246,7 @@ ClipboardSizeDataSource::NextValue(SystemInfo& info) const char* ClipboardSizeDataSource::Label() const { - return fText ? "Text Clipboard Size" : "Raw Clipboard Size"; + return fText ? "Text clipboard size" : "Raw clipboard size"; } @@ -1300,7 +1300,7 @@ MediaNodesDataSource::NextValue(SystemInfo& info) const char* MediaNodesDataSource::Label() const { - return "Media Nodes"; + return "Media nodes"; } diff --git a/src/apps/activitymonitor/SettingsWindow.cpp b/src/apps/activitymonitor/SettingsWindow.cpp index 079e36c4ac..5fc15e98f2 100644 --- a/src/apps/activitymonitor/SettingsWindow.cpp +++ b/src/apps/activitymonitor/SettingsWindow.cpp @@ -70,9 +70,9 @@ private: bigtime_t interval = kUpdateIntervals[level]; if ((interval % 1000) == 0) - snprintf(fText, sizeof(fText), "%lld secs", interval / 1000); + snprintf(fText, sizeof(fText), "%lld sec.", interval / 1000); else - snprintf(fText, sizeof(fText), "%lld msecs", interval); + snprintf(fText, sizeof(fText), "%lld ms", interval); return fText; } diff --git a/src/apps/autoraise/AutoRaiseApp.cpp b/src/apps/autoraise/AutoRaiseApp.cpp index c348a228a7..8bcd92e518 100644 --- a/src/apps/autoraise/AutoRaiseApp.cpp +++ b/src/apps/autoraise/AutoRaiseApp.cpp @@ -67,7 +67,7 @@ void AutoRaiseApp::ReadyToRun() if (!_directToDeskbar) { printf("\nUsage: " APP_NAME " [options]\n\t--deskbar\twill not open window, will just put " APP_NAME " into tray\n\t--persist will put " APP_NAME " into tray such that it remains between bootings\n"); - BAlert *alert = new BAlert("usage box", APP_NAME ", (c) 2002, mmu_man\nUsage: " APP_NAME " [options]\n\t--deskbar\twill not open window, will just put " APP_NAME " into tray\n\t--persist will put "APP_NAME" into tray such that it remains between bootings\n", "Ok", NULL, NULL, + BAlert *alert = new BAlert("usage box", APP_NAME ", (c) 2002, mmu_man\nUsage: " APP_NAME " [options]\n\t--deskbar\twill not open window, will just put " APP_NAME " into tray\n\t--persist will put "APP_NAME" into tray such that it remains between bootings\n", "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_OFFSET_SPACING, B_INFO_ALERT); alert->SetShortcut(0, B_ENTER); alert->Go(); diff --git a/src/apps/autoraise/AutoRaiseIcon.cpp b/src/apps/autoraise/AutoRaiseIcon.cpp index 9a83899d9b..2a70aac2c2 100644 --- a/src/apps/autoraise/AutoRaiseIcon.cpp +++ b/src/apps/autoraise/AutoRaiseIcon.cpp @@ -22,11 +22,11 @@ extern "C" _EXPORT BView *instantiate_deskbar_item(void) long removeFromDeskbar(void *) -{ +{ BDeskbar db; if (db.RemoveItem(APP_NAME) != B_OK) printf("Unable to remove AutoRaise from BDeskbar\n"); - + return 0; } @@ -39,9 +39,9 @@ ConfigMenu::ConfigMenu(TrayView *tv, bool useMag) BMenuItem *tmpi; BMessage *msg; bigtime_t delay; - + AutoRaiseSettings *s = tv->Settings(); - + SetFont(be_plain_font); @@ -165,15 +165,16 @@ ConfigMenu::ConfigMenu(TrayView *tv, bool useMag) tmpm->SetTargetForItems(tv); BMenuItem *delaym = new BMenuItem(tmpm); delaym->SetEnabled(s->Active()); - + AddItem(delaym); - + AddSeparatorItem(); // AddItem(new BMenuItem("Settings...", new BMessage(OPEN_SETTINGS))); - - AddItem(new BMenuItem("About "APP_NAME, new BMessage(B_ABOUT_REQUESTED))); + + AddItem(new BMenuItem("About "APP_NAME B_UTF8_ELLIPSIS, + new BMessage(B_ABOUT_REQUESTED))); AddItem(new BMenuItem("Remove from tray", new BMessage(REMOVE_FROM_TRAY))); - + SetTargetForItems(tv); SetAsyncAutoDestruct(true); } @@ -202,19 +203,19 @@ void TrayView::_init() { thread_info ti; status_t err; - + watching = false; _settings = new AutoRaiseSettings; - + _appPath = _settings->AppPath(); - + raise_delay = _settings->Delay(); current_window = 0; polling_delay = 100000; fPollerSem = create_sem(0, "AutoRaise poller sync"); last_raiser_thread = 0; fNormalMM = mouse_mode(); - + _activeIcon = NULL; _inactiveIcon = NULL; @@ -222,7 +223,8 @@ void TrayView::_init() fDeskbarTeam = ti.team; #ifndef USE_DANO_HACK - resume_thread(poller_thread = spawn_thread(poller, "AutoRaise desktop poller", B_NORMAL_PRIORITY, (void *)this)); + resume_thread(poller_thread = spawn_thread(poller, "AutoRaise desktop " + "poller", B_NORMAL_PRIORITY, (void *)this)); #endif //determine paths to icon files based on app path in settings file @@ -230,7 +232,7 @@ void TrayView::_init() BResources res; BFile theapp(&_appPath, B_READ_ONLY); if ((err = res.SetTo(&theapp)) != B_OK) { - + printf("Unable to find the app to get the resources !!!\n"); // removeFromDeskbar(NULL); // delete _settings; @@ -241,30 +243,32 @@ void TrayView::_init() char *p; p = (char *)res.LoadResource('MICN', ACTIVE_ICON, &bmsz); - _activeIcon = new BBitmap(BRect(0, 0, B_MINI_ICON-1, B_MINI_ICON -1), B_CMAP8); + _activeIcon = new BBitmap(BRect(0, 0, B_MINI_ICON-1, B_MINI_ICON -1), + B_CMAP8); if (!p) puts("ERROR loading active icon"); else _activeIcon->SetBits(p, B_MINI_ICON*B_MINI_ICON, 0, B_CMAP8); - + p = (char *)res.LoadResource('MICN', INACTIVE_ICON, &bmsz); - _inactiveIcon = new BBitmap(BRect(0, 0, B_MINI_ICON-1, B_MINI_ICON -1), B_CMAP8); + _inactiveIcon = new BBitmap(BRect(0, 0, B_MINI_ICON-1, B_MINI_ICON -1), + B_CMAP8); if (!p) puts("ERROR loading inactive icon"); else _inactiveIcon->SetBits(p, B_MINI_ICON*B_MINI_ICON, 0, B_CMAP8); - - + + SetDrawingMode(B_OP_ALPHA); SetFlags(Flags() | B_WILL_DRAW); - + // begin watching if we want // (doesn't work here, better do it in AttachedToWindow()) } TrayView::~TrayView(){ status_t ret; - + if (watching) { #ifdef USE_DANO_HACK be_roster->StopWatching(this); @@ -281,7 +285,7 @@ TrayView::~TrayView(){ if (_activeIcon) delete _activeIcon; if (_inactiveIcon) delete _inactiveIcon; if (_settings) delete _settings; - + return; } @@ -304,7 +308,7 @@ TrayView *TrayView::Instantiate(BMessage *data) { { return NULL; } - + return (new TrayView(data)); } @@ -325,11 +329,11 @@ void TrayView::AttachedToWindow() { void TrayView::Draw(BRect updaterect) { BRect bnds(Bounds()); - + if (Parent()) SetHighColor(Parent()->ViewColor()); else SetHighColor(189, 186, 189, 255); FillRect(bnds); - + if (_settings->Active()) { if (_activeIcon) DrawBitmap(_activeIcon); @@ -344,43 +348,43 @@ void TrayView::MouseDown(BPoint where) { BWindow *window = Window(); /*To handle the MouseDown message*/ if (!window) /*Check for proper instantiation*/ return; - + BMessage *mouseMsg = window->CurrentMessage(); if (!mouseMsg) /*Check for existence*/ return; - + if (mouseMsg->what == B_MOUSE_DOWN) { /*Variables for storing the button pressed / modifying key*/ uint32 buttons = 0; uint32 modifiers = 0; - + /*Get the button pressed*/ mouseMsg->FindInt32("buttons", (int32 *) &buttons); /*Get modifier key (if any)*/ mouseMsg->FindInt32("modifiers", (int32 *) &modifiers); - + /*Now perform action*/ switch(buttons) { case B_PRIMARY_MOUSE_BUTTON: { SetActive(!_settings->Active()); - + break; } - case B_SECONDARY_MOUSE_BUTTON: + case B_SECONDARY_MOUSE_BUTTON: { ConvertToScreen(&where); //menu will delete itself (see constructor of ConfigMenu), //so all we're concerned about is calling Go() asynchronously ConfigMenu *menu = new ConfigMenu(this, false); - menu->Go(where, true, true, ConvertToScreen(Bounds()), true); + menu->Go(where, true, true, ConvertToScreen(Bounds()), true); break; } } } -} +} int32 fronter(void *arg) @@ -449,13 +453,13 @@ int32 poller(void *arg) if ((wi->window_left > wi->window_right) || (wi->window_top > wi->window_bottom)) goto zzz; // invalid window ? /* -printf("if (!%s && (%li, %li)isin(%li)(%li, %li, %li, %li) && (%li != %li) ", wi->is_mini?"true":"false", +printf("if (!%s && (%li, %li)isin(%li)(%li, %li, %li, %li) && (%li != %li) ", wi->is_mini?"true":"false", (long)mouse.x, (long)mouse.y, i, wi->window_left, wi->window_right, wi->window_top, wi->window_bottom, wi->id, tok); */ - if ((!wi->is_mini) - && (((long)mouse.x) > wi->window_left) && (((long)mouse.x) < wi->window_right) + if ((!wi->is_mini) + && (((long)mouse.x) > wi->window_left) && (((long)mouse.x) < wi->window_right) && (((long)mouse.y) > wi->window_top) && (((long)mouse.y) < wi->window_bottom)) { //((tv->_settings->Mode() != Mode_DeskbarOver) || (wi->team == tv->fDeskbarTeam)) @@ -502,9 +506,9 @@ void TrayView::MessageReceived(BMessage* message) bool wasactive; BPoint mouse; uint32 buttons; - + switch(message->what) - { + { case MSG_TOOGLE_ACTIVE: SetActive(!_settings->Active()); break; @@ -539,17 +543,17 @@ void TrayView::MessageReceived(BMessage* message) { thread_id tid = spawn_thread(removeFromDeskbar, "RemoveFromDeskbar", B_NORMAL_PRIORITY, NULL); if (tid) resume_thread(tid); - + break; } case B_ABOUT_REQUESTED: - alert = new BAlert("about box", "AutoRaise, (c) 2002, mmu_man\nEnjoy :-)", "Ok", NULL, NULL, + alert = new BAlert("about box", "AutoRaise, (c) 2002, mmu_man\nEnjoy :-)", "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_OFFSET_SPACING, B_INFO_ALERT); alert->SetShortcut(0, B_ENTER); alert->Go(NULL); // use asynchronous version break; case OPEN_SETTINGS: - + break; #ifdef USE_DANO_HACK case B_SOME_WINDOW_ACTIVATED: diff --git a/src/apps/bootman/BootManager.cpp b/src/apps/bootman/BootManager.cpp index c41ccc1864..361f672997 100644 --- a/src/apps/bootman/BootManager.cpp +++ b/src/apps/bootman/BootManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008, Haiku, Inc. All rights reserved. + * Copyright 2008-2009, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. * * Authors: @@ -46,7 +46,7 @@ BootManager::AboutRequested() { BAlert *alert = new BAlert("about", "Haiku Boot Manager\n\n" "\twritten by Michael Pfeiffer\n" - "\tCopyright 2008, Haiku Inc.\n", "Ok"); + "\tCopyright 2008, Haiku Inc.\n", "OK"); BTextView *view = alert->TextView(); BFont font; diff --git a/src/apps/bootman/BootManagerController.cpp b/src/apps/bootman/BootManagerController.cpp index e28154afd3..5e97eb9d2f 100644 --- a/src/apps/bootman/BootManagerController.cpp +++ b/src/apps/bootman/BootManagerController.cpp @@ -1,7 +1,7 @@ /* - * Copyright 2008, Haiku, Inc. All rights reserved. + * Copyright 20082009, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. - * + * * Authors: * Michael Pfeiffer */ @@ -39,14 +39,14 @@ BootManagerController::BootManagerController() #if USE_TEST_BOOT_DRIVE fBootDrive = new TestBootDrive(); #else - fBootDrive = new LegacyBootDrive(); + fBootDrive = new LegacyBootDrive(); #endif // set defaults fSettings.AddBool("install", true); fSettings.AddInt32("defaultPartition", 0); fSettings.AddInt32("timeout", -1); - + BPath path; if (find_directory(B_USER_SETTINGS_DIRECTORY, &path, true) == B_OK) { path.Append("bootman/MBR"); @@ -56,11 +56,11 @@ BootManagerController::BootManagerController() if (path.GetParent(&parent) == B_OK) { BDirectory directory; directory.CreateDirectory(parent.Path(), NULL); - } + } } else { fSettings.AddString("file", ""); } - + fReadPartitionsStatus = fBootDrive->ReadPartitions(&fSettings); } @@ -100,23 +100,23 @@ BootManagerController::NextState(int32 state) case kStateErrorEntry: be_app->PostMessage(B_QUIT_REQUESTED); break; - + case kStateSaveMBR: - if (_SaveMBR()) + if (_SaveMBR()) return kStateMBRSaved; break; - + case kStateMBRSaved: return kStatePartitions; - + case kStatePartitions: if (_HasSelectedPartitions()) return kStateDefaultPartitions; break; - + case kStateDefaultPartitions: return kStateInstallSummary; - + case kStateInstallSummary: if (_WriteBootMenu()) return kStateInstalled; @@ -125,7 +125,7 @@ BootManagerController::NextState(int32 state) case kStateInstalled: be_app->PostMessage(B_QUIT_REQUESTED); break; - + case kStateUninstall: if (_RestoreMBR()) return kStateUninstalled; @@ -134,7 +134,7 @@ BootManagerController::NextState(int32 state) case kStateUninstalled: be_app->PostMessage(B_QUIT_REQUESTED); break; - } + } // cannot leave the current state/page return -1; } @@ -147,13 +147,13 @@ BootManagerController::_HasSelectedPartitions() for (int32 i = 0; fSettings.FindMessage("partition", i, &message) == B_OK; i ++) { bool show; if (message.FindBool("show", &show) == B_OK && show) - return true; + return true; } - - BAlert* alert = new BAlert("info", "At least one partition must be selected!", - "OK"); + + BAlert* alert = new BAlert("info", "At least one partition must be " + "selected!", "OK"); alert->Go(); - + return false; } @@ -162,12 +162,12 @@ bool BootManagerController::_WriteBootMenu() { BAlert* alert = new BAlert("confirm", "About to write the boot menu " - "to disk. Are you sure you want to continue?", "Write Boot Menu", "Back", - NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); - + "to disk. Are you sure you want to continue?", "Write boot menu", + "Back", NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); + if (alert->Go() == 1) return false; - + fWriteBootMenuStatus = fBootDrive->WriteBootMenu(&fSettings); return true; } @@ -179,7 +179,7 @@ BootManagerController::_SaveMBR() BString path; fSettings.FindString("file", &path); BFile file(path.String(), B_READ_WRITE | B_CREATE_FILE | B_ERASE_FILE); - fSaveMBRStatus = fBootDrive->SaveMasterBootRecord(&fSettings, &file); + fSaveMBRStatus = fBootDrive->SaveMasterBootRecord(&fSettings, &file); return true; } @@ -191,19 +191,19 @@ BootManagerController::_RestoreMBR() BString path; fSettings.FindString("disk", &disk); fSettings.FindString("file", &path); - + BString message; message << "About to restore the Master Boot Record (MBR) of " << disk << " from " << path << ". " "Do you wish to continue?"; - BAlert* alert = new BAlert("confirm", message.String(), + BAlert* alert = new BAlert("confirm", message.String(), "Restore MBR", "Back", NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); if (alert->Go() == 1) return false; BFile file(path.String(), B_READ_ONLY); - fRestoreMBRStatus = fBootDrive->RestoreMasterBootRecord(&fSettings, &file); + fRestoreMBRStatus = fBootDrive->RestoreMasterBootRecord(&fSettings, &file); return true; } @@ -213,7 +213,7 @@ BootManagerController::CreatePage(int32 state, WizardView* wizard) { WizardPageView* page = NULL; BRect frame = wizard->PageFrame(); - + switch (state) { case kStateEntry: page = new EntryPage(&fSettings, frame, "entry"); @@ -257,7 +257,7 @@ BootManagerController::CreatePage(int32 state, WizardView* wizard) wizard->SetNextButtonLabel("Done"); break; } - + return page; } @@ -268,16 +268,16 @@ BootManagerController::_CreateErrorEntryPage(BRect frame) BString description; if (fReadPartitionsStatus == kErrorBootSectorTooSmall) - description << - "Partition Table Not Compatible\n\n" + description << + "Partition table not compatible\n\n" "The partition table of the first hard disk is not compatible " "with Boot Manager.\n" - "Boot Manager needs 2 KB available space before the first partition."; + "Boot Manager needs 2 KB available space before the first partition."; else - description << - "Error Reading Partition Table\n\n" - "Boot Manager is unable to read the partition table!"; - + description << + "Error reading partition table\n\n" + "Boot Manager is unable to read the partition table!"; + return new DescriptionPage(frame, "errorEntry", description.String(), true); } @@ -288,8 +288,8 @@ BootManagerController::_CreateSaveMBRPage(BRect frame) BString description; BString disk; fSettings.FindString("disk", &disk); - - description << + + description << "Backup Master Boot Record\n\n" "The Master Boot Record (MBR) of the boot device:\n" "\t" << disk << "\n" @@ -297,9 +297,9 @@ BootManagerController::_CreateSaveMBRPage(BRect frame) "save the MBR into.\n\n" "If something goes wrong with the installation or if " "you later wish to remove the boot menu, simply run the " - "bootman program and choose the 'Uninstall' option."; - - return new FileSelectionPage(&fSettings, frame, "saveMBR", description.String(), + "bootman program and choose the 'Uninstall' option."; + + return new FileSelectionPage(&fSettings, frame, "saveMBR", description.String(), B_SAVE_PANEL); } @@ -310,19 +310,19 @@ BootManagerController::_CreateMBRSavedPage(BRect frame) BString description; BString file; fSettings.FindString("file", &file); - + if (fSaveMBRStatus == B_OK) { - description << - "Old Master Boot Record Saved\n\n" + description << + "Old Master Boot Record saved\n\n" "The old Master Boot Record was successfully save to " - << file << ".\n"; + << file << ".\n"; } else { - description << - "Old Master Boot Record Saved Failure\n\n" + description << + "Old Master Boot Record Saved failure\n\n" "The old Master Boot Record could not be saved to " - << file << ".\n"; + << file << ".\n"; } - + return new DescriptionPage(frame, "summary", description.String(), true); } @@ -333,8 +333,8 @@ BootManagerController::_CreateInstallSummaryPage(BRect frame) BString description; BString disk; fSettings.FindString("disk", &disk); - - description << + + description << "Summary\n\n" "About to write the following boot menu to the boot disk " "(" << disk << "). Please verify the information below " @@ -342,18 +342,18 @@ BootManagerController::_CreateInstallSummaryPage(BRect frame) BMessage message; for (int32 i = 0; fSettings.FindMessage("partition", i, &message) == B_OK; i ++) { - + bool show; if (message.FindBool("show", &show) != B_OK || !show) continue; - + BString name; BString path; message.FindString("name", &name); message.FindString("path", &path); description << name << "\t(" << path << ")\n"; } - + return new DescriptionPage(frame, "summary", description.String(), true); } @@ -362,17 +362,17 @@ WizardPageView* BootManagerController::_CreateInstalledPage(BRect frame) { const char* description; - + if (fWriteBootMenuStatus == B_OK) { - description = "Installation Boot Menu Completed\n\n" + description = "Installation of boot menu completed\n\n" "The boot manager has been successfully installed " "on your system."; } else { - description = "Installation Boot Menu Failed\n\n" + description = "Installation of boot menu failed\n\n" "An error occured writing the boot menu. The Master Boot Record " "might be destroyed, you should restore the MBR now!"; } - + return new DescriptionPage(frame, "done", description, true); } @@ -381,19 +381,19 @@ WizardPageView* BootManagerController::_CreateUninstallPage(BRect frame) { BString description; - - description << - "Uninstall Boot Manager\n\n" + + description << + "Uninstall boot manager\n\n" "Please locate the Master Boot Record (MBR) save file to " "restore from. This is the file that was created when the " "boot manager was first installed."; - + return new FileSelectionPage(&fSettings, frame, "restoreMBR", description.String(), B_OPEN_PANEL); } -WizardPageView* +WizardPageView* BootManagerController::_CreateUninstalledPage(BRect frame) { BString description; @@ -401,18 +401,18 @@ BootManagerController::_CreateUninstalledPage(BRect frame) BString file; fSettings.FindString("disk", &disk); fSettings.FindString("file", &file); - + if (fRestoreMBRStatus == B_OK) { - description << - "Uninstallation Boot Menu Completed\n\n" - "The Master Boot Record of the boot device " + description << + "Uninstallation of boot menu completed\n\n" + "The Master Boot Record of the boot device " "(" << disk << ") has been successfully restored from " << file << "."; } else { description << - "Uninstallation Boot Menu Failed\n\n" + "Uninstallation of boot menu failed\n\n" "The Master Boot Record could not be restored!"; } - + return new DescriptionPage(frame, "summary", description.String(), true); } diff --git a/src/apps/bootman/EntryPage.cpp b/src/apps/bootman/EntryPage.cpp index 182fc2162e..717cfaee6a 100644 --- a/src/apps/bootman/EntryPage.cpp +++ b/src/apps/bootman/EntryPage.cpp @@ -1,7 +1,7 @@ /* - * Copyright 2008, Haiku, Inc. All rights reserved. + * Copyright 2008-2009, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. - * + * * Authors: * Michael Pfeiffer */ @@ -17,7 +17,7 @@ EntryPage::EntryPage(BMessage* settings, BRect frame, const char* name) - : WizardPageView(settings, frame, name, B_FOLLOW_ALL, + : WizardPageView(settings, frame, name, B_FOLLOW_ALL, B_WILL_DRAW | B_FRAME_EVENTS | B_FULL_UPDATE_ON_RESIZE) { _BuildUI(); @@ -49,8 +49,8 @@ void EntryPage::_BuildUI() { BRect rect(Bounds()); - - fInstall = new BRadioButton(rect, "install", + + fInstall = new BRadioButton(rect, "install", "", new BMessage('null')); AddChild(fInstall); @@ -58,24 +58,24 @@ EntryPage::_BuildUI() BRect textRect(rect); textRect.left = fInstall->Frame().right + kTextDistance; - - fInstallText = CreateDescription(textRect, "installText", - "Install Boot Menu\n\n" + + fInstallText = CreateDescription(textRect, "installText", + "Install boot menu\n\n" "Choose this option to install a boot menu, " "allowing you to select which operating " "system to boot when you turn on your " "computer.\n"); MakeHeading(fInstallText); AddChild(fInstallText); - - fUninstall = new BRadioButton(rect, "uninstall", + + fUninstall = new BRadioButton(rect, "uninstall", "", new BMessage('null')); AddChild(fUninstall); fUninstall->ResizeToPreferred(); - + fUninstallText = CreateDescription(textRect, "uninstallText", - "Uninstall Boot Menu\n\n" + "Uninstall boot menu\n\n" "Choose this option to remove the boot menu " "previously installed by this program.\n" ); @@ -84,12 +84,12 @@ EntryPage::_BuildUI() bool install; fSettings->FindBool("install", &install); - + if (install) fInstall->SetValue(1); else fUninstall->SetValue(1); - + _Layout(); } @@ -98,11 +98,11 @@ void EntryPage::_Layout() { LayoutDescriptionVertically(fInstallText); - + float left = fUninstall->Frame().left; float top = fInstallText->Frame().bottom; fUninstall->MoveTo(left, top); - + left = fUninstallText->Frame().left; fUninstallText->MoveTo(left, top); diff --git a/src/apps/charactermap/CharacterMap.cpp b/src/apps/charactermap/CharacterMap.cpp index bdc6260fde..cb5ef5e206 100644 --- a/src/apps/charactermap/CharacterMap.cpp +++ b/src/apps/charactermap/CharacterMap.cpp @@ -56,7 +56,7 @@ CharacterMap::AboutRequested() { BAlert *alert = new BAlert("about", "CharacterMap\n" "\twritten by Axel Dörfler\n" - "\tCopyright 2009, Haiku Inc.\n", "Ok"); + "\tCopyright 2009, Haiku, Inc.\n", "OK"); BTextView *view = alert->TextView(); BFont font; diff --git a/src/apps/charactermap/CharacterView.cpp b/src/apps/charactermap/CharacterView.cpp index 01826b2afb..e840b4867e 100644 --- a/src/apps/charactermap/CharacterView.cpp +++ b/src/apps/charactermap/CharacterView.cpp @@ -250,11 +250,11 @@ CharacterView::MouseDown(BPoint where) BMessage* message = new BMessage(B_COPY); message->AddInt32("character", fCurrentCharacter); - menu->AddItem(new BMenuItem("Copy Character", message, 'C')); + menu->AddItem(new BMenuItem("Copy character", message, 'C')); message = new BMessage(kMsgCopyAsEscapedString); message->AddInt32("character", fCurrentCharacter); - menu->AddItem(new BMenuItem("Copy As Escaped Byte String", + menu->AddItem(new BMenuItem("Copy as escaped byte string", message, 'C', B_SHIFT_KEY)); menu->SetTargetForItems(this); diff --git a/src/apps/charactermap/CharacterWindow.cpp b/src/apps/charactermap/CharacterWindow.cpp index 99e52e378a..8503890636 100644 --- a/src/apps/charactermap/CharacterWindow.cpp +++ b/src/apps/charactermap/CharacterWindow.cpp @@ -184,7 +184,7 @@ CharacterWindow::CharacterWindow() BScrollView* characterScroller = new BScrollView("characterScroller", fCharacterView, 0, false, true); - fFontSizeSlider = new FontSizeSlider("fontSizeSlider", "Font Size:", + fFontSizeSlider = new FontSizeSlider("fontSizeSlider", "Font size:", new BMessage(kMsgFontSizeChanged), kMinFontSize, kMaxFontSize); fFontSizeSlider->SetValue(fontSize); @@ -223,12 +223,12 @@ CharacterWindow::CharacterWindow() menuBar->AddItem(menu); menu = new BMenu("View"); - menu->AddItem(item = new BMenuItem("Show Private Blocks", + menu->AddItem(item = new BMenuItem("Show private blocks", new BMessage(kMsgPrivateBlocks))); item->SetMarked(fCharacterView->IsShowingPrivateBlocks()); // TODO: this feature is not yet supported by Haiku! #if 0 - menu->AddItem(item = new BMenuItem("Only Show Blocks Contained in Font", + menu->AddItem(item = new BMenuItem("Only show blocks contained in font", new BMessage(kMsgContainedBlocks))); item->SetMarked(fCharacterView->IsShowingContainedBlocksOnly()); #endif diff --git a/src/apps/charactermap/UnicodeBlocks.cpp b/src/apps/charactermap/UnicodeBlocks.cpp index f2d492e87f..d36391fb32 100644 --- a/src/apps/charactermap/UnicodeBlocks.cpp +++ b/src/apps/charactermap/UnicodeBlocks.cpp @@ -11,25 +11,25 @@ const unicode_block kNoBlock; const struct unicode_block_entry kUnicodeBlocks[] = { {"Basic Latin", 0x0000, 0x007f, false, B_BASIC_LATIN_BLOCK}, - {"Latin-1 Supplement", 0x0080, 0x00ff, false, B_LATIN1_SUPPLEMENT_BLOCK}, - {"Latin Extended A", 0x0100, 0x017f, false, B_LATIN_EXTENDED_A_BLOCK}, - {"Latin Extended B", 0x0180, 0x024f, false, B_LATIN_EXTENDED_B_BLOCK}, - {"IPA Extensions", 0x0250, 0x02af, false, B_IPA_EXTENSIONS_BLOCK}, - {"Spacing Modifier Letters", 0x02b0, 0x02ff, false, + {"Latin-1 supplement", 0x0080, 0x00ff, false, B_LATIN1_SUPPLEMENT_BLOCK}, + {"Latin extended A", 0x0100, 0x017f, false, B_LATIN_EXTENDED_A_BLOCK}, + {"Latin extended B", 0x0180, 0x024f, false, B_LATIN_EXTENDED_B_BLOCK}, + {"IPA extensions", 0x0250, 0x02af, false, B_IPA_EXTENSIONS_BLOCK}, + {"Spacing modifier letters", 0x02b0, 0x02ff, false, B_SPACING_MODIFIER_LETTERS_BLOCK}, - {"Combining Diacritical Marks", 0x0300, 0x036f, false, + {"Combining diacritical marks", 0x0300, 0x036f, false, B_COMBINING_DIACRITICAL_MARKS_BLOCK}, {"Greek and Coptic", 0x0370, 0x03ff, false, B_BASIC_GREEK_BLOCK | B_GREEK_SYMBOLS_AND_COPTIC_BLOCK}, {"Cyrillic", 0x0400, 0x04ff, false, B_CYRILLIC_BLOCK}, - {"Cyrillic Supplement", 0x0500, 0x052f, false, B_CYRILLIC_BLOCK}, + {"Cyrillic supplement", 0x0500, 0x052f, false, B_CYRILLIC_BLOCK}, {"Armenian", 0x0530, 0x058f, false, B_ARMENIAN_BLOCK}, {"Hebrew", 0x0590, 0x05ff, false, B_BASIC_HEBREW_BLOCK | B_HEBREW_EXTENDED_BLOCK}, {"Arabic", 0x0600, 0x06ff, false, B_BASIC_ARABIC_BLOCK | B_ARABIC_EXTENDED_BLOCK}, {"Syriac", 0x0700, 0x074f, false, kNoBlock}, - {"Arabic Supplement", 0x0750, 0x077f, false, kNoBlock}, + {"Arabic supplement", 0x0750, 0x077f, false, kNoBlock}, {"Thaana", 0x0780, 0x07bf, false, kNoBlock}, {"N'Ko", 0x07c0, 0x07ff, false, kNoBlock}, {"Devanagari", 0x0900, 0x097f, false, B_DEVANAGARI_BLOCK}, @@ -50,9 +50,9 @@ const struct unicode_block_entry kUnicodeBlocks[] = { {"Hangul Jamo", 0x1100, 0x11ff, false, kNoBlock}, // TODO! {"Ethiopic", 0x1200, 0x137f, false, kNoBlock}, - {"Ethiopic Supplement", 0x1380, 0x139f, false, kNoBlock}, + {"Ethiopic supplement", 0x1380, 0x139f, false, kNoBlock}, {"Cherokee", 0x13a0, 0x13ff, false, kNoBlock}, - {"Unified Canadian Aboriginal Syllabics", 0x1400, 0x167f, false, kNoBlock}, + {"Unified Canadian Aboriginal syllabics", 0x1400, 0x167f, false, kNoBlock}, {"Ogham", 0x1680, 0x169f, false, kNoBlock}, {"Runic", 0x16a0, 0x16ff, false, kNoBlock}, {"Tagalog", 0x1700, 0x171f, false, kNoBlock}, @@ -64,131 +64,131 @@ const struct unicode_block_entry kUnicodeBlocks[] = { {"Limbu", 0x1900, 0x194f, false, kNoBlock}, {"Tai Le", 0x1950, 0x197f, false, kNoBlock}, {"New Tai Lue", 0x1980, 0x19df, false, kNoBlock}, - {"Khmer Symbols", 0x19e0, 0x19ff, false, kNoBlock}, + {"Khmer symbols", 0x19e0, 0x19ff, false, kNoBlock}, {"Buginese", 0x1a00, 0x1a1f, false, kNoBlock}, {"Balinese", 0x1b00, 0x1b7f, false, kNoBlock}, {"Sundanese", 0x1b80, 0x1bbf, false, kNoBlock}, {"Lepcha", 0x1c00, 0x1c4f, false, kNoBlock}, {"Ol Chiki", 0x1c50, 0x1c7f, false, kNoBlock}, - {"Phonetic Extensions", 0x1d00, 0x1d7f, false, kNoBlock}, - {"Phonetic Extensions Supplement", 0x1d80, 0x1dbf, false, kNoBlock}, - {"Combining Diacritical Marks Supplement", 0x1dc0, 0x1dff, false, kNoBlock}, - {"Latin Extended Additional", 0x1e00, 0x1eff, false, kNoBlock}, - {"Greek Extended", 0x1f00, 0x1fff, false, kNoBlock}, - {"General Punctuation", 0x2000, 0x206f, false, kNoBlock}, - {"Superscripts and Subscripts", 0x2070, 0x209f, false, kNoBlock}, - {"Currency Symbols", 0x20a0, 0x20cf, false, kNoBlock}, - {"Combining Diacritical Marks for Symbols", 0x20d0, 0x20ff, false, + {"Phonetic extensions", 0x1d00, 0x1d7f, false, kNoBlock}, + {"Phonetic extensions supplement", 0x1d80, 0x1dbf, false, kNoBlock}, + {"Combining diacritical marks supplement", 0x1dc0, 0x1dff, false, kNoBlock}, + {"Latin extended additional", 0x1e00, 0x1eff, false, kNoBlock}, + {"Greek extended", 0x1f00, 0x1fff, false, kNoBlock}, + {"General punctuation", 0x2000, 0x206f, false, kNoBlock}, + {"Superscripts and subscripts", 0x2070, 0x209f, false, kNoBlock}, + {"Currency symbols", 0x20a0, 0x20cf, false, kNoBlock}, + {"Combining diacritical marks for symbols", 0x20d0, 0x20ff, false, kNoBlock}, - {"Letterlike Symbols", 0x2100, 0x214f, false, kNoBlock}, - {"Number Forms", 0x2150, 0x218f, false, kNoBlock}, + {"Letterlike symbols", 0x2100, 0x214f, false, kNoBlock}, + {"Number forms", 0x2150, 0x218f, false, kNoBlock}, {"Arrows", 0x2190, 0x21ff, false, kNoBlock}, - {"Mathematical Operators", 0x2200, 0x22ff, false, kNoBlock}, - {"Miscellaneous Technical", 0x2300, 0x23ff, false, kNoBlock}, - {"Control Pictures", 0x2400, 0x243f, false, kNoBlock}, - {"Optical Character Recognition", 0x2440, 0x245f, false, kNoBlock}, - {"Enclosed Alphanumerics", 0x2460, 0x24ff, false, kNoBlock}, - {"Box Drawing", 0x2500, 0x257f, false, kNoBlock}, - {"Block Elements", 0x2580, 0x259f, false, kNoBlock}, - {"Geometric Shapes", 0x25a0, 0x25ff, false, kNoBlock}, - {"Miscellaneous Symbols", 0x2600, 0x26ff, false, kNoBlock}, + {"Mathematical operators", 0x2200, 0x22ff, false, kNoBlock}, + {"Miscellaneous technical", 0x2300, 0x23ff, false, kNoBlock}, + {"Control pictures", 0x2400, 0x243f, false, kNoBlock}, + {"Optical character recognition", 0x2440, 0x245f, false, kNoBlock}, + {"Enclosed alphanumerics", 0x2460, 0x24ff, false, kNoBlock}, + {"Box drawing", 0x2500, 0x257f, false, kNoBlock}, + {"Block elements", 0x2580, 0x259f, false, kNoBlock}, + {"Geometric shapes", 0x25a0, 0x25ff, false, kNoBlock}, + {"Miscellaneous symbols", 0x2600, 0x26ff, false, kNoBlock}, {"Dingbats", 0x2700, 0x27bf, false, kNoBlock}, - {"Miscellaneous Mathematical Symbols A", 0x27c0, 0x27ef, false, kNoBlock}, - {"Supplemental Arrows A", 0x27f0, 0x27ff, false, kNoBlock}, - {"Braille Patterns", 0x2800, 0x28ff, false, kNoBlock}, - {"Supplemental Arrows B", 0x2900, 0x297f, false, kNoBlock}, - {"Miscellaneous Mathematical Symbols B", 0x2980, 0x29ff, false, kNoBlock}, - {"Supplemental Mathematical Operators", 0x2a00, 0x2aff, false, kNoBlock}, - {"Miscellaneous Symbols And Arrows", 0x2b00, 0x2bff, false, kNoBlock}, + {"Miscellaneous mathematical symbols A", 0x27c0, 0x27ef, false, kNoBlock}, + {"Supplemental arrows A", 0x27f0, 0x27ff, false, kNoBlock}, + {"Braille patterns", 0x2800, 0x28ff, false, kNoBlock}, + {"Supplemental arrows B", 0x2900, 0x297f, false, kNoBlock}, + {"Miscellaneous mathematical symbols B", 0x2980, 0x29ff, false, kNoBlock}, + {"Supplemental mathematical operators", 0x2a00, 0x2aff, false, kNoBlock}, + {"Miscellaneous symbols and arrows", 0x2b00, 0x2bff, false, kNoBlock}, {"Glagotic", 0x2c00, 0x2c5f, false, kNoBlock}, - {"Latin Extended C", 0x2c60, 0x2c7f, false, kNoBlock}, + {"Latin extended C", 0x2c60, 0x2c7f, false, kNoBlock}, {"Coptic", 0x2c80, 0x2cff, false, kNoBlock}, - {"Georgian Supplement", 0x2d00, 0x2d2f, false, kNoBlock}, + {"Georgian supplement", 0x2d00, 0x2d2f, false, kNoBlock}, {"Tifinagh", 0x2d30, 0x2d7f, false, kNoBlock}, - {"Ethiopic Extended", 0x2d80, 0x2ddf, false, kNoBlock}, - {"Cyrillic Extended A", 0x2de0, 0x2dff, false, kNoBlock}, - {"Supplement Punctuation", 0x2e00, 0x2e7f, false, kNoBlock}, - {"CJK Radicals Supplement", 0x2e80, 0x2eff, false, kNoBlock}, - {"Kangxi Radicals", 0x2f00, 0x2fdf, false, kNoBlock}, - {"Ideographic Description Characters", 0x2ff0, 0x2fff, false, kNoBlock}, - {"CJK Symbols and Punctuation", 0x3000, 0x303f, false, kNoBlock}, + {"Ethiopic extended", 0x2d80, 0x2ddf, false, kNoBlock}, + {"Cyrillic extended A", 0x2de0, 0x2dff, false, kNoBlock}, + {"Supplement punctuation", 0x2e00, 0x2e7f, false, kNoBlock}, + {"CJK radicals supplement", 0x2e80, 0x2eff, false, kNoBlock}, + {"Kangxi radicals", 0x2f00, 0x2fdf, false, kNoBlock}, + {"Ideographic description characters", 0x2ff0, 0x2fff, false, kNoBlock}, + {"CJK symbols and punctuation", 0x3000, 0x303f, false, kNoBlock}, {"Hiragana", 0x3040, 0x309f, false, kNoBlock}, {"Katakana", 0x30a0, 0x30ff, false, kNoBlock}, {"Bopomofo", 0x3100, 0x312f, false, kNoBlock}, - {"Hangul Compatibility Jamo", 0x3130, 0x318f, false, kNoBlock}, + {"Hangul compatibility Jamo", 0x3130, 0x318f, false, kNoBlock}, {"Kanbun", 0x3190, 0x319f, false, kNoBlock}, - {"Bopomofo Extended", 0x31a0, 0x31bf, false, kNoBlock}, - {"CJK Strokes", 0x31c0, 0x31ef, false, kNoBlock}, - {"Katakana Phonetic Extensions", 0x31f0, 0x31ff, false, kNoBlock}, - {"Enclosed CJK Letters and Months", 0x3200, 0x32ff, false, kNoBlock}, - {"CJK Compatibility", 0x3300, 0x33ff, false, kNoBlock}, - {"CJK Unified Ideographs Extension A", 0x3400, 0x4dbf, false, kNoBlock}, - {"Yijing Hexagram Symbols", 0x4dc0, 0x4dff, false, kNoBlock}, - {"CJK Unified Ideographs", 0x4e00, 0x9fff, false, kNoBlock}, - {"Yi Syllables", 0xa000, 0xa48f, false, kNoBlock}, + {"Bopomofo extended", 0x31a0, 0x31bf, false, kNoBlock}, + {"CJK strokes", 0x31c0, 0x31ef, false, kNoBlock}, + {"Katakana phonetic extensions", 0x31f0, 0x31ff, false, kNoBlock}, + {"Enclosed CJK letters and months", 0x3200, 0x32ff, false, kNoBlock}, + {"CJK compatibility", 0x3300, 0x33ff, false, kNoBlock}, + {"CJK unified ideographs extension A", 0x3400, 0x4dbf, false, kNoBlock}, + {"Yijing hexagram symbols", 0x4dc0, 0x4dff, false, kNoBlock}, + {"CJK unified ideographs", 0x4e00, 0x9fff, false, kNoBlock}, + {"Yi syllables", 0xa000, 0xa48f, false, kNoBlock}, {"Yi Radicals", 0xa490, 0xa4cf, false, kNoBlock}, {"Vai", 0xa500, 0xa63f, false, kNoBlock}, - {"Cyrillic Extended B", 0xa640, 0xa69f, false, kNoBlock}, - {"Modifier Tone Letters", 0xa700, 0xa71f, false, kNoBlock}, - {"Latin Extended D", 0xa720, 0xa7ff, false, kNoBlock}, + {"Cyrillic extended B", 0xa640, 0xa69f, false, kNoBlock}, + {"Modifier tone letters", 0xa700, 0xa71f, false, kNoBlock}, + {"Latin extended D", 0xa720, 0xa7ff, false, kNoBlock}, {"Syloti Nagri", 0xa800, 0xa82f, false, kNoBlock}, {"Phags-pa", 0xa840, 0xa87f, false, kNoBlock}, {"Saurashtra", 0xa880, 0xa8df, false, kNoBlock}, {"Kayah Li", 0xa900, 0xa92f, false, kNoBlock}, {"Rejang", 0xa930, 0xa95f, false, kNoBlock}, {"Cham", 0xaa00, 0xaa5f, false, kNoBlock}, - {"Hangul Syllables", 0xac00, 0xd7af, false, kNoBlock}, -// {"High Surrogates", 0xd800, 0xdb7f, false, kNoBlock}, -// {"High Private Use Surrogates", 0xdb80, 0xdbff, false, kNoBlock}, -// {"Low Surrogates", 0xdc00, 0xdfff, false, kNoBlock}, - {"Private Use Area", 0xe000, 0xf8ff, true, kNoBlock}, - {"CJK Compatibility Ideographs", 0xf900, 0xfaff, false, kNoBlock}, - {"Alphabetic Presentation Forms", 0xfb00, 0xfb4f, false, kNoBlock}, - {"Arabic Presentation Forms A", 0xfb50, 0xfdff, false, kNoBlock}, - {"Variation Selectors", 0xfe00, 0xfe0f, false, kNoBlock}, - {"Vertical Forms", 0xfe10, 0xfe1f, false, kNoBlock}, - {"Combining Half Marks", 0xfe20, 0xfe2f, false, kNoBlock}, - {"CJK Compatibility Forms", 0xfe30, 0xfe4f, false, kNoBlock}, - {"Small Form Variants", 0xfe50, 0xfe6f, false, kNoBlock}, - {"Arabic Presentation Forms B", 0xfe70, 0xfeff, false, kNoBlock}, - {"Halfwidth and Fullwidth Forms", 0xff00, 0xffef, false, kNoBlock}, + {"Hangul syllables", 0xac00, 0xd7af, false, kNoBlock}, +// {"High surrogates", 0xd800, 0xdb7f, false, kNoBlock}, +// {"High private use surrogates", 0xdb80, 0xdbff, false, kNoBlock}, +// {"Low surrogates", 0xdc00, 0xdfff, false, kNoBlock}, + {"Private use area", 0xe000, 0xf8ff, true, kNoBlock}, + {"CJK compatibility ideographs", 0xf900, 0xfaff, false, kNoBlock}, + {"Alphabetic presentation forms", 0xfb00, 0xfb4f, false, kNoBlock}, + {"Arabic presentation forms A", 0xfb50, 0xfdff, false, kNoBlock}, + {"Variation selectors", 0xfe00, 0xfe0f, false, kNoBlock}, + {"Vertical forms", 0xfe10, 0xfe1f, false, kNoBlock}, + {"Combining half marks", 0xfe20, 0xfe2f, false, kNoBlock}, + {"CJK compatibility forms", 0xfe30, 0xfe4f, false, kNoBlock}, + {"Small form variants", 0xfe50, 0xfe6f, false, kNoBlock}, + {"Arabic presentation forms B", 0xfe70, 0xfeff, false, kNoBlock}, + {"Halfwidth and fullwidth forms", 0xff00, 0xffef, false, kNoBlock}, {"Specials", 0xfff0, 0xffff, false, kNoBlock}, - {"Linear B Syllabary", 0x010000, 0x01007f, false, kNoBlock}, - {"Linear B Ideograms", 0x010080, 0x0100ff, false, kNoBlock}, - {"Aegean Numbers", 0x010100, 0x01013f, false, kNoBlock}, - {"Ancient Greek Numbers", 0x010140, 0x01018f, false, kNoBlock}, - {"Ancient Symbols", 0x010190, 0x0101cf, false, kNoBlock}, - {"Phaistos Disc", 0x0101d0, 0x0101ff, false, kNoBlock}, + {"Linear B syllabary", 0x010000, 0x01007f, false, kNoBlock}, + {"Linear B ideograms", 0x010080, 0x0100ff, false, kNoBlock}, + {"Aegean numbers", 0x010100, 0x01013f, false, kNoBlock}, + {"Ancient Greek numbers", 0x010140, 0x01018f, false, kNoBlock}, + {"Ancient smbols", 0x010190, 0x0101cf, false, kNoBlock}, + {"Phaistos disc", 0x0101d0, 0x0101ff, false, kNoBlock}, {"Lycian", 0x010280, 0x01029f, false, kNoBlock}, {"Carian", 0x0102a0, 0x0102df, false, kNoBlock}, - {"Old Italic", 0x010300, 0x01032f, false, kNoBlock}, + {"Old italic", 0x010300, 0x01032f, false, kNoBlock}, {"Gothic", 0x010330, 0x01034f, false, kNoBlock}, {"Ugaritic", 0x010380, 0x01039f, false, kNoBlock}, {"Old Persian", 0x0103a0, 0x0103df, false, kNoBlock}, {"Deseret", 0x010400, 0x01044f, false, kNoBlock}, {"Shavian", 0x010450, 0x01047f, false, kNoBlock}, {"Osmanya", 0x010480, 0x0104af, false, kNoBlock}, - {"Cypriot Syllabary", 0x010800, 0x01083f, false, kNoBlock}, + {"Cypriot syllabary", 0x010800, 0x01083f, false, kNoBlock}, {"Phoenician", 0x010900, 0x01091f, false, kNoBlock}, {"Lydian", 0x010920, 0x01093f, false, kNoBlock}, {"Kharoshthi", 0x010a00, 0x010a5f, false, kNoBlock}, {"Cuneiform", 0x012000, 0x0123ff, false, kNoBlock}, - {"Cuneiform Numbers and Punctuation", 0x012400, 0x01247f, false, kNoBlock}, - {"Byzantine Musical Symbols", 0x01d000, 0x01d0ff, false, kNoBlock}, - {"Muscial Symbols", 0x01d100, 0x01d1ff, false, kNoBlock}, - {"Ancient Greek Musical Notation", 0x01d200, 0x01d24f, false, kNoBlock}, - {"Tai Xuan Jing Symbols", 0x01d300, 0x01d35f, false, kNoBlock}, - {"Counting Rod Numerals", 0x01d360, 0x01d37f, false, kNoBlock}, - {"Mathematical Alphanumeric Symbols", 0x01d400, 0x01d7ff, false, kNoBlock}, - {"Mahjong Tiles", 0x01f000, 0x01f02f, false, kNoBlock}, - {"Domino Tiles", 0x01f030, 0x01f09f, false, kNoBlock}, - {"CJK Unified Ideographs Extension B", 0x020000, 0x02a6df, false, kNoBlock}, - {"CJK Compatibility Ideographs Supplement", 0x02f800, 0x02fa1f, false, + {"Cuneiform numbers and punctuation", 0x012400, 0x01247f, false, kNoBlock}, + {"Byzantine musical symbols", 0x01d000, 0x01d0ff, false, kNoBlock}, + {"Muscial symbols", 0x01d100, 0x01d1ff, false, kNoBlock}, + {"Ancient Greek musical notation", 0x01d200, 0x01d24f, false, kNoBlock}, + {"Tai Xuan Jing symbols", 0x01d300, 0x01d35f, false, kNoBlock}, + {"Counting rod numerals", 0x01d360, 0x01d37f, false, kNoBlock}, + {"Mathematical alphanumeric symbols", 0x01d400, 0x01d7ff, false, kNoBlock}, + {"Mahjong tiles", 0x01f000, 0x01f02f, false, kNoBlock}, + {"Domino tiles", 0x01f030, 0x01f09f, false, kNoBlock}, + {"CJK unified ideographs extension B", 0x020000, 0x02a6df, false, kNoBlock}, + {"CJK compatibility ideographs Supplement", 0x02f800, 0x02fa1f, false, kNoBlock}, {"Tags", 0x0e0000, 0x0e007f, false, kNoBlock}, - {"Variation Selectors Supplement", 0x0e0100, 0x0e01ef, false, kNoBlock}, - {"Supplementary Private Use Area A", 0x0f0000, 0x0fffff, true, kNoBlock}, - {"Supplementary Private Use Area B", 0x100000, 0x10ffff, true, kNoBlock}, + {"Variation selectors supplement", 0x0e0100, 0x0e01ef, false, kNoBlock}, + {"Supplementary private use area A", 0x0f0000, 0x0fffff, true, kNoBlock}, + {"Supplementary private use area B", 0x100000, 0x10ffff, true, kNoBlock}, }; const uint32 kNumUnicodeBlocks diff --git a/src/apps/codycam/CodyCam.cpp b/src/apps/codycam/CodyCam.cpp index a0de742d67..faaa685bd5 100644 --- a/src/apps/codycam/CodyCam.cpp +++ b/src/apps/codycam/CodyCam.cpp @@ -67,7 +67,7 @@ ErrorAlert(const char* message, status_t err, BWindow *window = NULL) } -status_t +status_t AddTranslationItems(BMenu* intoMenu, uint32 fromType) { @@ -89,33 +89,33 @@ AddTranslationItems(BMenu* intoMenu, uint32 fromType) const translation_format* formats = NULL; int32 num_formats = 0; bool ok = false; - err = use->GetInputFormats(ids[tix], &formats, &num_formats); + err = use->GetInputFormats(ids[tix], &formats, &num_formats); if (err == B_OK) - for (int iix = 0; iix < num_formats; iix++) { - if (formats[iix].type == fromType) { - ok = true; - break; + for (int iix = 0; iix < num_formats; iix++) { + if (formats[iix].type == fromType) { + ok = true; + break; } } if (!ok) continue; - err = use->GetOutputFormats(ids[tix], &formats, &num_formats); + err = use->GetOutputFormats(ids[tix], &formats, &num_formats); if (err == B_OK) - for (int oix = 0; oix < num_formats; oix++) { - if (formats[oix].type != fromType) { - BMessage* itemmsg; + for (int oix = 0; oix < num_formats; oix++) { + if (formats[oix].type != fromType) { + BMessage* itemmsg; itemmsg = new BMessage(msg_translate); itemmsg->AddInt32(translatorIdName, ids[tix]); - itemmsg->AddInt32(translatorTypeName, formats[oix].type); - intoMenu->AddItem(new BMenuItem(formats[oix].name, itemmsg)); - } - } - } - delete[] ids; - return B_OK; -} + itemmsg->AddInt32(translatorTypeName, formats[oix].type); + intoMenu->AddItem(new BMenuItem(formats[oix].name, itemmsg)); + } + } + } + delete[] ids; + return B_OK; +} // #pragma mark - @@ -143,12 +143,12 @@ CodyCam::~CodyCam() fVideoConsumer->Release(); fVideoConsumer = NULL; } - + CALL("CodyCam::~CodyCam - EXIT\n"); } -void +void CodyCam::ReadyToRun() { fWindow = new VideoWindow(BRect(28, 28, 28, 28), @@ -162,12 +162,12 @@ CodyCam::ReadyToRun() -bool +bool CodyCam::QuitRequested() { _TearDownNodes(); snooze(100000); - + return true; } @@ -216,10 +216,10 @@ CodyCam::MessageReceived(BMessage *message) } case msg_about: - (new BAlert("About CodyCam", "CodyCam\n\nThe Original BeOS WebCam", + (new BAlert("About CodyCam", "CodyCam\n\nThe Original BeOS webcam", "Close"))->Go(); break; - + case msg_control_win: // our control window is being asked to go away // set our pointer to NULL @@ -233,7 +233,7 @@ CodyCam::MessageReceived(BMessage *message) } -status_t +status_t CodyCam::_SetUpNodes() { status_t status = B_OK; @@ -241,14 +241,14 @@ CodyCam::_SetUpNodes() /* find the media roster */ fMediaRoster = BMediaRoster::Roster(&status); if (status != B_OK) { - ErrorAlert("Can't find the media roster", status, fWindow); + ErrorAlert("Cannot find the media roster", status, fWindow); return status; } /* find the time source */ status = fMediaRoster->GetTimeSource(&fTimeSourceNode); if (status != B_OK) { - ErrorAlert("Can't get a time source", status, fWindow); + ErrorAlert("Cannot get a time source", status, fWindow); return status; } @@ -256,7 +256,7 @@ CodyCam::_SetUpNodes() INFO("CodyCam acquiring VideoInput node\n"); status = fMediaRoster->GetVideoInput(&fProducerNode); if (status != B_OK) { - ErrorAlert("Can't find a video source. You need a webcam to use CodyCam.", status, fWindow); + ErrorAlert("Cannot find a video source. You need a webcam to use CodyCam.", status, fWindow); return status; } @@ -264,25 +264,25 @@ CodyCam::_SetUpNodes() fVideoConsumer = new VideoConsumer("CodyCam", ((VideoWindow*)fWindow)->VideoView(), ((VideoWindow*)fWindow)->StatusLine(), NULL, 0); if (!fVideoConsumer) { - ErrorAlert("Can't create a video window", B_ERROR, fWindow); + ErrorAlert("Cannot create a video window", B_ERROR, fWindow); return B_ERROR; } /* register the node */ status = fMediaRoster->RegisterNode(fVideoConsumer); if (status != B_OK) { - ErrorAlert("Can't register the video window", status, fWindow); + ErrorAlert("Cannot register the video window", status, fWindow); return status; } fPort = fVideoConsumer->ControlPort(); - + /* find free producer output */ int32 cnt = 0; status = fMediaRoster->GetFreeOutputsFor(fProducerNode, &fProducerOut, 1, &cnt, B_MEDIA_RAW_VIDEO); if (status != B_OK || cnt < 1) { status = B_RESOURCE_UNAVAILABLE; - ErrorAlert("Can't find an available video stream", status, fWindow); + ErrorAlert("Cannot find an available video stream", status, fWindow); return status; } @@ -301,13 +301,13 @@ CodyCam::_SetUpNodes() format.type = B_MEDIA_RAW_VIDEO; media_raw_video_format vid_format = {0, 1, 0, 239, B_VIDEO_TOP_LEFT_RIGHT, 1, 1, {B_RGB32, VIDEO_SIZE_X, VIDEO_SIZE_Y, VIDEO_SIZE_X * 4, 0, 0}}; - format.u.raw_video = vid_format; + format.u.raw_video = vid_format; /* connect producer to consumer */ status = fMediaRoster->Connect(fProducerOut.source, fConsumerIn.destination, &format, &fProducerOut, &fConsumerIn); if (status != B_OK) { - ErrorAlert("Can't connect the video source to the video window", status); + ErrorAlert("Cannot connect the video source to the video window", status); return status; } @@ -315,13 +315,13 @@ CodyCam::_SetUpNodes() /* set time sources */ status = fMediaRoster->SetTimeSourceFor(fProducerNode.node, fTimeSourceNode.node); if (status != B_OK) { - ErrorAlert("Can't set the timesource for the video source", status); + ErrorAlert("Cannot set the time source for the video source", status); return status; } status = fMediaRoster->SetTimeSourceFor(fVideoConsumer->ID(), fTimeSourceNode.node); if (status != B_OK) { - ErrorAlert("Can't set the timesource for the video window", status); + ErrorAlert("Cannot set the time source for the video window", status); return status; } @@ -334,12 +334,12 @@ CodyCam::_SetUpNodes() bigtime_t initLatency = 0; status = fMediaRoster->GetInitialLatencyFor(fProducerNode, &initLatency); if (status < B_OK) { - ErrorAlert("error getting initial latency for fCaptureNode", status); + ErrorAlert("Error getting initial latency for the capture node", status); return status; } initLatency += estimate_max_scheduling_latency(); - + BTimeSource* timeSource = fMediaRoster->MakeTimeSourceFor(fProducerNode); bool running = timeSource->IsRunning(); @@ -350,59 +350,59 @@ CodyCam::_SetUpNodes() status = fMediaRoster->StartTimeSource(fTimeSourceNode, real); if (status != B_OK) { timeSource->Release(); - ErrorAlert("cannot start time source!", status); + ErrorAlert("Cannot start time source!", status); return status; } status = fMediaRoster->SeekTimeSource(fTimeSourceNode, 0, real); if (status != B_OK) { timeSource->Release(); - ErrorAlert("cannot seek time source!", status); + ErrorAlert("Cannot seek time source!", status); return status; } } bigtime_t perf = timeSource->PerformanceTimeFor(real + latency + initLatency); timeSource->Release(); - + /* start the nodes */ status = fMediaRoster->StartNode(fProducerNode, perf); if (status != B_OK) { - ErrorAlert("Can't start the video source", status); + ErrorAlert("Cannot start the video source", status); return status; } status = fMediaRoster->StartNode(fVideoConsumer->Node(), perf); if (status != B_OK) { - ErrorAlert("Can't start the video window", status); + ErrorAlert("Cannot start the video window", status); return status; } - + return status; } -void +void CodyCam::_TearDownNodes() { CALL("CodyCam::_TearDownNodes\n"); if (!fMediaRoster) return; - + if (fVideoConsumer) { - /* stop */ + /* stop */ INFO("stopping nodes!\n"); // fMediaRoster->StopNode(fProducerNode, 0, true); fMediaRoster->StopNode(fVideoConsumer->Node(), 0, true); - + /* disconnect */ fMediaRoster->Disconnect(fProducerOut.node.node, fProducerOut.source, fConsumerIn.node.node, fConsumerIn.destination); - + if (fProducerNode != media_node::null) { INFO("CodyCam releasing fProducerNode\n"); fMediaRoster->ReleaseNode(fProducerNode); fProducerNode = media_node::null; } - fMediaRoster->ReleaseNode(fVideoConsumer->Node()); + fMediaRoster->ReleaseNode(fVideoConsumer->Node()); fVideoConsumer = NULL; } } @@ -431,30 +431,31 @@ VideoWindow::VideoWindow(BRect frame, const char* title, window_type type, strcpy(fFtpInfo.passwordText, "password"); strcpy(fFtpInfo.directoryText, "directory"); - _SetUpSettings("codycam", ""); + _SetUpSettings("codycam", ""); BMenuBar* menuBar = new BMenuBar(BRect(0, 0, 0, 0), "menu bar"); - + BMenuItem* menuItem; BMenu* menu = new BMenu("File"); - menuItem = new BMenuItem("Video Preferences", new BMessage(msg_video), 'P'); + menuItem = new BMenuItem("Video settings", new BMessage(msg_video), 'P'); menuItem->SetTarget(be_app); menu->AddItem(menuItem); menu->AddSeparatorItem(); - menuItem = new BMenuItem("Start Video", new BMessage(msg_start), 'A'); + menuItem = new BMenuItem("Start video", new BMessage(msg_start), 'A'); menuItem->SetTarget(be_app); menu->AddItem(menuItem); - menuItem = new BMenuItem("Stop Video", new BMessage(msg_stop), 'O'); + menuItem = new BMenuItem("Stop video", new BMessage(msg_stop), 'O'); menuItem->SetTarget(be_app); menu->AddItem(menuItem); menu->AddSeparatorItem(); - menuItem = new BMenuItem("About Codycam", new BMessage(msg_about), 'B'); + menuItem = new BMenuItem("About Codycam" B_UTF8_ELLIPSIS, + new BMessage(msg_about), 'B'); menuItem->SetTarget(be_app); menu->AddItem(menuItem); @@ -576,9 +577,9 @@ VideoWindow::MessageReceived(BMessage* message) fFtpInfo.rate = (bigtime_t)(B_INFINITE_TIMEOUT); break; - case msg_translate: + case msg_translate: message->FindInt32("be:type", (int32*)&(fFtpInfo.imageFormat)); - message->FindInt32("be:translator", &(fFtpInfo.translator)); + message->FindInt32("be:translator", &(fFtpInfo.translator)); break; case msg_upl_client: @@ -663,12 +664,12 @@ VideoWindow::_BuildCaptureControls(BView* theView) BGridLayout *controlsLayout = new BGridLayout(kXBuffer, 0); controlsLayout->SetInsets(10, 15, 5, 5); fCaptureSetupBox->SetLayout(controlsLayout); - + fFileName = new BTextControl("File Name", "File name:", fFilenameSetting->Value(), new BMessage(msg_filename)); fFileName->SetTarget(BMessenger(NULL, this)); - fImageFormatMenu = new BPopUpMenu("Image Format Menu"); + fImageFormatMenu = new BPopUpMenu("Image Format Menu"); AddTranslationItems(fImageFormatMenu, B_TRANSLATOR_BITMAP); fImageFormatMenu->SetTargetForItems(this); @@ -676,16 +677,14 @@ VideoWindow::_BuildCaptureControls(BView* theView) && fImageFormatMenu->FindItem(fImageFormatSettings->Value()) != NULL) { fImageFormatMenu->FindItem( fImageFormatSettings->Value())->SetMarked(true); - } else if (fImageFormatMenu->FindItem("JPEG Image") != NULL) - fImageFormatMenu->FindItem("JPEG Image")->SetMarked(true); - else if (fImageFormatMenu->FindItem("JPEG image") != NULL) + } else if (fImageFormatMenu->FindItem("JPEG image") != NULL) fImageFormatMenu->FindItem("JPEG image")->SetMarked(true); else fImageFormatMenu->ItemAt(0)->SetMarked(true); fImageFormatSelector = new BMenuField("Format", "Format:", fImageFormatMenu, NULL); - + fCaptureRateMenu = new BPopUpMenu("Capture Rate Menu"); fCaptureRateMenu->AddItem(new BMenuItem("Every 15 seconds", new BMessage(msg_rate_15s))); @@ -727,7 +726,7 @@ VideoWindow::_BuildCaptureControls(BView* theView) controlsLayout->AddItem(BSpaceLayoutItem::CreateGlue(), 0, 3, 2); // FTP setup box - fFtpSetupBox = new BBox("Ftp Setup", B_WILL_DRAW); + fFtpSetupBox = new BBox("FTP Setup", B_WILL_DRAW); fUploadClientMenu = new BPopUpMenu("Send to" B_UTF8_ELLIPSIS); for (int i = 0; kUploadClient[i]; i++) { @@ -768,7 +767,7 @@ VideoWindow::_BuildCaptureControls(BView* theView) fDirectorySetting->Value(), new BMessage(msg_directory)); fDirectory->SetTarget(this); - fPassiveFtp = new BCheckBox("Passive ftp", "Passive FTP", + fPassiveFtp = new BCheckBox("Passive FTP", "Passive FTP", new BMessage(msg_passiveftp)); fPassiveFtp->SetTarget(this); fPassiveFtp->SetValue(fPassiveFtpSetting->Value()); @@ -784,14 +783,14 @@ VideoWindow::_BuildCaptureControls(BView* theView) ftpLayout->AddItem(fDirectory->CreateLabelLayoutItem(), 0, 4); ftpLayout->AddItem(fDirectory->CreateTextViewLayoutItem(), 1, 4); ftpLayout->AddView(fPassiveFtp, 0, 5, 2); - + fStatusLine = new BStringView("Status Line", "Waiting" B_UTF8_ELLIPSIS); - + BGroupLayout *groupLayout = new BGroupLayout(B_VERTICAL); groupLayout->SetInsets(kXBuffer, kYBuffer, kXBuffer, kYBuffer); - + theView->SetLayout(groupLayout); - + theView->AddChild(BSpaceLayoutItem::CreateVerticalStrut(kYBuffer)); theView->AddChild(BGroupLayoutBuilder(B_HORIZONTAL) .Add(BSpaceLayoutItem::CreateHorizontalStrut(0.0)) @@ -846,7 +845,7 @@ VideoWindow::_SetUpSettings(const char* filename, const char* dirname) fFilenameSetting = new StringValueSetting("StillImageFilename", "codycam.jpg", "still image filename expected", ""); fImageFormatSettings = new StringValueSetting("ImageFileFormat", - "JPEG Image", "image file format expected", ""); + "JPEG image", "image file format expected", ""); fCaptureRateSetting = new EnumeratedStringValueSetting("CaptureRate", "Every 5 minutes", kCaptureRate, "capture rate expected", "unrecognized capture rate specified"); @@ -892,7 +891,7 @@ VideoWindow::_QuitSettings() fImageFormatSettings->ValueChanged(fImageFormatMenu->FindMarked()->Label()); fCaptureRateSetting->ValueChanged(fCaptureRateMenu->FindMarked()->Label()); fUploadClientSetting->ValueChanged(fUploadClientMenu->FindMarked()->Label()); - + fSettings->SaveSettings(); delete fSettings; } @@ -902,25 +901,25 @@ VideoWindow::_QuitSettings() ControlWindow::ControlWindow(const BRect& frame, BView* controls, media_node node) - : BWindow(frame, "Video Preferences", B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS) + : BWindow(frame, "Video settings", B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS) { fView = controls; fNode = node; - + AddChild(fView); } void -ControlWindow::MessageReceived(BMessage* message) +ControlWindow::MessageReceived(BMessage* message) { BParameterWeb* web = NULL; status_t err; - + switch (message->what) { case B_MEDIA_WEB_CHANGED: { - // If this is a tab view, find out which tab + // If this is a tab view, find out which tab // is selected BTabView* tabView = dynamic_cast(fView); int32 tabNum = -1; @@ -938,7 +937,7 @@ ControlWindow::MessageReceived(BMessage* message) // Another tab view? Restore previous selection if (tabNum > 0) { - BTabView* newTabView = dynamic_cast(fView); + BTabView* newTabView = dynamic_cast(fView); if (newTabView) newTabView->Select(tabNum); } @@ -952,7 +951,7 @@ ControlWindow::MessageReceived(BMessage* message) } -bool +bool ControlWindow::QuitRequested() { be_app->PostMessage(msg_control_win); @@ -966,6 +965,6 @@ ControlWindow::QuitRequested() int main() { CodyCam app; app.Run(); - return 0; + return 0; } diff --git a/src/apps/cortex/DormantNodeView/DormantNodeListItem.cpp b/src/apps/cortex/DormantNodeView/DormantNodeListItem.cpp index 7f9093beb4..7ec070ade2 100644 --- a/src/apps/cortex/DormantNodeView/DormantNodeListItem.cpp +++ b/src/apps/cortex/DormantNodeView/DormantNodeListItem.cpp @@ -236,7 +236,7 @@ void DormantNodeListItem::showContextMenu( // Add the "Get Info" item BMessage *message = new BMessage(InfoWindowManager::M_INFO_WINDOW_REQUESTED); - menu->AddItem(new BMenuItem("Get Info", message)); + menu->AddItem(new BMenuItem("Get info", message)); menu->SetTargetForItems(owner); owner->ConvertToScreen(&point); diff --git a/src/apps/cortex/DormantNodeView/DormantNodeWindow.cpp b/src/apps/cortex/DormantNodeView/DormantNodeWindow.cpp index 6ca7b9f3bc..7ba7f8edfa 100644 --- a/src/apps/cortex/DormantNodeView/DormantNodeWindow.cpp +++ b/src/apps/cortex/DormantNodeView/DormantNodeWindow.cpp @@ -34,7 +34,7 @@ const BRect DormantNodeWindow::s_initFrame(500.0, 350.0, 640.0, 480.0); DormantNodeWindow::DormantNodeWindow( BWindow* parent) - : BWindow(s_initFrame, "Media Add-Ons", + : BWindow(s_initFrame, "Media add-ons", B_FLOATING_WINDOW_LOOK, B_FLOATING_SUBSET_WINDOW_FEEL, B_WILL_ACCEPT_FIRST_CLICK|B_AVOID_FOCUS|B_ASYNCHRONOUS_CONTROLS), diff --git a/src/apps/cortex/InfoView/DormantNodeInfoView.cpp b/src/apps/cortex/InfoView/DormantNodeInfoView.cpp index 24cc3a3ef3..51f99d2731 100644 --- a/src/apps/cortex/InfoView/DormantNodeInfoView.cpp +++ b/src/apps/cortex/InfoView/DormantNodeInfoView.cpp @@ -22,7 +22,7 @@ __USE_CORTEX_NAMESPACE DormantNodeInfoView::DormantNodeInfoView( const dormant_node_info &info) - : InfoView(info.name, "Dormant Media Node", + : InfoView(info.name, "Dormant media node", new MediaIcon(info, B_LARGE_ICON)), m_addOnID(info.addon), m_flavorID(info.flavor_id) @@ -59,9 +59,9 @@ DormantNodeInfoView::DormantNodeInfoView( addField("Kinds", MediaString::getStringFor(static_cast(flavorInfo.kinds))); // add "Flavor Flags" field - addField("Flavor Flags", "?"); + addField("Flavor flags", "?"); - // add "Max Instances" field + // add "Max. instances" field if (flavorInfo.possible_count > 0) { s = ""; @@ -71,18 +71,18 @@ DormantNodeInfoView::DormantNodeInfoView( { s = "Any number"; } - addField("Max Instances", s); + addField("Max. instances", s); // add "Input Formats" field if (flavorInfo.in_format_count > 0) { if (flavorInfo.in_format_count == 1) { - addField("Input Format", MediaString::getStringFor(flavorInfo.in_formats[0], false)); + addField("Input format", MediaString::getStringFor(flavorInfo.in_formats[0], false)); } else { - addField("Input Formats", ""); + addField("Input formats", ""); for (int32 i = 0; i < flavorInfo.in_format_count; i++) { s = ""; @@ -97,11 +97,11 @@ DormantNodeInfoView::DormantNodeInfoView( { if (flavorInfo.out_format_count == 1) { - addField("Output Format", MediaString::getStringFor(flavorInfo.out_formats[0], false)); + addField("Output format", MediaString::getStringFor(flavorInfo.out_formats[0], false)); } else { - addField("Output Formats", ""); + addField("Output formats", ""); for (int32 i = 0; i < flavorInfo.out_format_count; i++) { s = ""; diff --git a/src/apps/cortex/InfoView/EndPointInfoView.cpp b/src/apps/cortex/InfoView/EndPointInfoView.cpp index 73f774d153..494d7cd03c 100644 --- a/src/apps/cortex/InfoView/EndPointInfoView.cpp +++ b/src/apps/cortex/InfoView/EndPointInfoView.cpp @@ -18,7 +18,7 @@ __USE_CORTEX_NAMESPACE EndPointInfoView::EndPointInfoView( const media_input &input) - : InfoView(input.name, "Media Input", 0), + : InfoView(input.name, "Media input", 0), m_output(false), m_port(input.destination.port), m_id(input.destination.id) { @@ -37,14 +37,14 @@ EndPointInfoView::EndPointInfoView( addField("", ""); // add "Media Type" field - addField("Media Type", MediaString::getStringFor(input.format.type)); + addField("Media type", MediaString::getStringFor(input.format.type)); _addFormatFields(input.format); } EndPointInfoView::EndPointInfoView( const media_output &output) - : InfoView(output.name, "Media Output", 0), + : InfoView(output.name, "Media output", 0), m_output(true), m_port(output.source.port), m_id(output.source.id) { @@ -63,7 +63,7 @@ EndPointInfoView::EndPointInfoView( addField("", ""); // add "Media Type" field - addField("Media Type", MediaString::getStringFor(output.format.type)); + addField("Media type", MediaString::getStringFor(output.format.type)); _addFormatFields(output.format); } @@ -117,22 +117,22 @@ void EndPointInfoView::_addFormatFields( addField("Format", s); // add "Sample Rate" field s = MediaString::forAudioFrameRate(format.u.raw_audio.frame_rate); - addField("Sample Rate", s); + addField("Sample rate", s); // add "Channels" field s = MediaString::forAudioChannelCount(format.u.raw_audio.channel_count); addField("Channels", s); // add "Channel Mask" field s = MediaString::forAudioChannelMask(format.u.raw_audio.channel_mask); - addField("Channel Mask", s); + addField("Channel mask", s); // add "Matrix Mask" field s = MediaString::forAudioMatrixMask(format.u.raw_audio.matrix_mask); - addField("Matrix Mask", s); + addField("Matrix mask", s); // add the "Byte Order" field s = MediaString::forAudioByteOrder(format.u.raw_audio.byte_order); - addField("Byte Order", s); + addField("Byte order", s); // add the "Buffer Size" field s = MediaString::forAudioBufferSize(format.u.raw_audio.buffer_size); - addField("Buffer Size", s); + addField("Buffer size", s); break; } case B_MEDIA_RAW_VIDEO: { @@ -149,18 +149,18 @@ void EndPointInfoView::_addFormatFields( // add the "Field Rate" field s = MediaString::forVideoFieldRate(format.u.raw_video.field_rate, format.u.raw_video.interlace); - addField("Field Rate", s); + addField("Field rate", s); // add the "Orientation" field s = MediaString::forVideoOrientation(format.u.raw_video.orientation); addField("Orientation", s); // add the "Aspect Ratio" field s = MediaString::forVideoAspectRatio(format.u.raw_video.pixel_width_aspect, format.u.raw_video.pixel_height_aspect); - addField("Aspect Ratio", s); + addField("Aspect ratio", s); // add the "Active Lines" field s = MediaString::forVideoActiveLines(format.u.raw_video.first_active, format.u.raw_video.last_active); - addField("Active Lines", s); + addField("Active lines", s); // add the "Offset" field s = MediaString::forVideoOffset(format.u.raw_video.display.pixel_offset, format.u.raw_video.display.line_offset); @@ -173,10 +173,10 @@ void EndPointInfoView::_addFormatFields( BString s; // add the "Bit Rate" field s = MediaString::forAudioBitRate(format.u.encoded_audio.bit_rate); - addField("Bit Rate", s); + addField("Bit rate", s); // add the "Frame Size" field s = MediaString::forAudioFrameSize(format.u.encoded_audio.frame_size); - addField("Frame Size", s); + addField("Frame size", s); break; } case B_MEDIA_ENCODED_VIDEO: { @@ -186,10 +186,10 @@ void EndPointInfoView::_addFormatFields( // add the "Bit Rate" field s = MediaString::forVideoBitRate(format.u.encoded_video.avg_bit_rate, format.u.encoded_video.max_bit_rate); - addField("Bit Rate", s); + addField("Bit rate", s); // add the "Frame Size" field s = MediaString::forVideoFrameSize(format.u.encoded_video.frame_size); - addField("Frame Size", s); + addField("Frame size", s); // add the "History" field s = MediaString::forVideoHistory(format.u.encoded_video.forward_history, format.u.encoded_video.backward_history); @@ -206,11 +206,11 @@ void EndPointInfoView::_addFormatFields( // add the "Bit Rate" field s = MediaString::forMultistreamBitRate(format.u.multistream.avg_bit_rate, format.u.multistream.max_bit_rate); - addField("Bit Rate", s); + addField("Bit rate", s); // add the "Chunk Size" field s = MediaString::forMultistreamChunkSize(format.u.multistream.avg_chunk_size, format.u.multistream.max_chunk_size); - addField("Chunk Size", s); + addField("Chunk size", s); // add the "Flags" field s = MediaString::forMultistreamFlags(format.u.multistream.flags); addField("Flags", s); diff --git a/src/apps/cortex/MediaRoutingView/MediaJack.cpp b/src/apps/cortex/MediaRoutingView/MediaJack.cpp index 838cca4217..2964801cb3 100644 --- a/src/apps/cortex/MediaRoutingView/MediaJack.cpp +++ b/src/apps/cortex/MediaRoutingView/MediaJack.cpp @@ -718,7 +718,7 @@ void MediaJack::showContextMenu( BMessage *message = new BMessage(InfoWindowManager::M_INFO_WINDOW_REQUESTED); message->AddData("input", B_RAW_TYPE, reinterpret_cast(&input), sizeof(input)); - menu->AddItem(item = new BMenuItem("Get Info", message)); + menu->AddItem(item = new BMenuItem("Get info", message)); } else if (isOutput()) { @@ -727,7 +727,7 @@ void MediaJack::showContextMenu( BMessage *message = new BMessage(InfoWindowManager::M_INFO_WINDOW_REQUESTED); message->AddData("output", B_RAW_TYPE, reinterpret_cast(&output), sizeof(output)); - menu->AddItem(item = new BMenuItem("Get Info", message)); + menu->AddItem(item = new BMenuItem("Get info", message)); } menu->SetTargetForItems(view()); diff --git a/src/apps/cortex/MediaRoutingView/MediaNodePanel.cpp b/src/apps/cortex/MediaRoutingView/MediaNodePanel.cpp index e8497a946b..d9cb9f6659 100644 --- a/src/apps/cortex/MediaRoutingView/MediaNodePanel.cpp +++ b/src/apps/cortex/MediaRoutingView/MediaNodePanel.cpp @@ -533,7 +533,7 @@ void MediaNodePanel::showContextMenu( // add the "Tweak Parameters" item message = new BMessage(MediaRoutingView::M_NODE_TWEAK_PARAMETERS); - menu->AddItem(item = new BMenuItem("Tweak Parameters", message, 'P')); + menu->AddItem(item = new BMenuItem("Tweak parameters", message, 'P')); if (!(ref->kind() & B_CONTROLLABLE)) { item->SetEnabled(false); @@ -541,7 +541,7 @@ void MediaNodePanel::showContextMenu( message = new BMessage(InfoWindowManager::M_INFO_WINDOW_REQUESTED); message->AddInt32("nodeID", ref->id()); - menu->AddItem(new BMenuItem("Get Info", message, 'I')); + menu->AddItem(new BMenuItem("Get info", message, 'I')); menu->AddSeparatorItem(); menu->AddItem(item = new BMenuItem("Release", new BMessage(MediaRoutingView::M_DELETE_SELECTION), 'T')); @@ -562,7 +562,7 @@ void MediaNodePanel::showContextMenu( } // add the "Run Mode" sub menu - BMenu *subMenu = new BMenu("Run Mode"); + BMenu *subMenu = new BMenu("Run mode"); subMenu->SetFont(be_plain_font); for (uint32 runMode = 1; runMode <= BMediaNode::B_RECORDING; runMode++) { @@ -604,12 +604,12 @@ void MediaNodePanel::showContextMenu( message = new BMessage(MediaRoutingView::M_NODE_START_TIME_SOURCE); message->AddInt32("nodeID", ref->id()); subMenu->AddItem(new BMenuItem( - "Start Time Source", + "Start time source", message)); message = new BMessage(MediaRoutingView::M_NODE_START_TIME_SOURCE); message->AddInt32("nodeID", ref->id()); subMenu->AddItem(new BMenuItem( - "Stop Time Source", + "Stop time source", message)); } // [c.lenz 24dec99] support for BControllable::StartControlPanel() @@ -631,7 +631,7 @@ void MediaNodePanel::showContextMenu( subMenu->AddSeparatorItem(); subMenu->AddItem( new BMenuItem( - isLocked ? "Unlock Group" : "Lock Group", message)); + isLocked ? "Unlock group" : "Lock group", message)); } if (subMenu->CountItems() > 0) diff --git a/src/apps/cortex/MediaRoutingView/MediaRoutingView.cpp b/src/apps/cortex/MediaRoutingView/MediaRoutingView.cpp index 5d29cb32aa..7d9bac974a 100644 --- a/src/apps/cortex/MediaRoutingView/MediaRoutingView.cpp +++ b/src/apps/cortex/MediaRoutingView/MediaRoutingView.cpp @@ -911,14 +911,14 @@ void MediaRoutingView::showContextMenu( BMenuItem *item; BMessage *message = new BMessage(M_LAYOUT_CHANGED); message->AddInt32("layout", M_ICON_VIEW); - menu->AddItem(item = new BMenuItem("Icon View", message)); + menu->AddItem(item = new BMenuItem("Icon view", message)); if (m_layout == M_ICON_VIEW) { item->SetMarked(true); } message = new BMessage(M_LAYOUT_CHANGED); message->AddInt32("layout", M_MINI_ICON_VIEW); - menu->AddItem(item = new BMenuItem("Mini Icon View", message)); + menu->AddItem(item = new BMenuItem("Mini icon view", message)); if (m_layout == M_MINI_ICON_VIEW) { item->SetMarked(true); @@ -926,10 +926,10 @@ void MediaRoutingView::showContextMenu( menu->AddSeparatorItem(); // add 'CleanUp' command - menu->AddItem(new BMenuItem("Clean Up", new BMessage(M_CLEANUP_REQUESTED), 'K')); + menu->AddItem(new BMenuItem("Clean up", new BMessage(M_CLEANUP_REQUESTED), 'K')); // add 'Select All' command - menu->AddItem(new BMenuItem("Select All", new BMessage(M_SELECT_ALL), 'A')); + menu->AddItem(new BMenuItem("Select all", new BMessage(M_SELECT_ALL), 'A')); menu->SetTargetForItems(this); ConvertToScreen(&point); @@ -955,7 +955,7 @@ void MediaRoutingView::showErrorMessage( BMessenger messenger(0, Window()); if (!messenger.IsValid() || (messenger.SendMessage(&message) != B_OK)) { - BAlert *alert = new BAlert("Error", text.String(), "Ok", 0, 0, + BAlert *alert = new BAlert("Error", text.String(), "OK", 0, 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT); alert->Go(); } @@ -1500,21 +1500,21 @@ void MediaRoutingView::_initContent() NodeRef* videoIn = manager->videoInputNode(); if (videoIn) { - group = manager->createGroup("Video Input"); + group = manager->createGroup("Video input"); group->setRunMode(BMediaNode::B_RECORDING); group->addNode(videoIn); } NodeRef* audioIn = manager->audioInputNode(); if (audioIn) { - group = manager->createGroup("Audio Input"); + group = manager->createGroup("Audio input"); group->setRunMode(BMediaNode::B_RECORDING); group->addNode(audioIn); } NodeRef* videoOut = manager->videoOutputNode(); if (videoOut) { - group = manager->createGroup("Video Output"); + group = manager->createGroup("Video output"); group->addNode(videoOut); } } diff --git a/src/apps/cortex/MediaRoutingView/MediaWire.cpp b/src/apps/cortex/MediaRoutingView/MediaWire.cpp index b9aad693de..befa206d72 100644 --- a/src/apps/cortex/MediaRoutingView/MediaWire.cpp +++ b/src/apps/cortex/MediaRoutingView/MediaWire.cpp @@ -291,7 +291,7 @@ void MediaWire::showContextMenu( BMessage *message = new BMessage(InfoWindowManager::M_INFO_WINDOW_REQUESTED); message->AddData("connection", B_RAW_TYPE, reinterpret_cast(&output), sizeof(output)); - menu->AddItem(item = new BMenuItem("Get Info", message, 'I')); + menu->AddItem(item = new BMenuItem("Get info", message, 'I')); // add the "Disconnect" item menu->AddItem(item = new BMenuItem("Disconnect", new BMessage(MediaRoutingView::M_DELETE_SELECTION), 'T')); diff --git a/src/apps/cortex/ParameterView/ParameterWindow.cpp b/src/apps/cortex/ParameterView/ParameterWindow.cpp index e666ef4e84..6f861d7544 100644 --- a/src/apps/cortex/ParameterView/ParameterWindow.cpp +++ b/src/apps/cortex/ParameterView/ParameterWindow.cpp @@ -40,7 +40,7 @@ ParameterWindow::ParameterWindow( BPoint position, live_node_info &nodeInfo, BMessenger *notifyTarget) - : BWindow(BRect(position, position + BPoint(50.0, 50.0)), + : BWindow(BRect(position, position + BPoint(50.0, 50.0)), "parameters", B_DOCUMENT_WINDOW, B_WILL_ACCEPT_FIRST_CLICK | B_ASYNCHRONOUS_CONTROLS), m_node(nodeInfo.node), @@ -61,7 +61,7 @@ ParameterWindow::ParameterWindow( BMenuBar *menuBar = new BMenuBar(Bounds(), "ParameterWindow MenuBar"); BMenu *menu = new BMenu("Window"); - menu->AddItem(new BMenuItem("Start Control Panel", + menu->AddItem(new BMenuItem("Start control panel", new BMessage(M_START_CONTROL_PANEL), 'P', B_COMMAND_KEY | B_SHIFT_KEY)); menu->AddSeparatorItem(); @@ -158,7 +158,7 @@ void ParameterWindow::MessageReceived( default: { BWindow::MessageReceived(message); } - } + } } bool ParameterWindow::QuitRequested() { @@ -276,7 +276,7 @@ void ParameterWindow::_updateParameterView( // adapt the window to the new dimensions ResizeTo(m_idealSize.Width(), m_idealSize.Height()); m_zoomed = true; - + if (m_parameters) { BRect paramRect = m_parameters->Bounds(); AddChild(new ParameterContainerView(paramRect, m_parameters)); @@ -285,7 +285,7 @@ void ParameterWindow::_updateParameterView( void ParameterWindow::_constrainToScreen() { D_INTERNAL(("ParameterWindow::_constrainToScreen()\n")); - + BScreen screen(this); BRect screenRect = screen.Frame(); BRect windowRect = Frame(); diff --git a/src/apps/cortex/RouteApp/RouteAppNodeManager.cpp b/src/apps/cortex/RouteApp/RouteAppNodeManager.cpp index b20e13f5b6..fa3753a491 100644 --- a/src/apps/cortex/RouteApp/RouteAppNodeManager.cpp +++ b/src/apps/cortex/RouteApp/RouteAppNodeManager.cpp @@ -164,7 +164,7 @@ void RouteAppNodeManager::nodeCreated( if(ts->Node() != systemClock) { g->setTimeSource(ts->Node()); - logMsg.AddString("line", "Synced to System Clock"); + logMsg.AddString("line", "Synced to system clock"); } ts->Release(); } @@ -249,7 +249,7 @@ void RouteAppNodeManager::connectionMade( logMsg.AddString("line", line); NodeGroup *group = 0; - BString groupName = "Untitled Group "; + BString groupName = "Untitled group "; if(_canGroup(producer) && _canGroup(consumer)) { if (producer->group() && consumer->group() && diff --git a/src/apps/cortex/RouteApp/RouteWindow.cpp b/src/apps/cortex/RouteApp/RouteWindow.cpp index a1294b29b9..657cac2ba2 100644 --- a/src/apps/cortex/RouteApp/RouteWindow.cpp +++ b/src/apps/cortex/RouteApp/RouteWindow.cpp @@ -78,7 +78,7 @@ RouteWindow::RouteWindow(RouteAppNodeManager* manager) item->SetTarget(be_app); pFileMenu->AddItem(item); pFileMenu->AddItem(new BSeparatorItem()); - item = new BMenuItem("Save Nodes" B_UTF8_ELLIPSIS, + item = new BMenuItem("Save nodes" B_UTF8_ELLIPSIS, new BMessage(RouteApp::M_SHOW_SAVE_PANEL), 'S'); item->SetTarget(be_app); pFileMenu->AddItem(item); @@ -137,19 +137,19 @@ RouteWindow::RouteWindow(RouteAppNodeManager* manager) // construct the Window menu BMenu* windowMenu = new BMenu("Window"); m_transportWindowItem = new BMenuItem( - "Show Transport", + "Show transport", new BMessage(M_TOGGLE_TRANSPORT_WINDOW)); windowMenu->AddItem(m_transportWindowItem); m_dormantNodeWindowItem = new BMenuItem( - "Show Add-Ons", + "Show add-ons", new BMessage(M_TOGGLE_DORMANT_NODE_WINDOW)); windowMenu->AddItem(m_dormantNodeWindowItem); windowMenu->AddItem(new BSeparatorItem()); m_pullPalettesItem = new BMenuItem( - "Pull Palettes", + "Pull palettes", new BMessage(M_TOGGLE_PULLING_PALETTES)); windowMenu->AddItem(m_pullPalettesItem); @@ -341,7 +341,7 @@ RouteWindow::MessageReceived(BMessage* pMsg) // switch (pMsg->what) { case B_ABOUT_REQUESTED: - (new BAlert("About", g_aboutText, "Ok"))->Go(); + (new BAlert("About", g_aboutText, "OK"))->Go(); break; case MediaRoutingView::M_GROUP_SELECTED: diff --git a/src/apps/cortex/TransportView/TransportView.cpp b/src/apps/cortex/TransportView/TransportView.cpp index e6c41cdf77..96be0ae409 100644 --- a/src/apps/cortex/TransportView/TransportView.cpp +++ b/src/apps/cortex/TransportView/TransportView.cpp @@ -525,16 +525,16 @@ void TransportView::_releaseGroup() { const char _run_mode_strings[][20] = { "Offline", - "Decrease Precision", - "Increase Latency", - "Drop Data", + "Decrease precision", + "Increase latency", + "Drop data", "Recording" }; const int _run_modes = 5; //const char _time_source_strings[][20] = { -// "DAC Time Source", -// "System Clock" +// "DAC time source", +// "System clock" //}; //const int _time_sources = 2; @@ -564,7 +564,7 @@ void TransportView::_constructControls() { m_runModeView = new BMenuField( BRect(), "runModeView", - "Run Mode:", + "Run mode:", new BPopUpMenu("runModeMenu")); _populateRunModeMenu( m_runModeView->Menu()); @@ -573,7 +573,7 @@ void TransportView::_constructControls() { m_timeSourceView = new BMenuField( BRect(), "timeSourceView", - "Time Source:", + "Time source:", new BPopUpMenu("timeSourceMenu")); _populateTimeSourceMenu( m_timeSourceView->Menu()); @@ -706,7 +706,7 @@ void TransportView::_populateTimeSourceMenu( &dacTimeSource, sizeof(media_node)); i = new BMenuItem( - "DAC Time Source", + "DAC time source", m); menu->AddItem(i); _addGroupTarget(i); @@ -721,7 +721,7 @@ void TransportView::_populateTimeSourceMenu( &systemTimeSource, sizeof(media_node)); i = new BMenuItem( - "System Clock", + "System clock", m); menu->AddItem(i); _addGroupTarget(i); diff --git a/src/apps/cortex/addons/AudioAdapter/AudioAdapterParams.cpp b/src/apps/cortex/addons/AudioAdapter/AudioAdapterParams.cpp index 12cdec5bac..c84b9aaa1f 100644 --- a/src/apps/cortex/addons/AudioAdapter/AudioAdapterParams.cpp +++ b/src/apps/cortex/addons/AudioAdapter/AudioAdapterParams.cpp @@ -90,7 +90,7 @@ void _AudioAdapterParams::populateGroup( param = inputGroup->MakeDiscreteParameter( P_INPUT_FORMAT, B_MEDIA_NO_TYPE, - "Sample Format", + "Sample format:", B_GENERIC); param->AddItem( 0, @@ -111,7 +111,7 @@ void _AudioAdapterParams::populateGroup( param = inputGroup->MakeDiscreteParameter( P_INPUT_CHANNEL_COUNT, B_MEDIA_NO_TYPE, - "Channels", + "Channels:", B_GENERIC); param->AddItem( 0, @@ -137,7 +137,7 @@ void _AudioAdapterParams::populateGroup( param = outputGroup->MakeDiscreteParameter( P_OUTPUT_FORMAT, B_MEDIA_NO_TYPE, - "Sample Format", + "Sample format:", B_GENERIC); param->AddItem( 0, @@ -158,7 +158,7 @@ void _AudioAdapterParams::populateGroup( param = outputGroup->MakeDiscreteParameter( P_OUTPUT_CHANNEL_COUNT, B_MEDIA_NO_TYPE, - "Channels", + "Channels:", B_GENERIC); param->AddItem( 0, diff --git a/src/apps/cortex/addons/Flanger/FlangerNode.cpp b/src/apps/cortex/addons/Flanger/FlangerNode.cpp index ec7b982786..d72c67b516 100644 --- a/src/apps/cortex/addons/Flanger/FlangerNode.cpp +++ b/src/apps/cortex/addons/Flanger/FlangerNode.cpp @@ -1228,11 +1228,11 @@ void FlangerNode::initParameterWeb() { BParameterGroup* g; // mix ratio - g = pTopGroup->MakeGroup("Mix Ratio"); + g = pTopGroup->MakeGroup("Mix ratio"); label = g->MakeNullParameter( P_MIX_RATIO_LABEL, B_MEDIA_NO_TYPE, - "Mix Ratio", + "Mix ratio", B_GENERIC); value = g->MakeContinuousParameter( @@ -1244,11 +1244,11 @@ void FlangerNode::initParameterWeb() { value->AddInput(label); // sweep rate - g = pTopGroup->MakeGroup("Sweep Rate"); + g = pTopGroup->MakeGroup("Sweep rate"); label = g->MakeNullParameter( P_SWEEP_RATE_LABEL, B_MEDIA_NO_TYPE, - "Sweep Rate", + "Sweep rate", B_GENERIC); value = g->MakeContinuousParameter( @@ -1271,7 +1271,7 @@ void FlangerNode::initParameterWeb() { P_DELAY, B_MEDIA_NO_TYPE, "", - B_GAIN, "msec", 0.1, s_fMaxDelay/2.0, 0.1); + B_GAIN, "ms", 0.1, s_fMaxDelay/2.0, 0.1); label->AddOutput(value); value->AddInput(label); @@ -1287,7 +1287,7 @@ void FlangerNode::initParameterWeb() { P_DEPTH, B_MEDIA_NO_TYPE, "", - B_GAIN, "msec", 1.0, s_fMaxDelay/4.0, 0.1); + B_GAIN, "ms", 1.0, s_fMaxDelay/4.0, 0.1); label->AddOutput(value); value->AddInput(label); diff --git a/src/apps/cortex/addons/LoggingConsumer/LoggingConsumer.cpp b/src/apps/cortex/addons/LoggingConsumer/LoggingConsumer.cpp index 327a6719d9..f2d8832884 100644 --- a/src/apps/cortex/addons/LoggingConsumer/LoggingConsumer.cpp +++ b/src/apps/cortex/addons/LoggingConsumer/LoggingConsumer.cpp @@ -28,22 +28,22 @@ static BParameterWeb* build_parameter_web() BParameterWeb* web = new BParameterWeb; BParameterGroup* mainGroup = web->MakeGroup("LoggingConsumer Parameters"); - BParameterGroup* group = mainGroup->MakeGroup("Latency Control"); + BParameterGroup* group = mainGroup->MakeGroup("Latency control"); BParameter* nullParam = group->MakeNullParameter(INPUT_NULL_PARAM, B_MEDIA_NO_TYPE, "Latency", B_GENERIC); BParameter* latencyParam = group->MakeContinuousParameter(LATENCY_PARAM, B_MEDIA_NO_TYPE, "", - B_GAIN, "msec", 5, 100, 5); + B_GAIN, "ms", 5, 100, 5); nullParam->AddOutput(latencyParam); latencyParam->AddInput(nullParam); - group = mainGroup->MakeGroup("CPU Percentage"); - nullParam = group->MakeNullParameter(CPU_NULL_PARAM, B_MEDIA_NO_TYPE, "CPU Spin Percentage", B_GENERIC); + group = mainGroup->MakeGroup("CPU percentage"); + nullParam = group->MakeNullParameter(CPU_NULL_PARAM, B_MEDIA_NO_TYPE, "CPU spin percentage", B_GENERIC); BContinuousParameter* cpuParam = group->MakeContinuousParameter(CPU_SPIN_PARAM, B_MEDIA_NO_TYPE, "", B_GAIN, "percent", 5, 80, 5); nullParam->AddOutput(cpuParam); cpuParam->AddInput(nullParam); group = mainGroup->MakeGroup("Priority"); - nullParam = group->MakeNullParameter(PRIO_NULL_PARAM, B_MEDIA_NO_TYPE, "Thread Priority", B_GENERIC); + nullParam = group->MakeNullParameter(PRIO_NULL_PARAM, B_MEDIA_NO_TYPE, "Thread priority", B_GENERIC); BDiscreteParameter* prioParam = group->MakeDiscreteParameter(PRIORITY_PARAM, B_MEDIA_NO_TYPE, "", B_GENERIC); prioParam->AddItem(5, "B_LOW_PRIORITY"); prioParam->AddItem(10, "B_NORMAL_PRIORITY"); diff --git a/src/apps/cortex/addons/common/MediaNodeControlApp.cpp b/src/apps/cortex/addons/common/MediaNodeControlApp.cpp index b4e24cae71..a6053548bf 100644 --- a/src/apps/cortex/addons/common/MediaNodeControlApp.cpp +++ b/src/apps/cortex/addons/common/MediaNodeControlApp.cpp @@ -53,7 +53,7 @@ MediaNodeControlApp::MediaNodeControlApp( sprintf(buffer, "MediaNodeControlApp: couldn't find node (%ld):\n%s\n", nodeID, strerror(err)); - (new BAlert("error", buffer, "Ok"))->Go(); + (new BAlert("error", buffer, "OK"))->Go(); return; } @@ -65,7 +65,7 @@ MediaNodeControlApp::MediaNodeControlApp( sprintf(buffer, "MediaNodeControlApp: couldn't get node info (%ld):\n%s\n", nodeID, strerror(err)); - (new BAlert("error", buffer, "Ok"))->Go(); + (new BAlert("error", buffer, "OK"))->Go(); return; } @@ -80,7 +80,7 @@ MediaNodeControlApp::MediaNodeControlApp( sprintf(buffer, "MediaNodeControlApp: no parameters for node (%ld):\n%s\n", nodeID, strerror(err)); - (new BAlert("error", buffer, "Ok"))->Go(); + (new BAlert("error", buffer, "OK"))->Go(); return; } diff --git a/src/apps/cortex/support/MediaString.cpp b/src/apps/cortex/support/MediaString.cpp index 836e96064d..8260cd42fe 100644 --- a/src/apps/cortex/support/MediaString.cpp +++ b/src/apps/cortex/support/MediaString.cpp @@ -26,30 +26,30 @@ BString MediaString::getStringFor( if (kinds & B_BUFFER_PRODUCER) { if (first) { - list = "Buffer Producer"; + list = "Buffer producer"; first = false; } } if (kinds & B_BUFFER_CONSUMER) { if (first) { - list = "Buffer Consumer"; + list = "Buffer consumer"; first = false; } else { if (last != "") list << ", " << last; - last = "Buffer Consumer"; + last = "Buffer consumer"; } } if (kinds & B_TIME_SOURCE) { if (first) { - list = "Time Source"; + list = "Time source"; first = false; } else { if (last != "") list << ", " << last; - last = "Time Source"; + last = "Time source"; } } if (kinds & B_CONTROLLABLE) { @@ -65,57 +65,57 @@ BString MediaString::getStringFor( } if (kinds & B_FILE_INTERFACE) { if (first) { - list = "File Interface"; + list = "File interface"; first = false; } else { if (last != "") list << ", " << last; - last = "File Interface"; + last = "File interface"; } } if (kinds & B_ENTITY_INTERFACE) { if (first) { - list = "Entity Interface"; + list = "Entity interface"; first = false; } else { if (last != "") list << ", " << last; - last = "Entity Interface"; + last = "Entity interface"; } } if (kinds & B_PHYSICAL_INPUT) { if (first) { - list = "Physical Input"; + list = "Physical input"; first = false; } else { if (last != "") list << ", " << last; - last = "Physical Input"; + last = "Physical input"; } } if (kinds & B_PHYSICAL_OUTPUT) { if (first) { - list = "Physical Output"; + list = "Physical output"; first = false; } else { if (last != "") list << ", " << last; - last = "Physical Output"; + last = "Physical output"; } } if (kinds & B_SYSTEM_MIXER) { if (first) { - list = "System Mixer"; + list = "System mixer"; first = false; } else { if (last != "") list << ", " << last; - last = "System Mixer"; + last = "System mixer"; } } @@ -133,9 +133,9 @@ BString MediaString::getStringFor( switch (runMode) { case BMediaNode::B_OFFLINE: return "Offline"; case BMediaNode::B_RECORDING: return "Recording"; - case BMediaNode::B_DECREASE_PRECISION: return "Decrease Precision"; - case BMediaNode::B_INCREASE_LATENCY: return "Increase Latency"; - case BMediaNode::B_DROP_DATA: return "Drop Data"; + case BMediaNode::B_DECREASE_PRECISION: return "Decrease precision"; + case BMediaNode::B_INCREASE_LATENCY: return "Increase latency"; + case BMediaNode::B_DROP_DATA: return "Drop data"; default: return "(unknown run mode)"; } } @@ -150,24 +150,24 @@ BString MediaString::getStringFor( D_METHOD(("MediaString::getStringFor(media_type)\n")); switch (type) { - case B_MEDIA_NO_TYPE: return "Typeless Media"; - case B_MEDIA_UNKNOWN_TYPE: return "Unknown Media Type"; - case B_MEDIA_RAW_AUDIO: return "Raw Audio"; - case B_MEDIA_RAW_VIDEO: return "Raw Video"; + case B_MEDIA_NO_TYPE: return "Typeless media"; + case B_MEDIA_UNKNOWN_TYPE: return "Unknown media type"; + case B_MEDIA_RAW_AUDIO: return "Raw audio"; + case B_MEDIA_RAW_VIDEO: return "Raw video"; case B_MEDIA_VBL: return "Raw data from VBL area"; case B_MEDIA_TIMECODE: return "Timecode"; case B_MEDIA_MIDI: return "MIDI"; case B_MEDIA_TEXT: return "Text"; case B_MEDIA_HTML: return "HTML"; - case B_MEDIA_MULTISTREAM: return "Multistream Media"; + case B_MEDIA_MULTISTREAM: return "Multistream media"; case B_MEDIA_PARAMETERS: return "Parameters"; - case B_MEDIA_ENCODED_AUDIO: return "Encoded Audio"; - case B_MEDIA_ENCODED_VIDEO: return "Encoded Video"; + case B_MEDIA_ENCODED_AUDIO: return "Encoded audio"; + case B_MEDIA_ENCODED_VIDEO: return "Encoded video"; default: { if (type >= B_MEDIA_PRIVATE) - return "Private Be Media Type"; + return "Private Be media type"; if (type >= B_MEDIA_FIRST_USER_TYPE) - return "User-defined Media Type"; + return "User-defined media type"; } } return "Unknown Media Type"; @@ -179,15 +179,15 @@ BString MediaString::getStringFor( D_METHOD(("MediaString::getStringFor(media_format_family)\n")); switch (family) { - case B_ANY_FORMAT_FAMILY: return "Any Format Family"; - case B_BEOS_FORMAT_FAMILY: return "BeOS Format Family"; - case B_QUICKTIME_FORMAT_FAMILY: return "QuickTime Format Family"; - case B_AVI_FORMAT_FAMILY: return "AVI Format Family"; - case B_ASF_FORMAT_FAMILY: return "ASF Format Family"; - case B_MPEG_FORMAT_FAMILY: return "MPEG Format Family"; - case B_WAV_FORMAT_FAMILY: return "WAV Format Family"; - case B_AIFF_FORMAT_FAMILY: return "AIFF Format Family"; - default: return "Miscellaneous Format Family"; + case B_ANY_FORMAT_FAMILY: return "Any format family"; + case B_BEOS_FORMAT_FAMILY: return "BeOS format family"; + case B_QUICKTIME_FORMAT_FAMILY: return "QuickTime format family"; + case B_AVI_FORMAT_FAMILY: return "AVI format family"; + case B_ASF_FORMAT_FAMILY: return "ASF format family"; + case B_MPEG_FORMAT_FAMILY: return "MPEG format family"; + case B_WAV_FORMAT_FAMILY: return "WAV format family"; + case B_AIFF_FORMAT_FAMILY: return "AIFF format family"; + default: return "Miscellaneous format family"; } } @@ -460,7 +460,7 @@ BString MediaString::getStringFor( s << "Port " << source.port << ", ID " << source.id; } else { - s = "(None)"; + s = "(none)"; } return s; } @@ -476,7 +476,7 @@ BString MediaString::getStringFor( s << "Port " << destination.port << ", ID " << destination.id; } else { - s = "(None)"; + s = "(none)"; } return s; } @@ -497,13 +497,13 @@ BString MediaString::forAudioFormat( switch (format) { case media_raw_audio_format::B_AUDIO_UCHAR: { - return "8 bit Integer"; + return "8 bit integer"; } case media_raw_audio_format::B_AUDIO_SHORT: { - return "16 bit Integer"; + return "16 bit integer"; } case media_raw_audio_format::B_AUDIO_FLOAT: { - return "32 bit Float"; + return "32 bit float"; } case media_raw_audio_format::B_AUDIO_INT: { BString s = ""; @@ -511,7 +511,7 @@ BString MediaString::forAudioFormat( s << validBits << " bit "; else s << "32 bit "; - s << "Integer"; + s << "integer"; return s; } default: { @@ -569,10 +569,10 @@ BString MediaString::forAudioByteOrder( switch (byteOrder) { case B_MEDIA_BIG_ENDIAN: { - return "Big Endian"; + return "Big endian"; } case B_MEDIA_LITTLE_ENDIAN: { - return "Little Endian"; + return "Little endian"; } default: { return "(unknown byte order)"; @@ -642,156 +642,156 @@ BString MediaString::forAudioChannelMask( } if (channelMask & B_CHANNEL_REARLEFT) { if (first) { - list = "Rear-Left"; + list = "Rear-left"; first = false; } else { if (last != "") list << ", " << last; - last = "Rear-Left"; + last = "Rear-left"; } } if (channelMask & B_CHANNEL_REARRIGHT) { if (first) { - list = "Rear-Right"; + list = "Rear-right"; first = false; } else { if (last != "") list << ", " << last; - last = "Rear-Right"; + last = "Rear-right"; } } if (channelMask & B_CHANNEL_FRONT_LEFT_CENTER) { if (first) { - list = "Front-Left-Center"; + list = "Front-left-center"; first = false; } else { if (last != "") list << ", " << last; - last = "Front-Left-Center"; + last = "Front-left-center"; } } if (channelMask & B_CHANNEL_FRONT_RIGHT_CENTER) { if (first) { - list = "Front-Right-Center"; + list = "Front-right-center"; first = false; } else { if (last != "") list << ", " << last; - last = "Front-Right-Center"; + last = "Front-right-center"; } } if (channelMask & B_CHANNEL_BACK_CENTER) { if (first) { - list = "Back-Center"; + list = "Back-center"; first = false; } else { if (last != "") list << ", " << last; - last = "Back-Center"; + last = "Back-center"; } } if (channelMask & B_CHANNEL_SIDE_LEFT) { if (first) { - list = "Side-Left"; + list = "Side-left"; first = false; } else { if (last != "") list << ", " << last; - last = "Side-Left"; + last = "Side-left"; } } if (channelMask & B_CHANNEL_SIDE_RIGHT) { if (first) { - list = "Side-Right"; + list = "Side-right"; first = false; } else { if (last != "") list << ", " << last; - last = "Side-Right"; + last = "Side-right"; } } if (channelMask & B_CHANNEL_TOP_CENTER) { if (first) { - list = "Top-Center"; + list = "Top-center"; first = false; } else { if (last != "") list << ", " << last; - last = "Top-Center"; + last = "Top-center"; } } if (channelMask & B_CHANNEL_TOP_FRONT_LEFT) { if (first) { - list = "Top-Front-Left"; + list = "Top-Front-left"; first = false; } else { if (last != "") list << ", " << last; - last = "Top-Front-Left"; + last = "Top-Front-left"; } } if (channelMask & B_CHANNEL_TOP_FRONT_CENTER) { if (first) { - list = "Top-Front-Center"; + list = "Top-Front-center"; first = false; } else { if (last != "") list << ", " << last; - last = "Top-Front-Center"; + last = "Top-Front-center"; } } if (channelMask & B_CHANNEL_TOP_FRONT_RIGHT) { if (first) { - list = "Top-Front-Right"; + list = "Top-Front-right"; first = false; } else { if (last != "") list << ", " << last; - last = "Top-Front-Right"; + last = "Top-Front-right"; } } if (channelMask & B_CHANNEL_TOP_BACK_LEFT) { if (first) { - list = "Top-Back-Left"; + list = "Top-Back-left"; first = false; } else { if (last != "") list << ", " << last; - last = "Top-Back-Left"; + last = "Top-Back-left"; } } if (channelMask & B_CHANNEL_TOP_BACK_CENTER) { if (first) { - list = "Top-Back-Center"; + list = "Top-Back-center"; first = false; } else { if (last != "") list << ", " << last; - last = "Top-Back-Center"; + last = "Top-Back-center"; } } if (channelMask & B_CHANNEL_TOP_BACK_RIGHT) { if (first) { - list = "Top-Back-Right"; + list = "Top-Back-right"; first = false; } else { if (last != "") list << ", " << last; - last = "Top-Back-Right"; + last = "Top-Back-right"; } } if (last != "") { @@ -876,8 +876,8 @@ BString MediaString::forVideoFormat( case B_RGB15_BIG: return "15 bit RGB"; case B_RGBA15: case B_RGBA15_BIG: return "15 bit RGBA"; - case B_CMAP8: return "8 bit Color-Index"; - case B_GRAY8: return "8 bit Grayscale-Index"; + case B_CMAP8: return "8 bit color-index"; + case B_GRAY8: return "8 bit grayscale-index"; case B_GRAY1: return "Monochrome"; case B_YUV422: return "YUV422"; case B_YUV411: return "YUV411"; @@ -942,7 +942,7 @@ BString MediaString::forVideoFieldRate( BString s = ""; if (interlace == 1) { - s << "Non-Interlaced "; + s << "Non-interlaced "; } else { s << "Interlaced "; @@ -970,10 +970,10 @@ BString MediaString::forVideoOrientation( switch (orientation) { case B_VIDEO_TOP_LEFT_RIGHT: { - return "Top to Bottom, Left to Right"; + return "Top to bottom, left to right"; } case B_VIDEO_BOTTOM_LEFT_RIGHT: { - return "Bottom to Top, Left to Right"; + return "Bottom to top, left to right"; } default: { return "(unkown video orientation)"; @@ -1129,7 +1129,7 @@ BString MediaString::forMultistreamFormat( } switch (format) { - case media_multistream_format::B_VID: return "BeOS Video"; + case media_multistream_format::B_VID: return "BeOS video"; case media_multistream_format::B_AVI: return "AVI"; case media_multistream_format::B_MPEG1: return "MPEG1"; case media_multistream_format::B_MPEG2: return "MPEG2"; diff --git a/src/apps/debugger/user_interface/gui/running_teams_window/hdb.cpp b/src/apps/debugger/user_interface/gui/running_teams_window/hdb.cpp index 84c1aa4918..1ff7726234 100644 --- a/src/apps/debugger/user_interface/gui/running_teams_window/hdb.cpp +++ b/src/apps/debugger/user_interface/gui/running_teams_window/hdb.cpp @@ -129,7 +129,7 @@ Debugger::RefsReceived(BMessage *message) ref.name, strerror(status)); (new BAlert("Debugger request", - buffer, "Ok", NULL, NULL, + buffer, "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go(); } } @@ -219,7 +219,7 @@ Debugger::ShowAbout() { BAlert *alert = new BAlert("about", "Debugger\n" "\twritten by Philippe Houdoin\n" - "\tCopyright 2009, Haiku Inc.\n", "Ok"); + "\tCopyright 2009, Haiku, Inc.\n", "OK"); BTextView *view = alert->TextView(); BFont font; diff --git a/src/apps/deskbar/BeMenu.cpp b/src/apps/deskbar/BeMenu.cpp index 2181eaef53..703e1792e1 100644 --- a/src/apps/deskbar/BeMenu.cpp +++ b/src/apps/deskbar/BeMenu.cpp @@ -149,8 +149,8 @@ TBeMenu::AddNextItem() TrackingHookData* data = fBarView->GetTrackingHookData(); if (fAddState == kAddingRecents) { - const char* recentTitle[] = {"Recent Documents", "Recent Folders", - "Recent Applications"}; + const char* recentTitle[] = {"Recent documents", "Recent folders", + "Recent applications"}; const int recentType[] = {kRecentDocuments, kRecentFolders, kRecentApplications}; const int recentTypes = 3; @@ -225,7 +225,7 @@ TBeMenu::AddStandardBeMenuItems() #ifdef HAIKU_DISTRO_COMPATIBILITY_OFFICIAL "About Haiku" #else - "About This System" + "About this system" #endif B_UTF8_ELLIPSIS, new BMessage(kShowSplash)); item->SetEnabled(!dragging); @@ -240,7 +240,7 @@ TBeMenu::AddStandardBeMenuItems() item->SetEnabled(!dragging); AddItem(item); - item = new BMenuItem("Show Replicants", new BMessage(kToggleDraggers)); + item = new BMenuItem("Show replicants", new BMessage(kToggleDraggers)); item->SetEnabled(!dragging); item->SetMarked(BDragger::AreDraggersDrawn()); AddItem(item); @@ -251,7 +251,7 @@ TBeMenu::AddStandardBeMenuItems() AddItem(mountMenu); #endif - item = new BMenuItem("Deskbar Preferences" B_UTF8_ELLIPSIS, + item = new BMenuItem("Deskbar preferences" B_UTF8_ELLIPSIS, new BMessage(kConfigShow)); item->SetTarget(be_app); AddItem(item); @@ -260,7 +260,7 @@ TBeMenu::AddStandardBeMenuItems() BMenu* shutdownMenu = new BMenu("Shutdown" B_UTF8_ELLIPSIS); - item = new BMenuItem("Restart System", new BMessage(kRebootSystem)); + item = new BMenuItem("Restart system", new BMessage(kRebootSystem)); item->SetEnabled(!dragging); shutdownMenu->AddItem(item); @@ -272,7 +272,7 @@ TBeMenu::AddStandardBeMenuItems() } #endif - item = new BMenuItem("Power Off", new BMessage(kShutdownSystem)); + item = new BMenuItem("Power off", new BMessage(kShutdownSystem)); item->SetEnabled(!dragging); shutdownMenu->AddItem(item); shutdownMenu->SetFont(be_plain_font); diff --git a/src/apps/deskbar/PreferencesWindow.cpp b/src/apps/deskbar/PreferencesWindow.cpp index 3e18e9657a..c291445f57 100644 --- a/src/apps/deskbar/PreferencesWindow.cpp +++ b/src/apps/deskbar/PreferencesWindow.cpp @@ -24,15 +24,15 @@ PreferencesWindow::PreferencesWindow(BRect frame) : - BWindow(frame, "Deskbar Preferences", B_TITLED_WINDOW, + BWindow(frame, "Deskbar preferences", B_TITLED_WINDOW, B_NOT_RESIZABLE | B_AUTO_UPDATE_SIZE_LIMITS | B_NOT_ZOOMABLE) { // Controls - fMenuRecentDocuments = new BCheckBox("Recent Documents:", + fMenuRecentDocuments = new BCheckBox("Recent documents:", new BMessage(kUpdateRecentCounts)); - fMenuRecentApplications = new BCheckBox("Recent Applications:", + fMenuRecentApplications = new BCheckBox("Recent applications:", new BMessage(kUpdateRecentCounts)); - fMenuRecentFolders = new BCheckBox("Recent Folders:", + fMenuRecentFolders = new BCheckBox("Recent folders:", new BMessage(kUpdateRecentCounts)); fMenuRecentDocumentCount = new BTextControl(NULL, NULL, @@ -42,23 +42,23 @@ PreferencesWindow::PreferencesWindow(BRect frame) fMenuRecentFolderCount = new BTextControl(NULL, NULL, new BMessage(kUpdateRecentCounts)); - fAppsSort = new BCheckBox("Sort Running Applications", + fAppsSort = new BCheckBox("Sort running applications", new BMessage(kSortRunningApps)); - fAppsSortTrackerFirst = new BCheckBox("Tracker Always First", + fAppsSortTrackerFirst = new BCheckBox("Tracker always first", new BMessage(kTrackerFirst)); - fAppsShowExpanders = new BCheckBox("Show Application Expander", + fAppsShowExpanders = new BCheckBox("Show application expander", new BMessage(kSuperExpando)); - fAppsExpandNew = new BCheckBox("Expand New Applications", + fAppsExpandNew = new BCheckBox("Expand new applications", new BMessage(kExpandNewTeams)); - fClock24Hours = new BCheckBox("24 Hour Clock", new BMessage(kMilTime)); - fClockSeconds = new BCheckBox("Show Seconds", + fClock24Hours = new BCheckBox("24 hour clock", new BMessage(kMilTime)); + fClockSeconds = new BCheckBox("Show seconds", new BMessage(kShowSeconds)); - fClockEuropeanDate = new BCheckBox("European Date", + fClockEuropeanDate = new BCheckBox("European date", new BMessage(kEuroDate)); - fClockFullDate = new BCheckBox("Full Date", new BMessage(kFullDate)); + fClockFullDate = new BCheckBox("Full date", new BMessage(kFullDate)); - fWindowAlwaysOnTop = new BCheckBox("Always On Top", + fWindowAlwaysOnTop = new BCheckBox("Always on top", new BMessage(kAlwaysTop)); fWindowAutoRaise = new BCheckBox("Auto-raise", new BMessage(kAutoRaise)); @@ -183,7 +183,7 @@ PreferencesWindow::PreferencesWindow(BRect frame) .Add(fMenuRecentApplicationCount) .End() .End() - .Add(new BButton("Edit Menu" B_UTF8_ELLIPSIS, + .Add(new BButton("Edit menu" B_UTF8_ELLIPSIS, new BMessage(kEditMenuInTracker))) .SetInsets(10, 10, 10, 10) .End() diff --git a/src/apps/deskbar/TimeView.cpp b/src/apps/deskbar/TimeView.cpp index 68631c9b72..94cbadfcb1 100644 --- a/src/apps/deskbar/TimeView.cpp +++ b/src/apps/deskbar/TimeView.cpp @@ -558,14 +558,14 @@ TTimeView::ShowClockOptions(BPoint point) menu->SetFont(be_plain_font); BMenuItem* item; - item = new BMenuItem("Change Time" B_UTF8_ELLIPSIS, + item = new BMenuItem("Change time" B_UTF8_ELLIPSIS, new BMessage(kChangeClock)); menu->AddItem(item); - item = new BMenuItem("Hide Time", new BMessage('time')); + item = new BMenuItem("Hide time", new BMessage('time')); menu->AddItem(item); - item = new BMenuItem("Show Calendar" B_UTF8_ELLIPSIS, + item = new BMenuItem("Show calendar" B_UTF8_ELLIPSIS, new BMessage(kShowCalendar)); menu->AddItem(item); diff --git a/src/apps/deskbar/WindowMenu.cpp b/src/apps/deskbar/WindowMenu.cpp index b0a65dcefe..89958a38ed 100644 --- a/src/apps/deskbar/WindowMenu.cpp +++ b/src/apps/deskbar/WindowMenu.cpp @@ -173,7 +173,7 @@ TWindowMenu::AttachedToWindow() int32 itemCount = CountItems() + parentMenuItems; if (itemCount < 1) { TWindowMenuItem* noWindowsItem = - new TWindowMenuItem("No Windows", -1, false, false); + new TWindowMenuItem("No windows", -1, false, false); noWindowsItem->SetEnabled(false); @@ -183,7 +183,7 @@ TWindowMenu::AttachedToWindow() // it. (but we only add this option if the application is not Tracker.) if (fApplicationSignature.ICompare(kTrackerSignature) != 0) { AddSeparatorItem(); - AddItem(new TShowHideMenuItem("Quit Application", fTeam, + AddItem(new TShowHideMenuItem("Quit application", fTeam, B_QUIT_REQUESTED)); } } else { @@ -191,11 +191,11 @@ TWindowMenu::AttachedToWindow() // to the menu if (!dragging) { TShowHideMenuItem* hide = - new TShowHideMenuItem("Hide All", fTeam, B_MINIMIZE_WINDOW); + new TShowHideMenuItem("Hide all", fTeam, B_MINIMIZE_WINDOW); TShowHideMenuItem* show = - new TShowHideMenuItem("Show All", fTeam, B_BRING_TO_FRONT); + new TShowHideMenuItem("Show all", fTeam, B_BRING_TO_FRONT); TShowHideMenuItem* close = - new TShowHideMenuItem("Close All", fTeam, B_QUIT_REQUESTED); + new TShowHideMenuItem("Close all", fTeam, B_QUIT_REQUESTED); if (miniCount == itemCount) hide->SetEnabled(false); diff --git a/src/apps/deskcalc/CalcView.cpp b/src/apps/deskcalc/CalcView.cpp index 071071b8e9..c23f7a5aa5 100644 --- a/src/apps/deskcalc/CalcView.cpp +++ b/src/apps/deskcalc/CalcView.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2006 Haiku, Inc. All Rights Reserved. + * Copyright 2006-2009, Haiku, Inc. All rights reserved. * Copyright 1997, 1998 R3 Software Ltd. All Rights Reserved. * Distributed under the terms of the MIT License. * @@ -687,7 +687,7 @@ CalcView::AboutRequested() "written by Timothy Wayper,\nStephan Aßmus and Ingo Weinhold\n\n" B_UTF8_COPYRIGHT"1997, 1998 R3 Software Ltd.\n" B_UTF8_COPYRIGHT"2006-2009 Haiku, Inc.\n\n" - "All Rights Reserved.", "Cool"); + "All Rights Reserved.", "OK"); alert->Go(NULL); } @@ -1098,13 +1098,13 @@ void CalcView::_CreatePopUpMenu() { // construct items - fAutoNumlockItem = new BMenuItem("Enable Num Lock on start up", + fAutoNumlockItem = new BMenuItem("Enable Num Lock on startup", new BMessage(MSG_OPTIONS_AUTO_NUM_LOCK)); fAudioFeedbackItem = new BMenuItem("Audio Feedback", new BMessage(MSG_OPTIONS_AUDIO_FEEDBACK)); - fShowKeypadItem = new BMenuItem("Show Keypad", + fShowKeypadItem = new BMenuItem("Show keypad", new BMessage(MSG_OPTIONS_SHOW_KEYPAD)); - fAboutItem = new BMenuItem("About DeskCalc", + fAboutItem = new BMenuItem("About DeskCalc" B_UTF8_ELLIPSIS, new BMessage(B_ABOUT_REQUESTED)); // apply current settings diff --git a/src/apps/devices/DevicePCI.cpp b/src/apps/devices/DevicePCI.cpp index 95fdbe52c8..e6c1823194 100644 --- a/src/apps/devices/DevicePCI.cpp +++ b/src/apps/devices/DevicePCI.cpp @@ -74,7 +74,7 @@ DevicePCI::InitFromAttributes() const char *venFull; get_vendor_info(fVendorId, &venShort, &venFull); if (!venShort && !venFull) { - ManufacturerName << "Unkown"; + ManufacturerName << "Unknown"; } else if (venShort && venFull) { ManufacturerName << venFull << "(" << venShort << ")"; } else { @@ -98,7 +98,7 @@ DevicePCI::InitFromAttributes() SetAttribute("Manufacturer", ManufacturerName); SetAttribute("Driver used", "Not implemented"); SetAttribute("Device paths", "Not implemented"); - SetAttribute("Class Info", classInfo); + SetAttribute("Class info", classInfo); fCategory = (Category)fClassBaseId; BString outlineName; outlineName << ManufacturerName << " " << DeviceName; diff --git a/src/apps/devices/DevicesApplication.cpp b/src/apps/devices/DevicesApplication.cpp index f779495aa6..290f933249 100644 --- a/src/apps/devices/DevicesApplication.cpp +++ b/src/apps/devices/DevicesApplication.cpp @@ -56,7 +56,7 @@ DevicesApplication::ShowAbout() "\tBased on listdev by Jérôme Duval\n" "\tand the previous Devices preference\n" "\tby Jérôme Duval and Sikosis\n" - "\tCopyright 2009, Haiku Inc.\n", "Ok"); + "\tCopyright 2009, Haiku, Inc.\n", "OK"); BTextView* view = alert->TextView(); BFont font; diff --git a/src/apps/devices/DevicesView.cpp b/src/apps/devices/DevicesView.cpp index c70a57addf..1aeb2881a5 100644 --- a/src/apps/devices/DevicesView.cpp +++ b/src/apps/devices/DevicesView.cpp @@ -32,11 +32,11 @@ DevicesView::CreateLayout() BMenuBar* menuBar = new BMenuBar("menu"); BMenu* menu = new BMenu("Devices"); BMenuItem* item; - menu->AddItem(new BMenuItem("Refresh Devices", new BMessage(kMsgRefresh), 'R')); - menu->AddItem(item = new BMenuItem("Report Compatibility", + menu->AddItem(new BMenuItem("Refresh devices", new BMessage(kMsgRefresh), 'R')); + menu->AddItem(item = new BMenuItem("Report compatibility", new BMessage(kMsgReportCompatibility))); item->SetEnabled(false); - menu->AddItem(item = new BMenuItem("Generate System Information", + menu->AddItem(item = new BMenuItem("Generate system information", new BMessage(kMsgGenerateSysInfo))); item->SetEnabled(false); menu->AddSeparatorItem(); @@ -60,12 +60,12 @@ DevicesView::CreateLayout() // why? Bug? In scrollview or in outlinelistview? BPopUpMenu* orderByPopupMenu = new BPopUpMenu("orderByMenu"); - BMenuItem* byCategory = new BMenuItem("category", + BMenuItem* byCategory = new BMenuItem("Category", new BMessage(kMsgOrderCategory)); - BMenuItem* byConnection = new BMenuItem("connection", + BMenuItem* byConnection = new BMenuItem("Connection", new BMessage(kMsgOrderConnection)); byCategory->SetMarked(true); - fOrderBy = byCategory->IsMarked() ? ORDER_BY_CATEGORY : + fOrderBy = byCategory->IsMarked() ? ORDER_BY_CATEGORY : ORDER_BY_CONNECTION; orderByPopupMenu->AddItem(byCategory); orderByPopupMenu->AddItem(byConnection); @@ -76,7 +76,7 @@ DevicesView::CreateLayout() fBasicTab = new BTab(); fBasicView = new PropertyListPlain("basicView"); fTabView->AddTab(fBasicView, fBasicTab); - fBasicTab->SetLabel("Basic Information"); + fBasicTab->SetLabel("Basic information"); fDeviceTypeTab = new BTab(); fBusView = new PropertyListPlain("busView"); @@ -273,27 +273,27 @@ DevicesView::AddDeviceAndChildren(device_node_cookie *node, Device* parent) } attributes.push_back(Attribute(attr.name, attrString)); } - + // Determine what type of device it is and create it for (unsigned int i = 0; i < attributes.size(); i++) { // Devices Root - if (attributes[i].fName == "device/pretty name" + if (attributes[i].fName == "device/pretty name" && attributes[i].fValue == "Devices Root") { newDevice = new Device(parent, BUS_NONE, CAT_COMPUTER, "Computer"); break; } - + // PCI bus if (attributes[i].fName == "device/pretty name" && attributes[i].fValue == "PCI") { - newDevice = new Device(parent, BUS_PCI, CAT_BUS, "PCI Bus"); + newDevice = new Device(parent, BUS_PCI, CAT_BUS, "PCI bus"); break; } // ISA bus if (attributes[i].fName == "device/bus" && attributes[i].fValue == "isa") { - newDevice = new Device(parent, BUS_ISA, CAT_BUS, "ISA Bus"); + newDevice = new Device(parent, BUS_ISA, CAT_BUS, "ISA bus"); break; } @@ -304,11 +304,11 @@ DevicesView::AddDeviceAndChildren(device_node_cookie *node, Device* parent) break; } } - + if (newDevice == NULL) { - newDevice = new Device(parent, BUS_NONE, CAT_NONE, "Unknown Device"); + newDevice = new Device(parent, BUS_NONE, CAT_NONE, "Unknown device"); } - + // Add its attributes to the device, initialize it and add to the list. for (unsigned int i = 0; i < attributes.size(); i++) { newDevice->SetAttribute(attributes[i].fName, attributes[i].fValue); diff --git a/src/apps/diskprobe/AttributeWindow.cpp b/src/apps/diskprobe/AttributeWindow.cpp index 0b1763916a..1b32feca66 100644 --- a/src/apps/diskprobe/AttributeWindow.cpp +++ b/src/apps/diskprobe/AttributeWindow.cpp @@ -53,7 +53,7 @@ EditorTabView::EditorTabView(BRect frame, const char *name, button_width width, { ContainerView()->MoveBy(-ContainerView()->Frame().left, TabHeight() + 1 - ContainerView()->Frame().top); - fNoEditorView = new BStringView(ContainerView()->Bounds(), "Type Editor", + fNoEditorView = new BStringView(ContainerView()->Bounds(), "Type editor", "No type editor available", B_FOLLOW_NONE); fNoEditorView->ResizeToPreferred(); fNoEditorView->SetAlignment(B_ALIGN_CENTER); @@ -128,7 +128,7 @@ EditorTabView::AddRawEditorTab(BView *view) fRawTab = CountTabs(); - view = new BView(BRect(0, 0, 5, 5), "Raw Editor", B_FOLLOW_NONE, 0); + view = new BView(BRect(0, 0, 5, 5), "Raw editor", B_FOLLOW_NONE, 0); view->SetViewColor(ViewColor()); AddTab(view); } @@ -208,7 +208,7 @@ AttributeWindow::AttributeWindow(BRect _rect, entry_ref *ref, const char *attrib BMenu *menu = new BMenu("Attribute"); // the ProbeView save menu items will be inserted here - menu->AddItem(new BMenuItem("Remove from File", new BMessage(kMsgRemoveAttribute))); + menu->AddItem(new BMenuItem("Remove from file", new BMessage(kMsgRemoveAttribute))); menu->AddSeparatorItem(); // the ProbeView print menu items will be inserted here diff --git a/src/apps/diskprobe/DiskProbe.cpp b/src/apps/diskprobe/DiskProbe.cpp index ac426c8894..16d38891e2 100644 --- a/src/apps/diskprobe/DiskProbe.cpp +++ b/src/apps/diskprobe/DiskProbe.cpp @@ -346,7 +346,7 @@ DiskProbe::RefsReceived(BMessage *message) ref.name, strerror(status)); (new BAlert("DiskProbe request", - buffer, "Ok", NULL, NULL, + buffer, "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go(); } } @@ -465,7 +465,7 @@ DiskProbe::AboutRequested() BAlert *alert = new BAlert("about", "DiskProbe\n" "\twritten by Axel Dörfler\n" "\tCopyright 2004-2007, Haiku.\n\n" - "original Be version by Robert Polic\n", "Ok"); + "Original Be version by Robert Polic\n", "OK"); BTextView *view = alert->TextView(); BFont font; diff --git a/src/apps/diskprobe/FileWindow.cpp b/src/apps/diskprobe/FileWindow.cpp index 4cf6df4fe4..52459b5734 100644 --- a/src/apps/diskprobe/FileWindow.cpp +++ b/src/apps/diskprobe/FileWindow.cpp @@ -50,12 +50,12 @@ FileWindow::FileWindow(BRect rect, entry_ref *ref, const BMessage *settings) menu->AddItem(new BMenuItem("New" B_UTF8_ELLIPSIS, new BMessage(kMsgOpenOpenWindow), 'N', B_COMMAND_KEY)); - BMenu *devicesMenu = new BMenu("Open Device"); + BMenu *devicesMenu = new BMenu("Open device"); OpenWindow::CollectDevices(devicesMenu); devicesMenu->SetTargetForItems(be_app); menu->AddItem(new BMenuItem(devicesMenu)); - BMenu *recentsMenu = BRecentFilesList::NewFileListMenu("Open File" B_UTF8_ELLIPSIS, + BMenu *recentsMenu = BRecentFilesList::NewFileListMenu("Open file" B_UTF8_ELLIPSIS, NULL, NULL, be_app, 10, false, NULL, kSignature); BMenuItem *item; menu->AddItem(item = new BMenuItem(recentsMenu, new BMessage(kMsgOpenFilePanel))); diff --git a/src/apps/diskprobe/OpenWindow.cpp b/src/apps/diskprobe/OpenWindow.cpp index 1d3ec212b8..717550b47d 100644 --- a/src/apps/diskprobe/OpenWindow.cpp +++ b/src/apps/diskprobe/OpenWindow.cpp @@ -35,13 +35,13 @@ OpenWindow::OpenWindow() if (BMenuItem *item = fDevicesMenu->ItemAt(0)) item->SetMarked(true); - BMenuField *field = new BMenuField("Examine Device:", fDevicesMenu, NULL); + BMenuField *field = new BMenuField("Examine device:", fDevicesMenu, NULL); - BButton *probeDeviceButton = new BButton("device", "Probe Device", + BButton *probeDeviceButton = new BButton("device", "Probe device", new BMessage(kMsgProbeDevice)); probeDeviceButton->MakeDefault(true); - BButton *probeFileButton = new BButton("file", "Probe File" B_UTF8_ELLIPSIS, + BButton *probeFileButton = new BButton("file", "Probe file" B_UTF8_ELLIPSIS, new BMessage(kMsgProbeFile)); BButton *cancelButton = new BButton("cancel", "Cancel", diff --git a/src/apps/diskprobe/ProbeView.cpp b/src/apps/diskprobe/ProbeView.cpp index a620ac9779..cd957dfad0 100644 --- a/src/apps/diskprobe/ProbeView.cpp +++ b/src/apps/diskprobe/ProbeView.cpp @@ -519,7 +519,7 @@ HeaderView::HeaderView(BRect frame, const entry_ref *ref, DataEditor &editor) if (editor.IsAttribute()) { top += 3; stringView = new BStringView(BRect(50, top, frame.right, top + 15), - B_EMPTY_STRING, "Attribute Type: "); + B_EMPTY_STRING, "Attribute type: "); stringView->SetFont(&boldFont); stringView->ResizeToPreferred(); AddChild(stringView); @@ -590,8 +590,8 @@ HeaderView::HeaderView(BRect frame, const entry_ref *ref, DataEditor &editor) rect.left = rect.right + 4; rect.right = frame.right; stringView = new BStringView(rect, B_EMPTY_STRING, editor.IsAttribute() - ? "Attribute Offset: " : editor.IsDevice() - ? "Device Offset: " : "File Offset: "); + ? "Attribute offset: " : editor.IsDevice() + ? "Device offset: " : "File offset: "); stringView->SetFont(&boldFont); stringView->ResizeToPreferred(); AddChild(stringView); @@ -1092,7 +1092,7 @@ EditorLooper::Find(off_t startAt, const uint8 *data, size_t dataSize, // If the user had to wait more than 8 seconds for the result, // we are trying to please him with a requester... (new BAlert("DiskProbe request", - "Could not find search string.", "Ok", NULL, NULL, + "Could not find search string.", "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go(NULL); } else beep(); @@ -1119,7 +1119,7 @@ TypeView::TypeView(BRect rect, const char* name, int32 index, fTypeEditorView = GetTypeEditorAt(index, Frame(), editor); if (fTypeEditorView == NULL) { - AddChild(new BStringView(Bounds(), "Type Editor", + AddChild(new BStringView(Bounds(), "Type editor", "Type editor not supported", B_FOLLOW_NONE)); } else AddChild(fTypeEditorView); @@ -1323,7 +1323,7 @@ void ProbeView::AddPrintMenuItems(BMenu* menu, int32 index) { BMenuItem *item; - menu->AddItem(item = new BMenuItem("Page Setup" B_UTF8_ELLIPSIS, + menu->AddItem(item = new BMenuItem("Page setup" B_UTF8_ELLIPSIS, new BMessage(kMsgPageSetup)), index++); item->SetTarget(this); menu->AddItem(item = new BMenuItem("Print" B_UTF8_ELLIPSIS, @@ -1427,14 +1427,14 @@ ProbeView::AttachedToWindow() 'V')); fPasteMenuItem->SetTarget(NULL, Window()); _CheckClipboard(); - menu->AddItem(item = new BMenuItem("Select All", new BMessage(B_SELECT_ALL), + menu->AddItem(item = new BMenuItem("Select all", new BMessage(B_SELECT_ALL), 'A')); item->SetTarget(NULL, Window()); menu->AddSeparatorItem(); menu->AddItem(item = new BMenuItem("Find" B_UTF8_ELLIPSIS, new BMessage(kMsgOpenFindWindow), 'F')); item->SetTarget(this); - menu->AddItem(fFindAgainMenuItem = new BMenuItem("Find Again", + menu->AddItem(fFindAgainMenuItem = new BMenuItem("Find again", new BMessage(kMsgFind), 'G')); fFindAgainMenuItem->SetEnabled(false); fFindAgainMenuItem->SetTarget(this); @@ -1546,7 +1546,7 @@ ProbeView::AttachedToWindow() // Font Size - subMenu = new BMenu("Font Size"); + subMenu = new BMenu("Font size"); subMenu->SetRadioMode(true); const int32 fontSizes[] = {9, 10, 11, 12, 13, 14, 18, 24, 36, 48}; int32 fontSize = int32(fDataView->FontSize() + 0.5); @@ -1841,7 +1841,7 @@ ProbeView::_Save() strerror(status)); (new BAlert("DiskProbe request", - buffer, "Ok", NULL, NULL, + buffer, "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go(NULL); return status; @@ -1857,7 +1857,7 @@ ProbeView::QuitRequested() return true; int32 chosen = (new BAlert("DiskProbe request", - "Save changes before closing?", "Don't Save", "Cancel", "Save", + "Save changes before closing?", "Don't save", "Cancel", "Save", B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go(); if (chosen == 0) diff --git a/src/apps/diskprobe/TypeEditors.cpp b/src/apps/diskprobe/TypeEditors.cpp index f98b42ce57..88ea6932e3 100644 --- a/src/apps/diskprobe/TypeEditors.cpp +++ b/src/apps/diskprobe/TypeEditors.cpp @@ -191,7 +191,7 @@ TypeEditorView::TypeMatches() StringEditor::StringEditor(BRect rect, DataEditor& editor) - : TypeEditorView(rect, "String Editor", B_FOLLOW_ALL, 0, editor) + : TypeEditorView(rect, "String editor", B_FOLLOW_ALL, 0, editor) { SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); @@ -275,12 +275,12 @@ StringEditor::MessageReceived(BMessage *message) MimeTypeEditor::MimeTypeEditor(BRect rect, DataEditor& editor) - : TypeEditorView(rect, "MIME Type Editor", B_FOLLOW_LEFT_RIGHT, 0, editor) + : TypeEditorView(rect, "MIME type editor", B_FOLLOW_LEFT_RIGHT, 0, editor) { SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); fTextControl = new BTextControl(rect.InsetByCopy(5, 5), B_EMPTY_STRING, - "MIME Type:", NULL, new BMessage(kMsgValueChanged), B_FOLLOW_ALL); + "MIME type:", NULL, new BMessage(kMsgValueChanged), B_FOLLOW_ALL); fTextControl->SetDivider(StringWidth(fTextControl->Label()) + 8); float width, height; @@ -366,7 +366,7 @@ MimeTypeEditor::MessageReceived(BMessage *message) NumberEditor::NumberEditor(BRect rect, DataEditor &editor) - : TypeEditorView(rect, "Number Editor", B_FOLLOW_LEFT_RIGHT, 0, editor) + : TypeEditorView(rect, "Number editor", B_FOLLOW_LEFT_RIGHT, 0, editor) { SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); @@ -593,33 +593,33 @@ NumberEditor::_TypeLabel() { switch (fEditor.Type()) { case B_INT8_TYPE: - return "8 Bit Signed Value:"; + return "8 bit signed value:"; case B_UINT8_TYPE: - return "8 Bit Unsigned Value:"; + return "8 bit unsigned value:"; case B_INT16_TYPE: - return "16 Bit Signed Value:"; + return "16 bit signed value:"; case B_UINT16_TYPE: - return "16 Bit Unsigned Value:"; + return "16 bit unsigned value:"; case B_INT32_TYPE: - return "32 Bit Signed Value:"; + return "32 bit signed value:"; case B_UINT32_TYPE: - return "32 Bit Unsigned Value:"; + return "32 bit unsigned value:"; case B_INT64_TYPE: - return "64 Bit Signed Value:"; + return "64 bit signed value:"; case B_UINT64_TYPE: - return "64 Bit Unsigned Value:"; + return "64 bit unsigned value:"; case B_FLOAT_TYPE: - return "Floating-Point Value:"; + return "Floating-point value:"; case B_DOUBLE_TYPE: - return "Double Precision Floating-Point Value:"; + return "Double precision floating-point value:"; case B_SSIZE_T_TYPE: - return "32 Bit Size or Status:"; + return "32 bit size or status:"; case B_SIZE_T_TYPE: - return "32 Bit Unsigned Size:"; + return "32 bit unsigned size:"; case B_OFF_T_TYPE: - return "64 Bit Signed Offset:"; + return "64 bit signed offset:"; case B_POINTER_TYPE: - return "32 Bit Unsigned Pointer:"; + return "32 bit unsigned pointer:"; default: return "Number:"; } @@ -742,7 +742,7 @@ NumberEditor::MessageReceived(BMessage *message) BooleanEditor::BooleanEditor(BRect rect, DataEditor &editor) - : TypeEditorView(rect, "Boolean Editor", B_FOLLOW_NONE, 0, editor) + : TypeEditorView(rect, "Boolean editor", B_FOLLOW_NONE, 0, editor) { SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); @@ -755,7 +755,7 @@ BooleanEditor::BooleanEditor(BRect rect, DataEditor &editor) message->AddInt8("value", 1); BMenuField *menuField = new BMenuField(rect.InsetByCopy(5, 5), - B_EMPTY_STRING, "Boolean Value:", menu, B_FOLLOW_LEFT_RIGHT); + B_EMPTY_STRING, "Boolean value:", menu, B_FOLLOW_LEFT_RIGHT); menuField->SetDivider(StringWidth(menuField->Label()) + 8); menuField->ResizeToPreferred(); ResizeTo(menuField->Bounds().Width() + 10, @@ -839,7 +839,7 @@ BooleanEditor::MessageReceived(BMessage *message) ImageView::ImageView(BRect rect, DataEditor &editor) - : TypeEditorView(rect, "Image View", B_FOLLOW_NONE, B_WILL_DRAW, editor), + : TypeEditorView(rect, "Image view", B_FOLLOW_NONE, B_WILL_DRAW, editor), fBitmap(NULL), fScaleSlider(NULL) { @@ -848,7 +848,7 @@ ImageView::ImageView(BRect rect, DataEditor &editor) || editor.Type() == B_VECTOR_ICON_TYPE #endif ) - SetName("Icon View"); + SetName("Icon view"); #ifdef HAIKU_TARGET_PLATFORM_HAIKU if (editor.Type() == B_VECTOR_ICON_TYPE) { @@ -1020,7 +1020,7 @@ ImageView::_UpdateImage() if (fBitmap != NULL) { char buffer[256]; - const char *type = "Unknown Type"; + const char *type = "Unknown type"; switch (fEditor.Type()) { case B_MINI_ICON_TYPE: case B_LARGE_ICON_TYPE: @@ -1030,10 +1030,10 @@ ImageView::_UpdateImage() type = "Icon"; break; case B_PNG_FORMAT: - type = "PNG Format"; + type = "PNG format"; break; case B_MESSAGE_TYPE: - type = "Flattened Bitmap"; + type = "Flattened bitmap"; break; default: break; @@ -1042,29 +1042,29 @@ ImageView::_UpdateImage() switch (fBitmap->ColorSpace()) { case B_GRAY1: case B_GRAY8: - colorSpace = "Gray Scale"; + colorSpace = "Grayscale"; break; case B_CMAP8: - colorSpace = "8 Bit Palette"; + colorSpace = "8 bit palette"; break; case B_RGB32: case B_RGBA32: case B_RGB32_BIG: case B_RGBA32_BIG: - colorSpace = "32 Bit"; + colorSpace = "32 bit"; break; case B_RGB15: case B_RGBA15: case B_RGB15_BIG: case B_RGBA15_BIG: - colorSpace = "15 Bit"; + colorSpace = "15 bit"; break; case B_RGB16: case B_RGB16_BIG: - colorSpace = "16 Bit"; + colorSpace = "16 bit"; break; default: - colorSpace = "Unknown Format"; + colorSpace = "Unknown format"; break; } snprintf(buffer, sizeof(buffer), "%s, %g x %g, %s", type, diff --git a/src/apps/drivesetup/CreateParamsPanel.cpp b/src/apps/drivesetup/CreateParamsPanel.cpp index 4fa91af216..7a8b6d2bd2 100644 --- a/src/apps/drivesetup/CreateParamsPanel.cpp +++ b/src/apps/drivesetup/CreateParamsPanel.cpp @@ -218,11 +218,11 @@ CreateParamsPanel::_CreateViewControls(BPartition* parent, off_t offset, off_t size) { // Setup the controls - fSizeSlider = new SizeSlider("Slider", "Partition Size", NULL, offset, + fSizeSlider = new SizeSlider("Slider", "Partition size", NULL, offset, offset + size); fSizeSlider->SetPosition(1.0); - fNameTextControl = new BTextControl("Name Control", "Partition Name", + fNameTextControl = new BTextControl("Name Control", "Partition name", "", NULL); if (!parent->SupportsChildName()) fNameTextControl->SetEnabled(false); @@ -242,7 +242,7 @@ CreateParamsPanel::_CreateViewControls(BPartition* parent, off_t offset, item->SetMarked(true); } - fTypeMenuField = new BMenuField("Partition Type", fTypePopUpMenu, NULL); + fTypeMenuField = new BMenuField("Partition type", fTypePopUpMenu, NULL); fOKButton = new BButton("Create", new BMessage(MSG_OK)); fCancelButton = new BButton("Cancel", new BMessage(MSG_CANCEL)); diff --git a/src/apps/drivesetup/MainWindow.cpp b/src/apps/drivesetup/MainWindow.cpp index 45a32da626..217c2150e6 100644 --- a/src/apps/drivesetup/MainWindow.cpp +++ b/src/apps/drivesetup/MainWindow.cpp @@ -164,7 +164,7 @@ MainWindow::MainWindow(BRect frame) fFormatMI = new BMenuItem("Format (not implemented)", new BMessage(MSG_FORMAT)); fEjectMI = new BMenuItem("Eject", new BMessage(MSG_EJECT), 'E'); - fSurfaceTestMI = new BMenuItem("Surface Test (not implemented)", + fSurfaceTestMI = new BMenuItem("Surface test (not implemented)", new BMessage(MSG_SURFACE_TEST)); fRescanMI = new BMenuItem("Rescan", new BMessage(MSG_RESCAN)); @@ -174,7 +174,7 @@ MainWindow::MainWindow(BRect frame) fMountMI = new BMenuItem("Mount", new BMessage(MSG_MOUNT), 'M'); fUnmountMI = new BMenuItem("Unmount", new BMessage(MSG_UNMOUNT), 'U'); - fMountAllMI = new BMenuItem("Mount All", + fMountAllMI = new BMenuItem("Mount all", new BMessage(MSG_MOUNT_ALL), 'M', B_SHIFT_KEY); // Disk menu @@ -622,7 +622,7 @@ MainWindow::_DisplayPartitionError(BString _message, sprintf(message, "%s\n\nError: %s", helper.String(), strerror(error)); } - BAlert* alert = new BAlert("error", message, "Ok", NULL, NULL, + BAlert* alert = new BAlert("error", message, "OK", NULL, NULL, B_WIDTH_FROM_WIDEST, error < B_OK ? B_STOP_ALERT : B_INFO_ALERT); alert->Go(NULL); } @@ -642,7 +642,7 @@ MainWindow::_Mount(BDiskDevice* disk, partition_id selectedPartition) BPartition* partition = disk->FindDescendant(selectedPartition); if (!partition) { - _DisplayPartitionError("Unable to find the selected partition by id."); + _DisplayPartitionError("Unable to find the selected partition by ID."); return; } @@ -673,7 +673,7 @@ MainWindow::_Unmount(BDiskDevice* disk, partition_id selectedPartition) BPartition* partition = disk->FindDescendant(selectedPartition); if (!partition) { - _DisplayPartitionError("Unable to find the selected partition by id."); + _DisplayPartitionError("Unable to find the selected partition by ID."); return; } @@ -757,7 +757,7 @@ MainWindow::_Initialize(BDiskDevice* disk, partition_id selectedPartition, BPartition* partition = disk->FindDescendant(selectedPartition); if (!partition) { - _DisplayPartitionError("Unable to find the selected partition by id."); + _DisplayPartitionError("Unable to find the selected partition by ID."); return; } @@ -862,9 +862,9 @@ MainWindow::_Initialize(BDiskDevice* disk, partition_id selectedPartition, message << "All data on the partition"; if (previousName.Length() > 0) message << " \"" << previousName << "\""; - message << " will be irrevertably lost if you do so!"; + message << " will be irretrievably lost if you do so!"; alert = new BAlert("final notice", message.String(), - "Write Changes", "Cancel", NULL, B_WIDTH_FROM_WIDEST, B_WARNING_ALERT); + "Write changes", "Cancel", NULL, B_WIDTH_FROM_WIDEST, B_WARNING_ALERT); choice = alert->Go(); if (choice == 1) @@ -873,7 +873,7 @@ MainWindow::_Initialize(BDiskDevice* disk, partition_id selectedPartition, // commit ret = modificationPreparer.CommitModifications(); - // The partition pointer is toast now! Use the partition id to + // The partition pointer is toast now! Use the partition ID to // retrieve it again. partition = disk->FindDescendant(selectedPartition); @@ -969,9 +969,9 @@ MainWindow::_Create(BDiskDevice* disk, partition_id selectedPartition) BString message = "Are you sure you want to write the changes back to " "disk now?\n\n"; message << "All data on the partition"; - message << " will be irrevertably lost if you do so!"; + message << " will be irretrievably lost if you do so!"; BAlert* alert = new BAlert("final notice", message.String(), - "Write Changes", "Cancel", NULL, B_WIDTH_FROM_WIDEST, B_WARNING_ALERT); + "Write changes", "Cancel", NULL, B_WIDTH_FROM_WIDEST, B_WARNING_ALERT); int32 choice = alert->Go(); if (choice == 1) @@ -1018,7 +1018,7 @@ MainWindow::_Delete(BDiskDevice* disk, partition_id selectedPartition) BPartition* partition = disk->FindDescendant(selectedPartition); if (!partition) { - _DisplayPartitionError("Unable to find the selected partition by id."); + _DisplayPartitionError("Unable to find the selected partition by ID."); return; } @@ -1045,9 +1045,9 @@ MainWindow::_Delete(BDiskDevice* disk, partition_id selectedPartition) // Warn the user one more time... BString message = "Are you sure you want to delete the selected "; message << "partition?\n\nAll data on the partition"; - message << " will be irrevertably lost if you do so!"; + message << " will be irretrievably lost if you do so!"; BAlert* alert = new BAlert("final notice", message.String(), - "Delete Partition", "Cancel", NULL, B_WIDTH_FROM_WIDEST, + "Delete partition", "Cancel", NULL, B_WIDTH_FROM_WIDEST, B_WARNING_ALERT); int32 choice = alert->Go(); diff --git a/src/apps/drivesetup/PartitionList.cpp b/src/apps/drivesetup/PartitionList.cpp index 784ebd6354..bb783c6551 100644 --- a/src/apps/drivesetup/PartitionList.cpp +++ b/src/apps/drivesetup/PartitionList.cpp @@ -249,11 +249,11 @@ PartitionListView::PartitionListView(const BRect& frame, uint32 resizeMode) { AddColumn(new PartitionColumn("Device", 150, 50, 500, B_TRUNCATE_MIDDLE), kDeviceColumn); - AddColumn(new PartitionColumn("Filesystem", 100, 50, 500, + AddColumn(new PartitionColumn("File system", 100, 50, 500, B_TRUNCATE_MIDDLE), kFilesystemColumn); - AddColumn(new PartitionColumn("Volume Name", 130, 50, 500, + AddColumn(new PartitionColumn("Volume name", 130, 50, 500, B_TRUNCATE_MIDDLE), kVolumeNameColumn); - AddColumn(new PartitionColumn("Mounted At", 100, 50, 500, + AddColumn(new PartitionColumn("Mounted at", 100, 50, 500, B_TRUNCATE_MIDDLE), kMountedAtColumn); AddColumn(new PartitionColumn("Size", 100, 50, 500, B_TRUNCATE_END, B_ALIGN_RIGHT), kSizeColumn); diff --git a/src/apps/expander/ExpanderApp.cpp b/src/apps/expander/ExpanderApp.cpp index d78054bd71..0dd6137761 100644 --- a/src/apps/expander/ExpanderApp.cpp +++ b/src/apps/expander/ExpanderApp.cpp @@ -29,7 +29,7 @@ ExpanderApp::AboutRequested() "\twritten by Jérôme Duval\n" "\tCopyright 2004-2006, Haiku Inc.\n\n" "original Be version by \n" - "Dominic, Hiroshi, Peter, Pavel and Robert\n", "Ok"); + "Dominic, Hiroshi, Peter, Pavel and Robert\n", "OK"); BTextView *view = alert->TextView(); BFont font; diff --git a/src/apps/expander/ExpanderPreferences.cpp b/src/apps/expander/ExpanderPreferences.cpp index c961fba672..9dd653361f 100644 --- a/src/apps/expander/ExpanderPreferences.cpp +++ b/src/apps/expander/ExpanderPreferences.cpp @@ -34,7 +34,7 @@ ExpanderPreferences::ExpanderPreferences(BMessage *settings) rect.right -= 22; BBox *box = new BBox(rect, "background", B_FOLLOW_NONE, B_WILL_DRAW | B_FRAME_EVENTS, B_FANCY_BORDER); - box->SetLabel("Expander Preferences"); + box->SetLabel("Expander settings"); background->AddChild(box); float maxWidth = box->Bounds().right; @@ -72,7 +72,7 @@ ExpanderPreferences::ExpanderPreferences(BMessage *settings) frameRect = stringView->Frame(); frameRect.top = fCloseWindow->Frame().bottom + 10; - stringView = new BStringView(frameRect, "destinationFolder", "Destination Folder:", + stringView = new BStringView(frameRect, "destinationFolder", "Destination folder:", B_FOLLOW_LEFT | B_FOLLOW_TOP, B_WILL_DRAW); stringView->ResizeToPreferred(); if (stringView->Frame().right > maxWidth) diff --git a/src/apps/expander/ExpanderWindow.cpp b/src/apps/expander/ExpanderWindow.cpp index 240d9c0917..21fe9a3c7a 100644 --- a/src/apps/expander/ExpanderWindow.cpp +++ b/src/apps/expander/ExpanderWindow.cpp @@ -55,12 +55,12 @@ ExpanderWindow::ExpanderWindow(BRect frame, const entry_ref *ref, BMessage *sett menu->AddItem(item = new BMenuItem("About Expander" B_UTF8_ELLIPSIS, new BMessage(B_ABOUT_REQUESTED))); item->SetTarget(be_app_messenger); menu->AddSeparatorItem(); - menu->AddItem(fSourceItem = new BMenuItem("Set Source" B_UTF8_ELLIPSIS, new BMessage(MSG_SOURCE), 'O')); - menu->AddItem(fDestItem = new BMenuItem("Set Destination" B_UTF8_ELLIPSIS, new BMessage(MSG_DEST), 'D')); + menu->AddItem(fSourceItem = new BMenuItem("Set source" B_UTF8_ELLIPSIS, new BMessage(MSG_SOURCE), 'O')); + menu->AddItem(fDestItem = new BMenuItem("Set destination" B_UTF8_ELLIPSIS, new BMessage(MSG_DEST), 'D')); menu->AddSeparatorItem(); menu->AddItem(fExpandItem = new BMenuItem("Expand", new BMessage(MSG_EXPAND), 'E')); fExpandItem->SetEnabled(false); - menu->AddItem(fShowItem = new BMenuItem("Show Contents", new BMessage(MSG_SHOW), 'L')); + menu->AddItem(fShowItem = new BMenuItem("Show contents", new BMessage(MSG_SHOW), 'L')); fShowItem->SetEnabled(false); menu->AddSeparatorItem(); menu->AddItem(fStopItem = new BMenuItem("Stop", new BMessage(MSG_STOP), 'K')); @@ -69,9 +69,9 @@ ExpanderWindow::ExpanderWindow(BRect frame, const entry_ref *ref, BMessage *sett menu->AddItem(new BMenuItem("Close", new BMessage(B_QUIT_REQUESTED), 'W')); fBar->AddItem(menu); - menu = new BMenu("Edit"); - menu->AddItem(fPreferencesItem = new BMenuItem("Preferences" B_UTF8_ELLIPSIS, - new BMessage(MSG_PREFERENCES), 'P')); + menu = new BMenu("Settings"); + menu->AddItem(fPreferencesItem = new BMenuItem("Settings" B_UTF8_ELLIPSIS, + new BMessage(MSG_PREFERENCES), 'S')); fBar->AddItem(menu); AddChild(fBar); @@ -125,7 +125,7 @@ ExpanderWindow::ExpanderWindow(BRect frame, const entry_ref *ref, BMessage *sett topView->AddChild(fDestText); rect.OffsetBy(0, fSourceButton->Bounds().Height() + 4 + offset); - fShowContents = new BCheckBox(rect, "showContents", "Show Contents", + fShowContents = new BCheckBox(rect, "showContents", "Show contents", new BMessage(MSG_SHOWCONTENTS), B_FOLLOW_RIGHT | B_FOLLOW_TOP); fShowContents->ResizeToPreferred(); fShowContents->MoveTo(Bounds().right - 8 - fShowContents->Bounds().Width(), @@ -186,13 +186,13 @@ ExpanderWindow::ValidateDest() BVolume volume; if (!entry.Exists()) { BAlert *alert = new BAlert("destAlert", "The destination" - " directory does not exist.", "Cancel", NULL, NULL, + " folder does not exist.", "Cancel", NULL, NULL, B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_WARNING_ALERT); alert->Go(); return false; } else if (!entry.IsDirectory()) { (new BAlert("destAlert", "The destination" - " is not a directory.", "Cancel", NULL, NULL, + " is not a folder.", "Cancel", NULL, NULL, B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_WARNING_ALERT))->Go(); return false; } else if (entry.GetVolume(&volume) != B_OK || volume.IsReadOnly()) { @@ -299,7 +299,7 @@ ExpanderWindow::MessageReceived(BMessage *msg) case MSG_SHOWCONTENTS: // change menu item label fShowItem->SetLabel(fShowContents->Value() == B_CONTROL_OFF - ? "Show Contents" : "Hide Contents"); + ? "Show contents" : "Hide contents"); if (fShowContents->Value() == B_CONTROL_OFF) { if (fListingStarted) @@ -508,7 +508,7 @@ ExpanderWindow::StartExpanding() BEntry destEntry(fDestText->Text(), true); if (!destEntry.Exists()) { - BAlert *alert = new BAlert("destAlert", "The directory was either moved, renamed or not\n" + BAlert *alert = new BAlert("destAlert", "The folder was either moved, renamed or not\n" "supported.", "Cancel", NULL, NULL, B_WIDTH_AS_USUAL, B_EVEN_SPACING, B_WARNING_ALERT); @@ -620,7 +620,7 @@ ExpanderWindow::StartListing() fDestItem->SetEnabled(false); fExpandItem->SetEnabled(false); fShowItem->SetEnabled(true); - fShowItem->SetLabel("Hide Contents"); + fShowItem->SetLabel("Hide contents"); fStopItem->SetEnabled(false); fPreferencesItem->SetEnabled(false); diff --git a/src/apps/fontdemo/ControlView.cpp b/src/apps/fontdemo/ControlView.cpp index 70a4998b21..8ce674a214 100644 --- a/src/apps/fontdemo/ControlView.cpp +++ b/src/apps/fontdemo/ControlView.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2006, Haiku, Inc. All Rights Reserved. + * Copyright 2006-2009, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. * * Authors: @@ -108,7 +108,7 @@ ControlView::AttachedToWindow() AddChild(fOutlineSlider); rect.OffsetBy(0.0, offsetX); - fAliasingCheckBox = new BCheckBox(rect, "Aliasing", "Anti-aliased text", + fAliasingCheckBox = new BCheckBox(rect, "Aliasing", "Antialiased text", new BMessage(ALIASING_MSG)); fAliasingCheckBox->SetValue(B_CONTROL_ON); AddChild(fAliasingCheckBox); @@ -164,7 +164,7 @@ ControlView::AttachedToWindow() AddChild(fBoundingboxesCheckBox); rect.OffsetBy(0.0, 22.0); - fCyclingFontButton = new BButton(rect, "Cyclefonts", "Cycle Fonts", + fCyclingFontButton = new BButton(rect, "Cyclefonts", "Cycle fonts", new BMessage(CYCLING_FONTS_MSG)); AddChild(fCyclingFontButton); @@ -302,7 +302,7 @@ ControlView::MessageReceived(BMessage* msg) case CYCLING_FONTS_MSG: { - fCyclingFontButton->SetLabel(fCycleFonts ? "Cycle Fonts" : "Stop Cycling"); + fCyclingFontButton->SetLabel(fCycleFonts ? "Cycle fonts" : "Stop cycling"); fCycleFonts = !fCycleFonts; if (fCycleFonts) { diff --git a/src/apps/glteapot/TeapotWindow.cpp b/src/apps/glteapot/TeapotWindow.cpp index f477cf98d7..4bafa9382d 100644 --- a/src/apps/glteapot/TeapotWindow.cpp +++ b/src/apps/glteapot/TeapotWindow.cpp @@ -50,7 +50,7 @@ TeapotWindow::TeapotWindow(BRect rect, char* name, window_type wt, ulong somethi menu->AddItem(item = new BMenuItem("Perspective", new BMessage(kMsgPerspective))); item->SetTarget(fObjectView); item->SetMarked(false); - menu->AddItem(item = new BMenuItem("FPS Display", new BMessage(kMsgFPS))); + menu->AddItem(item = new BMenuItem("FPS display", new BMessage(kMsgFPS))); item->SetTarget(fObjectView); item->SetMarked(true); menu->AddItem(item = new BMenuItem("Filled polygons", new BMessage(kMsgFilled))); diff --git a/src/apps/gradients/GradientsWindow.cpp b/src/apps/gradients/GradientsWindow.cpp index 0668a7b31b..fda5e2c5cd 100644 --- a/src/apps/gradients/GradientsWindow.cpp +++ b/src/apps/gradients/GradientsWindow.cpp @@ -18,7 +18,7 @@ GradientsWindow::GradientsWindow() fGradientsMenu = new BPopUpMenu("gradientsType"); fLinearItem = new BMenuItem("Linear", new BMessage(MSG_LINEAR)); fRadialItem = new BMenuItem("Radial", new BMessage(MSG_RADIAL)); - fRadialFocusItem = new BMenuItem("Radial Focus", + fRadialFocusItem = new BMenuItem("Radial focus", new BMessage(MSG_RADIAL_FOCUS)); fDiamondItem = new BMenuItem("Diamond", new BMessage(MSG_DIAMOND)); diff --git a/src/apps/haiku3d/App.cpp b/src/apps/haiku3d/App.cpp index 626dcac8b8..8860bbbc6d 100644 --- a/src/apps/haiku3d/App.cpp +++ b/src/apps/haiku3d/App.cpp @@ -39,7 +39,7 @@ void App::AboutRequested() { BAlert* alert; - alert = new BAlert("About", "A little 3d demo", "ok"); + alert = new BAlert("About", "A little 3D demo", "OK"); alert->Go(NULL); } diff --git a/src/apps/icon-o-matic/MainWindow.cpp b/src/apps/icon-o-matic/MainWindow.cpp index 6cf0413686..b10f80dd27 100644 --- a/src/apps/icon-o-matic/MainWindow.cpp +++ b/src/apps/icon-o-matic/MainWindow.cpp @@ -263,19 +263,19 @@ MainWindow::MessageReceived(BMessage* message) commands[1] = pathCommand; commands[2] = shapeCommand; command = new CompoundCommand(commands, 3, - "Add Shape With Path & Style", 0); + "Add shape with path & style", 0); } else if (styleCommand) { Command** commands = new Command*[2]; commands[0] = styleCommand; commands[1] = shapeCommand; command = new CompoundCommand(commands, 2, - "Add Shape With Style", 0); + "Add shape with style", 0); } else { Command** commands = new Command*[2]; commands[0] = pathCommand; commands[1] = shapeCommand; command = new CompoundCommand(commands, 2, - "Add Shape With Path", 0); + "Add shape with path", 0); } } else { command = shapeCommand; @@ -1027,12 +1027,12 @@ MainWindow::_CreateMenuBar(BRect frame) fileMenu->AddSeparatorItem(); fileMenu->AddItem(new BMenuItem("Save", new BMessage(MSG_SAVE), 'S')); - fileMenu->AddItem(new BMenuItem("Save As"B_UTF8_ELLIPSIS, + fileMenu->AddItem(new BMenuItem("Save as"B_UTF8_ELLIPSIS, new BMessage(MSG_SAVE_AS), 'S', B_SHIFT_KEY)); fileMenu->AddSeparatorItem(); fileMenu->AddItem(new BMenuItem("Export", new BMessage(MSG_EXPORT), 'P')); - fileMenu->AddItem(new BMenuItem("Export As"B_UTF8_ELLIPSIS, + fileMenu->AddItem(new BMenuItem("Export as"B_UTF8_ELLIPSIS, new BMessage(MSG_EXPORT_AS), 'P', B_SHIFT_KEY)); fileMenu->AddSeparatorItem(); fileMenu->AddItem(new BMenuItem("Quit", @@ -1052,7 +1052,7 @@ MainWindow::_CreateMenuBar(BRect frame) editMenu->AddItem(fRedoMI); // Settings - BMenu* filterModeMenu = new BMenu("Snap to Grid"); + BMenu* filterModeMenu = new BMenu("Snap to grid"); BMessage* message = new BMessage(MSG_MOUSE_FILTER_MODE); message->AddInt32("mode", SNAPPING_OFF); filterModeMenu->AddItem(new BMenuItem("Off", message, '4')); diff --git a/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorPickerPanel.cpp b/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorPickerPanel.cpp index 0fb4dbfd28..182bb585fd 100644 --- a/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorPickerPanel.cpp +++ b/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorPickerPanel.cpp @@ -43,12 +43,12 @@ ColorPickerPanel::ColorPickerPanel(BRect frame, rgb_color color, fMessage(message), fTarget(target) { - SetTitle("Pick Color"); + SetTitle("Pick a color"); fColorPickerView = new ColorPickerView("color picker", color, mode); #if LIB_LAYOUT - MButton* defaultButton = new MButton("Ok", new BMessage(MSG_DONE), this); + MButton* defaultButton = new MButton("OK", new BMessage(MSG_DONE), this); // interface layout BView* topView = new VGroup ( @@ -68,7 +68,7 @@ ColorPickerPanel::ColorPickerPanel(BRect frame, rgb_color color, ); #else // LIB_LAYOUT frame = BRect(0, 0, 40, 15); - BButton* defaultButton = new BButton(frame, "ok button", "Ok", + BButton* defaultButton = new BButton(frame, "ok button", "OK", new BMessage(MSG_DONE), B_FOLLOW_RIGHT | B_FOLLOW_TOP); defaultButton->ResizeToPreferred(); diff --git a/src/apps/icon-o-matic/generic/property/view/PropertyListView.cpp b/src/apps/icon-o-matic/generic/property/view/PropertyListView.cpp index 22d64a3ac4..436202103f 100644 --- a/src/apps/icon-o-matic/generic/property/view/PropertyListView.cpp +++ b/src/apps/icon-o-matic/generic/property/view/PropertyListView.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2006-2007, Haiku Inc. All rights reserved. + * Copyright 2006-2009, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. * * Authors: @@ -321,7 +321,7 @@ PropertyListView::SetMenu(BMenu* menu) fSelectM->AddItem(fSelectAllMI); fSelectNoneMI = new BMenuItem("None", new BMessage(MSG_SELECT_NONE)); fSelectM->AddItem(fSelectNoneMI); - fInvertSelectionMI = new BMenuItem("Invert Selection", new BMessage(MSG_INVERT_SELECTION)); + fInvertSelectionMI = new BMenuItem("Invert selection", new BMessage(MSG_INVERT_SELECTION)); fSelectM->AddItem(fInvertSelectionMI); fSelectM->SetTargetForItems(this); @@ -728,8 +728,8 @@ PropertyListView::_CheckMenuStatus() fPasteMI->SetEnabled(clipboardHasData); // LanguageManager* m = LanguageManager::Default(); if (IsEditingMultipleObjects()) -// fPasteMI->SetLabel(m->GetString(MULTI_PASTE, "Multi Paste")); - fPasteMI->SetLabel("Multi Paste"); +// fPasteMI->SetLabel(m->GetString(MULTI_PASTE, "Multi paste")); + fPasteMI->SetLabel("Multi paste"); else // fPasteMI->SetLabel(m->GetString(PASTE, "Paste")); fPasteMI->SetLabel("Paste"); diff --git a/src/apps/icon-o-matic/gui/PathListView.cpp b/src/apps/icon-o-matic/gui/PathListView.cpp index 66f2024ad7..f2b55cb08c 100644 --- a/src/apps/icon-o-matic/gui/PathListView.cpp +++ b/src/apps/icon-o-matic/gui/PathListView.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2006, Haiku. + * Copyright 2006-2009, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. * * Authors: @@ -729,17 +729,17 @@ PathListView::SetMenu(BMenu* menu) return; fAddMI = new BMenuItem("Add", new BMessage(MSG_ADD)); - fAddRectMI = new BMenuItem("Add Rect", new BMessage(MSG_ADD_RECT)); - fAddCircleMI = new BMenuItem("Add Circle"/*B_UTF8_ELLIPSIS*/, + fAddRectMI = new BMenuItem("Add rect", new BMessage(MSG_ADD_RECT)); + fAddCircleMI = new BMenuItem("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("Duplicate", new BMessage(MSG_DUPLICATE)); fReverseMI = new BMenuItem("Reverse", new BMessage(MSG_REVERSE)); - fCleanUpMI = new BMenuItem("Clean Up", new BMessage(MSG_CLEAN_UP)); - fRotateIndicesRightMI = new BMenuItem("Rotate Indices Right", + fCleanUpMI = new BMenuItem("Clean up", new BMessage(MSG_CLEAN_UP)); + fRotateIndicesRightMI = new BMenuItem("Rotate indices right", new BMessage(MSG_ROTATE_INDICES_CCW), 'R'); - fRotateIndicesLeftMI = new BMenuItem("Rotate Indices Left", + fRotateIndicesLeftMI = new BMenuItem("Rotate indices left", new BMessage(MSG_ROTATE_INDICES_CW), 'R', B_SHIFT_KEY); fRemoveMI = new BMenuItem("Remove", new BMessage(MSG_REMOVE)); diff --git a/src/apps/icon-o-matic/gui/ShapeListView.cpp b/src/apps/icon-o-matic/gui/ShapeListView.cpp index 3bdb154a17..b14f810a12 100644 --- a/src/apps/icon-o-matic/gui/ShapeListView.cpp +++ b/src/apps/icon-o-matic/gui/ShapeListView.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2006-2007, Haiku Inc. All rights reserved. + * Copyright 2006-2009, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. * * Authors: @@ -423,25 +423,25 @@ ShapeListView::SetMenu(BMenu* menu) return; BMessage* message = new BMessage(MSG_ADD_SHAPE); - fAddEmptyMI = new BMenuItem("Add Empty", message); + fAddEmptyMI = new BMenuItem("Add empty", message); message = new BMessage(MSG_ADD_SHAPE); message->AddBool("path", true); - fAddWidthPathMI = new BMenuItem("Add With Path", message); + fAddWidthPathMI = new BMenuItem("Add with path", message); message = new BMessage(MSG_ADD_SHAPE); message->AddBool("style", true); - fAddWidthStyleMI = new BMenuItem("Add With Style", message); + fAddWidthStyleMI = new BMenuItem("Add with style", message); message = new BMessage(MSG_ADD_SHAPE); message->AddBool("path", true); message->AddBool("style", true); - fAddWidthPathAndStyleMI = new BMenuItem("Add With Path & Style", message); + fAddWidthPathAndStyleMI = new BMenuItem("Add with path & style", message); fDuplicateMI = new BMenuItem("Duplicate", new BMessage(MSG_DUPLICATE)); - fResetTransformationMI = new BMenuItem("Reset Transformation", + fResetTransformationMI = new BMenuItem("Reset transformation", new BMessage(MSG_RESET_TRANSFORMATION)); - fFreezeTransformationMI = new BMenuItem("Freeze Transformation", + fFreezeTransformationMI = new BMenuItem("Freeze transformation", new BMessage(MSG_FREEZE_TRANSFORMATION)); fRemoveMI = new BMenuItem("Remove", new BMessage(MSG_REMOVE)); diff --git a/src/apps/icon-o-matic/gui/StyleListView.cpp b/src/apps/icon-o-matic/gui/StyleListView.cpp index bbf9d87c3f..4c84b157d5 100644 --- a/src/apps/icon-o-matic/gui/StyleListView.cpp +++ b/src/apps/icon-o-matic/gui/StyleListView.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2006, Haiku. + * Copyright 2006-2009, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. * * Authors: @@ -600,7 +600,7 @@ StyleListView::SetMenu(BMenu* menu) fDuplicateMI = new BMenuItem("Duplicate", new BMessage(MSG_DUPLICATE)); fMenu->AddItem(fDuplicateMI); - fResetTransformationMI = new BMenuItem("Reset Transformation", + fResetTransformationMI = new BMenuItem("Reset transformation", new BMessage(MSG_RESET_TRANSFORMATION)); fMenu->AddItem(fResetTransformationMI); diff --git a/src/apps/icon-o-matic/gui/StyleView.cpp b/src/apps/icon-o-matic/gui/StyleView.cpp index 9a8ac389d0..d79781b266 100644 --- a/src/apps/icon-o-matic/gui/StyleView.cpp +++ b/src/apps/icon-o-matic/gui/StyleView.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2006, Haiku. All rights reserved. + * Copyright 2006-2009, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. * * Authors: @@ -74,14 +74,14 @@ StyleView::StyleView(BRect frame) BGridLayout* layout = new BGridLayout(5, 5); SetLayout(layout); - fStyleType = new BMenuField( "Style Type", menu, NULL); + fStyleType = new BMenuField( "Style type", menu, NULL); #else frame.OffsetTo(B_ORIGIN); frame.InsetBy(5, 5); frame.bottom = frame.top + 15; - fStyleType = new BMenuField(frame, "style type", "Style Type", + fStyleType = new BMenuField(frame, "style type", "Style type", menu, true); AddChild(fStyleType); @@ -110,7 +110,7 @@ StyleView::StyleView(BRect frame) menu->AddItem(new BMenuItem("Conic", message)); #if __HAIKU__ - fGradientType = new BMenuField("Gradient Type", menu, NULL); + fGradientType = new BMenuField("Gradient type", menu, NULL); fGradientControl = new GradientControl(new BMessage(MSG_SET_COLOR), this); layout->AddItem(BSpaceLayoutItem::CreateVerticalStrut(3), 0, 0, 4); @@ -129,7 +129,7 @@ StyleView::StyleView(BRect frame) #else // !__HAIKU__ frame.OffsetBy(0, fStyleType->Frame().Height() + 6); - fGradientType = new BMenuField(frame, "gradient type", "Gradient Type", + fGradientType = new BMenuField(frame, "gradient type", "Gradient type", menu, true); AddChild(fGradientType); @@ -160,7 +160,7 @@ StyleView::StyleView(BRect frame) divider = max_c(divider, fStyleType->StringWidth(fStyleType->Label())); fGradientType->SetDivider(divider + 8); fStyleType->SetDivider(divider + 8); - + #endif // __HAIKU__ fStyleType->SetEnabled(false); diff --git a/src/apps/icon-o-matic/gui/TransformerListView.cpp b/src/apps/icon-o-matic/gui/TransformerListView.cpp index b7e04e247e..52afd24198 100644 --- a/src/apps/icon-o-matic/gui/TransformerListView.cpp +++ b/src/apps/icon-o-matic/gui/TransformerListView.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2006, Haiku. + * Copyright 2006-2009, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. * * Authors: @@ -129,7 +129,7 @@ TransformerListView::Draw(BRect updateRect) // display helpful messages const char* message1 = "Click on a shape above"; - const char* message2 = "to attach Transformers."; + const char* message2 = "to attach transformers."; SetHighColor(tint_color(LowColor(), B_DARKEN_2_TINT)); font_height fh; diff --git a/src/apps/icon-o-matic/import_export/styled_text/StyledTextImporter.cpp b/src/apps/icon-o-matic/import_export/styled_text/StyledTextImporter.cpp index 2bb3f848cf..1b8e6285e8 100644 --- a/src/apps/icon-o-matic/import_export/styled_text/StyledTextImporter.cpp +++ b/src/apps/icon-o-matic/import_export/styled_text/StyledTextImporter.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008, Haiku. All rights reserved. + * Copyright 2008-2009, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. * * Authors: @@ -60,7 +60,7 @@ class ShapeIterator : public BShapeIterator { bool fHasLastPoint; }; -ShapeIterator::ShapeIterator(Icon *icon, Shape *to, BPoint offset, +ShapeIterator::ShapeIterator(Icon *icon, Shape *to, BPoint offset, const char *name) { CALLED(); @@ -112,7 +112,7 @@ ShapeIterator::IterateBezierTo(int32 bezierCount, BPoint *bezierPts) if (fHasLastPoint) start = fLastPoint; while (bezierCount--) { - fPath->AddPoint(fOffset + bezierPts[0], + fPath->AddPoint(fOffset + bezierPts[0], fLastPoint, fOffset + bezierPts[1], true); fLastPoint = fOffset + bezierPts[2]; bezierPts += 3; @@ -184,11 +184,11 @@ StyledTextImporter::Import(Icon* icon, BMessage* clipping) if (clipping == NULL) return ENOENT; - if (clipping->FindData("text/plain", + if (clipping->FindData("text/plain", B_MIME_TYPE, (const void **)&text, &textLength) == B_OK) { text_run_array *runs = NULL; int32 runsLength; - if (clipping->FindData("application/x-vnd.Be-text_run_array", + if (clipping->FindData("application/x-vnd.Be-text_run_array", B_MIME_TYPE, (const void **)&runs, &runsLength) < B_OK) runs = NULL; BString str(text, textLength); @@ -223,7 +223,7 @@ StyledTextImporter::Import(Icon* icon, const entry_ref* ref) return err; if (size > 1 * 1024 * 1024) // Don't load files that big return E2BIG; - + BMallocIO mio; mio.SetSize((size_t)size + 1); memset((void *)mio.Buffer(), 0, (size_t)size + 1); @@ -247,8 +247,8 @@ StyledTextImporter::_Import(Icon* icon, const char *text, text_run_array *runs) BString str(text); if (str.Length() > 50) { - BAlert* alert = new BAlert("too big", - "The text you are trying to import is quite long, are you sure ?", + BAlert* alert = new BAlert("too big", + "The text you are trying to import is quite long, are you sure?", "Yes", "No", NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); if (alert->Go()) return B_CANCELED; @@ -274,7 +274,7 @@ StyledTextImporter::_Import(Icon* icon, const char *text, text_run_array *runs) for (int32 i = 0, c = 0; i < len && c < chars; c++) { // make sure we are still on the (good) run - while (run && currentRun < runs->count - 1 && + while (run && currentRun < runs->count - 1 && i >= runs->runs[currentRun + 1].offset) { run = &runs->runs[++currentRun]; //printf("switching to run %d\n", currentRun); diff --git a/src/apps/icon-o-matic/import_export/svg/SVGImporter.cpp b/src/apps/icon-o-matic/import_export/svg/SVGImporter.cpp index 737c8da837..9eb0196591 100644 --- a/src/apps/icon-o-matic/import_export/svg/SVGImporter.cpp +++ b/src/apps/icon-o-matic/import_export/svg/SVGImporter.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2006, Haiku. All rights reserved. + * Copyright 2006-2009, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. * * Authors: @@ -68,10 +68,10 @@ SVGImporter::Import(Icon* icon, const entry_ref* ref) } catch(agg::svg::exception& e) { char error[1024]; sprintf(error, "Failed to open the file '%s' as " - "an SVG Document.\n\n" + "an SVG document.\n\n" "Error: %s", ref->name, e.msg()); BAlert* alert = new BAlert("load error", - error, "Ok", NULL, NULL, + error, "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); alert->Go(NULL); ret = B_ERROR; diff --git a/src/apps/installer/InstallerApp.cpp b/src/apps/installer/InstallerApp.cpp index c6a50a45d2..2f20a2ceba 100644 --- a/src/apps/installer/InstallerApp.cpp +++ b/src/apps/installer/InstallerApp.cpp @@ -52,7 +52,7 @@ static const char* kInfoText = "1) If you are installing Haiku onto real hardware (not inside an emulator) " "it is recommended that you have already prepared a hard disk partition. The " "Installer and the DriveSetup tool offer to initialize existing partitions " -"with the Haiku native filesystem, but the options to change the actual " +"with the Haiku native file system, but the options to change the actual " "partition layout may not have been tested on a sufficiently great variety of " "computer installations so we do not recommend using it.\n" "If you have not created a partition yet, simply reboot, create the partition " @@ -130,7 +130,7 @@ InstallerApp::AboutRequested() { BAlert *alert = new BAlert("about", "Installer\n" "\twritten by Jérôme Duval\n" - "\tCopyright 2005, Haiku.\n\n", "Ok"); + "\tCopyright 2005, Haiku.\n\n", "OK"); BTextView *view = alert->TextView(); BFont font; diff --git a/src/apps/installer/InstallerWindow.cpp b/src/apps/installer/InstallerWindow.cpp index a1378e46f2..deaff2b1bc 100644 --- a/src/apps/installer/InstallerWindow.cpp +++ b/src/apps/installer/InstallerWindow.cpp @@ -173,8 +173,8 @@ InstallerWindow::InstallerWindow() fDestMenuField->SetAlignment(B_ALIGN_RIGHT); fPackagesSwitch = new PaneSwitch("options_button"); - fPackagesSwitch->SetLabels("Hide Optional Packages", - "Show Optional Packages"); + fPackagesSwitch->SetLabels("Hide optional packages", + "Show optional packages"); fPackagesSwitch->SetMessage(new BMessage(SHOW_BOTTOM_MESSAGE)); fPackagesSwitch->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNSET)); @@ -193,7 +193,7 @@ InstallerWindow::InstallerWindow() fSizeView->SetExplicitAlignment( BAlignment(B_ALIGN_RIGHT, B_ALIGN_MIDDLE)); - fProgressBar = new BStatusBar("progress", "Install Progress: "); + fProgressBar = new BStatusBar("progress", "Install progress: "); fProgressBar->SetMaxValue(100.0); fBeginButton = new BButton("begin_button", "Begin", @@ -205,7 +205,7 @@ InstallerWindow::InstallerWindow() "Set up partitions" B_UTF8_ELLIPSIS, new BMessage(SETUP_MESSAGE)); fMakeBootableButton = new BButton("makebootable_button", - "Write Boot Sector", new BMessage(MSG_WRITE_BOOT_SECTOR)); + "Write boot sector", new BMessage(MSG_WRITE_BOOT_SECTOR)); fMakeBootableButton->SetEnabled(false); SetLayout(new BGroupLayout(B_HORIZONTAL)); @@ -305,7 +305,7 @@ InstallerWindow::MessageReceived(BMessage *msg) snprintf(errorMessage, sizeof(errorMessage), "An error was " "encountered and the installation was not completed:\n\n" "Error: %s", strerror(error)); - (new BAlert("error", errorMessage, "Ok"))->Go(); + (new BAlert("error", errorMessage, "OK"))->Go(); } _DisableInterface(false); @@ -383,8 +383,8 @@ InstallerWindow::MessageReceived(BMessage *msg) { (new BAlert("use drive setup", "No partitions have been found that " "are suitable for installation. Please set up partitions and " - "initialize at least one partition with the Be File System." , - "Ok"))->Go(); + "initialize at least one partition with the Be file system." , + "OK"))->Go(); } case MSG_STATUS_MESSAGE: { @@ -482,7 +482,7 @@ InstallerWindow::QuitRequested() if (fDriveSetupLaunched) { (new BAlert("driveSetup", "Please close the DriveSetup window before closing the " - "Installer window.", "Ok"))->Go(); + "Installer window.", "OK"))->Go(); return false; } _QuitCopyEngine(false); @@ -522,7 +522,7 @@ InstallerWindow::_LaunchDriveSetup() if (entry.GetRef(&ref) != B_OK || be_roster->Launch(&ref) != B_OK) { BAlert* alert = new BAlert("error", "DriveSetup, the application " "to configure disk partitions, could not be launched.", - "Ok"); + "OK"); alert->Go(); } } @@ -599,7 +599,7 @@ InstallerWindow::_UpdateControls() if (fDestMenu->CountItems() == 0) label = ""; else - label = "Please Choose Target"; + label = "Please choose target"; } fDestMenuField->MenuItem()->SetLabel(label.String()); @@ -624,7 +624,7 @@ InstallerWindow::_UpdateControls() fBeginButton->SetEnabled(srcItem && dstItem); // adjust "Write Boot Sector" button - label = "Write Boot Sector"; + label = "Write boot sector"; if (dstItem) label << " to \'" <Name() << '\''; fMakeBootableButton->SetEnabled(dstItem); diff --git a/src/apps/installer/WorkerThread.cpp b/src/apps/installer/WorkerThread.cpp index dd85124f69..631d799bc6 100644 --- a/src/apps/installer/WorkerThread.cpp +++ b/src/apps/installer/WorkerThread.cpp @@ -392,7 +392,7 @@ WorkerThread::_PerformInstall(BMenu* srcMenu, BMenu* targetMenu) "merged, whereas files and links that exist on both the source " "and target volume will be overwritten with the source volume " "version.", - "Install Anyway", "Cancel", 0, + "Install anyway", "Cancel", 0, B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go() != 0)) { // TODO: Would be cool to offer the option here to clean additional // folders at the user's choice (like /boot/common and /boot/develop). diff --git a/src/apps/launchbox/NamePanel.cpp b/src/apps/launchbox/NamePanel.cpp index 1777908621..d7b9a554f6 100644 --- a/src/apps/launchbox/NamePanel.cpp +++ b/src/apps/launchbox/NamePanel.cpp @@ -30,7 +30,7 @@ NamePanel::NamePanel(const char* label, const char* text, BWindow* window, fTarget(target), fMessage(message) { - BButton* defaultButton = new BButton("Ok", new BMessage(MSG_PANEL_OK)); + BButton* defaultButton = new BButton("OK", new BMessage(MSG_PANEL_OK)); BButton* cancelButton = new BButton("Cancel", new BMessage(MSG_PANEL_CANCEL)); fNameTC = new BTextControl(label, text, NULL); diff --git a/src/apps/launchbox/PadView.cpp b/src/apps/launchbox/PadView.cpp index 2e90585866..6166826f90 100644 --- a/src/apps/launchbox/PadView.cpp +++ b/src/apps/launchbox/PadView.cpp @@ -320,7 +320,7 @@ PadView::DisplayMenu(BPoint where, LaunchButton* button) const // add button BMessage* message = new BMessage(MSG_ADD_SLOT); message->AddPointer("be:source", (void*)nearestButton); - BMenuItem* item = new BMenuItem("Add Button Here", message); + BMenuItem* item = new BMenuItem("Add button here", message); item->SetTarget(window); menu->AddItem(item); // button options @@ -328,20 +328,20 @@ PadView::DisplayMenu(BPoint where, LaunchButton* button) const // clear button message = new BMessage(MSG_CLEAR_SLOT); message->AddPointer("be:source", (void*)button); - item = new BMenuItem("Clear Button", message); + item = new BMenuItem("Clear button", message); item->SetTarget(window); menu->AddItem(item); // remove button message = new BMessage(MSG_REMOVE_SLOT); message->AddPointer("be:source", (void*)button); - item = new BMenuItem("Remove Button", message); + item = new BMenuItem("Remove button", message); item->SetTarget(window); menu->AddItem(item); // set button description if (button->Ref()) { message = new BMessage(MSG_SET_DESCRIPTION); message->AddPointer("be:source", (void*)button); - item = new BMenuItem("Set Description"B_UTF8_ELLIPSIS, message); + item = new BMenuItem("Set description"B_UTF8_ELLIPSIS, message); item->SetTarget(window); menu->AddItem(item); } @@ -353,9 +353,9 @@ PadView::DisplayMenu(BPoint where, LaunchButton* button) const const char* toggleLayoutLabel; if (fButtonLayout->Orientation() == B_HORIZONTAL) - toggleLayoutLabel = "Vertical Layout"; + toggleLayoutLabel = "Vertical layout"; else - toggleLayoutLabel = "Horizontal Layout"; + toggleLayoutLabel = "Horizontal layout"; item = new BMenuItem(toggleLayoutLabel, new BMessage(MSG_TOGGLE_LAYOUT)); item->SetTarget(this); settingsM->AddItem(item); @@ -374,24 +374,24 @@ PadView::DisplayMenu(BPoint where, LaunchButton* button) const } settingsM->AddItem(iconSizeM); - item = new BMenuItem("Ignore Double-click", + item = new BMenuItem("Ignore double-click", new BMessage(MSG_SET_IGNORE_DOUBLECLICK)); item->SetTarget(this); item->SetMarked(IgnoreDoubleClick()); settingsM->AddItem(item); uint32 what = window->Look() == B_BORDERED_WINDOW_LOOK ? MSG_SHOW_BORDER : MSG_HIDE_BORDER; - item = new BMenuItem("Show Window Border", new BMessage(what)); + item = new BMenuItem("Show window border", new BMessage(what)); item->SetTarget(window); item->SetMarked(what == MSG_HIDE_BORDER); settingsM->AddItem(item); - item = new BMenuItem("Auto Raise", new BMessage(MSG_TOGGLE_AUTORAISE)); + item = new BMenuItem("Auto-raise", new BMessage(MSG_TOGGLE_AUTORAISE)); item->SetTarget(window); item->SetMarked(window->AutoRaise()); settingsM->AddItem(item); - item = new BMenuItem("Show On All Workspaces", new BMessage(MSG_SHOW_ON_ALL_WORKSPACES)); + item = new BMenuItem("Show on all workspaces", new BMessage(MSG_SHOW_ON_ALL_WORKSPACES)); item->SetTarget(window); item->SetMarked(window->ShowOnAllWorkspaces()); settingsM->AddItem(item); diff --git a/src/apps/login/LoginApp.cpp b/src/apps/login/LoginApp.cpp index a2a0ce95e1..e38c17f49f 100644 --- a/src/apps/login/LoginApp.cpp +++ b/src/apps/login/LoginApp.cpp @@ -48,18 +48,18 @@ LoginApp::ReadyToRun() if (fEditShelfMode) { (new BAlert("Info", "You can customize the desktop shown " - "behind the Login app by dropping replicants onto it.\n" + "behind the Login application by dropping replicants onto it.\n" "\n" - "When you are finished just quit the application (Alt-Q).", - "Ok"))->Go(NULL); + "When you are finished just quit the application (Alt-Q).", + "OK"))->Go(NULL); } else { BRect frame(0, 0, 400, 150); - frame.OffsetBySelf(screen.Frame().Width()/2 - frame.Width()/2, + frame.OffsetBySelf(screen.Frame().Width()/2 - frame.Width()/2, screen.Frame().Height()/2 - frame.Height()/2); fLoginWindow = new LoginWindow(frame); fLoginWindow->Show(); } - + fDesktopWindow = new DesktopWindow(screen.Frame(), fEditShelfMode); fDesktopWindow->Show(); // TODO: add a shelf with Activity Monitor replicant :) @@ -89,12 +89,12 @@ LoginApp::MessageReceived(BMessage *message) if (error < B_OK) { BString msg("Error: "); msg << strerror(error); - (new BAlert("Error", msg.String(), "Ok"))->Go(); + (new BAlert("Error", msg.String(), "OK"))->Go(); } break; } case kSuspendAction: - (new BAlert("Error", "Unimplemented", "Ok"))->Go(); + (new BAlert("Error", "Unimplemented", "OK"))->Go(); break; #endif default: @@ -106,8 +106,7 @@ LoginApp::MessageReceived(BMessage *message) void LoginApp::ArgvReceived(int32 argc, char **argv) { - int i; - for (i = 1; i < argc; i++) { + for (int i = 1; i < argc; i++) { BString arg(argv[i]); //printf("[%d]: %s\n", i, argv[i]); if (arg == "--edit") @@ -118,7 +117,7 @@ LoginApp::ArgvReceived(int32 argc, char **argv) printf("Login application for Haiku\nUsage:\n"); printf("%s [--nonmodal] [--edit]\n", argv[0]); printf("--nonmodal Do not make the window modal\n"); - printf("--edit Launch in Shelf editting mode to " + printf("--edit Launch in shelf editting mode to " "allow customizing the desktop.\n"); // just return to the shell exit((arg == "--help") ? 0 : 1); @@ -143,10 +142,10 @@ LoginApp::TryLogin(BMessage *message) if (err == B_OK) { reply.what = kLoginOk; message->SendReply(&reply); - + if (password == NULL) return; - + // start a session //kSetProgress StartUserSession(login); @@ -155,7 +154,7 @@ LoginApp::TryLogin(BMessage *message) message->SendReply(&reply); return; } - + } else { reply.AddInt32("error", EINVAL); message->SendReply(&reply); @@ -168,7 +167,7 @@ status_t LoginApp::ValidateLogin(const char *login, const char *password) { struct passwd *pwd; - + pwd = getpwnam(login); if (!pwd) return ENOENT; @@ -207,7 +206,7 @@ LoginApp::getpty(char *pty, char *tty) static const char minor[] = "0123456789abcdef"; uint32 i, j; int32 fd = -1; - + for (i = 0; i < sizeof(major); i++) { for (j = 0; j < sizeof(minor); j++) @@ -221,7 +220,7 @@ LoginApp::getpty(char *pty, char *tty) } } } - + return fd; } diff --git a/src/apps/login/LoginView.cpp b/src/apps/login/LoginView.cpp index b269d3e4f3..d0fc6769f1 100644 --- a/src/apps/login/LoginView.cpp +++ b/src/apps/login/LoginView.cpp @@ -21,7 +21,7 @@ class PwdItem : public BStringItem { public: - PwdItem(struct passwd *pwd, uint32 level = 0, + PwdItem(struct passwd *pwd, uint32 level = 0, bool expanded = true) : BStringItem("", level, expanded) { @@ -42,58 +42,58 @@ private: LoginView::LoginView(BRect frame) : BView(frame, "LoginView", B_FOLLOW_ALL, B_PULSE_NEEDED) { - // TODO: when I don't need to test in BeOS anymore, + // TODO: when I don't need to test in BeOS anymore, // rewrite to use layout engine. SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); SetLowColor(ViewColor()); BRect r; r.Set(CSEP, CSEP, LW, Bounds().Height() - 3 * CSEP - BH); fUserList = new BListView(r, "users"); - BScrollView *sv = new BScrollView("userssv", fUserList, + BScrollView *sv = new BScrollView("userssv", fUserList, B_FOLLOW_LEFT | B_FOLLOW_TOP, 0, false, true); AddChild(sv); fUserList->SetSelectionMessage(new BMessage(kUserSelected)); fUserList->SetInvocationMessage(new BMessage(kUserInvoked)); - - r.Set(LW + 30, Bounds().top + CSEP, + + r.Set(LW + 30, Bounds().top + CSEP, Bounds().right - CSEP, Bounds().top + CSEP + CSEP); - fLoginControl = new BTextControl(r, "login", "login:", "", + fLoginControl = new BTextControl(r, "login", "Login:", "", new BMessage(kLoginEdited)); AddChild(fLoginControl); r.OffsetBySelf(0, CSEP + CSEP); - fPasswordControl = new BTextControl(r, "password", "password:", "", + fPasswordControl = new BTextControl(r, "password", "Password:", "", new BMessage(kPasswordEdited)); fPasswordControl->TextView()->HideTyping(true); AddChild(fPasswordControl); r.OffsetBySelf(0, CSEP + CSEP); - fHidePasswordCheckBox = new BCheckBox(r, "hidepw", "Hide Password", + fHidePasswordCheckBox = new BCheckBox(r, "hidepw", "Hide password", new BMessage(kHidePassword)); fHidePasswordCheckBox->SetValue(1); AddChild(fHidePasswordCheckBox); // buttons float buttonWidth = BW; //(Bounds().Width() - 4 * CSEP) / 3; - BRect buttonRect(0, Bounds().bottom - BH, + BRect buttonRect(0, Bounds().bottom - BH, buttonWidth, Bounds().bottom); buttonRect.OffsetBySelf(CSEP, -CSEP); - fHaltButton = new BButton(buttonRect, "halt", "Halt", + fHaltButton = new BButton(buttonRect, "halt", "Halt", new BMessage(kHaltAction)); AddChild(fHaltButton); buttonRect.OffsetBySelf(CSEP + buttonWidth, 0); - fRebootButton = new BButton(buttonRect, "reboot", "Reboot", + fRebootButton = new BButton(buttonRect, "reboot", "Reboot", new BMessage(kRebootAction)); AddChild(fRebootButton); BRect infoRect(buttonRect); infoRect.OffsetBySelf(buttonWidth + CSEP, 0); - buttonRect.OffsetToSelf(Bounds().Width() - CSEP - buttonWidth, + buttonRect.OffsetToSelf(Bounds().Width() - CSEP - buttonWidth, Bounds().Height() - CSEP - BH); - fLoginButton = new BButton(buttonRect, "ok", "Ok", + fLoginButton = new BButton(buttonRect, "ok", "OK", new BMessage(kAttemptLogin)); AddChild(fLoginButton); @@ -161,7 +161,7 @@ LoginView::MessageReceived(BMessage *message) // if no pass specified and we were selecting the user, // give a chance to enter the password // else we might want to enter an empty password. - if (strlen(fPasswordControl->Text()) < 1 + if (strlen(fPasswordControl->Text()) < 1 && (fUserList->IsFocus() || fLoginControl->IsFocus())) { fPasswordControl->MakeFocus(); break; @@ -224,10 +224,10 @@ LoginView::AddNextUser() pwd = getpwent(); - if (pwd && pwd->pw_shell && - strcmp(pwd->pw_shell, "false") && - strcmp(pwd->pw_shell, "true") && - strcmp(pwd->pw_shell, "/bin/false") && + if (pwd && pwd->pw_shell && + strcmp(pwd->pw_shell, "false") && + strcmp(pwd->pw_shell, "true") && + strcmp(pwd->pw_shell, "/bin/false") && strcmp(pwd->pw_shell, "/bin/true")) { // not disabled PwdItem *item = new PwdItem(pwd); diff --git a/src/apps/magnify/Magnify.cpp b/src/apps/magnify/Magnify.cpp index a428fa6e9b..7e548d8375 100644 --- a/src/apps/magnify/Magnify.cpp +++ b/src/apps/magnify/Magnify.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008, Haiku, Inc. All Rights Reserved. + * Copyright 2002-2009, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. * * Updated by Sikosis (beos@gravity24hr.com) @@ -132,40 +132,40 @@ BuildInfoMenu(BMenu *menu) menu->AddItem(menuItem); menu->AddSeparatorItem(); - menuItem = new BMenuItem("Save Image", new BMessage(msg_save),'S'); + menuItem = new BMenuItem("Save image", new BMessage(msg_save),'S'); menu->AddItem(menuItem); -// menuItem = new BMenuItem("Save Selection", new BMessage(msg_save),'S'); +// menuItem = new BMenuItem("Save selection", new BMessage(msg_save),'S'); // menu->AddItem(menuItem); - menuItem = new BMenuItem("Copy Image", new BMessage(msg_copy_image),'C'); + menuItem = new BMenuItem("Copy image", new BMessage(msg_copy_image),'C'); menu->AddItem(menuItem); menu->AddSeparatorItem(); - menuItem = new BMenuItem("Hide/Show Info", new BMessage(msg_show_info),'T'); + menuItem = new BMenuItem("Hide/Show info", new BMessage(msg_show_info),'T'); menu->AddItem(menuItem); - menuItem = new BMenuItem("Add a Crosshair", new BMessage(msg_add_cross_hair),'H'); + menuItem = new BMenuItem("Add a crosshair", new BMessage(msg_add_cross_hair),'H'); menu->AddItem(menuItem); - menuItem = new BMenuItem("Remove a Crosshair", new BMessage(msg_remove_cross_hair), 'H', + menuItem = new BMenuItem("Remove a crosshair", new BMessage(msg_remove_cross_hair), 'H', B_SHIFT_KEY); menu->AddItem(menuItem); - menuItem = new BMenuItem("Hide/Show Grid", new BMessage(msg_toggle_grid),'G'); + menuItem = new BMenuItem("Hide/Show grid", new BMessage(msg_toggle_grid),'G'); menu->AddItem(menuItem); menu->AddSeparatorItem(); menuItem = new BMenuItem("Freeze/Unfreeze image", new BMessage(msg_freeze),'F'); menu->AddItem(menuItem); - menuItem = new BMenuItem("Stick Coordinates", new BMessage(msg_stick), 'I'); + menuItem = new BMenuItem("Stick coordinates", new BMessage(msg_stick), 'I'); menu->AddItem(menuItem); menu->AddSeparatorItem(); - menuItem = new BMenuItem("Make Square", new BMessage(msg_make_square),'/'); + menuItem = new BMenuItem("Make square", new BMessage(msg_make_square),'/'); menu->AddItem(menuItem); - menuItem = new BMenuItem("Decrease Window Size", new BMessage(msg_shrink),'-'); + menuItem = new BMenuItem("Decrease window size", new BMessage(msg_shrink),'-'); menu->AddItem(menuItem); - menuItem = new BMenuItem("Increase Window Size", new BMessage(msg_grow),'+'); + menuItem = new BMenuItem("Increase window size", new BMessage(msg_grow),'+'); menu->AddItem(menuItem); - menuItem = new BMenuItem("Decrease Pixel Size", new BMessage(msg_shrink_pixel),','); + menuItem = new BMenuItem("Decrease pixel size", new BMessage(msg_shrink_pixel),','); menu->AddItem(menuItem); - menuItem = new BMenuItem("Increase Pixel Size", new BMessage(msg_grow_pixel),'.'); + menuItem = new BMenuItem("Increase pixel size", new BMessage(msg_grow_pixel),'.'); menu->AddItem(menuItem); } @@ -771,7 +771,7 @@ void TWindow::ShowHelp() { BRect r(0, 0, 375, 240); - BWindow* w = new BWindow(r, "Magnify Help", B_TITLED_WINDOW, + BWindow* w = new BWindow(r, "Magnify help", B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE | B_NOT_RESIZABLE); r.right -= B_V_SCROLL_BAR_WIDTH; @@ -810,7 +810,7 @@ TWindow::ShowHelp() text->Insert(" freeze - freezes/unfreezes magnification of whatever the\n"); text->Insert(" cursor is currently over\n"); text->Insert("\n\n"); - text->Insert("Sizing & Resizing:\n"); + text->Insert("Sizing/Resizing:\n"); text->Insert(" make square - sets the width and the height to the larger\n"); text->Insert(" of the two making a square image\n"); text->Insert(" increase/decrease window size - grows or shrinks the window\n"); @@ -1013,31 +1013,31 @@ TMenu::AttachedToWindow() if (fMainWindow) state = fMainWindow->IsActive(); - BMenuItem* menuItem = FindItem("Hide/Show Info"); + BMenuItem* menuItem = FindItem("Hide/Show info"); if (menuItem) menuItem->SetEnabled(state); - menuItem = FindItem("Add a Crosshair"); + menuItem = FindItem("Add a crosshair"); if (menuItem) menuItem->SetEnabled(state); - menuItem = FindItem("Remove a Crosshair"); + menuItem = FindItem("Remove a crosshair"); if (menuItem) menuItem->SetEnabled(state); - menuItem = FindItem("Hide/Show Grid"); + menuItem = FindItem("Hide/Show grid"); if (menuItem) menuItem->SetEnabled(state); - menuItem = FindItem("Make Square"); + menuItem = FindItem("Make square"); if (menuItem) menuItem->SetEnabled(state); - menuItem = FindItem("Decrease Window Size"); + menuItem = FindItem("Decrease window size"); if (menuItem) menuItem->SetEnabled(state); - menuItem = FindItem("Increase Window Size"); + menuItem = FindItem("Increase window size"); if (menuItem) menuItem->SetEnabled(state); - menuItem = FindItem("Decrease Pixel Size"); + menuItem = FindItem("Decrease pixel size"); if (menuItem) menuItem->SetEnabled(state); - menuItem = FindItem("Increase Pixel Size"); + menuItem = FindItem("Increase pixel size"); if (menuItem) menuItem->SetEnabled(state); diff --git a/src/apps/mandelbrot/Mandelbrot.cpp b/src/apps/mandelbrot/Mandelbrot.cpp index 671e8aa8cd..954cd4d431 100644 --- a/src/apps/mandelbrot/Mandelbrot.cpp +++ b/src/apps/mandelbrot/Mandelbrot.cpp @@ -56,10 +56,10 @@ TMainWindow::TMainWindow(BRect bound, char* name, window_type type, long flags) menuBar->AddItem(menu); menu = new BMenu("Palette"); - menu->AddItem(new BMenuItem("Palette1", new BMessage(P1))); - menu->AddItem(new BMenuItem("Palette2", new BMessage(P2))); - menu->AddItem(item = new BMenuItem("Palette3", new BMessage(P3))); - menu->AddItem(new BMenuItem("Palette4", new BMessage(P4))); + menu->AddItem(new BMenuItem("Palette 1", new BMessage(P1))); + menu->AddItem(new BMenuItem("Palette 2", new BMessage(P2))); + menu->AddItem(item = new BMenuItem("Palette 3", new BMessage(P3))); + menu->AddItem(new BMenuItem("Palette 4", new BMessage(P4))); menuBar->AddItem(menu); item->SetMarked(true); diff --git a/src/apps/mediaconverter/MediaConverterWindow.cpp b/src/apps/mediaconverter/MediaConverterWindow.cpp index 7e2e1b5e28..a4e650df1c 100644 --- a/src/apps/mediaconverter/MediaConverterWindow.cpp +++ b/src/apps/mediaconverter/MediaConverterWindow.cpp @@ -602,7 +602,7 @@ MediaConverterWindow::BuildAudioVideoMenus() format.u.raw_audio = media_raw_audio_format::wildcard; while (get_next_encoder(&cookie, mf_format, &format, &outfmt, &codec_info) == B_OK) { if (separator) { - menu->AddItem(new BMenuItem("No Audio", + menu->AddItem(new BMenuItem("No audio", new BMessage(AUDIO_CODEC_SELECT_MESSAGE))); menu->AddSeparatorItem(); separator = false; @@ -656,7 +656,7 @@ MediaConverterWindow::BuildAudioVideoMenus() cookie = 0; while (get_next_encoder(&cookie, mf_format, &format, &outfmt, &codec_info) == B_OK) { if (separator) { - menu->AddItem(new BMenuItem("No Video", + menu->AddItem(new BMenuItem("No video", new BMessage(VIDEO_CODEC_SELECT_MESSAGE))); menu->AddSeparatorItem(); separator = false; diff --git a/src/apps/mediaconverter/Strings.h b/src/apps/mediaconverter/Strings.h index ce98e19d39..81c6047c28 100644 --- a/src/apps/mediaconverter/Strings.h +++ b/src/apps/mediaconverter/Strings.h @@ -26,14 +26,14 @@ #define SOURCE_BOX_LABEL _T("Source files") #define INFO_BOX_LABEL _T("File details") #define OUTPUT_BOX_LABEL _T("Output format") -#define FORMAT_LABEL _T("File format") -#define VIDEO_LABEL _T("Video encoding") -#define AUDIO_LABEL _T("Audio encoding") +#define FORMAT_LABEL _T("File format:") +#define VIDEO_LABEL _T("Video encoding:") +#define AUDIO_LABEL _T("Audio encoding:") // -#define OUTPUT_FOLDER_LABEL _T("Output Folder") +#define OUTPUT_FOLDER_LABEL _T("Output folder") #define PREVIEW_BUTTON_LABEL _T("Preview") -#define START_LABEL _T("Start mSec ") -#define END_LABEL _T("End mSec ") +#define START_LABEL _T("Start [ms]: ") +#define END_LABEL _T("End [ms]: ") // #define FORMAT_MENU_LABEL _T("Format") #define VIDEO_MENU_LABEL _T("Video") @@ -43,8 +43,8 @@ #define AUDIO_INFO_LABEL _T("Audio:") #define CONVERT_LABEL _T("Convert") #define CANCEL_LABEL _T("Cancel") -#define VIDEO_QUALITY_LABEL _T("Video quality %3d%%") -#define AUDIO_QUALITY_LABEL _T("Audio quality %3d%%") +#define VIDEO_QUALITY_LABEL _T("Video quality: %3d%%") +#define AUDIO_QUALITY_LABEL _T("Audio quality: %3d%%") #define SLIDER_LOW_LABEL _T("Low") #define SLIDER_HIGH_LABEL _T("High") #define NONE_LABEL _T("None available") @@ -54,14 +54,14 @@ #define OK_LABEL _T("OK") #define CONV_COMPLETE_LABEL _T("Conversion completed") #define CONV_CANCEL_LABEL _T("Conversion cancelled") -#define SELECT_DIR_LABEL _T("Select This Directory") +#define SELECT_DIR_LABEL _T("Select this folder") #define SELECT_LABEL _T("Select") #define SAVE_DIR_LABEL _T("MediaConverter+:SaveDirectory") #define NO_FILE_LABEL _T("No file selected") // #define FILE_MENU_LABEL _T("File") #define OPEN_MENU_LABEL _T("Open") -#define ABOUT_MENU_LABEL _T("About") +#define ABOUT_MENU_LABEL _T("About MediaConverter") #define QUIT_MENU_LABEL _T("Quit") #define WRITE_AUDIO_STRING _T("Writing audio track:") @@ -86,7 +86,7 @@ #define ERROR_READ_AUDIO_STRING _T("Error read audio frame ") #define ERROR_LOAD_STRING _T("Error loading file") -#define ENCODER_PARAMETERS _T("Encoder Parameters") +#define ENCODER_PARAMETERS _T("Encoder parameters") #endif // STRINGS_H diff --git a/src/apps/mediaconverter/languages/MediaConverter.frFR b/src/apps/mediaconverter/languages/MediaConverter.frFR index 24d4db034e..679ae7191a 100644 --- a/src/apps/mediaconverter/languages/MediaConverter.frFR +++ b/src/apps/mediaconverter/languages/MediaConverter.frFR @@ -8,10 +8,10 @@ "File format" "Format du fichier" "Video encoding" "Codage Vidéo" "Audio encoding" "Codage Audio" -"Output Folder" "Dossier de sortie" +"Output folder" "Dossier de sortie" "Preview" "Prévue" -"Start mSec " "Début (mSec)" -"End mSec " "FIn (mSec)" +"Start [ms] " "Début (mSec)" +"End [ms] " "FIn (mSec)" "Format" "Format" "Video" "Vidéo" "Audio" "Audio" @@ -22,8 +22,8 @@ "Cancel" "Annuler" "Low" "Faible" "High" "Haute" -"Video quality %3d%%" "QualitéVidéo %3d%%" -"Audio quality %3d%%" "QualitéAudio %3d%%" +"Video quality %3d%%" "Qualité vidéo %3d%%" +"Audio quality %3d%%" "Qualité audio %3d%%" "Drop media files onto this window" "Jeter les fichiers media dans cette fenêtre" "None available" "Non disponible" "Converting" "Conversion en cours" @@ -33,13 +33,13 @@ "Cancelling" "Annulation en cours" "OK" "Ok" "No file selected" "Aucun fichier sélectionné" -"Select This Directory" "Choisir ce dossier" +"Select this folder" "Choisir ce dossier" "Select" "Sélectionner" "MediaConverter+:SaveDirectory" "MediaConverter+:DossierSauvegarde" "Output file" "Fichier cible" "created" "créé" -"AudioQuality doesn't support" "Qualité Audio non supportée" -"VideoQuality doesn't support" "Qualité Vidéo non supportée" +"Audio quality doesn't support" "Qualité audio non supportée" +"Video quality doesn't support" "Qualité vidéo non supportée" "Writing audio track:" "Ecriture de la piste audio:" "Writing video track:" "Ecriture de la piste vidéo:" "Error launching: " "Erreur de lancement : " diff --git a/src/apps/mediaconverter/languages/MediaConverter.itIT b/src/apps/mediaconverter/languages/MediaConverter.itIT index 79141a0e6e..3ffbd24dd2 100644 --- a/src/apps/mediaconverter/languages/MediaConverter.itIT +++ b/src/apps/mediaconverter/languages/MediaConverter.itIT @@ -8,10 +8,10 @@ "File format" "Formato del file" "Video encoding" "Codifica video" "Audio encoding" "Codifica audio" -"Output Folder" "Cartella di destinazione" +"Output folder" "Cartella di destinazione" "Preview" "Anteprima" -"Start mSec " "Inizio mSec" -"End mSec " "Fine mSec" +"Start [ms] " "Inizio mSec" +"End [ms] " "Fine mSec" "Format" "Formato" "Video" "Video" "Audio" "Audio" @@ -33,13 +33,13 @@ "Cancelling" "Interruzione" "OK" "OK" "No file selected" "Nessun file selezionato" -"Select This Directory" "Seleziona questa directory" +"Select this folder" "Seleziona questa directory" "Select" "Seleziona" "MediaConverter+:SaveDirectory" "MediaConverter+:Directory di salvataggio" "Output file" "File di output" "created" "creato" -"Audio-Quality doesn't support" "Audio-Quality non supportata" -"Video-Quality doesn't support" "Video-Quality non supportata" +"Audio quality doesn't support" "Audio quality non supportata" +"Video quality doesn't support" "Video quality non supportata" "Writing audio track:" "Scrittura traccia audio in corso:" "Writing video track:" "Scrittura traccia video in corso:" "Error launching: " "Errore lanciando: " diff --git a/src/apps/mediaconverter/languages/MediaConverter.jaJP b/src/apps/mediaconverter/languages/MediaConverter.jaJP index a545b0013c..38fb6f8d45 100644 --- a/src/apps/mediaconverter/languages/MediaConverter.jaJP +++ b/src/apps/mediaconverter/languages/MediaConverter.jaJP @@ -8,10 +8,10 @@ "File format" "ファイル形式" "Video encoding" "映像エンコード形式" "Audio encoding" "音声エンコード形式" -"Output Folder" "出力フォルダ" +"Output folder" "出力フォルダ" "Preview" "プレビュー" -"Start mSec " "開始 mSec" -"End mSec " "終了 mSec" +"Start [ms] " "開始 mSec" +"End [ms] " "終了 mSec" "Format" "形式" "Video" "映像" "Audio" "音声" @@ -33,13 +33,13 @@ "Cancelling" "中止しています" "OK" "了解" "No file selected" "ファイル未選択" -"Select This Directory" "現在のディレクトリを選択" +"Select this folder" "現在のディレクトリを選択" "Select" "選択" "MediaConverter+:SaveDirectory" "MediaConverter+:保存先のディレクトリ" "Output file" "出力ファイル" "created" "生成" -"AudioQuality doesn't support" "音質調整機能なし" -"VideoQuality doesn't support" "画質調整機能なし" +"Audio quality doesn't support" "音質調整機能なし" +"Video quality doesn't support" "画質調整機能なし" "Writing audio track:" "音声トラック書き込み中:" "Writing video track:" "映像トラック書き込み中:" "Error launching: " "起動エラー : " diff --git a/src/apps/mediaplayer/InfoWin.cpp b/src/apps/mediaplayer/InfoWin.cpp index 75af3de8b5..0e7747d96a 100644 --- a/src/apps/mediaplayer/InfoWin.cpp +++ b/src/apps/mediaplayer/InfoWin.cpp @@ -415,7 +415,7 @@ printf("InfoWin::Update(0x%08lx)\n", which); fContentsView->Insert(s.String()); // TODO: demux/video/audio/... perfs (Kb/s) - fLabelsView->Insert("Display Mode\n"); + fLabelsView->Insert("Display mode\n"); if (fController->IsOverlayActive()) fContentsView->Insert("Overlay\n"); else diff --git a/src/apps/mediaplayer/MainApp.cpp b/src/apps/mediaplayer/MainApp.cpp index ca4c1ba1ad..678bc1b006 100644 --- a/src/apps/mediaplayer/MainApp.cpp +++ b/src/apps/mediaplayer/MainApp.cpp @@ -80,8 +80,8 @@ MainApp::MainApp() if (!fMediaServerRunning || !fMediaAddOnServerRunning) { BAlert* alert = new BAlert("start_media_server", - "It appears the Media Server is not running.\n" - "Would you like to start it ?", "Quit", "Start Media Server", NULL, + "It appears the media server is not running.\n" + "Would you like to start it ?", "Quit", "Start media server", NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); if (alert->Go() == 0) { PostMessage(B_QUIT_REQUESTED); @@ -344,7 +344,7 @@ MainApp::MessageReceived(BMessage* message) void MainApp::AboutRequested() { - BAlert* alert = new BAlert("about", NAME"\n\n Written by Marcus Overhagen " + BAlert* alert = new BAlert("about", NAME"\n\nWritten by Marcus Overhagen " ", Stephan Aßmus and Frederik Modéen", "Thanks"); alert->SetFeel(B_FLOATING_ALL_WINDOW_FEEL); // Make sure it is on top of any player windows that may have the @@ -586,7 +586,7 @@ MainApp::_InstallPlaylistMimeType() } // set descriptions - ret = mime.SetShortDescription("MediaPlayer Playlist"); + ret = mime.SetShortDescription("MediaPlayer playlist"); if (ret != B_OK) { fprintf(stderr, "Could not set short description of mime type: %s\n", strerror(ret)); diff --git a/src/apps/mediaplayer/MainWin.cpp b/src/apps/mediaplayer/MainWin.cpp index 571202f653..34c158d20c 100644 --- a/src/apps/mediaplayer/MainWin.cpp +++ b/src/apps/mediaplayer/MainWin.cpp @@ -1071,7 +1071,7 @@ MainWin::_CreateMenu() fPlaylistMenu = new BMenu("Playlist"B_UTF8_ELLIPSIS); fAudioMenu = new BMenu("Audio"); fVideoMenu = new BMenu("Video"); - fVideoAspectMenu = new BMenu("Aspect Ratio"); + fVideoAspectMenu = new BMenu("Aspect ratio"); fSettingsMenu = new BMenu("Settings"); fAudioTrackMenu = new BMenu("Track"); fVideoTrackMenu = new BMenu("Track"); @@ -1081,7 +1081,7 @@ MainWin::_CreateMenu() fMenuBar->AddItem(fVideoMenu); fMenuBar->AddItem(fSettingsMenu); - fFileMenu->AddItem(new BMenuItem("New Player"B_UTF8_ELLIPSIS, + fFileMenu->AddItem(new BMenuItem("New player"B_UTF8_ELLIPSIS, new BMessage(M_FILE_NEWPLAYER), 'N')); fFileMenu->AddSeparatorItem(); @@ -1090,12 +1090,12 @@ MainWin::_CreateMenu() // Add recent files BRecentFilesList recentFiles(10, false, NULL, kAppSig); BMenuItem *item = new BMenuItem(recentFiles.NewFileListMenu( - "Open File"B_UTF8_ELLIPSIS, new BMessage(B_REFS_RECEIVED), + "Open file"B_UTF8_ELLIPSIS, new BMessage(B_REFS_RECEIVED), NULL, this, 10, false, NULL, 0, kAppSig), new BMessage(M_FILE_OPEN)); item->SetShortcut('O', 0); fFileMenu->AddItem(item); - fFileMenu->AddItem(new BMenuItem("File Info"B_UTF8_ELLIPSIS, + fFileMenu->AddItem(new BMenuItem("File info"B_UTF8_ELLIPSIS, new BMessage(M_FILE_INFO), 'I')); fFileMenu->AddItem(fPlaylistMenu); fPlaylistMenu->Superitem()->SetShortcut('P', B_COMMAND_KEY); @@ -1136,7 +1136,7 @@ MainWin::_CreateMenu() fVideoMenu->AddSeparatorItem(); - fVideoMenu->AddItem(new BMenuItem("Full Screen", + fVideoMenu->AddItem(new BMenuItem("Full screen", new BMessage(M_TOGGLE_FULLSCREEN), 'F')); fVideoMenu->AddSeparatorItem(); @@ -1144,10 +1144,10 @@ MainWin::_CreateMenu() _SetupVideoAspectItems(fVideoAspectMenu); fVideoMenu->AddItem(fVideoAspectMenu); - fNoInterfaceMenuItem = new BMenuItem("No Interface", + fNoInterfaceMenuItem = new BMenuItem("No interface", new BMessage(M_TOGGLE_NO_INTERFACE), 'B'); fSettingsMenu->AddItem(fNoInterfaceMenuItem); - fSettingsMenu->AddItem(new BMenuItem("Always on Top", + fSettingsMenu->AddItem(new BMenuItem("Always on top", new BMessage(M_TOGGLE_ALWAYS_ON_TOP), 'T')); fSettingsMenu->AddSeparatorItem(); item = new BMenuItem("Settings"B_UTF8_ELLIPSIS, @@ -1176,12 +1176,12 @@ MainWin::_SetupVideoAspectItems(BMenu* menu) // "Stream Settings" and "16 : 9" if the stream settings happen to // be "16 : 9". - menu->AddItem(item = new BMenuItem("Stream Settings", + menu->AddItem(item = new BMenuItem("Stream settings", new BMessage(M_ASPECT_SAME_AS_SOURCE))); item->SetMarked(widthAspect == fWidthAspect && heightAspect == fHeightAspect); - menu->AddItem(item = new BMenuItem("No Aspect Correction", + menu->AddItem(item = new BMenuItem("No aspect correction", new BMessage(M_ASPECT_NO_DISTORTION))); item->SetMarked(width == fWidthAspect && height == fHeightAspect); @@ -1546,18 +1546,18 @@ MainWin::_ShowContextMenu(const BPoint &screen_point) printf("Show context menu\n"); BPopUpMenu *menu = new BPopUpMenu("context menu", false, false); BMenuItem *item; - menu->AddItem(item = new BMenuItem("Full Screen", + menu->AddItem(item = new BMenuItem("Full screen", new BMessage(M_TOGGLE_FULLSCREEN), 'F')); item->SetMarked(fIsFullscreen); item->SetEnabled(fHasVideo); - BMenu* aspectSubMenu = new BMenu("Aspect Ratio"); + BMenu* aspectSubMenu = new BMenu("Aspect ratio"); _SetupVideoAspectItems(aspectSubMenu); aspectSubMenu->SetTargetForItems(this); menu->AddItem(item = new BMenuItem(aspectSubMenu)); item->SetEnabled(fHasVideo); - menu->AddItem(item = new BMenuItem("No Interface", + menu->AddItem(item = new BMenuItem("No interface", new BMessage(M_TOGGLE_NO_INTERFACE), 'B')); item->SetMarked(fNoInterface); item->SetEnabled(fHasVideo); @@ -1565,8 +1565,8 @@ MainWin::_ShowContextMenu(const BPoint &screen_point) menu->AddSeparatorItem(); // Add track selector menus - BMenu* audioTrackMenu = new BMenu("Audio Track"); - BMenu* videoTrackMenu = new BMenu("Video Track"); + BMenu* audioTrackMenu = new BMenu("Audio track"); + BMenu* videoTrackMenu = new BMenu("Video track"); _SetupTrackMenus(audioTrackMenu, videoTrackMenu); audioTrackMenu->SetTargetForItems(this); diff --git a/src/apps/mediaplayer/media_node_framework/NodeManager.cpp b/src/apps/mediaplayer/media_node_framework/NodeManager.cpp index c4d9fd10b0..e92311fc1c 100644 --- a/src/apps/mediaplayer/media_node_framework/NodeManager.cpp +++ b/src/apps/mediaplayer/media_node_framework/NodeManager.cpp @@ -315,7 +315,7 @@ NodeManager::_SetUpVideoNodes(color_space preferredVideoFormat, bool useOverlays) { // create the video producer node - fVideoProducer = new VideoProducer(NULL, "MediaPlayer Video Out", 0, + fVideoProducer = new VideoProducer(NULL, "MediaPlayer video out", 0, this, fVideoSupplier); // register the producer node @@ -331,7 +331,7 @@ NodeManager::_SetUpVideoNodes(color_space preferredVideoFormat, fVideoConnection.producer = fVideoProducer->Node(); // create the video consumer node - fVideoConsumer = new VideoConsumer("MediaPlayer Video In", NULL, 0, this, + fVideoConsumer = new VideoConsumer("MediaPlayer video in", NULL, 0, this, fVideoTarget); // register the consumer node @@ -448,7 +448,7 @@ NodeManager::_SetUpVideoNodes(color_space preferredVideoFormat, status_t NodeManager::_SetUpAudioNodes(float audioFrameRate, uint32 audioChannels) { - fAudioProducer = new AudioProducer("MediaPlayer Audio Out", fAudioSupplier); + fAudioProducer = new AudioProducer("MediaPlayer audio out", fAudioSupplier); fAudioProducer->SetPeakListener(fPeakListener); fStatus = fMediaRoster->RegisterNode(fAudioProducer); if (fStatus != B_OK) { diff --git a/src/apps/mediaplayer/playlist/ImportPLItemsCommand.cpp b/src/apps/mediaplayer/playlist/ImportPLItemsCommand.cpp index 968d4884bb..a77e1a62b4 100644 --- a/src/apps/mediaplayer/playlist/ImportPLItemsCommand.cpp +++ b/src/apps/mediaplayer/playlist/ImportPLItemsCommand.cpp @@ -44,7 +44,7 @@ ImportPLItemsCommand::ImportPLItemsCommand(Playlist* playlist, fNewCount = temp.CountItems(); if (fNewCount <= 0) { BAlert* alert = new BAlert("Nothing to Play", "None of the files " - "you wanted to play appear to be media files.", "Ok"); + "you wanted to play appear to be media files.", "OK"); alert->Go(NULL); return; } diff --git a/src/apps/mediaplayer/playlist/PlaylistWindow.cpp b/src/apps/mediaplayer/playlist/PlaylistWindow.cpp index a71492d0f5..ed01acf9e0 100644 --- a/src/apps/mediaplayer/playlist/PlaylistWindow.cpp +++ b/src/apps/mediaplayer/playlist/PlaylistWindow.cpp @@ -228,7 +228,7 @@ PlaylistWindow::_CreateMenu(BRect& frame) menuBar->AddItem(fileMenu); fileMenu->AddItem(new BMenuItem("Open"B_UTF8_ELLIPSIS, new BMessage(M_PLAYLIST_OPEN), 'O')); - fileMenu->AddItem(new BMenuItem("Save As"B_UTF8_ELLIPSIS, + fileMenu->AddItem(new BMenuItem("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')); @@ -249,9 +249,9 @@ PlaylistWindow::_CreateMenu(BRect& frame) editMenu->AddSeparatorItem(); editMenu->AddItem(new BMenuItem("Remove (Del)", new BMessage(M_PLAYLIST_REMOVE)/*, B_DELETE, 0*/)); - editMenu->AddItem(new BMenuItem("Remove and Put into Trash", + editMenu->AddItem(new BMenuItem("Remove and put into Trash", new BMessage(M_PLAYLIST_REMOVE_AND_PUT_INTO_TRASH), 'T')); - editMenu->AddItem(new BMenuItem("Remove All", + editMenu->AddItem(new BMenuItem("Remove all", new BMessage(M_PLAYLIST_EMPTY), 'N')); menuBar->AddItem(editMenu); @@ -292,7 +292,7 @@ PlaylistWindow::_ObjectChanged(const Notifier* object) static void display_save_alert(const char* message) { - BAlert* alert = new BAlert("Save Error", message, "Ok", NULL, NULL, + BAlert* alert = new BAlert("Save error", message, "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT); alert->Go(NULL); } @@ -315,7 +315,7 @@ PlaylistWindow::_SavePlaylist(const BMessage* message) if (message->FindRef("directory", &ref) != B_OK || message->FindString("name", &name) != B_OK) { display_save_alert("Internal error (malformed message). " - "Saving the Playlist failed."); + "Saving the playlist failed."); return; } @@ -328,7 +328,7 @@ PlaylistWindow::_SavePlaylist(const BMessage* message) || origPath.Append(name) != B_OK || tempPath.Append(tempName.String()) != B_OK) { display_save_alert("Internal error (out of memory). " - "Saving the Playlist failed."); + "Saving the playlist failed."); return; } @@ -336,7 +336,7 @@ PlaylistWindow::_SavePlaylist(const BMessage* message) BEntry tempEntry(tempPath.Path()); if (origEntry.InitCheck() != B_OK || tempEntry.InitCheck() != B_OK) { display_save_alert("Internal error (out of memory). " - "Saving the Playlist failed."); + "Saving the playlist failed."); return; } @@ -393,7 +393,7 @@ PlaylistWindow::_SavePlaylist(BEntry& origEntry, BEntry& tempEntry, AutoLocker lock(fPlaylist); if (!lock.IsLocked()) { display_save_alert("Internal error (locking failed). " - "Saving the Playlist failed."); + "Saving the playlist failed."); return; } diff --git a/src/apps/mediaplayer/playlist/RemovePLItemsCommand.cpp b/src/apps/mediaplayer/playlist/RemovePLItemsCommand.cpp index 7569248c26..07456f6e36 100644 --- a/src/apps/mediaplayer/playlist/RemovePLItemsCommand.cpp +++ b/src/apps/mediaplayer/playlist/RemovePLItemsCommand.cpp @@ -109,10 +109,10 @@ RemovePLItemsCommand::Perform() message << "All "; else message << "Some "; - message << "files could not be moved into the Trash.\n\n"; + message << "files could not be moved into Trash.\n\n"; message << "Error: " << strerror(moveError); (new BAlert("Move Into Trash Error", message.String(), - "Ok", NULL, NULL, B_WIDTH_AS_USUAL, + "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go(NULL); } } diff --git a/src/apps/mediaplayer/settings/SettingsWindow.cpp b/src/apps/mediaplayer/settings/SettingsWindow.cpp index a8d462a2a2..28d9e3e345 100644 --- a/src/apps/mediaplayer/settings/SettingsWindow.cpp +++ b/src/apps/mediaplayer/settings/SettingsWindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2008, Haiku. All rights reserved. + * Copyright 2008-2009, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. * * Authors: @@ -46,7 +46,7 @@ enum { #define BUTTONHEIGHT 20 SettingsWindow::SettingsWindow(BRect frame) - : BWindow(frame, "MediaPlayer Settings", B_FLOATING_WINDOW_LOOK, + : BWindow(frame, "MediaPlayer settings", B_FLOATING_WINDOW_LOOK, B_FLOATING_APP_WINDOW_FEEL, B_ASYNCHRONOUS_CONTROLS | B_NOT_ZOOMABLE | B_NOT_RESIZABLE #ifdef __HAIKU__ @@ -115,7 +115,7 @@ SettingsWindow::SettingsWindow(BRect frame) BButton* cancelButton = new BButton("cancel", "Cancel", new BMessage(M_SETTINGS_CANCEL)); - BButton* okButton = new BButton("ok", "Ok", + BButton* okButton = new BButton("ok", "OK", new BMessage(M_SETTINGS_SAVE)); okButton->MakeDefault(true); diff --git a/src/apps/midiplayer/MidiPlayerWindow.cpp b/src/apps/midiplayer/MidiPlayerWindow.cpp index ce02cdea34..1616e300b4 100644 --- a/src/apps/midiplayer/MidiPlayerWindow.cpp +++ b/src/apps/midiplayer/MidiPlayerWindow.cpp @@ -192,7 +192,7 @@ void MidiPlayerWindow::CreateInputMenu() inputPopUp->AddItem(inputOff); - inputMenu = new BMenuField("Live Input:", inputPopUp, NULL); + inputMenu = new BMenuField("Live input:", inputPopUp, NULL); } //------------------------------------------------------------------------------ @@ -211,7 +211,7 @@ void MidiPlayerWindow::CreateReverbMenu() "Garage", new BMessage(MSG_REVERB_GARAGE)); reverbIgor = new BMenuItem( - "Igor's Lab", new BMessage(MSG_REVERB_IGOR)); + "Igor's lab", new BMessage(MSG_REVERB_IGOR)); reverbCavern = new BMenuItem( "Cavern", new BMessage(MSG_REVERB_CAVERN)); @@ -397,7 +397,7 @@ void MidiPlayerWindow::LoadFile(entry_ref* ref) scopeView->Invalidate(); (new BAlert( - NULL, "Could not load song", "Okay", NULL, NULL, + NULL, "Could not load song", "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go(); } } diff --git a/src/apps/networkstatus/NetworkStatusView.cpp b/src/apps/networkstatus/NetworkStatusView.cpp index 26b9008e0d..b10ea22fef 100644 --- a/src/apps/networkstatus/NetworkStatusView.cpp +++ b/src/apps/networkstatus/NetworkStatusView.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2006-2007, Haiku, Inc. All Rights Reserved. + * Copyright 2006-2009, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. * * Authors: @@ -43,7 +43,7 @@ static const char *kStatusDescriptions[] = { "Unknown", - "No Link", + "No link", "No stateful configuration", "Configuring", "Ready" @@ -346,7 +346,7 @@ NetworkStatusView::_ShowConfiguration(BMessage* message) text += address; } - BAlert* alert = new BAlert(name, text.String(), "Ok"); + BAlert* alert = new BAlert(name, text.String(), "OK"); BTextView* view = alert->TextView(); BFont font; @@ -382,7 +382,7 @@ NetworkStatusView::MouseDown(BPoint point) menu->AddSeparatorItem(); //menu->AddItem(new BMenuItem("About NetworkStatus" B_UTF8_ELLIPSIS, // new BMessage(B_ABOUT_REQUESTED))); - menu->AddItem(new BMenuItem("Open Networks Preferences" B_UTF8_ELLIPSIS, + menu->AddItem(new BMenuItem("Open network preferences" B_UTF8_ELLIPSIS, new BMessage(kMsgOpenNetworkPreferences))); if (fInDeskbar) @@ -399,7 +399,7 @@ NetworkStatusView::_AboutRequested() { BAlert* alert = new BAlert("about", "NetworkStatus\n" "\twritten by Axel Dörfler and Hugo Santos\n" - "\tCopyright 2007, Haiku, Inc.\n", "Ok"); + "\tCopyright 2007, Haiku, Inc.\n", "OK"); BTextView *view = alert->TextView(); BFont font; @@ -512,11 +512,11 @@ NetworkStatusView::_OpenNetworksPreferences() { status_t status = be_roster->Launch("application/x-vnd.Haiku-Network"); if (status != B_OK && status != B_ALREADY_RUNNING) { - BString errorMessage("Launching the Network preflet failed.\n\n" + BString errorMessage("Launching the network preflet failed.\n\n" "Error: "); errorMessage << strerror(status); BAlert* alert = new BAlert("launch error", errorMessage.String(), - "Ok"); + "OK"); // asynchronous alert in order to not block replicant host application alert->Go(NULL); diff --git a/src/apps/packageinstaller/PackageInfo.cpp b/src/apps/packageinstaller/PackageInfo.cpp index 6349b48e4b..f77e562556 100644 --- a/src/apps/packageinstaller/PackageInfo.cpp +++ b/src/apps/packageinstaller/PackageInfo.cpp @@ -44,7 +44,7 @@ enum { PackageInfo::PackageInfo() - : + : fStatus(B_NO_INIT), fPackageFile(0), fDescription(T("No package available.")), @@ -55,7 +55,7 @@ PackageInfo::PackageInfo() PackageInfo::PackageInfo(const entry_ref *ref) - : + : fStatus(B_NO_INIT), fPackageFile(new BFile(ref, B_READ_ONLY)), fDescription(T("No package selected.")), @@ -97,13 +97,13 @@ PackageInfo::Parse() if (!fPackageFile || fPackageFile->InitCheck() != B_OK) { RETURN_AND_SET_STATUS(B_ERROR); } - + // Check for the presence of the first AlB tag - as the 'magic number'. // This also ensures that the file header section is present - which // is a crucial pkg section char buffer[16]; fPackageFile->Read(buffer, 8); - if (buffer[0] != 'A' || buffer[1] != 'l' || buffer[2] != 'B' + if (buffer[0] != 'A' || buffer[1] != 'l' || buffer[2] != 'B' || buffer[3] != 0x1a) { RETURN_AND_SET_STATUS(B_ERROR); } @@ -111,7 +111,7 @@ PackageInfo::Parse() fHasImage = false; // Parse all known parts of the given .pkg file - + uint32 i; int8 bytesRead; off_t actualSize = 0; @@ -122,7 +122,7 @@ PackageInfo::Parse() system_info sysinfo; get_system_info(&sysinfo); - + uint64 infoOffset = 0, groupsOffset = 0; uint64 length = 0; @@ -261,7 +261,7 @@ PackageInfo::Parse() fDisclaimer = (char *)disclaimer; delete disclaimer; - continue; + continue; } else if (!memcmp(buffer, splashScreenMarker, 7)) { uint64 length; fPackageFile->Read(&length, 8); @@ -283,9 +283,9 @@ PackageInfo::Parse() delete compressed; RETURN_AND_SET_STATUS(B_ERROR); } - + fImage.SetSize(original); - status_t ret = inflate_data(compressed, length, + status_t ret = inflate_data(compressed, length, static_cast(const_cast(fImage.Buffer())), original); delete compressed; @@ -393,7 +393,7 @@ PackageInfo::Parse() } fProfiles.AddItem(new pkg_profile(group)); - parser_debug("Group added: %s %s\n", group.name.String(), + parser_debug("Group added: %s %s\n", group.name.String(), group.description.String()); groupStarted = false; @@ -874,7 +874,7 @@ PackageInfo::Parse() BString dest = ""; uint8 localType = pathType; - if (path == 0xfffffffe) + if (path == 0xfffffffe) dest << itemPath << "/" << nameString.String(); else if (path == 0xffffffff) { localType = P_INSTALL_PATH; @@ -912,7 +912,7 @@ PackageInfo::Parse() signatureString, mode); } } else if (element == P_DIRECTORY) { - if (itemGroups) { + if (itemGroups) { if (installDirectoryFlag != 0) { if (installDirectoryFlag < 0) { // Normal directory @@ -938,7 +938,7 @@ PackageInfo::Parse() pathType = P_SYSTEM_PATH; else pathType = P_USER_PATH; - + itemPath = *def; } else { BPath *def = static_cast( @@ -981,7 +981,7 @@ PackageInfo::Parse() BString dest = ""; uint8 localType = pathType; - if (path == 0xfffffffe) + if (path == 0xfffffffe) dest << itemPath << "/" << nameString.String(); else if (path == 0xffffffff) { localType = P_INSTALL_PATH; @@ -998,7 +998,7 @@ PackageInfo::Parse() localType = P_SYSTEM_PATH; else localType = P_USER_PATH; - + dest << *def << "/" << nameString; } else { BPath *def = static_cast(systemPaths.ItemAt(path)); @@ -1011,7 +1011,7 @@ PackageInfo::Parse() } } - parser_debug("Adding link: %s! (type %s)\n", dest.String(), + parser_debug("Adding link: %s! (type %s)\n", dest.String(), pathType == P_SYSTEM_PATH ? "System" : localType == P_INSTALL_PATH ? "Install" : "User"); @@ -1056,12 +1056,13 @@ PackageInfo::Parse() // Inform the user of a possible error int32 selection; BAlert *warning = new BAlert(T("filesize_wrong"), - T("There seems to be a filesize mismatch in the package file. " + T("There seems to be a file size mismatch in the package file. " "The package might be corrupted or have been modified after its " - "creation. Do you still wish to continue?"), T("Yes"), T("No"), NULL, + "creation. Do you still wish to continue?"), T("Continue"), + T("Abort"), NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); selection = warning->Go(); - + if (selection == 1) { RETURN_AND_SET_STATUS(B_ERROR); } @@ -1097,7 +1098,7 @@ PackageInfo::_AddItem(PackageItem *item, uint64 size, uint32 groups, // the destination volume if (path == 0xffffffff) profile->path_type = P_INSTALL_PATH; - else if (path < 0xfffffffe && + else if (path < 0xfffffffe && profile->path_type != P_INSTALL_PATH) { if (cust) { profile->path_type = P_USER_PATH; diff --git a/src/apps/packageinstaller/PackageView.cpp b/src/apps/packageinstaller/PackageView.cpp index d7ab1e1732..ed775916b0 100644 --- a/src/apps/packageinstaller/PackageView.cpp +++ b/src/apps/packageinstaller/PackageView.cpp @@ -266,7 +266,7 @@ PackageView::Install() BAlert *reinstall = new BAlert("reinstall", T("The given package seems to be already installed on your system. " "Would you like to uninstall the existing one and continue the " - "installation?"), T("Yes"), T("No")); + "installation?"), T("Continue"), T("Abort")); if (reinstall->Go() == 0) { // Uninstall the package @@ -301,7 +301,7 @@ PackageView::Install() return err; } - fStatusWindow->StageStep(1, "Installing files and directories"); + fStatusWindow->StageStep(1, "Installing files and folders"); // Install files and directories PackageItem *iter; @@ -570,11 +570,11 @@ PackageView::_ItemExists(PackageItem &item, BPath &path) BString alertString = T("The "); alertString << item.ItemKind() << T(" named \'") << path.Leaf() << "\' "; - alertString << T("already exists in the given path. Should the " - "existing file be replaced with the one from this package?"); + alertString << T("already exists in the given path.\nReplace the file with " + "the one from this package or skip it?"); BAlert *alert = new BAlert(T("file_exists"), alertString.String(), - T("Yes"), T("No"), T("Abort")); + T("Replace"), T("Skip"), T("Abort")); choice = alert->Go(); switch (choice) { @@ -590,8 +590,8 @@ PackageView::_ItemExists(PackageItem &item, BPath &path) if (fItemExistsPolicy == P_EXISTS_NONE) { // TODO: Maybe add 'No, but ask again' type of choice as well? - alertString = T("Should this decision be remembered and all " - "existing files encountered in the future be "); + alertString = T("Do you want to remember this decision for the rest of " + "this installation?\nAll existing files will be "); alertString << ((choice == P_EXISTS_OVERWRITE) ? T("replaced?") : T("skipped?")); diff --git a/src/apps/packageinstaller/PackageWindow.cpp b/src/apps/packageinstaller/PackageWindow.cpp index 05a7541f35..e38313e833 100644 --- a/src/apps/packageinstaller/PackageWindow.cpp +++ b/src/apps/packageinstaller/PackageWindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Haiku, Inc. + * Copyright (c) 2007-2009, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT license. * * Author: @@ -18,7 +18,7 @@ PackageWindow::PackageWindow(const entry_ref *ref) - : BWindow(BRect(100, 100, 600, 300), T("Package Installer"), B_TITLED_WINDOW, + : BWindow(BRect(100, 100, 600, 300), T("PackageInstaller"), B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_NOT_RESIZABLE) { //SetLayout(new BGroupLayout(B_HORIZONTAL)); diff --git a/src/apps/packageinstaller/main.cpp b/src/apps/packageinstaller/main.cpp index a648ba876b..f66d4bd527 100644 --- a/src/apps/packageinstaller/main.cpp +++ b/src/apps/packageinstaller/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, Haiku, Inc. + * Copyright (c) 2007-2009, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT license. * * Author: @@ -139,7 +139,7 @@ PackageInstaller::AboutRequested() "BeOS legacy .pkg file installer for Haiku.\n\n" "Copyright 2007,\nŁukasz 'Sil2100' Zemczak\n\n" "Copyright (c) 2007 Haiku, Inc. \n", - "Close"); + "OK"); BTextView *view = about->TextView(); BFont font; diff --git a/src/apps/pairs/PairsView.cpp b/src/apps/pairs/PairsView.cpp index 5c1b1e8964..2866a573f8 100644 --- a/src/apps/pairs/PairsView.cpp +++ b/src/apps/pairs/PairsView.cpp @@ -158,7 +158,7 @@ PairsView::_ReadRandomIcons() if (fCard[i] == NULL) { BAlert* alert = new BAlert("fatal", "Pairs did not find enough " "vector icons in the system, it needs at least eight.", - "Oh!", NULL, NULL, B_WIDTH_FROM_WIDEST, B_STOP_ALERT); + "OK", NULL, NULL, B_WIDTH_FROM_WIDEST, B_STOP_ALERT); alert->Go(); exit(1); } diff --git a/src/apps/people/PeopleApp.cpp b/src/apps/people/PeopleApp.cpp index 09f448038c..1cef4c7cca 100644 --- a/src/apps/people/PeopleApp.cpp +++ b/src/apps/people/PeopleApp.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2005 - 2008, Haiku, Inc. + * Copyright 2005-2009, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT license. * * Authors: @@ -29,7 +29,7 @@ struct people_field gFields[] = { - { "META:name", 120, "Contact Name" }, + { "META:name", 120, "Contact name" }, { "META:nickname", 120, "Nickname" }, { "META:company", 120, "Company" }, { "META:address", 120, "Address" }, @@ -37,8 +37,8 @@ struct people_field gFields[] = { { "META:state", 50, "State" }, { "META:zip", 50, "Zip" }, { "META:country", 120, "Country" }, - { "META:hphone", 90, "Home Phone" }, - { "META:wphone", 90, "Work Phone" }, + { "META:hphone", 90, "Home phone" }, + { "META:wphone", 90, "Work phone" }, { "META:fax", 90, "Fax" }, { "META:email", 120, "E-mail" }, { "META:url", 120, "URL" }, @@ -140,7 +140,7 @@ TPeopleApp::~TPeopleApp(void) void TPeopleApp::AboutRequested(void) { - (new BAlert("", "...by Robert Polic", "Big Deal"))->Go(); + (new BAlert("", "...by Robert Polic", "OK"))->Go(); } @@ -230,7 +230,7 @@ TPeopleApp::NewWindow(entry_ref *ref) { TPeopleWindow *window; - window = new TPeopleWindow(fPosition, "New Person", ref); + window = new TPeopleWindow(fPosition, "New person", ref); window->Show(); fWindowCount++; fPosition.OffsetBy(20, 20); diff --git a/src/apps/people/PeopleWindow.cpp b/src/apps/people/PeopleWindow.cpp index eda1407ed9..21d16bb837 100644 --- a/src/apps/people/PeopleWindow.cpp +++ b/src/apps/people/PeopleWindow.cpp @@ -42,13 +42,13 @@ TPeopleWindow::TPeopleWindow(BRect frame, const char *title, entry_ref *ref) BRect rect(0, 0, 32767, 15); BMenuBar* menuBar = new BMenuBar(rect, ""); menu = new BMenu("File"); - menu->AddItem(item = new BMenuItem("New Person" B_UTF8_ELLIPSIS, new BMessage(M_NEW), 'N')); + menu->AddItem(item = new BMenuItem("New person" B_UTF8_ELLIPSIS, new BMessage(M_NEW), 'N')); item->SetTarget(NULL, be_app); menu->AddItem(new BMenuItem("Close", new BMessage(B_QUIT_REQUESTED), 'W')); menu->AddSeparatorItem(); menu->AddItem(fSave = new BMenuItem("Save", new BMessage(M_SAVE), 'S')); fSave->SetEnabled(FALSE); - menu->AddItem(new BMenuItem("Save As"B_UTF8_ELLIPSIS, new BMessage(M_SAVE_AS))); + menu->AddItem(new BMenuItem("Save as"B_UTF8_ELLIPSIS, new BMessage(M_SAVE_AS))); menu->AddItem(fRevert = new BMenuItem("Revert", new BMessage(M_REVERT), 'R')); fRevert->SetEnabled(FALSE); menu->AddSeparatorItem(); @@ -68,7 +68,7 @@ TPeopleWindow::TPeopleWindow(BRect frame, const char *title, entry_ref *ref) fCopy->SetTarget(NULL, this); menu->AddItem(fPaste = new BMenuItem("Paste", new BMessage(B_PASTE), 'V')); fPaste->SetTarget(NULL, this); - menu->AddItem(item = new BMenuItem("Select All", new BMessage(M_SELECT), 'A')); + menu->AddItem(item = new BMenuItem("Select all", new BMessage(M_SELECT), 'A')); item->SetTarget(NULL, this); menuBar->AddItem(menu); AddChild(menuBar); diff --git a/src/apps/poorman/PoorManAdvancedView.cpp b/src/apps/poorman/PoorManAdvancedView.cpp index b5c19422cd..b3a7d1c6a8 100644 --- a/src/apps/poorman/PoorManAdvancedView.cpp +++ b/src/apps/poorman/PoorManAdvancedView.cpp @@ -6,7 +6,7 @@ */ #include - + #include "constants.h" #include "PoorManAdvancedView.h" #include "PoorManWindow.h" @@ -17,9 +17,9 @@ PoorManAdvancedView::PoorManAdvancedView(BRect rect, const char *name) { PoorManWindow * win; win = ((PoorManApplication *)be_app)->GetPoorManWindow(); - + SetViewColor(BACKGROUND_COLOR); - + // Console Logging BBox BRect maxRect; maxRect = rect; @@ -27,31 +27,31 @@ PoorManAdvancedView::PoorManAdvancedView(BRect rect, const char *name) maxRect.left -= 5.0; maxRect.right -= 7.0; maxRect.bottom -= 118.0; - - BBox * connectionOptions = new BBox(maxRect, "Connection Options"); + + BBox * connectionOptions = new BBox(maxRect, "Connections"); connectionOptions->SetLabel(STR_BBX_CONNECTION); AddChild(connectionOptions); - + BRect sliderRect; sliderRect = connectionOptions->Bounds(); sliderRect.InsetBy(10.0f, 10.0f); sliderRect.top += 10; sliderRect.bottom = sliderRect.top + 50.0; - - maxConnections = new StatusSlider(sliderRect, "Max Slider", STR_SLD_LABEL, - STR_SLD_STATUS_LABEL, new BMessage(MSG_PREF_ADV_SLD_MAX_CONNECTION), 1, 200); - + + maxConnections = new StatusSlider(sliderRect, "Max Slider", STR_SLD_LABEL, + STR_SLD_STATUS_LABEL, new BMessage(MSG_PREF_ADV_SLD_MAX_CONNECTION), 1, 200); + // labels below the slider 1 and 200 maxConnections->SetLimitLabels("1", "200"); SetMaxSimutaneousConnections(win->MaxConnections()); connectionOptions->AddChild(maxConnections); } -void +void PoorManAdvancedView::SetMaxSimutaneousConnections(int32 num) { if (num <= 0 || num > 200) maxConnections->SetValue(32); - else + else maxConnections->SetValue(num); } diff --git a/src/apps/poorman/PoorManWindow.cpp b/src/apps/poorman/PoorManWindow.cpp index ff95821b9b..d5aed23187 100644 --- a/src/apps/poorman/PoorManWindow.cpp +++ b/src/apps/poorman/PoorManWindow.cpp @@ -229,14 +229,14 @@ PoorManWindow::MessageReceived(BMessage* message) saveConsoleFilePanel->Show(); break; case MSG_FILE_PANEL_SAVE_CONSOLE: - printf("FilePanel: Save Console\n"); + printf("FilePanel: Save console\n"); SaveConsole(message, false); break; case MSG_MENU_FILE_SAVE_SELECTION: saveConsoleSelectionFilePanel->Show(); break; case MSG_FILE_PANEL_SAVE_CONSOLE_SELECTION: - printf("FilePanel: Save Console Selection\n"); + printf("FilePanel: Save console selection\n"); SaveConsole(message, true); break; case MSG_FILE_PANEL_SELECT_WEB_DIR: diff --git a/src/apps/poorman/constants.cpp b/src/apps/poorman/constants.cpp index 6c924dabd3..880baadf7f 100644 --- a/src/apps/poorman/constants.cpp +++ b/src/apps/poorman/constants.cpp @@ -6,27 +6,26 @@ // PoorMan Window extern const char* STR_APP_SIG = "application/x-vnd.Haiku.PoorMan"; - char* STR_APP_NAME +char* STR_APP_NAME = "PoorMan"; extern const char* STR_ERR_WEB_DIR - = "You have not yet selected the folder you want PoorMan " - "to publish on the Web. PoorMan can create a " - "\"public_html\" folder in your home folder or you can select " - "one of your own folders to publish.\n\n" - "Do you wish to select a folder to publish on the Web?"; + = "Please choose the folder to publish on the web.\n\n" + "You can have PoorMan create a default \"public_html\" " + "in your home folder.\n" + "Or you select one of your own folders instead."; extern const char* STR_ERR_CANT_START - = "Can't Start the Server"; + = "Cannot start the server"; extern const char* STR_DIR_CREATED - = "A default Web folder has been created for you " - "at \"/boot/home/public_html.\"\nMake sure an HTML " - "document named \"index.html\" is in that folder."; + = "A default web folder has been created " + "at \"/boot/home/public_html.\"\nMake sure there is a HTML " + "file named \"index.html\" in that folder."; extern const char* STR_MNU_FILE = "File"; extern const char* STR_MNU_FILE_SAVE_AS - = "Save Console As" B_UTF8_ELLIPSIS; + = "Save console as" B_UTF8_ELLIPSIS; extern const char* STR_MNU_FILE_SAVE_SELECTION - = "Save Console Selections As" B_UTF8_ELLIPSIS; + = "Save console selections as" B_UTF8_ELLIPSIS; extern const char* STR_MNU_FILE_ABOUT = "About PoorMan" B_UTF8_ELLIPSIS; extern const char* STR_MNU_FILE_QUIT @@ -36,83 +35,83 @@ extern const char* STR_MNU_EDIT extern const char* STR_MNU_EDIT_COPY = "Copy"; extern const char* STR_MNU_EDIT_SELECT_ALL - = "Select All"; + = "Select all"; extern const char* STR_MNU_EDIT_PREF = "Settings" B_UTF8_ELLIPSIS; extern const char* STR_MNU_CTRL = "Controls"; extern const char* STR_MNU_CTRL_RUN_SERVER - = "Run Server"; + = "Run server"; extern const char* STR_MNU_CTRL_CLEAR_HIT_COUNTER - = "Clear Hit Counter"; + = "Clear hit counter"; extern const char* STR_MNU_CTRL_CLEAR_CONSOLE - = "Clear Console Log"; + = "Clear console log"; extern const char* STR_MNU_CTRL_CLEAR_LOG_FILE - = "Clear Log File"; + = "Clear log file"; extern const char* STR_FILEPANEL_SAVE_CONSOLE - = "Save Log Console"; + = "Save log console"; extern const char* STR_FILEPANEL_SAVE_CONSOLE_SELECTION - = "Save Log Console Selection"; + = "Save log console selection"; extern const char* STR_TXT_VIEW - = "Logging View"; + = "Logging view"; // ------------------------------------------------------ // Preferences Window char* STR_WIN_NAME_PREF - = "PoorMan Settings"; + = "PoorMan settings"; extern const char* STR_SETTINGS_FILE_NAME - = "PoorMan Settings"; + = "PoorMan settings"; extern const char* STR_SETTINGS_NEW_FILE_NAME - = "OBOS PoorMan Settings"; + = "OBOS PoorMan settings"; extern const char* STR_DEFAULT_WEB_DIRECTORY - = "/boot/home/public_html"; + = "/boot/home/public_html"; extern const char* STR_TAB_SITE = "Site"; extern const char* STR_BBX_LOCATION - = "Web Site Location"; + = "Website location"; extern const char* STR_TXT_DIRECTORY - = "Web Folder:"; + = "Web folder:"; extern const char* STR_BTN_DIRECTORY - = "Select Web Folder"; + = "Select web folder"; extern const char* STR_TXT_INDEX - = "Start Page:"; + = "Start page:"; extern const char* STR_BBX_OPTIONS - = "Web Site Options"; + = "Website options"; extern const char* STR_CBX_DIR_LIST = "Send file listing if there's no start page"; extern const char* STR_CBX_DIR_LIST_LABEL = "Send file listing if there's no start page"; extern const char* STR_FILEPANEL_SELECT_WEB_DIR - = "Select Web Folder"; - + = "Select web folder"; + extern const char* STR_TAB_LOGGING = "Logging"; extern const char* STR_BBX_CONSOLE_LOGGING - = "Console Logging"; + = "Console logging"; extern const char* STR_CBX_LOG_CONSOLE - = "Log to Console"; + = "Log to console"; extern const char* STR_BBX_FILE_LOGGING - = "File Logging"; + = "File logging"; extern const char* STR_CBX_LOG_FILE - = "Log to File"; + = "Log to file"; extern const char* STR_TXT_LOG_FILE_NAME - = "Log File Name:"; + = "Log file name:"; extern const char* STR_BTN_CREATE_LOG_FILE - = "Create Log File"; + = "Create log file"; extern const char* STR_FILEPANEL_CREATE_LOG_FILE - = "Create Poor Man Log"; - + = "Create PoorMan log"; + extern const char* STR_TAB_ADVANCED = "Advanced"; extern const char* STR_BBX_CONNECTION - = "Connections Options"; + = "Connections"; extern const char* STR_SLD_LABEL - = "Max. Simultaneous Connections:"; + = "Max. simultaneous connections:"; char* STR_SLD_STATUS_LABEL = "connections"; - + extern const char CMD_FILE_SAVE_AS = 'S'; extern const char CMD_FILE_QUIT @@ -121,18 +120,18 @@ extern const char CMD_EDIT_COPY = 'C'; extern const char CMD_EDIT_SELECT_ALL = 'A'; - + extern const char* STR_ABOUT_TITLE = "About PoorMan"; extern const char* STR_ABOUT_BUTTON = "OK"; extern const char* STR_ABOUT_DESC - = "Poor Man's Web Server\n" + = "Poor Man's web server\n" "Copyright " B_UTF8_COPYRIGHT " 2004-2009 Haiku\n" "All rights reserved.\n\n" "Written by: Philip Harrison, Ma Jie"; - -// -------------------------------- + +// -------------------------------- extern const rgb_color WHITE = { 255, 255, 255, 255 }; extern const rgb_color GRAY = { 184, 184, 184, 255 }; extern const rgb_color BACKGROUND_COLOR = { 216, 216, 216, 255 }; diff --git a/src/apps/powerstatus/ExtendedInfoWindow.cpp b/src/apps/powerstatus/ExtendedInfoWindow.cpp index 74633f9df9..0aa33d2424 100644 --- a/src/apps/powerstatus/ExtendedInfoWindow.cpp +++ b/src/apps/powerstatus/ExtendedInfoWindow.cpp @@ -132,7 +132,7 @@ BatteryInfoView::_FillStringList() else if (fBatteryInfo.state & BATTERY_DISCHARGING) fontString->string = "Battery discharging"; else if (fBatteryInfo.state & BATTERY_CRITICAL_STATE) - fontString->string = "Empty Battery Slot"; + fontString->string = "Empty battery slot"; else fontString->string = "Battery unused"; @@ -143,13 +143,13 @@ BatteryInfoView::_FillStringList() _AddToStringList(fontString); fontString = new FontString; - fontString->string = "Last full Charge: "; + fontString->string = "Last full charge: "; fontString->string << fBatteryInfo.full_capacity; fontString->string << powerUnit; _AddToStringList(fontString); fontString = new FontString; - fontString->string = "Current Rate: "; + fontString->string = "Current rate: "; fontString->string << fBatteryInfo.current_rate; fontString->string << rateUnit; _AddToStringList(fontString); @@ -159,7 +159,7 @@ BatteryInfoView::_FillStringList() _AddToStringList(fontString); fontString = new FontString; - fontString->string = "Design Capacity: "; + fontString->string = "Design capacity: "; fontString->string << fBatteryExtendedInfo.design_capacity; fontString->string << powerUnit; _AddToStringList(fontString); @@ -175,37 +175,37 @@ BatteryInfoView::_FillStringList() _AddToStringList(fontString); fontString = new FontString; - fontString->string = "Design Voltage: "; + fontString->string = "Design voltage: "; fontString->string << fBatteryExtendedInfo.design_voltage; fontString->string << " mV"; _AddToStringList(fontString); fontString = new FontString; - fontString->string = "Design Capacity Warning: "; + fontString->string = "Design capacity warning: "; fontString->string << fBatteryExtendedInfo.design_capacity_warning; fontString->string << powerUnit; _AddToStringList(fontString); fontString = new FontString; - fontString->string = "Design Capacity low Warning: "; + fontString->string = "Design capacity low warning: "; fontString->string << fBatteryExtendedInfo.design_capacity_low; fontString->string << powerUnit; _AddToStringList(fontString); fontString = new FontString; - fontString->string = "Capacity Granularity 1: "; + fontString->string = "Capacity granularity 1: "; fontString->string << fBatteryExtendedInfo.capacity_granularity_1; fontString->string << powerUnit; _AddToStringList(fontString); fontString = new FontString; - fontString->string = "Capacity Granularity 2: "; + fontString->string = "Capacity granularity 2: "; fontString->string << fBatteryExtendedInfo.capacity_granularity_2; fontString->string << powerUnit; _AddToStringList(fontString); fontString = new FontString; - fontString->string = "Model Number: "; + fontString->string = "Model number: "; fontString->string << fBatteryExtendedInfo.model_number; _AddToStringList(fontString); @@ -220,7 +220,7 @@ BatteryInfoView::_FillStringList() _AddToStringList(fontString); fontString = new FontString; - fontString->string = "OEM Info: "; + fontString->string = "OEM info: "; fontString->string += fBatteryExtendedInfo.oem_info; _AddToStringList(fontString); @@ -325,7 +325,7 @@ ExtPowerStatusView::Update(bool force) ExtendedInfoWindow::ExtendedInfoWindow(PowerStatusDriverInterface* interface) : - BWindow(BRect(100, 150, 500, 500), "Extended Battery Info", B_TITLED_WINDOW, + BWindow(BRect(100, 150, 500, 500), "Extended battery info", B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_AVOID_FRONT | B_ASYNCHRONOUS_CONTROLS), fDriverInterface(interface), @@ -344,8 +344,8 @@ ExtendedInfoWindow::ExtendedInfoWindow(PowerStatusDriverInterface* interface) BRect rect = Bounds(); rect.InsetBy(5, 5); - BBox *infoBox = new BBox(rect, "Power Status Box"); - infoBox->SetLabel("Battery Info"); + BBox *infoBox = new BBox(rect, "Power status box"); + infoBox->SetLabel("Battery info"); BGroupLayout* infoLayout = new BGroupLayout(B_HORIZONTAL); infoLayout->SetInsets(10, infoBox->TopBorderOffset() * 2 + 10, 10, 10); infoLayout->SetSpacing(10); diff --git a/src/apps/powerstatus/PowerStatusView.cpp b/src/apps/powerstatus/PowerStatusView.cpp index b8e69d5929..f0a1407823 100644 --- a/src/apps/powerstatus/PowerStatusView.cpp +++ b/src/apps/powerstatus/PowerStatusView.cpp @@ -570,19 +570,19 @@ PowerStatusReplicant::MouseDown(BPoint point) menu->SetFont(be_plain_font); BMenuItem* item; - menu->AddItem(item = new BMenuItem("Show Text Label", + menu->AddItem(item = new BMenuItem("Show text label", new BMessage(kMsgToggleLabel))); if (fShowLabel) item->SetMarked(true); - menu->AddItem(item = new BMenuItem("Show Status Icon", + menu->AddItem(item = new BMenuItem("Show status icon", new BMessage(kMsgToggleStatusIcon))); if (fShowStatusIcon) item->SetMarked(true); - menu->AddItem(new BMenuItem(!fShowTime ? "Show Time" : "Show Percent", + menu->AddItem(new BMenuItem(!fShowTime ? "Show time" : "Show percent", new BMessage(kMsgToggleTime))); menu->AddSeparatorItem(); - menu->AddItem(new BMenuItem("Battery Info" B_UTF8_ELLIPSIS, + menu->AddItem(new BMenuItem("Battery info" B_UTF8_ELLIPSIS, new BMessage(kMsgToggleExtInfo))); menu->AddSeparatorItem(); @@ -601,7 +601,7 @@ PowerStatusReplicant::_AboutRequested() { BAlert* alert = new BAlert("about", "PowerStatus\n" "written by Axel Dörfler, Clemens Zeidler\n" - "Copyright 2006, Haiku, Inc.\n", "Ok"); + "Copyright 2006, Haiku, Inc.\n", "OK"); BTextView *view = alert->TextView(); BFont font; diff --git a/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp b/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp index c18d5c325a..b39f0c576f 100644 --- a/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp +++ b/src/apps/processcontroller/KernelMemoryBarMenuItem.cpp @@ -28,7 +28,7 @@ KernelMemoryBarMenuItem::KernelMemoryBarMenuItem(system_info& systemInfo) - : BMenuItem("System Resources & Caches" B_UTF8_ELLIPSIS, NULL) + : BMenuItem("System resources & caches" B_UTF8_ELLIPSIS, NULL) { fLastSum = -1; fGrenze1 = -1; diff --git a/src/apps/processcontroller/NoiseBarMenuItem.cpp b/src/apps/processcontroller/NoiseBarMenuItem.cpp index b230c73ee6..fc2202c19d 100644 --- a/src/apps/processcontroller/NoiseBarMenuItem.cpp +++ b/src/apps/processcontroller/NoiseBarMenuItem.cpp @@ -25,7 +25,7 @@ NoiseBarMenuItem::NoiseBarMenuItem() - : BMenuItem("Gone Teams" B_UTF8_ELLIPSIS, NULL) + : BMenuItem("Gone teams" B_UTF8_ELLIPSIS, NULL) { fBusyWaiting = -1; fLost = -1; diff --git a/src/apps/processcontroller/PriorityMenu.cpp b/src/apps/processcontroller/PriorityMenu.cpp index 879fb05d2a..e34dc32f3c 100644 --- a/src/apps/processcontroller/PriorityMenu.cpp +++ b/src/apps/processcontroller/PriorityMenu.cpp @@ -54,14 +54,14 @@ typedef struct { static PriorityRec priorities[] = { {"Idle", 0}, - {"Lowest Active", 1}, + {"Lowest active", 1}, {"Low", 5}, {"Normal", 10}, {"Display", 15}, - {"Urgent Display", 20}, - {"Real Time Display", 100}, + {"Urgent display", 20}, + {"Real-time display", 100}, {"Urgent", 110}, - {"Real Time", 120}, + {"Real-time", 120}, {"", -1} }; @@ -88,7 +88,7 @@ PriorityMenu::BuildMenu() message = new BMessage('PrTh'); message->AddInt32("thread", fThreadID); message->AddInt32("priority", priority->priority); - sprintf(name, "%s Priority [%d]", priority->name, (int)priority->priority); + sprintf(name, "%s priority [%d]", priority->name, (int)priority->priority); item = new BMenuItem(name, message); item->SetTarget(gPCView); if (fPriority == priority->priority) diff --git a/src/apps/processcontroller/ProcessController.cpp b/src/apps/processcontroller/ProcessController.cpp index 7cf4d8e59c..20b4b3bd96 100644 --- a/src/apps/processcontroller/ProcessController.cpp +++ b/src/apps/processcontroller/ProcessController.cpp @@ -1,7 +1,7 @@ /* ProcessController © 2000, Georges-Edouard Berenger, All Rights Reserved. Copyright (C) 2004 beunited.org - Copyright (c) 2006 Haiku, Inc. All Rights Reserved. + Copyright (c) 2006-2009, Haiku, Inc. All rights reserved. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -258,7 +258,7 @@ ProcessController::MessageReceived(BMessage *message) if (get_team_info(team, &infos.team_info) == B_OK) { get_team_name_and_icon(infos); sprintf(question, "Do you really want to kill the team \"%s\"?", infos.team_name); - alert = new BAlert("", question, "Cancel", "Yes, Kill this Team!", NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT); + alert = new BAlert("", question, "Cancel", "Yes, kill this team!", NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT); alert->SetShortcut(0, B_ESCAPE); if (alert->Go()) kill_team(team); @@ -275,7 +275,7 @@ ProcessController::MessageReceived(BMessage *message) if (get_thread_info(thread, &thinfo) == B_OK) { #if DEBUG_THREADS sprintf(question, "What do you want to do with the thread \"%s\"?", thinfo.name); - alert = new BAlert("", question, "Cancel", "Debug this Thread!", "Kill this thread!", B_WIDTH_AS_USUAL, B_STOP_ALERT); + alert = new BAlert("", question, "Cancel", "Debug this thread!", "Kill this thread!", B_WIDTH_AS_USUAL, B_STOP_ALERT); #define KILL 2 #else sprintf(question, "Are you sure you want to kill the thread \"%s\"?", thinfo.name); @@ -374,7 +374,7 @@ ProcessController::AboutRequested() BAlert *alert = new BAlert("about", "ProcessController\n\n" "Copyright 1997-2001,\n" "Georges-Edouard Berenger.\n\n" - "Copyright " B_UTF8_COPYRIGHT " 2007 Haiku, Inc.\n", "Close"); + "Copyright " B_UTF8_COPYRIGHT " 2007 Haiku, Inc.\n", "OK"); BTextView *view = alert->TextView(); BFont font; @@ -636,12 +636,12 @@ thread_popup(void *arg) popup->SetFont(be_plain_font); // Quit section - BMenu* QuitPopup = new QuitMenu("Quit an Application", infos, systemInfo.used_teams); + BMenu* QuitPopup = new QuitMenu("Quit an application", infos, systemInfo.used_teams); QuitPopup->SetFont(be_plain_font); popup->AddItem(QuitPopup); // Memory Usage section - MemoryBarMenu* MemoryPopup = new MemoryBarMenu("Memory Usage", infos, systemInfo); + MemoryBarMenu* MemoryPopup = new MemoryBarMenu("Memory usage", infos, systemInfo); int commitedMemory = int(systemInfo.used_pages * B_PAGE_SIZE / 1024); for (m = 0; m < systemInfo.used_teams; m++) { if (infos[m].team_info.team >= 0) { @@ -654,7 +654,7 @@ thread_popup(void *arg) addtopbottom(MemoryPopup); // CPU Load section - TeamBarMenu* CPUPopup = new TeamBarMenu("Threads and CPU Usage", infos, systemInfo.used_teams); + TeamBarMenu* CPUPopup = new TeamBarMenu("Threads and CPU usage", infos, systemInfo.used_teams); for (m = 0; m < systemInfo.used_teams; m++) { if (infos[m].team_info.team >= 0) { ThreadBarMenu* TeamPopup = new ThreadBarMenu(infos[m].team_name, infos[m].team_info.team, infos[m].team_info.thread_count); diff --git a/src/apps/pulse/ConfigView.cpp b/src/apps/pulse/ConfigView.cpp index c8cbb1c2cb..82a4144f58 100644 --- a/src/apps/pulse/ConfigView.cpp +++ b/src/apps/pulse/ConfigView.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 Haiku, Inc. All Rights Reserved. + * Copyright 2002-2009, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT license. * * Copyright 1999, Be Incorporated. All Rights Reserved. @@ -61,7 +61,7 @@ ConfigView::ConfigView(BRect rect, const char *name, uint32 mode, BMessenger& ta fActiveButton = fIdleButton = fFrameButton = NULL; fIconWidthControl = NULL; - SetLabel("Bar Colors"); + SetLabel("Bar colors"); font_height fontHeight; be_bold_font->GetHeight(&fontHeight); diff --git a/src/apps/pulse/DeskbarPulseView.cpp b/src/apps/pulse/DeskbarPulseView.cpp index 57ac1cf241..11ccc51627 100644 --- a/src/apps/pulse/DeskbarPulseView.cpp +++ b/src/apps/pulse/DeskbarPulseView.cpp @@ -26,30 +26,30 @@ DeskbarPulseView::DeskbarPulseView(BRect rect) : MiniPulseView(rect, "DeskbarPul } DeskbarPulseView::DeskbarPulseView(BMessage *message) : MiniPulseView(message) { - mode1->SetLabel("Normal Mode"); + mode1->SetLabel("Normal mode"); mode1->SetMessage(new BMessage(PV_NORMAL_MODE)); - mode2->SetLabel("Mini Mode"); + mode2->SetLabel("Mini mode"); mode2->SetMessage(new BMessage(PV_MINI_MODE)); quit = new BMenuItem("Quit", new BMessage(PV_QUIT), 0, 0); popupmenu->AddSeparatorItem(); popupmenu->AddItem(quit); - + SetViewColor(B_TRANSPARENT_COLOR); - + prefs = new Prefs(); active_color.red = (prefs->deskbar_active_color & 0xff000000) >> 24; active_color.green = (prefs->deskbar_active_color & 0x00ff0000) >> 16; active_color.blue = (prefs->deskbar_active_color & 0x0000ff00) >> 8; - + idle_color.red = (prefs->deskbar_idle_color & 0xff000000) >> 24; idle_color.green = (prefs->deskbar_idle_color & 0x00ff0000) >> 16; idle_color.blue = (prefs->deskbar_idle_color & 0x0000ff00) >> 8; - + frame_color.red = (prefs->deskbar_frame_color & 0xff000000) >> 24; frame_color.green = (prefs->deskbar_frame_color & 0x00ff0000) >> 16; frame_color.blue = (prefs->deskbar_frame_color & 0x0000ff00) >> 8; SetViewColor(idle_color); - + messagerunner = NULL; prefswindow = NULL; } @@ -61,7 +61,7 @@ void DeskbarPulseView::AttachedToWindow() { preferences->SetTarget(messenger); about->SetTarget(messenger); quit->SetTarget(messenger); - + system_info sys_info; get_system_info(&sys_info); if (sys_info.cpu_count >= 2) { @@ -69,7 +69,7 @@ void DeskbarPulseView::AttachedToWindow() { cpu_menu_items[x]->SetTarget(messenger); } } - + // Use a BMessageRunner to deliver periodic messsages instead // of Pulse() events from the Deskbar - this is to avoid changing // the current pulse rate and affecting other replicants @@ -82,7 +82,7 @@ void DeskbarPulseView::MouseDown(BPoint point) { uint32 buttons; MakeFocus(true); GetMouse(&cursor, &buttons, true); - + if (buttons & B_PRIMARY_MOUSE_BUTTON) { BMessage *message = Window()->CurrentMessage(); int32 clicks = message->FindInt32("clicks"); @@ -113,12 +113,13 @@ void DeskbarPulseView::MessageReceived(BMessage *message) { prefswindow->Activate(true); break; } - prefswindow = new PrefsWindow(prefs->prefs_window_rect, "Pulse Preferences", - new BMessenger(this), prefs); + prefswindow = new PrefsWindow(prefs->prefs_window_rect, + "Pulse settings", new BMessenger(this), prefs); prefswindow->Show(); break; case PV_ABOUT: { - BAlert *alert = new BAlert("Info", "Pulse\n\nBy David Ramsey and Arve Hjønnevåg\nRevised by Daniel Switkin", "OK"); + BAlert *alert = new BAlert("Info", "Pulse\n\nBy David Ramsey and " + "Arve Hjønnevåg\nRevised by Daniel Switkin", "OK"); alert->Go(NULL); break; } diff --git a/src/apps/pulse/MiniPulseView.cpp b/src/apps/pulse/MiniPulseView.cpp index 8ff3b71bd0..d5637189fc 100644 --- a/src/apps/pulse/MiniPulseView.cpp +++ b/src/apps/pulse/MiniPulseView.cpp @@ -15,9 +15,9 @@ MiniPulseView::MiniPulseView(BRect rect, const char *name, Prefs *prefs) : PulseView(rect, name) { - mode1->SetLabel("Normal Mode"); + mode1->SetLabel("Normal mode"); mode1->SetMessage(new BMessage(PV_NORMAL_MODE)); - mode2->SetLabel("Deskbar Mode"); + mode2->SetLabel("Deskbar mode"); mode2->SetMessage(new BMessage(PV_DESKBAR_MODE)); quit = new BMenuItem("Quit", new BMessage(PV_QUIT), 0, 0); popupmenu->AddSeparatorItem(); diff --git a/src/apps/pulse/NormalPulseView.cpp b/src/apps/pulse/NormalPulseView.cpp index 38aceff56e..9f4f863d4e 100644 --- a/src/apps/pulse/NormalPulseView.cpp +++ b/src/apps/pulse/NormalPulseView.cpp @@ -50,9 +50,9 @@ NormalPulseView::NormalPulseView(BRect rect) SetViewColor(color); SetLowColor(color); - mode1->SetLabel("Mini Mode"); + mode1->SetLabel("Mini mode"); mode1->SetMessage(new BMessage(PV_MINI_MODE)); - mode2->SetLabel("Deskbar Mode"); + mode2->SetLabel("Deskbar mode"); mode2->SetMessage(new BMessage(PV_DESKBAR_MODE)); DetermineVendorAndProcessor(); @@ -69,7 +69,7 @@ NormalPulseView::NormalPulseView(BRect rect) BRect r(PROGRESS_MLEFT, PROGRESS_MTOP + ITEM_OFFSET * x, PROGRESS_MLEFT + ProgressBar::PROGRESS_WIDTH, PROGRESS_MTOP + ITEM_OFFSET * x + ProgressBar::PROGRESS_HEIGHT); - fProgressBars[x] = new ProgressBar(r, "CPU Progress Bar"); + fProgressBars[x] = new ProgressBar(r, "CPU progress bar"); AddChild(fProgressBars[x]); r.Set(CPUBUTTON_MLEFT, CPUBUTTON_MTOP + ITEM_OFFSET * x, diff --git a/src/apps/pulse/PrefsWindow.cpp b/src/apps/pulse/PrefsWindow.cpp index a1c5fee855..15846a7ccc 100644 --- a/src/apps/pulse/PrefsWindow.cpp +++ b/src/apps/pulse/PrefsWindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006 Haiku, Inc. All Rights Reserved. + * Copyright 2002-2009, Haiku, Inc. All Rights Reserved. * Distributed under the terms of the MIT license. * * Copyright 1999, Be Incorporated. All Rights Reserved. @@ -43,15 +43,15 @@ PrefsWindow::PrefsWindow(BRect frame, const char *name, BMessenger *messenger, P BRect rect = fTabView->ContainerView()->Bounds(); rect.InsetBy(5, 5); - ConfigView *normalView = new ConfigView(rect, "Normal Mode", + ConfigView *normalView = new ConfigView(rect, "Normal mode", PRV_NORMAL_CHANGE_COLOR, fTarget, prefs); fTabView->AddTab(normalView); - ConfigView *miniView = new ConfigView(rect, "Mini Mode", PRV_MINI_CHANGE_COLOR, + ConfigView *miniView = new ConfigView(rect, "Mini mode", PRV_MINI_CHANGE_COLOR, fTarget, prefs); fTabView->AddTab(miniView); - - ConfigView *deskbarView = new ConfigView(rect, "Deskbar Mode", PRV_DESKBAR_CHANGE_COLOR, + + ConfigView *deskbarView = new ConfigView(rect, "Deskbar mode", PRV_DESKBAR_CHANGE_COLOR, fTarget, prefs); fTabView->AddTab(deskbarView); @@ -102,7 +102,7 @@ PrefsWindow::MessageReceived(BMessage *message) Hide(); fTabView->Select(2); - ConfigView *deskbar = (ConfigView *)FindView("Deskbar Mode"); + ConfigView *deskbar = (ConfigView *)FindView("Deskbar mode"); deskbar->UpdateDeskbarIconWidth(); PostMessage(B_QUIT_REQUESTED); diff --git a/src/apps/pulse/PulseView.cpp b/src/apps/pulse/PulseView.cpp index d62b2aa5e9..afe155b5ca 100644 --- a/src/apps/pulse/PulseView.cpp +++ b/src/apps/pulse/PulseView.cpp @@ -50,7 +50,7 @@ void PulseView::Init() { popupmenu->SetFont(be_plain_font); mode1 = new BMenuItem("", NULL, 0, 0); mode2 = new BMenuItem("", NULL, 0, 0); - preferences = new BMenuItem("Preferences" B_UTF8_ELLIPSIS, new BMessage(PV_PREFERENCES), 0, 0); + preferences = new BMenuItem("Settings" B_UTF8_ELLIPSIS, new BMessage(PV_PREFERENCES), 0, 0); about = new BMenuItem("About Pulse" B_UTF8_ELLIPSIS, new BMessage(PV_ABOUT), 0, 0); popupmenu->AddItem(mode1); diff --git a/src/apps/pulse/PulseWindow.cpp b/src/apps/pulse/PulseWindow.cpp index 16a7d49aba..0a9da1dc35 100644 --- a/src/apps/pulse/PulseWindow.cpp +++ b/src/apps/pulse/PulseWindow.cpp @@ -89,7 +89,7 @@ PulseWindow::MessageReceived(BMessage *message) // Otherwise launch a new preferences window PulseApp *pulseapp = (PulseApp *)be_app; fPrefsWindow = new PrefsWindow(pulseapp->prefs->prefs_window_rect, - "Pulse Preferences", new BMessenger(this), pulseapp->prefs); + "Pulse settings", new BMessenger(this), pulseapp->prefs); fPrefsWindow->Show(); break; } diff --git a/src/apps/screenshot/ScreenshotWindow.cpp b/src/apps/screenshot/ScreenshotWindow.cpp index d3999e68de..3d44807242 100644 --- a/src/apps/screenshot/ScreenshotWindow.cpp +++ b/src/apps/screenshot/ScreenshotWindow.cpp @@ -89,7 +89,7 @@ ScreenshotWindow::ScreenshotWindow(bigtime_t delay, bool includeBorder, bool includeMouse, bool grabActiveWindow, bool showConfigWindow, bool saveScreenshotSilent, int32 imageFileType, int32 translator) : - BWindow(BRect(0, 0, 200.0, 100.0), "Take Screenshot", B_TITLED_WINDOW, + BWindow(BRect(0, 0, 200.0, 100.0), "Retake screenshot", B_TITLED_WINDOW, B_NOT_ZOOMABLE | B_NOT_RESIZABLE | B_QUIT_ON_WINDOW_CLOSE | B_AVOID_FRONT | B_AUTO_UPDATE_SIZE_LIMITS | B_CLOSE_ON_ESCAPE), fDelayControl(NULL), @@ -155,7 +155,7 @@ ScreenshotWindow::MessageReceived(BMessage* message) BCardLayout* layout = dynamic_cast (GetLayout()); if (layout) layout->SetVisibleItem(1L); - SetTitle("Save Screenshot"); + SetTitle("Save screenshot"); break; } @@ -314,10 +314,10 @@ ScreenshotWindow::_SetupFirstLayoutItem(BCardLayout* layout) BBox* divider = new BBox(B_FANCY_BORDER, NULL); divider->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, 1)); - fBackToSave = new BButton("", "Back to save", new BMessage(kBackToSave)); + fBackToSave = new BButton("", "Back to saving", new BMessage(kBackToSave)); fBackToSave->SetEnabled(false); - fTakeScreenshot = new BButton("", "Take Screenshot", + fTakeScreenshot = new BButton("", "Take screenshot", new BMessage(kTakeScreenshot)); layout->AddView(0, BGroupLayoutBuilder(B_VERTICAL) @@ -553,7 +553,7 @@ ScreenshotWindow::_UpdatePreviewPanel() if (layout) layout->SetVisibleItem(1L); - SetTitle("Save Screenshot"); + SetTitle("Save screenshot"); } diff --git a/src/apps/showimage/PrintOptionsWindow.cpp b/src/apps/showimage/PrintOptionsWindow.cpp index cf28898ab1..cac4147aa7 100644 --- a/src/apps/showimage/PrintOptionsWindow.cpp +++ b/src/apps/showimage/PrintOptionsWindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2003-2009 Haiku Inc. All rights reserved. + * Copyright 2003-2009, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. * * Authors: @@ -63,16 +63,16 @@ PrintOptions::SetWidth(float w) void PrintOptions::SetHeight(float h) { - fWidth = (fBounds.Width()+1) * h / (fBounds.Height()+1); + fWidth = (fBounds.Width()+1) * h / (fBounds.Height()+1); fHeight = h; } PrintOptionsWindow::PrintOptionsWindow(BPoint at, PrintOptions *options, BWindow* listener) - : - BWindow(BRect(at.x, at.y, at.x + 300, at.y + 200), "Print Options", - B_TITLED_WINDOW_LOOK, B_MODAL_SUBSET_WINDOW_FEEL, + : + BWindow(BRect(at.x, at.y, at.x + 300, at.y + 200), "Print options", + B_TITLED_WINDOW_LOOK, B_MODAL_SUBSET_WINDOW_FEEL, B_NOT_ZOOMABLE | B_NOT_RESIZABLE), fPrintOptions(options), fCurrentOptions(*options), @@ -123,7 +123,7 @@ PrintOptionsWindow::AddTextControl(BView* view, BPoint& at, const char* name, text->SetAlignment(B_ALIGN_LEFT, B_ALIGN_RIGHT); SetValue(text, value); at.y += text->Bounds().Height() + kLineSkip; - return text; + return text; } @@ -137,16 +137,16 @@ PrintOptionsWindow::Setup() BRadioButton* rb; BBox* line; BButton* button; - - BBox *panel = new BBox(rect, "top_panel", B_FOLLOW_ALL, + + BBox *panel = new BBox(rect, "top_panel", B_FOLLOW_ALL, B_WILL_DRAW | B_FRAME_EVENTS | B_NAVIGABLE_JUMP, B_PLAIN_BORDER); AddChild(panel); - - AddRadioButton(panel, at, "fit_to_page", "Fit Image to Page", + + AddRadioButton(panel, at, "fit_to_page", "Fit image to page", kMsgFitToPageSelected, op == PrintOptions::kFitToPage); textAt = at; - rb = AddRadioButton(panel, at, "zoom_factor", "Zoom Factor in %: ", + rb = AddRadioButton(panel, at, "zoom_factor", "Zoom factor in %: ", kMsgZoomFactorSelected, op == PrintOptions::kZoomFactor); textAt.x = rb->Bounds().right + 5; fZoomFactor = AddTextControl(panel, textAt, "zoom_factor_text", "", @@ -160,10 +160,10 @@ PrintOptionsWindow::Setup() 0, kMsgDPIChanged); rb = AddRadioButton(panel, at, "width_and_height", - "Resize To (in 1/72 Inches):", kMsgWidthAndHeightSelected, - op == PrintOptions::kWidth || op == PrintOptions::kHeight); + "Resize to (in 1/72 inches):", kMsgWidthAndHeightSelected, + op == PrintOptions::kWidth || op == PrintOptions::kHeight); at.x += 15; - textAt = at; + textAt = at; fWidth = AddTextControl(panel, textAt, "width", "Width: ", fCurrentOptions.Width(), 40, kMsgWidthChanged); textAt = at; @@ -176,10 +176,10 @@ PrintOptionsWindow::Setup() line = new BBox(BRect(rect.left+3, at.y, rect.right-3, at.y + 1), NULL, B_FOLLOW_LEFT | B_FOLLOW_TOP); panel->AddChild(line); - + at.y += 10; rect.OffsetBy(at); - button = new BButton(rect, "job setup", "Job Setup", + button = new BButton(rect, "job setup", "Job setup", new BMessage(kMsgJobSetup)); panel->AddChild(button); button->ResizeToPreferred(); @@ -189,7 +189,7 @@ PrintOptionsWindow::Setup() // resize window ResizeTo(fHeight->Frame().right + kIndent, button->Frame().bottom + kIndent); - // center button + // center button button->MoveTo((Bounds().Width()-button->Bounds().Width())/2, button->Frame().top); } @@ -241,7 +241,7 @@ PrintOptionsWindow::MessageReceived(BMessage* msg) case kMsgWidthAndHeightSelected: fCurrentOptions.SetOption(MsgToOption(msg->what)); break; - + case kMsgZoomFactorChanged: if (GetValue(fZoomFactor, &value) && fCurrentOptions.ZoomFactor() != value) { @@ -253,7 +253,7 @@ PrintOptionsWindow::MessageReceived(BMessage* msg) if (GetValue(fDPI, &value) && fCurrentOptions.DPI() != value) { fCurrentOptions.SetDPI(value); SetValue(fZoomFactor, 100*fCurrentOptions.ZoomFactor()); - } + } break; case kMsgWidthChanged: if (GetValue(fWidth, &value) && fCurrentOptions.Width() != value) { @@ -267,13 +267,13 @@ PrintOptionsWindow::MessageReceived(BMessage* msg) SetValue(fWidth, fCurrentOptions.Width()); } break; - + case kMsgJobSetup: *fPrintOptions = fCurrentOptions; fStatus = B_OK; PostMessage(B_QUIT_REQUESTED); break; - + default: BWindow::MessageReceived(msg); } diff --git a/src/apps/showimage/ProgressWindow.cpp b/src/apps/showimage/ProgressWindow.cpp index 8cfc40d2c8..6762ac155e 100644 --- a/src/apps/showimage/ProgressWindow.cpp +++ b/src/apps/showimage/ProgressWindow.cpp @@ -21,7 +21,7 @@ static const uint32 kMsgShow = 'show'; ProgressWindow::ProgressWindow(BWindow* referenceWindow, bool center) : - BWindow(BRect(0, 0, 250, 100), "Progress Monitor", + BWindow(BRect(0, 0, 250, 100), "Progress monitor", B_MODAL_WINDOW_LOOK, B_FLOATING_APP_WINDOW_FEEL, B_NOT_ZOOMABLE | B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS), fRunner(NULL) diff --git a/src/apps/showimage/ResizerWindow.cpp b/src/apps/showimage/ResizerWindow.cpp index 8ad58c660d..0659fda4cf 100644 --- a/src/apps/showimage/ResizerWindow.cpp +++ b/src/apps/showimage/ResizerWindow.cpp @@ -28,7 +28,7 @@ static const char* kWidthLabel = "Width:"; static const char* kHeightLabel = "Height:"; -static const char* kKeepAspectRatioLabel = "Keep Original Proportions"; +static const char* kKeepAspectRatioLabel = "Keep original proportions"; static const char* kApplyLabel = "Apply"; static const float kLineDistance = 5; diff --git a/src/apps/showimage/ShowImageView.cpp b/src/apps/showimage/ShowImageView.cpp index e838273d74..9349a2fc36 100644 --- a/src/apps/showimage/ShowImageView.cpp +++ b/src/apps/showimage/ShowImageView.cpp @@ -1261,7 +1261,7 @@ ShowImageView::SaveToFile(BDirectory* dir, const char* name, BBitmap* bitmap, // If loop terminated because of a break, there was an error BString errText; errText << "Sorry, the file '" << name << "' could not be written."; - BAlert *palert = new BAlert(NULL, errText.String(), "Ok"); + BAlert *palert = new BAlert(NULL, errText.String(), "OK"); palert->Go(); } diff --git a/src/apps/showimage/ShowImageWindow.cpp b/src/apps/showimage/ShowImageWindow.cpp index b90446d470..6ed2b6e962 100644 --- a/src/apps/showimage/ShowImageWindow.cpp +++ b/src/apps/showimage/ShowImageWindow.cpp @@ -247,9 +247,9 @@ ShowImageWindow::BuildContextMenu(BMenu *menu) void ShowImageWindow::_BuildViewMenu(BMenu *menu, bool popupMenu) { - _AddItemMenu(menu, "Slide Show", MSG_SLIDE_SHOW, 0, 0, this); + _AddItemMenu(menu, "Slide show", MSG_SLIDE_SHOW, 0, 0, this); _MarkMenuItem(menu, MSG_SLIDE_SHOW, fImageView->SlideShowStarted()); - BMenu* delayMenu = new BMenu("Slide Delay"); + BMenu* delayMenu = new BMenu("Slide delay"); if (fSlideShowDelay == NULL) fSlideShowDelay = delayMenu; @@ -258,38 +258,38 @@ ShowImageWindow::_BuildViewMenu(BMenu *menu, bool popupMenu) // if slide show delay is too short! (Especially if loading the image // takes as long as or longer than the slide show delay). Should load // in background thread! - _AddDelayItem(delayMenu, "Three Seconds", 3); - _AddDelayItem(delayMenu, "Four Second", 4); - _AddDelayItem(delayMenu, "Five Seconds", 5); - _AddDelayItem(delayMenu, "Six Seconds", 6); - _AddDelayItem(delayMenu, "Seven Seconds", 7); - _AddDelayItem(delayMenu, "Eight Seconds", 8); - _AddDelayItem(delayMenu, "Nine Seconds", 9); - _AddDelayItem(delayMenu, "Ten Seconds", 10); - _AddDelayItem(delayMenu, "Twenty Seconds", 20); + _AddDelayItem(delayMenu, "3 seconds", 3); + _AddDelayItem(delayMenu, "4 seconds", 4); + _AddDelayItem(delayMenu, "5 seconds", 5); + _AddDelayItem(delayMenu, "6 seconds", 6); + _AddDelayItem(delayMenu, "7 seconds", 7); + _AddDelayItem(delayMenu, "8 seconds", 8); + _AddDelayItem(delayMenu, "9 seconds", 9); + _AddDelayItem(delayMenu, "10 seconds", 10); + _AddDelayItem(delayMenu, "20 seconds", 20); menu->AddItem(delayMenu); menu->AddSeparatorItem(); - _AddItemMenu(menu, "Original Size", MSG_ORIGINAL_SIZE, '1', 0, this); - _AddItemMenu(menu, "Zoom In", MSG_ZOOM_IN, '+', 0, this); - _AddItemMenu(menu, "Zoom Out", MSG_ZOOM_OUT, '-', 0, this); + _AddItemMenu(menu, "Original size", MSG_ORIGINAL_SIZE, '1', 0, this); + _AddItemMenu(menu, "Zoom in", MSG_ZOOM_IN, '+', 0, this); + _AddItemMenu(menu, "Zoom out", MSG_ZOOM_OUT, '-', 0, this); menu->AddSeparatorItem(); - _AddItemMenu(menu, "High-Quality Zooming", MSG_SCALE_BILINEAR, 0, 0, this); + _AddItemMenu(menu, "High-quality zooming", MSG_SCALE_BILINEAR, 0, 0, this); menu->AddSeparatorItem(); - _AddItemMenu(menu, "Shrink to Window", MSG_SHRINK_TO_WINDOW, 0, 0, this); - _AddItemMenu(menu, "Zoom to Window", MSG_ZOOM_TO_WINDOW, 0, 0, this); + _AddItemMenu(menu, "Shrink to window", MSG_SHRINK_TO_WINDOW, 0, 0, this); + _AddItemMenu(menu, "Zoom to window", MSG_ZOOM_TO_WINDOW, 0, 0, this); menu->AddSeparatorItem(); - _AddItemMenu(menu, "Full Screen", MSG_FULL_SCREEN, B_ENTER, 0, this); + _AddItemMenu(menu, "Full screen", MSG_FULL_SCREEN, B_ENTER, 0, this); _MarkMenuItem(menu, MSG_FULL_SCREEN, fFullScreen); - _AddItemMenu(menu, "Show Caption in Full Screen Mode", MSG_SHOW_CAPTION, 0, + _AddItemMenu(menu, "Show caption in full screen mode", MSG_SHOW_CAPTION, 0, 0, this); _MarkMenuItem(menu, MSG_SHOW_CAPTION, fShowCaption); @@ -309,7 +309,7 @@ ShowImageWindow::_BuildViewMenu(BMenu *menu, bool popupMenu) if (popupMenu) { menu->AddSeparatorItem(); - _AddItemMenu(menu, "Use as Background", MSG_DESKTOP_BACKGROUND, 0, 0, + _AddItemMenu(menu, "Use as background" B_UTF8_ELLIPSIS, MSG_DESKTOP_BACKGROUND, 0, 0, this); } } @@ -326,14 +326,14 @@ ShowImageWindow::AddMenus(BMenuBar *bar) fOpenMenu->Superitem()->SetTarget(be_app); fOpenMenu->Superitem()->SetShortcut('O', 0); menu->AddSeparatorItem(); - BMenu *pmenuSaveAs = new BMenu("Save As" B_UTF8_ELLIPSIS, B_ITEMS_IN_COLUMN); + BMenu *pmenuSaveAs = new BMenu("Save as" B_UTF8_ELLIPSIS, B_ITEMS_IN_COLUMN); BTranslationUtils::AddTranslationItems(pmenuSaveAs, B_TRANSLATOR_BITMAP); // Fill Save As submenu with all types that can be converted // to from the Be bitmap image format menu->AddItem(pmenuSaveAs); _AddItemMenu(menu, "Close", B_QUIT_REQUESTED, 'W', 0, this); menu->AddSeparatorItem(); - _AddItemMenu(menu, "Page Setup" B_UTF8_ELLIPSIS, MSG_PAGE_SETUP, 0, 0, this); + _AddItemMenu(menu, "Page setup" B_UTF8_ELLIPSIS, MSG_PAGE_SETUP, 0, 0, this); _AddItemMenu(menu, "Print" B_UTF8_ELLIPSIS, MSG_PREPARE_PRINT, 'P', 0, this); menu->AddSeparatorItem(); _AddItemMenu(menu, "About ShowImage" B_UTF8_ELLIPSIS, B_ABOUT_REQUESTED, 0, 0, @@ -350,36 +350,36 @@ ShowImageWindow::AddMenus(BMenuBar *bar) _AddItemMenu(menu, "Paste", B_PASTE, 'V', 0, this, false); _AddItemMenu(menu, "Clear", MSG_CLEAR_SELECT, 0, 0, this, false); menu->AddSeparatorItem(); - _AddItemMenu(menu, "Select All", MSG_SELECT_ALL, 'A', 0, this); + _AddItemMenu(menu, "Select all", MSG_SELECT_ALL, 'A', 0, this); bar->AddItem(menu); menu = fBrowseMenu = new BMenu("Browse"); - _AddItemMenu(menu, "First Page", MSG_PAGE_FIRST, B_LEFT_ARROW, B_SHIFT_KEY, this); - _AddItemMenu(menu, "Last Page", MSG_PAGE_LAST, B_RIGHT_ARROW, B_SHIFT_KEY, this); - _AddItemMenu(menu, "Previous Page", MSG_PAGE_PREV, B_LEFT_ARROW, 0, this); - _AddItemMenu(menu, "Next Page", MSG_PAGE_NEXT, B_RIGHT_ARROW, 0, this); - fGoToPageMenu = new BMenu("Go to Page"); + _AddItemMenu(menu, "First page", MSG_PAGE_FIRST, B_LEFT_ARROW, B_SHIFT_KEY, this); + _AddItemMenu(menu, "Last page", MSG_PAGE_LAST, B_RIGHT_ARROW, B_SHIFT_KEY, this); + _AddItemMenu(menu, "Previous page", MSG_PAGE_PREV, B_LEFT_ARROW, 0, this); + _AddItemMenu(menu, "Next page", MSG_PAGE_NEXT, B_RIGHT_ARROW, 0, this); + fGoToPageMenu = new BMenu("Go to page"); fGoToPageMenu->SetRadioMode(true); menu->AddItem(fGoToPageMenu); menu->AddSeparatorItem(); - _AddItemMenu(menu, "Previous File", MSG_FILE_PREV, B_UP_ARROW, 0, this); - _AddItemMenu(menu, "Next File", MSG_FILE_NEXT, B_DOWN_ARROW, 0, this); + _AddItemMenu(menu, "Previous file", MSG_FILE_PREV, B_UP_ARROW, 0, this); + _AddItemMenu(menu, "Next file", MSG_FILE_NEXT, B_DOWN_ARROW, 0, this); bar->AddItem(menu); menu = new BMenu("Image"); - _AddItemMenu(menu, "Rotate Clockwise", MSG_ROTATE_90, 'R', 0, this); - _AddItemMenu(menu, "Rotate Counterclockwise", MSG_ROTATE_270, 'R', B_SHIFT_KEY, this); + _AddItemMenu(menu, "Rotate clockwise", MSG_ROTATE_90, 'R', 0, this); + _AddItemMenu(menu, "Rotate counterclockwise", MSG_ROTATE_270, 'R', B_SHIFT_KEY, this); menu->AddSeparatorItem(); - _AddItemMenu(menu, "Flip Left to Right", MSG_FLIP_LEFT_TO_RIGHT, 0, 0, this); - _AddItemMenu(menu, "Flip Top to Bottom", MSG_FLIP_TOP_TO_BOTTOM, 0, 0, this); + _AddItemMenu(menu, "Flip left to right", MSG_FLIP_LEFT_TO_RIGHT, 0, 0, this); + _AddItemMenu(menu, "Flip top to bottom", MSG_FLIP_TOP_TO_BOTTOM, 0, 0, this); menu->AddSeparatorItem(); - _AddItemMenu(menu, "Invert Colors", MSG_INVERT, 0, 0, this); + _AddItemMenu(menu, "Invert colors", MSG_INVERT, 0, 0, this); menu->AddSeparatorItem(); fResizeItem = _AddItemMenu(menu, "Resize" B_UTF8_ELLIPSIS, MSG_OPEN_RESIZER_WINDOW, 0, 0, this); bar->AddItem(menu); menu->AddSeparatorItem(); - _AddItemMenu(menu, "Use as Background", MSG_DESKTOP_BACKGROUND, 0, 0, + _AddItemMenu(menu, "Use as background" B_UTF8_ELLIPSIS, MSG_DESKTOP_BACKGROUND, 0, 0, this); } diff --git a/src/apps/soundrecorder/RecorderWindow.cpp b/src/apps/soundrecorder/RecorderWindow.cpp index 2eb93179e5..2a4642f34e 100644 --- a/src/apps/soundrecorder/RecorderWindow.cpp +++ b/src/apps/soundrecorder/RecorderWindow.cpp @@ -379,14 +379,14 @@ RecorderWindow::InitWindow() r.InsetBy(10, 8); r.top -= 1; fFileInfoBox = new BBox(r, "fileinfo", B_FOLLOW_LEFT | B_FOLLOW_BOTTOM); - fFileInfoBox->SetLabel("File Info"); + fFileInfoBox->SetLabel("File info"); r = fFileInfoBox->Bounds(); r.left = 8; r.top = 13; r.bottom = r.top + 15; r.right -= 10; - fFilename = new BStringView(r, "filename", "File Name:"); + fFilename = new BStringView(r, "filename", "File name:"); fFileInfoBox->AddChild(fFilename); r.top += 13; r.bottom = r.top + 15; @@ -402,11 +402,11 @@ RecorderWindow::InitWindow() fFileInfoBox->AddChild(fChannels); r.top += 13; r.bottom = r.top + 15; - fSampleSize = new BStringView(r, "samplesize", "Sample Size:"); + fSampleSize = new BStringView(r, "samplesize", "Sample size:"); fFileInfoBox->AddChild(fSampleSize); r.top += 13; r.bottom = r.top + 15; - fSampleRate = new BStringView(r, "samplerate", "Sample Rate:"); + fSampleRate = new BStringView(r, "samplerate", "Sample rate:"); fFileInfoBox->AddChild(fSampleRate); r.top += 13; r.bottom = r.top + 15; @@ -429,7 +429,7 @@ RecorderWindow::InitWindow() WINDOW((stderr, "dropped %ld inputs\n", real_count - max_input_count)); real_count = max_input_count; } - char selected_name[B_MEDIA_NAME_LENGTH] = "Default Input"; + char selected_name[B_MEDIA_NAME_LENGTH] = "Default input"; BMessage * msg; BMenuItem * item; for (int i = 0; i < real_count; i++) { @@ -1093,7 +1093,7 @@ RecorderWindow::UpdatePlayFile(SoundListItem* item, bool updateDisplay) if (!updateDisplay) return B_OK; - BString filename = "File Name: "; + BString filename = "File name: "; filename << ref.name; fFilename->SetText(filename.String()); @@ -1111,9 +1111,9 @@ RecorderWindow::UpdatePlayFile(SoundListItem* item, bool updateDisplay) } BString channels = "Channels: "; channels << fPlayFormat.u.raw_audio.channel_count; - BString samplesize = "Sample Size: "; + BString samplesize = "Sample size: "; samplesize << 8 * (fPlayFormat.u.raw_audio.format & 0xf) << " bits"; - BString samplerate = "Sample Rate: "; + BString samplerate = "Sample rate: "; samplerate << (int)fPlayFormat.u.raw_audio.frame_rate; BString durationString = "Duration: "; bigtime_t duration = fPlayTrack->Duration(); @@ -1302,7 +1302,7 @@ RecorderWindow::RefsReceived(BMessage *msg) } if (countBad > 0 && countGood == 0) - (new BAlert("Nothing to Play", "None of the files appear to be " + (new BAlert("Nothing to play", "None of the files appear to be " "audio files", "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go(); else if (countGood > 0) { if (countBad > 0) diff --git a/src/apps/soundrecorder/SoundListView.cpp b/src/apps/soundrecorder/SoundListView.cpp index f03304dac8..49af40b2bf 100644 --- a/src/apps/soundrecorder/SoundListView.cpp +++ b/src/apps/soundrecorder/SoundListView.cpp @@ -29,19 +29,19 @@ SoundListView::Draw(BRect updateRect) if (IsEmpty()) { SetHighColor(235,235,235); FillRect(Bounds()); - - SetHighColor(0,0,0); + + SetHighColor(0,0,0); BFont font(be_bold_font); font.SetSize(12.0); SetFont(&font); font_height height; font.GetHeight(&height); - float width = font.StringWidth("Drop Files Here"); - + float width = font.StringWidth("Drop files here"); + BPoint pt; pt.x = (Bounds().Width() - width) / 2; pt.y = (Bounds().Height() + height.ascent + height.descent)/ 2; - DrawString("Drop Files Here", pt); + DrawString("Drop files here", pt); } BListView::Draw(updateRect); } @@ -57,7 +57,7 @@ SoundListView::AttachedToWindow() SoundListItem::SoundListItem( const BEntry & entry, - bool isTemp) + bool isTemp) : BStringItem(""), fEntry(entry), fIsTemp(isTemp) diff --git a/src/apps/stylededit/ReplaceWindow.cpp b/src/apps/stylededit/ReplaceWindow.cpp index 1e05cc84b8..2f66e6a837 100644 --- a/src/apps/stylededit/ReplaceWindow.cpp +++ b/src/apps/stylededit/ReplaceWindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2002-2006, Haiku, Inc. All Rights Reserved. + * Copyright 2002-2009, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. * * Authors: @@ -61,7 +61,7 @@ ReplaceWindow::ReplaceWindow(BRect frame, BHandler *_handler, BString *searchStr fUIchange = false; fReplaceView->AddChild(fReplaceAllButton = new BButton(BRect(10, 150, 98, 166), - "", "Replace All", new BMessage(MSG_REPLACE_ALL), B_FOLLOW_LEFT | B_FOLLOW_TOP, + "", "Replace all", new BMessage(MSG_REPLACE_ALL), B_FOLLOW_LEFT | B_FOLLOW_TOP, B_WILL_DRAW | B_NAVIGABLE)); fReplaceView->AddChild(fCancelButton = new BButton(BRect(141, 150, 211, 166), "", "Cancel", new BMessage(B_QUIT_REQUESTED), B_FOLLOW_LEFT | B_FOLLOW_TOP, diff --git a/src/apps/stylededit/StyledEditWindow.cpp b/src/apps/stylededit/StyledEditWindow.cpp index ed00091fe8..5bb4397b0c 100644 --- a/src/apps/stylededit/StyledEditWindow.cpp +++ b/src/apps/stylededit/StyledEditWindow.cpp @@ -139,17 +139,17 @@ StyledEditWindow::InitWindow(uint32 encoding) menu->AddItem(fSaveItem = new BMenuItem("Save", new BMessage(MENU_SAVE), 'S')); fSaveItem->SetEnabled(false); - menu->AddItem(menuItem = new BMenuItem("Save As" B_UTF8_ELLIPSIS, new BMessage(MENU_SAVEAS))); + menu->AddItem(menuItem = new BMenuItem("Save as" B_UTF8_ELLIPSIS, new BMessage(MENU_SAVEAS))); menuItem->SetShortcut('S',B_SHIFT_KEY); menuItem->SetEnabled(true); - menu->AddItem(fRevertItem = new BMenuItem("Revert to Saved" B_UTF8_ELLIPSIS, + menu->AddItem(fRevertItem = new BMenuItem("Revert to saved" B_UTF8_ELLIPSIS, new BMessage(MENU_REVERT))); fRevertItem->SetEnabled(false); menu->AddItem(menuItem = new BMenuItem("Close", new BMessage(MENU_CLOSE), 'W')); menu->AddSeparatorItem(); - menu->AddItem(menuItem = new BMenuItem("Page Setup" B_UTF8_ELLIPSIS, new BMessage(MENU_PAGESETUP))); + menu->AddItem(menuItem = new BMenuItem("Page setup" B_UTF8_ELLIPSIS, new BMessage(MENU_PAGESETUP))); menu->AddItem(menuItem = new BMenuItem("Print" B_UTF8_ELLIPSIS, new BMessage(MENU_PRINT), 'P')); menu->AddSeparatorItem(); @@ -159,7 +159,7 @@ StyledEditWindow::InitWindow(uint32 encoding) menu = new BMenu("Edit"); fMenuBar->AddItem(menu); - menu->AddItem(fUndoItem = new BMenuItem("Can't Undo", new BMessage(B_UNDO), 'Z')); + menu->AddItem(fUndoItem = new BMenuItem("Can't undo", new BMessage(B_UNDO), 'Z')); fUndoItem->SetEnabled(false); menu->AddSeparatorItem(); @@ -178,17 +178,17 @@ StyledEditWindow::InitWindow(uint32 encoding) fClearItem->SetTarget(fTextView); menu->AddSeparatorItem(); - menu->AddItem(menuItem = new BMenuItem("Select All", new BMessage(B_SELECT_ALL), 'A')); + menu->AddItem(menuItem = new BMenuItem("Select all", new BMessage(B_SELECT_ALL), 'A')); menuItem->SetTarget(fTextView); menu->AddSeparatorItem(); menu->AddItem(menuItem = new BMenuItem("Find" B_UTF8_ELLIPSIS, new BMessage(MENU_FIND),'F')); - menu->AddItem(fFindAgainItem= new BMenuItem("Find Again",new BMessage(MENU_FIND_AGAIN),'G')); + menu->AddItem(fFindAgainItem= new BMenuItem("Find again",new BMessage(MENU_FIND_AGAIN),'G')); fFindAgainItem->SetEnabled(false); - menu->AddItem(menuItem = new BMenuItem("Find Selection", new BMessage(MENU_FIND_SELECTION),'H')); + menu->AddItem(menuItem = new BMenuItem("Find selection", new BMessage(MENU_FIND_SELECTION),'H')); menu->AddItem(menuItem = new BMenuItem("Replace" B_UTF8_ELLIPSIS, new BMessage(MENU_REPLACE),'R')); - menu->AddItem(fReplaceSameItem = new BMenuItem("Replace Same", new BMessage(MENU_REPLACE_SAME),'T')); + menu->AddItem(fReplaceSameItem = new BMenuItem("Replace same", new BMessage(MENU_REPLACE_SAME),'T')); fReplaceSameItem->SetEnabled(false); // Add the "Font"-menu: @@ -269,7 +269,7 @@ StyledEditWindow::InitWindow(uint32 encoding) subMenu->AddItem(fAlignCenter = new BMenuItem("Center", new BMessage(ALIGN_CENTER))); subMenu->AddItem(fAlignRight = new BMenuItem("Right", new BMessage(ALIGN_RIGHT))); menu->AddItem(subMenu); - menu->AddItem(fWrapItem = new BMenuItem("Wrap Lines", new BMessage(WRAP_LINES))); + menu->AddItem(fWrapItem = new BMenuItem("Wrap lines", new BMessage(WRAP_LINES))); fWrapItem->SetMarked(true); fSavePanel = NULL; @@ -542,7 +542,7 @@ StyledEditWindow::MessageReceived(BMessage *message) // set mode fCanUndo = false; fCanRedo = true; - fUndoItem->SetLabel("Redo Typing"); + fUndoItem->SetLabel("Redo typing"); fUndoItem->SetEnabled(true); fUndoFlag = false; } else { @@ -562,7 +562,7 @@ StyledEditWindow::MessageReceived(BMessage *message) // set mode fCanUndo = true; fCanRedo = false; - fUndoItem->SetLabel("Undo Typing"); + fUndoItem->SetLabel("Undo typing"); fUndoItem->SetEnabled(true); fRedoFlag = false; } @@ -744,7 +744,7 @@ StyledEditWindow::QuitRequested() BString alertText("Save changes to the document \""); alertText<< Title() <<"\"? "; - int32 index = _ShowAlert(alertText, "Cancel", "Don't Save", "Save", + int32 index = _ShowAlert(alertText, "Cancel", "Don't save", "Save", B_WARNING_ALERT); if (index == 0) @@ -988,7 +988,7 @@ StyledEditWindow::RevertToSaved() return; // clear undo modes - fUndoItem->SetLabel("Can't Undo"); + fUndoItem->SetLabel("Can't undo"); fUndoItem->SetEnabled(false); fUndoFlag = false; fCanUndo = false; diff --git a/src/apps/sudoku/ProgressWindow.cpp b/src/apps/sudoku/ProgressWindow.cpp index 73c473d8f8..ab9693b069 100644 --- a/src/apps/sudoku/ProgressWindow.cpp +++ b/src/apps/sudoku/ProgressWindow.cpp @@ -20,7 +20,7 @@ static const uint32 kMsgShow = 'show'; ProgressWindow::ProgressWindow(BWindow* referenceWindow, BMessage* abortMessage) - : BWindow(BRect(0, 0, 250, 100), "Progress Monitor", + : BWindow(BRect(0, 0, 250, 100), "Progress monitor", B_MODAL_WINDOW_LOOK, B_FLOATING_APP_WINDOW_FEEL, B_NOT_ZOOMABLE | B_NOT_RESIZABLE | B_ASYNCHRONOUS_CONTROLS), fRunner(NULL) diff --git a/src/apps/sudoku/Sudoku.cpp b/src/apps/sudoku/Sudoku.cpp index 22ec86b3f5..b10c6033ae 100644 --- a/src/apps/sudoku/Sudoku.cpp +++ b/src/apps/sudoku/Sudoku.cpp @@ -63,7 +63,7 @@ Sudoku::DisplayAbout() { BAlert *alert = new BAlert("about", "Sudoku\n" "\twritten by Axel Dörfler\n" - "\tCopyright 2007, Haiku Inc.\n", "Ok"); + "\tCopyright 2007, Haiku Inc.\n", "OK"); BTextView *view = alert->TextView(); BFont font; diff --git a/src/apps/sudoku/SudokuWindow.cpp b/src/apps/sudoku/SudokuWindow.cpp index 001c05436d..68c6242516 100644 --- a/src/apps/sudoku/SudokuWindow.cpp +++ b/src/apps/sudoku/SudokuWindow.cpp @@ -182,10 +182,10 @@ SudokuWindow::SudokuWindow() // "File" menu BMenu* menu = new BMenu("File"); menu->AddItem(new BMenuItem("New", new BMessage(kMsgNew))); - menu->AddItem(new BMenuItem("Start Again", new BMessage(kMsgStartAgain))); + menu->AddItem(new BMenuItem("Start again", new BMessage(kMsgStartAgain))); menu->AddSeparatorItem(); BMenu* recentsMenu = BRecentFilesList::NewFileListMenu( - "Open File" B_UTF8_ELLIPSIS, NULL, NULL, this, 10, false, NULL, + "Open file" B_UTF8_ELLIPSIS, NULL, NULL, this, 10, false, NULL, kSignature); BMenuItem *item; menu->AddItem(item = new BMenuItem(recentsMenu, @@ -202,7 +202,7 @@ SudokuWindow::SudokuWindow() menu->AddSeparatorItem(); - subMenu = new BMenu("Export As" B_UTF8_ELLIPSIS); + subMenu = new BMenu("Export as" B_UTF8_ELLIPSIS); BMessage *msg; msg = new BMessage(kMsgExportAs); msg->AddInt32("as", kExportAsText); @@ -233,11 +233,11 @@ SudokuWindow::SudokuWindow() // "View" menu menu = new BMenu("View"); - menu->AddItem(item = new BMenuItem("Mark Invalid Values", + menu->AddItem(item = new BMenuItem("Mark invalid values", new BMessage(kMsgMarkInvalid))); if (fSudokuView->HintFlags() & kMarkInvalid) item->SetMarked(true); - menu->AddItem(item = new BMenuItem("Mark Valid Hints", + menu->AddItem(item = new BMenuItem("Mark valid hints", new BMessage(kMsgMarkValidHints))); if (fSudokuView->HintFlags() & kMarkValidHints) item->SetMarked(true); @@ -253,14 +253,14 @@ SudokuWindow::SudokuWindow() fRedoItem->SetEnabled(false); menu->AddSeparatorItem(); - menu->AddItem(new BMenuItem("Snapshot Current", new BMessage(kMsgStoreState))); - menu->AddItem(fRestoreStateItem = new BMenuItem("Restore Snapshot", + menu->AddItem(new BMenuItem("Snapshot current", new BMessage(kMsgStoreState))); + menu->AddItem(fRestoreStateItem = new BMenuItem("Restore snapshot", new BMessage(kMsgRestoreState))); fRestoreStateItem->SetEnabled(fStoredState != NULL); menu->AddSeparatorItem(); menu->AddItem(new BMenuItem("Solve", new BMessage(kMsgSolveSudoku))); - menu->AddItem(new BMenuItem("Solve Single Field", + menu->AddItem(new BMenuItem("Solve single field", new BMessage(kMsgSolveSingle))); menu->SetTargetForItems(fSudokuView); menuBar->AddItem(menu); @@ -386,7 +386,7 @@ SudokuWindow::_MessageDropped(BMessage* message) } (new BAlert("Sudoku request", - buffer, "Ok", NULL, NULL, + buffer, "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go(); } } @@ -528,7 +528,7 @@ SudokuWindow::MessageReceived(BMessage* message) case kMsgSudokuSolved: (new BAlert("Sudoku request", - "Sudoku solved - congratulations!", "Ok", NULL, NULL, + "Sudoku solved - congratulations!", "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_IDEA_ALERT))->Go(); break; diff --git a/src/apps/terminal/FindWindow.cpp b/src/apps/terminal/FindWindow.cpp index e77f545b1b..3e00098ed9 100644 --- a/src/apps/terminal/FindWindow.cpp +++ b/src/apps/terminal/FindWindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2007, Haiku, Inc. + * Copyright 2007-2009, Haiku, Inc. All rights reserved. * Copyright 2003-2004 Kian Duffy, myob@users.sourceforge.net * Parts Copyright 1998-1999 Kazuho Okui and Takashi Murai. * All rights reserved. Distributed under the terms of the MIT license. @@ -39,18 +39,18 @@ FindWindow::FindWindow(BMessenger messenger, BString &str, BView *layoutView = BGroupLayoutBuilder(B_VERTICAL, 10) .SetInsets(5, 5, 5, 5) - .Add(fTextRadio = new BRadioButton("fTextRadio", "Use Text: ", + .Add(fTextRadio = new BRadioButton("fTextRadio", "Use text: ", NULL)) .Add(fFindLabel = new BTextControl("fFindLabel", "", "", NULL)) .Add(fSelectionRadio = new BRadioButton("fSelectionRadio", - "Use Selection", NULL)) + "Use selection", NULL)) .Add(separator) .Add(fForwardSearchBox = new BCheckBox("fForwardSearchBox", - "Search Forward", NULL)) + "Search forward", NULL)) .Add(fMatchCaseBox = new BCheckBox("fMatchCaseBox", - "Match Case", NULL)) + "Match case", NULL)) .Add(fMatchWordBox = new BCheckBox("fMatchWordBox", - "Match Word", NULL)) + "Match word", NULL)) .Add(fFindButton = new BButton("fFindButton", "Find", new BMessage(MSG_FIND))) .End(); diff --git a/src/apps/terminal/PrefWindow.cpp b/src/apps/terminal/PrefWindow.cpp index c58004b296..098c403dee 100644 --- a/src/apps/terminal/PrefWindow.cpp +++ b/src/apps/terminal/PrefWindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2007-2008, Haiku, Inc. + * Copyright 2007-2009, Haiku, Inc. All rights reserved. * Copyright 2003-2004 Kian Duffy, myob@users.sourceforge.net * Parts Copyright 1998-1999 Kazuho Okui and Takashi Murai. * All rights reserved. Distributed under the terms of the MIT license. @@ -23,7 +23,7 @@ PrefWindow::PrefWindow(const BMessenger &messenger) - : BWindow(BRect(0, 0, 375, 185), "Terminal Preferences", + : BWindow(BRect(0, 0, 375, 185), "Terminal settings", B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, B_NOT_RESIZABLE|B_NOT_ZOOMABLE|B_AUTO_UPDATE_SIZE_LIMITS), fPreviousPref(new PrefHandler(PrefHandler::Default())), @@ -37,7 +37,7 @@ PrefWindow::PrefWindow(const BMessenger &messenger) .Add(new AppearancePrefView("Appearance", fTerminalMessenger)) .AddGroup(B_HORIZONTAL) .Add(fSaveAsFileButton = new BButton("savebutton", - "Save to File" B_UTF8_ELLIPSIS, + "Save to file" B_UTF8_ELLIPSIS, new BMessage(MSG_SAVEAS_PRESSED), B_WILL_DRAW)) .AddGlue() .Add(fRevertButton = new BButton("revertbutton", @@ -79,8 +79,8 @@ PrefWindow::QuitRequested() if (!fDirty) return true; - BAlert *alert = new BAlert("", "Save changes to this preference panel?", - "Cancel", "Don't Save", "Save", + BAlert *alert = new BAlert("", "Save changes to this settings panel?", + "Cancel", "Don't save", "Save", B_WIDTH_AS_USUAL, B_OFFSET_SPACING, B_WARNING_ALERT); alert->SetShortcut(0, B_ESCAPE); diff --git a/src/apps/terminal/Shell.cpp b/src/apps/terminal/Shell.cpp index afd0590ffd..6bc56e2145 100644 --- a/src/apps/terminal/Shell.cpp +++ b/src/apps/terminal/Shell.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2007 Haiku, inc. + * Copyright 2007-2009, Haiku, Inc. All rights reserved. * Copyright (c) 2003-4 Kian Duffy * Copyright (c) 2004 Daniel Furrer * Parts Copyright (C) 1998,99 Kazuho Okui and Takashi Murai. @@ -511,7 +511,7 @@ Shell::_Spawn(int row, int col, const char *encoding, int argc, const char **arg const char *spawnAlertMessage = "alert --stop " "'Cannot execute \"%s\":\n" "\t%s' " - "'Use Default Shell' 'Abort'"; + "'Use default shell' 'Abort'"; char errorMessage[256]; snprintf(errorMessage, sizeof(errorMessage), spawnAlertMessage, argv[0], strerror(errno)); diff --git a/src/apps/terminal/SmartTabView.cpp b/src/apps/terminal/SmartTabView.cpp index 5f14147c65..8f25da7119 100644 --- a/src/apps/terminal/SmartTabView.cpp +++ b/src/apps/terminal/SmartTabView.cpp @@ -76,7 +76,7 @@ SmartTabView::MouseDown(BPoint point) message->AddInt32("index", tabIndex); BPopUpMenu* popUpMenu = new BPopUpMenu("tab menu"); - popUpMenu->AddItem(new BMenuItem("Close Tab", message)); + popUpMenu->AddItem(new BMenuItem("Close tab", message)); popUpMenu->SetAsyncAutoDestruct(true); popUpMenu->SetTargetForItems(BMessenger(this)); popUpMenu->Go(ConvertToScreen(point), true, true, true); diff --git a/src/apps/terminal/TermApp.cpp b/src/apps/terminal/TermApp.cpp index 95afea4b9b..d837b90a0b 100644 --- a/src/apps/terminal/TermApp.cpp +++ b/src/apps/terminal/TermApp.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2001-2008, Haiku. + * Copyright 2001-2009, Haiku, Inc. All rights reserved. * Copyright (c) 2003-2004 Kian Duffy * Copyright (C) 1998,99 Kazuho Okui and Takashi Murai. * @@ -127,7 +127,7 @@ TermApp::ReadyToRun() // TODO: This alert does never show up. if (status < B_OK) { (new BAlert("alert", "Terminal couldn't start the shell. Sorry.", - "ok", NULL, NULL, B_WIDTH_FROM_LABEL, + "OK", NULL, NULL, B_WIDTH_FROM_LABEL, B_INFO_ALERT))->Go(NULL); PostMessage(B_QUIT_REQUESTED); return; diff --git a/src/apps/terminal/TermConst.h b/src/apps/terminal/TermConst.h index e3d0cf6331..7abee6c0cf 100644 --- a/src/apps/terminal/TermConst.h +++ b/src/apps/terminal/TermConst.h @@ -100,34 +100,34 @@ const char* const PREF_HALF_FONT_SIZE = "Half Font Size"; const char* const PREF_TEXT_FORE_COLOR = "Text"; const char* const PREF_TEXT_BACK_COLOR = "Background"; -const char* const PREF_SELECT_FORE_COLOR = "Selected Text"; -const char* const PREF_SELECT_BACK_COLOR = "Selected Background"; -const char* const PREF_CURSOR_FORE_COLOR = "Cursor Text"; -const char* const PREF_CURSOR_BACK_COLOR = "Cursor Background"; +const char* const PREF_SELECT_FORE_COLOR = "Selected text"; +const char* const PREF_SELECT_BACK_COLOR = "Selected background"; +const char* const PREF_CURSOR_FORE_COLOR = "Cursor text"; +const char* const PREF_CURSOR_BACK_COLOR = "Cursor background"; -const char* const PREF_IM_FORE_COLOR = "IM Foreground Color"; -const char* const PREF_IM_BACK_COLOR = "IM Background Color"; -const char* const PREF_IM_SELECT_COLOR = "IM Selection Color"; +const char* const PREF_IM_FORE_COLOR = "IM foreground color"; +const char* const PREF_IM_BACK_COLOR = "IM background color"; +const char* const PREF_IM_SELECT_COLOR = "IM selection color"; -const char* const PREF_ANSI_BLACK_COLOR = "ANSI Black Color"; -const char* const PREF_ANSI_RED_COLOR = "ANSI Red Color"; -const char* const PREF_ANSI_GREEN_COLOR = "ANSI Green Color"; -const char* const PREF_ANSI_YELLOW_COLOR = "ANSI Yellow Color"; -const char* const PREF_ANSI_BLUE_COLOR = "ANSI Blue Color"; -const char* const PREF_ANSI_MAGENTA_COLOR = "ANSI Magenta Color"; -const char* const PREF_ANSI_CYAN_COLOR = "ANSI Cyan Color"; -const char* const PREF_ANSI_WHITE_COLOR = "ANSI White Color"; +const char* const PREF_ANSI_BLACK_COLOR = "ANSI black color"; +const char* const PREF_ANSI_RED_COLOR = "ANSI red color"; +const char* const PREF_ANSI_GREEN_COLOR = "ANSI green color"; +const char* const PREF_ANSI_YELLOW_COLOR = "ANSI yellow color"; +const char* const PREF_ANSI_BLUE_COLOR = "ANSI blue color"; +const char* const PREF_ANSI_MAGENTA_COLOR = "ANSI magenta color"; +const char* const PREF_ANSI_CYAN_COLOR = "ANSI cyan color"; +const char* const PREF_ANSI_WHITE_COLOR = "ANSI white color"; -const char* const PREF_HISTORY_SIZE = "History Size"; -const char* const PREF_CURSOR_BLINKING = "Cursor Blinking Rate"; +const char* const PREF_HISTORY_SIZE = "History size"; +const char* const PREF_CURSOR_BLINKING = "Cursor blinking rate"; -const char* const PREF_IM_AWARE = "Input Method Aware"; +const char* const PREF_IM_AWARE = "Input method aware"; const char* const PREF_COLS = "Cols"; const char* const PREF_ROWS = "Rows"; const char* const PREF_SHELL = "Shell"; -const char* const PREF_TEXT_ENCODING = "Text Encoding"; +const char* const PREF_TEXT_ENCODING = "Text encoding"; const char* const PREF_GUI_LANGUAGE = "Language"; // Color type diff --git a/src/apps/terminal/TermView.cpp b/src/apps/terminal/TermView.cpp index bc9be240b5..3f472be8f0 100644 --- a/src/apps/terminal/TermView.cpp +++ b/src/apps/terminal/TermView.cpp @@ -1796,11 +1796,11 @@ TermView::_SecondaryMouseButtonDropped(BMessage* msg) cpMessage->what = kSecondaryMouseDropAction; cpMessage->AddInt8("action", kCopyFiles); - BMenuItem* insertItem = new BMenuItem("Insert Path", insertMessage); - BMenuItem* cdItem = new BMenuItem("Change Directory", cdMessage); - BMenuItem* lnItem = new BMenuItem("Create Link Here", lnMessage); - BMenuItem* mvItem = new BMenuItem("Move Here", mvMessage); - BMenuItem* cpItem = new BMenuItem("Copy Here", cpMessage); + BMenuItem* insertItem = new BMenuItem("Insert path", insertMessage); + BMenuItem* cdItem = new BMenuItem("Change directory", cdMessage); + BMenuItem* lnItem = new BMenuItem("Create link here", lnMessage); + BMenuItem* mvItem = new BMenuItem("Move here", mvMessage); + BMenuItem* cpItem = new BMenuItem("Copy here", cpMessage); BMenuItem* chItem = new BMenuItem("Cancel", NULL); // if the refs point to different directorys disable the cd menu item @@ -2742,7 +2742,7 @@ TermView::AboutRequested() "Terminal\n\n" "written by Kazuho Okui and Takashi Murai\n" "updated by Kian Duffy and others\n\n" - "Copyright " B_UTF8_COPYRIGHT "2003-2009, Haiku.\n", "Ok"); + "Copyright " B_UTF8_COPYRIGHT "2003-2009, Haiku.\n", "OK"); if (alert != NULL) alert->Go(); } diff --git a/src/apps/terminal/TermWindow.cpp b/src/apps/terminal/TermWindow.cpp index 7feb2e73d8..650f63571c 100644 --- a/src/apps/terminal/TermWindow.cpp +++ b/src/apps/terminal/TermWindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2007 Haiku, Inc. + * Copyright 2007-2009, Haiku, Inc. All rights reserved. * Copyright (c) 2004 Daniel Furrer * Copyright (c) 2003-2004 Kian Duffy * Copyright (C) 1998,99 Kazuho Okui and Takashi Murai. @@ -253,7 +253,7 @@ TermWindow::MenusBeginning() BMenu * TermWindow::_MakeEncodingMenu() { - BMenu *menu = new (std::nothrow) BMenu("Text Encoding"); + BMenu *menu = new (std::nothrow) BMenu("Text encoding"); if (menu == NULL) return NULL; @@ -285,19 +285,19 @@ TermWindow::_SetupMenu() fFilemenu = new BMenu("Terminal"); fFilemenu->AddItem(new BMenuItem("Switch Terminals", new BMessage(MENU_SWITCH_TERM), B_TAB)); - fFilemenu->AddItem(new BMenuItem("New Terminal" B_UTF8_ELLIPSIS, + fFilemenu->AddItem(new BMenuItem("New Terminal", new BMessage(MENU_NEW_TERM), 'N')); - fFilemenu->AddItem(new BMenuItem("New Tab", new BMessage(kNewTab), 'T')); + fFilemenu->AddItem(new BMenuItem("New tab", new BMessage(kNewTab), 'T')); fFilemenu->AddSeparatorItem(); - fFilemenu->AddItem(new BMenuItem("Page Setup" B_UTF8_ELLIPSIS, + fFilemenu->AddItem(new BMenuItem("Page setup" B_UTF8_ELLIPSIS, new BMessage(MENU_PAGE_SETUP))); fFilemenu->AddItem(new BMenuItem("Print", new BMessage(MENU_PRINT),'P')); fFilemenu->AddSeparatorItem(); fFilemenu->AddItem(new BMenuItem("About Terminal" B_UTF8_ELLIPSIS, new BMessage(B_ABOUT_REQUESTED))); fFilemenu->AddSeparatorItem(); - fFilemenu->AddItem(new BMenuItem("Close Active Tab", + fFilemenu->AddItem(new BMenuItem("Close active tab", new BMessage(kCloseView), 'W', B_SHIFT_KEY)); fFilemenu->AddItem(new BMenuItem("Quit", new BMessage(B_QUIT_REQUESTED), 'Q')); @@ -308,18 +308,18 @@ TermWindow::_SetupMenu() fEditmenu->AddItem(new BMenuItem("Copy", new BMessage(B_COPY),'C')); fEditmenu->AddItem(new BMenuItem("Paste", new BMessage(B_PASTE),'V')); fEditmenu->AddSeparatorItem(); - fEditmenu->AddItem(new BMenuItem("Select All", + fEditmenu->AddItem(new BMenuItem("Select all", new BMessage(B_SELECT_ALL), 'A')); - fEditmenu->AddItem(new BMenuItem("Clear All", + fEditmenu->AddItem(new BMenuItem("Clear all", new BMessage(MENU_CLEAR_ALL), 'L')); fEditmenu->AddSeparatorItem(); fEditmenu->AddItem(new BMenuItem("Find" B_UTF8_ELLIPSIS, new BMessage(MENU_FIND_STRING),'F')); - fFindPreviousMenuItem = new BMenuItem("Find Previous", + fFindPreviousMenuItem = new BMenuItem("Find previous", new BMessage(MENU_FIND_PREVIOUS), 'G', B_SHIFT_KEY); fEditmenu->AddItem(fFindPreviousMenuItem); fFindPreviousMenuItem->SetEnabled(false); - fFindNextMenuItem = new BMenuItem("Find Next", + fFindNextMenuItem = new BMenuItem("Find next", new BMessage(MENU_FIND_NEXT), 'G'); fEditmenu->AddItem(fFindNextMenuItem); fFindNextMenuItem->SetEnabled(false); @@ -332,7 +332,7 @@ TermWindow::_SetupMenu() fEncodingmenu = _MakeEncodingMenu(); - fSizeMenu = new BMenu("Text Size"); + fSizeMenu = new BMenu("Text size"); fIncreaseFontSizeMenuItem = new BMenuItem("Increase", new BMessage(kIncreaseFontSize), '+', B_COMMAND_KEY); @@ -347,7 +347,7 @@ TermWindow::_SetupMenu() fHelpmenu->AddItem(fEncodingmenu); fHelpmenu->AddItem(fSizeMenu); fHelpmenu->AddSeparatorItem(); - fHelpmenu->AddItem(new BMenuItem("Preferences" B_UTF8_ELLIPSIS, + fHelpmenu->AddItem(new BMenuItem("Settings" B_UTF8_ELLIPSIS, new BMessage(MENU_PREF_OPEN))); fHelpmenu->AddSeparatorItem(); fHelpmenu->AddItem(new BMenuItem("Save as default", @@ -452,7 +452,7 @@ TermWindow::MessageReceived(BMessage *message) if (fFindString.Length() == 0) { const char* errorMsg = !fFindSelection ? "No search string was entered." : "Nothing is selected."; - BAlert* alert = new BAlert("Find failed", errorMsg, "Ok", NULL, + BAlert* alert = new BAlert("Find failed", errorMsg, "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); alert->Go(); @@ -467,7 +467,7 @@ TermWindow::MessageReceived(BMessage *message) findresult = _ActiveTermView()->Find(fFindString, fForwardSearch, fMatchCase, fMatchWord); if (!findresult) { - BAlert *alert = new BAlert("Find failed", "Text not found.", "Ok", NULL, + BAlert *alert = new BAlert("Find failed", "Text not found.", "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); alert->SetShortcut(0, B_ESCAPE); alert->Go(); @@ -488,7 +488,7 @@ TermWindow::MessageReceived(BMessage *message) (message->what == MENU_FIND_NEXT) == fForwardSearch, fMatchCase, fMatchWord); if (!findresult) { - BAlert *alert = new BAlert("find failed", "Not Found.", "Okay", + BAlert *alert = new BAlert("Find failed", "Not found.", "OK", NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); alert->SetShortcut(0, B_ESCAPE); alert->Go(); @@ -976,7 +976,7 @@ TermWindow::_ResizeView(TermView *view) BMenu* TermWindow::_MakeWindowSizeMenu() { - BMenu *menu = new (std::nothrow) BMenu("Window Size"); + BMenu *menu = new (std::nothrow) BMenu("Window size"); if (menu == NULL) return NULL; @@ -1000,7 +1000,7 @@ TermWindow::_MakeWindowSizeMenu() } menu->AddSeparatorItem(); - menu->AddItem(new BMenuItem("Fullscreen", new BMessage(FULLSCREEN), + menu->AddItem(new BMenuItem("Full screen", new BMessage(FULLSCREEN), B_ENTER)); return menu; diff --git a/src/apps/text_search/GrepWindow.cpp b/src/apps/text_search/GrepWindow.cpp index 74eb2ee14d..9175bfebbf 100644 --- a/src/apps/text_search/GrepWindow.cpp +++ b/src/apps/text_search/GrepWindow.cpp @@ -416,21 +416,21 @@ GrepWindow::_CreateMenus() fFileMenu = new BMenu(_T("File")); fActionMenu = new BMenu(_T("Actions")); - fPreferencesMenu = new BMenu(_T("Preferences")); + fPreferencesMenu = new BMenu(_T("Settings")); fHistoryMenu = new BMenu(_T("History")); fEncodingMenu = new BMenu(_T("Encoding")); fNew = new BMenuItem( - _T("New Window"), new BMessage(MSG_NEW_WINDOW), 'N'); + _T("New window"), new BMessage(MSG_NEW_WINDOW), 'N'); fOpen = new BMenuItem( - _T("Set Which Files to Search"), new BMessage(MSG_OPEN_PANEL), 'F'); + _T("Set which files to search"), new BMessage(MSG_OPEN_PANEL), 'F'); fClose = new BMenuItem( _T("Close"), new BMessage(B_QUIT_REQUESTED), 'W'); fAbout = new BMenuItem( - _T("About"), new BMessage(B_ABOUT_REQUESTED)); + _T("About TextSearch" B_UTF8_ELLIPSIS), new BMessage(B_ABOUT_REQUESTED)); fQuit = new BMenuItem( _T("Quit"), new BMessage(MSG_QUIT_NOW), 'Q'); @@ -439,31 +439,31 @@ GrepWindow::_CreateMenus() _T("Search"), new BMessage(MSG_START_CANCEL), 'S'); fSelectAll = new BMenuItem( - _T("Select All"), new BMessage(MSG_SELECT_ALL), 'A'); + _T("Select all"), new BMessage(MSG_SELECT_ALL), 'A'); fTrimSelection = new BMenuItem( - _T("Trim to Selection"), new BMessage(MSG_TRIM_SELECTION), 'T'); + _T("Trim to selection"), new BMessage(MSG_TRIM_SELECTION), 'T'); fOpenSelection = new BMenuItem( - _T("Open Selection"), new BMessage(MSG_OPEN_SELECTION), 'O'); + _T("Open selection"), new BMessage(MSG_OPEN_SELECTION), 'O'); fSelectInTracker = new BMenuItem( - _T("Show Files in Tracker"), new BMessage(MSG_SELECT_IN_TRACKER), 'K'); + _T("Show files in Tracker"), new BMessage(MSG_SELECT_IN_TRACKER), 'K'); fCopyText = new BMenuItem( - _T("Copy Text to Clipboard"), new BMessage(MSG_COPY_TEXT), 'B'); + _T("Copy text to clipboard"), new BMessage(MSG_COPY_TEXT), 'B'); fRecurseLinks = new BMenuItem( _T("Follow symbolic links"), new BMessage(MSG_RECURSE_LINKS)); fRecurseDirs = new BMenuItem( - _T("Look in sub-directories"), new BMessage(MSG_RECURSE_DIRS)); + _T("Look in sub-folders"), new BMessage(MSG_RECURSE_DIRS)); fSkipDotDirs = new BMenuItem( - _T("Skip sub-directories starting with a dot"), new BMessage(MSG_SKIP_DOT_DIRS)); + _T("Skip sub-folders starting with a dot"), new BMessage(MSG_SKIP_DOT_DIRS)); fCaseSensitive = new BMenuItem( - _T("Case sensitive"), new BMessage(MSG_CASE_SENSITIVE)); + _T("Case-sensitive"), new BMessage(MSG_CASE_SENSITIVE)); fEscapeText = new BMenuItem( _T("Escape search text"), new BMessage(MSG_ESCAPE_TEXT)); @@ -475,7 +475,7 @@ GrepWindow::_CreateMenus() _T("Open files in Pe"), new BMessage(MSG_INVOKE_PE)); fShowLinesMenuitem = new BMenuItem( - _T("Show Lines"), new BMessage(MSG_MENU_SHOW_LINES), 'L'); + _T("Show lines"), new BMessage(MSG_MENU_SHOW_LINES), 'L'); fShowLinesMenuitem->SetMarked(true); fUTF8 = new BMenuItem("UTF8", new BMessage('utf8')); @@ -561,7 +561,7 @@ GrepWindow::_CreateViews() fButton->SetEnabled(false); fShowLinesCheckbox = new BCheckBox( - BRect(0, 0, 1, 1), "ShowLines", _T("Show Lines"), + BRect(0, 0, 1, 1), "ShowLines", _T("Show lines"), new BMessage(MSG_CHECKBOX_SHOW_LINES), B_FOLLOW_LEFT); fShowLinesCheckbox->SetValue(B_CONTROL_ON); @@ -1284,7 +1284,7 @@ GrepWindow::_OnTrimSelection() text << "\n"; text << _T("The unselected files will be removed from the list."); text << "\n"; - BAlert* alert = new BAlert(NULL, text.String(), _T("Okay"), NULL, NULL, + BAlert* alert = new BAlert(NULL, text.String(), _T("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); alert->Go(NULL); return; @@ -1377,7 +1377,7 @@ GrepWindow::_OnSelectInTracker() BAlert* alert = new BAlert("Info", _T("Please select the files you wish to have selected for you in " "Tracker."), - _T("Okay"), NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); + _T("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_WARNING_ALERT); alert->Go(NULL); return; } @@ -1438,9 +1438,8 @@ GrepWindow::_OnSelectInTracker() if (!_AreAllFoldersOpenInTracker(&folderList)) { BAlert* alert = new BAlert(NULL, - _T(APP_NAME " couldn't open one or more folders, and it's very " - "sorry about it."), - _T("Forgive and forget!"), NULL, NULL, B_WIDTH_AS_USUAL, + _T(APP_NAME " couldn't open one or more folders,"), + _T("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_STOP_ALERT); alert->Go(NULL); goto out; @@ -1478,7 +1477,7 @@ GrepWindow::_OnAboutRequested() "Oliver Tappe, Jonas Sundström, Luc Schrijvers and momoziro."); text << "\n"; - BAlert* alert = new BAlert("TextSearch", text.String(), _T("Ok"), NULL, + BAlert* alert = new BAlert("TextSearch", text.String(), _T("OK"), NULL, NULL, B_WIDTH_AS_USUAL, B_INFO_ALERT); BTextView* view = alert->TextView(); diff --git a/src/apps/tv/MainWin.cpp b/src/apps/tv/MainWin.cpp index 4b5bf73e54..94c1a68820 100644 --- a/src/apps/tv/MainWin.cpp +++ b/src/apps/tv/MainWin.cpp @@ -3,22 +3,22 @@ * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without restriction, - * including without limitation the rights to use, copy, modify, - * merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is + * files (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, + * merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is * furnished to do so, subject to the following conditions: * - * The above copyright notice and this permission notice shall be + * The above copyright notice and this permission notice shall be * included in all copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR * OTHER DEALINGS IN THE SOFTWARE. */ @@ -41,11 +41,11 @@ #include #include -enum +enum { M_DUMMY = 0x100, M_FILE_ABOUT, - M_FILE_QUIT, + M_FILE_QUIT, M_SCALE_TO_NATIVE_SIZE, M_TOGGLE_FULLSCREEN, M_TOGGLE_NO_BORDER, @@ -98,7 +98,7 @@ MainWin::MainWin(BRect frame_rect) fBackground->SetViewColor(0,0,0); AddChild(fBackground); - // menu + // menu fMenuBar = new BMenuBar(fBackground->Bounds(), "menu"); CreateMenu(); fBackground->AddChild(fMenuBar); @@ -113,16 +113,16 @@ MainWin::MainWin(BRect frame_rect) fVideoView->MakeFocus(); -// SetSizeLimits(fControlViewMinWidth - 1, 32767, +// SetSizeLimits(fControlViewMinWidth - 1, 32767, // fMenuBarHeight + fControlViewHeight - 1, fMenuBarHeight + fControlViewHeight - 1); // SetSizeLimits(320 - 1, 32767, 240 + fMenuBarHeight - 1, 32767); SetSizeLimits(0, 32767, fMenuBarHeight - 1, 32767); - + fController->SetVideoView(fVideoView); fController->SetVideoNode(fVideoView->Node()); - + fVideoView->IsOverlaySupported(); SetupInterfaceMenu(); @@ -159,14 +159,14 @@ MainWin::CreateMenu() fMenuBar->AddItem(fInterfaceMenu); fMenuBar->AddItem(fSettingsMenu); fMenuBar->AddItem(fDebugMenu); - + fFileMenu->AddItem(new BMenuItem("About " NAME B_UTF8_ELLIPSIS, new BMessage(M_FILE_ABOUT))); fFileMenu->AddSeparatorItem(); fFileMenu->AddItem(new BMenuItem("Quit", new BMessage(M_FILE_QUIT), 'Q', B_COMMAND_KEY)); -/* - fChannelMenu->AddItem(new BMenuItem("Next Channel", new BMessage(M_CHANNEL_NEXT), '+', B_COMMAND_KEY)); - fChannelMenu->AddItem(new BMenuItem("Previous Channel", new BMessage(M_CHANNEL_PREV), '-', B_COMMAND_KEY)); +/* + fChannelMenu->AddItem(new BMenuItem("Next channel", new BMessage(M_CHANNEL_NEXT), '+', B_COMMAND_KEY)); + fChannelMenu->AddItem(new BMenuItem("Previous channel", new BMessage(M_CHANNEL_PREV), '-', B_COMMAND_KEY)); fChannelMenu->AddSeparatorItem(); fChannelMenu->AddItem(new BMenuItem("RTL", new BMessage(M_DUMMY), '0', B_COMMAND_KEY)); fChannelMenu->AddItem(new BMenuItem("Pro7", new BMessage(M_DUMMY), '1', B_COMMAND_KEY)); @@ -177,14 +177,14 @@ MainWin::CreateMenu() */ fSettingsMenu->AddItem(new BMenuItem("Scale to native size", new BMessage(M_SCALE_TO_NATIVE_SIZE), 'N', B_COMMAND_KEY)); - fSettingsMenu->AddItem(new BMenuItem("Full Screen", new BMessage(M_TOGGLE_FULLSCREEN), 'F', B_COMMAND_KEY)); + fSettingsMenu->AddItem(new BMenuItem("Full screen", new BMessage(M_TOGGLE_FULLSCREEN), 'F', B_COMMAND_KEY)); fSettingsMenu->AddSeparatorItem(); - fSettingsMenu->AddItem(new BMenuItem("No Menu", new BMessage(M_TOGGLE_NO_MENU), 'M', B_COMMAND_KEY)); - fSettingsMenu->AddItem(new BMenuItem("No Border", new BMessage(M_TOGGLE_NO_BORDER), 'B', B_COMMAND_KEY)); - fSettingsMenu->AddItem(new BMenuItem("Always on Top", new BMessage(M_TOGGLE_ALWAYS_ON_TOP), 'T', B_COMMAND_KEY)); - fSettingsMenu->AddItem(new BMenuItem("Keep Aspect Ratio", new BMessage(M_TOGGLE_KEEP_ASPECT_RATIO), 'K', B_COMMAND_KEY)); + fSettingsMenu->AddItem(new BMenuItem("No menu", new BMessage(M_TOGGLE_NO_MENU), 'M', B_COMMAND_KEY)); + fSettingsMenu->AddItem(new BMenuItem("No border", new BMessage(M_TOGGLE_NO_BORDER), 'B', B_COMMAND_KEY)); + fSettingsMenu->AddItem(new BMenuItem("Always on top", new BMessage(M_TOGGLE_ALWAYS_ON_TOP), 'T', B_COMMAND_KEY)); + fSettingsMenu->AddItem(new BMenuItem("Keep aspect ratio", new BMessage(M_TOGGLE_KEEP_ASPECT_RATIO), 'K', B_COMMAND_KEY)); fSettingsMenu->AddSeparatorItem(); - fSettingsMenu->AddItem(new BMenuItem("Preferences"B_UTF8_ELLIPSIS, new BMessage(M_PREFERENCES), 'P', B_COMMAND_KEY)); + fSettingsMenu->AddItem(new BMenuItem("Settings"B_UTF8_ELLIPSIS, new BMessage(M_PREFERENCES), 'P', B_COMMAND_KEY)); fDebugMenu->AddItem(new BMenuItem("pixel aspect ratio 1.00000:1", new BMessage(M_ASPECT_100000_1))); fDebugMenu->AddItem(new BMenuItem("pixel aspect ratio 1.06666:1", new BMessage(M_ASPECT_106666_1))); @@ -229,17 +229,17 @@ MainWin::SetupChannelMenu() int interface = fController->CurrentInterface(); printf("MainWin::SetupChannelMenu: interface %d\n", interface); - + int channels = fController->ChannelCount(); if (channels == 0) { fChannelMenu->AddItem(new BMenuItem("None", new BMessage(M_DUMMY))); } else { - fChannelMenu->AddItem(new BMenuItem("Next Channel", new BMessage(M_CHANNEL_NEXT), '+', B_COMMAND_KEY)); - fChannelMenu->AddItem(new BMenuItem("Previous Channel", new BMessage(M_CHANNEL_PREV), '-', B_COMMAND_KEY)); + fChannelMenu->AddItem(new BMenuItem("Next channel", new BMessage(M_CHANNEL_NEXT), '+', B_COMMAND_KEY)); + fChannelMenu->AddItem(new BMenuItem("Previous channel", new BMessage(M_CHANNEL_PREV), '-', B_COMMAND_KEY)); fChannelMenu->AddSeparatorItem(); } - + char s[100]; for (int i = 0; i < channels; i++) { sprintf(s, "%s%d %s", (i < 9) ? " " : "", i + 1, fController->ChannelName(i)); @@ -255,12 +255,12 @@ MainWin::SetInterfaceMenuMarker() int interface = fController->CurrentInterface(); printf("MainWin::SetInterfaceMenuMarker: interface %d\n", interface); - + // remove old marker item = fInterfaceMenu->FindMarked(); if (item) item->SetMarked(false); - + // set new marker int index = (interface < 0) ? 0 : interface + 2; item = fInterfaceMenu->ItemAt(index); @@ -294,7 +294,7 @@ void MainWin::SelectChannel(int i) { printf("MainWin::SelectChannel %d\n", i); - + if (B_OK != fController->SelectChannel(i)) return; @@ -315,7 +315,7 @@ MainWin::SelectInterface(int i) fController->DisconnectInterface(); goto done; } - + if (!fController->IsInterfaceAvailable(i)) { BString s; s << "Error, interface is busy:\n\n" << gDeviceRoster->DeviceName(i); @@ -390,7 +390,7 @@ MainWin::MouseDown(BMessage *msg) return; } } - + if (2 == buttons && msg->FindInt32("clicks") % 2 == 0) { BRect r(screen_where.x - 1, screen_where.y - 1, screen_where.x + 1, screen_where.y + 1); if (r.Contains(fMouseDownMousePos)) { @@ -419,7 +419,7 @@ MainWin::MouseDown(BMessage *msg) bigtime_t start = system_time(); bigtime_t delay = 200000; BPoint location; - do { + do { fVideoView->GetMouse(&location, &buttons); if ((buttons & 2) == 0) break; @@ -438,9 +438,9 @@ MainWin::MouseMoved(BMessage *msg) BPoint mousePos; uint32 buttons = msg->FindInt32("buttons"); - + if (1 == buttons && fMouseDownTracking && !fIsFullscreen) { -/* +/* // very broken in Zeta: BPoint mousePos = msg->FindPoint("where"); printf("view where: %.0f, %.0f => ", mousePos.x, mousePos.y); @@ -478,16 +478,16 @@ MainWin::ShowContextMenu(const BPoint &screen_point) BPopUpMenu *menu = new BPopUpMenu("context menu", false, false); BMenuItem *item; menu->AddItem(new BMenuItem("Scale to native size", new BMessage(M_SCALE_TO_NATIVE_SIZE), 'N', B_COMMAND_KEY)); - menu->AddItem(item = new BMenuItem("Full Screen", new BMessage(M_TOGGLE_FULLSCREEN), 'F', B_COMMAND_KEY)); + menu->AddItem(item = new BMenuItem("Full screen", new BMessage(M_TOGGLE_FULLSCREEN), 'F', B_COMMAND_KEY)); item->SetMarked(fIsFullscreen); menu->AddSeparatorItem(); - menu->AddItem(item = new BMenuItem("No Menu", new BMessage(M_TOGGLE_NO_MENU), 'M', B_COMMAND_KEY)); + menu->AddItem(item = new BMenuItem("No menu", new BMessage(M_TOGGLE_NO_MENU), 'M', B_COMMAND_KEY)); item->SetMarked(fNoMenu); - menu->AddItem(item = new BMenuItem("No Border", new BMessage(M_TOGGLE_NO_BORDER), 'B', B_COMMAND_KEY)); + menu->AddItem(item = new BMenuItem("No border", new BMessage(M_TOGGLE_NO_BORDER), 'B', B_COMMAND_KEY)); item->SetMarked(fNoBorder); - menu->AddItem(item = new BMenuItem("Always on Top", new BMessage(M_TOGGLE_ALWAYS_ON_TOP), 'T', B_COMMAND_KEY)); + menu->AddItem(item = new BMenuItem("Always on top", new BMessage(M_TOGGLE_ALWAYS_ON_TOP), 'T', B_COMMAND_KEY)); item->SetMarked(fAlwaysOnTop); - menu->AddItem(item = new BMenuItem("Keep Aspect Ratio", new BMessage(M_TOGGLE_KEEP_ASPECT_RATIO), 'K', B_COMMAND_KEY)); + menu->AddItem(item = new BMenuItem("Keep aspect ratio", new BMessage(M_TOGGLE_KEEP_ASPECT_RATIO), 'K', B_COMMAND_KEY)); item->SetMarked(fKeepAspectRatio); menu->AddSeparatorItem(); menu->AddItem(new BMenuItem("About " NAME B_UTF8_ELLIPSIS, new BMessage(M_FILE_ABOUT))); @@ -513,7 +513,7 @@ void MainWin::VideoFormatChange(int width, int height, float width_scale, float height_scale) { // called when video format or aspect ratio changes - + printf("VideoFormatChange enter: width %d, height %d, width_scale %.6f, height_scale %.6f\n", width, height, width_scale, height_scale); if (width_scale < 1.0 && height_scale >= 1.0) { @@ -521,12 +521,12 @@ MainWin::VideoFormatChange(int width, int height, float width_scale, float heigh height_scale = 1.0 / height_scale; printf("inverting! new values: width_scale %.6f, height_scale %.6f\n", width_scale, height_scale); } - + fSourceWidth = width; fSourceHeight = height; fWidthScale = width_scale; fHeightScale = height_scale; - + // ResizeWindow(Bounds().Width() + 1, Bounds().Height() + 1, true); if (fIsFullscreen) { @@ -557,9 +557,9 @@ MainWin::FrameResized(float new_width, float new_height) debugger("size wrong\n"); } - + printf("FrameResized enter: new_width %.0f, new_height %.0f, bounds width %.0f, bounds height %.0f\n", new_width, new_height, Bounds().Width(), Bounds().Height()); - + if (fIsFullscreen) { printf("FrameResized in fullscreen mode\n"); @@ -568,13 +568,13 @@ MainWin::FrameResized(float new_width, float new_height) AdjustFullscreenRenderer(); } else { - + if (fFrameResizedTriggeredAutomatically) { fFrameResizedTriggeredAutomatically = false; printf("FrameResized triggered automatically\n"); fIgnoreFrameResized = false; - + AdjustWindowedRenderer(false); } else { printf("FrameResized by user in window mode\n"); @@ -610,7 +610,7 @@ MainWin::AdjustFullscreenRenderer() // n.b. we don't have a menu in fullscreen mode! if (fKeepAspectRatio) { - + // Keep aspect ratio, place render inside // the background area (may create black bars). float max_width = fBackground->Bounds().Width() + 1.0f; @@ -624,10 +624,10 @@ MainWin::AdjustFullscreenRenderer() int y_ofs = (int(max_height) - render_height) / 2; printf("AdjustFullscreenRenderer: background %.1f x %.1f, src video %d x %d, " - "scaled video %.3f x %.3f, factor %.3f, render %d x %d, x-ofs %d, y-ofs %d\n", + "scaled video %.3f x %.3f, factor %.3f, render %d x %d, x-ofs %d, y-ofs %d\n", max_width, max_height, fSourceWidth, fSourceHeight, scaled_width, scaled_height, factor, render_width, render_height, x_ofs, y_ofs); - + fVideoView->MoveTo(x_ofs, y_ofs); fVideoView->ResizeTo(render_width - 1, render_height - 1); @@ -662,7 +662,7 @@ MainWin::AdjustWindowedRenderer(bool user_resized) float max_height = Bounds().Height() + 1.0f - (fNoMenu ? 0 : fMenuBarHeight); float scaled_width = fSourceWidth * fWidthScale; float scaled_height = fSourceHeight * fHeightScale; - + if (!user_resized && (scaled_width > max_width || scaled_height > max_height)) { // A format switch occured, and the window was // smaller then the video source. As it was not @@ -677,9 +677,9 @@ MainWin::AdjustWindowedRenderer(bool user_resized) float display_aspect_ratio = scaled_width / scaled_height; int new_width = int(max_width); int new_height = int(max_width / display_aspect_ratio + 0.5); - + printf("AdjustWindowedRenderer: old display %d x %d, src video %d x %d, " - "scaled video %.3f x %.3f, aspect ratio %.3f, new display %d x %d\n", + "scaled video %.3f x %.3f, aspect ratio %.3f, new display %d x %d\n", int(max_width), int(max_height), fSourceWidth, fSourceHeight, scaled_width, scaled_height, display_aspect_ratio, new_width, new_height); @@ -690,7 +690,7 @@ MainWin::AdjustWindowedRenderer(bool user_resized) printf("AdjustWindowedRenderer leave\n"); } - + void MainWin::ToggleNoBorderNoMenu() @@ -720,13 +720,13 @@ MainWin::ToggleFullscreen() return; } fFrameResizedCalled = false; - - + + fIsFullscreen = !fIsFullscreen; - + if (fIsFullscreen) { // switch to fullscreen - + // Sync here is probably not required // Sync(); @@ -740,7 +740,7 @@ MainWin::ToggleFullscreen() // if we have a menu, remove it now fMenuBar->Hide(); } - fFrameResizedTriggeredAutomatically = true; + fFrameResizedTriggeredAutomatically = true; MoveTo(rect.left, rect.top); ResizeTo(rect.Width(), rect.Height()); Show(); @@ -755,11 +755,11 @@ MainWin::ToggleFullscreen() if (!fNoMenu) { fMenuBar->Show(); } - fFrameResizedTriggeredAutomatically = true; + fFrameResizedTriggeredAutomatically = true; MoveTo(fSavedFrame.left, fSavedFrame.top); ResizeTo(fSavedFrame.Width(), fSavedFrame.Height()); Show(); - + // We *must* make sure that the window is at // the correct position before continuing, or // rapid fullscreen switching by holding down @@ -769,7 +769,7 @@ MainWin::ToggleFullscreen() } // FrameResized() will do the required adjustments - + printf("ToggleFullscreen leave\n"); } @@ -780,14 +780,14 @@ MainWin::ToggleNoMenu() printf("ToggleNoMenu enter\n"); fNoMenu = !fNoMenu; - + if (fIsFullscreen) { - // fullscreen is always without menu + // fullscreen is always without menu printf("ToggleNoMenu leave, doing nothing, we are fullscreen\n"); return; } -// fFrameResizedTriggeredAutomatically = true; +// fFrameResizedTriggeredAutomatically = true; fIgnoreFrameResized = true; if (fNoMenu) { @@ -837,7 +837,7 @@ MainWin::ToggleKeepAspectRatio() printf("ToggleKeepAspectRatio enter\n"); fKeepAspectRatio = !fKeepAspectRatio; - fFrameResizedTriggeredAutomatically = true; + fFrameResizedTriggeredAutomatically = true; FrameResized(Bounds().Width(), Bounds().Height()); // if (fIsFullscreen) { // AdjustFullscreenRenderer(); @@ -855,13 +855,13 @@ status_t MainWin::KeyDown(BMessage *msg) { // msg->PrintToStream(); - + uint32 key = msg->FindInt32("key"); uint32 raw_char = msg->FindInt32("raw_char"); uint32 modifiers = msg->FindInt32("modifiers"); - + printf("key 0x%lx, raw_char 0x%lx, modifiers 0x%lx\n", key, raw_char, modifiers); - + switch (raw_char) { case B_SPACE: PostMessage(M_TOGGLE_NO_BORDER_NO_MENU); @@ -880,14 +880,14 @@ MainWin::KeyDown(BMessage *msg) return B_OK; } else break; - + case B_TAB: if ((modifiers & (B_COMMAND_KEY | B_CONTROL_KEY | B_OPTION_KEY | B_MENU_KEY)) == 0) { PostMessage(M_TOGGLE_FULLSCREEN); return B_OK; } else break; - + case B_UP_ARROW: if (modifiers & B_COMMAND_KEY) { PostMessage(M_CHANNEL_NEXT); @@ -903,7 +903,7 @@ MainWin::KeyDown(BMessage *msg) PostMessage(M_VOLUME_DOWN); } return B_OK; - + case B_RIGHT_ARROW: if (modifiers & B_COMMAND_KEY) { PostMessage(M_VOLUME_UP); @@ -923,7 +923,7 @@ MainWin::KeyDown(BMessage *msg) case B_PAGE_UP: PostMessage(M_CHANNEL_NEXT); return B_OK; - + case B_PAGE_DOWN: PostMessage(M_CHANNEL_PREV); return B_OK; @@ -955,18 +955,18 @@ MainWin::KeyDown(BMessage *msg) case 0x59: // numeric keypad down arrow PostMessage(M_VOLUME_DOWN); return B_OK; - + case 0x39: // numeric keypad page up case 0x4a: // numeric keypad right arrow PostMessage(M_CHANNEL_NEXT); return B_OK; - + case 0x5a: // numeric keypad page down case 0x48: // numeric keypad left arrow PostMessage(M_CHANNEL_PREV); return B_OK; } - + return B_ERROR; } @@ -990,14 +990,14 @@ MainWin::DispatchMessage(BMessage *msg, BHandler *handler) fVideoView->OverlayScreenshotCleanup(); return; } - + // every other key gets dispatched to our KeyDown first if (KeyDown(msg) == B_OK) { // it got handled, don't pass it on return; } } - + BWindow::DispatchMessage(msg, handler); } @@ -1010,12 +1010,12 @@ MainWin::MessageReceived(BMessage *msg) printf("B_ACQUIRE_OVERLAY_LOCK\n"); fVideoView->OverlayLockAcquire(); break; - + case B_RELEASE_OVERLAY_LOCK: printf("B_RELEASE_OVERLAY_LOCK\n"); fVideoView->OverlayLockRelease(); break; - + case B_MOUSE_WHEEL_CHANGED: { printf("B_MOUSE_WHEEL_CHANGED\n"); @@ -1095,7 +1095,7 @@ MainWin::MessageReceived(BMessage *msg) printf("MainWin::MessageReceived: B_REFS_RECEIVED\n"); // RefsReceived(msg); break; - + case B_SIMPLE_DATA: printf("MainWin::MessageReceived: B_SIMPLE_DATA\n"); // if (msg->HasRef("refs")) @@ -1109,7 +1109,7 @@ MainWin::MessageReceived(BMessage *msg) #if TIME_BOMB_ACTIVE "\n\n" INFO2 #endif - "\n\nCopyright "COPYRIGHT"\n\nVersion "VERSION"\n\nRevision "REVISION"\n\nBuild "BUILD, "Thanks"); + "\n\nCopyright "COPYRIGHT"\nVersion "VERSION"\nRevision "REVISION"\nBuild "BUILD, "OK"); if (fAlwaysOnTop) { ToggleAlwaysOnTop(); alert->Go(); @@ -1119,7 +1119,7 @@ MainWin::MessageReceived(BMessage *msg) } break; - case M_FILE_QUIT: + case M_FILE_QUIT: // be_app->PostMessage(B_QUIT_REQUESTED); PostMessage(B_QUIT_REQUESTED); break; @@ -1129,7 +1129,7 @@ MainWin::MessageReceived(BMessage *msg) if (fIsFullscreen) { ToggleFullscreen(); } - ResizeTo(int(fSourceWidth * fWidthScale), + ResizeTo(int(fSourceWidth * fWidthScale), int(fSourceHeight * fHeightScale) + (fNoMenu ? 0 : fMenuBarHeight)); // Sync(); break; @@ -1143,17 +1143,17 @@ MainWin::MessageReceived(BMessage *msg) ToggleNoMenu(); fSettingsMenu->ItemAt(3)->SetMarked(fNoMenu); break; - + case M_TOGGLE_NO_BORDER: ToggleNoBorder(); fSettingsMenu->ItemAt(4)->SetMarked(fNoBorder); break; - + case M_TOGGLE_ALWAYS_ON_TOP: ToggleAlwaysOnTop(); fSettingsMenu->ItemAt(5)->SetMarked(fAlwaysOnTop); break; - + case M_TOGGLE_KEEP_ASPECT_RATIO: ToggleKeepAspectRatio(); fSettingsMenu->ItemAt(6)->SetMarked(fKeepAspectRatio); @@ -1162,7 +1162,7 @@ MainWin::MessageReceived(BMessage *msg) case M_TOGGLE_NO_BORDER_NO_MENU: ToggleNoBorderNoMenu(); break; - + case M_PREFERENCES: break; diff --git a/src/apps/webwatch/WatchView.cpp b/src/apps/webwatch/WatchView.cpp index 64cca9779b..072aa80ee5 100644 --- a/src/apps/webwatch/WatchView.cpp +++ b/src/apps/webwatch/WatchView.cpp @@ -151,11 +151,11 @@ void WatchView::OnAboutRequested() (new BAlert( NULL, "WebWatch " VERSION - "\nAn Internet Time clock for your Deskbar\n\n" + "\nAn internet time clock for your Deskbar\n\n" "Created by Matthijs Hollemans\n" "mahlzeit@users.sourceforge.net\n\n" "Thanks to Jason Parks for his help.\n", - "Okay"))->Go(NULL); + "OK"))->Go(NULL); } //////////////////////////////////////////////////////////////////////////////// diff --git a/src/apps/workspaces/Workspaces.cpp b/src/apps/workspaces/Workspaces.cpp index 8bd9721a7f..991dd1b24c 100644 --- a/src/apps/workspaces/Workspaces.cpp +++ b/src/apps/workspaces/Workspaces.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008, Haiku, Inc. + * Copyright 2002-2009, Haiku, Inc. All rights reserved. * Copyright 2002, François Revol, revol@free.fr. * This file is distributed under the terms of the MIT License. * @@ -391,7 +391,7 @@ WorkspacesView::_AboutRequested() "written by François Revol, Axel Dörfler, and Matt Madia.\n\n" "Copyright 2002-2008, Haiku.\n\n" "Send windows behind using the Option key. " - "Move windows to front using the Control key.\n", "Ok"); + "Move windows to front using the Control key.\n", "OK"); BTextView *view = alert->TextView(); BFont font; @@ -537,7 +537,7 @@ WorkspacesView::MouseDown(BPoint where) menu->SetFont(be_plain_font); // TODO: alternatively change the count here directly? - BMenuItem* changeItem = new BMenuItem("Change Workspace Count" + BMenuItem* changeItem = new BMenuItem("Change workspace count" B_UTF8_ELLIPSIS, new BMessage(kMsgChangeCount)); menu->AddItem(changeItem); @@ -546,28 +546,28 @@ WorkspacesView::MouseDown(BPoint where) BMenuItem* item; menu->AddSeparatorItem(); - menu->AddItem(item = new BMenuItem("Show Window Title", + menu->AddItem(item = new BMenuItem("Show window title", new BMessage(kMsgToggleTitle))); if (window->Look() == B_TITLED_WINDOW_LOOK) item->SetMarked(true); - menu->AddItem(item = new BMenuItem("Show Window Border", + menu->AddItem(item = new BMenuItem("Show window border", new BMessage(kMsgToggleBorder))); if (window->Look() == B_TITLED_WINDOW_LOOK || window->Look() == B_MODAL_WINDOW_LOOK) item->SetMarked(true); menu->AddSeparatorItem(); - menu->AddItem(item = new BMenuItem("Always On Top", + menu->AddItem(item = new BMenuItem("Always on top", new BMessage(kMsgToggleAlwaysOnTop))); if (window->Feel() == B_FLOATING_ALL_WINDOW_FEEL) item->SetMarked(true); - menu->AddItem(item = new BMenuItem("Auto Raise", + menu->AddItem(item = new BMenuItem("Auto-raise", new BMessage(kMsgToggleAutoRaise))); if (window->IsAutoRaising()) item->SetMarked(true); menu->AddSeparatorItem(); - menu->AddItem(new BMenuItem("About" B_UTF8_ELLIPSIS, + menu->AddItem(new BMenuItem("About Workspaces" B_UTF8_ELLIPSIS, new BMessage(B_ABOUT_REQUESTED))); menu->AddItem(new BMenuItem("Quit", new BMessage(B_QUIT_REQUESTED))); menu->SetTargetForItems(window);