에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit d61c943410af89182708e1537a1bc719bb95a96e

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

디지털 시계 추가

Showing 40 changed files with 734 additions and 16 deletions   Show diff stats
app/gui/oven_control/adjustmentwindow.ui
  Diff comments   View file @d61c943
@@ -71,6 +71,19 @@ @@ -71,6 +71,19 @@
71 </rect> 71 </rect>
72 </property> 72 </property>
73 </widget> 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>300</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>
74 </widget> 87 </widget>
75 <widget class="QWidget" name="page_2"/> 88 <widget class="QWidget" name="page_2"/>
76 </widget> 89 </widget>
@@ -293,6 +306,11 @@ QPushButton { @@ -293,6 +306,11 @@ QPushButton {
293 <extends>QLabel</extends> 306 <extends>QLabel</extends>
294 <header>halfenergyicon.h</header> 307 <header>halfenergyicon.h</header>
295 </customwidget> 308 </customwidget>
  309 + <customwidget>
  310 + <class>DigitalClock</class>
  311 + <extends>QLabel</extends>
  312 + <header>digitalclock.h</header>
  313 + </customwidget>
296 </customwidgets> 314 </customwidgets>
297 <resources> 315 <resources>
298 <include location="resources.qrc"/> 316 <include location="resources.qrc"/>
app/gui/oven_control/autocookcheckconfigwindow.ui
  Diff comments   View file @d61c943
@@ -358,6 +358,19 @@ border: none; @@ -358,6 +358,19 @@ border: none;
358 </rect> 358 </rect>
359 </property> 359 </property>
360 </widget> 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>300</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>
361 </widget> 374 </widget>
362 <widget class="QWidget" name="page_2"/> 375 <widget class="QWidget" name="page_2"/>
363 </widget> 376 </widget>
@@ -1345,6 +1358,11 @@ border-image: url(:/images/button/288_ov.png); @@ -1345,6 +1358,11 @@ border-image: url(:/images/button/288_ov.png);
1345 <header>halfenergyicon.h</header> 1358 <header>halfenergyicon.h</header>
1346 </customwidget> 1359 </customwidget>
1347 <customwidget> 1360 <customwidget>
  1361 + <class>DigitalClock</class>
  1362 + <extends>QLabel</extends>
  1363 + <header>digitalclock.h</header>
  1364 + </customwidget>
  1365 + <customwidget>
1348 <class>Slider</class> 1366 <class>Slider</class>
1349 <extends>QWidget</extends> 1367 <extends>QWidget</extends>
1350 <header>slider.h</header> 1368 <header>slider.h</header>
app/gui/oven_control/autocookcheckwindow.ui
  Diff comments   View file @d61c943
@@ -163,6 +163,19 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/auto_bu @@ -163,6 +163,19 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/auto_bu
163 </rect> 163 </rect>
164 </property> 164 </property>
165 </widget> 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>300</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>
166 </widget> 179 </widget>
167 <widget class="QWidget" name="page_2"/> 180 <widget class="QWidget" name="page_2"/>
168 </widget> 181 </widget>
@@ -810,6 +823,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/b @@ -810,6 +823,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/b
810 <header>animatedimagebox.h</header> 823 <header>animatedimagebox.h</header>
811 </customwidget> 824 </customwidget>
812 <customwidget> 825 <customwidget>
  826 + <class>DigitalClock</class>
  827 + <extends>QLabel</extends>
  828 + <header>digitalclock.h</header>
  829 + </customwidget>
  830 + <customwidget>
813 <class>HumidityCircularGauge</class> 831 <class>HumidityCircularGauge</class>
814 <extends>QWidget</extends> 832 <extends>QWidget</extends>
815 <header>humiditycirculargauge.h</header> 833 <header>humiditycirculargauge.h</header>
app/gui/oven_control/autocookconfigwindow.ui
  Diff comments   View file @d61c943
@@ -115,6 +115,19 @@ border: none; @@ -115,6 +115,19 @@ border: none;
115 </rect> 115 </rect>
116 </property> 116 </property>
117 </widget> 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>300</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>
118 </widget> 131 </widget>
119 <widget class="QWidget" name="page_2"/> 132 <widget class="QWidget" name="page_2"/>
120 </widget> 133 </widget>
@@ -1447,6 +1460,11 @@ border-image: url(:/images/button/152_ov.png); @@ -1447,6 +1460,11 @@ border-image: url(:/images/button/152_ov.png);
1447 <header>halfenergyicon.h</header> 1460 <header>halfenergyicon.h</header>
1448 </customwidget> 1461 </customwidget>
1449 <customwidget> 1462 <customwidget>
  1463 + <class>DigitalClock</class>
  1464 + <extends>QLabel</extends>
  1465 + <header>digitalclock.h</header>
  1466 + </customwidget>
  1467 + <customwidget>
1450 <class>Slider</class> 1468 <class>Slider</class>
1451 <extends>QWidget</extends> 1469 <extends>QWidget</extends>
1452 <header>slider.h</header> 1470 <header>slider.h</header>
app/gui/oven_control/autocookselectionwindow.ui
  Diff comments   View file @d61c943
@@ -68,6 +68,19 @@ @@ -68,6 +68,19 @@
68 </rect> 68 </rect>
69 </property> 69 </property>
70 </widget> 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>300</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>
71 </widget> 84 </widget>
72 <widget class="QWidget" name="page_2"/> 85 <widget class="QWidget" name="page_2"/>
73 </widget> 86 </widget>
@@ -216,6 +229,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h @@ -216,6 +229,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h
216 <extends>QLabel</extends> 229 <extends>QLabel</extends>
217 <header>halfenergyicon.h</header> 230 <header>halfenergyicon.h</header>
218 </customwidget> 231 </customwidget>
  232 + <customwidget>
  233 + <class>DigitalClock</class>
  234 + <extends>QLabel</extends>
  235 + <header>digitalclock.h</header>
  236 + </customwidget>
219 </customwidgets> 237 </customwidgets>
220 <resources/> 238 <resources/>
221 <connections/> 239 <connections/>
app/gui/oven_control/autocookwindow.ui
  Diff comments   View file @d61c943
@@ -74,6 +74,19 @@ border: none; @@ -74,6 +74,19 @@ border: none;
74 </rect> 74 </rect>
75 </property> 75 </property>
76 </widget> 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>300</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>
77 </widget> 90 </widget>
78 <widget class="QWidget" name="page_2"/> 91 <widget class="QWidget" name="page_2"/>
79 </widget> 92 </widget>
@@ -1410,6 +1423,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/152_o @@ -1410,6 +1423,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/152_o
1410 <header>animatedimagebox.h</header> 1423 <header>animatedimagebox.h</header>
1411 </customwidget> 1424 </customwidget>
1412 <customwidget> 1425 <customwidget>
  1426 + <class>DigitalClock</class>
  1427 + <extends>QLabel</extends>
  1428 + <header>digitalclock.h</header>
  1429 + </customwidget>
  1430 + <customwidget>
1413 <class>HumidityCircularGauge</class> 1431 <class>HumidityCircularGauge</class>
1414 <extends>QWidget</extends> 1432 <extends>QWidget</extends>
1415 <header>humiditycirculargauge.h</header> 1433 <header>humiditycirculargauge.h</header>
app/gui/oven_control/basicsettingwindow.ui
  Diff comments   View file @d61c943
@@ -72,6 +72,19 @@ @@ -72,6 +72,19 @@
72 </rect> 72 </rect>
73 </property> 73 </property>
74 </widget> 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>300</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>
75 </widget> 88 </widget>
76 <widget class="QWidget" name="page_2"/> 89 <widget class="QWidget" name="page_2"/>
77 </widget> 90 </widget>
@@ -446,6 +459,11 @@ QPushButton { text-align: left;} @@ -446,6 +459,11 @@ QPushButton { text-align: left;}
446 <extends>QLabel</extends> 459 <extends>QLabel</extends>
447 <header>halfenergyicon.h</header> 460 <header>halfenergyicon.h</header>
448 </customwidget> 461 </customwidget>
  462 + <customwidget>
  463 + <class>DigitalClock</class>
  464 + <extends>QLabel</extends>
  465 + <header>digitalclock.h</header>
  466 + </customwidget>
449 </customwidgets> 467 </customwidgets>
450 <resources/> 468 <resources/>
451 <connections/> 469 <connections/>
app/gui/oven_control/burnertestwindow.ui
  Diff comments   View file @d61c943
@@ -68,6 +68,19 @@ @@ -68,6 +68,19 @@
68 </rect> 68 </rect>
69 </property> 69 </property>
70 </widget> 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>300</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>
71 </widget> 84 </widget>
72 <widget class="QWidget" name="page_2"/> 85 <widget class="QWidget" name="page_2"/>
73 </widget> 86 </widget>
@@ -2134,6 +2147,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -2134,6 +2147,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
2134 <extends>QLabel</extends> 2147 <extends>QLabel</extends>
2135 <header>halfenergyicon.h</header> 2148 <header>halfenergyicon.h</header>
2136 </customwidget> 2149 </customwidget>
  2150 + <customwidget>
  2151 + <class>DigitalClock</class>
  2152 + <extends>QLabel</extends>
  2153 + <header>digitalclock.h</header>
  2154 + </customwidget>
2137 </customwidgets> 2155 </customwidgets>
2138 <resources> 2156 <resources>
2139 <include location="resources.qrc"/> 2157 <include location="resources.qrc"/>
app/gui/oven_control/componenttestwindow.ui
  Diff comments   View file @d61c943
@@ -68,6 +68,19 @@ @@ -68,6 +68,19 @@
68 </rect> 68 </rect>
69 </property> 69 </property>
70 </widget> 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>300</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>
71 </widget> 84 </widget>
72 <widget class="QWidget" name="page_2"/> 85 <widget class="QWidget" name="page_2"/>
73 </widget> 86 </widget>
@@ -541,6 +554,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -541,6 +554,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
541 <extends>QLabel</extends> 554 <extends>QLabel</extends>
542 <header>halfenergyicon.h</header> 555 <header>halfenergyicon.h</header>
543 </customwidget> 556 </customwidget>
  557 + <customwidget>
  558 + <class>DigitalClock</class>
  559 + <extends>QLabel</extends>
  560 + <header>digitalclock.h</header>
  561 + </customwidget>
544 </customwidgets> 562 </customwidgets>
545 <resources> 563 <resources>
546 <include location="resources.qrc"/> 564 <include location="resources.qrc"/>
app/gui/oven_control/configwindow.ui
  Diff comments   View file @d61c943
@@ -107,6 +107,19 @@ background: none; @@ -107,6 +107,19 @@ background: none;
107 </rect> 107 </rect>
108 </property> 108 </property>
109 </widget> 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>300</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>
110 </widget> 123 </widget>
111 <widget class="QWidget" name="page_2"/> 124 <widget class="QWidget" name="page_2"/>
112 </widget> 125 </widget>
@@ -590,6 +603,11 @@ QPushButton:pressed , QPushButton:focus { border-image: url(:/images/bottom_bar/ @@ -590,6 +603,11 @@ QPushButton:pressed , QPushButton:focus { border-image: url(:/images/bottom_bar/
590 <extends>QLabel</extends> 603 <extends>QLabel</extends>
591 <header>halfenergyicon.h</header> 604 <header>halfenergyicon.h</header>
592 </customwidget> 605 </customwidget>
  606 + <customwidget>
  607 + <class>DigitalClock</class>
  608 + <extends>QLabel</extends>
  609 + <header>digitalclock.h</header>
  610 + </customwidget>
593 </customwidgets> 611 </customwidgets>
594 <tabstops> 612 <tabstops>
595 <tabstop>pushButton</tabstop> 613 <tabstop>pushButton</tabstop>
app/gui/oven_control/digitalclock.cpp
  Diff comments   View file @d61c943
@@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@
  1 +#include "digitalclock.h"
  2 +
  3 +#include <QTimer>
  4 +#include <QDateTime>
  5 +
  6 +DigitalClock::DigitalClock(QWidget *parent) : QLabel(parent)
  7 +{
  8 + QTimer *timer = new QTimer(this);
  9 + connect(timer, SIGNAL(timeout()), SLOT(updateView()));
  10 +
  11 + updateView();
  12 +
  13 + timer->start(100);
  14 +}
  15 +
  16 +void DigitalClock::updateView()
  17 +{
  18 + static const QString format("\
  19 +<style>\
  20 +span.time { color: white; font-size: 15pt; font-weight: bold; }\
  21 +span.date { color: #C3C3C3; font-size: 12pt; }\
  22 +</style>\
  23 +<span class=\"time\">%1:%2</span><br><span class=\"date\">%3, %4 %5</span>");
  24 +
  25 + QDateTime dt = QDateTime::currentDateTime();
  26 + setText(format
  27 + .arg(dt.time().hour(), 2, 10, QLatin1Char('0'))
  28 + .arg(dt.time().minute(), 2, 10, QLatin1Char('0'))
  29 + .arg(QDate::longDayName(dt.date().dayOfWeek()))
  30 + .arg(QDate::longMonthName(dt.date().month()))
  31 + .arg(dt.date().day()));
  32 +}
app/gui/oven_control/digitalclock.h
  Diff comments   View file @d61c943
@@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@
  1 +#ifndef DIGITALCLOCK_H
  2 +#define DIGITALCLOCK_H
  3 +
  4 +#include <QLabel>
  5 +
  6 +class DigitalClock : public QLabel
  7 +{
  8 + Q_OBJECT
  9 +public:
  10 + explicit DigitalClock(QWidget *parent = 0);
  11 +
  12 +signals:
  13 +
  14 +private slots:
  15 + void updateView();
  16 +};
  17 +
  18 +#endif // DIGITALCLOCK_H
app/gui/oven_control/electricmodelsettingwindow.ui
  Diff comments   View file @d61c943
@@ -502,6 +502,19 @@ QPushButton:pressed, QPushButton:checked, QPushButton:focus { border-image: url( @@ -502,6 +502,19 @@ QPushButton:pressed, QPushButton:checked, QPushButton:focus { border-image: url(
502 </rect> 502 </rect>
503 </property> 503 </property>
504 </widget> 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>300</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>
505 </widget> 518 </widget>
506 <widget class="QWidget" name="page_2"/> 519 <widget class="QWidget" name="page_2"/>
507 </widget> 520 </widget>
@@ -529,6 +542,11 @@ QPushButton:pressed, QPushButton:checked, QPushButton:focus { border-image: url( @@ -529,6 +542,11 @@ QPushButton:pressed, QPushButton:checked, QPushButton:focus { border-image: url(
529 <extends>QLabel</extends> 542 <extends>QLabel</extends>
530 <header>halfenergyicon.h</header> 543 <header>halfenergyicon.h</header>
531 </customwidget> 544 </customwidget>
  545 + <customwidget>
  546 + <class>DigitalClock</class>
  547 + <extends>QLabel</extends>
  548 + <header>digitalclock.h</header>
  549 + </customwidget>
532 </customwidgets> 550 </customwidgets>
533 <tabstops> 551 <tabstops>
534 <tabstop>e10Button</tabstop> 552 <tabstop>e10Button</tabstop>
app/gui/oven_control/engineermenuwindow.ui
  Diff comments   View file @d61c943
@@ -71,6 +71,19 @@ @@ -71,6 +71,19 @@
71 </rect> 71 </rect>
72 </property> 72 </property>
73 </widget> 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>300</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>
74 </widget> 87 </widget>
75 <widget class="QWidget" name="page_2"/> 88 <widget class="QWidget" name="page_2"/>
76 </widget> 89 </widget>
@@ -642,6 +655,11 @@ QPushButton { color: rgb(255, 255, 255);text-align: left;padding-left:30px;}&lt;/st @@ -642,6 +655,11 @@ QPushButton { color: rgb(255, 255, 255);text-align: left;padding-left:30px;}&lt;/st
642 <extends>QLabel</extends> 655 <extends>QLabel</extends>
643 <header>halfenergyicon.h</header> 656 <header>halfenergyicon.h</header>
644 </customwidget> 657 </customwidget>
  658 + <customwidget>
  659 + <class>DigitalClock</class>
  660 + <extends>QLabel</extends>
  661 + <header>digitalclock.h</header>
  662 + </customwidget>
645 </customwidgets> 663 </customwidgets>
646 <tabstops> 664 <tabstops>
647 <tabstop>engAdjustButton</tabstop> 665 <tabstop>engAdjustButton</tabstop>
app/gui/oven_control/fantestwindow.ui
  Diff comments   View file @d61c943
@@ -68,6 +68,19 @@ @@ -68,6 +68,19 @@
68 </rect> 68 </rect>
69 </property> 69 </property>
70 </widget> 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>300</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>
71 </widget> 84 </widget>
72 <widget class="QWidget" name="page_2"/> 85 <widget class="QWidget" name="page_2"/>
73 </widget> 86 </widget>
@@ -780,6 +793,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -780,6 +793,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
780 <extends>QLabel</extends> 793 <extends>QLabel</extends>
781 <header>halfenergyicon.h</header> 794 <header>halfenergyicon.h</header>
782 </customwidget> 795 </customwidget>
  796 + <customwidget>
  797 + <class>DigitalClock</class>
  798 + <extends>QLabel</extends>
  799 + <header>digitalclock.h</header>
  800 + </customwidget>
783 </customwidgets> 801 </customwidgets>
784 <resources> 802 <resources>
785 <include location="resources.qrc"/> 803 <include location="resources.qrc"/>
app/gui/oven_control/functiontestwindow.ui
  Diff comments   View file @d61c943
@@ -74,6 +74,19 @@ @@ -74,6 +74,19 @@
74 </rect> 74 </rect>
75 </property> 75 </property>
76 </widget> 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>300</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>
77 </widget> 90 </widget>
78 <widget class="QWidget" name="page_2"/> 91 <widget class="QWidget" name="page_2"/>
79 </widget> 92 </widget>
@@ -664,6 +677,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o @@ -664,6 +677,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o
664 <extends>QLabel</extends> 677 <extends>QLabel</extends>
665 <header>halfenergyicon.h</header> 678 <header>halfenergyicon.h</header>
666 </customwidget> 679 </customwidget>
  680 + <customwidget>
  681 + <class>DigitalClock</class>
  682 + <extends>QLabel</extends>
  683 + <header>digitalclock.h</header>
  684 + </customwidget>
667 </customwidgets> 685 </customwidgets>
668 <resources/> 686 <resources/>
669 <connections/> 687 <connections/>
app/gui/oven_control/gasmodelsettingwindow.ui
  Diff comments   View file @d61c943
@@ -602,6 +602,19 @@ QPushButton:pressed , QPushButton::checked, QPushButton:focus{ border-image: url @@ -602,6 +602,19 @@ QPushButton:pressed , QPushButton::checked, QPushButton:focus{ border-image: url
602 </rect> 602 </rect>
603 </property> 603 </property>
604 </widget> 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>300</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>
605 </widget> 618 </widget>
606 <widget class="QWidget" name="page_2"/> 619 <widget class="QWidget" name="page_2"/>
607 </widget> 620 </widget>
@@ -729,6 +742,11 @@ QPushButton:pressed, QPushButton::checked, QPushButton:focus { border-image: url @@ -729,6 +742,11 @@ QPushButton:pressed, QPushButton::checked, QPushButton:focus { border-image: url
729 <extends>QLabel</extends> 742 <extends>QLabel</extends>
730 <header>halfenergyicon.h</header> 743 <header>halfenergyicon.h</header>
731 </customwidget> 744 </customwidget>
  745 + <customwidget>
  746 + <class>DigitalClock</class>
  747 + <extends>QLabel</extends>
  748 + <header>digitalclock.h</header>
  749 + </customwidget>
732 </customwidgets> 750 </customwidgets>
733 <tabstops> 751 <tabstops>
734 <tabstop>lpg10Button</tabstop> 752 <tabstop>lpg10Button</tabstop>
app/gui/oven_control/gastestwindow.ui
  Diff comments   View file @d61c943
@@ -68,6 +68,19 @@ @@ -68,6 +68,19 @@
68 </rect> 68 </rect>
69 </property> 69 </property>
70 </widget> 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>300</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>
71 </widget> 84 </widget>
72 <widget class="QWidget" name="page_2"/> 85 <widget class="QWidget" name="page_2"/>
73 </widget> 86 </widget>
@@ -162,6 +175,11 @@ QPushButton:pressed { @@ -162,6 +175,11 @@ QPushButton:pressed {
162 <extends>QLabel</extends> 175 <extends>QLabel</extends>
163 <header>halfenergyicon.h</header> 176 <header>halfenergyicon.h</header>
164 </customwidget> 177 </customwidget>
  178 + <customwidget>
  179 + <class>DigitalClock</class>
  180 + <extends>QLabel</extends>
  181 + <header>digitalclock.h</header>
  182 + </customwidget>
165 </customwidgets> 183 </customwidgets>
166 <resources/> 184 <resources/>
167 <connections/> 185 <connections/>
app/gui/oven_control/historylistwindow.ui
  Diff comments   View file @d61c943
@@ -226,6 +226,19 @@ QPushButton:pressed , QPushButton:focus{ border-image: url(:/images/bottom_bar/0 @@ -226,6 +226,19 @@ QPushButton:pressed , QPushButton:focus{ border-image: url(:/images/bottom_bar/0
226 </rect> 226 </rect>
227 </property> 227 </property>
228 </widget> 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>300</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>
229 </widget> 242 </widget>
230 <widget class="QWidget" name="page_2"/> 243 <widget class="QWidget" name="page_2"/>
231 </widget> 244 </widget>
@@ -1450,6 +1463,11 @@ QPushButton { text-align:center;}&lt;/string&gt; @@ -1450,6 +1463,11 @@ QPushButton { text-align:center;}&lt;/string&gt;
1450 <extends>QLabel</extends> 1463 <extends>QLabel</extends>
1451 <header>halfenergyicon.h</header> 1464 <header>halfenergyicon.h</header>
1452 </customwidget> 1465 </customwidget>
  1466 + <customwidget>
  1467 + <class>DigitalClock</class>
  1468 + <extends>QLabel</extends>
  1469 + <header>digitalclock.h</header>
  1470 + </customwidget>
1453 </customwidgets> 1471 </customwidgets>
1454 <resources/> 1472 <resources/>
1455 <connections/> 1473 <connections/>
app/gui/oven_control/mainwindow.ui
  Diff comments   View file @d61c943
@@ -626,6 +626,19 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ @@ -626,6 +626,19 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
626 </rect> 626 </rect>
627 </property> 627 </property>
628 </widget> 628 </widget>
  629 + <widget class="DigitalClock" name="label_4">
  630 + <property name="geometry">
  631 + <rect>
  632 + <x>20</x>
  633 + <y>310</y>
  634 + <width>300</width>
  635 + <height>100</height>
  636 + </rect>
  637 + </property>
  638 + <property name="alignment">
  639 + <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
  640 + </property>
  641 + </widget>
629 </widget> 642 </widget>
630 <widget class="QLabel" name="steamLabel_13"> 643 <widget class="QLabel" name="steamLabel_13">
631 <property name="enabled"> 644 <property name="enabled">
@@ -730,6 +743,11 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ @@ -730,6 +743,11 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
730 <extends>QLabel</extends> 743 <extends>QLabel</extends>
731 <header>halfenergyicon.h</header> 744 <header>halfenergyicon.h</header>
732 </customwidget> 745 </customwidget>
  746 + <customwidget>
  747 + <class>DigitalClock</class>
  748 + <extends>QLabel</extends>
  749 + <header>digitalclock.h</header>
  750 + </customwidget>
733 </customwidgets> 751 </customwidgets>
734 <tabstops> 752 <tabstops>
735 <tabstop>steamButton</tabstop> 753 <tabstop>steamButton</tabstop>
app/gui/oven_control/manualcookwindow.ui
  Diff comments   View file @d61c943
@@ -118,6 +118,19 @@ height: 33px; @@ -118,6 +118,19 @@ height: 33px;
118 </rect> 118 </rect>
119 </property> 119 </property>
120 </widget> 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>300</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>
121 </widget> 134 </widget>
122 <widget class="QWidget" name="closeDoorWidget"> 135 <widget class="QWidget" name="closeDoorWidget">
123 <property name="styleSheet"> 136 <property name="styleSheet">
@@ -1290,16 +1303,21 @@ QPushButton:checked:focus @@ -1290,16 +1303,21 @@ QPushButton:checked:focus
1290 <header>halfenergyicon.h</header> 1303 <header>halfenergyicon.h</header>
1291 </customwidget> 1304 </customwidget>
1292 <customwidget> 1305 <customwidget>
  1306 + <class>AnimatedImageBox</class>
  1307 + <extends>QLabel</extends>
  1308 + <header>animatedimagebox.h</header>
  1309 + </customwidget>
  1310 + <customwidget>
  1311 + <class>DigitalClock</class>
  1312 + <extends>QLabel</extends>
  1313 + <header>digitalclock.h</header>
  1314 + </customwidget>
  1315 + <customwidget>
1293 <class>Slider</class> 1316 <class>Slider</class>
1294 <extends>QWidget</extends> 1317 <extends>QWidget</extends>
1295 <header>slider.h</header> 1318 <header>slider.h</header>
1296 <container>1</container> 1319 <container>1</container>
1297 </customwidget> 1320 </customwidget>
1298 - <customwidget>  
1299 - <class>AnimatedImageBox</class>  
1300 - <extends>QLabel</extends>  
1301 - <header>animatedimagebox.h</header>  
1302 - </customwidget>  
1303 </customwidgets> 1321 </customwidgets>
1304 <tabstops> 1322 <tabstops>
1305 <tabstop>steamButton</tabstop> 1323 <tabstop>steamButton</tabstop>
app/gui/oven_control/modelsettingwindow.ui
  Diff comments   View file @d61c943
@@ -390,6 +390,19 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o @@ -390,6 +390,19 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o
390 </rect> 390 </rect>
391 </property> 391 </property>
392 </widget> 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>300</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>
393 </widget> 406 </widget>
394 <widget class="QWidget" name="page_2"/> 407 <widget class="QWidget" name="page_2"/>
395 </widget> 408 </widget>
@@ -417,6 +430,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o @@ -417,6 +430,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o
417 <extends>QLabel</extends> 430 <extends>QLabel</extends>
418 <header>halfenergyicon.h</header> 431 <header>halfenergyicon.h</header>
419 </customwidget> 432 </customwidget>
  433 + <customwidget>
  434 + <class>DigitalClock</class>
  435 + <extends>QLabel</extends>
  436 + <header>digitalclock.h</header>
  437 + </customwidget>
420 </customwidgets> 438 </customwidgets>
421 <resources/> 439 <resources/>
422 <connections/> 440 <connections/>
app/gui/oven_control/operationtimeheat.ui
  Diff comments   View file @d61c943
@@ -72,6 +72,19 @@ @@ -72,6 +72,19 @@
72 </rect> 72 </rect>
73 </property> 73 </property>
74 </widget> 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>300</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>
75 </widget> 88 </widget>
76 <widget class="QWidget" name="page_2"/> 89 <widget class="QWidget" name="page_2"/>
77 </widget> 90 </widget>
@@ -394,6 +407,11 @@ QPushButton { text-align: center;} @@ -394,6 +407,11 @@ QPushButton { text-align: center;}
394 <extends>QLabel</extends> 407 <extends>QLabel</extends>
395 <header>halfenergyicon.h</header> 408 <header>halfenergyicon.h</header>
396 </customwidget> 409 </customwidget>
  410 + <customwidget>
  411 + <class>DigitalClock</class>
  412 + <extends>QLabel</extends>
  413 + <header>digitalclock.h</header>
  414 + </customwidget>
397 </customwidgets> 415 </customwidgets>
398 <resources/> 416 <resources/>
399 <connections/> 417 <connections/>
app/gui/oven_control/operationtimemain.ui
  Diff comments   View file @d61c943
@@ -71,6 +71,19 @@ @@ -71,6 +71,19 @@
71 </rect> 71 </rect>
72 </property> 72 </property>
73 </widget> 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>300</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>
74 </widget> 87 </widget>
75 <widget class="QWidget" name="page_2"/> 88 <widget class="QWidget" name="page_2"/>
76 </widget> 89 </widget>
@@ -358,6 +371,11 @@ QPushButton { text-align: center;} @@ -358,6 +371,11 @@ QPushButton { text-align: center;}
358 <extends>QLabel</extends> 371 <extends>QLabel</extends>
359 <header>halfenergyicon.h</header> 372 <header>halfenergyicon.h</header>
360 </customwidget> 373 </customwidget>
  374 + <customwidget>
  375 + <class>DigitalClock</class>
  376 + <extends>QLabel</extends>
  377 + <header>digitalclock.h</header>
  378 + </customwidget>
361 </customwidgets> 379 </customwidgets>
362 <resources> 380 <resources>
363 <include location="resources.qrc"/> 381 <include location="resources.qrc"/>
app/gui/oven_control/operationtimemode.ui
  Diff comments   View file @d61c943
@@ -72,6 +72,19 @@ @@ -72,6 +72,19 @@
72 </rect> 72 </rect>
73 </property> 73 </property>
74 </widget> 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>300</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>
75 </widget> 88 </widget>
76 <widget class="QWidget" name="page_2"/> 89 <widget class="QWidget" name="page_2"/>
77 </widget> 90 </widget>
@@ -814,6 +827,11 @@ QPushButton { text-align: center;} @@ -814,6 +827,11 @@ QPushButton { text-align: center;}
814 <extends>QLabel</extends> 827 <extends>QLabel</extends>
815 <header>halfenergyicon.h</header> 828 <header>halfenergyicon.h</header>
816 </customwidget> 829 </customwidget>
  830 + <customwidget>
  831 + <class>DigitalClock</class>
  832 + <extends>QLabel</extends>
  833 + <header>digitalclock.h</header>
  834 + </customwidget>
817 </customwidgets> 835 </customwidgets>
818 <resources/> 836 <resources/>
819 <connections/> 837 <connections/>
app/gui/oven_control/operationtimeparts.ui
  Diff comments   View file @d61c943
@@ -72,6 +72,19 @@ @@ -72,6 +72,19 @@
72 </rect> 72 </rect>
73 </property> 73 </property>
74 </widget> 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>300</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>
75 </widget> 88 </widget>
76 <widget class="QWidget" name="page_2"/> 89 <widget class="QWidget" name="page_2"/>
77 </widget> 90 </widget>
@@ -1087,6 +1100,11 @@ QPushButton { text-align: center;} @@ -1087,6 +1100,11 @@ QPushButton { text-align: center;}
1087 <extends>QLabel</extends> 1100 <extends>QLabel</extends>
1088 <header>halfenergyicon.h</header> 1101 <header>halfenergyicon.h</header>
1089 </customwidget> 1102 </customwidget>
  1103 + <customwidget>
  1104 + <class>DigitalClock</class>
  1105 + <extends>QLabel</extends>
  1106 + <header>digitalclock.h</header>
  1107 + </customwidget>
1090 </customwidgets> 1108 </customwidgets>
1091 <resources/> 1109 <resources/>
1092 <connections/> 1110 <connections/>
app/gui/oven_control/oven_control.pro
  Diff comments   View file @d61c943
@@ -127,7 +127,8 @@ SOURCES += main.cpp\ @@ -127,7 +127,8 @@ SOURCES += main.cpp\
127 demoicon.cpp \ 127 demoicon.cpp \
128 halfenergyicon.cpp \ 128 halfenergyicon.cpp \
129 notipopupdlg.cpp \ 129 notipopupdlg.cpp \
130 - configsteamwashdlg.cpp 130 + configsteamwashdlg.cpp \
  131 + digitalclock.cpp
131 132
132 133
133 HEADERS += mainwindow.h \ 134 HEADERS += mainwindow.h \
@@ -245,7 +246,8 @@ HEADERS += mainwindow.h \ @@ -245,7 +246,8 @@ HEADERS += mainwindow.h \
245 demoicon.h \ 246 demoicon.h \
246 halfenergyicon.h \ 247 halfenergyicon.h \
247 notipopupdlg.h \ 248 notipopupdlg.h \
248 - configsteamwashdlg.h 249 + configsteamwashdlg.h \
  250 + digitalclock.h
249 251
250 FORMS += mainwindow.ui \ 252 FORMS += mainwindow.ui \
251 manualcookwindow.ui \ 253 manualcookwindow.ui \
app/gui/oven_control/primewindow.ui
  Diff comments   View file @d61c943
@@ -184,6 +184,19 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c @@ -184,6 +184,19 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c
184 </rect> 184 </rect>
185 </property> 185 </property>
186 </widget> 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>300</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>
187 </widget> 200 </widget>
188 <widget class="QWidget" name="page_2"/> 201 <widget class="QWidget" name="page_2"/>
189 </widget> 202 </widget>
@@ -338,6 +351,11 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/etc/main @@ -338,6 +351,11 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/etc/main
338 <extends>QLabel</extends> 351 <extends>QLabel</extends>
339 <header>halfenergyicon.h</header> 352 <header>halfenergyicon.h</header>
340 </customwidget> 353 </customwidget>
  354 + <customwidget>
  355 + <class>DigitalClock</class>
  356 + <extends>QLabel</extends>
  357 + <header>digitalclock.h</header>
  358 + </customwidget>
341 </customwidgets> 359 </customwidgets>
342 <tabstops> 360 <tabstops>
343 <tabstop>mostCookedButton</tabstop> 361 <tabstop>mostCookedButton</tabstop>
app/gui/oven_control/programmingautoconfigwindow.ui
  Diff comments   View file @d61c943
@@ -549,6 +549,19 @@ border-image: url(:/images/button/288_ov.png); @@ -549,6 +549,19 @@ border-image: url(:/images/button/288_ov.png);
549 </rect> 549 </rect>
550 </property> 550 </property>
551 </widget> 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>300</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>
552 </widget> 565 </widget>
553 <widget class="QWidget" name="page_2"/> 566 <widget class="QWidget" name="page_2"/>
554 </widget> 567 </widget>
@@ -1424,6 +1437,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c @@ -1424,6 +1437,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c
1424 <header>halfenergyicon.h</header> 1437 <header>halfenergyicon.h</header>
1425 </customwidget> 1438 </customwidget>
1426 <customwidget> 1439 <customwidget>
  1440 + <class>DigitalClock</class>
  1441 + <extends>QLabel</extends>
  1442 + <header>digitalclock.h</header>
  1443 + </customwidget>
  1444 + <customwidget>
1427 <class>Slider</class> 1445 <class>Slider</class>
1428 <extends>QWidget</extends> 1446 <extends>QWidget</extends>
1429 <header>slider.h</header> 1447 <header>slider.h</header>
app/gui/oven_control/programmingautoselectionwindow.ui
  Diff comments   View file @d61c943
@@ -152,6 +152,19 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0 @@ -152,6 +152,19 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0
152 </rect> 152 </rect>
153 </property> 153 </property>
154 </widget> 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>300</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>
155 </widget> 168 </widget>
156 <widget class="QWidget" name="page_2"/> 169 <widget class="QWidget" name="page_2"/>
157 </widget> 170 </widget>
@@ -198,6 +211,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0 @@ -198,6 +211,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0
198 <extends>QLabel</extends> 211 <extends>QLabel</extends>
199 <header>halfenergyicon.h</header> 212 <header>halfenergyicon.h</header>
200 </customwidget> 213 </customwidget>
  214 + <customwidget>
  215 + <class>DigitalClock</class>
  216 + <extends>QLabel</extends>
  217 + <header>digitalclock.h</header>
  218 + </customwidget>
201 </customwidgets> 219 </customwidgets>
202 <resources/> 220 <resources/>
203 <connections/> 221 <connections/>
app/gui/oven_control/programmingmanualwindow.ui
  Diff comments   View file @d61c943
@@ -177,6 +177,19 @@ height: 33px; @@ -177,6 +177,19 @@ height: 33px;
177 </rect> 177 </rect>
178 </property> 178 </property>
179 </widget> 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>300</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>
180 </widget> 193 </widget>
181 <widget class="QWidget" name="closeDoorWidget"> 194 <widget class="QWidget" name="closeDoorWidget">
182 <property name="styleSheet"> 195 <property name="styleSheet">
@@ -978,16 +991,21 @@ QPushButton:checked { background-image: url(:/images/cook_mode/big_combi.png); } @@ -978,16 +991,21 @@ QPushButton:checked { background-image: url(:/images/cook_mode/big_combi.png); }
978 <header>halfenergyicon.h</header> 991 <header>halfenergyicon.h</header>
979 </customwidget> 992 </customwidget>
980 <customwidget> 993 <customwidget>
  994 + <class>AnimatedImageBox</class>
  995 + <extends>QLabel</extends>
  996 + <header>animatedimagebox.h</header>
  997 + </customwidget>
  998 + <customwidget>
  999 + <class>DigitalClock</class>
  1000 + <extends>QLabel</extends>
  1001 + <header>digitalclock.h</header>
  1002 + </customwidget>
  1003 + <customwidget>
981 <class>Slider</class> 1004 <class>Slider</class>
982 <extends>QWidget</extends> 1005 <extends>QWidget</extends>
983 <header>slider.h</header> 1006 <header>slider.h</header>
984 <container>1</container> 1007 <container>1</container>
985 </customwidget> 1008 </customwidget>
986 - <customwidget>  
987 - <class>AnimatedImageBox</class>  
988 - <extends>QLabel</extends>  
989 - <header>animatedimagebox.h</header>  
990 - </customwidget>  
991 </customwidgets> 1009 </customwidgets>
992 <tabstops> 1010 <tabstops>
993 <tabstop>steamButton</tabstop> 1011 <tabstop>steamButton</tabstop>
app/gui/oven_control/programmingselectionwindow.ui
  Diff comments   View file @d61c943
@@ -695,6 +695,19 @@ QPushButton:disabled { background-image: url(:/images/cook_type/additional_hide. @@ -695,6 +695,19 @@ QPushButton:disabled { background-image: url(:/images/cook_type/additional_hide.
695 </rect> 695 </rect>
696 </property> 696 </property>
697 </widget> 697 </widget>
  698 + <widget class="DigitalClock" name="label_4">
  699 + <property name="geometry">
  700 + <rect>
  701 + <x>20</x>
  702 + <y>310</y>
  703 + <width>300</width>
  704 + <height>100</height>
  705 + </rect>
  706 + </property>
  707 + <property name="alignment">
  708 + <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
  709 + </property>
  710 + </widget>
698 </widget> 711 </widget>
699 <widget class="QPushButton" name="breadButton"> 712 <widget class="QPushButton" name="breadButton">
700 <property name="enabled"> 713 <property name="enabled">
@@ -750,6 +763,11 @@ QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png); @@ -750,6 +763,11 @@ QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png);
750 <extends>QLabel</extends> 763 <extends>QLabel</extends>
751 <header>halfenergyicon.h</header> 764 <header>halfenergyicon.h</header>
752 </customwidget> 765 </customwidget>
  766 + <customwidget>
  767 + <class>DigitalClock</class>
  768 + <extends>QLabel</extends>
  769 + <header>digitalclock.h</header>
  770 + </customwidget>
753 </customwidgets> 771 </customwidgets>
754 <tabstops> 772 <tabstops>
755 <tabstop>steamButton</tabstop> 773 <tabstop>steamButton</tabstop>
app/gui/oven_control/programmingwindow.ui
  Diff comments   View file @d61c943
@@ -115,6 +115,19 @@ background: none; @@ -115,6 +115,19 @@ background: none;
115 </rect> 115 </rect>
116 </property> 116 </property>
117 </widget> 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>300</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>
118 </widget> 131 </widget>
119 <widget class="QWidget" name="page_2"/> 132 <widget class="QWidget" name="page_2"/>
120 </widget> 133 </widget>
@@ -321,6 +334,11 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/etc/bar_ @@ -321,6 +334,11 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/etc/bar_
321 <extends>QLabel</extends> 334 <extends>QLabel</extends>
322 <header>halfenergyicon.h</header> 335 <header>halfenergyicon.h</header>
323 </customwidget> 336 </customwidget>
  337 + <customwidget>
  338 + <class>DigitalClock</class>
  339 + <extends>QLabel</extends>
  340 + <header>digitalclock.h</header>
  341 + </customwidget>
324 </customwidgets> 342 </customwidgets>
325 <tabstops> 343 <tabstops>
326 <tabstop>autoButton</tabstop> 344 <tabstop>autoButton</tabstop>
app/gui/oven_control/realtimemain.ui
  Diff comments   View file @d61c943
@@ -71,6 +71,19 @@ @@ -71,6 +71,19 @@
71 </rect> 71 </rect>
72 </property> 72 </property>
73 </widget> 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>300</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>
74 </widget> 87 </widget>
75 <widget class="QWidget" name="page_2"/> 88 <widget class="QWidget" name="page_2"/>
76 </widget> 89 </widget>
@@ -322,6 +335,11 @@ QPushButton { text-align: center;} @@ -322,6 +335,11 @@ QPushButton { text-align: center;}
322 <extends>QLabel</extends> 335 <extends>QLabel</extends>
323 <header>halfenergyicon.h</header> 336 <header>halfenergyicon.h</header>
324 </customwidget> 337 </customwidget>
  338 + <customwidget>
  339 + <class>DigitalClock</class>
  340 + <extends>QLabel</extends>
  341 + <header>digitalclock.h</header>
  342 + </customwidget>
325 </customwidgets> 343 </customwidgets>
326 <resources> 344 <resources>
327 <include location="resources.qrc"/> 345 <include location="resources.qrc"/>
app/gui/oven_control/realtimepartswindow.ui
  Diff comments   View file @d61c943
@@ -72,6 +72,19 @@ @@ -72,6 +72,19 @@
72 </rect> 72 </rect>
73 </property> 73 </property>
74 </widget> 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>300</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>
75 </widget> 88 </widget>
76 <widget class="QWidget" name="page_2"/> 89 <widget class="QWidget" name="page_2"/>
77 </widget> 90 </widget>
@@ -1064,6 +1077,11 @@ QPushButton { text-align: center;} @@ -1064,6 +1077,11 @@ QPushButton { text-align: center;}
1064 <extends>QLabel</extends> 1077 <extends>QLabel</extends>
1065 <header>halfenergyicon.h</header> 1078 <header>halfenergyicon.h</header>
1066 </customwidget> 1079 </customwidget>
  1080 + <customwidget>
  1081 + <class>DigitalClock</class>
  1082 + <extends>QLabel</extends>
  1083 + <header>digitalclock.h</header>
  1084 + </customwidget>
1067 </customwidgets> 1085 </customwidgets>
1068 <resources/> 1086 <resources/>
1069 <connections/> 1087 <connections/>
app/gui/oven_control/realtimesensorwindow.ui
  Diff comments   View file @d61c943
@@ -72,6 +72,19 @@ @@ -72,6 +72,19 @@
72 </rect> 72 </rect>
73 </property> 73 </property>
74 </widget> 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>300</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>
75 </widget> 88 </widget>
76 <widget class="QWidget" name="page_2"/> 89 <widget class="QWidget" name="page_2"/>
77 </widget> 90 </widget>
@@ -1424,6 +1437,11 @@ QPushButton { text-align: center;} @@ -1424,6 +1437,11 @@ QPushButton { text-align: center;}
1424 <extends>QLabel</extends> 1437 <extends>QLabel</extends>
1425 <header>halfenergyicon.h</header> 1438 <header>halfenergyicon.h</header>
1426 </customwidget> 1439 </customwidget>
  1440 + <customwidget>
  1441 + <class>DigitalClock</class>
  1442 + <extends>QLabel</extends>
  1443 + <header>digitalclock.h</header>
  1444 + </customwidget>
1427 </customwidgets> 1445 </customwidgets>
1428 <resources/> 1446 <resources/>
1429 <connections/> 1447 <connections/>
app/gui/oven_control/servicehistorymain.ui
  Diff comments   View file @d61c943
@@ -71,6 +71,19 @@ @@ -71,6 +71,19 @@
71 </rect> 71 </rect>
72 </property> 72 </property>
73 </widget> 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>300</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>
74 </widget> 87 </widget>
75 <widget class="QWidget" name="page_2"/> 88 <widget class="QWidget" name="page_2"/>
76 </widget> 89 </widget>
@@ -394,6 +407,11 @@ QPushButton { text-align: center;} @@ -394,6 +407,11 @@ QPushButton { text-align: center;}
394 <extends>QLabel</extends> 407 <extends>QLabel</extends>
395 <header>halfenergyicon.h</header> 408 <header>halfenergyicon.h</header>
396 </customwidget> 409 </customwidget>
  410 + <customwidget>
  411 + <class>DigitalClock</class>
  412 + <extends>QLabel</extends>
  413 + <header>digitalclock.h</header>
  414 + </customwidget>
397 </customwidgets> 415 </customwidgets>
398 <resources> 416 <resources>
399 <include location="resources.qrc"/> 417 <include location="resources.qrc"/>
app/gui/oven_control/valvetestwindow.ui
  Diff comments   View file @d61c943
@@ -68,6 +68,19 @@ @@ -68,6 +68,19 @@
68 </rect> 68 </rect>
69 </property> 69 </property>
70 </widget> 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>300</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>
71 </widget> 84 </widget>
72 <widget class="QWidget" name="page_2"/> 85 <widget class="QWidget" name="page_2"/>
73 </widget> 86 </widget>
@@ -1205,6 +1218,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -1205,6 +1218,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
1205 <extends>QLabel</extends> 1218 <extends>QLabel</extends>
1206 <header>halfenergyicon.h</header> 1219 <header>halfenergyicon.h</header>
1207 </customwidget> 1220 </customwidget>
  1221 + <customwidget>
  1222 + <class>DigitalClock</class>
  1223 + <extends>QLabel</extends>
  1224 + <header>digitalclock.h</header>
  1225 + </customwidget>
1208 </customwidgets> 1226 </customwidgets>
1209 <resources> 1227 <resources>
1210 <include location="resources.qrc"/> 1228 <include location="resources.qrc"/>
app/gui/oven_control/washtestwindow.ui
  Diff comments   View file @d61c943
@@ -68,6 +68,19 @@ @@ -68,6 +68,19 @@
68 </rect> 68 </rect>
69 </property> 69 </property>
70 </widget> 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>300</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>
71 </widget> 84 </widget>
72 <widget class="QWidget" name="page_2"/> 85 <widget class="QWidget" name="page_2"/>
73 </widget> 86 </widget>
@@ -691,6 +704,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o @@ -691,6 +704,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o
691 <extends>QLabel</extends> 704 <extends>QLabel</extends>
692 <header>halfenergyicon.h</header> 705 <header>halfenergyicon.h</header>
693 </customwidget> 706 </customwidget>
  707 + <customwidget>
  708 + <class>DigitalClock</class>
  709 + <extends>QLabel</extends>
  710 + <header>digitalclock.h</header>
  711 + </customwidget>
694 </customwidgets> 712 </customwidgets>
695 <resources> 713 <resources>
696 <include location="resources.qrc"/> 714 <include location="resources.qrc"/>
app/gui/oven_control/washwindow.ui
  Diff comments   View file @d61c943
@@ -111,6 +111,19 @@ border: none; @@ -111,6 +111,19 @@ border: none;
111 </rect> 111 </rect>
112 </property> 112 </property>
113 </widget> 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>300</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>
114 </widget> 127 </widget>
115 <widget class="QWidget" name="progressContainer"> 128 <widget class="QWidget" name="progressContainer">
116 <property name="styleSheet"> 129 <property name="styleSheet">
@@ -1190,6 +1203,12 @@ QPushButton:pressed { image: url(:/images/slider_icon/clean_ov.png); }&lt;/string&gt; @@ -1190,6 +1203,12 @@ QPushButton:pressed { image: url(:/images/slider_icon/clean_ov.png); }&lt;/string&gt;
1190 </widget> 1203 </widget>
1191 <customwidgets> 1204 <customwidgets>
1192 <customwidget> 1205 <customwidget>
  1206 + <class>WashStepGauge</class>
  1207 + <extends>QWidget</extends>
  1208 + <header>washstepgauge.h</header>
  1209 + <container>1</container>
  1210 + </customwidget>
  1211 + <customwidget>
1193 <class>Clock</class> 1212 <class>Clock</class>
1194 <extends>QWidget</extends> 1213 <extends>QWidget</extends>
1195 <header>clock.h</header> 1214 <header>clock.h</header>
@@ -1216,10 +1235,9 @@ QPushButton:pressed { image: url(:/images/slider_icon/clean_ov.png); }&lt;/string&gt; @@ -1216,10 +1235,9 @@ QPushButton:pressed { image: url(:/images/slider_icon/clean_ov.png); }&lt;/string&gt;
1216 <header>animatedimagebox.h</header> 1235 <header>animatedimagebox.h</header>
1217 </customwidget> 1236 </customwidget>
1218 <customwidget> 1237 <customwidget>
1219 - <class>WashStepGauge</class>  
1220 - <extends>QWidget</extends>  
1221 - <header>washstepgauge.h</header>  
1222 - <container>1</container> 1238 + <class>DigitalClock</class>
  1239 + <extends>QLabel</extends>
  1240 + <header>digitalclock.h</header>
1223 </customwidget> 1241 </customwidget>
1224 </customwidgets> 1242 </customwidgets>
1225 <tabstops> 1243 <tabstops>