diff --git a/app/gui/oven_control/adjustmentwindow.ui b/app/gui/oven_control/adjustmentwindow.ui index 1b56e9a..0453d0f 100644 --- a/app/gui/oven_control/adjustmentwindow.ui +++ b/app/gui/oven_control/adjustmentwindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/config_service.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } @@ -173,7 +170,7 @@ QPushButton { text-align: left;padding-left:30px;} color: rgb(255, 255, 255); - EM-1 + EM-1 Qt::AlignCenter @@ -218,7 +215,7 @@ QPushButton { } - 0/ 00:00 + 0/ 00:00 diff --git a/app/gui/oven_control/autocookconfigwindow.ui b/app/gui/oven_control/autocookconfigwindow.ui index 36cd1e5..42d5cd0 100644 --- a/app/gui/oven_control/autocookconfigwindow.ui +++ b/app/gui/oven_control/autocookconfigwindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/auto.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/autocookselectionwindow.ui b/app/gui/oven_control/autocookselectionwindow.ui index 2471e20..9e45a28 100644 --- a/app/gui/oven_control/autocookselectionwindow.ui +++ b/app/gui/oven_control/autocookselectionwindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/auto.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/autocooksettingwidget.ui b/app/gui/oven_control/autocooksettingwidget.ui index 62d5a15..4502e47 100644 --- a/app/gui/oven_control/autocooksettingwidget.ui +++ b/app/gui/oven_control/autocooksettingwidget.ui @@ -10,9 +10,6 @@ 1024 - - Form - #background { background-image: url(:/images/background/auto.png); diff --git a/app/gui/oven_control/autocookwindow.ui b/app/gui/oven_control/autocookwindow.ui index 606447a..4e31f4e 100644 --- a/app/gui/oven_control/autocookwindow.ui +++ b/app/gui/oven_control/autocookwindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/auto_steps.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/basicsettingwindow.ui b/app/gui/oven_control/basicsettingwindow.ui index 07d997f..7187677 100644 --- a/app/gui/oven_control/basicsettingwindow.ui +++ b/app/gui/oven_control/basicsettingwindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/config_service.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/burnertestwindow.ui b/app/gui/oven_control/burnertestwindow.ui index de39636..d97d0d1 100644 --- a/app/gui/oven_control/burnertestwindow.ui +++ b/app/gui/oven_control/burnertestwindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/config_service.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/componenttestwindow.ui b/app/gui/oven_control/componenttestwindow.ui index 55968db..b9df90b 100644 --- a/app/gui/oven_control/componenttestwindow.ui +++ b/app/gui/oven_control/componenttestwindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/config_service.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/config1digitsetandenablesetdlg.ui b/app/gui/oven_control/config1digitsetandenablesetdlg.ui index 23f1d2e..48f9bf1 100644 --- a/app/gui/oven_control/config1digitsetandenablesetdlg.ui +++ b/app/gui/oven_control/config1digitsetandenablesetdlg.ui @@ -10,9 +10,6 @@ 1600 - - Dialog - #ConfigDateTimeDlg{ /*background-color : transparent;*/ diff --git a/app/gui/oven_control/config1digitsetdlg.ui b/app/gui/oven_control/config1digitsetdlg.ui index 9b29d85..6016c73 100644 --- a/app/gui/oven_control/config1digitsetdlg.ui +++ b/app/gui/oven_control/config1digitsetdlg.ui @@ -10,9 +10,6 @@ 1600 - - Dialog - #ConfigDateTimeDlg{ /*background-color : transparent;*/ diff --git a/app/gui/oven_control/configbacklightdlg.ui b/app/gui/oven_control/configbacklightdlg.ui index 8966207..2df3522 100644 --- a/app/gui/oven_control/configbacklightdlg.ui +++ b/app/gui/oven_control/configbacklightdlg.ui @@ -10,9 +10,6 @@ 1600 - - Dialog - false diff --git a/app/gui/oven_control/configdatetimedlg.ui b/app/gui/oven_control/configdatetimedlg.ui index 5ee2eb4..996483a 100644 --- a/app/gui/oven_control/configdatetimedlg.ui +++ b/app/gui/oven_control/configdatetimedlg.ui @@ -10,9 +10,6 @@ 1600 - - Dialog - #ConfigDateTimeDlg{ /*background-color : transparent;*/ diff --git a/app/gui/oven_control/configdoormonitoring.ui b/app/gui/oven_control/configdoormonitoring.ui index 75889c7..fe2d09d 100644 --- a/app/gui/oven_control/configdoormonitoring.ui +++ b/app/gui/oven_control/configdoormonitoring.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/config_service.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } @@ -55,9 +52,6 @@ - clock - label - gridLayoutWidget @@ -515,8 +509,6 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); } - ctrLbTitle - gridLayoutWidget diff --git a/app/gui/oven_control/configdutywashdlg.ui b/app/gui/oven_control/configdutywashdlg.ui index d6ce395..7290024 100644 --- a/app/gui/oven_control/configdutywashdlg.ui +++ b/app/gui/oven_control/configdutywashdlg.ui @@ -10,9 +10,6 @@ 1600 - - Dialog - false diff --git a/app/gui/oven_control/configfavoritebutton.ui b/app/gui/oven_control/configfavoritebutton.ui index 2f953f4..36bb32c 100644 --- a/app/gui/oven_control/configfavoritebutton.ui +++ b/app/gui/oven_control/configfavoritebutton.ui @@ -22,9 +22,6 @@ 65 - - Form - QPushButton { background-position: center; diff --git a/app/gui/oven_control/configfileprocessdlg.ui b/app/gui/oven_control/configfileprocessdlg.ui index 638af30..603274b 100644 --- a/app/gui/oven_control/configfileprocessdlg.ui +++ b/app/gui/oven_control/configfileprocessdlg.ui @@ -10,9 +10,6 @@ 1600 - - Dialog - 1.000000000000000 diff --git a/app/gui/oven_control/confighalfenergydlg.ui b/app/gui/oven_control/confighalfenergydlg.ui index fe10051..c8e57fe 100644 --- a/app/gui/oven_control/confighalfenergydlg.ui +++ b/app/gui/oven_control/confighalfenergydlg.ui @@ -10,9 +10,6 @@ 1600 - - Dialog - false diff --git a/app/gui/oven_control/configinfodlg.ui b/app/gui/oven_control/configinfodlg.ui index 1642392..911aad3 100644 --- a/app/gui/oven_control/configinfodlg.ui +++ b/app/gui/oven_control/configinfodlg.ui @@ -10,9 +10,6 @@ 1600 - - Dialog - #ConfigDateTimeDlg{ /*background-color : transparent;*/ diff --git a/app/gui/oven_control/configipdlg.ui b/app/gui/oven_control/configipdlg.ui index 2618fca..be20566 100644 --- a/app/gui/oven_control/configipdlg.ui +++ b/app/gui/oven_control/configipdlg.ui @@ -10,9 +10,6 @@ 1600 - - Dialog - #ConfigDateTimeDlg{ /*background-color : transparent;*/ diff --git a/app/gui/oven_control/configlanguagedlg.ui b/app/gui/oven_control/configlanguagedlg.ui index 94f18c3..211b49b 100644 --- a/app/gui/oven_control/configlanguagedlg.ui +++ b/app/gui/oven_control/configlanguagedlg.ui @@ -10,9 +10,6 @@ 1600 - - Dialog - false @@ -253,8 +250,6 @@ QLabel{ - label - line diff --git a/app/gui/oven_control/configmastervolumedlg.ui b/app/gui/oven_control/configmastervolumedlg.ui index 8fa3238..ca6b225 100644 --- a/app/gui/oven_control/configmastervolumedlg.ui +++ b/app/gui/oven_control/configmastervolumedlg.ui @@ -10,9 +10,6 @@ 1600 - - Dialog - false diff --git a/app/gui/oven_control/configpanelbutton.ui b/app/gui/oven_control/configpanelbutton.ui index 3fa9217..14ee294 100644 --- a/app/gui/oven_control/configpanelbutton.ui +++ b/app/gui/oven_control/configpanelbutton.ui @@ -22,9 +22,6 @@ 65 - - Form - QPushButton { background-position: center; diff --git a/app/gui/oven_control/configresttimeformatdlg.ui b/app/gui/oven_control/configresttimeformatdlg.ui index ba01656..d049654 100644 --- a/app/gui/oven_control/configresttimeformatdlg.ui +++ b/app/gui/oven_control/configresttimeformatdlg.ui @@ -10,9 +10,6 @@ 1600 - - Dialog - false diff --git a/app/gui/oven_control/configsoundselelectdlg.ui b/app/gui/oven_control/configsoundselelectdlg.ui index 7efe246..0d7aea2 100644 --- a/app/gui/oven_control/configsoundselelectdlg.ui +++ b/app/gui/oven_control/configsoundselelectdlg.ui @@ -10,9 +10,6 @@ 1600 - - Dialog - false diff --git a/app/gui/oven_control/configtemptypedlg.ui b/app/gui/oven_control/configtemptypedlg.ui index ffd287c..42a2762 100644 --- a/app/gui/oven_control/configtemptypedlg.ui +++ b/app/gui/oven_control/configtemptypedlg.ui @@ -10,9 +10,6 @@ 1600 - - Dialog - false @@ -218,8 +215,6 @@ QLabel{ - label - line diff --git a/app/gui/oven_control/configtimeformatdlg.ui b/app/gui/oven_control/configtimeformatdlg.ui index 4e13c46..b289052 100644 --- a/app/gui/oven_control/configtimeformatdlg.ui +++ b/app/gui/oven_control/configtimeformatdlg.ui @@ -10,9 +10,6 @@ 1600 - - Dialog - false diff --git a/app/gui/oven_control/configwindow.ui b/app/gui/oven_control/configwindow.ui index f5eade8..49ec6f9 100644 --- a/app/gui/oven_control/configwindow.ui +++ b/app/gui/oven_control/configwindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/config.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/confirmpopup.ui b/app/gui/oven_control/confirmpopup.ui index f80787f..24bed4f 100644 --- a/app/gui/oven_control/confirmpopup.ui +++ b/app/gui/oven_control/confirmpopup.ui @@ -10,9 +10,6 @@ 1600 - - Form - #text { color: white; } QPushButton { color: white; border: none; } diff --git a/app/gui/oven_control/cookpanelbutton.ui b/app/gui/oven_control/cookpanelbutton.ui index 1452177..a9dd184 100644 --- a/app/gui/oven_control/cookpanelbutton.ui +++ b/app/gui/oven_control/cookpanelbutton.ui @@ -22,9 +22,6 @@ 65 - - Form - QPushButton { background-position: center; diff --git a/app/gui/oven_control/cooldownpopup.ui b/app/gui/oven_control/cooldownpopup.ui index abbdf78..e662ad2 100644 --- a/app/gui/oven_control/cooldownpopup.ui +++ b/app/gui/oven_control/cooldownpopup.ui @@ -10,9 +10,6 @@ 1600 - - Form - #closeButton { border: none; } #closeButton_2 { border: none; } diff --git a/app/gui/oven_control/coretempsettingpopup.ui b/app/gui/oven_control/coretempsettingpopup.ui index 2fabf6f..93fe71b 100644 --- a/app/gui/oven_control/coretempsettingpopup.ui +++ b/app/gui/oven_control/coretempsettingpopup.ui @@ -10,9 +10,6 @@ 1600 - - Form - #background { background-image: url(:/images/background/manual_core.png); diff --git a/app/gui/oven_control/dotprogressbarwidget.ui b/app/gui/oven_control/dotprogressbarwidget.ui index b4bc3fd..3f2bc9c 100644 --- a/app/gui/oven_control/dotprogressbarwidget.ui +++ b/app/gui/oven_control/dotprogressbarwidget.ui @@ -1,32 +1,27 @@ + - - - DotProgressBarWidget - - - 0 - 0 - 710 - 126 - - - - Form - - - - 0 + + + 0 + 0 + 710 + 126 + - - 0 - - - - - - - - + + + 0 + + + 0 + + + + + + + + diff --git a/app/gui/oven_control/electricmodelsettingwindow.ui b/app/gui/oven_control/electricmodelsettingwindow.ui index 6b61e66..40eea48 100644 --- a/app/gui/oven_control/electricmodelsettingwindow.ui +++ b/app/gui/oven_control/electricmodelsettingwindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/config_service.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/engineermenuwindow.ui b/app/gui/oven_control/engineermenuwindow.ui index 761588a..3d5a05a 100644 --- a/app/gui/oven_control/engineermenuwindow.ui +++ b/app/gui/oven_control/engineermenuwindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/config_service.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/errorpopupdlg.ui b/app/gui/oven_control/errorpopupdlg.ui index 1b733f6..863ecbf 100644 --- a/app/gui/oven_control/errorpopupdlg.ui +++ b/app/gui/oven_control/errorpopupdlg.ui @@ -10,9 +10,6 @@ 1600 - - Dialog - #centralwidget { background-image: url(:/images/error/background.png); } QDialog { background: transparent; } diff --git a/app/gui/oven_control/fantestwindow.ui b/app/gui/oven_control/fantestwindow.ui index 973cc89..dc7addc 100644 --- a/app/gui/oven_control/fantestwindow.ui +++ b/app/gui/oven_control/fantestwindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/config_service.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/favoritenamepopup.ui b/app/gui/oven_control/favoritenamepopup.ui index b03e4c9..729e685 100644 --- a/app/gui/oven_control/favoritenamepopup.ui +++ b/app/gui/oven_control/favoritenamepopup.ui @@ -10,9 +10,6 @@ 1600 - - Form - #background { background-image: url(:/images/background/popup/503.png); } QLabel, QPushButton, QLineEdit { color: white; } diff --git a/app/gui/oven_control/fileprocessdlg.ui b/app/gui/oven_control/fileprocessdlg.ui index 9016434..3fbd7d8 100644 --- a/app/gui/oven_control/fileprocessdlg.ui +++ b/app/gui/oven_control/fileprocessdlg.ui @@ -10,9 +10,6 @@ 1600 - - Dialog - 1.000000000000000 diff --git a/app/gui/oven_control/functiontestwindow.ui b/app/gui/oven_control/functiontestwindow.ui index 294d9de..a8eca7e 100644 --- a/app/gui/oven_control/functiontestwindow.ui +++ b/app/gui/oven_control/functiontestwindow.ui @@ -16,9 +16,6 @@ 18 - - MainWindow - #centralwidget { background-image: url(:/images/background/config_service.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/gasmodelsettingwindow.ui b/app/gui/oven_control/gasmodelsettingwindow.ui index 5b73253..a2b38f8 100644 --- a/app/gui/oven_control/gasmodelsettingwindow.ui +++ b/app/gui/oven_control/gasmodelsettingwindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/config_service.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/gastestwindow.ui b/app/gui/oven_control/gastestwindow.ui index 81bc741..5bd169f 100644 --- a/app/gui/oven_control/gastestwindow.ui +++ b/app/gui/oven_control/gastestwindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/config_service.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/historylistwindow.ui b/app/gui/oven_control/historylistwindow.ui index b7da729..9877149 100644 --- a/app/gui/oven_control/historylistwindow.ui +++ b/app/gui/oven_control/historylistwindow.ui @@ -16,9 +16,6 @@ 0 - - MainWindow - QLabel[style = "info"]{font-size : 8pt} diff --git a/app/gui/oven_control/keepwarmpopup.ui b/app/gui/oven_control/keepwarmpopup.ui index 7175348..70fc630 100644 --- a/app/gui/oven_control/keepwarmpopup.ui +++ b/app/gui/oven_control/keepwarmpopup.ui @@ -10,9 +10,6 @@ 1600 - - Form - #background { background-image: url(:/images/background/popup/668.png); } QPushButton { border: none; } diff --git a/app/gui/oven_control/keyboardwidget.ui b/app/gui/oven_control/keyboardwidget.ui index 1bc2013..5de7ed1 100644 --- a/app/gui/oven_control/keyboardwidget.ui +++ b/app/gui/oven_control/keyboardwidget.ui @@ -10,9 +10,6 @@ 600 - - Form - #KeyboardWidget{ background-color: rgba(25, 25, 25, 200); diff --git a/app/gui/oven_control/mainwindow.ui b/app/gui/oven_control/mainwindow.ui index ab5a4c3..1745ca3 100644 --- a/app/gui/oven_control/mainwindow.ui +++ b/app/gui/oven_control/mainwindow.ui @@ -16,9 +16,6 @@ 0 - - MainWindow - true diff --git a/app/gui/oven_control/manualcooksettingwidget.ui b/app/gui/oven_control/manualcooksettingwidget.ui index 9393bae..a681208 100644 --- a/app/gui/oven_control/manualcooksettingwidget.ui +++ b/app/gui/oven_control/manualcooksettingwidget.ui @@ -10,9 +10,6 @@ 1024 - - Form - #background { background-image: url(:/images/background/manual.png); diff --git a/app/gui/oven_control/manualcookwindow.ui b/app/gui/oven_control/manualcookwindow.ui index 0e9eaf6..26378d7 100644 --- a/app/gui/oven_control/manualcookwindow.ui +++ b/app/gui/oven_control/manualcookwindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #bottomBar { background-image: url(:/images/bottom_bar/background.png); } #centralwidget { background-image: url(:/images/background/manual.png); } diff --git a/app/gui/oven_control/modelsettingwindow.ui b/app/gui/oven_control/modelsettingwindow.ui index 2c46f23..22c9c38 100644 --- a/app/gui/oven_control/modelsettingwindow.ui +++ b/app/gui/oven_control/modelsettingwindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/config_service.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/operationtimeheat.ui b/app/gui/oven_control/operationtimeheat.ui index 866275b..09f6f5d 100644 --- a/app/gui/oven_control/operationtimeheat.ui +++ b/app/gui/oven_control/operationtimeheat.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/config_service.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/operationtimemain.ui b/app/gui/oven_control/operationtimemain.ui index 3e51397..0a41621 100644 --- a/app/gui/oven_control/operationtimemain.ui +++ b/app/gui/oven_control/operationtimemain.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/config_service.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/operationtimemode.ui b/app/gui/oven_control/operationtimemode.ui index 96d8b61..1c005ff 100644 --- a/app/gui/oven_control/operationtimemode.ui +++ b/app/gui/oven_control/operationtimemode.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/config_service.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/operationtimeparts.ui b/app/gui/oven_control/operationtimeparts.ui index f13a1c4..24dd40b 100644 --- a/app/gui/oven_control/operationtimeparts.ui +++ b/app/gui/oven_control/operationtimeparts.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/config_service.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/preheatpopup.ui b/app/gui/oven_control/preheatpopup.ui index 66cda50..1c0997d 100644 --- a/app/gui/oven_control/preheatpopup.ui +++ b/app/gui/oven_control/preheatpopup.ui @@ -10,9 +10,6 @@ 1600 - - Form - #closeButton { border: none; } #closeButton_2 { border: none; } diff --git a/app/gui/oven_control/primewindow.ui b/app/gui/oven_control/primewindow.ui index 5b7c75f..9a38aca 100644 --- a/app/gui/oven_control/primewindow.ui +++ b/app/gui/oven_control/primewindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/etc.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/programmingautoconfigwindow.ui b/app/gui/oven_control/programmingautoconfigwindow.ui index 9d52f0c..fedb227 100644 --- a/app/gui/oven_control/programmingautoconfigwindow.ui +++ b/app/gui/oven_control/programmingautoconfigwindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/auto.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/programmingautoselectionwindow.ui b/app/gui/oven_control/programmingautoselectionwindow.ui index acda156..be491cd 100644 --- a/app/gui/oven_control/programmingautoselectionwindow.ui +++ b/app/gui/oven_control/programmingautoselectionwindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/auto.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/programmingmanualcoretemppopup.ui b/app/gui/oven_control/programmingmanualcoretemppopup.ui index 5740cbe..6aafd1d 100644 --- a/app/gui/oven_control/programmingmanualcoretemppopup.ui +++ b/app/gui/oven_control/programmingmanualcoretemppopup.ui @@ -10,9 +10,6 @@ 1600 - - Form - #background { background-image: url(:/images/background/manual_core.png); @@ -221,8 +218,6 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); } applyButton coreTempLabel - - - + diff --git a/app/gui/oven_control/programmingmanualwindow.ui b/app/gui/oven_control/programmingmanualwindow.ui index 83b5e66..84faa93 100644 --- a/app/gui/oven_control/programmingmanualwindow.ui +++ b/app/gui/oven_control/programmingmanualwindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #bottomBar { background-image: url(:/images/bottom_bar/background.png); } #centralwidget { background-image: url(:/images/background/manual.png); } diff --git a/app/gui/oven_control/programmingnamepopup.ui b/app/gui/oven_control/programmingnamepopup.ui index cd199c9..d949d67 100644 --- a/app/gui/oven_control/programmingnamepopup.ui +++ b/app/gui/oven_control/programmingnamepopup.ui @@ -10,9 +10,6 @@ 1600 - - Form - #background { background-image: url(:/images/background/popup/503.png); } QLabel, QPushButton, QLineEdit { color: white; } diff --git a/app/gui/oven_control/programmingselectionwindow.ui b/app/gui/oven_control/programmingselectionwindow.ui index 245a7a8..fe253bd 100644 --- a/app/gui/oven_control/programmingselectionwindow.ui +++ b/app/gui/oven_control/programmingselectionwindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/main.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/programmingwindow.ui b/app/gui/oven_control/programmingwindow.ui index e8c37c4..695df0c 100644 --- a/app/gui/oven_control/programmingwindow.ui +++ b/app/gui/oven_control/programmingwindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/etc.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/realtimemain.ui b/app/gui/oven_control/realtimemain.ui index 1340c1a..2c03f2b 100644 --- a/app/gui/oven_control/realtimemain.ui +++ b/app/gui/oven_control/realtimemain.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/config_service.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/realtimepartswindow.ui b/app/gui/oven_control/realtimepartswindow.ui index 2c4c791..4d2d589 100644 --- a/app/gui/oven_control/realtimepartswindow.ui +++ b/app/gui/oven_control/realtimepartswindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/config_service.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/realtimesensorwindow.ui b/app/gui/oven_control/realtimesensorwindow.ui index d179a38..cc0ea4d 100644 --- a/app/gui/oven_control/realtimesensorwindow.ui +++ b/app/gui/oven_control/realtimesensorwindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/config_service.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/reservedtimepopup.ui b/app/gui/oven_control/reservedtimepopup.ui index 70d44ab..b553bba 100644 --- a/app/gui/oven_control/reservedtimepopup.ui +++ b/app/gui/oven_control/reservedtimepopup.ui @@ -10,9 +10,6 @@ 1600 - - Form - #background { background-image: url(:/images/background/popup/503.png); } QLabel, QPushButton, QLineEdit { color: white; } diff --git a/app/gui/oven_control/reservetimepopup.ui b/app/gui/oven_control/reservetimepopup.ui index 0e26ceb..09a6dbf 100644 --- a/app/gui/oven_control/reservetimepopup.ui +++ b/app/gui/oven_control/reservetimepopup.ui @@ -10,9 +10,6 @@ 1600 - - Form - #background { background-image: url(:/images/background/popup/503.png); } QLabel, QPushButton, QLineEdit { color: white; } diff --git a/app/gui/oven_control/servicehistorymain.ui b/app/gui/oven_control/servicehistorymain.ui index 384d09d..ca3634f 100644 --- a/app/gui/oven_control/servicehistorymain.ui +++ b/app/gui/oven_control/servicehistorymain.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/config_service.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/servicepassinputdlg.ui b/app/gui/oven_control/servicepassinputdlg.ui index 0ceebc0..7bad869 100644 --- a/app/gui/oven_control/servicepassinputdlg.ui +++ b/app/gui/oven_control/servicepassinputdlg.ui @@ -10,9 +10,6 @@ 1600 - - Dialog - #ConfigDateTimeDlg{ /*background-color : transparent;*/ diff --git a/app/gui/oven_control/usbcheckpopupdlg.ui b/app/gui/oven_control/usbcheckpopupdlg.ui index 7add1a8..8c0187b 100644 --- a/app/gui/oven_control/usbcheckpopupdlg.ui +++ b/app/gui/oven_control/usbcheckpopupdlg.ui @@ -10,9 +10,6 @@ 1600 - - Dialog - 1.000000000000000 diff --git a/app/gui/oven_control/valvetestwindow.ui b/app/gui/oven_control/valvetestwindow.ui index 2af1162..2d22309 100644 --- a/app/gui/oven_control/valvetestwindow.ui +++ b/app/gui/oven_control/valvetestwindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/config_service.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/washtestwindow.ui b/app/gui/oven_control/washtestwindow.ui index 6ff34de..6530551 100644 --- a/app/gui/oven_control/washtestwindow.ui +++ b/app/gui/oven_control/washtestwindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/config_service.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } diff --git a/app/gui/oven_control/washwindow.ui b/app/gui/oven_control/washwindow.ui index e1491bf..e7fc06f 100644 --- a/app/gui/oven_control/washwindow.ui +++ b/app/gui/oven_control/washwindow.ui @@ -10,9 +10,6 @@ 1600 - - MainWindow - #centralwidget { background-image: url(:/images/background/original.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } @@ -1167,6 +1164,11 @@ QPushButton:pressed { image: url(:/images/slider_icon/clean_ov.png); } 1 + WashWarnIcon + QLabel +
washwarnicon.h
+
+ AnimatedImageBox QLabel
animatedimagebox.h
@@ -1177,11 +1179,6 @@ QPushButton:pressed { image: url(:/images/slider_icon/clean_ov.png); }
washstepgauge.h
1
- - WashWarnIcon - QLabel -
washwarnicon.h
-
diff --git a/app/gui/oven_control/yesnopopupdlg.ui b/app/gui/oven_control/yesnopopupdlg.ui index 89cee75..d5da19e 100644 --- a/app/gui/oven_control/yesnopopupdlg.ui +++ b/app/gui/oven_control/yesnopopupdlg.ui @@ -10,9 +10,6 @@ 1600
- - Dialog - 1.000000000000000