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