에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 22fe3f227d814e5e0dc37099838ddd91cad7470e

Authored by 김태훈
1 parent ea3dabf48f
Exists in master

스타일시트 정의가 자식 윈도우에 전파되어 생기는 부작용 차단

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