에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 214a68f0dab34d9d95cba204712504d5dd95ad68

Authored by 김태훈
1 parent b2c148b359
Exists in fhd

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

Showing 4 changed files with 10 additions and 9 deletions   Show diff stats
app/gui/oven_control/manualcookfinishpopup.cpp
  Diff comments   View file @214a68f
... ... @@ -5,7 +5,7 @@
5 5  
6 6 #include "soundplayer.h"
7 7  
8   -ManualCookFinishPopup::ManualCookFinishPopup(QWidget *parent) :
  8 +ManualCookFinishPopup::ManualCookFinishPopup(QWidget *parent, bool keepWarmStartable) :
9 9 QWidget(parent),
10 10 ui(new Ui::ManualCookFinishPopup)
11 11 {
... ... @@ -16,6 +16,8 @@ ManualCookFinishPopup::ManualCookFinishPopup(QWidget *parent) :
16 16 foreach (QPushButton *button, findChildren<QPushButton *>())
17 17 connect(button, &QPushButton::pressed, SoundPlayer::playClick);
18 18  
  19 + ui->warmupButton->setEnabled(keepWarmStartable);
  20 +
19 21 ui->background->setFocus();
20 22 }
21 23  
... ...
app/gui/oven_control/manualcookfinishpopup.h
  Diff comments   View file @214a68f
... ... @@ -12,7 +12,7 @@ class ManualCookFinishPopup : public QWidget
12 12 Q_OBJECT
13 13  
14 14 public:
15   - explicit ManualCookFinishPopup(QWidget *parent = nullptr);
  15 + explicit ManualCookFinishPopup(QWidget *parent = nullptr, bool keepWarmStartable = true);
16 16 ~ManualCookFinishPopup();
17 17  
18 18 signals:
... ...
app/gui/oven_control/manualcookfinishpopup.ui
  Diff comments   View file @214a68f
... ... @@ -29,6 +29,7 @@ QPushButton[style=&amp;quot;icon&amp;quot;] { background-image: url(:/images/slider_icon
29 29  
30 30 QPushButton { color: white; border: none; }
31 31 QPushButton:pressed, QPushButton:focus { color: yellow; }
  32 +QPushButton:disabled { color: grey; }
32 33  
33 34 QLabel { color: white; }</string>
34 35 </property>
... ...
app/gui/oven_control/manualcookwindow.cpp
  Diff comments   View file @214a68f
... ... @@ -665,14 +665,12 @@ void ManualCookWindow::onOvenUpdated(Oven *oven)
665 665  
666 666 emit done();
667 667  
668   - if (oven->mode() != Define::CombiMode) {
669   - focused = focusWidget();
  668 + focused = focusWidget();
670 669  
671   - ManualCookFinishPopup *p = new ManualCookFinishPopup(this);
672   - p->showFullScreen();
673   - connect(p, SIGNAL(keepWarm()), SLOT(startKeepWarm()));
674   - connect(p, SIGNAL(destroyed()), SLOT(focusAgain()));
675   - }
  670 + ManualCookFinishPopup *p = new ManualCookFinishPopup(this, oven->mode() != Define::CombiMode);
  671 + p->showFullScreen();
  672 + connect(p, SIGNAL(keepWarm()), SLOT(startKeepWarm()));
  673 + connect(p, SIGNAL(destroyed()), SLOT(focusAgain()));
676 674 }
677 675 }
678 676  
... ...