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 | 389 | QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/meat_ov.png); }</string> |
390 | 390 | </property> |
391 | 391 | <property name="text"> |
392 | - <string>육류</string> | |
392 | + <string>볶음류</string> | |
393 | 393 | </property> |
394 | 394 | <property name="style" stdset="0"> |
395 | 395 | <string>type</string> |
... | ... | @@ -415,7 +415,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ |
415 | 415 | QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/desert_ov.png); }</string> |
416 | 416 | </property> |
417 | 417 | <property name="text"> |
418 | - <string>디저트류</string> | |
418 | + <string>조림류</string> | |
419 | 419 | </property> |
420 | 420 | <property name="style" stdset="0"> |
421 | 421 | <string>type</string> |
... | ... | @@ -467,7 +467,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ |
467 | 467 | QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/vegetable_ov.png); }</string> |
468 | 468 | </property> |
469 | 469 | <property name="text"> |
470 | - <string>채소및곡류</string> | |
470 | + <string>초벌</string> | |
471 | 471 | </property> |
472 | 472 | <property name="style" stdset="0"> |
473 | 473 | <string>type</string> |
... | ... | @@ -493,7 +493,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ |
493 | 493 | QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/poultry_ov.png); }</string> |
494 | 494 | </property> |
495 | 495 | <property name="text"> |
496 | - <string>가금류</string> | |
496 | + <string>구이류</string> | |
497 | 497 | </property> |
498 | 498 | <property name="style" stdset="0"> |
499 | 499 | <string>type</string> |
... | ... | @@ -519,7 +519,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ |
519 | 519 | QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/fish_ov.png); }</string> |
520 | 520 | </property> |
521 | 521 | <property name="text"> |
522 | - <string>생선류</string> | |
522 | + <string>스팀류</string> | |
523 | 523 | </property> |
524 | 524 | <property name="style" stdset="0"> |
525 | 525 | <string>type</string> |
... | ... | @@ -545,7 +545,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ |
545 | 545 | QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/bread_ov.png); }</string> |
546 | 546 | </property> |
547 | 547 | <property name="text"> |
548 | - <string>제과제빵류</string> | |
548 | + <string>보온</string> | |
549 | 549 | </property> |
550 | 550 | <property name="style" stdset="0"> |
551 | 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 | 118 | QPushButton:disabled { background-image: url(:/images/cook_type/vegetable_hide.png); }</string> |
119 | 119 | </property> |
120 | 120 | <property name="text"> |
121 | - <string>채소및곡류</string> | |
121 | + <string>초벌</string> | |
122 | 122 | </property> |
123 | 123 | <property name="style" stdset="0"> |
124 | 124 | <string notr="true">type</string> |
... | ... | @@ -161,7 +161,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ |
161 | 161 | QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png); }</string> |
162 | 162 | </property> |
163 | 163 | <property name="text"> |
164 | - <string>제과제빵류</string> | |
164 | + <string>보온</string> | |
165 | 165 | </property> |
166 | 166 | <property name="style" stdset="0"> |
167 | 167 | <string notr="true">type</string> |
... | ... | @@ -204,7 +204,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ |
204 | 204 | QPushButton:disabled { background-image: url(:/images/cook_type/meat_hide.png); }</string> |
205 | 205 | </property> |
206 | 206 | <property name="text"> |
207 | - <string>육류</string> | |
207 | + <string>볶음류</string> | |
208 | 208 | </property> |
209 | 209 | <property name="style" stdset="0"> |
210 | 210 | <string notr="true">type</string> |
... | ... | @@ -247,7 +247,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ |
247 | 247 | QPushButton:disabled { background-image: url(:/images/cook_type/desert_hide.png); }</string> |
248 | 248 | </property> |
249 | 249 | <property name="text"> |
250 | - <string>디저트류</string> | |
250 | + <string>조림류</string> | |
251 | 251 | </property> |
252 | 252 | <property name="style" stdset="0"> |
253 | 253 | <string notr="true">type</string> |
... | ... | @@ -277,7 +277,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ |
277 | 277 | QPushButton:disabled { background-image: url(:/images/cook_type/poultry_hide.png); }</string> |
278 | 278 | </property> |
279 | 279 | <property name="text"> |
280 | - <string>가금류</string> | |
280 | + <string>구이류</string> | |
281 | 281 | </property> |
282 | 282 | <property name="style" stdset="0"> |
283 | 283 | <string notr="true">type</string> |
... | ... | @@ -644,7 +644,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ |
644 | 644 | QPushButton:disabled { background-image: url(:/images/cook_type/fish_hide.png); }</string> |
645 | 645 | </property> |
646 | 646 | <property name="text"> |
647 | - <string>생선류</string> | |
647 | + <string>스팀류</string> | |
648 | 648 | </property> |
649 | 649 | <property name="style" stdset="0"> |
650 | 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 | 81 | QPushButton:disabled { background-image: url(:/images/cook_type/desert_hide.png); }</string> |
82 | 82 | </property> |
83 | 83 | <property name="text"> |
84 | - <string>디저트류</string> | |
84 | + <string>조림류</string> | |
85 | 85 | </property> |
86 | 86 | <property name="style" stdset="0"> |
87 | 87 | <string>type</string> |
... | ... | @@ -111,7 +111,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ |
111 | 111 | QPushButton:disabled { background-image: url(:/images/cook_type/fish_hide.png); }</string> |
112 | 112 | </property> |
113 | 113 | <property name="text"> |
114 | - <string>생선류</string> | |
114 | + <string>스팀류</string> | |
115 | 115 | </property> |
116 | 116 | <property name="style" stdset="0"> |
117 | 117 | <string>type</string> |
... | ... | @@ -200,7 +200,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ |
200 | 200 | QPushButton:disabled { background-image: url(:/images/cook_type/vegetable_hide.png); }</string> |
201 | 201 | </property> |
202 | 202 | <property name="text"> |
203 | - <string>채소및곡류</string> | |
203 | + <string>초벌</string> | |
204 | 204 | </property> |
205 | 205 | <property name="style" stdset="0"> |
206 | 206 | <string>type</string> |
... | ... | @@ -230,7 +230,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ |
230 | 230 | QPushButton:disabled { background-image: url(:/images/cook_type/meat_hide.png); }</string> |
231 | 231 | </property> |
232 | 232 | <property name="text"> |
233 | - <string>육류</string> | |
233 | + <string>볶음류</string> | |
234 | 234 | </property> |
235 | 235 | <property name="style" stdset="0"> |
236 | 236 | <string>type</string> |
... | ... | @@ -583,7 +583,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ |
583 | 583 | QPushButton:disabled { background-image: url(:/images/cook_type/poultry_hide.png); }</string> |
584 | 584 | </property> |
585 | 585 | <property name="text"> |
586 | - <string>가금류</string> | |
586 | + <string>구이류</string> | |
587 | 587 | </property> |
588 | 588 | <property name="style" stdset="0"> |
589 | 589 | <string>type</string> |
... | ... | @@ -667,7 +667,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ |
667 | 667 | QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png); }</string> |
668 | 668 | </property> |
669 | 669 | <property name="text"> |
670 | - <string>제과제빵류</string> | |
670 | + <string>보온</string> | |
671 | 671 | </property> |
672 | 672 | <property name="style" stdset="0"> |
673 | 673 | <string>type</string> | ... | ... |