diff --git a/app/gui/oven_control/adjustmentwindow.ui b/app/gui/oven_control/adjustmentwindow.ui index bfbb630..4934ec2 100644 --- a/app/gui/oven_control/adjustmentwindow.ui +++ b/app/gui/oven_control/adjustmentwindow.ui @@ -71,6 +71,19 @@ + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -293,6 +306,11 @@ QPushButton { QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
diff --git a/app/gui/oven_control/autocookcheckconfigwindow.ui b/app/gui/oven_control/autocookcheckconfigwindow.ui index 9bf6b71..72b8b43 100644 --- a/app/gui/oven_control/autocookcheckconfigwindow.ui +++ b/app/gui/oven_control/autocookcheckconfigwindow.ui @@ -358,6 +358,19 @@ border: none; + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -1345,6 +1358,11 @@ border-image: url(:/images/button/288_ov.png);
halfenergyicon.h
+ DigitalClock + QLabel +
digitalclock.h
+
+ Slider QWidget
slider.h
diff --git a/app/gui/oven_control/autocookcheckwindow.ui b/app/gui/oven_control/autocookcheckwindow.ui index 026cd6a..4fac368 100644 --- a/app/gui/oven_control/autocookcheckwindow.ui +++ b/app/gui/oven_control/autocookcheckwindow.ui @@ -163,6 +163,19 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/auto_bu + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -810,6 +823,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/b
animatedimagebox.h
+ DigitalClock + QLabel +
digitalclock.h
+
+ HumidityCircularGauge QWidget
humiditycirculargauge.h
diff --git a/app/gui/oven_control/autocookconfigwindow.ui b/app/gui/oven_control/autocookconfigwindow.ui index ec108c7..fd98558 100644 --- a/app/gui/oven_control/autocookconfigwindow.ui +++ b/app/gui/oven_control/autocookconfigwindow.ui @@ -115,6 +115,19 @@ border: none; + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -1447,6 +1460,11 @@ border-image: url(:/images/button/152_ov.png);
halfenergyicon.h
+ DigitalClock + QLabel +
digitalclock.h
+
+ Slider QWidget
slider.h
diff --git a/app/gui/oven_control/autocookselectionwindow.ui b/app/gui/oven_control/autocookselectionwindow.ui index d9dfee5..898c6cc 100644 --- a/app/gui/oven_control/autocookselectionwindow.ui +++ b/app/gui/oven_control/autocookselectionwindow.ui @@ -68,6 +68,19 @@ + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -216,6 +229,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
diff --git a/app/gui/oven_control/autocookwindow.ui b/app/gui/oven_control/autocookwindow.ui index e5a67ab..5501089 100644 --- a/app/gui/oven_control/autocookwindow.ui +++ b/app/gui/oven_control/autocookwindow.ui @@ -74,6 +74,19 @@ border: none; + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -1410,6 +1423,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/152_o
animatedimagebox.h
+ DigitalClock + QLabel +
digitalclock.h
+
+ HumidityCircularGauge QWidget
humiditycirculargauge.h
diff --git a/app/gui/oven_control/basicsettingwindow.ui b/app/gui/oven_control/basicsettingwindow.ui index dc064a9..6ef2a14 100644 --- a/app/gui/oven_control/basicsettingwindow.ui +++ b/app/gui/oven_control/basicsettingwindow.ui @@ -72,6 +72,19 @@ + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -446,6 +459,11 @@ QPushButton { text-align: left;} QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
diff --git a/app/gui/oven_control/burnertestwindow.ui b/app/gui/oven_control/burnertestwindow.ui index fb852f8..815eb8b 100644 --- a/app/gui/oven_control/burnertestwindow.ui +++ b/app/gui/oven_control/burnertestwindow.ui @@ -68,6 +68,19 @@ + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -2134,6 +2147,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
diff --git a/app/gui/oven_control/componenttestwindow.ui b/app/gui/oven_control/componenttestwindow.ui index 19d7ec8..682707a 100644 --- a/app/gui/oven_control/componenttestwindow.ui +++ b/app/gui/oven_control/componenttestwindow.ui @@ -68,6 +68,19 @@ + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -541,6 +554,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
diff --git a/app/gui/oven_control/configwindow.ui b/app/gui/oven_control/configwindow.ui index 9d88c85..db7cd2f 100644 --- a/app/gui/oven_control/configwindow.ui +++ b/app/gui/oven_control/configwindow.ui @@ -107,6 +107,19 @@ background: none; + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -590,6 +603,11 @@ QPushButton:pressed , QPushButton:focus { border-image: url(:/images/bottom_bar/ QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
pushButton diff --git a/app/gui/oven_control/digitalclock.cpp b/app/gui/oven_control/digitalclock.cpp new file mode 100644 index 0000000..b57d1c9 --- /dev/null +++ b/app/gui/oven_control/digitalclock.cpp @@ -0,0 +1,32 @@ +#include "digitalclock.h" + +#include +#include + +DigitalClock::DigitalClock(QWidget *parent) : QLabel(parent) +{ + QTimer *timer = new QTimer(this); + connect(timer, SIGNAL(timeout()), SLOT(updateView())); + + updateView(); + + timer->start(100); +} + +void DigitalClock::updateView() +{ + static const QString format("\ +\ +%1:%2
%3, %4 %5"); + + QDateTime dt = QDateTime::currentDateTime(); + setText(format + .arg(dt.time().hour(), 2, 10, QLatin1Char('0')) + .arg(dt.time().minute(), 2, 10, QLatin1Char('0')) + .arg(QDate::longDayName(dt.date().dayOfWeek())) + .arg(QDate::longMonthName(dt.date().month())) + .arg(dt.date().day())); +} diff --git a/app/gui/oven_control/digitalclock.h b/app/gui/oven_control/digitalclock.h new file mode 100644 index 0000000..fbb261e --- /dev/null +++ b/app/gui/oven_control/digitalclock.h @@ -0,0 +1,18 @@ +#ifndef DIGITALCLOCK_H +#define DIGITALCLOCK_H + +#include + +class DigitalClock : public QLabel +{ + Q_OBJECT +public: + explicit DigitalClock(QWidget *parent = 0); + +signals: + +private slots: + void updateView(); +}; + +#endif // DIGITALCLOCK_H diff --git a/app/gui/oven_control/electricmodelsettingwindow.ui b/app/gui/oven_control/electricmodelsettingwindow.ui index a1cc25f..e87779c 100644 --- a/app/gui/oven_control/electricmodelsettingwindow.ui +++ b/app/gui/oven_control/electricmodelsettingwindow.ui @@ -502,6 +502,19 @@ QPushButton:pressed, QPushButton:checked, QPushButton:focus { border-image: url( + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -529,6 +542,11 @@ QPushButton:pressed, QPushButton:checked, QPushButton:focus { border-image: url( QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
e10Button diff --git a/app/gui/oven_control/engineermenuwindow.ui b/app/gui/oven_control/engineermenuwindow.ui index d28874d..0b378f3 100644 --- a/app/gui/oven_control/engineermenuwindow.ui +++ b/app/gui/oven_control/engineermenuwindow.ui @@ -71,6 +71,19 @@ + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -642,6 +655,11 @@ QPushButton { color: rgb(255, 255, 255);text-align: left;padding-left:30px;}QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
engAdjustButton diff --git a/app/gui/oven_control/fantestwindow.ui b/app/gui/oven_control/fantestwindow.ui index 0f56639..3049e46 100644 --- a/app/gui/oven_control/fantestwindow.ui +++ b/app/gui/oven_control/fantestwindow.ui @@ -68,6 +68,19 @@ + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -780,6 +793,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
diff --git a/app/gui/oven_control/functiontestwindow.ui b/app/gui/oven_control/functiontestwindow.ui index d5f0d1d..1585be6 100644 --- a/app/gui/oven_control/functiontestwindow.ui +++ b/app/gui/oven_control/functiontestwindow.ui @@ -74,6 +74,19 @@ + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -664,6 +677,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
diff --git a/app/gui/oven_control/gasmodelsettingwindow.ui b/app/gui/oven_control/gasmodelsettingwindow.ui index 6c11690..65f366d 100644 --- a/app/gui/oven_control/gasmodelsettingwindow.ui +++ b/app/gui/oven_control/gasmodelsettingwindow.ui @@ -602,6 +602,19 @@ QPushButton:pressed , QPushButton::checked, QPushButton:focus{ border-image: url + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -729,6 +742,11 @@ QPushButton:pressed, QPushButton::checked, QPushButton:focus { border-image: url QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
lpg10Button diff --git a/app/gui/oven_control/gastestwindow.ui b/app/gui/oven_control/gastestwindow.ui index f02d5dd..3ae93cd 100644 --- a/app/gui/oven_control/gastestwindow.ui +++ b/app/gui/oven_control/gastestwindow.ui @@ -68,6 +68,19 @@ + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -162,6 +175,11 @@ QPushButton:pressed { QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
diff --git a/app/gui/oven_control/historylistwindow.ui b/app/gui/oven_control/historylistwindow.ui index 7b1ccfb..fd54d17 100644 --- a/app/gui/oven_control/historylistwindow.ui +++ b/app/gui/oven_control/historylistwindow.ui @@ -226,6 +226,19 @@ QPushButton:pressed , QPushButton:focus{ border-image: url(:/images/bottom_bar/0 + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -1450,6 +1463,11 @@ QPushButton { text-align:center;} QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
diff --git a/app/gui/oven_control/mainwindow.ui b/app/gui/oven_control/mainwindow.ui index 9df8799..3492338 100644 --- a/app/gui/oven_control/mainwindow.ui +++ b/app/gui/oven_control/mainwindow.ui @@ -626,6 +626,19 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -730,6 +743,11 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
steamButton diff --git a/app/gui/oven_control/manualcookwindow.ui b/app/gui/oven_control/manualcookwindow.ui index ad92dfd..ea7f05d 100644 --- a/app/gui/oven_control/manualcookwindow.ui +++ b/app/gui/oven_control/manualcookwindow.ui @@ -118,6 +118,19 @@ height: 33px;
+ + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -1290,16 +1303,21 @@ QPushButton:checked:focus
halfenergyicon.h
+ AnimatedImageBox + QLabel +
animatedimagebox.h
+
+ + DigitalClock + QLabel +
digitalclock.h
+
+ Slider QWidget
slider.h
1
- - AnimatedImageBox - QLabel -
animatedimagebox.h
-
steamButton diff --git a/app/gui/oven_control/modelsettingwindow.ui b/app/gui/oven_control/modelsettingwindow.ui index e536cab..0b2f6bf 100644 --- a/app/gui/oven_control/modelsettingwindow.ui +++ b/app/gui/oven_control/modelsettingwindow.ui @@ -390,6 +390,19 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o
+ + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -417,6 +430,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
diff --git a/app/gui/oven_control/operationtimeheat.ui b/app/gui/oven_control/operationtimeheat.ui index 4f8b333..a9de049 100644 --- a/app/gui/oven_control/operationtimeheat.ui +++ b/app/gui/oven_control/operationtimeheat.ui @@ -72,6 +72,19 @@ + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -394,6 +407,11 @@ QPushButton { text-align: center;} QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
diff --git a/app/gui/oven_control/operationtimemain.ui b/app/gui/oven_control/operationtimemain.ui index bac543c..94ac4af 100644 --- a/app/gui/oven_control/operationtimemain.ui +++ b/app/gui/oven_control/operationtimemain.ui @@ -71,6 +71,19 @@ + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -358,6 +371,11 @@ QPushButton { text-align: center;} QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
diff --git a/app/gui/oven_control/operationtimemode.ui b/app/gui/oven_control/operationtimemode.ui index d62f4ff..72af823 100644 --- a/app/gui/oven_control/operationtimemode.ui +++ b/app/gui/oven_control/operationtimemode.ui @@ -72,6 +72,19 @@ + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -814,6 +827,11 @@ QPushButton { text-align: center;} QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
diff --git a/app/gui/oven_control/operationtimeparts.ui b/app/gui/oven_control/operationtimeparts.ui index 43e678c..3fc56f7 100644 --- a/app/gui/oven_control/operationtimeparts.ui +++ b/app/gui/oven_control/operationtimeparts.ui @@ -72,6 +72,19 @@ + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -1087,6 +1100,11 @@ QPushButton { text-align: center;} QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
diff --git a/app/gui/oven_control/oven_control.pro b/app/gui/oven_control/oven_control.pro index f1618a6..f99cb3f 100644 --- a/app/gui/oven_control/oven_control.pro +++ b/app/gui/oven_control/oven_control.pro @@ -127,7 +127,8 @@ SOURCES += main.cpp\ demoicon.cpp \ halfenergyicon.cpp \ notipopupdlg.cpp \ - configsteamwashdlg.cpp + configsteamwashdlg.cpp \ + digitalclock.cpp HEADERS += mainwindow.h \ @@ -245,7 +246,8 @@ HEADERS += mainwindow.h \ demoicon.h \ halfenergyicon.h \ notipopupdlg.h \ - configsteamwashdlg.h + configsteamwashdlg.h \ + digitalclock.h FORMS += mainwindow.ui \ manualcookwindow.ui \ diff --git a/app/gui/oven_control/primewindow.ui b/app/gui/oven_control/primewindow.ui index 41cfe9f..73759dd 100644 --- a/app/gui/oven_control/primewindow.ui +++ b/app/gui/oven_control/primewindow.ui @@ -184,6 +184,19 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -338,6 +351,11 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/etc/main QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
mostCookedButton diff --git a/app/gui/oven_control/programmingautoconfigwindow.ui b/app/gui/oven_control/programmingautoconfigwindow.ui index 94e2e42..e10be5c 100644 --- a/app/gui/oven_control/programmingautoconfigwindow.ui +++ b/app/gui/oven_control/programmingautoconfigwindow.ui @@ -549,6 +549,19 @@ border-image: url(:/images/button/288_ov.png); + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -1424,6 +1437,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c
halfenergyicon.h
+ DigitalClock + QLabel +
digitalclock.h
+
+ Slider QWidget
slider.h
diff --git a/app/gui/oven_control/programmingautoselectionwindow.ui b/app/gui/oven_control/programmingautoselectionwindow.ui index 1e96e14..34e7583 100644 --- a/app/gui/oven_control/programmingautoselectionwindow.ui +++ b/app/gui/oven_control/programmingautoselectionwindow.ui @@ -152,6 +152,19 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0 + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -198,6 +211,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0 QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
diff --git a/app/gui/oven_control/programmingmanualwindow.ui b/app/gui/oven_control/programmingmanualwindow.ui index 988c7aa..c55ac7d 100644 --- a/app/gui/oven_control/programmingmanualwindow.ui +++ b/app/gui/oven_control/programmingmanualwindow.ui @@ -177,6 +177,19 @@ height: 33px; + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -978,16 +991,21 @@ QPushButton:checked { background-image: url(:/images/cook_mode/big_combi.png); }
halfenergyicon.h
+ AnimatedImageBox + QLabel +
animatedimagebox.h
+
+ + DigitalClock + QLabel +
digitalclock.h
+
+ Slider QWidget
slider.h
1
- - AnimatedImageBox - QLabel -
animatedimagebox.h
-
steamButton diff --git a/app/gui/oven_control/programmingselectionwindow.ui b/app/gui/oven_control/programmingselectionwindow.ui index b36c2b1..c7b1382 100644 --- a/app/gui/oven_control/programmingselectionwindow.ui +++ b/app/gui/oven_control/programmingselectionwindow.ui @@ -695,6 +695,19 @@ QPushButton:disabled { background-image: url(:/images/cook_type/additional_hide.
+ + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -750,6 +763,11 @@ QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png); QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
steamButton diff --git a/app/gui/oven_control/programmingwindow.ui b/app/gui/oven_control/programmingwindow.ui index 87c7332..9b580fd 100644 --- a/app/gui/oven_control/programmingwindow.ui +++ b/app/gui/oven_control/programmingwindow.ui @@ -115,6 +115,19 @@ background: none;
+ + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -321,6 +334,11 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/etc/bar_ QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
autoButton diff --git a/app/gui/oven_control/realtimemain.ui b/app/gui/oven_control/realtimemain.ui index 4269e0f..5c782db 100644 --- a/app/gui/oven_control/realtimemain.ui +++ b/app/gui/oven_control/realtimemain.ui @@ -71,6 +71,19 @@ + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -322,6 +335,11 @@ QPushButton { text-align: center;} QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
diff --git a/app/gui/oven_control/realtimepartswindow.ui b/app/gui/oven_control/realtimepartswindow.ui index be62d07..ef47f8a 100644 --- a/app/gui/oven_control/realtimepartswindow.ui +++ b/app/gui/oven_control/realtimepartswindow.ui @@ -72,6 +72,19 @@ + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -1064,6 +1077,11 @@ QPushButton { text-align: center;} QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
diff --git a/app/gui/oven_control/realtimesensorwindow.ui b/app/gui/oven_control/realtimesensorwindow.ui index af5c516..671aa0e 100644 --- a/app/gui/oven_control/realtimesensorwindow.ui +++ b/app/gui/oven_control/realtimesensorwindow.ui @@ -72,6 +72,19 @@ + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -1424,6 +1437,11 @@ QPushButton { text-align: center;} QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
diff --git a/app/gui/oven_control/servicehistorymain.ui b/app/gui/oven_control/servicehistorymain.ui index b477364..b12172f 100644 --- a/app/gui/oven_control/servicehistorymain.ui +++ b/app/gui/oven_control/servicehistorymain.ui @@ -71,6 +71,19 @@ + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -394,6 +407,11 @@ QPushButton { text-align: center;} QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
diff --git a/app/gui/oven_control/valvetestwindow.ui b/app/gui/oven_control/valvetestwindow.ui index d983c1b..c7f8ba4 100644 --- a/app/gui/oven_control/valvetestwindow.ui +++ b/app/gui/oven_control/valvetestwindow.ui @@ -68,6 +68,19 @@ + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -1205,6 +1218,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
diff --git a/app/gui/oven_control/washtestwindow.ui b/app/gui/oven_control/washtestwindow.ui index 16408ab..51749b8 100644 --- a/app/gui/oven_control/washtestwindow.ui +++ b/app/gui/oven_control/washtestwindow.ui @@ -68,6 +68,19 @@ + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -691,6 +704,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o QLabel
halfenergyicon.h
+ + DigitalClock + QLabel +
digitalclock.h
+
diff --git a/app/gui/oven_control/washwindow.ui b/app/gui/oven_control/washwindow.ui index 9d73c78..ef79900 100644 --- a/app/gui/oven_control/washwindow.ui +++ b/app/gui/oven_control/washwindow.ui @@ -111,6 +111,19 @@ border: none; + + + + 20 + 310 + 300 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + @@ -1190,6 +1203,12 @@ QPushButton:pressed { image: url(:/images/slider_icon/clean_ov.png); } + WashStepGauge + QWidget +
washstepgauge.h
+ 1 +
+ Clock QWidget
clock.h
@@ -1216,10 +1235,9 @@ QPushButton:pressed { image: url(:/images/slider_icon/clean_ov.png); }
animatedimagebox.h
- WashStepGauge - QWidget -
washstepgauge.h
- 1 + DigitalClock + QLabel +
digitalclock.h