Commit dc9ba3d4b5318c07cdd574cc78529d0abe7ac345
1 parent
a77f8c19e9
Exists in
fhd
요리 종류 이름 및 아이콘 변경
Showing
27 changed files
with
18 additions
and
18 deletions
Show diff stats
app/gui/oven_control/images/cook_type/additional.png
app/gui/oven_control/images/cook_type/additional_hide.png
app/gui/oven_control/images/cook_type/additional_ov.png
app/gui/oven_control/images/cook_type/bread.png
app/gui/oven_control/images/cook_type/bread_hide.png
app/gui/oven_control/images/cook_type/bread_ov.png
app/gui/oven_control/images/cook_type/desert.png
app/gui/oven_control/images/cook_type/desert_hide.png
app/gui/oven_control/images/cook_type/desert_ov.png
app/gui/oven_control/images/cook_type/etc.png
app/gui/oven_control/images/cook_type/etc_hide.png
app/gui/oven_control/images/cook_type/etc_ov.png
app/gui/oven_control/images/cook_type/fish.png
app/gui/oven_control/images/cook_type/fish_hide.png
app/gui/oven_control/images/cook_type/fish_ov.png
app/gui/oven_control/images/cook_type/meat.png
app/gui/oven_control/images/cook_type/meat_hide.png
app/gui/oven_control/images/cook_type/meat_ov.png
app/gui/oven_control/images/cook_type/poultry.png
app/gui/oven_control/images/cook_type/poultry_hide.png
app/gui/oven_control/images/cook_type/poultry_ov.png
app/gui/oven_control/images/cook_type/vegetable.png
app/gui/oven_control/images/cook_type/vegetable_hide.png
app/gui/oven_control/images/cook_type/vegetable_ov.png
app/gui/oven_control/mainwindow.ui
| @@ -389,7 +389,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod | @@ -389,7 +389,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod | ||
| 389 | QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/meat_ov.png); }</string> | 389 | QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/meat_ov.png); }</string> |
| 390 | </property> | 390 | </property> |
| 391 | <property name="text"> | 391 | <property name="text"> |
| 392 | - <string>육류</string> | 392 | + <string>볶음류</string> |
| 393 | </property> | 393 | </property> |
| 394 | <property name="style" stdset="0"> | 394 | <property name="style" stdset="0"> |
| 395 | <string>type</string> | 395 | <string>type</string> |
| @@ -415,7 +415,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -415,7 +415,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
| 415 | QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/desert_ov.png); }</string> | 415 | QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/desert_ov.png); }</string> |
| 416 | </property> | 416 | </property> |
| 417 | <property name="text"> | 417 | <property name="text"> |
| 418 | - <string>디저트류</string> | 418 | + <string>조림류</string> |
| 419 | </property> | 419 | </property> |
| 420 | <property name="style" stdset="0"> | 420 | <property name="style" stdset="0"> |
| 421 | <string>type</string> | 421 | <string>type</string> |
| @@ -467,7 +467,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -467,7 +467,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
| 467 | QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/vegetable_ov.png); }</string> | 467 | QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/vegetable_ov.png); }</string> |
| 468 | </property> | 468 | </property> |
| 469 | <property name="text"> | 469 | <property name="text"> |
| 470 | - <string>채소및곡류</string> | 470 | + <string>초벌</string> |
| 471 | </property> | 471 | </property> |
| 472 | <property name="style" stdset="0"> | 472 | <property name="style" stdset="0"> |
| 473 | <string>type</string> | 473 | <string>type</string> |
| @@ -493,7 +493,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -493,7 +493,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
| 493 | QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/poultry_ov.png); }</string> | 493 | QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/poultry_ov.png); }</string> |
| 494 | </property> | 494 | </property> |
| 495 | <property name="text"> | 495 | <property name="text"> |
| 496 | - <string>가금류</string> | 496 | + <string>구이류</string> |
| 497 | </property> | 497 | </property> |
| 498 | <property name="style" stdset="0"> | 498 | <property name="style" stdset="0"> |
| 499 | <string>type</string> | 499 | <string>type</string> |
| @@ -519,7 +519,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -519,7 +519,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
| 519 | QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/fish_ov.png); }</string> | 519 | QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/fish_ov.png); }</string> |
| 520 | </property> | 520 | </property> |
| 521 | <property name="text"> | 521 | <property name="text"> |
| 522 | - <string>생선류</string> | 522 | + <string>스팀류</string> |
| 523 | </property> | 523 | </property> |
| 524 | <property name="style" stdset="0"> | 524 | <property name="style" stdset="0"> |
| 525 | <string>type</string> | 525 | <string>type</string> |
| @@ -545,7 +545,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -545,7 +545,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
| 545 | QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/bread_ov.png); }</string> | 545 | QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/bread_ov.png); }</string> |
| 546 | </property> | 546 | </property> |
| 547 | <property name="text"> | 547 | <property name="text"> |
| 548 | - <string>제과제빵류</string> | 548 | + <string>보온</string> |
| 549 | </property> | 549 | </property> |
| 550 | <property name="style" stdset="0"> | 550 | <property name="style" stdset="0"> |
| 551 | <string>type</string> | 551 | <string>type</string> |
app/gui/oven_control/multicookselectionwindow.ui
| @@ -118,7 +118,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -118,7 +118,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
| 118 | QPushButton:disabled { background-image: url(:/images/cook_type/vegetable_hide.png); }</string> | 118 | QPushButton:disabled { background-image: url(:/images/cook_type/vegetable_hide.png); }</string> |
| 119 | </property> | 119 | </property> |
| 120 | <property name="text"> | 120 | <property name="text"> |
| 121 | - <string>채소및곡류</string> | 121 | + <string>초벌</string> |
| 122 | </property> | 122 | </property> |
| 123 | <property name="style" stdset="0"> | 123 | <property name="style" stdset="0"> |
| 124 | <string notr="true">type</string> | 124 | <string notr="true">type</string> |
| @@ -161,7 +161,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -161,7 +161,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
| 161 | QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png); }</string> | 161 | QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png); }</string> |
| 162 | </property> | 162 | </property> |
| 163 | <property name="text"> | 163 | <property name="text"> |
| 164 | - <string>제과제빵류</string> | 164 | + <string>보온</string> |
| 165 | </property> | 165 | </property> |
| 166 | <property name="style" stdset="0"> | 166 | <property name="style" stdset="0"> |
| 167 | <string notr="true">type</string> | 167 | <string notr="true">type</string> |
| @@ -204,7 +204,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -204,7 +204,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
| 204 | QPushButton:disabled { background-image: url(:/images/cook_type/meat_hide.png); }</string> | 204 | QPushButton:disabled { background-image: url(:/images/cook_type/meat_hide.png); }</string> |
| 205 | </property> | 205 | </property> |
| 206 | <property name="text"> | 206 | <property name="text"> |
| 207 | - <string>육류</string> | 207 | + <string>볶음류</string> |
| 208 | </property> | 208 | </property> |
| 209 | <property name="style" stdset="0"> | 209 | <property name="style" stdset="0"> |
| 210 | <string notr="true">type</string> | 210 | <string notr="true">type</string> |
| @@ -247,7 +247,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -247,7 +247,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
| 247 | QPushButton:disabled { background-image: url(:/images/cook_type/desert_hide.png); }</string> | 247 | QPushButton:disabled { background-image: url(:/images/cook_type/desert_hide.png); }</string> |
| 248 | </property> | 248 | </property> |
| 249 | <property name="text"> | 249 | <property name="text"> |
| 250 | - <string>디저트류</string> | 250 | + <string>조림류</string> |
| 251 | </property> | 251 | </property> |
| 252 | <property name="style" stdset="0"> | 252 | <property name="style" stdset="0"> |
| 253 | <string notr="true">type</string> | 253 | <string notr="true">type</string> |
| @@ -277,7 +277,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -277,7 +277,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
| 277 | QPushButton:disabled { background-image: url(:/images/cook_type/poultry_hide.png); }</string> | 277 | QPushButton:disabled { background-image: url(:/images/cook_type/poultry_hide.png); }</string> |
| 278 | </property> | 278 | </property> |
| 279 | <property name="text"> | 279 | <property name="text"> |
| 280 | - <string>가금류</string> | 280 | + <string>구이류</string> |
| 281 | </property> | 281 | </property> |
| 282 | <property name="style" stdset="0"> | 282 | <property name="style" stdset="0"> |
| 283 | <string notr="true">type</string> | 283 | <string notr="true">type</string> |
| @@ -644,7 +644,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -644,7 +644,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
| 644 | QPushButton:disabled { background-image: url(:/images/cook_type/fish_hide.png); }</string> | 644 | QPushButton:disabled { background-image: url(:/images/cook_type/fish_hide.png); }</string> |
| 645 | </property> | 645 | </property> |
| 646 | <property name="text"> | 646 | <property name="text"> |
| 647 | - <string>생선류</string> | 647 | + <string>스팀류</string> |
| 648 | </property> | 648 | </property> |
| 649 | <property name="style" stdset="0"> | 649 | <property name="style" stdset="0"> |
| 650 | <string notr="true">type</string> | 650 | <string notr="true">type</string> |
app/gui/oven_control/programmingselectionwindow.ui
| @@ -81,7 +81,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -81,7 +81,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
| 81 | QPushButton:disabled { background-image: url(:/images/cook_type/desert_hide.png); }</string> | 81 | QPushButton:disabled { background-image: url(:/images/cook_type/desert_hide.png); }</string> |
| 82 | </property> | 82 | </property> |
| 83 | <property name="text"> | 83 | <property name="text"> |
| 84 | - <string>디저트류</string> | 84 | + <string>조림류</string> |
| 85 | </property> | 85 | </property> |
| 86 | <property name="style" stdset="0"> | 86 | <property name="style" stdset="0"> |
| 87 | <string>type</string> | 87 | <string>type</string> |
| @@ -111,7 +111,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -111,7 +111,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
| 111 | QPushButton:disabled { background-image: url(:/images/cook_type/fish_hide.png); }</string> | 111 | QPushButton:disabled { background-image: url(:/images/cook_type/fish_hide.png); }</string> |
| 112 | </property> | 112 | </property> |
| 113 | <property name="text"> | 113 | <property name="text"> |
| 114 | - <string>생선류</string> | 114 | + <string>스팀류</string> |
| 115 | </property> | 115 | </property> |
| 116 | <property name="style" stdset="0"> | 116 | <property name="style" stdset="0"> |
| 117 | <string>type</string> | 117 | <string>type</string> |
| @@ -200,7 +200,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -200,7 +200,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
| 200 | QPushButton:disabled { background-image: url(:/images/cook_type/vegetable_hide.png); }</string> | 200 | QPushButton:disabled { background-image: url(:/images/cook_type/vegetable_hide.png); }</string> |
| 201 | </property> | 201 | </property> |
| 202 | <property name="text"> | 202 | <property name="text"> |
| 203 | - <string>채소및곡류</string> | 203 | + <string>초벌</string> |
| 204 | </property> | 204 | </property> |
| 205 | <property name="style" stdset="0"> | 205 | <property name="style" stdset="0"> |
| 206 | <string>type</string> | 206 | <string>type</string> |
| @@ -230,7 +230,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -230,7 +230,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
| 230 | QPushButton:disabled { background-image: url(:/images/cook_type/meat_hide.png); }</string> | 230 | QPushButton:disabled { background-image: url(:/images/cook_type/meat_hide.png); }</string> |
| 231 | </property> | 231 | </property> |
| 232 | <property name="text"> | 232 | <property name="text"> |
| 233 | - <string>육류</string> | 233 | + <string>볶음류</string> |
| 234 | </property> | 234 | </property> |
| 235 | <property name="style" stdset="0"> | 235 | <property name="style" stdset="0"> |
| 236 | <string>type</string> | 236 | <string>type</string> |
| @@ -583,7 +583,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -583,7 +583,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
| 583 | QPushButton:disabled { background-image: url(:/images/cook_type/poultry_hide.png); }</string> | 583 | QPushButton:disabled { background-image: url(:/images/cook_type/poultry_hide.png); }</string> |
| 584 | </property> | 584 | </property> |
| 585 | <property name="text"> | 585 | <property name="text"> |
| 586 | - <string>가금류</string> | 586 | + <string>구이류</string> |
| 587 | </property> | 587 | </property> |
| 588 | <property name="style" stdset="0"> | 588 | <property name="style" stdset="0"> |
| 589 | <string>type</string> | 589 | <string>type</string> |
| @@ -667,7 +667,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | @@ -667,7 +667,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ | ||
| 667 | QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png); }</string> | 667 | QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png); }</string> |
| 668 | </property> | 668 | </property> |
| 669 | <property name="text"> | 669 | <property name="text"> |
| 670 | - <string>제과제빵류</string> | 670 | + <string>보온</string> |
| 671 | </property> | 671 | </property> |
| 672 | <property name="style" stdset="0"> | 672 | <property name="style" stdset="0"> |
| 673 | <string>type</string> | 673 | <string>type</string> |