Commit b7ae9e830307124045ba2425baf8f028e9ee75ad

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

엔코더 관련 디자인 변경 시범 적용

Showing 35 changed files with 98 additions and 43 deletions   Show diff stats
app/gui/oven_control/configpanelbutton.ui
@@ -84,8 +84,16 @@ QPushButton:focus { background-image: url(:/images/config/pannel_fav_ov.png); }< @@ -84,8 +84,16 @@ QPushButton:focus { background-image: url(:/images/config/pannel_fav_ov.png); }<
84 <enum>Qt::TabFocus</enum> 84 <enum>Qt::TabFocus</enum>
85 </property> 85 </property>
86 <property name="styleSheet"> 86 <property name="styleSheet">
87 - <string notr="true">QPushButton { background-image: url(:/images/config/088_fava_02.png); }  
88 -QPushButton:checked, QPushButton:focus { background-image: url(:/images/config/088_fava_01.png); }</string> 87 + <string notr="true">QPushButton
  88 +{ background-image: url(:/images/config/088_fava_02.png); }
  89 +QPushButton:pressed,
  90 +QPushButton:focus
  91 +{ background-image: url(:/images/config/088_fava_01.png); }
  92 +QPushButton:checked
  93 +{ background-image: url(:/images/config/088_fava_01.png); }
  94 +QPushButton:checked:pressed,
  95 +QPushButton:checked:focus
  96 +{ background-image: url(:/images/config/088_fava_01.png); }</string>
89 </property> 97 </property>
90 <property name="text"> 98 <property name="text">
91 <string/> 99 <string/>
@@ -93,9 +101,6 @@ QPushButton:checked, QPushButton:focus { background-image: url(:/images/config/0 @@ -93,9 +101,6 @@ QPushButton:checked, QPushButton:focus { background-image: url(:/images/config/0
93 <property name="checkable"> 101 <property name="checkable">
94 <bool>true</bool> 102 <bool>true</bool>
95 </property> 103 </property>
96 - <property name="checked">  
97 - <bool>false</bool>  
98 - </property>  
99 </widget> 104 </widget>
100 </widget> 105 </widget>
101 <resources/> 106 <resources/>
app/gui/oven_control/define.cpp
@@ -253,29 +253,29 @@ QString Define::iconActiveted(Define::CookConfigType type) @@ -253,29 +253,29 @@ QString Define::iconActiveted(Define::CookConfigType type)
253 switch (type) 253 switch (type)
254 { 254 {
255 case Brightness: 255 case Brightness:
256 - return ":/images/slider_icon/gau_icon_01_ov.png"; 256 + return ":/images/slider_icon/gau_icon_01_active.png";
257 case BurnDegree: 257 case BurnDegree:
258 - return ":/images/slider_icon/gau_icon_02_ov.png"; 258 + return ":/images/slider_icon/gau_icon_02_active.png";
259 case SoftBoilDegree: 259 case SoftBoilDegree:
260 - return ":/images/slider_icon/gau_icon_03_ov.png"; 260 + return ":/images/slider_icon/sys_icon_05_active.png";
261 case PieceSize: 261 case PieceSize:
262 - return ":/images/slider_icon/gau_icon_04_ov.png"; 262 + return ":/images/slider_icon/sys_icon_01_active.png";
263 case CrispyDegree: 263 case CrispyDegree:
264 - return ":/images/slider_icon/gau_icon_05_ov.png"; 264 + return ":/images/slider_icon/sys_icon_02_active.png";
265 case MoistDegree: 265 case MoistDegree:
266 - return ":/images/slider_icon/Gau_icon_06_ov.png"; 266 + return ":/images/slider_icon/sys_icon_03_active.png";
267 case Thickness: 267 case Thickness:
268 - return ":/images/slider_icon/Gau_icon_07_ov.png"; 268 + return ":/images/slider_icon/sys_icon_04_active.png";
269 case Humidity: 269 case Humidity:
270 - return ":/images/slider_icon/humidity_ov.png"; 270 + return ":/images/slider_icon/011_icon_01_active.png";
271 case Temperature: 271 case Temperature:
272 - return ":/images/slider_icon/temp_ov.png"; 272 + return ":/images/slider_icon/011_icon_02_active.png";
273 case Time: 273 case Time:
274 - return ":/images/slider_icon/time_ov.png"; 274 + return ":/images/slider_icon/011_icon_03_active.png";
275 case CoreTemperature: 275 case CoreTemperature:
276 - return ":/images/slider_icon/core_temp_ov.png"; 276 + return ":/images/slider_icon/011_icon_04_active.png";
277 case Thermometer: 277 case Thermometer:
278 - return ":/images/slider_icon/thermometer_ov.png"; 278 + return ":/images/slider_icon/cen_mt_icon_03_active.png";
279 case InvalidConfig: 279 case InvalidConfig:
280 case ConfigNotUsed: 280 case ConfigNotUsed:
281 default: 281 default:
app/gui/oven_control/images/config/050_setting_btn_01_active.png

4.56 KB

app/gui/oven_control/images/config/050_setting_btn_01_ov_active.png

4.31 KB

app/gui/oven_control/images/manual_button/012_play_btn_ov.png

13.5 KB

app/gui/oven_control/images/manual_button/012_play_btn_ov_stop_ov.png

13.2 KB

app/gui/oven_control/images/manual_button/013_sys_icon_01.png

4.7 KB

app/gui/oven_control/images/manual_button/013_sys_icon_01_active.png

4.63 KB

app/gui/oven_control/images/manual_button/013_sys_icon_02_active.png

5.51 KB

app/gui/oven_control/images/manual_button/013_sys_icon_02_ov_active.png

5.71 KB

app/gui/oven_control/images/manual_button/013_sys_icon_03_active.png

7.36 KB

app/gui/oven_control/images/manual_button/013_sys_icon_03_ov_active.png

7.59 KB

app/gui/oven_control/images/manual_button/013_sys_icon_04_active.png

7.98 KB

app/gui/oven_control/images/manual_button/013_sys_icon_04_ov_active.png

8.26 KB

app/gui/oven_control/images/manual_button/013_sys_icon_06_01_active.png

7.03 KB

app/gui/oven_control/images/manual_button/013_sys_icon_06_02_active.png

7.05 KB

app/gui/oven_control/images/manual_button/013_sys_icon_06_03_active.png

7.09 KB

app/gui/oven_control/images/manual_button/013_sys_icon_06_04_active.png

7.11 KB

app/gui/oven_control/images/manual_button/013_sys_icon_06_active.png

6.99 KB

app/gui/oven_control/images/slider_icon/011_icon_01_active.png

7.2 KB

app/gui/oven_control/images/slider_icon/011_icon_02_active.png

6.98 KB

app/gui/oven_control/images/slider_icon/011_icon_03_active.png

7.4 KB

app/gui/oven_control/images/slider_icon/011_icon_04_active.png

8.04 KB

app/gui/oven_control/images/slider_icon/cen_mt_icon_03_active.png

8.82 KB

app/gui/oven_control/images/slider_icon/gau_icon_01_active.png

7.41 KB

app/gui/oven_control/images/slider_icon/gau_icon_02_active.png

7.73 KB

app/gui/oven_control/images/slider_icon/mark_01_icon_active.png

7.45 KB

app/gui/oven_control/images/slider_icon/sys_icon_01_active.png

9.39 KB

app/gui/oven_control/images/slider_icon/sys_icon_02_active.png

8.1 KB

app/gui/oven_control/images/slider_icon/sys_icon_03_active.png

8.07 KB

app/gui/oven_control/images/slider_icon/sys_icon_04_active.png

7.71 KB

app/gui/oven_control/images/slider_icon/sys_icon_05_active.png

6.61 KB

app/gui/oven_control/manualcookwindow.cpp
@@ -420,6 +420,10 @@ void ManualCookWindow::updateView() @@ -420,6 +420,10 @@ void ManualCookWindow::updateView()
420 bool humidification = oven->humidification(); 420 bool humidification = oven->humidification();
421 ui->humidificationButton->setChecked(humidification); 421 ui->humidificationButton->setChecked(humidification);
422 422
  423 + QString fanStyleSheet("\
  424 +QPushButton { background-image: url(%1); }\
  425 +QPushButton:focus { background-image: url(%2); }");
  426 +
423 int fan = oven->fan(); 427 int fan = oven->fan();
424 if (fan != lastViewFan) 428 if (fan != lastViewFan)
425 { 429 {
@@ -428,28 +432,34 @@ void ManualCookWindow::updateView() @@ -428,28 +432,34 @@ void ManualCookWindow::updateView()
428 switch (fan) 432 switch (fan)
429 { 433 {
430 case 1: 434 case 1:
431 - ui->fanButton->setStyleSheet(  
432 - "background-image: url(:/images/manual_button/fan_1.png)"); 435 + ui->fanButton->setStyleSheet(fanStyleSheet
  436 + .arg(":/images/manual_button/fan_1.png")
  437 + .arg(":/images/manual_button/013_sys_icon_06_active.png"));
433 break; 438 break;
434 case 2: 439 case 2:
435 - ui->fanButton->setStyleSheet(  
436 - "background-image: url(:/images/manual_button/fan_2.png)"); 440 + ui->fanButton->setStyleSheet(fanStyleSheet
  441 + .arg(":/images/manual_button/fan_2.png")
  442 + .arg(":/images/manual_button/013_sys_icon_06_01_active.png"));
437 break; 443 break;
438 case 3: 444 case 3:
439 - ui->fanButton->setStyleSheet(  
440 - "background-image: url(:/images/manual_button/fan_3.png)"); 445 + ui->fanButton->setStyleSheet(fanStyleSheet
  446 + .arg(":/images/manual_button/fan_3.png")
  447 + .arg(":/images/manual_button/013_sys_icon_06_02_active.png"));
441 break; 448 break;
442 case 4: 449 case 4:
443 - ui->fanButton->setStyleSheet(  
444 - "background-image: url(:/images/manual_button/fan_4.png)"); 450 + ui->fanButton->setStyleSheet(fanStyleSheet
  451 + .arg(":/images/manual_button/fan_4.png")
  452 + .arg(":/images/manual_button/013_sys_icon_06_03_active.png"));
445 break; 453 break;
446 case 5: 454 case 5:
447 - ui->fanButton->setStyleSheet(  
448 - "background-image: url(:/images/manual_button/fan_5.png)"); 455 + ui->fanButton->setStyleSheet(fanStyleSheet
  456 + .arg(":/images/manual_button/fan_5.png")
  457 + .arg(":/images/manual_button/013_sys_icon_06_04_active.png"));
449 break; 458 break;
450 default: 459 default:
451 - ui->fanButton->setStyleSheet(  
452 - "background-image: url(:/images/manual_button/fan_1.png)"); 460 + ui->fanButton->setStyleSheet(fanStyleSheet
  461 + .arg(":/images/manual_button/fan_6.png")
  462 + .arg(":/images/manual_button/013_sys_icon_06_active.png"));
453 break; 463 break;
454 } 464 }
455 } 465 }
app/gui/oven_control/manualcookwindow.ui
@@ -524,7 +524,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h @@ -524,7 +524,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h
524 <property name="styleSheet"> 524 <property name="styleSheet">
525 <string notr="true">QPushButton { image: url(:/images/slider_icon/temp.png); } 525 <string notr="true">QPushButton { image: url(:/images/slider_icon/temp.png); }
526 QPushButton:pressed, 526 QPushButton:pressed,
527 -QPushButton:focus { image: url(:/images/slider_icon/temp_ov.png); } 527 +QPushButton:focus { image: url(:/images/slider_icon/011_icon_02_active.png); }
528 QPushButton:checked { image: url(:/images/slider_icon/temp_ov.png); }</string> 528 QPushButton:checked { image: url(:/images/slider_icon/temp_ov.png); }</string>
529 </property> 529 </property>
530 <property name="checkable"> 530 <property name="checkable">
@@ -736,7 +736,7 @@ QPushButton:checked { image: url(:/images/slider_icon/temp_ov.png); }&lt;/string&gt; @@ -736,7 +736,7 @@ QPushButton:checked { image: url(:/images/slider_icon/temp_ov.png); }&lt;/string&gt;
736 <property name="styleSheet"> 736 <property name="styleSheet">
737 <string notr="true">QPushButton { image: url(:/images/slider_icon/humidity.png); } 737 <string notr="true">QPushButton { image: url(:/images/slider_icon/humidity.png); }
738 QPushButton:pressed, 738 QPushButton:pressed,
739 -QPushButton:focus { image: url(:/images/slider_icon/humidity_ov.png); } 739 +QPushButton:focus { image: url(:/images/slider_icon/011_icon_01_active.png); }
740 QPushButton:checked { image: url(:/images/slider_icon/humidity_ov.png); }</string> 740 QPushButton:checked { image: url(:/images/slider_icon/humidity_ov.png); }</string>
741 </property> 741 </property>
742 <property name="checkable"> 742 <property name="checkable">
@@ -779,7 +779,7 @@ QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/core_te @@ -779,7 +779,7 @@ QPushButton:pressed, QPushButton:focus { image: url(:/images/slider_icon/core_te
779 <property name="styleSheet"> 779 <property name="styleSheet">
780 <string notr="true">QPushButton { image: url(:/images/slider_icon/time.png); } 780 <string notr="true">QPushButton { image: url(:/images/slider_icon/time.png); }
781 QPushButton:pressed, 781 QPushButton:pressed,
782 -QPushButton:focus { image: url(:/images/slider_icon/time_ov.png); } 782 +QPushButton:focus { image: url(:/images/slider_icon/011_icon_03_active.png); }
783 QPushButton:checked { image: url(:/images/slider_icon/time_ov.png); }</string> 783 QPushButton:checked { image: url(:/images/slider_icon/time_ov.png); }</string>
784 </property> 784 </property>
785 <property name="checkable"> 785 <property name="checkable">
@@ -929,12 +929,12 @@ QPushButton:checked { image: url(:/images/slider_icon/time_ov.png); }&lt;/string&gt; @@ -929,12 +929,12 @@ QPushButton:checked { image: url(:/images/slider_icon/time_ov.png); }&lt;/string&gt;
929 { border-image: url(:/images/manual_button/run.png); } 929 { border-image: url(:/images/manual_button/run.png); }
930 QPushButton:pressed, 930 QPushButton:pressed,
931 QPushButton:focus 931 QPushButton:focus
932 -{ border-image: url(:/images/manual_button/run.png); } 932 +{ border-image: url(:/images/manual_button/012_play_btn_ov.png); }
933 QPushButton:checked 933 QPushButton:checked
934 { border-image: url(:/images/manual_button/stop.png); } 934 { border-image: url(:/images/manual_button/stop.png); }
935 QPushButton:checked:pressed, 935 QPushButton:checked:pressed,
936 QPushButton:checked:focus 936 QPushButton:checked:focus
937 -{ border-image: url(:/images/manual_button/stop.png); }</string> 937 +{ border-image: url(:/images/manual_button/012_play_btn_ov_stop_ov.png); }</string>
938 </property> 938 </property>
939 <property name="text"> 939 <property name="text">
940 <string/> 940 <string/>
@@ -1005,7 +1005,8 @@ QPushButton:checked:focus @@ -1005,7 +1005,8 @@ QPushButton:checked:focus
1005 </rect> 1005 </rect>
1006 </property> 1006 </property>
1007 <property name="styleSheet"> 1007 <property name="styleSheet">
1008 - <string notr="true">QPushButton { background-image: url(:/images/manual_button/cooldown.png); } 1008 + <string notr="true">QPushButton
  1009 +{ background-image: url(:/images/manual_button/cooldown.png); }
1009 QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/cooldown_ov.png); }</string> 1010 QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/cooldown_ov.png); }</string>
1010 </property> 1011 </property>
1011 <property name="checkable"> 1012 <property name="checkable">
@@ -1122,12 +1123,12 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b @@ -1122,12 +1123,12 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b
1122 { background-image: url(:/images/manual_button/damper_close.png); } 1123 { background-image: url(:/images/manual_button/damper_close.png); }
1123 QPushButton:pressed, 1124 QPushButton:pressed,
1124 QPushButton:focus 1125 QPushButton:focus
1125 -{ background-image: url(:/images/manual_button/damper_close.png); } 1126 +{ background-image: url(:/images/manual_button/013_sys_icon_02_active.png); }
1126 QPushButton:checked 1127 QPushButton:checked
1127 { background-image: url(:/images/manual_button/damper_open.png); } 1128 { background-image: url(:/images/manual_button/damper_open.png); }
1128 QPushButton:checked:pressed, 1129 QPushButton:checked:pressed,
1129 QPushButton:checked:focus 1130 QPushButton:checked:focus
1130 -{ background-image: url(:/images/manual_button/damper_open.png); }</string> 1131 +{ background-image: url(:/images/manual_button/013_sys_icon_02_ov_active.png); }</string>
1131 </property> 1132 </property>
1132 <property name="checkable"> 1133 <property name="checkable">
1133 <bool>true</bool> 1134 <bool>true</bool>
@@ -1150,12 +1151,12 @@ QPushButton:checked:focus @@ -1150,12 +1151,12 @@ QPushButton:checked:focus
1150 { background-image: url(:/images/manual_button/repeat.png); } 1151 { background-image: url(:/images/manual_button/repeat.png); }
1151 QPushButton:pressed, 1152 QPushButton:pressed,
1152 QPushButton:focus 1153 QPushButton:focus
1153 -{ background-image: url(:/images/manual_button/repeat_ov.png); } 1154 +{ background-image: url(:/images/manual_button/013_sys_icon_04_active.png); }
1154 QPushButton:checked 1155 QPushButton:checked
1155 { background-image: url(:/images/manual_button/repeat_ov.png); } 1156 { background-image: url(:/images/manual_button/repeat_ov.png); }
1156 QPushButton:checked:pressed, 1157 QPushButton:checked:pressed,
1157 QPushButton:checked:focus 1158 QPushButton:checked:focus
1158 -{ background-image: url(:/images/manual_button/repeat_ov.png); }</string> 1159 +{ background-image: url(:/images/manual_button/013_sys_icon_04_ov_active.png); }</string>
1159 </property> 1160 </property>
1160 <property name="checkable"> 1161 <property name="checkable">
1161 <bool>true</bool> 1162 <bool>true</bool>
@@ -1174,8 +1175,12 @@ QPushButton:checked:focus @@ -1174,8 +1175,12 @@ QPushButton:checked:focus
1174 </rect> 1175 </rect>
1175 </property> 1176 </property>
1176 <property name="styleSheet"> 1177 <property name="styleSheet">
1177 - <string notr="true">QPushButton { background-image: url(:/images/manual_button/preheat.png); }  
1178 -QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_button/preheat_ov.png); }</string> 1178 + <string notr="true">QPushButton
  1179 +{ background-image: url(:/images/manual_button/preheat.png); }
  1180 +QPushButton:focus
  1181 +{ background-image: url(:/images/manual_button/013_sys_icon_01_active.png); }
  1182 +QPushButton:focus:pressed
  1183 +{ background-image: url(:/images/manual_button/013_sys_icon_01.png); }</string>
1179 </property> 1184 </property>
1180 <property name="style" stdset="0"> 1185 <property name="style" stdset="0">
1181 <string>tool</string> 1186 <string>tool</string>
@@ -1195,12 +1200,12 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b @@ -1195,12 +1200,12 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/manual_b
1195 { background-image: url(:/images/manual_button/side_nozzle_close.png); } 1200 { background-image: url(:/images/manual_button/side_nozzle_close.png); }
1196 QPushButton:pressed, 1201 QPushButton:pressed,
1197 QPushButton:focus 1202 QPushButton:focus
1198 -{ background-image: url(:/images/manual_button/side_nozzle_close.png); } 1203 +{ background-image: url(:/images/manual_button/013_sys_icon_03_active.png); }
1199 QPushButton:checked 1204 QPushButton:checked
1200 { background-image: url(:/images/manual_button/side_nozzle_open.png); } 1205 { background-image: url(:/images/manual_button/side_nozzle_open.png); }
1201 QPushButton:checked:pressed, 1206 QPushButton:checked:pressed,
1202 QPushButton:checked:focus 1207 QPushButton:checked:focus
1203 -{ background-image: url(:/images/manual_button/side_nozzle_open.png); }</string> 1208 +{ background-image: url(:/images/manual_button/013_sys_icon_03_ov_active.png); }</string>
1204 </property> 1209 </property>
1205 <property name="checkable"> 1210 <property name="checkable">
1206 <bool>true</bool> 1211 <bool>true</bool>
app/gui/oven_control/resources.qrc
@@ -584,5 +584,40 @@ @@ -584,5 +584,40 @@
584 <file>images/auto_popup/prev_ov.png</file> 584 <file>images/auto_popup/prev_ov.png</file>
585 <file>images/symbol/demo.png</file> 585 <file>images/symbol/demo.png</file>
586 <file>images/symbol/half_energy.png</file> 586 <file>images/symbol/half_energy.png</file>
  587 + <file>images/config/050_setting_btn_01_active.png</file>
  588 + <file>images/config/050_setting_btn_01_ov_active.png</file>
  589 + <file>images/slider_icon/011_icon_01_active.png</file>
  590 + <file>images/slider_icon/011_icon_02_active.png</file>
  591 + <file>images/slider_icon/011_icon_03_active.png</file>
  592 + <file>images/slider_icon/011_icon_04_active.png</file>
  593 + <file>images/slider_icon/cen_mt_icon_01.png</file>
  594 + <file>images/slider_icon/cen_mt_icon_02.png</file>
  595 + <file>images/slider_icon/cen_mt_icon_03.png</file>
  596 + <file>images/slider_icon/cen_mt_icon_03_active.png</file>
  597 + <file>images/slider_icon/cen_mt_icon_block.png</file>
  598 + <file>images/slider_icon/gau_icon_01_active.png</file>
  599 + <file>images/slider_icon/gau_icon_02_active.png</file>
  600 + <file>images/slider_icon/gau_icon_bg.png</file>
  601 + <file>images/slider_icon/mark_01_icon_active.png</file>
  602 + <file>images/slider_icon/sys_icon_01_active.png</file>
  603 + <file>images/slider_icon/sys_icon_02_active.png</file>
  604 + <file>images/slider_icon/sys_icon_03_active.png</file>
  605 + <file>images/slider_icon/sys_icon_04_active.png</file>
  606 + <file>images/slider_icon/sys_icon_05_active.png</file>
  607 + <file>images/manual_button/012_play_btn_ov.png</file>
  608 + <file>images/manual_button/012_play_btn_ov_stop_ov.png</file>
  609 + <file>images/manual_button/013_sys_icon_01.png</file>
  610 + <file>images/manual_button/013_sys_icon_01_active.png</file>
  611 + <file>images/manual_button/013_sys_icon_02_active.png</file>
  612 + <file>images/manual_button/013_sys_icon_02_ov_active.png</file>
  613 + <file>images/manual_button/013_sys_icon_03_active.png</file>
  614 + <file>images/manual_button/013_sys_icon_03_ov_active.png</file>
  615 + <file>images/manual_button/013_sys_icon_04_active.png</file>
  616 + <file>images/manual_button/013_sys_icon_04_ov_active.png</file>
  617 + <file>images/manual_button/013_sys_icon_06_01_active.png</file>
  618 + <file>images/manual_button/013_sys_icon_06_02_active.png</file>
  619 + <file>images/manual_button/013_sys_icon_06_03_active.png</file>
  620 + <file>images/manual_button/013_sys_icon_06_04_active.png</file>
  621 + <file>images/manual_button/013_sys_icon_06_active.png</file>
587 </qresource> 622 </qresource>
588 </RCC> 623 </RCC>