Initializes firmware installation (#1155)

gui/CMakeLists.txt

@@ -18,7 +18,6 @@ add_executable(obliteration WIN32 MACOSX_BUNDLE
     progress_dialog.cpp
     resources.cpp
     resources.qrc
-    screen.cpp
     settings.cpp
     system.cpp)
 

gui/Cargo.toml

@@ -11,6 +11,7 @@ path = "src/main.rs"
 bitfield-struct = "0.9.2"
 ciborium = "0.2.2"
 clap = { version = "4.5.21", features = ["derive"] }
+erdp = "0.1.1"
 gdbstub = "0.7.3"
 gdbstub_arch = "0.3.1"
 humansize = "2.1.3"

gui/main.cpp

@@ -38,8 +38,6 @@ int main(int argc, char *argv[])
     // Parse arguments.
     QCommandLineParser args;
 
-    args.setApplicationDescription("Virtualization stack for Obliteration");
-    args.addHelpOption();
     args.addOption(Args::debug);
     args.addOption(Args::kernel);
     args.process(app);
@@ -165,7 +163,7 @@ int main(int argc, char *argv[])
 #ifdef __APPLE__
     MainWindow win(args);
 #else
-    MainWindow win(args, &vulkan, std::move(vkDevices));
+    MainWindow win(args, std::move(vkDevices));
 #endif
 
     win.restoreGeometry();

gui/main_window.cpp

@@ -1,7 +1,6 @@
 #include "main_window.hpp"
 #include "launch_settings.hpp"
 #include "resources.hpp"
-#include "screen.hpp"
 #include "settings.hpp"
 
 #include <QAction>
@@ -41,13 +40,11 @@ MainWindow::MainWindow(const QCommandLineParser &args) :
 #else
 MainWindow::MainWindow(
     const QCommandLineParser &args,
-    QVulkanInstance *vulkan,
     QList<VkPhysicalDevice> &&vkDevices) :
 #endif
     m_args(args),
     m_main(nullptr),
     m_launch(nullptr),
-    m_screen(nullptr),
     m_debugNoti(nullptr)
 {
     setWindowTitle("Obliteration");
@@ -92,15 +89,6 @@ MainWindow::MainWindow(
 #endif
 
     m_main->addWidget(m_launch);
-
-    // Screen.
-    m_screen = new Screen();
-
-#ifndef __APPLE__
-    m_screen->setVulkanInstance(vulkan);
-#endif
-
-    m_main->addWidget(createWindowContainer(m_screen));
 }
 
 MainWindow::~MainWindow()

gui/main_window.hpp

@@ -7,12 +7,10 @@
 #endif
 
 class LaunchSettings;
-class ProfileList;
 class QCommandLineOption;
 class QCommandLineParser;
 class QSocketNotifier;
 class QStackedWidget;
-class Screen;
 
 class MainWindow final : public QMainWindow {
 public:
@@ -21,7 +19,6 @@ class MainWindow final : public QMainWindow {
 #else
     MainWindow(
         const QCommandLineParser &args,
-        QVulkanInstance *vulkan,
         QList<VkPhysicalDevice> &&vkDevices);
 #endif
     ~MainWindow() override;
@@ -42,7 +39,6 @@ private slots:
     const QCommandLineParser &m_args;
     QStackedWidget *m_main;
     LaunchSettings *m_launch;
-    Screen *m_screen;
     QSocketNotifier *m_debugNoti;
 };
 

gui/src/setup/mod.rs

@@ -1,7 +1,9 @@
 use crate::dialogs::{open_file, FileType};
 use crate::ui::SetupWizard;
+use erdp::ErrorDisplay;
 use slint::{ComponentHandle, PlatformError};
 use std::cell::Cell;
+use std::fs::File;
 use std::rc::Rc;
 use thiserror::Error;
 
@@ -24,6 +26,12 @@ pub fn run_setup() -> Result<bool, SetupError> {
         }
     });
 
+    win.on_install_firmware({
+        let win = win.as_weak();
+
+        move || install_firmware(win.unwrap())
+    });
+
     win.on_finish({
         let win = win.as_weak();
         let finish = finish.clone();
@@ -56,6 +64,18 @@ async fn browse_firmware(win: SetupWizard) {
     win.set_firmware_dump(path.into_os_string().into_string().unwrap().into());
 }
 
+fn install_firmware(win: SetupWizard) {
+    // Open firmware dump.
+    let dump = win.get_firmware_dump();
+    let dump = match File::open(dump.as_str()) {
+        Ok(v) => v,
+        Err(e) => {
+            win.set_error_message(format!("Failed to open {}: {}.", dump, e.display()).into());
+            return;
+        }
+    };
+}
+
 /// Represents an error when [`run_setup()`] fails.
 #[derive(Debug, Error)]
 pub enum SetupError {

gui/ui/error.slint

@@ -1,8 +1,10 @@
 import { Palette, HorizontalBox, StandardButton, VerticalBox } from "std-widgets.slint";
 
-component Content {
+component Content inherits Rectangle {
     in property <string> message;
 
+    background: Palette.background;
+
     HorizontalBox {
         VerticalLayout {
             alignment: start;
@@ -23,7 +25,7 @@ component Content {
 }
 
 component ActionBar inherits Rectangle {
-    pure callback close();
+    callback close();
 
     background: Palette.alternate-background;
 
@@ -39,6 +41,29 @@ component ActionBar inherits Rectangle {
     }
 }
 
+export component ErrorPopup inherits PopupWindow {
+    in property <string> message;
+
+    callback close-clicked <=> ab.close;
+
+    close-on-click: false;
+
+    Rectangle {
+        border-color: Palette.border;
+        border-width: 1px;
+        clip: true;
+
+        VerticalLayout {
+            Content {
+                message: message;
+                vertical-stretch: 1;
+            }
+
+            ab := ActionBar { }
+        }
+    }
+}
+
 export component ErrorWindow inherits Window {
     in property <string> message;
 

gui/ui/setup.slint

@@ -3,6 +3,7 @@ import { Firmware, InstallFirmware } from "setup/firmware.slint";
 import { Conclusion } from "setup/conclusion.slint";
 import { NavBar } from "setup/nav.slint";
 import { Palette } from "std-widgets.slint";
+import { ErrorPopup } from "error.slint";
 
 // https://github.com/slint-ui/slint/issues/6880
 enum WizardPage {
@@ -11,18 +12,28 @@ enum WizardPage {
     Conclusion
 }
 
-export component SetupWizard inherits Window {
-    title: "Setup Obliteration";
-    icon: @image-url("icon.png");
-    width: 500px; // PopupWindow does not resize with the window somehow.
-    height: 400px; // Same here.
+export enum FirmwareInstaller {
+    Stopped,
+    Running
+}
 
+export component SetupWizard inherits Window {
     in-out property <string> firmware-dump;
+    in-out property <FirmwareInstaller> firmware-installer;
+    in property <string> firmware-status;
+    in property <float> firmware-progress;
+    in-out property <string> error-message;
 
     pure callback cancel <=> nav.cancel;
     pure callback browse-firmware();
+    pure callback install-firmware();
     pure callback finish();
 
+    title: "Setup Obliteration";
+    icon: @image-url("icon.png");
+    width: 500px; // PopupWindow does not resize with the window somehow.
+    height: 400px; // Same here.
+
     private property <WizardPage> page: WizardPage.Intro;
 
     states [
@@ -37,12 +48,16 @@ export component SetupWizard inherits Window {
         }
 
         if page == WizardPage.Firmware: Firmware {
-            firmware-dump: root.firmware-dump;
+            firmware-dump: firmware-dump;
             vertical-stretch: 1;
 
             browse => {
                 browse-firmware();
             }
+
+            changed firmware-dump => {
+                firmware-dump = self.firmware-dump;
+            }
         }
 
         if page == WizardPage.Conclusion: Conclusion {
@@ -62,18 +77,44 @@ export component SetupWizard inherits Window {
                 if root.page == WizardPage.Intro {
                     root.page = WizardPage.Firmware;
                 } else if root.page == WizardPage.Firmware {
-                    install-firmware.show();
+                    install-firmware();
                 } else if root.page == WizardPage.Conclusion {
                     finish();
                 }
             }
         }
     }
 
-    install-firmware := InstallFirmware {
+    firmware-popup := InstallFirmware {
         x: 10px;
         y: 150px;
         width: parent.width - 20px;
         height: parent.height - 300px;
+        status: firmware-status;
+        progress: firmware-progress;
+    }
+
+    error-popup := ErrorPopup {
+        x: 10px;
+        y: (parent.height / 2) - 50px;
+        width: parent.width - 20px;
+        message: error-message;
+        close-clicked => {
+            error-message = "";
+        }
+    }
+
+    changed firmware-installer => {
+        if firmware-installer == FirmwareInstaller.Running {
+            firmware-popup.show();
+        }
+    }
+
+    changed error-message => {
+        if error-message == "" {
+            error-popup.close();
+        } else {
+            error-popup.show();
+        }
     }
 }

gui/ui/setup/firmware.slint

@@ -35,6 +35,9 @@ export component Firmware {
 }
 
 export component InstallFirmware inherits PopupWindow {
+    in property <string> status;
+    in property <float> progress;
+
     close-on-click: false;
 
     Rectangle {
@@ -50,9 +53,12 @@ export component InstallFirmware inherits PopupWindow {
                 horizontal-alignment: center;
             }
 
-            ProgressIndicator { }
+            ProgressIndicator {
+                progress: progress;
+            }
 
             Text {
+                text: status;
                 horizontal-alignment: center;
             }
         }