에프에이리눅스 / 1611_0007_prime_oven

Compare View

switch
from
...
to
 
Commits (3)
Showing 40 changed files   Show diff stats
app/gui/oven_control/autocookselectionwindow.cpp
  Diff comments   View file @bd94cf5
@@ -26,6 +26,7 @@ AutoCookSelectionWindow::AutoCookSelectionWindow(QWidget *parent, Define::CookTy @@ -26,6 +26,7 @@ AutoCookSelectionWindow::AutoCookSelectionWindow(QWidget *parent, Define::CookTy
26 setAttribute(Qt::WA_DeleteOnClose); 26 setAttribute(Qt::WA_DeleteOnClose);
27 27
28 ui->cookTypeIcon->setPixmap(Define::icon(type)); 28 ui->cookTypeIcon->setPixmap(Define::icon(type));
  29 + ui->cookTypeLabel->setText(Define::label(type));
29 30
30 book = CookBook(type); 31 book = CookBook(type);
31 32
app/gui/oven_control/autocookselectionwindow.ui
  Diff comments   View file @bd94cf5
@@ -138,7 +138,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h @@ -138,7 +138,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h
138 <rect> 138 <rect>
139 <x>0</x> 139 <x>0</x>
140 <y>516</y> 140 <y>516</y>
141 - <width>1080</width> 141 + <width>240</width>
142 <height>180</height> 142 <height>180</height>
143 </rect> 143 </rect>
144 </property> 144 </property>
@@ -190,12 +190,30 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/auto_pop @@ -190,12 +190,30 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/auto_pop
190 QPushButton:pressed, QPushButton:focus { background-image: url(:/images/auto_popup/next_ov.png); }</string> 190 QPushButton:pressed, QPushButton:focus { background-image: url(:/images/auto_popup/next_ov.png); }</string>
191 </property> 191 </property>
192 </widget> 192 </widget>
  193 + <widget class="QLabel" name="cookTypeLabel">
  194 + <property name="geometry">
  195 + <rect>
  196 + <x>0</x>
  197 + <y>516</y>
  198 + <width>1080</width>
  199 + <height>180</height>
  200 + </rect>
  201 + </property>
  202 + <property name="styleSheet">
  203 + <string notr="true">color: white;
  204 +font-size: 48px;</string>
  205 + </property>
  206 + <property name="alignment">
  207 + <set>Qt::AlignCenter</set>
  208 + </property>
  209 + </widget>
193 <zorder>upperStack</zorder> 210 <zorder>upperStack</zorder>
194 <zorder>bottomBar</zorder> 211 <zorder>bottomBar</zorder>
195 <zorder>cookTypeIcon</zorder> 212 <zorder>cookTypeIcon</zorder>
196 <zorder>bullets</zorder> 213 <zorder>bullets</zorder>
197 <zorder>next</zorder> 214 <zorder>next</zorder>
198 <zorder>prev</zorder> 215 <zorder>prev</zorder>
  216 + <zorder>cookTypeLabel</zorder>
199 </widget> 217 </widget>
200 </widget> 218 </widget>
201 <customwidgets> 219 <customwidgets>
app/gui/oven_control/define.cpp
  Diff comments   View file @bd94cf5
@@ -160,19 +160,19 @@ QString Define::icon(Define::CookType type) @@ -160,19 +160,19 @@ QString Define::icon(Define::CookType type)
160 switch (type) 160 switch (type)
161 { 161 {
162 case Poultry: 162 case Poultry:
163 - return ":/images/cook_type/poultry_ov.png"; 163 + return ":/images/cook_type/poultry_big.png";
164 case Meat: 164 case Meat:
165 - return ":/images/cook_type/meat_ov.png"; 165 + return ":/images/cook_type/meat_big.png";
166 case Fish: 166 case Fish:
167 - return ":/images/cook_type/fish_ov.png"; 167 + return ":/images/cook_type/fish_big.png";
168 case Desert: 168 case Desert:
169 - return ":/images/cook_type/desert_ov.png"; 169 + return ":/images/cook_type/desert_big.png";
170 case Vegetable: 170 case Vegetable:
171 - return ":/images/cook_type/vegetable_ov.png"; 171 + return ":/images/cook_type/vegetable_big.png";
172 case Bread: 172 case Bread:
173 - return ":/images/cook_type/bread_ov.png"; 173 + return ":/images/cook_type/bread_big.png";
174 case Etc: 174 case Etc:
175 - return ":/images/cook_type/etc_ov.png"; 175 + return ":/images/cook_type/etc_big.png";
176 default: 176 default:
177 return ""; 177 return "";
178 } 178 }
@@ -599,3 +599,26 @@ QString Define::name(Define::CookConfigType type) @@ -599,3 +599,26 @@ QString Define::name(Define::CookConfigType type)
599 return "unknownconfig"; 599 return "unknownconfig";
600 } 600 }
601 } 601 }
  602 +
  603 +QString Define::label(Define::CookType type)
  604 +{
  605 + switch (type)
  606 + {
  607 + case Poultry:
  608 + return QObject::tr("구이류");
  609 + case Meat:
  610 + return QObject::tr("볶음류");
  611 + case Fish:
  612 + return QObject::tr("스팀류");
  613 + case Desert:
  614 + return QObject::tr("조림류");
  615 + case Vegetable:
  616 + return QObject::tr("초벌");
  617 + case Bread:
  618 + return QObject::tr("보온");
  619 + case Etc:
  620 + return QObject::tr("기타요리");
  621 + default:
  622 + return "";
  623 + }
  624 +}
app/gui/oven_control/define.h
  Diff comments   View file @bd94cf5
@@ -31,6 +31,7 @@ namespace Define @@ -31,6 +31,7 @@ namespace Define
31 31
32 QString icon(CookType type); 32 QString icon(CookType type);
33 QString name(CookType type); 33 QString name(CookType type);
  34 + QString label(CookType type);
34 35
35 enum CookConfigType 36 enum CookConfigType
36 { 37 {
app/gui/oven_control/images/cook_type/additional.png
  Diff comments   View file @bd94cf5

2.7 KB | W: | H:

2.7 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/additional_big.png
  Diff comments   View file @bd94cf5

2.56 KB
app/gui/oven_control/images/cook_type/additional_hide.png
  Diff comments   View file @bd94cf5

2.69 KB | W: | H:

2.69 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/additional_ov.png
  Diff comments   View file @bd94cf5

2.07 KB | W: | H:

2.07 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/bread.png
  Diff comments   View file @bd94cf5

3.05 KB | W: | H:

3.05 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/bread_big.png
  Diff comments   View file @bd94cf5

3.12 KB
app/gui/oven_control/images/cook_type/bread_hide.png
  Diff comments   View file @bd94cf5

3.05 KB | W: | H:

3.05 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/bread_ov.png
  Diff comments   View file @bd94cf5

2.45 KB | W: | H:

2.45 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/desert.png
  Diff comments   View file @bd94cf5

2.53 KB | W: | H:

2.53 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/desert_big.png
  Diff comments   View file @bd94cf5

2.42 KB
app/gui/oven_control/images/cook_type/desert_hide.png
  Diff comments   View file @bd94cf5

2.51 KB | W: | H:

2.51 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/desert_ov.png
  Diff comments   View file @bd94cf5

1.9 KB | W: | H:

1.9 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/etc.png
  Diff comments   View file @bd94cf5

2.85 KB | W: | H:

2.85 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/etc_big.png
  Diff comments   View file @bd94cf5

2.77 KB
app/gui/oven_control/images/cook_type/etc_hide.png
  Diff comments   View file @bd94cf5

2.84 KB | W: | H:

2.84 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/etc_ov.png
  Diff comments   View file @bd94cf5

2.19 KB | W: | H:

2.19 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/fish.png
  Diff comments   View file @bd94cf5

3.03 KB | W: | H:

3.03 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/fish_big.png
  Diff comments   View file @bd94cf5

3.09 KB
app/gui/oven_control/images/cook_type/fish_hide.png
  Diff comments   View file @bd94cf5

3 KB | W: | H:

3 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/fish_ov.png
  Diff comments   View file @bd94cf5

2.42 KB | W: | H:

2.42 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/meat.png
  Diff comments   View file @bd94cf5

3.04 KB | W: | H:

3.04 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/meat_big.png
  Diff comments   View file @bd94cf5

2.92 KB
app/gui/oven_control/images/cook_type/meat_hide.png
  Diff comments   View file @bd94cf5

3.03 KB | W: | H:

3.03 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/meat_ov.png
  Diff comments   View file @bd94cf5

2.34 KB | W: | H:

2.34 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/poultry.png
  Diff comments   View file @bd94cf5

3.09 KB | W: | H:

3.09 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/poultry_big.png
  Diff comments   View file @bd94cf5

3.25 KB
app/gui/oven_control/images/cook_type/poultry_hide.png
  Diff comments   View file @bd94cf5

3.09 KB | W: | H:

3.09 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/poultry_ov.png
  Diff comments   View file @bd94cf5

2.49 KB | W: | H:

2.49 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/vegetable.png
  Diff comments   View file @bd94cf5

2.81 KB | W: | H:

2.81 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/vegetable_big.png
  Diff comments   View file @bd94cf5

2.79 KB
app/gui/oven_control/images/cook_type/vegetable_hide.png
  Diff comments   View file @bd94cf5

2.81 KB | W: | H:

2.81 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/images/cook_type/vegetable_ov.png
  Diff comments   View file @bd94cf5

2.15 KB | W: | H:

2.15 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/mainwindow.ui
  Diff comments   View file @bd94cf5
@@ -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
  Diff comments   View file @bd94cf5
@@ -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
  Diff comments   View file @bd94cf5
@@ -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>
app/gui/oven_control/resources.qrc
  Diff comments   View file @bd94cf5
@@ -637,5 +637,13 @@ @@ -637,5 +637,13 @@
637 <file>images/symbol/water_level_middle.png</file> 637 <file>images/symbol/water_level_middle.png</file>
638 <file>images/symbol/water_level_low.png</file> 638 <file>images/symbol/water_level_low.png</file>
639 <file>images/symbol/main_logo_pssco.png</file> 639 <file>images/symbol/main_logo_pssco.png</file>
  640 + <file>images/cook_type/additional_big.png</file>
  641 + <file>images/cook_type/bread_big.png</file>
  642 + <file>images/cook_type/desert_big.png</file>
  643 + <file>images/cook_type/etc_big.png</file>
  644 + <file>images/cook_type/fish_big.png</file>
  645 + <file>images/cook_type/meat_big.png</file>
  646 + <file>images/cook_type/poultry_big.png</file>
  647 + <file>images/cook_type/vegetable_big.png</file>
640 </qresource> 648 </qresource>
641 </RCC> 649 </RCC>