에프에이리눅스 / 1611_0007_prime_oven

Compare View

switch
from
...
to
 
Commits (2)
Showing 41 changed files   Show diff stats
app/gui/oven_control/autocookselectionwindow.cpp
  Diff comments   View file @ea3dabf
... ... @@ -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 @ea3dabf
... ... @@ -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>430</y>
141   - <width>900</width>
  141 + <width>300</width>
142 142 <height>150</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>430</y>
  198 + <width>900</width>
  199 + <height>150</height>
  200 + </rect>
  201 + </property>
  202 + <property name="styleSheet">
  203 + <string notr="true">color: white;
  204 +font-size: 40px;</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 @ea3dabf
... ... @@ -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 @ea3dabf
... ... @@ -5,7 +5,7 @@
5 5  
6 6 #define MAJOR_VER 1
7 7 #define MINOR_VER 6
8   -#define HOTFIX_VER 9
  8 +#define HOTFIX_VER 11
9 9  
10 10 // 0 for normal
11 11 // 1 for premium
... ... @@ -30,6 +30,7 @@ namespace Define
30 30  
31 31 QString icon(CookType type);
32 32 QString name(CookType type);
  33 + QString label(CookType type);
33 34  
34 35 enum CookConfigType
35 36 {
... ...
app/gui/oven_control/images/cook_type/additional.png
  Diff comments   View file @ea3dabf

2.09 KB | W: | H:

2.09 KB | W: | H:

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

2.19 KB
app/gui/oven_control/images/cook_type/additional_hide.png
  Diff comments   View file @ea3dabf

2.09 KB | W: | H:

2.09 KB | W: | H:

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

1.78 KB | W: | H:

1.78 KB | W: | H:

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

2.68 KB | W: | H:

2.68 KB | W: | H:

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

3.04 KB
app/gui/oven_control/images/cook_type/bread_hide.png
  Diff comments   View file @ea3dabf

2.68 KB | W: | H:

2.68 KB | W: | H:

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

2.41 KB | W: | H:

2.41 KB | W: | H:

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

2.16 KB | W: | H:

2.16 KB | W: | H:

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

2.17 KB
app/gui/oven_control/images/cook_type/desert_hide.png
  Diff comments   View file @ea3dabf

2.16 KB | W: | H:

2.16 KB | W: | H:

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

1.81 KB | W: | H:

1.81 KB | W: | H:

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

2.29 KB | W: | H:

2.29 KB | W: | H:

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

2.52 KB
app/gui/oven_control/images/cook_type/etc_hide.png
  Diff comments   View file @ea3dabf

2.29 KB | W: | H:

2.29 KB | W: | H:

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

1.98 KB | W: | H:

1.98 KB | W: | H:

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

2.8 KB | W: | H:

2.8 KB | W: | H:

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

3.12 KB
app/gui/oven_control/images/cook_type/fish_hide.png
  Diff comments   View file @ea3dabf

2.8 KB | W: | H:

2.8 KB | W: | H:

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

2.44 KB | W: | H:

2.44 KB | W: | H:

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

2.75 KB | W: | H:

2.75 KB | W: | H:

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

3.05 KB
app/gui/oven_control/images/cook_type/meat_hide.png
  Diff comments   View file @ea3dabf

2.75 KB | W: | H:

2.75 KB | W: | H:

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

2.46 KB | W: | H:

2.46 KB | W: | H:

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

2.75 KB | W: | H:

2.75 KB | W: | H:

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

3.14 KB
app/gui/oven_control/images/cook_type/poultry_hide.png
  Diff comments   View file @ea3dabf

2.75 KB | W: | H:

2.75 KB | W: | H:

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

2.54 KB | W: | H:

2.54 KB | W: | H:

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

2.24 KB | W: | H:

2.24 KB | W: | H:

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

2.4 KB
app/gui/oven_control/images/cook_type/vegetable_hide.png
  Diff comments   View file @ea3dabf

2.24 KB | W: | H:

2.24 KB | W: | H:

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

1.95 KB | W: | H:

1.95 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/gui/oven_control/mainwindow.ui
  Diff comments   View file @ea3dabf
... ... @@ -41,14 +41,15 @@ font-size: 40px;
41 41  
42 42 QPushButton[style=&quot;type&quot;] {
43 43 background-repeat: no-repeat;
44   -background-position: center;
45   -background-clip: border;
  44 +background-position: top;
  45 +background-clip: margin;
46 46 background-origin: border;
  47 +margin-top: 42px;
47 48  
48   -border-top: 165px;
  49 +padding-top: 82px;
49 50 border-style: hidden;
50 51 color: white;
51   -font-size: 30px;
  52 +font-size: 36px;
52 53 }
53 54  
54 55 QPushButton[style=&quot;function&quot;] {
... ... @@ -389,7 +390,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod
389 390 QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/meat_ov.png); }</string>
390 391 </property>
391 392 <property name="text">
392   - <string>육류</string>
  393 + <string>볶음류</string>
393 394 </property>
394 395 <property name="style" stdset="0">
395 396 <string>type</string>
... ... @@ -415,7 +416,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
415 416 QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/desert_ov.png); }</string>
416 417 </property>
417 418 <property name="text">
418   - <string>디저트류</string>
  419 + <string>조림류</string>
419 420 </property>
420 421 <property name="style" stdset="0">
421 422 <string>type</string>
... ... @@ -467,7 +468,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
467 468 QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/vegetable_ov.png); }</string>
468 469 </property>
469 470 <property name="text">
470   - <string>채소및곡류</string>
  471 + <string>초벌</string>
471 472 </property>
472 473 <property name="style" stdset="0">
473 474 <string>type</string>
... ... @@ -493,7 +494,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
493 494 QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/poultry_ov.png); }</string>
494 495 </property>
495 496 <property name="text">
496   - <string>가금류</string>
  497 + <string>구이류</string>
497 498 </property>
498 499 <property name="style" stdset="0">
499 500 <string>type</string>
... ... @@ -519,7 +520,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
519 520 QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/fish_ov.png); }</string>
520 521 </property>
521 522 <property name="text">
522   - <string>생선류</string>
  523 + <string>스팀류</string>
523 524 </property>
524 525 <property name="style" stdset="0">
525 526 <string>type</string>
... ... @@ -545,7 +546,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
545 546 QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/bread_ov.png); }</string>
546 547 </property>
547 548 <property name="text">
548   - <string>제과제빵류</string>
  549 + <string>보온</string>
549 550 </property>
550 551 <property name="style" stdset="0">
551 552 <string>type</string>
... ...
app/gui/oven_control/manualcookwindow.ui
  Diff comments   View file @ea3dabf
... ... @@ -1193,7 +1193,7 @@ QPushButton:focus:pressed
1193 1193 <string notr="true">QPushButton
1194 1194 { background-image: url(:/images/manual_button/side_nozzle_close.png); }
1195 1195 QPushButton:pressed,
1196   -QPushButton:focus
  1196 +QPushButton:focus
1197 1197 { background-image: url(:/images/manual_button/013_sys_icon_03_active.png); }
1198 1198 QPushButton:checked
1199 1199 { background-image: url(:/images/manual_button/side_nozzle_open.png); }
... ...
app/gui/oven_control/multicookselectionwindow.ui
  Diff comments   View file @ea3dabf
... ... @@ -32,14 +32,15 @@ font-size: 40px;
32 32  
33 33 QPushButton[style=&quot;type&quot;] {
34 34 background-repeat: no-repeat;
35   -background-position: center;
36   -background-clip: border;
  35 +background-position: top;
  36 +background-clip: margin;
37 37 background-origin: border;
  38 +margin-top: 42px;
38 39  
39   -border-top: 165px;
  40 +padding-top: 82px;
40 41 border-style: hidden;
41 42 color: white;
42   -font-size: 30px;
  43 +font-size: 36px;
43 44 }
44 45  
45 46 QPushButton[style=&quot;function&quot;] {
... ... @@ -118,7 +119,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
118 119 QPushButton:disabled { background-image: url(:/images/cook_type/vegetable_hide.png); }</string>
119 120 </property>
120 121 <property name="text">
121   - <string>채소및곡류</string>
  122 + <string>초벌</string>
122 123 </property>
123 124 <property name="style" stdset="0">
124 125 <string notr="true">type</string>
... ... @@ -161,7 +162,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
161 162 QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png); }</string>
162 163 </property>
163 164 <property name="text">
164   - <string>제과제빵류</string>
  165 + <string>보온</string>
165 166 </property>
166 167 <property name="style" stdset="0">
167 168 <string notr="true">type</string>
... ... @@ -204,7 +205,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
204 205 QPushButton:disabled { background-image: url(:/images/cook_type/meat_hide.png); }</string>
205 206 </property>
206 207 <property name="text">
207   - <string>육류</string>
  208 + <string>볶음류</string>
208 209 </property>
209 210 <property name="style" stdset="0">
210 211 <string notr="true">type</string>
... ... @@ -247,7 +248,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
247 248 QPushButton:disabled { background-image: url(:/images/cook_type/desert_hide.png); }</string>
248 249 </property>
249 250 <property name="text">
250   - <string>디저트류</string>
  251 + <string>조림류</string>
251 252 </property>
252 253 <property name="style" stdset="0">
253 254 <string notr="true">type</string>
... ... @@ -277,7 +278,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
277 278 QPushButton:disabled { background-image: url(:/images/cook_type/poultry_hide.png); }</string>
278 279 </property>
279 280 <property name="text">
280   - <string>가금류</string>
  281 + <string>구이류</string>
281 282 </property>
282 283 <property name="style" stdset="0">
283 284 <string notr="true">type</string>
... ... @@ -644,7 +645,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
644 645 QPushButton:disabled { background-image: url(:/images/cook_type/fish_hide.png); }</string>
645 646 </property>
646 647 <property name="text">
647   - <string>생선류</string>
  648 + <string>스팀류</string>
648 649 </property>
649 650 <property name="style" stdset="0">
650 651 <string notr="true">type</string>
... ...
app/gui/oven_control/programmingselectionwindow.ui
  Diff comments   View file @ea3dabf
... ... @@ -32,14 +32,15 @@ font-size: 40px;
32 32  
33 33 QPushButton[style=&quot;type&quot;] {
34 34 background-repeat: no-repeat;
35   -background-position: center;
36   -background-clip: border;
  35 +background-position: top;
  36 +background-clip: margin;
37 37 background-origin: border;
  38 +margin-top: 42px;
38 39  
39   -border-top: 165px;
  40 +padding-top: 82px;
40 41 border-style: hidden;
41 42 color: white;
42   -font-size: 30px;
  43 +font-size: 36px;
43 44 }
44 45  
45 46 QPushButton[style=&quot;function&quot;] {
... ... @@ -81,7 +82,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
81 82 QPushButton:disabled { background-image: url(:/images/cook_type/desert_hide.png); }</string>
82 83 </property>
83 84 <property name="text">
84   - <string>디저트류</string>
  85 + <string>조림류</string>
85 86 </property>
86 87 <property name="style" stdset="0">
87 88 <string>type</string>
... ... @@ -111,7 +112,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
111 112 QPushButton:disabled { background-image: url(:/images/cook_type/fish_hide.png); }</string>
112 113 </property>
113 114 <property name="text">
114   - <string>생선류</string>
  115 + <string>스팀류</string>
115 116 </property>
116 117 <property name="style" stdset="0">
117 118 <string>type</string>
... ... @@ -200,7 +201,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
200 201 QPushButton:disabled { background-image: url(:/images/cook_type/vegetable_hide.png); }</string>
201 202 </property>
202 203 <property name="text">
203   - <string>채소및곡류</string>
  204 + <string>초벌</string>
204 205 </property>
205 206 <property name="style" stdset="0">
206 207 <string>type</string>
... ... @@ -230,7 +231,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
230 231 QPushButton:disabled { background-image: url(:/images/cook_type/meat_hide.png); }</string>
231 232 </property>
232 233 <property name="text">
233   - <string>육류</string>
  234 + <string>볶음류</string>
234 235 </property>
235 236 <property name="style" stdset="0">
236 237 <string>type</string>
... ... @@ -583,7 +584,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
583 584 QPushButton:disabled { background-image: url(:/images/cook_type/poultry_hide.png); }</string>
584 585 </property>
585 586 <property name="text">
586   - <string>가금류</string>
  587 + <string>구이류</string>
587 588 </property>
588 589 <property name="style" stdset="0">
589 590 <string>type</string>
... ... @@ -667,7 +668,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
667 668 QPushButton:disabled { background-image: url(:/images/cook_type/bread_hide.png); }</string>
668 669 </property>
669 670 <property name="text">
670   - <string>제과제빵류</string>
  671 + <string>보온</string>
671 672 </property>
672 673 <property name="style" stdset="0">
673 674 <string>type</string>
... ...
app/gui/oven_control/resources.qrc
  Diff comments   View file @ea3dabf
... ... @@ -636,5 +636,13 @@
636 636 <file>images/symbol/water_level_high.png</file>
637 637 <file>images/symbol/water_level_middle.png</file>
638 638 <file>images/symbol/water_level_low.png</file>
  639 + <file>images/cook_type/additional_big.png</file>
  640 + <file>images/cook_type/bread_big.png</file>
  641 + <file>images/cook_type/desert_big.png</file>
  642 + <file>images/cook_type/etc_big.png</file>
  643 + <file>images/cook_type/fish_big.png</file>
  644 + <file>images/cook_type/meat_big.png</file>
  645 + <file>images/cook_type/poultry_big.png</file>
  646 + <file>images/cook_type/vegetable_big.png</file>
639 647 </qresource>
640 648 </RCC>
... ...