에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit ea3dabf48f9767ee1803512568ced99275153e11

Authored by 김태훈
1 parent e34c94639b
Exists in master

버전 1.6.11 

디자인 피드백 반영
Showing 6 changed files with 12 additions and 12 deletions   Show diff stats
app/gui/oven_control/define.h
  Diff comments   View file @ea3dabf
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 5
6 #define MAJOR_VER 1 6 #define MAJOR_VER 1
7 #define MINOR_VER 6 7 #define MINOR_VER 6
8 -#define HOTFIX_VER 10 8 +#define HOTFIX_VER 11
9 9
10 // 0 for normal 10 // 0 for normal
11 // 1 for premium 11 // 1 for premium
app/gui/oven_control/mainwindow.ui
  Diff comments   View file @ea3dabf
@@ -36,7 +36,7 @@ border-top: 200px; @@ -36,7 +36,7 @@ border-top: 200px;
36 border-bottom: -50px; 36 border-bottom: -50px;
37 border-style: hidden; 37 border-style: hidden;
38 color: white; 38 color: white;
39 -font-size: 28px; 39 +font-size: 40px;
40 } 40 }
41 41
42 QPushButton[style="type"] { 42 QPushButton[style="type"] {
@@ -49,7 +49,7 @@ margin-top: 42px; @@ -49,7 +49,7 @@ margin-top: 42px;
49 padding-top: 82px; 49 padding-top: 82px;
50 border-style: hidden; 50 border-style: hidden;
51 color: white; 51 color: white;
52 -font-size: 38px; 52 +font-size: 36px;
53 } 53 }
54 54
55 QPushButton[style="function"] { 55 QPushButton[style="function"] {
@@ -61,7 +61,7 @@ background-origin: border; @@ -61,7 +61,7 @@ background-origin: border;
61 padding-top: 206px; 61 padding-top: 206px;
62 border-style: hidden; 62 border-style: hidden;
63 color: white; 63 color: white;
64 -font-size: 28px; 64 +font-size: 30px;
65 }</string> 65 }</string>
66 </property> 66 </property>
67 <widget class="QWidget" name="centralwidget"> 67 <widget class="QWidget" name="centralwidget">
app/gui/oven_control/manualcooksettingwidget.ui
  Diff comments   View file @ea3dabf
@@ -34,7 +34,7 @@ border-top: 200px; @@ -34,7 +34,7 @@ border-top: 200px;
34 border-bottom: -50px; 34 border-bottom: -50px;
35 border-style: hidden; 35 border-style: hidden;
36 color: #7B7B7B; 36 color: #7B7B7B;
37 -font-size: 28px; 37 +font-size: 40px;
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 @ea3dabf
@@ -25,7 +25,7 @@ border-top: 200px; @@ -25,7 +25,7 @@ border-top: 200px;
25 border-bottom: -50px; 25 border-bottom: -50px;
26 border-style: hidden; 26 border-style: hidden;
27 color: #7B7B7B; 27 color: #7B7B7B;
28 -font-size: 28px; 28 +font-size: 40px;
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 @ea3dabf
@@ -27,7 +27,7 @@ border-top: 200px; @@ -27,7 +27,7 @@ border-top: 200px;
27 border-bottom: -50px; 27 border-bottom: -50px;
28 border-style: hidden; 28 border-style: hidden;
29 color: white; 29 color: white;
30 -font-size: 28px; 30 +font-size: 40px;
31 } 31 }
32 32
33 QPushButton[style=&quot;type&quot;] { 33 QPushButton[style=&quot;type&quot;] {
@@ -40,7 +40,7 @@ margin-top: 42px; @@ -40,7 +40,7 @@ margin-top: 42px;
40 padding-top: 82px; 40 padding-top: 82px;
41 border-style: hidden; 41 border-style: hidden;
42 color: white; 42 color: white;
43 -font-size: 38px; 43 +font-size: 36px;
44 } 44 }
45 45
46 QPushButton[style=&quot;function&quot;] { 46 QPushButton[style=&quot;function&quot;] {
@@ -52,7 +52,7 @@ background-origin: border; @@ -52,7 +52,7 @@ background-origin: border;
52 border-top: 206px; 52 border-top: 206px;
53 border-style: hidden; 53 border-style: hidden;
54 color: white; 54 color: white;
55 -font-size: 28px; 55 +font-size: 30px;
56 } 56 }
57 57
58 QPushButton:disabled { color: #7B7B7B; }</string> 58 QPushButton:disabled { color: #7B7B7B; }</string>
app/gui/oven_control/programmingselectionwindow.ui
  Diff comments   View file @ea3dabf
@@ -27,7 +27,7 @@ border-top: 200px; @@ -27,7 +27,7 @@ border-top: 200px;
27 border-bottom: -50px; 27 border-bottom: -50px;
28 border-style: hidden; 28 border-style: hidden;
29 color: white; 29 color: white;
30 -font-size: 28px; 30 +font-size: 40px;
31 } 31 }
32 32
33 QPushButton[style=&quot;type&quot;] { 33 QPushButton[style=&quot;type&quot;] {
@@ -40,7 +40,7 @@ margin-top: 42px; @@ -40,7 +40,7 @@ margin-top: 42px;
40 padding-top: 82px; 40 padding-top: 82px;
41 border-style: hidden; 41 border-style: hidden;
42 color: white; 42 color: white;
43 -font-size: 38px; 43 +font-size: 36px;
44 } 44 }
45 45
46 QPushButton[style=&quot;function&quot;] { 46 QPushButton[style=&quot;function&quot;] {
@@ -52,7 +52,7 @@ background-origin: border; @@ -52,7 +52,7 @@ background-origin: border;
52 border-top: 206px; 52 border-top: 206px;
53 border-style: hidden; 53 border-style: hidden;
54 color: white; 54 color: white;
55 -font-size: 28px; 55 +font-size: 30px;
56 } 56 }
57 57
58 QPushButton:disabled { color: #7B7B7B; }</string> 58 QPushButton:disabled { color: #7B7B7B; }</string>