Commit abb6056926d0b8a53b3ffc15a09a6ab4c97d7ceb

Authored by 김태훈
1 parent ffa5133350
Exists in fhd

새 디자인 시안 반영

app/gui/oven_control/mainwindow.ui
... ... @@ -36,19 +36,20 @@ border-top: 248px;
36 36 border-bottom: -60px;
37 37 border-style: hidden;
38 38 color: white;
39   -font-size: 48px;
  39 +font-size: 34px;
40 40 }
41 41  
42 42 QPushButton[style="type"] {
43 43 background-repeat: no-repeat;
44   -background-position: center;
45   -background-clip: border;
  44 +background-position: top;
  45 +background-clip: margin;
46 46 background-origin: border;
  47 +margin-top: 52px;
47 48  
48   -border-top: 198px;
  49 +padding-top: 100px;
49 50 border-style: hidden;
50 51 color: white;
51   -font-size: 36px;
  52 +font-size: 46px;
52 53 }
53 54  
54 55 QPushButton[style="function"] {
... ... @@ -60,7 +61,7 @@ background-origin: border;
60 61 padding-top: 247px;
61 62 border-style: hidden;
62 63 color: white;
63   -font-size: 36px;
  64 +font-size: 34px;
64 65 }</string>
65 66 </property>
66 67 <widget class="QWidget" name="centralwidget">
... ...
app/gui/oven_control/manualcooksettingwidget.ui
... ... @@ -34,7 +34,7 @@ border-top: 248px;
34 34 border-bottom: -60px;
35 35 border-style: hidden;
36 36 color: #7B7B7B;
37   -font-size: 48px;
  37 +font-size: 34px;
38 38 }
39 39  
40 40 QPushButton[style=&quot;mode&quot;]:checked {
... ...
app/gui/oven_control/manualcookwindow.ui
... ... @@ -25,7 +25,7 @@ border-top: 248px;
25 25 border-bottom: -60px;
26 26 border-style: hidden;
27 27 color: #7B7B7B;
28   -font-size: 48px;
  28 +font-size: 34px;
29 29 }
30 30  
31 31 QPushButton[style=&quot;mode&quot;]:checked {
... ...
app/gui/oven_control/multicookselectionwindow.ui
... ... @@ -27,19 +27,20 @@ border-top: 248px;
27 27 border-bottom: -60px;
28 28 border-style: hidden;
29 29 color: white;
30   -font-size: 48px;
  30 +font-size: 34px;
31 31 }
32 32  
33 33 QPushButton[style=&quot;type&quot;] {
34 34 background-repeat: no-repeat;
35   -background-position: center;
36   -background-clip: border;
  35 +background-position: top;
  36 +background-clip: margin;
37 37 background-origin: border;
  38 +margin-top: 52px;
38 39  
39   -border-top: 198px;
  40 +padding-top: 100px;
40 41 border-style: hidden;
41 42 color: white;
42   -font-size: 36px;
  43 +font-size: 46px;
43 44 }
44 45  
45 46 QPushButton[style=&quot;function&quot;] {
... ... @@ -51,7 +52,7 @@ background-origin: border;
51 52 border-top: 247px;
52 53 border-style: hidden;
53 54 color: white;
54   -font-size: 36px;
  55 +font-size: 34px;
55 56 }
56 57  
57 58 QPushButton:disabled { color: #7B7B7B; }</string>
... ...
app/gui/oven_control/programmingselectionwindow.ui
... ... @@ -27,19 +27,20 @@ border-top: 248px;
27 27 border-bottom: -60px;
28 28 border-style: hidden;
29 29 color: white;
30   -font-size: 48px;
  30 +font-size: 34px;
31 31 }
32 32  
33 33 QPushButton[style=&quot;type&quot;] {
34 34 background-repeat: no-repeat;
35   -background-position: center;
36   -background-clip: border;
  35 +background-position: top;
  36 +background-clip: margin;
37 37 background-origin: border;
  38 +margin-top: 52px;
38 39  
39   -border-top: 198px;
  40 +padding-top: 100px;
40 41 border-style: hidden;
41 42 color: white;
42   -font-size: 36px;
  43 +font-size: 46px;
43 44 }
44 45  
45 46 QPushButton[style=&quot;function&quot;] {
... ... @@ -51,7 +52,7 @@ background-origin: border;
51 52 border-top: 247px;
52 53 border-style: hidden;
53 54 color: white;
54   -font-size: 36px;
  55 +font-size: 34px;
55 56 }
56 57  
57 58 QPushButton:disabled { color: #7B7B7B; }</string>
... ...