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
This commit is contained in:
@@ -1121,7 +1121,6 @@ CalcView::_CreatePopUpMenu()
|
|||||||
// preflet.
|
// preflet.
|
||||||
// fPopUpMenu->AddItem(fAudioFeedbackItem);
|
// fPopUpMenu->AddItem(fAudioFeedbackItem);
|
||||||
fPopUpMenu->AddItem(fShowKeypadItem);
|
fPopUpMenu->AddItem(fShowKeypadItem);
|
||||||
fPopUpMenu->AddSeparatorItem();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -79,7 +79,6 @@ FileWindow::FileWindow(BRect rect, entry_ref *ref, const BMessage *settings)
|
|||||||
menu->AddSeparatorItem();
|
menu->AddSeparatorItem();
|
||||||
|
|
||||||
// the ProbeView print menu items will be inserted here
|
// the ProbeView print menu items will be inserted here
|
||||||
menu->AddSeparatorItem();
|
|
||||||
|
|
||||||
menu->AddItem(new BMenuItem(B_TRANSLATE("Quit"),
|
menu->AddItem(new BMenuItem(B_TRANSLATE("Quit"),
|
||||||
new BMessage(B_QUIT_REQUESTED), 'Q', B_COMMAND_KEY));
|
new BMessage(B_QUIT_REQUESTED), 'Q', B_COMMAND_KEY));
|
||||||
|
|||||||
@@ -7,7 +7,6 @@
|
|||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#include <AboutWindow.h>
|
|
||||||
#include <Catalog.h>
|
#include <Catalog.h>
|
||||||
#include <Entry.h>
|
#include <Entry.h>
|
||||||
#include <Message.h>
|
#include <Message.h>
|
||||||
@@ -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
|
void
|
||||||
App::Pulse()
|
App::Pulse()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ public:
|
|||||||
virtual bool QuitRequested();
|
virtual bool QuitRequested();
|
||||||
virtual void ReadyToRun();
|
virtual void ReadyToRun();
|
||||||
virtual void MessageReceived(BMessage* message);
|
virtual void MessageReceived(BMessage* message);
|
||||||
virtual void AboutRequested();
|
|
||||||
virtual void Pulse();
|
virtual void Pulse();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|||||||
@@ -252,9 +252,6 @@ MainWindow::MessageReceived(BMessage* message)
|
|||||||
case B_PASTE:
|
case B_PASTE:
|
||||||
case B_MODIFIERS_CHANGED:
|
case B_MODIFIERS_CHANGED:
|
||||||
break;
|
break;
|
||||||
case B_ABOUT_REQUESTED:
|
|
||||||
be_app->PostMessage(message);
|
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
BWindow::MessageReceived(message);
|
BWindow::MessageReceived(message);
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -425,10 +425,6 @@ PadView::DisplayMenu(BPoint where, LaunchButton* button) const
|
|||||||
// app commands
|
// app commands
|
||||||
BMenu* appM = new BMenu(B_TRANSLATE_SYSTEM_NAME("LaunchBox"));
|
BMenu* appM = new BMenu(B_TRANSLATE_SYSTEM_NAME("LaunchBox"));
|
||||||
appM->SetFont(be_plain_font);
|
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
|
// quit
|
||||||
item = new BMenuItem(B_TRANSLATE("Quit"), new BMessage(B_QUIT_REQUESTED));
|
item = new BMenuItem(B_TRANSLATE("Quit"), new BMessage(B_QUIT_REQUESTED));
|
||||||
item->SetTarget(be_app);
|
item->SetTarget(be_app);
|
||||||
|
|||||||
@@ -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
|
void
|
||||||
TMailApp::ArgvReceived(int32 argc, char **argv)
|
TMailApp::ArgvReceived(int32 argc, char **argv)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -54,7 +54,6 @@ class TMailApp : public BApplication {
|
|||||||
TMailApp();
|
TMailApp();
|
||||||
virtual ~TMailApp();
|
virtual ~TMailApp();
|
||||||
|
|
||||||
virtual void AboutRequested();
|
|
||||||
virtual void ArgvReceived(int32, char**);
|
virtual void ArgvReceived(int32, char**);
|
||||||
virtual void MessageReceived(BMessage*);
|
virtual void MessageReceived(BMessage*);
|
||||||
virtual bool QuitRequested();
|
virtual bool QuitRequested();
|
||||||
|
|||||||
@@ -300,12 +300,6 @@ TMailWindow::TMailWindow(BRect rect, const char* title, TMailApp* app,
|
|||||||
new BMessage(M_PRINT), 'P'));
|
new BMessage(M_PRINT), 'P'));
|
||||||
fMenuBar->AddItem(menu);
|
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->AddSeparatorItem();
|
||||||
menu->AddItem(item = new BMenuItem(B_TRANSLATE("Quit"),
|
menu->AddItem(item = new BMenuItem(B_TRANSLATE("Quit"),
|
||||||
new BMessage(B_QUIT_REQUESTED), 'Q'));
|
new BMessage(B_QUIT_REQUESTED), 'Q'));
|
||||||
|
|||||||
@@ -64,7 +64,6 @@ public:
|
|||||||
virtual void ArgvReceived(int32 argc, char** argv);
|
virtual void ArgvReceived(int32 argc, char** argv);
|
||||||
virtual void MessageReceived(BMessage* message);
|
virtual void MessageReceived(BMessage* message);
|
||||||
|
|
||||||
virtual void AboutRequested();
|
|
||||||
virtual bool QuitRequested();
|
virtual bool QuitRequested();
|
||||||
|
|
||||||
private:
|
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
|
bool
|
||||||
FileTypes::QuitRequested()
|
FileTypes::QuitRequested()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -345,10 +345,6 @@ FileTypesWindow::FileTypesWindow(const BMessage& settings)
|
|||||||
new BMessage(kMsgOpenApplicationTypesWindow)));
|
new BMessage(kMsgOpenApplicationTypesWindow)));
|
||||||
menu->AddSeparatorItem();
|
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"),
|
menu->AddItem(new BMenuItem(B_TRANSLATE("Quit"),
|
||||||
new BMessage(B_QUIT_REQUESTED), 'Q', B_COMMAND_KEY));
|
new BMessage(B_QUIT_REQUESTED), 'Q', B_COMMAND_KEY));
|
||||||
menu->SetTargetForItems(be_app);
|
menu->SetTargetForItems(be_app);
|
||||||
|
|||||||
@@ -10,22 +10,18 @@
|
|||||||
|
|
||||||
#include "ShortcutsApp.h"
|
#include "ShortcutsApp.h"
|
||||||
|
|
||||||
#include <Alert.h>
|
|
||||||
#include <Catalog.h>
|
#include <Catalog.h>
|
||||||
#include <Locale.h>
|
|
||||||
|
|
||||||
#include "ShortcutsWindow.h"
|
#include "ShortcutsWindow.h"
|
||||||
|
|
||||||
|
|
||||||
#define APPLICATION_SIGNATURE "application/x-vnd.Haiku-Shortcuts"
|
|
||||||
|
|
||||||
#undef B_TRANSLATE_CONTEXT
|
#undef B_TRANSLATE_CONTEXT
|
||||||
#define B_TRANSLATE_CONTEXT "ShortcutsApp"
|
#define B_TRANSLATE_CONTEXT "ShortcutsApp"
|
||||||
|
|
||||||
|
|
||||||
ShortcutsApp::ShortcutsApp()
|
ShortcutsApp::ShortcutsApp()
|
||||||
:
|
:
|
||||||
BApplication(APPLICATION_SIGNATURE)
|
BApplication("application/x-vnd.Haiku-Shortcuts")
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -41,15 +37,3 @@ ShortcutsApp::ReadyToRun()
|
|||||||
ShortcutsApp::~ShortcutsApp()
|
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();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ public:
|
|||||||
ShortcutsApp();
|
ShortcutsApp();
|
||||||
~ShortcutsApp();
|
~ShortcutsApp();
|
||||||
virtual void ReadyToRun();
|
virtual void ReadyToRun();
|
||||||
virtual void AboutRequested();
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -121,9 +121,6 @@ ShortcutsWindow::ShortcutsWindow()
|
|||||||
B_TRANSLATE("Save KeySet as" B_UTF8_ELLIPSIS),
|
B_TRANSLATE("Save KeySet as" B_UTF8_ELLIPSIS),
|
||||||
new BMessage(SAVE_KEYSET_AS), 'S'));
|
new BMessage(SAVE_KEYSET_AS), 'S'));
|
||||||
fileMenu->AddItem(new BSeparatorItem);
|
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"),
|
fileMenu->AddItem(new BMenuItem(B_TRANSLATE("Quit"),
|
||||||
new BMessage(B_QUIT_REQUESTED), 'Q'));
|
new BMessage(B_QUIT_REQUESTED), 'Q'));
|
||||||
menuBar->AddItem(fileMenu);
|
menuBar->AddItem(fileMenu);
|
||||||
@@ -537,10 +534,6 @@ ShortcutsWindow::MessageReceived(BMessage* msg)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
case B_ABOUT_REQUESTED:
|
|
||||||
be_app_messenger.SendMessage(B_ABOUT_REQUESTED);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case ADD_HOTKEY_ITEM:
|
case ADD_HOTKEY_ITEM:
|
||||||
_AddNewSpec(NULL);
|
_AddNewSpec(NULL);
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user