diff --git a/src/apps/3dmov/MainWindow.cpp b/src/apps/3dmov/MainWindow.cpp index dadee0ae53..b1e92457cf 100644 --- a/src/apps/3dmov/MainWindow.cpp +++ b/src/apps/3dmov/MainWindow.cpp @@ -24,20 +24,12 @@ static const float MENU_BAR_HEIGHT = 19; static const unsigned int MSG_FILE_OPEN = 'fopn'; -static const unsigned int MSG_ABOUT = 'info'; static const unsigned int MSG_SHAPE_BOOK = 'spbk'; static const unsigned int MSG_SHAPE_CUBE = 'spcb'; static const unsigned int MSG_SHAPE_SPHERE = 'spsp'; static const unsigned int MSG_OPTION_WIREFRAME = 'opwf'; static const unsigned int MSG_FULLSCREEN = 'full'; -static const char *ABOUT_TEXT = "\ -Drag and drop media files (pictures and videos) onto the 3D shapes. \ -Use your mouse to interact with the 3D shape.\n\ -Pick up your jaw from the floor.\n\n\ -Inspired by the original BeInc 3dmov demo.\n\ -Written by Zenja Solaja, 2009"; - // Local functions static int32 animation_thread(void *cookie); @@ -111,7 +103,6 @@ void MainWindow :: SetupMenuBar(BRect frame) // File BMenu *menu_file = new BMenu("File"); //menu_file->AddItem(new BMenuItem("Open", new BMessage(MSG_FILE_OPEN), 'N')); - menu_file->AddItem(new BMenuItem("About", new BMessage(MSG_ABOUT))); menu_file->AddItem(new BMenuItem("Exit", new BMessage(B_QUIT_REQUESTED))); // Shape @@ -146,14 +137,6 @@ void MainWindow :: MessageReceived(BMessage *message) SetFullScreen(!IsFullScreen()); break; - case MSG_ABOUT: - { - BAlert *about = new BAlert("3Dmov", ABOUT_TEXT, "Wow"); - about->SetShortcut(0, B_ESCAPE); - about->Go(NULL); - break; - } - /* TODO - Due to a bug when creating a 2nd BGLView in Haiku, I've decided to spawn a new window instead of creating a new BGLView (and using AddChild(new_view) / RemoveChild(old_view). Under Zeta, there is no problem replacing the current view with a new view. diff --git a/src/apps/activitymonitor/ActivityWindow.cpp b/src/apps/activitymonitor/ActivityWindow.cpp index 18f6397d99..08b2b84e0c 100644 --- a/src/apps/activitymonitor/ActivityWindow.cpp +++ b/src/apps/activitymonitor/ActivityWindow.cpp @@ -8,7 +8,6 @@ #include -#include #include #include #include @@ -119,19 +118,13 @@ ActivityWindow::ActivityWindow() // "File" menu BMenu* menu = new BMenu(B_TRANSLATE("File")); - BMenuItem* item; - menu->AddItem(new BMenuItem(B_TRANSLATE("Add graph"), new BMessage(kMsgAddView))); menu->AddSeparatorItem(); - menu->AddItem(item = new BAboutMenuItem()); - menu->AddSeparatorItem(); - menu->AddItem(new BMenuItem(B_TRANSLATE("Quit"), new BMessage(B_QUIT_REQUESTED), 'Q')); menu->SetTargetForItems(this); - item->SetTarget(be_app); menuBar->AddItem(menu); // "Settings" menu diff --git a/src/apps/bootmanager/BootManager.cpp b/src/apps/bootmanager/BootManager.cpp index 6ebcf82ffa..4060d7cd93 100644 --- a/src/apps/bootmanager/BootManager.cpp +++ b/src/apps/bootmanager/BootManager.cpp @@ -10,12 +10,8 @@ #include "BootManagerWindow.h" -#include -#include #include #include -#include -#include #undef B_TRANSLATE_CONTEXT @@ -30,7 +26,6 @@ public: BootManager(); virtual void ReadyToRun(); - virtual void AboutRequested(); }; @@ -49,20 +44,6 @@ BootManager::ReadyToRun() } -void -BootManager::AboutRequested() -{ - const char* authors[] = { - "David Dengg", - "Michael Pfeiffer", - NULL - }; - - BAboutWindow about(B_TRANSLATE_SYSTEM_NAME("BootManager"), 2008, authors); - about.Show(); -} - - // #pragma mark - diff --git a/src/apps/bootmanager/BootManagerWindow.cpp b/src/apps/bootmanager/BootManagerWindow.cpp index 6ef470655f..b0b4e39ef8 100644 --- a/src/apps/bootmanager/BootManagerWindow.cpp +++ b/src/apps/bootmanager/BootManagerWindow.cpp @@ -42,8 +42,6 @@ BootManagerWindow::BootManagerWindow() fController.Initialize(fWizardView); - AddShortcut('A', B_COMMAND_KEY, new BMessage(B_ABOUT_REQUESTED)); - CenterOnScreen(); // Prevent minimizing this window if the user would have no way to @@ -70,10 +68,6 @@ BootManagerWindow::MessageReceived(BMessage* msg) fController.Previous(fWizardView); break; - case B_ABOUT_REQUESTED: - be_app_messenger.SendMessage(B_ABOUT_REQUESTED); - break; - default: BWindow::MessageReceived(msg); } diff --git a/src/apps/bootmanager/Jamfile b/src/apps/bootmanager/Jamfile index 8d015e34cf..a141789323 100644 --- a/src/apps/bootmanager/Jamfile +++ b/src/apps/bootmanager/Jamfile @@ -22,7 +22,7 @@ Application BootManager : WizardController.cpp WizardPageView.cpp - : be libshared.a textencoding tracker $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++) + : be textencoding tracker $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++) : BootManager.rdef ; diff --git a/src/apps/charactermap/CharacterMap.cpp b/src/apps/charactermap/CharacterMap.cpp index b0f7a6d644..9afe5a3307 100644 --- a/src/apps/charactermap/CharacterMap.cpp +++ b/src/apps/charactermap/CharacterMap.cpp @@ -8,11 +8,8 @@ #include -#include -#include #include #include -#include #include "CharacterWindow.h" @@ -55,19 +52,6 @@ CharacterMap::MessageReceived(BMessage* message) } -void -CharacterMap::AboutRequested() -{ - const char* authors[] = { - "Axel Dörfler", - NULL - }; - - BAboutWindow about(B_TRANSLATE_SYSTEM_NAME("CharacterMap"), 2009, authors); - about.Show(); -} - - // #pragma mark - diff --git a/src/apps/charactermap/CharacterMap.h b/src/apps/charactermap/CharacterMap.h index 29c1e15dbb..7d99144bee 100644 --- a/src/apps/charactermap/CharacterMap.h +++ b/src/apps/charactermap/CharacterMap.h @@ -22,8 +22,6 @@ public: virtual void RefsReceived(BMessage* message); virtual void MessageReceived(BMessage* message); - virtual void AboutRequested(); - private: CharacterWindow* fWindow; }; diff --git a/src/apps/charactermap/CharacterWindow.cpp b/src/apps/charactermap/CharacterWindow.cpp index b90825f634..7e806e9c06 100644 --- a/src/apps/charactermap/CharacterWindow.cpp +++ b/src/apps/charactermap/CharacterWindow.cpp @@ -10,7 +10,6 @@ #include #include -#include #include #include #include @@ -228,14 +227,9 @@ CharacterWindow::CharacterWindow() BMenu* menu = new BMenu(B_TRANSLATE("File")); BMenuItem* item; - menu->AddItem(item = new BAboutMenuItem()); - - menu->AddSeparatorItem(); - menu->AddItem(new BMenuItem(B_TRANSLATE("Quit"), new BMessage(B_QUIT_REQUESTED), 'Q')); menu->SetTargetForItems(this); - item->SetTarget(be_app); menuBar->AddItem(menu); menu = new BMenu(B_TRANSLATE("View")); diff --git a/src/apps/charactermap/Jamfile b/src/apps/charactermap/Jamfile index c27ddb6e98..70dd91e310 100644 --- a/src/apps/charactermap/Jamfile +++ b/src/apps/charactermap/Jamfile @@ -11,7 +11,7 @@ Application CharacterMap : UnicodeBlocks.cpp UnicodeBlockView.cpp - : be libshared.a locale $(TARGET_LIBSUPC++) $(HAIKU_LOCALE_LIBS) + : be locale $(TARGET_LIBSUPC++) $(HAIKU_LOCALE_LIBS) : CharacterMap.rdef ; diff --git a/src/apps/codycam/CodyCam.cpp b/src/apps/codycam/CodyCam.cpp index 0deaca385c..0b1704ea21 100644 --- a/src/apps/codycam/CodyCam.cpp +++ b/src/apps/codycam/CodyCam.cpp @@ -4,8 +4,6 @@ #include #include -#include -#include #include #include #include @@ -270,21 +268,6 @@ CodyCam::MessageReceived(BMessage *message) } -void -CodyCam::AboutRequested() -{ - const char* authors[] = { - "Be, Incorporated", - NULL - }; - - BAboutWindow about(B_TRANSLATE_SYSTEM_NAME("CodyCam"), 2003, authors, - "The Original BeOS webcam.\n" - B_UTF8_COPYRIGHT " 1998-1999 Be, Incorporated."); - about.Show(); -} - - status_t CodyCam::_SetUpNodes() { @@ -522,12 +505,6 @@ VideoWindow::VideoWindow(BRect frame, const char* title, window_type type, menu->AddSeparatorItem(); - menuItem = new BAboutMenuItem(); - menuItem->SetTarget(be_app); - menu->AddItem(menuItem); - - menu->AddSeparatorItem(); - menuItem = new BMenuItem(B_TRANSLATE("Quit"), new BMessage(B_QUIT_REQUESTED), 'Q'); menuItem->SetTarget(be_app); diff --git a/src/apps/codycam/CodyCam.h b/src/apps/codycam/CodyCam.h index 8f1595396a..b87f4c327e 100644 --- a/src/apps/codycam/CodyCam.h +++ b/src/apps/codycam/CodyCam.h @@ -93,7 +93,6 @@ public: void ReadyToRun(); virtual bool QuitRequested(); virtual void MessageReceived(BMessage* message); - virtual void AboutRequested(); private: status_t _SetUpNodes(); diff --git a/src/apps/codycam/Jamfile b/src/apps/codycam/Jamfile index 51c49aea2a..ced6af6fd3 100644 --- a/src/apps/codycam/Jamfile +++ b/src/apps/codycam/Jamfile @@ -13,7 +13,7 @@ Application CodyCam : Settings.cpp SettingsHandler.cpp VideoConsumer.cpp - : be $(HAIKU_LOCALE_LIBS) libshared.a media translation $(TARGET_NETAPI_LIB) + : be $(HAIKU_LOCALE_LIBS) media translation $(TARGET_NETAPI_LIB) $(TARGET_LIBSTDC++) : CodyCam.rdef ; diff --git a/src/apps/deskcalc/CalcView.cpp b/src/apps/deskcalc/CalcView.cpp index 41eb560b12..5e1d05537f 100644 --- a/src/apps/deskcalc/CalcView.cpp +++ b/src/apps/deskcalc/CalcView.cpp @@ -17,7 +17,6 @@ #include #include -#include #include #include #include @@ -121,8 +120,6 @@ CalcView::CalcView(BRect frame, rgb_color rgbBaseColor, BMessage* settings) fAutoNumlockItem(NULL), fAudioFeedbackItem(NULL), fShowKeypadItem(NULL), - fAboutItem(NULL), - fOptions(new CalcOptions()), fShowKeypad(true) { @@ -173,8 +170,6 @@ CalcView::CalcView(BMessage* archive) fAutoNumlockItem(NULL), fAudioFeedbackItem(NULL), fShowKeypadItem(NULL), - fAboutItem(NULL), - fOptions(new CalcOptions()), fShowKeypad(true) { @@ -1112,7 +1107,6 @@ CalcView::_CreatePopUpMenu() new BMessage(MSG_OPTIONS_AUDIO_FEEDBACK)); fShowKeypadItem = new BMenuItem(B_TRANSLATE("Show keypad"), new BMessage(MSG_OPTIONS_SHOW_KEYPAD)); - fAboutItem = new BAboutMenuItem(); // apply current settings fAutoNumlockItem->SetMarked(fOptions->auto_num_lock); @@ -1128,7 +1122,6 @@ CalcView::_CreatePopUpMenu() // fPopUpMenu->AddItem(fAudioFeedbackItem); fPopUpMenu->AddItem(fShowKeypadItem); fPopUpMenu->AddSeparatorItem(); - fPopUpMenu->AddItem(fAboutItem); } diff --git a/src/apps/deskcalc/CalcView.h b/src/apps/deskcalc/CalcView.h index 4bc5348187..9333e81d28 100644 --- a/src/apps/deskcalc/CalcView.h +++ b/src/apps/deskcalc/CalcView.h @@ -120,7 +120,6 @@ class CalcView : public BView { BMenuItem* fAutoNumlockItem; BMenuItem* fAudioFeedbackItem; BMenuItem* fShowKeypadItem; - BMenuItem* fAboutItem; // calculator options. CalcOptions* fOptions; diff --git a/src/apps/devices/DevicesApplication.cpp b/src/apps/devices/DevicesApplication.cpp index e88e077394..1cecd334d6 100644 --- a/src/apps/devices/DevicesApplication.cpp +++ b/src/apps/devices/DevicesApplication.cpp @@ -6,7 +6,6 @@ * Pieter Panman */ -#include #include #include #include @@ -20,8 +19,6 @@ class DevicesApplication : public BApplication { public: DevicesApplication(); - virtual void AboutRequested(); - static void ShowAbout(); }; @@ -44,27 +41,6 @@ DevicesApplication::DevicesApplication() } -void -DevicesApplication::AboutRequested() -{ - ShowAbout(); -} - - -void -DevicesApplication::ShowAbout() -{ - const char* authors[] = { - "Pieter Panman", - NULL - }; - BAboutWindow about(B_TRANSLATE_SYSTEM_NAME("Devices"), 2009, authors, - "Based on listdev by Jérôme Duval and the previous Devices " - "preference by Jérôme Duval and Sikosis."); - about.Show(); -} - - DevicesWindow::DevicesWindow() : BWindow(BRect(50, 50, 750, 550), B_TRANSLATE_SYSTEM_NAME("Devices"), diff --git a/src/apps/devices/DevicesView.cpp b/src/apps/devices/DevicesView.cpp index dad2a5002c..442be43e04 100644 --- a/src/apps/devices/DevicesView.cpp +++ b/src/apps/devices/DevicesView.cpp @@ -7,7 +7,6 @@ */ -#include #include #include #include @@ -45,8 +44,6 @@ DevicesView::CreateLayout() "Generate system information"), new BMessage(kMsgGenerateSysInfo))); item->SetEnabled(false); menu->AddSeparatorItem(); - menu->AddItem(item = new BAboutMenuItem()); - menu->AddSeparatorItem(); menu->AddItem(new BMenuItem(B_TRANSLATE("Quit"), new BMessage(B_QUIT_REQUESTED), 'Q')); menu->SetTargetForItems(this); diff --git a/src/apps/devices/Jamfile b/src/apps/devices/Jamfile index c849f4c933..fe7b609b71 100644 --- a/src/apps/devices/Jamfile +++ b/src/apps/devices/Jamfile @@ -72,7 +72,7 @@ Application Devices : Device.cpp PropertyList.cpp PropertyListPlain.cpp - : be libcolumnlistview.a libshared.a tracker $(TARGET_LIBSUPC++) + : be libcolumnlistview.a tracker $(TARGET_LIBSUPC++) $(TARGET_LIBSTDC++) $(HAIKU_LOCALE_LIBS) : Devices.rdef ; diff --git a/src/apps/diskprobe/DiskProbe.cpp b/src/apps/diskprobe/DiskProbe.cpp index 621f1a470f..df351aff78 100644 --- a/src/apps/diskprobe/DiskProbe.cpp +++ b/src/apps/diskprobe/DiskProbe.cpp @@ -77,7 +77,6 @@ class DiskProbe : public BApplication { virtual void ArgvReceived(int32 argc, char **argv); virtual void MessageReceived(BMessage *message); - virtual void AboutRequested(); virtual bool QuitRequested(); private: @@ -483,20 +482,6 @@ DiskProbe::MessageReceived(BMessage *message) } -void -DiskProbe::AboutRequested() -{ - const char* authors[] = { - "Axel Dörfler", - NULL - }; - - BAboutWindow about(B_TRANSLATE_SYSTEM_NAME("DiskProbe"), 2004, authors, - "Original Be version by Robert Polic."); - about.Show(); -} - - bool DiskProbe::QuitRequested() { diff --git a/src/apps/diskprobe/FileWindow.cpp b/src/apps/diskprobe/FileWindow.cpp index a1e9e01cc3..32a459e580 100644 --- a/src/apps/diskprobe/FileWindow.cpp +++ b/src/apps/diskprobe/FileWindow.cpp @@ -81,10 +81,6 @@ FileWindow::FileWindow(BRect rect, entry_ref *ref, const BMessage *settings) // the ProbeView print menu items will be inserted here menu->AddSeparatorItem(); - menu->AddItem(new BMenuItem(B_TRANSLATE("About DiskProbe" 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/apps/diskprobe/Jamfile b/src/apps/diskprobe/Jamfile index 13b06fb6e4..466886e450 100644 --- a/src/apps/diskprobe/Jamfile +++ b/src/apps/diskprobe/Jamfile @@ -16,7 +16,7 @@ Application DiskProbe : OpenWindow.cpp FindWindow.cpp : be $(HAIKU_LOCALE_LIBS) tracker translation libexpression_parser.a - libmapm.a libshared.a $(TARGET_LIBSUPC++) + libmapm.a $(TARGET_LIBSUPC++) : DiskProbe.rdef ; diff --git a/src/apps/expander/ExpanderApp.cpp b/src/apps/expander/ExpanderApp.cpp index 6c5e473a51..e303303a00 100644 --- a/src/apps/expander/ExpanderApp.cpp +++ b/src/apps/expander/ExpanderApp.cpp @@ -6,12 +6,6 @@ #include "ExpanderApp.h" -#include -#include -#include -#include -#include - #include "ExpanderWindow.h" @@ -27,28 +21,6 @@ ExpanderApp::ExpanderApp() } -#undef B_TRANSLATE_CONTEXT -#define B_TRANSLATE_CONTEXT "About" - -void -ExpanderApp::AboutRequested() -{ - const char* authors[] = { - "Jérôme Duval", - NULL - }; - BAboutWindow about(B_TRANSLATE_SYSTEM_NAME("Expander"), 2004, authors, - "Original Be version by Dominic, Hiroshi, Peter, Pavel and Robert."); - about.Show(); -} - - -void -ExpanderApp::ReadyToRun() -{ -} - - void ExpanderApp::ArgvReceived(int32 argc, char **argv) { diff --git a/src/apps/expander/ExpanderApp.h b/src/apps/expander/ExpanderApp.h index 3ac5af8da5..5ad8306b71 100644 --- a/src/apps/expander/ExpanderApp.h +++ b/src/apps/expander/ExpanderApp.h @@ -25,29 +25,29 @@ // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // DEALINGS IN THE SOFTWARE. /*****************************************************************************/ - #ifndef _ExpanderApp_h #define _ExpanderApp_h + #include -#include + #include "ExpanderSettings.h" #include "ExpanderWindow.h" + class ExpanderApp : public BApplication { - public: - ExpanderApp(); +public: + ExpanderApp(); - public: - virtual void AboutRequested(); - virtual void ArgvReceived(int32 argc, char **argv); - virtual void ReadyToRun(); - virtual void RefsReceived(BMessage *msg); + virtual void ArgvReceived(int32 argc, char** argv); + virtual void RefsReceived(BMessage* msg); - ExpanderSettings fSettings; - void UpdateSettingsFrom(BMessage *message); - private: - ExpanderWindow *fWindow; + void UpdateSettingsFrom(BMessage* message); + + ExpanderSettings fSettings; +private: + ExpanderWindow* fWindow; }; -#endif /* _ExpanderApp_h */ + +#endif // _ExpanderApp_h diff --git a/src/apps/expander/ExpanderWindow.cpp b/src/apps/expander/ExpanderWindow.cpp index 22e09793fa..c2c0701db0 100644 --- a/src/apps/expander/ExpanderWindow.cpp +++ b/src/apps/expander/ExpanderWindow.cpp @@ -514,11 +514,6 @@ ExpanderWindow::_AddMenuBar(BLayout* layout) { fBar = new BMenuBar("menu_bar", B_ITEMS_IN_ROW, B_INVALIDATE_AFTER_LAYOUT); BMenu* menu = new BMenu(B_TRANSLATE("File")); - BMenuItem* item; - menu->AddItem(item = new BMenuItem(B_TRANSLATE("About Expander…"), - new BMessage(B_ABOUT_REQUESTED))); - item->SetTarget(be_app_messenger); - menu->AddSeparatorItem(); menu->AddItem(fSourceItem = new BMenuItem(B_TRANSLATE("Set source…"), new BMessage(MSG_SOURCE), 'O')); menu->AddItem(fDestItem = new BMenuItem(B_TRANSLATE("Set destination…"), diff --git a/src/apps/expander/Jamfile b/src/apps/expander/Jamfile index 1ae430ed7b..d1d13ab13d 100644 --- a/src/apps/expander/Jamfile +++ b/src/apps/expander/Jamfile @@ -12,14 +12,13 @@ Application Expander : DirectoryFilePanel.cpp ExpanderRules.cpp PasswordAlert.cpp - : be libshared.a tracker $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++) + : be tracker $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++) : Expander.rdef ; DoCatalogs Expander : x-vnd.Haiku-Expander : - ExpanderApp.cpp ExpanderWindow.cpp ExpanderPreferences.cpp ExpanderSettings.cpp diff --git a/src/apps/glteapot/TeapotApp.h b/src/apps/glteapot/TeapotApp.h index 61ea1cac28..3a35ec4ab6 100644 --- a/src/apps/glteapot/TeapotApp.h +++ b/src/apps/glteapot/TeapotApp.h @@ -2,19 +2,22 @@ Copyright 1999, Be Incorporated. All Rights Reserved. This file may be used under the terms of the Be Sample Code License. */ - #ifndef _TEAPOT_APP_ #define _TEAPOT_APP_ + #include + #include "TeapotWindow.h" + class TeapotApp : public BApplication { - public: - TeapotApp(const char* sign); - virtual void MessageReceived(BMessage* msg); -// void AboutRequested(); - private: - TeapotWindow* fTeapotWindow; +public: + TeapotApp(const char* sign); + virtual void MessageReceived(BMessage* msg); + +private: + TeapotWindow* fTeapotWindow; }; + #endif diff --git a/src/apps/haiku3d/App.cpp b/src/apps/haiku3d/App.cpp index 8860bbbc6d..4302c1f943 100644 --- a/src/apps/haiku3d/App.cpp +++ b/src/apps/haiku3d/App.cpp @@ -6,9 +6,9 @@ * Alexandre Deckner */ -#include #include "App.h" + #include "MainWindow.h" @@ -35,15 +35,6 @@ App::ReadyToRun() } -void -App::AboutRequested() -{ - BAlert* alert; - alert = new BAlert("About", "A little 3D demo", "OK"); - alert->Go(NULL); -} - - bool App::QuitRequested() { diff --git a/src/apps/haiku3d/App.h b/src/apps/haiku3d/App.h index b71609777d..df609d2046 100644 --- a/src/apps/haiku3d/App.h +++ b/src/apps/haiku3d/App.h @@ -5,23 +5,23 @@ * Authors: * Alexandre Deckner */ - #ifndef _APP_H #define _APP_H + #include -class App: public BApplication { -public: - App(); - virtual ~App(); - virtual void ReadyToRun(); - virtual void AboutRequested(); - virtual bool QuitRequested(); +class App : public BApplication { +public: + App(); + virtual ~App(); + + virtual void ReadyToRun(); + virtual bool QuitRequested(); protected: - BWindow* fMainWindow; + BWindow* fMainWindow; }; #endif /* _APP_H */ diff --git a/src/apps/installedpackages/main.cpp b/src/apps/installedpackages/main.cpp index 6f025f9bad..56fd2165e4 100644 --- a/src/apps/installedpackages/main.cpp +++ b/src/apps/installedpackages/main.cpp @@ -30,8 +30,6 @@ public: UninstallApplication(); ~UninstallApplication(); - void AboutRequested(); - private: UninstallWindow* fWindow; }; @@ -52,32 +50,6 @@ UninstallApplication::~UninstallApplication() } -void -UninstallApplication::AboutRequested() -{ - BString aboutString = B_TRANSLATE("InstalledPackages"); - int appNameLength = aboutString.Length(); - aboutString << "\n"; - aboutString << B_TRANSLATE( - "BeOS legacy .pkg package removing application " - "for Haiku.\n\n" - "Copyright 2007,\nŁukasz 'Sil2100' Zemczak\n\n" - "Copyright (c) 2007 Haiku, Inc.\n"); - BAlert* about = new BAlert("about", aboutString.String(), - B_TRANSLATE("Close")); - - BTextView* view = about->TextView(); - BFont font; - view->SetStylable(true); - view->GetFont(&font); - font.SetFace(B_BOLD_FACE); - font.SetSize(font.Size() * 1.5); - view->SetFontAndColor(0, appNameLength, &font); - - about->Go(); -} - - int main() { diff --git a/src/apps/magnify/Jamfile b/src/apps/magnify/Jamfile index a4df1c62de..9bd4dbf87f 100644 --- a/src/apps/magnify/Jamfile +++ b/src/apps/magnify/Jamfile @@ -8,7 +8,7 @@ UsePrivateHeaders shared ; Application Magnify : Magnify.cpp - : be game $(HAIKU_LOCALE_LIBS) libshared.a $(TARGET_LIBSUPC++) tracker + : be game $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++) tracker : Magnify.rdef ; diff --git a/src/apps/magnify/Magnify.cpp b/src/apps/magnify/Magnify.cpp index 78040402d0..288e3c667d 100644 --- a/src/apps/magnify/Magnify.cpp +++ b/src/apps/magnify/Magnify.cpp @@ -10,7 +10,6 @@ #include "Magnify.h" -#include #include #include #include @@ -132,8 +131,6 @@ static void BuildInfoMenu(BMenu *menu) { BMenuItem* menuItem; - menuItem = new BAboutMenuItem(); - menu->AddItem(menuItem); menuItem = new BMenuItem(B_TRANSLATE("Help"), new BMessage(msg_help)); menu->AddItem(menuItem); @@ -202,37 +199,6 @@ TApp::TApp(int32 pixelCount) } -void -TApp::MessageReceived(BMessage* msg) -{ - switch (msg->what) { - case B_ABOUT_REQUESTED: - AboutRequested(); - break; - default: - BApplication::MessageReceived(msg); - break; - } -} - - -void -TApp::ReadyToRun() -{ - BApplication::ReadyToRun(); -} - - -void -TApp::AboutRequested() -{ - (new BAlert("", B_TRANSLATE("Magnify!\n\n" B_UTF8_COPYRIGHT - "2002-2006 Haiku\n(C)1999 Be Inc.\n\n" - "Now with even more features and recompiled for Haiku."), - B_TRANSLATE("OK")))->Go(); -} - - // #pragma mark - @@ -263,7 +229,6 @@ TWindow::TWindow(int32 pixelCount) ResizeWindow(fHPixelCount, fVPixelCount); - AddShortcut('I', B_COMMAND_KEY, new BMessage(B_ABOUT_REQUESTED)); AddShortcut('S', B_COMMAND_KEY, new BMessage(msg_save)); AddShortcut('C', B_COMMAND_KEY, new BMessage(msg_copy_image)); AddShortcut('T', B_COMMAND_KEY, new BMessage(msg_show_info)); @@ -291,10 +256,6 @@ TWindow::MessageReceived(BMessage* m) bool active = fFatBits->Active(); switch (m->what) { - case B_ABOUT_REQUESTED: - be_app->MessageReceived(m); - break; - case msg_help: ShowHelp(); break; diff --git a/src/apps/magnify/Magnify.h b/src/apps/magnify/Magnify.h index c9388dd4b1..2e3e7a4e83 100644 --- a/src/apps/magnify/Magnify.h +++ b/src/apps/magnify/Magnify.h @@ -254,10 +254,6 @@ class TWindow : public BWindow { class TApp : public BApplication { public: TApp(int32 pixelCount = -1); - - virtual void MessageReceived(BMessage* message); - virtual void ReadyToRun(); - virtual void AboutRequested(); }; #endif // MAGNIFY_H diff --git a/src/apps/mediaconverter/Jamfile b/src/apps/mediaconverter/Jamfile index 541a37316b..81098f02a5 100644 --- a/src/apps/mediaconverter/Jamfile +++ b/src/apps/mediaconverter/Jamfile @@ -12,7 +12,7 @@ Application MediaConverter : MediaFileInfoView.cpp MediaFileListView.cpp - : be libshared.a media tracker $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSTDC++) + : be media tracker $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSTDC++) : MediaConverter.rdef ; diff --git a/src/apps/mediaconverter/MediaConverterWindow.cpp b/src/apps/mediaconverter/MediaConverterWindow.cpp index d4a1ae399a..423a11b268 100644 --- a/src/apps/mediaconverter/MediaConverterWindow.cpp +++ b/src/apps/mediaconverter/MediaConverterWindow.cpp @@ -9,7 +9,6 @@ #include #include -#include #include #include #include @@ -384,20 +383,6 @@ MediaConverterWindow::MessageReceived(BMessage* msg) case B_CANCEL: break; - case B_ABOUT_REQUESTED: - { - BString title(B_TRANSLATE("About" B_UTF8_ELLIPSIS)); - (new BAlert(title, - B_TRANSLATE("MediaConverter\n" - VERSION"\n" - B_UTF8_COPYRIGHT" 1999, Be Incorporated.\n" - B_UTF8_COPYRIGHT" 2000-2004 Jun Suzuki\n" - B_UTF8_COPYRIGHT" 2007 Stephan Aßmus\n" - B_UTF8_COPYRIGHT" 2010 Haiku, Inc."), - B_TRANSLATE("OK")))->Go(); - break; - } - case QUIT_MESSAGE: MediaConverterWindow::QuitRequested(); break; @@ -933,9 +918,6 @@ MediaConverterWindow::_CreateMenu() new BMessage(OPEN_FILE_MESSAGE), 'O'); menu->AddItem(item); menu->AddSeparatorItem(); - item = new BAboutMenuItem(), - menu->AddItem(item); - menu->AddSeparatorItem(); item = new BMenuItem(B_TRANSLATE_WITH_CONTEXT("Quit", "Menu"), new BMessage(QUIT_MESSAGE), 'Q'); menu->AddItem(item); diff --git a/src/apps/mediaplayer/MainApp.cpp b/src/apps/mediaplayer/MainApp.cpp index d3dcc012cf..6576e0b339 100644 --- a/src/apps/mediaplayer/MainApp.cpp +++ b/src/apps/mediaplayer/MainApp.cpp @@ -407,23 +407,6 @@ MainApp::MessageReceived(BMessage* message) } -void -MainApp::AboutRequested() -{ - const char* appName = B_TRANSLATE_SYSTEM_NAME("MediaPlayer"); - BString message = B_TRANSLATE("%app%\n\nWritten by Marcus Overhagen, " - "Stephan Aßmus and Frederik Modéen"); - message.ReplaceFirst("%app%", appName); - BAlert* alert = new BAlert(appName, message.String(), - B_TRANSLATE("Thanks")); - alert->SetFeel(B_FLOATING_ALL_WINDOW_FEEL); - // Make sure it is on top of any player windows that may have the - // floating all window feel. - alert->Go(NULL); - // asynchronous mode -} - - // #pragma mark - diff --git a/src/apps/mediaplayer/MainApp.h b/src/apps/mediaplayer/MainApp.h index 997eb0d9de..d629d6d49a 100644 --- a/src/apps/mediaplayer/MainApp.h +++ b/src/apps/mediaplayer/MainApp.h @@ -74,7 +74,6 @@ private: virtual void RefsReceived(BMessage* message); virtual void ArgvReceived(int32 argc, char** argv); virtual void MessageReceived(BMessage* message); - virtual void AboutRequested(); private: void _ShowSettingsWindow(); diff --git a/src/apps/mediaplayer/MainWin.cpp b/src/apps/mediaplayer/MainWin.cpp index 2c24095be9..cffbac5e99 100644 --- a/src/apps/mediaplayer/MainWin.cpp +++ b/src/apps/mediaplayer/MainWin.cpp @@ -27,7 +27,6 @@ #include #include -#include #include #include #include @@ -1476,12 +1475,6 @@ MainWin::_CreateMenu() fFileMenu->AddSeparatorItem(); - item = new BAboutMenuItem(); - fFileMenu->AddItem(item); - item->SetTarget(be_app); - - fFileMenu->AddSeparatorItem(); - fFileMenu->AddItem(new BMenuItem(B_TRANSLATE("Close"), new BMessage(M_FILE_CLOSE), 'W')); fFileMenu->AddItem(new BMenuItem(B_TRANSLATE("Quit"), diff --git a/src/apps/packageinstaller/main.cpp b/src/apps/packageinstaller/main.cpp index b87925ded5..23b3810db8 100644 --- a/src/apps/packageinstaller/main.cpp +++ b/src/apps/packageinstaller/main.cpp @@ -35,8 +35,6 @@ class PackageInstaller : public BApplication { void MessageReceived(BMessage *msg); - void AboutRequested(); - private: BFilePanel *fOpen; uint32 fWindowCount; @@ -140,28 +138,6 @@ PackageInstaller::MessageReceived(BMessage *msg) } -void -PackageInstaller::AboutRequested() -{ - BAlert *about = new BAlert("about", - B_TRANSLATE("PackageInstaller\n" - "BeOS legacy .pkg file installer for Haiku.\n\n" - "Copyright 2007,\nŁukasz 'Sil2100' Zemczak\n\n" - "Copyright (c) 2007 Haiku, Inc. \n"), - B_TRANSLATE("OK")); - - BTextView *view = about->TextView(); - BFont font; - view->SetStylable(true); - view->GetFont(&font); - font.SetFace(B_BOLD_FACE); - font.SetSize(font.Size() * 1.5); - view->SetFontAndColor(0, 17, &font); - - about->Go(); -} - - int main(void) { diff --git a/src/apps/packagemanager/Jamfile b/src/apps/packagemanager/Jamfile index 412949b987..2a59ff8c7b 100644 --- a/src/apps/packagemanager/Jamfile +++ b/src/apps/packagemanager/Jamfile @@ -6,7 +6,7 @@ Application PackageManager : ApplicationView.cpp ApplicationWindow.cpp PackageManager.cpp - : be $(HAIKU_LOCALE_LIBS) libshared.a $(TARGET_LIBSUPC++) translation + : be $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++) translation : PackageManager.rdef ; diff --git a/src/apps/packagemanager/PackageManager.cpp b/src/apps/packagemanager/PackageManager.cpp index a023bb7330..d9d2cb08d5 100644 --- a/src/apps/packagemanager/PackageManager.cpp +++ b/src/apps/packagemanager/PackageManager.cpp @@ -9,8 +9,6 @@ #include "ApplicationWindow.h" -#include -#include #include #include #include @@ -33,8 +31,6 @@ class PackageManager : public BApplication { void MessageReceived(BMessage *msg); - void AboutRequested(); - private: ApplicationWindow* fMainWindow; }; @@ -113,19 +109,6 @@ PackageManager::MessageReceived(BMessage *msg) } -void -PackageManager::AboutRequested() -{ - const char* authors[] = { - "Adrien Destugues", - NULL - }; - - BAboutWindow about(B_TRANSLATE_SYSTEM_NAME("PackageManager"), 2010, authors); - about.Show(); -} - - int main(void) { diff --git a/src/apps/people/PeopleApp.cpp b/src/apps/people/PeopleApp.cpp index 0f0be2b9f2..fa81c080fe 100644 --- a/src/apps/people/PeopleApp.cpp +++ b/src/apps/people/PeopleApp.cpp @@ -198,14 +198,6 @@ TPeopleApp::~TPeopleApp() } -void -TPeopleApp::AboutRequested() -{ - (new BAlert(B_TRANSLATE("About"), B_UTF8_ELLIPSIS "by Robert Polic", - B_TRANSLATE("OK")))->Go(); -} - - void TPeopleApp::ArgvReceived(int32 argc, char** argv) { diff --git a/src/apps/people/PeopleApp.h b/src/apps/people/PeopleApp.h index 9af0544225..4adb7377d3 100644 --- a/src/apps/people/PeopleApp.h +++ b/src/apps/people/PeopleApp.h @@ -38,7 +38,6 @@ public: TPeopleApp(); virtual ~TPeopleApp(); - virtual void AboutRequested(); virtual void ArgvReceived(int32, char**); virtual void MessageReceived(BMessage*); virtual void RefsReceived(BMessage*); diff --git a/src/apps/poorman/Jamfile b/src/apps/poorman/Jamfile index 4efe913b89..29f7007c98 100644 --- a/src/apps/poorman/Jamfile +++ b/src/apps/poorman/Jamfile @@ -51,7 +51,7 @@ Application PoorMan : PoorMan.cpp match.c tdate_parse.c - : be libshared.a network tracker $(TARGET_LIBSTDC++) $(HAIKU_LOCALE_LIBS) + : be network tracker $(TARGET_LIBSTDC++) $(HAIKU_LOCALE_LIBS) ; diff --git a/src/apps/poorman/PoorManApplication.cpp b/src/apps/poorman/PoorManApplication.cpp index 915af8f2e3..868b25fec5 100644 --- a/src/apps/poorman/PoorManApplication.cpp +++ b/src/apps/poorman/PoorManApplication.cpp @@ -8,7 +8,6 @@ #include "PoorManApplication.h" -#include #include #include #include @@ -42,20 +41,6 @@ PoorManApplication::PoorManApplication() } -void -PoorManApplication::AboutRequested() -{ - const char* authors[] = { - "Philip Harrison", - "Ma Jie", - NULL - }; - BAboutWindow about(STR_APP_NAME, 2004, authors, - "Poor Man's web server."); - about.Show(); -} - - void PoorManApplication::MessageReceived(BMessage *message) { diff --git a/src/apps/poorman/PoorManApplication.h b/src/apps/poorman/PoorManApplication.h index 5a0a829302..c9fa22f260 100644 --- a/src/apps/poorman/PoorManApplication.h +++ b/src/apps/poorman/PoorManApplication.h @@ -19,7 +19,6 @@ class PoorManApplication: public BApplication { public: PoorManApplication(); - void AboutRequested(); virtual void MessageReceived(BMessage *message); PoorManWindow * GetPoorManWindow() { return mainWindow; } private: diff --git a/src/apps/poorman/PoorManWindow.cpp b/src/apps/poorman/PoorManWindow.cpp index 52179760d7..955c887a9d 100644 --- a/src/apps/poorman/PoorManWindow.cpp +++ b/src/apps/poorman/PoorManWindow.cpp @@ -11,7 +11,6 @@ #include #include -#include #include #include #include @@ -458,13 +457,6 @@ PoorManWindow::BuildFileMenu() const new BMessage(MSG_MENU_FILE_SAVE_SELECTION))); ptrFileMenu->AddSeparatorItem(); - - BAboutMenuItem * AboutItem = new BAboutMenuItem(); - AboutItem->SetTarget(NULL, be_app); - ptrFileMenu->AddItem(AboutItem); - - ptrFileMenu->AddSeparatorItem(); - ptrFileMenu->AddItem(new BMenuItem(STR_MNU_FILE_QUIT, new BMessage(B_QUIT_REQUESTED), CMD_FILE_QUIT)); diff --git a/src/apps/poorman/constants.cpp b/src/apps/poorman/constants.cpp index 58979528a2..19379bbbc8 100644 --- a/src/apps/poorman/constants.cpp +++ b/src/apps/poorman/constants.cpp @@ -36,8 +36,6 @@ const char* STR_MNU_FILE_SAVE_AS = B_TRANSLATE("Save console as" B_UTF8_ELLIPSIS); const char* STR_MNU_FILE_SAVE_SELECTION = B_TRANSLATE("Save console selections as" B_UTF8_ELLIPSIS); -const char* STR_MNU_FILE_ABOUT - = B_TRANSLATE("About PoorMan" B_UTF8_ELLIPSIS); const char* STR_MNU_FILE_QUIT = B_TRANSLATE("Quit"); const char* STR_MNU_EDIT diff --git a/src/apps/poorman/constants.h b/src/apps/poorman/constants.h index 99194c3374..201e21bf59 100644 --- a/src/apps/poorman/constants.h +++ b/src/apps/poorman/constants.h @@ -51,7 +51,6 @@ extern const char* STR_DIR_CREATED; extern const char* STR_MNU_FILE; extern const char* STR_MNU_FILE_SAVE_AS; extern const char* STR_MNU_FILE_SAVE_SELECTION; -extern const char* STR_MNU_FILE_ABOUT; extern const char* STR_MNU_FILE_QUIT; extern const char* STR_MNU_EDIT; extern const char* STR_MNU_EDIT_COPY; diff --git a/src/apps/readonlybootprompt/BootPrompt.cpp b/src/apps/readonlybootprompt/BootPrompt.cpp index a6fd160f61..6bda68837c 100644 --- a/src/apps/readonlybootprompt/BootPrompt.cpp +++ b/src/apps/readonlybootprompt/BootPrompt.cpp @@ -7,7 +7,6 @@ #include -#include #include #include @@ -58,22 +57,6 @@ BootPromptApp::MessageReceived(BMessage* message) } -void -BootPromptApp::AboutRequested() -{ - const char* kAuthors[] = { - "Stephan Aßmus", - NULL - }; - - BAboutWindow* aboutWindow = new BAboutWindow( - B_TRANSLATE_SYSTEM_NAME("ReadOnlyBootPrompt"), 2010, kAuthors); - - aboutWindow->Show(); - delete aboutWindow; -} - - void BootPromptApp::ReadyToRun() { diff --git a/src/apps/readonlybootprompt/BootPrompt.h b/src/apps/readonlybootprompt/BootPrompt.h index 31aa2847ff..cb357bfc9d 100644 --- a/src/apps/readonlybootprompt/BootPrompt.h +++ b/src/apps/readonlybootprompt/BootPrompt.h @@ -21,7 +21,6 @@ public: BootPromptApp(); virtual void MessageReceived(BMessage* message); - virtual void AboutRequested(); virtual void ReadyToRun(); }; diff --git a/src/apps/showimage/Jamfile b/src/apps/showimage/Jamfile index ae349d3d22..87aa25bced 100644 --- a/src/apps/showimage/Jamfile +++ b/src/apps/showimage/Jamfile @@ -32,7 +32,6 @@ DoCatalogs ShowImage : : PrintOptionsWindow.cpp ProgressWindow.cpp - ShowImageApp.cpp ShowImageView.cpp ShowImageWindow.cpp ; diff --git a/src/apps/showimage/ShowImageApp.cpp b/src/apps/showimage/ShowImageApp.cpp index 485b6a875c..3272bcbd7d 100644 --- a/src/apps/showimage/ShowImageApp.cpp +++ b/src/apps/showimage/ShowImageApp.cpp @@ -14,8 +14,6 @@ #include -#include -#include #include #include #include @@ -29,10 +27,6 @@ #include "ToolBarIcons.h" -#undef B_TRANSLATE_CONTEXT -#define B_TRANSLATE_CONTEXT "AboutWindow" - - const char* kApplicationSignature = "application/x-vnd.Haiku-ShowImage"; const int32 kWindowsToIgnore = 1; // ignore the always open file panel @@ -45,6 +39,7 @@ ShowImageApp::ShowImageApp() fPulseStarted(false), fLastWindowFrame(BRect(30, 30, 430, 330)) { + B_TRANSLATE_MARK_SYSTEM_NAME("ShowImage"); _UpdateLastWindowFrame(); // BBitmap can be created after there is a BApplication instance. init_tool_bar_icons(); @@ -142,22 +137,6 @@ ShowImageApp::MessageReceived(BMessage* message) } -void -ShowImageApp::AboutRequested() -{ - const char* authors[] = { - "Fernando F. Oliveira", - "Michael Wilber", - "Michael Pfeiffer", - "Ryan Leavengood", - "Axel Dörfler", - NULL - }; - BAboutWindow about(B_TRANSLATE_SYSTEM_NAME("ShowImage"), 2003, authors); - about.Show(); -} - - void ShowImageApp::Pulse() { diff --git a/src/apps/showimage/ShowImageApp.h b/src/apps/showimage/ShowImageApp.h index 2b9df85fb3..7fc690785a 100644 --- a/src/apps/showimage/ShowImageApp.h +++ b/src/apps/showimage/ShowImageApp.h @@ -14,7 +14,6 @@ #include "ShowImageSettings.h" #include -#include #include @@ -31,7 +30,6 @@ public: virtual void ArgvReceived(int32 argc, char** argv); virtual void ReadyToRun(); virtual void MessageReceived(BMessage* message); - virtual void AboutRequested(); virtual void Pulse(); virtual void RefsReceived(BMessage* message); virtual bool QuitRequested(); diff --git a/src/apps/showimage/ShowImageWindow.cpp b/src/apps/showimage/ShowImageWindow.cpp index f32c5729ec..385006d2f3 100644 --- a/src/apps/showimage/ShowImageWindow.cpp +++ b/src/apps/showimage/ShowImageWindow.cpp @@ -396,9 +396,6 @@ ShowImageWindow::_AddMenus(BMenuBar* bar) _AddItemMenu(menu, B_TRANSLATE("Print" B_UTF8_ELLIPSIS), MSG_PREPARE_PRINT, 'P', 0, this); menu->AddSeparatorItem(); - _AddItemMenu(menu, B_TRANSLATE("About ShowImage" B_UTF8_ELLIPSIS), - B_ABOUT_REQUESTED, 0, 0, be_app); - menu->AddSeparatorItem(); _AddItemMenu(menu, B_TRANSLATE("Quit"), B_QUIT_REQUESTED, 'Q', 0, be_app); bar->AddItem(menu); diff --git a/src/apps/sudoku/Sudoku.cpp b/src/apps/sudoku/Sudoku.cpp index 9514468295..95c6881d42 100644 --- a/src/apps/sudoku/Sudoku.cpp +++ b/src/apps/sudoku/Sudoku.cpp @@ -57,34 +57,6 @@ Sudoku::MessageReceived(BMessage* message) } -void -Sudoku::AboutRequested() -{ - Sudoku::DisplayAbout(); -} - - -void -Sudoku::DisplayAbout() -{ - BAlert *alert = new BAlert(B_TRANSLATE("About"), B_TRANSLATE("Sudoku\n" - "\twritten by Axel Dörfler\n" - "\tCopyright 2007, Haiku Inc.\n"), 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, strlen(B_TRANSLATE("Sudoku")), &font); - - alert->SetShortcut(0, B_ESCAPE); - alert->Go(); -} - - // #pragma mark - diff --git a/src/apps/sudoku/Sudoku.h b/src/apps/sudoku/Sudoku.h index a442ebd170..0e037563c4 100644 --- a/src/apps/sudoku/Sudoku.h +++ b/src/apps/sudoku/Sudoku.h @@ -20,9 +20,6 @@ public: virtual void RefsReceived(BMessage *message); virtual void MessageReceived(BMessage *message); - virtual void AboutRequested(); - static void DisplayAbout(); - private: SudokuWindow* fWindow; }; diff --git a/src/apps/sudoku/SudokuView.cpp b/src/apps/sudoku/SudokuView.cpp index 86b2fc054b..b34b1ce6bf 100644 --- a/src/apps/sudoku/SudokuView.cpp +++ b/src/apps/sudoku/SudokuView.cpp @@ -1076,10 +1076,6 @@ SudokuView::MessageReceived(BMessage* message) break; } - case B_ABOUT_REQUESTED: - Sudoku::DisplayAbout(); - break; - default: BView::MessageReceived(message); break; diff --git a/src/apps/sudoku/SudokuWindow.cpp b/src/apps/sudoku/SudokuWindow.cpp index 8cbe7c5956..d0672647fa 100644 --- a/src/apps/sudoku/SudokuWindow.cpp +++ b/src/apps/sudoku/SudokuWindow.cpp @@ -240,11 +240,6 @@ SudokuWindow::SudokuWindow() menu->AddSeparatorItem(); - menu->AddItem(item = new BMenuItem( - B_TRANSLATE("About Sudoku" B_UTF8_ELLIPSIS), - new BMessage(B_ABOUT_REQUESTED))); - menu->AddSeparatorItem(); - menu->AddItem(new BMenuItem(B_TRANSLATE("Quit"), new BMessage(B_QUIT_REQUESTED), 'Q')); menu->SetTargetForItems(this); diff --git a/src/apps/text_search/GrepWindow.cpp b/src/apps/text_search/GrepWindow.cpp index 32ea2c78fa..246173335d 100644 --- a/src/apps/text_search/GrepWindow.cpp +++ b/src/apps/text_search/GrepWindow.cpp @@ -92,7 +92,6 @@ GrepWindow::GrepWindow(BMessage* message) fNew(NULL), fOpen(NULL), fClose(NULL), - fAbout(NULL), fQuit(NULL), fActionMenu(NULL), fSelectAll(NULL), @@ -191,10 +190,6 @@ void GrepWindow::MenusEnded() void GrepWindow::MessageReceived(BMessage *message) { switch (message->what) { - case B_ABOUT_REQUESTED: - _OnAboutRequested(); - break; - case MSG_NEW_WINDOW: _OnNewWindow(); break; @@ -433,9 +428,6 @@ GrepWindow::_CreateMenus() fClose = new BMenuItem( B_TRANSLATE("Close"), new BMessage(B_QUIT_REQUESTED), 'W'); - fAbout = new BMenuItem( - B_TRANSLATE("About TextSearch" B_UTF8_ELLIPSIS), new BMessage(B_ABOUT_REQUESTED)); - fQuit = new BMenuItem( B_TRANSLATE("Quit"), new BMessage(MSG_QUIT_NOW), 'Q'); @@ -492,8 +484,6 @@ GrepWindow::_CreateMenus() fFileMenu->AddItem(fOpen); fFileMenu->AddItem(fClose); fFileMenu->AddSeparatorItem(); - fFileMenu->AddItem(fAbout); - fFileMenu->AddSeparatorItem(); fFileMenu->AddItem(fQuit); fActionMenu->AddItem(fSearch); @@ -1480,33 +1470,6 @@ GrepWindow::_OnQuitNow() } -void -GrepWindow::_OnAboutRequested() -{ - BString text; - text << B_TRANSLATE(APP_NAME) << " " << "\n\n"; - int32 titleLength = text.Length(); - text << B_TRANSLATE("Created by Matthijs Hollemans." "\n\n" - "Contributed to by " - "Peter Hinely, Serge Fantino, Hideki Naito, Oscar Lesta, " - "Oliver Tappe, Jonas Sundström, Luc Schrijvers and" - " momoziro.\n"); - - BAlert* alert = new BAlert("TextSearch", text.String(), B_TRANSLATE("OK"), NULL, - NULL, B_WIDTH_AS_USUAL, B_INFO_ALERT); - - BTextView* view = alert->TextView(); - BFont font; - view->SetStylable(true); - view->GetFont(&font); - font.SetSize(font.Size() * 1.5); - font.SetFace(B_BOLD_FACE); - view->SetFontAndColor(0, titleLength, &font); - - alert->Go(NULL); -} - - void GrepWindow::_OnFileDrop(BMessage* message) { diff --git a/src/apps/text_search/GrepWindow.h b/src/apps/text_search/GrepWindow.h index 67711de2d8..dd4dce1fe9 100644 --- a/src/apps/text_search/GrepWindow.h +++ b/src/apps/text_search/GrepWindow.h @@ -84,7 +84,6 @@ private: void _OnCopyText(); void _OnSelectInTracker(); void _OnQuitNow(); - void _OnAboutRequested(); void _OnFileDrop(BMessage* message); void _OnRefsReceived(BMessage* message); void _OnOpenPanel(); @@ -109,7 +108,6 @@ private: BMenuItem* fNew; BMenuItem* fOpen; BMenuItem* fClose; - BMenuItem* fAbout; BMenuItem* fQuit; BMenu* fActionMenu; BMenuItem* fSelectAll; diff --git a/src/apps/tv/MainWin.cpp b/src/apps/tv/MainWin.cpp index ea9e1e29ea..81dd427df0 100644 --- a/src/apps/tv/MainWin.cpp +++ b/src/apps/tv/MainWin.cpp @@ -53,7 +53,6 @@ static const char* fLocalizedInfo1 = B_TRANSLATE_MARK("DVB - Digital Video Broad enum { M_DUMMY = 0x100, - M_FILE_ABOUT, M_FILE_QUIT, M_SCALE_TO_NATIVE_SIZE, M_TOGGLE_FULLSCREEN, @@ -175,12 +174,6 @@ MainWin::CreateMenu() fMenuBar->AddItem(fSettingsMenu); fMenuBar->AddItem(fDebugMenu); - BString aboutStr = B_TRANSLATE_COMMENT("About %1"B_UTF8_ELLIPSIS, - "Parameter %1 is the name of the application."); - aboutStr.ReplaceFirst("%1", fLocalizedName); - fFileMenu->AddItem(new BMenuItem(aboutStr.String(), - new BMessage(M_FILE_ABOUT))); - fFileMenu->AddSeparatorItem(); fFileMenu->AddItem(new BMenuItem(B_TRANSLATE("Quit"), new BMessage(M_FILE_QUIT), 'Q', B_COMMAND_KEY)); @@ -568,12 +561,6 @@ MainWin::ShowContextMenu(const BPoint &screen_point) new BMessage(M_TOGGLE_KEEP_ASPECT_RATIO), 'K', B_COMMAND_KEY)); item->SetMarked(fKeepAspectRatio); menu->AddSeparatorItem(); - BString aboutStr = B_TRANSLATE_COMMENT("About %1"B_UTF8_ELLIPSIS, - "Parameter %1 is the name of the application."); - aboutStr.ReplaceFirst("%1", fLocalizedName); - menu->AddItem(new BMenuItem(aboutStr.String(), - new BMessage(M_FILE_ABOUT))); - menu->AddSeparatorItem(); menu->AddItem(new BMenuItem(B_TRANSLATE("Quit"), new BMessage(M_FILE_QUIT), 'Q', B_COMMAND_KEY)); @@ -1231,38 +1218,6 @@ MainWin::MessageReceived(BMessage *msg) // RefsReceived(msg); break; - case M_FILE_ABOUT: - { - BString alertStr = fLocalizedName; - alertStr << "\n\n"; - alertStr << fLocalizedInfo1; - #if TIME_BOMB_ACTIVE - alertStr << "\n\n"; - alertStr << INFO2; - #endif - alertStr << "\n\nCopyright "; - alertStr << COPYRIGHT; - alertStr << B_TRANSLATE("\nVersion "); - alertStr << VERSION; - alertStr << B_TRANSLATE("\nRevision "); - if (strcmp(REVISION, "unknown") == 0) - alertStr << fLocalizedRevision; - else - alertStr << REVISION; - alertStr << B_TRANSLATE("\nBuild "); - alertStr << BUILD; - - BAlert *alert; - alert = new BAlert("about", alertStr.String(), B_TRANSLATE("OK")); - if (fAlwaysOnTop) { - ToggleAlwaysOnTop(); - alert->Go(); - ToggleAlwaysOnTop(); - } else - alert->Go(); - } - break; - case M_FILE_QUIT: // be_app->PostMessage(B_QUIT_REQUESTED); PostMessage(B_QUIT_REQUESTED);