Commit 4f5675d6adb1cce419912df4ffa0a43250de9a54
1 parent
aac0f73eef
Exists in
fhd
스타일시트 정의가 자식 윈도우에 전파되어 생기는 부작용 차단
Showing
5 changed files
with
42 additions
and
42 deletions
Show diff stats
app/gui/oven_control/configwindow.ui
@@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
14 | <string notr="true">#centralwidget { background-image: url(:/images/background/config.png); } | 14 | <string notr="true">#centralwidget { background-image: url(:/images/background/config.png); } |
15 | #bottomBar { background-image: url(:/images/bottom_bar/background.png); } | 15 | #bottomBar { background-image: url(:/images/bottom_bar/background.png); } |
16 | 16 | ||
17 | -QPushButton[style="type"] { | 17 | +QPushButton[style="configwindow-type"] { |
18 | background-repeat: no-repeat; | 18 | background-repeat: no-repeat; |
19 | background-position: center; | 19 | background-position: center; |
20 | background-origin: margin; | 20 | background-origin: margin; |
@@ -109,7 +109,7 @@ QPushButton:pressed, QPushButton:focus, QPushButton:checked { background-image: | @@ -109,7 +109,7 @@ QPushButton:pressed, QPushButton:focus, QPushButton:checked { background-image: | ||
109 | <bool>true</bool> | 109 | <bool>true</bool> |
110 | </property> | 110 | </property> |
111 | <property name="style" stdset="0"> | 111 | <property name="style" stdset="0"> |
112 | - <string notr="true">type</string> | 112 | + <string notr="true">configwindow-type</string> |
113 | </property> | 113 | </property> |
114 | </widget> | 114 | </widget> |
115 | </item> | 115 | </item> |
@@ -148,7 +148,7 @@ QPushButton:pressed, QPushButton:focus,QPushButton:checked { background-image: u | @@ -148,7 +148,7 @@ QPushButton:pressed, QPushButton:focus,QPushButton:checked { background-image: u | ||
148 | <bool>true</bool> | 148 | <bool>true</bool> |
149 | </property> | 149 | </property> |
150 | <property name="style" stdset="0"> | 150 | <property name="style" stdset="0"> |
151 | - <string notr="true">type</string> | 151 | + <string notr="true">configwindow-type</string> |
152 | </property> | 152 | </property> |
153 | </widget> | 153 | </widget> |
154 | </item> | 154 | </item> |
@@ -187,7 +187,7 @@ QPushButton:pressed, QPushButton:focus, QPushButton:checked { background-image: | @@ -187,7 +187,7 @@ QPushButton:pressed, QPushButton:focus, QPushButton:checked { background-image: | ||
187 | <bool>true</bool> | 187 | <bool>true</bool> |
188 | </property> | 188 | </property> |
189 | <property name="style" stdset="0"> | 189 | <property name="style" stdset="0"> |
190 | - <string notr="true">type</string> | 190 | + <string notr="true">configwindow-type</string> |
191 | </property> | 191 | </property> |
192 | </widget> | 192 | </widget> |
193 | </item> | 193 | </item> |
@@ -226,7 +226,7 @@ QPushButton:pressed, QPushButton:focus,QPushButton:checked { background-image: u | @@ -226,7 +226,7 @@ QPushButton:pressed, QPushButton:focus,QPushButton:checked { background-image: u | ||
226 | <bool>true</bool> | 226 | <bool>true</bool> |
227 | </property> | 227 | </property> |
228 | <property name="style" stdset="0"> | 228 | <property name="style" stdset="0"> |
229 | - <string notr="true">type</string> | 229 | + <string notr="true">configwindow-type</string> |
230 | </property> | 230 | </property> |
231 | </widget> | 231 | </widget> |
232 | </item> | 232 | </item> |
@@ -256,7 +256,7 @@ QPushButton:pressed, QPushButton:focus ,QPushButton:checked{ background-image: u | @@ -256,7 +256,7 @@ QPushButton:pressed, QPushButton:focus ,QPushButton:checked{ background-image: u | ||
256 | <bool>true</bool> | 256 | <bool>true</bool> |
257 | </property> | 257 | </property> |
258 | <property name="style" stdset="0"> | 258 | <property name="style" stdset="0"> |
259 | - <string notr="true">type</string> | 259 | + <string notr="true">configwindow-type</string> |
260 | </property> | 260 | </property> |
261 | </widget> | 261 | </widget> |
262 | </item> | 262 | </item> |
@@ -295,7 +295,7 @@ QPushButton:pressed, QPushButton:focus,QPushButton:checked { background-image: u | @@ -295,7 +295,7 @@ QPushButton:pressed, QPushButton:focus,QPushButton:checked { background-image: u | ||
295 | <bool>true</bool> | 295 | <bool>true</bool> |
296 | </property> | 296 | </property> |
297 | <property name="style" stdset="0"> | 297 | <property name="style" stdset="0"> |
298 | - <string notr="true">type</string> | 298 | + <string notr="true">configwindow-type</string> |
299 | </property> | 299 | </property> |
300 | </widget> | 300 | </widget> |
301 | </item> | 301 | </item> |
@@ -334,7 +334,7 @@ QPushButton:pressed, QPushButton:focus,QPushButton:checked { background-image: u | @@ -334,7 +334,7 @@ QPushButton:pressed, QPushButton:focus,QPushButton:checked { background-image: u | ||
334 | <bool>true</bool> | 334 | <bool>true</bool> |
335 | </property> | 335 | </property> |
336 | <property name="style" stdset="0"> | 336 | <property name="style" stdset="0"> |
337 | - <string notr="true">type</string> | 337 | + <string notr="true">configwindow-type</string> |
338 | </property> | 338 | </property> |
339 | </widget> | 339 | </widget> |
340 | </item> | 340 | </item> |
@@ -373,7 +373,7 @@ QPushButton:pressed, QPushButton:focus ,QPushButton:checked{ background-image: u | @@ -373,7 +373,7 @@ QPushButton:pressed, QPushButton:focus ,QPushButton:checked{ background-image: u | ||
373 | <bool>true</bool> | 373 | <bool>true</bool> |
374 | </property> | 374 | </property> |
375 | <property name="style" stdset="0"> | 375 | <property name="style" stdset="0"> |
376 | - <string notr="true">type</string> | 376 | + <string notr="true">configwindow-type</string> |
377 | </property> | 377 | </property> |
378 | </widget> | 378 | </widget> |
379 | </item> | 379 | </item> |
app/gui/oven_control/mainwindow.ui
@@ -39,7 +39,7 @@ color: white; | @@ -39,7 +39,7 @@ color: white; | ||
39 | font-size: 48px; | 39 | font-size: 48px; |
40 | } | 40 | } |
41 | 41 | ||
42 | -QPushButton[style="type"] { | 42 | +QPushButton[style="mainwindow-type"] { |
43 | background-repeat: no-repeat; | 43 | background-repeat: no-repeat; |
44 | background-position: top; | 44 | background-position: top; |
45 | background-clip: margin; | 45 | background-clip: margin; |
@@ -393,7 +393,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -393,7 +393,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
393 | <string>볶음류</string> | 393 | <string>볶음류</string> |
394 | </property> | 394 | </property> |
395 | <property name="style" stdset="0"> | 395 | <property name="style" stdset="0"> |
396 | - <string>type</string> | 396 | + <string notr="true">mainwindow-type</string> |
397 | </property> | 397 | </property> |
398 | </widget> | 398 | </widget> |
399 | <widget class="QPushButton" name="dessertButton"> | 399 | <widget class="QPushButton" name="dessertButton"> |
@@ -419,7 +419,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -419,7 +419,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
419 | <string>조림류</string> | 419 | <string>조림류</string> |
420 | </property> | 420 | </property> |
421 | <property name="style" stdset="0"> | 421 | <property name="style" stdset="0"> |
422 | - <string>type</string> | 422 | + <string notr="true">mainwindow-type</string> |
423 | </property> | 423 | </property> |
424 | </widget> | 424 | </widget> |
425 | <widget class="QPushButton" name="etcButton"> | 425 | <widget class="QPushButton" name="etcButton"> |
@@ -445,7 +445,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -445,7 +445,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
445 | <string>기타요리</string> | 445 | <string>기타요리</string> |
446 | </property> | 446 | </property> |
447 | <property name="style" stdset="0"> | 447 | <property name="style" stdset="0"> |
448 | - <string>type</string> | 448 | + <string notr="true">mainwindow-type</string> |
449 | </property> | 449 | </property> |
450 | </widget> | 450 | </widget> |
451 | <widget class="QPushButton" name="grainButton"> | 451 | <widget class="QPushButton" name="grainButton"> |
@@ -471,7 +471,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -471,7 +471,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
471 | <string>초벌</string> | 471 | <string>초벌</string> |
472 | </property> | 472 | </property> |
473 | <property name="style" stdset="0"> | 473 | <property name="style" stdset="0"> |
474 | - <string>type</string> | 474 | + <string notr="true">mainwindow-type</string> |
475 | </property> | 475 | </property> |
476 | </widget> | 476 | </widget> |
477 | <widget class="QPushButton" name="poultryButton"> | 477 | <widget class="QPushButton" name="poultryButton"> |
@@ -497,7 +497,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -497,7 +497,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
497 | <string>구이류</string> | 497 | <string>구이류</string> |
498 | </property> | 498 | </property> |
499 | <property name="style" stdset="0"> | 499 | <property name="style" stdset="0"> |
500 | - <string>type</string> | 500 | + <string notr="true">mainwindow-type</string> |
501 | </property> | 501 | </property> |
502 | </widget> | 502 | </widget> |
503 | <widget class="QPushButton" name="fishButton"> | 503 | <widget class="QPushButton" name="fishButton"> |
@@ -523,7 +523,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -523,7 +523,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
523 | <string>스팀류</string> | 523 | <string>스팀류</string> |
524 | </property> | 524 | </property> |
525 | <property name="style" stdset="0"> | 525 | <property name="style" stdset="0"> |
526 | - <string>type</string> | 526 | + <string notr="true">mainwindow-type</string> |
527 | </property> | 527 | </property> |
528 | </widget> | 528 | </widget> |
529 | <widget class="QPushButton" name="breadButton"> | 529 | <widget class="QPushButton" name="breadButton"> |
@@ -549,7 +549,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -549,7 +549,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
549 | <string>보온</string> | 549 | <string>보온</string> |
550 | </property> | 550 | </property> |
551 | <property name="style" stdset="0"> | 551 | <property name="style" stdset="0"> |
552 | - <string>type</string> | 552 | + <string notr="true">mainwindow-type</string> |
553 | </property> | 553 | </property> |
554 | </widget> | 554 | </widget> |
555 | <widget class="QPushButton" name="primeButton"> | 555 | <widget class="QPushButton" name="primeButton"> |
@@ -575,7 +575,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -575,7 +575,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
575 | <string>부가기능</string> | 575 | <string>부가기능</string> |
576 | </property> | 576 | </property> |
577 | <property name="style" stdset="0"> | 577 | <property name="style" stdset="0"> |
578 | - <string>type</string> | 578 | + <string notr="true">mainwindow-type</string> |
579 | </property> | 579 | </property> |
580 | </widget> | 580 | </widget> |
581 | <widget class="StatusArea" name="clockContainer" native="true"> | 581 | <widget class="StatusArea" name="clockContainer" native="true"> |
app/gui/oven_control/multicookselectionwindow.ui
@@ -30,7 +30,7 @@ color: white; | @@ -30,7 +30,7 @@ color: white; | ||
30 | font-size: 48px; | 30 | font-size: 48px; |
31 | } | 31 | } |
32 | 32 | ||
33 | -QPushButton[style="type"] { | 33 | +QPushButton[style="multicookselectionwindow-type"] { |
34 | background-repeat: no-repeat; | 34 | background-repeat: no-repeat; |
35 | background-position: top; | 35 | background-position: top; |
36 | background-clip: margin; | 36 | background-clip: margin; |
@@ -122,7 +122,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/vegetable_hide.p | @@ -122,7 +122,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/vegetable_hide.p | ||
122 | <string>초벌</string> | 122 | <string>초벌</string> |
123 | </property> | 123 | </property> |
124 | <property name="style" stdset="0"> | 124 | <property name="style" stdset="0"> |
125 | - <string notr="true">type</string> | 125 | + <string notr="true">multicookselectionwindow-type</string> |
126 | </property> | 126 | </property> |
127 | </widget> | 127 | </widget> |
128 | <widget class="Line" name="line_5"> | 128 | <widget class="Line" name="line_5"> |
@@ -165,7 +165,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png); | @@ -165,7 +165,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png); | ||
165 | <string>보온</string> | 165 | <string>보온</string> |
166 | </property> | 166 | </property> |
167 | <property name="style" stdset="0"> | 167 | <property name="style" stdset="0"> |
168 | - <string notr="true">type</string> | 168 | + <string notr="true">multicookselectionwindow-type</string> |
169 | </property> | 169 | </property> |
170 | </widget> | 170 | </widget> |
171 | <widget class="Line" name="line_3"> | 171 | <widget class="Line" name="line_3"> |
@@ -208,7 +208,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/meat_hide.png); | @@ -208,7 +208,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/meat_hide.png); | ||
208 | <string>볶음류</string> | 208 | <string>볶음류</string> |
209 | </property> | 209 | </property> |
210 | <property name="style" stdset="0"> | 210 | <property name="style" stdset="0"> |
211 | - <string notr="true">type</string> | 211 | + <string notr="true">multicookselectionwindow-type</string> |
212 | </property> | 212 | </property> |
213 | </widget> | 213 | </widget> |
214 | <widget class="Line" name="line"> | 214 | <widget class="Line" name="line"> |
@@ -251,7 +251,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/desert_hide.png) | @@ -251,7 +251,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/desert_hide.png) | ||
251 | <string>조림류</string> | 251 | <string>조림류</string> |
252 | </property> | 252 | </property> |
253 | <property name="style" stdset="0"> | 253 | <property name="style" stdset="0"> |
254 | - <string notr="true">type</string> | 254 | + <string notr="true">multicookselectionwindow-type</string> |
255 | </property> | 255 | </property> |
256 | </widget> | 256 | </widget> |
257 | <widget class="QPushButton" name="poultryButton"> | 257 | <widget class="QPushButton" name="poultryButton"> |
@@ -281,7 +281,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/poultry_hide.png | @@ -281,7 +281,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/poultry_hide.png | ||
281 | <string>구이류</string> | 281 | <string>구이류</string> |
282 | </property> | 282 | </property> |
283 | <property name="style" stdset="0"> | 283 | <property name="style" stdset="0"> |
284 | - <string notr="true">type</string> | 284 | + <string notr="true">multicookselectionwindow-type</string> |
285 | </property> | 285 | </property> |
286 | </widget> | 286 | </widget> |
287 | <widget class="QPushButton" name="combiButton"> | 287 | <widget class="QPushButton" name="combiButton"> |
@@ -414,7 +414,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/etc_hide.png); } | @@ -414,7 +414,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/etc_hide.png); } | ||
414 | <string>기타요리</string> | 414 | <string>기타요리</string> |
415 | </property> | 415 | </property> |
416 | <property name="style" stdset="0"> | 416 | <property name="style" stdset="0"> |
417 | - <string notr="true">type</string> | 417 | + <string notr="true">multicookselectionwindow-type</string> |
418 | </property> | 418 | </property> |
419 | </widget> | 419 | </widget> |
420 | <widget class="Line" name="line_4"> | 420 | <widget class="Line" name="line_4"> |
@@ -490,7 +490,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/additional_hide. | @@ -490,7 +490,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/additional_hide. | ||
490 | <string>부가기능</string> | 490 | <string>부가기능</string> |
491 | </property> | 491 | </property> |
492 | <property name="style" stdset="0"> | 492 | <property name="style" stdset="0"> |
493 | - <string notr="true">type</string> | 493 | + <string notr="true">multicookselectionwindow-type</string> |
494 | </property> | 494 | </property> |
495 | </widget> | 495 | </widget> |
496 | <widget class="Line" name="line_6"> | 496 | <widget class="Line" name="line_6"> |
@@ -648,7 +648,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/fish_hide.png); | @@ -648,7 +648,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/fish_hide.png); | ||
648 | <string>스팀류</string> | 648 | <string>스팀류</string> |
649 | </property> | 649 | </property> |
650 | <property name="style" stdset="0"> | 650 | <property name="style" stdset="0"> |
651 | - <string notr="true">type</string> | 651 | + <string notr="true">multicookselectionwindow-type</string> |
652 | </property> | 652 | </property> |
653 | </widget> | 653 | </widget> |
654 | <widget class="QStackedWidget" name="upperStack"> | 654 | <widget class="QStackedWidget" name="upperStack"> |
app/gui/oven_control/programmingselectionwindow.ui
@@ -30,7 +30,7 @@ color: white; | @@ -30,7 +30,7 @@ color: white; | ||
30 | font-size: 48px; | 30 | font-size: 48px; |
31 | } | 31 | } |
32 | 32 | ||
33 | -QPushButton[style="type"] { | 33 | +QPushButton[style="programmingselectionwindow-type"] { |
34 | background-repeat: no-repeat; | 34 | background-repeat: no-repeat; |
35 | background-position: top; | 35 | background-position: top; |
36 | background-clip: margin; | 36 | background-clip: margin; |
@@ -85,7 +85,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/desert_hide.png) | @@ -85,7 +85,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/desert_hide.png) | ||
85 | <string>조림류</string> | 85 | <string>조림류</string> |
86 | </property> | 86 | </property> |
87 | <property name="style" stdset="0"> | 87 | <property name="style" stdset="0"> |
88 | - <string>type</string> | 88 | + <string notr="true">programmingselectionwindow-type</string> |
89 | </property> | 89 | </property> |
90 | </widget> | 90 | </widget> |
91 | <widget class="QPushButton" name="fishButton"> | 91 | <widget class="QPushButton" name="fishButton"> |
@@ -115,7 +115,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/fish_hide.png); | @@ -115,7 +115,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/fish_hide.png); | ||
115 | <string>스팀류</string> | 115 | <string>스팀류</string> |
116 | </property> | 116 | </property> |
117 | <property name="style" stdset="0"> | 117 | <property name="style" stdset="0"> |
118 | - <string>type</string> | 118 | + <string notr="true">programmingselectionwindow-type</string> |
119 | </property> | 119 | </property> |
120 | </widget> | 120 | </widget> |
121 | <widget class="Line" name="line_6"> | 121 | <widget class="Line" name="line_6"> |
@@ -204,7 +204,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/vegetable_hide.p | @@ -204,7 +204,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/vegetable_hide.p | ||
204 | <string>초벌</string> | 204 | <string>초벌</string> |
205 | </property> | 205 | </property> |
206 | <property name="style" stdset="0"> | 206 | <property name="style" stdset="0"> |
207 | - <string>type</string> | 207 | + <string notr="true">programmingselectionwindow-type</string> |
208 | </property> | 208 | </property> |
209 | </widget> | 209 | </widget> |
210 | <widget class="QPushButton" name="meatButton"> | 210 | <widget class="QPushButton" name="meatButton"> |
@@ -234,7 +234,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/meat_hide.png); | @@ -234,7 +234,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/meat_hide.png); | ||
234 | <string>볶음류</string> | 234 | <string>볶음류</string> |
235 | </property> | 235 | </property> |
236 | <property name="style" stdset="0"> | 236 | <property name="style" stdset="0"> |
237 | - <string>type</string> | 237 | + <string notr="true">programmingselectionwindow-type</string> |
238 | </property> | 238 | </property> |
239 | </widget> | 239 | </widget> |
240 | <widget class="QWidget" name="bottomBar" native="true"> | 240 | <widget class="QWidget" name="bottomBar" native="true"> |
@@ -415,7 +415,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/etc_hide.png); } | @@ -415,7 +415,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/etc_hide.png); } | ||
415 | <string>기타요리</string> | 415 | <string>기타요리</string> |
416 | </property> | 416 | </property> |
417 | <property name="style" stdset="0"> | 417 | <property name="style" stdset="0"> |
418 | - <string>type</string> | 418 | + <string notr="true">programmingselectionwindow-type</string> |
419 | </property> | 419 | </property> |
420 | </widget> | 420 | </widget> |
421 | <widget class="Line" name="line_7"> | 421 | <widget class="Line" name="line_7"> |
@@ -587,7 +587,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/poultry_hide.png | @@ -587,7 +587,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/poultry_hide.png | ||
587 | <string>구이류</string> | 587 | <string>구이류</string> |
588 | </property> | 588 | </property> |
589 | <property name="style" stdset="0"> | 589 | <property name="style" stdset="0"> |
590 | - <string>type</string> | 590 | + <string notr="true">programmingselectionwindow-type</string> |
591 | </property> | 591 | </property> |
592 | </widget> | 592 | </widget> |
593 | <widget class="QPushButton" name="combiButton"> | 593 | <widget class="QPushButton" name="combiButton"> |
@@ -641,7 +641,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/additional_hide. | @@ -641,7 +641,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/additional_hide. | ||
641 | <string>부가기능</string> | 641 | <string>부가기능</string> |
642 | </property> | 642 | </property> |
643 | <property name="style" stdset="0"> | 643 | <property name="style" stdset="0"> |
644 | - <string>type</string> | 644 | + <string notr="true">programmingselectionwindow-type</string> |
645 | </property> | 645 | </property> |
646 | </widget> | 646 | </widget> |
647 | <widget class="QPushButton" name="breadButton"> | 647 | <widget class="QPushButton" name="breadButton"> |
@@ -671,7 +671,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png); | @@ -671,7 +671,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png); | ||
671 | <string>보온</string> | 671 | <string>보온</string> |
672 | </property> | 672 | </property> |
673 | <property name="style" stdset="0"> | 673 | <property name="style" stdset="0"> |
674 | - <string>type</string> | 674 | + <string notr="true">programmingselectionwindow-type</string> |
675 | </property> | 675 | </property> |
676 | </widget> | 676 | </widget> |
677 | <widget class="QStackedWidget" name="upperStack"> | 677 | <widget class="QStackedWidget" name="upperStack"> |
app/gui/oven_control/washwindow.ui
@@ -38,7 +38,7 @@ width: 27px; | @@ -38,7 +38,7 @@ width: 27px; | ||
38 | height: 39px; | 38 | height: 39px; |
39 | } | 39 | } |
40 | 40 | ||
41 | -QPushButton[style="type"] { | 41 | +QPushButton[style="washwindow-type"] { |
42 | background-repeat: no-repeat; | 42 | background-repeat: no-repeat; |
43 | background-position: center; | 43 | background-position: center; |
44 | background-clip: border; | 44 | background-clip: border; |
@@ -535,7 +535,7 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/wash/bu | @@ -535,7 +535,7 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/wash/bu | ||
535 | <string>세제 없이 헹굼</string> | 535 | <string>세제 없이 헹굼</string> |
536 | </property> | 536 | </property> |
537 | <property name="style" stdset="0"> | 537 | <property name="style" stdset="0"> |
538 | - <string notr="true">type</string> | 538 | + <string notr="true">washwindow-type</string> |
539 | </property> | 539 | </property> |
540 | </widget> | 540 | </widget> |
541 | <widget class="QPushButton" name="washButton_2"> | 541 | <widget class="QPushButton" name="washButton_2"> |
@@ -558,7 +558,7 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/wash/bu | @@ -558,7 +558,7 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/wash/bu | ||
558 | <string>간이 세척</string> | 558 | <string>간이 세척</string> |
559 | </property> | 559 | </property> |
560 | <property name="style" stdset="0"> | 560 | <property name="style" stdset="0"> |
561 | - <string notr="true">type</string> | 561 | + <string notr="true">washwindow-type</string> |
562 | </property> | 562 | </property> |
563 | </widget> | 563 | </widget> |
564 | <widget class="QPushButton" name="washButton_3"> | 564 | <widget class="QPushButton" name="washButton_3"> |
@@ -581,7 +581,7 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/wash/bu | @@ -581,7 +581,7 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/wash/bu | ||
581 | <string>표준 세척</string> | 581 | <string>표준 세척</string> |
582 | </property> | 582 | </property> |
583 | <property name="style" stdset="0"> | 583 | <property name="style" stdset="0"> |
584 | - <string notr="true">type</string> | 584 | + <string notr="true">washwindow-type</string> |
585 | </property> | 585 | </property> |
586 | </widget> | 586 | </widget> |
587 | <widget class="QPushButton" name="washButton_4"> | 587 | <widget class="QPushButton" name="washButton_4"> |
@@ -604,7 +604,7 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/wash/bu | @@ -604,7 +604,7 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/wash/bu | ||
604 | <string>강 세척</string> | 604 | <string>강 세척</string> |
605 | </property> | 605 | </property> |
606 | <property name="style" stdset="0"> | 606 | <property name="style" stdset="0"> |
607 | - <string notr="true">type</string> | 607 | + <string notr="true">washwindow-type</string> |
608 | </property> | 608 | </property> |
609 | </widget> | 609 | </widget> |
610 | <widget class="QPushButton" name="washButton_5"> | 610 | <widget class="QPushButton" name="washButton_5"> |
@@ -627,7 +627,7 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/wash/bu | @@ -627,7 +627,7 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/wash/bu | ||
627 | <string>고속 세척</string> | 627 | <string>고속 세척</string> |
628 | </property> | 628 | </property> |
629 | <property name="style" stdset="0"> | 629 | <property name="style" stdset="0"> |
630 | - <string notr="true">type</string> | 630 | + <string notr="true">washwindow-type</string> |
631 | </property> | 631 | </property> |
632 | </widget> | 632 | </widget> |
633 | <widget class="QLabel" name="configMaxLabel_4"> | 633 | <widget class="QLabel" name="configMaxLabel_4"> |