diff --git a/app/gui/oven_control/adjustmentwindow.ui b/app/gui/oven_control/adjustmentwindow.ui
index 2fc201c..1b56e9a 100644
--- a/app/gui/oven_control/adjustmentwindow.ui
+++ b/app/gui/oven_control/adjustmentwindow.ui
@@ -44,6 +44,16 @@
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -248,6 +258,11 @@ QPushButton {
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/autocookconfigwindow.ui b/app/gui/oven_control/autocookconfigwindow.ui
index ca5e35b..36cd1e5 100644
--- a/app/gui/oven_control/autocookconfigwindow.ui
+++ b/app/gui/oven_control/autocookconfigwindow.ui
@@ -88,6 +88,16 @@ border: none;
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -1455,6 +1465,11 @@ border-image: url(:/images/button/152_ov.png);
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/autocookselectionwindow.ui b/app/gui/oven_control/autocookselectionwindow.ui
index 43b45cf..2471e20 100644
--- a/app/gui/oven_control/autocookselectionwindow.ui
+++ b/app/gui/oven_control/autocookselectionwindow.ui
@@ -41,6 +41,16 @@
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -174,6 +184,11 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); }clock.h
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/autocookwindow.ui b/app/gui/oven_control/autocookwindow.ui
index 0362416..9be5756 100644
--- a/app/gui/oven_control/autocookwindow.ui
+++ b/app/gui/oven_control/autocookwindow.ui
@@ -47,6 +47,16 @@ border: none;
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -1351,12 +1361,6 @@ QPushButton:pressed { border-image: url(:/images/button/152_ov.png); }
- BulletIndicator
- QWidget
-
- 1
-
-
Clock
QWidget
@@ -1368,6 +1372,17 @@ QPushButton:pressed { border-image: url(:/images/button/152_ov.png); }
+ WashWarnIcon
+ QLabel
+
+
+
+ BulletIndicator
+ QWidget
+
+ 1
+
+
HumidityCircularGauge
QWidget
diff --git a/app/gui/oven_control/basicsettingwindow.ui b/app/gui/oven_control/basicsettingwindow.ui
index 4f54275..07d997f 100644
--- a/app/gui/oven_control/basicsettingwindow.ui
+++ b/app/gui/oven_control/basicsettingwindow.ui
@@ -45,6 +45,16 @@
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -404,6 +414,11 @@ QPushButton { text-align: left;}
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/burnertestwindow.ui b/app/gui/oven_control/burnertestwindow.ui
index 1263023..de39636 100644
--- a/app/gui/oven_control/burnertestwindow.ui
+++ b/app/gui/oven_control/burnertestwindow.ui
@@ -41,6 +41,16 @@
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -2092,6 +2102,11 @@ QPushButton:pressed { border-image: url(:/images/button/184_ov.png); }
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/componenttestwindow.ui b/app/gui/oven_control/componenttestwindow.ui
index 021f105..55968db 100644
--- a/app/gui/oven_control/componenttestwindow.ui
+++ b/app/gui/oven_control/componenttestwindow.ui
@@ -41,6 +41,16 @@
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -499,6 +509,11 @@ QPushButton:pressed { border-image: url(:/images/button/184_ov.png); }
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/configwindow.ui b/app/gui/oven_control/configwindow.ui
index 0da82d9..f5eade8 100644
--- a/app/gui/oven_control/configwindow.ui
+++ b/app/gui/oven_control/configwindow.ui
@@ -80,6 +80,16 @@ background: none;
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -545,6 +555,11 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); }clock.h
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/electricmodelsettingwindow.ui b/app/gui/oven_control/electricmodelsettingwindow.ui
index 35ae986..6b61e66 100644
--- a/app/gui/oven_control/electricmodelsettingwindow.ui
+++ b/app/gui/oven_control/electricmodelsettingwindow.ui
@@ -451,6 +451,16 @@ QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -463,6 +473,11 @@ QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/engineermenuwindow.ui b/app/gui/oven_control/engineermenuwindow.ui
index 71f2189..761588a 100644
--- a/app/gui/oven_control/engineermenuwindow.ui
+++ b/app/gui/oven_control/engineermenuwindow.ui
@@ -44,6 +44,16 @@
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -600,6 +610,11 @@ QPushButton { color: rgb(255, 255, 255);text-align: left;padding-left:30px;}clock.h
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/fantestwindow.ui b/app/gui/oven_control/fantestwindow.ui
index d65f0de..973cc89 100644
--- a/app/gui/oven_control/fantestwindow.ui
+++ b/app/gui/oven_control/fantestwindow.ui
@@ -41,6 +41,16 @@
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -738,6 +748,11 @@ QPushButton:pressed { border-image: url(:/images/button/184_ov.png); }
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/functiontestwindow.ui b/app/gui/oven_control/functiontestwindow.ui
index 5dd4a6b..294d9de 100644
--- a/app/gui/oven_control/functiontestwindow.ui
+++ b/app/gui/oven_control/functiontestwindow.ui
@@ -47,6 +47,16 @@
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -576,6 +586,11 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); }clock.h
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/gasmodelsettingwindow.ui b/app/gui/oven_control/gasmodelsettingwindow.ui
index 83acf1a..5b73253 100644
--- a/app/gui/oven_control/gasmodelsettingwindow.ui
+++ b/app/gui/oven_control/gasmodelsettingwindow.ui
@@ -539,6 +539,16 @@ QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -639,6 +649,11 @@ QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/gastestwindow.ui b/app/gui/oven_control/gastestwindow.ui
index 5caae85..81bc741 100644
--- a/app/gui/oven_control/gastestwindow.ui
+++ b/app/gui/oven_control/gastestwindow.ui
@@ -41,6 +41,16 @@
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -120,6 +130,11 @@ QPushButton:pressed {
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/historylistwindow.ui b/app/gui/oven_control/historylistwindow.ui
index 59962d2..b7da729 100644
--- a/app/gui/oven_control/historylistwindow.ui
+++ b/app/gui/oven_control/historylistwindow.ui
@@ -199,6 +199,16 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/006_sys_icon_14_ov.p
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -1394,6 +1404,11 @@ QPushButton { text-align:center;}
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/mainwindow.ui b/app/gui/oven_control/mainwindow.ui
index 414d847..6201834 100644
--- a/app/gui/oven_control/mainwindow.ui
+++ b/app/gui/oven_control/mainwindow.ui
@@ -599,6 +599,16 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -688,6 +698,11 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
1
+
+ WashWarnIcon
+ QLabel
+
+
steamButton
diff --git a/app/gui/oven_control/manualcookwindow.ui b/app/gui/oven_control/manualcookwindow.ui
index 17f7727..105ccf1 100644
--- a/app/gui/oven_control/manualcookwindow.ui
+++ b/app/gui/oven_control/manualcookwindow.ui
@@ -99,6 +99,16 @@ height: 33px;
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -2337,6 +2347,11 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); }
QLabel
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/modelsettingwindow.ui b/app/gui/oven_control/modelsettingwindow.ui
index 3981085..2c46f23 100644
--- a/app/gui/oven_control/modelsettingwindow.ui
+++ b/app/gui/oven_control/modelsettingwindow.ui
@@ -363,6 +363,16 @@ QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -375,6 +385,11 @@ QPushButton:pressed { border-image: url(:/images/button/379_ov.png); }
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/operationtimeheat.ui b/app/gui/oven_control/operationtimeheat.ui
index 2b14532..866275b 100644
--- a/app/gui/oven_control/operationtimeheat.ui
+++ b/app/gui/oven_control/operationtimeheat.ui
@@ -45,6 +45,16 @@
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -352,6 +362,11 @@ QPushButton { text-align: center;}
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/operationtimemain.ui b/app/gui/oven_control/operationtimemain.ui
index d223b97..3e51397 100644
--- a/app/gui/oven_control/operationtimemain.ui
+++ b/app/gui/oven_control/operationtimemain.ui
@@ -44,6 +44,16 @@
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -313,6 +323,11 @@ QPushButton { text-align: center;}
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/operationtimemode.ui b/app/gui/oven_control/operationtimemode.ui
index facb15f..96d8b61 100644
--- a/app/gui/oven_control/operationtimemode.ui
+++ b/app/gui/oven_control/operationtimemode.ui
@@ -45,6 +45,16 @@
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -742,6 +752,11 @@ QPushButton { text-align: center;}
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/operationtimeparts.ui b/app/gui/oven_control/operationtimeparts.ui
index b5d2b1a..f13a1c4 100644
--- a/app/gui/oven_control/operationtimeparts.ui
+++ b/app/gui/oven_control/operationtimeparts.ui
@@ -45,6 +45,16 @@
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -1045,6 +1055,11 @@ QPushButton { text-align: center;}
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/oven_control.pro b/app/gui/oven_control/oven_control.pro
index e5268e8..db6020c 100644
--- a/app/gui/oven_control/oven_control.pro
+++ b/app/gui/oven_control/oven_control.pro
@@ -101,7 +101,8 @@ SOURCES += main.cpp\
system.cpp \
servicepassinputdlg.cpp \
backlight.cpp \
- dirtylevel.cpp
+ dirtylevel.cpp \
+ washwarnicon.cpp
HEADERS += mainwindow.h \
cook.h \
@@ -192,7 +193,8 @@ HEADERS += mainwindow.h \
system.h \
servicepassinputdlg.h \
backlight.h \
- dirtylevel.h
+ dirtylevel.h \
+ washwarnicon.h
FORMS += mainwindow.ui \
manualcookwindow.ui \
diff --git a/app/gui/oven_control/primewindow.ui b/app/gui/oven_control/primewindow.ui
index da0b3fa..5b7c75f 100644
--- a/app/gui/oven_control/primewindow.ui
+++ b/app/gui/oven_control/primewindow.ui
@@ -262,6 +262,16 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); }
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -311,6 +321,11 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); }clock.h
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/programmingwindow.ui b/app/gui/oven_control/programmingwindow.ui
index d5be026..70e5ee9 100644
--- a/app/gui/oven_control/programmingwindow.ui
+++ b/app/gui/oven_control/programmingwindow.ui
@@ -61,6 +61,16 @@ image-position: bottom;
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -198,6 +208,11 @@ QPushButton:pressed { background-image: url(:/images/etc/main_btn_02_ov.png); }<
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/realtimemain.ui b/app/gui/oven_control/realtimemain.ui
index 63cc57e..1340c1a 100644
--- a/app/gui/oven_control/realtimemain.ui
+++ b/app/gui/oven_control/realtimemain.ui
@@ -44,6 +44,16 @@
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -277,6 +287,11 @@ QPushButton { text-align: center;}
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/realtimepartswindow.ui b/app/gui/oven_control/realtimepartswindow.ui
index 3c429c5..2c4c791 100644
--- a/app/gui/oven_control/realtimepartswindow.ui
+++ b/app/gui/oven_control/realtimepartswindow.ui
@@ -45,6 +45,16 @@
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -998,6 +1008,11 @@ QPushButton { text-align: center;}
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/realtimesensorwindow.ui b/app/gui/oven_control/realtimesensorwindow.ui
index 97d2be2..d179a38 100644
--- a/app/gui/oven_control/realtimesensorwindow.ui
+++ b/app/gui/oven_control/realtimesensorwindow.ui
@@ -45,6 +45,16 @@
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -1332,6 +1342,11 @@ QPushButton { text-align: center;}
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/resources.qrc b/app/gui/oven_control/resources.qrc
index f1647db..f43dff4 100644
--- a/app/gui/oven_control/resources.qrc
+++ b/app/gui/oven_control/resources.qrc
@@ -545,5 +545,6 @@
images/config/105_icon_download_ov.png
images/config/105_icon_download.png
images/config/111_icon_upload.png
+ images/symbol/wash.png
diff --git a/app/gui/oven_control/servicehistorymain.ui b/app/gui/oven_control/servicehistorymain.ui
index 6ecd958..384d09d 100644
--- a/app/gui/oven_control/servicehistorymain.ui
+++ b/app/gui/oven_control/servicehistorymain.ui
@@ -44,6 +44,16 @@
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -349,6 +359,11 @@ QPushButton { text-align: center;}
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/valvetestwindow.ui b/app/gui/oven_control/valvetestwindow.ui
index ec7cc93..2af1162 100644
--- a/app/gui/oven_control/valvetestwindow.ui
+++ b/app/gui/oven_control/valvetestwindow.ui
@@ -41,6 +41,16 @@
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -1163,6 +1173,11 @@ QPushButton:pressed { border-image: url(:/images/button/184_ov.png); }
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/washtestwindow.ui b/app/gui/oven_control/washtestwindow.ui
index 4e289ab..6ff34de 100644
--- a/app/gui/oven_control/washtestwindow.ui
+++ b/app/gui/oven_control/washtestwindow.ui
@@ -41,6 +41,16 @@
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -649,6 +659,11 @@ QPushButton:pressed { border-image: url(:/images/button/184_ov.png); }
1
+
+ WashWarnIcon
+ QLabel
+
+
diff --git a/app/gui/oven_control/washwarnicon.cpp b/app/gui/oven_control/washwarnicon.cpp
index 8608b62..9838d9c 100644
--- a/app/gui/oven_control/washwarnicon.cpp
+++ b/app/gui/oven_control/washwarnicon.cpp
@@ -1,6 +1,31 @@
#include "washwarnicon.h"
-WashWarnIcon::WashWarnIcon()
+#include "config.h"
+#include "dirtylevel.h"
+
+QPixmap *WashWarnIcon::icon = NULL;
+
+WashWarnIcon::WashWarnIcon(QWidget *parent) : QLabel(parent)
{
+ if (icon == NULL)
+ icon = new QPixmap(":/images/symbol/wash.png");
+
+ connect(&timer, SIGNAL(timeout()), SLOT(check()));
+ timer.start(1000);
+
+ setPixmap(*icon);
+ check();
}
+
+void WashWarnIcon::check()
+{
+ Define::config_item item = Config::getInstance()->getConfigValue(Define::config_duty_wash);
+ if (item.d32 == 0)
+ hide();
+ else if (DirtyLevel::dirty() > 0 || DirtyLevel::state() > 0)
+ show();
+ else
+ hide();
+}
+
diff --git a/app/gui/oven_control/washwarnicon.h b/app/gui/oven_control/washwarnicon.h
index 3dcdf58..12897e0 100644
--- a/app/gui/oven_control/washwarnicon.h
+++ b/app/gui/oven_control/washwarnicon.h
@@ -2,10 +2,21 @@
#define WASHWARNICON_H
+#include
+#include
+
class WashWarnIcon : public QLabel
{
+ Q_OBJECT
+
+ static QPixmap *icon;
+ QTimer timer;
+
public:
- WashWarnIcon();
+ explicit WashWarnIcon(QWidget *parent = 0);
+
+private slots:
+ void check();
};
-#endif // WASHWARNICON_H
\ No newline at end of file
+#endif // WASHWARNICON_H
diff --git a/app/gui/oven_control/washwindow.ui b/app/gui/oven_control/washwindow.ui
index d554ca7..e1491bf 100644
--- a/app/gui/oven_control/washwindow.ui
+++ b/app/gui/oven_control/washwindow.ui
@@ -84,6 +84,16 @@ border: none;
+
+
+
+ 800
+ 320
+ 80
+ 84
+
+
+
@@ -1167,6 +1177,11 @@ QPushButton:pressed { image: url(:/images/slider_icon/clean_ov.png); }
1
+
+ WashWarnIcon
+ QLabel
+
+