Commit 9abbfaeb0275b21e93ba32e3e81cab66652c365c

Authored by 김태훈
1 parent 26fa00c5f2
Exists in master and in 2 other branches fhd, fhd-demo

폰트 크기 조절

app/gui/oven_control/functiontestwindow.ui
@@ -84,7 +84,7 @@ background-image: url(:/images/images/config/001_01_background_time.png); @@ -84,7 +84,7 @@ background-image: url(:/images/images/config/001_01_background_time.png);
84 <property name="font"> 84 <property name="font">
85 <font> 85 <font>
86 <family>NanumGothic</family> 86 <family>NanumGothic</family>
87 - <pointsize>11</pointsize> 87 + <pointsize>10</pointsize>
88 <weight>75</weight> 88 <weight>75</weight>
89 <bold>true</bold> 89 <bold>true</bold>
90 <strikeout>false</strikeout> 90 <strikeout>false</strikeout>
@@ -117,7 +117,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e @@ -117,7 +117,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e
117 <property name="font"> 117 <property name="font">
118 <font> 118 <font>
119 <family>NanumGothic</family> 119 <family>NanumGothic</family>
120 - <pointsize>11</pointsize> 120 + <pointsize>10</pointsize>
121 <weight>75</weight> 121 <weight>75</weight>
122 <bold>true</bold> 122 <bold>true</bold>
123 <strikeout>false</strikeout> 123 <strikeout>false</strikeout>
@@ -150,7 +150,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e @@ -150,7 +150,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e
150 <property name="font"> 150 <property name="font">
151 <font> 151 <font>
152 <family>NanumGothic</family> 152 <family>NanumGothic</family>
153 - <pointsize>11</pointsize> 153 + <pointsize>10</pointsize>
154 <weight>75</weight> 154 <weight>75</weight>
155 <bold>true</bold> 155 <bold>true</bold>
156 <strikeout>false</strikeout> 156 <strikeout>false</strikeout>
@@ -183,7 +183,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e @@ -183,7 +183,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e
183 <property name="font"> 183 <property name="font">
184 <font> 184 <font>
185 <family>NanumGothic</family> 185 <family>NanumGothic</family>
186 - <pointsize>11</pointsize> 186 + <pointsize>10</pointsize>
187 <weight>75</weight> 187 <weight>75</weight>
188 <bold>true</bold> 188 <bold>true</bold>
189 <strikeout>false</strikeout> 189 <strikeout>false</strikeout>
@@ -216,7 +216,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e @@ -216,7 +216,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e
216 <property name="font"> 216 <property name="font">
217 <font> 217 <font>
218 <family>NanumGothic</family> 218 <family>NanumGothic</family>
219 - <pointsize>11</pointsize> 219 + <pointsize>10</pointsize>
220 <weight>75</weight> 220 <weight>75</weight>
221 <bold>true</bold> 221 <bold>true</bold>
222 <strikeout>false</strikeout> 222 <strikeout>false</strikeout>
@@ -249,7 +249,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e @@ -249,7 +249,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e
249 <property name="font"> 249 <property name="font">
250 <font> 250 <font>
251 <family>NanumGothic</family> 251 <family>NanumGothic</family>
252 - <pointsize>11</pointsize> 252 + <pointsize>10</pointsize>
253 <weight>75</weight> 253 <weight>75</weight>
254 <bold>true</bold> 254 <bold>true</bold>
255 <strikeout>false</strikeout> 255 <strikeout>false</strikeout>
app/gui/oven_control/manualcookwindow.ui
@@ -1806,7 +1806,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); @@ -1806,7 +1806,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png);
1806 <property name="font"> 1806 <property name="font">
1807 <font> 1807 <font>
1808 <family>Malgun Gothic</family> 1808 <family>Malgun Gothic</family>
1809 - <pointsize>18</pointsize> 1809 + <pointsize>11</pointsize>
1810 </font> 1810 </font>
1811 </property> 1811 </property>
1812 <property name="text"> 1812 <property name="text">
@@ -2778,7 +2778,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); @@ -2778,7 +2778,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png);
2778 <property name="font"> 2778 <property name="font">
2779 <font> 2779 <font>
2780 <family>Malgun Gothic</family> 2780 <family>Malgun Gothic</family>
2781 - <pointsize>11</pointsize> 2781 + <pointsize>12</pointsize>
2782 </font> 2782 </font>
2783 </property> 2783 </property>
2784 <property name="text"> 2784 <property name="text">
@@ -2856,7 +2856,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); @@ -2856,7 +2856,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png);
2856 <property name="font"> 2856 <property name="font">
2857 <font> 2857 <font>
2858 <family>Malgun Gothic</family> 2858 <family>Malgun Gothic</family>
2859 - <pointsize>11</pointsize> 2859 + <pointsize>12</pointsize>
2860 </font> 2860 </font>
2861 </property> 2861 </property>
2862 <property name="text"> 2862 <property name="text">
@@ -2950,7 +2950,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); @@ -2950,7 +2950,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png);
2950 <property name="font"> 2950 <property name="font">
2951 <font> 2951 <font>
2952 <family>Malgun Gothic</family> 2952 <family>Malgun Gothic</family>
2953 - <pointsize>11</pointsize> 2953 + <pointsize>12</pointsize>
2954 </font> 2954 </font>
2955 </property> 2955 </property>
2956 <property name="text"> 2956 <property name="text">