Commit 16ef5d842d393dc4d1cc611c2b5b99e2eca29fb3
1 parent
a8bd59df85
Exists in
master
V2.0.01
Showing
54 changed files
with
742 additions
and
4439 deletions
Show diff stats
app/gui/oven_control/adjustmentwindow.ui
| @@ -27,76 +27,10 @@ | @@ -27,76 +27,10 @@ | ||
| 27 | <height>426</height> | 27 | <height>426</height> |
| 28 | </rect> | 28 | </rect> |
| 29 | </property> | 29 | </property> |
| 30 | - <widget class="QWidget" name="clockContainer"> | 30 | + <widget class="StatusArea" name="clockContainer"> |
| 31 | <property name="styleSheet"> | 31 | <property name="styleSheet"> |
| 32 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 32 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 33 | </property> | 33 | </property> |
| 34 | - <widget class="Clock" name="clock" native="true"> | ||
| 35 | - <property name="geometry"> | ||
| 36 | - <rect> | ||
| 37 | - <x>272</x> | ||
| 38 | - <y>36</y> | ||
| 39 | - <width>356</width> | ||
| 40 | - <height>355</height> | ||
| 41 | - </rect> | ||
| 42 | - </property> | ||
| 43 | - </widget> | ||
| 44 | - <widget class="WashWarnIcon" name="label_2"> | ||
| 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> | ||
| 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> | ||
| 74 | - <widget class="DigitalClock" name="label_5"> | ||
| 75 | - <property name="geometry"> | ||
| 76 | - <rect> | ||
| 77 | - <x>20</x> | ||
| 78 | - <y>310</y> | ||
| 79 | - <width>600</width> | ||
| 80 | - <height>100</height> | ||
| 81 | - </rect> | ||
| 82 | - </property> | ||
| 83 | - <property name="alignment"> | ||
| 84 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 85 | - </property> | ||
| 86 | - </widget> | ||
| 87 | - <widget class="IgnitionIcon" name="label_7"> | ||
| 88 | - <property name="geometry"> | ||
| 89 | - <rect> | ||
| 90 | - <x>662</x> | ||
| 91 | - <y>164</y> | ||
| 92 | - <width>111</width> | ||
| 93 | - <height>121</height> | ||
| 94 | - </rect> | ||
| 95 | - </property> | ||
| 96 | - <property name="text"> | ||
| 97 | - <string/> | ||
| 98 | - </property> | ||
| 99 | - </widget> | ||
| 100 | </widget> | 34 | </widget> |
| 101 | <widget class="QWidget" name="page_2"/> | 35 | <widget class="QWidget" name="page_2"/> |
| 102 | </widget> | 36 | </widget> |
| @@ -373,19 +307,6 @@ QPushButton { | @@ -373,19 +307,6 @@ QPushButton { | ||
| 373 | </size> | 307 | </size> |
| 374 | </property> | 308 | </property> |
| 375 | </widget> | 309 | </widget> |
| 376 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 377 | - <property name="geometry"> | ||
| 378 | - <rect> | ||
| 379 | - <x>670</x> | ||
| 380 | - <y>290</y> | ||
| 381 | - <width>111</width> | ||
| 382 | - <height>121</height> | ||
| 383 | - </rect> | ||
| 384 | - </property> | ||
| 385 | - <property name="text"> | ||
| 386 | - <string/> | ||
| 387 | - </property> | ||
| 388 | - </widget> | ||
| 389 | <zorder>label</zorder> | 310 | <zorder>label</zorder> |
| 390 | <zorder>upperStack</zorder> | 311 | <zorder>upperStack</zorder> |
| 391 | <zorder>label_15</zorder> | 312 | <zorder>label_15</zorder> |
| @@ -394,46 +315,15 @@ QPushButton { | @@ -394,46 +315,15 @@ QPushButton { | ||
| 394 | <zorder>btnAdjust</zorder> | 315 | <zorder>btnAdjust</zorder> |
| 395 | <zorder>btnAdjust_LCD</zorder> | 316 | <zorder>btnAdjust_LCD</zorder> |
| 396 | <zorder>btnClearWashData</zorder> | 317 | <zorder>btnClearWashData</zorder> |
| 397 | - <zorder>label_6</zorder> | ||
| 398 | </widget> | 318 | </widget> |
| 399 | </widget> | 319 | </widget> |
| 400 | <customwidgets> | 320 | <customwidgets> |
| 401 | <customwidget> | 321 | <customwidget> |
| 402 | - <class>Clock</class> | 322 | + <class>StatusArea</class> |
| 403 | <extends>QWidget</extends> | 323 | <extends>QWidget</extends> |
| 404 | - <header>clock.h</header> | 324 | + <header>statusarea.h</header> |
| 405 | <container>1</container> | 325 | <container>1</container> |
| 406 | </customwidget> | 326 | </customwidget> |
| 407 | - <customwidget> | ||
| 408 | - <class>WashWarnIcon</class> | ||
| 409 | - <extends>QLabel</extends> | ||
| 410 | - <header>washwarnicon.h</header> | ||
| 411 | - </customwidget> | ||
| 412 | - <customwidget> | ||
| 413 | - <class>DemoIcon</class> | ||
| 414 | - <extends>QLabel</extends> | ||
| 415 | - <header>demoicon.h</header> | ||
| 416 | - </customwidget> | ||
| 417 | - <customwidget> | ||
| 418 | - <class>HalfEnergyIcon</class> | ||
| 419 | - <extends>QLabel</extends> | ||
| 420 | - <header>halfenergyicon.h</header> | ||
| 421 | - </customwidget> | ||
| 422 | - <customwidget> | ||
| 423 | - <class>DigitalClock</class> | ||
| 424 | - <extends>QLabel</extends> | ||
| 425 | - <header>digitalclock.h</header> | ||
| 426 | - </customwidget> | ||
| 427 | - <customwidget> | ||
| 428 | - <class>IgnitionIcon</class> | ||
| 429 | - <extends>QLabel</extends> | ||
| 430 | - <header>ignitionicon.h</header> | ||
| 431 | - </customwidget> | ||
| 432 | - <customwidget> | ||
| 433 | - <class>WaterLevelIcon</class> | ||
| 434 | - <extends>QLabel</extends> | ||
| 435 | - <header>waterlevelicon.h</header> | ||
| 436 | - </customwidget> | ||
| 437 | </customwidgets> | 327 | </customwidgets> |
| 438 | <resources> | 328 | <resources> |
| 439 | <include location="resources.qrc"/> | 329 | <include location="resources.qrc"/> |
app/gui/oven_control/autocookcheckconfigwindow.ui
| @@ -314,76 +314,10 @@ border: none; | @@ -314,76 +314,10 @@ border: none; | ||
| 314 | <height>426</height> | 314 | <height>426</height> |
| 315 | </rect> | 315 | </rect> |
| 316 | </property> | 316 | </property> |
| 317 | - <widget class="QWidget" name="clockContainer"> | 317 | + <widget class="StatusArea" name="clockContainer"> |
| 318 | <property name="styleSheet"> | 318 | <property name="styleSheet"> |
| 319 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 319 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 320 | </property> | 320 | </property> |
| 321 | - <widget class="Clock" name="clock" native="true"> | ||
| 322 | - <property name="geometry"> | ||
| 323 | - <rect> | ||
| 324 | - <x>272</x> | ||
| 325 | - <y>36</y> | ||
| 326 | - <width>356</width> | ||
| 327 | - <height>355</height> | ||
| 328 | - </rect> | ||
| 329 | - </property> | ||
| 330 | - </widget> | ||
| 331 | - <widget class="WashWarnIcon" name="label"> | ||
| 332 | - <property name="geometry"> | ||
| 333 | - <rect> | ||
| 334 | - <x>800</x> | ||
| 335 | - <y>320</y> | ||
| 336 | - <width>80</width> | ||
| 337 | - <height>84</height> | ||
| 338 | - </rect> | ||
| 339 | - </property> | ||
| 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> | ||
| 361 | - <widget class="DigitalClock" name="label_4"> | ||
| 362 | - <property name="geometry"> | ||
| 363 | - <rect> | ||
| 364 | - <x>20</x> | ||
| 365 | - <y>310</y> | ||
| 366 | - <width>600</width> | ||
| 367 | - <height>100</height> | ||
| 368 | - </rect> | ||
| 369 | - </property> | ||
| 370 | - <property name="alignment"> | ||
| 371 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 372 | - </property> | ||
| 373 | - </widget> | ||
| 374 | - <widget class="IgnitionIcon" name="label_5"> | ||
| 375 | - <property name="geometry"> | ||
| 376 | - <rect> | ||
| 377 | - <x>662</x> | ||
| 378 | - <y>164</y> | ||
| 379 | - <width>111</width> | ||
| 380 | - <height>121</height> | ||
| 381 | - </rect> | ||
| 382 | - </property> | ||
| 383 | - <property name="text"> | ||
| 384 | - <string/> | ||
| 385 | - </property> | ||
| 386 | - </widget> | ||
| 387 | </widget> | 321 | </widget> |
| 388 | <widget class="QWidget" name="page_2"/> | 322 | <widget class="QWidget" name="page_2"/> |
| 389 | </widget> | 323 | </widget> |
| @@ -1346,59 +1280,16 @@ border-image: url(:/images/button/288_ov.png); | @@ -1346,59 +1280,16 @@ border-image: url(:/images/button/288_ov.png); | ||
| 1346 | <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> | 1280 | <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> |
| 1347 | </property> | 1281 | </property> |
| 1348 | </widget> | 1282 | </widget> |
| 1349 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 1350 | - <property name="geometry"> | ||
| 1351 | - <rect> | ||
| 1352 | - <x>670</x> | ||
| 1353 | - <y>290</y> | ||
| 1354 | - <width>111</width> | ||
| 1355 | - <height>121</height> | ||
| 1356 | - </rect> | ||
| 1357 | - </property> | ||
| 1358 | - <property name="text"> | ||
| 1359 | - <string/> | ||
| 1360 | - </property> | ||
| 1361 | - </widget> | ||
| 1362 | </widget> | 1283 | </widget> |
| 1363 | </widget> | 1284 | </widget> |
| 1364 | <customwidgets> | 1285 | <customwidgets> |
| 1365 | <customwidget> | 1286 | <customwidget> |
| 1366 | - <class>Clock</class> | 1287 | + <class>StatusArea</class> |
| 1367 | <extends>QWidget</extends> | 1288 | <extends>QWidget</extends> |
| 1368 | - <header>clock.h</header> | 1289 | + <header>statusarea.h</header> |
| 1369 | <container>1</container> | 1290 | <container>1</container> |
| 1370 | </customwidget> | 1291 | </customwidget> |
| 1371 | <customwidget> | 1292 | <customwidget> |
| 1372 | - <class>WashWarnIcon</class> | ||
| 1373 | - <extends>QLabel</extends> | ||
| 1374 | - <header>washwarnicon.h</header> | ||
| 1375 | - </customwidget> | ||
| 1376 | - <customwidget> | ||
| 1377 | - <class>DemoIcon</class> | ||
| 1378 | - <extends>QLabel</extends> | ||
| 1379 | - <header>demoicon.h</header> | ||
| 1380 | - </customwidget> | ||
| 1381 | - <customwidget> | ||
| 1382 | - <class>HalfEnergyIcon</class> | ||
| 1383 | - <extends>QLabel</extends> | ||
| 1384 | - <header>halfenergyicon.h</header> | ||
| 1385 | - </customwidget> | ||
| 1386 | - <customwidget> | ||
| 1387 | - <class>DigitalClock</class> | ||
| 1388 | - <extends>QLabel</extends> | ||
| 1389 | - <header>digitalclock.h</header> | ||
| 1390 | - </customwidget> | ||
| 1391 | - <customwidget> | ||
| 1392 | - <class>IgnitionIcon</class> | ||
| 1393 | - <extends>QLabel</extends> | ||
| 1394 | - <header>ignitionicon.h</header> | ||
| 1395 | - </customwidget> | ||
| 1396 | - <customwidget> | ||
| 1397 | - <class>WaterLevelIcon</class> | ||
| 1398 | - <extends>QLabel</extends> | ||
| 1399 | - <header>waterlevelicon.h</header> | ||
| 1400 | - </customwidget> | ||
| 1401 | - <customwidget> | ||
| 1402 | <class>Slider</class> | 1293 | <class>Slider</class> |
| 1403 | <extends>QWidget</extends> | 1294 | <extends>QWidget</extends> |
| 1404 | <header>slider.h</header> | 1295 | <header>slider.h</header> |
app/gui/oven_control/autocookcheckwindow.ui
| @@ -119,89 +119,10 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/auto_bu | @@ -119,89 +119,10 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/auto_bu | ||
| 119 | <height>426</height> | 119 | <height>426</height> |
| 120 | </rect> | 120 | </rect> |
| 121 | </property> | 121 | </property> |
| 122 | - <widget class="QWidget" name="clockContainer"> | 122 | + <widget class="StatusArea" name="clockContainer"> |
| 123 | <property name="styleSheet"> | 123 | <property name="styleSheet"> |
| 124 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 124 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 125 | </property> | 125 | </property> |
| 126 | - <widget class="Clock" name="clock" native="true"> | ||
| 127 | - <property name="geometry"> | ||
| 128 | - <rect> | ||
| 129 | - <x>272</x> | ||
| 130 | - <y>36</y> | ||
| 131 | - <width>356</width> | ||
| 132 | - <height>355</height> | ||
| 133 | - </rect> | ||
| 134 | - </property> | ||
| 135 | - </widget> | ||
| 136 | - <widget class="WashWarnIcon" name="label"> | ||
| 137 | - <property name="geometry"> | ||
| 138 | - <rect> | ||
| 139 | - <x>800</x> | ||
| 140 | - <y>320</y> | ||
| 141 | - <width>80</width> | ||
| 142 | - <height>84</height> | ||
| 143 | - </rect> | ||
| 144 | - </property> | ||
| 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> | ||
| 166 | - <widget class="DigitalClock" name="label_5"> | ||
| 167 | - <property name="geometry"> | ||
| 168 | - <rect> | ||
| 169 | - <x>20</x> | ||
| 170 | - <y>310</y> | ||
| 171 | - <width>600</width> | ||
| 172 | - <height>100</height> | ||
| 173 | - </rect> | ||
| 174 | - </property> | ||
| 175 | - <property name="alignment"> | ||
| 176 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 177 | - </property> | ||
| 178 | - </widget> | ||
| 179 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 180 | - <property name="geometry"> | ||
| 181 | - <rect> | ||
| 182 | - <x>670</x> | ||
| 183 | - <y>290</y> | ||
| 184 | - <width>111</width> | ||
| 185 | - <height>121</height> | ||
| 186 | - </rect> | ||
| 187 | - </property> | ||
| 188 | - <property name="text"> | ||
| 189 | - <string/> | ||
| 190 | - </property> | ||
| 191 | - </widget> | ||
| 192 | - <widget class="IgnitionIcon" name="label_7"> | ||
| 193 | - <property name="geometry"> | ||
| 194 | - <rect> | ||
| 195 | - <x>662</x> | ||
| 196 | - <y>164</y> | ||
| 197 | - <width>111</width> | ||
| 198 | - <height>121</height> | ||
| 199 | - </rect> | ||
| 200 | - </property> | ||
| 201 | - <property name="text"> | ||
| 202 | - <string/> | ||
| 203 | - </property> | ||
| 204 | - </widget> | ||
| 205 | </widget> | 126 | </widget> |
| 206 | <widget class="QWidget" name="page_2"/> | 127 | <widget class="QWidget" name="page_2"/> |
| 207 | </widget> | 128 | </widget> |
| @@ -823,42 +744,12 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/b | @@ -823,42 +744,12 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/b | ||
| 823 | </widget> | 744 | </widget> |
| 824 | <customwidgets> | 745 | <customwidgets> |
| 825 | <customwidget> | 746 | <customwidget> |
| 826 | - <class>Clock</class> | 747 | + <class>StatusArea</class> |
| 827 | <extends>QWidget</extends> | 748 | <extends>QWidget</extends> |
| 828 | - <header>clock.h</header> | 749 | + <header>statusarea.h</header> |
| 829 | <container>1</container> | 750 | <container>1</container> |
| 830 | </customwidget> | 751 | </customwidget> |
| 831 | <customwidget> | 752 | <customwidget> |
| 832 | - <class>WashWarnIcon</class> | ||
| 833 | - <extends>QLabel</extends> | ||
| 834 | - <header>washwarnicon.h</header> | ||
| 835 | - </customwidget> | ||
| 836 | - <customwidget> | ||
| 837 | - <class>DemoIcon</class> | ||
| 838 | - <extends>QLabel</extends> | ||
| 839 | - <header>demoicon.h</header> | ||
| 840 | - </customwidget> | ||
| 841 | - <customwidget> | ||
| 842 | - <class>HalfEnergyIcon</class> | ||
| 843 | - <extends>QLabel</extends> | ||
| 844 | - <header>halfenergyicon.h</header> | ||
| 845 | - </customwidget> | ||
| 846 | - <customwidget> | ||
| 847 | - <class>DigitalClock</class> | ||
| 848 | - <extends>QLabel</extends> | ||
| 849 | - <header>digitalclock.h</header> | ||
| 850 | - </customwidget> | ||
| 851 | - <customwidget> | ||
| 852 | - <class>IgnitionIcon</class> | ||
| 853 | - <extends>QLabel</extends> | ||
| 854 | - <header>ignitionicon.h</header> | ||
| 855 | - </customwidget> | ||
| 856 | - <customwidget> | ||
| 857 | - <class>WaterLevelIcon</class> | ||
| 858 | - <extends>QLabel</extends> | ||
| 859 | - <header>waterlevelicon.h</header> | ||
| 860 | - </customwidget> | ||
| 861 | - <customwidget> | ||
| 862 | <class>AnimatedImageBox</class> | 753 | <class>AnimatedImageBox</class> |
| 863 | <extends>QLabel</extends> | 754 | <extends>QLabel</extends> |
| 864 | <header>animatedimagebox.h</header> | 755 | <header>animatedimagebox.h</header> |
app/gui/oven_control/autocookconfigwindow.ui
| @@ -71,89 +71,10 @@ border: none; | @@ -71,89 +71,10 @@ border: none; | ||
| 71 | <height>426</height> | 71 | <height>426</height> |
| 72 | </rect> | 72 | </rect> |
| 73 | </property> | 73 | </property> |
| 74 | - <widget class="QWidget" name="clockContainer"> | 74 | + <widget class="StatusArea" name="clockContainer"> |
| 75 | <property name="styleSheet"> | 75 | <property name="styleSheet"> |
| 76 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 76 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 77 | </property> | 77 | </property> |
| 78 | - <widget class="Clock" name="clock" native="true"> | ||
| 79 | - <property name="geometry"> | ||
| 80 | - <rect> | ||
| 81 | - <x>272</x> | ||
| 82 | - <y>36</y> | ||
| 83 | - <width>356</width> | ||
| 84 | - <height>355</height> | ||
| 85 | - </rect> | ||
| 86 | - </property> | ||
| 87 | - </widget> | ||
| 88 | - <widget class="WashWarnIcon" name="label"> | ||
| 89 | - <property name="geometry"> | ||
| 90 | - <rect> | ||
| 91 | - <x>800</x> | ||
| 92 | - <y>320</y> | ||
| 93 | - <width>80</width> | ||
| 94 | - <height>84</height> | ||
| 95 | - </rect> | ||
| 96 | - </property> | ||
| 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> | ||
| 118 | - <widget class="DigitalClock" name="label_4"> | ||
| 119 | - <property name="geometry"> | ||
| 120 | - <rect> | ||
| 121 | - <x>20</x> | ||
| 122 | - <y>310</y> | ||
| 123 | - <width>600</width> | ||
| 124 | - <height>100</height> | ||
| 125 | - </rect> | ||
| 126 | - </property> | ||
| 127 | - <property name="alignment"> | ||
| 128 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 129 | - </property> | ||
| 130 | - </widget> | ||
| 131 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 132 | - <property name="geometry"> | ||
| 133 | - <rect> | ||
| 134 | - <x>670</x> | ||
| 135 | - <y>290</y> | ||
| 136 | - <width>111</width> | ||
| 137 | - <height>121</height> | ||
| 138 | - </rect> | ||
| 139 | - </property> | ||
| 140 | - <property name="text"> | ||
| 141 | - <string/> | ||
| 142 | - </property> | ||
| 143 | - </widget> | ||
| 144 | - <widget class="IgnitionIcon" name="label_5"> | ||
| 145 | - <property name="geometry"> | ||
| 146 | - <rect> | ||
| 147 | - <x>662</x> | ||
| 148 | - <y>164</y> | ||
| 149 | - <width>111</width> | ||
| 150 | - <height>121</height> | ||
| 151 | - </rect> | ||
| 152 | - </property> | ||
| 153 | - <property name="text"> | ||
| 154 | - <string/> | ||
| 155 | - </property> | ||
| 156 | - </widget> | ||
| 157 | </widget> | 78 | </widget> |
| 158 | <widget class="QWidget" name="page_2"/> | 79 | <widget class="QWidget" name="page_2"/> |
| 159 | </widget> | 80 | </widget> |
| @@ -1465,42 +1386,12 @@ border-image: url(:/images/button/152_ov.png); | @@ -1465,42 +1386,12 @@ border-image: url(:/images/button/152_ov.png); | ||
| 1465 | </widget> | 1386 | </widget> |
| 1466 | <customwidgets> | 1387 | <customwidgets> |
| 1467 | <customwidget> | 1388 | <customwidget> |
| 1468 | - <class>Clock</class> | 1389 | + <class>StatusArea</class> |
| 1469 | <extends>QWidget</extends> | 1390 | <extends>QWidget</extends> |
| 1470 | - <header>clock.h</header> | 1391 | + <header>statusarea.h</header> |
| 1471 | <container>1</container> | 1392 | <container>1</container> |
| 1472 | </customwidget> | 1393 | </customwidget> |
| 1473 | <customwidget> | 1394 | <customwidget> |
| 1474 | - <class>WashWarnIcon</class> | ||
| 1475 | - <extends>QLabel</extends> | ||
| 1476 | - <header>washwarnicon.h</header> | ||
| 1477 | - </customwidget> | ||
| 1478 | - <customwidget> | ||
| 1479 | - <class>DemoIcon</class> | ||
| 1480 | - <extends>QLabel</extends> | ||
| 1481 | - <header>demoicon.h</header> | ||
| 1482 | - </customwidget> | ||
| 1483 | - <customwidget> | ||
| 1484 | - <class>HalfEnergyIcon</class> | ||
| 1485 | - <extends>QLabel</extends> | ||
| 1486 | - <header>halfenergyicon.h</header> | ||
| 1487 | - </customwidget> | ||
| 1488 | - <customwidget> | ||
| 1489 | - <class>DigitalClock</class> | ||
| 1490 | - <extends>QLabel</extends> | ||
| 1491 | - <header>digitalclock.h</header> | ||
| 1492 | - </customwidget> | ||
| 1493 | - <customwidget> | ||
| 1494 | - <class>IgnitionIcon</class> | ||
| 1495 | - <extends>QLabel</extends> | ||
| 1496 | - <header>ignitionicon.h</header> | ||
| 1497 | - </customwidget> | ||
| 1498 | - <customwidget> | ||
| 1499 | - <class>WaterLevelIcon</class> | ||
| 1500 | - <extends>QLabel</extends> | ||
| 1501 | - <header>waterlevelicon.h</header> | ||
| 1502 | - </customwidget> | ||
| 1503 | - <customwidget> | ||
| 1504 | <class>Slider</class> | 1395 | <class>Slider</class> |
| 1505 | <extends>QWidget</extends> | 1396 | <extends>QWidget</extends> |
| 1506 | <header>slider.h</header> | 1397 | <header>slider.h</header> |
app/gui/oven_control/autocookselectionwindow.ui
| @@ -24,89 +24,10 @@ | @@ -24,89 +24,10 @@ | ||
| 24 | <height>426</height> | 24 | <height>426</height> |
| 25 | </rect> | 25 | </rect> |
| 26 | </property> | 26 | </property> |
| 27 | - <widget class="QWidget" name="clockContainer"> | 27 | + <widget class="StatusArea" name="clockContainer"> |
| 28 | <property name="styleSheet"> | 28 | <property name="styleSheet"> |
| 29 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 29 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 30 | </property> | 30 | </property> |
| 31 | - <widget class="Clock" name="clock" native="true"> | ||
| 32 | - <property name="geometry"> | ||
| 33 | - <rect> | ||
| 34 | - <x>272</x> | ||
| 35 | - <y>36</y> | ||
| 36 | - <width>356</width> | ||
| 37 | - <height>355</height> | ||
| 38 | - </rect> | ||
| 39 | - </property> | ||
| 40 | - </widget> | ||
| 41 | - <widget class="WashWarnIcon" name="label"> | ||
| 42 | - <property name="geometry"> | ||
| 43 | - <rect> | ||
| 44 | - <x>800</x> | ||
| 45 | - <y>320</y> | ||
| 46 | - <width>80</width> | ||
| 47 | - <height>84</height> | ||
| 48 | - </rect> | ||
| 49 | - </property> | ||
| 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> | ||
| 71 | - <widget class="DigitalClock" name="label_4"> | ||
| 72 | - <property name="geometry"> | ||
| 73 | - <rect> | ||
| 74 | - <x>20</x> | ||
| 75 | - <y>310</y> | ||
| 76 | - <width>600</width> | ||
| 77 | - <height>100</height> | ||
| 78 | - </rect> | ||
| 79 | - </property> | ||
| 80 | - <property name="alignment"> | ||
| 81 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 82 | - </property> | ||
| 83 | - </widget> | ||
| 84 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 85 | - <property name="geometry"> | ||
| 86 | - <rect> | ||
| 87 | - <x>670</x> | ||
| 88 | - <y>290</y> | ||
| 89 | - <width>111</width> | ||
| 90 | - <height>121</height> | ||
| 91 | - </rect> | ||
| 92 | - </property> | ||
| 93 | - <property name="text"> | ||
| 94 | - <string/> | ||
| 95 | - </property> | ||
| 96 | - </widget> | ||
| 97 | - <widget class="IgnitionIcon" name="label_5"> | ||
| 98 | - <property name="geometry"> | ||
| 99 | - <rect> | ||
| 100 | - <x>662</x> | ||
| 101 | - <y>164</y> | ||
| 102 | - <width>111</width> | ||
| 103 | - <height>121</height> | ||
| 104 | - </rect> | ||
| 105 | - </property> | ||
| 106 | - <property name="text"> | ||
| 107 | - <string/> | ||
| 108 | - </property> | ||
| 109 | - </widget> | ||
| 110 | </widget> | 31 | </widget> |
| 111 | <widget class="QWidget" name="page_2"/> | 32 | <widget class="QWidget" name="page_2"/> |
| 112 | </widget> | 33 | </widget> |
| @@ -279,47 +200,17 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/auto_pop | @@ -279,47 +200,17 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/auto_pop | ||
| 279 | </widget> | 200 | </widget> |
| 280 | <customwidgets> | 201 | <customwidgets> |
| 281 | <customwidget> | 202 | <customwidget> |
| 282 | - <class>BulletIndicator</class> | 203 | + <class>StatusArea</class> |
| 283 | <extends>QWidget</extends> | 204 | <extends>QWidget</extends> |
| 284 | - <header>bulletindicator.h</header> | 205 | + <header>statusarea.h</header> |
| 285 | <container>1</container> | 206 | <container>1</container> |
| 286 | </customwidget> | 207 | </customwidget> |
| 287 | <customwidget> | 208 | <customwidget> |
| 288 | - <class>Clock</class> | 209 | + <class>BulletIndicator</class> |
| 289 | <extends>QWidget</extends> | 210 | <extends>QWidget</extends> |
| 290 | - <header>clock.h</header> | 211 | + <header>bulletindicator.h</header> |
| 291 | <container>1</container> | 212 | <container>1</container> |
| 292 | </customwidget> | 213 | </customwidget> |
| 293 | - <customwidget> | ||
| 294 | - <class>WashWarnIcon</class> | ||
| 295 | - <extends>QLabel</extends> | ||
| 296 | - <header>washwarnicon.h</header> | ||
| 297 | - </customwidget> | ||
| 298 | - <customwidget> | ||
| 299 | - <class>DemoIcon</class> | ||
| 300 | - <extends>QLabel</extends> | ||
| 301 | - <header>demoicon.h</header> | ||
| 302 | - </customwidget> | ||
| 303 | - <customwidget> | ||
| 304 | - <class>HalfEnergyIcon</class> | ||
| 305 | - <extends>QLabel</extends> | ||
| 306 | - <header>halfenergyicon.h</header> | ||
| 307 | - </customwidget> | ||
| 308 | - <customwidget> | ||
| 309 | - <class>DigitalClock</class> | ||
| 310 | - <extends>QLabel</extends> | ||
| 311 | - <header>digitalclock.h</header> | ||
| 312 | - </customwidget> | ||
| 313 | - <customwidget> | ||
| 314 | - <class>IgnitionIcon</class> | ||
| 315 | - <extends>QLabel</extends> | ||
| 316 | - <header>ignitionicon.h</header> | ||
| 317 | - </customwidget> | ||
| 318 | - <customwidget> | ||
| 319 | - <class>WaterLevelIcon</class> | ||
| 320 | - <extends>QLabel</extends> | ||
| 321 | - <header>waterlevelicon.h</header> | ||
| 322 | - </customwidget> | ||
| 323 | </customwidgets> | 214 | </customwidgets> |
| 324 | <resources/> | 215 | <resources/> |
| 325 | <connections/> | 216 | <connections/> |
app/gui/oven_control/autocookwindow.ui
| @@ -30,89 +30,10 @@ border: none; | @@ -30,89 +30,10 @@ border: none; | ||
| 30 | <height>426</height> | 30 | <height>426</height> |
| 31 | </rect> | 31 | </rect> |
| 32 | </property> | 32 | </property> |
| 33 | - <widget class="QWidget" name="clockContainer"> | 33 | + <widget class="StatusArea" name="clockContainer"> |
| 34 | <property name="styleSheet"> | 34 | <property name="styleSheet"> |
| 35 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 35 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 36 | </property> | 36 | </property> |
| 37 | - <widget class="Clock" name="clock" native="true"> | ||
| 38 | - <property name="geometry"> | ||
| 39 | - <rect> | ||
| 40 | - <x>272</x> | ||
| 41 | - <y>36</y> | ||
| 42 | - <width>356</width> | ||
| 43 | - <height>355</height> | ||
| 44 | - </rect> | ||
| 45 | - </property> | ||
| 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> | ||
| 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> | ||
| 77 | - <widget class="DigitalClock" name="label_6"> | ||
| 78 | - <property name="geometry"> | ||
| 79 | - <rect> | ||
| 80 | - <x>20</x> | ||
| 81 | - <y>310</y> | ||
| 82 | - <width>600</width> | ||
| 83 | - <height>100</height> | ||
| 84 | - </rect> | ||
| 85 | - </property> | ||
| 86 | - <property name="alignment"> | ||
| 87 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 88 | - </property> | ||
| 89 | - </widget> | ||
| 90 | - <widget class="WaterLevelIcon" name="label_7"> | ||
| 91 | - <property name="geometry"> | ||
| 92 | - <rect> | ||
| 93 | - <x>670</x> | ||
| 94 | - <y>290</y> | ||
| 95 | - <width>111</width> | ||
| 96 | - <height>121</height> | ||
| 97 | - </rect> | ||
| 98 | - </property> | ||
| 99 | - <property name="text"> | ||
| 100 | - <string/> | ||
| 101 | - </property> | ||
| 102 | - </widget> | ||
| 103 | - <widget class="IgnitionIcon" name="label_8"> | ||
| 104 | - <property name="geometry"> | ||
| 105 | - <rect> | ||
| 106 | - <x>662</x> | ||
| 107 | - <y>164</y> | ||
| 108 | - <width>111</width> | ||
| 109 | - <height>121</height> | ||
| 110 | - </rect> | ||
| 111 | - </property> | ||
| 112 | - <property name="text"> | ||
| 113 | - <string/> | ||
| 114 | - </property> | ||
| 115 | - </widget> | ||
| 116 | </widget> | 37 | </widget> |
| 117 | <widget class="QWidget" name="page_2"/> | 38 | <widget class="QWidget" name="page_2"/> |
| 118 | </widget> | 39 | </widget> |
| @@ -1437,42 +1358,12 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/152_o | @@ -1437,42 +1358,12 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/152_o | ||
| 1437 | </widget> | 1358 | </widget> |
| 1438 | <customwidgets> | 1359 | <customwidgets> |
| 1439 | <customwidget> | 1360 | <customwidget> |
| 1440 | - <class>Clock</class> | 1361 | + <class>StatusArea</class> |
| 1441 | <extends>QWidget</extends> | 1362 | <extends>QWidget</extends> |
| 1442 | - <header>clock.h</header> | 1363 | + <header>statusarea.h</header> |
| 1443 | <container>1</container> | 1364 | <container>1</container> |
| 1444 | </customwidget> | 1365 | </customwidget> |
| 1445 | <customwidget> | 1366 | <customwidget> |
| 1446 | - <class>WashWarnIcon</class> | ||
| 1447 | - <extends>QLabel</extends> | ||
| 1448 | - <header>washwarnicon.h</header> | ||
| 1449 | - </customwidget> | ||
| 1450 | - <customwidget> | ||
| 1451 | - <class>DemoIcon</class> | ||
| 1452 | - <extends>QLabel</extends> | ||
| 1453 | - <header>demoicon.h</header> | ||
| 1454 | - </customwidget> | ||
| 1455 | - <customwidget> | ||
| 1456 | - <class>HalfEnergyIcon</class> | ||
| 1457 | - <extends>QLabel</extends> | ||
| 1458 | - <header>halfenergyicon.h</header> | ||
| 1459 | - </customwidget> | ||
| 1460 | - <customwidget> | ||
| 1461 | - <class>DigitalClock</class> | ||
| 1462 | - <extends>QLabel</extends> | ||
| 1463 | - <header>digitalclock.h</header> | ||
| 1464 | - </customwidget> | ||
| 1465 | - <customwidget> | ||
| 1466 | - <class>IgnitionIcon</class> | ||
| 1467 | - <extends>QLabel</extends> | ||
| 1468 | - <header>ignitionicon.h</header> | ||
| 1469 | - </customwidget> | ||
| 1470 | - <customwidget> | ||
| 1471 | - <class>WaterLevelIcon</class> | ||
| 1472 | - <extends>QLabel</extends> | ||
| 1473 | - <header>waterlevelicon.h</header> | ||
| 1474 | - </customwidget> | ||
| 1475 | - <customwidget> | ||
| 1476 | <class>AnimatedImageBox</class> | 1367 | <class>AnimatedImageBox</class> |
| 1477 | <extends>QLabel</extends> | 1368 | <extends>QLabel</extends> |
| 1478 | <header>animatedimagebox.h</header> | 1369 | <header>animatedimagebox.h</header> |
app/gui/oven_control/burnertestwindow.ui
| @@ -24,89 +24,10 @@ | @@ -24,89 +24,10 @@ | ||
| 24 | <height>426</height> | 24 | <height>426</height> |
| 25 | </rect> | 25 | </rect> |
| 26 | </property> | 26 | </property> |
| 27 | - <widget class="QWidget" name="clockContainer"> | 27 | + <widget class="StatusArea" name="clockContainer"> |
| 28 | <property name="styleSheet"> | 28 | <property name="styleSheet"> |
| 29 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 29 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 30 | </property> | 30 | </property> |
| 31 | - <widget class="Clock" name="clock" native="true"> | ||
| 32 | - <property name="geometry"> | ||
| 33 | - <rect> | ||
| 34 | - <x>272</x> | ||
| 35 | - <y>36</y> | ||
| 36 | - <width>356</width> | ||
| 37 | - <height>355</height> | ||
| 38 | - </rect> | ||
| 39 | - </property> | ||
| 40 | - </widget> | ||
| 41 | - <widget class="WashWarnIcon" name="label_7"> | ||
| 42 | - <property name="geometry"> | ||
| 43 | - <rect> | ||
| 44 | - <x>800</x> | ||
| 45 | - <y>320</y> | ||
| 46 | - <width>80</width> | ||
| 47 | - <height>84</height> | ||
| 48 | - </rect> | ||
| 49 | - </property> | ||
| 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_9"> | ||
| 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> | ||
| 71 | - <widget class="DigitalClock" name="label_10"> | ||
| 72 | - <property name="geometry"> | ||
| 73 | - <rect> | ||
| 74 | - <x>20</x> | ||
| 75 | - <y>310</y> | ||
| 76 | - <width>600</width> | ||
| 77 | - <height>100</height> | ||
| 78 | - </rect> | ||
| 79 | - </property> | ||
| 80 | - <property name="alignment"> | ||
| 81 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 82 | - </property> | ||
| 83 | - </widget> | ||
| 84 | - <widget class="WaterLevelIcon" name="label_11"> | ||
| 85 | - <property name="geometry"> | ||
| 86 | - <rect> | ||
| 87 | - <x>670</x> | ||
| 88 | - <y>290</y> | ||
| 89 | - <width>111</width> | ||
| 90 | - <height>121</height> | ||
| 91 | - </rect> | ||
| 92 | - </property> | ||
| 93 | - <property name="text"> | ||
| 94 | - <string/> | ||
| 95 | - </property> | ||
| 96 | - </widget> | ||
| 97 | - <widget class="IgnitionIcon" name="label_12"> | ||
| 98 | - <property name="geometry"> | ||
| 99 | - <rect> | ||
| 100 | - <x>662</x> | ||
| 101 | - <y>164</y> | ||
| 102 | - <width>111</width> | ||
| 103 | - <height>121</height> | ||
| 104 | - </rect> | ||
| 105 | - </property> | ||
| 106 | - <property name="text"> | ||
| 107 | - <string/> | ||
| 108 | - </property> | ||
| 109 | - </widget> | ||
| 110 | </widget> | 31 | </widget> |
| 111 | <widget class="QWidget" name="page_2"/> | 32 | <widget class="QWidget" name="page_2"/> |
| 112 | </widget> | 33 | </widget> |
| @@ -2153,41 +2074,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o | @@ -2153,41 +2074,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o | ||
| 2153 | </widget> | 2074 | </widget> |
| 2154 | <customwidgets> | 2075 | <customwidgets> |
| 2155 | <customwidget> | 2076 | <customwidget> |
| 2156 | - <class>Clock</class> | 2077 | + <class>StatusArea</class> |
| 2157 | <extends>QWidget</extends> | 2078 | <extends>QWidget</extends> |
| 2158 | - <header>clock.h</header> | 2079 | + <header>statusarea.h</header> |
| 2159 | <container>1</container> | 2080 | <container>1</container> |
| 2160 | </customwidget> | 2081 | </customwidget> |
| 2161 | - <customwidget> | ||
| 2162 | - <class>WashWarnIcon</class> | ||
| 2163 | - <extends>QLabel</extends> | ||
| 2164 | - <header>washwarnicon.h</header> | ||
| 2165 | - </customwidget> | ||
| 2166 | - <customwidget> | ||
| 2167 | - <class>DemoIcon</class> | ||
| 2168 | - <extends>QLabel</extends> | ||
| 2169 | - <header>demoicon.h</header> | ||
| 2170 | - </customwidget> | ||
| 2171 | - <customwidget> | ||
| 2172 | - <class>HalfEnergyIcon</class> | ||
| 2173 | - <extends>QLabel</extends> | ||
| 2174 | - <header>halfenergyicon.h</header> | ||
| 2175 | - </customwidget> | ||
| 2176 | - <customwidget> | ||
| 2177 | - <class>DigitalClock</class> | ||
| 2178 | - <extends>QLabel</extends> | ||
| 2179 | - <header>digitalclock.h</header> | ||
| 2180 | - </customwidget> | ||
| 2181 | - <customwidget> | ||
| 2182 | - <class>IgnitionIcon</class> | ||
| 2183 | - <extends>QLabel</extends> | ||
| 2184 | - <header>ignitionicon.h</header> | ||
| 2185 | - </customwidget> | ||
| 2186 | - <customwidget> | ||
| 2187 | - <class>WaterLevelIcon</class> | ||
| 2188 | - <extends>QLabel</extends> | ||
| 2189 | - <header>waterlevelicon.h</header> | ||
| 2190 | - </customwidget> | ||
| 2191 | </customwidgets> | 2082 | </customwidgets> |
| 2192 | <resources> | 2083 | <resources> |
| 2193 | <include location="resources.qrc"/> | 2084 | <include location="resources.qrc"/> |
app/gui/oven_control/commicon.cpp
| @@ -0,0 +1,38 @@ | @@ -0,0 +1,38 @@ | ||
| 1 | +#include "commicon.h" | ||
| 2 | + | ||
| 3 | +#include <QPainter> | ||
| 4 | +#include <QPaintEvent> | ||
| 5 | + | ||
| 6 | +#include "udphandler.h" | ||
| 7 | + | ||
| 8 | +CommIcon::CommIcon(QWidget *parent) : QWidget(parent) | ||
| 9 | +{ | ||
| 10 | + isFault = false; | ||
| 11 | + | ||
| 12 | + UdpHandler *udp = UdpHandler::getInstance(); | ||
| 13 | + connect(udp, SIGNAL(timeout()), SLOT(setFault())); | ||
| 14 | + connect(udp, SIGNAL(recovered()), SLOT(setOK())); | ||
| 15 | +} | ||
| 16 | + | ||
| 17 | +void CommIcon::setFault() | ||
| 18 | +{ | ||
| 19 | + isFault = true; | ||
| 20 | + update(); | ||
| 21 | +} | ||
| 22 | + | ||
| 23 | +void CommIcon::setOK() | ||
| 24 | +{ | ||
| 25 | + isFault = false; | ||
| 26 | + update(); | ||
| 27 | +} | ||
| 28 | + | ||
| 29 | +void CommIcon::paintEvent(QPaintEvent *event) | ||
| 30 | +{ | ||
| 31 | + if (isFault) | ||
| 32 | + return; | ||
| 33 | + | ||
| 34 | + QPainter painter(this); | ||
| 35 | + painter.setRenderHint(QPainter::Antialiasing); | ||
| 36 | + painter.setBrush(Qt::blue); | ||
| 37 | + painter.drawEllipse(rect()); | ||
| 38 | +} |
app/gui/oven_control/commicon.h
| @@ -0,0 +1,25 @@ | @@ -0,0 +1,25 @@ | ||
| 1 | +#ifndef COMMICON_H | ||
| 2 | +#define COMMICON_H | ||
| 3 | + | ||
| 4 | +#include <QWidget> | ||
| 5 | + | ||
| 6 | +class CommIcon : public QWidget | ||
| 7 | +{ | ||
| 8 | + Q_OBJECT | ||
| 9 | +public: | ||
| 10 | + explicit CommIcon(QWidget *parent = nullptr); | ||
| 11 | + | ||
| 12 | +signals: | ||
| 13 | + | ||
| 14 | +public slots: | ||
| 15 | + void setFault(); | ||
| 16 | + void setOK(); | ||
| 17 | + | ||
| 18 | +protected: | ||
| 19 | + void paintEvent(QPaintEvent *event); | ||
| 20 | + | ||
| 21 | +private: | ||
| 22 | + bool isFault; | ||
| 23 | +}; | ||
| 24 | + | ||
| 25 | +#endif // COMMICON_H |
app/gui/oven_control/componenttestwindow.ui
| @@ -24,89 +24,10 @@ | @@ -24,89 +24,10 @@ | ||
| 24 | <height>426</height> | 24 | <height>426</height> |
| 25 | </rect> | 25 | </rect> |
| 26 | </property> | 26 | </property> |
| 27 | - <widget class="QWidget" name="clockContainer"> | 27 | + <widget class="StatusArea" name="clockContainer"> |
| 28 | <property name="styleSheet"> | 28 | <property name="styleSheet"> |
| 29 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 29 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 30 | </property> | 30 | </property> |
| 31 | - <widget class="Clock" name="clock" native="true"> | ||
| 32 | - <property name="geometry"> | ||
| 33 | - <rect> | ||
| 34 | - <x>272</x> | ||
| 35 | - <y>36</y> | ||
| 36 | - <width>356</width> | ||
| 37 | - <height>355</height> | ||
| 38 | - </rect> | ||
| 39 | - </property> | ||
| 40 | - </widget> | ||
| 41 | - <widget class="WashWarnIcon" name="label_4"> | ||
| 42 | - <property name="geometry"> | ||
| 43 | - <rect> | ||
| 44 | - <x>800</x> | ||
| 45 | - <y>320</y> | ||
| 46 | - <width>80</width> | ||
| 47 | - <height>84</height> | ||
| 48 | - </rect> | ||
| 49 | - </property> | ||
| 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> | ||
| 71 | - <widget class="DigitalClock" name="label_13"> | ||
| 72 | - <property name="geometry"> | ||
| 73 | - <rect> | ||
| 74 | - <x>20</x> | ||
| 75 | - <y>310</y> | ||
| 76 | - <width>600</width> | ||
| 77 | - <height>100</height> | ||
| 78 | - </rect> | ||
| 79 | - </property> | ||
| 80 | - <property name="alignment"> | ||
| 81 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 82 | - </property> | ||
| 83 | - </widget> | ||
| 84 | - <widget class="WaterLevelIcon" name="label_14"> | ||
| 85 | - <property name="geometry"> | ||
| 86 | - <rect> | ||
| 87 | - <x>670</x> | ||
| 88 | - <y>290</y> | ||
| 89 | - <width>111</width> | ||
| 90 | - <height>121</height> | ||
| 91 | - </rect> | ||
| 92 | - </property> | ||
| 93 | - <property name="text"> | ||
| 94 | - <string/> | ||
| 95 | - </property> | ||
| 96 | - </widget> | ||
| 97 | - <widget class="IgnitionIcon" name="label_16"> | ||
| 98 | - <property name="geometry"> | ||
| 99 | - <rect> | ||
| 100 | - <x>662</x> | ||
| 101 | - <y>164</y> | ||
| 102 | - <width>111</width> | ||
| 103 | - <height>121</height> | ||
| 104 | - </rect> | ||
| 105 | - </property> | ||
| 106 | - <property name="text"> | ||
| 107 | - <string/> | ||
| 108 | - </property> | ||
| 109 | - </widget> | ||
| 110 | </widget> | 31 | </widget> |
| 111 | <widget class="QWidget" name="page_2"/> | 32 | <widget class="QWidget" name="page_2"/> |
| 112 | </widget> | 33 | </widget> |
| @@ -560,41 +481,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o | @@ -560,41 +481,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o | ||
| 560 | </widget> | 481 | </widget> |
| 561 | <customwidgets> | 482 | <customwidgets> |
| 562 | <customwidget> | 483 | <customwidget> |
| 563 | - <class>Clock</class> | 484 | + <class>StatusArea</class> |
| 564 | <extends>QWidget</extends> | 485 | <extends>QWidget</extends> |
| 565 | - <header>clock.h</header> | 486 | + <header>statusarea.h</header> |
| 566 | <container>1</container> | 487 | <container>1</container> |
| 567 | </customwidget> | 488 | </customwidget> |
| 568 | - <customwidget> | ||
| 569 | - <class>WashWarnIcon</class> | ||
| 570 | - <extends>QLabel</extends> | ||
| 571 | - <header>washwarnicon.h</header> | ||
| 572 | - </customwidget> | ||
| 573 | - <customwidget> | ||
| 574 | - <class>DemoIcon</class> | ||
| 575 | - <extends>QLabel</extends> | ||
| 576 | - <header>demoicon.h</header> | ||
| 577 | - </customwidget> | ||
| 578 | - <customwidget> | ||
| 579 | - <class>HalfEnergyIcon</class> | ||
| 580 | - <extends>QLabel</extends> | ||
| 581 | - <header>halfenergyicon.h</header> | ||
| 582 | - </customwidget> | ||
| 583 | - <customwidget> | ||
| 584 | - <class>DigitalClock</class> | ||
| 585 | - <extends>QLabel</extends> | ||
| 586 | - <header>digitalclock.h</header> | ||
| 587 | - </customwidget> | ||
| 588 | - <customwidget> | ||
| 589 | - <class>IgnitionIcon</class> | ||
| 590 | - <extends>QLabel</extends> | ||
| 591 | - <header>ignitionicon.h</header> | ||
| 592 | - </customwidget> | ||
| 593 | - <customwidget> | ||
| 594 | - <class>WaterLevelIcon</class> | ||
| 595 | - <extends>QLabel</extends> | ||
| 596 | - <header>waterlevelicon.h</header> | ||
| 597 | - </customwidget> | ||
| 598 | </customwidgets> | 489 | </customwidgets> |
| 599 | <resources> | 490 | <resources> |
| 600 | <include location="resources.qrc"/> | 491 | <include location="resources.qrc"/> |
app/gui/oven_control/configdoormonitoring.ui
| @@ -28,56 +28,10 @@ | @@ -28,56 +28,10 @@ | ||
| 28 | <height>426</height> | 28 | <height>426</height> |
| 29 | </rect> | 29 | </rect> |
| 30 | </property> | 30 | </property> |
| 31 | - <widget class="QWidget" name="clockContainer"> | 31 | + <widget class="StatusArea" name="clockContainer"> |
| 32 | <property name="styleSheet"> | 32 | <property name="styleSheet"> |
| 33 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 33 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 34 | </property> | 34 | </property> |
| 35 | - <widget class="Clock" name="clock" native="true"> | ||
| 36 | - <property name="geometry"> | ||
| 37 | - <rect> | ||
| 38 | - <x>272</x> | ||
| 39 | - <y>36</y> | ||
| 40 | - <width>356</width> | ||
| 41 | - <height>355</height> | ||
| 42 | - </rect> | ||
| 43 | - </property> | ||
| 44 | - </widget> | ||
| 45 | - <widget class="WashWarnIcon" name="label"> | ||
| 46 | - <property name="geometry"> | ||
| 47 | - <rect> | ||
| 48 | - <x>800</x> | ||
| 49 | - <y>320</y> | ||
| 50 | - <width>80</width> | ||
| 51 | - <height>84</height> | ||
| 52 | - </rect> | ||
| 53 | - </property> | ||
| 54 | - </widget> | ||
| 55 | - <widget class="WaterLevelIcon" name="label_13"> | ||
| 56 | - <property name="geometry"> | ||
| 57 | - <rect> | ||
| 58 | - <x>670</x> | ||
| 59 | - <y>290</y> | ||
| 60 | - <width>111</width> | ||
| 61 | - <height>121</height> | ||
| 62 | - </rect> | ||
| 63 | - </property> | ||
| 64 | - <property name="text"> | ||
| 65 | - <string/> | ||
| 66 | - </property> | ||
| 67 | - </widget> | ||
| 68 | - <widget class="IgnitionIcon" name="label_14"> | ||
| 69 | - <property name="geometry"> | ||
| 70 | - <rect> | ||
| 71 | - <x>662</x> | ||
| 72 | - <y>164</y> | ||
| 73 | - <width>111</width> | ||
| 74 | - <height>121</height> | ||
| 75 | - </rect> | ||
| 76 | - </property> | ||
| 77 | - <property name="text"> | ||
| 78 | - <string/> | ||
| 79 | - </property> | ||
| 80 | - </widget> | ||
| 81 | </widget> | 35 | </widget> |
| 82 | <widget class="QWidget" name="page_2"/> | 36 | <widget class="QWidget" name="page_2"/> |
| 83 | </widget> | 37 | </widget> |
| @@ -555,26 +509,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h | @@ -555,26 +509,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h | ||
| 555 | </widget> | 509 | </widget> |
| 556 | <customwidgets> | 510 | <customwidgets> |
| 557 | <customwidget> | 511 | <customwidget> |
| 558 | - <class>Clock</class> | 512 | + <class>StatusArea</class> |
| 559 | <extends>QWidget</extends> | 513 | <extends>QWidget</extends> |
| 560 | - <header>clock.h</header> | 514 | + <header>statusarea.h</header> |
| 561 | <container>1</container> | 515 | <container>1</container> |
| 562 | </customwidget> | 516 | </customwidget> |
| 563 | - <customwidget> | ||
| 564 | - <class>WashWarnIcon</class> | ||
| 565 | - <extends>QLabel</extends> | ||
| 566 | - <header>washwarnicon.h</header> | ||
| 567 | - </customwidget> | ||
| 568 | - <customwidget> | ||
| 569 | - <class>IgnitionIcon</class> | ||
| 570 | - <extends>QLabel</extends> | ||
| 571 | - <header>ignitionicon.h</header> | ||
| 572 | - </customwidget> | ||
| 573 | - <customwidget> | ||
| 574 | - <class>WaterLevelIcon</class> | ||
| 575 | - <extends>QLabel</extends> | ||
| 576 | - <header>waterlevelicon.h</header> | ||
| 577 | - </customwidget> | ||
| 578 | </customwidgets> | 517 | </customwidgets> |
| 579 | <resources/> | 518 | <resources/> |
| 580 | <connections/> | 519 | <connections/> |
app/gui/oven_control/configwindow.ui
| @@ -63,89 +63,10 @@ background: none; | @@ -63,89 +63,10 @@ background: none; | ||
| 63 | <property name="currentIndex"> | 63 | <property name="currentIndex"> |
| 64 | <number>0</number> | 64 | <number>0</number> |
| 65 | </property> | 65 | </property> |
| 66 | - <widget class="QWidget" name="clockContainer"> | 66 | + <widget class="StatusArea" name="clockContainer"> |
| 67 | <property name="styleSheet"> | 67 | <property name="styleSheet"> |
| 68 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 68 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 69 | </property> | 69 | </property> |
| 70 | - <widget class="Clock" name="clock" native="true"> | ||
| 71 | - <property name="geometry"> | ||
| 72 | - <rect> | ||
| 73 | - <x>272</x> | ||
| 74 | - <y>36</y> | ||
| 75 | - <width>356</width> | ||
| 76 | - <height>355</height> | ||
| 77 | - </rect> | ||
| 78 | - </property> | ||
| 79 | - </widget> | ||
| 80 | - <widget class="WashWarnIcon" name="label"> | ||
| 81 | - <property name="geometry"> | ||
| 82 | - <rect> | ||
| 83 | - <x>800</x> | ||
| 84 | - <y>320</y> | ||
| 85 | - <width>80</width> | ||
| 86 | - <height>84</height> | ||
| 87 | - </rect> | ||
| 88 | - </property> | ||
| 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> | ||
| 110 | - <widget class="DigitalClock" name="label_4"> | ||
| 111 | - <property name="geometry"> | ||
| 112 | - <rect> | ||
| 113 | - <x>20</x> | ||
| 114 | - <y>310</y> | ||
| 115 | - <width>600</width> | ||
| 116 | - <height>100</height> | ||
| 117 | - </rect> | ||
| 118 | - </property> | ||
| 119 | - <property name="alignment"> | ||
| 120 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 121 | - </property> | ||
| 122 | - </widget> | ||
| 123 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 124 | - <property name="geometry"> | ||
| 125 | - <rect> | ||
| 126 | - <x>670</x> | ||
| 127 | - <y>290</y> | ||
| 128 | - <width>111</width> | ||
| 129 | - <height>121</height> | ||
| 130 | - </rect> | ||
| 131 | - </property> | ||
| 132 | - <property name="text"> | ||
| 133 | - <string/> | ||
| 134 | - </property> | ||
| 135 | - </widget> | ||
| 136 | - <widget class="IgnitionIcon" name="label_5"> | ||
| 137 | - <property name="geometry"> | ||
| 138 | - <rect> | ||
| 139 | - <x>662</x> | ||
| 140 | - <y>164</y> | ||
| 141 | - <width>111</width> | ||
| 142 | - <height>121</height> | ||
| 143 | - </rect> | ||
| 144 | - </property> | ||
| 145 | - <property name="text"> | ||
| 146 | - <string/> | ||
| 147 | - </property> | ||
| 148 | - </widget> | ||
| 149 | </widget> | 70 | </widget> |
| 150 | <widget class="QWidget" name="page_2"/> | 71 | <widget class="QWidget" name="page_2"/> |
| 151 | </widget> | 72 | </widget> |
| @@ -609,41 +530,11 @@ QPushButton:pressed , QPushButton:focus { border-image: url(:/images/bottom_bar/ | @@ -609,41 +530,11 @@ QPushButton:pressed , QPushButton:focus { border-image: url(:/images/bottom_bar/ | ||
| 609 | </widget> | 530 | </widget> |
| 610 | <customwidgets> | 531 | <customwidgets> |
| 611 | <customwidget> | 532 | <customwidget> |
| 612 | - <class>Clock</class> | 533 | + <class>StatusArea</class> |
| 613 | <extends>QWidget</extends> | 534 | <extends>QWidget</extends> |
| 614 | - <header>clock.h</header> | 535 | + <header>statusarea.h</header> |
| 615 | <container>1</container> | 536 | <container>1</container> |
| 616 | </customwidget> | 537 | </customwidget> |
| 617 | - <customwidget> | ||
| 618 | - <class>WashWarnIcon</class> | ||
| 619 | - <extends>QLabel</extends> | ||
| 620 | - <header>washwarnicon.h</header> | ||
| 621 | - </customwidget> | ||
| 622 | - <customwidget> | ||
| 623 | - <class>DemoIcon</class> | ||
| 624 | - <extends>QLabel</extends> | ||
| 625 | - <header>demoicon.h</header> | ||
| 626 | - </customwidget> | ||
| 627 | - <customwidget> | ||
| 628 | - <class>HalfEnergyIcon</class> | ||
| 629 | - <extends>QLabel</extends> | ||
| 630 | - <header>halfenergyicon.h</header> | ||
| 631 | - </customwidget> | ||
| 632 | - <customwidget> | ||
| 633 | - <class>DigitalClock</class> | ||
| 634 | - <extends>QLabel</extends> | ||
| 635 | - <header>digitalclock.h</header> | ||
| 636 | - </customwidget> | ||
| 637 | - <customwidget> | ||
| 638 | - <class>IgnitionIcon</class> | ||
| 639 | - <extends>QLabel</extends> | ||
| 640 | - <header>ignitionicon.h</header> | ||
| 641 | - </customwidget> | ||
| 642 | - <customwidget> | ||
| 643 | - <class>WaterLevelIcon</class> | ||
| 644 | - <extends>QLabel</extends> | ||
| 645 | - <header>waterlevelicon.h</header> | ||
| 646 | - </customwidget> | ||
| 647 | </customwidgets> | 538 | </customwidgets> |
| 648 | <tabstops> | 539 | <tabstops> |
| 649 | <tabstop>pushButton</tabstop> | 540 | <tabstop>pushButton</tabstop> |
app/gui/oven_control/define.h
| @@ -3,9 +3,9 @@ | @@ -3,9 +3,9 @@ | ||
| 3 | 3 | ||
| 4 | #include <QtCore> | 4 | #include <QtCore> |
| 5 | 5 | ||
| 6 | -#define MAJOR_VER 1 | ||
| 7 | -#define MINOR_VER 6 | ||
| 8 | -#define HOTFIX_VER 0 | 6 | +#define MAJOR_VER 2 |
| 7 | +#define MINOR_VER 0 | ||
| 8 | +#define HOTFIX_VER 1 | ||
| 9 | 9 | ||
| 10 | // 0 for normal | 10 | // 0 for normal |
| 11 | // 1 for premium | 11 | // 1 for premium |
app/gui/oven_control/electricmodelsettingwindow.ui
| @@ -458,89 +458,10 @@ QPushButton:pressed, QPushButton:checked, QPushButton:focus { border-image: url( | @@ -458,89 +458,10 @@ QPushButton:pressed, QPushButton:checked, QPushButton:focus { border-image: url( | ||
| 458 | <height>426</height> | 458 | <height>426</height> |
| 459 | </rect> | 459 | </rect> |
| 460 | </property> | 460 | </property> |
| 461 | - <widget class="QWidget" name="clockContainer"> | 461 | + <widget class="StatusArea" name="clockContainer"> |
| 462 | <property name="styleSheet"> | 462 | <property name="styleSheet"> |
| 463 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 463 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 464 | </property> | 464 | </property> |
| 465 | - <widget class="Clock" name="clock" native="true"> | ||
| 466 | - <property name="geometry"> | ||
| 467 | - <rect> | ||
| 468 | - <x>272</x> | ||
| 469 | - <y>36</y> | ||
| 470 | - <width>356</width> | ||
| 471 | - <height>355</height> | ||
| 472 | - </rect> | ||
| 473 | - </property> | ||
| 474 | - </widget> | ||
| 475 | - <widget class="WashWarnIcon" name="label"> | ||
| 476 | - <property name="geometry"> | ||
| 477 | - <rect> | ||
| 478 | - <x>800</x> | ||
| 479 | - <y>320</y> | ||
| 480 | - <width>80</width> | ||
| 481 | - <height>84</height> | ||
| 482 | - </rect> | ||
| 483 | - </property> | ||
| 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> | ||
| 505 | - <widget class="DigitalClock" name="label_4"> | ||
| 506 | - <property name="geometry"> | ||
| 507 | - <rect> | ||
| 508 | - <x>20</x> | ||
| 509 | - <y>310</y> | ||
| 510 | - <width>600</width> | ||
| 511 | - <height>100</height> | ||
| 512 | - </rect> | ||
| 513 | - </property> | ||
| 514 | - <property name="alignment"> | ||
| 515 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 516 | - </property> | ||
| 517 | - </widget> | ||
| 518 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 519 | - <property name="geometry"> | ||
| 520 | - <rect> | ||
| 521 | - <x>670</x> | ||
| 522 | - <y>290</y> | ||
| 523 | - <width>111</width> | ||
| 524 | - <height>121</height> | ||
| 525 | - </rect> | ||
| 526 | - </property> | ||
| 527 | - <property name="text"> | ||
| 528 | - <string/> | ||
| 529 | - </property> | ||
| 530 | - </widget> | ||
| 531 | - <widget class="IgnitionIcon" name="label_5"> | ||
| 532 | - <property name="geometry"> | ||
| 533 | - <rect> | ||
| 534 | - <x>662</x> | ||
| 535 | - <y>164</y> | ||
| 536 | - <width>111</width> | ||
| 537 | - <height>121</height> | ||
| 538 | - </rect> | ||
| 539 | - </property> | ||
| 540 | - <property name="text"> | ||
| 541 | - <string/> | ||
| 542 | - </property> | ||
| 543 | - </widget> | ||
| 544 | </widget> | 465 | </widget> |
| 545 | <widget class="QWidget" name="page_2"/> | 466 | <widget class="QWidget" name="page_2"/> |
| 546 | </widget> | 467 | </widget> |
| @@ -548,41 +469,11 @@ QPushButton:pressed, QPushButton:checked, QPushButton:focus { border-image: url( | @@ -548,41 +469,11 @@ QPushButton:pressed, QPushButton:checked, QPushButton:focus { border-image: url( | ||
| 548 | </widget> | 469 | </widget> |
| 549 | <customwidgets> | 470 | <customwidgets> |
| 550 | <customwidget> | 471 | <customwidget> |
| 551 | - <class>Clock</class> | 472 | + <class>StatusArea</class> |
| 552 | <extends>QWidget</extends> | 473 | <extends>QWidget</extends> |
| 553 | - <header>clock.h</header> | 474 | + <header>statusarea.h</header> |
| 554 | <container>1</container> | 475 | <container>1</container> |
| 555 | </customwidget> | 476 | </customwidget> |
| 556 | - <customwidget> | ||
| 557 | - <class>WashWarnIcon</class> | ||
| 558 | - <extends>QLabel</extends> | ||
| 559 | - <header>washwarnicon.h</header> | ||
| 560 | - </customwidget> | ||
| 561 | - <customwidget> | ||
| 562 | - <class>DemoIcon</class> | ||
| 563 | - <extends>QLabel</extends> | ||
| 564 | - <header>demoicon.h</header> | ||
| 565 | - </customwidget> | ||
| 566 | - <customwidget> | ||
| 567 | - <class>HalfEnergyIcon</class> | ||
| 568 | - <extends>QLabel</extends> | ||
| 569 | - <header>halfenergyicon.h</header> | ||
| 570 | - </customwidget> | ||
| 571 | - <customwidget> | ||
| 572 | - <class>DigitalClock</class> | ||
| 573 | - <extends>QLabel</extends> | ||
| 574 | - <header>digitalclock.h</header> | ||
| 575 | - </customwidget> | ||
| 576 | - <customwidget> | ||
| 577 | - <class>IgnitionIcon</class> | ||
| 578 | - <extends>QLabel</extends> | ||
| 579 | - <header>ignitionicon.h</header> | ||
| 580 | - </customwidget> | ||
| 581 | - <customwidget> | ||
| 582 | - <class>WaterLevelIcon</class> | ||
| 583 | - <extends>QLabel</extends> | ||
| 584 | - <header>waterlevelicon.h</header> | ||
| 585 | - </customwidget> | ||
| 586 | </customwidgets> | 477 | </customwidgets> |
| 587 | <tabstops> | 478 | <tabstops> |
| 588 | <tabstop>e10Button</tabstop> | 479 | <tabstop>e10Button</tabstop> |
app/gui/oven_control/engineermenuwindow.ui
| @@ -27,89 +27,10 @@ | @@ -27,89 +27,10 @@ | ||
| 27 | <height>426</height> | 27 | <height>426</height> |
| 28 | </rect> | 28 | </rect> |
| 29 | </property> | 29 | </property> |
| 30 | - <widget class="QWidget" name="clockContainer"> | 30 | + <widget class="StatusArea" name="clockContainer"> |
| 31 | <property name="styleSheet"> | 31 | <property name="styleSheet"> |
| 32 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 32 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 33 | </property> | 33 | </property> |
| 34 | - <widget class="Clock" name="clock" native="true"> | ||
| 35 | - <property name="geometry"> | ||
| 36 | - <rect> | ||
| 37 | - <x>272</x> | ||
| 38 | - <y>36</y> | ||
| 39 | - <width>356</width> | ||
| 40 | - <height>355</height> | ||
| 41 | - </rect> | ||
| 42 | - </property> | ||
| 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> | ||
| 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> | ||
| 74 | - <widget class="DigitalClock" name="label_4"> | ||
| 75 | - <property name="geometry"> | ||
| 76 | - <rect> | ||
| 77 | - <x>20</x> | ||
| 78 | - <y>310</y> | ||
| 79 | - <width>600</width> | ||
| 80 | - <height>100</height> | ||
| 81 | - </rect> | ||
| 82 | - </property> | ||
| 83 | - <property name="alignment"> | ||
| 84 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 85 | - </property> | ||
| 86 | - </widget> | ||
| 87 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 88 | - <property name="geometry"> | ||
| 89 | - <rect> | ||
| 90 | - <x>670</x> | ||
| 91 | - <y>290</y> | ||
| 92 | - <width>111</width> | ||
| 93 | - <height>121</height> | ||
| 94 | - </rect> | ||
| 95 | - </property> | ||
| 96 | - <property name="text"> | ||
| 97 | - <string/> | ||
| 98 | - </property> | ||
| 99 | - </widget> | ||
| 100 | - <widget class="IgnitionIcon" name="label_5"> | ||
| 101 | - <property name="geometry"> | ||
| 102 | - <rect> | ||
| 103 | - <x>662</x> | ||
| 104 | - <y>164</y> | ||
| 105 | - <width>111</width> | ||
| 106 | - <height>121</height> | ||
| 107 | - </rect> | ||
| 108 | - </property> | ||
| 109 | - <property name="text"> | ||
| 110 | - <string/> | ||
| 111 | - </property> | ||
| 112 | - </widget> | ||
| 113 | </widget> | 34 | </widget> |
| 114 | <widget class="QWidget" name="page_2"/> | 35 | <widget class="QWidget" name="page_2"/> |
| 115 | </widget> | 36 | </widget> |
| @@ -661,41 +582,11 @@ QPushButton { color: rgb(255, 255, 255);text-align: left;padding-left:30px;}</st | @@ -661,41 +582,11 @@ QPushButton { color: rgb(255, 255, 255);text-align: left;padding-left:30px;}</st | ||
| 661 | </widget> | 582 | </widget> |
| 662 | <customwidgets> | 583 | <customwidgets> |
| 663 | <customwidget> | 584 | <customwidget> |
| 664 | - <class>Clock</class> | 585 | + <class>StatusArea</class> |
| 665 | <extends>QWidget</extends> | 586 | <extends>QWidget</extends> |
| 666 | - <header>clock.h</header> | 587 | + <header>statusarea.h</header> |
| 667 | <container>1</container> | 588 | <container>1</container> |
| 668 | </customwidget> | 589 | </customwidget> |
| 669 | - <customwidget> | ||
| 670 | - <class>WashWarnIcon</class> | ||
| 671 | - <extends>QLabel</extends> | ||
| 672 | - <header>washwarnicon.h</header> | ||
| 673 | - </customwidget> | ||
| 674 | - <customwidget> | ||
| 675 | - <class>DemoIcon</class> | ||
| 676 | - <extends>QLabel</extends> | ||
| 677 | - <header>demoicon.h</header> | ||
| 678 | - </customwidget> | ||
| 679 | - <customwidget> | ||
| 680 | - <class>HalfEnergyIcon</class> | ||
| 681 | - <extends>QLabel</extends> | ||
| 682 | - <header>halfenergyicon.h</header> | ||
| 683 | - </customwidget> | ||
| 684 | - <customwidget> | ||
| 685 | - <class>DigitalClock</class> | ||
| 686 | - <extends>QLabel</extends> | ||
| 687 | - <header>digitalclock.h</header> | ||
| 688 | - </customwidget> | ||
| 689 | - <customwidget> | ||
| 690 | - <class>IgnitionIcon</class> | ||
| 691 | - <extends>QLabel</extends> | ||
| 692 | - <header>ignitionicon.h</header> | ||
| 693 | - </customwidget> | ||
| 694 | - <customwidget> | ||
| 695 | - <class>WaterLevelIcon</class> | ||
| 696 | - <extends>QLabel</extends> | ||
| 697 | - <header>waterlevelicon.h</header> | ||
| 698 | - </customwidget> | ||
| 699 | </customwidgets> | 590 | </customwidgets> |
| 700 | <tabstops> | 591 | <tabstops> |
| 701 | <tabstop>engAdjustButton</tabstop> | 592 | <tabstop>engAdjustButton</tabstop> |
app/gui/oven_control/fantestwindow.ui
| @@ -24,89 +24,10 @@ | @@ -24,89 +24,10 @@ | ||
| 24 | <height>426</height> | 24 | <height>426</height> |
| 25 | </rect> | 25 | </rect> |
| 26 | </property> | 26 | </property> |
| 27 | - <widget class="QWidget" name="clockContainer"> | 27 | + <widget class="StatusArea" name="clockContainer"> |
| 28 | <property name="styleSheet"> | 28 | <property name="styleSheet"> |
| 29 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 29 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 30 | </property> | 30 | </property> |
| 31 | - <widget class="Clock" name="clock" native="true"> | ||
| 32 | - <property name="geometry"> | ||
| 33 | - <rect> | ||
| 34 | - <x>272</x> | ||
| 35 | - <y>36</y> | ||
| 36 | - <width>356</width> | ||
| 37 | - <height>355</height> | ||
| 38 | - </rect> | ||
| 39 | - </property> | ||
| 40 | - </widget> | ||
| 41 | - <widget class="WashWarnIcon" name="label"> | ||
| 42 | - <property name="geometry"> | ||
| 43 | - <rect> | ||
| 44 | - <x>800</x> | ||
| 45 | - <y>320</y> | ||
| 46 | - <width>80</width> | ||
| 47 | - <height>84</height> | ||
| 48 | - </rect> | ||
| 49 | - </property> | ||
| 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> | ||
| 71 | - <widget class="DigitalClock" name="label_9"> | ||
| 72 | - <property name="geometry"> | ||
| 73 | - <rect> | ||
| 74 | - <x>20</x> | ||
| 75 | - <y>310</y> | ||
| 76 | - <width>600</width> | ||
| 77 | - <height>100</height> | ||
| 78 | - </rect> | ||
| 79 | - </property> | ||
| 80 | - <property name="alignment"> | ||
| 81 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 82 | - </property> | ||
| 83 | - </widget> | ||
| 84 | - <widget class="WaterLevelIcon" name="label_10"> | ||
| 85 | - <property name="geometry"> | ||
| 86 | - <rect> | ||
| 87 | - <x>670</x> | ||
| 88 | - <y>290</y> | ||
| 89 | - <width>111</width> | ||
| 90 | - <height>121</height> | ||
| 91 | - </rect> | ||
| 92 | - </property> | ||
| 93 | - <property name="text"> | ||
| 94 | - <string/> | ||
| 95 | - </property> | ||
| 96 | - </widget> | ||
| 97 | - <widget class="IgnitionIcon" name="label_11"> | ||
| 98 | - <property name="geometry"> | ||
| 99 | - <rect> | ||
| 100 | - <x>662</x> | ||
| 101 | - <y>164</y> | ||
| 102 | - <width>111</width> | ||
| 103 | - <height>121</height> | ||
| 104 | - </rect> | ||
| 105 | - </property> | ||
| 106 | - <property name="text"> | ||
| 107 | - <string/> | ||
| 108 | - </property> | ||
| 109 | - </widget> | ||
| 110 | </widget> | 31 | </widget> |
| 111 | <widget class="QWidget" name="page_2"/> | 32 | <widget class="QWidget" name="page_2"/> |
| 112 | </widget> | 33 | </widget> |
| @@ -799,41 +720,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o | @@ -799,41 +720,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o | ||
| 799 | </widget> | 720 | </widget> |
| 800 | <customwidgets> | 721 | <customwidgets> |
| 801 | <customwidget> | 722 | <customwidget> |
| 802 | - <class>Clock</class> | 723 | + <class>StatusArea</class> |
| 803 | <extends>QWidget</extends> | 724 | <extends>QWidget</extends> |
| 804 | - <header>clock.h</header> | 725 | + <header>statusarea.h</header> |
| 805 | <container>1</container> | 726 | <container>1</container> |
| 806 | </customwidget> | 727 | </customwidget> |
| 807 | - <customwidget> | ||
| 808 | - <class>WashWarnIcon</class> | ||
| 809 | - <extends>QLabel</extends> | ||
| 810 | - <header>washwarnicon.h</header> | ||
| 811 | - </customwidget> | ||
| 812 | - <customwidget> | ||
| 813 | - <class>DemoIcon</class> | ||
| 814 | - <extends>QLabel</extends> | ||
| 815 | - <header>demoicon.h</header> | ||
| 816 | - </customwidget> | ||
| 817 | - <customwidget> | ||
| 818 | - <class>HalfEnergyIcon</class> | ||
| 819 | - <extends>QLabel</extends> | ||
| 820 | - <header>halfenergyicon.h</header> | ||
| 821 | - </customwidget> | ||
| 822 | - <customwidget> | ||
| 823 | - <class>DigitalClock</class> | ||
| 824 | - <extends>QLabel</extends> | ||
| 825 | - <header>digitalclock.h</header> | ||
| 826 | - </customwidget> | ||
| 827 | - <customwidget> | ||
| 828 | - <class>IgnitionIcon</class> | ||
| 829 | - <extends>QLabel</extends> | ||
| 830 | - <header>ignitionicon.h</header> | ||
| 831 | - </customwidget> | ||
| 832 | - <customwidget> | ||
| 833 | - <class>WaterLevelIcon</class> | ||
| 834 | - <extends>QLabel</extends> | ||
| 835 | - <header>waterlevelicon.h</header> | ||
| 836 | - </customwidget> | ||
| 837 | </customwidgets> | 728 | </customwidgets> |
| 838 | <resources> | 729 | <resources> |
| 839 | <include location="resources.qrc"/> | 730 | <include location="resources.qrc"/> |
app/gui/oven_control/functiontestwindow.ui
| @@ -30,89 +30,10 @@ | @@ -30,89 +30,10 @@ | ||
| 30 | <height>426</height> | 30 | <height>426</height> |
| 31 | </rect> | 31 | </rect> |
| 32 | </property> | 32 | </property> |
| 33 | - <widget class="QWidget" name="clockContainer"> | 33 | + <widget class="StatusArea" name="clockContainer"> |
| 34 | <property name="styleSheet"> | 34 | <property name="styleSheet"> |
| 35 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 35 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 36 | </property> | 36 | </property> |
| 37 | - <widget class="Clock" name="clock" native="true"> | ||
| 38 | - <property name="geometry"> | ||
| 39 | - <rect> | ||
| 40 | - <x>272</x> | ||
| 41 | - <y>36</y> | ||
| 42 | - <width>356</width> | ||
| 43 | - <height>355</height> | ||
| 44 | - </rect> | ||
| 45 | - </property> | ||
| 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> | ||
| 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> | ||
| 77 | - <widget class="DigitalClock" name="label_4"> | ||
| 78 | - <property name="geometry"> | ||
| 79 | - <rect> | ||
| 80 | - <x>20</x> | ||
| 81 | - <y>310</y> | ||
| 82 | - <width>600</width> | ||
| 83 | - <height>100</height> | ||
| 84 | - </rect> | ||
| 85 | - </property> | ||
| 86 | - <property name="alignment"> | ||
| 87 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 88 | - </property> | ||
| 89 | - </widget> | ||
| 90 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 91 | - <property name="geometry"> | ||
| 92 | - <rect> | ||
| 93 | - <x>670</x> | ||
| 94 | - <y>290</y> | ||
| 95 | - <width>111</width> | ||
| 96 | - <height>121</height> | ||
| 97 | - </rect> | ||
| 98 | - </property> | ||
| 99 | - <property name="text"> | ||
| 100 | - <string/> | ||
| 101 | - </property> | ||
| 102 | - </widget> | ||
| 103 | - <widget class="IgnitionIcon" name="label_5"> | ||
| 104 | - <property name="geometry"> | ||
| 105 | - <rect> | ||
| 106 | - <x>662</x> | ||
| 107 | - <y>164</y> | ||
| 108 | - <width>111</width> | ||
| 109 | - <height>121</height> | ||
| 110 | - </rect> | ||
| 111 | - </property> | ||
| 112 | - <property name="text"> | ||
| 113 | - <string/> | ||
| 114 | - </property> | ||
| 115 | - </widget> | ||
| 116 | </widget> | 37 | </widget> |
| 117 | <widget class="QWidget" name="page_2"/> | 38 | <widget class="QWidget" name="page_2"/> |
| 118 | </widget> | 39 | </widget> |
| @@ -839,41 +760,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o | @@ -839,41 +760,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o | ||
| 839 | </widget> | 760 | </widget> |
| 840 | <customwidgets> | 761 | <customwidgets> |
| 841 | <customwidget> | 762 | <customwidget> |
| 842 | - <class>Clock</class> | 763 | + <class>StatusArea</class> |
| 843 | <extends>QWidget</extends> | 764 | <extends>QWidget</extends> |
| 844 | - <header>clock.h</header> | 765 | + <header>statusarea.h</header> |
| 845 | <container>1</container> | 766 | <container>1</container> |
| 846 | </customwidget> | 767 | </customwidget> |
| 847 | - <customwidget> | ||
| 848 | - <class>WashWarnIcon</class> | ||
| 849 | - <extends>QLabel</extends> | ||
| 850 | - <header>washwarnicon.h</header> | ||
| 851 | - </customwidget> | ||
| 852 | - <customwidget> | ||
| 853 | - <class>DemoIcon</class> | ||
| 854 | - <extends>QLabel</extends> | ||
| 855 | - <header>demoicon.h</header> | ||
| 856 | - </customwidget> | ||
| 857 | - <customwidget> | ||
| 858 | - <class>HalfEnergyIcon</class> | ||
| 859 | - <extends>QLabel</extends> | ||
| 860 | - <header>halfenergyicon.h</header> | ||
| 861 | - </customwidget> | ||
| 862 | - <customwidget> | ||
| 863 | - <class>DigitalClock</class> | ||
| 864 | - <extends>QLabel</extends> | ||
| 865 | - <header>digitalclock.h</header> | ||
| 866 | - </customwidget> | ||
| 867 | - <customwidget> | ||
| 868 | - <class>IgnitionIcon</class> | ||
| 869 | - <extends>QLabel</extends> | ||
| 870 | - <header>ignitionicon.h</header> | ||
| 871 | - </customwidget> | ||
| 872 | - <customwidget> | ||
| 873 | - <class>WaterLevelIcon</class> | ||
| 874 | - <extends>QLabel</extends> | ||
| 875 | - <header>waterlevelicon.h</header> | ||
| 876 | - </customwidget> | ||
| 877 | </customwidgets> | 768 | </customwidgets> |
| 878 | <resources/> | 769 | <resources/> |
| 879 | <connections/> | 770 | <connections/> |
app/gui/oven_control/gasmodelsettingwindow.ui
| @@ -558,89 +558,10 @@ QPushButton:pressed , QPushButton::checked, QPushButton:focus{ border-image: url | @@ -558,89 +558,10 @@ QPushButton:pressed , QPushButton::checked, QPushButton:focus{ border-image: url | ||
| 558 | <height>426</height> | 558 | <height>426</height> |
| 559 | </rect> | 559 | </rect> |
| 560 | </property> | 560 | </property> |
| 561 | - <widget class="QWidget" name="clockContainer"> | 561 | + <widget class="StatusArea" name="clockContainer"> |
| 562 | <property name="styleSheet"> | 562 | <property name="styleSheet"> |
| 563 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 563 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 564 | </property> | 564 | </property> |
| 565 | - <widget class="Clock" name="clock" native="true"> | ||
| 566 | - <property name="geometry"> | ||
| 567 | - <rect> | ||
| 568 | - <x>272</x> | ||
| 569 | - <y>36</y> | ||
| 570 | - <width>356</width> | ||
| 571 | - <height>355</height> | ||
| 572 | - </rect> | ||
| 573 | - </property> | ||
| 574 | - </widget> | ||
| 575 | - <widget class="WashWarnIcon" name="label"> | ||
| 576 | - <property name="geometry"> | ||
| 577 | - <rect> | ||
| 578 | - <x>800</x> | ||
| 579 | - <y>320</y> | ||
| 580 | - <width>80</width> | ||
| 581 | - <height>84</height> | ||
| 582 | - </rect> | ||
| 583 | - </property> | ||
| 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> | ||
| 605 | - <widget class="DigitalClock" name="label_4"> | ||
| 606 | - <property name="geometry"> | ||
| 607 | - <rect> | ||
| 608 | - <x>20</x> | ||
| 609 | - <y>310</y> | ||
| 610 | - <width>600</width> | ||
| 611 | - <height>100</height> | ||
| 612 | - </rect> | ||
| 613 | - </property> | ||
| 614 | - <property name="alignment"> | ||
| 615 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 616 | - </property> | ||
| 617 | - </widget> | ||
| 618 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 619 | - <property name="geometry"> | ||
| 620 | - <rect> | ||
| 621 | - <x>670</x> | ||
| 622 | - <y>290</y> | ||
| 623 | - <width>111</width> | ||
| 624 | - <height>121</height> | ||
| 625 | - </rect> | ||
| 626 | - </property> | ||
| 627 | - <property name="text"> | ||
| 628 | - <string/> | ||
| 629 | - </property> | ||
| 630 | - </widget> | ||
| 631 | - <widget class="IgnitionIcon" name="label_5"> | ||
| 632 | - <property name="geometry"> | ||
| 633 | - <rect> | ||
| 634 | - <x>662</x> | ||
| 635 | - <y>164</y> | ||
| 636 | - <width>111</width> | ||
| 637 | - <height>121</height> | ||
| 638 | - </rect> | ||
| 639 | - </property> | ||
| 640 | - <property name="text"> | ||
| 641 | - <string/> | ||
| 642 | - </property> | ||
| 643 | - </widget> | ||
| 644 | </widget> | 565 | </widget> |
| 645 | <widget class="QWidget" name="page_2"/> | 566 | <widget class="QWidget" name="page_2"/> |
| 646 | </widget> | 567 | </widget> |
| @@ -748,41 +669,11 @@ QPushButton:pressed, QPushButton::checked, QPushButton:focus { border-image: url | @@ -748,41 +669,11 @@ QPushButton:pressed, QPushButton::checked, QPushButton:focus { border-image: url | ||
| 748 | </widget> | 669 | </widget> |
| 749 | <customwidgets> | 670 | <customwidgets> |
| 750 | <customwidget> | 671 | <customwidget> |
| 751 | - <class>Clock</class> | 672 | + <class>StatusArea</class> |
| 752 | <extends>QWidget</extends> | 673 | <extends>QWidget</extends> |
| 753 | - <header>clock.h</header> | 674 | + <header>statusarea.h</header> |
| 754 | <container>1</container> | 675 | <container>1</container> |
| 755 | </customwidget> | 676 | </customwidget> |
| 756 | - <customwidget> | ||
| 757 | - <class>WashWarnIcon</class> | ||
| 758 | - <extends>QLabel</extends> | ||
| 759 | - <header>washwarnicon.h</header> | ||
| 760 | - </customwidget> | ||
| 761 | - <customwidget> | ||
| 762 | - <class>DemoIcon</class> | ||
| 763 | - <extends>QLabel</extends> | ||
| 764 | - <header>demoicon.h</header> | ||
| 765 | - </customwidget> | ||
| 766 | - <customwidget> | ||
| 767 | - <class>HalfEnergyIcon</class> | ||
| 768 | - <extends>QLabel</extends> | ||
| 769 | - <header>halfenergyicon.h</header> | ||
| 770 | - </customwidget> | ||
| 771 | - <customwidget> | ||
| 772 | - <class>DigitalClock</class> | ||
| 773 | - <extends>QLabel</extends> | ||
| 774 | - <header>digitalclock.h</header> | ||
| 775 | - </customwidget> | ||
| 776 | - <customwidget> | ||
| 777 | - <class>IgnitionIcon</class> | ||
| 778 | - <extends>QLabel</extends> | ||
| 779 | - <header>ignitionicon.h</header> | ||
| 780 | - </customwidget> | ||
| 781 | - <customwidget> | ||
| 782 | - <class>WaterLevelIcon</class> | ||
| 783 | - <extends>QLabel</extends> | ||
| 784 | - <header>waterlevelicon.h</header> | ||
| 785 | - </customwidget> | ||
| 786 | </customwidgets> | 677 | </customwidgets> |
| 787 | <tabstops> | 678 | <tabstops> |
| 788 | <tabstop>lpg10Button</tabstop> | 679 | <tabstop>lpg10Button</tabstop> |
app/gui/oven_control/gastestwindow.ui
| @@ -24,89 +24,10 @@ | @@ -24,89 +24,10 @@ | ||
| 24 | <height>426</height> | 24 | <height>426</height> |
| 25 | </rect> | 25 | </rect> |
| 26 | </property> | 26 | </property> |
| 27 | - <widget class="QWidget" name="clockContainer"> | 27 | + <widget class="StatusArea" name="clockContainer"> |
| 28 | <property name="styleSheet"> | 28 | <property name="styleSheet"> |
| 29 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 29 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 30 | </property> | 30 | </property> |
| 31 | - <widget class="Clock" name="clock" native="true"> | ||
| 32 | - <property name="geometry"> | ||
| 33 | - <rect> | ||
| 34 | - <x>272</x> | ||
| 35 | - <y>36</y> | ||
| 36 | - <width>356</width> | ||
| 37 | - <height>355</height> | ||
| 38 | - </rect> | ||
| 39 | - </property> | ||
| 40 | - </widget> | ||
| 41 | - <widget class="WashWarnIcon" name="label"> | ||
| 42 | - <property name="geometry"> | ||
| 43 | - <rect> | ||
| 44 | - <x>800</x> | ||
| 45 | - <y>320</y> | ||
| 46 | - <width>80</width> | ||
| 47 | - <height>84</height> | ||
| 48 | - </rect> | ||
| 49 | - </property> | ||
| 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> | ||
| 71 | - <widget class="DigitalClock" name="label_4"> | ||
| 72 | - <property name="geometry"> | ||
| 73 | - <rect> | ||
| 74 | - <x>20</x> | ||
| 75 | - <y>310</y> | ||
| 76 | - <width>600</width> | ||
| 77 | - <height>100</height> | ||
| 78 | - </rect> | ||
| 79 | - </property> | ||
| 80 | - <property name="alignment"> | ||
| 81 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 82 | - </property> | ||
| 83 | - </widget> | ||
| 84 | - <widget class="WaterLevelIcon" name="label_7"> | ||
| 85 | - <property name="geometry"> | ||
| 86 | - <rect> | ||
| 87 | - <x>670</x> | ||
| 88 | - <y>290</y> | ||
| 89 | - <width>111</width> | ||
| 90 | - <height>121</height> | ||
| 91 | - </rect> | ||
| 92 | - </property> | ||
| 93 | - <property name="text"> | ||
| 94 | - <string/> | ||
| 95 | - </property> | ||
| 96 | - </widget> | ||
| 97 | - <widget class="IgnitionIcon" name="label_5"> | ||
| 98 | - <property name="geometry"> | ||
| 99 | - <rect> | ||
| 100 | - <x>662</x> | ||
| 101 | - <y>164</y> | ||
| 102 | - <width>111</width> | ||
| 103 | - <height>121</height> | ||
| 104 | - </rect> | ||
| 105 | - </property> | ||
| 106 | - <property name="text"> | ||
| 107 | - <string/> | ||
| 108 | - </property> | ||
| 109 | - </widget> | ||
| 110 | </widget> | 31 | </widget> |
| 111 | <widget class="QWidget" name="page_2"/> | 32 | <widget class="QWidget" name="page_2"/> |
| 112 | </widget> | 33 | </widget> |
| @@ -537,41 +458,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o | @@ -537,41 +458,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o | ||
| 537 | </widget> | 458 | </widget> |
| 538 | <customwidgets> | 459 | <customwidgets> |
| 539 | <customwidget> | 460 | <customwidget> |
| 540 | - <class>Clock</class> | 461 | + <class>StatusArea</class> |
| 541 | <extends>QWidget</extends> | 462 | <extends>QWidget</extends> |
| 542 | - <header>clock.h</header> | 463 | + <header>statusarea.h</header> |
| 543 | <container>1</container> | 464 | <container>1</container> |
| 544 | </customwidget> | 465 | </customwidget> |
| 545 | - <customwidget> | ||
| 546 | - <class>WashWarnIcon</class> | ||
| 547 | - <extends>QLabel</extends> | ||
| 548 | - <header>washwarnicon.h</header> | ||
| 549 | - </customwidget> | ||
| 550 | - <customwidget> | ||
| 551 | - <class>DemoIcon</class> | ||
| 552 | - <extends>QLabel</extends> | ||
| 553 | - <header>demoicon.h</header> | ||
| 554 | - </customwidget> | ||
| 555 | - <customwidget> | ||
| 556 | - <class>HalfEnergyIcon</class> | ||
| 557 | - <extends>QLabel</extends> | ||
| 558 | - <header>halfenergyicon.h</header> | ||
| 559 | - </customwidget> | ||
| 560 | - <customwidget> | ||
| 561 | - <class>DigitalClock</class> | ||
| 562 | - <extends>QLabel</extends> | ||
| 563 | - <header>digitalclock.h</header> | ||
| 564 | - </customwidget> | ||
| 565 | - <customwidget> | ||
| 566 | - <class>IgnitionIcon</class> | ||
| 567 | - <extends>QLabel</extends> | ||
| 568 | - <header>ignitionicon.h</header> | ||
| 569 | - </customwidget> | ||
| 570 | - <customwidget> | ||
| 571 | - <class>WaterLevelIcon</class> | ||
| 572 | - <extends>QLabel</extends> | ||
| 573 | - <header>waterlevelicon.h</header> | ||
| 574 | - </customwidget> | ||
| 575 | </customwidgets> | 466 | </customwidgets> |
| 576 | <resources> | 467 | <resources> |
| 577 | <include location="resources.qrc"/> | 468 | <include location="resources.qrc"/> |
app/gui/oven_control/historylistwindow.ui
| @@ -182,89 +182,10 @@ QPushButton:pressed , QPushButton:focus{ border-image: url(:/images/bottom_bar/0 | @@ -182,89 +182,10 @@ QPushButton:pressed , QPushButton:focus{ border-image: url(:/images/bottom_bar/0 | ||
| 182 | <height>426</height> | 182 | <height>426</height> |
| 183 | </rect> | 183 | </rect> |
| 184 | </property> | 184 | </property> |
| 185 | - <widget class="QWidget" name="clockContainer"> | 185 | + <widget class="StatusArea" name="clockContainer"> |
| 186 | <property name="styleSheet"> | 186 | <property name="styleSheet"> |
| 187 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 187 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 188 | </property> | 188 | </property> |
| 189 | - <widget class="Clock" name="clock" native="true"> | ||
| 190 | - <property name="geometry"> | ||
| 191 | - <rect> | ||
| 192 | - <x>272</x> | ||
| 193 | - <y>36</y> | ||
| 194 | - <width>356</width> | ||
| 195 | - <height>355</height> | ||
| 196 | - </rect> | ||
| 197 | - </property> | ||
| 198 | - </widget> | ||
| 199 | - <widget class="WashWarnIcon" name="label_5"> | ||
| 200 | - <property name="geometry"> | ||
| 201 | - <rect> | ||
| 202 | - <x>800</x> | ||
| 203 | - <y>320</y> | ||
| 204 | - <width>80</width> | ||
| 205 | - <height>84</height> | ||
| 206 | - </rect> | ||
| 207 | - </property> | ||
| 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> | ||
| 229 | - <widget class="DigitalClock" name="label_8"> | ||
| 230 | - <property name="geometry"> | ||
| 231 | - <rect> | ||
| 232 | - <x>20</x> | ||
| 233 | - <y>310</y> | ||
| 234 | - <width>600</width> | ||
| 235 | - <height>100</height> | ||
| 236 | - </rect> | ||
| 237 | - </property> | ||
| 238 | - <property name="alignment"> | ||
| 239 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 240 | - </property> | ||
| 241 | - </widget> | ||
| 242 | - <widget class="WaterLevelIcon" name="label_9"> | ||
| 243 | - <property name="geometry"> | ||
| 244 | - <rect> | ||
| 245 | - <x>670</x> | ||
| 246 | - <y>290</y> | ||
| 247 | - <width>111</width> | ||
| 248 | - <height>121</height> | ||
| 249 | - </rect> | ||
| 250 | - </property> | ||
| 251 | - <property name="text"> | ||
| 252 | - <string/> | ||
| 253 | - </property> | ||
| 254 | - </widget> | ||
| 255 | - <widget class="IgnitionIcon" name="label_10"> | ||
| 256 | - <property name="geometry"> | ||
| 257 | - <rect> | ||
| 258 | - <x>662</x> | ||
| 259 | - <y>164</y> | ||
| 260 | - <width>111</width> | ||
| 261 | - <height>121</height> | ||
| 262 | - </rect> | ||
| 263 | - </property> | ||
| 264 | - <property name="text"> | ||
| 265 | - <string/> | ||
| 266 | - </property> | ||
| 267 | - </widget> | ||
| 268 | </widget> | 189 | </widget> |
| 269 | <widget class="QWidget" name="page_2"/> | 190 | <widget class="QWidget" name="page_2"/> |
| 270 | </widget> | 191 | </widget> |
| @@ -1469,41 +1390,11 @@ QPushButton { text-align:center;}</string> | @@ -1469,41 +1390,11 @@ QPushButton { text-align:center;}</string> | ||
| 1469 | </widget> | 1390 | </widget> |
| 1470 | <customwidgets> | 1391 | <customwidgets> |
| 1471 | <customwidget> | 1392 | <customwidget> |
| 1472 | - <class>Clock</class> | 1393 | + <class>StatusArea</class> |
| 1473 | <extends>QWidget</extends> | 1394 | <extends>QWidget</extends> |
| 1474 | - <header>clock.h</header> | 1395 | + <header>statusarea.h</header> |
| 1475 | <container>1</container> | 1396 | <container>1</container> |
| 1476 | </customwidget> | 1397 | </customwidget> |
| 1477 | - <customwidget> | ||
| 1478 | - <class>WashWarnIcon</class> | ||
| 1479 | - <extends>QLabel</extends> | ||
| 1480 | - <header>washwarnicon.h</header> | ||
| 1481 | - </customwidget> | ||
| 1482 | - <customwidget> | ||
| 1483 | - <class>DemoIcon</class> | ||
| 1484 | - <extends>QLabel</extends> | ||
| 1485 | - <header>demoicon.h</header> | ||
| 1486 | - </customwidget> | ||
| 1487 | - <customwidget> | ||
| 1488 | - <class>HalfEnergyIcon</class> | ||
| 1489 | - <extends>QLabel</extends> | ||
| 1490 | - <header>halfenergyicon.h</header> | ||
| 1491 | - </customwidget> | ||
| 1492 | - <customwidget> | ||
| 1493 | - <class>DigitalClock</class> | ||
| 1494 | - <extends>QLabel</extends> | ||
| 1495 | - <header>digitalclock.h</header> | ||
| 1496 | - </customwidget> | ||
| 1497 | - <customwidget> | ||
| 1498 | - <class>IgnitionIcon</class> | ||
| 1499 | - <extends>QLabel</extends> | ||
| 1500 | - <header>ignitionicon.h</header> | ||
| 1501 | - </customwidget> | ||
| 1502 | - <customwidget> | ||
| 1503 | - <class>WaterLevelIcon</class> | ||
| 1504 | - <extends>QLabel</extends> | ||
| 1505 | - <header>waterlevelicon.h</header> | ||
| 1506 | - </customwidget> | ||
| 1507 | </customwidgets> | 1398 | </customwidgets> |
| 1508 | <resources/> | 1399 | <resources/> |
| 1509 | <connections/> | 1400 | <connections/> |
app/gui/oven_control/ignitionicon.cpp
| @@ -17,7 +17,7 @@ IgnitionIcon::IgnitionIcon(QWidget *parent) : QLabel(parent) | @@ -17,7 +17,7 @@ IgnitionIcon::IgnitionIcon(QWidget *parent) : QLabel(parent) | ||
| 17 | void IgnitionIcon::check() | 17 | void IgnitionIcon::check() |
| 18 | { | 18 | { |
| 19 | UdpHandler *udp = UdpHandler::getInstance(); | 19 | UdpHandler *udp = UdpHandler::getInstance(); |
| 20 | - if (udp->burnerState(1) || udp->burnerState(2) || udp->burnerState(3)) | 20 | + if (udp->burnerState(1) || udp->burnerState(2) || udp->burnerState(3) || udp->heater()) |
| 21 | show(); | 21 | show(); |
| 22 | else | 22 | else |
| 23 | hide(); | 23 | hide(); |
app/gui/oven_control/mainwindow.ui
| @@ -577,7 +577,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -577,7 +577,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
| 577 | <string>type</string> | 577 | <string>type</string> |
| 578 | </property> | 578 | </property> |
| 579 | </widget> | 579 | </widget> |
| 580 | - <widget class="QWidget" name="clockContainer" native="true"> | 580 | + <widget class="StatusArea" name="clockContainer" native="true"> |
| 581 | <property name="geometry"> | 581 | <property name="geometry"> |
| 582 | <rect> | 582 | <rect> |
| 583 | <x>0</x> | 583 | <x>0</x> |
| @@ -589,85 +589,6 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -589,85 +589,6 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
| 589 | <property name="styleSheet"> | 589 | <property name="styleSheet"> |
| 590 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 590 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 591 | </property> | 591 | </property> |
| 592 | - <widget class="Clock" name="clock" native="true"> | ||
| 593 | - <property name="geometry"> | ||
| 594 | - <rect> | ||
| 595 | - <x>272</x> | ||
| 596 | - <y>36</y> | ||
| 597 | - <width>356</width> | ||
| 598 | - <height>355</height> | ||
| 599 | - </rect> | ||
| 600 | - </property> | ||
| 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> | ||
| 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 | - </widget> | ||
| 622 | - <widget class="HalfEnergyIcon" name="label_3"> | ||
| 623 | - <property name="geometry"> | ||
| 624 | - <rect> | ||
| 625 | - <x>780</x> | ||
| 626 | - <y>160</y> | ||
| 627 | - <width>108</width> | ||
| 628 | - <height>67</height> | ||
| 629 | - </rect> | ||
| 630 | - </property> | ||
| 631 | - </widget> | ||
| 632 | - <widget class="DigitalClock" name="label_4"> | ||
| 633 | - <property name="geometry"> | ||
| 634 | - <rect> | ||
| 635 | - <x>20</x> | ||
| 636 | - <y>310</y> | ||
| 637 | - <width>600</width> | ||
| 638 | - <height>100</height> | ||
| 639 | - </rect> | ||
| 640 | - </property> | ||
| 641 | - <property name="alignment"> | ||
| 642 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 643 | - </property> | ||
| 644 | - </widget> | ||
| 645 | - <widget class="IgnitionIcon" name="label_5"> | ||
| 646 | - <property name="geometry"> | ||
| 647 | - <rect> | ||
| 648 | - <x>662</x> | ||
| 649 | - <y>164</y> | ||
| 650 | - <width>111</width> | ||
| 651 | - <height>121</height> | ||
| 652 | - </rect> | ||
| 653 | - </property> | ||
| 654 | - <property name="text"> | ||
| 655 | - <string/> | ||
| 656 | - </property> | ||
| 657 | - </widget> | ||
| 658 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 659 | - <property name="geometry"> | ||
| 660 | - <rect> | ||
| 661 | - <x>670</x> | ||
| 662 | - <y>290</y> | ||
| 663 | - <width>111</width> | ||
| 664 | - <height>121</height> | ||
| 665 | - </rect> | ||
| 666 | - </property> | ||
| 667 | - <property name="text"> | ||
| 668 | - <string/> | ||
| 669 | - </property> | ||
| 670 | - </widget> | ||
| 671 | </widget> | 592 | </widget> |
| 672 | <widget class="Line" name="line_7"> | 593 | <widget class="Line" name="line_7"> |
| 673 | <property name="geometry"> | 594 | <property name="geometry"> |
| @@ -730,41 +651,11 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -730,41 +651,11 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
| 730 | <layoutdefault spacing="6" margin="11"/> | 651 | <layoutdefault spacing="6" margin="11"/> |
| 731 | <customwidgets> | 652 | <customwidgets> |
| 732 | <customwidget> | 653 | <customwidget> |
| 733 | - <class>Clock</class> | 654 | + <class>StatusArea</class> |
| 734 | <extends>QWidget</extends> | 655 | <extends>QWidget</extends> |
| 735 | - <header>clock.h</header> | 656 | + <header>statusarea.h</header> |
| 736 | <container>1</container> | 657 | <container>1</container> |
| 737 | </customwidget> | 658 | </customwidget> |
| 738 | - <customwidget> | ||
| 739 | - <class>WashWarnIcon</class> | ||
| 740 | - <extends>QLabel</extends> | ||
| 741 | - <header>washwarnicon.h</header> | ||
| 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> | ||
| 753 | - <customwidget> | ||
| 754 | - <class>DigitalClock</class> | ||
| 755 | - <extends>QLabel</extends> | ||
| 756 | - <header>digitalclock.h</header> | ||
| 757 | - </customwidget> | ||
| 758 | - <customwidget> | ||
| 759 | - <class>IgnitionIcon</class> | ||
| 760 | - <extends>QLabel</extends> | ||
| 761 | - <header>ignitionicon.h</header> | ||
| 762 | - </customwidget> | ||
| 763 | - <customwidget> | ||
| 764 | - <class>WaterLevelIcon</class> | ||
| 765 | - <extends>QLabel</extends> | ||
| 766 | - <header>waterlevelicon.h</header> | ||
| 767 | - </customwidget> | ||
| 768 | </customwidgets> | 659 | </customwidgets> |
| 769 | <tabstops> | 660 | <tabstops> |
| 770 | <tabstop>steamButton</tabstop> | 661 | <tabstop>steamButton</tabstop> |
app/gui/oven_control/manualcookfinishpopup.cpp
| @@ -0,0 +1,117 @@ | @@ -0,0 +1,117 @@ | ||
| 1 | +#include "manualcookfinishpopup.h" | ||
| 2 | +#include "ui_manualcookfinishpopup.h" | ||
| 3 | + | ||
| 4 | +#include <QKeyEvent> | ||
| 5 | + | ||
| 6 | +#include "soundplayer.h" | ||
| 7 | + | ||
| 8 | +ManualCookFinishPopup::ManualCookFinishPopup(QWidget *parent, bool keepWarmStartable) : | ||
| 9 | + QWidget(parent), | ||
| 10 | + ui(new Ui::ManualCookFinishPopup) | ||
| 11 | +{ | ||
| 12 | + ui->setupUi(this); | ||
| 13 | + | ||
| 14 | + setAttribute(Qt::WA_DeleteOnClose); | ||
| 15 | + | ||
| 16 | + foreach (QPushButton *button, findChildren<QPushButton *>()) | ||
| 17 | + connect(button, &QPushButton::pressed, SoundPlayer::playClick); | ||
| 18 | + | ||
| 19 | + ui->warmupButton->setEnabled(keepWarmStartable); | ||
| 20 | + | ||
| 21 | + ui->background->setFocus(); | ||
| 22 | +} | ||
| 23 | + | ||
| 24 | +ManualCookFinishPopup::~ManualCookFinishPopup() | ||
| 25 | +{ | ||
| 26 | + delete ui; | ||
| 27 | +} | ||
| 28 | + | ||
| 29 | +void ManualCookFinishPopup::keyPressEvent(QKeyEvent *event) | ||
| 30 | +{ | ||
| 31 | + switch (event->key()) | ||
| 32 | + { | ||
| 33 | + case 0x01000032: // Turn left | ||
| 34 | + onEncoderLeft(); | ||
| 35 | + break; | ||
| 36 | + case 0x01000031: // Push | ||
| 37 | + pushed = focusWidget(); | ||
| 38 | + break; | ||
| 39 | + case 0x01000030: // Turn right | ||
| 40 | + onEncoderRight(); | ||
| 41 | + break; | ||
| 42 | + } | ||
| 43 | +} | ||
| 44 | + | ||
| 45 | +void ManualCookFinishPopup::keyReleaseEvent(QKeyEvent *event) | ||
| 46 | +{ | ||
| 47 | + switch (event->key()) | ||
| 48 | + { | ||
| 49 | + case 0x01000032: // Turn left | ||
| 50 | + onEncoderLeft(); | ||
| 51 | + break; | ||
| 52 | + case 0x01000031: // Push | ||
| 53 | + if (focusWidget() == pushed) | ||
| 54 | + onEncoderClicked(pushed); | ||
| 55 | + | ||
| 56 | + pushed = NULL; | ||
| 57 | + break; | ||
| 58 | + case 0x01000030: // Turn right | ||
| 59 | + onEncoderRight(); | ||
| 60 | + break; | ||
| 61 | + } | ||
| 62 | +} | ||
| 63 | + | ||
| 64 | +void ManualCookFinishPopup::onEncoderLeft() | ||
| 65 | +{ | ||
| 66 | + QWidget *focused = focusWidget(); | ||
| 67 | + if (focused == ui->background) | ||
| 68 | + ui->okButton->setFocus(); | ||
| 69 | + else | ||
| 70 | + focusPreviousChild(); | ||
| 71 | +} | ||
| 72 | + | ||
| 73 | +void ManualCookFinishPopup::onEncoderRight() | ||
| 74 | +{ | ||
| 75 | + if (focusWidget() == ui->okButton) | ||
| 76 | + ui->background->setFocus(); | ||
| 77 | + else | ||
| 78 | + focusNextChild(); | ||
| 79 | +} | ||
| 80 | + | ||
| 81 | +void ManualCookFinishPopup::onEncoderClicked(QWidget *clicked) | ||
| 82 | +{ | ||
| 83 | + if (clicked == ui->background) | ||
| 84 | + { | ||
| 85 | + close(); | ||
| 86 | + return; | ||
| 87 | + } | ||
| 88 | + | ||
| 89 | + QPushButton *b = qobject_cast<QPushButton *>(clicked); | ||
| 90 | + if (b) | ||
| 91 | + { | ||
| 92 | + b->click(); | ||
| 93 | + return; | ||
| 94 | + } | ||
| 95 | +} | ||
| 96 | + | ||
| 97 | +void ManualCookFinishPopup::on_closeButton_clicked() | ||
| 98 | +{ | ||
| 99 | + close(); | ||
| 100 | +} | ||
| 101 | + | ||
| 102 | +void ManualCookFinishPopup::on_closeButton_2_clicked() | ||
| 103 | +{ | ||
| 104 | + close(); | ||
| 105 | +} | ||
| 106 | + | ||
| 107 | +void ManualCookFinishPopup::on_warmupButton_clicked() | ||
| 108 | +{ | ||
| 109 | + close(); | ||
| 110 | + | ||
| 111 | + emit keepWarm(); | ||
| 112 | +} | ||
| 113 | + | ||
| 114 | +void ManualCookFinishPopup::on_okButton_clicked() | ||
| 115 | +{ | ||
| 116 | + close(); | ||
| 117 | +} |
app/gui/oven_control/manualcookfinishpopup.h
| @@ -0,0 +1,41 @@ | @@ -0,0 +1,41 @@ | ||
| 1 | +#ifndef MANUALCOOKFINISHPOPUP_H | ||
| 2 | +#define MANUALCOOKFINISHPOPUP_H | ||
| 3 | + | ||
| 4 | +#include <QWidget> | ||
| 5 | + | ||
| 6 | +namespace Ui { | ||
| 7 | +class ManualCookFinishPopup; | ||
| 8 | +} | ||
| 9 | + | ||
| 10 | +class ManualCookFinishPopup : public QWidget | ||
| 11 | +{ | ||
| 12 | + Q_OBJECT | ||
| 13 | + | ||
| 14 | +public: | ||
| 15 | + explicit ManualCookFinishPopup(QWidget *parent = nullptr, bool keepWarmStartable = true); | ||
| 16 | + ~ManualCookFinishPopup(); | ||
| 17 | + | ||
| 18 | +signals: | ||
| 19 | + void keepWarm(); | ||
| 20 | + | ||
| 21 | +protected: | ||
| 22 | + void keyPressEvent(QKeyEvent *event); | ||
| 23 | + void keyReleaseEvent(QKeyEvent *event); | ||
| 24 | + | ||
| 25 | +private: | ||
| 26 | + Ui::ManualCookFinishPopup *ui; | ||
| 27 | + | ||
| 28 | + QWidget *pushed = Q_NULLPTR; | ||
| 29 | + | ||
| 30 | + void onEncoderLeft(); | ||
| 31 | + void onEncoderRight(); | ||
| 32 | + void onEncoderClicked(QWidget *clicked); | ||
| 33 | + | ||
| 34 | +private slots: | ||
| 35 | + void on_closeButton_clicked(); | ||
| 36 | + void on_closeButton_2_clicked(); | ||
| 37 | + void on_warmupButton_clicked(); | ||
| 38 | + void on_okButton_clicked(); | ||
| 39 | +}; | ||
| 40 | + | ||
| 41 | +#endif // MANUALCOOKFINISHPOPUP_H |
app/gui/oven_control/manualcookfinishpopup.ui
| @@ -0,0 +1,171 @@ | @@ -0,0 +1,171 @@ | ||
| 1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | +<ui version="4.0"> | ||
| 3 | + <class>ManualCookFinishPopup</class> | ||
| 4 | + <widget class="QWidget" name="ManualCookFinishPopup"> | ||
| 5 | + <property name="geometry"> | ||
| 6 | + <rect> | ||
| 7 | + <x>0</x> | ||
| 8 | + <y>0</y> | ||
| 9 | + <width>1080</width> | ||
| 10 | + <height>1920</height> | ||
| 11 | + </rect> | ||
| 12 | + </property> | ||
| 13 | + <property name="windowTitle"> | ||
| 14 | + <string>Form</string> | ||
| 15 | + </property> | ||
| 16 | + <property name="styleSheet"> | ||
| 17 | + <string notr="true">#closeButton { border: none; } | ||
| 18 | +#closeButton_2 { border: none; } | ||
| 19 | +#background { background-image: url(:/images/background/popup/913.png); } | ||
| 20 | +#background:focus { border: 4px solid gray; } | ||
| 21 | + | ||
| 22 | +QPushButton { | ||
| 23 | +background-position: center; | ||
| 24 | +background-repeat: no-repeat; | ||
| 25 | +border: none; | ||
| 26 | +} | ||
| 27 | + | ||
| 28 | +QPushButton[style="icon"] { background-image: url(:/images/slider_icon/background.png); } | ||
| 29 | + | ||
| 30 | +QPushButton { color: white; border: none; } | ||
| 31 | +QPushButton:pressed, QPushButton:focus { color: yellow; } | ||
| 32 | +QPushButton:disabled { color: grey; } | ||
| 33 | + | ||
| 34 | +QLabel { color: white; }</string> | ||
| 35 | + </property> | ||
| 36 | + <widget class="QPushButton" name="closeButton_2"> | ||
| 37 | + <property name="geometry"> | ||
| 38 | + <rect> | ||
| 39 | + <x>0</x> | ||
| 40 | + <y>961</y> | ||
| 41 | + <width>1080</width> | ||
| 42 | + <height>958</height> | ||
| 43 | + </rect> | ||
| 44 | + </property> | ||
| 45 | + <property name="text"> | ||
| 46 | + <string/> | ||
| 47 | + </property> | ||
| 48 | + </widget> | ||
| 49 | + <widget class="QWidget" name="background" native="true"> | ||
| 50 | + <property name="geometry"> | ||
| 51 | + <rect> | ||
| 52 | + <x>0</x> | ||
| 53 | + <y>511</y> | ||
| 54 | + <width>1080</width> | ||
| 55 | + <height>831</height> | ||
| 56 | + </rect> | ||
| 57 | + </property> | ||
| 58 | + <property name="focusPolicy"> | ||
| 59 | + <enum>Qt::TabFocus</enum> | ||
| 60 | + </property> | ||
| 61 | + <widget class="QPushButton" name="warmupButton"> | ||
| 62 | + <property name="geometry"> | ||
| 63 | + <rect> | ||
| 64 | + <x>385</x> | ||
| 65 | + <y>670</y> | ||
| 66 | + <width>150</width> | ||
| 67 | + <height>120</height> | ||
| 68 | + </rect> | ||
| 69 | + </property> | ||
| 70 | + <property name="font"> | ||
| 71 | + <font> | ||
| 72 | + <pointsize>22</pointsize> | ||
| 73 | + <weight>75</weight> | ||
| 74 | + <bold>true</bold> | ||
| 75 | + <underline>true</underline> | ||
| 76 | + </font> | ||
| 77 | + </property> | ||
| 78 | + <property name="styleSheet"> | ||
| 79 | + <string notr="true"/> | ||
| 80 | + </property> | ||
| 81 | + <property name="text"> | ||
| 82 | + <string>보온</string> | ||
| 83 | + </property> | ||
| 84 | + </widget> | ||
| 85 | + <widget class="QPushButton" name="okButton"> | ||
| 86 | + <property name="geometry"> | ||
| 87 | + <rect> | ||
| 88 | + <x>545</x> | ||
| 89 | + <y>670</y> | ||
| 90 | + <width>150</width> | ||
| 91 | + <height>120</height> | ||
| 92 | + </rect> | ||
| 93 | + </property> | ||
| 94 | + <property name="font"> | ||
| 95 | + <font> | ||
| 96 | + <pointsize>22</pointsize> | ||
| 97 | + <weight>75</weight> | ||
| 98 | + <bold>true</bold> | ||
| 99 | + <underline>true</underline> | ||
| 100 | + </font> | ||
| 101 | + </property> | ||
| 102 | + <property name="styleSheet"> | ||
| 103 | + <string notr="true"/> | ||
| 104 | + </property> | ||
| 105 | + <property name="text"> | ||
| 106 | + <string>확인</string> | ||
| 107 | + </property> | ||
| 108 | + </widget> | ||
| 109 | + <widget class="QLabel" name="text"> | ||
| 110 | + <property name="geometry"> | ||
| 111 | + <rect> | ||
| 112 | + <x>0</x> | ||
| 113 | + <y>0</y> | ||
| 114 | + <width>1080</width> | ||
| 115 | + <height>240</height> | ||
| 116 | + </rect> | ||
| 117 | + </property> | ||
| 118 | + <property name="font"> | ||
| 119 | + <font> | ||
| 120 | + <pointsize>32</pointsize> | ||
| 121 | + <weight>75</weight> | ||
| 122 | + <bold>true</bold> | ||
| 123 | + </font> | ||
| 124 | + </property> | ||
| 125 | + <property name="text"> | ||
| 126 | + <string>요리가 끝났습니다</string> | ||
| 127 | + </property> | ||
| 128 | + <property name="alignment"> | ||
| 129 | + <set>Qt::AlignCenter</set> | ||
| 130 | + </property> | ||
| 131 | + </widget> | ||
| 132 | + <widget class="QLabel" name="label"> | ||
| 133 | + <property name="geometry"> | ||
| 134 | + <rect> | ||
| 135 | + <x>439</x> | ||
| 136 | + <y>250</y> | ||
| 137 | + <width>301</width> | ||
| 138 | + <height>350</height> | ||
| 139 | + </rect> | ||
| 140 | + </property> | ||
| 141 | + <property name="pixmap"> | ||
| 142 | + <pixmap resource="resources.qrc">:/images/animation/pull_04.png</pixmap> | ||
| 143 | + </property> | ||
| 144 | + </widget> | ||
| 145 | + </widget> | ||
| 146 | + <widget class="QPushButton" name="closeButton"> | ||
| 147 | + <property name="geometry"> | ||
| 148 | + <rect> | ||
| 149 | + <x>0</x> | ||
| 150 | + <y>0</y> | ||
| 151 | + <width>1080</width> | ||
| 152 | + <height>511</height> | ||
| 153 | + </rect> | ||
| 154 | + </property> | ||
| 155 | + <property name="text"> | ||
| 156 | + <string/> | ||
| 157 | + </property> | ||
| 158 | + </widget> | ||
| 159 | + </widget> | ||
| 160 | + <tabstops> | ||
| 161 | + <tabstop>closeButton_2</tabstop> | ||
| 162 | + <tabstop>background</tabstop> | ||
| 163 | + <tabstop>warmupButton</tabstop> | ||
| 164 | + <tabstop>okButton</tabstop> | ||
| 165 | + <tabstop>closeButton</tabstop> | ||
| 166 | + </tabstops> | ||
| 167 | + <resources> | ||
| 168 | + <include location="resources.qrc"/> | ||
| 169 | + </resources> | ||
| 170 | + <connections/> | ||
| 171 | +</ui> |
app/gui/oven_control/manualcookwindow.cpp
| @@ -24,6 +24,7 @@ | @@ -24,6 +24,7 @@ | ||
| 24 | #include "errorpopupdlg.h" | 24 | #include "errorpopupdlg.h" |
| 25 | #include "manualviewerdlg.h" | 25 | #include "manualviewerdlg.h" |
| 26 | #include "haccp.h" | 26 | #include "haccp.h" |
| 27 | +#include "manualcookfinishpopup.h" | ||
| 27 | 28 | ||
| 28 | #include <QTime> | 29 | #include <QTime> |
| 29 | 30 | ||
| @@ -616,6 +617,19 @@ void ManualCookWindow::showInfoText(QString text, QString icon) | @@ -616,6 +617,19 @@ void ManualCookWindow::showInfoText(QString text, QString icon) | ||
| 616 | showInfoTextTimer.start(); | 617 | showInfoTextTimer.start(); |
| 617 | } | 618 | } |
| 618 | 619 | ||
| 620 | +void ManualCookWindow::startKeepWarm() | ||
| 621 | +{ | ||
| 622 | + if (oven->mode() == Define::CombiMode) | ||
| 623 | + return; | ||
| 624 | + | ||
| 625 | + cookDone = false; | ||
| 626 | + | ||
| 627 | + oven->setTemp(70); | ||
| 628 | + oven->setTime(60*60); | ||
| 629 | + | ||
| 630 | + start(); | ||
| 631 | +} | ||
| 632 | + | ||
| 619 | void ManualCookWindow::onOvenUpdated(Oven *oven) | 633 | void ManualCookWindow::onOvenUpdated(Oven *oven) |
| 620 | { | 634 | { |
| 621 | updateView(); | 635 | updateView(); |
| @@ -650,6 +664,13 @@ void ManualCookWindow::onOvenUpdated(Oven *oven) | @@ -650,6 +664,13 @@ void ManualCookWindow::onOvenUpdated(Oven *oven) | ||
| 650 | HACCP::done(); | 664 | HACCP::done(); |
| 651 | 665 | ||
| 652 | emit done(); | 666 | emit done(); |
| 667 | + | ||
| 668 | + focused = focusWidget(); | ||
| 669 | + | ||
| 670 | + ManualCookFinishPopup *p = new ManualCookFinishPopup(this, oven->mode() != Define::CombiMode); | ||
| 671 | + p->showFullScreen(); | ||
| 672 | + connect(p, SIGNAL(keepWarm()), SLOT(startKeepWarm())); | ||
| 673 | + connect(p, SIGNAL(destroyed()), SLOT(focusAgain())); | ||
| 653 | } | 674 | } |
| 654 | } | 675 | } |
| 655 | 676 |
app/gui/oven_control/manualcookwindow.h
| @@ -42,6 +42,7 @@ private slots: | @@ -42,6 +42,7 @@ private slots: | ||
| 42 | void showCurrentTemp(); | 42 | void showCurrentTemp(); |
| 43 | void hideCurrentTemp(); | 43 | void hideCurrentTemp(); |
| 44 | void showInfoText(QString text, QString icon); | 44 | void showInfoText(QString text, QString icon); |
| 45 | + void startKeepWarm(); | ||
| 45 | 46 | ||
| 46 | void onOvenUpdated(Oven *oven); | 47 | void onOvenUpdated(Oven *oven); |
| 47 | 48 |
app/gui/oven_control/manualcookwindow.ui
| @@ -74,89 +74,10 @@ height: 33px; | @@ -74,89 +74,10 @@ height: 33px; | ||
| 74 | <height>426</height> | 74 | <height>426</height> |
| 75 | </rect> | 75 | </rect> |
| 76 | </property> | 76 | </property> |
| 77 | - <widget class="QWidget" name="clockContainer"> | 77 | + <widget class="StatusArea" name="clockContainer"> |
| 78 | <property name="styleSheet"> | 78 | <property name="styleSheet"> |
| 79 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 79 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 80 | </property> | 80 | </property> |
| 81 | - <widget class="Clock" name="clock" native="true"> | ||
| 82 | - <property name="geometry"> | ||
| 83 | - <rect> | ||
| 84 | - <x>272</x> | ||
| 85 | - <y>36</y> | ||
| 86 | - <width>356</width> | ||
| 87 | - <height>355</height> | ||
| 88 | - </rect> | ||
| 89 | - </property> | ||
| 90 | - </widget> | ||
| 91 | - <widget class="WashWarnIcon" name="label_6"> | ||
| 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> | ||
| 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> | ||
| 121 | - <widget class="DigitalClock" name="label_4"> | ||
| 122 | - <property name="geometry"> | ||
| 123 | - <rect> | ||
| 124 | - <x>20</x> | ||
| 125 | - <y>310</y> | ||
| 126 | - <width>600</width> | ||
| 127 | - <height>100</height> | ||
| 128 | - </rect> | ||
| 129 | - </property> | ||
| 130 | - <property name="alignment"> | ||
| 131 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 132 | - </property> | ||
| 133 | - </widget> | ||
| 134 | - <widget class="WaterLevelIcon" name="label_8"> | ||
| 135 | - <property name="geometry"> | ||
| 136 | - <rect> | ||
| 137 | - <x>670</x> | ||
| 138 | - <y>290</y> | ||
| 139 | - <width>111</width> | ||
| 140 | - <height>121</height> | ||
| 141 | - </rect> | ||
| 142 | - </property> | ||
| 143 | - <property name="text"> | ||
| 144 | - <string/> | ||
| 145 | - </property> | ||
| 146 | - </widget> | ||
| 147 | - <widget class="IgnitionIcon" name="label_9"> | ||
| 148 | - <property name="geometry"> | ||
| 149 | - <rect> | ||
| 150 | - <x>662</x> | ||
| 151 | - <y>164</y> | ||
| 152 | - <width>111</width> | ||
| 153 | - <height>121</height> | ||
| 154 | - </rect> | ||
| 155 | - </property> | ||
| 156 | - <property name="text"> | ||
| 157 | - <string/> | ||
| 158 | - </property> | ||
| 159 | - </widget> | ||
| 160 | </widget> | 81 | </widget> |
| 161 | <widget class="QWidget" name="closeDoorWidget"> | 82 | <widget class="QWidget" name="closeDoorWidget"> |
| 162 | <property name="styleSheet"> | 83 | <property name="styleSheet"> |
| @@ -1370,42 +1291,12 @@ margin: 200px 200px;</string> | @@ -1370,42 +1291,12 @@ margin: 200px 200px;</string> | ||
| 1370 | </widget> | 1291 | </widget> |
| 1371 | <customwidgets> | 1292 | <customwidgets> |
| 1372 | <customwidget> | 1293 | <customwidget> |
| 1373 | - <class>Clock</class> | 1294 | + <class>StatusArea</class> |
| 1374 | <extends>QWidget</extends> | 1295 | <extends>QWidget</extends> |
| 1375 | - <header>clock.h</header> | 1296 | + <header>statusarea.h</header> |
| 1376 | <container>1</container> | 1297 | <container>1</container> |
| 1377 | </customwidget> | 1298 | </customwidget> |
| 1378 | <customwidget> | 1299 | <customwidget> |
| 1379 | - <class>WashWarnIcon</class> | ||
| 1380 | - <extends>QLabel</extends> | ||
| 1381 | - <header>washwarnicon.h</header> | ||
| 1382 | - </customwidget> | ||
| 1383 | - <customwidget> | ||
| 1384 | - <class>DemoIcon</class> | ||
| 1385 | - <extends>QLabel</extends> | ||
| 1386 | - <header>demoicon.h</header> | ||
| 1387 | - </customwidget> | ||
| 1388 | - <customwidget> | ||
| 1389 | - <class>HalfEnergyIcon</class> | ||
| 1390 | - <extends>QLabel</extends> | ||
| 1391 | - <header>halfenergyicon.h</header> | ||
| 1392 | - </customwidget> | ||
| 1393 | - <customwidget> | ||
| 1394 | - <class>DigitalClock</class> | ||
| 1395 | - <extends>QLabel</extends> | ||
| 1396 | - <header>digitalclock.h</header> | ||
| 1397 | - </customwidget> | ||
| 1398 | - <customwidget> | ||
| 1399 | - <class>IgnitionIcon</class> | ||
| 1400 | - <extends>QLabel</extends> | ||
| 1401 | - <header>ignitionicon.h</header> | ||
| 1402 | - </customwidget> | ||
| 1403 | - <customwidget> | ||
| 1404 | - <class>WaterLevelIcon</class> | ||
| 1405 | - <extends>QLabel</extends> | ||
| 1406 | - <header>waterlevelicon.h</header> | ||
| 1407 | - </customwidget> | ||
| 1408 | - <customwidget> | ||
| 1409 | <class>Slider</class> | 1300 | <class>Slider</class> |
| 1410 | <extends>QWidget</extends> | 1301 | <extends>QWidget</extends> |
| 1411 | <header>slider.h</header> | 1302 | <header>slider.h</header> |
app/gui/oven_control/modelsettingwindow.ui
| @@ -346,89 +346,10 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o | @@ -346,89 +346,10 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o | ||
| 346 | <height>426</height> | 346 | <height>426</height> |
| 347 | </rect> | 347 | </rect> |
| 348 | </property> | 348 | </property> |
| 349 | - <widget class="QWidget" name="clockContainer"> | 349 | + <widget class="StatusArea" name="clockContainer"> |
| 350 | <property name="styleSheet"> | 350 | <property name="styleSheet"> |
| 351 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 351 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 352 | </property> | 352 | </property> |
| 353 | - <widget class="Clock" name="clock" native="true"> | ||
| 354 | - <property name="geometry"> | ||
| 355 | - <rect> | ||
| 356 | - <x>272</x> | ||
| 357 | - <y>36</y> | ||
| 358 | - <width>356</width> | ||
| 359 | - <height>355</height> | ||
| 360 | - </rect> | ||
| 361 | - </property> | ||
| 362 | - </widget> | ||
| 363 | - <widget class="WashWarnIcon" name="label"> | ||
| 364 | - <property name="geometry"> | ||
| 365 | - <rect> | ||
| 366 | - <x>800</x> | ||
| 367 | - <y>320</y> | ||
| 368 | - <width>80</width> | ||
| 369 | - <height>84</height> | ||
| 370 | - </rect> | ||
| 371 | - </property> | ||
| 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> | ||
| 393 | - <widget class="DigitalClock" name="label_4"> | ||
| 394 | - <property name="geometry"> | ||
| 395 | - <rect> | ||
| 396 | - <x>20</x> | ||
| 397 | - <y>310</y> | ||
| 398 | - <width>600</width> | ||
| 399 | - <height>100</height> | ||
| 400 | - </rect> | ||
| 401 | - </property> | ||
| 402 | - <property name="alignment"> | ||
| 403 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 404 | - </property> | ||
| 405 | - </widget> | ||
| 406 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 407 | - <property name="geometry"> | ||
| 408 | - <rect> | ||
| 409 | - <x>670</x> | ||
| 410 | - <y>290</y> | ||
| 411 | - <width>111</width> | ||
| 412 | - <height>121</height> | ||
| 413 | - </rect> | ||
| 414 | - </property> | ||
| 415 | - <property name="text"> | ||
| 416 | - <string/> | ||
| 417 | - </property> | ||
| 418 | - </widget> | ||
| 419 | - <widget class="IgnitionIcon" name="label_5"> | ||
| 420 | - <property name="geometry"> | ||
| 421 | - <rect> | ||
| 422 | - <x>662</x> | ||
| 423 | - <y>164</y> | ||
| 424 | - <width>111</width> | ||
| 425 | - <height>121</height> | ||
| 426 | - </rect> | ||
| 427 | - </property> | ||
| 428 | - <property name="text"> | ||
| 429 | - <string/> | ||
| 430 | - </property> | ||
| 431 | - </widget> | ||
| 432 | </widget> | 353 | </widget> |
| 433 | <widget class="QWidget" name="page_2"/> | 354 | <widget class="QWidget" name="page_2"/> |
| 434 | </widget> | 355 | </widget> |
| @@ -436,41 +357,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o | @@ -436,41 +357,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o | ||
| 436 | </widget> | 357 | </widget> |
| 437 | <customwidgets> | 358 | <customwidgets> |
| 438 | <customwidget> | 359 | <customwidget> |
| 439 | - <class>Clock</class> | 360 | + <class>StatusArea</class> |
| 440 | <extends>QWidget</extends> | 361 | <extends>QWidget</extends> |
| 441 | - <header>clock.h</header> | 362 | + <header>statusarea.h</header> |
| 442 | <container>1</container> | 363 | <container>1</container> |
| 443 | </customwidget> | 364 | </customwidget> |
| 444 | - <customwidget> | ||
| 445 | - <class>WashWarnIcon</class> | ||
| 446 | - <extends>QLabel</extends> | ||
| 447 | - <header>washwarnicon.h</header> | ||
| 448 | - </customwidget> | ||
| 449 | - <customwidget> | ||
| 450 | - <class>DemoIcon</class> | ||
| 451 | - <extends>QLabel</extends> | ||
| 452 | - <header>demoicon.h</header> | ||
| 453 | - </customwidget> | ||
| 454 | - <customwidget> | ||
| 455 | - <class>HalfEnergyIcon</class> | ||
| 456 | - <extends>QLabel</extends> | ||
| 457 | - <header>halfenergyicon.h</header> | ||
| 458 | - </customwidget> | ||
| 459 | - <customwidget> | ||
| 460 | - <class>DigitalClock</class> | ||
| 461 | - <extends>QLabel</extends> | ||
| 462 | - <header>digitalclock.h</header> | ||
| 463 | - </customwidget> | ||
| 464 | - <customwidget> | ||
| 465 | - <class>IgnitionIcon</class> | ||
| 466 | - <extends>QLabel</extends> | ||
| 467 | - <header>ignitionicon.h</header> | ||
| 468 | - </customwidget> | ||
| 469 | - <customwidget> | ||
| 470 | - <class>WaterLevelIcon</class> | ||
| 471 | - <extends>QLabel</extends> | ||
| 472 | - <header>waterlevelicon.h</header> | ||
| 473 | - </customwidget> | ||
| 474 | </customwidgets> | 365 | </customwidgets> |
| 475 | <resources/> | 366 | <resources/> |
| 476 | <connections/> | 367 | <connections/> |
app/gui/oven_control/multicookautowindow.ui
| @@ -24,89 +24,10 @@ | @@ -24,89 +24,10 @@ | ||
| 24 | <height>426</height> | 24 | <height>426</height> |
| 25 | </rect> | 25 | </rect> |
| 26 | </property> | 26 | </property> |
| 27 | - <widget class="QWidget" name="clockContainer"> | 27 | + <widget class="StatusArea" name="clockContainer"> |
| 28 | <property name="styleSheet"> | 28 | <property name="styleSheet"> |
| 29 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 29 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 30 | </property> | 30 | </property> |
| 31 | - <widget class="Clock" name="clock" native="true"> | ||
| 32 | - <property name="geometry"> | ||
| 33 | - <rect> | ||
| 34 | - <x>272</x> | ||
| 35 | - <y>36</y> | ||
| 36 | - <width>356</width> | ||
| 37 | - <height>355</height> | ||
| 38 | - </rect> | ||
| 39 | - </property> | ||
| 40 | - </widget> | ||
| 41 | - <widget class="WashWarnIcon" name="label"> | ||
| 42 | - <property name="geometry"> | ||
| 43 | - <rect> | ||
| 44 | - <x>800</x> | ||
| 45 | - <y>320</y> | ||
| 46 | - <width>80</width> | ||
| 47 | - <height>84</height> | ||
| 48 | - </rect> | ||
| 49 | - </property> | ||
| 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> | ||
| 71 | - <widget class="DigitalClock" name="label_4"> | ||
| 72 | - <property name="geometry"> | ||
| 73 | - <rect> | ||
| 74 | - <x>20</x> | ||
| 75 | - <y>310</y> | ||
| 76 | - <width>600</width> | ||
| 77 | - <height>100</height> | ||
| 78 | - </rect> | ||
| 79 | - </property> | ||
| 80 | - <property name="alignment"> | ||
| 81 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 82 | - </property> | ||
| 83 | - </widget> | ||
| 84 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 85 | - <property name="geometry"> | ||
| 86 | - <rect> | ||
| 87 | - <x>670</x> | ||
| 88 | - <y>290</y> | ||
| 89 | - <width>111</width> | ||
| 90 | - <height>121</height> | ||
| 91 | - </rect> | ||
| 92 | - </property> | ||
| 93 | - <property name="text"> | ||
| 94 | - <string/> | ||
| 95 | - </property> | ||
| 96 | - </widget> | ||
| 97 | - <widget class="IgnitionIcon" name="label_5"> | ||
| 98 | - <property name="geometry"> | ||
| 99 | - <rect> | ||
| 100 | - <x>662</x> | ||
| 101 | - <y>164</y> | ||
| 102 | - <width>111</width> | ||
| 103 | - <height>121</height> | ||
| 104 | - </rect> | ||
| 105 | - </property> | ||
| 106 | - <property name="text"> | ||
| 107 | - <string/> | ||
| 108 | - </property> | ||
| 109 | - </widget> | ||
| 110 | </widget> | 31 | </widget> |
| 111 | <widget class="QWidget" name="page_2"/> | 32 | <widget class="QWidget" name="page_2"/> |
| 112 | </widget> | 33 | </widget> |
| @@ -189,41 +110,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h | @@ -189,41 +110,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h | ||
| 189 | </widget> | 110 | </widget> |
| 190 | <customwidgets> | 111 | <customwidgets> |
| 191 | <customwidget> | 112 | <customwidget> |
| 192 | - <class>Clock</class> | 113 | + <class>StatusArea</class> |
| 193 | <extends>QWidget</extends> | 114 | <extends>QWidget</extends> |
| 194 | - <header>clock.h</header> | 115 | + <header>statusarea.h</header> |
| 195 | <container>1</container> | 116 | <container>1</container> |
| 196 | </customwidget> | 117 | </customwidget> |
| 197 | - <customwidget> | ||
| 198 | - <class>WashWarnIcon</class> | ||
| 199 | - <extends>QLabel</extends> | ||
| 200 | - <header>washwarnicon.h</header> | ||
| 201 | - </customwidget> | ||
| 202 | - <customwidget> | ||
| 203 | - <class>DemoIcon</class> | ||
| 204 | - <extends>QLabel</extends> | ||
| 205 | - <header>demoicon.h</header> | ||
| 206 | - </customwidget> | ||
| 207 | - <customwidget> | ||
| 208 | - <class>HalfEnergyIcon</class> | ||
| 209 | - <extends>QLabel</extends> | ||
| 210 | - <header>halfenergyicon.h</header> | ||
| 211 | - </customwidget> | ||
| 212 | - <customwidget> | ||
| 213 | - <class>DigitalClock</class> | ||
| 214 | - <extends>QLabel</extends> | ||
| 215 | - <header>digitalclock.h</header> | ||
| 216 | - </customwidget> | ||
| 217 | - <customwidget> | ||
| 218 | - <class>IgnitionIcon</class> | ||
| 219 | - <extends>QLabel</extends> | ||
| 220 | - <header>ignitionicon.h</header> | ||
| 221 | - </customwidget> | ||
| 222 | - <customwidget> | ||
| 223 | - <class>WaterLevelIcon</class> | ||
| 224 | - <extends>QLabel</extends> | ||
| 225 | - <header>waterlevelicon.h</header> | ||
| 226 | - </customwidget> | ||
| 227 | </customwidgets> | 118 | </customwidgets> |
| 228 | <resources/> | 119 | <resources/> |
| 229 | <connections/> | 120 | <connections/> |
app/gui/oven_control/multicookmanualwindow.ui
| @@ -721,89 +721,10 @@ QPushButton:checked { background-image: url(:/images/cook_mode/big_steam.png); } | @@ -721,89 +721,10 @@ QPushButton:checked { background-image: url(:/images/cook_mode/big_steam.png); } | ||
| 721 | <height>426</height> | 721 | <height>426</height> |
| 722 | </rect> | 722 | </rect> |
| 723 | </property> | 723 | </property> |
| 724 | - <widget class="QWidget" name="clockContainer"> | 724 | + <widget class="StatusArea" name="clockContainer"> |
| 725 | <property name="styleSheet"> | 725 | <property name="styleSheet"> |
| 726 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 726 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 727 | </property> | 727 | </property> |
| 728 | - <widget class="Clock" name="clock" native="true"> | ||
| 729 | - <property name="geometry"> | ||
| 730 | - <rect> | ||
| 731 | - <x>272</x> | ||
| 732 | - <y>36</y> | ||
| 733 | - <width>356</width> | ||
| 734 | - <height>355</height> | ||
| 735 | - </rect> | ||
| 736 | - </property> | ||
| 737 | - </widget> | ||
| 738 | - <widget class="WashWarnIcon" name="label_6"> | ||
| 739 | - <property name="geometry"> | ||
| 740 | - <rect> | ||
| 741 | - <x>800</x> | ||
| 742 | - <y>320</y> | ||
| 743 | - <width>80</width> | ||
| 744 | - <height>84</height> | ||
| 745 | - </rect> | ||
| 746 | - </property> | ||
| 747 | - </widget> | ||
| 748 | - <widget class="DemoIcon" name="label_2"> | ||
| 749 | - <property name="geometry"> | ||
| 750 | - <rect> | ||
| 751 | - <x>780</x> | ||
| 752 | - <y>230</y> | ||
| 753 | - <width>101</width> | ||
| 754 | - <height>90</height> | ||
| 755 | - </rect> | ||
| 756 | - </property> | ||
| 757 | - </widget> | ||
| 758 | - <widget class="HalfEnergyIcon" name="label_3"> | ||
| 759 | - <property name="geometry"> | ||
| 760 | - <rect> | ||
| 761 | - <x>780</x> | ||
| 762 | - <y>160</y> | ||
| 763 | - <width>108</width> | ||
| 764 | - <height>67</height> | ||
| 765 | - </rect> | ||
| 766 | - </property> | ||
| 767 | - </widget> | ||
| 768 | - <widget class="DigitalClock" name="label_4"> | ||
| 769 | - <property name="geometry"> | ||
| 770 | - <rect> | ||
| 771 | - <x>20</x> | ||
| 772 | - <y>310</y> | ||
| 773 | - <width>600</width> | ||
| 774 | - <height>100</height> | ||
| 775 | - </rect> | ||
| 776 | - </property> | ||
| 777 | - <property name="alignment"> | ||
| 778 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 779 | - </property> | ||
| 780 | - </widget> | ||
| 781 | - <widget class="WaterLevelIcon" name="label_7"> | ||
| 782 | - <property name="geometry"> | ||
| 783 | - <rect> | ||
| 784 | - <x>670</x> | ||
| 785 | - <y>290</y> | ||
| 786 | - <width>111</width> | ||
| 787 | - <height>121</height> | ||
| 788 | - </rect> | ||
| 789 | - </property> | ||
| 790 | - <property name="text"> | ||
| 791 | - <string/> | ||
| 792 | - </property> | ||
| 793 | - </widget> | ||
| 794 | - <widget class="IgnitionIcon" name="label_8"> | ||
| 795 | - <property name="geometry"> | ||
| 796 | - <rect> | ||
| 797 | - <x>662</x> | ||
| 798 | - <y>164</y> | ||
| 799 | - <width>111</width> | ||
| 800 | - <height>121</height> | ||
| 801 | - </rect> | ||
| 802 | - </property> | ||
| 803 | - <property name="text"> | ||
| 804 | - <string/> | ||
| 805 | - </property> | ||
| 806 | - </widget> | ||
| 807 | </widget> | 728 | </widget> |
| 808 | <widget class="QWidget" name="closeDoorWidget"> | 729 | <widget class="QWidget" name="closeDoorWidget"> |
| 809 | <property name="styleSheet"> | 730 | <property name="styleSheet"> |
| @@ -873,42 +794,12 @@ QPushButton:checked { image: url(:/images/slider_icon/temp_ov.png); }</string> | @@ -873,42 +794,12 @@ QPushButton:checked { image: url(:/images/slider_icon/temp_ov.png); }</string> | ||
| 873 | </widget> | 794 | </widget> |
| 874 | <customwidgets> | 795 | <customwidgets> |
| 875 | <customwidget> | 796 | <customwidget> |
| 876 | - <class>Clock</class> | 797 | + <class>StatusArea</class> |
| 877 | <extends>QWidget</extends> | 798 | <extends>QWidget</extends> |
| 878 | - <header>clock.h</header> | 799 | + <header>statusarea.h</header> |
| 879 | <container>1</container> | 800 | <container>1</container> |
| 880 | </customwidget> | 801 | </customwidget> |
| 881 | <customwidget> | 802 | <customwidget> |
| 882 | - <class>WashWarnIcon</class> | ||
| 883 | - <extends>QLabel</extends> | ||
| 884 | - <header>washwarnicon.h</header> | ||
| 885 | - </customwidget> | ||
| 886 | - <customwidget> | ||
| 887 | - <class>DemoIcon</class> | ||
| 888 | - <extends>QLabel</extends> | ||
| 889 | - <header>demoicon.h</header> | ||
| 890 | - </customwidget> | ||
| 891 | - <customwidget> | ||
| 892 | - <class>HalfEnergyIcon</class> | ||
| 893 | - <extends>QLabel</extends> | ||
| 894 | - <header>halfenergyicon.h</header> | ||
| 895 | - </customwidget> | ||
| 896 | - <customwidget> | ||
| 897 | - <class>DigitalClock</class> | ||
| 898 | - <extends>QLabel</extends> | ||
| 899 | - <header>digitalclock.h</header> | ||
| 900 | - </customwidget> | ||
| 901 | - <customwidget> | ||
| 902 | - <class>IgnitionIcon</class> | ||
| 903 | - <extends>QLabel</extends> | ||
| 904 | - <header>ignitionicon.h</header> | ||
| 905 | - </customwidget> | ||
| 906 | - <customwidget> | ||
| 907 | - <class>WaterLevelIcon</class> | ||
| 908 | - <extends>QLabel</extends> | ||
| 909 | - <header>waterlevelicon.h</header> | ||
| 910 | - </customwidget> | ||
| 911 | - <customwidget> | ||
| 912 | <class>Slider</class> | 803 | <class>Slider</class> |
| 913 | <extends>QWidget</extends> | 804 | <extends>QWidget</extends> |
| 914 | <header>slider.h</header> | 805 | <header>slider.h</header> |
app/gui/oven_control/multicookwindow.ui
| @@ -447,89 +447,10 @@ QPushButton:focus | @@ -447,89 +447,10 @@ QPushButton:focus | ||
| 447 | <height>426</height> | 447 | <height>426</height> |
| 448 | </rect> | 448 | </rect> |
| 449 | </property> | 449 | </property> |
| 450 | - <widget class="QWidget" name="clockContainer"> | 450 | + <widget class="StatusArea" name="clockContainer"> |
| 451 | <property name="styleSheet"> | 451 | <property name="styleSheet"> |
| 452 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 452 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 453 | </property> | 453 | </property> |
| 454 | - <widget class="Clock" name="clock" native="true"> | ||
| 455 | - <property name="geometry"> | ||
| 456 | - <rect> | ||
| 457 | - <x>272</x> | ||
| 458 | - <y>36</y> | ||
| 459 | - <width>356</width> | ||
| 460 | - <height>355</height> | ||
| 461 | - </rect> | ||
| 462 | - </property> | ||
| 463 | - </widget> | ||
| 464 | - <widget class="WashWarnIcon" name="label_2"> | ||
| 465 | - <property name="geometry"> | ||
| 466 | - <rect> | ||
| 467 | - <x>800</x> | ||
| 468 | - <y>320</y> | ||
| 469 | - <width>80</width> | ||
| 470 | - <height>84</height> | ||
| 471 | - </rect> | ||
| 472 | - </property> | ||
| 473 | - </widget> | ||
| 474 | - <widget class="DemoIcon" name="label_3"> | ||
| 475 | - <property name="geometry"> | ||
| 476 | - <rect> | ||
| 477 | - <x>780</x> | ||
| 478 | - <y>230</y> | ||
| 479 | - <width>101</width> | ||
| 480 | - <height>90</height> | ||
| 481 | - </rect> | ||
| 482 | - </property> | ||
| 483 | - </widget> | ||
| 484 | - <widget class="HalfEnergyIcon" name="label_4"> | ||
| 485 | - <property name="geometry"> | ||
| 486 | - <rect> | ||
| 487 | - <x>780</x> | ||
| 488 | - <y>160</y> | ||
| 489 | - <width>108</width> | ||
| 490 | - <height>67</height> | ||
| 491 | - </rect> | ||
| 492 | - </property> | ||
| 493 | - </widget> | ||
| 494 | - <widget class="DigitalClock" name="label_5"> | ||
| 495 | - <property name="geometry"> | ||
| 496 | - <rect> | ||
| 497 | - <x>20</x> | ||
| 498 | - <y>310</y> | ||
| 499 | - <width>600</width> | ||
| 500 | - <height>100</height> | ||
| 501 | - </rect> | ||
| 502 | - </property> | ||
| 503 | - <property name="alignment"> | ||
| 504 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 505 | - </property> | ||
| 506 | - </widget> | ||
| 507 | - <widget class="WaterLevelIcon" name="label_11"> | ||
| 508 | - <property name="geometry"> | ||
| 509 | - <rect> | ||
| 510 | - <x>670</x> | ||
| 511 | - <y>290</y> | ||
| 512 | - <width>111</width> | ||
| 513 | - <height>121</height> | ||
| 514 | - </rect> | ||
| 515 | - </property> | ||
| 516 | - <property name="text"> | ||
| 517 | - <string/> | ||
| 518 | - </property> | ||
| 519 | - </widget> | ||
| 520 | - <widget class="IgnitionIcon" name="label_12"> | ||
| 521 | - <property name="geometry"> | ||
| 522 | - <rect> | ||
| 523 | - <x>662</x> | ||
| 524 | - <y>164</y> | ||
| 525 | - <width>111</width> | ||
| 526 | - <height>121</height> | ||
| 527 | - </rect> | ||
| 528 | - </property> | ||
| 529 | - <property name="text"> | ||
| 530 | - <string/> | ||
| 531 | - </property> | ||
| 532 | - </widget> | ||
| 533 | </widget> | 454 | </widget> |
| 534 | <widget class="QWidget" name="recentsContainer"> | 455 | <widget class="QWidget" name="recentsContainer"> |
| 535 | <property name="styleSheet"> | 456 | <property name="styleSheet"> |
| @@ -1224,42 +1145,12 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0 | @@ -1224,42 +1145,12 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0 | ||
| 1224 | </widget> | 1145 | </widget> |
| 1225 | <customwidgets> | 1146 | <customwidgets> |
| 1226 | <customwidget> | 1147 | <customwidget> |
| 1227 | - <class>Clock</class> | 1148 | + <class>StatusArea</class> |
| 1228 | <extends>QWidget</extends> | 1149 | <extends>QWidget</extends> |
| 1229 | - <header>clock.h</header> | 1150 | + <header>statusarea.h</header> |
| 1230 | <container>1</container> | 1151 | <container>1</container> |
| 1231 | </customwidget> | 1152 | </customwidget> |
| 1232 | <customwidget> | 1153 | <customwidget> |
| 1233 | - <class>WashWarnIcon</class> | ||
| 1234 | - <extends>QLabel</extends> | ||
| 1235 | - <header>washwarnicon.h</header> | ||
| 1236 | - </customwidget> | ||
| 1237 | - <customwidget> | ||
| 1238 | - <class>DemoIcon</class> | ||
| 1239 | - <extends>QLabel</extends> | ||
| 1240 | - <header>demoicon.h</header> | ||
| 1241 | - </customwidget> | ||
| 1242 | - <customwidget> | ||
| 1243 | - <class>HalfEnergyIcon</class> | ||
| 1244 | - <extends>QLabel</extends> | ||
| 1245 | - <header>halfenergyicon.h</header> | ||
| 1246 | - </customwidget> | ||
| 1247 | - <customwidget> | ||
| 1248 | - <class>DigitalClock</class> | ||
| 1249 | - <extends>QLabel</extends> | ||
| 1250 | - <header>digitalclock.h</header> | ||
| 1251 | - </customwidget> | ||
| 1252 | - <customwidget> | ||
| 1253 | - <class>IgnitionIcon</class> | ||
| 1254 | - <extends>QLabel</extends> | ||
| 1255 | - <header>ignitionicon.h</header> | ||
| 1256 | - </customwidget> | ||
| 1257 | - <customwidget> | ||
| 1258 | - <class>WaterLevelIcon</class> | ||
| 1259 | - <extends>QLabel</extends> | ||
| 1260 | - <header>waterlevelicon.h</header> | ||
| 1261 | - </customwidget> | ||
| 1262 | - <customwidget> | ||
| 1263 | <class>AnimatedImageBox</class> | 1154 | <class>AnimatedImageBox</class> |
| 1264 | <extends>QLabel</extends> | 1155 | <extends>QLabel</extends> |
| 1265 | <header>animatedimagebox.h</header> | 1156 | <header>animatedimagebox.h</header> |
app/gui/oven_control/operationtimeheat.ui
| @@ -28,89 +28,10 @@ | @@ -28,89 +28,10 @@ | ||
| 28 | <height>426</height> | 28 | <height>426</height> |
| 29 | </rect> | 29 | </rect> |
| 30 | </property> | 30 | </property> |
| 31 | - <widget class="QWidget" name="clockContainer"> | 31 | + <widget class="StatusArea" name="clockContainer"> |
| 32 | <property name="styleSheet"> | 32 | <property name="styleSheet"> |
| 33 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 33 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 34 | </property> | 34 | </property> |
| 35 | - <widget class="Clock" name="clock" native="true"> | ||
| 36 | - <property name="geometry"> | ||
| 37 | - <rect> | ||
| 38 | - <x>272</x> | ||
| 39 | - <y>36</y> | ||
| 40 | - <width>356</width> | ||
| 41 | - <height>355</height> | ||
| 42 | - </rect> | ||
| 43 | - </property> | ||
| 44 | - </widget> | ||
| 45 | - <widget class="WashWarnIcon" name="label"> | ||
| 46 | - <property name="geometry"> | ||
| 47 | - <rect> | ||
| 48 | - <x>800</x> | ||
| 49 | - <y>320</y> | ||
| 50 | - <width>80</width> | ||
| 51 | - <height>84</height> | ||
| 52 | - </rect> | ||
| 53 | - </property> | ||
| 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> | ||
| 75 | - <widget class="DigitalClock" name="label_4"> | ||
| 76 | - <property name="geometry"> | ||
| 77 | - <rect> | ||
| 78 | - <x>20</x> | ||
| 79 | - <y>310</y> | ||
| 80 | - <width>600</width> | ||
| 81 | - <height>100</height> | ||
| 82 | - </rect> | ||
| 83 | - </property> | ||
| 84 | - <property name="alignment"> | ||
| 85 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 86 | - </property> | ||
| 87 | - </widget> | ||
| 88 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 89 | - <property name="geometry"> | ||
| 90 | - <rect> | ||
| 91 | - <x>670</x> | ||
| 92 | - <y>290</y> | ||
| 93 | - <width>111</width> | ||
| 94 | - <height>121</height> | ||
| 95 | - </rect> | ||
| 96 | - </property> | ||
| 97 | - <property name="text"> | ||
| 98 | - <string/> | ||
| 99 | - </property> | ||
| 100 | - </widget> | ||
| 101 | - <widget class="IgnitionIcon" name="label_5"> | ||
| 102 | - <property name="geometry"> | ||
| 103 | - <rect> | ||
| 104 | - <x>662</x> | ||
| 105 | - <y>164</y> | ||
| 106 | - <width>111</width> | ||
| 107 | - <height>121</height> | ||
| 108 | - </rect> | ||
| 109 | - </property> | ||
| 110 | - <property name="text"> | ||
| 111 | - <string/> | ||
| 112 | - </property> | ||
| 113 | - </widget> | ||
| 114 | </widget> | 35 | </widget> |
| 115 | <widget class="QWidget" name="page_2"/> | 36 | <widget class="QWidget" name="page_2"/> |
| 116 | </widget> | 37 | </widget> |
| @@ -413,41 +334,11 @@ QPushButton { text-align: center;} | @@ -413,41 +334,11 @@ QPushButton { text-align: center;} | ||
| 413 | </widget> | 334 | </widget> |
| 414 | <customwidgets> | 335 | <customwidgets> |
| 415 | <customwidget> | 336 | <customwidget> |
| 416 | - <class>Clock</class> | 337 | + <class>StatusArea</class> |
| 417 | <extends>QWidget</extends> | 338 | <extends>QWidget</extends> |
| 418 | - <header>clock.h</header> | 339 | + <header>statusarea.h</header> |
| 419 | <container>1</container> | 340 | <container>1</container> |
| 420 | </customwidget> | 341 | </customwidget> |
| 421 | - <customwidget> | ||
| 422 | - <class>WashWarnIcon</class> | ||
| 423 | - <extends>QLabel</extends> | ||
| 424 | - <header>washwarnicon.h</header> | ||
| 425 | - </customwidget> | ||
| 426 | - <customwidget> | ||
| 427 | - <class>DemoIcon</class> | ||
| 428 | - <extends>QLabel</extends> | ||
| 429 | - <header>demoicon.h</header> | ||
| 430 | - </customwidget> | ||
| 431 | - <customwidget> | ||
| 432 | - <class>HalfEnergyIcon</class> | ||
| 433 | - <extends>QLabel</extends> | ||
| 434 | - <header>halfenergyicon.h</header> | ||
| 435 | - </customwidget> | ||
| 436 | - <customwidget> | ||
| 437 | - <class>DigitalClock</class> | ||
| 438 | - <extends>QLabel</extends> | ||
| 439 | - <header>digitalclock.h</header> | ||
| 440 | - </customwidget> | ||
| 441 | - <customwidget> | ||
| 442 | - <class>IgnitionIcon</class> | ||
| 443 | - <extends>QLabel</extends> | ||
| 444 | - <header>ignitionicon.h</header> | ||
| 445 | - </customwidget> | ||
| 446 | - <customwidget> | ||
| 447 | - <class>WaterLevelIcon</class> | ||
| 448 | - <extends>QLabel</extends> | ||
| 449 | - <header>waterlevelicon.h</header> | ||
| 450 | - </customwidget> | ||
| 451 | </customwidgets> | 342 | </customwidgets> |
| 452 | <resources/> | 343 | <resources/> |
| 453 | <connections/> | 344 | <connections/> |
app/gui/oven_control/operationtimemain.ui
| @@ -27,89 +27,10 @@ | @@ -27,89 +27,10 @@ | ||
| 27 | <height>426</height> | 27 | <height>426</height> |
| 28 | </rect> | 28 | </rect> |
| 29 | </property> | 29 | </property> |
| 30 | - <widget class="QWidget" name="clockContainer"> | 30 | + <widget class="StatusArea" name="clockContainer"> |
| 31 | <property name="styleSheet"> | 31 | <property name="styleSheet"> |
| 32 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 32 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 33 | </property> | 33 | </property> |
| 34 | - <widget class="Clock" name="clock" native="true"> | ||
| 35 | - <property name="geometry"> | ||
| 36 | - <rect> | ||
| 37 | - <x>272</x> | ||
| 38 | - <y>36</y> | ||
| 39 | - <width>356</width> | ||
| 40 | - <height>355</height> | ||
| 41 | - </rect> | ||
| 42 | - </property> | ||
| 43 | - </widget> | ||
| 44 | - <widget class="WashWarnIcon" name="label_2"> | ||
| 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> | ||
| 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> | ||
| 74 | - <widget class="DigitalClock" name="label_5"> | ||
| 75 | - <property name="geometry"> | ||
| 76 | - <rect> | ||
| 77 | - <x>20</x> | ||
| 78 | - <y>310</y> | ||
| 79 | - <width>600</width> | ||
| 80 | - <height>100</height> | ||
| 81 | - </rect> | ||
| 82 | - </property> | ||
| 83 | - <property name="alignment"> | ||
| 84 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 85 | - </property> | ||
| 86 | - </widget> | ||
| 87 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 88 | - <property name="geometry"> | ||
| 89 | - <rect> | ||
| 90 | - <x>670</x> | ||
| 91 | - <y>290</y> | ||
| 92 | - <width>111</width> | ||
| 93 | - <height>121</height> | ||
| 94 | - </rect> | ||
| 95 | - </property> | ||
| 96 | - <property name="text"> | ||
| 97 | - <string/> | ||
| 98 | - </property> | ||
| 99 | - </widget> | ||
| 100 | - <widget class="IgnitionIcon" name="label_7"> | ||
| 101 | - <property name="geometry"> | ||
| 102 | - <rect> | ||
| 103 | - <x>662</x> | ||
| 104 | - <y>164</y> | ||
| 105 | - <width>111</width> | ||
| 106 | - <height>121</height> | ||
| 107 | - </rect> | ||
| 108 | - </property> | ||
| 109 | - <property name="text"> | ||
| 110 | - <string/> | ||
| 111 | - </property> | ||
| 112 | - </widget> | ||
| 113 | </widget> | 34 | </widget> |
| 114 | <widget class="QWidget" name="page_2"/> | 35 | <widget class="QWidget" name="page_2"/> |
| 115 | </widget> | 36 | </widget> |
| @@ -377,41 +298,11 @@ QPushButton { text-align: center;} | @@ -377,41 +298,11 @@ QPushButton { text-align: center;} | ||
| 377 | </widget> | 298 | </widget> |
| 378 | <customwidgets> | 299 | <customwidgets> |
| 379 | <customwidget> | 300 | <customwidget> |
| 380 | - <class>Clock</class> | 301 | + <class>StatusArea</class> |
| 381 | <extends>QWidget</extends> | 302 | <extends>QWidget</extends> |
| 382 | - <header>clock.h</header> | 303 | + <header>statusarea.h</header> |
| 383 | <container>1</container> | 304 | <container>1</container> |
| 384 | </customwidget> | 305 | </customwidget> |
| 385 | - <customwidget> | ||
| 386 | - <class>WashWarnIcon</class> | ||
| 387 | - <extends>QLabel</extends> | ||
| 388 | - <header>washwarnicon.h</header> | ||
| 389 | - </customwidget> | ||
| 390 | - <customwidget> | ||
| 391 | - <class>DemoIcon</class> | ||
| 392 | - <extends>QLabel</extends> | ||
| 393 | - <header>demoicon.h</header> | ||
| 394 | - </customwidget> | ||
| 395 | - <customwidget> | ||
| 396 | - <class>HalfEnergyIcon</class> | ||
| 397 | - <extends>QLabel</extends> | ||
| 398 | - <header>halfenergyicon.h</header> | ||
| 399 | - </customwidget> | ||
| 400 | - <customwidget> | ||
| 401 | - <class>DigitalClock</class> | ||
| 402 | - <extends>QLabel</extends> | ||
| 403 | - <header>digitalclock.h</header> | ||
| 404 | - </customwidget> | ||
| 405 | - <customwidget> | ||
| 406 | - <class>IgnitionIcon</class> | ||
| 407 | - <extends>QLabel</extends> | ||
| 408 | - <header>ignitionicon.h</header> | ||
| 409 | - </customwidget> | ||
| 410 | - <customwidget> | ||
| 411 | - <class>WaterLevelIcon</class> | ||
| 412 | - <extends>QLabel</extends> | ||
| 413 | - <header>waterlevelicon.h</header> | ||
| 414 | - </customwidget> | ||
| 415 | </customwidgets> | 306 | </customwidgets> |
| 416 | <resources> | 307 | <resources> |
| 417 | <include location="resources.qrc"/> | 308 | <include location="resources.qrc"/> |
app/gui/oven_control/operationtimemode.ui
| @@ -28,89 +28,10 @@ | @@ -28,89 +28,10 @@ | ||
| 28 | <height>426</height> | 28 | <height>426</height> |
| 29 | </rect> | 29 | </rect> |
| 30 | </property> | 30 | </property> |
| 31 | - <widget class="QWidget" name="clockContainer"> | 31 | + <widget class="StatusArea" name="clockContainer"> |
| 32 | <property name="styleSheet"> | 32 | <property name="styleSheet"> |
| 33 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 33 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 34 | </property> | 34 | </property> |
| 35 | - <widget class="Clock" name="clock" native="true"> | ||
| 36 | - <property name="geometry"> | ||
| 37 | - <rect> | ||
| 38 | - <x>272</x> | ||
| 39 | - <y>36</y> | ||
| 40 | - <width>356</width> | ||
| 41 | - <height>355</height> | ||
| 42 | - </rect> | ||
| 43 | - </property> | ||
| 44 | - </widget> | ||
| 45 | - <widget class="WashWarnIcon" name="label"> | ||
| 46 | - <property name="geometry"> | ||
| 47 | - <rect> | ||
| 48 | - <x>800</x> | ||
| 49 | - <y>320</y> | ||
| 50 | - <width>80</width> | ||
| 51 | - <height>84</height> | ||
| 52 | - </rect> | ||
| 53 | - </property> | ||
| 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> | ||
| 75 | - <widget class="DigitalClock" name="label_4"> | ||
| 76 | - <property name="geometry"> | ||
| 77 | - <rect> | ||
| 78 | - <x>20</x> | ||
| 79 | - <y>310</y> | ||
| 80 | - <width>600</width> | ||
| 81 | - <height>100</height> | ||
| 82 | - </rect> | ||
| 83 | - </property> | ||
| 84 | - <property name="alignment"> | ||
| 85 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 86 | - </property> | ||
| 87 | - </widget> | ||
| 88 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 89 | - <property name="geometry"> | ||
| 90 | - <rect> | ||
| 91 | - <x>670</x> | ||
| 92 | - <y>290</y> | ||
| 93 | - <width>111</width> | ||
| 94 | - <height>121</height> | ||
| 95 | - </rect> | ||
| 96 | - </property> | ||
| 97 | - <property name="text"> | ||
| 98 | - <string/> | ||
| 99 | - </property> | ||
| 100 | - </widget> | ||
| 101 | - <widget class="IgnitionIcon" name="label_5"> | ||
| 102 | - <property name="geometry"> | ||
| 103 | - <rect> | ||
| 104 | - <x>662</x> | ||
| 105 | - <y>164</y> | ||
| 106 | - <width>111</width> | ||
| 107 | - <height>121</height> | ||
| 108 | - </rect> | ||
| 109 | - </property> | ||
| 110 | - <property name="text"> | ||
| 111 | - <string/> | ||
| 112 | - </property> | ||
| 113 | - </widget> | ||
| 114 | </widget> | 35 | </widget> |
| 115 | <widget class="QWidget" name="page_2"/> | 36 | <widget class="QWidget" name="page_2"/> |
| 116 | </widget> | 37 | </widget> |
| @@ -833,41 +754,11 @@ QPushButton { text-align: center;} | @@ -833,41 +754,11 @@ QPushButton { text-align: center;} | ||
| 833 | </widget> | 754 | </widget> |
| 834 | <customwidgets> | 755 | <customwidgets> |
| 835 | <customwidget> | 756 | <customwidget> |
| 836 | - <class>Clock</class> | 757 | + <class>StatusArea</class> |
| 837 | <extends>QWidget</extends> | 758 | <extends>QWidget</extends> |
| 838 | - <header>clock.h</header> | 759 | + <header>statusarea.h</header> |
| 839 | <container>1</container> | 760 | <container>1</container> |
| 840 | </customwidget> | 761 | </customwidget> |
| 841 | - <customwidget> | ||
| 842 | - <class>WashWarnIcon</class> | ||
| 843 | - <extends>QLabel</extends> | ||
| 844 | - <header>washwarnicon.h</header> | ||
| 845 | - </customwidget> | ||
| 846 | - <customwidget> | ||
| 847 | - <class>DemoIcon</class> | ||
| 848 | - <extends>QLabel</extends> | ||
| 849 | - <header>demoicon.h</header> | ||
| 850 | - </customwidget> | ||
| 851 | - <customwidget> | ||
| 852 | - <class>HalfEnergyIcon</class> | ||
| 853 | - <extends>QLabel</extends> | ||
| 854 | - <header>halfenergyicon.h</header> | ||
| 855 | - </customwidget> | ||
| 856 | - <customwidget> | ||
| 857 | - <class>DigitalClock</class> | ||
| 858 | - <extends>QLabel</extends> | ||
| 859 | - <header>digitalclock.h</header> | ||
| 860 | - </customwidget> | ||
| 861 | - <customwidget> | ||
| 862 | - <class>IgnitionIcon</class> | ||
| 863 | - <extends>QLabel</extends> | ||
| 864 | - <header>ignitionicon.h</header> | ||
| 865 | - </customwidget> | ||
| 866 | - <customwidget> | ||
| 867 | - <class>WaterLevelIcon</class> | ||
| 868 | - <extends>QLabel</extends> | ||
| 869 | - <header>waterlevelicon.h</header> | ||
| 870 | - </customwidget> | ||
| 871 | </customwidgets> | 762 | </customwidgets> |
| 872 | <resources/> | 763 | <resources/> |
| 873 | <connections/> | 764 | <connections/> |
app/gui/oven_control/operationtimeparts.ui
| @@ -28,89 +28,10 @@ | @@ -28,89 +28,10 @@ | ||
| 28 | <height>426</height> | 28 | <height>426</height> |
| 29 | </rect> | 29 | </rect> |
| 30 | </property> | 30 | </property> |
| 31 | - <widget class="QWidget" name="clockContainer"> | 31 | + <widget class="StatusArea" name="clockContainer"> |
| 32 | <property name="styleSheet"> | 32 | <property name="styleSheet"> |
| 33 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 33 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 34 | </property> | 34 | </property> |
| 35 | - <widget class="Clock" name="clock" native="true"> | ||
| 36 | - <property name="geometry"> | ||
| 37 | - <rect> | ||
| 38 | - <x>272</x> | ||
| 39 | - <y>36</y> | ||
| 40 | - <width>356</width> | ||
| 41 | - <height>355</height> | ||
| 42 | - </rect> | ||
| 43 | - </property> | ||
| 44 | - </widget> | ||
| 45 | - <widget class="WashWarnIcon" name="label"> | ||
| 46 | - <property name="geometry"> | ||
| 47 | - <rect> | ||
| 48 | - <x>800</x> | ||
| 49 | - <y>320</y> | ||
| 50 | - <width>80</width> | ||
| 51 | - <height>84</height> | ||
| 52 | - </rect> | ||
| 53 | - </property> | ||
| 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> | ||
| 75 | - <widget class="DigitalClock" name="label_4"> | ||
| 76 | - <property name="geometry"> | ||
| 77 | - <rect> | ||
| 78 | - <x>20</x> | ||
| 79 | - <y>310</y> | ||
| 80 | - <width>600</width> | ||
| 81 | - <height>100</height> | ||
| 82 | - </rect> | ||
| 83 | - </property> | ||
| 84 | - <property name="alignment"> | ||
| 85 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 86 | - </property> | ||
| 87 | - </widget> | ||
| 88 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 89 | - <property name="geometry"> | ||
| 90 | - <rect> | ||
| 91 | - <x>670</x> | ||
| 92 | - <y>290</y> | ||
| 93 | - <width>111</width> | ||
| 94 | - <height>121</height> | ||
| 95 | - </rect> | ||
| 96 | - </property> | ||
| 97 | - <property name="text"> | ||
| 98 | - <string/> | ||
| 99 | - </property> | ||
| 100 | - </widget> | ||
| 101 | - <widget class="IgnitionIcon" name="label_5"> | ||
| 102 | - <property name="geometry"> | ||
| 103 | - <rect> | ||
| 104 | - <x>662</x> | ||
| 105 | - <y>164</y> | ||
| 106 | - <width>111</width> | ||
| 107 | - <height>121</height> | ||
| 108 | - </rect> | ||
| 109 | - </property> | ||
| 110 | - <property name="text"> | ||
| 111 | - <string/> | ||
| 112 | - </property> | ||
| 113 | - </widget> | ||
| 114 | </widget> | 35 | </widget> |
| 115 | <widget class="QWidget" name="page_2"/> | 36 | <widget class="QWidget" name="page_2"/> |
| 116 | </widget> | 37 | </widget> |
| @@ -1106,41 +1027,11 @@ QPushButton { text-align: center;} | @@ -1106,41 +1027,11 @@ QPushButton { text-align: center;} | ||
| 1106 | </widget> | 1027 | </widget> |
| 1107 | <customwidgets> | 1028 | <customwidgets> |
| 1108 | <customwidget> | 1029 | <customwidget> |
| 1109 | - <class>Clock</class> | 1030 | + <class>StatusArea</class> |
| 1110 | <extends>QWidget</extends> | 1031 | <extends>QWidget</extends> |
| 1111 | - <header>clock.h</header> | 1032 | + <header>statusarea.h</header> |
| 1112 | <container>1</container> | 1033 | <container>1</container> |
| 1113 | </customwidget> | 1034 | </customwidget> |
| 1114 | - <customwidget> | ||
| 1115 | - <class>WashWarnIcon</class> | ||
| 1116 | - <extends>QLabel</extends> | ||
| 1117 | - <header>washwarnicon.h</header> | ||
| 1118 | - </customwidget> | ||
| 1119 | - <customwidget> | ||
| 1120 | - <class>DemoIcon</class> | ||
| 1121 | - <extends>QLabel</extends> | ||
| 1122 | - <header>demoicon.h</header> | ||
| 1123 | - </customwidget> | ||
| 1124 | - <customwidget> | ||
| 1125 | - <class>HalfEnergyIcon</class> | ||
| 1126 | - <extends>QLabel</extends> | ||
| 1127 | - <header>halfenergyicon.h</header> | ||
| 1128 | - </customwidget> | ||
| 1129 | - <customwidget> | ||
| 1130 | - <class>DigitalClock</class> | ||
| 1131 | - <extends>QLabel</extends> | ||
| 1132 | - <header>digitalclock.h</header> | ||
| 1133 | - </customwidget> | ||
| 1134 | - <customwidget> | ||
| 1135 | - <class>IgnitionIcon</class> | ||
| 1136 | - <extends>QLabel</extends> | ||
| 1137 | - <header>ignitionicon.h</header> | ||
| 1138 | - </customwidget> | ||
| 1139 | - <customwidget> | ||
| 1140 | - <class>WaterLevelIcon</class> | ||
| 1141 | - <extends>QLabel</extends> | ||
| 1142 | - <header>waterlevelicon.h</header> | ||
| 1143 | - </customwidget> | ||
| 1144 | </customwidgets> | 1035 | </customwidgets> |
| 1145 | <resources/> | 1036 | <resources/> |
| 1146 | <connections/> | 1037 | <connections/> |
app/gui/oven_control/oven_control.pro
| @@ -13,12 +13,15 @@ TEMPLATE = app | @@ -13,12 +13,15 @@ TEMPLATE = app | ||
| 13 | 13 | ||
| 14 | 14 | ||
| 15 | SOURCES += main.cpp\ | 15 | SOURCES += main.cpp\ |
| 16 | + commicon.cpp \ | ||
| 16 | mainwindow.cpp \ | 17 | mainwindow.cpp \ |
| 17 | cook.cpp \ | 18 | cook.cpp \ |
| 19 | + manualcookfinishpopup.cpp \ | ||
| 18 | oven.cpp \ | 20 | oven.cpp \ |
| 19 | abstractoveninterface.cpp \ | 21 | abstractoveninterface.cpp \ |
| 20 | clock.cpp \ | 22 | clock.cpp \ |
| 21 | manualcookwindow.cpp \ | 23 | manualcookwindow.cpp \ |
| 24 | + statusarea.cpp \ | ||
| 22 | udphandler.cpp \ | 25 | udphandler.cpp \ |
| 23 | ovencontroller.cpp \ | 26 | ovencontroller.cpp \ |
| 24 | configwindow.cpp \ | 27 | configwindow.cpp \ |
| @@ -152,11 +155,14 @@ SOURCES += main.cpp\ | @@ -152,11 +155,14 @@ SOURCES += main.cpp\ | ||
| 152 | 155 | ||
| 153 | 156 | ||
| 154 | HEADERS += mainwindow.h \ | 157 | HEADERS += mainwindow.h \ |
| 158 | + commicon.h \ | ||
| 155 | cook.h \ | 159 | cook.h \ |
| 160 | + manualcookfinishpopup.h \ | ||
| 156 | oven.h \ | 161 | oven.h \ |
| 157 | abstractoveninterface.h \ | 162 | abstractoveninterface.h \ |
| 158 | clock.h \ | 163 | clock.h \ |
| 159 | manualcookwindow.h \ | 164 | manualcookwindow.h \ |
| 165 | + statusarea.h \ | ||
| 160 | udphandler.h \ | 166 | udphandler.h \ |
| 161 | ../../app-prime-modbus/include/all_share.h \ | 167 | ../../app-prime-modbus/include/all_share.h \ |
| 162 | ovencontroller.h \ | 168 | ovencontroller.h \ |
| @@ -290,11 +296,13 @@ HEADERS += mainwindow.h \ | @@ -290,11 +296,13 @@ HEADERS += mainwindow.h \ | ||
| 290 | waterlevelicon.h | 296 | waterlevelicon.h |
| 291 | 297 | ||
| 292 | FORMS += mainwindow.ui \ | 298 | FORMS += mainwindow.ui \ |
| 299 | + manualcookfinishpopup.ui \ | ||
| 293 | manualcookwindow.ui \ | 300 | manualcookwindow.ui \ |
| 294 | configwindow.ui \ | 301 | configwindow.ui \ |
| 295 | functiontestwindow.ui \ | 302 | functiontestwindow.ui \ |
| 296 | componenttestwindow.ui \ | 303 | componenttestwindow.ui \ |
| 297 | burnertestwindow.ui \ | 304 | burnertestwindow.ui \ |
| 305 | + statusarea.ui \ | ||
| 298 | valvetestwindow.ui \ | 306 | valvetestwindow.ui \ |
| 299 | washtestwindow.ui \ | 307 | washtestwindow.ui \ |
| 300 | fantestwindow.ui \ | 308 | fantestwindow.ui \ |
app/gui/oven_control/preheatpopup.cpp
| @@ -4,6 +4,7 @@ | @@ -4,6 +4,7 @@ | ||
| 4 | #include <QKeyEvent> | 4 | #include <QKeyEvent> |
| 5 | 5 | ||
| 6 | #include "stringer.h" | 6 | #include "stringer.h" |
| 7 | +#include "soundplayer.h" | ||
| 7 | 8 | ||
| 8 | PreheatPopup::PreheatPopup(QWidget *parent, Oven *oven) : | 9 | PreheatPopup::PreheatPopup(QWidget *parent, Oven *oven) : |
| 9 | QWidget(parent), | 10 | QWidget(parent), |
| @@ -119,6 +120,8 @@ void PreheatPopup::onOvenChanged() | @@ -119,6 +120,8 @@ void PreheatPopup::onOvenChanged() | ||
| 119 | { | 120 | { |
| 120 | if (oven->currentTemp() >= oven->temp()) | 121 | if (oven->currentTemp() >= oven->temp()) |
| 121 | { | 122 | { |
| 123 | + SoundPlayer::playStop(); | ||
| 124 | + | ||
| 122 | stop(); | 125 | stop(); |
| 123 | close(); | 126 | close(); |
| 124 | } | 127 | } |
app/gui/oven_control/primewindow.ui
| @@ -140,89 +140,10 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c | @@ -140,89 +140,10 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c | ||
| 140 | <height>426</height> | 140 | <height>426</height> |
| 141 | </rect> | 141 | </rect> |
| 142 | </property> | 142 | </property> |
| 143 | - <widget class="QWidget" name="clockContainer"> | 143 | + <widget class="StatusArea" name="clockContainer"> |
| 144 | <property name="styleSheet"> | 144 | <property name="styleSheet"> |
| 145 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 145 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 146 | </property> | 146 | </property> |
| 147 | - <widget class="Clock" name="clock" native="true"> | ||
| 148 | - <property name="geometry"> | ||
| 149 | - <rect> | ||
| 150 | - <x>272</x> | ||
| 151 | - <y>36</y> | ||
| 152 | - <width>356</width> | ||
| 153 | - <height>355</height> | ||
| 154 | - </rect> | ||
| 155 | - </property> | ||
| 156 | - </widget> | ||
| 157 | - <widget class="WashWarnIcon" name="label"> | ||
| 158 | - <property name="geometry"> | ||
| 159 | - <rect> | ||
| 160 | - <x>800</x> | ||
| 161 | - <y>320</y> | ||
| 162 | - <width>80</width> | ||
| 163 | - <height>84</height> | ||
| 164 | - </rect> | ||
| 165 | - </property> | ||
| 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> | ||
| 187 | - <widget class="DigitalClock" name="label_4"> | ||
| 188 | - <property name="geometry"> | ||
| 189 | - <rect> | ||
| 190 | - <x>20</x> | ||
| 191 | - <y>310</y> | ||
| 192 | - <width>600</width> | ||
| 193 | - <height>100</height> | ||
| 194 | - </rect> | ||
| 195 | - </property> | ||
| 196 | - <property name="alignment"> | ||
| 197 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 198 | - </property> | ||
| 199 | - </widget> | ||
| 200 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 201 | - <property name="geometry"> | ||
| 202 | - <rect> | ||
| 203 | - <x>670</x> | ||
| 204 | - <y>290</y> | ||
| 205 | - <width>111</width> | ||
| 206 | - <height>121</height> | ||
| 207 | - </rect> | ||
| 208 | - </property> | ||
| 209 | - <property name="text"> | ||
| 210 | - <string/> | ||
| 211 | - </property> | ||
| 212 | - </widget> | ||
| 213 | - <widget class="IgnitionIcon" name="label_5"> | ||
| 214 | - <property name="geometry"> | ||
| 215 | - <rect> | ||
| 216 | - <x>662</x> | ||
| 217 | - <y>164</y> | ||
| 218 | - <width>111</width> | ||
| 219 | - <height>121</height> | ||
| 220 | - </rect> | ||
| 221 | - </property> | ||
| 222 | - <property name="text"> | ||
| 223 | - <string/> | ||
| 224 | - </property> | ||
| 225 | - </widget> | ||
| 226 | </widget> | 147 | </widget> |
| 227 | <widget class="QWidget" name="page_2"/> | 148 | <widget class="QWidget" name="page_2"/> |
| 228 | </widget> | 149 | </widget> |
| @@ -357,41 +278,11 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/etc/main | @@ -357,41 +278,11 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/etc/main | ||
| 357 | </widget> | 278 | </widget> |
| 358 | <customwidgets> | 279 | <customwidgets> |
| 359 | <customwidget> | 280 | <customwidget> |
| 360 | - <class>Clock</class> | 281 | + <class>StatusArea</class> |
| 361 | <extends>QWidget</extends> | 282 | <extends>QWidget</extends> |
| 362 | - <header>clock.h</header> | 283 | + <header>statusarea.h</header> |
| 363 | <container>1</container> | 284 | <container>1</container> |
| 364 | </customwidget> | 285 | </customwidget> |
| 365 | - <customwidget> | ||
| 366 | - <class>WashWarnIcon</class> | ||
| 367 | - <extends>QLabel</extends> | ||
| 368 | - <header>washwarnicon.h</header> | ||
| 369 | - </customwidget> | ||
| 370 | - <customwidget> | ||
| 371 | - <class>DemoIcon</class> | ||
| 372 | - <extends>QLabel</extends> | ||
| 373 | - <header>demoicon.h</header> | ||
| 374 | - </customwidget> | ||
| 375 | - <customwidget> | ||
| 376 | - <class>HalfEnergyIcon</class> | ||
| 377 | - <extends>QLabel</extends> | ||
| 378 | - <header>halfenergyicon.h</header> | ||
| 379 | - </customwidget> | ||
| 380 | - <customwidget> | ||
| 381 | - <class>DigitalClock</class> | ||
| 382 | - <extends>QLabel</extends> | ||
| 383 | - <header>digitalclock.h</header> | ||
| 384 | - </customwidget> | ||
| 385 | - <customwidget> | ||
| 386 | - <class>IgnitionIcon</class> | ||
| 387 | - <extends>QLabel</extends> | ||
| 388 | - <header>ignitionicon.h</header> | ||
| 389 | - </customwidget> | ||
| 390 | - <customwidget> | ||
| 391 | - <class>WaterLevelIcon</class> | ||
| 392 | - <extends>QLabel</extends> | ||
| 393 | - <header>waterlevelicon.h</header> | ||
| 394 | - </customwidget> | ||
| 395 | </customwidgets> | 286 | </customwidgets> |
| 396 | <tabstops> | 287 | <tabstops> |
| 397 | <tabstop>mostCookedButton</tabstop> | 288 | <tabstop>mostCookedButton</tabstop> |
app/gui/oven_control/programmingautoconfigwindow.ui
| @@ -505,89 +505,10 @@ border-image: url(:/images/button/288_ov.png); | @@ -505,89 +505,10 @@ border-image: url(:/images/button/288_ov.png); | ||
| 505 | <height>426</height> | 505 | <height>426</height> |
| 506 | </rect> | 506 | </rect> |
| 507 | </property> | 507 | </property> |
| 508 | - <widget class="QWidget" name="clockContainer"> | 508 | + <widget class="StatusArea" name="clockContainer"> |
| 509 | <property name="styleSheet"> | 509 | <property name="styleSheet"> |
| 510 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 510 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 511 | </property> | 511 | </property> |
| 512 | - <widget class="Clock" name="clock" native="true"> | ||
| 513 | - <property name="geometry"> | ||
| 514 | - <rect> | ||
| 515 | - <x>272</x> | ||
| 516 | - <y>36</y> | ||
| 517 | - <width>356</width> | ||
| 518 | - <height>355</height> | ||
| 519 | - </rect> | ||
| 520 | - </property> | ||
| 521 | - </widget> | ||
| 522 | - <widget class="WashWarnIcon" name="label"> | ||
| 523 | - <property name="geometry"> | ||
| 524 | - <rect> | ||
| 525 | - <x>800</x> | ||
| 526 | - <y>320</y> | ||
| 527 | - <width>80</width> | ||
| 528 | - <height>84</height> | ||
| 529 | - </rect> | ||
| 530 | - </property> | ||
| 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> | ||
| 552 | - <widget class="DigitalClock" name="label_4"> | ||
| 553 | - <property name="geometry"> | ||
| 554 | - <rect> | ||
| 555 | - <x>20</x> | ||
| 556 | - <y>310</y> | ||
| 557 | - <width>600</width> | ||
| 558 | - <height>100</height> | ||
| 559 | - </rect> | ||
| 560 | - </property> | ||
| 561 | - <property name="alignment"> | ||
| 562 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 563 | - </property> | ||
| 564 | - </widget> | ||
| 565 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 566 | - <property name="geometry"> | ||
| 567 | - <rect> | ||
| 568 | - <x>670</x> | ||
| 569 | - <y>290</y> | ||
| 570 | - <width>111</width> | ||
| 571 | - <height>121</height> | ||
| 572 | - </rect> | ||
| 573 | - </property> | ||
| 574 | - <property name="text"> | ||
| 575 | - <string/> | ||
| 576 | - </property> | ||
| 577 | - </widget> | ||
| 578 | - <widget class="IgnitionIcon" name="label_5"> | ||
| 579 | - <property name="geometry"> | ||
| 580 | - <rect> | ||
| 581 | - <x>662</x> | ||
| 582 | - <y>164</y> | ||
| 583 | - <width>111</width> | ||
| 584 | - <height>121</height> | ||
| 585 | - </rect> | ||
| 586 | - </property> | ||
| 587 | - <property name="text"> | ||
| 588 | - <string/> | ||
| 589 | - </property> | ||
| 590 | - </widget> | ||
| 591 | </widget> | 512 | </widget> |
| 592 | <widget class="QWidget" name="page_2"/> | 513 | <widget class="QWidget" name="page_2"/> |
| 593 | </widget> | 514 | </widget> |
| @@ -1442,42 +1363,12 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c | @@ -1442,42 +1363,12 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c | ||
| 1442 | </widget> | 1363 | </widget> |
| 1443 | <customwidgets> | 1364 | <customwidgets> |
| 1444 | <customwidget> | 1365 | <customwidget> |
| 1445 | - <class>Clock</class> | 1366 | + <class>StatusArea</class> |
| 1446 | <extends>QWidget</extends> | 1367 | <extends>QWidget</extends> |
| 1447 | - <header>clock.h</header> | 1368 | + <header>statusarea.h</header> |
| 1448 | <container>1</container> | 1369 | <container>1</container> |
| 1449 | </customwidget> | 1370 | </customwidget> |
| 1450 | <customwidget> | 1371 | <customwidget> |
| 1451 | - <class>WashWarnIcon</class> | ||
| 1452 | - <extends>QLabel</extends> | ||
| 1453 | - <header>washwarnicon.h</header> | ||
| 1454 | - </customwidget> | ||
| 1455 | - <customwidget> | ||
| 1456 | - <class>DemoIcon</class> | ||
| 1457 | - <extends>QLabel</extends> | ||
| 1458 | - <header>demoicon.h</header> | ||
| 1459 | - </customwidget> | ||
| 1460 | - <customwidget> | ||
| 1461 | - <class>HalfEnergyIcon</class> | ||
| 1462 | - <extends>QLabel</extends> | ||
| 1463 | - <header>halfenergyicon.h</header> | ||
| 1464 | - </customwidget> | ||
| 1465 | - <customwidget> | ||
| 1466 | - <class>DigitalClock</class> | ||
| 1467 | - <extends>QLabel</extends> | ||
| 1468 | - <header>digitalclock.h</header> | ||
| 1469 | - </customwidget> | ||
| 1470 | - <customwidget> | ||
| 1471 | - <class>IgnitionIcon</class> | ||
| 1472 | - <extends>QLabel</extends> | ||
| 1473 | - <header>ignitionicon.h</header> | ||
| 1474 | - </customwidget> | ||
| 1475 | - <customwidget> | ||
| 1476 | - <class>WaterLevelIcon</class> | ||
| 1477 | - <extends>QLabel</extends> | ||
| 1478 | - <header>waterlevelicon.h</header> | ||
| 1479 | - </customwidget> | ||
| 1480 | - <customwidget> | ||
| 1481 | <class>Slider</class> | 1372 | <class>Slider</class> |
| 1482 | <extends>QWidget</extends> | 1373 | <extends>QWidget</extends> |
| 1483 | <header>slider.h</header> | 1374 | <header>slider.h</header> |
app/gui/oven_control/programmingautoselectionwindow.ui
| @@ -108,89 +108,10 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0 | @@ -108,89 +108,10 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0 | ||
| 108 | <height>426</height> | 108 | <height>426</height> |
| 109 | </rect> | 109 | </rect> |
| 110 | </property> | 110 | </property> |
| 111 | - <widget class="QWidget" name="clockContainer"> | 111 | + <widget class="StatusArea" name="clockContainer"> |
| 112 | <property name="styleSheet"> | 112 | <property name="styleSheet"> |
| 113 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 113 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 114 | </property> | 114 | </property> |
| 115 | - <widget class="Clock" name="clock" native="true"> | ||
| 116 | - <property name="geometry"> | ||
| 117 | - <rect> | ||
| 118 | - <x>272</x> | ||
| 119 | - <y>36</y> | ||
| 120 | - <width>356</width> | ||
| 121 | - <height>355</height> | ||
| 122 | - </rect> | ||
| 123 | - </property> | ||
| 124 | - </widget> | ||
| 125 | - <widget class="WashWarnIcon" name="label"> | ||
| 126 | - <property name="geometry"> | ||
| 127 | - <rect> | ||
| 128 | - <x>800</x> | ||
| 129 | - <y>320</y> | ||
| 130 | - <width>80</width> | ||
| 131 | - <height>84</height> | ||
| 132 | - </rect> | ||
| 133 | - </property> | ||
| 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> | ||
| 155 | - <widget class="DigitalClock" name="label_4"> | ||
| 156 | - <property name="geometry"> | ||
| 157 | - <rect> | ||
| 158 | - <x>20</x> | ||
| 159 | - <y>310</y> | ||
| 160 | - <width>600</width> | ||
| 161 | - <height>100</height> | ||
| 162 | - </rect> | ||
| 163 | - </property> | ||
| 164 | - <property name="alignment"> | ||
| 165 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 166 | - </property> | ||
| 167 | - </widget> | ||
| 168 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 169 | - <property name="geometry"> | ||
| 170 | - <rect> | ||
| 171 | - <x>670</x> | ||
| 172 | - <y>290</y> | ||
| 173 | - <width>111</width> | ||
| 174 | - <height>121</height> | ||
| 175 | - </rect> | ||
| 176 | - </property> | ||
| 177 | - <property name="text"> | ||
| 178 | - <string/> | ||
| 179 | - </property> | ||
| 180 | - </widget> | ||
| 181 | - <widget class="IgnitionIcon" name="label_5"> | ||
| 182 | - <property name="geometry"> | ||
| 183 | - <rect> | ||
| 184 | - <x>662</x> | ||
| 185 | - <y>164</y> | ||
| 186 | - <width>111</width> | ||
| 187 | - <height>121</height> | ||
| 188 | - </rect> | ||
| 189 | - </property> | ||
| 190 | - <property name="text"> | ||
| 191 | - <string/> | ||
| 192 | - </property> | ||
| 193 | - </widget> | ||
| 194 | </widget> | 115 | </widget> |
| 195 | <widget class="QWidget" name="page_2"/> | 116 | <widget class="QWidget" name="page_2"/> |
| 196 | </widget> | 117 | </widget> |
| @@ -217,41 +138,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0 | @@ -217,41 +138,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0 | ||
| 217 | </widget> | 138 | </widget> |
| 218 | <customwidgets> | 139 | <customwidgets> |
| 219 | <customwidget> | 140 | <customwidget> |
| 220 | - <class>Clock</class> | 141 | + <class>StatusArea</class> |
| 221 | <extends>QWidget</extends> | 142 | <extends>QWidget</extends> |
| 222 | - <header>clock.h</header> | 143 | + <header>statusarea.h</header> |
| 223 | <container>1</container> | 144 | <container>1</container> |
| 224 | </customwidget> | 145 | </customwidget> |
| 225 | - <customwidget> | ||
| 226 | - <class>WashWarnIcon</class> | ||
| 227 | - <extends>QLabel</extends> | ||
| 228 | - <header>washwarnicon.h</header> | ||
| 229 | - </customwidget> | ||
| 230 | - <customwidget> | ||
| 231 | - <class>DemoIcon</class> | ||
| 232 | - <extends>QLabel</extends> | ||
| 233 | - <header>demoicon.h</header> | ||
| 234 | - </customwidget> | ||
| 235 | - <customwidget> | ||
| 236 | - <class>HalfEnergyIcon</class> | ||
| 237 | - <extends>QLabel</extends> | ||
| 238 | - <header>halfenergyicon.h</header> | ||
| 239 | - </customwidget> | ||
| 240 | - <customwidget> | ||
| 241 | - <class>DigitalClock</class> | ||
| 242 | - <extends>QLabel</extends> | ||
| 243 | - <header>digitalclock.h</header> | ||
| 244 | - </customwidget> | ||
| 245 | - <customwidget> | ||
| 246 | - <class>IgnitionIcon</class> | ||
| 247 | - <extends>QLabel</extends> | ||
| 248 | - <header>ignitionicon.h</header> | ||
| 249 | - </customwidget> | ||
| 250 | - <customwidget> | ||
| 251 | - <class>WaterLevelIcon</class> | ||
| 252 | - <extends>QLabel</extends> | ||
| 253 | - <header>waterlevelicon.h</header> | ||
| 254 | - </customwidget> | ||
| 255 | </customwidgets> | 146 | </customwidgets> |
| 256 | <resources/> | 147 | <resources/> |
| 257 | <connections/> | 148 | <connections/> |
app/gui/oven_control/programmingmanualwindow.ui
| @@ -133,89 +133,10 @@ height: 33px; | @@ -133,89 +133,10 @@ height: 33px; | ||
| 133 | <height>426</height> | 133 | <height>426</height> |
| 134 | </rect> | 134 | </rect> |
| 135 | </property> | 135 | </property> |
| 136 | - <widget class="QWidget" name="clockContainer"> | 136 | + <widget class="StatusArea" name="clockContainer"> |
| 137 | <property name="styleSheet"> | 137 | <property name="styleSheet"> |
| 138 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 138 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 139 | </property> | 139 | </property> |
| 140 | - <widget class="Clock" name="clock" native="true"> | ||
| 141 | - <property name="geometry"> | ||
| 142 | - <rect> | ||
| 143 | - <x>272</x> | ||
| 144 | - <y>36</y> | ||
| 145 | - <width>356</width> | ||
| 146 | - <height>355</height> | ||
| 147 | - </rect> | ||
| 148 | - </property> | ||
| 149 | - </widget> | ||
| 150 | - <widget class="WashWarnIcon" name="label_6"> | ||
| 151 | - <property name="geometry"> | ||
| 152 | - <rect> | ||
| 153 | - <x>800</x> | ||
| 154 | - <y>320</y> | ||
| 155 | - <width>80</width> | ||
| 156 | - <height>84</height> | ||
| 157 | - </rect> | ||
| 158 | - </property> | ||
| 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> | ||
| 180 | - <widget class="DigitalClock" name="label_4"> | ||
| 181 | - <property name="geometry"> | ||
| 182 | - <rect> | ||
| 183 | - <x>20</x> | ||
| 184 | - <y>310</y> | ||
| 185 | - <width>600</width> | ||
| 186 | - <height>100</height> | ||
| 187 | - </rect> | ||
| 188 | - </property> | ||
| 189 | - <property name="alignment"> | ||
| 190 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 191 | - </property> | ||
| 192 | - </widget> | ||
| 193 | - <widget class="WaterLevelIcon" name="label_7"> | ||
| 194 | - <property name="geometry"> | ||
| 195 | - <rect> | ||
| 196 | - <x>670</x> | ||
| 197 | - <y>290</y> | ||
| 198 | - <width>111</width> | ||
| 199 | - <height>121</height> | ||
| 200 | - </rect> | ||
| 201 | - </property> | ||
| 202 | - <property name="text"> | ||
| 203 | - <string/> | ||
| 204 | - </property> | ||
| 205 | - </widget> | ||
| 206 | - <widget class="IgnitionIcon" name="label_8"> | ||
| 207 | - <property name="geometry"> | ||
| 208 | - <rect> | ||
| 209 | - <x>662</x> | ||
| 210 | - <y>164</y> | ||
| 211 | - <width>111</width> | ||
| 212 | - <height>121</height> | ||
| 213 | - </rect> | ||
| 214 | - </property> | ||
| 215 | - <property name="text"> | ||
| 216 | - <string/> | ||
| 217 | - </property> | ||
| 218 | - </widget> | ||
| 219 | </widget> | 140 | </widget> |
| 220 | <widget class="QWidget" name="closeDoorWidget"> | 141 | <widget class="QWidget" name="closeDoorWidget"> |
| 221 | <property name="styleSheet"> | 142 | <property name="styleSheet"> |
| @@ -996,42 +917,12 @@ QPushButton:checked { background-image: url(:/images/cook_mode/big_combi.png); } | @@ -996,42 +917,12 @@ QPushButton:checked { background-image: url(:/images/cook_mode/big_combi.png); } | ||
| 996 | </widget> | 917 | </widget> |
| 997 | <customwidgets> | 918 | <customwidgets> |
| 998 | <customwidget> | 919 | <customwidget> |
| 999 | - <class>Clock</class> | 920 | + <class>StatusArea</class> |
| 1000 | <extends>QWidget</extends> | 921 | <extends>QWidget</extends> |
| 1001 | - <header>clock.h</header> | 922 | + <header>statusarea.h</header> |
| 1002 | <container>1</container> | 923 | <container>1</container> |
| 1003 | </customwidget> | 924 | </customwidget> |
| 1004 | <customwidget> | 925 | <customwidget> |
| 1005 | - <class>WashWarnIcon</class> | ||
| 1006 | - <extends>QLabel</extends> | ||
| 1007 | - <header>washwarnicon.h</header> | ||
| 1008 | - </customwidget> | ||
| 1009 | - <customwidget> | ||
| 1010 | - <class>DemoIcon</class> | ||
| 1011 | - <extends>QLabel</extends> | ||
| 1012 | - <header>demoicon.h</header> | ||
| 1013 | - </customwidget> | ||
| 1014 | - <customwidget> | ||
| 1015 | - <class>HalfEnergyIcon</class> | ||
| 1016 | - <extends>QLabel</extends> | ||
| 1017 | - <header>halfenergyicon.h</header> | ||
| 1018 | - </customwidget> | ||
| 1019 | - <customwidget> | ||
| 1020 | - <class>DigitalClock</class> | ||
| 1021 | - <extends>QLabel</extends> | ||
| 1022 | - <header>digitalclock.h</header> | ||
| 1023 | - </customwidget> | ||
| 1024 | - <customwidget> | ||
| 1025 | - <class>IgnitionIcon</class> | ||
| 1026 | - <extends>QLabel</extends> | ||
| 1027 | - <header>ignitionicon.h</header> | ||
| 1028 | - </customwidget> | ||
| 1029 | - <customwidget> | ||
| 1030 | - <class>WaterLevelIcon</class> | ||
| 1031 | - <extends>QLabel</extends> | ||
| 1032 | - <header>waterlevelicon.h</header> | ||
| 1033 | - </customwidget> | ||
| 1034 | - <customwidget> | ||
| 1035 | <class>Slider</class> | 926 | <class>Slider</class> |
| 1036 | <extends>QWidget</extends> | 927 | <extends>QWidget</extends> |
| 1037 | <header>slider.h</header> | 928 | <header>slider.h</header> |
app/gui/oven_control/programmingselectionwindow.ui
| @@ -685,89 +685,10 @@ QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png); | @@ -685,89 +685,10 @@ QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png); | ||
| 685 | <property name="currentIndex"> | 685 | <property name="currentIndex"> |
| 686 | <number>0</number> | 686 | <number>0</number> |
| 687 | </property> | 687 | </property> |
| 688 | - <widget class="QWidget" name="clockContainer"> | 688 | + <widget class="StatusArea" name="clockContainer"> |
| 689 | <property name="styleSheet"> | 689 | <property name="styleSheet"> |
| 690 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 690 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 691 | </property> | 691 | </property> |
| 692 | - <widget class="Clock" name="clock" native="true"> | ||
| 693 | - <property name="geometry"> | ||
| 694 | - <rect> | ||
| 695 | - <x>272</x> | ||
| 696 | - <y>36</y> | ||
| 697 | - <width>356</width> | ||
| 698 | - <height>355</height> | ||
| 699 | - </rect> | ||
| 700 | - </property> | ||
| 701 | - </widget> | ||
| 702 | - <widget class="WashWarnIcon" name="label"> | ||
| 703 | - <property name="geometry"> | ||
| 704 | - <rect> | ||
| 705 | - <x>800</x> | ||
| 706 | - <y>320</y> | ||
| 707 | - <width>80</width> | ||
| 708 | - <height>84</height> | ||
| 709 | - </rect> | ||
| 710 | - </property> | ||
| 711 | - </widget> | ||
| 712 | - <widget class="DemoIcon" name="label_2"> | ||
| 713 | - <property name="geometry"> | ||
| 714 | - <rect> | ||
| 715 | - <x>780</x> | ||
| 716 | - <y>230</y> | ||
| 717 | - <width>101</width> | ||
| 718 | - <height>90</height> | ||
| 719 | - </rect> | ||
| 720 | - </property> | ||
| 721 | - </widget> | ||
| 722 | - <widget class="HalfEnergyIcon" name="label_3"> | ||
| 723 | - <property name="geometry"> | ||
| 724 | - <rect> | ||
| 725 | - <x>780</x> | ||
| 726 | - <y>160</y> | ||
| 727 | - <width>108</width> | ||
| 728 | - <height>67</height> | ||
| 729 | - </rect> | ||
| 730 | - </property> | ||
| 731 | - </widget> | ||
| 732 | - <widget class="DigitalClock" name="label_4"> | ||
| 733 | - <property name="geometry"> | ||
| 734 | - <rect> | ||
| 735 | - <x>20</x> | ||
| 736 | - <y>310</y> | ||
| 737 | - <width>600</width> | ||
| 738 | - <height>100</height> | ||
| 739 | - </rect> | ||
| 740 | - </property> | ||
| 741 | - <property name="alignment"> | ||
| 742 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 743 | - </property> | ||
| 744 | - </widget> | ||
| 745 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 746 | - <property name="geometry"> | ||
| 747 | - <rect> | ||
| 748 | - <x>670</x> | ||
| 749 | - <y>290</y> | ||
| 750 | - <width>111</width> | ||
| 751 | - <height>121</height> | ||
| 752 | - </rect> | ||
| 753 | - </property> | ||
| 754 | - <property name="text"> | ||
| 755 | - <string/> | ||
| 756 | - </property> | ||
| 757 | - </widget> | ||
| 758 | - <widget class="IgnitionIcon" name="label_5"> | ||
| 759 | - <property name="geometry"> | ||
| 760 | - <rect> | ||
| 761 | - <x>662</x> | ||
| 762 | - <y>164</y> | ||
| 763 | - <width>111</width> | ||
| 764 | - <height>121</height> | ||
| 765 | - </rect> | ||
| 766 | - </property> | ||
| 767 | - <property name="text"> | ||
| 768 | - <string/> | ||
| 769 | - </property> | ||
| 770 | - </widget> | ||
| 771 | </widget> | 692 | </widget> |
| 772 | <widget class="QWidget" name="page_2"/> | 693 | <widget class="QWidget" name="page_2"/> |
| 773 | </widget> | 694 | </widget> |
| @@ -775,41 +696,11 @@ QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png); | @@ -775,41 +696,11 @@ QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png); | ||
| 775 | </widget> | 696 | </widget> |
| 776 | <customwidgets> | 697 | <customwidgets> |
| 777 | <customwidget> | 698 | <customwidget> |
| 778 | - <class>Clock</class> | 699 | + <class>StatusArea</class> |
| 779 | <extends>QWidget</extends> | 700 | <extends>QWidget</extends> |
| 780 | - <header>clock.h</header> | 701 | + <header>statusarea.h</header> |
| 781 | <container>1</container> | 702 | <container>1</container> |
| 782 | </customwidget> | 703 | </customwidget> |
| 783 | - <customwidget> | ||
| 784 | - <class>WashWarnIcon</class> | ||
| 785 | - <extends>QLabel</extends> | ||
| 786 | - <header>washwarnicon.h</header> | ||
| 787 | - </customwidget> | ||
| 788 | - <customwidget> | ||
| 789 | - <class>DemoIcon</class> | ||
| 790 | - <extends>QLabel</extends> | ||
| 791 | - <header>demoicon.h</header> | ||
| 792 | - </customwidget> | ||
| 793 | - <customwidget> | ||
| 794 | - <class>HalfEnergyIcon</class> | ||
| 795 | - <extends>QLabel</extends> | ||
| 796 | - <header>halfenergyicon.h</header> | ||
| 797 | - </customwidget> | ||
| 798 | - <customwidget> | ||
| 799 | - <class>DigitalClock</class> | ||
| 800 | - <extends>QLabel</extends> | ||
| 801 | - <header>digitalclock.h</header> | ||
| 802 | - </customwidget> | ||
| 803 | - <customwidget> | ||
| 804 | - <class>IgnitionIcon</class> | ||
| 805 | - <extends>QLabel</extends> | ||
| 806 | - <header>ignitionicon.h</header> | ||
| 807 | - </customwidget> | ||
| 808 | - <customwidget> | ||
| 809 | - <class>WaterLevelIcon</class> | ||
| 810 | - <extends>QLabel</extends> | ||
| 811 | - <header>waterlevelicon.h</header> | ||
| 812 | - </customwidget> | ||
| 813 | </customwidgets> | 704 | </customwidgets> |
| 814 | <tabstops> | 705 | <tabstops> |
| 815 | <tabstop>steamButton</tabstop> | 706 | <tabstop>steamButton</tabstop> |
app/gui/oven_control/programmingwindow.ui
| @@ -71,89 +71,10 @@ background: none; | @@ -71,89 +71,10 @@ background: none; | ||
| 71 | <height>426</height> | 71 | <height>426</height> |
| 72 | </rect> | 72 | </rect> |
| 73 | </property> | 73 | </property> |
| 74 | - <widget class="QWidget" name="clockContainer"> | 74 | + <widget class="StatusArea" name="clockContainer"> |
| 75 | <property name="styleSheet"> | 75 | <property name="styleSheet"> |
| 76 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 76 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 77 | </property> | 77 | </property> |
| 78 | - <widget class="Clock" name="clock" native="true"> | ||
| 79 | - <property name="geometry"> | ||
| 80 | - <rect> | ||
| 81 | - <x>272</x> | ||
| 82 | - <y>36</y> | ||
| 83 | - <width>356</width> | ||
| 84 | - <height>355</height> | ||
| 85 | - </rect> | ||
| 86 | - </property> | ||
| 87 | - </widget> | ||
| 88 | - <widget class="WashWarnIcon" name="label"> | ||
| 89 | - <property name="geometry"> | ||
| 90 | - <rect> | ||
| 91 | - <x>800</x> | ||
| 92 | - <y>320</y> | ||
| 93 | - <width>80</width> | ||
| 94 | - <height>84</height> | ||
| 95 | - </rect> | ||
| 96 | - </property> | ||
| 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> | ||
| 118 | - <widget class="DigitalClock" name="label_4"> | ||
| 119 | - <property name="geometry"> | ||
| 120 | - <rect> | ||
| 121 | - <x>20</x> | ||
| 122 | - <y>310</y> | ||
| 123 | - <width>600</width> | ||
| 124 | - <height>100</height> | ||
| 125 | - </rect> | ||
| 126 | - </property> | ||
| 127 | - <property name="alignment"> | ||
| 128 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 129 | - </property> | ||
| 130 | - </widget> | ||
| 131 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 132 | - <property name="geometry"> | ||
| 133 | - <rect> | ||
| 134 | - <x>670</x> | ||
| 135 | - <y>290</y> | ||
| 136 | - <width>111</width> | ||
| 137 | - <height>121</height> | ||
| 138 | - </rect> | ||
| 139 | - </property> | ||
| 140 | - <property name="text"> | ||
| 141 | - <string/> | ||
| 142 | - </property> | ||
| 143 | - </widget> | ||
| 144 | - <widget class="IgnitionIcon" name="label_5"> | ||
| 145 | - <property name="geometry"> | ||
| 146 | - <rect> | ||
| 147 | - <x>662</x> | ||
| 148 | - <y>164</y> | ||
| 149 | - <width>111</width> | ||
| 150 | - <height>121</height> | ||
| 151 | - </rect> | ||
| 152 | - </property> | ||
| 153 | - <property name="text"> | ||
| 154 | - <string/> | ||
| 155 | - </property> | ||
| 156 | - </widget> | ||
| 157 | </widget> | 78 | </widget> |
| 158 | <widget class="QWidget" name="page_2"/> | 79 | <widget class="QWidget" name="page_2"/> |
| 159 | </widget> | 80 | </widget> |
| @@ -340,41 +261,11 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/etc/bar_ | @@ -340,41 +261,11 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/etc/bar_ | ||
| 340 | </widget> | 261 | </widget> |
| 341 | <customwidgets> | 262 | <customwidgets> |
| 342 | <customwidget> | 263 | <customwidget> |
| 343 | - <class>Clock</class> | 264 | + <class>StatusArea</class> |
| 344 | <extends>QWidget</extends> | 265 | <extends>QWidget</extends> |
| 345 | - <header>clock.h</header> | 266 | + <header>statusarea.h</header> |
| 346 | <container>1</container> | 267 | <container>1</container> |
| 347 | </customwidget> | 268 | </customwidget> |
| 348 | - <customwidget> | ||
| 349 | - <class>WashWarnIcon</class> | ||
| 350 | - <extends>QLabel</extends> | ||
| 351 | - <header>washwarnicon.h</header> | ||
| 352 | - </customwidget> | ||
| 353 | - <customwidget> | ||
| 354 | - <class>DemoIcon</class> | ||
| 355 | - <extends>QLabel</extends> | ||
| 356 | - <header>demoicon.h</header> | ||
| 357 | - </customwidget> | ||
| 358 | - <customwidget> | ||
| 359 | - <class>HalfEnergyIcon</class> | ||
| 360 | - <extends>QLabel</extends> | ||
| 361 | - <header>halfenergyicon.h</header> | ||
| 362 | - </customwidget> | ||
| 363 | - <customwidget> | ||
| 364 | - <class>DigitalClock</class> | ||
| 365 | - <extends>QLabel</extends> | ||
| 366 | - <header>digitalclock.h</header> | ||
| 367 | - </customwidget> | ||
| 368 | - <customwidget> | ||
| 369 | - <class>IgnitionIcon</class> | ||
| 370 | - <extends>QLabel</extends> | ||
| 371 | - <header>ignitionicon.h</header> | ||
| 372 | - </customwidget> | ||
| 373 | - <customwidget> | ||
| 374 | - <class>WaterLevelIcon</class> | ||
| 375 | - <extends>QLabel</extends> | ||
| 376 | - <header>waterlevelicon.h</header> | ||
| 377 | - </customwidget> | ||
| 378 | </customwidgets> | 269 | </customwidgets> |
| 379 | <tabstops> | 270 | <tabstops> |
| 380 | <tabstop>autoButton</tabstop> | 271 | <tabstop>autoButton</tabstop> |
app/gui/oven_control/realtimemain.ui
| @@ -27,89 +27,10 @@ | @@ -27,89 +27,10 @@ | ||
| 27 | <height>426</height> | 27 | <height>426</height> |
| 28 | </rect> | 28 | </rect> |
| 29 | </property> | 29 | </property> |
| 30 | - <widget class="QWidget" name="clockContainer"> | 30 | + <widget class="StatusArea" name="clockContainer"> |
| 31 | <property name="styleSheet"> | 31 | <property name="styleSheet"> |
| 32 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 32 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 33 | </property> | 33 | </property> |
| 34 | - <widget class="Clock" name="clock" native="true"> | ||
| 35 | - <property name="geometry"> | ||
| 36 | - <rect> | ||
| 37 | - <x>272</x> | ||
| 38 | - <y>36</y> | ||
| 39 | - <width>356</width> | ||
| 40 | - <height>355</height> | ||
| 41 | - </rect> | ||
| 42 | - </property> | ||
| 43 | - </widget> | ||
| 44 | - <widget class="WashWarnIcon" name="label_2"> | ||
| 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> | ||
| 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> | ||
| 74 | - <widget class="DigitalClock" name="label_5"> | ||
| 75 | - <property name="geometry"> | ||
| 76 | - <rect> | ||
| 77 | - <x>20</x> | ||
| 78 | - <y>310</y> | ||
| 79 | - <width>600</width> | ||
| 80 | - <height>100</height> | ||
| 81 | - </rect> | ||
| 82 | - </property> | ||
| 83 | - <property name="alignment"> | ||
| 84 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 85 | - </property> | ||
| 86 | - </widget> | ||
| 87 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 88 | - <property name="geometry"> | ||
| 89 | - <rect> | ||
| 90 | - <x>670</x> | ||
| 91 | - <y>290</y> | ||
| 92 | - <width>111</width> | ||
| 93 | - <height>121</height> | ||
| 94 | - </rect> | ||
| 95 | - </property> | ||
| 96 | - <property name="text"> | ||
| 97 | - <string/> | ||
| 98 | - </property> | ||
| 99 | - </widget> | ||
| 100 | - <widget class="IgnitionIcon" name="label_7"> | ||
| 101 | - <property name="geometry"> | ||
| 102 | - <rect> | ||
| 103 | - <x>662</x> | ||
| 104 | - <y>164</y> | ||
| 105 | - <width>111</width> | ||
| 106 | - <height>121</height> | ||
| 107 | - </rect> | ||
| 108 | - </property> | ||
| 109 | - <property name="text"> | ||
| 110 | - <string/> | ||
| 111 | - </property> | ||
| 112 | - </widget> | ||
| 113 | </widget> | 34 | </widget> |
| 114 | <widget class="QWidget" name="page_2"/> | 35 | <widget class="QWidget" name="page_2"/> |
| 115 | </widget> | 36 | </widget> |
| @@ -341,41 +262,11 @@ QPushButton { text-align: center;} | @@ -341,41 +262,11 @@ QPushButton { text-align: center;} | ||
| 341 | </widget> | 262 | </widget> |
| 342 | <customwidgets> | 263 | <customwidgets> |
| 343 | <customwidget> | 264 | <customwidget> |
| 344 | - <class>Clock</class> | 265 | + <class>StatusArea</class> |
| 345 | <extends>QWidget</extends> | 266 | <extends>QWidget</extends> |
| 346 | - <header>clock.h</header> | 267 | + <header>statusarea.h</header> |
| 347 | <container>1</container> | 268 | <container>1</container> |
| 348 | </customwidget> | 269 | </customwidget> |
| 349 | - <customwidget> | ||
| 350 | - <class>WashWarnIcon</class> | ||
| 351 | - <extends>QLabel</extends> | ||
| 352 | - <header>washwarnicon.h</header> | ||
| 353 | - </customwidget> | ||
| 354 | - <customwidget> | ||
| 355 | - <class>DemoIcon</class> | ||
| 356 | - <extends>QLabel</extends> | ||
| 357 | - <header>demoicon.h</header> | ||
| 358 | - </customwidget> | ||
| 359 | - <customwidget> | ||
| 360 | - <class>HalfEnergyIcon</class> | ||
| 361 | - <extends>QLabel</extends> | ||
| 362 | - <header>halfenergyicon.h</header> | ||
| 363 | - </customwidget> | ||
| 364 | - <customwidget> | ||
| 365 | - <class>DigitalClock</class> | ||
| 366 | - <extends>QLabel</extends> | ||
| 367 | - <header>digitalclock.h</header> | ||
| 368 | - </customwidget> | ||
| 369 | - <customwidget> | ||
| 370 | - <class>IgnitionIcon</class> | ||
| 371 | - <extends>QLabel</extends> | ||
| 372 | - <header>ignitionicon.h</header> | ||
| 373 | - </customwidget> | ||
| 374 | - <customwidget> | ||
| 375 | - <class>WaterLevelIcon</class> | ||
| 376 | - <extends>QLabel</extends> | ||
| 377 | - <header>waterlevelicon.h</header> | ||
| 378 | - </customwidget> | ||
| 379 | </customwidgets> | 270 | </customwidgets> |
| 380 | <resources> | 271 | <resources> |
| 381 | <include location="resources.qrc"/> | 272 | <include location="resources.qrc"/> |
app/gui/oven_control/realtimepartswindow.ui
| @@ -28,89 +28,10 @@ | @@ -28,89 +28,10 @@ | ||
| 28 | <height>426</height> | 28 | <height>426</height> |
| 29 | </rect> | 29 | </rect> |
| 30 | </property> | 30 | </property> |
| 31 | - <widget class="QWidget" name="clockContainer"> | 31 | + <widget class="StatusArea" name="clockContainer"> |
| 32 | <property name="styleSheet"> | 32 | <property name="styleSheet"> |
| 33 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 33 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 34 | </property> | 34 | </property> |
| 35 | - <widget class="Clock" name="clock" native="true"> | ||
| 36 | - <property name="geometry"> | ||
| 37 | - <rect> | ||
| 38 | - <x>272</x> | ||
| 39 | - <y>36</y> | ||
| 40 | - <width>356</width> | ||
| 41 | - <height>355</height> | ||
| 42 | - </rect> | ||
| 43 | - </property> | ||
| 44 | - </widget> | ||
| 45 | - <widget class="WashWarnIcon" name="label"> | ||
| 46 | - <property name="geometry"> | ||
| 47 | - <rect> | ||
| 48 | - <x>800</x> | ||
| 49 | - <y>320</y> | ||
| 50 | - <width>80</width> | ||
| 51 | - <height>84</height> | ||
| 52 | - </rect> | ||
| 53 | - </property> | ||
| 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> | ||
| 75 | - <widget class="DigitalClock" name="label_4"> | ||
| 76 | - <property name="geometry"> | ||
| 77 | - <rect> | ||
| 78 | - <x>20</x> | ||
| 79 | - <y>310</y> | ||
| 80 | - <width>600</width> | ||
| 81 | - <height>100</height> | ||
| 82 | - </rect> | ||
| 83 | - </property> | ||
| 84 | - <property name="alignment"> | ||
| 85 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 86 | - </property> | ||
| 87 | - </widget> | ||
| 88 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 89 | - <property name="geometry"> | ||
| 90 | - <rect> | ||
| 91 | - <x>670</x> | ||
| 92 | - <y>290</y> | ||
| 93 | - <width>111</width> | ||
| 94 | - <height>121</height> | ||
| 95 | - </rect> | ||
| 96 | - </property> | ||
| 97 | - <property name="text"> | ||
| 98 | - <string/> | ||
| 99 | - </property> | ||
| 100 | - </widget> | ||
| 101 | - <widget class="IgnitionIcon" name="label_5"> | ||
| 102 | - <property name="geometry"> | ||
| 103 | - <rect> | ||
| 104 | - <x>662</x> | ||
| 105 | - <y>164</y> | ||
| 106 | - <width>111</width> | ||
| 107 | - <height>121</height> | ||
| 108 | - </rect> | ||
| 109 | - </property> | ||
| 110 | - <property name="text"> | ||
| 111 | - <string/> | ||
| 112 | - </property> | ||
| 113 | - </widget> | ||
| 114 | </widget> | 35 | </widget> |
| 115 | <widget class="QWidget" name="page_2"/> | 36 | <widget class="QWidget" name="page_2"/> |
| 116 | </widget> | 37 | </widget> |
| @@ -1083,41 +1004,11 @@ QPushButton { text-align: center;} | @@ -1083,41 +1004,11 @@ QPushButton { text-align: center;} | ||
| 1083 | </widget> | 1004 | </widget> |
| 1084 | <customwidgets> | 1005 | <customwidgets> |
| 1085 | <customwidget> | 1006 | <customwidget> |
| 1086 | - <class>Clock</class> | 1007 | + <class>StatusArea</class> |
| 1087 | <extends>QWidget</extends> | 1008 | <extends>QWidget</extends> |
| 1088 | - <header>clock.h</header> | 1009 | + <header>statusarea.h</header> |
| 1089 | <container>1</container> | 1010 | <container>1</container> |
| 1090 | </customwidget> | 1011 | </customwidget> |
| 1091 | - <customwidget> | ||
| 1092 | - <class>WashWarnIcon</class> | ||
| 1093 | - <extends>QLabel</extends> | ||
| 1094 | - <header>washwarnicon.h</header> | ||
| 1095 | - </customwidget> | ||
| 1096 | - <customwidget> | ||
| 1097 | - <class>DemoIcon</class> | ||
| 1098 | - <extends>QLabel</extends> | ||
| 1099 | - <header>demoicon.h</header> | ||
| 1100 | - </customwidget> | ||
| 1101 | - <customwidget> | ||
| 1102 | - <class>HalfEnergyIcon</class> | ||
| 1103 | - <extends>QLabel</extends> | ||
| 1104 | - <header>halfenergyicon.h</header> | ||
| 1105 | - </customwidget> | ||
| 1106 | - <customwidget> | ||
| 1107 | - <class>DigitalClock</class> | ||
| 1108 | - <extends>QLabel</extends> | ||
| 1109 | - <header>digitalclock.h</header> | ||
| 1110 | - </customwidget> | ||
| 1111 | - <customwidget> | ||
| 1112 | - <class>IgnitionIcon</class> | ||
| 1113 | - <extends>QLabel</extends> | ||
| 1114 | - <header>ignitionicon.h</header> | ||
| 1115 | - </customwidget> | ||
| 1116 | - <customwidget> | ||
| 1117 | - <class>WaterLevelIcon</class> | ||
| 1118 | - <extends>QLabel</extends> | ||
| 1119 | - <header>waterlevelicon.h</header> | ||
| 1120 | - </customwidget> | ||
| 1121 | </customwidgets> | 1012 | </customwidgets> |
| 1122 | <resources/> | 1013 | <resources/> |
| 1123 | <connections/> | 1014 | <connections/> |
app/gui/oven_control/realtimesensorwindow.ui
| @@ -28,89 +28,10 @@ | @@ -28,89 +28,10 @@ | ||
| 28 | <height>426</height> | 28 | <height>426</height> |
| 29 | </rect> | 29 | </rect> |
| 30 | </property> | 30 | </property> |
| 31 | - <widget class="QWidget" name="clockContainer"> | 31 | + <widget class="StatusArea" name="clockContainer"> |
| 32 | <property name="styleSheet"> | 32 | <property name="styleSheet"> |
| 33 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 33 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 34 | </property> | 34 | </property> |
| 35 | - <widget class="Clock" name="clock" native="true"> | ||
| 36 | - <property name="geometry"> | ||
| 37 | - <rect> | ||
| 38 | - <x>272</x> | ||
| 39 | - <y>36</y> | ||
| 40 | - <width>356</width> | ||
| 41 | - <height>355</height> | ||
| 42 | - </rect> | ||
| 43 | - </property> | ||
| 44 | - </widget> | ||
| 45 | - <widget class="WashWarnIcon" name="label"> | ||
| 46 | - <property name="geometry"> | ||
| 47 | - <rect> | ||
| 48 | - <x>800</x> | ||
| 49 | - <y>320</y> | ||
| 50 | - <width>80</width> | ||
| 51 | - <height>84</height> | ||
| 52 | - </rect> | ||
| 53 | - </property> | ||
| 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> | ||
| 75 | - <widget class="DigitalClock" name="label_4"> | ||
| 76 | - <property name="geometry"> | ||
| 77 | - <rect> | ||
| 78 | - <x>20</x> | ||
| 79 | - <y>310</y> | ||
| 80 | - <width>600</width> | ||
| 81 | - <height>100</height> | ||
| 82 | - </rect> | ||
| 83 | - </property> | ||
| 84 | - <property name="alignment"> | ||
| 85 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 86 | - </property> | ||
| 87 | - </widget> | ||
| 88 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 89 | - <property name="geometry"> | ||
| 90 | - <rect> | ||
| 91 | - <x>670</x> | ||
| 92 | - <y>290</y> | ||
| 93 | - <width>111</width> | ||
| 94 | - <height>121</height> | ||
| 95 | - </rect> | ||
| 96 | - </property> | ||
| 97 | - <property name="text"> | ||
| 98 | - <string/> | ||
| 99 | - </property> | ||
| 100 | - </widget> | ||
| 101 | - <widget class="IgnitionIcon" name="label_5"> | ||
| 102 | - <property name="geometry"> | ||
| 103 | - <rect> | ||
| 104 | - <x>662</x> | ||
| 105 | - <y>164</y> | ||
| 106 | - <width>111</width> | ||
| 107 | - <height>121</height> | ||
| 108 | - </rect> | ||
| 109 | - </property> | ||
| 110 | - <property name="text"> | ||
| 111 | - <string/> | ||
| 112 | - </property> | ||
| 113 | - </widget> | ||
| 114 | </widget> | 35 | </widget> |
| 115 | <widget class="QWidget" name="page_2"/> | 36 | <widget class="QWidget" name="page_2"/> |
| 116 | </widget> | 37 | </widget> |
| @@ -1613,41 +1534,11 @@ QPushButton { text-align: center;} | @@ -1613,41 +1534,11 @@ QPushButton { text-align: center;} | ||
| 1613 | </widget> | 1534 | </widget> |
| 1614 | <customwidgets> | 1535 | <customwidgets> |
| 1615 | <customwidget> | 1536 | <customwidget> |
| 1616 | - <class>Clock</class> | 1537 | + <class>StatusArea</class> |
| 1617 | <extends>QWidget</extends> | 1538 | <extends>QWidget</extends> |
| 1618 | - <header>clock.h</header> | 1539 | + <header>statusarea.h</header> |
| 1619 | <container>1</container> | 1540 | <container>1</container> |
| 1620 | </customwidget> | 1541 | </customwidget> |
| 1621 | - <customwidget> | ||
| 1622 | - <class>WashWarnIcon</class> | ||
| 1623 | - <extends>QLabel</extends> | ||
| 1624 | - <header>washwarnicon.h</header> | ||
| 1625 | - </customwidget> | ||
| 1626 | - <customwidget> | ||
| 1627 | - <class>DemoIcon</class> | ||
| 1628 | - <extends>QLabel</extends> | ||
| 1629 | - <header>demoicon.h</header> | ||
| 1630 | - </customwidget> | ||
| 1631 | - <customwidget> | ||
| 1632 | - <class>HalfEnergyIcon</class> | ||
| 1633 | - <extends>QLabel</extends> | ||
| 1634 | - <header>halfenergyicon.h</header> | ||
| 1635 | - </customwidget> | ||
| 1636 | - <customwidget> | ||
| 1637 | - <class>DigitalClock</class> | ||
| 1638 | - <extends>QLabel</extends> | ||
| 1639 | - <header>digitalclock.h</header> | ||
| 1640 | - </customwidget> | ||
| 1641 | - <customwidget> | ||
| 1642 | - <class>IgnitionIcon</class> | ||
| 1643 | - <extends>QLabel</extends> | ||
| 1644 | - <header>ignitionicon.h</header> | ||
| 1645 | - </customwidget> | ||
| 1646 | - <customwidget> | ||
| 1647 | - <class>WaterLevelIcon</class> | ||
| 1648 | - <extends>QLabel</extends> | ||
| 1649 | - <header>waterlevelicon.h</header> | ||
| 1650 | - </customwidget> | ||
| 1651 | </customwidgets> | 1542 | </customwidgets> |
| 1652 | <resources/> | 1543 | <resources/> |
| 1653 | <connections/> | 1544 | <connections/> |
app/gui/oven_control/servicehistorymain.ui
| @@ -27,89 +27,10 @@ | @@ -27,89 +27,10 @@ | ||
| 27 | <height>426</height> | 27 | <height>426</height> |
| 28 | </rect> | 28 | </rect> |
| 29 | </property> | 29 | </property> |
| 30 | - <widget class="QWidget" name="clockContainer"> | 30 | + <widget class="StatusArea" name="clockContainer"> |
| 31 | <property name="styleSheet"> | 31 | <property name="styleSheet"> |
| 32 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 32 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 33 | </property> | 33 | </property> |
| 34 | - <widget class="Clock" name="clock" native="true"> | ||
| 35 | - <property name="geometry"> | ||
| 36 | - <rect> | ||
| 37 | - <x>272</x> | ||
| 38 | - <y>36</y> | ||
| 39 | - <width>356</width> | ||
| 40 | - <height>355</height> | ||
| 41 | - </rect> | ||
| 42 | - </property> | ||
| 43 | - </widget> | ||
| 44 | - <widget class="WashWarnIcon" name="label_2"> | ||
| 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> | ||
| 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> | ||
| 74 | - <widget class="DigitalClock" name="label_5"> | ||
| 75 | - <property name="geometry"> | ||
| 76 | - <rect> | ||
| 77 | - <x>20</x> | ||
| 78 | - <y>310</y> | ||
| 79 | - <width>600</width> | ||
| 80 | - <height>100</height> | ||
| 81 | - </rect> | ||
| 82 | - </property> | ||
| 83 | - <property name="alignment"> | ||
| 84 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 85 | - </property> | ||
| 86 | - </widget> | ||
| 87 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 88 | - <property name="geometry"> | ||
| 89 | - <rect> | ||
| 90 | - <x>670</x> | ||
| 91 | - <y>290</y> | ||
| 92 | - <width>111</width> | ||
| 93 | - <height>121</height> | ||
| 94 | - </rect> | ||
| 95 | - </property> | ||
| 96 | - <property name="text"> | ||
| 97 | - <string/> | ||
| 98 | - </property> | ||
| 99 | - </widget> | ||
| 100 | - <widget class="IgnitionIcon" name="label_7"> | ||
| 101 | - <property name="geometry"> | ||
| 102 | - <rect> | ||
| 103 | - <x>662</x> | ||
| 104 | - <y>164</y> | ||
| 105 | - <width>111</width> | ||
| 106 | - <height>121</height> | ||
| 107 | - </rect> | ||
| 108 | - </property> | ||
| 109 | - <property name="text"> | ||
| 110 | - <string/> | ||
| 111 | - </property> | ||
| 112 | - </widget> | ||
| 113 | </widget> | 34 | </widget> |
| 114 | <widget class="QWidget" name="page_2"/> | 35 | <widget class="QWidget" name="page_2"/> |
| 115 | </widget> | 36 | </widget> |
| @@ -413,41 +334,11 @@ QPushButton { text-align: center;} | @@ -413,41 +334,11 @@ QPushButton { text-align: center;} | ||
| 413 | </widget> | 334 | </widget> |
| 414 | <customwidgets> | 335 | <customwidgets> |
| 415 | <customwidget> | 336 | <customwidget> |
| 416 | - <class>Clock</class> | 337 | + <class>StatusArea</class> |
| 417 | <extends>QWidget</extends> | 338 | <extends>QWidget</extends> |
| 418 | - <header>clock.h</header> | 339 | + <header>statusarea.h</header> |
| 419 | <container>1</container> | 340 | <container>1</container> |
| 420 | </customwidget> | 341 | </customwidget> |
| 421 | - <customwidget> | ||
| 422 | - <class>WashWarnIcon</class> | ||
| 423 | - <extends>QLabel</extends> | ||
| 424 | - <header>washwarnicon.h</header> | ||
| 425 | - </customwidget> | ||
| 426 | - <customwidget> | ||
| 427 | - <class>DemoIcon</class> | ||
| 428 | - <extends>QLabel</extends> | ||
| 429 | - <header>demoicon.h</header> | ||
| 430 | - </customwidget> | ||
| 431 | - <customwidget> | ||
| 432 | - <class>HalfEnergyIcon</class> | ||
| 433 | - <extends>QLabel</extends> | ||
| 434 | - <header>halfenergyicon.h</header> | ||
| 435 | - </customwidget> | ||
| 436 | - <customwidget> | ||
| 437 | - <class>DigitalClock</class> | ||
| 438 | - <extends>QLabel</extends> | ||
| 439 | - <header>digitalclock.h</header> | ||
| 440 | - </customwidget> | ||
| 441 | - <customwidget> | ||
| 442 | - <class>IgnitionIcon</class> | ||
| 443 | - <extends>QLabel</extends> | ||
| 444 | - <header>ignitionicon.h</header> | ||
| 445 | - </customwidget> | ||
| 446 | - <customwidget> | ||
| 447 | - <class>WaterLevelIcon</class> | ||
| 448 | - <extends>QLabel</extends> | ||
| 449 | - <header>waterlevelicon.h</header> | ||
| 450 | - </customwidget> | ||
| 451 | </customwidgets> | 342 | </customwidgets> |
| 452 | <resources> | 343 | <resources> |
| 453 | <include location="resources.qrc"/> | 344 | <include location="resources.qrc"/> |
app/gui/oven_control/statusarea.cpp
app/gui/oven_control/statusarea.h
| @@ -0,0 +1,22 @@ | @@ -0,0 +1,22 @@ | ||
| 1 | +#ifndef STATUSAREA_H | ||
| 2 | +#define STATUSAREA_H | ||
| 3 | + | ||
| 4 | +#include <QWidget> | ||
| 5 | + | ||
| 6 | +namespace Ui { | ||
| 7 | +class StatusArea; | ||
| 8 | +} | ||
| 9 | + | ||
| 10 | +class StatusArea : public QWidget | ||
| 11 | +{ | ||
| 12 | + Q_OBJECT | ||
| 13 | + | ||
| 14 | +public: | ||
| 15 | + explicit StatusArea(QWidget *parent = nullptr); | ||
| 16 | + ~StatusArea(); | ||
| 17 | + | ||
| 18 | +private: | ||
| 19 | + Ui::StatusArea *ui; | ||
| 20 | +}; | ||
| 21 | + | ||
| 22 | +#endif // STATUSAREA_H |
app/gui/oven_control/statusarea.ui
| @@ -0,0 +1,155 @@ | @@ -0,0 +1,155 @@ | ||
| 1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | +<ui version="4.0"> | ||
| 3 | + <class>StatusArea</class> | ||
| 4 | + <widget class="QWidget" name="StatusArea"> | ||
| 5 | + <property name="geometry"> | ||
| 6 | + <rect> | ||
| 7 | + <x>0</x> | ||
| 8 | + <y>0</y> | ||
| 9 | + <width>900</width> | ||
| 10 | + <height>426</height> | ||
| 11 | + </rect> | ||
| 12 | + </property> | ||
| 13 | + <property name="windowTitle"> | ||
| 14 | + <string>Form</string> | ||
| 15 | + </property> | ||
| 16 | + <property name="styleSheet"> | ||
| 17 | + <string notr="true">#StatusArea { background-image: url(:/images/clock/background.png); }</string> | ||
| 18 | + </property> | ||
| 19 | + <widget class="IgnitionIcon" name="label_5"> | ||
| 20 | + <property name="geometry"> | ||
| 21 | + <rect> | ||
| 22 | + <x>662</x> | ||
| 23 | + <y>164</y> | ||
| 24 | + <width>111</width> | ||
| 25 | + <height>121</height> | ||
| 26 | + </rect> | ||
| 27 | + </property> | ||
| 28 | + <property name="text"> | ||
| 29 | + <string/> | ||
| 30 | + </property> | ||
| 31 | + </widget> | ||
| 32 | + <widget class="Clock" name="clock" native="true"> | ||
| 33 | + <property name="geometry"> | ||
| 34 | + <rect> | ||
| 35 | + <x>272</x> | ||
| 36 | + <y>36</y> | ||
| 37 | + <width>356</width> | ||
| 38 | + <height>355</height> | ||
| 39 | + </rect> | ||
| 40 | + </property> | ||
| 41 | + </widget> | ||
| 42 | + <widget class="WashWarnIcon" name="label"> | ||
| 43 | + <property name="geometry"> | ||
| 44 | + <rect> | ||
| 45 | + <x>800</x> | ||
| 46 | + <y>320</y> | ||
| 47 | + <width>80</width> | ||
| 48 | + <height>84</height> | ||
| 49 | + </rect> | ||
| 50 | + </property> | ||
| 51 | + </widget> | ||
| 52 | + <widget class="HalfEnergyIcon" name="label_3"> | ||
| 53 | + <property name="geometry"> | ||
| 54 | + <rect> | ||
| 55 | + <x>780</x> | ||
| 56 | + <y>160</y> | ||
| 57 | + <width>108</width> | ||
| 58 | + <height>67</height> | ||
| 59 | + </rect> | ||
| 60 | + </property> | ||
| 61 | + </widget> | ||
| 62 | + <widget class="DigitalClock" name="label_4"> | ||
| 63 | + <property name="geometry"> | ||
| 64 | + <rect> | ||
| 65 | + <x>20</x> | ||
| 66 | + <y>310</y> | ||
| 67 | + <width>600</width> | ||
| 68 | + <height>100</height> | ||
| 69 | + </rect> | ||
| 70 | + </property> | ||
| 71 | + <property name="alignment"> | ||
| 72 | + <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 73 | + </property> | ||
| 74 | + </widget> | ||
| 75 | + <widget class="DemoIcon" name="label_2"> | ||
| 76 | + <property name="geometry"> | ||
| 77 | + <rect> | ||
| 78 | + <x>780</x> | ||
| 79 | + <y>230</y> | ||
| 80 | + <width>101</width> | ||
| 81 | + <height>90</height> | ||
| 82 | + </rect> | ||
| 83 | + </property> | ||
| 84 | + </widget> | ||
| 85 | + <widget class="WaterLevelIcon" name="label_6"> | ||
| 86 | + <property name="geometry"> | ||
| 87 | + <rect> | ||
| 88 | + <x>670</x> | ||
| 89 | + <y>290</y> | ||
| 90 | + <width>111</width> | ||
| 91 | + <height>121</height> | ||
| 92 | + </rect> | ||
| 93 | + </property> | ||
| 94 | + <property name="text"> | ||
| 95 | + <string/> | ||
| 96 | + </property> | ||
| 97 | + </widget> | ||
| 98 | + <widget class="CommIcon" name="commIcon" native="true"> | ||
| 99 | + <property name="geometry"> | ||
| 100 | + <rect> | ||
| 101 | + <x>20</x> | ||
| 102 | + <y>20</y> | ||
| 103 | + <width>20</width> | ||
| 104 | + <height>20</height> | ||
| 105 | + </rect> | ||
| 106 | + </property> | ||
| 107 | + </widget> | ||
| 108 | + </widget> | ||
| 109 | + <customwidgets> | ||
| 110 | + <customwidget> | ||
| 111 | + <class>Clock</class> | ||
| 112 | + <extends>QWidget</extends> | ||
| 113 | + <header>clock.h</header> | ||
| 114 | + <container>1</container> | ||
| 115 | + </customwidget> | ||
| 116 | + <customwidget> | ||
| 117 | + <class>WashWarnIcon</class> | ||
| 118 | + <extends>QLabel</extends> | ||
| 119 | + <header>washwarnicon.h</header> | ||
| 120 | + </customwidget> | ||
| 121 | + <customwidget> | ||
| 122 | + <class>DemoIcon</class> | ||
| 123 | + <extends>QLabel</extends> | ||
| 124 | + <header>demoicon.h</header> | ||
| 125 | + </customwidget> | ||
| 126 | + <customwidget> | ||
| 127 | + <class>HalfEnergyIcon</class> | ||
| 128 | + <extends>QLabel</extends> | ||
| 129 | + <header>halfenergyicon.h</header> | ||
| 130 | + </customwidget> | ||
| 131 | + <customwidget> | ||
| 132 | + <class>DigitalClock</class> | ||
| 133 | + <extends>QLabel</extends> | ||
| 134 | + <header>digitalclock.h</header> | ||
| 135 | + </customwidget> | ||
| 136 | + <customwidget> | ||
| 137 | + <class>IgnitionIcon</class> | ||
| 138 | + <extends>QLabel</extends> | ||
| 139 | + <header>ignitionicon.h</header> | ||
| 140 | + </customwidget> | ||
| 141 | + <customwidget> | ||
| 142 | + <class>WaterLevelIcon</class> | ||
| 143 | + <extends>QLabel</extends> | ||
| 144 | + <header>waterlevelicon.h</header> | ||
| 145 | + </customwidget> | ||
| 146 | + <customwidget> | ||
| 147 | + <class>CommIcon</class> | ||
| 148 | + <extends>QWidget</extends> | ||
| 149 | + <header>commicon.h</header> | ||
| 150 | + <container>1</container> | ||
| 151 | + </customwidget> | ||
| 152 | + </customwidgets> | ||
| 153 | + <resources/> | ||
| 154 | + <connections/> | ||
| 155 | +</ui> |
app/gui/oven_control/valvetestwindow.ui
| @@ -24,89 +24,10 @@ | @@ -24,89 +24,10 @@ | ||
| 24 | <height>426</height> | 24 | <height>426</height> |
| 25 | </rect> | 25 | </rect> |
| 26 | </property> | 26 | </property> |
| 27 | - <widget class="QWidget" name="clockContainer"> | 27 | + <widget class="StatusArea" name="clockContainer"> |
| 28 | <property name="styleSheet"> | 28 | <property name="styleSheet"> |
| 29 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 29 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 30 | </property> | 30 | </property> |
| 31 | - <widget class="Clock" name="clock" native="true"> | ||
| 32 | - <property name="geometry"> | ||
| 33 | - <rect> | ||
| 34 | - <x>272</x> | ||
| 35 | - <y>36</y> | ||
| 36 | - <width>356</width> | ||
| 37 | - <height>355</height> | ||
| 38 | - </rect> | ||
| 39 | - </property> | ||
| 40 | - </widget> | ||
| 41 | - <widget class="WashWarnIcon" name="label_16"> | ||
| 42 | - <property name="geometry"> | ||
| 43 | - <rect> | ||
| 44 | - <x>800</x> | ||
| 45 | - <y>320</y> | ||
| 46 | - <width>80</width> | ||
| 47 | - <height>84</height> | ||
| 48 | - </rect> | ||
| 49 | - </property> | ||
| 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> | ||
| 71 | - <widget class="DigitalClock" name="label_19"> | ||
| 72 | - <property name="geometry"> | ||
| 73 | - <rect> | ||
| 74 | - <x>20</x> | ||
| 75 | - <y>310</y> | ||
| 76 | - <width>600</width> | ||
| 77 | - <height>100</height> | ||
| 78 | - </rect> | ||
| 79 | - </property> | ||
| 80 | - <property name="alignment"> | ||
| 81 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 82 | - </property> | ||
| 83 | - </widget> | ||
| 84 | - <widget class="WaterLevelIcon" name="label_21"> | ||
| 85 | - <property name="geometry"> | ||
| 86 | - <rect> | ||
| 87 | - <x>670</x> | ||
| 88 | - <y>290</y> | ||
| 89 | - <width>111</width> | ||
| 90 | - <height>121</height> | ||
| 91 | - </rect> | ||
| 92 | - </property> | ||
| 93 | - <property name="text"> | ||
| 94 | - <string/> | ||
| 95 | - </property> | ||
| 96 | - </widget> | ||
| 97 | - <widget class="IgnitionIcon" name="label_22"> | ||
| 98 | - <property name="geometry"> | ||
| 99 | - <rect> | ||
| 100 | - <x>662</x> | ||
| 101 | - <y>164</y> | ||
| 102 | - <width>111</width> | ||
| 103 | - <height>121</height> | ||
| 104 | - </rect> | ||
| 105 | - </property> | ||
| 106 | - <property name="text"> | ||
| 107 | - <string/> | ||
| 108 | - </property> | ||
| 109 | - </widget> | ||
| 110 | </widget> | 31 | </widget> |
| 111 | <widget class="QWidget" name="page_2"/> | 32 | <widget class="QWidget" name="page_2"/> |
| 112 | </widget> | 33 | </widget> |
| @@ -1311,41 +1232,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o | @@ -1311,41 +1232,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o | ||
| 1311 | </widget> | 1232 | </widget> |
| 1312 | <customwidgets> | 1233 | <customwidgets> |
| 1313 | <customwidget> | 1234 | <customwidget> |
| 1314 | - <class>Clock</class> | 1235 | + <class>StatusArea</class> |
| 1315 | <extends>QWidget</extends> | 1236 | <extends>QWidget</extends> |
| 1316 | - <header>clock.h</header> | 1237 | + <header>statusarea.h</header> |
| 1317 | <container>1</container> | 1238 | <container>1</container> |
| 1318 | </customwidget> | 1239 | </customwidget> |
| 1319 | - <customwidget> | ||
| 1320 | - <class>WashWarnIcon</class> | ||
| 1321 | - <extends>QLabel</extends> | ||
| 1322 | - <header>washwarnicon.h</header> | ||
| 1323 | - </customwidget> | ||
| 1324 | - <customwidget> | ||
| 1325 | - <class>DemoIcon</class> | ||
| 1326 | - <extends>QLabel</extends> | ||
| 1327 | - <header>demoicon.h</header> | ||
| 1328 | - </customwidget> | ||
| 1329 | - <customwidget> | ||
| 1330 | - <class>HalfEnergyIcon</class> | ||
| 1331 | - <extends>QLabel</extends> | ||
| 1332 | - <header>halfenergyicon.h</header> | ||
| 1333 | - </customwidget> | ||
| 1334 | - <customwidget> | ||
| 1335 | - <class>DigitalClock</class> | ||
| 1336 | - <extends>QLabel</extends> | ||
| 1337 | - <header>digitalclock.h</header> | ||
| 1338 | - </customwidget> | ||
| 1339 | - <customwidget> | ||
| 1340 | - <class>IgnitionIcon</class> | ||
| 1341 | - <extends>QLabel</extends> | ||
| 1342 | - <header>ignitionicon.h</header> | ||
| 1343 | - </customwidget> | ||
| 1344 | - <customwidget> | ||
| 1345 | - <class>WaterLevelIcon</class> | ||
| 1346 | - <extends>QLabel</extends> | ||
| 1347 | - <header>waterlevelicon.h</header> | ||
| 1348 | - </customwidget> | ||
| 1349 | </customwidgets> | 1240 | </customwidgets> |
| 1350 | <resources> | 1241 | <resources> |
| 1351 | <include location="resources.qrc"/> | 1242 | <include location="resources.qrc"/> |
app/gui/oven_control/washtestwindow.ui
| @@ -24,89 +24,10 @@ | @@ -24,89 +24,10 @@ | ||
| 24 | <height>426</height> | 24 | <height>426</height> |
| 25 | </rect> | 25 | </rect> |
| 26 | </property> | 26 | </property> |
| 27 | - <widget class="QWidget" name="clockContainer"> | 27 | + <widget class="StatusArea" name="clockContainer"> |
| 28 | <property name="styleSheet"> | 28 | <property name="styleSheet"> |
| 29 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 29 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 30 | </property> | 30 | </property> |
| 31 | - <widget class="Clock" name="clock" native="true"> | ||
| 32 | - <property name="geometry"> | ||
| 33 | - <rect> | ||
| 34 | - <x>272</x> | ||
| 35 | - <y>36</y> | ||
| 36 | - <width>356</width> | ||
| 37 | - <height>355</height> | ||
| 38 | - </rect> | ||
| 39 | - </property> | ||
| 40 | - </widget> | ||
| 41 | - <widget class="WashWarnIcon" name="label_14"> | ||
| 42 | - <property name="geometry"> | ||
| 43 | - <rect> | ||
| 44 | - <x>800</x> | ||
| 45 | - <y>320</y> | ||
| 46 | - <width>80</width> | ||
| 47 | - <height>84</height> | ||
| 48 | - </rect> | ||
| 49 | - </property> | ||
| 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> | ||
| 71 | - <widget class="DigitalClock" name="label_17"> | ||
| 72 | - <property name="geometry"> | ||
| 73 | - <rect> | ||
| 74 | - <x>20</x> | ||
| 75 | - <y>310</y> | ||
| 76 | - <width>600</width> | ||
| 77 | - <height>100</height> | ||
| 78 | - </rect> | ||
| 79 | - </property> | ||
| 80 | - <property name="alignment"> | ||
| 81 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 82 | - </property> | ||
| 83 | - </widget> | ||
| 84 | - <widget class="WaterLevelIcon" name="label_18"> | ||
| 85 | - <property name="geometry"> | ||
| 86 | - <rect> | ||
| 87 | - <x>670</x> | ||
| 88 | - <y>290</y> | ||
| 89 | - <width>111</width> | ||
| 90 | - <height>121</height> | ||
| 91 | - </rect> | ||
| 92 | - </property> | ||
| 93 | - <property name="text"> | ||
| 94 | - <string/> | ||
| 95 | - </property> | ||
| 96 | - </widget> | ||
| 97 | - <widget class="IgnitionIcon" name="label_19"> | ||
| 98 | - <property name="geometry"> | ||
| 99 | - <rect> | ||
| 100 | - <x>662</x> | ||
| 101 | - <y>164</y> | ||
| 102 | - <width>111</width> | ||
| 103 | - <height>121</height> | ||
| 104 | - </rect> | ||
| 105 | - </property> | ||
| 106 | - <property name="text"> | ||
| 107 | - <string/> | ||
| 108 | - </property> | ||
| 109 | - </widget> | ||
| 110 | </widget> | 31 | </widget> |
| 111 | <widget class="QWidget" name="page_2"/> | 32 | <widget class="QWidget" name="page_2"/> |
| 112 | </widget> | 33 | </widget> |
| @@ -710,41 +631,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o | @@ -710,41 +631,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o | ||
| 710 | </widget> | 631 | </widget> |
| 711 | <customwidgets> | 632 | <customwidgets> |
| 712 | <customwidget> | 633 | <customwidget> |
| 713 | - <class>Clock</class> | 634 | + <class>StatusArea</class> |
| 714 | <extends>QWidget</extends> | 635 | <extends>QWidget</extends> |
| 715 | - <header>clock.h</header> | 636 | + <header>statusarea.h</header> |
| 716 | <container>1</container> | 637 | <container>1</container> |
| 717 | </customwidget> | 638 | </customwidget> |
| 718 | - <customwidget> | ||
| 719 | - <class>WashWarnIcon</class> | ||
| 720 | - <extends>QLabel</extends> | ||
| 721 | - <header>washwarnicon.h</header> | ||
| 722 | - </customwidget> | ||
| 723 | - <customwidget> | ||
| 724 | - <class>DemoIcon</class> | ||
| 725 | - <extends>QLabel</extends> | ||
| 726 | - <header>demoicon.h</header> | ||
| 727 | - </customwidget> | ||
| 728 | - <customwidget> | ||
| 729 | - <class>HalfEnergyIcon</class> | ||
| 730 | - <extends>QLabel</extends> | ||
| 731 | - <header>halfenergyicon.h</header> | ||
| 732 | - </customwidget> | ||
| 733 | - <customwidget> | ||
| 734 | - <class>DigitalClock</class> | ||
| 735 | - <extends>QLabel</extends> | ||
| 736 | - <header>digitalclock.h</header> | ||
| 737 | - </customwidget> | ||
| 738 | - <customwidget> | ||
| 739 | - <class>IgnitionIcon</class> | ||
| 740 | - <extends>QLabel</extends> | ||
| 741 | - <header>ignitionicon.h</header> | ||
| 742 | - </customwidget> | ||
| 743 | - <customwidget> | ||
| 744 | - <class>WaterLevelIcon</class> | ||
| 745 | - <extends>QLabel</extends> | ||
| 746 | - <header>waterlevelicon.h</header> | ||
| 747 | - </customwidget> | ||
| 748 | </customwidgets> | 639 | </customwidgets> |
| 749 | <resources> | 640 | <resources> |
| 750 | <include location="resources.qrc"/> | 641 | <include location="resources.qrc"/> |
app/gui/oven_control/washwindow.ui
| @@ -67,89 +67,10 @@ border: none; | @@ -67,89 +67,10 @@ border: none; | ||
| 67 | <height>426</height> | 67 | <height>426</height> |
| 68 | </rect> | 68 | </rect> |
| 69 | </property> | 69 | </property> |
| 70 | - <widget class="QWidget" name="clockContainer"> | 70 | + <widget class="StatusArea" name="clockContainer"> |
| 71 | <property name="styleSheet"> | 71 | <property name="styleSheet"> |
| 72 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | 72 | <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> |
| 73 | </property> | 73 | </property> |
| 74 | - <widget class="Clock" name="clock" native="true"> | ||
| 75 | - <property name="geometry"> | ||
| 76 | - <rect> | ||
| 77 | - <x>272</x> | ||
| 78 | - <y>36</y> | ||
| 79 | - <width>356</width> | ||
| 80 | - <height>355</height> | ||
| 81 | - </rect> | ||
| 82 | - </property> | ||
| 83 | - </widget> | ||
| 84 | - <widget class="WashWarnIcon" name="label_2"> | ||
| 85 | - <property name="geometry"> | ||
| 86 | - <rect> | ||
| 87 | - <x>800</x> | ||
| 88 | - <y>320</y> | ||
| 89 | - <width>80</width> | ||
| 90 | - <height>84</height> | ||
| 91 | - </rect> | ||
| 92 | - </property> | ||
| 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> | ||
| 114 | - <widget class="DigitalClock" name="label_5"> | ||
| 115 | - <property name="geometry"> | ||
| 116 | - <rect> | ||
| 117 | - <x>20</x> | ||
| 118 | - <y>310</y> | ||
| 119 | - <width>600</width> | ||
| 120 | - <height>100</height> | ||
| 121 | - </rect> | ||
| 122 | - </property> | ||
| 123 | - <property name="alignment"> | ||
| 124 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | ||
| 125 | - </property> | ||
| 126 | - </widget> | ||
| 127 | - <widget class="WaterLevelIcon" name="label_6"> | ||
| 128 | - <property name="geometry"> | ||
| 129 | - <rect> | ||
| 130 | - <x>670</x> | ||
| 131 | - <y>290</y> | ||
| 132 | - <width>111</width> | ||
| 133 | - <height>121</height> | ||
| 134 | - </rect> | ||
| 135 | - </property> | ||
| 136 | - <property name="text"> | ||
| 137 | - <string/> | ||
| 138 | - </property> | ||
| 139 | - </widget> | ||
| 140 | - <widget class="IgnitionIcon" name="label_7"> | ||
| 141 | - <property name="geometry"> | ||
| 142 | - <rect> | ||
| 143 | - <x>662</x> | ||
| 144 | - <y>164</y> | ||
| 145 | - <width>111</width> | ||
| 146 | - <height>121</height> | ||
| 147 | - </rect> | ||
| 148 | - </property> | ||
| 149 | - <property name="text"> | ||
| 150 | - <string/> | ||
| 151 | - </property> | ||
| 152 | - </widget> | ||
| 153 | </widget> | 74 | </widget> |
| 154 | <widget class="QWidget" name="progressContainer"> | 75 | <widget class="QWidget" name="progressContainer"> |
| 155 | <property name="styleSheet"> | 76 | <property name="styleSheet"> |
| @@ -1229,42 +1150,12 @@ QPushButton:pressed { image: url(:/images/slider_icon/clean_ov.png); }</string> | @@ -1229,42 +1150,12 @@ QPushButton:pressed { image: url(:/images/slider_icon/clean_ov.png); }</string> | ||
| 1229 | </widget> | 1150 | </widget> |
| 1230 | <customwidgets> | 1151 | <customwidgets> |
| 1231 | <customwidget> | 1152 | <customwidget> |
| 1232 | - <class>Clock</class> | 1153 | + <class>StatusArea</class> |
| 1233 | <extends>QWidget</extends> | 1154 | <extends>QWidget</extends> |
| 1234 | - <header>clock.h</header> | 1155 | + <header>statusarea.h</header> |
| 1235 | <container>1</container> | 1156 | <container>1</container> |
| 1236 | </customwidget> | 1157 | </customwidget> |
| 1237 | <customwidget> | 1158 | <customwidget> |
| 1238 | - <class>WashWarnIcon</class> | ||
| 1239 | - <extends>QLabel</extends> | ||
| 1240 | - <header>washwarnicon.h</header> | ||
| 1241 | - </customwidget> | ||
| 1242 | - <customwidget> | ||
| 1243 | - <class>DemoIcon</class> | ||
| 1244 | - <extends>QLabel</extends> | ||
| 1245 | - <header>demoicon.h</header> | ||
| 1246 | - </customwidget> | ||
| 1247 | - <customwidget> | ||
| 1248 | - <class>HalfEnergyIcon</class> | ||
| 1249 | - <extends>QLabel</extends> | ||
| 1250 | - <header>halfenergyicon.h</header> | ||
| 1251 | - </customwidget> | ||
| 1252 | - <customwidget> | ||
| 1253 | - <class>DigitalClock</class> | ||
| 1254 | - <extends>QLabel</extends> | ||
| 1255 | - <header>digitalclock.h</header> | ||
| 1256 | - </customwidget> | ||
| 1257 | - <customwidget> | ||
| 1258 | - <class>IgnitionIcon</class> | ||
| 1259 | - <extends>QLabel</extends> | ||
| 1260 | - <header>ignitionicon.h</header> | ||
| 1261 | - </customwidget> | ||
| 1262 | - <customwidget> | ||
| 1263 | - <class>WaterLevelIcon</class> | ||
| 1264 | - <extends>QLabel</extends> | ||
| 1265 | - <header>waterlevelicon.h</header> | ||
| 1266 | - </customwidget> | ||
| 1267 | - <customwidget> | ||
| 1268 | <class>AnimatedImageBox</class> | 1159 | <class>AnimatedImageBox</class> |
| 1269 | <extends>QLabel</extends> | 1160 | <extends>QLabel</extends> |
| 1270 | <header>animatedimagebox.h</header> | 1161 | <header>animatedimagebox.h</header> |