From 214a68f0dab34d9d95cba204712504d5dd95ad68 Mon Sep 17 00:00:00 2001
From: taehoon <taehoon@falinux.com>
Date: Fri, 14 May 2021 17:36:14 +0900
Subject: [PATCH] =?UTF-8?q?=EC=88=98=EB=8F=99=20=EC=9A=94=EB=A6=AC=20?=
 =?UTF-8?q?=EC=A2=85=EB=A3=8C=20=ED=8C=9D=EC=97=85=EC=9D=B4=20=EC=BD=A4?=
 =?UTF-8?q?=EB=B9=84=20=EB=AA=A8=EB=93=9C=EC=97=90=EC=84=9C=EB=8F=84=20?=
 =?UTF-8?q?=EB=82=98=ED=83=80=EB=82=98=EB=8F=84=EB=A1=9D=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/gui/oven_control/manualcookfinishpopup.cpp |  4 +++-
 app/gui/oven_control/manualcookfinishpopup.h   |  2 +-
 app/gui/oven_control/manualcookfinishpopup.ui  |  1 +
 app/gui/oven_control/manualcookwindow.cpp      | 12 +++++-------
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/gui/oven_control/manualcookfinishpopup.cpp b/app/gui/oven_control/manualcookfinishpopup.cpp
index d60b9af..362b1d3 100644
--- a/app/gui/oven_control/manualcookfinishpopup.cpp
+++ b/app/gui/oven_control/manualcookfinishpopup.cpp
@@ -5,7 +5,7 @@
 
 #include "soundplayer.h"
 
-ManualCookFinishPopup::ManualCookFinishPopup(QWidget *parent) :
+ManualCookFinishPopup::ManualCookFinishPopup(QWidget *parent, bool keepWarmStartable) :
     QWidget(parent),
     ui(new Ui::ManualCookFinishPopup)
 {
@@ -16,6 +16,8 @@ ManualCookFinishPopup::ManualCookFinishPopup(QWidget *parent) :
     foreach (QPushButton *button, findChildren<QPushButton *>())
         connect(button, &QPushButton::pressed, SoundPlayer::playClick);
 
+    ui->warmupButton->setEnabled(keepWarmStartable);
+
     ui->background->setFocus();
 }
 
diff --git a/app/gui/oven_control/manualcookfinishpopup.h b/app/gui/oven_control/manualcookfinishpopup.h
index 93c094b..d8d8aa6 100644
--- a/app/gui/oven_control/manualcookfinishpopup.h
+++ b/app/gui/oven_control/manualcookfinishpopup.h
@@ -12,7 +12,7 @@ class ManualCookFinishPopup : public QWidget
     Q_OBJECT
 
 public:
-    explicit ManualCookFinishPopup(QWidget *parent = nullptr);
+    explicit ManualCookFinishPopup(QWidget *parent = nullptr, bool keepWarmStartable = true);
     ~ManualCookFinishPopup();
 
 signals:
diff --git a/app/gui/oven_control/manualcookfinishpopup.ui b/app/gui/oven_control/manualcookfinishpopup.ui
index 2dbb80d..fd9621c 100644
--- a/app/gui/oven_control/manualcookfinishpopup.ui
+++ b/app/gui/oven_control/manualcookfinishpopup.ui
@@ -29,6 +29,7 @@ QPushButton[style=&quot;icon&quot;] { background-image: url(:/images/slider_icon
 
 QPushButton { color: white; border: none; }
 QPushButton:pressed, QPushButton:focus { color: yellow; }
+QPushButton:disabled { color: grey; }
 
 QLabel { color: white; }</string>
   </property>
diff --git a/app/gui/oven_control/manualcookwindow.cpp b/app/gui/oven_control/manualcookwindow.cpp
index 5cf9399..12db865 100644
--- a/app/gui/oven_control/manualcookwindow.cpp
+++ b/app/gui/oven_control/manualcookwindow.cpp
@@ -665,14 +665,12 @@ void ManualCookWindow::onOvenUpdated(Oven *oven)
 
             emit done();
 
-            if (oven->mode() != Define::CombiMode) {
-                focused = focusWidget();
+            focused = focusWidget();
 
-                ManualCookFinishPopup *p = new ManualCookFinishPopup(this);
-                p->showFullScreen();
-                connect(p, SIGNAL(keepWarm()), SLOT(startKeepWarm()));
-                connect(p, SIGNAL(destroyed()), SLOT(focusAgain()));
-            }
+            ManualCookFinishPopup *p = new ManualCookFinishPopup(this, oven->mode() != Define::CombiMode);
+            p->showFullScreen();
+            connect(p, SIGNAL(keepWarm()), SLOT(startKeepWarm()));
+            connect(p, SIGNAL(destroyed()), SLOT(focusAgain()));
         }
     }
 
-- 
2.1.4