[haiku-commits] r41108 - in haiku/trunk/src/apps: 3dmov activitymonitor bootmanager charactermap codycam ...
- From: jonas@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 26 Mar 2011 03:18:53 +0100 (CET)
Author: kirilla
Date: 2011-03-26 03:18:52 +0100 (Sat, 26 Mar 2011)
New Revision: 41108
Changeset: https://dev.haiku-os.org/changeset/41108
Modified:
haiku/trunk/src/apps/3dmov/MainWindow.cpp
haiku/trunk/src/apps/activitymonitor/ActivityWindow.cpp
haiku/trunk/src/apps/bootmanager/BootManager.cpp
haiku/trunk/src/apps/bootmanager/BootManagerWindow.cpp
haiku/trunk/src/apps/bootmanager/Jamfile
haiku/trunk/src/apps/charactermap/CharacterMap.cpp
haiku/trunk/src/apps/charactermap/CharacterMap.h
haiku/trunk/src/apps/charactermap/CharacterWindow.cpp
haiku/trunk/src/apps/charactermap/Jamfile
haiku/trunk/src/apps/codycam/CodyCam.cpp
haiku/trunk/src/apps/codycam/CodyCam.h
haiku/trunk/src/apps/codycam/Jamfile
haiku/trunk/src/apps/deskcalc/CalcView.cpp
haiku/trunk/src/apps/deskcalc/CalcView.h
haiku/trunk/src/apps/devices/DevicesApplication.cpp
haiku/trunk/src/apps/devices/DevicesView.cpp
haiku/trunk/src/apps/devices/Jamfile
haiku/trunk/src/apps/diskprobe/DiskProbe.cpp
haiku/trunk/src/apps/diskprobe/FileWindow.cpp
haiku/trunk/src/apps/diskprobe/Jamfile
haiku/trunk/src/apps/expander/ExpanderApp.cpp
haiku/trunk/src/apps/expander/ExpanderApp.h
haiku/trunk/src/apps/expander/ExpanderWindow.cpp
haiku/trunk/src/apps/expander/Jamfile
haiku/trunk/src/apps/glteapot/TeapotApp.h
haiku/trunk/src/apps/haiku3d/App.cpp
haiku/trunk/src/apps/haiku3d/App.h
haiku/trunk/src/apps/installedpackages/main.cpp
haiku/trunk/src/apps/magnify/Jamfile
haiku/trunk/src/apps/magnify/Magnify.cpp
haiku/trunk/src/apps/magnify/Magnify.h
haiku/trunk/src/apps/mediaconverter/Jamfile
haiku/trunk/src/apps/mediaconverter/MediaConverterWindow.cpp
haiku/trunk/src/apps/mediaplayer/MainApp.cpp
haiku/trunk/src/apps/mediaplayer/MainApp.h
haiku/trunk/src/apps/mediaplayer/MainWin.cpp
haiku/trunk/src/apps/packageinstaller/main.cpp
haiku/trunk/src/apps/packagemanager/Jamfile
haiku/trunk/src/apps/packagemanager/PackageManager.cpp
haiku/trunk/src/apps/people/PeopleApp.cpp
haiku/trunk/src/apps/people/PeopleApp.h
haiku/trunk/src/apps/poorman/Jamfile
haiku/trunk/src/apps/poorman/PoorManApplication.cpp
haiku/trunk/src/apps/poorman/PoorManApplication.h
haiku/trunk/src/apps/poorman/PoorManWindow.cpp
haiku/trunk/src/apps/poorman/constants.cpp
haiku/trunk/src/apps/poorman/constants.h
haiku/trunk/src/apps/readonlybootprompt/BootPrompt.cpp
haiku/trunk/src/apps/readonlybootprompt/BootPrompt.h
haiku/trunk/src/apps/showimage/Jamfile
haiku/trunk/src/apps/showimage/ShowImageApp.cpp
haiku/trunk/src/apps/showimage/ShowImageApp.h
haiku/trunk/src/apps/showimage/ShowImageWindow.cpp
haiku/trunk/src/apps/sudoku/Sudoku.cpp
haiku/trunk/src/apps/sudoku/Sudoku.h
haiku/trunk/src/apps/sudoku/SudokuView.cpp
haiku/trunk/src/apps/sudoku/SudokuWindow.cpp
haiku/trunk/src/apps/text_search/GrepWindow.cpp
haiku/trunk/src/apps/text_search/GrepWindow.h
haiku/trunk/src/apps/tv/MainWin.cpp
Log:
Removing most About windows and menu items as discussed here
//www.freelists.org/post/haiku-commits/r40968-in-haikutrunksrcapps-activitymonitor-bootmanager-charactermap-codycam-deskbar,3
Leaving them for now in replicants, and in Terminal, according to (my
interpretation of) the instructions here
http://dev.haiku-os.org/browser/haiku/trunk/src/apps/terminal/README.GPL_to_OBOS#L70
Some sporadic cleanup.
Modified: haiku/trunk/src/apps/3dmov/MainWindow.cpp
===================================================================
--- haiku/trunk/src/apps/3dmov/MainWindow.cpp 2011-03-26 01:57:20 UTC (rev
41107)
+++ haiku/trunk/src/apps/3dmov/MainWindow.cpp 2011-03-26 02:18:52 UTC (rev
41108)
@@ -24,21 +24,13 @@
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 @@
// 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 @@
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.
Modified: haiku/trunk/src/apps/activitymonitor/ActivityWindow.cpp
===================================================================
--- haiku/trunk/src/apps/activitymonitor/ActivityWindow.cpp 2011-03-26
01:57:20 UTC (rev 41107)
+++ haiku/trunk/src/apps/activitymonitor/ActivityWindow.cpp 2011-03-26
02:18:52 UTC (rev 41108)
@@ -8,7 +8,6 @@
#include <stdio.h>
-#include <AboutMenuItem.h>
#include <Application.h>
#include <Catalog.h>
#include <File.h>
@@ -119,19 +118,13 @@
// "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
Modified: haiku/trunk/src/apps/bootmanager/BootManager.cpp
===================================================================
--- haiku/trunk/src/apps/bootmanager/BootManager.cpp 2011-03-26 01:57:20 UTC
(rev 41107)
+++ haiku/trunk/src/apps/bootmanager/BootManager.cpp 2011-03-26 02:18:52 UTC
(rev 41108)
@@ -10,12 +10,8 @@
#include "BootManagerWindow.h"
-#include <AboutWindow.h>
-#include <Alert.h>
#include <Application.h>
#include <Catalog.h>
-#include <Locale.h>
-#include <TextView.h>
#undef B_TRANSLATE_CONTEXT
@@ -30,7 +26,6 @@
BootManager();
virtual void ReadyToRun();
- virtual void AboutRequested();
};
@@ -49,20 +44,6 @@
}
-void
-BootManager::AboutRequested()
-{
- const char* authors[] = {
- "David Dengg",
- "Michael Pfeiffer",
- NULL
- };
-
- BAboutWindow about(B_TRANSLATE_SYSTEM_NAME("BootManager"), 2008,
authors);
- about.Show();
-}
-
-
// #pragma mark -
Modified: haiku/trunk/src/apps/bootmanager/BootManagerWindow.cpp
===================================================================
--- haiku/trunk/src/apps/bootmanager/BootManagerWindow.cpp 2011-03-26
01:57:20 UTC (rev 41107)
+++ haiku/trunk/src/apps/bootmanager/BootManagerWindow.cpp 2011-03-26
02:18:52 UTC (rev 41108)
@@ -42,8 +42,6 @@
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 @@
fController.Previous(fWizardView);
break;
- case B_ABOUT_REQUESTED:
- be_app_messenger.SendMessage(B_ABOUT_REQUESTED);
- break;
-
default:
BWindow::MessageReceived(msg);
}
Modified: haiku/trunk/src/apps/bootmanager/Jamfile
===================================================================
--- haiku/trunk/src/apps/bootmanager/Jamfile 2011-03-26 01:57:20 UTC (rev
41107)
+++ haiku/trunk/src/apps/bootmanager/Jamfile 2011-03-26 02:18:52 UTC (rev
41108)
@@ -22,7 +22,7 @@
WizardController.cpp
WizardPageView.cpp
- : be libshared.a textencoding tracker $(HAIKU_LOCALE_LIBS)
$(TARGET_LIBSUPC++)
+ : be textencoding tracker $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++)
: BootManager.rdef
;
Modified: haiku/trunk/src/apps/charactermap/CharacterMap.cpp
===================================================================
--- haiku/trunk/src/apps/charactermap/CharacterMap.cpp 2011-03-26 01:57:20 UTC
(rev 41107)
+++ haiku/trunk/src/apps/charactermap/CharacterMap.cpp 2011-03-26 02:18:52 UTC
(rev 41108)
@@ -8,11 +8,8 @@
#include <stdlib.h>
-#include <AboutWindow.h>
-#include <Alert.h>
#include <Application.h>
#include <Catalog.h>
-#include <TextView.h>
#include "CharacterWindow.h"
@@ -55,19 +52,6 @@
}
-void
-CharacterMap::AboutRequested()
-{
- const char* authors[] = {
- "Axel Dörfler",
- NULL
- };
-
- BAboutWindow about(B_TRANSLATE_SYSTEM_NAME("CharacterMap"), 2009,
authors);
- about.Show();
-}
-
-
// #pragma mark -
Modified: haiku/trunk/src/apps/charactermap/CharacterMap.h
===================================================================
--- haiku/trunk/src/apps/charactermap/CharacterMap.h 2011-03-26 01:57:20 UTC
(rev 41107)
+++ haiku/trunk/src/apps/charactermap/CharacterMap.h 2011-03-26 02:18:52 UTC
(rev 41108)
@@ -22,8 +22,6 @@
virtual void RefsReceived(BMessage* message);
virtual void MessageReceived(BMessage* message);
- virtual void AboutRequested();
-
private:
CharacterWindow* fWindow;
};
Modified: haiku/trunk/src/apps/charactermap/CharacterWindow.cpp
===================================================================
--- haiku/trunk/src/apps/charactermap/CharacterWindow.cpp 2011-03-26
01:57:20 UTC (rev 41107)
+++ haiku/trunk/src/apps/charactermap/CharacterWindow.cpp 2011-03-26
02:18:52 UTC (rev 41108)
@@ -10,7 +10,6 @@
#include <stdio.h>
#include <string.h>
-#include <AboutMenuItem.h>
#include <Application.h>
#include <Button.h>
#include <Catalog.h>
@@ -228,14 +227,9 @@
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"));
Modified: haiku/trunk/src/apps/charactermap/Jamfile
===================================================================
--- haiku/trunk/src/apps/charactermap/Jamfile 2011-03-26 01:57:20 UTC (rev
41107)
+++ haiku/trunk/src/apps/charactermap/Jamfile 2011-03-26 02:18:52 UTC (rev
41108)
@@ -11,7 +11,7 @@
UnicodeBlocks.cpp
UnicodeBlockView.cpp
- : be libshared.a locale $(TARGET_LIBSUPC++) $(HAIKU_LOCALE_LIBS)
+ : be locale $(TARGET_LIBSUPC++) $(HAIKU_LOCALE_LIBS)
: CharacterMap.rdef
;
Modified: haiku/trunk/src/apps/codycam/CodyCam.cpp
===================================================================
--- haiku/trunk/src/apps/codycam/CodyCam.cpp 2011-03-26 01:57:20 UTC (rev
41107)
+++ haiku/trunk/src/apps/codycam/CodyCam.cpp 2011-03-26 02:18:52 UTC (rev
41108)
@@ -4,8 +4,6 @@
#include <string.h>
#include <unistd.h>
-#include <AboutMenuItem.h>
-#include <AboutWindow.h>
#include <Alert.h>
#include <Button.h>
#include <LayoutBuilder.h>
@@ -270,21 +268,6 @@
}
-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 @@
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);
Modified: haiku/trunk/src/apps/codycam/CodyCam.h
===================================================================
--- haiku/trunk/src/apps/codycam/CodyCam.h 2011-03-26 01:57:20 UTC (rev
41107)
+++ haiku/trunk/src/apps/codycam/CodyCam.h 2011-03-26 02:18:52 UTC (rev
41108)
@@ -93,7 +93,6 @@
void ReadyToRun();
virtual bool QuitRequested();
virtual void MessageReceived(BMessage* message);
- virtual void AboutRequested();
private:
status_t _SetUpNodes();
Modified: haiku/trunk/src/apps/codycam/Jamfile
===================================================================
--- haiku/trunk/src/apps/codycam/Jamfile 2011-03-26 01:57:20 UTC (rev
41107)
+++ haiku/trunk/src/apps/codycam/Jamfile 2011-03-26 02:18:52 UTC (rev
41108)
@@ -13,7 +13,7 @@
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
;
Modified: haiku/trunk/src/apps/deskcalc/CalcView.cpp
===================================================================
--- haiku/trunk/src/apps/deskcalc/CalcView.cpp 2011-03-26 01:57:20 UTC (rev
41107)
+++ haiku/trunk/src/apps/deskcalc/CalcView.cpp 2011-03-26 02:18:52 UTC (rev
41108)
@@ -17,7 +17,6 @@
#include <ctype.h>
#include <assert.h>
-#include <AboutMenuItem.h>
#include <AboutWindow.h>
#include <Alert.h>
#include <Application.h>
@@ -121,8 +120,6 @@
fAutoNumlockItem(NULL),
fAudioFeedbackItem(NULL),
fShowKeypadItem(NULL),
- fAboutItem(NULL),
-
fOptions(new CalcOptions()),
fShowKeypad(true)
{
@@ -173,8 +170,6 @@
fAutoNumlockItem(NULL),
fAudioFeedbackItem(NULL),
fShowKeypadItem(NULL),
- fAboutItem(NULL),
-
fOptions(new CalcOptions()),
fShowKeypad(true)
{
@@ -1112,7 +1107,6 @@
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 @@
// fPopUpMenu->AddItem(fAudioFeedbackItem);
fPopUpMenu->AddItem(fShowKeypadItem);
fPopUpMenu->AddSeparatorItem();
- fPopUpMenu->AddItem(fAboutItem);
}
Modified: haiku/trunk/src/apps/deskcalc/CalcView.h
===================================================================
--- haiku/trunk/src/apps/deskcalc/CalcView.h 2011-03-26 01:57:20 UTC (rev
41107)
+++ haiku/trunk/src/apps/deskcalc/CalcView.h 2011-03-26 02:18:52 UTC (rev
41108)
@@ -120,7 +120,6 @@
BMenuItem* fAutoNumlockItem;
BMenuItem* fAudioFeedbackItem;
BMenuItem* fShowKeypadItem;
- BMenuItem* fAboutItem;
// calculator options.
CalcOptions* fOptions;
Modified: haiku/trunk/src/apps/devices/DevicesApplication.cpp
===================================================================
--- haiku/trunk/src/apps/devices/DevicesApplication.cpp 2011-03-26 01:57:20 UTC
(rev 41107)
+++ haiku/trunk/src/apps/devices/DevicesApplication.cpp 2011-03-26 02:18:52 UTC
(rev 41108)
@@ -6,7 +6,6 @@
* Pieter Panman
*/
-#include <AboutWindow.h>
#include <Alert.h>
#include <Application.h>
#include <Catalog.h>
@@ -20,8 +19,6 @@
class DevicesApplication : public BApplication {
public:
DevicesApplication();
- virtual void AboutRequested();
- static void ShowAbout();
};
@@ -44,27 +41,6 @@
}
-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"),
Modified: haiku/trunk/src/apps/devices/DevicesView.cpp
===================================================================
--- haiku/trunk/src/apps/devices/DevicesView.cpp 2011-03-26 01:57:20 UTC
(rev 41107)
+++ haiku/trunk/src/apps/devices/DevicesView.cpp 2011-03-26 02:18:52 UTC
(rev 41108)
@@ -7,7 +7,6 @@
*/
-#include <AboutMenuItem.h>
#include <Application.h>
#include <Catalog.h>
#include <MenuBar.h>
@@ -45,8 +44,6 @@
"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);
Modified: haiku/trunk/src/apps/devices/Jamfile
===================================================================
--- haiku/trunk/src/apps/devices/Jamfile 2011-03-26 01:57:20 UTC (rev
41107)
+++ haiku/trunk/src/apps/devices/Jamfile 2011-03-26 02:18:52 UTC (rev
41108)
@@ -72,7 +72,7 @@
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
;
Modified: haiku/trunk/src/apps/diskprobe/DiskProbe.cpp
===================================================================
--- haiku/trunk/src/apps/diskprobe/DiskProbe.cpp 2011-03-26 01:57:20 UTC
(rev 41107)
+++ haiku/trunk/src/apps/diskprobe/DiskProbe.cpp 2011-03-26 02:18:52 UTC
(rev 41108)
@@ -77,7 +77,6 @@
virtual void ArgvReceived(int32 argc, char **argv);
virtual void MessageReceived(BMessage *message);
- virtual void AboutRequested();
virtual bool QuitRequested();
private:
@@ -483,20 +482,6 @@
}
-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()
{
Modified: haiku/trunk/src/apps/diskprobe/FileWindow.cpp
===================================================================
--- haiku/trunk/src/apps/diskprobe/FileWindow.cpp 2011-03-26 01:57:20 UTC
(rev 41107)
+++ haiku/trunk/src/apps/diskprobe/FileWindow.cpp 2011-03-26 02:18:52 UTC
(rev 41108)
@@ -81,10 +81,6 @@
// 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);
Modified: haiku/trunk/src/apps/diskprobe/Jamfile
===================================================================
--- haiku/trunk/src/apps/diskprobe/Jamfile 2011-03-26 01:57:20 UTC (rev
41107)
+++ haiku/trunk/src/apps/diskprobe/Jamfile 2011-03-26 02:18:52 UTC (rev
41108)
@@ -16,7 +16,7 @@
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
;
Modified: haiku/trunk/src/apps/expander/ExpanderApp.cpp
===================================================================
--- haiku/trunk/src/apps/expander/ExpanderApp.cpp 2011-03-26 01:57:20 UTC
(rev 41107)
+++ haiku/trunk/src/apps/expander/ExpanderApp.cpp 2011-03-26 02:18:52 UTC
(rev 41108)
@@ -6,12 +6,6 @@
#include "ExpanderApp.h"
-#include <AboutWindow.h>
-#include <Alert.h>
-#include <Catalog.h>
-#include <Locale.h>
-#include <TextView.h>
-
#include "ExpanderWindow.h"
@@ -27,29 +21,7 @@
}
-#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)
{
BMessage* msg = NULL;
Modified: haiku/trunk/src/apps/expander/ExpanderApp.h
===================================================================
--- haiku/trunk/src/apps/expander/ExpanderApp.h 2011-03-26 01:57:20 UTC (rev
41107)
+++ haiku/trunk/src/apps/expander/ExpanderApp.h 2011-03-26 02:18:52 UTC (rev
41108)
@@ -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 <Application.h>
-#include <Catalog.h>
+
#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
Modified: haiku/trunk/src/apps/expander/ExpanderWindow.cpp
===================================================================
--- haiku/trunk/src/apps/expander/ExpanderWindow.cpp 2011-03-26 01:57:20 UTC
(rev 41107)
+++ haiku/trunk/src/apps/expander/ExpanderWindow.cpp 2011-03-26 02:18:52 UTC
(rev 41108)
@@ -514,11 +514,6 @@
{
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…"),
Modified: haiku/trunk/src/apps/expander/Jamfile
===================================================================
--- haiku/trunk/src/apps/expander/Jamfile 2011-03-26 01:57:20 UTC (rev
41107)
+++ haiku/trunk/src/apps/expander/Jamfile 2011-03-26 02:18:52 UTC (rev
41108)
@@ -12,14 +12,13 @@
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
Modified: haiku/trunk/src/apps/glteapot/TeapotApp.h
===================================================================
--- haiku/trunk/src/apps/glteapot/TeapotApp.h 2011-03-26 01:57:20 UTC (rev
41107)
+++ haiku/trunk/src/apps/glteapot/TeapotApp.h 2011-03-26 02:18:52 UTC (rev
41108)
@@ -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 <Application.h>
+
#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
Modified: haiku/trunk/src/apps/haiku3d/App.cpp
===================================================================
--- haiku/trunk/src/apps/haiku3d/App.cpp 2011-03-26 01:57:20 UTC (rev
41107)
+++ haiku/trunk/src/apps/haiku3d/App.cpp 2011-03-26 02:18:52 UTC (rev
41108)
@@ -6,9 +6,9 @@
* Alexandre Deckner <alex@xxxxxxxxxxxx>
*/
-#include <Alert.h>
#include "App.h"
+
#include "MainWindow.h"
@@ -35,15 +35,6 @@
}
-void
-App::AboutRequested()
-{
- BAlert* alert;
- alert = new BAlert("About", "A little 3D demo", "OK");
- alert->Go(NULL);
-}
-
-
bool
App::QuitRequested()
{
Modified: haiku/trunk/src/apps/haiku3d/App.h
===================================================================
--- haiku/trunk/src/apps/haiku3d/App.h 2011-03-26 01:57:20 UTC (rev 41107)
+++ haiku/trunk/src/apps/haiku3d/App.h 2011-03-26 02:18:52 UTC (rev 41108)
@@ -5,23 +5,23 @@
* Authors:
* Alexandre Deckner <alex@xxxxxxxxxxxx>
*/
-
#ifndef _APP_H
#define _APP_H
+
#include <Application.h>
-class App: public BApplication {
+
+class App : public BApplication {
public:
- App();
- virtual ~App();
+ App();
+ virtual ~App();
- virtual void ReadyToRun();
- virtual void AboutRequested();
- virtual bool QuitRequested();
+ virtual void ReadyToRun();
+ virtual bool QuitRequested();
protected:
- BWindow* fMainWindow;
+ BWindow* fMainWindow;
};
#endif /* _APP_H */
Modified: haiku/trunk/src/apps/installedpackages/main.cpp
===================================================================
--- haiku/trunk/src/apps/installedpackages/main.cpp 2011-03-26 01:57:20 UTC
(rev 41107)
+++ haiku/trunk/src/apps/installedpackages/main.cpp 2011-03-26 02:18:52 UTC
(rev 41108)
@@ -30,8 +30,6 @@
UninstallApplication();
~UninstallApplication();
- void AboutRequested();
-
private:
UninstallWindow* fWindow;
};
@@ -52,32 +50,6 @@
}
-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()
{
Modified: haiku/trunk/src/apps/magnify/Jamfile
===================================================================
--- haiku/trunk/src/apps/magnify/Jamfile 2011-03-26 01:57:20 UTC (rev
41107)
+++ haiku/trunk/src/apps/magnify/Jamfile 2011-03-26 02:18:52 UTC (rev
41108)
@@ -8,7 +8,7 @@
Application Magnify :
Magnify.cpp
- : be game $(HAIKU_LOCALE_LIBS) libshared.a $(TARGET_LIBSUPC++) tracker
+ : be game $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSUPC++) tracker
: Magnify.rdef
;
Modified: haiku/trunk/src/apps/magnify/Magnify.cpp
===================================================================
--- haiku/trunk/src/apps/magnify/Magnify.cpp 2011-03-26 01:57:20 UTC (rev
41107)
+++ haiku/trunk/src/apps/magnify/Magnify.cpp 2011-03-26 02:18:52 UTC (rev
41108)
@@ -10,7 +10,6 @@
#include "Magnify.h"
-#include <AboutMenuItem.h>
#include <Alert.h>
#include <Bitmap.h>
#include <Catalog.h>
@@ -132,8 +131,6 @@
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 @@
}
-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 @@
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 @@
bool active = fFatBits->Active();
switch (m->what) {
- case B_ABOUT_REQUESTED:
- be_app->MessageReceived(m);
- break;
-
case msg_help:
ShowHelp();
break;
Modified: haiku/trunk/src/apps/magnify/Magnify.h
===================================================================
--- haiku/trunk/src/apps/magnify/Magnify.h 2011-03-26 01:57:20 UTC (rev
41107)
+++ haiku/trunk/src/apps/magnify/Magnify.h 2011-03-26 02:18:52 UTC (rev
41108)
@@ -254,10 +254,6 @@
class TApp : public BApplication {
public:
TApp(int32 pixelCount = -1);
-
- virtual void MessageReceived(BMessage* message);
- virtual void ReadyToRun();
- virtual void AboutRequested();
};
#endif // MAGNIFY_H
Modified: haiku/trunk/src/apps/mediaconverter/Jamfile
===================================================================
--- haiku/trunk/src/apps/mediaconverter/Jamfile 2011-03-26 01:57:20 UTC (rev
41107)
+++ haiku/trunk/src/apps/mediaconverter/Jamfile 2011-03-26 02:18:52 UTC (rev
41108)
@@ -12,7 +12,7 @@
MediaFileInfoView.cpp
MediaFileListView.cpp
- : be libshared.a media tracker $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSTDC++)
+ : be media tracker $(HAIKU_LOCALE_LIBS) $(TARGET_LIBSTDC++)
: MediaConverter.rdef
;
Modified: haiku/trunk/src/apps/mediaconverter/MediaConverterWindow.cpp
===================================================================
--- haiku/trunk/src/apps/mediaconverter/MediaConverterWindow.cpp
2011-03-26 01:57:20 UTC (rev 41107)
+++ haiku/trunk/src/apps/mediaconverter/MediaConverterWindow.cpp
2011-03-26 02:18:52 UTC (rev 41108)
@@ -9,7 +9,6 @@
#include <stdio.h>
#include <string.h>
-#include <AboutMenuItem.h>
#include <Alert.h>
#include <Application.h>
#include <Box.h>
@@ -384,20 +383,6 @@
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 @@
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);
[... truncated: 736 lines follow ...]
Other related posts:
