에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit e34c94639b47faf1a3eabb798c0052e68eb0df80

Authored by 김태훈
1 parent c6308e642d
Exists in master

버전 1.6.10 

새 디자인 시안 반영
Showing 42 changed files with 102 additions and 48 deletions   Show diff stats
app/gui/oven_control/autocookselectionwindow.cpp
  Diff comments   View file @e34c946
@@ -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 @e34c946
@@ -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>430</y> 140 <y>430</y>
141 - <width>900</width> 141 + <width>300</width>
142 <height>150</height> 142 <height>150</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>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 <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 @e34c946
@@ -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 @e34c946
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 5
6 #define MAJOR_VER 1 6 #define MAJOR_VER 1
7 #define MINOR_VER 6 7 #define MINOR_VER 6
8 -#define HOTFIX_VER 9 8 +#define HOTFIX_VER 10
9 9
10 // 0 for normal 10 // 0 for normal
11 // 1 for premium 11 // 1 for premium
@@ -30,6 +30,7 @@ namespace Define @@ -30,6 +30,7 @@ namespace Define
30 30
31 QString icon(CookType type); 31 QString icon(CookType type);
32 QString name(CookType type); 32 QString name(CookType type);
  33 + QString label(CookType type);
33 34
34 enum CookConfigType 35 enum CookConfigType
35 { 36 {
app/gui/oven_control/images/cook_type/additional.png
  Diff comments   View file @e34c946

1.67 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 @e34c946

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

1.02 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 @e34c946

1.67 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 @e34c946

2.71 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 @e34c946

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

1.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 @e34c946

2.71 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 @e34c946

3.07 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 @e34c946

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

1.95 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 @e34c946

3.07 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 @e34c946

2.25 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 @e34c946

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

1.42 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 @e34c946

2.25 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 @e34c946

3.34 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 @e34c946

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

2.15 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 @e34c946

3.34 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 @e34c946

3.5 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 @e34c946

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

2.23 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 @e34c946

3.5 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 @e34c946

3.24 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 @e34c946

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

2.1 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 @e34c946

3.24 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 @e34c946

3.55 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 @e34c946

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

2.32 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 @e34c946

3.55 KB | W: | H:

1.95 KB | W: | H:

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