hrev54470 adds 1 changeset to branch 'master'
old head: 60a6f1d5d7a8715cd3897dd0b626f2e4a64984a8
new head: 6a40fd892cbcf202c57a3f412738f410f26d4cac
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=6a40fd892cbc+%5E60a6f1d5d7a8
----------------------------------------------------------------------------
6a40fd892cbc: Cleaned up InstallerApp
- Removed outdated, unused EULA text
- Removed unused BAboutWindow instance
- Changed instance name from 'theApp' to 'installer'
Change-Id: I6b8e078dc6e469df4cd2f254ccab719c061561d8
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3066
Reviewed-by: Adrien Destugues <pulkomandy@xxxxxxxxx>
[ Panagiotis Vasilopoulos <hello@xxxxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev54470
Commit: 6a40fd892cbcf202c57a3f412738f410f26d4cac
URL: https://git.haiku-os.org/haiku/commit/?id=6a40fd892cbc
Author: Panagiotis Vasilopoulos <hello@xxxxxxxxxxxxxxx>
Date: Thu Jul 23 16:36:29 2020 UTC
Committer: Adrien Destugues <pulkomandy@xxxxxxxxx>
Commit-Date: Tue Jul 28 17:01:11 2020 UTC
----------------------------------------------------------------------------
2 files changed, 2 insertions(+), 49 deletions(-)
src/apps/installer/InstallerApp.cpp | 50 ++-------------------------------
src/apps/installer/InstallerApp.h | 1 -
----------------------------------------------------------------------------
diff --git a/src/apps/installer/InstallerApp.cpp
b/src/apps/installer/InstallerApp.cpp
index 7e50920a97..ccb4f4927f 100644
--- a/src/apps/installer/InstallerApp.cpp
+++ b/src/apps/installer/InstallerApp.cpp
@@ -22,39 +22,14 @@
static const uint32 kMsgAgree = 'agre';
static const uint32 kMsgNext = 'next';
-//static const char* kEULAText =
-//"NOTICE: READ THIS BEFORE INSTALLING OR USING HAIKU\n\n"
-//
-//"Copyright " B_UTF8_COPYRIGHT " 2001-2009 The Haiku Project. All rights "
-//"reserved. The copyright to the Haiku code is property of Haiku, Inc. or of "
-//"the respective authors where expressly noted in the source.\n\n"
-//
-//"Permission is hereby granted, free of charge, to any person obtaining a "
-//"copy of this software and associated documentation files (the
\"Software\"), "
-//"to deal in the Software without restriction, including without limitation "
-//"the rights to use, copy, modify, merge, publish, distribute, sublicense, "
-//"and/or sell copies of the Software, and to permit persons to whom the "
-//"Software is furnished to do so, subject to the following conditions:\n\n"
-//"The above copyright notice and this permission notice shall be included in "
-//"all copies or substantial portions of the Software.\n\n"
-//
-//"THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS "
-//"OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
"
-//"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
"
-//"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER "
-//"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING "
-//"FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS "
-//"IN THE SOFTWARE.";
-
-
#undef B_TRANSLATION_CONTEXT
#define B_TRANSLATION_CONTEXT "InstallerApp"
int main(int, char **)
{
- InstallerApp theApp;
- theApp.Run();
+ InstallerApp installer;
+ installer.Run();
return 0;
}
@@ -83,27 +58,6 @@ InstallerApp::MessageReceived(BMessage* message)
}
-void
-InstallerApp::AboutRequested()
-{
- BAlert *alert = new BAlert("about", B_TRANSLATE("Installer\n"
- "\twritten by Jérôme Duval and Stephan Aßmus\n"
- "\tCopyright 2005-2010, Haiku.\n\n"), B_TRANSLATE("OK"));
- alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE);
- BTextView *view = alert->TextView();
- BFont font;
-
- view->SetStylable(true);
-
- view->GetFont(&font);
- font.SetSize(18);
- font.SetFace(B_BOLD_FACE);
- view->SetFontAndColor(0, 9, &font);
-
- alert->Go();
-}
-
-
void
InstallerApp::ReadyToRun()
{
diff --git a/src/apps/installer/InstallerApp.h
b/src/apps/installer/InstallerApp.h
index 4fb43aa81b..8cfbd38d4e 100644
--- a/src/apps/installer/InstallerApp.h
+++ b/src/apps/installer/InstallerApp.h
@@ -19,7 +19,6 @@ public:
virtual void MessageReceived(BMessage*
message);
- virtual void AboutRequested();
virtual void ReadyToRun();
virtual void Quit();
