From cd74cf6ed2d98fee0720b4d9be4fbeefbed1a38c Mon Sep 17 00:00:00 2001 From: victor Date: Wed, 21 Jun 2017 12:00:41 +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?=EC=A0=81=EC=9A=A9?= 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/define.cpp | 48 +++++++++++----------- app/gui/oven_control/manualcookwindow.cpp | 11 ++--- .../oven_control/programmingautoconfigwindow.cpp | 4 ++ 4 files changed, 36 insertions(+), 31 deletions(-) diff --git a/app/gui/oven_control/autocookconfigwindow.cpp b/app/gui/oven_control/autocookconfigwindow.cpp index 8649fdc..5fe98ed 100644 --- a/app/gui/oven_control/autocookconfigwindow.cpp +++ b/app/gui/oven_control/autocookconfigwindow.cpp @@ -166,6 +166,8 @@ void AutoCookConfigWindow::afterThreeSecs() } else start(); + + updateView(); } void AutoCookConfigWindow::changeCook(Cook cook) @@ -221,6 +223,8 @@ void AutoCookConfigWindow::onEncoderClicked(QWidget *clicked) else if (slider == ui->configSlider_5) ui->configButton_5->setFocus(); } + + updateView(); } } diff --git a/app/gui/oven_control/define.cpp b/app/gui/oven_control/define.cpp index 6fd75d8..ae151e4 100644 --- a/app/gui/oven_control/define.cpp +++ b/app/gui/oven_control/define.cpp @@ -218,29 +218,29 @@ QString Define::iconOverlay(Define::CookConfigType type) switch (type) { case Brightness: - return ":/images/slider_icon/gau_icon_01_ov.png"; + return ":/images/slider_icon/gau_icon_01_active.png"; case BurnDegree: - return ":/images/slider_icon/gau_icon_02_ov.png"; + return ":/images/slider_icon/gau_icon_02_active.png"; case SoftBoilDegree: - return ":/images/slider_icon/gau_icon_03_ov.png"; + return ":/images/slider_icon/sys_icon_05_active.png"; case PieceSize: - return ":/images/slider_icon/gau_icon_04_ov.png"; + return ":/images/slider_icon/sys_icon_01_active.png"; case CrispyDegree: - return ":/images/slider_icon/gau_icon_05_ov.png"; + return ":/images/slider_icon/sys_icon_02_active.png"; case MoistDegree: - return ":/images/slider_icon/Gau_icon_06_ov.png"; + return ":/images/slider_icon/sys_icon_03_active.png"; case Thickness: - return ":/images/slider_icon/Gau_icon_07_ov.png"; + return ":/images/slider_icon/sys_icon_04_active.png"; case Humidity: - return ":/images/slider_icon/humidity_ov.png"; + return ":/images/slider_icon/011_icon_01_active.png"; case Temperature: - return ":/images/slider_icon/temp_ov.png"; + return ":/images/slider_icon/011_icon_02_active.png"; case Time: - return ":/images/slider_icon/time_ov.png"; + return ":/images/slider_icon/011_icon_03_active.png"; case CoreTemperature: - return ":/images/slider_icon/core_temp_ov.png"; + return ":/images/slider_icon/011_icon_04_active.png"; case Thermometer: - return ":/images/slider_icon/thermometer_ov.png"; + return ":/images/slider_icon/cen_mt_icon_03_active.png"; case InvalidConfig: case ConfigNotUsed: default: @@ -253,29 +253,29 @@ QString Define::iconActiveted(Define::CookConfigType type) switch (type) { case Brightness: - return ":/images/slider_icon/gau_icon_01_active.png"; + return ":/images/slider_icon/gau_icon_01_ov.png"; case BurnDegree: - return ":/images/slider_icon/gau_icon_02_active.png"; + return ":/images/slider_icon/gau_icon_02_ov.png"; case SoftBoilDegree: - return ":/images/slider_icon/sys_icon_05_active.png"; + return ":/images/slider_icon/gau_icon_03_ov.png"; case PieceSize: - return ":/images/slider_icon/sys_icon_01_active.png"; + return ":/images/slider_icon/gau_icon_04_ov.png"; case CrispyDegree: - return ":/images/slider_icon/sys_icon_02_active.png"; + return ":/images/slider_icon/gau_icon_05_ov.png"; case MoistDegree: - return ":/images/slider_icon/sys_icon_03_active.png"; + return ":/images/slider_icon/Gau_icon_06_ov.png"; case Thickness: - return ":/images/slider_icon/sys_icon_04_active.png"; + return ":/images/slider_icon/Gau_icon_07_ov.png"; case Humidity: - return ":/images/slider_icon/011_icon_01_active.png"; + return ":/images/slider_icon/humidity_ov.png"; case Temperature: - return ":/images/slider_icon/011_icon_02_active.png"; + return ":/images/slider_icon/temp_ov.png"; case Time: - return ":/images/slider_icon/011_icon_03_active.png"; + return ":/images/slider_icon/time_ov.png"; case CoreTemperature: - return ":/images/slider_icon/011_icon_04_active.png"; + return ":/images/slider_icon/core_temp_ov.png"; case Thermometer: - return ":/images/slider_icon/cen_mt_icon_03_active.png"; + return ":/images/slider_icon/thermometer_ov.png"; case InvalidConfig: case ConfigNotUsed: default: diff --git a/app/gui/oven_control/manualcookwindow.cpp b/app/gui/oven_control/manualcookwindow.cpp index dd79094..449a945 100644 --- a/app/gui/oven_control/manualcookwindow.cpp +++ b/app/gui/oven_control/manualcookwindow.cpp @@ -371,12 +371,7 @@ void ManualCookWindow::updateView() ui->interTempLabel->setText(Stringer::unusedTemperature(Stringer::fontSize14)); } - bool cooking = oven->cooking(); - if (cooking != lastViewCooking) - { - lastViewCooking = cooking; - ui->runStopButton->setChecked(cooking); - } + ui->runStopButton->setChecked(oven->cooking()); if (showFrontButtons) { @@ -909,8 +904,10 @@ void ManualCookWindow::on_runStopButton_clicked() { if (oven->cooking()) stop(); - else + else if (oven->time() > 0) start(); + + updateView(); } void ManualCookWindow::on_fanButton_clicked() diff --git a/app/gui/oven_control/programmingautoconfigwindow.cpp b/app/gui/oven_control/programmingautoconfigwindow.cpp index eac9400..6c31844 100644 --- a/app/gui/oven_control/programmingautoconfigwindow.cpp +++ b/app/gui/oven_control/programmingautoconfigwindow.cpp @@ -170,6 +170,8 @@ void ProgrammingAutoConfigWindow::onEncoderClicked(QWidget *clicked) ui->configButton_4->setFocus(); else if (slider == ui->configSlider_5) ui->configButton_5->setFocus(); + + updateView(); } } @@ -304,6 +306,8 @@ void ProgrammingAutoConfigWindow::afterThreeSecs() ui->configButton_4->setFocus(); else if (slider == ui->configSlider_5) ui->configButton_5->setFocus(); + + updateView(); } } -- 2.1.4