[haiku-commits] r41115 - in haiku/trunk/src: apps/deskcalc apps/diskprobe apps/launchbox apps/mail preferences/filetypes ...
- From: jonas@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 26 Mar 2011 18:29:29 +0100 (CET)
Author: kirilla
Date: 2011-03-26 18:29:28 +0100 (Sat, 26 Mar 2011)
New Revision: 41115
Changeset: https://dev.haiku-os.org/changeset/41115
Modified:
haiku/trunk/src/apps/deskcalc/CalcView.cpp
haiku/trunk/src/apps/diskprobe/FileWindow.cpp
haiku/trunk/src/apps/launchbox/App.cpp
haiku/trunk/src/apps/launchbox/App.h
haiku/trunk/src/apps/launchbox/MainWindow.cpp
haiku/trunk/src/apps/launchbox/PadView.cpp
haiku/trunk/src/apps/mail/MailApp.cpp
haiku/trunk/src/apps/mail/MailApp.h
haiku/trunk/src/apps/mail/MailWindow.cpp
haiku/trunk/src/preferences/filetypes/FileTypes.cpp
haiku/trunk/src/preferences/filetypes/FileTypesWindow.cpp
haiku/trunk/src/preferences/shortcuts/ShortcutsApp.cpp
haiku/trunk/src/preferences/shortcuts/ShortcutsApp.h
haiku/trunk/src/preferences/shortcuts/ShortcutsWindow.cpp
Log:
Follow-up on r41108. Removal of About-windows and menu items.
Modified: haiku/trunk/src/apps/deskcalc/CalcView.cpp
===================================================================
--- haiku/trunk/src/apps/deskcalc/CalcView.cpp 2011-03-26 16:39:32 UTC (rev
41114)
+++ haiku/trunk/src/apps/deskcalc/CalcView.cpp 2011-03-26 17:29:28 UTC (rev
41115)
@@ -1121,7 +1121,6 @@
// preflet.
// fPopUpMenu->AddItem(fAudioFeedbackItem);
fPopUpMenu->AddItem(fShowKeypadItem);
- fPopUpMenu->AddSeparatorItem();
}
Modified: haiku/trunk/src/apps/diskprobe/FileWindow.cpp
===================================================================
--- haiku/trunk/src/apps/diskprobe/FileWindow.cpp 2011-03-26 16:39:32 UTC
(rev 41114)
+++ haiku/trunk/src/apps/diskprobe/FileWindow.cpp 2011-03-26 17:29:28 UTC
(rev 41115)
@@ -79,7 +79,6 @@
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));
Modified: haiku/trunk/src/apps/launchbox/App.cpp
===================================================================
--- haiku/trunk/src/apps/launchbox/App.cpp 2011-03-26 16:39:32 UTC (rev
41114)
+++ haiku/trunk/src/apps/launchbox/App.cpp 2011-03-26 17:29:28 UTC (rev
41115)
@@ -7,7 +7,6 @@
#include <stdio.h>
-#include <AboutWindow.h>
#include <Catalog.h>
#include <Entry.h>
#include <Message.h>
@@ -105,17 +104,6 @@
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()
{
_StoreSettingsIfNeeded();
Modified: haiku/trunk/src/apps/launchbox/App.h
===================================================================
--- haiku/trunk/src/apps/launchbox/App.h 2011-03-26 16:39:32 UTC (rev
41114)
+++ haiku/trunk/src/apps/launchbox/App.h 2011-03-26 17:29:28 UTC (rev
41115)
@@ -18,7 +18,6 @@
virtual bool QuitRequested();
virtual void ReadyToRun();
virtual void MessageReceived(BMessage*
message);
- virtual void AboutRequested();
virtual void Pulse();
private:
Modified: haiku/trunk/src/apps/launchbox/MainWindow.cpp
===================================================================
--- haiku/trunk/src/apps/launchbox/MainWindow.cpp 2011-03-26 16:39:32 UTC
(rev 41114)
+++ haiku/trunk/src/apps/launchbox/MainWindow.cpp 2011-03-26 17:29:28 UTC
(rev 41115)
@@ -252,9 +252,6 @@
case B_PASTE:
case B_MODIFIERS_CHANGED:
break;
- case B_ABOUT_REQUESTED:
- be_app->PostMessage(message);
- break;
default:
BWindow::MessageReceived(message);
break;
Modified: haiku/trunk/src/apps/launchbox/PadView.cpp
===================================================================
--- haiku/trunk/src/apps/launchbox/PadView.cpp 2011-03-26 16:39:32 UTC (rev
41114)
+++ haiku/trunk/src/apps/launchbox/PadView.cpp 2011-03-26 17:29:28 UTC (rev
41115)
@@ -425,10 +425,6 @@
// 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);
Modified: haiku/trunk/src/apps/mail/MailApp.cpp
===================================================================
--- haiku/trunk/src/apps/mail/MailApp.cpp 2011-03-26 16:39:32 UTC (rev
41114)
+++ haiku/trunk/src/apps/mail/MailApp.cpp 2011-03-26 17:29:28 UTC (rev
41115)
@@ -145,32 +145,6 @@
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)
{
BEntry entry;
Modified: haiku/trunk/src/apps/mail/MailApp.h
===================================================================
--- haiku/trunk/src/apps/mail/MailApp.h 2011-03-26 16:39:32 UTC (rev 41114)
+++ haiku/trunk/src/apps/mail/MailApp.h 2011-03-26 17:29:28 UTC (rev 41115)
@@ -54,7 +54,6 @@
TMailApp();
virtual ~TMailApp();
- virtual void AboutRequested();
virtual void ArgvReceived(int32, char**);
virtual void MessageReceived(BMessage*);
virtual bool QuitRequested();
Modified: haiku/trunk/src/apps/mail/MailWindow.cpp
===================================================================
--- haiku/trunk/src/apps/mail/MailWindow.cpp 2011-03-26 16:39:32 UTC (rev
41114)
+++ haiku/trunk/src/apps/mail/MailWindow.cpp 2011-03-26 17:29:28 UTC (rev
41115)
@@ -301,12 +301,6 @@
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'));
item->SetTarget(be_app);
Modified: haiku/trunk/src/preferences/filetypes/FileTypes.cpp
===================================================================
--- haiku/trunk/src/preferences/filetypes/FileTypes.cpp 2011-03-26 16:39:32 UTC
(rev 41114)
+++ haiku/trunk/src/preferences/filetypes/FileTypes.cpp 2011-03-26 17:29:28 UTC
(rev 41115)
@@ -64,7 +64,6 @@
virtual void ArgvReceived(int32 argc, char**
argv);
virtual void MessageReceived(BMessage*
message);
- virtual void AboutRequested();
virtual bool QuitRequested();
private:
@@ -416,29 +415,6 @@
}
-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()
{
Modified: haiku/trunk/src/preferences/filetypes/FileTypesWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/filetypes/FileTypesWindow.cpp 2011-03-26
16:39:32 UTC (rev 41114)
+++ haiku/trunk/src/preferences/filetypes/FileTypesWindow.cpp 2011-03-26
17:29:28 UTC (rev 41115)
@@ -345,10 +345,6 @@
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);
Modified: haiku/trunk/src/preferences/shortcuts/ShortcutsApp.cpp
===================================================================
--- haiku/trunk/src/preferences/shortcuts/ShortcutsApp.cpp 2011-03-26
16:39:32 UTC (rev 41114)
+++ haiku/trunk/src/preferences/shortcuts/ShortcutsApp.cpp 2011-03-26
17:29:28 UTC (rev 41115)
@@ -10,22 +10,18 @@
#include "ShortcutsApp.h"
-#include <Alert.h>
#include <Catalog.h>
-#include <Locale.h>
#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::~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();
-}
-
Modified: haiku/trunk/src/preferences/shortcuts/ShortcutsApp.h
===================================================================
--- haiku/trunk/src/preferences/shortcuts/ShortcutsApp.h 2011-03-26
16:39:32 UTC (rev 41114)
+++ haiku/trunk/src/preferences/shortcuts/ShortcutsApp.h 2011-03-26
17:29:28 UTC (rev 41115)
@@ -18,7 +18,6 @@
ShortcutsApp();
~ShortcutsApp();
virtual void ReadyToRun();
- virtual void AboutRequested();
};
Modified: haiku/trunk/src/preferences/shortcuts/ShortcutsWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/shortcuts/ShortcutsWindow.cpp 2011-03-26
16:39:32 UTC (rev 41114)
+++ haiku/trunk/src/preferences/shortcuts/ShortcutsWindow.cpp 2011-03-26
17:29:28 UTC (rev 41115)
@@ -121,9 +121,6 @@
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 @@
break;
}
- case B_ABOUT_REQUESTED:
- be_app_messenger.SendMessage(B_ABOUT_REQUESTED);
- break;
-
case ADD_HOTKEY_ITEM:
_AddNewSpec(NULL);
break;
Other related posts:
- » [haiku-commits] r41115 - in haiku/trunk/src: apps/deskcalc apps/diskprobe apps/launchbox apps/mail preferences/filetypes ... - jonas
