에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit abb6056926d0b8a53b3ffc15a09a6ab4c97d7ceb

Authored by 김태훈
1 parent ffa5133350
Exists in fhd

새 디자인 시안 반영

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