From 62769fc6d5b7ee60cea4d6e289316a5e20e0c5d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Sundstr=C3=B6m?= Date: Sat, 26 Mar 2011 17:29:28 +0000 Subject: [PATCH] Follow-up on r41108. Removal of About-windows and menu items. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41115 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/deskcalc/CalcView.cpp | 1 - src/apps/diskprobe/FileWindow.cpp | 1 - src/apps/launchbox/App.cpp | 12 --------- src/apps/launchbox/App.h | 1 - src/apps/launchbox/MainWindow.cpp | 3 --- src/apps/launchbox/PadView.cpp | 4 --- src/apps/mail/MailApp.cpp | 26 ------------------- src/apps/mail/MailApp.h | 1 - src/apps/mail/MailWindow.cpp | 6 ----- src/preferences/filetypes/FileTypes.cpp | 24 ----------------- src/preferences/filetypes/FileTypesWindow.cpp | 4 --- src/preferences/shortcuts/ShortcutsApp.cpp | 18 +------------ src/preferences/shortcuts/ShortcutsApp.h | 1 - src/preferences/shortcuts/ShortcutsWindow.cpp | 7 ----- 14 files changed, 1 insertion(+), 108 deletions(-) diff --git a/src/apps/deskcalc/CalcView.cpp b/src/apps/deskcalc/CalcView.cpp index 5e1d05537f..74580b2743 100644 --- a/src/apps/deskcalc/CalcView.cpp +++ b/src/apps/deskcalc/CalcView.cpp @@ -1121,7 +1121,6 @@ CalcView::_CreatePopUpMenu() // preflet. // fPopUpMenu->AddItem(fAudioFeedbackItem); fPopUpMenu->AddItem(fShowKeypadItem); - fPopUpMenu->AddSeparatorItem(); } diff --git a/src/apps/diskprobe/FileWindow.cpp b/src/apps/diskprobe/FileWindow.cpp index 32a459e580..60b216b514 100644 --- a/src/apps/diskprobe/FileWindow.cpp +++ b/src/apps/diskprobe/FileWindow.cpp @@ -79,7 +79,6 @@ FileWindow::FileWindow(BRect rect, entry_ref *ref, const BMessage *settings) menu->AddSeparatorItem(); // the ProbeView print menu items will be inserted here - menu->AddSeparatorItem(); menu->AddItem(new BMenuItem(B_TRANSLATE("Quit"), new BMessage(B_QUIT_REQUESTED), 'Q', B_COMMAND_KEY)); diff --git a/src/apps/launchbox/App.cpp b/src/apps/launchbox/App.cpp index d572aeb4b6..f9c0f54620 100644 --- a/src/apps/launchbox/App.cpp +++ b/src/apps/launchbox/App.cpp @@ -7,7 +7,6 @@ #include -#include #include #include #include @@ -104,17 +103,6 @@ App::MessageReceived(BMessage* message) } -void -App::AboutRequested() -{ - const char* authors[2]; - authors[0] = B_TRANSLATE("Stephan Aßmus (aka stippi)"); - authors[1] = NULL; - BString appName = B_TRANSLATE_SYSTEM_NAME("LaunchBox"); - BAboutWindow(appName, 2004, authors).Show(); -} - - void App::Pulse() { diff --git a/src/apps/launchbox/App.h b/src/apps/launchbox/App.h index 00a3f75945..9d2465ad94 100644 --- a/src/apps/launchbox/App.h +++ b/src/apps/launchbox/App.h @@ -18,7 +18,6 @@ public: virtual bool QuitRequested(); virtual void ReadyToRun(); virtual void MessageReceived(BMessage* message); - virtual void AboutRequested(); virtual void Pulse(); private: diff --git a/src/apps/launchbox/MainWindow.cpp b/src/apps/launchbox/MainWindow.cpp index 40c77b1709..e4ca7da6ec 100644 --- a/src/apps/launchbox/MainWindow.cpp +++ b/src/apps/launchbox/MainWindow.cpp @@ -252,9 +252,6 @@ MainWindow::MessageReceived(BMessage* message) case B_PASTE: case B_MODIFIERS_CHANGED: break; - case B_ABOUT_REQUESTED: - be_app->PostMessage(message); - break; default: BWindow::MessageReceived(message); break; diff --git a/src/apps/launchbox/PadView.cpp b/src/apps/launchbox/PadView.cpp index dee1cd7377..aa24e4661d 100644 --- a/src/apps/launchbox/PadView.cpp +++ b/src/apps/launchbox/PadView.cpp @@ -425,10 +425,6 @@ PadView::DisplayMenu(BPoint where, LaunchButton* button) const // app commands BMenu* appM = new BMenu(B_TRANSLATE_SYSTEM_NAME("LaunchBox")); appM->SetFont(be_plain_font); - // about - item = new BMenuItem(B_TRANSLATE("About"), new BMessage(B_ABOUT_REQUESTED)); - item->SetTarget(be_app); - appM->AddItem(item); // quit item = new BMenuItem(B_TRANSLATE("Quit"), new BMessage(B_QUIT_REQUESTED)); item->SetTarget(be_app); diff --git a/src/apps/mail/MailApp.cpp b/src/apps/mail/MailApp.cpp index 0e87d9022e..f1a471ea30 100644 --- a/src/apps/mail/MailApp.cpp +++ b/src/apps/mail/MailApp.cpp @@ -144,32 +144,6 @@ TMailApp::~TMailApp() } -void -TMailApp::AboutRequested() -{ - BString aboutText; - aboutText << B_TRANSLATE("Mail\n\n"); - int titleLength = aboutText.Length(); - aboutText << B_TRANSLATE( - "Written by Robert Polic.\n" - "Enhanced by the Dr. Zoidberg crew.\n\n" - "Copyright 1991-2001, Be Incorporated.\n" - "Copyright 2005-2010 Haiku, Inc.\n"); - BAlert *alert = new BAlert("about", aboutText, B_TRANSLATE("OK")); - BTextView *view = alert->TextView(); - BFont font; - - view->SetStylable(true); - - view->GetFont(&font); - font.SetSize(font.Size() + 7.0f); - font.SetFace(B_BOLD_FACE); - view->SetFontAndColor(0, titleLength, &font); - - alert->Go(); -} - - void TMailApp::ArgvReceived(int32 argc, char **argv) { diff --git a/src/apps/mail/MailApp.h b/src/apps/mail/MailApp.h index f01cd8480a..516de1b1ad 100644 --- a/src/apps/mail/MailApp.h +++ b/src/apps/mail/MailApp.h @@ -54,7 +54,6 @@ class TMailApp : public BApplication { TMailApp(); virtual ~TMailApp(); - virtual void AboutRequested(); virtual void ArgvReceived(int32, char**); virtual void MessageReceived(BMessage*); virtual bool QuitRequested(); diff --git a/src/apps/mail/MailWindow.cpp b/src/apps/mail/MailWindow.cpp index 79edef3ccd..ec9511feb8 100644 --- a/src/apps/mail/MailWindow.cpp +++ b/src/apps/mail/MailWindow.cpp @@ -300,12 +300,6 @@ TMailWindow::TMailWindow(BRect rect, const char* title, TMailApp* app, new BMessage(M_PRINT), 'P')); fMenuBar->AddItem(menu); - menu->AddSeparatorItem(); - menu->AddItem(item = new BMenuItem( - B_TRANSLATE("About Mail" B_UTF8_ELLIPSIS), - new BMessage(B_ABOUT_REQUESTED))); - item->SetTarget(be_app); - menu->AddSeparatorItem(); menu->AddItem(item = new BMenuItem(B_TRANSLATE("Quit"), new BMessage(B_QUIT_REQUESTED), 'Q')); diff --git a/src/preferences/filetypes/FileTypes.cpp b/src/preferences/filetypes/FileTypes.cpp index 0acb3a850e..d29609990b 100644 --- a/src/preferences/filetypes/FileTypes.cpp +++ b/src/preferences/filetypes/FileTypes.cpp @@ -64,7 +64,6 @@ public: virtual void ArgvReceived(int32 argc, char** argv); virtual void MessageReceived(BMessage* message); - virtual void AboutRequested(); virtual bool QuitRequested(); private: @@ -416,29 +415,6 @@ FileTypes::MessageReceived(BMessage* message) } -void -FileTypes::AboutRequested() -{ - BString aboutText(B_TRANSLATE("FileTypes")); - int32 titleLength = aboutText.Length(); - aboutText << "\n"; - aboutText << B_TRANSLATE("\twritten by Axel Dörfler\n" - "\tCopyright 2006-2007, Haiku.\n"); - BAlert* alert = new BAlert("about", aboutText.String(), B_TRANSLATE("OK")); - BTextView* view = alert->TextView(); - BFont font; - - view->SetStylable(true); - - view->GetFont(&font); - font.SetSize(18); - font.SetFace(B_BOLD_FACE); - view->SetFontAndColor(0, titleLength, &font); - - alert->Go(); -} - - bool FileTypes::QuitRequested() { diff --git a/src/preferences/filetypes/FileTypesWindow.cpp b/src/preferences/filetypes/FileTypesWindow.cpp index 3cec8aa7a9..6812baa6f2 100644 --- a/src/preferences/filetypes/FileTypesWindow.cpp +++ b/src/preferences/filetypes/FileTypesWindow.cpp @@ -345,10 +345,6 @@ FileTypesWindow::FileTypesWindow(const BMessage& settings) new BMessage(kMsgOpenApplicationTypesWindow))); menu->AddSeparatorItem(); - menu->AddItem(new BMenuItem(B_TRANSLATE("About FileTypes" B_UTF8_ELLIPSIS), - new BMessage(B_ABOUT_REQUESTED))); - menu->AddSeparatorItem(); - menu->AddItem(new BMenuItem(B_TRANSLATE("Quit"), new BMessage(B_QUIT_REQUESTED), 'Q', B_COMMAND_KEY)); menu->SetTargetForItems(be_app); diff --git a/src/preferences/shortcuts/ShortcutsApp.cpp b/src/preferences/shortcuts/ShortcutsApp.cpp index 5307ca9c10..7662966dc3 100644 --- a/src/preferences/shortcuts/ShortcutsApp.cpp +++ b/src/preferences/shortcuts/ShortcutsApp.cpp @@ -10,22 +10,18 @@ #include "ShortcutsApp.h" -#include #include -#include #include "ShortcutsWindow.h" -#define APPLICATION_SIGNATURE "application/x-vnd.Haiku-Shortcuts" - #undef B_TRANSLATE_CONTEXT #define B_TRANSLATE_CONTEXT "ShortcutsApp" ShortcutsApp::ShortcutsApp() : - BApplication(APPLICATION_SIGNATURE) + BApplication("application/x-vnd.Haiku-Shortcuts") { } @@ -41,15 +37,3 @@ ShortcutsApp::ReadyToRun() ShortcutsApp::~ShortcutsApp() { } - - -void -ShortcutsApp::AboutRequested() -{ - BAlert* alert = new BAlert(B_TRANSLATE("About Shortcuts"), - B_TRANSLATE("Shortcuts\n\n" - "Based on SpicyKeys for BeOS made by Jeremy Friesner."), - B_TRANSLATE("OK")); - alert->Go(); -} - diff --git a/src/preferences/shortcuts/ShortcutsApp.h b/src/preferences/shortcuts/ShortcutsApp.h index 0dfa5ca3f0..19b90319d1 100644 --- a/src/preferences/shortcuts/ShortcutsApp.h +++ b/src/preferences/shortcuts/ShortcutsApp.h @@ -18,7 +18,6 @@ public: ShortcutsApp(); ~ShortcutsApp(); virtual void ReadyToRun(); - virtual void AboutRequested(); }; diff --git a/src/preferences/shortcuts/ShortcutsWindow.cpp b/src/preferences/shortcuts/ShortcutsWindow.cpp index 98a863be4b..b4c6e6b169 100644 --- a/src/preferences/shortcuts/ShortcutsWindow.cpp +++ b/src/preferences/shortcuts/ShortcutsWindow.cpp @@ -121,9 +121,6 @@ ShortcutsWindow::ShortcutsWindow() B_TRANSLATE("Save KeySet as" B_UTF8_ELLIPSIS), new BMessage(SAVE_KEYSET_AS), 'S')); fileMenu->AddItem(new BSeparatorItem); - fileMenu->AddItem(new BMenuItem(B_TRANSLATE("About Shortcuts"), - new BMessage(B_ABOUT_REQUESTED))); - fileMenu->AddItem(new BSeparatorItem); fileMenu->AddItem(new BMenuItem(B_TRANSLATE("Quit"), new BMessage(B_QUIT_REQUESTED), 'Q')); menuBar->AddItem(fileMenu); @@ -537,10 +534,6 @@ ShortcutsWindow::MessageReceived(BMessage* msg) break; } - case B_ABOUT_REQUESTED: - be_app_messenger.SendMessage(B_ABOUT_REQUESTED); - break; - case ADD_HOTKEY_ITEM: _AddNewSpec(NULL); break;