에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit d804d82b41ca51ce8f17755e8c33eaee76612e8f

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

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

Showing 4 changed files with 50 additions and 77 deletions   Show diff stats
app/gui/oven_control/coretempsettingpopup.ui
  Diff comments   View file @d804d82
... ... @@ -39,11 +39,6 @@ padding-top: 130px;
39 39 border: none;
40 40 color: white;
41 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 44 QSlider::groove {
... ... @@ -164,7 +159,7 @@ height: 33px;
164 159 </property>
165 160 <property name="styleSheet">
166 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 163 </property>
169 164 <property name="text">
170 165 <string>확인/적용하기</string>
... ... @@ -452,7 +447,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); }
452 447 <property name="styleSheet">
453 448 <string notr="true">QPushButton { image: url(:/images/slider_icon/core_temp_enabled.png); }
454 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 451 </property>
457 452 <property name="style" stdset="0">
458 453 <string>icon</string>
... ... @@ -672,7 +667,7 @@ QPushButton:pressed { image: url(:/images/slider_icon/core_temp_ov.png); }&lt;/stri
672 667 </property>
673 668 <property name="styleSheet">
674 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 671 </property>
677 672 <property name="text">
678 673 <string>이전으로</string>
... ...
app/gui/oven_control/mainwindow.ui
  Diff comments   View file @d804d82
... ... @@ -23,19 +23,20 @@
23 23 <string notr="true">#centralwidget { background-image: url(:/images/background/main.png); }
24 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 28 QPushButton[style=&quot;mode&quot;] {
29 29 background-repeat: no-repeat;
30 30 background-position: center;
31 31 background-clip: border;
32 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 38 color: white;
37 39 font-size: 40px;
38   -outline: none;
39 40 }
40 41  
41 42 QPushButton[style=&quot;type&quot;] {
... ... @@ -44,11 +45,10 @@ background-position: center;
44 45 background-clip: border;
45 46 background-origin: border;
46 47  
47   -padding-top: 165px;
48   -border: none;
  48 +border-top: 165px;
  49 +border-style: hidden;
49 50 color: white;
50 51 font-size: 30px;
51   -outline: none;
52 52 }
53 53  
54 54 QPushButton[style=&quot;function&quot;] {
... ... @@ -61,13 +61,7 @@ padding-top: 206px;
61 61 border-style: hidden;
62 62 color: white;
63 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 65 </property>
72 66 <widget class="QWidget" name="centralwidget">
73 67 <property name="sizePolicy">
... ... @@ -120,7 +114,7 @@ border: 1px solid rgba(0, 150, 255, 80%);
120 114 </property>
121 115 <property name="styleSheet">
122 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 118 </property>
125 119 <property name="text">
126 120 <string/>
... ... @@ -149,7 +143,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); }&lt;/s
149 143 </property>
150 144 <property name="styleSheet">
151 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 147 </property>
154 148 <property name="text">
155 149 <string/>
... ... @@ -173,7 +167,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); }&lt;/str
173 167 </property>
174 168 <property name="styleSheet">
175 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 171 </property>
178 172 <property name="text">
179 173 <string>다중요리</string>
... ... @@ -199,7 +193,7 @@ QPushButton:pressed { background-image: url(:/images/main_button/multi_ov.png);
199 193 </property>
200 194 <property name="styleSheet">
201 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 197 </property>
204 198 <property name="text">
205 199 <string>프로그래밍모드</string>
... ... @@ -225,7 +219,7 @@ QPushButton:pressed { background-image: url(:/images/main_button/custom_ov.png);
225 219 </property>
226 220 <property name="styleSheet">
227 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 223 </property>
230 224 <property name="text">
231 225 <string>세척모드</string>
... ... @@ -323,7 +317,7 @@ QPushButton:pressed { background-image: url(:/images/main_button/wash_ov.png); }
323 317 </property>
324 318 <property name="styleSheet">
325 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 321 </property>
328 322 <property name="text">
329 323 <string>건열</string>
... ... @@ -343,7 +337,7 @@ QPushButton:pressed { background-image: url(:/images/cook_mode/big_dryheat_ov.pn
343 337 </property>
344 338 <property name="styleSheet">
345 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 341 </property>
348 342 <property name="text">
349 343 <string>콤비</string>
... ... @@ -363,7 +357,7 @@ QPushButton:pressed { background-image: url(:/images/cook_mode/big_combi_ov.png)
363 357 </property>
364 358 <property name="styleSheet">
365 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 361 </property>
368 362 <property name="text">
369 363 <string>스팀</string>
... ... @@ -389,7 +383,7 @@ QPushButton:pressed { background-image: url(:/images/cook_mode/big_steam_ov.png)
389 383 </property>
390 384 <property name="styleSheet">
391 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 387 </property>
394 388 <property name="text">
395 389 <string>육류</string>
... ... @@ -415,7 +409,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/meat_ov.png); }&lt;/
415 409 </property>
416 410 <property name="styleSheet">
417 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 413 </property>
420 414 <property name="text">
421 415 <string>디저트류</string>
... ... @@ -441,7 +435,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/desert_ov.png); }
441 435 </property>
442 436 <property name="styleSheet">
443 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 439 </property>
446 440 <property name="text">
447 441 <string>기타요리</string>
... ... @@ -467,7 +461,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/etc_ov.png); }&lt;/s
467 461 </property>
468 462 <property name="styleSheet">
469 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 465 </property>
472 466 <property name="text">
473 467 <string>채소및곡류</string>
... ... @@ -493,7 +487,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/vegetable_ov.png)
493 487 </property>
494 488 <property name="styleSheet">
495 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 491 </property>
498 492 <property name="text">
499 493 <string>가금류</string>
... ... @@ -519,7 +513,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/poultry_ov.png);
519 513 </property>
520 514 <property name="styleSheet">
521 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 517 </property>
524 518 <property name="text">
525 519 <string>생선류</string>
... ... @@ -545,7 +539,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/fish_ov.png); }&lt;/
545 539 </property>
546 540 <property name="styleSheet">
547 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 543 </property>
550 544 <property name="text">
551 545 <string>제과제빵류</string>
... ... @@ -571,7 +565,7 @@ QPushButton:pressed { background-image: url(:/images/cook_type/bread_ov.png); }&lt;
571 565 </property>
572 566 <property name="styleSheet">
573 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 569 </property>
576 570 <property name="text">
577 571 <string>부가기능</string>
... ...
app/gui/oven_control/manualcookwindow.ui
  Diff comments   View file @d804d82
... ... @@ -19,8 +19,10 @@ background-repeat: no-repeat;
19 19 background-position: center;
20 20 background-clip: border;
21 21 background-origin: border;
  22 +margin-bottom: 50px;
22 23  
23   -padding-top: 200px;
  24 +border-top: 200px;
  25 +border-bottom: -50px;
24 26 border-style: hidden;
25 27 color: #7B7B7B;
26 28 font-size: 40px;
... ... @@ -45,10 +47,6 @@ background-repeat: no-repeat;
45 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 50 QSlider::groove {
53 51 background-image: url(:/images/slider/groove_ticks.png);
54 52 background-repeat: no-repeat;
... ... @@ -142,7 +140,7 @@ height: 33px;
142 140 <property name="styleSheet">
143 141 <string notr="true">QPushButton { background-image: url(:/images/cook_mode/big_combi_hide.png); }
144 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 144 </property>
147 145 <property name="text">
148 146 <string>콤비</string>
... ... @@ -169,7 +167,7 @@ QPushButton:pressed { background-image: url(:/images/cook_mode/big_combi_ov.png)
169 167 <property name="styleSheet">
170 168 <string notr="true">QPushButton { background-image: url(:/images/cook_mode/big_steam_hide.png); }
171 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 171 </property>
174 172 <property name="text">
175 173 <string>스팀</string>
... ... @@ -196,7 +194,7 @@ QPushButton:pressed { background-image: url(:/images/cook_mode/big_steam_ov.png)
196 194 <property name="styleSheet">
197 195 <string notr="true">QPushButton { background-image: url(:/images/cook_mode/big_dryheat_hide.png); }
198 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 198 </property>
201 199 <property name="text">
202 200 <string>건열</string>
... ... @@ -231,7 +229,7 @@ QPushButton:pressed { background-image: url(:/images/cook_mode/big_dryheat_ov.pn
231 229 </property>
232 230 <property name="styleSheet">
233 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 233 </property>
236 234 <property name="text">
237 235 <string/>
... ... @@ -248,7 +246,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); }&lt;/str
248 246 </property>
249 247 <property name="styleSheet">
250 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 250 </property>
253 251 <property name="text">
254 252 <string/>
... ... @@ -265,7 +263,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); }&lt;/s
265 263 </property>
266 264 <property name="styleSheet">
267 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 267 </property>
270 268 <property name="text">
271 269 <string/>
... ... @@ -282,7 +280,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/favorites_manual_ov.
282 280 </property>
283 281 <property name="styleSheet">
284 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 284 </property>
287 285 <property name="text">
288 286 <string/>
... ... @@ -299,7 +297,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/wash_ov.png); }&lt;/str
299 297 </property>
300 298 <property name="styleSheet">
301 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 301 </property>
304 302 <property name="text">
305 303 <string/>
... ... @@ -505,7 +503,7 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); }&lt;/str
505 503 </property>
506 504 <property name="styleSheet">
507 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 507 </property>
510 508 <property name="checkable">
511 509 <bool>true</bool>
... ... @@ -715,7 +713,7 @@ QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/temp_
715 713 </property>
716 714 <property name="styleSheet">
717 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 717 </property>
720 718 <property name="checkable">
721 719 <bool>true</bool>
... ... @@ -736,7 +734,7 @@ QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/humid
736 734 <property name="styleSheet">
737 735 <string notr="true">QPushButton { image: url(:/images/slider_icon/core_temp.png); }
738 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 738 </property>
741 739 <property name="checkable">
742 740 <bool>true</bool>
... ... @@ -756,7 +754,7 @@ QPushButton:pressed { image: url(:/images/slider_icon/core_temp_ov.png); }&lt;/stri
756 754 </property>
757 755 <property name="styleSheet">
758 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 758 </property>
761 759 <property name="checkable">
762 760 <bool>true</bool>
... ... @@ -970,7 +968,7 @@ QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/time_
970 968 </property>
971 969 <property name="styleSheet">
972 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 972 </property>
975 973 <property name="checkable">
976 974 <bool>true</bool>
... ... @@ -990,7 +988,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/cooldown_ov.p
990 988 </property>
991 989 <property name="styleSheet">
992 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 992 </property>
995 993 <property name="style" stdset="0">
996 994 <string>tool</string>
... ... @@ -1007,7 +1005,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/next_ov.png);
1007 1005 </property>
1008 1006 <property name="styleSheet">
1009 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 1009 </property>
1012 1010 <property name="style" stdset="0">
1013 1011 <string>tool</string>
... ... @@ -1024,7 +1022,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/favorites_ov.
1024 1022 </property>
1025 1023 <property name="styleSheet">
1026 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 1026 </property>
1029 1027 <property name="style" stdset="0">
1030 1028 <string>tool</string>
... ... @@ -1083,7 +1081,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/reserve_ov.pn
1083 1081 </property>
1084 1082 <property name="styleSheet">
1085 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 1085 </property>
1088 1086 <property name="checkable">
1089 1087 <bool>true</bool>
... ... @@ -1103,7 +1101,7 @@ QPushButton:checked, QPushButton:pressed { background-image: url(:/images/manual
1103 1101 </property>
1104 1102 <property name="styleSheet">
1105 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 1105 </property>
1108 1106 <property name="checkable">
1109 1107 <bool>true</bool>
... ... @@ -1123,7 +1121,7 @@ QPushButton:pressed, QPushButton:checked { background-image: url(:/images/manual
1123 1121 </property>
1124 1122 <property name="styleSheet">
1125 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 1125 </property>
1128 1126 <property name="style" stdset="0">
1129 1127 <string>tool</string>
... ... @@ -1140,7 +1138,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/preheat_ov.pn
1140 1138 </property>
1141 1139 <property name="styleSheet">
1142 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 1142 </property>
1145 1143 <property name="checkable">
1146 1144 <bool>true</bool>
... ...
app/gui/oven_control/slider.cpp
  Diff comments   View file @d804d82
... ... @@ -118,8 +118,6 @@ bool Slider::isSliderMoved()
118 118 void Slider::focusInEvent(QFocusEvent */*event*/)
119 119 {
120 120 focused = true;
121   -
122   - update();
123 121 }
124 122  
125 123 void Slider::focusOutEvent(QFocusEvent *event)
... ... @@ -134,8 +132,6 @@ void Slider::focusOutEvent(QFocusEvent *event)
134 132 value_ = sliderPosition_;
135 133 emit valueChanged(value_);
136 134 }
137   -
138   - update();
139 135 }
140 136  
141 137 void Slider::keyPressEvent(QKeyEvent *event)
... ... @@ -236,16 +232,6 @@ void Slider::paintEvent(QPaintEvent */*event*/)
236 232 QPoint handlePoint(subPoint.x() + subLength - handle.width() / 2, (height() - handle.height()) / 2);
237 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 237 void Slider::resizeEvent(QResizeEvent */*event*/)
... ...