에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 239d51c8b9c96dde3774c5913ac55b401bace417

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

의무 세척 기능 추가

Showing 35 changed files with 515 additions and 11 deletions   Show diff stats
app/gui/oven_control/adjustmentwindow.ui
  Diff comments   View file @239d51c
... ... @@ -44,6 +44,16 @@
44 44 </rect>
45 45 </property>
46 46 </widget>
  47 + <widget class="WashWarnIcon" name="label_2">
  48 + <property name="geometry">
  49 + <rect>
  50 + <x>800</x>
  51 + <y>320</y>
  52 + <width>80</width>
  53 + <height>84</height>
  54 + </rect>
  55 + </property>
  56 + </widget>
47 57 </widget>
48 58 <widget class="QWidget" name="page_2"/>
49 59 </widget>
... ... @@ -248,6 +258,11 @@ QPushButton {
248 258 <header>clock.h</header>
249 259 <container>1</container>
250 260 </customwidget>
  261 + <customwidget>
  262 + <class>WashWarnIcon</class>
  263 + <extends>QLabel</extends>
  264 + <header>washwarnicon.h</header>
  265 + </customwidget>
251 266 </customwidgets>
252 267 <resources>
253 268 <include location="resources.qrc"/>
... ...
app/gui/oven_control/autocookconfigwindow.ui
  Diff comments   View file @239d51c
... ... @@ -88,6 +88,16 @@ border: none;
88 88 </rect>
89 89 </property>
90 90 </widget>
  91 + <widget class="WashWarnIcon" name="label">
  92 + <property name="geometry">
  93 + <rect>
  94 + <x>800</x>
  95 + <y>320</y>
  96 + <width>80</width>
  97 + <height>84</height>
  98 + </rect>
  99 + </property>
  100 + </widget>
91 101 </widget>
92 102 <widget class="QWidget" name="page_2"/>
93 103 </widget>
... ... @@ -1455,6 +1465,11 @@ border-image: url(:/images/button/152_ov.png);
1455 1465 <header>clock.h</header>
1456 1466 <container>1</container>
1457 1467 </customwidget>
  1468 + <customwidget>
  1469 + <class>WashWarnIcon</class>
  1470 + <extends>QLabel</extends>
  1471 + <header>washwarnicon.h</header>
  1472 + </customwidget>
1458 1473 </customwidgets>
1459 1474 <resources>
1460 1475 <include location="resources.qrc"/>
... ...
app/gui/oven_control/autocookselectionwindow.ui
  Diff comments   View file @239d51c
... ... @@ -41,6 +41,16 @@
41 41 </rect>
42 42 </property>
43 43 </widget>
  44 + <widget class="WashWarnIcon" name="label">
  45 + <property name="geometry">
  46 + <rect>
  47 + <x>800</x>
  48 + <y>320</y>
  49 + <width>80</width>
  50 + <height>84</height>
  51 + </rect>
  52 + </property>
  53 + </widget>
44 54 </widget>
45 55 <widget class="QWidget" name="page_2"/>
46 56 </widget>
... ... @@ -174,6 +184,11 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); }&lt;/str
174 184 <header>clock.h</header>
175 185 <container>1</container>
176 186 </customwidget>
  187 + <customwidget>
  188 + <class>WashWarnIcon</class>
  189 + <extends>QLabel</extends>
  190 + <header>washwarnicon.h</header>
  191 + </customwidget>
177 192 </customwidgets>
178 193 <resources/>
179 194 <connections/>
... ...
app/gui/oven_control/autocookwindow.ui
  Diff comments   View file @239d51c
... ... @@ -47,6 +47,16 @@ border: none;
47 47 </rect>
48 48 </property>
49 49 </widget>
  50 + <widget class="WashWarnIcon" name="label">
  51 + <property name="geometry">
  52 + <rect>
  53 + <x>800</x>
  54 + <y>320</y>
  55 + <width>80</width>
  56 + <height>84</height>
  57 + </rect>
  58 + </property>
  59 + </widget>
50 60 </widget>
51 61 <widget class="QWidget" name="page_2"/>
52 62 </widget>
... ... @@ -1351,12 +1361,6 @@ QPushButton:pressed { border-image: url(:/images/button/152_ov.png); }&lt;/string&gt;
1351 1361 </widget>
1352 1362 <customwidgets>
1353 1363 <customwidget>
1354   - <class>BulletIndicator</class>
1355   - <extends>QWidget</extends>
1356   - <header>bulletindicator.h</header>
1357   - <container>1</container>
1358   - </customwidget>
1359   - <customwidget>
1360 1364 <class>Clock</class>
1361 1365 <extends>QWidget</extends>
1362 1366 <header>clock.h</header>
... ... @@ -1368,6 +1372,17 @@ QPushButton:pressed { border-image: url(:/images/button/152_ov.png); }&lt;/string&gt;
1368 1372 <header>animatedimagebox.h</header>
1369 1373 </customwidget>
1370 1374 <customwidget>
  1375 + <class>WashWarnIcon</class>
  1376 + <extends>QLabel</extends>
  1377 + <header>washwarnicon.h</header>
  1378 + </customwidget>
  1379 + <customwidget>
  1380 + <class>BulletIndicator</class>
  1381 + <extends>QWidget</extends>
  1382 + <header>bulletindicator.h</header>
  1383 + <container>1</container>
  1384 + </customwidget>
  1385 + <customwidget>
1371 1386 <class>HumidityCircularGauge</class>
1372 1387 <extends>QWidget</extends>
1373 1388 <header>humiditycirculargauge.h</header>
... ...
app/gui/oven_control/basicsettingwindow.ui
  Diff comments   View file @239d51c
... ... @@ -45,6 +45,16 @@
45 45 </rect>
46 46 </property>
47 47 </widget>
  48 + <widget class="WashWarnIcon" name="label">
  49 + <property name="geometry">
  50 + <rect>
  51 + <x>800</x>
  52 + <y>320</y>
  53 + <width>80</width>
  54 + <height>84</height>
  55 + </rect>
  56 + </property>
  57 + </widget>
48 58 </widget>
49 59 <widget class="QWidget" name="page_2"/>
50 60 </widget>
... ... @@ -404,6 +414,11 @@ QPushButton { text-align: left;}
404 414 <header>clock.h</header>
405 415 <container>1</container>
406 416 </customwidget>
  417 + <customwidget>
  418 + <class>WashWarnIcon</class>
  419 + <extends>QLabel</extends>
  420 + <header>washwarnicon.h</header>
  421 + </customwidget>
407 422 </customwidgets>
408 423 <resources/>
409 424 <connections/>
... ...
app/gui/oven_control/burnertestwindow.ui
  Diff comments   View file @239d51c
... ... @@ -41,6 +41,16 @@
41 41 </rect>
42 42 </property>
43 43 </widget>
  44 + <widget class="WashWarnIcon" name="label_7">
  45 + <property name="geometry">
  46 + <rect>
  47 + <x>800</x>
  48 + <y>320</y>
  49 + <width>80</width>
  50 + <height>84</height>
  51 + </rect>
  52 + </property>
  53 + </widget>
44 54 </widget>
45 55 <widget class="QWidget" name="page_2"/>
46 56 </widget>
... ... @@ -2092,6 +2102,11 @@ QPushButton:pressed { border-image: url(:/images/button/184_ov.png); }&lt;/string&gt;
2092 2102 <header>clock.h</header>
2093 2103 <container>1</container>
2094 2104 </customwidget>
  2105 + <customwidget>
  2106 + <class>WashWarnIcon</class>
  2107 + <extends>QLabel</extends>
  2108 + <header>washwarnicon.h</header>
  2109 + </customwidget>
2095 2110 </customwidgets>
2096 2111 <resources>
2097 2112 <include location="resources.qrc"/>
... ...
app/gui/oven_control/componenttestwindow.ui
  Diff comments   View file @239d51c
... ... @@ -41,6 +41,16 @@
41 41 </rect>
42 42 </property>
43 43 </widget>
  44 + <widget class="WashWarnIcon" name="label_4">
  45 + <property name="geometry">
  46 + <rect>
  47 + <x>800</x>
  48 + <y>320</y>
  49 + <width>80</width>
  50 + <height>84</height>
  51 + </rect>
  52 + </property>
  53 + </widget>
44 54 </widget>
45 55 <widget class="QWidget" name="page_2"/>
46 56 </widget>
... ... @@ -499,6 +509,11 @@ QPushButton:pressed { border-image: url(:/images/button/184_ov.png); }&lt;/string&gt;
499 509 <header>clock.h</header>
500 510 <container>1</container>
501 511 </customwidget>
  512 + <customwidget>
  513 + <class>WashWarnIcon</class>
  514 + <extends>QLabel</extends>
  515 + <header>washwarnicon.h</header>
  516 + </customwidget>
502 517 </customwidgets>
503 518 <resources>
504 519 <include location="resources.qrc"/>
... ...
app/gui/oven_control/configwindow.ui
  Diff comments   View file @239d51c
... ... @@ -80,6 +80,16 @@ background: none;
80 80 </rect>
81 81 </property>
82 82 </widget>
  83 + <widget class="WashWarnIcon" name="label">
  84 + <property name="geometry">
  85 + <rect>
  86 + <x>800</x>
  87 + <y>320</y>
  88 + <width>80</width>
  89 + <height>84</height>
  90 + </rect>
  91 + </property>
  92 + </widget>
83 93 </widget>
84 94 <widget class="QWidget" name="page_2"/>
85 95 </widget>
... ... @@ -545,6 +555,11 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); }&lt;/str
545 555 <header>clock.h</header>
546 556 <container>1</container>
547 557 </customwidget>
  558 + <customwidget>
  559 + <class>WashWarnIcon</class>
  560 + <extends>QLabel</extends>
  561 + <header>washwarnicon.h</header>
  562 + </customwidget>
548 563 </customwidgets>
549 564 <resources/>
550 565 <connections/>
... ...
app/gui/oven_control/electricmodelsettingwindow.ui
  Diff comments   View file @239d51c
... ... @@ -451,6 +451,16 @@ QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }&lt;/string&gt;
451 451 </rect>
452 452 </property>
453 453 </widget>
  454 + <widget class="WashWarnIcon" name="label">
  455 + <property name="geometry">
  456 + <rect>
  457 + <x>800</x>
  458 + <y>320</y>
  459 + <width>80</width>
  460 + <height>84</height>
  461 + </rect>
  462 + </property>
  463 + </widget>
454 464 </widget>
455 465 <widget class="QWidget" name="page_2"/>
456 466 </widget>
... ... @@ -463,6 +473,11 @@ QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }&lt;/string&gt;
463 473 <header>clock.h</header>
464 474 <container>1</container>
465 475 </customwidget>
  476 + <customwidget>
  477 + <class>WashWarnIcon</class>
  478 + <extends>QLabel</extends>
  479 + <header>washwarnicon.h</header>
  480 + </customwidget>
466 481 </customwidgets>
467 482 <resources/>
468 483 <connections/>
... ...
app/gui/oven_control/engineermenuwindow.ui
  Diff comments   View file @239d51c
... ... @@ -44,6 +44,16 @@
44 44 </rect>
45 45 </property>
46 46 </widget>
  47 + <widget class="WashWarnIcon" name="label">
  48 + <property name="geometry">
  49 + <rect>
  50 + <x>800</x>
  51 + <y>320</y>
  52 + <width>80</width>
  53 + <height>84</height>
  54 + </rect>
  55 + </property>
  56 + </widget>
47 57 </widget>
48 58 <widget class="QWidget" name="page_2"/>
49 59 </widget>
... ... @@ -600,6 +610,11 @@ QPushButton { color: rgb(255, 255, 255);text-align: left;padding-left:30px;}&lt;/st
600 610 <header>clock.h</header>
601 611 <container>1</container>
602 612 </customwidget>
  613 + <customwidget>
  614 + <class>WashWarnIcon</class>
  615 + <extends>QLabel</extends>
  616 + <header>washwarnicon.h</header>
  617 + </customwidget>
603 618 </customwidgets>
604 619 <resources/>
605 620 <connections/>
... ...
app/gui/oven_control/fantestwindow.ui
  Diff comments   View file @239d51c
... ... @@ -41,6 +41,16 @@
41 41 </rect>
42 42 </property>
43 43 </widget>
  44 + <widget class="WashWarnIcon" name="label">
  45 + <property name="geometry">
  46 + <rect>
  47 + <x>800</x>
  48 + <y>320</y>
  49 + <width>80</width>
  50 + <height>84</height>
  51 + </rect>
  52 + </property>
  53 + </widget>
44 54 </widget>
45 55 <widget class="QWidget" name="page_2"/>
46 56 </widget>
... ... @@ -738,6 +748,11 @@ QPushButton:pressed { border-image: url(:/images/button/184_ov.png); }&lt;/string&gt;
738 748 <header>clock.h</header>
739 749 <container>1</container>
740 750 </customwidget>
  751 + <customwidget>
  752 + <class>WashWarnIcon</class>
  753 + <extends>QLabel</extends>
  754 + <header>washwarnicon.h</header>
  755 + </customwidget>
741 756 </customwidgets>
742 757 <resources>
743 758 <include location="resources.qrc"/>
... ...
app/gui/oven_control/functiontestwindow.ui
  Diff comments   View file @239d51c
... ... @@ -47,6 +47,16 @@
47 47 </rect>
48 48 </property>
49 49 </widget>
  50 + <widget class="WashWarnIcon" name="label">
  51 + <property name="geometry">
  52 + <rect>
  53 + <x>800</x>
  54 + <y>320</y>
  55 + <width>80</width>
  56 + <height>84</height>
  57 + </rect>
  58 + </property>
  59 + </widget>
50 60 </widget>
51 61 <widget class="QWidget" name="page_2"/>
52 62 </widget>
... ... @@ -576,6 +586,11 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); }&lt;/str
576 586 <header>clock.h</header>
577 587 <container>1</container>
578 588 </customwidget>
  589 + <customwidget>
  590 + <class>WashWarnIcon</class>
  591 + <extends>QLabel</extends>
  592 + <header>washwarnicon.h</header>
  593 + </customwidget>
579 594 </customwidgets>
580 595 <resources/>
581 596 <connections/>
... ...
app/gui/oven_control/gasmodelsettingwindow.ui
  Diff comments   View file @239d51c
... ... @@ -539,6 +539,16 @@ QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }&lt;/string&gt;
539 539 </rect>
540 540 </property>
541 541 </widget>
  542 + <widget class="WashWarnIcon" name="label">
  543 + <property name="geometry">
  544 + <rect>
  545 + <x>800</x>
  546 + <y>320</y>
  547 + <width>80</width>
  548 + <height>84</height>
  549 + </rect>
  550 + </property>
  551 + </widget>
542 552 </widget>
543 553 <widget class="QWidget" name="page_2"/>
544 554 </widget>
... ... @@ -639,6 +649,11 @@ QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }&lt;/string&gt;
639 649 <header>clock.h</header>
640 650 <container>1</container>
641 651 </customwidget>
  652 + <customwidget>
  653 + <class>WashWarnIcon</class>
  654 + <extends>QLabel</extends>
  655 + <header>washwarnicon.h</header>
  656 + </customwidget>
642 657 </customwidgets>
643 658 <resources/>
644 659 <connections/>
... ...
app/gui/oven_control/gastestwindow.ui
  Diff comments   View file @239d51c
... ... @@ -41,6 +41,16 @@
41 41 </rect>
42 42 </property>
43 43 </widget>
  44 + <widget class="WashWarnIcon" name="label">
  45 + <property name="geometry">
  46 + <rect>
  47 + <x>800</x>
  48 + <y>320</y>
  49 + <width>80</width>
  50 + <height>84</height>
  51 + </rect>
  52 + </property>
  53 + </widget>
44 54 </widget>
45 55 <widget class="QWidget" name="page_2"/>
46 56 </widget>
... ... @@ -120,6 +130,11 @@ QPushButton:pressed {
120 130 <header>clock.h</header>
121 131 <container>1</container>
122 132 </customwidget>
  133 + <customwidget>
  134 + <class>WashWarnIcon</class>
  135 + <extends>QLabel</extends>
  136 + <header>washwarnicon.h</header>
  137 + </customwidget>
123 138 </customwidgets>
124 139 <resources/>
125 140 <connections/>
... ...
app/gui/oven_control/historylistwindow.ui
  Diff comments   View file @239d51c
... ... @@ -199,6 +199,16 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/006_sys_icon_14_ov.p
199 199 </rect>
200 200 </property>
201 201 </widget>
  202 + <widget class="WashWarnIcon" name="label_5">
  203 + <property name="geometry">
  204 + <rect>
  205 + <x>800</x>
  206 + <y>320</y>
  207 + <width>80</width>
  208 + <height>84</height>
  209 + </rect>
  210 + </property>
  211 + </widget>
202 212 </widget>
203 213 <widget class="QWidget" name="page_2"/>
204 214 </widget>
... ... @@ -1394,6 +1404,11 @@ QPushButton { text-align:center;}&lt;/string&gt;
1394 1404 <header>clock.h</header>
1395 1405 <container>1</container>
1396 1406 </customwidget>
  1407 + <customwidget>
  1408 + <class>WashWarnIcon</class>
  1409 + <extends>QLabel</extends>
  1410 + <header>washwarnicon.h</header>
  1411 + </customwidget>
1397 1412 </customwidgets>
1398 1413 <resources/>
1399 1414 <connections/>
... ...
app/gui/oven_control/mainwindow.ui
  Diff comments   View file @239d51c
... ... @@ -599,6 +599,16 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
599 599 </rect>
600 600 </property>
601 601 </widget>
  602 + <widget class="WashWarnIcon" name="label">
  603 + <property name="geometry">
  604 + <rect>
  605 + <x>800</x>
  606 + <y>320</y>
  607 + <width>80</width>
  608 + <height>84</height>
  609 + </rect>
  610 + </property>
  611 + </widget>
602 612 </widget>
603 613 <widget class="QLabel" name="steamLabel_13">
604 614 <property name="enabled">
... ... @@ -688,6 +698,11 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
688 698 <header>clock.h</header>
689 699 <container>1</container>
690 700 </customwidget>
  701 + <customwidget>
  702 + <class>WashWarnIcon</class>
  703 + <extends>QLabel</extends>
  704 + <header>washwarnicon.h</header>
  705 + </customwidget>
691 706 </customwidgets>
692 707 <tabstops>
693 708 <tabstop>steamButton</tabstop>
... ...
app/gui/oven_control/manualcookwindow.ui
  Diff comments   View file @239d51c
... ... @@ -99,6 +99,16 @@ height: 33px;
99 99 </rect>
100 100 </property>
101 101 </widget>
  102 + <widget class="WashWarnIcon" name="label_6">
  103 + <property name="geometry">
  104 + <rect>
  105 + <x>800</x>
  106 + <y>320</y>
  107 + <width>80</width>
  108 + <height>84</height>
  109 + </rect>
  110 + </property>
  111 + </widget>
102 112 </widget>
103 113 <widget class="QWidget" name="closeDoorWidget">
104 114 <property name="styleSheet">
... ... @@ -2337,6 +2347,11 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); }
2337 2347 <extends>QLabel</extends>
2338 2348 <header>animatedimagebox.h</header>
2339 2349 </customwidget>
  2350 + <customwidget>
  2351 + <class>WashWarnIcon</class>
  2352 + <extends>QLabel</extends>
  2353 + <header>washwarnicon.h</header>
  2354 + </customwidget>
2340 2355 </customwidgets>
2341 2356 <resources>
2342 2357 <include location="resources.qrc"/>
... ...
app/gui/oven_control/modelsettingwindow.ui
  Diff comments   View file @239d51c
... ... @@ -363,6 +363,16 @@ QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }&lt;/string&gt;
363 363 </rect>
364 364 </property>
365 365 </widget>
  366 + <widget class="WashWarnIcon" name="label">
  367 + <property name="geometry">
  368 + <rect>
  369 + <x>800</x>
  370 + <y>320</y>
  371 + <width>80</width>
  372 + <height>84</height>
  373 + </rect>
  374 + </property>
  375 + </widget>
366 376 </widget>
367 377 <widget class="QWidget" name="page_2"/>
368 378 </widget>
... ... @@ -375,6 +385,11 @@ QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }&lt;/string&gt;
375 385 <header>clock.h</header>
376 386 <container>1</container>
377 387 </customwidget>
  388 + <customwidget>
  389 + <class>WashWarnIcon</class>
  390 + <extends>QLabel</extends>
  391 + <header>washwarnicon.h</header>
  392 + </customwidget>
378 393 </customwidgets>
379 394 <resources/>
380 395 <connections/>
... ...
app/gui/oven_control/operationtimeheat.ui
  Diff comments   View file @239d51c
... ... @@ -45,6 +45,16 @@
45 45 </rect>
46 46 </property>
47 47 </widget>
  48 + <widget class="WashWarnIcon" name="label">
  49 + <property name="geometry">
  50 + <rect>
  51 + <x>800</x>
  52 + <y>320</y>
  53 + <width>80</width>
  54 + <height>84</height>
  55 + </rect>
  56 + </property>
  57 + </widget>
48 58 </widget>
49 59 <widget class="QWidget" name="page_2"/>
50 60 </widget>
... ... @@ -352,6 +362,11 @@ QPushButton { text-align: center;}
352 362 <header>clock.h</header>
353 363 <container>1</container>
354 364 </customwidget>
  365 + <customwidget>
  366 + <class>WashWarnIcon</class>
  367 + <extends>QLabel</extends>
  368 + <header>washwarnicon.h</header>
  369 + </customwidget>
355 370 </customwidgets>
356 371 <resources/>
357 372 <connections/>
... ...
app/gui/oven_control/operationtimemain.ui
  Diff comments   View file @239d51c
... ... @@ -44,6 +44,16 @@
44 44 </rect>
45 45 </property>
46 46 </widget>
  47 + <widget class="WashWarnIcon" name="label_2">
  48 + <property name="geometry">
  49 + <rect>
  50 + <x>800</x>
  51 + <y>320</y>
  52 + <width>80</width>
  53 + <height>84</height>
  54 + </rect>
  55 + </property>
  56 + </widget>
47 57 </widget>
48 58 <widget class="QWidget" name="page_2"/>
49 59 </widget>
... ... @@ -313,6 +323,11 @@ QPushButton { text-align: center;}
313 323 <header>clock.h</header>
314 324 <container>1</container>
315 325 </customwidget>
  326 + <customwidget>
  327 + <class>WashWarnIcon</class>
  328 + <extends>QLabel</extends>
  329 + <header>washwarnicon.h</header>
  330 + </customwidget>
316 331 </customwidgets>
317 332 <resources>
318 333 <include location="resources.qrc"/>
... ...
app/gui/oven_control/operationtimemode.ui
  Diff comments   View file @239d51c
... ... @@ -45,6 +45,16 @@
45 45 </rect>
46 46 </property>
47 47 </widget>
  48 + <widget class="WashWarnIcon" name="label">
  49 + <property name="geometry">
  50 + <rect>
  51 + <x>800</x>
  52 + <y>320</y>
  53 + <width>80</width>
  54 + <height>84</height>
  55 + </rect>
  56 + </property>
  57 + </widget>
48 58 </widget>
49 59 <widget class="QWidget" name="page_2"/>
50 60 </widget>
... ... @@ -742,6 +752,11 @@ QPushButton { text-align: center;}
742 752 <header>clock.h</header>
743 753 <container>1</container>
744 754 </customwidget>
  755 + <customwidget>
  756 + <class>WashWarnIcon</class>
  757 + <extends>QLabel</extends>
  758 + <header>washwarnicon.h</header>
  759 + </customwidget>
745 760 </customwidgets>
746 761 <resources/>
747 762 <connections/>
... ...
app/gui/oven_control/operationtimeparts.ui
  Diff comments   View file @239d51c
... ... @@ -45,6 +45,16 @@
45 45 </rect>
46 46 </property>
47 47 </widget>
  48 + <widget class="WashWarnIcon" name="label">
  49 + <property name="geometry">
  50 + <rect>
  51 + <x>800</x>
  52 + <y>320</y>
  53 + <width>80</width>
  54 + <height>84</height>
  55 + </rect>
  56 + </property>
  57 + </widget>
48 58 </widget>
49 59 <widget class="QWidget" name="page_2"/>
50 60 </widget>
... ... @@ -1045,6 +1055,11 @@ QPushButton { text-align: center;}
1045 1055 <header>clock.h</header>
1046 1056 <container>1</container>
1047 1057 </customwidget>
  1058 + <customwidget>
  1059 + <class>WashWarnIcon</class>
  1060 + <extends>QLabel</extends>
  1061 + <header>washwarnicon.h</header>
  1062 + </customwidget>
1048 1063 </customwidgets>
1049 1064 <resources/>
1050 1065 <connections/>
... ...
app/gui/oven_control/oven_control.pro
  Diff comments   View file @239d51c
... ... @@ -101,7 +101,8 @@ SOURCES += main.cpp\
101 101 system.cpp \
102 102 servicepassinputdlg.cpp \
103 103 backlight.cpp \
104   - dirtylevel.cpp
  104 + dirtylevel.cpp \
  105 + washwarnicon.cpp
105 106  
106 107 HEADERS += mainwindow.h \
107 108 cook.h \
... ... @@ -192,7 +193,8 @@ HEADERS += mainwindow.h \
192 193 system.h \
193 194 servicepassinputdlg.h \
194 195 backlight.h \
195   - dirtylevel.h
  196 + dirtylevel.h \
  197 + washwarnicon.h
196 198  
197 199 FORMS += mainwindow.ui \
198 200 manualcookwindow.ui \
... ...
app/gui/oven_control/primewindow.ui
  Diff comments   View file @239d51c
... ... @@ -262,6 +262,16 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); }&lt;/s
262 262 </rect>
263 263 </property>
264 264 </widget>
  265 + <widget class="WashWarnIcon" name="label">
  266 + <property name="geometry">
  267 + <rect>
  268 + <x>800</x>
  269 + <y>320</y>
  270 + <width>80</width>
  271 + <height>84</height>
  272 + </rect>
  273 + </property>
  274 + </widget>
265 275 </widget>
266 276 <widget class="QWidget" name="page_2"/>
267 277 </widget>
... ... @@ -311,6 +321,11 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); }&lt;/s
311 321 <header>clock.h</header>
312 322 <container>1</container>
313 323 </customwidget>
  324 + <customwidget>
  325 + <class>WashWarnIcon</class>
  326 + <extends>QLabel</extends>
  327 + <header>washwarnicon.h</header>
  328 + </customwidget>
314 329 </customwidgets>
315 330 <resources/>
316 331 <connections/>
... ...
app/gui/oven_control/programmingwindow.ui
  Diff comments   View file @239d51c
... ... @@ -61,6 +61,16 @@ image-position: bottom;
61 61 </rect>
62 62 </property>
63 63 </widget>
  64 + <widget class="WashWarnIcon" name="label">
  65 + <property name="geometry">
  66 + <rect>
  67 + <x>800</x>
  68 + <y>320</y>
  69 + <width>80</width>
  70 + <height>84</height>
  71 + </rect>
  72 + </property>
  73 + </widget>
64 74 </widget>
65 75 <widget class="QWidget" name="page_2"/>
66 76 </widget>
... ... @@ -198,6 +208,11 @@ QPushButton:pressed { background-image: url(:/images/etc/main_btn_02_ov.png); }&lt;
198 208 <header>clock.h</header>
199 209 <container>1</container>
200 210 </customwidget>
  211 + <customwidget>
  212 + <class>WashWarnIcon</class>
  213 + <extends>QLabel</extends>
  214 + <header>washwarnicon.h</header>
  215 + </customwidget>
201 216 </customwidgets>
202 217 <resources/>
203 218 <connections/>
... ...
app/gui/oven_control/realtimemain.ui
  Diff comments   View file @239d51c
... ... @@ -44,6 +44,16 @@
44 44 </rect>
45 45 </property>
46 46 </widget>
  47 + <widget class="WashWarnIcon" name="label_2">
  48 + <property name="geometry">
  49 + <rect>
  50 + <x>800</x>
  51 + <y>320</y>
  52 + <width>80</width>
  53 + <height>84</height>
  54 + </rect>
  55 + </property>
  56 + </widget>
47 57 </widget>
48 58 <widget class="QWidget" name="page_2"/>
49 59 </widget>
... ... @@ -277,6 +287,11 @@ QPushButton { text-align: center;}
277 287 <header>clock.h</header>
278 288 <container>1</container>
279 289 </customwidget>
  290 + <customwidget>
  291 + <class>WashWarnIcon</class>
  292 + <extends>QLabel</extends>
  293 + <header>washwarnicon.h</header>
  294 + </customwidget>
280 295 </customwidgets>
281 296 <resources>
282 297 <include location="resources.qrc"/>
... ...
app/gui/oven_control/realtimepartswindow.ui
  Diff comments   View file @239d51c
... ... @@ -45,6 +45,16 @@
45 45 </rect>
46 46 </property>
47 47 </widget>
  48 + <widget class="WashWarnIcon" name="label">
  49 + <property name="geometry">
  50 + <rect>
  51 + <x>800</x>
  52 + <y>320</y>
  53 + <width>80</width>
  54 + <height>84</height>
  55 + </rect>
  56 + </property>
  57 + </widget>
48 58 </widget>
49 59 <widget class="QWidget" name="page_2"/>
50 60 </widget>
... ... @@ -998,6 +1008,11 @@ QPushButton { text-align: center;}
998 1008 <header>clock.h</header>
999 1009 <container>1</container>
1000 1010 </customwidget>
  1011 + <customwidget>
  1012 + <class>WashWarnIcon</class>
  1013 + <extends>QLabel</extends>
  1014 + <header>washwarnicon.h</header>
  1015 + </customwidget>
1001 1016 </customwidgets>
1002 1017 <resources/>
1003 1018 <connections/>
... ...
app/gui/oven_control/realtimesensorwindow.ui
  Diff comments   View file @239d51c
... ... @@ -45,6 +45,16 @@
45 45 </rect>
46 46 </property>
47 47 </widget>
  48 + <widget class="WashWarnIcon" name="label">
  49 + <property name="geometry">
  50 + <rect>
  51 + <x>800</x>
  52 + <y>320</y>
  53 + <width>80</width>
  54 + <height>84</height>
  55 + </rect>
  56 + </property>
  57 + </widget>
48 58 </widget>
49 59 <widget class="QWidget" name="page_2"/>
50 60 </widget>
... ... @@ -1332,6 +1342,11 @@ QPushButton { text-align: center;}
1332 1342 <header>clock.h</header>
1333 1343 <container>1</container>
1334 1344 </customwidget>
  1345 + <customwidget>
  1346 + <class>WashWarnIcon</class>
  1347 + <extends>QLabel</extends>
  1348 + <header>washwarnicon.h</header>
  1349 + </customwidget>
1335 1350 </customwidgets>
1336 1351 <resources/>
1337 1352 <connections/>
... ...
app/gui/oven_control/resources.qrc
  Diff comments   View file @239d51c
... ... @@ -545,5 +545,6 @@
545 545 <file>images/config/105_icon_download_ov.png</file>
546 546 <file>images/config/105_icon_download.png</file>
547 547 <file>images/config/111_icon_upload.png</file>
  548 + <file>images/symbol/wash.png</file>
548 549 </qresource>
549 550 </RCC>
... ...
app/gui/oven_control/servicehistorymain.ui
  Diff comments   View file @239d51c
... ... @@ -44,6 +44,16 @@
44 44 </rect>
45 45 </property>
46 46 </widget>
  47 + <widget class="WashWarnIcon" name="label_2">
  48 + <property name="geometry">
  49 + <rect>
  50 + <x>800</x>
  51 + <y>320</y>
  52 + <width>80</width>
  53 + <height>84</height>
  54 + </rect>
  55 + </property>
  56 + </widget>
47 57 </widget>
48 58 <widget class="QWidget" name="page_2"/>
49 59 </widget>
... ... @@ -349,6 +359,11 @@ QPushButton { text-align: center;}
349 359 <header>clock.h</header>
350 360 <container>1</container>
351 361 </customwidget>
  362 + <customwidget>
  363 + <class>WashWarnIcon</class>
  364 + <extends>QLabel</extends>
  365 + <header>washwarnicon.h</header>
  366 + </customwidget>
352 367 </customwidgets>
353 368 <resources>
354 369 <include location="resources.qrc"/>
... ...
app/gui/oven_control/valvetestwindow.ui
  Diff comments   View file @239d51c
... ... @@ -41,6 +41,16 @@
41 41 </rect>
42 42 </property>
43 43 </widget>
  44 + <widget class="WashWarnIcon" name="label_16">
  45 + <property name="geometry">
  46 + <rect>
  47 + <x>800</x>
  48 + <y>320</y>
  49 + <width>80</width>
  50 + <height>84</height>
  51 + </rect>
  52 + </property>
  53 + </widget>
44 54 </widget>
45 55 <widget class="QWidget" name="page_2"/>
46 56 </widget>
... ... @@ -1163,6 +1173,11 @@ QPushButton:pressed { border-image: url(:/images/button/184_ov.png); }&lt;/string&gt;
1163 1173 <header>clock.h</header>
1164 1174 <container>1</container>
1165 1175 </customwidget>
  1176 + <customwidget>
  1177 + <class>WashWarnIcon</class>
  1178 + <extends>QLabel</extends>
  1179 + <header>washwarnicon.h</header>
  1180 + </customwidget>
1166 1181 </customwidgets>
1167 1182 <resources>
1168 1183 <include location="resources.qrc"/>
... ...
app/gui/oven_control/washtestwindow.ui
  Diff comments   View file @239d51c
... ... @@ -41,6 +41,16 @@
41 41 </rect>
42 42 </property>
43 43 </widget>
  44 + <widget class="WashWarnIcon" name="label_14">
  45 + <property name="geometry">
  46 + <rect>
  47 + <x>800</x>
  48 + <y>320</y>
  49 + <width>80</width>
  50 + <height>84</height>
  51 + </rect>
  52 + </property>
  53 + </widget>
44 54 </widget>
45 55 <widget class="QWidget" name="page_2"/>
46 56 </widget>
... ... @@ -649,6 +659,11 @@ QPushButton:pressed { border-image: url(:/images/button/184_ov.png); }&lt;/string&gt;
649 659 <header>clock.h</header>
650 660 <container>1</container>
651 661 </customwidget>
  662 + <customwidget>
  663 + <class>WashWarnIcon</class>
  664 + <extends>QLabel</extends>
  665 + <header>washwarnicon.h</header>
  666 + </customwidget>
652 667 </customwidgets>
653 668 <resources>
654 669 <include location="resources.qrc"/>
... ...
app/gui/oven_control/washwarnicon.cpp
  Diff comments   View file @239d51c
1 1 #include "washwarnicon.h"
2 2  
3   -WashWarnIcon::WashWarnIcon()
  3 +#include "config.h"
  4 +#include "dirtylevel.h"
  5 +
  6 +QPixmap *WashWarnIcon::icon = NULL;
  7 +
  8 +WashWarnIcon::WashWarnIcon(QWidget *parent) : QLabel(parent)
4 9 {
  10 + if (icon == NULL)
  11 + icon = new QPixmap(":/images/symbol/wash.png");
  12 +
  13 + connect(&timer, SIGNAL(timeout()), SLOT(check()));
  14 + timer.start(1000);
  15 +
  16 + setPixmap(*icon);
5 17  
  18 + check();
6 19 }
  20 +
  21 +void WashWarnIcon::check()
  22 +{
  23 + Define::config_item item = Config::getInstance()->getConfigValue(Define::config_duty_wash);
  24 + if (item.d32 == 0)
  25 + hide();
  26 + else if (DirtyLevel::dirty() > 0 || DirtyLevel::state() > 0)
  27 + show();
  28 + else
  29 + hide();
  30 +}
  31 +
... ...
app/gui/oven_control/washwarnicon.h
  Diff comments   View file @239d51c
... ... @@ -2,10 +2,21 @@
2 2 #define WASHWARNICON_H
3 3  
4 4  
  5 +#include <QLabel>
  6 +#include <QTimer>
  7 +
5 8 class WashWarnIcon : public QLabel
6 9 {
  10 + Q_OBJECT
  11 +
  12 + static QPixmap *icon;
  13 + QTimer timer;
  14 +
7 15 public:
8   - WashWarnIcon();
  16 + explicit WashWarnIcon(QWidget *parent = 0);
  17 +
  18 +private slots:
  19 + void check();
9 20 };
10 21  
11   -#endif // WASHWARNICON_H
12 22 \ No newline at end of file
  23 +#endif // WASHWARNICON_H
... ...
app/gui/oven_control/washwindow.ui
  Diff comments   View file @239d51c
... ... @@ -84,6 +84,16 @@ border: none;
84 84 </rect>
85 85 </property>
86 86 </widget>
  87 + <widget class="WashWarnIcon" name="label_2">
  88 + <property name="geometry">
  89 + <rect>
  90 + <x>800</x>
  91 + <y>320</y>
  92 + <width>80</width>
  93 + <height>84</height>
  94 + </rect>
  95 + </property>
  96 + </widget>
87 97 </widget>
88 98 <widget class="QWidget" name="progressContainer">
89 99 <property name="styleSheet">
... ... @@ -1167,6 +1177,11 @@ QPushButton:pressed { image: url(:/images/slider_icon/clean_ov.png); }&lt;/string&gt;
1167 1177 <header>washstepgauge.h</header>
1168 1178 <container>1</container>
1169 1179 </customwidget>
  1180 + <customwidget>
  1181 + <class>WashWarnIcon</class>
  1182 + <extends>QLabel</extends>
  1183 + <header>washwarnicon.h</header>
  1184 + </customwidget>
1170 1185 </customwidgets>
1171 1186 <resources>
1172 1187 <include location="resources.qrc"/>
... ...