From 1a3d3c8d81cbe622f70fabcadf4aef9db25ef1aa Mon Sep 17 00:00:00 2001 From: Jean-Philip Desjardins Date: Fri, 28 Sep 2018 12:00:02 -0400 Subject: [PATCH] Add "Boot from cdrom0" menu item. --- Source/ui_unix/Qt_ui/mainwindow.ui | 6 ++++++ Source/ui_unix/mainwindow.cpp | 14 ++++++++++++++ Source/ui_unix/mainwindow.h | 1 + 3 files changed, 21 insertions(+) diff --git a/Source/ui_unix/Qt_ui/mainwindow.ui b/Source/ui_unix/Qt_ui/mainwindow.ui index a021f6e1..4a4aa1c5 100644 --- a/Source/ui_unix/Qt_ui/mainwindow.ui +++ b/Source/ui_unix/Qt_ui/mainwindow.ui @@ -50,6 +50,7 @@ File + @@ -191,6 +192,11 @@ Capture Screen + + + Boot cdrom0 + + diff --git a/Source/ui_unix/mainwindow.cpp b/Source/ui_unix/mainwindow.cpp index 089fd35f..41f39184 100644 --- a/Source/ui_unix/mainwindow.cpp +++ b/Source/ui_unix/mainwindow.cpp @@ -197,6 +197,20 @@ void MainWindow::on_actionBoot_DiscImage_triggered() } } +void MainWindow::on_actionBoot_cdrom0_triggered() +{ + try + { + BootCDROM(); + } + catch(const std::exception& e) + { + QMessageBox messageBox; + messageBox.critical(nullptr, "Error", e.what()); + messageBox.show(); + } +} + void MainWindow::on_actionBoot_ELF_triggered() { QFileDialog dialog(this); diff --git a/Source/ui_unix/mainwindow.h b/Source/ui_unix/mainwindow.h index b261e337..daba09c7 100644 --- a/Source/ui_unix/mainwindow.h +++ b/Source/ui_unix/mainwindow.h @@ -99,6 +99,7 @@ public slots: private slots: void on_actionBoot_DiscImage_triggered(); + void on_actionBoot_cdrom0_triggered(); void on_actionBoot_ELF_triggered(); void on_actionExit_triggered(); void keyPressEvent(QKeyEvent*) Q_DECL_OVERRIDE;