From e75b6df283771a104effc2af05474d2ae9233d93 Mon Sep 17 00:00:00 2001 From: victor Date: Wed, 14 Jun 2017 17:01:22 +0900 Subject: [PATCH] =?UTF-8?q?=EC=88=98=EB=8F=99=20=EC=9A=94=EB=A6=AC=20?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EB=8F=99=EC=9E=91=20=EA=B0=9C=EC=84=A0=20?= =?UTF-8?q?-=20=EC=A4=91=EC=8B=AC=20=EC=98=A8=EB=8F=84=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=ED=8C=9D=EC=97=85=20=EC=A7=84=EC=9E=85=20=ED=9B=84?= =?UTF-8?q?=20=EB=B9=84=ED=99=9C=EC=84=B1=ED=99=94=20=EC=83=81=ED=83=9C?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=B5=EA=B7=80=ED=96=88=EC=9D=84=20=EB=95=8C=20?= =?UTF-8?q?=EC=A4=91=EC=8B=AC=20=EC=98=A8=EB=8F=84=20=EB=B2=84=ED=8A=BC?= =?UTF-8?q?=EC=9D=B4=20=ED=99=9C=EC=84=B1=ED=99=94=20=EC=83=81=ED=83=9C?= =?UTF-8?q?=EB=A1=9C=20=ED=91=9C=EC=8B=9C=EB=90=98=EB=8A=94=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=20=EC=88=98=EC=A0=95=20-=20=EC=8A=B5=EB=8F=84=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EB=B2=84=ED=8A=BC=EC=9D=B4=20=EC=9D=B4?= =?UTF-8?q?=EC=83=81=ED=95=98=EA=B2=8C=20=ED=91=9C=EC=8B=9C=EB=90=98?= =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/gui/oven_control/manualcookwindow.cpp | 8 +++++--- app/gui/oven_control/manualcookwindow.ui | 6 +----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/gui/oven_control/manualcookwindow.cpp b/app/gui/oven_control/manualcookwindow.cpp index bb0927f..7c25d24 100644 --- a/app/gui/oven_control/manualcookwindow.cpp +++ b/app/gui/oven_control/manualcookwindow.cpp @@ -338,14 +338,16 @@ void ManualCookWindow::updateView() else interTemp = oven->interTemp(); + ui->interTempButton->setChecked(oven->interTempEnabled()); + bool interTempEnabled = oven->interTempEnabled(); if (interTempEnabled != lastViewInterTempEnabled || interTemp != lastViewInterTemp) { if (interTempEnabled != lastViewInterTempEnabled) - { +// { lastViewInterTempEnabled = oven->interTempEnabled(); - ui->interTempButton->setChecked(interTempEnabled); - } +// ui->interTempButton->setChecked(interTempEnabled); +// } lastViewInterTemp = interTemp; diff --git a/app/gui/oven_control/manualcookwindow.ui b/app/gui/oven_control/manualcookwindow.ui index 8943716..629419f 100644 --- a/app/gui/oven_control/manualcookwindow.ui +++ b/app/gui/oven_control/manualcookwindow.ui @@ -710,11 +710,7 @@ QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/temp_ov QPushButton { image: url(:/images/slider_icon/humidity.png); } -QPushButton:checked { image: url(:/images/slider_icon/humidity_ov.png); } -QPushButton:pressed, QPushButton:focus { border: 2px dotted white; border-radius: 70px; } - - - true +QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/humidity_ov.png); } icon -- 2.1.4