diff --git a/app/gui/oven_control/adjustmentwindow.ui b/app/gui/oven_control/adjustmentwindow.ui index 0a6c743..965e5db 100644 --- a/app/gui/oven_control/adjustmentwindow.ui +++ b/app/gui/oven_control/adjustmentwindow.ui @@ -27,76 +27,10 @@ 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -373,19 +307,6 @@ QPushButton { - - - - 670 - 290 - 111 - 121 - - - - - - label upperStack label_15 @@ -394,46 +315,15 @@ QPushButton { btnAdjust btnAdjust_LCD btnClearWashData - label_6 - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- diff --git a/app/gui/oven_control/autocookcheckconfigwindow.ui b/app/gui/oven_control/autocookcheckconfigwindow.ui index 91795fc..cc708fc 100644 --- a/app/gui/oven_control/autocookcheckconfigwindow.ui +++ b/app/gui/oven_control/autocookcheckconfigwindow.ui @@ -314,76 +314,10 @@ border: none; 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -1346,59 +1280,16 @@ border-image: url(:/images/button/288_ov.png); Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - 670 - 290 - 111 - 121 - - - - - - - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- - Slider QWidget
slider.h
diff --git a/app/gui/oven_control/autocookcheckwindow.ui b/app/gui/oven_control/autocookcheckwindow.ui index 4a2f1ca..75d61fa 100644 --- a/app/gui/oven_control/autocookcheckwindow.ui +++ b/app/gui/oven_control/autocookcheckwindow.ui @@ -119,89 +119,10 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/auto_bu 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -823,42 +744,12 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/b - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- - AnimatedImageBox QLabel
animatedimagebox.h
diff --git a/app/gui/oven_control/autocookconfigwindow.ui b/app/gui/oven_control/autocookconfigwindow.ui index 1143d26..eeaed28 100644 --- a/app/gui/oven_control/autocookconfigwindow.ui +++ b/app/gui/oven_control/autocookconfigwindow.ui @@ -71,89 +71,10 @@ border: none; 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -1465,42 +1386,12 @@ border-image: url(:/images/button/152_ov.png); - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- - Slider QWidget
slider.h
diff --git a/app/gui/oven_control/autocookselectionwindow.ui b/app/gui/oven_control/autocookselectionwindow.ui index b1a50d1..a3b4a6b 100644 --- a/app/gui/oven_control/autocookselectionwindow.ui +++ b/app/gui/oven_control/autocookselectionwindow.ui @@ -24,89 +24,10 @@ 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -279,47 +200,17 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/auto_pop - BulletIndicator + StatusArea QWidget -
bulletindicator.h
+
statusarea.h
1 - Clock + BulletIndicator QWidget -
clock.h
+
bulletindicator.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- diff --git a/app/gui/oven_control/autocookwindow.ui b/app/gui/oven_control/autocookwindow.ui index d61231e..ddda5c5 100644 --- a/app/gui/oven_control/autocookwindow.ui +++ b/app/gui/oven_control/autocookwindow.ui @@ -30,89 +30,10 @@ border: none; 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -1437,42 +1358,12 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/152_o - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- - AnimatedImageBox QLabel
animatedimagebox.h
diff --git a/app/gui/oven_control/burnertestwindow.ui b/app/gui/oven_control/burnertestwindow.ui index 7665b6d..46c825a 100644 --- a/app/gui/oven_control/burnertestwindow.ui +++ b/app/gui/oven_control/burnertestwindow.ui @@ -24,89 +24,10 @@ 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -2153,41 +2074,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- diff --git a/app/gui/oven_control/commicon.cpp b/app/gui/oven_control/commicon.cpp new file mode 100644 index 0000000..ed7b1d8 --- /dev/null +++ b/app/gui/oven_control/commicon.cpp @@ -0,0 +1,38 @@ +#include "commicon.h" + +#include +#include + +#include "udphandler.h" + +CommIcon::CommIcon(QWidget *parent) : QWidget(parent) +{ + isFault = false; + + UdpHandler *udp = UdpHandler::getInstance(); + connect(udp, SIGNAL(timeout()), SLOT(setFault())); + connect(udp, SIGNAL(recovered()), SLOT(setOK())); +} + +void CommIcon::setFault() +{ + isFault = true; + update(); +} + +void CommIcon::setOK() +{ + isFault = false; + update(); +} + +void CommIcon::paintEvent(QPaintEvent *event) +{ + if (isFault) + return; + + QPainter painter(this); + painter.setRenderHint(QPainter::Antialiasing); + painter.setBrush(Qt::blue); + painter.drawEllipse(rect()); +} diff --git a/app/gui/oven_control/commicon.h b/app/gui/oven_control/commicon.h new file mode 100644 index 0000000..32cdda5 --- /dev/null +++ b/app/gui/oven_control/commicon.h @@ -0,0 +1,25 @@ +#ifndef COMMICON_H +#define COMMICON_H + +#include + +class CommIcon : public QWidget +{ + Q_OBJECT +public: + explicit CommIcon(QWidget *parent = nullptr); + +signals: + +public slots: + void setFault(); + void setOK(); + +protected: + void paintEvent(QPaintEvent *event); + +private: + bool isFault; +}; + +#endif // COMMICON_H diff --git a/app/gui/oven_control/componenttestwindow.ui b/app/gui/oven_control/componenttestwindow.ui index 97bda1d..e7d1a9d 100644 --- a/app/gui/oven_control/componenttestwindow.ui +++ b/app/gui/oven_control/componenttestwindow.ui @@ -24,89 +24,10 @@ 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -560,41 +481,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- diff --git a/app/gui/oven_control/configdoormonitoring.ui b/app/gui/oven_control/configdoormonitoring.ui index 62971cd..a213d8e 100644 --- a/app/gui/oven_control/configdoormonitoring.ui +++ b/app/gui/oven_control/configdoormonitoring.ui @@ -28,56 +28,10 @@ 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -555,26 +509,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- diff --git a/app/gui/oven_control/configwindow.ui b/app/gui/oven_control/configwindow.ui index 2a72e62..a891d09 100644 --- a/app/gui/oven_control/configwindow.ui +++ b/app/gui/oven_control/configwindow.ui @@ -63,89 +63,10 @@ background: none; 0 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -609,41 +530,11 @@ QPushButton:pressed , QPushButton:focus { border-image: url(:/images/bottom_bar/ - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- pushButton diff --git a/app/gui/oven_control/define.h b/app/gui/oven_control/define.h index ca89444..48f3482 100644 --- a/app/gui/oven_control/define.h +++ b/app/gui/oven_control/define.h @@ -3,9 +3,9 @@ #include -#define MAJOR_VER 1 -#define MINOR_VER 6 -#define HOTFIX_VER 0 +#define MAJOR_VER 2 +#define MINOR_VER 0 +#define HOTFIX_VER 1 // 0 for normal // 1 for premium diff --git a/app/gui/oven_control/electricmodelsettingwindow.ui b/app/gui/oven_control/electricmodelsettingwindow.ui index 2252b1e..a2a4542 100644 --- a/app/gui/oven_control/electricmodelsettingwindow.ui +++ b/app/gui/oven_control/electricmodelsettingwindow.ui @@ -458,89 +458,10 @@ QPushButton:pressed, QPushButton:checked, QPushButton:focus { border-image: url( 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -548,41 +469,11 @@ QPushButton:pressed, QPushButton:checked, QPushButton:focus { border-image: url( - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- e10Button diff --git a/app/gui/oven_control/engineermenuwindow.ui b/app/gui/oven_control/engineermenuwindow.ui index d4da36d..273b84a 100644 --- a/app/gui/oven_control/engineermenuwindow.ui +++ b/app/gui/oven_control/engineermenuwindow.ui @@ -27,89 +27,10 @@ 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -661,41 +582,11 @@ QPushButton { color: rgb(255, 255, 255);text-align: left;padding-left:30px;} - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- engAdjustButton diff --git a/app/gui/oven_control/fantestwindow.ui b/app/gui/oven_control/fantestwindow.ui index 75bf485..a034503 100644 --- a/app/gui/oven_control/fantestwindow.ui +++ b/app/gui/oven_control/fantestwindow.ui @@ -24,89 +24,10 @@ 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -799,41 +720,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- diff --git a/app/gui/oven_control/functiontestwindow.ui b/app/gui/oven_control/functiontestwindow.ui index d7ed297..c137bbb 100644 --- a/app/gui/oven_control/functiontestwindow.ui +++ b/app/gui/oven_control/functiontestwindow.ui @@ -30,89 +30,10 @@ 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -839,41 +760,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- diff --git a/app/gui/oven_control/gasmodelsettingwindow.ui b/app/gui/oven_control/gasmodelsettingwindow.ui index dc5c9a3..e7a612d 100644 --- a/app/gui/oven_control/gasmodelsettingwindow.ui +++ b/app/gui/oven_control/gasmodelsettingwindow.ui @@ -558,89 +558,10 @@ QPushButton:pressed , QPushButton::checked, QPushButton:focus{ border-image: url 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -748,41 +669,11 @@ QPushButton:pressed, QPushButton::checked, QPushButton:focus { border-image: url - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- lpg10Button diff --git a/app/gui/oven_control/gastestwindow.ui b/app/gui/oven_control/gastestwindow.ui index 9ff18ef..067389b 100644 --- a/app/gui/oven_control/gastestwindow.ui +++ b/app/gui/oven_control/gastestwindow.ui @@ -24,89 +24,10 @@ 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -537,41 +458,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- diff --git a/app/gui/oven_control/historylistwindow.ui b/app/gui/oven_control/historylistwindow.ui index 23615af..ce78168 100644 --- a/app/gui/oven_control/historylistwindow.ui +++ b/app/gui/oven_control/historylistwindow.ui @@ -182,89 +182,10 @@ QPushButton:pressed , QPushButton:focus{ border-image: url(:/images/bottom_bar/0 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -1469,41 +1390,11 @@ QPushButton { text-align:center;} - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- diff --git a/app/gui/oven_control/ignitionicon.cpp b/app/gui/oven_control/ignitionicon.cpp index c89804d..e163f49 100644 --- a/app/gui/oven_control/ignitionicon.cpp +++ b/app/gui/oven_control/ignitionicon.cpp @@ -17,7 +17,7 @@ IgnitionIcon::IgnitionIcon(QWidget *parent) : QLabel(parent) void IgnitionIcon::check() { UdpHandler *udp = UdpHandler::getInstance(); - if (udp->burnerState(1) || udp->burnerState(2) || udp->burnerState(3)) + if (udp->burnerState(1) || udp->burnerState(2) || udp->burnerState(3) || udp->heater()) show(); else hide(); diff --git a/app/gui/oven_control/mainwindow.ui b/app/gui/oven_control/mainwindow.ui index f9e4c99..8aa47f5 100644 --- a/app/gui/oven_control/mainwindow.ui +++ b/app/gui/oven_control/mainwindow.ui @@ -577,7 +577,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ type - + 0 @@ -589,85 +589,6 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 662 - 164 - 111 - 121 - - - - - - - - - - 670 - 290 - 111 - 121 - - - - - - @@ -730,41 +651,11 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- steamButton diff --git a/app/gui/oven_control/manualcookfinishpopup.cpp b/app/gui/oven_control/manualcookfinishpopup.cpp new file mode 100644 index 0000000..362b1d3 --- /dev/null +++ b/app/gui/oven_control/manualcookfinishpopup.cpp @@ -0,0 +1,117 @@ +#include "manualcookfinishpopup.h" +#include "ui_manualcookfinishpopup.h" + +#include + +#include "soundplayer.h" + +ManualCookFinishPopup::ManualCookFinishPopup(QWidget *parent, bool keepWarmStartable) : + QWidget(parent), + ui(new Ui::ManualCookFinishPopup) +{ + ui->setupUi(this); + + setAttribute(Qt::WA_DeleteOnClose); + + foreach (QPushButton *button, findChildren()) + connect(button, &QPushButton::pressed, SoundPlayer::playClick); + + ui->warmupButton->setEnabled(keepWarmStartable); + + ui->background->setFocus(); +} + +ManualCookFinishPopup::~ManualCookFinishPopup() +{ + delete ui; +} + +void ManualCookFinishPopup::keyPressEvent(QKeyEvent *event) +{ + switch (event->key()) + { + case 0x01000032: // Turn left + onEncoderLeft(); + break; + case 0x01000031: // Push + pushed = focusWidget(); + break; + case 0x01000030: // Turn right + onEncoderRight(); + break; + } +} + +void ManualCookFinishPopup::keyReleaseEvent(QKeyEvent *event) +{ + switch (event->key()) + { + case 0x01000032: // Turn left + onEncoderLeft(); + break; + case 0x01000031: // Push + if (focusWidget() == pushed) + onEncoderClicked(pushed); + + pushed = NULL; + break; + case 0x01000030: // Turn right + onEncoderRight(); + break; + } +} + +void ManualCookFinishPopup::onEncoderLeft() +{ + QWidget *focused = focusWidget(); + if (focused == ui->background) + ui->okButton->setFocus(); + else + focusPreviousChild(); +} + +void ManualCookFinishPopup::onEncoderRight() +{ + if (focusWidget() == ui->okButton) + ui->background->setFocus(); + else + focusNextChild(); +} + +void ManualCookFinishPopup::onEncoderClicked(QWidget *clicked) +{ + if (clicked == ui->background) + { + close(); + return; + } + + QPushButton *b = qobject_cast(clicked); + if (b) + { + b->click(); + return; + } +} + +void ManualCookFinishPopup::on_closeButton_clicked() +{ + close(); +} + +void ManualCookFinishPopup::on_closeButton_2_clicked() +{ + close(); +} + +void ManualCookFinishPopup::on_warmupButton_clicked() +{ + close(); + + emit keepWarm(); +} + +void ManualCookFinishPopup::on_okButton_clicked() +{ + close(); +} diff --git a/app/gui/oven_control/manualcookfinishpopup.h b/app/gui/oven_control/manualcookfinishpopup.h new file mode 100644 index 0000000..d8d8aa6 --- /dev/null +++ b/app/gui/oven_control/manualcookfinishpopup.h @@ -0,0 +1,41 @@ +#ifndef MANUALCOOKFINISHPOPUP_H +#define MANUALCOOKFINISHPOPUP_H + +#include + +namespace Ui { +class ManualCookFinishPopup; +} + +class ManualCookFinishPopup : public QWidget +{ + Q_OBJECT + +public: + explicit ManualCookFinishPopup(QWidget *parent = nullptr, bool keepWarmStartable = true); + ~ManualCookFinishPopup(); + +signals: + void keepWarm(); + +protected: + void keyPressEvent(QKeyEvent *event); + void keyReleaseEvent(QKeyEvent *event); + +private: + Ui::ManualCookFinishPopup *ui; + + QWidget *pushed = Q_NULLPTR; + + void onEncoderLeft(); + void onEncoderRight(); + void onEncoderClicked(QWidget *clicked); + +private slots: + void on_closeButton_clicked(); + void on_closeButton_2_clicked(); + void on_warmupButton_clicked(); + void on_okButton_clicked(); +}; + +#endif // MANUALCOOKFINISHPOPUP_H diff --git a/app/gui/oven_control/manualcookfinishpopup.ui b/app/gui/oven_control/manualcookfinishpopup.ui new file mode 100644 index 0000000..fd9621c --- /dev/null +++ b/app/gui/oven_control/manualcookfinishpopup.ui @@ -0,0 +1,171 @@ + + + ManualCookFinishPopup + + + + 0 + 0 + 1080 + 1920 + + + + Form + + + #closeButton { border: none; } +#closeButton_2 { border: none; } +#background { background-image: url(:/images/background/popup/913.png); } +#background:focus { border: 4px solid gray; } + +QPushButton { +background-position: center; +background-repeat: no-repeat; +border: none; +} + +QPushButton[style="icon"] { background-image: url(:/images/slider_icon/background.png); } + +QPushButton { color: white; border: none; } +QPushButton:pressed, QPushButton:focus { color: yellow; } +QPushButton:disabled { color: grey; } + +QLabel { color: white; } + + + + + 0 + 961 + 1080 + 958 + + + + + + + + + + 0 + 511 + 1080 + 831 + + + + Qt::TabFocus + + + + + 385 + 670 + 150 + 120 + + + + + 22 + 75 + true + true + + + + + + + 보온 + + + + + + 545 + 670 + 150 + 120 + + + + + 22 + 75 + true + true + + + + + + + 확인 + + + + + + 0 + 0 + 1080 + 240 + + + + + 32 + 75 + true + + + + 요리가 끝났습니다 + + + Qt::AlignCenter + + + + + + 439 + 250 + 301 + 350 + + + + :/images/animation/pull_04.png + + + + + + + 0 + 0 + 1080 + 511 + + + + + + + + + closeButton_2 + background + warmupButton + okButton + closeButton + + + + + + diff --git a/app/gui/oven_control/manualcookwindow.cpp b/app/gui/oven_control/manualcookwindow.cpp index 87c8ea1..8cdcfea 100644 --- a/app/gui/oven_control/manualcookwindow.cpp +++ b/app/gui/oven_control/manualcookwindow.cpp @@ -24,6 +24,7 @@ #include "errorpopupdlg.h" #include "manualviewerdlg.h" #include "haccp.h" +#include "manualcookfinishpopup.h" #include @@ -616,6 +617,19 @@ void ManualCookWindow::showInfoText(QString text, QString icon) showInfoTextTimer.start(); } +void ManualCookWindow::startKeepWarm() +{ + if (oven->mode() == Define::CombiMode) + return; + + cookDone = false; + + oven->setTemp(70); + oven->setTime(60*60); + + start(); +} + void ManualCookWindow::onOvenUpdated(Oven *oven) { updateView(); @@ -650,6 +664,13 @@ void ManualCookWindow::onOvenUpdated(Oven *oven) HACCP::done(); emit done(); + + focused = focusWidget(); + + ManualCookFinishPopup *p = new ManualCookFinishPopup(this, oven->mode() != Define::CombiMode); + p->showFullScreen(); + connect(p, SIGNAL(keepWarm()), SLOT(startKeepWarm())); + connect(p, SIGNAL(destroyed()), SLOT(focusAgain())); } } diff --git a/app/gui/oven_control/manualcookwindow.h b/app/gui/oven_control/manualcookwindow.h index c35d461..f757e6c 100644 --- a/app/gui/oven_control/manualcookwindow.h +++ b/app/gui/oven_control/manualcookwindow.h @@ -42,6 +42,7 @@ private slots: void showCurrentTemp(); void hideCurrentTemp(); void showInfoText(QString text, QString icon); + void startKeepWarm(); void onOvenUpdated(Oven *oven); diff --git a/app/gui/oven_control/manualcookwindow.ui b/app/gui/oven_control/manualcookwindow.ui index 7a66f38..9b25da2 100644 --- a/app/gui/oven_control/manualcookwindow.ui +++ b/app/gui/oven_control/manualcookwindow.ui @@ -74,89 +74,10 @@ height: 33px; 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -1370,42 +1291,12 @@ margin: 200px 200px; - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- - Slider QWidget
slider.h
diff --git a/app/gui/oven_control/modelsettingwindow.ui b/app/gui/oven_control/modelsettingwindow.ui index ed26264..f76628c 100644 --- a/app/gui/oven_control/modelsettingwindow.ui +++ b/app/gui/oven_control/modelsettingwindow.ui @@ -346,89 +346,10 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -436,41 +357,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/379_o - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- diff --git a/app/gui/oven_control/multicookautowindow.ui b/app/gui/oven_control/multicookautowindow.ui index 45662fb..c75305f 100644 --- a/app/gui/oven_control/multicookautowindow.ui +++ b/app/gui/oven_control/multicookautowindow.ui @@ -24,89 +24,10 @@ 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -189,41 +110,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- diff --git a/app/gui/oven_control/multicookmanualwindow.ui b/app/gui/oven_control/multicookmanualwindow.ui index 68ac889..efb855e 100644 --- a/app/gui/oven_control/multicookmanualwindow.ui +++ b/app/gui/oven_control/multicookmanualwindow.ui @@ -721,89 +721,10 @@ QPushButton:checked { background-image: url(:/images/cook_mode/big_steam.png); } 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -873,42 +794,12 @@ QPushButton:checked { image: url(:/images/slider_icon/temp_ov.png); } - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- - Slider QWidget
slider.h
diff --git a/app/gui/oven_control/multicookwindow.ui b/app/gui/oven_control/multicookwindow.ui index abefd6c..9b85da8 100644 --- a/app/gui/oven_control/multicookwindow.ui +++ b/app/gui/oven_control/multicookwindow.ui @@ -447,89 +447,10 @@ QPushButton:focus 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -1224,42 +1145,12 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0 - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- - AnimatedImageBox QLabel
animatedimagebox.h
diff --git a/app/gui/oven_control/operationtimeheat.ui b/app/gui/oven_control/operationtimeheat.ui index a879595..ac3316c 100644 --- a/app/gui/oven_control/operationtimeheat.ui +++ b/app/gui/oven_control/operationtimeheat.ui @@ -28,89 +28,10 @@ 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -413,41 +334,11 @@ QPushButton { text-align: center;} - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- diff --git a/app/gui/oven_control/operationtimemain.ui b/app/gui/oven_control/operationtimemain.ui index 9190913..188160d 100644 --- a/app/gui/oven_control/operationtimemain.ui +++ b/app/gui/oven_control/operationtimemain.ui @@ -27,89 +27,10 @@ 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -377,41 +298,11 @@ QPushButton { text-align: center;} - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- diff --git a/app/gui/oven_control/operationtimemode.ui b/app/gui/oven_control/operationtimemode.ui index 442f934..0e0af10 100644 --- a/app/gui/oven_control/operationtimemode.ui +++ b/app/gui/oven_control/operationtimemode.ui @@ -28,89 +28,10 @@ 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -833,41 +754,11 @@ QPushButton { text-align: center;} - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- diff --git a/app/gui/oven_control/operationtimeparts.ui b/app/gui/oven_control/operationtimeparts.ui index 0209ac6..16d70cf 100644 --- a/app/gui/oven_control/operationtimeparts.ui +++ b/app/gui/oven_control/operationtimeparts.ui @@ -28,89 +28,10 @@ 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -1106,41 +1027,11 @@ QPushButton { text-align: center;} - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- diff --git a/app/gui/oven_control/oven_control.pro b/app/gui/oven_control/oven_control.pro index e3b762a..85f5f0b 100644 --- a/app/gui/oven_control/oven_control.pro +++ b/app/gui/oven_control/oven_control.pro @@ -13,12 +13,15 @@ TEMPLATE = app SOURCES += main.cpp\ + commicon.cpp \ mainwindow.cpp \ cook.cpp \ + manualcookfinishpopup.cpp \ oven.cpp \ abstractoveninterface.cpp \ clock.cpp \ manualcookwindow.cpp \ + statusarea.cpp \ udphandler.cpp \ ovencontroller.cpp \ configwindow.cpp \ @@ -152,11 +155,14 @@ SOURCES += main.cpp\ HEADERS += mainwindow.h \ + commicon.h \ cook.h \ + manualcookfinishpopup.h \ oven.h \ abstractoveninterface.h \ clock.h \ manualcookwindow.h \ + statusarea.h \ udphandler.h \ ../../app-prime-modbus/include/all_share.h \ ovencontroller.h \ @@ -290,11 +296,13 @@ HEADERS += mainwindow.h \ waterlevelicon.h FORMS += mainwindow.ui \ + manualcookfinishpopup.ui \ manualcookwindow.ui \ configwindow.ui \ functiontestwindow.ui \ componenttestwindow.ui \ burnertestwindow.ui \ + statusarea.ui \ valvetestwindow.ui \ washtestwindow.ui \ fantestwindow.ui \ diff --git a/app/gui/oven_control/preheatpopup.cpp b/app/gui/oven_control/preheatpopup.cpp index 0f7526c..62197db 100644 --- a/app/gui/oven_control/preheatpopup.cpp +++ b/app/gui/oven_control/preheatpopup.cpp @@ -4,6 +4,7 @@ #include #include "stringer.h" +#include "soundplayer.h" PreheatPopup::PreheatPopup(QWidget *parent, Oven *oven) : QWidget(parent), @@ -119,6 +120,8 @@ void PreheatPopup::onOvenChanged() { if (oven->currentTemp() >= oven->temp()) { + SoundPlayer::playStop(); + stop(); close(); } diff --git a/app/gui/oven_control/primewindow.ui b/app/gui/oven_control/primewindow.ui index aac0614..a21430e 100644 --- a/app/gui/oven_control/primewindow.ui +++ b/app/gui/oven_control/primewindow.ui @@ -140,89 +140,10 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -357,41 +278,11 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/etc/main - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- mostCookedButton diff --git a/app/gui/oven_control/programmingautoconfigwindow.ui b/app/gui/oven_control/programmingautoconfigwindow.ui index c81d3d3..c11b144 100644 --- a/app/gui/oven_control/programmingautoconfigwindow.ui +++ b/app/gui/oven_control/programmingautoconfigwindow.ui @@ -505,89 +505,10 @@ border-image: url(:/images/button/288_ov.png); 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -1442,42 +1363,12 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- - Slider QWidget
slider.h
diff --git a/app/gui/oven_control/programmingautoselectionwindow.ui b/app/gui/oven_control/programmingautoselectionwindow.ui index e2b6779..9d08e1b 100644 --- a/app/gui/oven_control/programmingautoselectionwindow.ui +++ b/app/gui/oven_control/programmingautoselectionwindow.ui @@ -108,89 +108,10 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -217,41 +138,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0 - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- diff --git a/app/gui/oven_control/programmingmanualwindow.ui b/app/gui/oven_control/programmingmanualwindow.ui index be93350..5844074 100644 --- a/app/gui/oven_control/programmingmanualwindow.ui +++ b/app/gui/oven_control/programmingmanualwindow.ui @@ -133,89 +133,10 @@ height: 33px; 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -996,42 +917,12 @@ QPushButton:checked { background-image: url(:/images/cook_mode/big_combi.png); } - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- - Slider QWidget
slider.h
diff --git a/app/gui/oven_control/programmingselectionwindow.ui b/app/gui/oven_control/programmingselectionwindow.ui index 2153684..3835fc4 100644 --- a/app/gui/oven_control/programmingselectionwindow.ui +++ b/app/gui/oven_control/programmingselectionwindow.ui @@ -685,89 +685,10 @@ QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png); 0 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -775,41 +696,11 @@ QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png); - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- steamButton diff --git a/app/gui/oven_control/programmingwindow.ui b/app/gui/oven_control/programmingwindow.ui index aec030d..034fd20 100644 --- a/app/gui/oven_control/programmingwindow.ui +++ b/app/gui/oven_control/programmingwindow.ui @@ -71,89 +71,10 @@ background: none; 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -340,41 +261,11 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/etc/bar_ - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- autoButton diff --git a/app/gui/oven_control/realtimemain.ui b/app/gui/oven_control/realtimemain.ui index 8eeb987..aeebe32 100644 --- a/app/gui/oven_control/realtimemain.ui +++ b/app/gui/oven_control/realtimemain.ui @@ -27,89 +27,10 @@ 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -341,41 +262,11 @@ QPushButton { text-align: center;} - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- diff --git a/app/gui/oven_control/realtimepartswindow.ui b/app/gui/oven_control/realtimepartswindow.ui index eca7cfa..10540f0 100644 --- a/app/gui/oven_control/realtimepartswindow.ui +++ b/app/gui/oven_control/realtimepartswindow.ui @@ -28,89 +28,10 @@ 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -1083,41 +1004,11 @@ QPushButton { text-align: center;} - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- diff --git a/app/gui/oven_control/realtimesensorwindow.ui b/app/gui/oven_control/realtimesensorwindow.ui index 676430e..582ecb5 100644 --- a/app/gui/oven_control/realtimesensorwindow.ui +++ b/app/gui/oven_control/realtimesensorwindow.ui @@ -28,89 +28,10 @@ 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -1613,41 +1534,11 @@ QPushButton { text-align: center;} - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- diff --git a/app/gui/oven_control/servicehistorymain.ui b/app/gui/oven_control/servicehistorymain.ui index 35a4fe6..2e11272 100644 --- a/app/gui/oven_control/servicehistorymain.ui +++ b/app/gui/oven_control/servicehistorymain.ui @@ -27,89 +27,10 @@ 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -413,41 +334,11 @@ QPushButton { text-align: center;} - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- diff --git a/app/gui/oven_control/statusarea.cpp b/app/gui/oven_control/statusarea.cpp new file mode 100644 index 0000000..688cee3 --- /dev/null +++ b/app/gui/oven_control/statusarea.cpp @@ -0,0 +1,14 @@ +#include "statusarea.h" +#include "ui_statusarea.h" + +StatusArea::StatusArea(QWidget *parent) : + QWidget(parent), + ui(new Ui::StatusArea) +{ + ui->setupUi(this); +} + +StatusArea::~StatusArea() +{ + delete ui; +} diff --git a/app/gui/oven_control/statusarea.h b/app/gui/oven_control/statusarea.h new file mode 100644 index 0000000..eddab93 --- /dev/null +++ b/app/gui/oven_control/statusarea.h @@ -0,0 +1,22 @@ +#ifndef STATUSAREA_H +#define STATUSAREA_H + +#include + +namespace Ui { +class StatusArea; +} + +class StatusArea : public QWidget +{ + Q_OBJECT + +public: + explicit StatusArea(QWidget *parent = nullptr); + ~StatusArea(); + +private: + Ui::StatusArea *ui; +}; + +#endif // STATUSAREA_H diff --git a/app/gui/oven_control/statusarea.ui b/app/gui/oven_control/statusarea.ui new file mode 100644 index 0000000..9adfef8 --- /dev/null +++ b/app/gui/oven_control/statusarea.ui @@ -0,0 +1,155 @@ + + + StatusArea + + + + 0 + 0 + 900 + 426 + + + + Form + + + #StatusArea { background-image: url(:/images/clock/background.png); } + + + + + 662 + 164 + 111 + 121 + + + + + + + + + + 272 + 36 + 356 + 355 + + + + + + + 800 + 320 + 80 + 84 + + + + + + + 780 + 160 + 108 + 67 + + + + + + + 20 + 310 + 600 + 100 + + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + 780 + 230 + 101 + 90 + + + + + + + 670 + 290 + 111 + 121 + + + + + + + + + + 20 + 20 + 20 + 20 + + + + + + + Clock + QWidget +
clock.h
+ 1 + + + WashWarnIcon + QLabel +
washwarnicon.h
+ + + DemoIcon + QLabel +
demoicon.h
+ + + HalfEnergyIcon + QLabel +
halfenergyicon.h
+ + + DigitalClock + QLabel +
digitalclock.h
+ + + IgnitionIcon + QLabel +
ignitionicon.h
+ + + WaterLevelIcon + QLabel +
waterlevelicon.h
+ + + CommIcon + QWidget +
commicon.h
+ 1 + + + + + diff --git a/app/gui/oven_control/valvetestwindow.ui b/app/gui/oven_control/valvetestwindow.ui index 2c95167..1d7e1da 100644 --- a/app/gui/oven_control/valvetestwindow.ui +++ b/app/gui/oven_control/valvetestwindow.ui @@ -24,89 +24,10 @@ 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -1311,41 +1232,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- diff --git a/app/gui/oven_control/washtestwindow.ui b/app/gui/oven_control/washtestwindow.ui index 52dbb06..834e749 100644 --- a/app/gui/oven_control/washtestwindow.ui +++ b/app/gui/oven_control/washtestwindow.ui @@ -24,89 +24,10 @@ 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -710,41 +631,11 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/button/184_o - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- diff --git a/app/gui/oven_control/washwindow.ui b/app/gui/oven_control/washwindow.ui index 614a29e..c2705a8 100644 --- a/app/gui/oven_control/washwindow.ui +++ b/app/gui/oven_control/washwindow.ui @@ -67,89 +67,10 @@ border: none; 426 - + #clockContainer { background-image: url(:/images/clock/background.png); } - - - - 272 - 36 - 356 - 355 - - - - - - - 800 - 320 - 80 - 84 - - - - - - - 780 - 230 - 101 - 90 - - - - - - - 780 - 160 - 108 - 67 - - - - - - - 20 - 310 - 600 - 100 - - - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft - - - - - - 670 - 290 - 111 - 121 - - - - - - - - - - 662 - 164 - 111 - 121 - - - - - - @@ -1229,42 +1150,12 @@ QPushButton:pressed { image: url(:/images/slider_icon/clean_ov.png); } - Clock + StatusArea QWidget -
clock.h
+
statusarea.h
1 - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - - IgnitionIcon - QLabel -
ignitionicon.h
- - - WaterLevelIcon - QLabel -
waterlevelicon.h
- - AnimatedImageBox QLabel
animatedimagebox.h