에프에이리눅스 / 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 26 setAttribute(Qt::WA_DeleteOnClose);
27 27  
28 28 ui->cookTypeIcon->setPixmap(Define::icon(type));
  29 + ui->cookTypeLabel->setText(Define::label(type));
29 30  
30 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 138 <rect>
139 139 <x>0</x>
140 140 <y>516</y>
141   - <width>1080</width>
  141 + <width>240</width>
142 142 <height>180</height>
143 143 </rect>
144 144 </property>
... ... @@ -190,12 +190,30 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/auto_pop
190 190 QPushButton:pressed, QPushButton:focus { background-image: url(:/images/auto_popup/next_ov.png); }</string>
191 191 </property>
192 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 210 <zorder>upperStack</zorder>
194 211 <zorder>bottomBar</zorder>
195 212 <zorder>cookTypeIcon</zorder>
196 213 <zorder>bullets</zorder>
197 214 <zorder>next</zorder>
198 215 <zorder>prev</zorder>
  216 + <zorder>cookTypeLabel</zorder>
199 217 </widget>
200 218 </widget>
201 219 <customwidgets>
... ...
app/gui/oven_control/define.cpp
  Diff comments   View file @bd94cf5
... ... @@ -160,19 +160,19 @@ QString Define::icon(Define::CookType type)
160 160 switch (type)
161 161 {
162 162 case Poultry:
163   - return ":/images/cook_type/poultry_ov.png";
  163 + return ":/images/cook_type/poultry_big.png";
164 164 case Meat:
165   - return ":/images/cook_type/meat_ov.png";
  165 + return ":/images/cook_type/meat_big.png";
166 166 case Fish:
167   - return ":/images/cook_type/fish_ov.png";
  167 + return ":/images/cook_type/fish_big.png";
168 168 case Desert:
169   - return ":/images/cook_type/desert_ov.png";
  169 + return ":/images/cook_type/desert_big.png";
170 170 case Vegetable:
171   - return ":/images/cook_type/vegetable_ov.png";
  171 + return ":/images/cook_type/vegetable_big.png";
172 172 case Bread:
173   - return ":/images/cook_type/bread_ov.png";
  173 + return ":/images/cook_type/bread_big.png";
174 174 case Etc:
175   - return ":/images/cook_type/etc_ov.png";
  175 + return ":/images/cook_type/etc_big.png";
176 176 default:
177 177 return "";
178 178 }
... ... @@ -599,3 +599,26 @@ QString Define::name(Define::CookConfigType type)
599 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 31  
32 32 QString icon(CookType type);
33 33 QString name(CookType type);
  34 + QString label(CookType type);
34 35  
35 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 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
  Diff comments   View file @bd94cf5
... ... @@ -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
  Diff comments   View file @bd94cf5
... ... @@ -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>
... ...
app/gui/oven_control/resources.qrc
  Diff comments   View file @bd94cf5
... ... @@ -637,5 +637,13 @@
637 637 <file>images/symbol/water_level_middle.png</file>
638 638 <file>images/symbol/water_level_low.png</file>
639 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 648 </qresource>
641 649 </RCC>
... ...