에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 9c1ea4a139c452961a92288b131450df93618bb2

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

포커스 디자인 변경 일부 적용 

- 대기 화면
- 수동 요리 화면
Showing 5 changed files with 127 additions and 83 deletions   Show diff stats
app/gui/oven_control/coretempsettingpopup.ui
  Diff comments   View file @9c1ea4a
... ... @@ -35,10 +35,15 @@ background-position: center;
35 35 background-clip: border;
36 36 background-origin: border;
37 37  
38   -border-top: 130px;
39   -border-style: hidden;
  38 +padding-top: 130px;
  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%);
42 47 }
43 48  
44 49 QSlider::groove {
... ... @@ -159,7 +164,7 @@ height: 33px;
159 164 </property>
160 165 <property name="styleSheet">
161 166 <string notr="true">QPushButton { background-image: url(:/images/manual_button/ok.png); }
162   -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/ok_ov.png); }</string>
  167 +QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); }</string>
163 168 </property>
164 169 <property name="text">
165 170 <string>확인/적용하기</string>
... ... @@ -447,7 +452,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b
447 452 <property name="styleSheet">
448 453 <string notr="true">QPushButton { image: url(:/images/slider_icon/core_temp_enabled.png); }
449 454 QPushButton:checked { image: url(:/images/slider_icon/core_temp_ov.png); }
450   -QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/core_temp_ov.png); }</string>
  455 +QPushButton:pressed { image: url(:/images/slider_icon/core_temp_ov.png); }</string>
451 456 </property>
452 457 <property name="style" stdset="0">
453 458 <string>icon</string>
... ... @@ -667,7 +672,7 @@ QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/core_te
667 672 </property>
668 673 <property name="styleSheet">
669 674 <string notr="true">QPushButton { background-image: url(:/images/manual_button/back.png); }
670   -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/back_ov.png); }</string>
  675 +QPushButton:pressed { background-image: url(:/images/manual_button/back_ov.png); }</string>
671 676 </property>
672 677 <property name="text">
673 678 <string>이전으로</string>
... ... @@ -1009,9 +1014,9 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b
1009 1014 <property name="geometry">
1010 1015 <rect>
1011 1016 <x>185</x>
1012   - <y>954</y>
  1017 + <y>994</y>
1013 1018 <width>666</width>
1014   - <height>140</height>
  1019 + <height>60</height>
1015 1020 </rect>
1016 1021 </property>
1017 1022 <property name="focusPolicy">
... ...
app/gui/oven_control/mainwindow.ui
  Diff comments   View file @9c1ea4a
... ... @@ -23,20 +23,19 @@
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: none; }
  26 +QWidget { outline: 1px solid rgba(0, 150, 255, 80%); }
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;
34 33  
35   -border-top: 200px;
36   -border-bottom: -50px;
37   -border-style: hidden;
  34 +padding-top: 200px;
  35 +border: none;
38 36 color: white;
39 37 font-size: 40px;
  38 +outline: none;
40 39 }
41 40  
42 41 QPushButton[style=&quot;type&quot;] {
... ... @@ -45,10 +44,11 @@ background-position: center;
45 44 background-clip: border;
46 45 background-origin: border;
47 46  
48   -border-top: 165px;
49   -border-style: hidden;
  47 +padding-top: 165px;
  48 +border: none;
50 49 color: white;
51 50 font-size: 30px;
  51 +outline: none;
52 52 }
53 53  
54 54 QPushButton[style=&quot;function&quot;] {
... ... @@ -57,11 +57,17 @@ background-position: center;
57 57 background-clip: border;
58 58 background-origin: border;
59 59  
60   -border-top: 206px;
  60 +padding-top: 206px;
61 61 border-style: hidden;
62 62 color: white;
63 63 font-size: 30px;
64   -}</string>
  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>
65 71 </property>
66 72 <widget class="QWidget" name="centralwidget">
67 73 <property name="sizePolicy">
... ... @@ -114,7 +120,7 @@ font-size: 30px;
114 120 </property>
115 121 <property name="styleSheet">
116 122 <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/config.png); }
117   -QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/config_ov.png); }</string>
  123 +QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); }</string>
118 124 </property>
119 125 <property name="text">
120 126 <string/>
... ... @@ -143,7 +149,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c
143 149 </property>
144 150 <property name="styleSheet">
145 151 <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/help.png); }
146   -QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/help_ov.png); }</string>
  152 +QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); }</string>
147 153 </property>
148 154 <property name="text">
149 155 <string/>
... ... @@ -167,7 +173,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h
167 173 </property>
168 174 <property name="styleSheet">
169 175 <string notr="true">QPushButton { background-image: url(:/images/main_button/multi.png); }
170   -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_button/multi_ov.png); }</string>
  176 +QPushButton:pressed { background-image: url(:/images/main_button/multi_ov.png); }</string>
171 177 </property>
172 178 <property name="text">
173 179 <string>다중요리</string>
... ... @@ -193,7 +199,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_but
193 199 </property>
194 200 <property name="styleSheet">
195 201 <string notr="true">QPushButton { background-image: url(:/images/main_button/custom.png); }
196   -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_button/custom_ov.png); }</string>
  202 +QPushButton:pressed { background-image: url(:/images/main_button/custom_ov.png); }</string>
197 203 </property>
198 204 <property name="text">
199 205 <string>프로그래밍모드</string>
... ... @@ -219,7 +225,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_but
219 225 </property>
220 226 <property name="styleSheet">
221 227 <string notr="true">QPushButton { background-image: url(:/images/main_button/wash.png); }
222   -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_button/wash_ov.png); }</string>
  228 +QPushButton:pressed { background-image: url(:/images/main_button/wash_ov.png); }</string>
223 229 </property>
224 230 <property name="text">
225 231 <string>세척모드</string>
... ... @@ -317,7 +323,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_but
317 323 </property>
318 324 <property name="styleSheet">
319 325 <string notr="true">QPushButton { background-image: url(:/images/cook_mode/big_dryheat.png); }
320   -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_dryheat_ov.png); }</string>
  326 +QPushButton:pressed { background-image: url(:/images/cook_mode/big_dryheat_ov.png); }</string>
321 327 </property>
322 328 <property name="text">
323 329 <string>건열</string>
... ... @@ -337,7 +343,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod
337 343 </property>
338 344 <property name="styleSheet">
339 345 <string notr="true">QPushButton { background-image: url(:/images/cook_mode/big_combi.png); }
340   -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_combi_ov.png); }</string>
  346 +QPushButton:pressed { background-image: url(:/images/cook_mode/big_combi_ov.png); }</string>
341 347 </property>
342 348 <property name="text">
343 349 <string>콤비</string>
... ... @@ -357,7 +363,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod
357 363 </property>
358 364 <property name="styleSheet">
359 365 <string notr="true">QPushButton { background-image: url(:/images/cook_mode/big_steam.png); }
360   -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_steam_ov.png); }</string>
  366 +QPushButton:pressed { background-image: url(:/images/cook_mode/big_steam_ov.png); }</string>
361 367 </property>
362 368 <property name="text">
363 369 <string>스팀</string>
... ... @@ -369,10 +375,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod
369 375 <widget class="QPushButton" name="meatButton">
370 376 <property name="geometry">
371 377 <rect>
372   - <x>225</x>
  378 + <x>226</x>
373 379 <y>720</y>
374   - <width>225</width>
375   - <height>222</height>
  380 + <width>224</width>
  381 + <height>221</height>
376 382 </rect>
377 383 </property>
378 384 <property name="sizePolicy">
... ... @@ -383,7 +389,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod
383 389 </property>
384 390 <property name="styleSheet">
385 391 <string notr="true">QPushButton { background-image: url(:/images/cook_type/meat.png); }
386   -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/meat_ov.png); }</string>
  392 +QPushButton:pressed { background-image: url(:/images/cook_type/meat_ov.png); }</string>
387 393 </property>
388 394 <property name="text">
389 395 <string>육류</string>
... ... @@ -395,10 +401,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
395 401 <widget class="QPushButton" name="dessertButton">
396 402 <property name="geometry">
397 403 <rect>
398   - <x>675</x>
  404 + <x>676</x>
399 405 <y>720</y>
400   - <width>225</width>
401   - <height>222</height>
  406 + <width>224</width>
  407 + <height>221</height>
402 408 </rect>
403 409 </property>
404 410 <property name="sizePolicy">
... ... @@ -409,7 +415,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
409 415 </property>
410 416 <property name="styleSheet">
411 417 <string notr="true">QPushButton { background-image: url(:/images/cook_type/desert.png); }
412   -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/desert_ov.png); }</string>
  418 +QPushButton:pressed { background-image: url(:/images/cook_type/desert_ov.png); }</string>
413 419 </property>
414 420 <property name="text">
415 421 <string>디저트류</string>
... ... @@ -421,10 +427,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
421 427 <widget class="QPushButton" name="etcButton">
422 428 <property name="geometry">
423 429 <rect>
424   - <x>450</x>
425   - <y>942</y>
426   - <width>225</width>
427   - <height>222</height>
  430 + <x>451</x>
  431 + <y>943</y>
  432 + <width>224</width>
  433 + <height>221</height>
428 434 </rect>
429 435 </property>
430 436 <property name="sizePolicy">
... ... @@ -435,7 +441,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
435 441 </property>
436 442 <property name="styleSheet">
437 443 <string notr="true">QPushButton { background-image: url(:/images/cook_type/etc.png); }
438   -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/etc_ov.png); }</string>
  444 +QPushButton:pressed { background-image: url(:/images/cook_type/etc_ov.png); }</string>
439 445 </property>
440 446 <property name="text">
441 447 <string>기타요리</string>
... ... @@ -448,9 +454,9 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
448 454 <property name="geometry">
449 455 <rect>
450 456 <x>0</x>
451   - <y>942</y>
  457 + <y>943</y>
452 458 <width>225</width>
453   - <height>222</height>
  459 + <height>221</height>
454 460 </rect>
455 461 </property>
456 462 <property name="sizePolicy">
... ... @@ -461,7 +467,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
461 467 </property>
462 468 <property name="styleSheet">
463 469 <string notr="true">QPushButton { background-image: url(:/images/cook_type/vegetable.png); }
464   -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/vegetable_ov.png); }</string>
  470 +QPushButton:pressed { background-image: url(:/images/cook_type/vegetable_ov.png); }</string>
465 471 </property>
466 472 <property name="text">
467 473 <string>채소및곡류</string>
... ... @@ -476,7 +482,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
476 482 <x>0</x>
477 483 <y>720</y>
478 484 <width>225</width>
479   - <height>222</height>
  485 + <height>221</height>
480 486 </rect>
481 487 </property>
482 488 <property name="sizePolicy">
... ... @@ -487,7 +493,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
487 493 </property>
488 494 <property name="styleSheet">
489 495 <string notr="true">QPushButton { background-image: url(:/images/cook_type/poultry.png); }
490   -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/poultry_ov.png); }</string>
  496 +QPushButton:pressed { background-image: url(:/images/cook_type/poultry_ov.png); }</string>
491 497 </property>
492 498 <property name="text">
493 499 <string>가금류</string>
... ... @@ -499,10 +505,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
499 505 <widget class="QPushButton" name="fishButton">
500 506 <property name="geometry">
501 507 <rect>
502   - <x>450</x>
  508 + <x>451</x>
503 509 <y>720</y>
504   - <width>225</width>
505   - <height>222</height>
  510 + <width>224</width>
  511 + <height>221</height>
506 512 </rect>
507 513 </property>
508 514 <property name="sizePolicy">
... ... @@ -513,7 +519,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
513 519 </property>
514 520 <property name="styleSheet">
515 521 <string notr="true">QPushButton { background-image: url(:/images/cook_type/fish.png); }
516   -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/fish_ov.png); }</string>
  522 +QPushButton:pressed { background-image: url(:/images/cook_type/fish_ov.png); }</string>
517 523 </property>
518 524 <property name="text">
519 525 <string>생선류</string>
... ... @@ -525,10 +531,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
525 531 <widget class="QPushButton" name="breadButton">
526 532 <property name="geometry">
527 533 <rect>
528   - <x>225</x>
529   - <y>942</y>
530   - <width>225</width>
531   - <height>222</height>
  534 + <x>226</x>
  535 + <y>943</y>
  536 + <width>224</width>
  537 + <height>221</height>
532 538 </rect>
533 539 </property>
534 540 <property name="sizePolicy">
... ... @@ -539,7 +545,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
539 545 </property>
540 546 <property name="styleSheet">
541 547 <string notr="true">QPushButton { background-image: url(:/images/cook_type/bread.png); }
542   -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/bread_ov.png); }</string>
  548 +QPushButton:pressed { background-image: url(:/images/cook_type/bread_ov.png); }</string>
543 549 </property>
544 550 <property name="text">
545 551 <string>제과제빵류</string>
... ... @@ -551,10 +557,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
551 557 <widget class="QPushButton" name="primeButton">
552 558 <property name="geometry">
553 559 <rect>
554   - <x>675</x>
555   - <y>942</y>
556   - <width>225</width>
557   - <height>222</height>
  560 + <x>676</x>
  561 + <y>943</y>
  562 + <width>224</width>
  563 + <height>221</height>
558 564 </rect>
559 565 </property>
560 566 <property name="sizePolicy">
... ... @@ -565,7 +571,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
565 571 </property>
566 572 <property name="styleSheet">
567 573 <string notr="true">QPushButton { background-image: url(:/images/cook_type/additional.png); }
568   -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/additional_ov.png); }</string>
  574 +QPushButton:pressed { background-image: url(:/images/cook_type/additional_ov.png); }</string>
569 575 </property>
570 576 <property name="text">
571 577 <string>부가기능</string>
... ...
app/gui/oven_control/manualcookwindow.cpp
  Diff comments   View file @9c1ea4a
... ... @@ -277,6 +277,11 @@ void ManualCookWindow::updateView()
277 277 break;
278 278 }
279 279  
  280 + QWidget *focused = focusWidget();
  281 + ui->humidityButton->setChecked(focused == ui->humiditySlider);
  282 + ui->tempButton->setChecked(focused == ui->tempSlider);
  283 + ui->timeButton->setChecked(focused == ui->timeSlider);
  284 +
280 285 int humidity;
281 286 if (showCurrentHumidity_)
282 287 humidity = oven->currentHumidity();
... ...
app/gui/oven_control/manualcookwindow.ui
  Diff comments   View file @9c1ea4a
... ... @@ -19,10 +19,8 @@ background-repeat: no-repeat;
19 19 background-position: center;
20 20 background-clip: border;
21 21 background-origin: border;
22   -margin-bottom: 50px;
23 22  
24   -border-top: 200px;
25   -border-bottom: -50px;
  23 +padding-top: 200px;
26 24 border-style: hidden;
27 25 color: #7B7B7B;
28 26 font-size: 40px;
... ... @@ -47,6 +45,10 @@ background-repeat: no-repeat;
47 45 background-position: center;
48 46 }
49 47  
  48 +QPushButton[style=&quot;mode&quot;]:focus {
  49 +border: 1px solid rgba(0, 150, 255, 80%);
  50 +}
  51 +
50 52 QSlider::groove {
51 53 background-image: url(:/images/slider/groove_ticks.png);
52 54 background-repeat: no-repeat;
... ... @@ -140,7 +142,7 @@ height: 33px;
140 142 <property name="styleSheet">
141 143 <string notr="true">QPushButton { background-image: url(:/images/cook_mode/big_combi_hide.png); }
142 144 QPushButton:checked { background-image: url(:/images/cook_mode/big_combi.png); }
143   -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_combi_ov.png); }</string>
  145 +QPushButton:pressed { background-image: url(:/images/cook_mode/big_combi_ov.png); }</string>
144 146 </property>
145 147 <property name="text">
146 148 <string>콤비</string>
... ... @@ -167,7 +169,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod
167 169 <property name="styleSheet">
168 170 <string notr="true">QPushButton { background-image: url(:/images/cook_mode/big_steam_hide.png); }
169 171 QPushButton:checked { background-image: url(:/images/cook_mode/big_steam.png); }
170   -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_steam_ov.png); }</string>
  172 +QPushButton:pressed { background-image: url(:/images/cook_mode/big_steam_ov.png); }</string>
171 173 </property>
172 174 <property name="text">
173 175 <string>스팀</string>
... ... @@ -194,7 +196,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod
194 196 <property name="styleSheet">
195 197 <string notr="true">QPushButton { background-image: url(:/images/cook_mode/big_dryheat_hide.png); }
196 198 QPushButton:checked { background-image: url(:/images/cook_mode/big_dryheat.png); }
197   -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mode/big_dryheat_ov.png); }</string>
  199 +QPushButton:pressed { background-image: url(:/images/cook_mode/big_dryheat_ov.png); }</string>
198 200 </property>
199 201 <property name="text">
200 202 <string>건열</string>
... ... @@ -229,7 +231,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod
229 231 </property>
230 232 <property name="styleSheet">
231 233 <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/back.png); }
232   -QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/back_ov.png); }</string>
  234 +QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); }</string>
233 235 </property>
234 236 <property name="text">
235 237 <string/>
... ... @@ -246,7 +248,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/b
246 248 </property>
247 249 <property name="styleSheet">
248 250 <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/config.png); }
249   -QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/config_ov.png); }</string>
  251 +QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); }</string>
250 252 </property>
251 253 <property name="text">
252 254 <string/>
... ... @@ -263,7 +265,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c
263 265 </property>
264 266 <property name="styleSheet">
265 267 <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/favorites_manual.png); }
266   -QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/favorites_manual_ov.png); }</string>
  268 +QPushButton:pressed { border-image: url(:/images/bottom_bar/favorites_manual_ov.png); }</string>
267 269 </property>
268 270 <property name="text">
269 271 <string/>
... ... @@ -280,7 +282,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/f
280 282 </property>
281 283 <property name="styleSheet">
282 284 <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/wash.png); }
283   -QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/wash_ov.png); }</string>
  285 +QPushButton:pressed { border-image: url(:/images/bottom_bar/wash_ov.png); }</string>
284 286 </property>
285 287 <property name="text">
286 288 <string/>
... ... @@ -297,7 +299,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/w
297 299 </property>
298 300 <property name="styleSheet">
299 301 <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/help.png); }
300   -QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/help_ov.png); }</string>
  302 +QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); }</string>
301 303 </property>
302 304 <property name="text">
303 305 <string/>
... ... @@ -503,7 +505,10 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h
503 505 </property>
504 506 <property name="styleSheet">
505 507 <string notr="true">QPushButton { image: url(:/images/slider_icon/temp.png); }
506   -QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/temp_ov.png); }</string>
  508 +QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/temp_ov.png); }</string>
  509 + </property>
  510 + <property name="checkable">
  511 + <bool>true</bool>
507 512 </property>
508 513 <property name="style" stdset="0">
509 514 <string notr="true">icon</string>
... ... @@ -710,7 +715,10 @@ QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/temp_ov
710 715 </property>
711 716 <property name="styleSheet">
712 717 <string notr="true">QPushButton { image: url(:/images/slider_icon/humidity.png); }
713   -QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/humidity_ov.png); }</string>
  718 +QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/humidity_ov.png); }</string>
  719 + </property>
  720 + <property name="checkable">
  721 + <bool>true</bool>
714 722 </property>
715 723 <property name="style" stdset="0">
716 724 <string notr="true">icon</string>
... ... @@ -728,7 +736,7 @@ QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/humidit
728 736 <property name="styleSheet">
729 737 <string notr="true">QPushButton { image: url(:/images/slider_icon/core_temp.png); }
730 738 QPushButton:checked { image: url(:/images/slider_icon/core_temp_enabled.png); }
731   -QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/core_temp_ov.png); }</string>
  739 +QPushButton:pressed { image: url(:/images/slider_icon/core_temp_ov.png); }</string>
732 740 </property>
733 741 <property name="checkable">
734 742 <bool>true</bool>
... ... @@ -748,7 +756,10 @@ QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/core_te
748 756 </property>
749 757 <property name="styleSheet">
750 758 <string notr="true">QPushButton { image: url(:/images/slider_icon/time.png); }
751   -QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/time_ov.png); }</string>
  759 +QPushButton:pressed, QPushButton:checked { image: url(:/images/slider_icon/time_ov.png); }</string>
  760 + </property>
  761 + <property name="checkable">
  762 + <bool>true</bool>
752 763 </property>
753 764 <property name="style" stdset="0">
754 765 <string notr="true">icon</string>
... ... @@ -959,7 +970,7 @@ QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/time_ov
959 970 </property>
960 971 <property name="styleSheet">
961 972 <string notr="true">QPushButton { background-image: url(:/images/manual_button/cooldown.png); }
962   -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/cooldown_ov.png); }</string>
  973 +QPushButton:pressed { background-image: url(:/images/manual_button/cooldown_ov.png); }</string>
963 974 </property>
964 975 <property name="checkable">
965 976 <bool>true</bool>
... ... @@ -979,7 +990,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b
979 990 </property>
980 991 <property name="styleSheet">
981 992 <string notr="true">QPushButton { background-image: url(:/images/manual_button/next.png); }
982   -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/next_ov.png); }</string>
  993 +QPushButton:pressed { background-image: url(:/images/manual_button/next_ov.png); }</string>
983 994 </property>
984 995 <property name="style" stdset="0">
985 996 <string>tool</string>
... ... @@ -996,7 +1007,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b
996 1007 </property>
997 1008 <property name="styleSheet">
998 1009 <string notr="true">QPushButton { background-image: url(:/images/manual_button/favorites.png); }
999   -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/favorites_ov.png); }</string>
  1010 +QPushButton:pressed { background-image: url(:/images/manual_button/favorites_ov.png); }</string>
1000 1011 </property>
1001 1012 <property name="style" stdset="0">
1002 1013 <string>tool</string>
... ... @@ -1013,7 +1024,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b
1013 1024 </property>
1014 1025 <property name="styleSheet">
1015 1026 <string notr="true">QPushButton { background-image: url(:/images/manual_button/reserve.png); }
1016   -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/reserve_ov.png); }</string>
  1027 +QPushButton:pressed { background-image: url(:/images/manual_button/reserve_ov.png); }</string>
1017 1028 </property>
1018 1029 <property name="style" stdset="0">
1019 1030 <string>tool</string>
... ... @@ -1071,8 +1082,8 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b
1071 1082 </rect>
1072 1083 </property>
1073 1084 <property name="styleSheet">
1074   - <string notr="true">QPushButton { background-image: url(:/images/manual_button/damper_close.png); }
1075   -QPushButton:checked, QPushButton:focus { background-image: url(:/images/manual_button/damper_open.png); }</string>
  1085 + <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>
1076 1087 </property>
1077 1088 <property name="checkable">
1078 1089 <bool>true</bool>
... ... @@ -1092,7 +1103,10 @@ QPushButton:checked, QPushButton:focus { background-image: url(:/images/manual_b
1092 1103 </property>
1093 1104 <property name="styleSheet">
1094 1105 <string notr="true">QPushButton { background-image: url(:/images/manual_button/repeat.png); }
1095   -QPushButton:pressed { background-image: url(:/images/manual_button/repeat_ov.png); }</string>
  1106 +QPushButton:pressed, QPushButton:checked { background-image: url(:/images/manual_button/repeat_ov.png); }</string>
  1107 + </property>
  1108 + <property name="checkable">
  1109 + <bool>true</bool>
1096 1110 </property>
1097 1111 <property name="style" stdset="0">
1098 1112 <string>tool</string>
... ... @@ -1109,7 +1123,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/repeat_ov.png
1109 1123 </property>
1110 1124 <property name="styleSheet">
1111 1125 <string notr="true">QPushButton { background-image: url(:/images/manual_button/preheat.png); }
1112   -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/preheat_ov.png); }</string>
  1126 +QPushButton:pressed { background-image: url(:/images/manual_button/preheat_ov.png); }</string>
1113 1127 </property>
1114 1128 <property name="style" stdset="0">
1115 1129 <string>tool</string>
... ... @@ -1126,7 +1140,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b
1126 1140 </property>
1127 1141 <property name="styleSheet">
1128 1142 <string notr="true">QPushButton, QPushButton:checked:pressed { background-image: url(:/images/manual_button/side_nozzle_close.png); }
1129   -QPushButton:checked, QPushButton:focus, QPushButton:pressed { background-image: url(:/images/manual_button/side_nozzle_open.png); }</string>
  1143 +QPushButton:checked, QPushButton:pressed { background-image: url(:/images/manual_button/side_nozzle_open.png); }</string>
1130 1144 </property>
1131 1145 <property name="checkable">
1132 1146 <bool>true</bool>
... ... @@ -1148,6 +1162,9 @@ QPushButton:checked, QPushButton:focus, QPushButton:pressed { background-image:
1148 1162 <string notr="true">background-image: url(:/images/line/manual_button.png);</string>
1149 1163 </property>
1150 1164 </widget>
  1165 + <zorder>sysLine_8</zorder>
  1166 + <zorder>sysLine_7</zorder>
  1167 + <zorder>sysLine_9</zorder>
1151 1168 <zorder>goFrontStackButton</zorder>
1152 1169 <zorder>fanButton</zorder>
1153 1170 <zorder>reserveButton</zorder>
... ... @@ -1179,9 +1196,6 @@ QPushButton:checked, QPushButton:focus, QPushButton:pressed { background-image:
1179 1196 <zorder>humiditySlider</zorder>
1180 1197 <zorder>timeSlider</zorder>
1181 1198 <zorder>interTempSlider</zorder>
1182   - <zorder>sysLine_8</zorder>
1183   - <zorder>sysLine_7</zorder>
1184   - <zorder>sysLine_9</zorder>
1185 1199 </widget>
1186 1200 </widget>
1187 1201 <customwidgets>
... ...
app/gui/oven_control/slider.cpp
  Diff comments   View file @9c1ea4a
... ... @@ -118,6 +118,8 @@ bool Slider::isSliderMoved()
118 118 void Slider::focusInEvent(QFocusEvent */*event*/)
119 119 {
120 120 focused = true;
  121 +
  122 + update();
121 123 }
122 124  
123 125 void Slider::focusOutEvent(QFocusEvent *event)
... ... @@ -132,6 +134,8 @@ void Slider::focusOutEvent(QFocusEvent *event)
132 134 value_ = sliderPosition_;
133 135 emit valueChanged(value_);
134 136 }
  137 +
  138 + update();
135 139 }
136 140  
137 141 void Slider::keyPressEvent(QKeyEvent *event)
... ... @@ -232,6 +236,16 @@ void Slider::paintEvent(QPaintEvent */*event*/)
232 236 QPoint handlePoint(subPoint.x() + subLength - handle.width() / 2, (height() - handle.height()) / 2);
233 237 painter.drawPixmap(handlePoint, handle);
234 238 }
  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 + }
235 249 }
236 250  
237 251 void Slider::resizeEvent(QResizeEvent */*event*/)
... ...