From 7d02881729c05a99b120d907b555dfc96ef07bbf Mon Sep 17 00:00:00 2001
From: victor <taehoon@falinux.com>
Date: Fri, 2 Jun 2017 13:53:06 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84=20-=20=EC=9E=90=EB=8F=99=20=EC=9A=94?=
 =?UTF-8?q?=EB=A6=AC=EC=97=90=20=ED=99=88=20=EB=B2=84=ED=8A=BC=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/gui/oven_control/autocookconfigwindow.cpp |  4 ++--
 app/gui/oven_control/autocookwindow.cpp       | 19 +++++++++++++++++++
 app/gui/oven_control/autocookwindow.h         |  3 +++
 app/gui/oven_control/autocookwindow.ui        | 12 ++++++------
 app/gui/oven_control/mainwindow.cpp           |  8 ++++++++
 app/gui/oven_control/mainwindow.h             |  1 +
 6 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/app/gui/oven_control/autocookconfigwindow.cpp b/app/gui/oven_control/autocookconfigwindow.cpp
index a78a78b..2ab0fba 100644
--- a/app/gui/oven_control/autocookconfigwindow.cpp
+++ b/app/gui/oven_control/autocookconfigwindow.cpp
@@ -197,12 +197,12 @@ void AutoCookConfigWindow::stopTimer()
 
 void AutoCookConfigWindow::start()
 {
-    close();
-
     AutoCookWindow *w = new AutoCookWindow(parentWidget(), cook);
     w->setWindowModality(Qt::WindowModal);
     w->showFullScreen();
     w->raise();
+
+    connect(w, SIGNAL(destroyed(QObject*)), SLOT(startTimer()));
 }
 
 void AutoCookConfigWindow::addFavorite()
diff --git a/app/gui/oven_control/autocookwindow.cpp b/app/gui/oven_control/autocookwindow.cpp
index e2dc5d7..ea4fa11 100644
--- a/app/gui/oven_control/autocookwindow.cpp
+++ b/app/gui/oven_control/autocookwindow.cpp
@@ -124,6 +124,8 @@ void AutoCookWindow::setupUi()
     lastViewDoorType = Define::Invalid;
     lastViewTime = 0;
     lastViewStepIndex = -1;
+    lastViewTemp = 999;
+    lastViewHumidity = 999;
     selectedStepIndex = 0;
     showingCurrentHumidity = false;
     showingCurrentTemp = false;
@@ -669,6 +671,23 @@ void AutoCookWindow::jumpWash()
     MainWindow::jump(w);
 }
 
+void AutoCookWindow::on_selectCookButton_clicked()
+{
+
+}
+
+void AutoCookWindow::on_homeButton_clicked()
+{
+    Oven::getInstance()->stop();
+
+    MainWindow::killChild();
+}
+
+void AutoCookWindow::on_configCookButton_clicked()
+{
+
+}
+
 void AutoCookWindow::on_humidityGaugeButton_pressed()
 {
     showCurrentHumidityTimer.start();
diff --git a/app/gui/oven_control/autocookwindow.h b/app/gui/oven_control/autocookwindow.h
index dafb7f5..56d01ed 100644
--- a/app/gui/oven_control/autocookwindow.h
+++ b/app/gui/oven_control/autocookwindow.h
@@ -71,6 +71,9 @@ private slots:
     void jumpConfig();
     void jumpWash();
 
+    void on_selectCookButton_clicked();
+    void on_homeButton_clicked();
+    void on_configCookButton_clicked();
     void on_humidityGaugeButton_pressed();
     void on_humidityGaugeButton_released();
     void on_heatGaugeButton_pressed();
diff --git a/app/gui/oven_control/autocookwindow.ui b/app/gui/oven_control/autocookwindow.ui
index 9be5756..606447a 100644
--- a/app/gui/oven_control/autocookwindow.ui
+++ b/app/gui/oven_control/autocookwindow.ui
@@ -268,7 +268,7 @@ QPushButton::pressed { border-image: url(:/images/button/152_ov.png); }</string>
      <string>Preheat</string>
     </property>
    </widget>
-   <widget class="QPushButton" name="autoCookButton">
+   <widget class="QPushButton" name="homeButton">
     <property name="geometry">
      <rect>
       <x>559</x>
@@ -1330,7 +1330,7 @@ QPushButton:pressed { border-image: url(:/images/button/152_ov.png); }</string>
    <zorder>bottomBar</zorder>
    <zorder>configCookButton</zorder>
    <zorder>doorStepLabel</zorder>
-   <zorder>autoCookButton</zorder>
+   <zorder>homeButton</zorder>
    <zorder>cookModeIcon</zorder>
    <zorder>humidityGauge</zorder>
    <zorder>humidityLabel</zorder>
@@ -1367,14 +1367,14 @@ QPushButton:pressed { border-image: url(:/images/button/152_ov.png); }</string>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>AnimatedImageBox</class>
+   <class>WashWarnIcon</class>
    <extends>QLabel</extends>
-   <header>animatedimagebox.h</header>
+   <header>washwarnicon.h</header>
   </customwidget>
   <customwidget>
-   <class>WashWarnIcon</class>
+   <class>AnimatedImageBox</class>
    <extends>QLabel</extends>
-   <header>washwarnicon.h</header>
+   <header>animatedimagebox.h</header>
   </customwidget>
   <customwidget>
    <class>BulletIndicator</class>
diff --git a/app/gui/oven_control/mainwindow.cpp b/app/gui/oven_control/mainwindow.cpp
index 1b4325f..22e7600 100644
--- a/app/gui/oven_control/mainwindow.cpp
+++ b/app/gui/oven_control/mainwindow.cpp
@@ -51,6 +51,14 @@ void MainWindow::jump(QMainWindow *newChild)
     instance->child = newChild;
 }
 
+void MainWindow::killChild()
+{
+    if (instance->child)
+        instance->child->deleteLater();
+
+    instance->child = NULL;
+}
+
 static QPushButton *pushedChild = NULL;
 
 void MainWindow::keyPressEvent(QKeyEvent *event)
diff --git a/app/gui/oven_control/mainwindow.h b/app/gui/oven_control/mainwindow.h
index 3c5ab85..d45cefe 100644
--- a/app/gui/oven_control/mainwindow.h
+++ b/app/gui/oven_control/mainwindow.h
@@ -22,6 +22,7 @@ public:
 
     static MainWindow *getInstance() { return instance; }
     static void jump(QMainWindow *newChild);
+    static void killChild();
 
 protected:
     void keyPressEvent(QKeyEvent *event);
-- 
2.1.4