diff --git a/app/gui/oven_control/programmingautoconfigwindow.cpp b/app/gui/oven_control/programmingautoconfigwindow.cpp index 4bb0879..3a5ab11 100644 --- a/app/gui/oven_control/programmingautoconfigwindow.cpp +++ b/app/gui/oven_control/programmingautoconfigwindow.cpp @@ -4,6 +4,8 @@ #include "soundplayer.h" #include "stringer.h" #include "cookprogram.h" +#include "configwindow.h" +#include "mainwindow.h" ProgrammingAutoConfigWindow::ProgrammingAutoConfigWindow(QWidget *parent, Cook cook) : QMainWindow(parent), @@ -171,7 +173,12 @@ void ProgrammingAutoConfigWindow::on_backButton_clicked() void ProgrammingAutoConfigWindow::on_configButton_clicked() { + ConfigWindow *w = new ConfigWindow(MainWindow::getInstance()); + w->setWindowModality(Qt::WindowModal); + w->showFullScreen(); + w->raise(); + MainWindow::jump(w); } void ProgrammingAutoConfigWindow::on_helpButton_clicked() diff --git a/app/gui/oven_control/programmingautoselectionwindow.cpp b/app/gui/oven_control/programmingautoselectionwindow.cpp index 80337eb..b02ca03 100644 --- a/app/gui/oven_control/programmingautoselectionwindow.cpp +++ b/app/gui/oven_control/programmingautoselectionwindow.cpp @@ -5,6 +5,8 @@ #include "soundplayer.h" #include "programmingautoconfigwindow.h" +#include "configwindow.h" +#include "mainwindow.h" ProgrammingAutoSelectionWindow::ProgrammingAutoSelectionWindow(QWidget *parent, Define::CookType type) : QMainWindow(parent), @@ -79,7 +81,12 @@ void ProgrammingAutoSelectionWindow::on_backButton_clicked() void ProgrammingAutoSelectionWindow::on_configButton_clicked() { + ConfigWindow *w = new ConfigWindow(MainWindow::getInstance()); + w->setWindowModality(Qt::WindowModal); + w->showFullScreen(); + w->raise(); + MainWindow::jump(w); } void ProgrammingAutoSelectionWindow::on_helpButton_clicked() diff --git a/app/gui/oven_control/programmingmanualwindow.cpp b/app/gui/oven_control/programmingmanualwindow.cpp index 448317e..dd2f836 100644 --- a/app/gui/oven_control/programmingmanualwindow.cpp +++ b/app/gui/oven_control/programmingmanualwindow.cpp @@ -5,6 +5,8 @@ #include "programmingmanualcoretemppopup.h" #include "cookprogram.h" #include "soundplayer.h" +#include "configwindow.h" +#include "mainwindow.h" ProgrammingManualWindow::ProgrammingManualWindow(QWidget *parent, Define::Mode mode) : QMainWindow(parent), @@ -219,7 +221,12 @@ void ProgrammingManualWindow::on_backButton_clicked() void ProgrammingManualWindow::on_configButton_clicked() { + ConfigWindow *w = new ConfigWindow(MainWindow::getInstance()); + w->setWindowModality(Qt::WindowModal); + w->showFullScreen(); + w->raise(); + MainWindow::jump(w); } void ProgrammingManualWindow::on_helpButton_clicked() diff --git a/app/gui/oven_control/programmingselectionwindow.cpp b/app/gui/oven_control/programmingselectionwindow.cpp index a8efcb0..0adb026 100644 --- a/app/gui/oven_control/programmingselectionwindow.cpp +++ b/app/gui/oven_control/programmingselectionwindow.cpp @@ -4,6 +4,8 @@ #include "programmingmanualwindow.h" #include "programmingautoselectionwindow.h" #include "soundplayer.h" +#include "configwindow.h" +#include "mainwindow.h" ProgrammingSelectionWindow::ProgrammingSelectionWindow(QWidget *parent) : QMainWindow(parent), @@ -122,7 +124,12 @@ void ProgrammingSelectionWindow::on_backButton_clicked() void ProgrammingSelectionWindow::on_configButton_clicked() { + ConfigWindow *w = new ConfigWindow(MainWindow::getInstance()); + w->setWindowModality(Qt::WindowModal); + w->showFullScreen(); + w->raise(); + MainWindow::jump(w); } void ProgrammingSelectionWindow::on_helpButton_clicked()