diff --git a/app/gui/oven_control/adjustmentwindow.cpp b/app/gui/oven_control/adjustmentwindow.cpp
index cb87045..ec8e8a0 100644
--- a/app/gui/oven_control/adjustmentwindow.cpp
+++ b/app/gui/oven_control/adjustmentwindow.cpp
@@ -8,6 +8,9 @@ AdjustmentWindow::AdjustmentWindow(QWidget *parent) :
ui(new Ui::AdjustmentWindow)
{
ui->setupUi(this);
+
+ ui->clockContainer->setParent(ui->upperStack);
+ setAttribute(Qt::WA_DeleteOnClose);
}
AdjustmentWindow::~AdjustmentWindow()
@@ -27,3 +30,8 @@ void AdjustmentWindow::on_btnAdjust_clicked()
}
else qDebug() <<"Rejected";
}
+
+void AdjustmentWindow::on_backButton_clicked()
+{
+ close();
+}
diff --git a/app/gui/oven_control/adjustmentwindow.h b/app/gui/oven_control/adjustmentwindow.h
index e704ffa..04dbbb7 100644
--- a/app/gui/oven_control/adjustmentwindow.h
+++ b/app/gui/oven_control/adjustmentwindow.h
@@ -18,6 +18,8 @@ public:
private slots:
void on_btnAdjust_clicked();
+ void on_backButton_clicked();
+
private:
Ui::AdjustmentWindow *ui;
};
diff --git a/app/gui/oven_control/mainwindow.cpp b/app/gui/oven_control/mainwindow.cpp
index b3fcf5c..7da23fc 100644
--- a/app/gui/oven_control/mainwindow.cpp
+++ b/app/gui/oven_control/mainwindow.cpp
@@ -95,10 +95,10 @@ void MainWindow::on_etcButton_clicked()
void MainWindow::on_primeButton_clicked()
{
- PrimeWindow *w = new PrimeWindow(this);
- w->setWindowModality(Qt::WindowModal);
- w->showFullScreen();
- w->raise();
+// PrimeWindow *w = new PrimeWindow(this);
+// w->setWindowModality(Qt::WindowModal);
+// w->showFullScreen();
+// w->raise();
}
void MainWindow::on_washButton_clicked()
@@ -111,14 +111,14 @@ void MainWindow::on_washButton_clicked()
void MainWindow::on_configButton_clicked()
{
- ConfigWindow *w = new ConfigWindow(this);
- w->setWindowModality(Qt::WindowModal);
- w->showFullScreen();
- w->raise();
-// EngineerMenuWindow *w = new EngineerMenuWindow(this);
+// ConfigWindow *w = new ConfigWindow(this);
// w->setWindowModality(Qt::WindowModal);
// w->showFullScreen();
// w->raise();
+ EngineerMenuWindow *w = new EngineerMenuWindow(this);
+ w->setWindowModality(Qt::WindowModal);
+ w->showFullScreen();
+ w->raise();
}
void MainWindow::on_helpButton_clicked()
@@ -128,8 +128,8 @@ void MainWindow::on_helpButton_clicked()
void MainWindow::on_programmingButton_clicked()
{
- ProgrammingWindow *w = new ProgrammingWindow(this);
- w->setWindowModality(Qt::WindowModal);
- w->showFullScreen();
- w->raise();
+// ProgrammingWindow *w = new ProgrammingWindow(this);
+// w->setWindowModality(Qt::WindowModal);
+// w->showFullScreen();
+// w->raise();
}
diff --git a/app/gui/oven_control/mainwindow.ui b/app/gui/oven_control/mainwindow.ui
index b94b5a9..8b25388 100644
--- a/app/gui/oven_control/mainwindow.ui
+++ b/app/gui/oven_control/mainwindow.ui
@@ -656,7 +656,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/additional_ov.png
- V0.1.10
+ V0.1.11
Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing