에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit b7ee6dc302067a1967784b0c3007e9e12d2e3cdd

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

시연 모드 아이콘, 하프 에너지 아이콘 적용

Showing 36 changed files with 1097 additions and 8 deletions   Show diff stats
app/gui/oven_control/adjustmentwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -51,6 +51,26 @@
51 51 </rect>
52 52 </property>
53 53 </widget>
  54 + <widget class="DemoIcon" name="label_3">
  55 + <property name="geometry">
  56 + <rect>
  57 + <x>780</x>
  58 + <y>230</y>
  59 + <width>101</width>
  60 + <height>90</height>
  61 + </rect>
  62 + </property>
  63 + </widget>
  64 + <widget class="HalfEnergyIcon" name="label_4">
  65 + <property name="geometry">
  66 + <rect>
  67 + <x>780</x>
  68 + <y>160</y>
  69 + <width>108</width>
  70 + <height>67</height>
  71 + </rect>
  72 + </property>
  73 + </widget>
54 74 </widget>
55 75 <widget class="QWidget" name="page_2"/>
56 76 </widget>
... ... @@ -263,6 +283,16 @@ QPushButton {
263 283 <extends>QLabel</extends>
264 284 <header>washwarnicon.h</header>
265 285 </customwidget>
  286 + <customwidget>
  287 + <class>DemoIcon</class>
  288 + <extends>QLabel</extends>
  289 + <header>demoicon.h</header>
  290 + </customwidget>
  291 + <customwidget>
  292 + <class>HalfEnergyIcon</class>
  293 + <extends>QLabel</extends>
  294 + <header>halfenergyicon.h</header>
  295 + </customwidget>
266 296 </customwidgets>
267 297 <resources>
268 298 <include location="resources.qrc"/>
... ...
app/gui/oven_control/autocookcheckconfigwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -338,6 +338,26 @@ border: none;
338 338 </rect>
339 339 </property>
340 340 </widget>
  341 + <widget class="DemoIcon" name="label_2">
  342 + <property name="geometry">
  343 + <rect>
  344 + <x>780</x>
  345 + <y>230</y>
  346 + <width>101</width>
  347 + <height>90</height>
  348 + </rect>
  349 + </property>
  350 + </widget>
  351 + <widget class="HalfEnergyIcon" name="label_3">
  352 + <property name="geometry">
  353 + <rect>
  354 + <x>780</x>
  355 + <y>160</y>
  356 + <width>108</width>
  357 + <height>67</height>
  358 + </rect>
  359 + </property>
  360 + </widget>
341 361 </widget>
342 362 <widget class="QWidget" name="page_2"/>
343 363 </widget>
... ... @@ -1315,6 +1335,16 @@ border-image: url(:/images/button/288_ov.png);
1315 1335 <header>washwarnicon.h</header>
1316 1336 </customwidget>
1317 1337 <customwidget>
  1338 + <class>DemoIcon</class>
  1339 + <extends>QLabel</extends>
  1340 + <header>demoicon.h</header>
  1341 + </customwidget>
  1342 + <customwidget>
  1343 + <class>HalfEnergyIcon</class>
  1344 + <extends>QLabel</extends>
  1345 + <header>halfenergyicon.h</header>
  1346 + </customwidget>
  1347 + <customwidget>
1318 1348 <class>Slider</class>
1319 1349 <extends>QWidget</extends>
1320 1350 <header>slider.h</header>
... ... @@ -1329,8 +1359,6 @@ border-image: url(:/images/button/288_ov.png);
1329 1359 <tabstop>configButton_1</tabstop>
1330 1360 <tabstop>configButton_2</tabstop>
1331 1361 </tabstops>
1332   - <resources>
1333   - <include location="resources.qrc"/>
1334   - </resources>
  1362 + <resources/>
1335 1363 <connections/>
1336 1364 </ui>
... ...
app/gui/oven_control/autocookcheckwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -143,6 +143,26 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/auto_bu
143 143 </rect>
144 144 </property>
145 145 </widget>
  146 + <widget class="DemoIcon" name="label_2">
  147 + <property name="geometry">
  148 + <rect>
  149 + <x>780</x>
  150 + <y>230</y>
  151 + <width>101</width>
  152 + <height>90</height>
  153 + </rect>
  154 + </property>
  155 + </widget>
  156 + <widget class="HalfEnergyIcon" name="label_4">
  157 + <property name="geometry">
  158 + <rect>
  159 + <x>780</x>
  160 + <y>160</y>
  161 + <width>108</width>
  162 + <height>67</height>
  163 + </rect>
  164 + </property>
  165 + </widget>
146 166 </widget>
147 167 <widget class="QWidget" name="page_2"/>
148 168 </widget>
... ... @@ -867,6 +887,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/f
867 887 <header>washwarnicon.h</header>
868 888 </customwidget>
869 889 <customwidget>
  890 + <class>DemoIcon</class>
  891 + <extends>QLabel</extends>
  892 + <header>demoicon.h</header>
  893 + </customwidget>
  894 + <customwidget>
  895 + <class>HalfEnergyIcon</class>
  896 + <extends>QLabel</extends>
  897 + <header>halfenergyicon.h</header>
  898 + </customwidget>
  899 + <customwidget>
870 900 <class>AnimatedImageBox</class>
871 901 <extends>QLabel</extends>
872 902 <header>animatedimagebox.h</header>
... ...
app/gui/oven_control/autocookconfigwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -95,6 +95,26 @@ border: none;
95 95 </rect>
96 96 </property>
97 97 </widget>
  98 + <widget class="DemoIcon" name="label_2">
  99 + <property name="geometry">
  100 + <rect>
  101 + <x>780</x>
  102 + <y>230</y>
  103 + <width>101</width>
  104 + <height>90</height>
  105 + </rect>
  106 + </property>
  107 + </widget>
  108 + <widget class="HalfEnergyIcon" name="label_3">
  109 + <property name="geometry">
  110 + <rect>
  111 + <x>780</x>
  112 + <y>160</y>
  113 + <width>108</width>
  114 + <height>67</height>
  115 + </rect>
  116 + </property>
  117 + </widget>
98 118 </widget>
99 119 <widget class="QWidget" name="page_2"/>
100 120 </widget>
... ... @@ -1402,6 +1422,16 @@ border-image: url(:/images/button/152_ov.png);
1402 1422 <header>washwarnicon.h</header>
1403 1423 </customwidget>
1404 1424 <customwidget>
  1425 + <class>DemoIcon</class>
  1426 + <extends>QLabel</extends>
  1427 + <header>demoicon.h</header>
  1428 + </customwidget>
  1429 + <customwidget>
  1430 + <class>HalfEnergyIcon</class>
  1431 + <extends>QLabel</extends>
  1432 + <header>halfenergyicon.h</header>
  1433 + </customwidget>
  1434 + <customwidget>
1405 1435 <class>Slider</class>
1406 1436 <extends>QWidget</extends>
1407 1437 <header>slider.h</header>
... ...
app/gui/oven_control/autocookselectionwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -48,6 +48,26 @@
48 48 </rect>
49 49 </property>
50 50 </widget>
  51 + <widget class="DemoIcon" name="label_2">
  52 + <property name="geometry">
  53 + <rect>
  54 + <x>780</x>
  55 + <y>230</y>
  56 + <width>101</width>
  57 + <height>90</height>
  58 + </rect>
  59 + </property>
  60 + </widget>
  61 + <widget class="HalfEnergyIcon" name="label_3">
  62 + <property name="geometry">
  63 + <rect>
  64 + <x>780</x>
  65 + <y>160</y>
  66 + <width>108</width>
  67 + <height>67</height>
  68 + </rect>
  69 + </property>
  70 + </widget>
51 71 </widget>
52 72 <widget class="QWidget" name="page_2"/>
53 73 </widget>
... ... @@ -186,6 +206,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h
186 206 <extends>QLabel</extends>
187 207 <header>washwarnicon.h</header>
188 208 </customwidget>
  209 + <customwidget>
  210 + <class>DemoIcon</class>
  211 + <extends>QLabel</extends>
  212 + <header>demoicon.h</header>
  213 + </customwidget>
  214 + <customwidget>
  215 + <class>HalfEnergyIcon</class>
  216 + <extends>QLabel</extends>
  217 + <header>halfenergyicon.h</header>
  218 + </customwidget>
189 219 </customwidgets>
190 220 <resources/>
191 221 <connections/>
... ...
app/gui/oven_control/autocookwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -54,6 +54,26 @@ border: none;
54 54 </rect>
55 55 </property>
56 56 </widget>
  57 + <widget class="DemoIcon" name="label_2">
  58 + <property name="geometry">
  59 + <rect>
  60 + <x>780</x>
  61 + <y>230</y>
  62 + <width>101</width>
  63 + <height>90</height>
  64 + </rect>
  65 + </property>
  66 + </widget>
  67 + <widget class="HalfEnergyIcon" name="label_5">
  68 + <property name="geometry">
  69 + <rect>
  70 + <x>780</x>
  71 + <y>160</y>
  72 + <width>108</width>
  73 + <height>67</height>
  74 + </rect>
  75 + </property>
  76 + </widget>
57 77 </widget>
58 78 <widget class="QWidget" name="page_2"/>
59 79 </widget>
... ... @@ -1375,6 +1395,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/152_o
1375 1395 <header>washwarnicon.h</header>
1376 1396 </customwidget>
1377 1397 <customwidget>
  1398 + <class>DemoIcon</class>
  1399 + <extends>QLabel</extends>
  1400 + <header>demoicon.h</header>
  1401 + </customwidget>
  1402 + <customwidget>
  1403 + <class>HalfEnergyIcon</class>
  1404 + <extends>QLabel</extends>
  1405 + <header>halfenergyicon.h</header>
  1406 + </customwidget>
  1407 + <customwidget>
1378 1408 <class>AnimatedImageBox</class>
1379 1409 <extends>QLabel</extends>
1380 1410 <header>animatedimagebox.h</header>
... ...
app/gui/oven_control/basicsettingwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -52,6 +52,26 @@
52 52 </rect>
53 53 </property>
54 54 </widget>
  55 + <widget class="DemoIcon" name="label_2">
  56 + <property name="geometry">
  57 + <rect>
  58 + <x>780</x>
  59 + <y>230</y>
  60 + <width>101</width>
  61 + <height>90</height>
  62 + </rect>
  63 + </property>
  64 + </widget>
  65 + <widget class="HalfEnergyIcon" name="label_3">
  66 + <property name="geometry">
  67 + <rect>
  68 + <x>780</x>
  69 + <y>160</y>
  70 + <width>108</width>
  71 + <height>67</height>
  72 + </rect>
  73 + </property>
  74 + </widget>
55 75 </widget>
56 76 <widget class="QWidget" name="page_2"/>
57 77 </widget>
... ... @@ -416,6 +436,16 @@ QPushButton { text-align: left;}
416 436 <extends>QLabel</extends>
417 437 <header>washwarnicon.h</header>
418 438 </customwidget>
  439 + <customwidget>
  440 + <class>DemoIcon</class>
  441 + <extends>QLabel</extends>
  442 + <header>demoicon.h</header>
  443 + </customwidget>
  444 + <customwidget>
  445 + <class>HalfEnergyIcon</class>
  446 + <extends>QLabel</extends>
  447 + <header>halfenergyicon.h</header>
  448 + </customwidget>
419 449 </customwidgets>
420 450 <resources/>
421 451 <connections/>
... ...
app/gui/oven_control/burnertestwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -48,6 +48,26 @@
48 48 </rect>
49 49 </property>
50 50 </widget>
  51 + <widget class="DemoIcon" name="label_8">
  52 + <property name="geometry">
  53 + <rect>
  54 + <x>780</x>
  55 + <y>250</y>
  56 + <width>101</width>
  57 + <height>90</height>
  58 + </rect>
  59 + </property>
  60 + </widget>
  61 + <widget class="HalfEnergyIcon" name="label_9">
  62 + <property name="geometry">
  63 + <rect>
  64 + <x>780</x>
  65 + <y>180</y>
  66 + <width>108</width>
  67 + <height>67</height>
  68 + </rect>
  69 + </property>
  70 + </widget>
51 71 </widget>
52 72 <widget class="QWidget" name="page_2"/>
53 73 </widget>
... ... @@ -2104,6 +2124,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
2104 2124 <extends>QLabel</extends>
2105 2125 <header>washwarnicon.h</header>
2106 2126 </customwidget>
  2127 + <customwidget>
  2128 + <class>DemoIcon</class>
  2129 + <extends>QLabel</extends>
  2130 + <header>demoicon.h</header>
  2131 + </customwidget>
  2132 + <customwidget>
  2133 + <class>HalfEnergyIcon</class>
  2134 + <extends>QLabel</extends>
  2135 + <header>halfenergyicon.h</header>
  2136 + </customwidget>
2107 2137 </customwidgets>
2108 2138 <resources>
2109 2139 <include location="resources.qrc"/>
... ...
app/gui/oven_control/componenttestwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -48,6 +48,26 @@
48 48 </rect>
49 49 </property>
50 50 </widget>
  51 + <widget class="DemoIcon" name="label_8">
  52 + <property name="geometry">
  53 + <rect>
  54 + <x>780</x>
  55 + <y>230</y>
  56 + <width>101</width>
  57 + <height>90</height>
  58 + </rect>
  59 + </property>
  60 + </widget>
  61 + <widget class="HalfEnergyIcon" name="label_12">
  62 + <property name="geometry">
  63 + <rect>
  64 + <x>780</x>
  65 + <y>160</y>
  66 + <width>108</width>
  67 + <height>67</height>
  68 + </rect>
  69 + </property>
  70 + </widget>
51 71 </widget>
52 72 <widget class="QWidget" name="page_2"/>
53 73 </widget>
... ... @@ -511,6 +531,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
511 531 <extends>QLabel</extends>
512 532 <header>washwarnicon.h</header>
513 533 </customwidget>
  534 + <customwidget>
  535 + <class>DemoIcon</class>
  536 + <extends>QLabel</extends>
  537 + <header>demoicon.h</header>
  538 + </customwidget>
  539 + <customwidget>
  540 + <class>HalfEnergyIcon</class>
  541 + <extends>QLabel</extends>
  542 + <header>halfenergyicon.h</header>
  543 + </customwidget>
514 544 </customwidgets>
515 545 <resources>
516 546 <include location="resources.qrc"/>
... ...
app/gui/oven_control/configwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -87,6 +87,26 @@ background: none;
87 87 </rect>
88 88 </property>
89 89 </widget>
  90 + <widget class="DemoIcon" name="label_2">
  91 + <property name="geometry">
  92 + <rect>
  93 + <x>780</x>
  94 + <y>230</y>
  95 + <width>101</width>
  96 + <height>90</height>
  97 + </rect>
  98 + </property>
  99 + </widget>
  100 + <widget class="HalfEnergyIcon" name="label_3">
  101 + <property name="geometry">
  102 + <rect>
  103 + <x>780</x>
  104 + <y>160</y>
  105 + <width>108</width>
  106 + <height>67</height>
  107 + </rect>
  108 + </property>
  109 + </widget>
90 110 </widget>
91 111 <widget class="QWidget" name="page_2"/>
92 112 </widget>
... ... @@ -560,6 +580,16 @@ QPushButton:pressed , QPushButton:focus { border-image: url(:/images/bottom_bar/
560 580 <extends>QLabel</extends>
561 581 <header>washwarnicon.h</header>
562 582 </customwidget>
  583 + <customwidget>
  584 + <class>DemoIcon</class>
  585 + <extends>QLabel</extends>
  586 + <header>demoicon.h</header>
  587 + </customwidget>
  588 + <customwidget>
  589 + <class>HalfEnergyIcon</class>
  590 + <extends>QLabel</extends>
  591 + <header>halfenergyicon.h</header>
  592 + </customwidget>
563 593 </customwidgets>
564 594 <tabstops>
565 595 <tabstop>pushButton</tabstop>
... ...
app/gui/oven_control/electricmodelsettingwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -482,6 +482,26 @@ QPushButton:pressed, QPushButton:checked, QPushButton:focus { border-image: url(
482 482 </rect>
483 483 </property>
484 484 </widget>
  485 + <widget class="DemoIcon" name="label_2">
  486 + <property name="geometry">
  487 + <rect>
  488 + <x>780</x>
  489 + <y>230</y>
  490 + <width>101</width>
  491 + <height>90</height>
  492 + </rect>
  493 + </property>
  494 + </widget>
  495 + <widget class="HalfEnergyIcon" name="label_3">
  496 + <property name="geometry">
  497 + <rect>
  498 + <x>780</x>
  499 + <y>160</y>
  500 + <width>108</width>
  501 + <height>67</height>
  502 + </rect>
  503 + </property>
  504 + </widget>
485 505 </widget>
486 506 <widget class="QWidget" name="page_2"/>
487 507 </widget>
... ... @@ -499,6 +519,16 @@ QPushButton:pressed, QPushButton:checked, QPushButton:focus { border-image: url(
499 519 <extends>QLabel</extends>
500 520 <header>washwarnicon.h</header>
501 521 </customwidget>
  522 + <customwidget>
  523 + <class>DemoIcon</class>
  524 + <extends>QLabel</extends>
  525 + <header>demoicon.h</header>
  526 + </customwidget>
  527 + <customwidget>
  528 + <class>HalfEnergyIcon</class>
  529 + <extends>QLabel</extends>
  530 + <header>halfenergyicon.h</header>
  531 + </customwidget>
502 532 </customwidgets>
503 533 <tabstops>
504 534 <tabstop>e10Button</tabstop>
... ...
app/gui/oven_control/engineermenuwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -51,6 +51,26 @@
51 51 </rect>
52 52 </property>
53 53 </widget>
  54 + <widget class="DemoIcon" name="label_2">
  55 + <property name="geometry">
  56 + <rect>
  57 + <x>780</x>
  58 + <y>230</y>
  59 + <width>101</width>
  60 + <height>90</height>
  61 + </rect>
  62 + </property>
  63 + </widget>
  64 + <widget class="HalfEnergyIcon" name="label_3">
  65 + <property name="geometry">
  66 + <rect>
  67 + <x>780</x>
  68 + <y>160</y>
  69 + <width>108</width>
  70 + <height>67</height>
  71 + </rect>
  72 + </property>
  73 + </widget>
54 74 </widget>
55 75 <widget class="QWidget" name="page_2"/>
56 76 </widget>
... ... @@ -612,6 +632,16 @@ QPushButton { color: rgb(255, 255, 255);text-align: left;padding-left:30px;}&lt;/st
612 632 <extends>QLabel</extends>
613 633 <header>washwarnicon.h</header>
614 634 </customwidget>
  635 + <customwidget>
  636 + <class>DemoIcon</class>
  637 + <extends>QLabel</extends>
  638 + <header>demoicon.h</header>
  639 + </customwidget>
  640 + <customwidget>
  641 + <class>HalfEnergyIcon</class>
  642 + <extends>QLabel</extends>
  643 + <header>halfenergyicon.h</header>
  644 + </customwidget>
615 645 </customwidgets>
616 646 <tabstops>
617 647 <tabstop>engAdjustButton</tabstop>
... ...
app/gui/oven_control/fantestwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -48,6 +48,26 @@
48 48 </rect>
49 49 </property>
50 50 </widget>
  51 + <widget class="DemoIcon" name="label_2">
  52 + <property name="geometry">
  53 + <rect>
  54 + <x>780</x>
  55 + <y>230</y>
  56 + <width>101</width>
  57 + <height>90</height>
  58 + </rect>
  59 + </property>
  60 + </widget>
  61 + <widget class="HalfEnergyIcon" name="label_3">
  62 + <property name="geometry">
  63 + <rect>
  64 + <x>780</x>
  65 + <y>160</y>
  66 + <width>108</width>
  67 + <height>67</height>
  68 + </rect>
  69 + </property>
  70 + </widget>
51 71 </widget>
52 72 <widget class="QWidget" name="page_2"/>
53 73 </widget>
... ... @@ -750,6 +770,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
750 770 <extends>QLabel</extends>
751 771 <header>washwarnicon.h</header>
752 772 </customwidget>
  773 + <customwidget>
  774 + <class>DemoIcon</class>
  775 + <extends>QLabel</extends>
  776 + <header>demoicon.h</header>
  777 + </customwidget>
  778 + <customwidget>
  779 + <class>HalfEnergyIcon</class>
  780 + <extends>QLabel</extends>
  781 + <header>halfenergyicon.h</header>
  782 + </customwidget>
753 783 </customwidgets>
754 784 <resources>
755 785 <include location="resources.qrc"/>
... ...
app/gui/oven_control/functiontestwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -54,6 +54,26 @@
54 54 </rect>
55 55 </property>
56 56 </widget>
  57 + <widget class="DemoIcon" name="label_2">
  58 + <property name="geometry">
  59 + <rect>
  60 + <x>780</x>
  61 + <y>230</y>
  62 + <width>101</width>
  63 + <height>90</height>
  64 + </rect>
  65 + </property>
  66 + </widget>
  67 + <widget class="HalfEnergyIcon" name="label_3">
  68 + <property name="geometry">
  69 + <rect>
  70 + <x>780</x>
  71 + <y>160</y>
  72 + <width>108</width>
  73 + <height>67</height>
  74 + </rect>
  75 + </property>
  76 + </widget>
57 77 </widget>
58 78 <widget class="QWidget" name="page_2"/>
59 79 </widget>
... ... @@ -588,6 +608,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/b
588 608 <extends>QLabel</extends>
589 609 <header>washwarnicon.h</header>
590 610 </customwidget>
  611 + <customwidget>
  612 + <class>DemoIcon</class>
  613 + <extends>QLabel</extends>
  614 + <header>demoicon.h</header>
  615 + </customwidget>
  616 + <customwidget>
  617 + <class>HalfEnergyIcon</class>
  618 + <extends>QLabel</extends>
  619 + <header>halfenergyicon.h</header>
  620 + </customwidget>
591 621 </customwidgets>
592 622 <resources/>
593 623 <connections/>
... ...
app/gui/oven_control/gasmodelsettingwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -582,6 +582,26 @@ QPushButton:pressed , QPushButton::checked, QPushButton:focus{ border-image: url
582 582 </rect>
583 583 </property>
584 584 </widget>
  585 + <widget class="DemoIcon" name="label_2">
  586 + <property name="geometry">
  587 + <rect>
  588 + <x>780</x>
  589 + <y>230</y>
  590 + <width>101</width>
  591 + <height>90</height>
  592 + </rect>
  593 + </property>
  594 + </widget>
  595 + <widget class="HalfEnergyIcon" name="label_3">
  596 + <property name="geometry">
  597 + <rect>
  598 + <x>780</x>
  599 + <y>160</y>
  600 + <width>108</width>
  601 + <height>67</height>
  602 + </rect>
  603 + </property>
  604 + </widget>
585 605 </widget>
586 606 <widget class="QWidget" name="page_2"/>
587 607 </widget>
... ... @@ -699,6 +719,16 @@ QPushButton:pressed, QPushButton::checked, QPushButton:focus { border-image: url
699 719 <extends>QLabel</extends>
700 720 <header>washwarnicon.h</header>
701 721 </customwidget>
  722 + <customwidget>
  723 + <class>DemoIcon</class>
  724 + <extends>QLabel</extends>
  725 + <header>demoicon.h</header>
  726 + </customwidget>
  727 + <customwidget>
  728 + <class>HalfEnergyIcon</class>
  729 + <extends>QLabel</extends>
  730 + <header>halfenergyicon.h</header>
  731 + </customwidget>
702 732 </customwidgets>
703 733 <tabstops>
704 734 <tabstop>lpg10Button</tabstop>
... ...
app/gui/oven_control/gastestwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -48,6 +48,26 @@
48 48 </rect>
49 49 </property>
50 50 </widget>
  51 + <widget class="DemoIcon" name="label_2">
  52 + <property name="geometry">
  53 + <rect>
  54 + <x>780</x>
  55 + <y>230</y>
  56 + <width>101</width>
  57 + <height>90</height>
  58 + </rect>
  59 + </property>
  60 + </widget>
  61 + <widget class="HalfEnergyIcon" name="label_3">
  62 + <property name="geometry">
  63 + <rect>
  64 + <x>780</x>
  65 + <y>160</y>
  66 + <width>108</width>
  67 + <height>67</height>
  68 + </rect>
  69 + </property>
  70 + </widget>
51 71 </widget>
52 72 <widget class="QWidget" name="page_2"/>
53 73 </widget>
... ... @@ -132,6 +152,16 @@ QPushButton:pressed {
132 152 <extends>QLabel</extends>
133 153 <header>washwarnicon.h</header>
134 154 </customwidget>
  155 + <customwidget>
  156 + <class>DemoIcon</class>
  157 + <extends>QLabel</extends>
  158 + <header>demoicon.h</header>
  159 + </customwidget>
  160 + <customwidget>
  161 + <class>HalfEnergyIcon</class>
  162 + <extends>QLabel</extends>
  163 + <header>halfenergyicon.h</header>
  164 + </customwidget>
135 165 </customwidgets>
136 166 <resources/>
137 167 <connections/>
... ...
app/gui/oven_control/historylistwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -206,6 +206,26 @@ QPushButton:pressed , QPushButton:focus{ border-image: url(:/images/bottom_bar/0
206 206 </rect>
207 207 </property>
208 208 </widget>
  209 + <widget class="DemoIcon" name="label_6">
  210 + <property name="geometry">
  211 + <rect>
  212 + <x>780</x>
  213 + <y>230</y>
  214 + <width>101</width>
  215 + <height>90</height>
  216 + </rect>
  217 + </property>
  218 + </widget>
  219 + <widget class="HalfEnergyIcon" name="label_7">
  220 + <property name="geometry">
  221 + <rect>
  222 + <x>780</x>
  223 + <y>160</y>
  224 + <width>108</width>
  225 + <height>67</height>
  226 + </rect>
  227 + </property>
  228 + </widget>
209 229 </widget>
210 230 <widget class="QWidget" name="page_2"/>
211 231 </widget>
... ... @@ -1420,6 +1440,16 @@ QPushButton { text-align:center;}&lt;/string&gt;
1420 1440 <extends>QLabel</extends>
1421 1441 <header>washwarnicon.h</header>
1422 1442 </customwidget>
  1443 + <customwidget>
  1444 + <class>DemoIcon</class>
  1445 + <extends>QLabel</extends>
  1446 + <header>demoicon.h</header>
  1447 + </customwidget>
  1448 + <customwidget>
  1449 + <class>HalfEnergyIcon</class>
  1450 + <extends>QLabel</extends>
  1451 + <header>halfenergyicon.h</header>
  1452 + </customwidget>
1423 1453 </customwidgets>
1424 1454 <resources/>
1425 1455 <connections/>
... ...
app/gui/oven_control/mainwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -605,6 +605,35 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
605 605 <height>84</height>
606 606 </rect>
607 607 </property>
  608 + <property name="pixmap">
  609 + <pixmap resource="resources.qrc">:/images/symbol/wash.png</pixmap>
  610 + </property>
  611 + </widget>
  612 + <widget class="DemoIcon" name="label_2">
  613 + <property name="geometry">
  614 + <rect>
  615 + <x>780</x>
  616 + <y>230</y>
  617 + <width>101</width>
  618 + <height>90</height>
  619 + </rect>
  620 + </property>
  621 + <property name="pixmap">
  622 + <pixmap resource="resources.qrc">:/images/symbol/demo.png</pixmap>
  623 + </property>
  624 + </widget>
  625 + <widget class="HalfEnergyIcon" name="label_3">
  626 + <property name="geometry">
  627 + <rect>
  628 + <x>780</x>
  629 + <y>160</y>
  630 + <width>108</width>
  631 + <height>67</height>
  632 + </rect>
  633 + </property>
  634 + <property name="pixmap">
  635 + <pixmap resource="resources.qrc">:/images/symbol/half_energy.png</pixmap>
  636 + </property>
608 637 </widget>
609 638 </widget>
610 639 <widget class="QLabel" name="steamLabel_13">
... ... @@ -700,6 +729,16 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
700 729 <extends>QLabel</extends>
701 730 <header>washwarnicon.h</header>
702 731 </customwidget>
  732 + <customwidget>
  733 + <class>DemoIcon</class>
  734 + <extends>QLabel</extends>
  735 + <header>demoicon.h</header>
  736 + </customwidget>
  737 + <customwidget>
  738 + <class>HalfEnergyIcon</class>
  739 + <extends>QLabel</extends>
  740 + <header>halfenergyicon.h</header>
  741 + </customwidget>
703 742 </customwidgets>
704 743 <tabstops>
705 744 <tabstop>steamButton</tabstop>
... ... @@ -719,6 +758,8 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
719 758 <tabstop>configButton</tabstop>
720 759 <tabstop>helpButton</tabstop>
721 760 </tabstops>
722   - <resources/>
  761 + <resources>
  762 + <include location="resources.qrc"/>
  763 + </resources>
723 764 <connections/>
724 765 </ui>
... ...
app/gui/oven_control/manualcookwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -98,6 +98,26 @@ height: 33px;
98 98 </rect>
99 99 </property>
100 100 </widget>
  101 + <widget class="DemoIcon" name="label_2">
  102 + <property name="geometry">
  103 + <rect>
  104 + <x>780</x>
  105 + <y>230</y>
  106 + <width>101</width>
  107 + <height>90</height>
  108 + </rect>
  109 + </property>
  110 + </widget>
  111 + <widget class="HalfEnergyIcon" name="label_3">
  112 + <property name="geometry">
  113 + <rect>
  114 + <x>780</x>
  115 + <y>160</y>
  116 + <width>108</width>
  117 + <height>67</height>
  118 + </rect>
  119 + </property>
  120 + </widget>
101 121 </widget>
102 122 <widget class="QWidget" name="closeDoorWidget">
103 123 <property name="styleSheet">
... ... @@ -1209,9 +1229,14 @@ QPushButton:checked, QPushButton:pressed, QPushButton:focus { background-image:
1209 1229 <header>washwarnicon.h</header>
1210 1230 </customwidget>
1211 1231 <customwidget>
1212   - <class>AnimatedImageBox</class>
  1232 + <class>DemoIcon</class>
1213 1233 <extends>QLabel</extends>
1214   - <header>animatedimagebox.h</header>
  1234 + <header>demoicon.h</header>
  1235 + </customwidget>
  1236 + <customwidget>
  1237 + <class>HalfEnergyIcon</class>
  1238 + <extends>QLabel</extends>
  1239 + <header>halfenergyicon.h</header>
1215 1240 </customwidget>
1216 1241 <customwidget>
1217 1242 <class>Slider</class>
... ... @@ -1219,6 +1244,11 @@ QPushButton:checked, QPushButton:pressed, QPushButton:focus { background-image:
1219 1244 <header>slider.h</header>
1220 1245 <container>1</container>
1221 1246 </customwidget>
  1247 + <customwidget>
  1248 + <class>AnimatedImageBox</class>
  1249 + <extends>QLabel</extends>
  1250 + <header>animatedimagebox.h</header>
  1251 + </customwidget>
1222 1252 </customwidgets>
1223 1253 <tabstops>
1224 1254 <tabstop>steamButton</tabstop>
... ...
app/gui/oven_control/modelsettingwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -370,6 +370,26 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o
370 370 </rect>
371 371 </property>
372 372 </widget>
  373 + <widget class="DemoIcon" name="label_2">
  374 + <property name="geometry">
  375 + <rect>
  376 + <x>780</x>
  377 + <y>230</y>
  378 + <width>101</width>
  379 + <height>90</height>
  380 + </rect>
  381 + </property>
  382 + </widget>
  383 + <widget class="HalfEnergyIcon" name="label_3">
  384 + <property name="geometry">
  385 + <rect>
  386 + <x>780</x>
  387 + <y>160</y>
  388 + <width>108</width>
  389 + <height>67</height>
  390 + </rect>
  391 + </property>
  392 + </widget>
373 393 </widget>
374 394 <widget class="QWidget" name="page_2"/>
375 395 </widget>
... ... @@ -387,6 +407,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o
387 407 <extends>QLabel</extends>
388 408 <header>washwarnicon.h</header>
389 409 </customwidget>
  410 + <customwidget>
  411 + <class>DemoIcon</class>
  412 + <extends>QLabel</extends>
  413 + <header>demoicon.h</header>
  414 + </customwidget>
  415 + <customwidget>
  416 + <class>HalfEnergyIcon</class>
  417 + <extends>QLabel</extends>
  418 + <header>halfenergyicon.h</header>
  419 + </customwidget>
390 420 </customwidgets>
391 421 <resources/>
392 422 <connections/>
... ...
app/gui/oven_control/operationtimemain.ui
  Diff comments   View file @b7ee6dc
... ... @@ -51,6 +51,26 @@
51 51 </rect>
52 52 </property>
53 53 </widget>
  54 + <widget class="DemoIcon" name="label_3">
  55 + <property name="geometry">
  56 + <rect>
  57 + <x>780</x>
  58 + <y>230</y>
  59 + <width>101</width>
  60 + <height>90</height>
  61 + </rect>
  62 + </property>
  63 + </widget>
  64 + <widget class="HalfEnergyIcon" name="label_4">
  65 + <property name="geometry">
  66 + <rect>
  67 + <x>780</x>
  68 + <y>160</y>
  69 + <width>108</width>
  70 + <height>67</height>
  71 + </rect>
  72 + </property>
  73 + </widget>
54 74 </widget>
55 75 <widget class="QWidget" name="page_2"/>
56 76 </widget>
... ... @@ -328,6 +348,16 @@ QPushButton { text-align: center;}
328 348 <extends>QLabel</extends>
329 349 <header>washwarnicon.h</header>
330 350 </customwidget>
  351 + <customwidget>
  352 + <class>DemoIcon</class>
  353 + <extends>QLabel</extends>
  354 + <header>demoicon.h</header>
  355 + </customwidget>
  356 + <customwidget>
  357 + <class>HalfEnergyIcon</class>
  358 + <extends>QLabel</extends>
  359 + <header>halfenergyicon.h</header>
  360 + </customwidget>
331 361 </customwidgets>
332 362 <resources>
333 363 <include location="resources.qrc"/>
... ...
app/gui/oven_control/operationtimemode.ui
  Diff comments   View file @b7ee6dc
... ... @@ -52,6 +52,26 @@
52 52 </rect>
53 53 </property>
54 54 </widget>
  55 + <widget class="DemoIcon" name="label_2">
  56 + <property name="geometry">
  57 + <rect>
  58 + <x>780</x>
  59 + <y>230</y>
  60 + <width>101</width>
  61 + <height>90</height>
  62 + </rect>
  63 + </property>
  64 + </widget>
  65 + <widget class="HalfEnergyIcon" name="label_3">
  66 + <property name="geometry">
  67 + <rect>
  68 + <x>780</x>
  69 + <y>160</y>
  70 + <width>108</width>
  71 + <height>67</height>
  72 + </rect>
  73 + </property>
  74 + </widget>
55 75 </widget>
56 76 <widget class="QWidget" name="page_2"/>
57 77 </widget>
... ... @@ -784,6 +804,16 @@ QPushButton { text-align: center;}
784 804 <extends>QLabel</extends>
785 805 <header>washwarnicon.h</header>
786 806 </customwidget>
  807 + <customwidget>
  808 + <class>DemoIcon</class>
  809 + <extends>QLabel</extends>
  810 + <header>demoicon.h</header>
  811 + </customwidget>
  812 + <customwidget>
  813 + <class>HalfEnergyIcon</class>
  814 + <extends>QLabel</extends>
  815 + <header>halfenergyicon.h</header>
  816 + </customwidget>
787 817 </customwidgets>
788 818 <resources/>
789 819 <connections/>
... ...
app/gui/oven_control/operationtimeparts.ui
  Diff comments   View file @b7ee6dc
... ... @@ -52,6 +52,26 @@
52 52 </rect>
53 53 </property>
54 54 </widget>
  55 + <widget class="DemoIcon" name="label_2">
  56 + <property name="geometry">
  57 + <rect>
  58 + <x>780</x>
  59 + <y>230</y>
  60 + <width>101</width>
  61 + <height>90</height>
  62 + </rect>
  63 + </property>
  64 + </widget>
  65 + <widget class="HalfEnergyIcon" name="label_3">
  66 + <property name="geometry">
  67 + <rect>
  68 + <x>780</x>
  69 + <y>160</y>
  70 + <width>108</width>
  71 + <height>67</height>
  72 + </rect>
  73 + </property>
  74 + </widget>
55 75 </widget>
56 76 <widget class="QWidget" name="page_2"/>
57 77 </widget>
... ... @@ -1057,6 +1077,16 @@ QPushButton { text-align: center;}
1057 1077 <extends>QLabel</extends>
1058 1078 <header>washwarnicon.h</header>
1059 1079 </customwidget>
  1080 + <customwidget>
  1081 + <class>DemoIcon</class>
  1082 + <extends>QLabel</extends>
  1083 + <header>demoicon.h</header>
  1084 + </customwidget>
  1085 + <customwidget>
  1086 + <class>HalfEnergyIcon</class>
  1087 + <extends>QLabel</extends>
  1088 + <header>halfenergyicon.h</header>
  1089 + </customwidget>
1060 1090 </customwidgets>
1061 1091 <resources/>
1062 1092 <connections/>
... ...
app/gui/oven_control/primewindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -164,6 +164,26 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c
164 164 </rect>
165 165 </property>
166 166 </widget>
  167 + <widget class="DemoIcon" name="label_2">
  168 + <property name="geometry">
  169 + <rect>
  170 + <x>780</x>
  171 + <y>230</y>
  172 + <width>101</width>
  173 + <height>90</height>
  174 + </rect>
  175 + </property>
  176 + </widget>
  177 + <widget class="HalfEnergyIcon" name="label_3">
  178 + <property name="geometry">
  179 + <rect>
  180 + <x>780</x>
  181 + <y>160</y>
  182 + <width>108</width>
  183 + <height>67</height>
  184 + </rect>
  185 + </property>
  186 + </widget>
167 187 </widget>
168 188 <widget class="QWidget" name="page_2"/>
169 189 </widget>
... ... @@ -308,6 +328,16 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/etc/main
308 328 <extends>QLabel</extends>
309 329 <header>washwarnicon.h</header>
310 330 </customwidget>
  331 + <customwidget>
  332 + <class>DemoIcon</class>
  333 + <extends>QLabel</extends>
  334 + <header>demoicon.h</header>
  335 + </customwidget>
  336 + <customwidget>
  337 + <class>HalfEnergyIcon</class>
  338 + <extends>QLabel</extends>
  339 + <header>halfenergyicon.h</header>
  340 + </customwidget>
311 341 </customwidgets>
312 342 <tabstops>
313 343 <tabstop>mostCookedButton</tabstop>
... ...
app/gui/oven_control/programmingautoconfigwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -529,6 +529,26 @@ border-image: url(:/images/button/288_ov.png);
529 529 </rect>
530 530 </property>
531 531 </widget>
  532 + <widget class="DemoIcon" name="label_2">
  533 + <property name="geometry">
  534 + <rect>
  535 + <x>780</x>
  536 + <y>230</y>
  537 + <width>101</width>
  538 + <height>90</height>
  539 + </rect>
  540 + </property>
  541 + </widget>
  542 + <widget class="HalfEnergyIcon" name="label_3">
  543 + <property name="geometry">
  544 + <rect>
  545 + <x>780</x>
  546 + <y>160</y>
  547 + <width>108</width>
  548 + <height>67</height>
  549 + </rect>
  550 + </property>
  551 + </widget>
532 552 </widget>
533 553 <widget class="QWidget" name="page_2"/>
534 554 </widget>
... ... @@ -1379,6 +1399,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c
1379 1399 <header>washwarnicon.h</header>
1380 1400 </customwidget>
1381 1401 <customwidget>
  1402 + <class>DemoIcon</class>
  1403 + <extends>QLabel</extends>
  1404 + <header>demoicon.h</header>
  1405 + </customwidget>
  1406 + <customwidget>
  1407 + <class>HalfEnergyIcon</class>
  1408 + <extends>QLabel</extends>
  1409 + <header>halfenergyicon.h</header>
  1410 + </customwidget>
  1411 + <customwidget>
1382 1412 <class>Slider</class>
1383 1413 <extends>QWidget</extends>
1384 1414 <header>slider.h</header>
... ...
app/gui/oven_control/programmingautoselectionwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -132,6 +132,26 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0
132 132 </rect>
133 133 </property>
134 134 </widget>
  135 + <widget class="DemoIcon" name="label_2">
  136 + <property name="geometry">
  137 + <rect>
  138 + <x>780</x>
  139 + <y>230</y>
  140 + <width>101</width>
  141 + <height>90</height>
  142 + </rect>
  143 + </property>
  144 + </widget>
  145 + <widget class="HalfEnergyIcon" name="label_3">
  146 + <property name="geometry">
  147 + <rect>
  148 + <x>780</x>
  149 + <y>160</y>
  150 + <width>108</width>
  151 + <height>67</height>
  152 + </rect>
  153 + </property>
  154 + </widget>
135 155 </widget>
136 156 <widget class="QWidget" name="page_2"/>
137 157 </widget>
... ... @@ -168,6 +188,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0
168 188 <extends>QLabel</extends>
169 189 <header>washwarnicon.h</header>
170 190 </customwidget>
  191 + <customwidget>
  192 + <class>DemoIcon</class>
  193 + <extends>QLabel</extends>
  194 + <header>demoicon.h</header>
  195 + </customwidget>
  196 + <customwidget>
  197 + <class>HalfEnergyIcon</class>
  198 + <extends>QLabel</extends>
  199 + <header>halfenergyicon.h</header>
  200 + </customwidget>
171 201 </customwidgets>
172 202 <resources/>
173 203 <connections/>
... ...
app/gui/oven_control/programmingmanualwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -157,6 +157,26 @@ height: 33px;
157 157 </rect>
158 158 </property>
159 159 </widget>
  160 + <widget class="DemoIcon" name="label_2">
  161 + <property name="geometry">
  162 + <rect>
  163 + <x>780</x>
  164 + <y>230</y>
  165 + <width>101</width>
  166 + <height>90</height>
  167 + </rect>
  168 + </property>
  169 + </widget>
  170 + <widget class="HalfEnergyIcon" name="label_3">
  171 + <property name="geometry">
  172 + <rect>
  173 + <x>780</x>
  174 + <y>160</y>
  175 + <width>108</width>
  176 + <height>67</height>
  177 + </rect>
  178 + </property>
  179 + </widget>
160 180 </widget>
161 181 <widget class="QWidget" name="closeDoorWidget">
162 182 <property name="styleSheet">
... ... @@ -929,9 +949,14 @@ QPushButton:checked { background-image: url(:/images/cook_mode/big_combi.png); }
929 949 <header>washwarnicon.h</header>
930 950 </customwidget>
931 951 <customwidget>
932   - <class>AnimatedImageBox</class>
  952 + <class>DemoIcon</class>
933 953 <extends>QLabel</extends>
934   - <header>animatedimagebox.h</header>
  954 + <header>demoicon.h</header>
  955 + </customwidget>
  956 + <customwidget>
  957 + <class>HalfEnergyIcon</class>
  958 + <extends>QLabel</extends>
  959 + <header>halfenergyicon.h</header>
935 960 </customwidget>
936 961 <customwidget>
937 962 <class>Slider</class>
... ... @@ -939,6 +964,11 @@ QPushButton:checked { background-image: url(:/images/cook_mode/big_combi.png); }
939 964 <header>slider.h</header>
940 965 <container>1</container>
941 966 </customwidget>
  967 + <customwidget>
  968 + <class>AnimatedImageBox</class>
  969 + <extends>QLabel</extends>
  970 + <header>animatedimagebox.h</header>
  971 + </customwidget>
942 972 </customwidgets>
943 973 <tabstops>
944 974 <tabstop>steamButton</tabstop>
... ...
app/gui/oven_control/programmingselectionwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -675,6 +675,26 @@ QPushButton:disabled { background-image: url(:/images/cook_type/additional_hide.
675 675 </rect>
676 676 </property>
677 677 </widget>
  678 + <widget class="DemoIcon" name="label_2">
  679 + <property name="geometry">
  680 + <rect>
  681 + <x>780</x>
  682 + <y>230</y>
  683 + <width>101</width>
  684 + <height>90</height>
  685 + </rect>
  686 + </property>
  687 + </widget>
  688 + <widget class="HalfEnergyIcon" name="label_3">
  689 + <property name="geometry">
  690 + <rect>
  691 + <x>780</x>
  692 + <y>160</y>
  693 + <width>108</width>
  694 + <height>67</height>
  695 + </rect>
  696 + </property>
  697 + </widget>
678 698 </widget>
679 699 <widget class="QPushButton" name="breadButton">
680 700 <property name="enabled">
... ... @@ -720,6 +740,16 @@ QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png);
720 740 <extends>QLabel</extends>
721 741 <header>washwarnicon.h</header>
722 742 </customwidget>
  743 + <customwidget>
  744 + <class>DemoIcon</class>
  745 + <extends>QLabel</extends>
  746 + <header>demoicon.h</header>
  747 + </customwidget>
  748 + <customwidget>
  749 + <class>HalfEnergyIcon</class>
  750 + <extends>QLabel</extends>
  751 + <header>halfenergyicon.h</header>
  752 + </customwidget>
723 753 </customwidgets>
724 754 <tabstops>
725 755 <tabstop>steamButton</tabstop>
... ...
app/gui/oven_control/programmingwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -95,6 +95,26 @@ background: none;
95 95 </rect>
96 96 </property>
97 97 </widget>
  98 + <widget class="DemoIcon" name="label_2">
  99 + <property name="geometry">
  100 + <rect>
  101 + <x>780</x>
  102 + <y>230</y>
  103 + <width>101</width>
  104 + <height>90</height>
  105 + </rect>
  106 + </property>
  107 + </widget>
  108 + <widget class="HalfEnergyIcon" name="label_3">
  109 + <property name="geometry">
  110 + <rect>
  111 + <x>780</x>
  112 + <y>160</y>
  113 + <width>108</width>
  114 + <height>67</height>
  115 + </rect>
  116 + </property>
  117 + </widget>
98 118 </widget>
99 119 <widget class="QWidget" name="page_2"/>
100 120 </widget>
... ... @@ -291,6 +311,16 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/etc/bar_
291 311 <extends>QLabel</extends>
292 312 <header>washwarnicon.h</header>
293 313 </customwidget>
  314 + <customwidget>
  315 + <class>DemoIcon</class>
  316 + <extends>QLabel</extends>
  317 + <header>demoicon.h</header>
  318 + </customwidget>
  319 + <customwidget>
  320 + <class>HalfEnergyIcon</class>
  321 + <extends>QLabel</extends>
  322 + <header>halfenergyicon.h</header>
  323 + </customwidget>
294 324 </customwidgets>
295 325 <tabstops>
296 326 <tabstop>autoButton</tabstop>
... ...
app/gui/oven_control/realtimemain.ui
  Diff comments   View file @b7ee6dc
... ... @@ -51,6 +51,26 @@
51 51 </rect>
52 52 </property>
53 53 </widget>
  54 + <widget class="DemoIcon" name="label_3">
  55 + <property name="geometry">
  56 + <rect>
  57 + <x>780</x>
  58 + <y>230</y>
  59 + <width>101</width>
  60 + <height>90</height>
  61 + </rect>
  62 + </property>
  63 + </widget>
  64 + <widget class="HalfEnergyIcon" name="label_4">
  65 + <property name="geometry">
  66 + <rect>
  67 + <x>780</x>
  68 + <y>160</y>
  69 + <width>108</width>
  70 + <height>67</height>
  71 + </rect>
  72 + </property>
  73 + </widget>
54 74 </widget>
55 75 <widget class="QWidget" name="page_2"/>
56 76 </widget>
... ... @@ -292,6 +312,16 @@ QPushButton { text-align: center;}
292 312 <extends>QLabel</extends>
293 313 <header>washwarnicon.h</header>
294 314 </customwidget>
  315 + <customwidget>
  316 + <class>DemoIcon</class>
  317 + <extends>QLabel</extends>
  318 + <header>demoicon.h</header>
  319 + </customwidget>
  320 + <customwidget>
  321 + <class>HalfEnergyIcon</class>
  322 + <extends>QLabel</extends>
  323 + <header>halfenergyicon.h</header>
  324 + </customwidget>
295 325 </customwidgets>
296 326 <resources>
297 327 <include location="resources.qrc"/>
... ...
app/gui/oven_control/realtimepartswindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -52,6 +52,26 @@
52 52 </rect>
53 53 </property>
54 54 </widget>
  55 + <widget class="DemoIcon" name="label_2">
  56 + <property name="geometry">
  57 + <rect>
  58 + <x>780</x>
  59 + <y>230</y>
  60 + <width>101</width>
  61 + <height>90</height>
  62 + </rect>
  63 + </property>
  64 + </widget>
  65 + <widget class="HalfEnergyIcon" name="label_3">
  66 + <property name="geometry">
  67 + <rect>
  68 + <x>780</x>
  69 + <y>160</y>
  70 + <width>108</width>
  71 + <height>67</height>
  72 + </rect>
  73 + </property>
  74 + </widget>
55 75 </widget>
56 76 <widget class="QWidget" name="page_2"/>
57 77 </widget>
... ... @@ -1034,6 +1054,16 @@ QPushButton { text-align: center;}
1034 1054 <extends>QLabel</extends>
1035 1055 <header>washwarnicon.h</header>
1036 1056 </customwidget>
  1057 + <customwidget>
  1058 + <class>DemoIcon</class>
  1059 + <extends>QLabel</extends>
  1060 + <header>demoicon.h</header>
  1061 + </customwidget>
  1062 + <customwidget>
  1063 + <class>HalfEnergyIcon</class>
  1064 + <extends>QLabel</extends>
  1065 + <header>halfenergyicon.h</header>
  1066 + </customwidget>
1037 1067 </customwidgets>
1038 1068 <resources/>
1039 1069 <connections/>
... ...
app/gui/oven_control/realtimesensorwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -52,6 +52,26 @@
52 52 </rect>
53 53 </property>
54 54 </widget>
  55 + <widget class="DemoIcon" name="label_2">
  56 + <property name="geometry">
  57 + <rect>
  58 + <x>780</x>
  59 + <y>230</y>
  60 + <width>101</width>
  61 + <height>90</height>
  62 + </rect>
  63 + </property>
  64 + </widget>
  65 + <widget class="HalfEnergyIcon" name="label_3">
  66 + <property name="geometry">
  67 + <rect>
  68 + <x>780</x>
  69 + <y>160</y>
  70 + <width>108</width>
  71 + <height>67</height>
  72 + </rect>
  73 + </property>
  74 + </widget>
55 75 </widget>
56 76 <widget class="QWidget" name="page_2"/>
57 77 </widget>
... ... @@ -1371,6 +1391,16 @@ QPushButton { text-align: center;}
1371 1391 <extends>QLabel</extends>
1372 1392 <header>washwarnicon.h</header>
1373 1393 </customwidget>
  1394 + <customwidget>
  1395 + <class>DemoIcon</class>
  1396 + <extends>QLabel</extends>
  1397 + <header>demoicon.h</header>
  1398 + </customwidget>
  1399 + <customwidget>
  1400 + <class>HalfEnergyIcon</class>
  1401 + <extends>QLabel</extends>
  1402 + <header>halfenergyicon.h</header>
  1403 + </customwidget>
1374 1404 </customwidgets>
1375 1405 <resources/>
1376 1406 <connections/>
... ...
app/gui/oven_control/servicehistorymain.ui
  Diff comments   View file @b7ee6dc
... ... @@ -51,6 +51,26 @@
51 51 </rect>
52 52 </property>
53 53 </widget>
  54 + <widget class="DemoIcon" name="label_3">
  55 + <property name="geometry">
  56 + <rect>
  57 + <x>780</x>
  58 + <y>230</y>
  59 + <width>101</width>
  60 + <height>90</height>
  61 + </rect>
  62 + </property>
  63 + </widget>
  64 + <widget class="HalfEnergyIcon" name="label_4">
  65 + <property name="geometry">
  66 + <rect>
  67 + <x>780</x>
  68 + <y>160</y>
  69 + <width>108</width>
  70 + <height>67</height>
  71 + </rect>
  72 + </property>
  73 + </widget>
54 74 </widget>
55 75 <widget class="QWidget" name="page_2"/>
56 76 </widget>
... ... @@ -364,6 +384,16 @@ QPushButton { text-align: center;}
364 384 <extends>QLabel</extends>
365 385 <header>washwarnicon.h</header>
366 386 </customwidget>
  387 + <customwidget>
  388 + <class>DemoIcon</class>
  389 + <extends>QLabel</extends>
  390 + <header>demoicon.h</header>
  391 + </customwidget>
  392 + <customwidget>
  393 + <class>HalfEnergyIcon</class>
  394 + <extends>QLabel</extends>
  395 + <header>halfenergyicon.h</header>
  396 + </customwidget>
367 397 </customwidgets>
368 398 <resources>
369 399 <include location="resources.qrc"/>
... ...
app/gui/oven_control/valvetestwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -48,6 +48,26 @@
48 48 </rect>
49 49 </property>
50 50 </widget>
  51 + <widget class="DemoIcon" name="label_17">
  52 + <property name="geometry">
  53 + <rect>
  54 + <x>780</x>
  55 + <y>230</y>
  56 + <width>101</width>
  57 + <height>90</height>
  58 + </rect>
  59 + </property>
  60 + </widget>
  61 + <widget class="HalfEnergyIcon" name="label_18">
  62 + <property name="geometry">
  63 + <rect>
  64 + <x>780</x>
  65 + <y>160</y>
  66 + <width>108</width>
  67 + <height>67</height>
  68 + </rect>
  69 + </property>
  70 + </widget>
51 71 </widget>
52 72 <widget class="QWidget" name="page_2"/>
53 73 </widget>
... ... @@ -1175,6 +1195,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
1175 1195 <extends>QLabel</extends>
1176 1196 <header>washwarnicon.h</header>
1177 1197 </customwidget>
  1198 + <customwidget>
  1199 + <class>DemoIcon</class>
  1200 + <extends>QLabel</extends>
  1201 + <header>demoicon.h</header>
  1202 + </customwidget>
  1203 + <customwidget>
  1204 + <class>HalfEnergyIcon</class>
  1205 + <extends>QLabel</extends>
  1206 + <header>halfenergyicon.h</header>
  1207 + </customwidget>
1178 1208 </customwidgets>
1179 1209 <resources>
1180 1210 <include location="resources.qrc"/>
... ...
app/gui/oven_control/washtestwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -48,6 +48,26 @@
48 48 </rect>
49 49 </property>
50 50 </widget>
  51 + <widget class="DemoIcon" name="label_15">
  52 + <property name="geometry">
  53 + <rect>
  54 + <x>780</x>
  55 + <y>230</y>
  56 + <width>101</width>
  57 + <height>90</height>
  58 + </rect>
  59 + </property>
  60 + </widget>
  61 + <widget class="HalfEnergyIcon" name="label_16">
  62 + <property name="geometry">
  63 + <rect>
  64 + <x>780</x>
  65 + <y>160</y>
  66 + <width>108</width>
  67 + <height>67</height>
  68 + </rect>
  69 + </property>
  70 + </widget>
51 71 </widget>
52 72 <widget class="QWidget" name="page_2"/>
53 73 </widget>
... ... @@ -661,6 +681,16 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
661 681 <extends>QLabel</extends>
662 682 <header>washwarnicon.h</header>
663 683 </customwidget>
  684 + <customwidget>
  685 + <class>DemoIcon</class>
  686 + <extends>QLabel</extends>
  687 + <header>demoicon.h</header>
  688 + </customwidget>
  689 + <customwidget>
  690 + <class>HalfEnergyIcon</class>
  691 + <extends>QLabel</extends>
  692 + <header>halfenergyicon.h</header>
  693 + </customwidget>
664 694 </customwidgets>
665 695 <resources>
666 696 <include location="resources.qrc"/>
... ...
app/gui/oven_control/washwindow.ui
  Diff comments   View file @b7ee6dc
... ... @@ -91,6 +91,26 @@ border: none;
91 91 </rect>
92 92 </property>
93 93 </widget>
  94 + <widget class="DemoIcon" name="label_3">
  95 + <property name="geometry">
  96 + <rect>
  97 + <x>780</x>
  98 + <y>230</y>
  99 + <width>101</width>
  100 + <height>90</height>
  101 + </rect>
  102 + </property>
  103 + </widget>
  104 + <widget class="HalfEnergyIcon" name="label_4">
  105 + <property name="geometry">
  106 + <rect>
  107 + <x>780</x>
  108 + <y>160</y>
  109 + <width>108</width>
  110 + <height>67</height>
  111 + </rect>
  112 + </property>
  113 + </widget>
94 114 </widget>
95 115 <widget class="QWidget" name="progressContainer">
96 116 <property name="styleSheet">
... ... @@ -1181,6 +1201,16 @@ QPushButton:pressed { image: url(:/images/slider_icon/clean_ov.png); }&lt;/string&gt;
1181 1201 <header>washwarnicon.h</header>
1182 1202 </customwidget>
1183 1203 <customwidget>
  1204 + <class>DemoIcon</class>
  1205 + <extends>QLabel</extends>
  1206 + <header>demoicon.h</header>
  1207 + </customwidget>
  1208 + <customwidget>
  1209 + <class>HalfEnergyIcon</class>
  1210 + <extends>QLabel</extends>
  1211 + <header>halfenergyicon.h</header>
  1212 + </customwidget>
  1213 + <customwidget>
1184 1214 <class>AnimatedImageBox</class>
1185 1215 <extends>QLabel</extends>
1186 1216 <header>animatedimagebox.h</header>
... ...