수동 요리 종료 팝업이 콤비 모드에서도 나타나도록 수정

김태훈
1 parent b2c148b359
Showing 4 changed files with 10 additions and 9 deletions Show diff stats
app/gui/oven_control/manualcookfinishpopup.cpp
app/gui/oven_control/manualcookfinishpopup.h
app/gui/oven_control/manualcookfinishpopup.ui
app/gui/oven_control/manualcookwindow.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();
 }
@@ -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:
@@ -29,6 +29,7 @@ QPushButton[style=&amp;quot;icon&amp;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>
@@ -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()));
         }
     }
	@@ -12,7 +12,7 @@ class ManualCookFinishPopup : public QWidget		@@ -12,7 +12,7 @@ class ManualCookFinishPopup : public QWidget
12	Q_OBJECT	12	Q_OBJECT
13		13
14	public:	14	public:
15	- explicit ManualCookFinishPopup(QWidget *parent = nullptr);	15	+ explicit ManualCookFinishPopup(QWidget *parent = nullptr, bool keepWarmStartable = true);
16	~ManualCookFinishPopup();	16	~ManualCookFinishPopup();
17		17
18	signals:	18	signals:
	@@ -29,6 +29,7 @@ QPushButton[style=&quot;icon&quot;] { background-image: url(:/images/slider_icon		@@ -29,6 +29,7 @@ QPushButton[style=&quot;icon&quot;] { background-image: url(:/images/slider_icon
29		29
30	QPushButton { color: white; border: none; }	30	QPushButton { color: white; border: none; }
31	QPushButton:pressed, QPushButton:focus { color: yellow; }	31	QPushButton:pressed, QPushButton:focus { color: yellow; }
		32	+QPushButton:disabled { color: grey; }
32		33
33	QLabel { color: white; }</string>	34	QLabel { color: white; }</string>
34	</property>	35	</property>