에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 52fc423d6e5963544c56e4bdd131dcc8859d6d67

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

폰트 사이즈 조절 

- LCD로 출력하니 DPI가 달라 텍스트 크기가 커진다
 - Qt Designer에서 DPI 정보 입력 후 크기 조절함
 - DPI는 56 x 177
Showing 8 changed files with 114 additions and 104 deletions   Show diff stats
app/gui/oven_control/burnertestwindow.ui
  Diff comments   View file @52fc423
... ... @@ -168,7 +168,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/006_sys_i
168 168 <property name="font">
169 169 <font>
170 170 <family>Roboto</family>
171   - <pointsize>16</pointsize>
  171 + <pointsize>10</pointsize>
172 172 <weight>75</weight>
173 173 <bold>true</bold>
174 174 </font>
... ... @@ -204,7 +204,7 @@ QPushButton:pressed {
204 204 <property name="font">
205 205 <font>
206 206 <family>Roboto</family>
207   - <pointsize>16</pointsize>
  207 + <pointsize>10</pointsize>
208 208 <weight>75</weight>
209 209 <bold>true</bold>
210 210 </font>
... ... @@ -240,7 +240,7 @@ QPushButton:pressed {
240 240 <property name="font">
241 241 <font>
242 242 <family>Roboto</family>
243   - <pointsize>16</pointsize>
  243 + <pointsize>10</pointsize>
244 244 <weight>75</weight>
245 245 <bold>true</bold>
246 246 </font>
... ... @@ -685,7 +685,7 @@ QPushButton:pressed {
685 685 <property name="font">
686 686 <font>
687 687 <family>Roboto</family>
688   - <pointsize>18</pointsize>
  688 + <pointsize>11</pointsize>
689 689 <weight>50</weight>
690 690 <bold>false</bold>
691 691 </font>
... ... @@ -1124,7 +1124,7 @@ QPushButton:pressed {
1124 1124 <property name="font">
1125 1125 <font>
1126 1126 <family>Roboto</family>
1127   - <pointsize>18</pointsize>
  1127 + <pointsize>11</pointsize>
1128 1128 <weight>50</weight>
1129 1129 <bold>false</bold>
1130 1130 </font>
... ... @@ -1563,7 +1563,7 @@ QPushButton:pressed {
1563 1563 <property name="font">
1564 1564 <font>
1565 1565 <family>Roboto</family>
1566   - <pointsize>18</pointsize>
  1566 + <pointsize>11</pointsize>
1567 1567 <weight>50</weight>
1568 1568 <bold>false</bold>
1569 1569 </font>
... ... @@ -2002,7 +2002,7 @@ QPushButton:pressed {
2002 2002 <property name="font">
2003 2003 <font>
2004 2004 <family>Roboto</family>
2005   - <pointsize>18</pointsize>
  2005 + <pointsize>11</pointsize>
2006 2006 <weight>50</weight>
2007 2007 <bold>false</bold>
2008 2008 </font>
... ... @@ -2095,7 +2095,7 @@ QPushButton:pressed {
2095 2095 <property name="font">
2096 2096 <font>
2097 2097 <family>Malgun Gothic</family>
2098   - <pointsize>18</pointsize>
  2098 + <pointsize>11</pointsize>
2099 2099 <weight>50</weight>
2100 2100 <bold>false</bold>
2101 2101 </font>
... ...
app/gui/oven_control/componenttestwindow.ui
  Diff comments   View file @52fc423
... ... @@ -101,7 +101,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/006_sys_i
101 101 <property name="font">
102 102 <font>
103 103 <family>Roboto</family>
104   - <pointsize>16</pointsize>
  104 + <pointsize>10</pointsize>
105 105 <weight>75</weight>
106 106 <bold>true</bold>
107 107 </font>
... ... @@ -137,7 +137,7 @@ QPushButton:pressed {
137 137 <property name="font">
138 138 <font>
139 139 <family>Roboto</family>
140   - <pointsize>16</pointsize>
  140 + <pointsize>10</pointsize>
141 141 <weight>75</weight>
142 142 <bold>true</bold>
143 143 </font>
... ... @@ -173,7 +173,7 @@ QPushButton:pressed {
173 173 <property name="font">
174 174 <font>
175 175 <family>Roboto</family>
176   - <pointsize>16</pointsize>
  176 + <pointsize>10</pointsize>
177 177 <weight>75</weight>
178 178 <bold>true</bold>
179 179 </font>
... ... @@ -336,7 +336,7 @@ QPushButton:pressed {
336 336 <property name="font">
337 337 <font>
338 338 <family>Malgun Gothic</family>
339   - <pointsize>18</pointsize>
  339 + <pointsize>11</pointsize>
340 340 </font>
341 341 </property>
342 342 <property name="text">
... ... @@ -392,7 +392,7 @@ QPushButton:pressed {
392 392 <property name="font">
393 393 <font>
394 394 <family>Malgun Gothic</family>
395   - <pointsize>18</pointsize>
  395 + <pointsize>11</pointsize>
396 396 </font>
397 397 </property>
398 398 <property name="text">
... ... @@ -448,7 +448,7 @@ QPushButton:pressed {
448 448 <property name="font">
449 449 <font>
450 450 <family>Malgun Gothic</family>
451   - <pointsize>18</pointsize>
  451 + <pointsize>11</pointsize>
452 452 </font>
453 453 </property>
454 454 <property name="text">
... ... @@ -504,7 +504,7 @@ QPushButton:pressed {
504 504 <property name="font">
505 505 <font>
506 506 <family>Malgun Gothic</family>
507   - <pointsize>18</pointsize>
  507 + <pointsize>11</pointsize>
508 508 </font>
509 509 </property>
510 510 <property name="text">
... ...
app/gui/oven_control/fantestwindow.ui
  Diff comments   View file @52fc423
... ... @@ -101,7 +101,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/006_sys_i
101 101 <property name="font">
102 102 <font>
103 103 <family>Malgun Gothic</family>
104   - <pointsize>16</pointsize>
  104 + <pointsize>10</pointsize>
105 105 <weight>75</weight>
106 106 <bold>true</bold>
107 107 </font>
... ... @@ -137,7 +137,7 @@ QPushButton:pressed {
137 137 <property name="font">
138 138 <font>
139 139 <family>Malgun Gothic</family>
140   - <pointsize>16</pointsize>
  140 + <pointsize>10</pointsize>
141 141 <weight>75</weight>
142 142 <bold>true</bold>
143 143 </font>
... ... @@ -173,7 +173,7 @@ QPushButton:pressed {
173 173 <property name="font">
174 174 <font>
175 175 <family>Malgun Gothic</family>
176   - <pointsize>16</pointsize>
  176 + <pointsize>10</pointsize>
177 177 <weight>75</weight>
178 178 <bold>true</bold>
179 179 </font>
... ... @@ -209,7 +209,7 @@ QPushButton:pressed {
209 209 <property name="font">
210 210 <font>
211 211 <family>Roboto</family>
212   - <pointsize>16</pointsize>
  212 + <pointsize>10</pointsize>
213 213 <weight>75</weight>
214 214 <bold>true</bold>
215 215 </font>
... ... @@ -245,7 +245,7 @@ QPushButton:pressed {
245 245 <property name="font">
246 246 <font>
247 247 <family>Roboto</family>
248   - <pointsize>16</pointsize>
  248 + <pointsize>10</pointsize>
249 249 <weight>75</weight>
250 250 <bold>true</bold>
251 251 </font>
... ... @@ -440,7 +440,7 @@ QPushButton:pressed {
440 440 <property name="font">
441 441 <font>
442 442 <family>Malgun Gothic</family>
443   - <pointsize>18</pointsize>
  443 + <pointsize>11</pointsize>
444 444 </font>
445 445 </property>
446 446 <property name="text">
... ... @@ -459,7 +459,7 @@ QPushButton:pressed {
459 459 <property name="font">
460 460 <font>
461 461 <family>Roboto</family>
462   - <pointsize>20</pointsize>
  462 + <pointsize>12</pointsize>
463 463 </font>
464 464 </property>
465 465 <property name="styleSheet">
... ... @@ -484,7 +484,7 @@ QPushButton:pressed {
484 484 <property name="font">
485 485 <font>
486 486 <family>Roboto</family>
487   - <pointsize>20</pointsize>
  487 + <pointsize>12</pointsize>
488 488 </font>
489 489 </property>
490 490 <property name="styleSheet">
... ... @@ -509,7 +509,7 @@ QPushButton:pressed {
509 509 <property name="font">
510 510 <font>
511 511 <family>Roboto</family>
512   - <pointsize>20</pointsize>
  512 + <pointsize>12</pointsize>
513 513 </font>
514 514 </property>
515 515 <property name="styleSheet">
... ... @@ -534,7 +534,7 @@ QPushButton:pressed {
534 534 <property name="font">
535 535 <font>
536 536 <family>Roboto</family>
537   - <pointsize>20</pointsize>
  537 + <pointsize>12</pointsize>
538 538 </font>
539 539 </property>
540 540 <property name="styleSheet">
... ... @@ -559,7 +559,7 @@ QPushButton:pressed {
559 559 <property name="font">
560 560 <font>
561 561 <family>Roboto</family>
562   - <pointsize>20</pointsize>
  562 + <pointsize>12</pointsize>
563 563 </font>
564 564 </property>
565 565 <property name="styleSheet">
... ... @@ -584,7 +584,7 @@ QPushButton:pressed {
584 584 <property name="font">
585 585 <font>
586 586 <family>Roboto</family>
587   - <pointsize>20</pointsize>
  587 + <pointsize>12</pointsize>
588 588 </font>
589 589 </property>
590 590 <property name="styleSheet">
... ... @@ -609,7 +609,7 @@ QPushButton:pressed {
609 609 <property name="font">
610 610 <font>
611 611 <family>Roboto</family>
612   - <pointsize>20</pointsize>
  612 + <pointsize>12</pointsize>
613 613 </font>
614 614 </property>
615 615 <property name="styleSheet">
... ... @@ -634,7 +634,7 @@ QPushButton:pressed {
634 634 <property name="font">
635 635 <font>
636 636 <family>Roboto</family>
637   - <pointsize>20</pointsize>
  637 + <pointsize>12</pointsize>
638 638 </font>
639 639 </property>
640 640 <property name="styleSheet">
... ... @@ -659,7 +659,7 @@ QPushButton:pressed {
659 659 <property name="font">
660 660 <font>
661 661 <family>Roboto</family>
662   - <pointsize>20</pointsize>
  662 + <pointsize>12</pointsize>
663 663 </font>
664 664 </property>
665 665 <property name="styleSheet">
... ... @@ -684,7 +684,7 @@ QPushButton:pressed {
684 684 <property name="font">
685 685 <font>
686 686 <family>Roboto</family>
687   - <pointsize>20</pointsize>
  687 + <pointsize>12</pointsize>
688 688 </font>
689 689 </property>
690 690 <property name="styleSheet">
... ... @@ -706,7 +706,7 @@ QPushButton:pressed {
706 706 <property name="font">
707 707 <font>
708 708 <family>Roboto</family>
709   - <pointsize>20</pointsize>
  709 + <pointsize>12</pointsize>
710 710 </font>
711 711 </property>
712 712 <property name="styleSheet">
... ... @@ -728,7 +728,7 @@ QPushButton:pressed {
728 728 <property name="font">
729 729 <font>
730 730 <family>Roboto</family>
731   - <pointsize>20</pointsize>
  731 + <pointsize>12</pointsize>
732 732 </font>
733 733 </property>
734 734 <property name="styleSheet">
... ... @@ -750,7 +750,7 @@ QPushButton:pressed {
750 750 <property name="font">
751 751 <font>
752 752 <family>Roboto</family>
753   - <pointsize>20</pointsize>
  753 + <pointsize>12</pointsize>
754 754 </font>
755 755 </property>
756 756 <property name="styleSheet">
... ...
app/gui/oven_control/functiontestwindow.ui
  Diff comments   View file @52fc423
... ... @@ -84,7 +84,7 @@ background-image: url(:/images/images/config/001_01_background_time.png);
84 84 <property name="font">
85 85 <font>
86 86 <family>NanumGothic</family>
87   - <pointsize>18</pointsize>
  87 + <pointsize>11</pointsize>
88 88 <weight>75</weight>
89 89 <bold>true</bold>
90 90 <strikeout>false</strikeout>
... ... @@ -117,7 +117,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e
117 117 <property name="font">
118 118 <font>
119 119 <family>NanumGothic</family>
120   - <pointsize>18</pointsize>
  120 + <pointsize>11</pointsize>
121 121 <weight>75</weight>
122 122 <bold>true</bold>
123 123 <strikeout>false</strikeout>
... ... @@ -150,7 +150,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e
150 150 <property name="font">
151 151 <font>
152 152 <family>NanumGothic</family>
153   - <pointsize>18</pointsize>
  153 + <pointsize>11</pointsize>
154 154 <weight>75</weight>
155 155 <bold>true</bold>
156 156 <strikeout>false</strikeout>
... ... @@ -183,7 +183,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e
183 183 <property name="font">
184 184 <font>
185 185 <family>NanumGothic</family>
186   - <pointsize>18</pointsize>
  186 + <pointsize>11</pointsize>
187 187 <weight>75</weight>
188 188 <bold>true</bold>
189 189 <strikeout>false</strikeout>
... ... @@ -216,7 +216,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e
216 216 <property name="font">
217 217 <font>
218 218 <family>NanumGothic</family>
219   - <pointsize>18</pointsize>
  219 + <pointsize>11</pointsize>
220 220 <weight>75</weight>
221 221 <bold>true</bold>
222 222 <strikeout>false</strikeout>
... ... @@ -249,7 +249,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e
249 249 <property name="font">
250 250 <font>
251 251 <family>NanumGothic</family>
252   - <pointsize>18</pointsize>
  252 + <pointsize>11</pointsize>
253 253 <weight>75</weight>
254 254 <bold>true</bold>
255 255 <strikeout>false</strikeout>
... ... @@ -349,7 +349,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/006_sys_i
349 349 <property name="font">
350 350 <font>
351 351 <family>Malgun Gothic</family>
352   - <pointsize>18</pointsize>
  352 + <pointsize>11</pointsize>
353 353 </font>
354 354 </property>
355 355 <property name="text">
... ... @@ -405,7 +405,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/006_sys_i
405 405 <property name="font">
406 406 <font>
407 407 <family>Malgun Gothic</family>
408   - <pointsize>18</pointsize>
  408 + <pointsize>11</pointsize>
409 409 <weight>50</weight>
410 410 <bold>false</bold>
411 411 </font>
... ... @@ -463,7 +463,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/006_sys_i
463 463 <property name="font">
464 464 <font>
465 465 <family>Roboto</family>
466   - <pointsize>18</pointsize>
  466 + <pointsize>11</pointsize>
467 467 <weight>75</weight>
468 468 <bold>true</bold>
469 469 </font>
... ...
app/gui/oven_control/mainwindow.ui
  Diff comments   View file @52fc423
... ... @@ -775,7 +775,7 @@ QPushButton#primeButton:pressed {
775 775 <property name="font">
776 776 <font>
777 777 <family>Malgun Gothic</family>
778   - <pointsize>18</pointsize>
  778 + <pointsize>12</pointsize>
779 779 </font>
780 780 </property>
781 781 <property name="text">
... ... @@ -837,7 +837,7 @@ QPushButton#primeButton:pressed {
837 837 <property name="font">
838 838 <font>
839 839 <family>Malgun Gothic</family>
840   - <pointsize>18</pointsize>
  840 + <pointsize>12</pointsize>
841 841 </font>
842 842 </property>
843 843 <property name="text">
... ... @@ -899,7 +899,7 @@ QPushButton#primeButton:pressed {
899 899 <property name="font">
900 900 <font>
901 901 <family>Malgun Gothic</family>
902   - <pointsize>18</pointsize>
  902 + <pointsize>12</pointsize>
903 903 </font>
904 904 </property>
905 905 <property name="text">
... ... @@ -961,7 +961,7 @@ QPushButton#primeButton:pressed {
961 961 <property name="font">
962 962 <font>
963 963 <family>Malgun Gothic</family>
964   - <pointsize>15</pointsize>
  964 + <pointsize>10</pointsize>
965 965 </font>
966 966 </property>
967 967 <property name="text">
... ... @@ -1023,7 +1023,7 @@ QPushButton#primeButton:pressed {
1023 1023 <property name="font">
1024 1024 <font>
1025 1025 <family>Malgun Gothic</family>
1026   - <pointsize>15</pointsize>
  1026 + <pointsize>10</pointsize>
1027 1027 </font>
1028 1028 </property>
1029 1029 <property name="text">
... ... @@ -1085,7 +1085,7 @@ QPushButton#primeButton:pressed {
1085 1085 <property name="font">
1086 1086 <font>
1087 1087 <family>Malgun Gothic</family>
1088   - <pointsize>15</pointsize>
  1088 + <pointsize>10</pointsize>
1089 1089 </font>
1090 1090 </property>
1091 1091 <property name="text">
... ... @@ -1147,7 +1147,7 @@ QPushButton#primeButton:pressed {
1147 1147 <property name="font">
1148 1148 <font>
1149 1149 <family>Malgun Gothic</family>
1150   - <pointsize>15</pointsize>
  1150 + <pointsize>10</pointsize>
1151 1151 </font>
1152 1152 </property>
1153 1153 <property name="text">
... ... @@ -1209,7 +1209,7 @@ QPushButton#primeButton:pressed {
1209 1209 <property name="font">
1210 1210 <font>
1211 1211 <family>Malgun Gothic</family>
1212   - <pointsize>15</pointsize>
  1212 + <pointsize>10</pointsize>
1213 1213 </font>
1214 1214 </property>
1215 1215 <property name="text">
... ... @@ -1271,7 +1271,7 @@ QPushButton#primeButton:pressed {
1271 1271 <property name="font">
1272 1272 <font>
1273 1273 <family>Malgun Gothic</family>
1274   - <pointsize>15</pointsize>
  1274 + <pointsize>10</pointsize>
1275 1275 </font>
1276 1276 </property>
1277 1277 <property name="text">
... ... @@ -1333,7 +1333,7 @@ QPushButton#primeButton:pressed {
1333 1333 <property name="font">
1334 1334 <font>
1335 1335 <family>Malgun Gothic</family>
1336   - <pointsize>15</pointsize>
  1336 + <pointsize>10</pointsize>
1337 1337 </font>
1338 1338 </property>
1339 1339 <property name="text">
... ... @@ -1395,7 +1395,7 @@ QPushButton#primeButton:pressed {
1395 1395 <property name="font">
1396 1396 <font>
1397 1397 <family>Malgun Gothic</family>
1398   - <pointsize>15</pointsize>
  1398 + <pointsize>10</pointsize>
1399 1399 </font>
1400 1400 </property>
1401 1401 <property name="text">
... ... @@ -1457,7 +1457,7 @@ QPushButton#primeButton:pressed {
1457 1457 <property name="font">
1458 1458 <font>
1459 1459 <family>Malgun Gothic</family>
1460   - <pointsize>15</pointsize>
  1460 + <pointsize>10</pointsize>
1461 1461 </font>
1462 1462 </property>
1463 1463 <property name="text">
... ... @@ -1519,7 +1519,7 @@ QPushButton#primeButton:pressed {
1519 1519 <property name="font">
1520 1520 <font>
1521 1521 <family>Malgun Gothic</family>
1522   - <pointsize>15</pointsize>
  1522 + <pointsize>10</pointsize>
1523 1523 </font>
1524 1524 </property>
1525 1525 <property name="text">
... ... @@ -1581,7 +1581,7 @@ QPushButton#primeButton:pressed {
1581 1581 <property name="font">
1582 1582 <font>
1583 1583 <family>Malgun Gothic</family>
1584   - <pointsize>15</pointsize>
  1584 + <pointsize>10</pointsize>
1585 1585 </font>
1586 1586 </property>
1587 1587 <property name="text">
... ...
app/gui/oven_control/manualcookwindow.ui
  Diff comments   View file @52fc423
... ... @@ -1080,7 +1080,7 @@ border-image: url(:/images/images/manual/013_sys_icon_06.png);
1080 1080 <property name="font">
1081 1081 <font>
1082 1082 <family>Malgun Gothic</family>
1083   - <pointsize>15</pointsize>
  1083 + <pointsize>9</pointsize>
1084 1084 </font>
1085 1085 </property>
1086 1086 <property name="text">
... ... @@ -1142,7 +1142,7 @@ border-image: url(:/images/images/manual/013_sys_icon_06.png);
1142 1142 <property name="font">
1143 1143 <font>
1144 1144 <family>Malgun Gothic</family>
1145   - <pointsize>15</pointsize>
  1145 + <pointsize>9</pointsize>
1146 1146 </font>
1147 1147 </property>
1148 1148 <property name="text">
... ... @@ -1204,7 +1204,7 @@ border-image: url(:/images/images/manual/013_sys_icon_06.png);
1204 1204 <property name="font">
1205 1205 <font>
1206 1206 <family>Malgun Gothic</family>
1207   - <pointsize>15</pointsize>
  1207 + <pointsize>9</pointsize>
1208 1208 </font>
1209 1209 </property>
1210 1210 <property name="text">
... ... @@ -1266,7 +1266,7 @@ border-image: url(:/images/images/manual/013_sys_icon_06.png);
1266 1266 <property name="font">
1267 1267 <font>
1268 1268 <family>Malgun Gothic</family>
1269   - <pointsize>15</pointsize>
  1269 + <pointsize>9</pointsize>
1270 1270 </font>
1271 1271 </property>
1272 1272 <property name="text">
... ... @@ -1328,7 +1328,7 @@ border-image: url(:/images/images/manual/013_sys_icon_06.png);
1328 1328 <property name="font">
1329 1329 <font>
1330 1330 <family>Malgun Gothic</family>
1331   - <pointsize>18</pointsize>
  1331 + <pointsize>11</pointsize>
1332 1332 </font>
1333 1333 </property>
1334 1334 <property name="text">
... ... @@ -1390,7 +1390,7 @@ border-image: url(:/images/images/manual/013_sys_icon_06.png);
1390 1390 <property name="font">
1391 1391 <font>
1392 1392 <family>Malgun Gothic</family>
1393   - <pointsize>18</pointsize>
  1393 + <pointsize>11</pointsize>
1394 1394 </font>
1395 1395 </property>
1396 1396 <property name="text">
... ... @@ -1452,7 +1452,7 @@ border-image: url(:/images/images/manual/013_sys_icon_06.png);
1452 1452 <property name="font">
1453 1453 <font>
1454 1454 <family>Malgun Gothic</family>
1455   - <pointsize>18</pointsize>
  1455 + <pointsize>11</pointsize>
1456 1456 </font>
1457 1457 </property>
1458 1458 <property name="text">
... ... @@ -1514,7 +1514,7 @@ border-image: url(:/images/images/manual/013_sys_icon_06.png);
1514 1514 <property name="font">
1515 1515 <font>
1516 1516 <family>Malgun Gothic</family>
1517   - <pointsize>18</pointsize>
  1517 + <pointsize>11</pointsize>
1518 1518 </font>
1519 1519 </property>
1520 1520 <property name="text">
... ... @@ -1868,7 +1868,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png);
1868 1868 <property name="font">
1869 1869 <font>
1870 1870 <family>Malgun Gothic</family>
1871   - <pointsize>15</pointsize>
  1871 + <pointsize>9</pointsize>
1872 1872 </font>
1873 1873 </property>
1874 1874 <property name="text">
... ... @@ -1930,7 +1930,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png);
1930 1930 <property name="font">
1931 1931 <font>
1932 1932 <family>Malgun Gothic</family>
1933   - <pointsize>15</pointsize>
  1933 + <pointsize>9</pointsize>
1934 1934 </font>
1935 1935 </property>
1936 1936 <property name="text">
... ... @@ -1992,7 +1992,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png);
1992 1992 <property name="font">
1993 1993 <font>
1994 1994 <family>Malgun Gothic</family>
1995   - <pointsize>15</pointsize>
  1995 + <pointsize>9</pointsize>
1996 1996 </font>
1997 1997 </property>
1998 1998 <property name="text">
... ... @@ -2054,7 +2054,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png);
2054 2054 <property name="font">
2055 2055 <font>
2056 2056 <family>Malgun Gothic</family>
2057   - <pointsize>15</pointsize>
  2057 + <pointsize>9</pointsize>
2058 2058 </font>
2059 2059 </property>
2060 2060 <property name="text">
... ... @@ -2116,7 +2116,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png);
2116 2116 <property name="font">
2117 2117 <font>
2118 2118 <family>Roboto</family>
2119   - <pointsize>18</pointsize>
  2119 + <pointsize>11</pointsize>
2120 2120 <weight>50</weight>
2121 2121 <bold>false</bold>
2122 2122 </font>
... ... @@ -2180,7 +2180,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png);
2180 2180 <property name="font">
2181 2181 <font>
2182 2182 <family>Roboto</family>
2183   - <pointsize>18</pointsize>
  2183 + <pointsize>11</pointsize>
2184 2184 <weight>50</weight>
2185 2185 <bold>false</bold>
2186 2186 </font>
... ... @@ -2244,7 +2244,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png);
2244 2244 <property name="font">
2245 2245 <font>
2246 2246 <family>Roboto</family>
2247   - <pointsize>18</pointsize>
  2247 + <pointsize>11</pointsize>
2248 2248 <weight>50</weight>
2249 2249 <bold>false</bold>
2250 2250 </font>
... ... @@ -2308,7 +2308,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png);
2308 2308 <property name="font">
2309 2309 <font>
2310 2310 <family>Roboto</family>
2311   - <pointsize>18</pointsize>
  2311 + <pointsize>11</pointsize>
2312 2312 <weight>50</weight>
2313 2313 <bold>false</bold>
2314 2314 </font>
... ... @@ -2372,7 +2372,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png);
2372 2372 <property name="font">
2373 2373 <font>
2374 2374 <family>Malgun Gothic</family>
2375   - <pointsize>25</pointsize>
  2375 + <pointsize>14</pointsize>
2376 2376 <weight>75</weight>
2377 2377 <bold>true</bold>
2378 2378 </font>
... ... @@ -2436,7 +2436,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png);
2436 2436 <property name="font">
2437 2437 <font>
2438 2438 <family>Malgun Gothic</family>
2439   - <pointsize>25</pointsize>
  2439 + <pointsize>14</pointsize>
2440 2440 <weight>75</weight>
2441 2441 <bold>true</bold>
2442 2442 </font>
... ... @@ -2500,7 +2500,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png);
2500 2500 <property name="font">
2501 2501 <font>
2502 2502 <family>Malgun Gothic</family>
2503   - <pointsize>25</pointsize>
  2503 + <pointsize>14</pointsize>
2504 2504 <weight>75</weight>
2505 2505 <bold>true</bold>
2506 2506 </font>
... ... @@ -2564,7 +2564,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png);
2564 2564 <property name="font">
2565 2565 <font>
2566 2566 <family>Malgun Gothic</family>
2567   - <pointsize>25</pointsize>
  2567 + <pointsize>14</pointsize>
2568 2568 <weight>75</weight>
2569 2569 <bold>true</bold>
2570 2570 </font>
... ... @@ -2628,7 +2628,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png);
2628 2628 <property name="font">
2629 2629 <font>
2630 2630 <family>Malgun Gothic</family>
2631   - <pointsize>15</pointsize>
  2631 + <pointsize>9</pointsize>
2632 2632 </font>
2633 2633 </property>
2634 2634 <property name="text">
... ... @@ -2690,7 +2690,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png);
2690 2690 <property name="font">
2691 2691 <font>
2692 2692 <family>Malgun Gothic</family>
2693   - <pointsize>15</pointsize>
  2693 + <pointsize>9</pointsize>
2694 2694 </font>
2695 2695 </property>
2696 2696 <property name="text">
... ... @@ -2700,6 +2700,10 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png);
2700 2700 <set>Qt::AlignBottom|Qt::AlignHCenter</set>
2701 2701 </property>
2702 2702 </widget>
  2703 + <zorder>curHumidityLabel</zorder>
  2704 + <zorder>targetHumidityLabel</zorder>
  2705 + <zorder>curTempLabel</zorder>
  2706 + <zorder>curInterTempLabel</zorder>
2703 2707 <zorder>innerInterTempBlock</zorder>
2704 2708 <zorder>innerInterTempSlider</zorder>
2705 2709 <zorder>innerInterTempButton</zorder>
... ... @@ -2718,10 +2722,6 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png);
2718 2722 <zorder>steamLabel_11</zorder>
2719 2723 <zorder>steamLabel_12</zorder>
2720 2724 <zorder>steamLabel_13</zorder>
2721   - <zorder>curHumidityLabel</zorder>
2722   - <zorder>targetHumidityLabel</zorder>
2723   - <zorder>curTempLabel</zorder>
2724   - <zorder>curInterTempLabel</zorder>
2725 2725 <zorder>steamLabel_14</zorder>
2726 2726 <zorder>steamLabel_15</zorder>
2727 2727 </widget>
... ... @@ -2778,7 +2778,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png);
2778 2778 <property name="font">
2779 2779 <font>
2780 2780 <family>Malgun Gothic</family>
2781   - <pointsize>18</pointsize>
  2781 + <pointsize>11</pointsize>
2782 2782 </font>
2783 2783 </property>
2784 2784 <property name="text">
... ... @@ -2856,7 +2856,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png);
2856 2856 <property name="font">
2857 2857 <font>
2858 2858 <family>Malgun Gothic</family>
2859   - <pointsize>18</pointsize>
  2859 + <pointsize>11</pointsize>
2860 2860 </font>
2861 2861 </property>
2862 2862 <property name="text">
... ... @@ -2950,7 +2950,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png);
2950 2950 <property name="font">
2951 2951 <font>
2952 2952 <family>Malgun Gothic</family>
2953   - <pointsize>18</pointsize>
  2953 + <pointsize>11</pointsize>
2954 2954 </font>
2955 2955 </property>
2956 2956 <property name="text">
... ...
app/gui/oven_control/valvetestwindow.ui
  Diff comments   View file @52fc423
... ... @@ -101,7 +101,7 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/006_sys_i
101 101 <property name="font">
102 102 <font>
103 103 <family>Roboto</family>
104   - <pointsize>16</pointsize>
  104 + <pointsize>10</pointsize>
105 105 <weight>75</weight>
106 106 <bold>true</bold>
107 107 </font>
... ... @@ -137,7 +137,7 @@ QPushButton:pressed {
137 137 <property name="font">
138 138 <font>
139 139 <family>Roboto</family>
140   - <pointsize>16</pointsize>
  140 + <pointsize>10</pointsize>
141 141 <weight>75</weight>
142 142 <bold>true</bold>
143 143 </font>
... ... @@ -173,7 +173,7 @@ QPushButton:pressed {
173 173 <property name="font">
174 174 <font>
175 175 <family>Roboto</family>
176   - <pointsize>16</pointsize>
  176 + <pointsize>10</pointsize>
177 177 <weight>75</weight>
178 178 <bold>true</bold>
179 179 </font>
... ... @@ -209,7 +209,7 @@ QPushButton:pressed {
209 209 <property name="font">
210 210 <font>
211 211 <family>Roboto</family>
212   - <pointsize>16</pointsize>
  212 + <pointsize>10</pointsize>
213 213 <weight>75</weight>
214 214 <bold>true</bold>
215 215 </font>
... ... @@ -245,7 +245,7 @@ QPushButton:pressed {
245 245 <property name="font">
246 246 <font>
247 247 <family>Roboto</family>
248   - <pointsize>16</pointsize>
  248 + <pointsize>10</pointsize>
249 249 <weight>75</weight>
250 250 <bold>true</bold>
251 251 </font>
... ... @@ -690,7 +690,7 @@ QPushButton:pressed {
690 690 <property name="font">
691 691 <font>
692 692 <family>Malgun Gothic</family>
693   - <pointsize>18</pointsize>
  693 + <pointsize>11</pointsize>
694 694 <weight>75</weight>
695 695 <bold>true</bold>
696 696 </font>
... ... @@ -755,7 +755,7 @@ QPushButton:pressed {
755 755 <rect>
756 756 <x>480</x>
757 757 <y>585</y>
758   - <width>184</width>
  758 + <width>211</width>
759 759 <height>70</height>
760 760 </rect>
761 761 </property>
... ... @@ -799,7 +799,7 @@ QPushButton:pressed {
799 799 <property name="font">
800 800 <font>
801 801 <family>Malgun Gothic</family>
802   - <pointsize>18</pointsize>
  802 + <pointsize>11</pointsize>
803 803 </font>
804 804 </property>
805 805 <property name="text">
... ... @@ -856,7 +856,7 @@ QPushButton:pressed {
856 856 <property name="font">
857 857 <font>
858 858 <family>Malgun Gothic</family>
859   - <pointsize>18</pointsize>
  859 + <pointsize>11</pointsize>
860 860 </font>
861 861 </property>
862 862 <property name="text">
... ... @@ -912,7 +912,7 @@ QPushButton:pressed {
912 912 <property name="font">
913 913 <font>
914 914 <family>Malgun Gothic</family>
915   - <pointsize>18</pointsize>
  915 + <pointsize>11</pointsize>
916 916 </font>
917 917 </property>
918 918 <property name="text">
... ... @@ -968,7 +968,7 @@ QPushButton:pressed {
968 968 <property name="font">
969 969 <font>
970 970 <family>Malgun Gothic</family>
971   - <pointsize>18</pointsize>
  971 + <pointsize>11</pointsize>
972 972 </font>
973 973 </property>
974 974 <property name="text">
... ... @@ -1025,7 +1025,7 @@ QPushButton:pressed {
1025 1025 <property name="font">
1026 1026 <font>
1027 1027 <family>Malgun Gothic</family>
1028   - <pointsize>18</pointsize>
  1028 + <pointsize>11</pointsize>
1029 1029 </font>
1030 1030 </property>
1031 1031 <property name="text">
... ... @@ -1177,7 +1177,7 @@ QPushButton:pressed {
1177 1177 <property name="font">
1178 1178 <font>
1179 1179 <family>Malgun Gothic</family>
1180   - <pointsize>18</pointsize>
  1180 + <pointsize>11</pointsize>
1181 1181 </font>
1182 1182 </property>
1183 1183 <property name="text">
... ...
app/gui/oven_control/washtestwindow.ui
  Diff comments   View file @52fc423
... ... @@ -100,6 +100,8 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/006_sys_i
100 100 </property>
101 101 <property name="font">
102 102 <font>
  103 + <family>Roboto</family>
  104 + <pointsize>10</pointsize>
103 105 <weight>75</weight>
104 106 <bold>true</bold>
105 107 </font>
... ... @@ -134,6 +136,8 @@ QPushButton:pressed {
134 136 </property>
135 137 <property name="font">
136 138 <font>
  139 + <family>Roboto</family>
  140 + <pointsize>10</pointsize>
137 141 <weight>75</weight>
138 142 <bold>true</bold>
139 143 </font>
... ... @@ -168,6 +172,8 @@ QPushButton:pressed {
168 172 </property>
169 173 <property name="font">
170 174 <font>
  175 + <family>Roboto</family>
  176 + <pointsize>10</pointsize>
171 177 <weight>75</weight>
172 178 <bold>true</bold>
173 179 </font>
... ... @@ -202,6 +208,8 @@ QPushButton:pressed {
202 208 </property>
203 209 <property name="font">
204 210 <font>
  211 + <family>Roboto</family>
  212 + <pointsize>10</pointsize>
205 213 <weight>75</weight>
206 214 <bold>true</bold>
207 215 </font>
... ... @@ -236,6 +244,8 @@ QPushButton:pressed {
236 244 </property>
237 245 <property name="font">
238 246 <font>
  247 + <family>Roboto</family>
  248 + <pointsize>10</pointsize>
239 249 <weight>75</weight>
240 250 <bold>true</bold>
241 251 </font>
... ... @@ -430,7 +440,7 @@ QPushButton:pressed {
430 440 <property name="font">
431 441 <font>
432 442 <family>NanumBarunGothic</family>
433   - <pointsize>18</pointsize>
  443 + <pointsize>11</pointsize>
434 444 </font>
435 445 </property>
436 446 <property name="text">
... ... @@ -486,7 +496,7 @@ QPushButton:pressed {
486 496 <property name="font">
487 497 <font>
488 498 <family>NanumBarunGothic</family>
489   - <pointsize>18</pointsize>
  499 + <pointsize>11</pointsize>
490 500 </font>
491 501 </property>
492 502 <property name="text">
... ... @@ -542,7 +552,7 @@ QPushButton:pressed {
542 552 <property name="font">
543 553 <font>
544 554 <family>NanumBarunGothic</family>
545   - <pointsize>18</pointsize>
  555 + <pointsize>11</pointsize>
546 556 </font>
547 557 </property>
548 558 <property name="text">
... ... @@ -598,7 +608,7 @@ QPushButton:pressed {
598 608 <property name="font">
599 609 <font>
600 610 <family>NanumBarunGothic</family>
601   - <pointsize>18</pointsize>
  611 + <pointsize>11</pointsize>
602 612 </font>
603 613 </property>
604 614 <property name="text">
... ... @@ -654,7 +664,7 @@ QPushButton:pressed {
654 664 <property name="font">
655 665 <font>
656 666 <family>NanumBarunGothic</family>
657   - <pointsize>18</pointsize>
  667 + <pointsize>11</pointsize>
658 668 </font>
659 669 </property>
660 670 <property name="text">
... ...