Show Installer on all workspaces when Tracker isn't running.
This applies to the EULA window as well. Addresses #9287:comment:5
This commit is contained in:
@@ -10,9 +10,12 @@
|
|||||||
#include <Button.h>
|
#include <Button.h>
|
||||||
#include <LayoutBuilder.h>
|
#include <LayoutBuilder.h>
|
||||||
#include <Locale.h>
|
#include <Locale.h>
|
||||||
|
#include <Roster.h>
|
||||||
#include <ScrollView.h>
|
#include <ScrollView.h>
|
||||||
#include <TextView.h>
|
#include <TextView.h>
|
||||||
|
|
||||||
|
#include "tracker_private.h"
|
||||||
|
|
||||||
|
|
||||||
static const uint32 kMsgAgree = 'agre';
|
static const uint32 kMsgAgree = 'agre';
|
||||||
|
|
||||||
@@ -251,7 +254,10 @@ InstallerApp::ReadyToRun()
|
|||||||
BRect eulaFrame = BRect(0, 0, 600, 450);
|
BRect eulaFrame = BRect(0, 0, 600, 450);
|
||||||
fEULAWindow = new BWindow(eulaFrame, B_TRANSLATE("README"),
|
fEULAWindow = new BWindow(eulaFrame, B_TRANSLATE("README"),
|
||||||
B_MODAL_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, B_NOT_ZOOMABLE
|
B_MODAL_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, B_NOT_ZOOMABLE
|
||||||
| B_NOT_MINIMIZABLE | B_AUTO_UPDATE_SIZE_LIMITS, B_ALL_WORKSPACES);
|
| B_NOT_MINIMIZABLE | B_AUTO_UPDATE_SIZE_LIMITS);
|
||||||
|
|
||||||
|
if (!be_roster->IsRunning(kTrackerSignature))
|
||||||
|
fEULAWindow->SetWorkspaces(B_ALL_WORKSPACES);
|
||||||
|
|
||||||
BLayoutBuilder::Group<>(fEULAWindow, B_VERTICAL, 10)
|
BLayoutBuilder::Group<>(fEULAWindow, B_VERTICAL, 10)
|
||||||
.SetInsets(10)
|
.SetInsets(10)
|
||||||
|
|||||||
@@ -157,7 +157,7 @@ InstallerWindow::InstallerWindow()
|
|||||||
:
|
:
|
||||||
BWindow(BRect(-2000, -2000, -1800, -1800),
|
BWindow(BRect(-2000, -2000, -1800, -1800),
|
||||||
B_TRANSLATE_SYSTEM_NAME("Installer"), B_TITLED_WINDOW,
|
B_TRANSLATE_SYSTEM_NAME("Installer"), B_TITLED_WINDOW,
|
||||||
B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS, B_ALL_WORKSPACES),
|
B_NOT_ZOOMABLE | B_AUTO_UPDATE_SIZE_LIMITS),
|
||||||
fEncouragedToSetupPartitions(false),
|
fEncouragedToSetupPartitions(false),
|
||||||
fDriveSetupLaunched(false),
|
fDriveSetupLaunched(false),
|
||||||
fBootManagerLaunched(false),
|
fBootManagerLaunched(false),
|
||||||
@@ -165,6 +165,9 @@ InstallerWindow::InstallerWindow()
|
|||||||
fWorkerThread(new WorkerThread(this)),
|
fWorkerThread(new WorkerThread(this)),
|
||||||
fCopyEngineCancelSemaphore(-1)
|
fCopyEngineCancelSemaphore(-1)
|
||||||
{
|
{
|
||||||
|
if (!be_roster->IsRunning(kTrackerSignature))
|
||||||
|
SetWorkspaces(B_ALL_WORKSPACES);
|
||||||
|
|
||||||
LogoView* logoView = new LogoView();
|
LogoView* logoView = new LogoView();
|
||||||
|
|
||||||
fStatusView = new BTextView("statusView", be_plain_font, NULL,
|
fStatusView = new BTextView("statusView", be_plain_font, NULL,
|
||||||
|
|||||||
Reference in New Issue
Block a user