diff --git a/app/gui/oven_control/coretempsettingpopup.ui b/app/gui/oven_control/coretempsettingpopup.ui
index d783bdb..8e363a5 100644
--- a/app/gui/oven_control/coretempsettingpopup.ui
+++ b/app/gui/oven_control/coretempsettingpopup.ui
@@ -35,10 +35,15 @@ background-position: center;
background-clip: border;
background-origin: border;
-border-top: 130px;
-border-style: hidden;
+padding-top: 130px;
+border: none;
color: white;
font-size: 30px;
+outline: none;
+}
+
+QPushButton[style="interTemp"]:focus {
+border: 1px solid rgba(0, 150, 255, 80%);
}
QSlider::groove {
@@ -159,7 +164,7 @@ height: 33px;
QPushButton { background-image: url(:/images/manual_button/ok.png); }
-QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/ok_ov.png); }
+QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); }
확인/적용하기
@@ -447,7 +452,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b
QPushButton { image: url(:/images/slider_icon/core_temp_enabled.png); }
QPushButton:checked { image: url(:/images/slider_icon/core_temp_ov.png); }
-QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/core_temp_ov.png); }
+QPushButton:pressed { image: url(:/images/slider_icon/core_temp_ov.png); }
icon
@@ -667,7 +672,7 @@ QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/core_te
QPushButton { background-image: url(:/images/manual_button/back.png); }
-QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/back_ov.png); }
+QPushButton:pressed { background-image: url(:/images/manual_button/back_ov.png); }
이전으로
@@ -1009,9 +1014,9 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b
185
- 954
+ 994
666
- 140
+ 60
diff --git a/app/gui/oven_control/mainwindow.ui b/app/gui/oven_control/mainwindow.ui
index d6d293f..df905da 100644
--- a/app/gui/oven_control/mainwindow.ui
+++ b/app/gui/oven_control/mainwindow.ui
@@ -23,20 +23,19 @@
#centralwidget { background-image: url(:/images/background/main.png); }
#bottomBar { background-image: url(:/images/bottom_bar/background.png); }
-QWidget { outline: none; }
+QWidget { outline: 1px solid rgba(0, 150, 255, 80%); }
QPushButton[style="mode"] {
background-repeat: no-repeat;
background-position: center;
background-clip: border;
background-origin: border;
-margin-bottom: 50px;
-border-top: 200px;
-border-bottom: -50px;
-border-style: hidden;
+padding-top: 200px;
+border: none;
color: white;
font-size: 40px;
+outline: none;
}
QPushButton[style="type"] {
@@ -45,10 +44,11 @@ background-position: center;
background-clip: border;
background-origin: border;
-border-top: 165px;
-border-style: hidden;
+padding-top: 165px;
+border: none;
color: white;
font-size: 30px;
+outline: none;
}
QPushButton[style="function"] {
@@ -57,11 +57,17 @@ background-position: center;
background-clip: border;
background-origin: border;
-border-top: 206px;
+padding-top: 206px;
border-style: hidden;
color: white;
font-size: 30px;
-}
+outline: none;
+}
+
+QPushButton[style="mode"]:focus, QPushButton[style="type"]:focus, QPushButton[style="function"]:focus {
+border: 1px solid rgba(0, 150, 255, 80%);
+}
+
@@ -114,7 +120,7 @@ font-size: 30px;
QPushButton { border-image: url(:/images/bottom_bar/config.png); }
-QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/config_ov.png); }
+QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); }
@@ -143,7 +149,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c
QPushButton { border-image: url(:/images/bottom_bar/help.png); }
-QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/help_ov.png); }
+QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); }
@@ -167,7 +173,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h
QPushButton { background-image: url(:/images/main_button/multi.png); }
-QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_button/multi_ov.png); }
+QPushButton:pressed { background-image: url(:/images/main_button/multi_ov.png); }
다중요리
@@ -193,7 +199,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_but
QPushButton { background-image: url(:/images/main_button/custom.png); }
-QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_button/custom_ov.png); }
+QPushButton:pressed { background-image: url(:/images/main_button/custom_ov.png); }
프로그래밍모드
@@ -219,7 +225,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_but
QPushButton { background-image: url(:/images/main_button/wash.png); }
-QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_button/wash_ov.png); }
+QPushButton:pressed { background-image: url(:/images/main_button/wash_ov.png); }
세척모드
@@ -317,7 +323,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_but
QPushButton { background-image: url(:/images/cook_mode/big_dryheat.png); }
-QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_dryheat_ov.png); }
+QPushButton:pressed { background-image: url(:/images/cook_mode/big_dryheat_ov.png); }
건열
@@ -337,7 +343,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod
QPushButton { background-image: url(:/images/cook_mode/big_combi.png); }
-QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_combi_ov.png); }
+QPushButton:pressed { background-image: url(:/images/cook_mode/big_combi_ov.png); }
콤비
@@ -357,7 +363,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod
QPushButton { background-image: url(:/images/cook_mode/big_steam.png); }
-QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_steam_ov.png); }
+QPushButton:pressed { background-image: url(:/images/cook_mode/big_steam_ov.png); }
스팀
@@ -369,10 +375,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod
- 225
+ 226
720
- 225
- 222
+ 224
+ 221
@@ -383,7 +389,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod
QPushButton { background-image: url(:/images/cook_type/meat.png); }
-QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/meat_ov.png); }
+QPushButton:pressed { background-image: url(:/images/cook_type/meat_ov.png); }
육류
@@ -395,10 +401,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
- 675
+ 676
720
- 225
- 222
+ 224
+ 221
@@ -409,7 +415,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
QPushButton { background-image: url(:/images/cook_type/desert.png); }
-QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/desert_ov.png); }
+QPushButton:pressed { background-image: url(:/images/cook_type/desert_ov.png); }
디저트류
@@ -421,10 +427,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
- 450
- 942
- 225
- 222
+ 451
+ 943
+ 224
+ 221
@@ -435,7 +441,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
QPushButton { background-image: url(:/images/cook_type/etc.png); }
-QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/etc_ov.png); }
+QPushButton:pressed { background-image: url(:/images/cook_type/etc_ov.png); }
기타요리
@@ -448,9 +454,9 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
0
- 942
+ 943
225
- 222
+ 221
@@ -461,7 +467,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
QPushButton { background-image: url(:/images/cook_type/vegetable.png); }
-QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/vegetable_ov.png); }
+QPushButton:pressed { background-image: url(:/images/cook_type/vegetable_ov.png); }
채소및곡류
@@ -476,7 +482,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
0
720
225
- 222
+ 221
@@ -487,7 +493,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
QPushButton { background-image: url(:/images/cook_type/poultry.png); }
-QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/poultry_ov.png); }
+QPushButton:pressed { background-image: url(:/images/cook_type/poultry_ov.png); }
가금류
@@ -499,10 +505,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
- 450
+ 451
720
- 225
- 222
+ 224
+ 221
@@ -513,7 +519,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
QPushButton { background-image: url(:/images/cook_type/fish.png); }
-QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/fish_ov.png); }
+QPushButton:pressed { background-image: url(:/images/cook_type/fish_ov.png); }
생선류
@@ -525,10 +531,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
- 225
- 942
- 225
- 222
+ 226
+ 943
+ 224
+ 221
@@ -539,7 +545,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
QPushButton { background-image: url(:/images/cook_type/bread.png); }
-QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/bread_ov.png); }
+QPushButton:pressed { background-image: url(:/images/cook_type/bread_ov.png); }
제과제빵류
@@ -551,10 +557,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
- 675
- 942
- 225
- 222
+ 676
+ 943
+ 224
+ 221
@@ -565,7 +571,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
QPushButton { background-image: url(:/images/cook_type/additional.png); }
-QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/additional_ov.png); }
+QPushButton:pressed { background-image: url(:/images/cook_type/additional_ov.png); }
부가기능
diff --git a/app/gui/oven_control/manualcookwindow.cpp b/app/gui/oven_control/manualcookwindow.cpp
index 7c25d24..5cf5daa 100644
--- a/app/gui/oven_control/manualcookwindow.cpp
+++ b/app/gui/oven_control/manualcookwindow.cpp
@@ -277,6 +277,11 @@ void ManualCookWindow::updateView()
break;
}
+ QWidget *focused = focusWidget();
+ ui->humidityButton->setChecked(focused == ui->humiditySlider);
+ ui->tempButton->setChecked(focused == ui->tempSlider);
+ ui->timeButton->setChecked(focused == ui->timeSlider);
+
int humidity;
if (showCurrentHumidity_)
humidity = oven->currentHumidity();
diff --git a/app/gui/oven_control/manualcookwindow.ui b/app/gui/oven_control/manualcookwindow.ui
index 629419f..0892239 100644
--- a/app/gui/oven_control/manualcookwindow.ui
+++ b/app/gui/oven_control/manualcookwindow.ui
@@ -19,10 +19,8 @@ background-repeat: no-repeat;
background-position: center;
background-clip: border;
background-origin: border;
-margin-bottom: 50px;
-border-top: 200px;
-border-bottom: -50px;
+padding-top: 200px;
border-style: hidden;
color: #7B7B7B;
font-size: 40px;
@@ -47,6 +45,10 @@ background-repeat: no-repeat;
background-position: center;
}
+QPushButton[style="mode"]:focus {
+border: 1px solid rgba(0, 150, 255, 80%);
+}
+
QSlider::groove {
background-image: url(:/images/slider/groove_ticks.png);
background-repeat: no-repeat;
@@ -140,7 +142,7 @@ height: 33px;
QPushButton { background-image: url(:/images/cook_mode/big_combi_hide.png); }
QPushButton:checked { background-image: url(:/images/cook_mode/big_combi.png); }
-QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_combi_ov.png); }
+QPushButton:pressed { background-image: url(:/images/cook_mode/big_combi_ov.png); }
콤비
@@ -167,7 +169,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod
QPushButton { background-image: url(:/images/cook_mode/big_steam_hide.png); }
QPushButton:checked { background-image: url(:/images/cook_mode/big_steam.png); }
-QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_steam_ov.png); }
+QPushButton:pressed { background-image: url(:/images/cook_mode/big_steam_ov.png); }
스팀
@@ -194,7 +196,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod
QPushButton { background-image: url(:/images/cook_mode/big_dryheat_hide.png); }
QPushButton:checked { background-image: url(:/images/cook_mode/big_dryheat.png); }
-QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_dryheat_ov.png); }
+QPushButton:pressed { background-image: url(:/images/cook_mode/big_dryheat_ov.png); }
건열
@@ -229,7 +231,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod
QPushButton { border-image: url(:/images/bottom_bar/back.png); }
-QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/back_ov.png); }
+QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); }
@@ -246,7 +248,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/b
QPushButton { border-image: url(:/images/bottom_bar/config.png); }
-QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/config_ov.png); }
+QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); }
@@ -263,7 +265,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c
QPushButton { border-image: url(:/images/bottom_bar/favorites_manual.png); }
-QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/favorites_manual_ov.png); }
+QPushButton:pressed { border-image: url(:/images/bottom_bar/favorites_manual_ov.png); }
@@ -280,7 +282,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/f
QPushButton { border-image: url(:/images/bottom_bar/wash.png); }
-QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/wash_ov.png); }
+QPushButton:pressed { border-image: url(:/images/bottom_bar/wash_ov.png); }
@@ -297,7 +299,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/w
QPushButton { border-image: url(:/images/bottom_bar/help.png); }
-QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/help_ov.png); }
+QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); }
@@ -503,7 +505,10 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h
QPushButton { image: url(:/images/slider_icon/temp.png); }
-QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/temp_ov.png); }
+QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/temp_ov.png); }
+
+
+ true
icon
@@ -710,7 +715,10 @@ QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/temp_ov
QPushButton { image: url(:/images/slider_icon/humidity.png); }
-QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/humidity_ov.png); }
+QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/humidity_ov.png); }
+
+
+ true
icon
@@ -728,7 +736,7 @@ QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/humidit
QPushButton { image: url(:/images/slider_icon/core_temp.png); }
QPushButton:checked { image: url(:/images/slider_icon/core_temp_enabled.png); }
-QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/core_temp_ov.png); }
+QPushButton:pressed { image: url(:/images/slider_icon/core_temp_ov.png); }
true
@@ -748,7 +756,10 @@ QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/core_te
QPushButton { image: url(:/images/slider_icon/time.png); }
-QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/time_ov.png); }
+QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/time_ov.png); }
+
+
+ true
icon
@@ -959,7 +970,7 @@ QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/time_ov
QPushButton { background-image: url(:/images/manual_button/cooldown.png); }
-QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/cooldown_ov.png); }
+QPushButton:pressed { background-image: url(:/images/manual_button/cooldown_ov.png); }
true
@@ -979,7 +990,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b
QPushButton { background-image: url(:/images/manual_button/next.png); }
-QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/next_ov.png); }
+QPushButton:pressed { background-image: url(:/images/manual_button/next_ov.png); }
tool
@@ -996,7 +1007,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b
QPushButton { background-image: url(:/images/manual_button/favorites.png); }
-QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/favorites_ov.png); }
+QPushButton:pressed { background-image: url(:/images/manual_button/favorites_ov.png); }
tool
@@ -1013,7 +1024,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b
QPushButton { background-image: url(:/images/manual_button/reserve.png); }
-QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/reserve_ov.png); }
+QPushButton:pressed { background-image: url(:/images/manual_button/reserve_ov.png); }
tool
@@ -1071,8 +1082,8 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b
- QPushButton { background-image: url(:/images/manual_button/damper_close.png); }
-QPushButton:checked, QPushButton:focus { background-image: url(:/images/manual_button/damper_open.png); }
+ QPushButton, QPushButton:checked:pressed { background-image: url(:/images/manual_button/damper_close.png); }
+QPushButton:checked, QPushButton:pressed { background-image: url(:/images/manual_button/damper_open.png); }
true
@@ -1092,7 +1103,10 @@ QPushButton:checked, QPushButton:focus { background-image: url(:/images/manual_b
QPushButton { background-image: url(:/images/manual_button/repeat.png); }
-QPushButton:pressed { background-image: url(:/images/manual_button/repeat_ov.png); }
+QPushButton:pressed, QPushButton:checked { background-image: url(:/images/manual_button/repeat_ov.png); }
+
+
+ true
tool
@@ -1109,7 +1123,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/repeat_ov.png
QPushButton { background-image: url(:/images/manual_button/preheat.png); }
-QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/preheat_ov.png); }
+QPushButton:pressed { background-image: url(:/images/manual_button/preheat_ov.png); }
tool
@@ -1126,7 +1140,7 @@ 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:focus, QPushButton:pressed { background-image: url(:/images/manual_button/side_nozzle_open.png); }
+QPushButton:checked, QPushButton:pressed { background-image: url(:/images/manual_button/side_nozzle_open.png); }
true
@@ -1148,6 +1162,9 @@ QPushButton:checked, QPushButton:focus, QPushButton:pressed { background-image:
background-image: url(:/images/line/manual_button.png);
+ sysLine_8
+ sysLine_7
+ sysLine_9
goFrontStackButton
fanButton
reserveButton
@@ -1179,9 +1196,6 @@ QPushButton:checked, QPushButton:focus, QPushButton:pressed { background-image:
humiditySlider
timeSlider
interTempSlider
- sysLine_8
- sysLine_7
- sysLine_9
diff --git a/app/gui/oven_control/slider.cpp b/app/gui/oven_control/slider.cpp
index 07cbd16..787499e 100644
--- a/app/gui/oven_control/slider.cpp
+++ b/app/gui/oven_control/slider.cpp
@@ -118,6 +118,8 @@ bool Slider::isSliderMoved()
void Slider::focusInEvent(QFocusEvent */*event*/)
{
focused = true;
+
+ update();
}
void Slider::focusOutEvent(QFocusEvent *event)
@@ -132,6 +134,8 @@ void Slider::focusOutEvent(QFocusEvent *event)
value_ = sliderPosition_;
emit valueChanged(value_);
}
+
+ update();
}
void Slider::keyPressEvent(QKeyEvent *event)
@@ -232,6 +236,16 @@ void Slider::paintEvent(QPaintEvent */*event*/)
QPoint handlePoint(subPoint.x() + subLength - handle.width() / 2, (height() - handle.height()) / 2);
painter.drawPixmap(handlePoint, handle);
}
+
+ if (focused)
+ {
+ QPen borderPen;
+ borderPen.setColor(QColor(0, 150, 255, 204));
+ borderPen.setWidth(1);
+ painter.setPen(borderPen);
+ painter.setBrush(Qt::NoBrush);
+ painter.drawRect(QRect(0, 0, width() - 1, height() - 1));
+ }
}
void Slider::resizeEvent(QResizeEvent */*event*/)