Commit 05f2a75527e687080daeb87981d611af18658a74
image 관리 구조 변경
Too many changes.
To preserve performance only 1000 of 1401 files displayed.
... | ... | @@ -14,9 +14,8 @@ |
14 | 14 | <string>MainWindow</string> |
15 | 15 | </property> |
16 | 16 | <property name="styleSheet"> |
17 | - <string notr="true">#centralwidget { | |
18 | -background-image: url(:/images/images/auto/ba_ground_set(full)_01); | |
19 | -} | |
17 | + <string notr="true">#centralwidget { background-image: url(:/images/background/auto_config.png); } | |
18 | +#bottomBar { background-image: url(:/images/bottom_bar/background.png); } | |
20 | 19 | |
21 | 20 | QSlider::groove { |
22 | 21 | background-image: url(:/images/images/auto/gau_04.png); |
... | ... | @@ -70,9 +69,7 @@ height: 33px; |
70 | 69 | </property> |
71 | 70 | <widget class="QWidget" name="clockContainer"> |
72 | 71 | <property name="styleSheet"> |
73 | - <string notr="true">QWidget#clockContainer { | |
74 | -background-image: url(:/images/images/config/001_01_background_time.png); | |
75 | -}</string> | |
72 | + <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | |
76 | 73 | </property> |
77 | 74 | <widget class="Clock" name="clock" native="true"> |
78 | 75 | <property name="geometry"> |
... | ... | @@ -96,11 +93,6 @@ background-image: url(:/images/images/config/001_01_background_time.png); |
96 | 93 | <height>150</height> |
97 | 94 | </rect> |
98 | 95 | </property> |
99 | - <property name="styleSheet"> | |
100 | - <string notr="true">QWidget#bottomBar { | |
101 | -background-image: url(:/images/images/config_service/001_01_background_under_down.png); | |
102 | -}</string> | |
103 | - </property> | |
104 | 96 | <widget class="QPushButton" name="backButton"> |
105 | 97 | <property name="geometry"> |
106 | 98 | <rect> |
... | ... | @@ -359,10 +351,10 @@ QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_02_ov. |
359 | 351 | </property> |
360 | 352 | <property name="styleSheet"> |
361 | 353 | <string notr="true">QPushButton { |
362 | -border-image: url(:/images/images/auto/btn_01.png); | |
354 | +border-image: url(:/images/button/288.png); | |
363 | 355 | } |
364 | 356 | QPushButton::pressed { |
365 | -border-image: url(:/images/images/auto/btn_01_ov.png); | |
357 | +border-image: url(:/images/button/288_ov.png); | |
366 | 358 | }</string> |
367 | 359 | </property> |
368 | 360 | <property name="text"> |
... | ... | @@ -630,17 +622,17 @@ border-image: url(:/images/images/auto/btn_01_ov.png); |
630 | 622 | </property> |
631 | 623 | <property name="styleSheet"> |
632 | 624 | <string notr="true">QPushButton { |
633 | -border-image: url(:/images/images/auto/btn_02.png); | |
625 | +border-image: url(:/images/button/152.png); | |
634 | 626 | } |
635 | 627 | QPushButton::pressed { |
636 | -border-image: url(:/images/images/auto/btn_02_ov.png); | |
628 | +border-image: url(:/images/button/152_ov.png); | |
637 | 629 | }</string> |
638 | 630 | </property> |
639 | 631 | <property name="text"> |
640 | 632 | <string/> |
641 | 633 | </property> |
642 | 634 | <property name="icon"> |
643 | - <iconset resource="resources.qrc"> | |
635 | + <iconset> | |
644 | 636 | <normaloff>:/images/images/auto/btn_icon_01.png</normaloff>:/images/images/auto/btn_icon_01.png</iconset> |
645 | 637 | </property> |
646 | 638 | <property name="iconSize"> |
... | ... | @@ -1348,7 +1340,7 @@ QPushButton:pressed { |
1348 | 1340 | <string/> |
1349 | 1341 | </property> |
1350 | 1342 | <property name="pixmap"> |
1351 | - <pixmap resource="resources.qrc">:/images/images/auto/005_auto_icon_01_ov.png</pixmap> | |
1343 | + <pixmap>:/images/images/auto/005_auto_icon_01_ov.png</pixmap> | |
1352 | 1344 | </property> |
1353 | 1345 | <property name="alignment"> |
1354 | 1346 | <set>Qt::AlignCenter</set> |
... | ... | @@ -1591,8 +1583,6 @@ QPushButton:pressed { |
1591 | 1583 | <container>1</container> |
1592 | 1584 | </customwidget> |
1593 | 1585 | </customwidgets> |
1594 | - <resources> | |
1595 | - <include location="resources.qrc"/> | |
1596 | - </resources> | |
1586 | + <resources/> | |
1597 | 1587 | <connections/> |
1598 | 1588 | </ui> | ... | ... |
... | ... | @@ -41,10 +41,10 @@ AutoCookSelectionWindow::AutoCookSelectionWindow(QWidget *parent, Oven *oven, Co |
41 | 41 | font.setWeight(75); |
42 | 42 | |
43 | 43 | QLatin1String stylesheet("QPushButton {\n" |
44 | - "border-image: url(:/images/images/auto/btn_01.png);\n" | |
44 | + "border-image: url(:/images/button/288.png);\n" | |
45 | 45 | "}\n" |
46 | 46 | "QPushButton::pressed {\n" |
47 | - "border-image: url(:/images/images/auto/btn_01_ov.png);\n" | |
47 | + "border-image: url(:/images/button/288_ov.png);\n" | |
48 | 48 | "}"); |
49 | 49 | |
50 | 50 | for (int idx = 0; idx < cookList.size(); idx++) | ... | ... |
... | ... | @@ -13,12 +13,11 @@ |
13 | 13 | <property name="windowTitle"> |
14 | 14 | <string>MainWindow</string> |
15 | 15 | </property> |
16 | + <property name="styleSheet"> | |
17 | + <string notr="true">#centralwidget { background-image: url(:/images/background/auto.png); } | |
18 | +#bottomBar { background-image: url(:/images/bottom_bar/background.png); }</string> | |
19 | + </property> | |
16 | 20 | <widget class="QWidget" name="centralwidget"> |
17 | - <property name="styleSheet"> | |
18 | - <string notr="true">QWidget#centralwidget { | |
19 | -background-image: url(:/images/images/auto/ba_ground_set(full)_01); | |
20 | -}</string> | |
21 | - </property> | |
22 | 21 | <widget class="QStackedWidget" name="upperStack"> |
23 | 22 | <property name="geometry"> |
24 | 23 | <rect> |
... | ... | @@ -30,9 +29,7 @@ background-image: url(:/images/images/auto/ba_ground_set(full)_01); |
30 | 29 | </property> |
31 | 30 | <widget class="QWidget" name="clockContainer"> |
32 | 31 | <property name="styleSheet"> |
33 | - <string notr="true">QWidget#clockContainer { | |
34 | -background-image: url(:/images/images/config/001_01_background_time.png); | |
35 | -}</string> | |
32 | + <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | |
36 | 33 | </property> |
37 | 34 | <widget class="Clock" name="clock" native="true"> |
38 | 35 | <property name="geometry"> |
... | ... | @@ -56,9 +53,6 @@ background-image: url(:/images/images/config/001_01_background_time.png); |
56 | 53 | <height>150</height> |
57 | 54 | </rect> |
58 | 55 | </property> |
59 | - <property name="styleSheet"> | |
60 | - <string notr="true">background-image: url(:/images/images/config_service/001_01_background_under_down.png);</string> | |
61 | - </property> | |
62 | 56 | <widget class="QPushButton" name="backButton"> |
63 | 57 | <property name="geometry"> |
64 | 58 | <rect> |
... | ... | @@ -75,14 +69,14 @@ background-image: url(:/images/images/config/001_01_background_time.png); |
75 | 69 | </sizepolicy> |
76 | 70 | </property> |
77 | 71 | <property name="styleSheet"> |
78 | - <string notr="true">QPushButton { border-image: url(:/images/images/auto/006_sys_icon_03.png); } | |
79 | -QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_03_ov.png); }</string> | |
72 | + <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/back.png); } | |
73 | +QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); }</string> | |
80 | 74 | </property> |
81 | 75 | <property name="text"> |
82 | 76 | <string/> |
83 | 77 | </property> |
84 | 78 | </widget> |
85 | - <widget class="QPushButton" name="backButton_2"> | |
79 | + <widget class="QPushButton" name="configButton"> | |
86 | 80 | <property name="geometry"> |
87 | 81 | <rect> |
88 | 82 | <x>345</x> |
... | ... | @@ -98,14 +92,14 @@ QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_03_ov. |
98 | 92 | </sizepolicy> |
99 | 93 | </property> |
100 | 94 | <property name="styleSheet"> |
101 | - <string notr="true">QPushButton { border-image: url(:/images/images/auto/006_sys_icon_01.png); } | |
102 | -QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_01_ov.png); }</string> | |
95 | + <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/config.png); } | |
96 | +QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); }</string> | |
103 | 97 | </property> |
104 | 98 | <property name="text"> |
105 | 99 | <string/> |
106 | 100 | </property> |
107 | 101 | </widget> |
108 | - <widget class="QPushButton" name="backButton_3"> | |
102 | + <widget class="QPushButton" name="washButton"> | |
109 | 103 | <property name="geometry"> |
110 | 104 | <rect> |
111 | 105 | <x>458</x> |
... | ... | @@ -121,14 +115,14 @@ QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_01_ov. |
121 | 115 | </sizepolicy> |
122 | 116 | </property> |
123 | 117 | <property name="styleSheet"> |
124 | - <string notr="true">QPushButton { border-image: url(:/images/images/auto/006_sys_icon_05.png); } | |
125 | -QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_05_ov.png); }</string> | |
118 | + <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/wash.png); } | |
119 | +QPushButton:pressed { border-image: url(:/images/bottom_bar/wash_ov.png); }</string> | |
126 | 120 | </property> |
127 | 121 | <property name="text"> |
128 | 122 | <string/> |
129 | 123 | </property> |
130 | 124 | </widget> |
131 | - <widget class="QPushButton" name="backButton_4"> | |
125 | + <widget class="QPushButton" name="helpButton"> | |
132 | 126 | <property name="geometry"> |
133 | 127 | <rect> |
134 | 128 | <x>571</x> |
... | ... | @@ -144,8 +138,8 @@ QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_05_ov. |
144 | 138 | </sizepolicy> |
145 | 139 | </property> |
146 | 140 | <property name="styleSheet"> |
147 | - <string notr="true">QPushButton { border-image: url(:/images/images/auto/006_sys_icon_02.png); } | |
148 | -QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_02_ov.png); }</string> | |
141 | + <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/help.png); } | |
142 | +QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); }</string> | |
149 | 143 | </property> |
150 | 144 | <property name="text"> |
151 | 145 | <string/> |
... | ... | @@ -165,7 +159,7 @@ QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_02_ov. |
165 | 159 | <string/> |
166 | 160 | </property> |
167 | 161 | <property name="pixmap"> |
168 | - <pixmap resource="resources.qrc">:/images/images/auto/005_auto_icon_01_ov.png</pixmap> | |
162 | + <pixmap>:/images/images/auto/005_auto_icon_01_ov.png</pixmap> | |
169 | 163 | </property> |
170 | 164 | <property name="alignment"> |
171 | 165 | <set>Qt::AlignCenter</set> |
... | ... | @@ -181,8 +175,6 @@ QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_02_ov. |
181 | 175 | <container>1</container> |
182 | 176 | </customwidget> |
183 | 177 | </customwidgets> |
184 | - <resources> | |
185 | - <include location="resources.qrc"/> | |
186 | - </resources> | |
178 | + <resources/> | |
187 | 179 | <connections/> |
188 | 180 | </ui> | ... | ... |
... | ... | @@ -103,11 +103,11 @@ AutoCookWindow::~AutoCookWindow() |
103 | 103 | |
104 | 104 | void AutoCookWindow::setupUi() |
105 | 105 | { |
106 | - bulletPixmap.load(":/images/images/auto/window_arrow_pin_02.png"); | |
107 | - selectedBulletPixmap.load(":/images/images/auto/window_arrow_pin_01.png"); | |
108 | - steamModeIcon.load(":/images/images/auto/window_icon_04.png"); | |
109 | - dryModeIcon.load(":/images/images/auto/window_icon_06.png"); | |
110 | - combiModeIcon.load(":/images/images/auto/window_icon_05.png"); | |
106 | + bulletPixmap.load(":/images/symbol/step_bullet.png"); | |
107 | + selectedBulletPixmap.load(":/images/symbol/selected_step_bullet.png"); | |
108 | + steamModeIcon.load(":/images/cook_mode/small_steam.png"); | |
109 | + dryModeIcon.load(":/images/cook_mode/small_dryheat.png"); | |
110 | + combiModeIcon.load(":/images/cook_mode/small_combi.png"); | |
111 | 111 | |
112 | 112 | QString cookTypeIcon = Cook::icon(cook->type()); |
113 | 113 | ui->cookTypeIcon_1->setPixmap(cookTypeIcon); |
... | ... | @@ -120,7 +120,6 @@ void AutoCookWindow::setupUi() |
120 | 120 | for (int idx = 0; idx < 5; idx++) |
121 | 121 | { |
122 | 122 | QPushButton *icon; |
123 | - QWidget *block; | |
124 | 123 | QLabel *minLabel; |
125 | 124 | QLabel *maxLabel; |
126 | 125 | QLabel *currentLabel; |
... | ... | @@ -130,7 +129,6 @@ void AutoCookWindow::setupUi() |
130 | 129 | { |
131 | 130 | case 0: |
132 | 131 | icon = ui->configButton_1; |
133 | - block = ui->configBlock_1; | |
134 | 132 | minLabel = ui->configMinLabel_1; |
135 | 133 | maxLabel = ui->configMaxLabel_1; |
136 | 134 | currentLabel = ui->configCurrentLabel_1; |
... | ... | @@ -138,7 +136,6 @@ void AutoCookWindow::setupUi() |
138 | 136 | break; |
139 | 137 | case 1: |
140 | 138 | icon = ui->configButton_2; |
141 | - block = ui->configBlock_2; | |
142 | 139 | minLabel = ui->configMinLabel_2; |
143 | 140 | maxLabel = ui->configMaxLabel_2; |
144 | 141 | currentLabel = ui->configCurrentLabel_2; |
... | ... | @@ -146,7 +143,6 @@ void AutoCookWindow::setupUi() |
146 | 143 | break; |
147 | 144 | case 2: |
148 | 145 | icon = ui->configButton_3; |
149 | - block = ui->configBlock_3; | |
150 | 146 | minLabel = ui->configMinLabel_3; |
151 | 147 | maxLabel = ui->configMaxLabel_3; |
152 | 148 | currentLabel = ui->configCurrentLabel_3; |
... | ... | @@ -154,7 +150,6 @@ void AutoCookWindow::setupUi() |
154 | 150 | break; |
155 | 151 | case 3: |
156 | 152 | icon = ui->configButton_4; |
157 | - block = ui->configBlock_4; | |
158 | 153 | minLabel = ui->configMinLabel_4; |
159 | 154 | maxLabel = ui->configMaxLabel_4; |
160 | 155 | currentLabel = ui->configCurrentLabel_4; |
... | ... | @@ -162,7 +157,6 @@ void AutoCookWindow::setupUi() |
162 | 157 | break; |
163 | 158 | case 4: |
164 | 159 | icon = ui->configButton_5; |
165 | - block = ui->configBlock_5; | |
166 | 160 | minLabel = ui->configMinLabel_5; |
167 | 161 | maxLabel = ui->configMaxLabel_5; |
168 | 162 | currentLabel = ui->configCurrentLabel_5; |
... | ... | @@ -174,12 +168,11 @@ void AutoCookWindow::setupUi() |
174 | 168 | if (config != NULL) |
175 | 169 | { |
176 | 170 | icon->show(); |
177 | - icon->setStyleSheet("QPushButton { border-image: url(" | |
171 | + icon->setStyleSheet("QPushButton { image: url(" | |
178 | 172 | + config->icon() |
179 | - + ") } QPushButton::pressed { border-image: url(" | |
173 | + + ") } QPushButton::pressed { image: url(" | |
180 | 174 | + config->overlayIcon() |
181 | 175 | + ") }"); |
182 | - block->show(); | |
183 | 176 | minLabel->show(); |
184 | 177 | minLabel->setText(config->minLabel()); |
185 | 178 | maxLabel->show(); |
... | ... | @@ -217,7 +210,6 @@ void AutoCookWindow::setupUi() |
217 | 210 | else |
218 | 211 | { |
219 | 212 | icon->hide(); |
220 | - block->hide(); | |
221 | 213 | minLabel->hide(); |
222 | 214 | maxLabel->hide(); |
223 | 215 | currentLabel->hide(); |
... | ... | @@ -227,13 +219,12 @@ void AutoCookWindow::setupUi() |
227 | 219 | |
228 | 220 | if (cook->interTempEnabled()) |
229 | 221 | { |
230 | - ui->configBlock_4->show(); | |
231 | 222 | ui->configButton_4->show(); |
232 | 223 | ui->configButton_4->setStyleSheet( |
233 | - QString("QPushButton { border-image: url(") | |
234 | - + ":/images/images/auto/011_icon_04_ov_01.png" | |
235 | - + ") } QPushButton::pressed { border-image: url(" | |
236 | - + ":/images/images/auto/011_icon_04_ov.png" | |
224 | + QString("QPushButton { image: url(") | |
225 | + + ":/images/slider_icon/core_temp_enabled.png" | |
226 | + + ") } QPushButton::pressed { image: url(" | |
227 | + + ":/images/slider_icon/core_temp_ov.png" | |
237 | 228 | + ") }" |
238 | 229 | ); |
239 | 230 | ui->configMinLabel_4->hide(); |
... | ... | @@ -264,28 +255,28 @@ void AutoCookWindow::setupUi() |
264 | 255 | ui->heatGauge->setMaximum(300); |
265 | 256 | ui->heatGauge->setValue(30); |
266 | 257 | |
267 | - ui->openDoorAnimation->load(":/images/images/auto/ani_01.png"); | |
268 | - ui->openDoorAnimation->load(":/images/images/auto/ani_02.png"); | |
269 | - ui->openDoorAnimation->load(":/images/images/auto/ani_03.png"); | |
270 | - ui->openDoorAnimation->load(":/images/images/auto/ani_04.png"); | |
271 | - ui->openDoorAnimation->load(":/images/images/auto/ani_05.png"); | |
272 | - ui->openDoorAnimation->load(":/images/images/auto/ani_06.png"); | |
273 | - ui->openDoorAnimation->load(":/images/images/auto/ani_07.png"); | |
274 | - ui->openDoorAnimation->load(":/images/images/auto/ani_08.png"); | |
275 | - ui->openDoorAnimation->load(":/images/images/auto/ani_09.png"); | |
258 | + ui->openDoorAnimation->load(":/images/animation/door_01.png"); | |
259 | + ui->openDoorAnimation->load(":/images/animation/door_02.png"); | |
260 | + ui->openDoorAnimation->load(":/images/animation/door_03.png"); | |
261 | + ui->openDoorAnimation->load(":/images/animation/door_04.png"); | |
262 | + ui->openDoorAnimation->load(":/images/animation/door_05.png"); | |
263 | + ui->openDoorAnimation->load(":/images/animation/door_06.png"); | |
264 | + ui->openDoorAnimation->load(":/images/animation/door_07.png"); | |
265 | + ui->openDoorAnimation->load(":/images/animation/door_08.png"); | |
266 | + ui->openDoorAnimation->load(":/images/animation/door_09.png"); | |
276 | 267 | ui->openDoorAnimation->start(300); |
277 | 268 | ui->openDoorAnimation->hide(); |
278 | 269 | ui->openDoorArrow->hide(); |
279 | 270 | |
280 | - ui->closeDoorAnimation->load(":/images/images/auto/ani_09.png"); | |
281 | - ui->closeDoorAnimation->load(":/images/images/auto/ani_08.png"); | |
282 | - ui->closeDoorAnimation->load(":/images/images/auto/ani_07.png"); | |
283 | - ui->closeDoorAnimation->load(":/images/images/auto/ani_06.png"); | |
284 | - ui->closeDoorAnimation->load(":/images/images/auto/ani_05.png"); | |
285 | - ui->closeDoorAnimation->load(":/images/images/auto/ani_04.png"); | |
286 | - ui->closeDoorAnimation->load(":/images/images/auto/ani_03.png"); | |
287 | - ui->closeDoorAnimation->load(":/images/images/auto/ani_02.png"); | |
288 | - ui->closeDoorAnimation->load(":/images/images/auto/ani_01.png"); | |
271 | + ui->closeDoorAnimation->load(":/images/animation/door_09.png"); | |
272 | + ui->closeDoorAnimation->load(":/images/animation/door_08.png"); | |
273 | + ui->closeDoorAnimation->load(":/images/animation/door_07.png"); | |
274 | + ui->closeDoorAnimation->load(":/images/animation/door_06.png"); | |
275 | + ui->closeDoorAnimation->load(":/images/animation/door_05.png"); | |
276 | + ui->closeDoorAnimation->load(":/images/animation/door_04.png"); | |
277 | + ui->closeDoorAnimation->load(":/images/animation/door_03.png"); | |
278 | + ui->closeDoorAnimation->load(":/images/animation/door_02.png"); | |
279 | + ui->closeDoorAnimation->load(":/images/animation/door_01.png"); | |
289 | 280 | ui->closeDoorAnimation->start(300); |
290 | 281 | ui->closeDoorAnimation->hide(); |
291 | 282 | ui->closeDoorArrow->hide(); |
... | ... | @@ -417,19 +408,19 @@ void AutoCookWindow::updateView() |
417 | 408 | if (interTempEnabled) |
418 | 409 | { |
419 | 410 | ui->configButton_4->setStyleSheet( |
420 | - QString("QPushButton { border-image: url(") | |
421 | - + ":/images/images/auto/011_icon_04_ov_01.png" | |
422 | - + ") } QPushButton::pressed { border-image: url(" | |
423 | - + ":/images/images/auto/011_icon_04_ov.png" | |
411 | + QString("QPushButton { image: url(") | |
412 | + + ":/images/slider_icon/core_temp_enabled.png" | |
413 | + + ") } QPushButton::pressed { image: url(" | |
414 | + + ":/images/slider_icon/core_temp_ov.png" | |
424 | 415 | + ") }"); |
425 | 416 | } |
426 | 417 | else |
427 | 418 | { |
428 | 419 | ui->configButton_4->setStyleSheet( |
429 | - QString("QPushButton { border-image: url(") | |
430 | - + ":/images/images/auto/011_icon_04.png" | |
431 | - + ") } QPushButton::pressed { border-image: url(" | |
432 | - + ":/images/images/auto/011_icon_04_ov.png" | |
420 | + QString("QPushButton { image: url(") | |
421 | + + ":/images/slider_icon/core_temp.png" | |
422 | + + ") } QPushButton::pressed { image: url(" | |
423 | + + ":/images/slider_icon/core_temp_ov.png" | |
433 | 424 | + ") }"); |
434 | 425 | } |
435 | 426 | } |
... | ... | @@ -457,7 +448,7 @@ void AutoCookWindow::viewStep(Cook::Step step) |
457 | 448 | void AutoCookWindow::viewPreheatStep(Cook::Step step) |
458 | 449 | { |
459 | 450 | ui->cookStepIcon->show(); |
460 | - ui->cookStepIcon->setPixmap(QPixmap(":/images/images/auto/sys_icon_05.png")); | |
451 | + ui->cookStepIcon->setPixmap(QPixmap(":/images/cook_step_type/sys_icon_05.png")); | |
461 | 452 | ui->cookStepLabel->show(); |
462 | 453 | ui->cookStepLabel->setText("예열"); |
463 | 454 | ui->doorStepLabel->hide(); |
... | ... | @@ -518,34 +509,34 @@ void AutoCookWindow::viewDoorStep(Cook::Step step) |
518 | 509 | { |
519 | 510 | case Cook::PutThermometer: |
520 | 511 | ui->doorStepLabel->setText("중심 온도계 삽입"); |
521 | - ui->cookStepAnimation->load(":/images/images/auto/ani_d_01.png"); | |
522 | - ui->cookStepAnimation->load(":/images/images/auto/ani_d_02.png"); | |
512 | + ui->cookStepAnimation->load(":/images/animation/thermometer_01.png"); | |
513 | + ui->cookStepAnimation->load(":/images/animation/thermometer_02.png"); | |
523 | 514 | ui->cookStepAnimation->setGeometry((900-210)/2, 800, 210, 307); |
524 | 515 | break; |
525 | 516 | case Cook::Load: |
526 | 517 | ui->doorStepLabel->setText("식재료 적재"); |
527 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_c_01.png"); | |
528 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_c_02.png"); | |
529 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_c_03.png"); | |
530 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_c_04.png"); | |
531 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_c_03.png"); | |
532 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_c_02.png"); | |
533 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_c_01.png"); | |
518 | + ui->cookStepAnimation->load(":/images/animation/load_01.png"); | |
519 | + ui->cookStepAnimation->load(":/images/animation/load_02.png"); | |
520 | + ui->cookStepAnimation->load(":/images/animation/load_03.png"); | |
521 | + ui->cookStepAnimation->load(":/images/animation/load_04.png"); | |
522 | + ui->cookStepAnimation->load(":/images/animation/load_03.png"); | |
523 | + ui->cookStepAnimation->load(":/images/animation/load_02.png"); | |
524 | + ui->cookStepAnimation->load(":/images/animation/load_01.png"); | |
534 | 525 | ui->cookStepAnimation->setGeometry((900-264)/2, 800, 264, 307); |
535 | 526 | break; |
536 | 527 | case Cook::Cut: |
537 | 528 | ui->doorStepLabel->setText("자르기"); |
538 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_b_01.png"); | |
539 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_b_02.png"); | |
540 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_b_03.png"); | |
529 | + ui->cookStepAnimation->load(":/images/animation/cut_01.png"); | |
530 | + ui->cookStepAnimation->load(":/images/animation/cut_02.png"); | |
531 | + ui->cookStepAnimation->load(":/images/animation/cut_03.png"); | |
541 | 532 | ui->cookStepAnimation->setGeometry((900-264)/2, 800, 264, 307); |
542 | 533 | break; |
543 | 534 | case Cook::Pour: |
544 | 535 | ui->doorStepLabel->setText("물 붓기"); |
545 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_a_01.png"); | |
546 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_a_02.png"); | |
547 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_a_03.png"); | |
548 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_a_04.png"); | |
536 | + ui->cookStepAnimation->load(":/images/animation/pour_01.png"); | |
537 | + ui->cookStepAnimation->load(":/images/animation/pour_02.png"); | |
538 | + ui->cookStepAnimation->load(":/images/animation/pour_03.png"); | |
539 | + ui->cookStepAnimation->load(":/images/animation/pour_04.png"); | |
549 | 540 | ui->cookStepAnimation->setGeometry((900-264)/2, 800, 264, 307); |
550 | 541 | break; |
551 | 542 | default: |
... | ... | @@ -642,8 +633,8 @@ void AutoCookWindow::checkPreheatStep(Cook::Step step) |
642 | 633 | |
643 | 634 | ui->preheatGauge->setValue(curTemp); |
644 | 635 | |
645 | - if (/*checkReached(step.humidity, lastHumidity, oven->currentHumidity()) | |
646 | - && */checkReached(step.temp, lastTemp, curTemp)) | |
636 | + if (checkReached(step.humidity, lastHumidity, oven->currentHumidity()) | |
637 | + && checkReached(step.temp, lastTemp, curTemp)) | |
647 | 638 | { |
648 | 639 | if (selectedStepIndex == cook->currentStepIndex()) |
649 | 640 | selectedStepIndex = cook->currentStepIndex() + 1; |
... | ... | @@ -682,8 +673,8 @@ void AutoCookWindow::checkCookStep(Cook::Step step) |
682 | 673 | { |
683 | 674 | if (cook->currentStepIndex() + 1 < cook->stepCount()) |
684 | 675 | { |
685 | - if (/*checkReached(step.humidity, lastHumidity, oven->currentHumidity()) | |
686 | - && */checkReached(step.temp, lastTemp, oven->currentTemp())) | |
676 | + if (checkReached(step.humidity, lastHumidity, oven->currentHumidity()) | |
677 | + && checkReached(step.temp, lastTemp, oven->currentTemp())) | |
687 | 678 | { |
688 | 679 | if (selectedStepIndex == cook->currentStepIndex()) |
689 | 680 | selectedStepIndex = cook->currentStepIndex() + 1; |
... | ... | @@ -693,7 +684,7 @@ void AutoCookWindow::checkCookStep(Cook::Step step) |
693 | 684 | } |
694 | 685 | else if (interTempEnabled) |
695 | 686 | { |
696 | - if (cook->interTemp() == oven->currentInterTemp()) | |
687 | + if (cook->interTemp() <= oven->currentInterTemp()) | |
697 | 688 | { |
698 | 689 | if (selectedStepIndex == cook->currentStepIndex()) |
699 | 690 | selectedStepIndex = cook->stepCount() - 1; |
... | ... | @@ -711,7 +702,7 @@ void AutoCookWindow::checkCookStep(Cook::Step step) |
711 | 702 | } |
712 | 703 | else |
713 | 704 | { |
714 | - if ((interTempEnabled && cook->interTemp() == oven->currentInterTemp()) | |
705 | + if ((interTempEnabled && cook->interTemp() <= oven->currentInterTemp()) | |
715 | 706 | || oven->time() == 0) |
716 | 707 | { |
717 | 708 | done = true; | ... | ... |
... | ... | @@ -14,12 +14,13 @@ |
14 | 14 | <string>MainWindow</string> |
15 | 15 | </property> |
16 | 16 | <property name="styleSheet"> |
17 | - <string notr="true">#centralwidget { | |
18 | -background-image: url(:/images/images/auto/ba_ground_a01.png); | |
19 | -} | |
17 | + <string notr="true">#centralwidget { background-image: url(:/images/background/auto_steps.png); } | |
18 | +#bottomBar { background-image: url(:/images/bottom_bar/background.png); } | |
19 | +#configPage { background-image: url(:/images/background/auto.png); } | |
20 | +#cookPage { background-image: url(:/images/background/auto_steps.png); } | |
20 | 21 | |
21 | 22 | QSlider::groove { |
22 | -background-image: url(:/images/images/auto/gau_04.png); | |
23 | +background-image: url(:/images/slider/groove.png); | |
23 | 24 | background-repeat: no-repeat; |
24 | 25 | background-position: center; |
25 | 26 | } |
... | ... | @@ -31,27 +32,27 @@ margin: 0px 5px; |
31 | 32 | } |
32 | 33 | |
33 | 34 | QSlider[sliderColor="red"]::sub-page { |
34 | -background-image: url(:/images/images/auto/gau_05.png); | |
35 | +background-image: url(:/images/slider/sub_red.png); | |
35 | 36 | } |
36 | 37 | |
37 | 38 | QSlider[sliderColor="yellow"]::sub-page { |
38 | -background-image: url(:/images/images/auto/gau_06.png); | |
39 | +background-image: url(:/images/slider/sub_yellow.png); | |
39 | 40 | } |
40 | 41 | |
41 | 42 | QSlider[sliderColor="white"]::sub-page { |
42 | -background-image: url(:/images/images/auto/gau_07.png); | |
43 | +background-image: url(:/images/slider/sub_white.png); | |
43 | 44 | } |
44 | 45 | |
45 | 46 | QSlider[sliderColor="blue"]::sub-page { |
46 | -background-image: url(:/images/images/auto/gau_09.png); | |
47 | +background-image: url(:/images/slider/sub_blue.png); | |
47 | 48 | } |
48 | 49 | |
49 | 50 | QSlider[sliderColor="green"]::sub-page { |
50 | -background-image: url(:/images/images/auto/sys_icon_01_gau.png); | |
51 | +background-image: url(:/images/slider/sub_green.png); | |
51 | 52 | } |
52 | 53 | |
53 | 54 | QSlider::handle { |
54 | -background-image: url(:/images/images/manual/graphe_BTN_Bigsize.png); | |
55 | +background-image: url(:/images/slider/handle_big.png); | |
55 | 56 | background-repeat: no-repeat; |
56 | 57 | background-position: center; |
57 | 58 | width: 23px; |
... | ... | @@ -62,6 +63,10 @@ QPushButton { |
62 | 63 | background-repeat: no-repeat; |
63 | 64 | background-position: center; |
64 | 65 | border: none; |
66 | +} | |
67 | + | |
68 | +QPushButton[style="icon"] { | |
69 | +background-image: url(:/images/slider_icon/background.png); | |
65 | 70 | }</string> |
66 | 71 | </property> |
67 | 72 | <widget class="QWidget" name="centralwidget"> |
... | ... | @@ -76,9 +81,7 @@ border: none; |
76 | 81 | </property> |
77 | 82 | <widget class="QWidget" name="clockContainer"> |
78 | 83 | <property name="styleSheet"> |
79 | - <string notr="true">QWidget#clockContainer { | |
80 | -background-image: url(:/images/images/config/001_01_background_time.png); | |
81 | -}</string> | |
84 | + <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | |
82 | 85 | </property> |
83 | 86 | <widget class="Clock" name="clock" native="true"> |
84 | 87 | <property name="geometry"> |
... | ... | @@ -103,11 +106,6 @@ background-image: url(:/images/images/config/001_01_background_time.png); |
103 | 106 | </rect> |
104 | 107 | </property> |
105 | 108 | <widget class="QWidget" name="configPage"> |
106 | - <property name="styleSheet"> | |
107 | - <string notr="true">QWidget#configPage { | |
108 | -background-image: url(:/images/images/auto/ba_ground_set(full)_01); | |
109 | -}</string> | |
110 | - </property> | |
111 | 109 | <widget class="QLabel" name="cookTypeIcon_1"> |
112 | 110 | <property name="geometry"> |
113 | 111 | <rect> |
... | ... | @@ -121,7 +119,7 @@ background-image: url(:/images/images/auto/ba_ground_set(full)_01); |
121 | 119 | <string/> |
122 | 120 | </property> |
123 | 121 | <property name="pixmap"> |
124 | - <pixmap resource="resources.qrc">:/images/images/auto/005_auto_icon_01_ov.png</pixmap> | |
122 | + <pixmap>:/images/images/auto/005_auto_icon_01_ov.png</pixmap> | |
125 | 123 | </property> |
126 | 124 | <property name="alignment"> |
127 | 125 | <set>Qt::AlignCenter</set> |
... | ... | @@ -146,10 +144,10 @@ background-image: url(:/images/images/auto/ba_ground_set(full)_01); |
146 | 144 | </property> |
147 | 145 | <property name="styleSheet"> |
148 | 146 | <string notr="true">QPushButton { |
149 | -border-image: url(:/images/images/auto/btn_01.png); | |
147 | +border-image: url(:/images/button/288.png); | |
150 | 148 | } |
151 | 149 | QPushButton::pressed { |
152 | -border-image: url(:/images/images/auto/btn_01_ov.png); | |
150 | +border-image: url(:/images/button/288_ov.png); | |
153 | 151 | }</string> |
154 | 152 | </property> |
155 | 153 | <property name="text"> |
... | ... | @@ -167,10 +165,10 @@ border-image: url(:/images/images/auto/btn_01_ov.png); |
167 | 165 | </property> |
168 | 166 | <property name="styleSheet"> |
169 | 167 | <string notr="true">QPushButton { |
170 | -border-image: url(:/images/images/auto/btn_02.png); | |
168 | +border-image: url(:/images/button/152.png); | |
171 | 169 | } |
172 | 170 | QPushButton::pressed { |
173 | -border-image: url(:/images/images/auto/btn_02_ov.png); | |
171 | +border-image: url(:/images/button/152_ov.png); | |
174 | 172 | }</string> |
175 | 173 | </property> |
176 | 174 | <property name="text"> |
... | ... | @@ -178,7 +176,7 @@ border-image: url(:/images/images/auto/btn_02_ov.png); |
178 | 176 | </property> |
179 | 177 | <property name="icon"> |
180 | 178 | <iconset resource="resources.qrc"> |
181 | - <normaloff>:/images/images/auto/btn_icon_01.png</normaloff>:/images/images/auto/btn_icon_01.png</iconset> | |
179 | + <normaloff>:/images/auto_button/btn_icon_01.png</normaloff>:/images/auto_button/btn_icon_01.png</iconset> | |
182 | 180 | </property> |
183 | 181 | <property name="iconSize"> |
184 | 182 | <size> |
... | ... | @@ -196,27 +194,15 @@ border-image: url(:/images/images/auto/btn_02_ov.png); |
196 | 194 | <height>33</height> |
197 | 195 | </rect> |
198 | 196 | </property> |
199 | - <property name="maximum"> | |
200 | - <number>100</number> | |
201 | - </property> | |
202 | 197 | <property name="pageStep"> |
203 | 198 | <number>1</number> |
204 | 199 | </property> |
205 | - <property name="value"> | |
206 | - <number>39</number> | |
207 | - </property> | |
208 | 200 | <property name="tracking"> |
209 | 201 | <bool>true</bool> |
210 | 202 | </property> |
211 | 203 | <property name="orientation"> |
212 | 204 | <enum>Qt::Horizontal</enum> |
213 | 205 | </property> |
214 | - <property name="tickPosition"> | |
215 | - <enum>QSlider::TicksBelow</enum> | |
216 | - </property> | |
217 | - <property name="tickInterval"> | |
218 | - <number>1</number> | |
219 | - </property> | |
220 | 206 | </widget> |
221 | 207 | <widget class="QLabel" name="configCurrentLabel_1"> |
222 | 208 | <property name="enabled"> |
... | ... | @@ -282,19 +268,6 @@ border-image: url(:/images/images/auto/btn_02_ov.png); |
282 | 268 | <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> |
283 | 269 | </property> |
284 | 270 | </widget> |
285 | - <widget class="QWidget" name="configBlock_1" native="true"> | |
286 | - <property name="geometry"> | |
287 | - <rect> | |
288 | - <x>27</x> | |
289 | - <y>605</y> | |
290 | - <width>140</width> | |
291 | - <height>140</height> | |
292 | - </rect> | |
293 | - </property> | |
294 | - <property name="styleSheet"> | |
295 | - <string notr="true">background-image: url(:/images/images/manual/010_icon_block.png);</string> | |
296 | - </property> | |
297 | - </widget> | |
298 | 271 | <widget class="QLabel" name="configMinLabel_1"> |
299 | 272 | <property name="enabled"> |
300 | 273 | <bool>true</bool> |
... | ... | @@ -360,25 +333,22 @@ border-image: url(:/images/images/auto/btn_02_ov.png); |
360 | 333 | <widget class="QPushButton" name="configButton_1"> |
361 | 334 | <property name="geometry"> |
362 | 335 | <rect> |
363 | - <x>49</x> | |
364 | - <y>627</y> | |
365 | - <width>96</width> | |
366 | - <height>96</height> | |
336 | + <x>27</x> | |
337 | + <y>605</y> | |
338 | + <width>140</width> | |
339 | + <height>140</height> | |
367 | 340 | </rect> |
368 | 341 | </property> |
369 | 342 | <property name="styleSheet"> |
370 | - <string notr="true">QPushButton { | |
371 | - border-image: url(:/images/images/manual/011_icon_01.png); | |
372 | -} | |
373 | - | |
374 | -QPushButton:pressed { | |
375 | - border-image: url(:/images/images/manual/011_icon_01_ov.png); | |
376 | -} | |
377 | -</string> | |
343 | + <string notr="true">QPushButton { image: url(:/images/slider_icon/gau_icon_01.png); } | |
344 | +QPushButton:pressed { image: url(:/images/slider_icon/gau_icon_01_ov.png); }</string> | |
378 | 345 | </property> |
379 | 346 | <property name="text"> |
380 | 347 | <string/> |
381 | 348 | </property> |
349 | + <property name="style" stdset="0"> | |
350 | + <string>icon</string> | |
351 | + </property> | |
382 | 352 | </widget> |
383 | 353 | <widget class="QLabel" name="configMaxLabel_1"> |
384 | 354 | <property name="enabled"> |
... | ... | @@ -569,25 +539,22 @@ QPushButton:pressed { |
569 | 539 | <widget class="QPushButton" name="configButton_2"> |
570 | 540 | <property name="geometry"> |
571 | 541 | <rect> |
572 | - <x>49</x> | |
573 | - <y>787</y> | |
574 | - <width>96</width> | |
575 | - <height>96</height> | |
542 | + <x>27</x> | |
543 | + <y>765</y> | |
544 | + <width>140</width> | |
545 | + <height>140</height> | |
576 | 546 | </rect> |
577 | 547 | </property> |
578 | 548 | <property name="styleSheet"> |
579 | - <string notr="true">QPushButton { | |
580 | - border-image: url(:/images/images/manual/011_icon_01.png); | |
581 | -} | |
582 | - | |
583 | -QPushButton:pressed { | |
584 | - border-image: url(:/images/images/manual/011_icon_01_ov.png); | |
585 | -} | |
586 | -</string> | |
549 | + <string notr="true">QPushButton { image: url(:/images/slider_icon/gau_icon_01.png); } | |
550 | +QPushButton:pressed { image: url(:/images/slider_icon/gau_icon_01_ov.png); }</string> | |
587 | 551 | </property> |
588 | 552 | <property name="text"> |
589 | 553 | <string/> |
590 | 554 | </property> |
555 | + <property name="style" stdset="0"> | |
556 | + <string>icon</string> | |
557 | + </property> | |
591 | 558 | </widget> |
592 | 559 | <widget class="QLabel" name="configCurrentLabel_2"> |
593 | 560 | <property name="enabled"> |
... | ... | @@ -653,19 +620,6 @@ QPushButton:pressed { |
653 | 620 | <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> |
654 | 621 | </property> |
655 | 622 | </widget> |
656 | - <widget class="QWidget" name="configBlock_2" native="true"> | |
657 | - <property name="geometry"> | |
658 | - <rect> | |
659 | - <x>27</x> | |
660 | - <y>765</y> | |
661 | - <width>140</width> | |
662 | - <height>140</height> | |
663 | - </rect> | |
664 | - </property> | |
665 | - <property name="styleSheet"> | |
666 | - <string notr="true">background-image: url(:/images/images/manual/010_icon_block.png);</string> | |
667 | - </property> | |
668 | - </widget> | |
669 | 623 | <widget class="QSlider" name="configSlider_2"> |
670 | 624 | <property name="geometry"> |
671 | 625 | <rect> |
... | ... | @@ -675,15 +629,9 @@ QPushButton:pressed { |
675 | 629 | <height>33</height> |
676 | 630 | </rect> |
677 | 631 | </property> |
678 | - <property name="maximum"> | |
679 | - <number>100</number> | |
680 | - </property> | |
681 | 632 | <property name="pageStep"> |
682 | 633 | <number>1</number> |
683 | 634 | </property> |
684 | - <property name="value"> | |
685 | - <number>10</number> | |
686 | - </property> | |
687 | 635 | <property name="tracking"> |
688 | 636 | <bool>true</bool> |
689 | 637 | </property> |
... | ... | @@ -818,25 +766,22 @@ QPushButton:pressed { |
818 | 766 | <widget class="QPushButton" name="configButton_3"> |
819 | 767 | <property name="geometry"> |
820 | 768 | <rect> |
821 | - <x>49</x> | |
822 | - <y>957</y> | |
823 | - <width>96</width> | |
824 | - <height>96</height> | |
769 | + <x>27</x> | |
770 | + <y>935</y> | |
771 | + <width>140</width> | |
772 | + <height>140</height> | |
825 | 773 | </rect> |
826 | 774 | </property> |
827 | 775 | <property name="styleSheet"> |
828 | - <string notr="true">QPushButton { | |
829 | - border-image: url(:/images/images/manual/011_icon_01.png); | |
830 | -} | |
831 | - | |
832 | -QPushButton:pressed { | |
833 | - border-image: url(:/images/images/manual/011_icon_01_ov.png); | |
834 | -} | |
835 | -</string> | |
776 | + <string notr="true">QPushButton { image: url(:/images/slider_icon/gau_icon_01.png); } | |
777 | +QPushButton:pressed { image: url(:/images/slider_icon/gau_icon_01_ov.png); }</string> | |
836 | 778 | </property> |
837 | 779 | <property name="text"> |
838 | 780 | <string/> |
839 | 781 | </property> |
782 | + <property name="style" stdset="0"> | |
783 | + <string>icon</string> | |
784 | + </property> | |
840 | 785 | </widget> |
841 | 786 | <widget class="QLabel" name="configCurrentLabel_3"> |
842 | 787 | <property name="enabled"> |
... | ... | @@ -902,19 +847,6 @@ QPushButton:pressed { |
902 | 847 | <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> |
903 | 848 | </property> |
904 | 849 | </widget> |
905 | - <widget class="QWidget" name="configBlock_3" native="true"> | |
906 | - <property name="geometry"> | |
907 | - <rect> | |
908 | - <x>27</x> | |
909 | - <y>935</y> | |
910 | - <width>140</width> | |
911 | - <height>140</height> | |
912 | - </rect> | |
913 | - </property> | |
914 | - <property name="styleSheet"> | |
915 | - <string notr="true">background-image: url(:/images/images/manual/010_icon_block.png);</string> | |
916 | - </property> | |
917 | - </widget> | |
918 | 850 | <widget class="QSlider" name="configSlider_3"> |
919 | 851 | <property name="geometry"> |
920 | 852 | <rect> |
... | ... | @@ -924,15 +856,9 @@ QPushButton:pressed { |
924 | 856 | <height>33</height> |
925 | 857 | </rect> |
926 | 858 | </property> |
927 | - <property name="maximum"> | |
928 | - <number>100</number> | |
929 | - </property> | |
930 | 859 | <property name="pageStep"> |
931 | 860 | <number>1</number> |
932 | 861 | </property> |
933 | - <property name="value"> | |
934 | - <number>0</number> | |
935 | - </property> | |
936 | 862 | <property name="tracking"> |
937 | 863 | <bool>true</bool> |
938 | 864 | </property> |
... | ... | @@ -1067,25 +993,22 @@ QPushButton:pressed { |
1067 | 993 | <widget class="QPushButton" name="configButton_4"> |
1068 | 994 | <property name="geometry"> |
1069 | 995 | <rect> |
1070 | - <x>49</x> | |
1071 | - <y>1137</y> | |
1072 | - <width>96</width> | |
1073 | - <height>96</height> | |
996 | + <x>27</x> | |
997 | + <y>1115</y> | |
998 | + <width>140</width> | |
999 | + <height>140</height> | |
1074 | 1000 | </rect> |
1075 | 1001 | </property> |
1076 | 1002 | <property name="styleSheet"> |
1077 | - <string notr="true">QPushButton { | |
1078 | - border-image: url(:/images/images/manual/011_icon_01.png); | |
1079 | -} | |
1080 | - | |
1081 | -QPushButton:pressed { | |
1082 | - border-image: url(:/images/images/manual/011_icon_01_ov.png); | |
1083 | -} | |
1084 | -</string> | |
1003 | + <string notr="true">QPushButton { image: url(:/images/slider_icon/gau_icon_01.png); } | |
1004 | +QPushButton:pressed { image: url(:/images/slider_icon/gau_icon_01_ov.png); }</string> | |
1085 | 1005 | </property> |
1086 | 1006 | <property name="text"> |
1087 | 1007 | <string/> |
1088 | 1008 | </property> |
1009 | + <property name="style" stdset="0"> | |
1010 | + <string>icon</string> | |
1011 | + </property> | |
1089 | 1012 | </widget> |
1090 | 1013 | <widget class="QLabel" name="configCurrentLabel_4"> |
1091 | 1014 | <property name="enabled"> |
... | ... | @@ -1151,19 +1074,6 @@ QPushButton:pressed { |
1151 | 1074 | <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> |
1152 | 1075 | </property> |
1153 | 1076 | </widget> |
1154 | - <widget class="QWidget" name="configBlock_4" native="true"> | |
1155 | - <property name="geometry"> | |
1156 | - <rect> | |
1157 | - <x>27</x> | |
1158 | - <y>1115</y> | |
1159 | - <width>140</width> | |
1160 | - <height>140</height> | |
1161 | - </rect> | |
1162 | - </property> | |
1163 | - <property name="styleSheet"> | |
1164 | - <string notr="true">background-image: url(:/images/images/manual/010_icon_block.png);</string> | |
1165 | - </property> | |
1166 | - </widget> | |
1167 | 1077 | <widget class="QSlider" name="configSlider_4"> |
1168 | 1078 | <property name="geometry"> |
1169 | 1079 | <rect> |
... | ... | @@ -1173,15 +1083,9 @@ QPushButton:pressed { |
1173 | 1083 | <height>33</height> |
1174 | 1084 | </rect> |
1175 | 1085 | </property> |
1176 | - <property name="maximum"> | |
1177 | - <number>100</number> | |
1178 | - </property> | |
1179 | 1086 | <property name="pageStep"> |
1180 | 1087 | <number>1</number> |
1181 | 1088 | </property> |
1182 | - <property name="value"> | |
1183 | - <number>0</number> | |
1184 | - </property> | |
1185 | 1089 | <property name="tracking"> |
1186 | 1090 | <bool>true</bool> |
1187 | 1091 | </property> |
... | ... | @@ -1316,25 +1220,22 @@ QPushButton:pressed { |
1316 | 1220 | <widget class="QPushButton" name="configButton_5"> |
1317 | 1221 | <property name="geometry"> |
1318 | 1222 | <rect> |
1319 | - <x>49</x> | |
1320 | - <y>1307</y> | |
1321 | - <width>96</width> | |
1322 | - <height>96</height> | |
1223 | + <x>27</x> | |
1224 | + <y>1285</y> | |
1225 | + <width>140</width> | |
1226 | + <height>140</height> | |
1323 | 1227 | </rect> |
1324 | 1228 | </property> |
1325 | 1229 | <property name="styleSheet"> |
1326 | - <string notr="true">QPushButton { | |
1327 | - border-image: url(:/images/images/manual/011_icon_01.png); | |
1328 | -} | |
1329 | - | |
1330 | -QPushButton:pressed { | |
1331 | - border-image: url(:/images/images/manual/011_icon_01_ov.png); | |
1332 | -} | |
1333 | -</string> | |
1230 | + <string notr="true">QPushButton { image: url(:/images/slider_icon/gau_icon_01.png); } | |
1231 | +QPushButton:pressed { image: url(:/images/slider_icon/gau_icon_01_ov.png); }</string> | |
1334 | 1232 | </property> |
1335 | 1233 | <property name="text"> |
1336 | 1234 | <string/> |
1337 | 1235 | </property> |
1236 | + <property name="style" stdset="0"> | |
1237 | + <string>icon</string> | |
1238 | + </property> | |
1338 | 1239 | </widget> |
1339 | 1240 | <widget class="QLabel" name="configCurrentLabel_5"> |
1340 | 1241 | <property name="enabled"> |
... | ... | @@ -1400,19 +1301,6 @@ QPushButton:pressed { |
1400 | 1301 | <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> |
1401 | 1302 | </property> |
1402 | 1303 | </widget> |
1403 | - <widget class="QWidget" name="configBlock_5" native="true"> | |
1404 | - <property name="geometry"> | |
1405 | - <rect> | |
1406 | - <x>27</x> | |
1407 | - <y>1285</y> | |
1408 | - <width>140</width> | |
1409 | - <height>140</height> | |
1410 | - </rect> | |
1411 | - </property> | |
1412 | - <property name="styleSheet"> | |
1413 | - <string notr="true">background-image: url(:/images/images/manual/010_icon_block.png);</string> | |
1414 | - </property> | |
1415 | - </widget> | |
1416 | 1304 | <widget class="QSlider" name="configSlider_5"> |
1417 | 1305 | <property name="geometry"> |
1418 | 1306 | <rect> |
... | ... | @@ -1422,15 +1310,9 @@ QPushButton:pressed { |
1422 | 1310 | <height>33</height> |
1423 | 1311 | </rect> |
1424 | 1312 | </property> |
1425 | - <property name="maximum"> | |
1426 | - <number>100</number> | |
1427 | - </property> | |
1428 | 1313 | <property name="pageStep"> |
1429 | 1314 | <number>1</number> |
1430 | 1315 | </property> |
1431 | - <property name="value"> | |
1432 | - <number>0</number> | |
1433 | - </property> | |
1434 | 1316 | <property name="tracking"> |
1435 | 1317 | <bool>true</bool> |
1436 | 1318 | </property> |
... | ... | @@ -1438,46 +1320,8 @@ QPushButton:pressed { |
1438 | 1320 | <enum>Qt::Horizontal</enum> |
1439 | 1321 | </property> |
1440 | 1322 | </widget> |
1441 | - <zorder>configBlock_5</zorder> | |
1442 | - <zorder>configBlock_4</zorder> | |
1443 | - <zorder>configBlock_3</zorder> | |
1444 | - <zorder>configBlock_2</zorder> | |
1445 | - <zorder>cookTypeIcon_1</zorder> | |
1446 | - <zorder>selectCookButton_1</zorder> | |
1447 | - <zorder>pushButton_4</zorder> | |
1448 | - <zorder>configSlider_1</zorder> | |
1449 | - <zorder>configCurrentLabel_1</zorder> | |
1450 | - <zorder>configBlock_1</zorder> | |
1451 | - <zorder>configMinLabel_1</zorder> | |
1452 | - <zorder>configButton_1</zorder> | |
1453 | - <zorder>configMaxLabel_1</zorder> | |
1454 | - <zorder>configMaxLabel_2</zorder> | |
1455 | - <zorder>configMinLabel_2</zorder> | |
1456 | - <zorder>configButton_2</zorder> | |
1457 | - <zorder>configCurrentLabel_2</zorder> | |
1458 | - <zorder>configSlider_2</zorder> | |
1459 | - <zorder>configMaxLabel_3</zorder> | |
1460 | - <zorder>configMinLabel_3</zorder> | |
1461 | - <zorder>configButton_3</zorder> | |
1462 | - <zorder>configCurrentLabel_3</zorder> | |
1463 | - <zorder>configSlider_3</zorder> | |
1464 | - <zorder>configMaxLabel_4</zorder> | |
1465 | - <zorder>configMinLabel_4</zorder> | |
1466 | - <zorder>configButton_4</zorder> | |
1467 | - <zorder>configCurrentLabel_4</zorder> | |
1468 | - <zorder>configSlider_4</zorder> | |
1469 | - <zorder>configMaxLabel_5</zorder> | |
1470 | - <zorder>configMinLabel_5</zorder> | |
1471 | - <zorder>configButton_5</zorder> | |
1472 | - <zorder>configCurrentLabel_5</zorder> | |
1473 | - <zorder>configSlider_5</zorder> | |
1474 | 1323 | </widget> |
1475 | 1324 | <widget class="QWidget" name="cookPage"> |
1476 | - <property name="styleSheet"> | |
1477 | - <string notr="true">QWidget#cookPage { | |
1478 | -background-image: url(:/images/images/auto/ba_ground_set(full)); | |
1479 | -}</string> | |
1480 | - </property> | |
1481 | 1325 | <widget class="QPushButton" name="configCookButton"> |
1482 | 1326 | <property name="geometry"> |
1483 | 1327 | <rect> |
... | ... | @@ -1488,19 +1332,15 @@ background-image: url(:/images/images/auto/ba_ground_set(full)); |
1488 | 1332 | </rect> |
1489 | 1333 | </property> |
1490 | 1334 | <property name="styleSheet"> |
1491 | - <string notr="true">QPushButton { | |
1492 | -border-image: url(:/images/images/auto/btn_02.png); | |
1493 | -} | |
1494 | -QPushButton::pressed { | |
1495 | -border-image: url(:/images/images/auto/btn_02_ov.png); | |
1496 | -}</string> | |
1335 | + <string notr="true">QPushButton { border-image: url(:/images/button/152.png); } | |
1336 | +QPushButton::pressed { border-image: url(:/images/button/152_ov.png); }</string> | |
1497 | 1337 | </property> |
1498 | 1338 | <property name="text"> |
1499 | 1339 | <string/> |
1500 | 1340 | </property> |
1501 | 1341 | <property name="icon"> |
1502 | 1342 | <iconset resource="resources.qrc"> |
1503 | - <normaloff>:/images/images/auto/btn_icon_03.png</normaloff>:/images/images/auto/btn_icon_03.png</iconset> | |
1343 | + <normaloff>:/images/auto_button/btn_icon_03.png</normaloff>:/images/auto_button/btn_icon_03.png</iconset> | |
1504 | 1344 | </property> |
1505 | 1345 | <property name="iconSize"> |
1506 | 1346 | <size> |
... | ... | @@ -1519,19 +1359,15 @@ border-image: url(:/images/images/auto/btn_02_ov.png); |
1519 | 1359 | </rect> |
1520 | 1360 | </property> |
1521 | 1361 | <property name="styleSheet"> |
1522 | - <string notr="true">QPushButton { | |
1523 | -border-image: url(:/images/images/auto/btn_02.png); | |
1524 | -} | |
1525 | -QPushButton::pressed { | |
1526 | -border-image: url(:/images/images/auto/btn_02_ov.png); | |
1527 | -}</string> | |
1362 | + <string notr="true">QPushButton { border-image: url(:/images/button/152.png); } | |
1363 | +QPushButton::pressed { border-image: url(:/images/button/152_ov.png); }</string> | |
1528 | 1364 | </property> |
1529 | 1365 | <property name="text"> |
1530 | 1366 | <string/> |
1531 | 1367 | </property> |
1532 | 1368 | <property name="icon"> |
1533 | 1369 | <iconset resource="resources.qrc"> |
1534 | - <normaloff>:/images/images/auto/btn_icon_02.png</normaloff>:/images/images/auto/btn_icon_02.png</iconset> | |
1370 | + <normaloff>:/images/auto_button/btn_icon_02.png</normaloff>:/images/auto_button/btn_icon_02.png</iconset> | |
1535 | 1371 | </property> |
1536 | 1372 | <property name="iconSize"> |
1537 | 1373 | <size> |
... | ... | @@ -1558,12 +1394,8 @@ border-image: url(:/images/images/auto/btn_02_ov.png); |
1558 | 1394 | </font> |
1559 | 1395 | </property> |
1560 | 1396 | <property name="styleSheet"> |
1561 | - <string notr="true">QPushButton { | |
1562 | -border-image: url(:/images/images/auto/btn_01.png); | |
1563 | -} | |
1564 | -QPushButton::pressed { | |
1565 | -border-image: url(:/images/images/auto/btn_01_ov.png); | |
1566 | -}</string> | |
1397 | + <string notr="true">QPushButton { border-image: url(:/images/button/288.png); } | |
1398 | +QPushButton::pressed { border-image: url(:/images/button/288_ov.png); }</string> | |
1567 | 1399 | </property> |
1568 | 1400 | <property name="text"> |
1569 | 1401 | <string/> |
... | ... | @@ -1582,7 +1414,7 @@ border-image: url(:/images/images/auto/btn_01_ov.png); |
1582 | 1414 | <string/> |
1583 | 1415 | </property> |
1584 | 1416 | <property name="pixmap"> |
1585 | - <pixmap resource="resources.qrc">:/images/images/auto/005_auto_icon_01_ov.png</pixmap> | |
1417 | + <pixmap>:/images/images/auto/005_auto_icon_01_ov.png</pixmap> | |
1586 | 1418 | </property> |
1587 | 1419 | <property name="alignment"> |
1588 | 1420 | <set>Qt::AlignCenter</set> |
... | ... | @@ -1598,12 +1430,8 @@ border-image: url(:/images/images/auto/btn_01_ov.png); |
1598 | 1430 | </rect> |
1599 | 1431 | </property> |
1600 | 1432 | <property name="styleSheet"> |
1601 | - <string notr="true">QPushButton { | |
1602 | -background-image: url(:/images/images/auto/time_window_02.png); | |
1603 | -} | |
1604 | -QPushButton::pressed { | |
1605 | -background-image: url(:/images/images/auto/window_arrow_01_expand.png); | |
1606 | -}</string> | |
1433 | + <string notr="true">QPushButton { background-image: url(:/images/auto_button/prev_step.png); } | |
1434 | +QPushButton::pressed { background-image: url(:/images/auto_button/prev_step_ov.png); }</string> | |
1607 | 1435 | </property> |
1608 | 1436 | <property name="text"> |
1609 | 1437 | <string/> |
... | ... | @@ -1619,12 +1447,8 @@ background-image: url(:/images/images/auto/window_arrow_01_expand.png); |
1619 | 1447 | </rect> |
1620 | 1448 | </property> |
1621 | 1449 | <property name="styleSheet"> |
1622 | - <string notr="true">QPushButton { | |
1623 | -background-image: url(:/images/images/auto/time_window_03.png); | |
1624 | -} | |
1625 | -QPushButton::pressed { | |
1626 | -background-image: url(:/images/images/auto/window_arrow_02_expand.png); | |
1627 | -}</string> | |
1450 | + <string notr="true">QPushButton { background-image: url(:/images/auto_button/next_step.png); } | |
1451 | +QPushButton::pressed { background-image: url(:/images/auto_button/next_step_ov.png); }</string> | |
1628 | 1452 | </property> |
1629 | 1453 | <property name="text"> |
1630 | 1454 | <string/> |
... | ... | @@ -1643,7 +1467,7 @@ background-image: url(:/images/images/auto/window_arrow_02_expand.png); |
1643 | 1467 | <string/> |
1644 | 1468 | </property> |
1645 | 1469 | <property name="pixmap"> |
1646 | - <pixmap resource="resources.qrc">:/images/images/auto/window_icon_01.png</pixmap> | |
1470 | + <pixmap resource="resources.qrc">:/images/symbol/time.png</pixmap> | |
1647 | 1471 | </property> |
1648 | 1472 | <property name="alignment"> |
1649 | 1473 | <set>Qt::AlignCenter</set> |
... | ... | @@ -1662,7 +1486,7 @@ background-image: url(:/images/images/auto/window_arrow_02_expand.png); |
1662 | 1486 | <string/> |
1663 | 1487 | </property> |
1664 | 1488 | <property name="pixmap"> |
1665 | - <pixmap resource="resources.qrc">:/images/images/auto/window_icon_02.png</pixmap> | |
1489 | + <pixmap resource="resources.qrc">:/images/symbol/core_temp.png</pixmap> | |
1666 | 1490 | </property> |
1667 | 1491 | <property name="alignment"> |
1668 | 1492 | <set>Qt::AlignCenter</set> |
... | ... | @@ -1678,12 +1502,8 @@ background-image: url(:/images/images/auto/window_arrow_02_expand.png); |
1678 | 1502 | </rect> |
1679 | 1503 | </property> |
1680 | 1504 | <property name="styleSheet"> |
1681 | - <string notr="true">QPushButton { | |
1682 | -border-image: url(:/images/images/auto/window_icon_03.png); | |
1683 | -} | |
1684 | -QPushButton::pressed { | |
1685 | -border-image: url(:/images/images/auto/window_icon_03_ov.png); | |
1686 | -}</string> | |
1505 | + <string notr="true">QPushButton { border-image: url(:/images/symbol/info.png); } | |
1506 | +QPushButton::pressed { border-image: url(:/images/symbol/info_ov.png); }</string> | |
1687 | 1507 | </property> |
1688 | 1508 | <property name="text"> |
1689 | 1509 | <string/> |
... | ... | @@ -1745,7 +1565,7 @@ border-image: url(:/images/images/auto/window_icon_03_ov.png); |
1745 | 1565 | <string/> |
1746 | 1566 | </property> |
1747 | 1567 | <property name="pixmap"> |
1748 | - <pixmap resource="resources.qrc">:/images/images/auto/sys_icon_05.png</pixmap> | |
1568 | + <pixmap resource="resources.qrc">:/images/cook_step_type/sys_icon_05.png</pixmap> | |
1749 | 1569 | </property> |
1750 | 1570 | <property name="alignment"> |
1751 | 1571 | <set>Qt::AlignCenter</set> |
... | ... | @@ -1820,7 +1640,7 @@ border-image: url(:/images/images/auto/window_icon_03_ov.png); |
1820 | 1640 | <string/> |
1821 | 1641 | </property> |
1822 | 1642 | <property name="pixmap"> |
1823 | - <pixmap resource="resources.qrc">:/images/images/auto/window_icon_06.png</pixmap> | |
1643 | + <pixmap>:/images/images/auto/window_icon_06.png</pixmap> | |
1824 | 1644 | </property> |
1825 | 1645 | <property name="alignment"> |
1826 | 1646 | <set>Qt::AlignCenter</set> |
... | ... | @@ -2338,7 +2158,7 @@ border-image: url(:/images/images/auto/window_icon_03_ov.png); |
2338 | 2158 | <string/> |
2339 | 2159 | </property> |
2340 | 2160 | <property name="pixmap"> |
2341 | - <pixmap resource="resources.qrc">:/images/images/auto/sys_icon_05.png</pixmap> | |
2161 | + <pixmap resource="resources.qrc">:/images/cook_step_type/sys_icon_05.png</pixmap> | |
2342 | 2162 | </property> |
2343 | 2163 | <property name="alignment"> |
2344 | 2164 | <set>Qt::AlignCenter</set> |
... | ... | @@ -2416,7 +2236,7 @@ border-image: url(:/images/images/auto/window_icon_03_ov.png); |
2416 | 2236 | <string/> |
2417 | 2237 | </property> |
2418 | 2238 | <property name="pixmap"> |
2419 | - <pixmap resource="resources.qrc">:/images/images/auto/ani_04.png</pixmap> | |
2239 | + <pixmap>:/images/images/auto/ani_04.png</pixmap> | |
2420 | 2240 | </property> |
2421 | 2241 | </widget> |
2422 | 2242 | <widget class="QLabel" name="closeDoorArrow"> |
... | ... | @@ -2432,7 +2252,7 @@ border-image: url(:/images/images/auto/window_icon_03_ov.png); |
2432 | 2252 | <string/> |
2433 | 2253 | </property> |
2434 | 2254 | <property name="pixmap"> |
2435 | - <pixmap resource="resources.qrc">:/images/images/auto/object_arrow_002.png</pixmap> | |
2255 | + <pixmap resource="resources.qrc">:/images/animation/close_door_arrow.png</pixmap> | |
2436 | 2256 | </property> |
2437 | 2257 | </widget> |
2438 | 2258 | <widget class="QLabel" name="openDoorArrow"> |
... | ... | @@ -2448,7 +2268,7 @@ border-image: url(:/images/images/auto/window_icon_03_ov.png); |
2448 | 2268 | <string/> |
2449 | 2269 | </property> |
2450 | 2270 | <property name="pixmap"> |
2451 | - <pixmap resource="resources.qrc">:/images/images/auto/object_arrow_001.png</pixmap> | |
2271 | + <pixmap resource="resources.qrc">:/images/animation/open_door_arrow.png</pixmap> | |
2452 | 2272 | </property> |
2453 | 2273 | </widget> |
2454 | 2274 | </widget> |
... | ... | @@ -2469,11 +2289,6 @@ background-image: url(:/images/images/auto/ba_ground_set); |
2469 | 2289 | <height>150</height> |
2470 | 2290 | </rect> |
2471 | 2291 | </property> |
2472 | - <property name="styleSheet"> | |
2473 | - <string notr="true">QWidget#bottomBar { | |
2474 | -background-image: url(:/images/images/config_service/001_01_background_under_down.png); | |
2475 | -}</string> | |
2476 | - </property> | |
2477 | 2292 | <widget class="QPushButton" name="backButton"> |
2478 | 2293 | <property name="geometry"> |
2479 | 2294 | <rect> |
... | ... | @@ -2490,14 +2305,14 @@ background-image: url(:/images/images/config_service/001_01_background_under_dow |
2490 | 2305 | </sizepolicy> |
2491 | 2306 | </property> |
2492 | 2307 | <property name="styleSheet"> |
2493 | - <string notr="true">QPushButton { border-image: url(:/images/images/auto/006_sys_icon_03.png); } | |
2494 | -QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_03_ov.png); }</string> | |
2308 | + <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/back.png); } | |
2309 | +QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); }</string> | |
2495 | 2310 | </property> |
2496 | 2311 | <property name="text"> |
2497 | 2312 | <string/> |
2498 | 2313 | </property> |
2499 | 2314 | </widget> |
2500 | - <widget class="QPushButton" name="backButton_3"> | |
2315 | + <widget class="QPushButton" name="washButton"> | |
2501 | 2316 | <property name="geometry"> |
2502 | 2317 | <rect> |
2503 | 2318 | <x>514</x> |
... | ... | @@ -2513,14 +2328,14 @@ QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_03_ov. |
2513 | 2328 | </sizepolicy> |
2514 | 2329 | </property> |
2515 | 2330 | <property name="styleSheet"> |
2516 | - <string notr="true">QPushButton { border-image: url(:/images/images/auto/006_sys_icon_05.png); } | |
2517 | -QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_05_ov.png); }</string> | |
2331 | + <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/wash.png); } | |
2332 | +QPushButton:pressed { border-image: url(:/images/bottom_bar/wash_ov.png); }</string> | |
2518 | 2333 | </property> |
2519 | 2334 | <property name="text"> |
2520 | 2335 | <string/> |
2521 | 2336 | </property> |
2522 | 2337 | </widget> |
2523 | - <widget class="QPushButton" name="backButton_2"> | |
2338 | + <widget class="QPushButton" name="configButton"> | |
2524 | 2339 | <property name="geometry"> |
2525 | 2340 | <rect> |
2526 | 2341 | <x>288</x> |
... | ... | @@ -2536,14 +2351,14 @@ QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_05_ov. |
2536 | 2351 | </sizepolicy> |
2537 | 2352 | </property> |
2538 | 2353 | <property name="styleSheet"> |
2539 | - <string notr="true">QPushButton { border-image: url(:/images/images/auto/006_sys_icon_01.png); } | |
2540 | -QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_01_ov.png); }</string> | |
2354 | + <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/config.png); } | |
2355 | +QPushButton:pressed { border-image: url(:/images/bottom_bar/config_ov.png); }</string> | |
2541 | 2356 | </property> |
2542 | 2357 | <property name="text"> |
2543 | 2358 | <string/> |
2544 | 2359 | </property> |
2545 | 2360 | </widget> |
2546 | - <widget class="QPushButton" name="backButton_4"> | |
2361 | + <widget class="QPushButton" name="helpButton"> | |
2547 | 2362 | <property name="geometry"> |
2548 | 2363 | <rect> |
2549 | 2364 | <x>627</x> |
... | ... | @@ -2559,14 +2374,14 @@ QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_01_ov. |
2559 | 2374 | </sizepolicy> |
2560 | 2375 | </property> |
2561 | 2376 | <property name="styleSheet"> |
2562 | - <string notr="true">QPushButton { border-image: url(:/images/images/auto/006_sys_icon_02.png); } | |
2563 | -QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_02_ov.png); }</string> | |
2377 | + <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/help.png); } | |
2378 | +QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); }</string> | |
2564 | 2379 | </property> |
2565 | 2380 | <property name="text"> |
2566 | 2381 | <string/> |
2567 | 2382 | </property> |
2568 | 2383 | </widget> |
2569 | - <widget class="QPushButton" name="backButton_5"> | |
2384 | + <widget class="QPushButton" name="favoritesButton"> | |
2570 | 2385 | <property name="geometry"> |
2571 | 2386 | <rect> |
2572 | 2387 | <x>401</x> |
... | ... | @@ -2582,7 +2397,8 @@ QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_02_ov. |
2582 | 2397 | </sizepolicy> |
2583 | 2398 | </property> |
2584 | 2399 | <property name="styleSheet"> |
2585 | - <string notr="true"/> | |
2400 | + <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/favorites.png); } | |
2401 | +QPushButton:pressed { border-image: url(:/images/bottom_bar/favorites_ov.png); }</string> | |
2586 | 2402 | </property> |
2587 | 2403 | <property name="text"> |
2588 | 2404 | <string/> |
... | ... | @@ -2602,11 +2418,6 @@ QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_02_ov. |
2602 | 2418 | <container>1</container> |
2603 | 2419 | </customwidget> |
2604 | 2420 | <customwidget> |
2605 | - <class>AnimatedImageBox</class> | |
2606 | - <extends>QLabel</extends> | |
2607 | - <header>animatedimagebox.h</header> | |
2608 | - </customwidget> | |
2609 | - <customwidget> | |
2610 | 2421 | <class>HumidityCircularGauge</class> |
2611 | 2422 | <extends>QWidget</extends> |
2612 | 2423 | <header>humiditycirculargauge.h</header> |
... | ... | @@ -2619,6 +2430,11 @@ QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_02_ov. |
2619 | 2430 | <container>1</container> |
2620 | 2431 | </customwidget> |
2621 | 2432 | <customwidget> |
2433 | + <class>AnimatedImageBox</class> | |
2434 | + <extends>QLabel</extends> | |
2435 | + <header>animatedimagebox.h</header> | |
2436 | + </customwidget> | |
2437 | + <customwidget> | |
2622 | 2438 | <class>PreheatTempGauge</class> |
2623 | 2439 | <extends>QWidget</extends> |
2624 | 2440 | <header>preheattempgauge.h</header> | ... | ... |
... | ... | @@ -14,9 +14,8 @@ |
14 | 14 | <string>MainWindow</string> |
15 | 15 | </property> |
16 | 16 | <property name="styleSheet"> |
17 | - <string notr="true">QWidget#centralwidget { | |
18 | -background-image: url(:/images/images/config_service/088_service_bg_all.png); | |
19 | -}</string> | |
17 | + <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); } | |
18 | +#bottomBar { background-image: url(:/images/bottom_bar/background.png); }</string> | |
20 | 19 | </property> |
21 | 20 | <widget class="QWidget" name="centralwidget"> |
22 | 21 | <widget class="QStackedWidget" name="upperStack"> |
... | ... | @@ -30,9 +29,7 @@ background-image: url(:/images/images/config_service/088_service_bg_all.png); |
30 | 29 | </property> |
31 | 30 | <widget class="QWidget" name="clockContainer"> |
32 | 31 | <property name="styleSheet"> |
33 | - <string notr="true">QWidget#clockContainer { | |
34 | -background-image: url(:/images/images/config/001_01_background_time.png); | |
35 | -}</string> | |
32 | + <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | |
36 | 33 | </property> |
37 | 34 | <widget class="Clock" name="clock" native="true"> |
38 | 35 | <property name="geometry"> |
... | ... | @@ -56,9 +53,6 @@ background-image: url(:/images/images/config/001_01_background_time.png); |
56 | 53 | <height>150</height> |
57 | 54 | </rect> |
58 | 55 | </property> |
59 | - <property name="styleSheet"> | |
60 | - <string notr="true">background-image: url(:/images/images/config_service/001_01_background_under_down.png);</string> | |
61 | - </property> | |
62 | 56 | <widget class="QPushButton" name="backButton"> |
63 | 57 | <property name="geometry"> |
64 | 58 | <rect> |
... | ... | @@ -75,8 +69,8 @@ background-image: url(:/images/images/config/001_01_background_time.png); |
75 | 69 | </sizepolicy> |
76 | 70 | </property> |
77 | 71 | <property name="styleSheet"> |
78 | - <string notr="true">QPushButton { border-image: url(:/images/images/config_service/006_sys_icon_03.png); } | |
79 | -QPushButton:pressed { border-image: url(:/images/images/config_service/006_sys_icon_03_ov.png); }</string> | |
72 | + <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/back.png); } | |
73 | +QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); }</string> | |
80 | 74 | </property> |
81 | 75 | <property name="text"> |
82 | 76 | <string/> |
... | ... | @@ -96,7 +90,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/006_sys_i |
96 | 90 | <string/> |
97 | 91 | </property> |
98 | 92 | <property name="pixmap"> |
99 | - <pixmap resource="resources.qrc">:/images/images/config_service/091_set_eng_icon_01.png</pixmap> | |
93 | + <pixmap resource="resources.qrc">:/images/config/service/091_set_eng_icon_01.png</pixmap> | |
100 | 94 | </property> |
101 | 95 | <property name="alignment"> |
102 | 96 | <set>Qt::AlignCenter</set> |
... | ... | @@ -115,7 +109,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/006_sys_i |
115 | 109 | <string/> |
116 | 110 | </property> |
117 | 111 | <property name="pixmap"> |
118 | - <pixmap resource="resources.qrc">:/images/images/config_service/091_set_eng_icon_03.png</pixmap> | |
112 | + <pixmap resource="resources.qrc">:/images/config/service/091_set_eng_icon_03.png</pixmap> | |
119 | 113 | </property> |
120 | 114 | </widget> |
121 | 115 | <widget class="QLabel" name="label_3"> |
... | ... | @@ -131,7 +125,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/006_sys_i |
131 | 125 | <string/> |
132 | 126 | </property> |
133 | 127 | <property name="pixmap"> |
134 | - <pixmap resource="resources.qrc">:/images/images/config_service/091_set_eng_icon_02.png</pixmap> | |
128 | + <pixmap resource="resources.qrc">:/images/config/service/091_set_eng_icon_02.png</pixmap> | |
135 | 129 | </property> |
136 | 130 | </widget> |
137 | 131 | <widget class="QLabel" name="label_4"> |
... | ... | @@ -147,7 +141,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/006_sys_i |
147 | 141 | <string/> |
148 | 142 | </property> |
149 | 143 | <property name="pixmap"> |
150 | - <pixmap resource="resources.qrc">:/images/images/config_service/091_set_eng_icon_04.png</pixmap> | |
144 | + <pixmap resource="resources.qrc">:/images/config/service/091_set_eng_icon_04.png</pixmap> | |
151 | 145 | </property> |
152 | 146 | </widget> |
153 | 147 | <widget class="QPushButton" name="steamBurnerButton"> |
... | ... | @@ -174,13 +168,8 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/006_sys_i |
174 | 168 | </font> |
175 | 169 | </property> |
176 | 170 | <property name="styleSheet"> |
177 | - <string notr="true">QPushButton { | |
178 | - border-image: url(:/images/images/config_service/090_set_eng_btn_03.png); | |
179 | -} | |
180 | - | |
181 | -QPushButton:pressed { | |
182 | - border-image: url(:/images/images/config_service/090_set_eng_btn_03_ov.png); | |
183 | -}</string> | |
171 | + <string notr="true">QPushButton { border-image: url(:/images/button/184.png); } | |
172 | +QPushButton:pressed { border-image: url(:/images/button/184_ov.png); }</string> | |
184 | 173 | </property> |
185 | 174 | <property name="text"> |
186 | 175 | <string>START</string> |
... | ... | @@ -210,13 +199,8 @@ QPushButton:pressed { |
210 | 199 | </font> |
211 | 200 | </property> |
212 | 201 | <property name="styleSheet"> |
213 | - <string notr="true">QPushButton { | |
214 | - border-image: url(:/images/images/config_service/090_set_eng_btn_03.png); | |
215 | -} | |
216 | - | |
217 | -QPushButton:pressed { | |
218 | - border-image: url(:/images/images/config_service/090_set_eng_btn_03_ov.png); | |
219 | -}</string> | |
202 | + <string notr="true">QPushButton { border-image: url(:/images/button/184.png); } | |
203 | +QPushButton:pressed { border-image: url(:/images/button/184_ov.png); }</string> | |
220 | 204 | </property> |
221 | 205 | <property name="text"> |
222 | 206 | <string>START</string> |
... | ... | @@ -246,13 +230,8 @@ QPushButton:pressed { |
246 | 230 | </font> |
247 | 231 | </property> |
248 | 232 | <property name="styleSheet"> |
249 | - <string notr="true">QPushButton { | |
250 | - border-image: url(:/images/images/config_service/090_set_eng_btn_03.png); | |
251 | -} | |
252 | - | |
253 | -QPushButton:pressed { | |
254 | - border-image: url(:/images/images/config_service/090_set_eng_btn_03_ov.png); | |
255 | -}</string> | |
233 | + <string notr="true">QPushButton { border-image: url(:/images/button/184.png); } | |
234 | +QPushButton:pressed { border-image: url(:/images/button/184_ov.png); }</string> | |
256 | 235 | </property> |
257 | 236 | <property name="text"> |
258 | 237 | <string>START</string> |
... | ... | @@ -2027,7 +2006,7 @@ QPushButton:pressed { |
2027 | 2006 | <string/> |
2028 | 2007 | </property> |
2029 | 2008 | <property name="pixmap"> |
2030 | - <pixmap resource="resources.qrc">:/images/images/config_service/002_btn_line_w.png</pixmap> | |
2009 | + <pixmap resource="resources.qrc">:/images/line/manual_core_temp_horizontal.png</pixmap> | |
2031 | 2010 | </property> |
2032 | 2011 | </widget> |
2033 | 2012 | <widget class="QLabel" name="label_6"> |
... | ... | @@ -2043,7 +2022,7 @@ QPushButton:pressed { |
2043 | 2022 | <string/> |
2044 | 2023 | </property> |
2045 | 2024 | <property name="pixmap"> |
2046 | - <pixmap resource="resources.qrc">:/images/images/config_service/002_btn_line_w.png</pixmap> | |
2025 | + <pixmap resource="resources.qrc">:/images/line/manual_core_temp_horizontal.png</pixmap> | |
2047 | 2026 | </property> |
2048 | 2027 | </widget> |
2049 | 2028 | <widget class="QLabel" name="label_15"> | ... | ... |
... | ... | @@ -6,7 +6,7 @@ |
6 | 6 | CircularGauge::CircularGauge(QWidget *parent) : QWidget(parent), |
7 | 7 | value(30), maximum(40), minimum(0) |
8 | 8 | { |
9 | - background.load(":/images/images/auto/circle_graphe_01.png"); | |
9 | + background.load(":/images/gauge/circle_background.png"); | |
10 | 10 | } |
11 | 11 | |
12 | 12 | void CircularGauge::setValue(int value) | ... | ... |
... | ... | @@ -10,7 +10,7 @@ Clock::Clock(QWidget *parent) : QWidget(parent) |
10 | 10 | { |
11 | 11 | ticking = true; |
12 | 12 | |
13 | - background.load(":/images/images/main/002_time_bg_number.png"); | |
13 | + background.load(":/images/clock/numbers.png"); | |
14 | 14 | |
15 | 15 | QTimer *timer = new QTimer(this); |
16 | 16 | connect(timer, SIGNAL(timeout()), this, SLOT(checkUpdate())); | ... | ... |
... | ... | @@ -14,9 +14,8 @@ |
14 | 14 | <string>MainWindow</string> |
15 | 15 | </property> |
16 | 16 | <property name="styleSheet"> |
17 | - <string notr="true">QWidget#centralwidget { | |
18 | -background-image: url(:/images/images/config_service/088_service_bg_all.png); | |
19 | -}</string> | |
17 | + <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); } | |
18 | +#bottomBar { background-image: url(:/images/bottom_bar/background.png); }</string> | |
20 | 19 | </property> |
21 | 20 | <widget class="QWidget" name="centralwidget"> |
22 | 21 | <widget class="QStackedWidget" name="upperStack"> |
... | ... | @@ -30,9 +29,7 @@ background-image: url(:/images/images/config_service/088_service_bg_all.png); |
30 | 29 | </property> |
31 | 30 | <widget class="QWidget" name="clockContainer"> |
32 | 31 | <property name="styleSheet"> |
33 | - <string notr="true">QWidget#clockContainer { | |
34 | -background-image: url(:/images/images/config/001_01_background_time.png); | |
35 | -}</string> | |
32 | + <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | |
36 | 33 | </property> |
37 | 34 | <widget class="Clock" name="clock" native="true"> |
38 | 35 | <property name="geometry"> |
... | ... | @@ -56,9 +53,6 @@ background-image: url(:/images/images/config/001_01_background_time.png); |
56 | 53 | <height>150</height> |
57 | 54 | </rect> |
58 | 55 | </property> |
59 | - <property name="styleSheet"> | |
60 | - <string notr="true">background-image: url(:/images/images/config_service/001_01_background_under_down.png);</string> | |
61 | - </property> | |
62 | 56 | <widget class="QPushButton" name="backButton"> |
63 | 57 | <property name="geometry"> |
64 | 58 | <rect> |
... | ... | @@ -75,8 +69,8 @@ background-image: url(:/images/images/config/001_01_background_time.png); |
75 | 69 | </sizepolicy> |
76 | 70 | </property> |
77 | 71 | <property name="styleSheet"> |
78 | - <string notr="true">QPushButton { border-image: url(:/images/images/config_service/006_sys_icon_03.png); } | |
79 | -QPushButton:pressed { border-image: url(:/images/images/config_service/006_sys_icon_03_ov.png); }</string> | |
72 | + <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/back.png); } | |
73 | +QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); }</string> | |
80 | 74 | </property> |
81 | 75 | <property name="text"> |
82 | 76 | <string/> |
... | ... | @@ -107,13 +101,8 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/006_sys_i |
107 | 101 | </font> |
108 | 102 | </property> |
109 | 103 | <property name="styleSheet"> |
110 | - <string notr="true">QPushButton { | |
111 | - border-image: url(:/images/images/config_service/090_set_eng_btn_03.png); | |
112 | -} | |
113 | - | |
114 | -QPushButton:pressed { | |
115 | - border-image: url(:/images/images/config_service/090_set_eng_btn_03_ov.png); | |
116 | -}</string> | |
104 | + <string notr="true">QPushButton { border-image: url(:/images/button/184.png); } | |
105 | +QPushButton:pressed { border-image: url(:/images/button/184_ov.png); }</string> | |
117 | 106 | </property> |
118 | 107 | <property name="text"> |
119 | 108 | <string>START</string> |
... | ... | @@ -143,13 +132,8 @@ QPushButton:pressed { |
143 | 132 | </font> |
144 | 133 | </property> |
145 | 134 | <property name="styleSheet"> |
146 | - <string notr="true">QPushButton { | |
147 | - border-image: url(:/images/images/config_service/090_set_eng_btn_03.png); | |
148 | -} | |
149 | - | |
150 | -QPushButton:pressed { | |
151 | - border-image: url(:/images/images/config_service/090_set_eng_btn_03_ov.png); | |
152 | -}</string> | |
135 | + <string notr="true">QPushButton { border-image: url(:/images/button/184.png); } | |
136 | +QPushButton:pressed { border-image: url(:/images/button/184_ov.png); }</string> | |
153 | 137 | </property> |
154 | 138 | <property name="text"> |
155 | 139 | <string>START</string> |
... | ... | @@ -179,13 +163,8 @@ QPushButton:pressed { |
179 | 163 | </font> |
180 | 164 | </property> |
181 | 165 | <property name="styleSheet"> |
182 | - <string notr="true">QPushButton { | |
183 | - border-image: url(:/images/images/config_service/090_set_eng_btn_03.png); | |
184 | -} | |
185 | - | |
186 | -QPushButton:pressed { | |
187 | - border-image: url(:/images/images/config_service/090_set_eng_btn_03_ov.png); | |
188 | -}</string> | |
166 | + <string notr="true">QPushButton { border-image: url(:/images/button/184.png); } | |
167 | +QPushButton:pressed { border-image: url(:/images/button/184_ov.png); }</string> | |
189 | 168 | </property> |
190 | 169 | <property name="text"> |
191 | 170 | <string>START</string> |
... | ... | @@ -204,7 +183,7 @@ QPushButton:pressed { |
204 | 183 | <string/> |
205 | 184 | </property> |
206 | 185 | <property name="pixmap"> |
207 | - <pixmap resource="resources.qrc">:/images/images/config_service/091_set_eng_icon_06.png</pixmap> | |
186 | + <pixmap resource="resources.qrc">:/images/config/service/091_set_eng_icon_06.png</pixmap> | |
208 | 187 | </property> |
209 | 188 | </widget> |
210 | 189 | <widget class="QLabel" name="label_2"> |
... | ... | @@ -220,7 +199,7 @@ QPushButton:pressed { |
220 | 199 | <string/> |
221 | 200 | </property> |
222 | 201 | <property name="pixmap"> |
223 | - <pixmap resource="resources.qrc">:/images/images/config_service/091_set_eng_icon_07.png</pixmap> | |
202 | + <pixmap resource="resources.qrc">:/images/config/service/091_set_eng_icon_07.png</pixmap> | |
224 | 203 | </property> |
225 | 204 | </widget> |
226 | 205 | <widget class="QLabel" name="label_3"> |
... | ... | @@ -236,7 +215,7 @@ QPushButton:pressed { |
236 | 215 | <string/> |
237 | 216 | </property> |
238 | 217 | <property name="pixmap"> |
239 | - <pixmap resource="resources.qrc">:/images/images/config_service/091_set_eng_icon_05.png</pixmap> | |
218 | + <pixmap resource="resources.qrc">:/images/config/service/091_set_eng_icon_05.png</pixmap> | |
240 | 219 | </property> |
241 | 220 | </widget> |
242 | 221 | <widget class="QLabel" name="label_5"> |
... | ... | @@ -252,7 +231,7 @@ QPushButton:pressed { |
252 | 231 | <string/> |
253 | 232 | </property> |
254 | 233 | <property name="pixmap"> |
255 | - <pixmap resource="resources.qrc">:/images/images/config_service/002_btn_line_w.png</pixmap> | |
234 | + <pixmap resource="resources.qrc">:/images/line/manual_core_temp_horizontal.png</pixmap> | |
256 | 235 | </property> |
257 | 236 | </widget> |
258 | 237 | <widget class="QLabel" name="label_6"> |
... | ... | @@ -268,7 +247,7 @@ QPushButton:pressed { |
268 | 247 | <string/> |
269 | 248 | </property> |
270 | 249 | <property name="pixmap"> |
271 | - <pixmap resource="resources.qrc">:/images/images/config_service/002_btn_line_w.png</pixmap> | |
250 | + <pixmap resource="resources.qrc">:/images/line/manual_core_temp_horizontal.png</pixmap> | |
272 | 251 | </property> |
273 | 252 | </widget> |
274 | 253 | <widget class="QLabel" name="label_7"> |
... | ... | @@ -284,7 +263,7 @@ QPushButton:pressed { |
284 | 263 | <string/> |
285 | 264 | </property> |
286 | 265 | <property name="pixmap"> |
287 | - <pixmap resource="resources.qrc">:/images/images/config_service/002_btn_line_w.png</pixmap> | |
266 | + <pixmap resource="resources.qrc">:/images/line/manual_core_temp_horizontal.png</pixmap> | |
288 | 267 | </property> |
289 | 268 | </widget> |
290 | 269 | <widget class="QLabel" name="label_9"> | ... | ... |
... | ... | @@ -30,9 +30,7 @@ background-image: url(:/images/images/config/001_01_background_all.png); |
30 | 30 | </property> |
31 | 31 | <widget class="QWidget" name="clockContainer"> |
32 | 32 | <property name="styleSheet"> |
33 | - <string notr="true">QWidget#clockContainer { | |
34 | -background-image: url(:/images/images/config/001_01_background_time.png); | |
35 | -}</string> | |
33 | + <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | |
36 | 34 | </property> |
37 | 35 | <widget class="Clock" name="clock" native="true"> |
38 | 36 | <property name="geometry"> | ... | ... |
... | ... | @@ -215,8 +215,8 @@ Cook::Step AbstractCookConfig::configureStep(Cook::Step standardStep) |
215 | 215 | BrightnessConfig::BrightnessConfig() |
216 | 216 | { |
217 | 217 | type_ = Cook::Brightness; |
218 | - icon_ = ":/images/images/auto/gau_icon_01.png"; | |
219 | - overayIcon_ = ":/images/images/auto/gau_icon_01_ov.png"; | |
218 | + icon_ = ":/images/slider_icon/gau_icon_01.png"; | |
219 | + overayIcon_ = ":/images/slider_icon/gau_icon_01_ov.png"; | |
220 | 220 | minLabel_ = "연한색"; |
221 | 221 | maxLabel_ = "진한색"; |
222 | 222 | } |
... | ... | @@ -235,8 +235,8 @@ Cook::Step BrightnessConfig::configureStep(Cook::Step standardStep) |
235 | 235 | TimeConfig::TimeConfig() |
236 | 236 | { |
237 | 237 | type_ = Cook::Time; |
238 | - icon_ = ":/images/images/auto/011_icon_03.png"; | |
239 | - overayIcon_ = ":/images/images/auto/011_icon_03_ov.png"; | |
238 | + icon_ = ":/images/slider_icon/time.png"; | |
239 | + overayIcon_ = ":/images/slider_icon/time_ov.png"; | |
240 | 240 | minLabel_ = "단시간"; |
241 | 241 | maxLabel_ = "장시간"; |
242 | 242 | } |
... | ... | @@ -254,8 +254,8 @@ int TimeConfig::configureTime(int standardTime) |
254 | 254 | BurnDegreeConfig::BurnDegreeConfig() |
255 | 255 | { |
256 | 256 | type_ = Cook::BurnDegree; |
257 | - icon_ = ":/images/images/auto/gau_icon_02.png"; | |
258 | - overayIcon_ = ":/images/images/auto/gau_icon_02_ov.png"; | |
257 | + icon_ = ":/images/slider_icon/gau_icon_02.png"; | |
258 | + overayIcon_ = ":/images/slider_icon/gau_icon_02_ov.png"; | |
259 | 259 | minLabel_ = "중간 익힘"; |
260 | 260 | maxLabel_ = "완전 익힘"; |
261 | 261 | } |
... | ... | @@ -348,42 +348,42 @@ QString Cook::icon(Cook::StepType type) |
348 | 348 | { |
349 | 349 | case Cook::Roast: |
350 | 350 | case Cook::Grill: |
351 | - return ":/images/images/auto/sys_icon_01.png"; | |
351 | + return ":/images/cook_step_type/sys_icon_01.png"; | |
352 | 352 | case Cook::Boil: |
353 | 353 | case Cook::BoilSteadily: |
354 | 354 | case Cook::HeatUp: |
355 | 355 | case Cook::Thicken: |
356 | 356 | case Cook::WarmUp: |
357 | 357 | case Cook::Simmer: |
358 | - return ":/images/images/auto/sys_icon_02.png"; | |
358 | + return ":/images/cook_step_type/sys_icon_02.png"; | |
359 | 359 | case Cook::End: |
360 | - return ":/images/images/auto/sys_icon_03.png"; | |
360 | + return ":/images/cook_step_type/sys_icon_03.png"; | |
361 | 361 | case Cook::MakeCrispy: |
362 | 362 | case Cook::Brown: |
363 | 363 | case Cook::BlowSteam: |
364 | 364 | case Cook::Damp: |
365 | - return ":/images/images/auto/sys_icon_04.png"; | |
365 | + return ":/images/cook_step_type/sys_icon_04.png"; | |
366 | 366 | case Cook::Finish: |
367 | - return ":/images/images/auto/sys_icon_05.png"; | |
367 | + return ":/images/cook_step_type/sys_icon_05.png"; | |
368 | 368 | case Cook::Burn: |
369 | 369 | case Cook::CookGratin: |
370 | - return ":/images/images/auto/sys_icon_06.png"; | |
370 | + return ":/images/cook_step_type/sys_icon_06.png"; | |
371 | 371 | case Cook::CoolDown: |
372 | - return ":/images/images/auto/sys_icon_07.png"; | |
372 | + return ":/images/cook_step_type/sys_icon_07.png"; | |
373 | 373 | case Cook::Defer: |
374 | 374 | case Cook::RipenKeep: |
375 | - return ":/images/images/auto/sys_icon_08.png"; | |
375 | + return ":/images/cook_step_type/sys_icon_08.png"; | |
376 | 376 | case Cook::Bake: |
377 | - return ":/images/images/auto/sys_icon_09.png"; | |
377 | + return ":/images/cook_step_type/sys_icon_09.png"; | |
378 | 378 | case Cook::Fry: |
379 | 379 | case Cook::Steam: |
380 | - return ":/images/images/auto/sys_icon_10.png"; | |
380 | + return ":/images/cook_step_type/sys_icon_10.png"; | |
381 | 381 | case Cook::Ripen: |
382 | 382 | case Cook::Ferment: |
383 | 383 | case Cook::Moisten: |
384 | - return ":/images/images/auto/sys_icon_11.png"; | |
384 | + return ":/images/cook_step_type/sys_icon_11.png"; | |
385 | 385 | case Cook::Dry: |
386 | - return ":/images/images/auto/sys_icon_12.png"; | |
386 | + return ":/images/cook_step_type/sys_icon_12.png"; | |
387 | 387 | default: |
388 | 388 | return ""; |
389 | 389 | } |
... | ... | @@ -394,19 +394,19 @@ QString Cook::icon(Cook::CookType type) |
394 | 394 | switch (type) |
395 | 395 | { |
396 | 396 | case Poultry: |
397 | - return ":/images/images/auto/005_auto_icon_01_ov.png"; | |
397 | + return ":/images/cook_type/poultry_ov.png"; | |
398 | 398 | case Meat: |
399 | - return ":/images/images/auto/005_auto_icon_02_ov.png"; | |
399 | + return ":/images/cook_type/meat_ov.png"; | |
400 | 400 | case Fish: |
401 | - return ":/images/images/auto/005_auto_icon_03_ov.png"; | |
401 | + return ":/images/cook_type/fish_ov.png"; | |
402 | 402 | case Desert: |
403 | - return ":/images/images/auto/005_auto_icon_04_ov.png"; | |
403 | + return ":/images/cook_type/desert_ov.png"; | |
404 | 404 | case Vegetable: |
405 | - return ":/images/images/auto/005_auto_icon_05_ov.png"; | |
405 | + return ":/images/cook_type/vegetable_ov.png"; | |
406 | 406 | case Bread: |
407 | - return ":/images/images/auto/005_auto_icon_06_ov.png"; | |
407 | + return ":/images/cook_type/bread_ov.png"; | |
408 | 408 | case Etc: |
409 | - return ":/images/images/auto/005_auto_icon_07_ov.png"; | |
409 | + return ":/images/cook_type/etc_ov.png"; | |
410 | 410 | default: |
411 | 411 | return ""; |
412 | 412 | } |
... | ... | @@ -467,7 +467,7 @@ MeatPie::MeatPie() |
467 | 467 | stepList[3] = { Cook::CoolDown, Cook::DryMode, 100, 120 }; |
468 | 468 | stepList[4] = { Cook::Bake, Cook::DryMode, 40, 120 }; |
469 | 469 | |
470 | - time_ = 1 * 60; | |
470 | + time_ = (1 * 60 + 17) * 60; | |
471 | 471 | interTempEnabled_ = true; |
472 | 472 | interTemp_ = 62; |
473 | 473 | ... | ... |
... | ... | @@ -66,61 +66,61 @@ void FanTestWindow::onDataChanged() |
66 | 66 | case Fan1: |
67 | 67 | rpm = rpm1; |
68 | 68 | dir = direction1; |
69 | - ui->fanLabel->setPixmap(QPixmap(":/images/images/config_service/091_set_eng_icon_pan_08.png")); | |
69 | + ui->fanLabel->setPixmap(QPixmap(":/images/config/service/fan_sel_1.png")); | |
70 | 70 | ui->motorLabel1->setStyleSheet(selectedStyle); |
71 | 71 | break; |
72 | 72 | case Fan2: |
73 | 73 | rpm = rpm2; |
74 | 74 | dir = direction2; |
75 | - ui->fanLabel->setPixmap(QPixmap(":/images/images/config_service/091_set_eng_icon_pan_09.png")); | |
75 | + ui->fanLabel->setPixmap(QPixmap(":/images/config/service/fan_sel_2.png")); | |
76 | 76 | ui->motorLabel2->setStyleSheet(selectedStyle); |
77 | 77 | break; |
78 | 78 | default: |
79 | 79 | rpm = 500; |
80 | 80 | dir = ClockWise; |
81 | - ui->fanLabel->setPixmap(QPixmap(":/images/images/config_service/091_set_eng_icon_pan_08.png")); | |
81 | + ui->fanLabel->setPixmap(QPixmap(":/images/config/service/fan_sel_1.png")); | |
82 | 82 | ui->motorLabel1->setStyleSheet(selectedStyle); |
83 | 83 | } |
84 | 84 | |
85 | 85 | switch (rpm) |
86 | 86 | { |
87 | 87 | case 500: |
88 | - ui->rpmLabel->setPixmap(QPixmap(":/images/images/config_service/091_set_eng_icon_pan_01.png")); | |
88 | + ui->rpmLabel->setPixmap(QPixmap(":/images/config/service/fan_level_1.png")); | |
89 | 89 | ui->rpmLabel500->setStyleSheet(selectedStyle); |
90 | 90 | break; |
91 | 91 | case 725: |
92 | - ui->rpmLabel->setPixmap(QPixmap(":/images/images/config_service/091_set_eng_icon_pan_02.png")); | |
92 | + ui->rpmLabel->setPixmap(QPixmap(":/images/config/service/fan_level_2.png")); | |
93 | 93 | ui->rpmLabel725->setStyleSheet(selectedStyle); |
94 | 94 | break; |
95 | 95 | case 950: |
96 | - ui->rpmLabel->setPixmap(QPixmap(":/images/images/config_service/091_set_eng_icon_pan_03.png")); | |
96 | + ui->rpmLabel->setPixmap(QPixmap(":/images/config/service/fan_level_3.png")); | |
97 | 97 | ui->rpmLabel950->setStyleSheet(selectedStyle); |
98 | 98 | break; |
99 | 99 | case 1175: |
100 | - ui->rpmLabel->setPixmap(QPixmap(":/images/images/config_service/091_set_eng_icon_pan_04.png")); | |
100 | + ui->rpmLabel->setPixmap(QPixmap(":/images/config/service/fan_level_4.png")); | |
101 | 101 | ui->rpmLabel1175->setStyleSheet(selectedStyle); |
102 | 102 | break; |
103 | 103 | case 1400: |
104 | - ui->rpmLabel->setPixmap(QPixmap(":/images/images/config_service/091_set_eng_icon_pan_05.png")); | |
104 | + ui->rpmLabel->setPixmap(QPixmap(":/images/config/service/fan_level_5.png")); | |
105 | 105 | ui->rpmLabel1400->setStyleSheet(selectedStyle); |
106 | 106 | break; |
107 | 107 | default: |
108 | - ui->rpmLabel->setPixmap(QPixmap(":/images/images/config_service/091_set_eng_icon_pan_01.png")); | |
108 | + ui->rpmLabel->setPixmap(QPixmap(":/images/config/service/fan_level_1.png")); | |
109 | 109 | ui->rpmLabel500->setStyleSheet(selectedStyle); |
110 | 110 | } |
111 | 111 | |
112 | 112 | switch (dir) |
113 | 113 | { |
114 | 114 | case ClockWise: |
115 | - ui->directionLabel->setPixmap(QPixmap(":/images/images/config_service/091_set_eng_icon_pan_06.png")); | |
115 | + ui->directionLabel->setPixmap(QPixmap(":/images/config/service/fan_dir_cw.png")); | |
116 | 116 | ui->directionLabelRight->setStyleSheet(selectedStyle); |
117 | 117 | break; |
118 | 118 | case CounterClockWise: |
119 | - ui->directionLabel->setPixmap(QPixmap(":/images/images/config_service/091_set_eng_icon_pan_07.png")); | |
119 | + ui->directionLabel->setPixmap(QPixmap(":/images/config/service/fan_dir_ccw.png")); | |
120 | 120 | ui->directionLabelLeft->setStyleSheet(selectedStyle); |
121 | 121 | break; |
122 | 122 | default: |
123 | - ui->directionLabel->setPixmap(QPixmap(":/images/images/config_service/091_set_eng_icon_pan_06.png")); | |
123 | + ui->directionLabel->setPixmap(QPixmap(":/images/config/service/fan_dir_cw.png")); | |
124 | 124 | ui->directionLabelRight->setStyleSheet(selectedStyle); |
125 | 125 | } |
126 | 126 | ... | ... |
... | ... | @@ -14,9 +14,8 @@ |
14 | 14 | <string>MainWindow</string> |
15 | 15 | </property> |
16 | 16 | <property name="styleSheet"> |
17 | - <string notr="true">QWidget#centralwidget { | |
18 | -background-image: url(:/images/images/config_service/088_service_bg_all.png); | |
19 | -}</string> | |
17 | + <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); } | |
18 | +#bottomBar { background-image: url(:/images/bottom_bar/background.png); }</string> | |
20 | 19 | </property> |
21 | 20 | <widget class="QWidget" name="centralwidget"> |
22 | 21 | <widget class="QStackedWidget" name="upperStack"> |
... | ... | @@ -30,9 +29,7 @@ background-image: url(:/images/images/config_service/088_service_bg_all.png); |
30 | 29 | </property> |
31 | 30 | <widget class="QWidget" name="clockContainer"> |
32 | 31 | <property name="styleSheet"> |
33 | - <string notr="true">QWidget#clockContainer { | |
34 | -background-image: url(:/images/images/config/001_01_background_time.png); | |
35 | -}</string> | |
32 | + <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | |
36 | 33 | </property> |
37 | 34 | <widget class="Clock" name="clock" native="true"> |
38 | 35 | <property name="geometry"> |
... | ... | @@ -56,9 +53,6 @@ background-image: url(:/images/images/config/001_01_background_time.png); |
56 | 53 | <height>150</height> |
57 | 54 | </rect> |
58 | 55 | </property> |
59 | - <property name="styleSheet"> | |
60 | - <string notr="true">background-image: url(:/images/images/config_service/001_01_background_under_down.png);</string> | |
61 | - </property> | |
62 | 56 | <widget class="QPushButton" name="backButton"> |
63 | 57 | <property name="geometry"> |
64 | 58 | <rect> |
... | ... | @@ -75,8 +69,8 @@ background-image: url(:/images/images/config/001_01_background_time.png); |
75 | 69 | </sizepolicy> |
76 | 70 | </property> |
77 | 71 | <property name="styleSheet"> |
78 | - <string notr="true">QPushButton { border-image: url(:/images/images/config_service/006_sys_icon_03.png); } | |
79 | -QPushButton:pressed { border-image: url(:/images/images/config_service/006_sys_icon_03_ov.png); }</string> | |
72 | + <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/back.png); } | |
73 | +QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); }</string> | |
80 | 74 | </property> |
81 | 75 | <property name="text"> |
82 | 76 | <string/> |
... | ... | @@ -107,13 +101,8 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/006_sys_i |
107 | 101 | </font> |
108 | 102 | </property> |
109 | 103 | <property name="styleSheet"> |
110 | - <string notr="true">QPushButton { | |
111 | - border-image: url(:/images/images/config_service/090_set_eng_btn_03.png); | |
112 | -} | |
113 | - | |
114 | -QPushButton:pressed { | |
115 | - border-image: url(:/images/images/config_service/090_set_eng_btn_03_ov.png); | |
116 | -}</string> | |
104 | + <string notr="true">QPushButton { border-image: url(:/images/button/184.png); } | |
105 | +QPushButton:pressed { border-image: url(:/images/button/184_ov.png); }</string> | |
117 | 106 | </property> |
118 | 107 | <property name="text"> |
119 | 108 | <string>설정값</string> |
... | ... | @@ -143,13 +132,8 @@ QPushButton:pressed { |
143 | 132 | </font> |
144 | 133 | </property> |
145 | 134 | <property name="styleSheet"> |
146 | - <string notr="true">QPushButton { | |
147 | - border-image: url(:/images/images/config_service/090_set_eng_btn_03.png); | |
148 | -} | |
149 | - | |
150 | -QPushButton:pressed { | |
151 | - border-image: url(:/images/images/config_service/090_set_eng_btn_03_ov.png); | |
152 | -}</string> | |
135 | + <string notr="true">QPushButton { border-image: url(:/images/button/184.png); } | |
136 | +QPushButton:pressed { border-image: url(:/images/button/184_ov.png); }</string> | |
153 | 137 | </property> |
154 | 138 | <property name="text"> |
155 | 139 | <string>방향조절</string> |
... | ... | @@ -179,13 +163,8 @@ QPushButton:pressed { |
179 | 163 | </font> |
180 | 164 | </property> |
181 | 165 | <property name="styleSheet"> |
182 | - <string notr="true">QPushButton { | |
183 | - border-image: url(:/images/images/config_service/090_set_eng_btn_03.png); | |
184 | -} | |
185 | - | |
186 | -QPushButton:pressed { | |
187 | - border-image: url(:/images/images/config_service/090_set_eng_btn_03_ov.png); | |
188 | -}</string> | |
166 | + <string notr="true">QPushButton { border-image: url(:/images/button/184.png); } | |
167 | +QPushButton:pressed { border-image: url(:/images/button/184_ov.png); }</string> | |
189 | 168 | </property> |
190 | 169 | <property name="text"> |
191 | 170 | <string>모터설정</string> |
... | ... | @@ -215,13 +194,8 @@ QPushButton:pressed { |
215 | 194 | </font> |
216 | 195 | </property> |
217 | 196 | <property name="styleSheet"> |
218 | - <string notr="true">QPushButton { | |
219 | - border-image: url(:/images/images/config_service/090_set_eng_btn_03.png); | |
220 | -} | |
221 | - | |
222 | -QPushButton:pressed { | |
223 | - border-image: url(:/images/images/config_service/090_set_eng_btn_03_ov.png); | |
224 | -}</string> | |
197 | + <string notr="true">QPushButton { border-image: url(:/images/button/184.png); } | |
198 | +QPushButton:pressed { border-image: url(:/images/button/184_ov.png); }</string> | |
225 | 199 | </property> |
226 | 200 | <property name="text"> |
227 | 201 | <string>START</string> |
... | ... | @@ -251,13 +225,8 @@ QPushButton:pressed { |
251 | 225 | </font> |
252 | 226 | </property> |
253 | 227 | <property name="styleSheet"> |
254 | - <string notr="true">QPushButton { | |
255 | - border-image: url(:/images/images/config_service/090_set_eng_btn_03.png); | |
256 | -} | |
257 | - | |
258 | -QPushButton:pressed { | |
259 | - border-image: url(:/images/images/config_service/090_set_eng_btn_03_ov.png); | |
260 | -}</string> | |
228 | + <string notr="true">QPushButton { border-image: url(:/images/button/184.png); } | |
229 | +QPushButton:pressed { border-image: url(:/images/button/184_ov.png); }</string> | |
261 | 230 | </property> |
262 | 231 | <property name="text"> |
263 | 232 | <string>START</string> |
... | ... | @@ -276,7 +245,7 @@ QPushButton:pressed { |
276 | 245 | <string/> |
277 | 246 | </property> |
278 | 247 | <property name="pixmap"> |
279 | - <pixmap resource="resources.qrc">:/images/images/config_service/091_set_eng_icon_pan_01.png</pixmap> | |
248 | + <pixmap resource="resources.qrc">:/images/config/service/fan_level_1.png</pixmap> | |
280 | 249 | </property> |
281 | 250 | </widget> |
282 | 251 | <widget class="QLabel" name="directionLabel"> |
... | ... | @@ -292,7 +261,7 @@ QPushButton:pressed { |
292 | 261 | <string/> |
293 | 262 | </property> |
294 | 263 | <property name="pixmap"> |
295 | - <pixmap resource="resources.qrc">:/images/images/config_service/091_set_eng_icon_pan_06.png</pixmap> | |
264 | + <pixmap resource="resources.qrc">:/images/config/service/fan_dir_cw.png</pixmap> | |
296 | 265 | </property> |
297 | 266 | </widget> |
298 | 267 | <widget class="QLabel" name="fanLabel"> |
... | ... | @@ -308,7 +277,7 @@ QPushButton:pressed { |
308 | 277 | <string/> |
309 | 278 | </property> |
310 | 279 | <property name="pixmap"> |
311 | - <pixmap resource="resources.qrc">:/images/images/config_service/091_set_eng_icon_pan_08.png</pixmap> | |
280 | + <pixmap resource="resources.qrc">:/images/config/service/fan_sel_1.png</pixmap> | |
312 | 281 | </property> |
313 | 282 | </widget> |
314 | 283 | <widget class="QLabel" name="label_4"> |
... | ... | @@ -324,7 +293,7 @@ QPushButton:pressed { |
324 | 293 | <string/> |
325 | 294 | </property> |
326 | 295 | <property name="pixmap"> |
327 | - <pixmap resource="resources.qrc">:/images/images/config_service/091_set_eng_icon_pan_10.png</pixmap> | |
296 | + <pixmap resource="resources.qrc">:/images/config/service/fan.png</pixmap> | |
328 | 297 | </property> |
329 | 298 | </widget> |
330 | 299 | <widget class="QLabel" name="label_5"> |
... | ... | @@ -340,7 +309,7 @@ QPushButton:pressed { |
340 | 309 | <string/> |
341 | 310 | </property> |
342 | 311 | <property name="pixmap"> |
343 | - <pixmap resource="resources.qrc">:/images/images/config_service/091_set_eng_icon_pan_10.png</pixmap> | |
312 | + <pixmap resource="resources.qrc">:/images/config/service/fan.png</pixmap> | |
344 | 313 | </property> |
345 | 314 | </widget> |
346 | 315 | <widget class="QLabel" name="label_6"> |
... | ... | @@ -356,7 +325,7 @@ QPushButton:pressed { |
356 | 325 | <string/> |
357 | 326 | </property> |
358 | 327 | <property name="pixmap"> |
359 | - <pixmap resource="resources.qrc">:/images/images/config_service/002_btn_line_w.png</pixmap> | |
328 | + <pixmap resource="resources.qrc">:/images/line/manual_core_temp_horizontal.png</pixmap> | |
360 | 329 | </property> |
361 | 330 | </widget> |
362 | 331 | <widget class="QLabel" name="label_7"> |
... | ... | @@ -372,7 +341,7 @@ QPushButton:pressed { |
372 | 341 | <string/> |
373 | 342 | </property> |
374 | 343 | <property name="pixmap"> |
375 | - <pixmap resource="resources.qrc">:/images/images/config_service/002_btn_line_w.png</pixmap> | |
344 | + <pixmap resource="resources.qrc">:/images/line/manual_core_temp_horizontal.png</pixmap> | |
376 | 345 | </property> |
377 | 346 | </widget> |
378 | 347 | <widget class="QLabel" name="label_8"> |
... | ... | @@ -388,7 +357,7 @@ QPushButton:pressed { |
388 | 357 | <string/> |
389 | 358 | </property> |
390 | 359 | <property name="pixmap"> |
391 | - <pixmap resource="resources.qrc">:/images/images/config_service/002_btn_line_h.png</pixmap> | |
360 | + <pixmap resource="resources.qrc">:/images/line/main_vertical.png</pixmap> | |
392 | 361 | </property> |
393 | 362 | </widget> |
394 | 363 | <widget class="QLabel" name="label_15"> | ... | ... |
... | ... | @@ -20,9 +20,8 @@ |
20 | 20 | <string>MainWindow</string> |
21 | 21 | </property> |
22 | 22 | <property name="styleSheet"> |
23 | - <string notr="true">QWidget#centralwidget { | |
24 | -background-image: url(:/images/images/config_service/088_service_bg_all.png); | |
25 | -}</string> | |
23 | + <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); } | |
24 | +#bottomBar { background-image: url(:/images/bottom_bar/background.png); }</string> | |
26 | 25 | </property> |
27 | 26 | <widget class="QWidget" name="centralwidget"> |
28 | 27 | <widget class="QStackedWidget" name="upperStack"> |
... | ... | @@ -36,9 +35,7 @@ background-image: url(:/images/images/config_service/088_service_bg_all.png); |
36 | 35 | </property> |
37 | 36 | <widget class="QWidget" name="clockContainer"> |
38 | 37 | <property name="styleSheet"> |
39 | - <string notr="true">QWidget#clockContainer { | |
40 | -background-image: url(:/images/images/config/001_01_background_time.png); | |
41 | -}</string> | |
38 | + <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | |
42 | 39 | </property> |
43 | 40 | <widget class="Clock" name="clock" native="true"> |
44 | 41 | <property name="geometry"> |
... | ... | @@ -261,9 +258,6 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e |
261 | 258 | <height>150</height> |
262 | 259 | </rect> |
263 | 260 | </property> |
264 | - <property name="styleSheet"> | |
265 | - <string notr="true">background-image: url(:/images/images/config_service/001_01_background_under_down.png);</string> | |
266 | - </property> | |
267 | 261 | <widget class="QPushButton" name="backButton"> |
268 | 262 | <property name="geometry"> |
269 | 263 | <rect> |
... | ... | @@ -280,8 +274,8 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e |
280 | 274 | </sizepolicy> |
281 | 275 | </property> |
282 | 276 | <property name="styleSheet"> |
283 | - <string notr="true">QPushButton { border-image: url(:/images/images/config_service/006_sys_icon_03.png); } | |
284 | -QPushButton:pressed { border-image: url(:/images/images/config_service/006_sys_icon_03_ov.png); }</string> | |
277 | + <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/back.png); } | |
278 | +QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); }</string> | |
285 | 279 | </property> |
286 | 280 | <property name="text"> |
287 | 281 | <string/> | ... | ... |
... | ... | @@ -14,9 +14,8 @@ |
14 | 14 | <string>MainWindow</string> |
15 | 15 | </property> |
16 | 16 | <property name="styleSheet"> |
17 | - <string notr="true">QWidget#centralwidget { | |
18 | -background-image: url(:/images/images/config_service/088_service_bg_all.png); | |
19 | -}</string> | |
17 | + <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); } | |
18 | +#bottomBar { background-image: url(:/images/bottom_bar/background.png); }</string> | |
20 | 19 | </property> |
21 | 20 | <widget class="QWidget" name="centralwidget"> |
22 | 21 | <widget class="QStackedWidget" name="upperStack"> |
... | ... | @@ -30,9 +29,7 @@ background-image: url(:/images/images/config_service/088_service_bg_all.png); |
30 | 29 | </property> |
31 | 30 | <widget class="QWidget" name="clockContainer"> |
32 | 31 | <property name="styleSheet"> |
33 | - <string notr="true">QWidget#clockContainer { | |
34 | -background-image: url(:/images/images/config/001_01_background_time.png); | |
35 | -}</string> | |
32 | + <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | |
36 | 33 | </property> |
37 | 34 | <widget class="Clock" name="clock" native="true"> |
38 | 35 | <property name="geometry"> |
... | ... | @@ -56,9 +53,6 @@ background-image: url(:/images/images/config/001_01_background_time.png); |
56 | 53 | <height>150</height> |
57 | 54 | </rect> |
58 | 55 | </property> |
59 | - <property name="styleSheet"> | |
60 | - <string notr="true">background-image: url(:/images/images/config_service/001_01_background_under_down.png);</string> | |
61 | - </property> | |
62 | 56 | <widget class="QPushButton" name="backButton"> |
63 | 57 | <property name="geometry"> |
64 | 58 | <rect> |
... | ... | @@ -75,8 +69,8 @@ background-image: url(:/images/images/config/001_01_background_time.png); |
75 | 69 | </sizepolicy> |
76 | 70 | </property> |
77 | 71 | <property name="styleSheet"> |
78 | - <string notr="true">QPushButton { border-image: url(:/images/images/config_service/006_sys_icon_03.png); } | |
79 | -QPushButton:pressed { border-image: url(:/images/images/config_service/006_sys_icon_03_ov.png); }</string> | |
72 | + <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/back.png); } | |
73 | +QPushButton:pressed { border-image: url(:/images/bottom_bar/back_ov.png); }</string> | |
80 | 74 | </property> |
81 | 75 | <property name="text"> |
82 | 76 | <string/> | ... | ... |
... | ... | @@ -2,7 +2,7 @@ |
2 | 2 | |
3 | 3 | HeatCircularGauge::HeatCircularGauge(QWidget *parent) : CircularGauge(parent) |
4 | 4 | { |
5 | - bar.load(":/images/images/auto/circle_graphe_04.png"); | |
6 | - indicator.load(":/images/images/auto/circle_graphe_07.png"); | |
7 | - icon.load(":/images/images/auto/window_icon_08.png"); | |
5 | + bar.load(":/images/gauge/circle_red.png"); | |
6 | + indicator.load(":/images/gauge/circle_red_indicator.png"); | |
7 | + icon.load(":/images/symbol/temp.png"); | |
8 | 8 | } | ... | ... |
... | ... | @@ -2,7 +2,7 @@ |
2 | 2 | |
3 | 3 | HumidityCircularGauge::HumidityCircularGauge(QWidget *parent) : CircularGauge(parent) |
4 | 4 | { |
5 | - bar.load(":/images/images/auto/circle_graphe_05.png"); | |
6 | - indicator.load(":/images/images/auto/circle_graphe_06.png"); | |
7 | - icon.load(":/images/images/auto/window_icon_07.png"); | |
5 | + bar.load(":/images/gauge/circle_blue.png"); | |
6 | + indicator.load(":/images/gauge/circle_blue_indicator.png"); | |
7 | + icon.load(":/images/symbol/humidity.png"); | |
8 | 8 | } | ... | ... |
70.1 KB
16.3 KB
4.84 KB
5.54 KB
5.49 KB
5.61 KB
5.58 KB
5.62 KB
5.58 KB
5.63 KB
5.5 KB
6.66 KB
6.51 KB
5.54 KB
5.48 KB
6.08 KB
5.97 KB
5.53 KB
5.38 KB
5.53 KB
5.37 KB
6.55 KB
6.38 KB
5.33 KB
5.28 KB
6.08 KB
5.97 KB
5.47 KB
5.44 KB
5.64 KB
5.58 KB
5.5 KB
5.46 KB
5.72 KB
5.62 KB
5.9 KB
5.83 KB
2.9 KB
2.85 KB
3.97 KB
4.1 KB
229 KB
227 KB
2.94 KB
9.72 KB
9.97 KB
9.75 KB
4.48 KB
4.5 KB
4.03 KB
4.03 KB
3.32 KB
5.2 KB
3.2 KB
5.84 KB
7.18 KB
6.05 KB
3.82 KB
3.26 KB
3.52 KB
29.1 KB
14.4 KB
18.5 KB
14.5 KB
19.2 KB
4.07 KB
4.06 KB
3.7 KB
2.84 KB
2.81 KB
3.7 KB
3.74 KB
3.58 KB
3.81 KB
2.83 KB
3.98 KB
2.91 KB
2.83 KB
3.5 KB
2.94 KB
2.83 KB
3.59 KB
4.28 KB
2.76 KB
2.74 KB
4.4 KB
4.55 KB
5.94 KB
5.94 KB
6.39 KB
6.67 KB
6.71 KB
6.78 KB
6.87 KB
5.1 KB
5.03 KB
5.4 KB
5.35 KB
5.54 KB
5.03 KB
6.13 KB
4.81 KB
4.48 KB
6.28 KB
6.23 KB
5.14 KB
4.52 KB
3.45 KB
52.5 KB
56 KB
57 KB
57.5 KB
56.9 KB
65.3 KB
71.2 KB
72.7 KB
70.7 KB
54.2 KB
54.6 KB
75.2 KB
78.2 KB
80.6 KB
82.3 KB
75.4 KB
78.3 KB
80.6 KB
82.3 KB
4.12 KB
4.23 KB
5.59 KB
3.83 KB
5.93 KB
3.22 KB
5.85 KB
4.58 KB
6.27 KB
4.9 KB
5.85 KB
6.23 KB
5.6 KB
4.48 KB
4.56 KB
4.19 KB
4.05 KB
2.75 KB
35.8 KB
36.1 KB
52.7 KB
51.7 KB
50.2 KB
48.3 KB
52.6 KB
51.7 KB
50.2 KB
48.4 KB
4.49 KB
96.6 KB
95 KB
93.8 KB
34.8 KB
36.6 KB
37 KB
37.4 KB
37 KB
42.4 KB
46.2 KB
47.2 KB
46 KB
52.5 KB
56 KB
57 KB
57.5 KB
56.9 KB
65.3 KB
71.2 KB
72.7 KB
70.7 KB
96.5 KB
94.3 KB
91.7 KB
88.7 KB
54.2 KB
54.6 KB
75.2 KB
78.2 KB
80.6 KB
82.3 KB
75.4 KB
78.3 KB
80.6 KB
82.3 KB
4.48 KB
95.1 KB
95.8 KB
97.3 KB
97.9 KB
73.5 KB
73.3 KB
118 KB
118 KB
115 KB
115 KB
16.3 KB
6.39 KB
6.13 KB
6.99 KB
6.72 KB
6.73 KB
6.6 KB
6.31 KB
6.09 KB
7.17 KB
6.82 KB
5.61 KB
5.54 KB
5.04 KB
4.92 KB
4.2 KB
4.1 KB
4.65 KB
4.5 KB
4.32 KB
4.24 KB
5.67 KB
5.48 KB
5.54 KB
5.49 KB
5.61 KB
5.58 KB
5.62 KB
5.58 KB
5.63 KB
5.5 KB
6.66 KB
6.51 KB
5.54 KB
5.48 KB
6.08 KB
5.97 KB
5.53 KB
5.38 KB
5.53 KB
5.37 KB
6.55 KB
6.38 KB
5.33 KB
5.28 KB
6.08 KB
5.97 KB
10.5 KB
6.05 KB
5.93 KB
5.97 KB
5.84 KB
6.35 KB
6.24 KB
6.23 KB
6.2 KB
6.4 KB
6.17 KB
6.41 KB
6.21 KB
6.34 KB
34.8 KB
36.6 KB
37 KB
37.4 KB
37 KB
42.4 KB
46.2 KB
47.2 KB
46 KB
35.8 KB
36.1 KB
52.7 KB
51.7 KB
50.2 KB
48.3 KB
52.6 KB
51.7 KB
50.2 KB
48.4 KB
73.5 KB
73.3 KB
95.1 KB
95.8 KB
97.3 KB
97.9 KB
96.6 KB
95 KB
93.8 KB
96.5 KB
94.3 KB
91.7 KB
88.7 KB
118 KB
118 KB
115 KB
114 KB
227 KB
2.94 KB
89.3 KB
296 KB
226 KB
271 KB
6.06 KB
83.9 KB
4.59 KB
8.05 KB
10.3 KB
6.03 KB
7.12 KB
8.05 KB
10.3 KB
3.31 KB
3.2 KB
3.51 KB
6.59 KB
6.6 KB
6.85 KB
10.5 KB
29.1 KB
14.4 KB
18.5 KB
14.5 KB
19.2 KB
4.07 KB
4.06 KB
3.7 KB
2.84 KB
2.81 KB
3.7 KB
3.74 KB
3.58 KB
3.81 KB
2.83 KB
3.98 KB
6.31 KB
6.09 KB
6.41 KB
6.19 KB
5.72 KB
5.83 KB
7 KB
6.69 KB
6.25 KB
6.45 KB
10.5 KB
2.91 KB
2.83 KB
3.5 KB
2.94 KB
2.83 KB
3.59 KB
4.48 KB
4.49 KB
8.78 KB
11 KB
8.14 KB
10 KB
8.1 KB
10.1 KB
8.2 KB
10 KB
7.78 KB
9.58 KB
8.72 KB
11 KB
11 KB
8.99 KB
11.4 KB
11.5 KB
11.4 KB
8.54 KB
10.6 KB
10.6 KB
6.77 KB
8.36 KB
12.8 KB
15.9 KB
12.5 KB
15.6 KB
14.2 KB
16.9 KB
14.4 KB
16.9 KB
14.7 KB
17.3 KB
4.23 KB
3.47 KB
6.69 KB
5.59 KB
3.83 KB
5.93 KB
3.22 KB
5.85 KB
4.58 KB
6.27 KB
4.9 KB
5.85 KB
6.23 KB
5.6 KB
2.74 KB
3.98 KB
3.78 KB
2.83 KB
2.92 KB
3.04 KB
3.76 KB
3.04 KB
3.69 KB
2.9 KB
3.11 KB
4.5 KB
4.78 KB
4.36 KB
4.36 KB
4.48 KB
4.56 KB
4.19 KB
4.05 KB
2.75 KB
3.8 KB
4.4 KB
4.78 KB
4.28 KB
4.73 KB
4.33 KB
4.86 KB
3.31 KB
3.2 KB
3.51 KB
3.78 KB
3.69 KB
8.78 KB
11 KB
8.14 KB
10 KB
8.1 KB
10.1 KB
8.2 KB
10 KB
7.78 KB
9.58 KB
8.72 KB
11 KB
11 KB
8.99 KB
11.4 KB
11.5 KB
11.4 KB
8.54 KB
10.6 KB
10.6 KB
6.77 KB
8.36 KB
3.98 KB
3.76 KB
226 KB
271 KB
296 KB
152 KB
231 KB
83.9 KB
41.3 KB
100 KB
33.3 KB
128 KB
2.94 KB
229 KB
245 KB
229 KB
181 KB
227 KB
4.52 KB
89.3 KB
5.14 KB
6.06 KB
7.08 KB
6.08 KB
5.97 KB
5.53 KB
5.38 KB
5.53 KB
5.37 KB
6.55 KB
6.38 KB
5.33 KB
5.28 KB
6.08 KB
5.97 KB
5.47 KB
5.44 KB
5.64 KB
5.58 KB
5.5 KB
5.46 KB
5.72 KB
5.62 KB
5.9 KB
5.83 KB
5.62 KB
5.58 KB
16.3 KB
5.54 KB
5.48 KB
5.54 KB
5.49 KB
5.46 KB
5.63 KB
5.5 KB
5.43 KB
5.61 KB
5.58 KB
6.66 KB
6.51 KB
5.2 KB
5.84 KB
6.03 KB
7.12 KB
6.13 KB
7.18 KB
6.64 KB
7.91 KB
7.67 KB
9.34 KB
7.94 KB
9.74 KB
8.05 KB
10.3 KB
9.6 KB
8.96 KB
12.3 KB
11.6 KB
3.1 KB
3.17 KB
3.13 KB
70.1 KB
31 KB
152 KB
227 KB
41.3 KB
70.1 KB
16.3 KB
31 KB
3.1 KB
3.17 KB
3.13 KB
5.61 KB
5.58 KB
5.62 KB
5.58 KB
6.66 KB
6.51 KB
2.74 KB
3.12 KB
3.18 KB
4.09 KB
4.03 KB
3.31 KB
3.51 KB
3.76 KB
4.02 KB
3.83 KB
4.09 KB
3.6 KB
3.86 KB
3.77 KB
4.02 KB
3.84 KB
4.14 KB
3.57 KB
3.79 KB
3.97 KB
4.24 KB
3.85 KB
4.11 KB
3.75 KB
4.01 KB
3.94 KB
4.25 KB
3.92 KB
4.31 KB
3.35 KB
3.6 KB
3.64 KB
3.95 KB
3.3 KB
3.55 KB
3.63 KB
3.93 KB
3.57 KB
3.86 KB
3.27 KB
3.5 KB
3.82 KB
4.13 KB
3.56 KB
3.82 KB
3.75 KB
4 KB
4 KB
4.27 KB
3.62 KB
3.9 KB
3.34 KB
3.57 KB
3.81 KB
4.09 KB
3.37 KB
3.61 KB
3.47 KB
3.73 KB
3.73 KB
4.06 KB
3.3 KB
3.52 KB
3.56 KB
3.84 KB
3.94 KB
4.21 KB
3.84 KB
4.12 KB
3.78 KB
4.09 KB
3.69 KB
3.95 KB
3.64 KB
3.96 KB
3.87 KB
4.23 KB
3.24 KB
3.44 KB
3.32 KB
3.51 KB
4.46 KB
4.69 KB
5.42 KB
5.74 KB
4.42 KB
4.8 KB
4.31 KB
4.62 KB
32.6 KB
40.8 KB
9.74 KB
9.96 KB
9.74 KB
9.96 KB
10.9 KB
13.6 KB
4.53 KB
4.5 KB
4.65 KB
4.58 KB
4.45 KB
5.5 KB
4.56 KB
5.01 KB
5.67 KB
4.51 KB
4.64 KB
4.19 KB
6.73 KB
5.35 KB
5.26 KB
4.51 KB
4.19 KB
4.27 KB
4.22 KB
3.92 KB
4.17 KB
7 KB
8.33 KB
8.32 KB
7.41 KB
7.41 KB
7.42 KB
7.33 KB
7.25 KB
9.76 KB
9.72 KB
152 KB
227 KB
41.3 KB
70.1 KB
16.3 KB
2.73 KB
2.74 KB
31 KB
3.1 KB
3.17 KB
3.13 KB
5.61 KB
5.58 KB
5.62 KB
5.58 KB
6.66 KB
6.51 KB
5.54 KB
5.48 KB
6.08 KB
5.97 KB
5.53 KB
5.38 KB
5.53 KB
5.37 KB
6.55 KB
6.38 KB
5.33 KB
5.28 KB
6.08 KB
5.97 KB
3.63 KB
3.57 KB
4.39 KB
4.36 KB
4.78 KB
4.63 KB
4.86 KB
4.75 KB
3.69 KB
3.63 KB
4.74 KB
4.65 KB
4.33 KB
4.23 KB
3.8 KB
3.75 KB
4.09 KB
4.03 KB
9.74 KB
9.96 KB
9.74 KB
9.96 KB
4.53 KB
2.74 KB
2.9 KB
2.85 KB
231 KB
227 KB
2.94 KB
9.6 KB
10.9 KB
13.6 KB
4.53 KB
4.5 KB
12.3 KB
6.64 KB
7.91 KB
9.6 KB
12.3 KB
6.64 KB
7.91 KB
6.13 KB
7.18 KB
7.94 KB
9.74 KB
8.96 KB
11.6 KB
7.67 KB
9.34 KB
9.6 KB
12.3 KB
3.45 KB
4.65 KB
4.58 KB
4.45 KB
5.5 KB
4.56 KB
5.01 KB
5.67 KB
4.51 KB
4.64 KB
4.19 KB
6.73 KB
5.35 KB
5.26 KB
4.51 KB
4.19 KB
4.27 KB
4.22 KB
3.92 KB
4.17 KB
7.41 KB
7.41 KB
7.42 KB
7.33 KB
7.25 KB
8.32 KB
8.33 KB
9.76 KB
9.72 KB
7 KB
101 KB
31.8 KB
9.74 KB
4.03 KB
4.03 KB
9.96 KB
6.11 KB
6.67 KB
5.86 KB
6.3 KB
5.84 KB
6.33 KB
5.57 KB
5.9 KB
4.27 KB
2.95 KB
3.32 KB
3.31 KB
3.44 KB
7.08 KB
6.21 KB
4.65 KB
6.23 KB
3.22 KB
2.87 KB
2.99 KB
3.19 KB
3.17 KB
4.99 KB
4.98 KB
6.02 KB
5.78 KB
3.23 KB
3.2 KB
2.77 KB
3.16 KB
4.16 KB
2.75 KB
3.24 KB
3.26 KB
2.86 KB
3.4 KB
5.22 KB
9.74 KB
9.96 KB
4.25 KB
4.28 KB
7.39 KB
7.54 KB
6.67 KB
5.82 KB
6.16 KB
6.07 KB
5.77 KB
6.43 KB
5.08 KB
4.76 KB
4.03 KB
4.24 KB
4.13 KB
5.25 KB
8.6 KB
7.54 KB
8.05 KB
7.83 KB
6.67 KB
7.47 KB
8.11 KB
7.35 KB
7.72 KB
4.84 KB
4.56 KB
4.19 KB
4.48 KB
4.23 KB
5.59 KB
3.83 KB
5.93 KB
3.22 KB
5.85 KB
4.58 KB
6.27 KB
4.9 KB
5.85 KB
6.23 KB
5.6 KB
4.2 KB
4.1 KB
5.61 KB
5.54 KB
6.31 KB
6.09 KB
5.04 KB
4.92 KB
6.73 KB
6.6 KB
6.99 KB
6.72 KB
6.39 KB
6.13 KB
7.17 KB
6.82 KB
4.84 KB
2.9 KB
2.85 KB
9.72 KB
9.97 KB
9.75 KB
4.48 KB
4.5 KB
4.03 KB
4.03 KB
3.32 KB
5.1 KB
5.03 KB
5.4 KB
5.35 KB
5.54 KB
5.03 KB
6.13 KB
4.81 KB
4.48 KB
5.14 KB
3.16 KB
3.02 KB
2.74 KB
2.83 KB
3.45 KB
2.83 KB
3.02 KB
3.35 KB
2.94 KB
3.59 KB
3.51 KB
2.91 KB
3.5 KB
29.1 KB
19.2 KB
18.5 KB
4.07 KB
14.5 KB
14.4 KB
4.06 KB
2.74 KB
3.12 KB
3.18 KB
3.31 KB
3.51 KB
3.76 KB
4.02 KB
3.83 KB
4.09 KB
3.6 KB
3.86 KB
3.77 KB
4.02 KB
3.84 KB
4.14 KB
3.57 KB
3.79 KB
3.97 KB
4.24 KB
3.85 KB
4.11 KB
3.75 KB
4.01 KB
3.94 KB
4.25 KB
3.92 KB
4.31 KB
3.35 KB
3.6 KB
3.64 KB
3.95 KB
3.3 KB
3.55 KB
3.63 KB
3.93 KB
3.57 KB
3.86 KB
3.27 KB
3.5 KB
3.82 KB
4.13 KB
3.56 KB
3.82 KB
3.75 KB
4 KB