[haiku-commits] haiku: hrev45122 - src/apps/installer
- From: mattmadia@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 2 Jan 2013 17:33:56 +0100 (CET)
hrev45122 adds 2 changesets to branch 'master'
old head: db41683495bfde817554415d14ae6f9cc91e77eb
new head: 87d333ee131f27cbab8bac9ee778865efba69fb6
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=87d333e+%5Edb41683
----------------------------------------------------------------------------
630404b: Automatic white space cleanup. No functional change.
87d333e: Make the EULA and Installer appear on all workspaces.
Fixes #9287
[ Matt Madia <mattmadia@xxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 4 insertions(+), 4 deletions(-)
src/apps/installer/InstallerApp.cpp | 6 +++---
src/apps/installer/InstallerWindow.cpp | 2 +-
############################################################################
Commit: 630404be03b9422bc35c437ade7cba21142138a1
URL: http://cgit.haiku-os.org/haiku/commit/?id=630404b
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Wed Jan 2 11:33:14 2013 UTC
Automatic white space cleanup. No functional change.
----------------------------------------------------------------------------
diff --git a/src/apps/installer/InstallerApp.cpp
b/src/apps/installer/InstallerApp.cpp
index 22b7ee6..e48f0ca 100644
--- a/src/apps/installer/InstallerApp.cpp
+++ b/src/apps/installer/InstallerApp.cpp
@@ -183,7 +183,7 @@ InstallerApp::ReadyToRun()
infoText << B_TRANSLATE(
"NOTE: While the naming strategy for hard disks is still as
described "
"under 2.1) the naming scheme for partitions has changed.\n\n");
- infoText << B_TRANSLATE(
+ infoText << B_TRANSLATE(
"GRUB's naming scheme is still: (hdN,n)\n\n");
infoText << B_TRANSLATE(
"All hard disks start with \"hd\".\n");
############################################################################
Revision: hrev45122
Commit: 87d333ee131f27cbab8bac9ee778865efba69fb6
URL: http://cgit.haiku-os.org/haiku/commit/?id=87d333e
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Wed Jan 2 11:34:09 2013 UTC
Ticket: https://dev.haiku-os.org/ticket/9287
Make the EULA and Installer appear on all workspaces.
Fixes #9287
----------------------------------------------------------------------------
diff --git a/src/apps/installer/InstallerApp.cpp
b/src/apps/installer/InstallerApp.cpp
index e48f0ca..a4e7237 100644
--- a/src/apps/installer/InstallerApp.cpp
+++ b/src/apps/installer/InstallerApp.cpp
@@ -250,8 +250,8 @@ InstallerApp::ReadyToRun()
BRect eulaFrame = BRect(0, 0, 600, 450);
fEULAWindow = new BWindow(eulaFrame, B_TRANSLATE("README"),
- B_MODAL_WINDOW, B_NOT_ZOOMABLE | B_NOT_MINIMIZABLE
- | B_AUTO_UPDATE_SIZE_LIMITS);
+ B_MODAL_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, B_NOT_ZOOMABLE
+ | B_NOT_MINIMIZABLE | B_AUTO_UPDATE_SIZE_LIMITS,
B_ALL_WORKSPACES);
BLayoutBuilder::Group<>(fEULAWindow, B_VERTICAL, 10)
.SetInsets(10)
diff --git a/src/apps/installer/InstallerWindow.cpp
b/src/apps/installer/InstallerWindow.cpp
index 4dd4899..a43fe39 100644
--- a/src/apps/installer/InstallerWindow.cpp
+++ b/src/apps/installer/InstallerWindow.cpp
@@ -157,7 +157,7 @@ InstallerWindow::InstallerWindow()
:
BWindow(BRect(-2000, -2000, -1800, -1800),
B_TRANSLATE_SYSTEM_NAME("Installer"), B_TITLED_WINDOW,
- B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS),
+ B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS, B_ALL_WORKSPACES),
fEncouragedToSetupPartitions(false),
fDriveSetupLaunched(false),
fBootManagerLaunched(false),
Other related posts:
- » [haiku-commits] haiku: hrev45122 - src/apps/installer - mattmadia
