From cd6b83ddc1b4cbd90eb6565752f6ef930360bb3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Sundstr=C3=B6m?= Date: Sat, 9 Feb 2008 13:26:28 +0000 Subject: [PATCH] The title of the (primary) window of (non-document) apps and preferences should be the filename of the executable. File and window names should be changed in tandem in the future. All IMO. Sorry, Marcus, for changing TV-O-Rama. :/ We may want to consider using more proper language, e.g. 'Screensaver' or 'Screen Saver' instead of 'ScreenSaver'. DeskCalc or 'Desk Calculator' should be just Calculator. We should avoid clinging to BeOS history, like with the name CodyCam, which hardly makes any sense anymore, even if you happen to be one of the few BeOS oldtimers. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23935 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/cdplayer/CDPlayer.cpp | 2 +- src/apps/deskcalc/CalcWindow.cpp | 2 +- src/apps/midiplayer/MidiPlayerWindow.cpp | 2 +- src/apps/soundrecorder/RecorderWindow.cpp | 2 +- src/apps/tv/config.h | 2 +- src/apps/tv/tv.rdef | 6 +++--- src/preferences/screensaver/ScreenSaverWindow.cpp | 2 +- src/tests/kits/game/chart/Chart.cpp | 2 +- src/tests/servers/app/bitmap_drawing/main.cpp | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/apps/cdplayer/CDPlayer.cpp b/src/apps/cdplayer/CDPlayer.cpp index da849a6a6e..865b3c83aa 100644 --- a/src/apps/cdplayer/CDPlayer.cpp +++ b/src/apps/cdplayer/CDPlayer.cpp @@ -600,7 +600,7 @@ CDPlayer::_WatchCDState() CDPlayerWindow::CDPlayerWindow() - : BWindow(BRect (100, 100, 405, 280), "CD Player", B_TITLED_WINDOW, B_NOT_RESIZABLE | + : BWindow(BRect (100, 100, 405, 280), "CDPlayer", B_TITLED_WINDOW, B_NOT_RESIZABLE | B_NOT_ZOOMABLE | B_ASYNCHRONOUS_CONTROLS) { } diff --git a/src/apps/deskcalc/CalcWindow.cpp b/src/apps/deskcalc/CalcWindow.cpp index 303674c644..9e30e28633 100644 --- a/src/apps/deskcalc/CalcWindow.cpp +++ b/src/apps/deskcalc/CalcWindow.cpp @@ -21,7 +21,7 @@ #include "CalcView.h" -static const char* kWindowTitle = "Desk Calculator"; +static const char* kWindowTitle = "DeskCalc"; CalcWindow::CalcWindow(BRect frame) diff --git a/src/apps/midiplayer/MidiPlayerWindow.cpp b/src/apps/midiplayer/MidiPlayerWindow.cpp index 616ac105ce..add7381fce 100644 --- a/src/apps/midiplayer/MidiPlayerWindow.cpp +++ b/src/apps/midiplayer/MidiPlayerWindow.cpp @@ -35,7 +35,7 @@ //------------------------------------------------------------------------------ MidiPlayerWindow::MidiPlayerWindow() - : BWindow(BRect(0, 0, 1, 1), "MIDI Player", B_TITLED_WINDOW, + : BWindow(BRect(0, 0, 1, 1), "MidiPlayer", B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | B_NOT_RESIZABLE | B_NOT_ZOOMABLE) { playing = false; diff --git a/src/apps/soundrecorder/RecorderWindow.cpp b/src/apps/soundrecorder/RecorderWindow.cpp index 7d6b19323d..e7248c4fb7 100644 --- a/src/apps/soundrecorder/RecorderWindow.cpp +++ b/src/apps/soundrecorder/RecorderWindow.cpp @@ -98,7 +98,7 @@ struct wave_struct RecorderWindow::RecorderWindow() : - BWindow(BRect(XPOS,YPOS,XPOS+MIN_WIDTH,YPOS+MIN_HEIGHT), "Sound Recorder", B_TITLED_WINDOW, + BWindow(BRect(XPOS,YPOS,XPOS+MIN_WIDTH,YPOS+MIN_HEIGHT), "SoundRecorder", B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS | B_NOT_V_RESIZABLE), fPlayer(NULL), fSoundList(NULL), diff --git a/src/apps/tv/config.h b/src/apps/tv/config.h index f14b4c6962..3a0da76979 100644 --- a/src/apps/tv/config.h +++ b/src/apps/tv/config.h @@ -28,7 +28,7 @@ #include #include -#define NAME "TV-O-Rama" +#define NAME "TV" #define REVISION "unknown" #define VERSION "1.1" #define BUILD __DATE__ " "__TIME__ diff --git a/src/apps/tv/tv.rdef b/src/apps/tv/tv.rdef index 215e2b7d0e..19305fa00e 100644 --- a/src/apps/tv/tv.rdef +++ b/src/apps/tv/tv.rdef @@ -2,7 +2,7 @@ * Icon-O-Matic.rdef */ -resource app_signature "application/x-vnd.MarcusOverhagen.TV-O-Rama"; +resource app_signature "application/x-vnd.MarcusOverhagen.TV"; resource app_version { major = 1, @@ -15,8 +15,8 @@ resource app_version { internal = 0, - short_info = "TV-O-Rama", - long_info = "TV-O-Rama ©2005-2007 Marcus Overhagen" + short_info = "TV", + long_info = "TV ©2005-2007 Marcus Overhagen" }; resource app_flags B_SINGLE_LAUNCH; diff --git a/src/preferences/screensaver/ScreenSaverWindow.cpp b/src/preferences/screensaver/ScreenSaverWindow.cpp index fb93b0dfa5..1b1254caa3 100644 --- a/src/preferences/screensaver/ScreenSaverWindow.cpp +++ b/src/preferences/screensaver/ScreenSaverWindow.cpp @@ -574,7 +574,7 @@ ModulesView::_OpenSaver() ScreenSaverWindow::ScreenSaverWindow() - : BWindow(BRect(50, 50, 496, 375), "Screen Saver", + : BWindow(BRect(50, 50, 496, 375), "ScreenSaver", B_TITLED_WINDOW, B_ASYNCHRONOUS_CONTROLS /*| B_NOT_ZOOMABLE | B_NOT_RESIZABLE*/) { fSettings.Load(); diff --git a/src/tests/kits/game/chart/Chart.cpp b/src/tests/kits/game/chart/Chart.cpp index e0494be20a..5314c24ab2 100644 --- a/src/tests/kits/game/chart/Chart.cpp +++ b/src/tests/kits/game/chart/Chart.cpp @@ -29,7 +29,7 @@ main() ChartApp::ChartApp() : BApplication("application/x-vnd.Be.ChartDemo") { - fWindow = new ChartWindow(BRect(120, 150, 629, 591), "Charts"); + fWindow = new ChartWindow(BRect(120, 150, 629, 591), "Chart"); // showing the window will also start the direct connection. If you // Sync() after the show, the direct connection will be established diff --git a/src/tests/servers/app/bitmap_drawing/main.cpp b/src/tests/servers/app/bitmap_drawing/main.cpp index 5dcab353b0..28124bb98a 100644 --- a/src/tests/servers/app/bitmap_drawing/main.cpp +++ b/src/tests/servers/app/bitmap_drawing/main.cpp @@ -564,7 +564,7 @@ main(int argc, char** argv) // BRect frame(10.0, 30.0, 790.0, 590.0); BRect frame(10.0, 30.0, 330.0, 220.0); - show_window(frame, "Bitmap Drawing"); + show_window(frame, "BitmapDrawing"); app->Run();