Changeset 546 for branches/eraser6/Installer/Bootstrapper/Main.cpp

Timestamp:

11/13/2008 3:08:07 PM (4 years ago)

Author:

lowjoel

Message:

Hide the Eraser bootstrapper progress screen after .NET has been installed, since the centrepiece should be the Eraser installer.

File:

• branches/eraser6/Installer/Bootstrapper/Main.cpp (modified) (5 diffs)

branches/eraser6/Installer/Bootstrapper/Main.cpp

@@ -134 +134 @@
         //Create the parent window and the child controls
         ::hInstance = hInstance;
-        Application::Get();
+        Application& app = Application::Get();
+        MainWindow& mainWin = app.GetTopWindow();
 
         //OK, now we do the hard work. Create a folder to place our payload into
@@ -148 +149 @@
         TempDir dir(tempDir);
         ExtractTempFiles(tempDir);
+        mainWin.EnableCancellation(false);
 
         //Install the .NET framework
@@ -154 +156 @@
 
         //Then install Eraser!
+        mainWin.Show(false);
         InstallEraser(tempDir);
     }
@@ -267 +270 @@
 
     //Create the window
-    hWnd = CreateWindowW(szWindowClass, L"Eraser Setup", WS_CAPTION | WS_SYSMENU,
+    hWnd = CreateWindowW(szWindowClass, L"Eraser Setup", WS_CAPTION,
         CW_USEDEFAULT, 0, 300, 130, NULL, NULL, hInstance, NULL);
 
@@ -306 +309 @@
 }
 
+void MainWindow::Show(bool show)
+{
+    ShowWindow(hWnd, show ? SW_SHOW : SW_HIDE);
+}
+
+void MainWindow::EnableCancellation(bool enable)
+{
+    EnableWindow(hWndCancelBtn, enable);
+}
+
 void MainWindow::SetProgress(float progress)
 {