From 07441dbd38f5f2b55e7f6e06a146569cb874d3ef Mon Sep 17 00:00:00 2001 From: victor Date: Tue, 20 Jun 2017 13:37:10 +0900 Subject: [PATCH] =?UTF-8?q?=EC=97=94=EC=BD=94=EB=8D=94=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?=EB=8C=80=EB=B9=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/gui/oven_control/autocookcheckconfigwindow.cpp | 17 +++--- app/gui/oven_control/autocookconfigwindow.cpp | 35 +++++++++--- app/gui/oven_control/autocookconfigwindow.ui | 15 ++++++ app/gui/oven_control/autocooksettingwidget.cpp | 14 +++-- app/gui/oven_control/burnertestwindow.ui | 4 +- app/gui/oven_control/define.cpp | 35 ++++++++++++ app/gui/oven_control/define.h | 1 + app/gui/oven_control/manualcookwindow.cpp | 25 +++------ app/gui/oven_control/manualcookwindow.ui | 62 ++++++++++++++++++---- app/gui/oven_control/operationtimeheat.ui | 30 +++++++++++ .../oven_control/programmingautoconfigwindow.cpp | 23 +++++--- .../oven_control/programmingautoconfigwindow.ui | 15 ++++++ 12 files changed, 220 insertions(+), 56 deletions(-) diff --git a/app/gui/oven_control/autocookcheckconfigwindow.cpp b/app/gui/oven_control/autocookcheckconfigwindow.cpp index c6c3757..fe249fd 100644 --- a/app/gui/oven_control/autocookcheckconfigwindow.cpp +++ b/app/gui/oven_control/autocookcheckconfigwindow.cpp @@ -136,6 +136,12 @@ void AutoCookCheckConfigWindow::setupUi() ui->cookTypeIcon->setPixmap(Define::icon(cook.type)); ui->selectCookButton->setText(cook.name); + QString styleSheet("\ +QPushButton { image: url(%1); }\ +QPushButton:pressed,\ +QPushButton:focus { image: url(%2); }\ +QPushButton:checked { image: url(%3); }"); + for (int idx = 0; idx < 5; idx++) { ConfigWidget cw = configWidgets.at(idx); @@ -151,19 +157,16 @@ void AutoCookCheckConfigWindow::setupUi() } else { - ConfigWidget cw = configWidgets.at(idx); cw.button->show(); cw.minimum->show(); cw.maximum->show(); cw.current->show(); cw.slider->show(); - cw.button->setStyleSheet( - "QPushButton { image: url(" - + Define::icon(config.type) - + ") } QPushButton:pressed, QPushButton:focus { image: url(" - + Define::iconOverlay(config.type) - + ") }"); + cw.button->setStyleSheet(styleSheet + .arg(Define::icon(config.type)) + .arg(Define::iconOverlay(config.type)) + .arg(Define::iconActiveted(config.type))); cw.minimum->setText(Define::minimum(config.type)); cw.maximum->setText(Define::maximum(config.type)); diff --git a/app/gui/oven_control/autocookconfigwindow.cpp b/app/gui/oven_control/autocookconfigwindow.cpp index 8f3ae81..d39a90e 100644 --- a/app/gui/oven_control/autocookconfigwindow.cpp +++ b/app/gui/oven_control/autocookconfigwindow.cpp @@ -66,7 +66,10 @@ AutoCookConfigWindow::AutoCookConfigWindow(QWidget *parent, Cook cook) : }); foreach (Slider *s, findChildren()) + { + connect(s, SIGNAL(sliderPressed()), SLOT(updateView())); connect(s, SIGNAL(sliderMoved(int)), SLOT(updateConfig())); + } setupUi(); @@ -226,12 +229,19 @@ void AutoCookConfigWindow::setupUi() ui->cookTypeIcon->setPixmap(Define::icon(cook.type)); ui->selectCookButton->setText(cook.name); + QString styleSheet("\ +QPushButton { image: url(%1); }\ +QPushButton:pressed,\ +QPushButton:focus { image: url(%2); }\ +QPushButton:checked { image: url(%3); }"); + for (int idx = 0; idx < 5; idx++) { + ConfigWidget cw = configWidgets.at(idx); + CookConfig config = cook.configs[idx]; if (config.type == Define::ConfigNotUsed) { - ConfigWidget cw = configWidgets.at(idx); cw.button->hide(); cw.minimum->hide(); cw.maximum->hide(); @@ -240,19 +250,16 @@ void AutoCookConfigWindow::setupUi() } else { - ConfigWidget cw = configWidgets.at(idx); cw.button->show(); cw.minimum->show(); cw.maximum->show(); cw.current->show(); cw.slider->show(); - cw.button->setStyleSheet( - "QPushButton { image: url(" - + Define::icon(config.type) - + ") } QPushButton:pressed, QPushButton:focus { image: url(" - + Define::iconOverlay(config.type) - + ") }"); + cw.button->setStyleSheet(styleSheet + .arg(Define::icon(config.type)) + .arg(Define::iconOverlay(config.type)) + .arg(Define::iconActiveted(config.type))); cw.minimum->setText(Define::minimum(config.type)); cw.maximum->setText(Define::maximum(config.type)); @@ -311,6 +318,13 @@ void AutoCookConfigWindow::updateView() break; } } + + QWidget *focused = focusWidget(); + ui->configButton_1->setChecked(focused == ui->configSlider_1); + ui->configButton_2->setChecked(focused == ui->configSlider_2); + ui->configButton_3->setChecked(focused == ui->configSlider_3); + ui->configButton_4->setChecked(focused == ui->configSlider_4); + ui->configButton_5->setChecked(focused == ui->configSlider_5); } void AutoCookConfigWindow::updateConfig() @@ -391,26 +405,31 @@ void AutoCookConfigWindow::on_washButton_clicked() void AutoCookConfigWindow::on_configButton_1_clicked() { ui->configSlider_1->setFocus(); + updateView(); } void AutoCookConfigWindow::on_configButton_2_clicked() { ui->configSlider_2->setFocus(); + updateView(); } void AutoCookConfigWindow::on_configButton_3_clicked() { ui->configSlider_3->setFocus(); + updateView(); } void AutoCookConfigWindow::on_configButton_4_clicked() { ui->configSlider_4->setFocus(); + updateView(); } void AutoCookConfigWindow::on_configButton_5_clicked() { ui->configSlider_5->setFocus(); + updateView(); } void AutoCookConfigWindow::on_selectCookButton_clicked() diff --git a/app/gui/oven_control/autocookconfigwindow.ui b/app/gui/oven_control/autocookconfigwindow.ui index b0639fe..ec108c7 100644 --- a/app/gui/oven_control/autocookconfigwindow.ui +++ b/app/gui/oven_control/autocookconfigwindow.ui @@ -689,6 +689,9 @@ border-image: url(:/images/button/152_ov.png); + + true + icon @@ -705,6 +708,9 @@ border-image: url(:/images/button/152_ov.png); + + true + icon @@ -971,6 +977,9 @@ border-image: url(:/images/button/152_ov.png); + + true + icon @@ -1258,6 +1267,9 @@ border-image: url(:/images/button/152_ov.png); + + true + icon @@ -1338,6 +1350,9 @@ border-image: url(:/images/button/152_ov.png); + + true + icon diff --git a/app/gui/oven_control/autocooksettingwidget.cpp b/app/gui/oven_control/autocooksettingwidget.cpp index e42c80e..fd88189 100644 --- a/app/gui/oven_control/autocooksettingwidget.cpp +++ b/app/gui/oven_control/autocooksettingwidget.cpp @@ -80,6 +80,12 @@ void AutoCookSettingWidget::setupUi(Cook cook) ui->cookTypeIcon->setPixmap(Define::icon(cook.type)); ui->selectCookButton->setText(cook.name); + QString styleSheet("\ +QPushButton { image: url(%1); }\ +QPushButton:pressed,\ +QPushButton:focus { image: url(%2); }\ +QPushButton:checked { image: url(%3); }"); + for (int idx = 0; idx < 5; idx++) { ConfigWidget cw = configWidgets.at(idx); @@ -95,10 +101,10 @@ void AutoCookSettingWidget::setupUi(Cook cook) } else { - cw.button->setStyleSheet( - QString("QPushButton { image: url(%1); } QPushButton:pressed { image: url(%2); }") - .arg(Define::icon(config.type)) - .arg(Define::iconOverlay(config.type))); + cw.button->setStyleSheet(styleSheet + .arg(Define::icon(config.type)) + .arg(Define::iconOverlay(config.type)) + .arg(Define::iconActiveted(config.type))); cw.minimum->setText(Define::minimum(config.type)); cw.maximum->setText(Define::maximum(config.type)); diff --git a/app/gui/oven_control/burnertestwindow.ui b/app/gui/oven_control/burnertestwindow.ui index 6f5b7f5..fb852f8 100644 --- a/app/gui/oven_control/burnertestwindow.ui +++ b/app/gui/oven_control/burnertestwindow.ui @@ -52,7 +52,7 @@ 780 - 250 + 230 101 90 @@ -62,7 +62,7 @@ 780 - 180 + 160 108 67 diff --git a/app/gui/oven_control/define.cpp b/app/gui/oven_control/define.cpp index c2a5f93..56f8eba 100644 --- a/app/gui/oven_control/define.cpp +++ b/app/gui/oven_control/define.cpp @@ -248,6 +248,41 @@ QString Define::iconOverlay(Define::CookConfigType type) } } +QString Define::iconActiveted(Define::CookConfigType type) +{ + switch (type) + { + case Brightness: + return ":/images/slider_icon/gau_icon_01_ov.png"; + case BurnDegree: + return ":/images/slider_icon/gau_icon_02_ov.png"; + case SoftBoilDegree: + return ":/images/slider_icon/gau_icon_03_ov.png"; + case PieceSize: + return ":/images/slider_icon/gau_icon_04_ov.png"; + case CrispyDegree: + return ":/images/slider_icon/gau_icon_05_ov.png"; + case MoistDegree: + return ":/images/slider_icon/Gau_icon_06_ov.png"; + case Thickness: + return ":/images/slider_icon/Gau_icon_07_ov.png"; + case Humidity: + return ":/images/slider_icon/humidity_ov.png"; + case Temperature: + return ":/images/slider_icon/temp_ov.png"; + case Time: + return ":/images/slider_icon/time_ov.png"; + case CoreTemperature: + return ":/images/slider_icon/core_temp_ov.png"; + case Thermometer: + return ":/images/slider_icon/thermometer_ov.png"; + case InvalidConfig: + case ConfigNotUsed: + default: + return ""; + } +} + QString Define::minimum(Define::CookConfigType type) { switch (type) diff --git a/app/gui/oven_control/define.h b/app/gui/oven_control/define.h index b1306a5..ec7de77 100644 --- a/app/gui/oven_control/define.h +++ b/app/gui/oven_control/define.h @@ -40,6 +40,7 @@ namespace Define CookConfigType identifyConfigType(QString type); QString icon(CookConfigType type); QString iconOverlay(CookConfigType type); + QString iconActiveted(CookConfigType type); QString minimum(CookConfigType type); QString maximum(CookConfigType type); diff --git a/app/gui/oven_control/manualcookwindow.cpp b/app/gui/oven_control/manualcookwindow.cpp index fa45360..9aaf907 100644 --- a/app/gui/oven_control/manualcookwindow.cpp +++ b/app/gui/oven_control/manualcookwindow.cpp @@ -375,13 +375,7 @@ void ManualCookWindow::updateView() if (cooking != lastViewCooking) { lastViewCooking = cooking; - - if (cooking) - ui->runStopButton->setStyleSheet( - "border-image: url(:/images/manual_button/stop.png)"); - else - ui->runStopButton->setStyleSheet( - "border-image: url(:/images/manual_button/run.png)"); + ui->runStopButton->setChecked(cooking); } if (showFrontButtons) @@ -460,6 +454,8 @@ void ManualCookWindow::updateView() } } + ui->repeatButton->setChecked(repeat); + if (oven->paused() && !oven->cooldown() && oven->door()) ui->upperStack->setCurrentIndex(1); else @@ -501,16 +497,14 @@ void ManualCookWindow::onOvenUpdated(Oven *oven) { repeat = false; - ui->repeatButton->setStyleSheet("\ -QPushButton { background-image: url(:/images/manual_button/repeat.png); }\ -QPushButton:pressed { background-image: url(:/images/manual_button/repeat_ov.png); }"); - oven->setMode(repeatSetting.mode); oven->setHumidity(repeatSetting.humidity); oven->setTemp(repeatSetting.temp); oven->setTime(repeatSetting.time); oven->setInterTempEnabled(repeatSetting.coreTempEnabled); oven->setInterTemp(repeatSetting.coreTemp); + + updateView(); } else if (lastCheckedCooking && !oven->cooking()){ if ((oven->interTempEnabled() && oven->currentInterTemp() >= oven->interTemp()) @@ -951,16 +945,13 @@ void ManualCookWindow::on_repeatButton_clicked() if (repeat) { repeat = false; - ui->repeatButton->setStyleSheet("\ -QPushButton { background-image: url(:/images/manual_button/repeat.png); }\ -QPushButton:pressed { background-image: url(:/images/manual_button/repeat_ov.png); }"); + updateView(); } else { repeat = true; - ui->repeatButton->setStyleSheet("\ -QPushButton { background-image: url(:/images/manual_button/repeat_ov.png); }\ -QPushButton:pressed { background-image: url(:/images/manual_button/repeat.png); }"); + updateView(); + repeatSetting.mode = oven->mode(); repeatSetting.humidity = oven->humidity(); repeatSetting.temp= oven->temp(); diff --git a/app/gui/oven_control/manualcookwindow.ui b/app/gui/oven_control/manualcookwindow.ui index 5c4bd08..8c235b0 100644 --- a/app/gui/oven_control/manualcookwindow.ui +++ b/app/gui/oven_control/manualcookwindow.ui @@ -523,7 +523,9 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h QPushButton { image: url(:/images/slider_icon/temp.png); } -QPushButton:pressed, QPushButton:checked, QPushButton:focus { image: url(:/images/slider_icon/temp_ov.png); } +QPushButton:pressed, +QPushButton:focus { image: url(:/images/slider_icon/temp_ov.png); } +QPushButton:checked { image: url(:/images/slider_icon/temp_ov.png); } true @@ -733,7 +735,9 @@ QPushButton:pressed, QPushButton:checked, QPushButton:focus { image: url(:/image QPushButton { image: url(:/images/slider_icon/humidity.png); } -QPushButton:pressed, QPushButton:checked, QPushButton:focus { image: url(:/images/slider_icon/humidity_ov.png); } +QPushButton:pressed, +QPushButton:focus { image: url(:/images/slider_icon/humidity_ov.png); } +QPushButton:checked { image: url(:/images/slider_icon/humidity_ov.png); } true @@ -774,7 +778,9 @@ QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/core_te QPushButton { image: url(:/images/slider_icon/time.png); } -QPushButton:pressed, QPushButton:checked, QPushButton:focus { image: url(:/images/slider_icon/time_ov.png); } +QPushButton:pressed, +QPushButton:focus { image: url(:/images/slider_icon/time_ov.png); } +QPushButton:checked { image: url(:/images/slider_icon/time_ov.png); } true @@ -919,11 +925,23 @@ QPushButton:pressed, QPushButton:checked, QPushButton:focus { image: url(:/image - QPushButton { border-image: url(:/images/manual_button/run.png); } + QPushButton +{ border-image: url(:/images/manual_button/run.png); } +QPushButton:pressed, +QPushButton:focus +{ border-image: url(:/images/manual_button/run.png); } +QPushButton:checked +{ border-image: url(:/images/manual_button/stop.png); } +QPushButton:checked:pressed, +QPushButton:checked:focus +{ border-image: url(:/images/manual_button/stop.png); } + + true + @@ -1100,8 +1118,16 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b - QPushButton, QPushButton:checked:pressed { background-image: url(:/images/manual_button/damper_close.png); } -QPushButton:checked, QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/damper_open.png); } + QPushButton +{ background-image: url(:/images/manual_button/damper_close.png); } +QPushButton:pressed, +QPushButton:focus +{ background-image: url(:/images/manual_button/damper_close.png); } +QPushButton:checked +{ background-image: url(:/images/manual_button/damper_open.png); } +QPushButton:checked:pressed, +QPushButton:checked:focus +{ background-image: url(:/images/manual_button/damper_open.png); } true @@ -1120,8 +1146,16 @@ QPushButton:checked, QPushButton:pressed, QPushButton:focus { background-image: - QPushButton { background-image: url(:/images/manual_button/repeat.png); } -QPushButton:pressed, QPushButton:checked, QPushButton:focus { background-image: url(:/images/manual_button/repeat_ov.png); } + QPushButton +{ background-image: url(:/images/manual_button/repeat.png); } +QPushButton:pressed, +QPushButton:focus +{ background-image: url(:/images/manual_button/repeat_ov.png); } +QPushButton:checked +{ background-image: url(:/images/manual_button/repeat_ov.png); } +QPushButton:checked:pressed, +QPushButton:checked:focus +{ background-image: url(:/images/manual_button/repeat_ov.png); } true @@ -1157,8 +1191,16 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b - QPushButton, QPushButton:checked:pressed { background-image: url(:/images/manual_button/side_nozzle_close.png); } -QPushButton:checked, QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/side_nozzle_open.png); } + QPushButton +{ background-image: url(:/images/manual_button/side_nozzle_close.png); } +QPushButton:pressed, +QPushButton:focus +{ background-image: url(:/images/manual_button/side_nozzle_close.png); } +QPushButton:checked +{ background-image: url(:/images/manual_button/side_nozzle_open.png); } +QPushButton:checked:pressed, +QPushButton:checked:focus +{ background-image: url(:/images/manual_button/side_nozzle_open.png); } true diff --git a/app/gui/oven_control/operationtimeheat.ui b/app/gui/oven_control/operationtimeheat.ui index 97644c7..4f8b333 100644 --- a/app/gui/oven_control/operationtimeheat.ui +++ b/app/gui/oven_control/operationtimeheat.ui @@ -52,6 +52,26 @@ + + + + 780 + 230 + 101 + 90 + + + + + + + 780 + 160 + 108 + 67 + + + @@ -364,6 +384,16 @@ QPushButton { text-align: center;} QLabel
washwarnicon.h
+ + DemoIcon + QLabel +
demoicon.h
+ + + HalfEnergyIcon + QLabel +
halfenergyicon.h
+ diff --git a/app/gui/oven_control/programmingautoconfigwindow.cpp b/app/gui/oven_control/programmingautoconfigwindow.cpp index a0b6928..f070c1f 100644 --- a/app/gui/oven_control/programmingautoconfigwindow.cpp +++ b/app/gui/oven_control/programmingautoconfigwindow.cpp @@ -62,6 +62,9 @@ ProgrammingAutoConfigWindow::ProgrammingAutoConfigWindow(QWidget *parent, Cook c setupUi(); + foreach (Slider *s, findChildren()) + connect(s, SIGNAL(sliderPressed()), SLOT(updateView())); + afterThreeSecsTimer.setSingleShot(true); afterThreeSecsTimer.setInterval(3000); connect(&afterThreeSecsTimer, SIGNAL(timeout()), SLOT(afterThreeSecs())); @@ -180,12 +183,19 @@ void ProgrammingAutoConfigWindow::setupUi() ui->cookTypeIcon->setPixmap(Define::icon(cook.type)); ui->selectCookButton->setText(cook.name); + QString styleSheet("\ +QPushButton { image: url(%1); }\ +QPushButton:pressed,\ +QPushButton:focus { image: url(%2); }\ +QPushButton:checked { image: url(%3); }"); + for (int idx = 0; idx < 5; idx++) { + ConfigWidget cw = configWidgets.at(idx); + CookConfig config = cook.configs[idx]; if (config.type == Define::ConfigNotUsed) { - ConfigWidget cw = configWidgets.at(idx); cw.button->hide(); cw.minimum->hide(); cw.maximum->hide(); @@ -194,13 +204,10 @@ void ProgrammingAutoConfigWindow::setupUi() } else { - ConfigWidget cw = configWidgets.at(idx); - cw.button->setStyleSheet( - "QPushButton { image: url(" - + Define::icon(config.type) - + ") } QPushButton::pressed, QPushButton:focus { image: url(" - + Define::iconOverlay(config.type) - + ") }"); + cw.button->setStyleSheet(styleSheet + .arg(Define::icon(config.type)) + .arg(Define::iconOverlay(config.type)) + .arg(Define::iconActiveted(config.type))); cw.minimum->setText(Define::minimum(config.type)); cw.maximum->setText(Define::maximum(config.type)); diff --git a/app/gui/oven_control/programmingautoconfigwindow.ui b/app/gui/oven_control/programmingautoconfigwindow.ui index 420d3f6..9ae4044 100644 --- a/app/gui/oven_control/programmingautoconfigwindow.ui +++ b/app/gui/oven_control/programmingautoconfigwindow.ui @@ -583,6 +583,9 @@ border-image: url(:/images/button/288_ov.png); + + true + icon @@ -661,6 +664,9 @@ border-image: url(:/images/button/288_ov.png); + + true + icon @@ -1033,6 +1039,9 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c + + true + icon @@ -1173,6 +1182,9 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c + + true + icon @@ -1189,6 +1201,9 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c + + true + icon -- 2.1.4