Commit aac0f73eefd11aef1962839108685f5f5f2f883f

Authored by 김태훈
1 parent daf11b6137
Exists in fhd

버전 2.1.4

디자인 피드백 반영
app/gui/oven_control/define.h
... ... @@ -5,7 +5,7 @@
5 5  
6 6 #define MAJOR_VER 2
7 7 #define MINOR_VER 1
8   -#define HOTFIX_VER 3
  8 +#define HOTFIX_VER 4
9 9  
10 10 // 0 for normal
11 11 // 1 for premium
... ...
app/gui/oven_control/mainwindow.ui
... ... @@ -36,7 +36,7 @@ border-top: 248px;
36 36 border-bottom: -60px;
37 37 border-style: hidden;
38 38 color: white;
39   -font-size: 34px;
  39 +font-size: 48px;
40 40 }
41 41  
42 42 QPushButton[style="type"] {
... ... @@ -49,7 +49,7 @@ margin-top: 52px;
49 49 padding-top: 100px;
50 50 border-style: hidden;
51 51 color: white;
52   -font-size: 46px;
  52 +font-size: 44px;
53 53 }
54 54  
55 55 QPushButton[style="function"] {
... ... @@ -61,7 +61,7 @@ background-origin: border;
61 61 padding-top: 247px;
62 62 border-style: hidden;
63 63 color: white;
64   -font-size: 34px;
  64 +font-size: 36px;
65 65 }</string>
66 66 </property>
67 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: 34px;
  37 +font-size: 48px;
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: 34px;
  28 +font-size: 48px;
29 29 }
30 30  
31 31 QPushButton[style=&quot;mode&quot;]:checked {
... ...
app/gui/oven_control/multicookselectionwindow.ui
... ... @@ -27,7 +27,7 @@ border-top: 248px;
27 27 border-bottom: -60px;
28 28 border-style: hidden;
29 29 color: white;
30   -font-size: 34px;
  30 +font-size: 48px;
31 31 }
32 32  
33 33 QPushButton[style=&quot;type&quot;] {
... ... @@ -40,7 +40,7 @@ margin-top: 52px;
40 40 padding-top: 100px;
41 41 border-style: hidden;
42 42 color: white;
43   -font-size: 46px;
  43 +font-size: 44px;
44 44 }
45 45  
46 46 QPushButton[style=&quot;function&quot;] {
... ... @@ -52,7 +52,7 @@ background-origin: border;
52 52 border-top: 247px;
53 53 border-style: hidden;
54 54 color: white;
55   -font-size: 34px;
  55 +font-size: 36px;
56 56 }
57 57  
58 58 QPushButton:disabled { color: #7B7B7B; }</string>
... ...
app/gui/oven_control/programmingselectionwindow.ui
... ... @@ -27,7 +27,7 @@ border-top: 248px;
27 27 border-bottom: -60px;
28 28 border-style: hidden;
29 29 color: white;
30   -font-size: 34px;
  30 +font-size: 48px;
31 31 }
32 32  
33 33 QPushButton[style=&quot;type&quot;] {
... ... @@ -40,7 +40,7 @@ margin-top: 52px;
40 40 padding-top: 100px;
41 41 border-style: hidden;
42 42 color: white;
43   -font-size: 46px;
  43 +font-size: 44px;
44 44 }
45 45  
46 46 QPushButton[style=&quot;function&quot;] {
... ... @@ -52,7 +52,7 @@ background-origin: border;
52 52 border-top: 247px;
53 53 border-style: hidden;
54 54 color: white;
55   -font-size: 34px;
  55 +font-size: 36px;
56 56 }
57 57  
58 58 QPushButton:disabled { color: #7B7B7B; }</string>
... ...