Commit d804d82b41ca51ce8f17755e8c33eaee76612e8f

Authored by 김태훈
1 parent 7674974847
Exists in master and in 2 other branches fhd, fhd-demo

프라임 요청으로 포커스 디자인 변경 적용한 걸 복원

app/gui/oven_control/coretempsettingpopup.ui
@@ -39,11 +39,6 @@ padding-top: 130px; @@ -39,11 +39,6 @@ padding-top: 130px;
39 border: none; 39 border: none;
40 color: white; 40 color: white;
41 font-size: 30px; 41 font-size: 30px;
42 -outline: none;  
43 -}  
44 -  
45 -QPushButton[style="interTemp"]:focus {  
46 -border: 1px solid rgba(0, 150, 255, 80%);  
47 } 42 }
48 43
49 QSlider::groove { 44 QSlider::groove {
@@ -164,7 +159,7 @@ height: 33px; @@ -164,7 +159,7 @@ height: 33px;
164 </property> 159 </property>
165 <property name="styleSheet"> 160 <property name="styleSheet">
166 <string notr="true">QPushButton { background-image: url(:/images/manual_button/ok.png); } 161 <string notr="true">QPushButton { background-image: url(:/images/manual_button/ok.png); }
167 -QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); }</string> 162 +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/ok_ov.png); }</string>
168 </property> 163 </property>
169 <property name="text"> 164 <property name="text">
170 <string>확인/적용하기</string> 165 <string>확인/적용하기</string>
@@ -452,7 +447,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); } @@ -452,7 +447,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); }
452 <property name="styleSheet"> 447 <property name="styleSheet">
453 <string notr="true">QPushButton { image: url(:/images/slider_icon/core_temp_enabled.png); } 448 <string notr="true">QPushButton { image: url(:/images/slider_icon/core_temp_enabled.png); }
454 QPushButton:checked { image: url(:/images/slider_icon/core_temp_ov.png); } 449 QPushButton:checked { image: url(:/images/slider_icon/core_temp_ov.png); }
455 -QPushButton:pressed { image: url(:/images/slider_icon/core_temp_ov.png); }</string> 450 +QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/core_temp_ov.png); }</string>
456 </property> 451 </property>
457 <property name="style" stdset="0"> 452 <property name="style" stdset="0">
458 <string>icon</string> 453 <string>icon</string>
@@ -672,7 +667,7 @@ QPushButton:pressed { image: url(:/images/slider_icon/core_temp_ov.png); }&lt;/stri @@ -672,7 +667,7 @@ QPushButton:pressed { image: url(:/images/slider_icon/core_temp_ov.png); }&lt;/stri
672 </property> 667 </property>
673 <property name="styleSheet"> 668 <property name="styleSheet">
674 <string notr="true">QPushButton { background-image: url(:/images/manual_button/back.png); } 669 <string notr="true">QPushButton { background-image: url(:/images/manual_button/back.png); }
675 -QPushButton:pressed { background-image: url(:/images/manual_button/back_ov.png); }</string> 670 +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/back_ov.png); }</string>
676 </property> 671 </property>
677 <property name="text"> 672 <property name="text">
678 <string>이전으로</string> 673 <string>이전으로</string>
app/gui/oven_control/mainwindow.ui
@@ -23,19 +23,20 @@ @@ -23,19 +23,20 @@
23 <string notr="true">#centralwidget { background-image: url(:/images/background/main.png); } 23 <string notr="true">#centralwidget { background-image: url(:/images/background/main.png); }
24 #bottomBar { background-image: url(:/images/bottom_bar/background.png); } 24 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }
25 25
26 -QWidget { outline: 1px solid rgba(0, 150, 255, 80%); } 26 +QWidget { outline: none; }
27 27
28 QPushButton[style=&quot;mode&quot;] { 28 QPushButton[style=&quot;mode&quot;] {
29 background-repeat: no-repeat; 29 background-repeat: no-repeat;
30 background-position: center; 30 background-position: center;
31 background-clip: border; 31 background-clip: border;
32 background-origin: border; 32 background-origin: border;
  33 +margin-bottom: 50px;
33 34
34 -padding-top: 200px;  
35 -border: none; 35 +border-top: 200px;
  36 +border-bottom: -50px;
  37 +border-style: hidden;
36 color: white; 38 color: white;
37 font-size: 40px; 39 font-size: 40px;
38 -outline: none;  
39 } 40 }
40 41
41 QPushButton[style=&quot;type&quot;] { 42 QPushButton[style=&quot;type&quot;] {
@@ -44,11 +45,10 @@ background-position: center; @@ -44,11 +45,10 @@ background-position: center;
44 background-clip: border; 45 background-clip: border;
45 background-origin: border; 46 background-origin: border;
46 47
47 -padding-top: 165px;  
48 -border: none; 48 +border-top: 165px;
  49 +border-style: hidden;
49 color: white; 50 color: white;
50 font-size: 30px; 51 font-size: 30px;
51 -outline: none;  
52 } 52 }
53 53
54 QPushButton[style=&quot;function&quot;] { 54 QPushButton[style=&quot;function&quot;] {
@@ -61,13 +61,7 @@ padding-top: 206px; @@ -61,13 +61,7 @@ padding-top: 206px;
61 border-style: hidden; 61 border-style: hidden;
62 color: white; 62 color: white;
63 font-size: 30px; 63 font-size: 30px;
64 -outline: none;  
65 -}  
66 -  
67 -QPushButton[style=&quot;mode&quot;]:focus, QPushButton[style=&quot;type&quot;]:focus, QPushButton[style=&quot;function&quot;]:focus {  
68 -border: 1px solid rgba(0, 150, 255, 80%);  
69 -}  
70 -</string> 64 +}</string>
71 </property> 65 </property>
72 <widget class="QWidget" name="centralwidget"> 66 <widget class="QWidget" name="centralwidget">
73 <property name="sizePolicy"> 67 <property name="sizePolicy">
@@ -120,7 +114,7 @@ border: 1px solid rgba(0, 150, 255, 80%); @@ -120,7 +114,7 @@ border: 1px solid rgba(0, 150, 255, 80%);
120 </property> 114 </property>
121 <property name="styleSheet"> 115 <property name="styleSheet">
122 <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/config.png); } 116 <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/config.png); }
123 -QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); }</string> 117 +QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/config_ov.png); }</string>
124 </property> 118 </property>
125 <property name="text"> 119 <property name="text">
126 <string/> 120 <string/>
@@ -149,7 +143,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); }&lt;/s @@ -149,7 +143,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); }&lt;/s
149 </property> 143 </property>
150 <property name="styleSheet"> 144 <property name="styleSheet">
151 <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/help.png); } 145 <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/help.png); }
152 -QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); }</string> 146 +QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/help_ov.png); }</string>
153 </property> 147 </property>
154 <property name="text"> 148 <property name="text">
155 <string/> 149 <string/>
@@ -173,7 +167,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); }&lt;/str @@ -173,7 +167,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); }&lt;/str
173 </property> 167 </property>
174 <property name="styleSheet"> 168 <property name="styleSheet">
175 <string notr="true">QPushButton { background-image: url(:/images/main_button/multi.png); } 169 <string notr="true">QPushButton { background-image: url(:/images/main_button/multi.png); }
176 -QPushButton:pressed { background-image: url(:/images/main_button/multi_ov.png); }</string> 170 +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_button/multi_ov.png); }</string>
177 </property> 171 </property>
178 <property name="text"> 172 <property name="text">
179 <string>다중요리</string> 173 <string>다중요리</string>
@@ -199,7 +193,7 @@ QPushButton:pressed { background-image: url(:/images/main_button/multi_ov.png); @@ -199,7 +193,7 @@ QPushButton:pressed { background-image: url(:/images/main_button/multi_ov.png);
199 </property> 193 </property>
200 <property name="styleSheet"> 194 <property name="styleSheet">
201 <string notr="true">QPushButton { background-image: url(:/images/main_button/custom.png); } 195 <string notr="true">QPushButton { background-image: url(:/images/main_button/custom.png); }
202 -QPushButton:pressed { background-image: url(:/images/main_button/custom_ov.png); }</string> 196 +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_button/custom_ov.png); }</string>
203 </property> 197 </property>
204 <property name="text"> 198 <property name="text">
205 <string>프로그래밍모드</string> 199 <string>프로그래밍모드</string>
@@ -225,7 +219,7 @@ QPushButton:pressed { background-image: url(:/images/main_button/custom_ov.png); @@ -225,7 +219,7 @@ QPushButton:pressed { background-image: url(:/images/main_button/custom_ov.png);
225 </property> 219 </property>
226 <property name="styleSheet"> 220 <property name="styleSheet">
227 <string notr="true">QPushButton { background-image: url(:/images/main_button/wash.png); } 221 <string notr="true">QPushButton { background-image: url(:/images/main_button/wash.png); }
228 -QPushButton:pressed { background-image: url(:/images/main_button/wash_ov.png); }</string> 222 +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_button/wash_ov.png); }</string>
229 </property> 223 </property>
230 <property name="text"> 224 <property name="text">
231 <string>세척모드</string> 225 <string>세척모드</string>
@@ -323,7 +317,7 @@ QPushButton:pressed { background-image: url(:/images/main_button/wash_ov.png); } @@ -323,7 +317,7 @@ QPushButton:pressed { background-image: url(:/images/main_button/wash_ov.png); }
323 </property> 317 </property>
324 <property name="styleSheet"> 318 <property name="styleSheet">
325 <string notr="true">QPushButton { background-image: url(:/images/cook_mode/big_dryheat.png); } 319 <string notr="true">QPushButton { background-image: url(:/images/cook_mode/big_dryheat.png); }
326 -QPushButton:pressed { background-image: url(:/images/cook_mode/big_dryheat_ov.png); }</string> 320 +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_dryheat_ov.png); }</string>
327 </property> 321 </property>
328 <property name="text"> 322 <property name="text">
329 <string>건열</string> 323 <string>건열</string>
@@ -343,7 +337,7 @@ QPushButton:pressed { background-image: url(:/images/cook_mode/big_dryheat_ov.pn @@ -343,7 +337,7 @@ QPushButton:pressed { background-image: url(:/images/cook_mode/big_dryheat_ov.pn
343 </property> 337 </property>
344 <property name="styleSheet"> 338 <property name="styleSheet">
345 <string notr="true">QPushButton { background-image: url(:/images/cook_mode/big_combi.png); } 339 <string notr="true">QPushButton { background-image: url(:/images/cook_mode/big_combi.png); }
346 -QPushButton:pressed { background-image: url(:/images/cook_mode/big_combi_ov.png); }</string> 340 +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_combi_ov.png); }</string>
347 </property> 341 </property>
348 <property name="text"> 342 <property name="text">
349 <string>콤비</string> 343 <string>콤비</string>
@@ -363,7 +357,7 @@ QPushButton:pressed { 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)
363 </property> 357 </property>
364 <property name="styleSheet"> 358 <property name="styleSheet">
365 <string notr="true">QPushButton { background-image: url(:/images/cook_mode/big_steam.png); } 359 <string notr="true">QPushButton { background-image: url(:/images/cook_mode/big_steam.png); }
366 -QPushButton:pressed { background-image: url(:/images/cook_mode/big_steam_ov.png); }</string> 360 +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_steam_ov.png); }</string>
367 </property> 361 </property>
368 <property name="text"> 362 <property name="text">
369 <string>스팀</string> 363 <string>스팀</string>
@@ -389,7 +383,7 @@ QPushButton:pressed { 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)
389 </property> 383 </property>
390 <property name="styleSheet"> 384 <property name="styleSheet">
391 <string notr="true">QPushButton { background-image: url(:/images/cook_type/meat.png); } 385 <string notr="true">QPushButton { background-image: url(:/images/cook_type/meat.png); }
392 -QPushButton:pressed { background-image: url(:/images/cook_type/meat_ov.png); }</string> 386 +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/meat_ov.png); }</string>
393 </property> 387 </property>
394 <property name="text"> 388 <property name="text">
395 <string>육류</string> 389 <string>육류</string>
@@ -415,7 +409,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/meat_ov.png); }&lt;/ @@ -415,7 +409,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/meat_ov.png); }&lt;/
415 </property> 409 </property>
416 <property name="styleSheet"> 410 <property name="styleSheet">
417 <string notr="true">QPushButton { background-image: url(:/images/cook_type/desert.png); } 411 <string notr="true">QPushButton { background-image: url(:/images/cook_type/desert.png); }
418 -QPushButton:pressed { background-image: url(:/images/cook_type/desert_ov.png); }</string> 412 +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/desert_ov.png); }</string>
419 </property> 413 </property>
420 <property name="text"> 414 <property name="text">
421 <string>디저트류</string> 415 <string>디저트류</string>
@@ -441,7 +435,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/desert_ov.png); } @@ -441,7 +435,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/desert_ov.png); }
441 </property> 435 </property>
442 <property name="styleSheet"> 436 <property name="styleSheet">
443 <string notr="true">QPushButton { background-image: url(:/images/cook_type/etc.png); } 437 <string notr="true">QPushButton { background-image: url(:/images/cook_type/etc.png); }
444 -QPushButton:pressed { background-image: url(:/images/cook_type/etc_ov.png); }</string> 438 +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/etc_ov.png); }</string>
445 </property> 439 </property>
446 <property name="text"> 440 <property name="text">
447 <string>기타요리</string> 441 <string>기타요리</string>
@@ -467,7 +461,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/etc_ov.png); }&lt;/s @@ -467,7 +461,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/etc_ov.png); }&lt;/s
467 </property> 461 </property>
468 <property name="styleSheet"> 462 <property name="styleSheet">
469 <string notr="true">QPushButton { background-image: url(:/images/cook_type/vegetable.png); } 463 <string notr="true">QPushButton { background-image: url(:/images/cook_type/vegetable.png); }
470 -QPushButton:pressed { background-image: url(:/images/cook_type/vegetable_ov.png); }</string> 464 +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/vegetable_ov.png); }</string>
471 </property> 465 </property>
472 <property name="text"> 466 <property name="text">
473 <string>채소및곡류</string> 467 <string>채소및곡류</string>
@@ -493,7 +487,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/vegetable_ov.png) @@ -493,7 +487,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/vegetable_ov.png)
493 </property> 487 </property>
494 <property name="styleSheet"> 488 <property name="styleSheet">
495 <string notr="true">QPushButton { background-image: url(:/images/cook_type/poultry.png); } 489 <string notr="true">QPushButton { background-image: url(:/images/cook_type/poultry.png); }
496 -QPushButton:pressed { background-image: url(:/images/cook_type/poultry_ov.png); }</string> 490 +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/poultry_ov.png); }</string>
497 </property> 491 </property>
498 <property name="text"> 492 <property name="text">
499 <string>가금류</string> 493 <string>가금류</string>
@@ -519,7 +513,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/poultry_ov.png); @@ -519,7 +513,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/poultry_ov.png);
519 </property> 513 </property>
520 <property name="styleSheet"> 514 <property name="styleSheet">
521 <string notr="true">QPushButton { background-image: url(:/images/cook_type/fish.png); } 515 <string notr="true">QPushButton { background-image: url(:/images/cook_type/fish.png); }
522 -QPushButton:pressed { background-image: url(:/images/cook_type/fish_ov.png); }</string> 516 +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/fish_ov.png); }</string>
523 </property> 517 </property>
524 <property name="text"> 518 <property name="text">
525 <string>생선류</string> 519 <string>생선류</string>
@@ -545,7 +539,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/fish_ov.png); }&lt;/ @@ -545,7 +539,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/fish_ov.png); }&lt;/
545 </property> 539 </property>
546 <property name="styleSheet"> 540 <property name="styleSheet">
547 <string notr="true">QPushButton { background-image: url(:/images/cook_type/bread.png); } 541 <string notr="true">QPushButton { background-image: url(:/images/cook_type/bread.png); }
548 -QPushButton:pressed { background-image: url(:/images/cook_type/bread_ov.png); }</string> 542 +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/bread_ov.png); }</string>
549 </property> 543 </property>
550 <property name="text"> 544 <property name="text">
551 <string>제과제빵류</string> 545 <string>제과제빵류</string>
@@ -571,7 +565,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/bread_ov.png); }&lt; @@ -571,7 +565,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/bread_ov.png); }&lt;
571 </property> 565 </property>
572 <property name="styleSheet"> 566 <property name="styleSheet">
573 <string notr="true">QPushButton { background-image: url(:/images/cook_type/additional.png); } 567 <string notr="true">QPushButton { background-image: url(:/images/cook_type/additional.png); }
574 -QPushButton:pressed { background-image: url(:/images/cook_type/additional_ov.png); }</string> 568 +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/additional_ov.png); }</string>
575 </property> 569 </property>
576 <property name="text"> 570 <property name="text">
577 <string>부가기능</string> 571 <string>부가기능</string>
app/gui/oven_control/manualcookwindow.ui
@@ -19,8 +19,10 @@ background-repeat: no-repeat; @@ -19,8 +19,10 @@ background-repeat: no-repeat;
19 background-position: center; 19 background-position: center;
20 background-clip: border; 20 background-clip: border;
21 background-origin: border; 21 background-origin: border;
  22 +margin-bottom: 50px;
22 23
23 -padding-top: 200px; 24 +border-top: 200px;
  25 +border-bottom: -50px;
24 border-style: hidden; 26 border-style: hidden;
25 color: #7B7B7B; 27 color: #7B7B7B;
26 font-size: 40px; 28 font-size: 40px;
@@ -45,10 +47,6 @@ background-repeat: no-repeat; @@ -45,10 +47,6 @@ background-repeat: no-repeat;
45 background-position: center; 47 background-position: center;
46 } 48 }
47 49
48 -QPushButton[style=&quot;mode&quot;]:focus {  
49 -border: 1px solid rgba(0, 150, 255, 80%);  
50 -}  
51 -  
52 QSlider::groove { 50 QSlider::groove {
53 background-image: url(:/images/slider/groove_ticks.png); 51 background-image: url(:/images/slider/groove_ticks.png);
54 background-repeat: no-repeat; 52 background-repeat: no-repeat;
@@ -142,7 +140,7 @@ height: 33px; @@ -142,7 +140,7 @@ height: 33px;
142 <property name="styleSheet"> 140 <property name="styleSheet">
143 <string notr="true">QPushButton { background-image: url(:/images/cook_mode/big_combi_hide.png); } 141 <string notr="true">QPushButton { background-image: url(:/images/cook_mode/big_combi_hide.png); }
144 QPushButton:checked { background-image: url(:/images/cook_mode/big_combi.png); } 142 QPushButton:checked { background-image: url(:/images/cook_mode/big_combi.png); }
145 -QPushButton:pressed { background-image: url(:/images/cook_mode/big_combi_ov.png); }</string> 143 +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_combi_ov.png); }</string>
146 </property> 144 </property>
147 <property name="text"> 145 <property name="text">
148 <string>콤비</string> 146 <string>콤비</string>
@@ -169,7 +167,7 @@ QPushButton:pressed { 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)
169 <property name="styleSheet"> 167 <property name="styleSheet">
170 <string notr="true">QPushButton { background-image: url(:/images/cook_mode/big_steam_hide.png); } 168 <string notr="true">QPushButton { background-image: url(:/images/cook_mode/big_steam_hide.png); }
171 QPushButton:checked { background-image: url(:/images/cook_mode/big_steam.png); } 169 QPushButton:checked { background-image: url(:/images/cook_mode/big_steam.png); }
172 -QPushButton:pressed { background-image: url(:/images/cook_mode/big_steam_ov.png); }</string> 170 +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_steam_ov.png); }</string>
173 </property> 171 </property>
174 <property name="text"> 172 <property name="text">
175 <string>스팀</string> 173 <string>스팀</string>
@@ -196,7 +194,7 @@ QPushButton:pressed { 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)
196 <property name="styleSheet"> 194 <property name="styleSheet">
197 <string notr="true">QPushButton { background-image: url(:/images/cook_mode/big_dryheat_hide.png); } 195 <string notr="true">QPushButton { background-image: url(:/images/cook_mode/big_dryheat_hide.png); }
198 QPushButton:checked { background-image: url(:/images/cook_mode/big_dryheat.png); } 196 QPushButton:checked { background-image: url(:/images/cook_mode/big_dryheat.png); }
199 -QPushButton:pressed { background-image: url(:/images/cook_mode/big_dryheat_ov.png); }</string> 197 +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_dryheat_ov.png); }</string>
200 </property> 198 </property>
201 <property name="text"> 199 <property name="text">
202 <string>건열</string> 200 <string>건열</string>
@@ -231,7 +229,7 @@ QPushButton:pressed { background-image: url(:/images/cook_mode/big_dryheat_ov.pn @@ -231,7 +229,7 @@ QPushButton:pressed { background-image: url(:/images/cook_mode/big_dryheat_ov.pn
231 </property> 229 </property>
232 <property name="styleSheet"> 230 <property name="styleSheet">
233 <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/back.png); } 231 <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/back.png); }
234 -QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); }</string> 232 +QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/back_ov.png); }</string>
235 </property> 233 </property>
236 <property name="text"> 234 <property name="text">
237 <string/> 235 <string/>
@@ -248,7 +246,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); }&lt;/str @@ -248,7 +246,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); }&lt;/str
248 </property> 246 </property>
249 <property name="styleSheet"> 247 <property name="styleSheet">
250 <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/config.png); } 248 <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/config.png); }
251 -QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); }</string> 249 +QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/config_ov.png); }</string>
252 </property> 250 </property>
253 <property name="text"> 251 <property name="text">
254 <string/> 252 <string/>
@@ -265,7 +263,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); }&lt;/s @@ -265,7 +263,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); }&lt;/s
265 </property> 263 </property>
266 <property name="styleSheet"> 264 <property name="styleSheet">
267 <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/favorites_manual.png); } 265 <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/favorites_manual.png); }
268 -QPushButton:pressed { border-image: url(:/images/bottom_bar/favorites_manual_ov.png); }</string> 266 +QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/favorites_manual_ov.png); }</string>
269 </property> 267 </property>
270 <property name="text"> 268 <property name="text">
271 <string/> 269 <string/>
@@ -282,7 +280,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/favorites_manual_ov. @@ -282,7 +280,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/favorites_manual_ov.
282 </property> 280 </property>
283 <property name="styleSheet"> 281 <property name="styleSheet">
284 <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/wash.png); } 282 <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/wash.png); }
285 -QPushButton:pressed { border-image: url(:/images/bottom_bar/wash_ov.png); }</string> 283 +QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/wash_ov.png); }</string>
286 </property> 284 </property>
287 <property name="text"> 285 <property name="text">
288 <string/> 286 <string/>
@@ -299,7 +297,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/wash_ov.png); }&lt;/str @@ -299,7 +297,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/wash_ov.png); }&lt;/str
299 </property> 297 </property>
300 <property name="styleSheet"> 298 <property name="styleSheet">
301 <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/help.png); } 299 <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/help.png); }
302 -QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); }</string> 300 +QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/help_ov.png); }</string>
303 </property> 301 </property>
304 <property name="text"> 302 <property name="text">
305 <string/> 303 <string/>
@@ -505,7 +503,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); }&lt;/str @@ -505,7 +503,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); }&lt;/str
505 </property> 503 </property>
506 <property name="styleSheet"> 504 <property name="styleSheet">
507 <string notr="true">QPushButton { image: url(:/images/slider_icon/temp.png); } 505 <string notr="true">QPushButton { image: url(:/images/slider_icon/temp.png); }
508 -QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/temp_ov.png); }</string> 506 +QPushButton:pressed, QPushButton:checked, QPushButton:focus { image: url(:/images/slider_icon/temp_ov.png); }</string>
509 </property> 507 </property>
510 <property name="checkable"> 508 <property name="checkable">
511 <bool>true</bool> 509 <bool>true</bool>
@@ -715,7 +713,7 @@ QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/temp_ @@ -715,7 +713,7 @@ QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/temp_
715 </property> 713 </property>
716 <property name="styleSheet"> 714 <property name="styleSheet">
717 <string notr="true">QPushButton { image: url(:/images/slider_icon/humidity.png); } 715 <string notr="true">QPushButton { image: url(:/images/slider_icon/humidity.png); }
718 -QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/humidity_ov.png); }</string> 716 +QPushButton:pressed, QPushButton:checked, QPushButton:focus { image: url(:/images/slider_icon/humidity_ov.png); }</string>
719 </property> 717 </property>
720 <property name="checkable"> 718 <property name="checkable">
721 <bool>true</bool> 719 <bool>true</bool>
@@ -736,7 +734,7 @@ QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/humid @@ -736,7 +734,7 @@ QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/humid
736 <property name="styleSheet"> 734 <property name="styleSheet">
737 <string notr="true">QPushButton { image: url(:/images/slider_icon/core_temp.png); } 735 <string notr="true">QPushButton { image: url(:/images/slider_icon/core_temp.png); }
738 QPushButton:checked { image: url(:/images/slider_icon/core_temp_enabled.png); } 736 QPushButton:checked { image: url(:/images/slider_icon/core_temp_enabled.png); }
739 -QPushButton:pressed { image: url(:/images/slider_icon/core_temp_ov.png); }</string> 737 +QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/core_temp_ov.png); }</string>
740 </property> 738 </property>
741 <property name="checkable"> 739 <property name="checkable">
742 <bool>true</bool> 740 <bool>true</bool>
@@ -756,7 +754,7 @@ QPushButton:pressed { image: url(:/images/slider_icon/core_temp_ov.png); }&lt;/stri @@ -756,7 +754,7 @@ QPushButton:pressed { image: url(:/images/slider_icon/core_temp_ov.png); }&lt;/stri
756 </property> 754 </property>
757 <property name="styleSheet"> 755 <property name="styleSheet">
758 <string notr="true">QPushButton { image: url(:/images/slider_icon/time.png); } 756 <string notr="true">QPushButton { image: url(:/images/slider_icon/time.png); }
759 -QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/time_ov.png); }</string> 757 +QPushButton:pressed, QPushButton:checked, QPushButton:focus { image: url(:/images/slider_icon/time_ov.png); }</string>
760 </property> 758 </property>
761 <property name="checkable"> 759 <property name="checkable">
762 <bool>true</bool> 760 <bool>true</bool>
@@ -970,7 +968,7 @@ QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/time_ @@ -970,7 +968,7 @@ QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/time_
970 </property> 968 </property>
971 <property name="styleSheet"> 969 <property name="styleSheet">
972 <string notr="true">QPushButton { background-image: url(:/images/manual_button/cooldown.png); } 970 <string notr="true">QPushButton { background-image: url(:/images/manual_button/cooldown.png); }
973 -QPushButton:pressed { background-image: url(:/images/manual_button/cooldown_ov.png); }</string> 971 +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/cooldown_ov.png); }</string>
974 </property> 972 </property>
975 <property name="checkable"> 973 <property name="checkable">
976 <bool>true</bool> 974 <bool>true</bool>
@@ -990,7 +988,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/cooldown_ov.p @@ -990,7 +988,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/cooldown_ov.p
990 </property> 988 </property>
991 <property name="styleSheet"> 989 <property name="styleSheet">
992 <string notr="true">QPushButton { background-image: url(:/images/manual_button/next.png); } 990 <string notr="true">QPushButton { background-image: url(:/images/manual_button/next.png); }
993 -QPushButton:pressed { background-image: url(:/images/manual_button/next_ov.png); }</string> 991 +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/next_ov.png); }</string>
994 </property> 992 </property>
995 <property name="style" stdset="0"> 993 <property name="style" stdset="0">
996 <string>tool</string> 994 <string>tool</string>
@@ -1007,7 +1005,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/next_ov.png); @@ -1007,7 +1005,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/next_ov.png);
1007 </property> 1005 </property>
1008 <property name="styleSheet"> 1006 <property name="styleSheet">
1009 <string notr="true">QPushButton { background-image: url(:/images/manual_button/favorites.png); } 1007 <string notr="true">QPushButton { background-image: url(:/images/manual_button/favorites.png); }
1010 -QPushButton:pressed { background-image: url(:/images/manual_button/favorites_ov.png); }</string> 1008 +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/favorites_ov.png); }</string>
1011 </property> 1009 </property>
1012 <property name="style" stdset="0"> 1010 <property name="style" stdset="0">
1013 <string>tool</string> 1011 <string>tool</string>
@@ -1024,7 +1022,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/favorites_ov. @@ -1024,7 +1022,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/favorites_ov.
1024 </property> 1022 </property>
1025 <property name="styleSheet"> 1023 <property name="styleSheet">
1026 <string notr="true">QPushButton { background-image: url(:/images/manual_button/reserve.png); } 1024 <string notr="true">QPushButton { background-image: url(:/images/manual_button/reserve.png); }
1027 -QPushButton:pressed { background-image: url(:/images/manual_button/reserve_ov.png); }</string> 1025 +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/reserve_ov.png); }</string>
1028 </property> 1026 </property>
1029 <property name="style" stdset="0"> 1027 <property name="style" stdset="0">
1030 <string>tool</string> 1028 <string>tool</string>
@@ -1083,7 +1081,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/reserve_ov.pn @@ -1083,7 +1081,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/reserve_ov.pn
1083 </property> 1081 </property>
1084 <property name="styleSheet"> 1082 <property name="styleSheet">
1085 <string notr="true">QPushButton, QPushButton:checked:pressed { background-image: url(:/images/manual_button/damper_close.png); } 1083 <string notr="true">QPushButton, QPushButton:checked:pressed { background-image: url(:/images/manual_button/damper_close.png); }
1086 -QPushButton:checked, QPushButton:pressed { background-image: url(:/images/manual_button/damper_open.png); }</string> 1084 +QPushButton:checked, QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/damper_open.png); }</string>
1087 </property> 1085 </property>
1088 <property name="checkable"> 1086 <property name="checkable">
1089 <bool>true</bool> 1087 <bool>true</bool>
@@ -1103,7 +1101,7 @@ QPushButton:checked, QPushButton:pressed { background-image: url(:/images/manual @@ -1103,7 +1101,7 @@ QPushButton:checked, QPushButton:pressed { background-image: url(:/images/manual
1103 </property> 1101 </property>
1104 <property name="styleSheet"> 1102 <property name="styleSheet">
1105 <string notr="true">QPushButton { background-image: url(:/images/manual_button/repeat.png); } 1103 <string notr="true">QPushButton { background-image: url(:/images/manual_button/repeat.png); }
1106 -QPushButton:pressed, QPushButton:checked { background-image: url(:/images/manual_button/repeat_ov.png); }</string> 1104 +QPushButton:pressed, QPushButton:checked, QPushButton:focus { background-image: url(:/images/manual_button/repeat_ov.png); }</string>
1107 </property> 1105 </property>
1108 <property name="checkable"> 1106 <property name="checkable">
1109 <bool>true</bool> 1107 <bool>true</bool>
@@ -1123,7 +1121,7 @@ QPushButton:pressed, QPushButton:checked { background-image: url(:/images/manual @@ -1123,7 +1121,7 @@ QPushButton:pressed, QPushButton:checked { background-image: url(:/images/manual
1123 </property> 1121 </property>
1124 <property name="styleSheet"> 1122 <property name="styleSheet">
1125 <string notr="true">QPushButton { background-image: url(:/images/manual_button/preheat.png); } 1123 <string notr="true">QPushButton { background-image: url(:/images/manual_button/preheat.png); }
1126 -QPushButton:pressed { background-image: url(:/images/manual_button/preheat_ov.png); }</string> 1124 +QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/preheat_ov.png); }</string>
1127 </property> 1125 </property>
1128 <property name="style" stdset="0"> 1126 <property name="style" stdset="0">
1129 <string>tool</string> 1127 <string>tool</string>
@@ -1140,7 +1138,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/preheat_ov.pn @@ -1140,7 +1138,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/preheat_ov.pn
1140 </property> 1138 </property>
1141 <property name="styleSheet"> 1139 <property name="styleSheet">
1142 <string notr="true">QPushButton, QPushButton:checked:pressed { background-image: url(:/images/manual_button/side_nozzle_close.png); } 1140 <string notr="true">QPushButton, QPushButton:checked:pressed { background-image: url(:/images/manual_button/side_nozzle_close.png); }
1143 -QPushButton:checked, QPushButton:pressed { background-image: url(:/images/manual_button/side_nozzle_open.png); }</string> 1141 +QPushButton:checked, QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/side_nozzle_open.png); }</string>
1144 </property> 1142 </property>
1145 <property name="checkable"> 1143 <property name="checkable">
1146 <bool>true</bool> 1144 <bool>true</bool>
app/gui/oven_control/slider.cpp
@@ -118,8 +118,6 @@ bool Slider::isSliderMoved() @@ -118,8 +118,6 @@ bool Slider::isSliderMoved()
118 void Slider::focusInEvent(QFocusEvent */*event*/) 118 void Slider::focusInEvent(QFocusEvent */*event*/)
119 { 119 {
120 focused = true; 120 focused = true;
121 -  
122 - update();  
123 } 121 }
124 122
125 void Slider::focusOutEvent(QFocusEvent *event) 123 void Slider::focusOutEvent(QFocusEvent *event)
@@ -134,8 +132,6 @@ void Slider::focusOutEvent(QFocusEvent *event) @@ -134,8 +132,6 @@ void Slider::focusOutEvent(QFocusEvent *event)
134 value_ = sliderPosition_; 132 value_ = sliderPosition_;
135 emit valueChanged(value_); 133 emit valueChanged(value_);
136 } 134 }
137 -  
138 - update();  
139 } 135 }
140 136
141 void Slider::keyPressEvent(QKeyEvent *event) 137 void Slider::keyPressEvent(QKeyEvent *event)
@@ -236,16 +232,6 @@ void Slider::paintEvent(QPaintEvent */*event*/) @@ -236,16 +232,6 @@ void Slider::paintEvent(QPaintEvent */*event*/)
236 QPoint handlePoint(subPoint.x() + subLength - handle.width() / 2, (height() - handle.height()) / 2); 232 QPoint handlePoint(subPoint.x() + subLength - handle.width() / 2, (height() - handle.height()) / 2);
237 painter.drawPixmap(handlePoint, handle); 233 painter.drawPixmap(handlePoint, handle);
238 } 234 }
239 -  
240 - if (focused)  
241 - {  
242 - QPen borderPen;  
243 - borderPen.setColor(QColor(0, 150, 255, 204));  
244 - borderPen.setWidth(1);  
245 - painter.setPen(borderPen);  
246 - painter.setBrush(Qt::NoBrush);  
247 - painter.drawRect(QRect(0, 0, width() - 1, height() - 1));  
248 - }  
249 } 235 }
250 236
251 void Slider::resizeEvent(QResizeEvent */*event*/) 237 void Slider::resizeEvent(QResizeEvent */*event*/)