i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* show EULA before the Installer window

Browse Source 
* this fixes #2332


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25860 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2008-06-08 12:09:10 +00:00
parent f7c655c7e0
commit 53ad1814cb
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/installer/InstallerApp.cpp
+8 -5
View File
@@ -28,11 +28,7 @@ int main(int, char **)
InstallerApp::InstallerApp() InstallerApp::InstallerApp()
: BApplication(APP_SIG) : BApplication(APP_SIG)
{ {
BRect windowFrame(0, 0, INSTALLER_RIGHT, 160);
BRect frame = BScreen().Frame(); BRect frame = BScreen().Frame();
windowFrame.OffsetBy((frame.Width() - windowFrame.Width()) / 2,
frame.Height() / 2 - windowFrame.Height() / 4 - 113);
fWindow = new InstallerWindow(windowFrame);
// show the EULA // show the EULA
BAlert *alert = new BAlert("", EULA_TEXT, " Disagree ", " Agree ", NULL, BAlert *alert = new BAlert("", EULA_TEXT, " Disagree ", " Agree ", NULL,
@@ -51,8 +47,15 @@ InstallerApp::InstallerApp()
alertFrame.OffsetTo((frame.Width() - alertFrame.Width()) / 2, alertFrame.OffsetTo((frame.Width() - alertFrame.Width()) / 2,
(frame.Height() - alertFrame.Height()) / 2); (frame.Height() - alertFrame.Height()) / 2);
alert->MoveTo(alertFrame.LeftTop()); alert->MoveTo(alertFrame.LeftTop());
if (alert->Go() != 1) if (alert->Go() != 1) {
PostMessage(B_QUIT_REQUESTED); PostMessage(B_QUIT_REQUESTED);
return;
}
BRect windowFrame(0, 0, INSTALLER_RIGHT, 160);
windowFrame.OffsetBy((frame.Width() - windowFrame.Width()) / 2,
frame.Height() / 2 - windowFrame.Height() / 4 - 113);
fWindow = new InstallerWindow(windowFrame);
} }
void void