diff --git a/app/gui/oven_control/coretempsettingpopup.ui b/app/gui/oven_control/coretempsettingpopup.ui index 8e363a5..85828b7 100644 --- a/app/gui/oven_control/coretempsettingpopup.ui +++ b/app/gui/oven_control/coretempsettingpopup.ui @@ -39,11 +39,6 @@ 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 { @@ -164,7 +159,7 @@ height: 33px; QPushButton { background-image: url(:/images/manual_button/ok.png); } -QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); } +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/ok_ov.png); } 확인/적용하기 @@ -452,7 +447,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); } QPushButton { image: url(:/images/slider_icon/core_temp_enabled.png); } QPushButton:checked { image: url(:/images/slider_icon/core_temp_ov.png); } -QPushButton:pressed { image: url(:/images/slider_icon/core_temp_ov.png); } +QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/core_temp_ov.png); } icon @@ -672,7 +667,7 @@ QPushButton:pressed { image: url(:/images/slider_icon/core_temp_ov.png); } QPushButton { background-image: url(:/images/manual_button/back.png); } -QPushButton:pressed { background-image: url(:/images/manual_button/back_ov.png); } +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/back_ov.png); } 이전으로 diff --git a/app/gui/oven_control/mainwindow.ui b/app/gui/oven_control/mainwindow.ui index 928edcf..2670ddd 100644 --- a/app/gui/oven_control/mainwindow.ui +++ b/app/gui/oven_control/mainwindow.ui @@ -23,19 +23,20 @@ #centralwidget { background-image: url(:/images/background/main.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } -QWidget { outline: 1px solid rgba(0, 150, 255, 80%); } +QWidget { outline: none; } QPushButton[style="mode"] { background-repeat: no-repeat; background-position: center; background-clip: border; background-origin: border; +margin-bottom: 50px; -padding-top: 200px; -border: none; +border-top: 200px; +border-bottom: -50px; +border-style: hidden; color: white; font-size: 40px; -outline: none; } QPushButton[style="type"] { @@ -44,11 +45,10 @@ background-position: center; background-clip: border; background-origin: border; -padding-top: 165px; -border: none; +border-top: 165px; +border-style: hidden; color: white; font-size: 30px; -outline: none; } QPushButton[style="function"] { @@ -61,13 +61,7 @@ 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%); -} - +} @@ -120,7 +114,7 @@ border: 1px solid rgba(0, 150, 255, 80%); QPushButton { border-image: url(:/images/bottom_bar/config.png); } -QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); } +QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/config_ov.png); } @@ -149,7 +143,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); } QPushButton { border-image: url(:/images/bottom_bar/help.png); } -QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); } +QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/help_ov.png); } @@ -173,7 +167,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); } QPushButton { background-image: url(:/images/main_button/multi.png); } -QPushButton:pressed { background-image: url(:/images/main_button/multi_ov.png); } +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_button/multi_ov.png); } 다중요리 @@ -199,7 +193,7 @@ QPushButton:pressed { background-image: url(:/images/main_button/multi_ov.png); QPushButton { background-image: url(:/images/main_button/custom.png); } -QPushButton:pressed { background-image: url(:/images/main_button/custom_ov.png); } +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_button/custom_ov.png); } 프로그래밍모드 @@ -225,7 +219,7 @@ QPushButton:pressed { background-image: url(:/images/main_button/custom_ov.png); QPushButton { background-image: url(:/images/main_button/wash.png); } -QPushButton:pressed { background-image: url(:/images/main_button/wash_ov.png); } +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_button/wash_ov.png); } 세척모드 @@ -323,7 +317,7 @@ QPushButton:pressed { background-image: url(:/images/main_button/wash_ov.png); } QPushButton { background-image: url(:/images/cook_mode/big_dryheat.png); } -QPushButton:pressed { background-image: url(:/images/cook_mode/big_dryheat_ov.png); } +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_dryheat_ov.png); } 건열 @@ -343,7 +337,7 @@ QPushButton:pressed { background-image: url(:/images/cook_mode/big_dryheat_ov.pn QPushButton { background-image: url(:/images/cook_mode/big_combi.png); } -QPushButton:pressed { background-image: url(:/images/cook_mode/big_combi_ov.png); } +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_combi_ov.png); } 콤비 @@ -363,7 +357,7 @@ QPushButton:pressed { background-image: url(:/images/cook_mode/big_combi_ov.png) QPushButton { background-image: url(:/images/cook_mode/big_steam.png); } -QPushButton:pressed { background-image: url(:/images/cook_mode/big_steam_ov.png); } +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_steam_ov.png); } 스팀 @@ -389,7 +383,7 @@ QPushButton:pressed { background-image: url(:/images/cook_mode/big_steam_ov.png) QPushButton { background-image: url(:/images/cook_type/meat.png); } -QPushButton:pressed { background-image: url(:/images/cook_type/meat_ov.png); } +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/meat_ov.png); } 육류 @@ -415,7 +409,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/meat_ov.png); } QPushButton { background-image: url(:/images/cook_type/desert.png); } -QPushButton:pressed { background-image: url(:/images/cook_type/desert_ov.png); } +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/desert_ov.png); } 디저트류 @@ -441,7 +435,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/desert_ov.png); } QPushButton { background-image: url(:/images/cook_type/etc.png); } -QPushButton:pressed { background-image: url(:/images/cook_type/etc_ov.png); } +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/etc_ov.png); } 기타요리 @@ -467,7 +461,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/etc_ov.png); } QPushButton { background-image: url(:/images/cook_type/vegetable.png); } -QPushButton:pressed { background-image: url(:/images/cook_type/vegetable_ov.png); } +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/vegetable_ov.png); } 채소및곡류 @@ -493,7 +487,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/vegetable_ov.png) QPushButton { background-image: url(:/images/cook_type/poultry.png); } -QPushButton:pressed { background-image: url(:/images/cook_type/poultry_ov.png); } +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/poultry_ov.png); } 가금류 @@ -519,7 +513,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/poultry_ov.png); QPushButton { background-image: url(:/images/cook_type/fish.png); } -QPushButton:pressed { background-image: url(:/images/cook_type/fish_ov.png); } +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/fish_ov.png); } 생선류 @@ -545,7 +539,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/fish_ov.png); } QPushButton { background-image: url(:/images/cook_type/bread.png); } -QPushButton:pressed { background-image: url(:/images/cook_type/bread_ov.png); } +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/bread_ov.png); } 제과제빵류 @@ -571,7 +565,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/bread_ov.png); }< QPushButton { background-image: url(:/images/cook_type/additional.png); } -QPushButton:pressed { background-image: url(:/images/cook_type/additional_ov.png); } +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/additional_ov.png); } 부가기능 diff --git a/app/gui/oven_control/manualcookwindow.ui b/app/gui/oven_control/manualcookwindow.ui index 0892239..ac566e4 100644 --- a/app/gui/oven_control/manualcookwindow.ui +++ b/app/gui/oven_control/manualcookwindow.ui @@ -19,8 +19,10 @@ background-repeat: no-repeat; background-position: center; background-clip: border; background-origin: border; +margin-bottom: 50px; -padding-top: 200px; +border-top: 200px; +border-bottom: -50px; border-style: hidden; color: #7B7B7B; font-size: 40px; @@ -45,10 +47,6 @@ 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; @@ -142,7 +140,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 { background-image: url(:/images/cook_mode/big_combi_ov.png); } +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_combi_ov.png); } 콤비 @@ -169,7 +167,7 @@ QPushButton:pressed { background-image: url(:/images/cook_mode/big_combi_ov.png) QPushButton { background-image: url(:/images/cook_mode/big_steam_hide.png); } QPushButton:checked { background-image: url(:/images/cook_mode/big_steam.png); } -QPushButton:pressed { background-image: url(:/images/cook_mode/big_steam_ov.png); } +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_steam_ov.png); } 스팀 @@ -196,7 +194,7 @@ QPushButton:pressed { background-image: url(:/images/cook_mode/big_steam_ov.png) QPushButton { background-image: url(:/images/cook_mode/big_dryheat_hide.png); } QPushButton:checked { background-image: url(:/images/cook_mode/big_dryheat.png); } -QPushButton:pressed { background-image: url(:/images/cook_mode/big_dryheat_ov.png); } +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_dryheat_ov.png); } 건열 @@ -231,7 +229,7 @@ QPushButton:pressed { background-image: url(:/images/cook_mode/big_dryheat_ov.pn QPushButton { border-image: url(:/images/bottom_bar/back.png); } -QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); } +QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/back_ov.png); } @@ -248,7 +246,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); } QPushButton { border-image: url(:/images/bottom_bar/config.png); } -QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); } +QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/config_ov.png); } @@ -265,7 +263,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); } QPushButton { border-image: url(:/images/bottom_bar/favorites_manual.png); } -QPushButton:pressed { border-image: url(:/images/bottom_bar/favorites_manual_ov.png); } +QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/favorites_manual_ov.png); } @@ -282,7 +280,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/favorites_manual_ov. QPushButton { border-image: url(:/images/bottom_bar/wash.png); } -QPushButton:pressed { border-image: url(:/images/bottom_bar/wash_ov.png); } +QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/wash_ov.png); } @@ -299,7 +297,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/wash_ov.png); } QPushButton { border-image: url(:/images/bottom_bar/help.png); } -QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); } +QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/help_ov.png); } @@ -505,7 +503,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); } QPushButton { image: url(:/images/slider_icon/temp.png); } -QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/temp_ov.png); } +QPushButton:pressed, QPushButton:checked, QPushButton:focus { image: url(:/images/slider_icon/temp_ov.png); } true @@ -715,7 +713,7 @@ QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/temp_ QPushButton { image: url(:/images/slider_icon/humidity.png); } -QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/humidity_ov.png); } +QPushButton:pressed, QPushButton:checked, QPushButton:focus { image: url(:/images/slider_icon/humidity_ov.png); } true @@ -736,7 +734,7 @@ QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/humid QPushButton { image: url(:/images/slider_icon/core_temp.png); } QPushButton:checked { image: url(:/images/slider_icon/core_temp_enabled.png); } -QPushButton:pressed { image: url(:/images/slider_icon/core_temp_ov.png); } +QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/core_temp_ov.png); } true @@ -756,7 +754,7 @@ QPushButton:pressed { image: url(:/images/slider_icon/core_temp_ov.png); } QPushButton { image: url(:/images/slider_icon/time.png); } -QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/time_ov.png); } +QPushButton:pressed, QPushButton:checked, QPushButton:focus { image: url(:/images/slider_icon/time_ov.png); } true @@ -970,7 +968,7 @@ QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/time_ QPushButton { background-image: url(:/images/manual_button/cooldown.png); } -QPushButton:pressed { background-image: url(:/images/manual_button/cooldown_ov.png); } +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/cooldown_ov.png); } true @@ -990,7 +988,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/cooldown_ov.p QPushButton { background-image: url(:/images/manual_button/next.png); } -QPushButton:pressed { background-image: url(:/images/manual_button/next_ov.png); } +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/next_ov.png); } tool @@ -1007,7 +1005,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/next_ov.png); QPushButton { background-image: url(:/images/manual_button/favorites.png); } -QPushButton:pressed { background-image: url(:/images/manual_button/favorites_ov.png); } +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/favorites_ov.png); } tool @@ -1024,7 +1022,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/favorites_ov. QPushButton { background-image: url(:/images/manual_button/reserve.png); } -QPushButton:pressed { background-image: url(:/images/manual_button/reserve_ov.png); } +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/reserve_ov.png); } tool @@ -1083,7 +1081,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/reserve_ov.pn 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); } +QPushButton:checked, QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/damper_open.png); } true @@ -1103,7 +1101,7 @@ QPushButton:checked, QPushButton:pressed { background-image: url(:/images/manual QPushButton { background-image: url(:/images/manual_button/repeat.png); } -QPushButton:pressed, QPushButton:checked { background-image: url(:/images/manual_button/repeat_ov.png); } +QPushButton:pressed, QPushButton:checked, QPushButton:focus { background-image: url(:/images/manual_button/repeat_ov.png); } true @@ -1123,7 +1121,7 @@ QPushButton:pressed, QPushButton:checked { background-image: url(:/images/manual QPushButton { background-image: url(:/images/manual_button/preheat.png); } -QPushButton:pressed { background-image: url(:/images/manual_button/preheat_ov.png); } +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/preheat_ov.png); } tool @@ -1140,7 +1138,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/preheat_ov.pn QPushButton, QPushButton:checked:pressed { background-image: url(:/images/manual_button/side_nozzle_close.png); } -QPushButton:checked, QPushButton:pressed { background-image: url(:/images/manual_button/side_nozzle_open.png); } +QPushButton:checked, QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/side_nozzle_open.png); } true diff --git a/app/gui/oven_control/slider.cpp b/app/gui/oven_control/slider.cpp index 787499e..07cbd16 100644 --- a/app/gui/oven_control/slider.cpp +++ b/app/gui/oven_control/slider.cpp @@ -118,8 +118,6 @@ bool Slider::isSliderMoved() void Slider::focusInEvent(QFocusEvent */*event*/) { focused = true; - - update(); } void Slider::focusOutEvent(QFocusEvent *event) @@ -134,8 +132,6 @@ void Slider::focusOutEvent(QFocusEvent *event) value_ = sliderPosition_; emit valueChanged(value_); } - - update(); } void Slider::keyPressEvent(QKeyEvent *event) @@ -236,16 +232,6 @@ 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*/)