From 453d18662f40107f6b6ba8a3dadef3111b373798 Mon Sep 17 00:00:00 2001
From: victor <taehoon@falinux.com>
Date: Mon, 15 May 2017 11:22:29 +0900
Subject: [PATCH] =?UTF-8?q?GUI=20=EB=B2=84=EC=A0=84=200.1.11=20-=20?=
 =?UTF-8?q?=EB=AF=B8=EA=B5=AC=ED=98=84=20=EA=B8=B0=EB=8A=A5=20=EC=A0=91?=
 =?UTF-8?q?=EA=B7=BC=20=EB=AA=BB=ED=95=98=EA=B2=8C=20=EC=B2=98=EB=A6=AC=20?=
 =?UTF-8?q?-=20=EC=97=94=EC=A7=80=EB=8B=88=EC=96=B4=20=EB=AA=A8=EB=93=9C?=
 =?UTF-8?q?=EC=9D=98=20=EA=B5=90=EC=A0=95=20=EC=B0=BD=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EB=92=A4=EB=A1=9C=EA=B0=80=EA=B8=B0=20=EB=B2=84=ED=8A=BC?=
 =?UTF-8?q?=EC=9D=B4=20=EB=8F=99=EC=9E=91=20=EC=95=88=ED=95=98=EB=8A=94=20?=
 =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/gui/oven_control/adjustmentwindow.cpp |  8 ++++++++
 app/gui/oven_control/adjustmentwindow.h   |  2 ++
 app/gui/oven_control/mainwindow.cpp       | 26 +++++++++++++-------------
 app/gui/oven_control/mainwindow.ui        |  2 +-
 4 files changed, 24 insertions(+), 14 deletions(-)

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
      </font>
     </property>
     <property name="text">
-     <string>V0.1.10</string>
+     <string>V0.1.11</string>
     </property>
     <property name="alignment">
      <set>Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing</set>
-- 
2.1.4