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; </property> <property name="styleSheet"> <string notr="true">QPushButton { background-image: url(:/images/manual_button/ok.png); } -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/ok_ov.png); }</string> +QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); }</string> </property> <property name="text"> <string>확인/적용하기</string> @@ -447,7 +452,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b <property name="styleSheet"> <string notr="true">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); }</string> +QPushButton:pressed { image: url(:/images/slider_icon/core_temp_ov.png); }</string> </property> <property name="style" stdset="0"> <string>icon</string> @@ -667,7 +672,7 @@ QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/core_te </property> <property name="styleSheet"> <string notr="true">QPushButton { background-image: url(:/images/manual_button/back.png); } -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/back_ov.png); }</string> +QPushButton:pressed { background-image: url(:/images/manual_button/back_ov.png); }</string> </property> <property name="text"> <string>이전으로</string> @@ -1009,9 +1014,9 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b <property name="geometry"> <rect> <x>185</x> - <y>954</y> + <y>994</y> <width>666</width> - <height>140</height> + <height>60</height> </rect> </property> <property name="focusPolicy"> 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 @@ <string notr="true">#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; -}</string> +outline: none; +} + +QPushButton[style="mode"]:focus, QPushButton[style="type"]:focus, QPushButton[style="function"]:focus { +border: 1px solid rgba(0, 150, 255, 80%); +} +</string> </property> <widget class="QWidget" name="centralwidget"> <property name="sizePolicy"> @@ -114,7 +120,7 @@ font-size: 30px; </property> <property name="styleSheet"> <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/config.png); } -QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/config_ov.png); }</string> +QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); }</string> </property> <property name="text"> <string/> @@ -143,7 +149,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c </property> <property name="styleSheet"> <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/help.png); } -QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/help_ov.png); }</string> +QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); }</string> </property> <property name="text"> <string/> @@ -167,7 +173,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h </property> <property name="styleSheet"> <string notr="true">QPushButton { background-image: url(:/images/main_button/multi.png); } -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_button/multi_ov.png); }</string> +QPushButton:pressed { background-image: url(:/images/main_button/multi_ov.png); }</string> </property> <property name="text"> <string>다중요리</string> @@ -193,7 +199,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_but </property> <property name="styleSheet"> <string notr="true">QPushButton { background-image: url(:/images/main_button/custom.png); } -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_button/custom_ov.png); }</string> +QPushButton:pressed { background-image: url(:/images/main_button/custom_ov.png); }</string> </property> <property name="text"> <string>프로그래밍모드</string> @@ -219,7 +225,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_but </property> <property name="styleSheet"> <string notr="true">QPushButton { background-image: url(:/images/main_button/wash.png); } -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_button/wash_ov.png); }</string> +QPushButton:pressed { background-image: url(:/images/main_button/wash_ov.png); }</string> </property> <property name="text"> <string>세척모드</string> @@ -317,7 +323,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_but </property> <property name="styleSheet"> <string notr="true">QPushButton { background-image: url(:/images/cook_mode/big_dryheat.png); } -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_dryheat_ov.png); }</string> +QPushButton:pressed { background-image: url(:/images/cook_mode/big_dryheat_ov.png); }</string> </property> <property name="text"> <string>건열</string> @@ -337,7 +343,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod </property> <property name="styleSheet"> <string notr="true">QPushButton { background-image: url(:/images/cook_mode/big_combi.png); } -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_combi_ov.png); }</string> +QPushButton:pressed { background-image: url(:/images/cook_mode/big_combi_ov.png); }</string> </property> <property name="text"> <string>콤비</string> @@ -357,7 +363,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod </property> <property name="styleSheet"> <string notr="true">QPushButton { background-image: url(:/images/cook_mode/big_steam.png); } -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_steam_ov.png); }</string> +QPushButton:pressed { background-image: url(:/images/cook_mode/big_steam_ov.png); }</string> </property> <property name="text"> <string>스팀</string> @@ -369,10 +375,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod <widget class="QPushButton" name="meatButton"> <property name="geometry"> <rect> - <x>225</x> + <x>226</x> <y>720</y> - <width>225</width> - <height>222</height> + <width>224</width> + <height>221</height> </rect> </property> <property name="sizePolicy"> @@ -383,7 +389,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod </property> <property name="styleSheet"> <string notr="true">QPushButton { background-image: url(:/images/cook_type/meat.png); } -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/meat_ov.png); }</string> +QPushButton:pressed { background-image: url(:/images/cook_type/meat_ov.png); }</string> </property> <property name="text"> <string>육류</string> @@ -395,10 +401,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ <widget class="QPushButton" name="dessertButton"> <property name="geometry"> <rect> - <x>675</x> + <x>676</x> <y>720</y> - <width>225</width> - <height>222</height> + <width>224</width> + <height>221</height> </rect> </property> <property name="sizePolicy"> @@ -409,7 +415,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ </property> <property name="styleSheet"> <string notr="true">QPushButton { background-image: url(:/images/cook_type/desert.png); } -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/desert_ov.png); }</string> +QPushButton:pressed { background-image: url(:/images/cook_type/desert_ov.png); }</string> </property> <property name="text"> <string>디저트류</string> @@ -421,10 +427,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ <widget class="QPushButton" name="etcButton"> <property name="geometry"> <rect> - <x>450</x> - <y>942</y> - <width>225</width> - <height>222</height> + <x>451</x> + <y>943</y> + <width>224</width> + <height>221</height> </rect> </property> <property name="sizePolicy"> @@ -435,7 +441,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ </property> <property name="styleSheet"> <string notr="true">QPushButton { background-image: url(:/images/cook_type/etc.png); } -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/etc_ov.png); }</string> +QPushButton:pressed { background-image: url(:/images/cook_type/etc_ov.png); }</string> </property> <property name="text"> <string>기타요리</string> @@ -448,9 +454,9 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ <property name="geometry"> <rect> <x>0</x> - <y>942</y> + <y>943</y> <width>225</width> - <height>222</height> + <height>221</height> </rect> </property> <property name="sizePolicy"> @@ -461,7 +467,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ </property> <property name="styleSheet"> <string notr="true">QPushButton { background-image: url(:/images/cook_type/vegetable.png); } -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/vegetable_ov.png); }</string> +QPushButton:pressed { background-image: url(:/images/cook_type/vegetable_ov.png); }</string> </property> <property name="text"> <string>채소및곡류</string> @@ -476,7 +482,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ <x>0</x> <y>720</y> <width>225</width> - <height>222</height> + <height>221</height> </rect> </property> <property name="sizePolicy"> @@ -487,7 +493,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ </property> <property name="styleSheet"> <string notr="true">QPushButton { background-image: url(:/images/cook_type/poultry.png); } -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/poultry_ov.png); }</string> +QPushButton:pressed { background-image: url(:/images/cook_type/poultry_ov.png); }</string> </property> <property name="text"> <string>가금류</string> @@ -499,10 +505,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ <widget class="QPushButton" name="fishButton"> <property name="geometry"> <rect> - <x>450</x> + <x>451</x> <y>720</y> - <width>225</width> - <height>222</height> + <width>224</width> + <height>221</height> </rect> </property> <property name="sizePolicy"> @@ -513,7 +519,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ </property> <property name="styleSheet"> <string notr="true">QPushButton { background-image: url(:/images/cook_type/fish.png); } -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/fish_ov.png); }</string> +QPushButton:pressed { background-image: url(:/images/cook_type/fish_ov.png); }</string> </property> <property name="text"> <string>생선류</string> @@ -525,10 +531,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ <widget class="QPushButton" name="breadButton"> <property name="geometry"> <rect> - <x>225</x> - <y>942</y> - <width>225</width> - <height>222</height> + <x>226</x> + <y>943</y> + <width>224</width> + <height>221</height> </rect> </property> <property name="sizePolicy"> @@ -539,7 +545,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ </property> <property name="styleSheet"> <string notr="true">QPushButton { background-image: url(:/images/cook_type/bread.png); } -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/bread_ov.png); }</string> +QPushButton:pressed { background-image: url(:/images/cook_type/bread_ov.png); }</string> </property> <property name="text"> <string>제과제빵류</string> @@ -551,10 +557,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ <widget class="QPushButton" name="primeButton"> <property name="geometry"> <rect> - <x>675</x> - <y>942</y> - <width>225</width> - <height>222</height> + <x>676</x> + <y>943</y> + <width>224</width> + <height>221</height> </rect> </property> <property name="sizePolicy"> @@ -565,7 +571,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ </property> <property name="styleSheet"> <string notr="true">QPushButton { background-image: url(:/images/cook_type/additional.png); } -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/additional_ov.png); }</string> +QPushButton:pressed { background-image: url(:/images/cook_type/additional_ov.png); }</string> </property> <property name="text"> <string>부가기능</string> 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; <property name="styleSheet"> <string notr="true">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); }</string> +QPushButton:pressed { background-image: url(:/images/cook_mode/big_combi_ov.png); }</string> </property> <property name="text"> <string>콤비</string> @@ -167,7 +169,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod <property name="styleSheet"> <string notr="true">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); }</string> +QPushButton:pressed { background-image: url(:/images/cook_mode/big_steam_ov.png); }</string> </property> <property name="text"> <string>스팀</string> @@ -194,7 +196,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod <property name="styleSheet"> <string notr="true">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); }</string> +QPushButton:pressed { background-image: url(:/images/cook_mode/big_dryheat_ov.png); }</string> </property> <property name="text"> <string>건열</string> @@ -229,7 +231,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod </property> <property name="styleSheet"> <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/back.png); } -QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/back_ov.png); }</string> +QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); }</string> </property> <property name="text"> <string/> @@ -246,7 +248,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/b </property> <property name="styleSheet"> <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/config.png); } -QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/config_ov.png); }</string> +QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); }</string> </property> <property name="text"> <string/> @@ -263,7 +265,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c </property> <property name="styleSheet"> <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/favorites_manual.png); } -QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/favorites_manual_ov.png); }</string> +QPushButton:pressed { border-image: url(:/images/bottom_bar/favorites_manual_ov.png); }</string> </property> <property name="text"> <string/> @@ -280,7 +282,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/f </property> <property name="styleSheet"> <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/wash.png); } -QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/wash_ov.png); }</string> +QPushButton:pressed { border-image: url(:/images/bottom_bar/wash_ov.png); }</string> </property> <property name="text"> <string/> @@ -297,7 +299,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/w </property> <property name="styleSheet"> <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/help.png); } -QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/help_ov.png); }</string> +QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); }</string> </property> <property name="text"> <string/> @@ -503,7 +505,10 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h </property> <property name="styleSheet"> <string notr="true">QPushButton { image: url(:/images/slider_icon/temp.png); } -QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/temp_ov.png); }</string> +QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/temp_ov.png); }</string> + </property> + <property name="checkable"> + <bool>true</bool> </property> <property name="style" stdset="0"> <string notr="true">icon</string> @@ -710,7 +715,10 @@ QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/temp_ov </property> <property name="styleSheet"> <string notr="true">QPushButton { image: url(:/images/slider_icon/humidity.png); } -QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/humidity_ov.png); }</string> +QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/humidity_ov.png); }</string> + </property> + <property name="checkable"> + <bool>true</bool> </property> <property name="style" stdset="0"> <string notr="true">icon</string> @@ -728,7 +736,7 @@ QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/humidit <property name="styleSheet"> <string notr="true">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); }</string> +QPushButton:pressed { image: url(:/images/slider_icon/core_temp_ov.png); }</string> </property> <property name="checkable"> <bool>true</bool> @@ -748,7 +756,10 @@ QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/core_te </property> <property name="styleSheet"> <string notr="true">QPushButton { image: url(:/images/slider_icon/time.png); } -QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/time_ov.png); }</string> +QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/time_ov.png); }</string> + </property> + <property name="checkable"> + <bool>true</bool> </property> <property name="style" stdset="0"> <string notr="true">icon</string> @@ -959,7 +970,7 @@ QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/time_ov </property> <property name="styleSheet"> <string notr="true">QPushButton { background-image: url(:/images/manual_button/cooldown.png); } -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/cooldown_ov.png); }</string> +QPushButton:pressed { background-image: url(:/images/manual_button/cooldown_ov.png); }</string> </property> <property name="checkable"> <bool>true</bool> @@ -979,7 +990,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b </property> <property name="styleSheet"> <string notr="true">QPushButton { background-image: url(:/images/manual_button/next.png); } -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/next_ov.png); }</string> +QPushButton:pressed { background-image: url(:/images/manual_button/next_ov.png); }</string> </property> <property name="style" stdset="0"> <string>tool</string> @@ -996,7 +1007,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b </property> <property name="styleSheet"> <string notr="true">QPushButton { background-image: url(:/images/manual_button/favorites.png); } -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/favorites_ov.png); }</string> +QPushButton:pressed { background-image: url(:/images/manual_button/favorites_ov.png); }</string> </property> <property name="style" stdset="0"> <string>tool</string> @@ -1013,7 +1024,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b </property> <property name="styleSheet"> <string notr="true">QPushButton { background-image: url(:/images/manual_button/reserve.png); } -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/reserve_ov.png); }</string> +QPushButton:pressed { background-image: url(:/images/manual_button/reserve_ov.png); }</string> </property> <property name="style" stdset="0"> <string>tool</string> @@ -1071,8 +1082,8 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b </rect> </property> <property name="styleSheet"> - <string notr="true">QPushButton { background-image: url(:/images/manual_button/damper_close.png); } -QPushButton:checked, QPushButton:focus { background-image: url(:/images/manual_button/damper_open.png); }</string> + <string notr="true">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); }</string> </property> <property name="checkable"> <bool>true</bool> @@ -1092,7 +1103,10 @@ QPushButton:checked, QPushButton:focus { background-image: url(:/images/manual_b </property> <property name="styleSheet"> <string notr="true">QPushButton { background-image: url(:/images/manual_button/repeat.png); } -QPushButton:pressed { background-image: url(:/images/manual_button/repeat_ov.png); }</string> +QPushButton:pressed, QPushButton:checked { background-image: url(:/images/manual_button/repeat_ov.png); }</string> + </property> + <property name="checkable"> + <bool>true</bool> </property> <property name="style" stdset="0"> <string>tool</string> @@ -1109,7 +1123,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/repeat_ov.png </property> <property name="styleSheet"> <string notr="true">QPushButton { background-image: url(:/images/manual_button/preheat.png); } -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/preheat_ov.png); }</string> +QPushButton:pressed { background-image: url(:/images/manual_button/preheat_ov.png); }</string> </property> <property name="style" stdset="0"> <string>tool</string> @@ -1126,7 +1140,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b </property> <property name="styleSheet"> <string notr="true">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); }</string> +QPushButton:checked, QPushButton:pressed { background-image: url(:/images/manual_button/side_nozzle_open.png); }</string> </property> <property name="checkable"> <bool>true</bool> @@ -1148,6 +1162,9 @@ QPushButton:checked, QPushButton:focus, QPushButton:pressed { background-image: <string notr="true">background-image: url(:/images/line/manual_button.png);</string> </property> </widget> + <zorder>sysLine_8</zorder> + <zorder>sysLine_7</zorder> + <zorder>sysLine_9</zorder> <zorder>goFrontStackButton</zorder> <zorder>fanButton</zorder> <zorder>reserveButton</zorder> @@ -1179,9 +1196,6 @@ QPushButton:checked, QPushButton:focus, QPushButton:pressed { background-image: <zorder>humiditySlider</zorder> <zorder>timeSlider</zorder> <zorder>interTempSlider</zorder> - <zorder>sysLine_8</zorder> - <zorder>sysLine_7</zorder> - <zorder>sysLine_9</zorder> </widget> </widget> <customwidgets> 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*/)