에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit c2ade431c9cf3df666b1c22a1bb4ca3bb3090f2b

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

모든 폼에서 창 제목 제거

Showing 73 changed files with 30 additions and 262 deletions   Show diff stats
app/gui/oven_control/adjustmentwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }</string>
... ... @@ -173,7 +170,7 @@ QPushButton { text-align: left;padding-left:30px;}
173 170 <string notr="true">color: rgb(255, 255, 255);</string>
174 171 </property>
175 172 <property name="text">
176   - <string>EM-1</string>
  173 + <string notr="true">EM-1</string>
177 174 </property>
178 175 <property name="alignment">
179 176 <set>Qt::AlignCenter</set>
... ... @@ -218,7 +215,7 @@ QPushButton {
218 215 }</string>
219 216 </property>
220 217 <property name="text">
221   - <string>0/ 00:00</string>
  218 + <string notr="true">0/ 00:00</string>
222 219 </property>
223 220 <property name="iconSize">
224 221 <size>
... ...
app/gui/oven_control/autocookconfigwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/auto.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }
... ...
app/gui/oven_control/autocookselectionwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/auto.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }</string>
... ...
app/gui/oven_control/autocooksettingwidget.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1024</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Form</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#background {
18 15 background-image: url(:/images/background/auto.png);
... ...
app/gui/oven_control/autocookwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/auto_steps.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }
... ...
app/gui/oven_control/basicsettingwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }
... ...
app/gui/oven_control/burnertestwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }</string>
... ...
app/gui/oven_control/componenttestwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }</string>
... ...
app/gui/oven_control/config1digitsetandenablesetdlg.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Dialog</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#ConfigDateTimeDlg{
18 15 /*background-color : transparent;*/
... ...
app/gui/oven_control/config1digitsetdlg.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Dialog</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#ConfigDateTimeDlg{
18 15 /*background-color : transparent;*/
... ...
app/gui/oven_control/configbacklightdlg.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Dialog</string>
15   - </property>
16 13 <property name="autoFillBackground">
17 14 <bool>false</bool>
18 15 </property>
... ...
app/gui/oven_control/configdatetimedlg.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Dialog</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#ConfigDateTimeDlg{
18 15 /*background-color : transparent;*/
... ...
app/gui/oven_control/configdoormonitoring.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }
... ... @@ -55,9 +52,6 @@
55 52 </rect>
56 53 </property>
57 54 </widget>
58   - <zorder>clock</zorder>
59   - <zorder>label</zorder>
60   - <zorder>gridLayoutWidget</zorder>
61 55 </widget>
62 56 <widget class="QWidget" name="page_2"/>
63 57 </widget>
... ... @@ -515,8 +509,6 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); }&lt;/str
515 509 </item>
516 510 </layout>
517 511 </widget>
518   - <zorder>ctrLbTitle</zorder>
519   - <zorder>gridLayoutWidget</zorder>
520 512 </widget>
521 513 </widget>
522 514 </widget>
... ...
app/gui/oven_control/configdutywashdlg.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Dialog</string>
15   - </property>
16 13 <property name="autoFillBackground">
17 14 <bool>false</bool>
18 15 </property>
... ...
app/gui/oven_control/configfavoritebutton.ui
  Diff comments   View file @c2ade43
... ... @@ -22,9 +22,6 @@
22 22 <height>65</height>
23 23 </size>
24 24 </property>
25   - <property name="windowTitle">
26   - <string>Form</string>
27   - </property>
28 25 <property name="styleSheet">
29 26 <string notr="true">QPushButton {
30 27 background-position: center;
... ...
app/gui/oven_control/configfileprocessdlg.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Dialog</string>
15   - </property>
16 13 <property name="windowOpacity">
17 14 <double>1.000000000000000</double>
18 15 </property>
... ...
app/gui/oven_control/confighalfenergydlg.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Dialog</string>
15   - </property>
16 13 <property name="autoFillBackground">
17 14 <bool>false</bool>
18 15 </property>
... ...
app/gui/oven_control/configinfodlg.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Dialog</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#ConfigDateTimeDlg{
18 15 /*background-color : transparent;*/
... ...
app/gui/oven_control/configipdlg.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Dialog</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#ConfigDateTimeDlg{
18 15 /*background-color : transparent;*/
... ...
app/gui/oven_control/configlanguagedlg.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Dialog</string>
15   - </property>
16 13 <property name="autoFillBackground">
17 14 <bool>false</bool>
18 15 </property>
... ... @@ -253,8 +250,6 @@ QLabel{
253 250 </layout>
254 251 </item>
255 252 </layout>
256   - <zorder>label</zorder>
257   - <zorder>line</zorder>
258 253 </widget>
259 254 </widget>
260 255 <resources/>
... ...
app/gui/oven_control/configmastervolumedlg.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Dialog</string>
15   - </property>
16 13 <property name="autoFillBackground">
17 14 <bool>false</bool>
18 15 </property>
... ...
app/gui/oven_control/configpanelbutton.ui
  Diff comments   View file @c2ade43
... ... @@ -22,9 +22,6 @@
22 22 <height>65</height>
23 23 </size>
24 24 </property>
25   - <property name="windowTitle">
26   - <string>Form</string>
27   - </property>
28 25 <property name="styleSheet">
29 26 <string notr="true">QPushButton {
30 27 background-position: center;
... ...
app/gui/oven_control/configresttimeformatdlg.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Dialog</string>
15   - </property>
16 13 <property name="autoFillBackground">
17 14 <bool>false</bool>
18 15 </property>
... ...
app/gui/oven_control/configsoundselelectdlg.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Dialog</string>
15   - </property>
16 13 <property name="autoFillBackground">
17 14 <bool>false</bool>
18 15 </property>
... ...
app/gui/oven_control/configtemptypedlg.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Dialog</string>
15   - </property>
16 13 <property name="autoFillBackground">
17 14 <bool>false</bool>
18 15 </property>
... ... @@ -218,8 +215,6 @@ QLabel{
218 215 </layout>
219 216 </item>
220 217 </layout>
221   - <zorder>label</zorder>
222   - <zorder>line</zorder>
223 218 </widget>
224 219 </widget>
225 220 <resources/>
... ...
app/gui/oven_control/configtimeformatdlg.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Dialog</string>
15   - </property>
16 13 <property name="autoFillBackground">
17 14 <bool>false</bool>
18 15 </property>
... ...
app/gui/oven_control/configwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/config.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }
... ...
app/gui/oven_control/confirmpopup.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Form</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#text { color: white; }
18 15 QPushButton { color: white; border: none; }
... ...
app/gui/oven_control/cookpanelbutton.ui
  Diff comments   View file @c2ade43
... ... @@ -22,9 +22,6 @@
22 22 <height>65</height>
23 23 </size>
24 24 </property>
25   - <property name="windowTitle">
26   - <string>Form</string>
27   - </property>
28 25 <property name="styleSheet">
29 26 <string notr="true">QPushButton {
30 27 background-position: center;
... ...
app/gui/oven_control/cooldownpopup.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Form</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#closeButton { border: none; }
18 15 #closeButton_2 { border: none; }
... ...
app/gui/oven_control/coretempsettingpopup.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Form</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#background {
18 15 background-image: url(:/images/background/manual_core.png);
... ...
app/gui/oven_control/dotprogressbarwidget.ui
  Diff comments   View file @c2ade43
  1 +<?xml version="1.0" encoding="UTF-8"?>
1 2 <ui version="4.0">
2   - <author/>
3   - <comment/>
4   - <exportmacro/>
5 3 <class>DotProgressBarWidget</class>
6 4 <widget class="QWidget" name="DotProgressBarWidget">
7   - <property name="geometry">
8   - <rect>
9   - <x>0</x>
10   - <y>0</y>
11   - <width>710</width>
12   - <height>126</height>
13   - </rect>
14   - </property>
15   - <property name="windowTitle">
16   - <string>Form</string>
17   - </property>
18   - <layout class="QHBoxLayout" name="horizontalLayout">
19   - <property name="leftMargin">
20   - <number>0</number>
  5 + <property name="geometry">
  6 + <rect>
  7 + <x>0</x>
  8 + <y>0</y>
  9 + <width>710</width>
  10 + <height>126</height>
  11 + </rect>
21 12 </property>
22   - <property name="rightMargin">
23   - <number>0</number>
24   - </property>
25   - <item>
26   - <layout class="QHBoxLayout" name="horizontalLayout_2"/>
27   - </item>
28   - </layout>
29   -</widget>
30   -<resources/>
31   -<connections/>
  13 + <layout class="QHBoxLayout" name="horizontalLayout">
  14 + <property name="leftMargin">
  15 + <number>0</number>
  16 + </property>
  17 + <property name="rightMargin">
  18 + <number>0</number>
  19 + </property>
  20 + <item>
  21 + <layout class="QHBoxLayout" name="horizontalLayout_2"/>
  22 + </item>
  23 + </layout>
  24 + </widget>
  25 + <resources/>
  26 + <connections/>
32 27 </ui>
... ...
app/gui/oven_control/electricmodelsettingwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }</string>
... ...
app/gui/oven_control/engineermenuwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }</string>
... ...
app/gui/oven_control/errorpopupdlg.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Dialog</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/error/background.png); }
18 15 QDialog { background: transparent; }</string>
... ...
app/gui/oven_control/fantestwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }</string>
... ...
app/gui/oven_control/favoritenamepopup.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Form</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#background { background-image: url(:/images/background/popup/503.png); }
18 15 QLabel, QPushButton, QLineEdit { color: white; }
... ...
app/gui/oven_control/fileprocessdlg.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Dialog</string>
15   - </property>
16 13 <property name="windowOpacity">
17 14 <double>1.000000000000000</double>
18 15 </property>
... ...
app/gui/oven_control/functiontestwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -16,9 +16,6 @@
16 16 <pointsize>18</pointsize>
17 17 </font>
18 18 </property>
19   - <property name="windowTitle">
20   - <string>MainWindow</string>
21   - </property>
22 19 <property name="styleSheet">
23 20 <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); }
24 21 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }</string>
... ...
app/gui/oven_control/gasmodelsettingwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }</string>
... ...
app/gui/oven_control/gastestwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }</string>
... ...
app/gui/oven_control/historylistwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -16,9 +16,6 @@
16 16 <verstretch>0</verstretch>
17 17 </sizepolicy>
18 18 </property>
19   - <property name="windowTitle">
20   - <string>MainWindow</string>
21   - </property>
22 19 <property name="styleSheet">
23 20 <string notr="true">QLabel[style = &quot;info&quot;]{font-size : 8pt}</string>
24 21 </property>
... ...
app/gui/oven_control/keepwarmpopup.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Form</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#background { background-image: url(:/images/background/popup/668.png); }
18 15 QPushButton { border: none; }</string>
... ...
app/gui/oven_control/keyboardwidget.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Form</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#KeyboardWidget{
18 15 background-color: rgba(25, 25, 25, 200);
... ...
app/gui/oven_control/mainwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -16,9 +16,6 @@
16 16 <verstretch>0</verstretch>
17 17 </sizepolicy>
18 18 </property>
19   - <property name="windowTitle">
20   - <string>MainWindow</string>
21   - </property>
22 19 <property name="autoFillBackground">
23 20 <bool>true</bool>
24 21 </property>
... ...
app/gui/oven_control/manualcooksettingwidget.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1024</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Form</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#background {
18 15 background-image: url(:/images/background/manual.png);
... ...
app/gui/oven_control/manualcookwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#bottomBar { background-image: url(:/images/bottom_bar/background.png); }
18 15 #centralwidget { background-image: url(:/images/background/manual.png); }
... ...
app/gui/oven_control/modelsettingwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }</string>
... ...
app/gui/oven_control/operationtimeheat.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }
... ...
app/gui/oven_control/operationtimemain.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }</string>
... ...
app/gui/oven_control/operationtimemode.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }
... ...
app/gui/oven_control/operationtimeparts.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }
... ...
app/gui/oven_control/preheatpopup.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Form</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#closeButton { border: none; }
18 15 #closeButton_2 { border: none; }
... ...
app/gui/oven_control/primewindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/etc.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }
... ...
app/gui/oven_control/programmingautoconfigwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/auto.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }
... ...
app/gui/oven_control/programmingautoselectionwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/auto.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }</string>
... ...
app/gui/oven_control/programmingmanualcoretemppopup.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Form</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#background {
18 15 background-image: url(:/images/background/manual_core.png);
... ... @@ -221,8 +218,6 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); }
221 218 <zorder>applyButton</zorder>
222 219 <zorder>coreTempLabel</zorder>
223 220 </widget>
224   - <resources>
225   - <include location="resources.qrc"/>
226   - </resources>
  221 + <resources/>
227 222 <connections/>
228 223 </ui>
... ...
app/gui/oven_control/programmingmanualwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#bottomBar { background-image: url(:/images/bottom_bar/background.png); }
18 15 #centralwidget { background-image: url(:/images/background/manual.png); }
... ...
app/gui/oven_control/programmingnamepopup.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Form</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#background { background-image: url(:/images/background/popup/503.png); }
18 15 QLabel, QPushButton, QLineEdit { color: white; }
... ...
app/gui/oven_control/programmingselectionwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/main.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }
... ...
app/gui/oven_control/programmingwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/etc.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }
... ...
app/gui/oven_control/realtimemain.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }</string>
... ...
app/gui/oven_control/realtimepartswindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }
... ...
app/gui/oven_control/realtimesensorwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }
... ...
app/gui/oven_control/reservedtimepopup.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Form</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#background { background-image: url(:/images/background/popup/503.png); }
18 15 QLabel, QPushButton, QLineEdit { color: white; }
... ...
app/gui/oven_control/reservetimepopup.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Form</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#background { background-image: url(:/images/background/popup/503.png); }
18 15 QLabel, QPushButton, QLineEdit { color: white; }
... ...
app/gui/oven_control/servicehistorymain.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }</string>
... ...
app/gui/oven_control/servicepassinputdlg.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Dialog</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#ConfigDateTimeDlg{
18 15 /*background-color : transparent;*/
... ...
app/gui/oven_control/usbcheckpopupdlg.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Dialog</string>
15   - </property>
16 13 <property name="windowOpacity">
17 14 <double>1.000000000000000</double>
18 15 </property>
... ...
app/gui/oven_control/valvetestwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }</string>
... ...
app/gui/oven_control/washtestwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }</string>
... ...
app/gui/oven_control/washwindow.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>MainWindow</string>
15   - </property>
16 13 <property name="styleSheet">
17 14 <string notr="true">#centralwidget { background-image: url(:/images/background/original.png); }
18 15 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }
... ... @@ -1167,6 +1164,11 @@ QPushButton:pressed { image: url(:/images/slider_icon/clean_ov.png); }&lt;/string&gt;
1167 1164 <container>1</container>
1168 1165 </customwidget>
1169 1166 <customwidget>
  1167 + <class>WashWarnIcon</class>
  1168 + <extends>QLabel</extends>
  1169 + <header>washwarnicon.h</header>
  1170 + </customwidget>
  1171 + <customwidget>
1170 1172 <class>AnimatedImageBox</class>
1171 1173 <extends>QLabel</extends>
1172 1174 <header>animatedimagebox.h</header>
... ... @@ -1177,11 +1179,6 @@ QPushButton:pressed { image: url(:/images/slider_icon/clean_ov.png); }&lt;/string&gt;
1177 1179 <header>washstepgauge.h</header>
1178 1180 <container>1</container>
1179 1181 </customwidget>
1180   - <customwidget>
1181   - <class>WashWarnIcon</class>
1182   - <extends>QLabel</extends>
1183   - <header>washwarnicon.h</header>
1184   - </customwidget>
1185 1182 </customwidgets>
1186 1183 <resources>
1187 1184 <include location="resources.qrc"/>
... ...
app/gui/oven_control/yesnopopupdlg.ui
  Diff comments   View file @c2ade43
... ... @@ -10,9 +10,6 @@
10 10 <height>1600</height>
11 11 </rect>
12 12 </property>
13   - <property name="windowTitle">
14   - <string>Dialog</string>
15   - </property>
16 13 <property name="windowOpacity">
17 14 <double>1.000000000000000</double>
18 15 </property>
... ...