Commit e75b6df283771a104effc2af05474d2ae9233d93
1 parent
d5ad196eb5
Exists in
master
and in
2 other branches
수동 요리 화면 동작 개선
- 중심 온도 설정 팝업 진입 후 비활성화 상태로 복귀했을 때 중심 온도 버튼이 활성화 상태로 표시되는 문제 수정 - 습도 설정 버튼이 이상하게 표시되는 문제 수정
Showing
2 changed files
with
6 additions
and
8 deletions
Show diff stats
app/gui/oven_control/manualcookwindow.cpp
| @@ -338,14 +338,16 @@ void ManualCookWindow::updateView() | @@ -338,14 +338,16 @@ void ManualCookWindow::updateView() | ||
| 338 | else | 338 | else |
| 339 | interTemp = oven->interTemp(); | 339 | interTemp = oven->interTemp(); |
| 340 | 340 | ||
| 341 | + ui->interTempButton->setChecked(oven->interTempEnabled()); | ||
| 342 | + | ||
| 341 | bool interTempEnabled = oven->interTempEnabled(); | 343 | bool interTempEnabled = oven->interTempEnabled(); |
| 342 | if (interTempEnabled != lastViewInterTempEnabled || interTemp != lastViewInterTemp) | 344 | if (interTempEnabled != lastViewInterTempEnabled || interTemp != lastViewInterTemp) |
| 343 | { | 345 | { |
| 344 | if (interTempEnabled != lastViewInterTempEnabled) | 346 | if (interTempEnabled != lastViewInterTempEnabled) |
| 345 | - { | 347 | +// { |
| 346 | lastViewInterTempEnabled = oven->interTempEnabled(); | 348 | lastViewInterTempEnabled = oven->interTempEnabled(); |
| 347 | - ui->interTempButton->setChecked(interTempEnabled); | ||
| 348 | - } | 349 | +// ui->interTempButton->setChecked(interTempEnabled); |
| 350 | +// } | ||
| 349 | 351 | ||
| 350 | lastViewInterTemp = interTemp; | 352 | lastViewInterTemp = interTemp; |
| 351 | 353 |
app/gui/oven_control/manualcookwindow.ui
| @@ -710,11 +710,7 @@ QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/temp_ov | @@ -710,11 +710,7 @@ QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/temp_ov | ||
| 710 | </property> | 710 | </property> |
| 711 | <property name="styleSheet"> | 711 | <property name="styleSheet"> |
| 712 | <string notr="true">QPushButton { image: url(:/images/slider_icon/humidity.png); } | 712 | <string notr="true">QPushButton { image: url(:/images/slider_icon/humidity.png); } |
| 713 | -QPushButton:checked { image: url(:/images/slider_icon/humidity_ov.png); } | ||
| 714 | -QPushButton:pressed, QPushButton:focus { border: 2px dotted white; border-radius: 70px; }</string> | ||
| 715 | - </property> | ||
| 716 | - <property name="checkable"> | ||
| 717 | - <bool>true</bool> | 713 | +QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/humidity_ov.png); }</string> |
| 718 | </property> | 714 | </property> |
| 719 | <property name="style" stdset="0"> | 715 | <property name="style" stdset="0"> |
| 720 | <string notr="true">icon</string> | 716 | <string notr="true">icon</string> |