에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 703beed2b847f4f112def024f367282bc2fc2492

Authored by 김태훈
Committed by 고영탁
1 parent 23c7443f29
Exists in master and in 2 other branches fhd, fhd-demo

디자인 안 반영

Showing 7 changed files with 434 additions and 408 deletions   Show diff stats
app/gui/oven_control/multicookselectionwindow.cpp
  Diff comments   View file @703beed
... ... @@ -79,6 +79,8 @@ void MultiCookSelectionWindow::updateView()
79 79 {
80 80 if (mode == Define::InvalidMode)
81 81 {
  82 + ui->description->setText(tr("1. 다중 요리에서 사용할 요리 카테고리를 선택해주세요\n2. 스팀, 콤비, 건열 중에서 선택하시면 자동으로 다음 단계로 진행됩니다"));
  83 +
82 84 ui->steamButton->setEnabled(true);
83 85 ui->combiButton->setEnabled(true);
84 86 ui->dryheatButton->setEnabled(true);
... ... @@ -93,6 +95,22 @@ void MultiCookSelectionWindow::updateView()
93 95 }
94 96 else
95 97 {
  98 + QString modeString;
  99 + switch (mode)
  100 + {
  101 + case Define::SteamMode:
  102 + modeString = tr("스팀을");
  103 + break;
  104 + case Define::CombiMode:
  105 + modeString = tr("콤비를");
  106 + break;
  107 + case Define::DryMode:
  108 + modeString = tr("건열을");
  109 + break;
  110 + }
  111 +
  112 + ui->description->setText(tr("1. %1 선택하였습니다\n2. 수동 메뉴 혹은 원하시는 자동 메뉴 상세 목록을 선택하세요").arg(modeString));
  113 +
96 114 ui->steamButton->setEnabled(mode == Define::SteamMode);
97 115 ui->combiButton->setEnabled(mode == Define::CombiMode);
98 116 ui->dryheatButton->setEnabled(mode == Define::DryMode);
... ... @@ -213,11 +231,6 @@ void MultiCookSelectionWindow::on_helpButton_clicked()
213 231  
214 232 }
215 233  
216   -void MultiCookSelectionWindow::on_okButton_clicked()
217   -{
218   -
219   -}
220   -
221 234 void MultiCookSelectionWindow::onEncoderLeft()
222 235 {
223 236 focusPreviousChild();
... ...
app/gui/oven_control/multicookselectionwindow.h
  Diff comments   View file @703beed
... ... @@ -47,7 +47,6 @@ private slots:
47 47  
48 48 void on_backButton_clicked();
49 49 void on_helpButton_clicked();
50   - void on_okButton_clicked();
51 50  
52 51 private:
53 52 Ui::MultiCookSelectionWindow *ui;
... ...
app/gui/oven_control/multicookselectionwindow.ui
  Diff comments   View file @703beed
... ... @@ -529,7 +529,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/additional_hide.
529 529 <widget class="QPushButton" name="helpButton">
530 530 <property name="geometry">
531 531 <rect>
532   - <x>401</x>
  532 + <x>514</x>
533 533 <y>26</y>
534 534 <width>97</width>
535 535 <height>97</height>
... ... @@ -572,18 +572,24 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/b
572 572 <string/>
573 573 </property>
574 574 </widget>
575   - <widget class="QPushButton" name="okButton">
  575 + <widget class="QPushButton" name="configButton">
576 576 <property name="geometry">
577 577 <rect>
578   - <x>514</x>
  578 + <x>401</x>
579 579 <y>26</y>
580 580 <width>97</width>
581 581 <height>97</height>
582 582 </rect>
583 583 </property>
  584 + <property name="sizePolicy">
  585 + <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
  586 + <horstretch>0</horstretch>
  587 + <verstretch>0</verstretch>
  588 + </sizepolicy>
  589 + </property>
584 590 <property name="styleSheet">
585   - <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/006_sys_icon_16.png); }
586   -QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/006_sys_icon_16_ov.png); }</string>
  591 + <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/config.png); }
  592 +QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/config_ov.png); }</string>
587 593 </property>
588 594 <property name="text">
589 595 <string/>
... ... @@ -660,57 +666,44 @@ QPushButton:disabled { background-image: url(:/images/cook_type/fish_hide.png);
660 666 <property name="styleSheet">
661 667 <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string>
662 668 </property>
663   - <widget class="Clock" name="clock" native="true">
  669 + <widget class="QLabel" name="label">
664 670 <property name="geometry">
665 671 <rect>
666   - <x>272</x>
667   - <y>36</y>
668   - <width>356</width>
669   - <height>355</height>
  672 + <x>407</x>
  673 + <y>75</y>
  674 + <width>112</width>
  675 + <height>113</height>
670 676 </rect>
671 677 </property>
672   - </widget>
673   - <widget class="WashWarnIcon" name="label">
674   - <property name="geometry">
675   - <rect>
676   - <x>800</x>
677   - <y>320</y>
678   - <width>80</width>
679   - <height>84</height>
680   - </rect>
  678 + <property name="pixmap">
  679 + <pixmap resource="resources.qrc">:/images/symbol/info_shadow.png</pixmap>
681 680 </property>
682 681 </widget>
683   - <widget class="DemoIcon" name="label_2">
  682 + <widget class="QLabel" name="description">
684 683 <property name="geometry">
685 684 <rect>
686   - <x>780</x>
687   - <y>230</y>
688   - <width>101</width>
689   - <height>90</height>
  685 + <x>0</x>
  686 + <y>175</y>
  687 + <width>900</width>
  688 + <height>251</height>
690 689 </rect>
691 690 </property>
692   - </widget>
693   - <widget class="HalfEnergyIcon" name="label_3">
694   - <property name="geometry">
695   - <rect>
696   - <x>780</x>
697   - <y>160</y>
698   - <width>108</width>
699   - <height>67</height>
700   - </rect>
  691 + <property name="font">
  692 + <font>
  693 + <pointsize>13</pointsize>
  694 + </font>
701 695 </property>
702   - </widget>
703   - <widget class="DigitalClock" name="label_4">
704   - <property name="geometry">
705   - <rect>
706   - <x>20</x>
707   - <y>310</y>
708   - <width>600</width>
709   - <height>100</height>
710   - </rect>
  696 + <property name="styleSheet">
  697 + <string notr="true">color: white;
  698 +padding-left: 50px;
  699 +padding-right: 50px;</string>
  700 + </property>
  701 + <property name="text">
  702 + <string>1. 다중 요리에서 사용할 요리 카테고리를 선택해주세요
  703 +2. 스팀, 콤비, 건열 중에서 선택하시면 자동으로 다음 단계로 진행됩니다</string>
711 704 </property>
712   - <property name="alignment">
713   - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
  705 + <property name="wordWrap">
  706 + <bool>true</bool>
714 707 </property>
715 708 </widget>
716 709 </widget>
... ... @@ -718,34 +711,6 @@ QPushButton:disabled { background-image: url(:/images/cook_type/fish_hide.png);
718 711 </widget>
719 712 </widget>
720 713 </widget>
721   - <customwidgets>
722   - <customwidget>
723   - <class>Clock</class>
724   - <extends>QWidget</extends>
725   - <header>clock.h</header>
726   - <container>1</container>
727   - </customwidget>
728   - <customwidget>
729   - <class>WashWarnIcon</class>
730   - <extends>QLabel</extends>
731   - <header>washwarnicon.h</header>
732   - </customwidget>
733   - <customwidget>
734   - <class>DemoIcon</class>
735   - <extends>QLabel</extends>
736   - <header>demoicon.h</header>
737   - </customwidget>
738   - <customwidget>
739   - <class>HalfEnergyIcon</class>
740   - <extends>QLabel</extends>
741   - <header>halfenergyicon.h</header>
742   - </customwidget>
743   - <customwidget>
744   - <class>DigitalClock</class>
745   - <extends>QLabel</extends>
746   - <header>digitalclock.h</header>
747   - </customwidget>
748   - </customwidgets>
749 714 <tabstops>
750 715 <tabstop>steamButton</tabstop>
751 716 <tabstop>combiButton</tabstop>
... ... @@ -760,8 +725,9 @@ QPushButton:disabled { background-image: url(:/images/cook_type/fish_hide.png);
760 725 <tabstop>primeButton</tabstop>
761 726 <tabstop>backButton</tabstop>
762 727 <tabstop>helpButton</tabstop>
763   - <tabstop>okButton</tabstop>
764 728 </tabstops>
765   - <resources/>
  729 + <resources>
  730 + <include location="resources.qrc"/>
  731 + </resources>
766 732 <connections/>
767 733 </ui>
... ...
app/gui/oven_control/multicookwindow.cpp
  Diff comments   View file @703beed
... ... @@ -40,23 +40,17 @@ MultiCookWindow::MultiCookWindow(QWidget *parent) :
40 40 buttons.append(ui->selectButton_9);
41 41 buttons.append(ui->selectButton_10);
42 42  
43   - cookButtons.append(ui->cookButton_1);
44   - cookButtons.append(ui->cookButton_2);
45   - cookButtons.append(ui->cookButton_3);
46   - cookButtons.append(ui->cookButton_4);
47   - cookButtons.append(ui->cookButton_5);
48   - cookButtons.append(ui->cookButton_6);
49   - cookButtons.append(ui->cookButton_7);
50   - cookButtons.append(ui->cookButton_8);
51   - cookButtons.append(ui->cookButton_9);
52   - cookButtons.append(ui->cookButton_10);
53   - cookButtons.append(ui->cookButton_11);
54   - cookButtons.append(ui->cookButton_12);
  43 + recentButtons.append(ui->recentButton_1);
  44 + recentButtons.append(ui->recentButton_2);
  45 + recentButtons.append(ui->recentButton_3);
  46 + recentButtons.append(ui->recentButton_4);
  47 + recentButtons.append(ui->recentButton_5);
  48 + recentButtons.append(ui->recentButton_6);
55 49  
56 50 mode = Define::InvalidMode;
57 51  
58 52 lastClickedButton = -1;
59   - lastClickedCookButton = -1;
  53 + lastClickedRecentCook = -1;
60 54 trashClicked = false;
61 55  
62 56 updateViewTimer.start(100);
... ... @@ -161,6 +155,8 @@ void MultiCookWindow::updateView()
161 155 .arg(currentTime.hour(), 2, 10, QLatin1Char('0'))
162 156 .arg(currentTime.minute(), 2, 10, QLatin1Char('0')));
163 157  
  158 + QString infoText;
  159 +
164 160 for (int i = 0; i < 10; i++)
165 161 {
166 162 QPushButton *button = buttons.at(i);
... ... @@ -169,12 +165,94 @@ void MultiCookWindow::updateView()
169 165 if (cook == Q_NULLPTR)
170 166 button->setText("-");
171 167 else
  168 + {
  169 + if (cook->remainingTime() <= 0)
  170 + {
  171 + if (!infoText.isEmpty())
  172 + infoText += "\n";
  173 +
  174 + infoText += tr("%1번 단 요리(%2)가 종료되었습니다")
  175 + .arg(i + 1).arg(cook->name());
  176 + }
  177 +
172 178 button->setText(Stringer::time(cook->remainingTime()));
  179 + }
  180 + }
  181 +
  182 + if (!infoText.isEmpty())
  183 + {
  184 + ui->upperStack->setCurrentIndex(2);
  185 + ui->info->setText(infoText);
  186 + }
  187 + else if (ui->upperStack->currentIndex() == 2)
  188 + ui->upperStack->setCurrentIndex(0);
  189 +
  190 + if (ui->upperStack->currentIndex() == 1)
  191 + updateRecents();
  192 +}
  193 +
  194 +void MultiCookWindow::updateRecents()
  195 +{
  196 + if (favorites.size() > 0)
  197 + {
  198 + if (favorites.size() > 6)
  199 + {
  200 + int currentPage = ui->pageIndicator->currentIndex();
  201 + int from = currentPage * 6;
  202 + int to = qMin(6, favorites.size() - from) + from;
  203 +
  204 + for (int i = from; i < to; i++)
  205 + {
  206 + QPushButton *b = recentButtons.at(i - from);
  207 + b->show();
  208 + b->setText(favorites.at(i)->name());
  209 + }
  210 +
  211 + for (int i = to - from; i < 6; i++)
  212 + recentButtons.at(i)->hide();
  213 +
  214 + ui->showNextPageButton->show();
  215 + ui->showPrevPageButton->show();
  216 + ui->pageIndicator->show();
  217 + }
  218 + else
  219 + {
  220 + int max = qMin(6, favorites.size());
  221 + for (int i = 0; i < max; i++)
  222 + {
  223 + QPushButton *b = recentButtons.at(i);
  224 + b->show();
  225 + b->setText(favorites.at(i)->name());
  226 + }
  227 +
  228 + for (int i = max; i < 6; i++)
  229 + recentButtons.at(i)->hide();
  230 +
  231 + ui->showNextPageButton->hide();
  232 + ui->showPrevPageButton->hide();
  233 + ui->pageIndicator->hide();
  234 + }
  235 + }
  236 + else
  237 + {
  238 + foreach (QPushButton *b, recentButtons)
  239 + b->hide();
  240 +
  241 + ui->showNextPageButton->hide();
  242 + ui->showPrevPageButton->hide();
  243 + ui->pageIndicator->hide();
173 244 }
174 245 }
175 246  
176 247 void MultiCookWindow::handleButtonClick(int button)
177 248 {
  249 + if (lastClickedButton != -1)
  250 + {
  251 + MultiCook *cook = container->at(lastClickedButton);
  252 + if (cook)
  253 + cook->setTime();
  254 + }
  255 +
178 256 MultiCook *cook = container->at(button);
179 257 if (cook)
180 258 {
... ... @@ -186,20 +264,17 @@ void MultiCookWindow::handleButtonClick(int button)
186 264 }
187 265 else
188 266 {
189   - if (lastClickedButton == -1)
190   - lastClickedButton = button;
191   - else
192   - cook->setTime();
  267 + lastClickedButton = button;
193 268 }
194 269 }
195 270 else
196 271 {
197   - if (lastClickedCookButton != -1)
  272 + if (lastClickedRecentCook != -1)
198 273 {
199   - MultiCook *c = favorites.at(lastClickedCookButton)->clone(this);
  274 + MultiCook *c = favorites.at(lastClickedRecentCook)->clone(this);
200 275 addCook(button, c);
201 276  
202   - lastClickedCookButton = -1;
  277 + lastClickedRecentCook = -1;
203 278 }
204 279 else
205 280 {
... ... @@ -213,9 +288,9 @@ void MultiCookWindow::handleButtonClick(int button)
213 288 }
214 289 }
215 290  
216   -void MultiCookWindow::handleFavoriteButtonClick(int button)
  291 +void MultiCookWindow::handleRecentButtonClick(int button)
217 292 {
218   - lastClickedCookButton = button;
  293 + lastClickedRecentCook = button + ui->pageIndicator->currentIndex() * 6;
219 294 }
220 295  
221 296 void MultiCookWindow::selectCook()
... ... @@ -243,21 +318,15 @@ void MultiCookWindow::onCookSelected(MultiCook *cook)
243 318 }
244 319 }
245 320  
246   -void MultiCookWindow::showFavorites()
  321 +void MultiCookWindow::showRecents()
247 322 {
248 323 favorites = MultiCookRecorder::list();
249 324  
250   - int max = qMin(12, favorites.size());
251   - for (int i = 0; i < max; i++)
252   - {
253   - cookButtons.at(i)->show();
254   - cookButtons.at(i)->setText(favorites.at(i)->name());
255   - }
256   -
257   - for (int i = max; i < 12; i++)
258   - cookButtons.at(i)->hide();
259   -
260 325 ui->upperStack->setCurrentIndex(1);
  326 + ui->pageIndicator->setMaximum(favorites.size() / 6);
  327 + ui->pageIndicator->setCurrentIndex(0);
  328 +
  329 + updateRecents();
261 330 }
262 331  
263 332 void MultiCookWindow::showClock()
... ... @@ -310,7 +379,7 @@ void MultiCookWindow::on_showNextButton_clicked()
310 379 void MultiCookWindow::on_showFavoritesButton_clicked()
311 380 {
312 381 if (ui->upperStack->currentIndex() == 0)
313   - showFavorites();
  382 + showRecents();
314 383 else
315 384 showClock();
316 385 }
... ... @@ -477,62 +546,44 @@ void MultiCookWindow::on_selectButton_10_clicked()
477 546 handleButtonClick(9);
478 547 }
479 548  
480   -void MultiCookWindow::on_cookButton_1_clicked()
481   -{
482   - handleFavoriteButtonClick(0);
483   -}
484   -
485   -void MultiCookWindow::on_cookButton_2_clicked()
486   -{
487   - handleFavoriteButtonClick(1);
488   -}
489   -
490   -void MultiCookWindow::on_cookButton_3_clicked()
491   -{
492   - handleFavoriteButtonClick(2);
493   -}
494   -
495   -void MultiCookWindow::on_cookButton_4_clicked()
496   -{
497   - handleFavoriteButtonClick(3);
498   -}
499   -
500   -void MultiCookWindow::on_cookButton_5_clicked()
  549 +void MultiCookWindow::on_recentButton_1_clicked()
501 550 {
502   - handleFavoriteButtonClick(4);
  551 + handleRecentButtonClick(0);
503 552 }
504 553  
505   -void MultiCookWindow::on_cookButton_6_clicked()
  554 +void MultiCookWindow::on_recentButton_2_clicked()
506 555 {
507   - handleFavoriteButtonClick(5);
  556 + handleRecentButtonClick(1);
508 557 }
509 558  
510   -void MultiCookWindow::on_cookButton_7_clicked()
  559 +void MultiCookWindow::on_recentButton_3_clicked()
511 560 {
512   - handleFavoriteButtonClick(6);
  561 + handleRecentButtonClick(2);
513 562 }
514 563  
515   -void MultiCookWindow::on_cookButton_8_clicked()
  564 +void MultiCookWindow::on_recentButton_4_clicked()
516 565 {
517   - handleFavoriteButtonClick(7);
  566 + handleRecentButtonClick(3);
518 567 }
519 568  
520   -void MultiCookWindow::on_cookButton_9_clicked()
  569 +void MultiCookWindow::on_recentButton_5_clicked()
521 570 {
522   - handleFavoriteButtonClick(8);
  571 + handleRecentButtonClick(4);
523 572 }
524 573  
525   -void MultiCookWindow::on_cookButton_10_clicked()
  574 +void MultiCookWindow::on_recentButton_6_clicked()
526 575 {
527   - handleFavoriteButtonClick(9);
  576 + handleRecentButtonClick(5);
528 577 }
529 578  
530   -void MultiCookWindow::on_cookButton_11_clicked()
  579 +void MultiCookWindow::on_showPrevPageButton_clicked()
531 580 {
532   - handleFavoriteButtonClick(10);
  581 + ui->pageIndicator->setCurrentIndex(ui->pageIndicator->currentIndex() - 1);
  582 + updateView();
533 583 }
534 584  
535   -void MultiCookWindow::on_cookButton_12_clicked()
  585 +void MultiCookWindow::on_showNextPageButton_clicked()
536 586 {
537   - handleFavoriteButtonClick(11);
  587 + ui->pageIndicator->setCurrentIndex(ui->pageIndicator->currentIndex() + 1);
  588 + updateView();
538 589 }
... ...
app/gui/oven_control/multicookwindow.h
  Diff comments   View file @703beed
... ... @@ -25,11 +25,12 @@ protected:
25 25  
26 26 private slots:
27 27 void updateView();
  28 + void updateRecents();
28 29 void handleButtonClick(int button);
29   - void handleFavoriteButtonClick(int button);
  30 + void handleRecentButtonClick(int button);
30 31 void selectCook();
31 32 void onCookSelected(MultiCook *cook);
32   - void showFavorites();
  33 + void showRecents();
33 34 void showClock();
34 35 void addCook(int slot, MultiCook *cook);
35 36 void jumpConfig();
... ... @@ -61,18 +62,15 @@ private slots:
61 62 void on_selectButton_9_clicked();
62 63 void on_selectButton_10_clicked();
63 64  
64   - void on_cookButton_1_clicked();
65   - void on_cookButton_2_clicked();
66   - void on_cookButton_3_clicked();
67   - void on_cookButton_4_clicked();
68   - void on_cookButton_5_clicked();
69   - void on_cookButton_6_clicked();
70   - void on_cookButton_7_clicked();
71   - void on_cookButton_8_clicked();
72   - void on_cookButton_9_clicked();
73   - void on_cookButton_10_clicked();
74   - void on_cookButton_11_clicked();
75   - void on_cookButton_12_clicked();
  65 + void on_recentButton_1_clicked();
  66 + void on_recentButton_2_clicked();
  67 + void on_recentButton_3_clicked();
  68 + void on_recentButton_4_clicked();
  69 + void on_recentButton_5_clicked();
  70 + void on_recentButton_6_clicked();
  71 +
  72 + void on_showPrevPageButton_clicked();
  73 + void on_showNextPageButton_clicked();
76 74  
77 75 private:
78 76 Ui::MultiCookWindow *ui;
... ... @@ -81,12 +79,12 @@ private:
81 79 MultiCookController *controller;
82 80  
83 81 QList<QPushButton *> buttons;
84   - QList<QPushButton *> cookButtons;
  82 + QList<QPushButton *> recentButtons;
85 83 QList<MultiCook *> favorites;
86 84 QTimer updateViewTimer;
87 85  
88 86 int lastClickedButton;
89   - int lastClickedCookButton;
  87 + int lastClickedRecentCook;
90 88 bool trashClicked;
91 89  
92 90 Define::Mode mode;
... ...
app/gui/oven_control/multicookwindow.ui
  Diff comments   View file @703beed
... ... @@ -14,14 +14,17 @@
14 14 <string>MainWindow</string>
15 15 </property>
16 16 <property name="styleSheet">
17   - <string notr="true">#centralwidget { background-image: url(:/images/background/original.png); }
  17 + <string notr="true">#centralwidget { background-image: url(:/images/background/multi.png); }
18 18 #bottomBar { background-image: url(:/images/bottom_bar/background.png); }
  19 +#closeDoorAnimationArea,
  20 +#openDoorAnimationArea
  21 +{ background-image: url(:/images/background/popup/509.png); }
19 22  
20   -QWidget { etch-disabled-text: 0; }
21 23 QPushButton {
22 24 background-position: center;
23 25 background-repeat: no-repeat;
24 26 border: none;
  27 +color: black;
25 28 }
26 29  
27 30 QPushButton[style=&quot;select&quot;]
... ... @@ -45,14 +48,14 @@ QLabel[style=&amp;quot;slotLabel&amp;quot;] { color: #C4C4C4; font-size: 24px; font-styl
45 48 <x>0</x>
46 49 <y>426</y>
47 50 <width>900</width>
48   - <height>1024</height>
  51 + <height>509</height>
49 52 </rect>
50 53 </property>
51 54 <widget class="AnimatedImageBox" name="closeDoorAnimation">
52 55 <property name="geometry">
53 56 <rect>
54 57 <x>366</x>
55   - <y>366</y>
  58 + <y>40</y>
56 59 <width>251</width>
57 60 <height>292</height>
58 61 </rect>
... ... @@ -62,7 +65,7 @@ QLabel[style=&amp;quot;slotLabel&amp;quot;] { color: #C4C4C4; font-size: 24px; font-styl
62 65 <property name="geometry">
63 66 <rect>
64 67 <x>440</x>
65   - <y>520</y>
  68 + <y>194</y>
66 69 <width>85</width>
67 70 <height>24</height>
68 71 </rect>
... ... @@ -71,6 +74,46 @@ QLabel[style=&amp;quot;slotLabel&amp;quot;] { color: #C4C4C4; font-size: 24px; font-styl
71 74 <pixmap resource="resources.qrc">:/images/animation/close_door_arrow.png</pixmap>
72 75 </property>
73 76 </widget>
  77 + <widget class="QLabel" name="label_9">
  78 + <property name="geometry">
  79 + <rect>
  80 + <x>220</x>
  81 + <y>380</y>
  82 + <width>100</width>
  83 + <height>100</height>
  84 + </rect>
  85 + </property>
  86 + <property name="pixmap">
  87 + <pixmap resource="resources.qrc">:/images/symbol/warning_medium.png</pixmap>
  88 + </property>
  89 + <property name="alignment">
  90 + <set>Qt::AlignCenter</set>
  91 + </property>
  92 + </widget>
  93 + <widget class="QLabel" name="label_10">
  94 + <property name="geometry">
  95 + <rect>
  96 + <x>329</x>
  97 + <y>380</y>
  98 + <width>571</width>
  99 + <height>100</height>
  100 + </rect>
  101 + </property>
  102 + <property name="font">
  103 + <font>
  104 + <pointsize>10</pointsize>
  105 + <weight>75</weight>
  106 + <bold>true</bold>
  107 + </font>
  108 + </property>
  109 + <property name="styleSheet">
  110 + <string notr="true">color: white;</string>
  111 + </property>
  112 + <property name="text">
  113 + <string>문이 열려있습니다
  114 +문을 닫으시면 다시 시작됩니다</string>
  115 + </property>
  116 + </widget>
74 117 </widget>
75 118 <widget class="QWidget" name="openDoorAnimationArea" native="true">
76 119 <property name="geometry">
... ... @@ -78,14 +121,14 @@ QLabel[style=&amp;quot;slotLabel&amp;quot;] { color: #C4C4C4; font-size: 24px; font-styl
78 121 <x>0</x>
79 122 <y>426</y>
80 123 <width>900</width>
81   - <height>1024</height>
  124 + <height>509</height>
82 125 </rect>
83 126 </property>
84 127 <widget class="AnimatedImageBox" name="openDoorAnimation">
85 128 <property name="geometry">
86 129 <rect>
87 130 <x>366</x>
88   - <y>366</y>
  131 + <y>40</y>
89 132 <width>251</width>
90 133 <height>292</height>
91 134 </rect>
... ... @@ -95,7 +138,7 @@ QLabel[style=&amp;quot;slotLabel&amp;quot;] { color: #C4C4C4; font-size: 24px; font-styl
95 138 <property name="geometry">
96 139 <rect>
97 140 <x>440</x>
98   - <y>520</y>
  141 + <y>194</y>
99 142 <width>85</width>
100 143 <height>24</height>
101 144 </rect>
... ... @@ -104,6 +147,45 @@ QLabel[style=&amp;quot;slotLabel&amp;quot;] { color: #C4C4C4; font-size: 24px; font-styl
104 147 <pixmap resource="resources.qrc">:/images/animation/open_door_arrow.png</pixmap>
105 148 </property>
106 149 </widget>
  150 + <widget class="QLabel" name="label_7">
  151 + <property name="geometry">
  152 + <rect>
  153 + <x>370</x>
  154 + <y>380</y>
  155 + <width>531</width>
  156 + <height>100</height>
  157 + </rect>
  158 + </property>
  159 + <property name="font">
  160 + <font>
  161 + <pointsize>10</pointsize>
  162 + <weight>75</weight>
  163 + <bold>true</bold>
  164 + </font>
  165 + </property>
  166 + <property name="styleSheet">
  167 + <string notr="true">color: white;</string>
  168 + </property>
  169 + <property name="text">
  170 + <string>문을 열어주세요</string>
  171 + </property>
  172 + </widget>
  173 + <widget class="QLabel" name="label_8">
  174 + <property name="geometry">
  175 + <rect>
  176 + <x>260</x>
  177 + <y>380</y>
  178 + <width>100</width>
  179 + <height>100</height>
  180 + </rect>
  181 + </property>
  182 + <property name="pixmap">
  183 + <pixmap resource="resources.qrc">:/images/symbol/warning_medium.png</pixmap>
  184 + </property>
  185 + <property name="alignment">
  186 + <set>Qt::AlignCenter</set>
  187 + </property>
  188 + </widget>
107 189 </widget>
108 190 <widget class="QWidget" name="blockingArea" native="true">
109 191 <property name="geometry">
... ... @@ -118,9 +200,9 @@ QLabel[style=&amp;quot;slotLabel&amp;quot;] { color: #C4C4C4; font-size: 24px; font-styl
118 200 <property name="geometry">
119 201 <rect>
120 202 <x>0</x>
121   - <y>1314</y>
  203 + <y>1329</y>
122 204 <width>70</width>
123   - <height>136</height>
  205 + <height>121</height>
124 206 </rect>
125 207 </property>
126 208 <property name="styleSheet">
... ... @@ -135,9 +217,9 @@ QPushButton:focus
135 217 <property name="geometry">
136 218 <rect>
137 219 <x>830</x>
138   - <y>1314</y>
  220 + <y>1329</y>
139 221 <width>70</width>
140   - <height>136</height>
  222 + <height>121</height>
141 223 </rect>
142 224 </property>
143 225 <property name="styleSheet">
... ... @@ -152,9 +234,9 @@ QPushButton:focus
152 234 <property name="geometry">
153 235 <rect>
154 236 <x>70</x>
155   - <y>1314</y>
  237 + <y>1329</y>
156 238 <width>85</width>
157   - <height>136</height>
  239 + <height>121</height>
158 240 </rect>
159 241 </property>
160 242 <property name="font">
... ... @@ -166,7 +248,7 @@ QPushButton:focus
166 248 </property>
167 249 <property name="styleSheet">
168 250 <string notr="true">QPushButton
169   -{ background-image: url(:/images/multi/button.png); font-size: 24px; font-weight: bold; }
  251 +{ background-image: url(:/images/multi/button.png); font-size: 24px; font-weight: bold; color: black; }
170 252 QPushButton:pressed,
171 253 QPushButton:focus
172 254 { background-image: url(:/images/multi/button_ov.png); }</string>
... ... @@ -176,9 +258,9 @@ QPushButton:focus
176 258 <property name="geometry">
177 259 <rect>
178 260 <x>160</x>
179   - <y>1314</y>
  261 + <y>1329</y>
180 262 <width>85</width>
181   - <height>136</height>
  263 + <height>121</height>
182 264 </rect>
183 265 </property>
184 266 <property name="styleSheet">
... ... @@ -190,7 +272,8 @@ QPushButton:focus
190 272 </property>
191 273 <property name="icon">
192 274 <iconset resource="resources.qrc">
193   - <normaloff>:/images/multi/icon_prime.png</normaloff>:/images/multi/icon_prime.png</iconset>
  275 + <normaloff>:/images/multi/icon_prime.png</normaloff>
  276 + <disabledoff>:/images/multi/icon_prime.png</disabledoff>:/images/multi/icon_prime.png</iconset>
194 277 </property>
195 278 <property name="iconSize">
196 279 <size>
... ... @@ -203,9 +286,9 @@ QPushButton:focus
203 286 <property name="geometry">
204 287 <rect>
205 288 <x>215</x>
206   - <y>554</y>
  289 + <y>551</y>
207 290 <width>685</width>
208   - <height>760</height>
  291 + <height>771</height>
209 292 </rect>
210 293 </property>
211 294 </widget>
... ... @@ -213,9 +296,9 @@ QPushButton:focus
213 296 <property name="geometry">
214 297 <rect>
215 298 <x>200</x>
216   - <y>1314</y>
  299 + <y>1329</y>
217 300 <width>700</width>
218   - <height>136</height>
  301 + <height>121</height>
219 302 </rect>
220 303 </property>
221 304 <property name="font">
... ... @@ -229,9 +312,9 @@ QPushButton:focus
229 312 <property name="geometry">
230 313 <rect>
231 314 <x>0</x>
232   - <y>554</y>
  315 + <y>551</y>
233 316 <width>200</width>
234   - <height>76</height>
  317 + <height>77</height>
235 318 </rect>
236 319 </property>
237 320 <property name="style" stdset="0">
... ... @@ -242,9 +325,9 @@ QPushButton:focus
242 325 <property name="geometry">
243 326 <rect>
244 327 <x>0</x>
245   - <y>630</y>
  328 + <y>628</y>
246 329 <width>200</width>
247   - <height>76</height>
  330 + <height>77</height>
248 331 </rect>
249 332 </property>
250 333 <property name="style" stdset="0">
... ... @@ -255,9 +338,9 @@ QPushButton:focus
255 338 <property name="geometry">
256 339 <rect>
257 340 <x>0</x>
258   - <y>706</y>
  341 + <y>705</y>
259 342 <width>200</width>
260   - <height>76</height>
  343 + <height>77</height>
261 344 </rect>
262 345 </property>
263 346 <property name="style" stdset="0">
... ... @@ -270,7 +353,7 @@ QPushButton:focus
270 353 <x>0</x>
271 354 <y>782</y>
272 355 <width>200</width>
273   - <height>76</height>
  356 + <height>77</height>
274 357 </rect>
275 358 </property>
276 359 <property name="style" stdset="0">
... ... @@ -281,9 +364,9 @@ QPushButton:focus
281 364 <property name="geometry">
282 365 <rect>
283 366 <x>0</x>
284   - <y>858</y>
  367 + <y>859</y>
285 368 <width>200</width>
286   - <height>76</height>
  369 + <height>77</height>
287 370 </rect>
288 371 </property>
289 372 <property name="style" stdset="0">
... ... @@ -294,9 +377,9 @@ QPushButton:focus
294 377 <property name="geometry">
295 378 <rect>
296 379 <x>0</x>
297   - <y>934</y>
  380 + <y>936</y>
298 381 <width>200</width>
299   - <height>76</height>
  382 + <height>77</height>
300 383 </rect>
301 384 </property>
302 385 <property name="style" stdset="0">
... ... @@ -307,9 +390,9 @@ QPushButton:focus
307 390 <property name="geometry">
308 391 <rect>
309 392 <x>0</x>
310   - <y>1010</y>
  393 + <y>1013</y>
311 394 <width>200</width>
312   - <height>76</height>
  395 + <height>77</height>
313 396 </rect>
314 397 </property>
315 398 <property name="style" stdset="0">
... ... @@ -320,9 +403,9 @@ QPushButton:focus
320 403 <property name="geometry">
321 404 <rect>
322 405 <x>0</x>
323   - <y>1086</y>
  406 + <y>1090</y>
324 407 <width>200</width>
325   - <height>76</height>
  408 + <height>77</height>
326 409 </rect>
327 410 </property>
328 411 <property name="style" stdset="0">
... ... @@ -333,9 +416,9 @@ QPushButton:focus
333 416 <property name="geometry">
334 417 <rect>
335 418 <x>0</x>
336   - <y>1162</y>
  419 + <y>1167</y>
337 420 <width>200</width>
338   - <height>76</height>
  421 + <height>77</height>
339 422 </rect>
340 423 </property>
341 424 <property name="style" stdset="0">
... ... @@ -346,9 +429,9 @@ QPushButton:focus
346 429 <property name="geometry">
347 430 <rect>
348 431 <x>0</x>
349   - <y>1238</y>
  432 + <y>1244</y>
350 433 <width>200</width>
351   - <height>76</height>
  434 + <height>77</height>
352 435 </rect>
353 436 </property>
354 437 <property name="style" stdset="0">
... ... @@ -422,9 +505,9 @@ QPushButton:focus
422 505 </property>
423 506 </widget>
424 507 </widget>
425   - <widget class="QWidget" name="favoritesContainer">
  508 + <widget class="QWidget" name="recentsContainer">
426 509 <property name="styleSheet">
427   - <string notr="true">#progressContainer { background-image: url(:/images/clock/background.png); }</string>
  510 + <string notr="true">#recentsContainer { background-image: url(:/images/clock/background.png); }</string>
428 511 </property>
429 512 <widget class="QLabel" name="titleLabel">
430 513 <property name="enabled">
... ... @@ -435,46 +518,9 @@ QPushButton:focus
435 518 <x>0</x>
436 519 <y>0</y>
437 520 <width>900</width>
438   - <height>88</height>
  521 + <height>130</height>
439 522 </rect>
440 523 </property>
441   - <property name="palette">
442   - <palette>
443   - <active>
444   - <colorrole role="WindowText">
445   - <brush brushstyle="SolidPattern">
446   - <color alpha="255">
447   - <red>255</red>
448   - <green>255</green>
449   - <blue>255</blue>
450   - </color>
451   - </brush>
452   - </colorrole>
453   - </active>
454   - <inactive>
455   - <colorrole role="WindowText">
456   - <brush brushstyle="SolidPattern">
457   - <color alpha="255">
458   - <red>255</red>
459   - <green>255</green>
460   - <blue>255</blue>
461   - </color>
462   - </brush>
463   - </colorrole>
464   - </inactive>
465   - <disabled>
466   - <colorrole role="WindowText">
467   - <brush brushstyle="SolidPattern">
468   - <color alpha="255">
469   - <red>123</red>
470   - <green>123</green>
471   - <blue>123</blue>
472   - </color>
473   - </brush>
474   - </colorrole>
475   - </disabled>
476   - </palette>
477   - </property>
478 524 <property name="font">
479 525 <font>
480 526 <family>Roboto</family>
... ... @@ -483,31 +529,23 @@ QPushButton:focus
483 529 <bold>true</bold>
484 530 </font>
485 531 </property>
  532 + <property name="styleSheet">
  533 + <string notr="true">color: white;
  534 +font-size: 13pt;
  535 +font-weight: bold;</string>
  536 + </property>
486 537 <property name="text">
487   - <string>다중 요리 즐겨찾기 목록입니다</string>
  538 + <string>다중 요리 최근 요리 목록입니다</string>
488 539 </property>
489 540 <property name="alignment">
490 541 <set>Qt::AlignCenter</set>
491 542 </property>
492 543 </widget>
493   - <widget class="Line" name="line">
494   - <property name="geometry">
495   - <rect>
496   - <x>0</x>
497   - <y>88</y>
498   - <width>900</width>
499   - <height>1</height>
500   - </rect>
501   - </property>
502   - <property name="orientation">
503   - <enum>Qt::Horizontal</enum>
504   - </property>
505   - </widget>
506   - <widget class="QPushButton" name="cookButton_1">
  544 + <widget class="QPushButton" name="recentButton_1">
507 545 <property name="geometry">
508 546 <rect>
509 547 <x>0</x>
510   - <y>102</y>
  548 + <y>130</y>
511 549 <width>300</width>
512 550 <height>70</height>
513 551 </rect>
... ... @@ -522,11 +560,11 @@ QPushButton:focus
522 560 <string notr="true">favorite</string>
523 561 </property>
524 562 </widget>
525   - <widget class="QPushButton" name="cookButton_2">
  563 + <widget class="QPushButton" name="recentButton_2">
526 564 <property name="geometry">
527 565 <rect>
528 566 <x>300</x>
529   - <y>102</y>
  567 + <y>130</y>
530 568 <width>300</width>
531 569 <height>70</height>
532 570 </rect>
... ... @@ -541,11 +579,11 @@ QPushButton:focus
541 579 <string notr="true">favorite</string>
542 580 </property>
543 581 </widget>
544   - <widget class="QPushButton" name="cookButton_3">
  582 + <widget class="QPushButton" name="recentButton_3">
545 583 <property name="geometry">
546 584 <rect>
547 585 <x>600</x>
548   - <y>102</y>
  586 + <y>130</y>
549 587 <width>300</width>
550 588 <height>70</height>
551 589 </rect>
... ... @@ -560,11 +598,11 @@ QPushButton:focus
560 598 <string notr="true">favorite</string>
561 599 </property>
562 600 </widget>
563   - <widget class="QPushButton" name="cookButton_4">
  601 + <widget class="QPushButton" name="recentButton_4">
564 602 <property name="geometry">
565 603 <rect>
566 604 <x>0</x>
567   - <y>182</y>
  605 + <y>210</y>
568 606 <width>300</width>
569 607 <height>70</height>
570 608 </rect>
... ... @@ -579,11 +617,11 @@ QPushButton:focus
579 617 <string notr="true">favorite</string>
580 618 </property>
581 619 </widget>
582   - <widget class="QPushButton" name="cookButton_6">
  620 + <widget class="QPushButton" name="recentButton_6">
583 621 <property name="geometry">
584 622 <rect>
585 623 <x>600</x>
586   - <y>182</y>
  624 + <y>210</y>
587 625 <width>300</width>
588 626 <height>70</height>
589 627 </rect>
... ... @@ -598,11 +636,11 @@ QPushButton:focus
598 636 <string notr="true">favorite</string>
599 637 </property>
600 638 </widget>
601   - <widget class="QPushButton" name="cookButton_5">
  639 + <widget class="QPushButton" name="recentButton_5">
602 640 <property name="geometry">
603 641 <rect>
604 642 <x>300</x>
605   - <y>182</y>
  643 + <y>210</y>
606 644 <width>300</width>
607 645 <height>70</height>
608 646 </rect>
... ... @@ -617,118 +655,77 @@ QPushButton:focus
617 655 <string notr="true">favorite</string>
618 656 </property>
619 657 </widget>
620   - <widget class="QPushButton" name="cookButton_9">
  658 + <widget class="QPushButton" name="showNextPageButton">
621 659 <property name="geometry">
622 660 <rect>
623   - <x>600</x>
624   - <y>262</y>
625   - <width>300</width>
626   - <height>70</height>
  661 + <x>815</x>
  662 + <y>300</y>
  663 + <width>85</width>
  664 + <height>100</height>
627 665 </rect>
628 666 </property>
629   - <property name="font">
630   - <font>
631   - <weight>75</weight>
632   - <bold>true</bold>
633   - </font>
  667 + <property name="styleSheet">
  668 + <string notr="true">QPushButton { background-image: url(:/images/auto_button/next_step.png); }
  669 +QPushButton::pressed, QPushButton:focus { background-image: url(:/images/auto_button/next_step_ov.png); }</string>
634 670 </property>
635   - <property name="style" stdset="0">
636   - <string notr="true">favorite</string>
  671 + <property name="text">
  672 + <string/>
637 673 </property>
638 674 </widget>
639   - <widget class="QPushButton" name="cookButton_7">
  675 + <widget class="QPushButton" name="showPrevPageButton">
640 676 <property name="geometry">
641 677 <rect>
642 678 <x>0</x>
643   - <y>262</y>
644   - <width>300</width>
645   - <height>70</height>
  679 + <y>300</y>
  680 + <width>85</width>
  681 + <height>100</height>
646 682 </rect>
647 683 </property>
648   - <property name="font">
649   - <font>
650   - <weight>75</weight>
651   - <bold>true</bold>
652   - </font>
  684 + <property name="styleSheet">
  685 + <string notr="true">QPushButton { background-image: url(:/images/auto_button/prev_step.png); }
  686 +QPushButton::pressed, QPushButton:focus { background-image: url(:/images/auto_button/prev_step_ov.png); }</string>
653 687 </property>
654   - <property name="style" stdset="0">
655   - <string notr="true">favorite</string>
  688 + <property name="text">
  689 + <string/>
656 690 </property>
657 691 </widget>
658   - <widget class="QPushButton" name="cookButton_8">
  692 + <widget class="BulletIndicator" name="pageIndicator" native="true">
659 693 <property name="geometry">
660 694 <rect>
661   - <x>300</x>
662   - <y>262</y>
663   - <width>300</width>
664   - <height>70</height>
  695 + <x>85</x>
  696 + <y>300</y>
  697 + <width>730</width>
  698 + <height>100</height>
665 699 </rect>
666 700 </property>
667   - <property name="font">
668   - <font>
669   - <weight>75</weight>
670   - <bold>true</bold>
671   - </font>
672   - </property>
673   - <property name="style" stdset="0">
674   - <string notr="true">favorite</string>
675   - </property>
676 701 </widget>
677   - <widget class="QPushButton" name="cookButton_10">
  702 + </widget>
  703 + <widget class="QWidget" name="infoContainer">
  704 + <property name="styleSheet">
  705 + <string notr="true">#infoContainer { background-image: url(:/images/clock/background.png); }</string>
  706 + </property>
  707 + <widget class="QLabel" name="info">
678 708 <property name="geometry">
679 709 <rect>
680 710 <x>0</x>
681   - <y>342</y>
682   - <width>300</width>
683   - <height>70</height>
684   - </rect>
685   - </property>
686   - <property name="font">
687   - <font>
688   - <weight>75</weight>
689   - <bold>true</bold>
690   - </font>
691   - </property>
692   - <property name="style" stdset="0">
693   - <string notr="true">favorite</string>
694   - </property>
695   - </widget>
696   - <widget class="QPushButton" name="cookButton_11">
697   - <property name="geometry">
698   - <rect>
699   - <x>300</x>
700   - <y>342</y>
701   - <width>300</width>
702   - <height>70</height>
  711 + <y>0</y>
  712 + <width>900</width>
  713 + <height>426</height>
703 714 </rect>
704 715 </property>
705 716 <property name="font">
706 717 <font>
707   - <weight>75</weight>
708   - <bold>true</bold>
  718 + <pointsize>12</pointsize>
709 719 </font>
710 720 </property>
711   - <property name="style" stdset="0">
712   - <string notr="true">favorite</string>
713   - </property>
714   - </widget>
715   - <widget class="QPushButton" name="cookButton_12">
716   - <property name="geometry">
717   - <rect>
718   - <x>600</x>
719   - <y>342</y>
720   - <width>300</width>
721   - <height>70</height>
722   - </rect>
  721 + <property name="styleSheet">
  722 + <string notr="true">color: white;</string>
723 723 </property>
724   - <property name="font">
725   - <font>
726   - <weight>75</weight>
727   - <bold>true</bold>
728   - </font>
  724 + <property name="text">
  725 + <string/>
729 726 </property>
730   - <property name="style" stdset="0">
731   - <string notr="true">favorite</string>
  727 + <property name="alignment">
  728 + <set>Qt::AlignCenter</set>
732 729 </property>
733 730 </widget>
734 731 </widget>
... ... @@ -737,9 +734,9 @@ QPushButton:focus
737 734 <property name="geometry">
738 735 <rect>
739 736 <x>170</x>
740   - <y>554</y>
  737 + <y>551</y>
741 738 <width>50</width>
742   - <height>76</height>
  739 + <height>77</height>
743 740 </rect>
744 741 </property>
745 742 <property name="font">
... ... @@ -761,9 +758,9 @@ QPushButton:focus
761 758 <property name="geometry">
762 759 <rect>
763 760 <x>170</x>
764   - <y>630</y>
  761 + <y>628</y>
765 762 <width>50</width>
766   - <height>76</height>
  763 + <height>77</height>
767 764 </rect>
768 765 </property>
769 766 <property name="font">
... ... @@ -785,9 +782,9 @@ QPushButton:focus
785 782 <property name="geometry">
786 783 <rect>
787 784 <x>170</x>
788   - <y>706</y>
  785 + <y>705</y>
789 786 <width>50</width>
790   - <height>76</height>
  787 + <height>77</height>
791 788 </rect>
792 789 </property>
793 790 <property name="font">
... ... @@ -811,7 +808,7 @@ QPushButton:focus
811 808 <x>170</x>
812 809 <y>782</y>
813 810 <width>50</width>
814   - <height>76</height>
  811 + <height>77</height>
815 812 </rect>
816 813 </property>
817 814 <property name="font">
... ... @@ -833,9 +830,9 @@ QPushButton:focus
833 830 <property name="geometry">
834 831 <rect>
835 832 <x>170</x>
836   - <y>858</y>
  833 + <y>859</y>
837 834 <width>50</width>
838   - <height>76</height>
  835 + <height>77</height>
839 836 </rect>
840 837 </property>
841 838 <property name="font">
... ... @@ -857,9 +854,9 @@ QPushButton:focus
857 854 <property name="geometry">
858 855 <rect>
859 856 <x>170</x>
860   - <y>934</y>
  857 + <y>936</y>
861 858 <width>50</width>
862   - <height>76</height>
  859 + <height>77</height>
863 860 </rect>
864 861 </property>
865 862 <property name="font">
... ... @@ -881,9 +878,9 @@ QPushButton:focus
881 878 <property name="geometry">
882 879 <rect>
883 880 <x>170</x>
884   - <y>1010</y>
  881 + <y>1013</y>
885 882 <width>50</width>
886   - <height>76</height>
  883 + <height>77</height>
887 884 </rect>
888 885 </property>
889 886 <property name="font">
... ... @@ -905,9 +902,9 @@ QPushButton:focus
905 902 <property name="geometry">
906 903 <rect>
907 904 <x>170</x>
908   - <y>1086</y>
  905 + <y>1090</y>
909 906 <width>50</width>
910   - <height>76</height>
  907 + <height>77</height>
911 908 </rect>
912 909 </property>
913 910 <property name="font">
... ... @@ -929,9 +926,9 @@ QPushButton:focus
929 926 <property name="geometry">
930 927 <rect>
931 928 <x>170</x>
932   - <y>1162</y>
  929 + <y>1167</y>
933 930 <width>50</width>
934   - <height>76</height>
  931 + <height>77</height>
935 932 </rect>
936 933 </property>
937 934 <property name="font">
... ... @@ -953,9 +950,9 @@ QPushButton:focus
953 950 <property name="geometry">
954 951 <rect>
955 952 <x>170</x>
956   - <y>1238</y>
  953 + <y>1244</y>
957 954 <width>50</width>
958   - <height>76</height>
  955 + <height>77</height>
959 956 </rect>
960 957 </property>
961 958 <property name="font">
... ... @@ -979,7 +976,7 @@ QPushButton:focus
979 976 <x>0</x>
980 977 <y>426</y>
981 978 <width>125</width>
982   - <height>128</height>
  979 + <height>121</height>
983 980 </rect>
984 981 </property>
985 982 <property name="pixmap">
... ... @@ -995,7 +992,7 @@ QPushButton:focus
995 992 <x>750</x>
996 993 <y>426</y>
997 994 <width>150</width>
998   - <height>128</height>
  995 + <height>121</height>
999 996 </rect>
1000 997 </property>
1001 998 <property name="styleSheet">
... ... @@ -1007,7 +1004,8 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/button/
1007 1004 </property>
1008 1005 <property name="icon">
1009 1006 <iconset resource="resources.qrc">
1010   - <normaloff>:/images/auto_button/btn_icon_02.png</normaloff>:/images/auto_button/btn_icon_02.png</iconset>
  1007 + <normaloff>:/images/auto_button/btn_icon_02.png</normaloff>
  1008 + <disabledoff>:/images/auto_button/btn_icon_02.png</disabledoff>:/images/auto_button/btn_icon_02.png</iconset>
1011 1009 </property>
1012 1010 <property name="iconSize">
1013 1011 <size>
... ... @@ -1022,7 +1020,7 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/button/
1022 1020 <x>0</x>
1023 1021 <y>426</y>
1024 1022 <width>900</width>
1025   - <height>128</height>
  1023 + <height>121</height>
1026 1024 </rect>
1027 1025 </property>
1028 1026 <property name="text">
... ... @@ -1242,6 +1240,12 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0
1242 1240 <header>multicooktimebar.h</header>
1243 1241 <container>1</container>
1244 1242 </customwidget>
  1243 + <customwidget>
  1244 + <class>BulletIndicator</class>
  1245 + <extends>QWidget</extends>
  1246 + <header>bulletindicator.h</header>
  1247 + <container>1</container>
  1248 + </customwidget>
1245 1249 </customwidgets>
1246 1250 <tabstops>
1247 1251 <tabstop>selectButton_1</tabstop>
... ... @@ -1263,18 +1267,12 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0
1263 1267 <tabstop>washButton</tabstop>
1264 1268 <tabstop>deleteButton</tabstop>
1265 1269 <tabstop>helpButton</tabstop>
1266   - <tabstop>cookButton_1</tabstop>
1267   - <tabstop>cookButton_2</tabstop>
1268   - <tabstop>cookButton_3</tabstop>
1269   - <tabstop>cookButton_4</tabstop>
1270   - <tabstop>cookButton_5</tabstop>
1271   - <tabstop>cookButton_6</tabstop>
1272   - <tabstop>cookButton_7</tabstop>
1273   - <tabstop>cookButton_8</tabstop>
1274   - <tabstop>cookButton_9</tabstop>
1275   - <tabstop>cookButton_10</tabstop>
1276   - <tabstop>cookButton_11</tabstop>
1277   - <tabstop>cookButton_12</tabstop>
  1270 + <tabstop>recentButton_1</tabstop>
  1271 + <tabstop>recentButton_2</tabstop>
  1272 + <tabstop>recentButton_3</tabstop>
  1273 + <tabstop>recentButton_4</tabstop>
  1274 + <tabstop>recentButton_5</tabstop>
  1275 + <tabstop>recentButton_6</tabstop>
1278 1276 </tabstops>
1279 1277 <resources>
1280 1278 <include location="resources.qrc"/>
... ...
app/gui/oven_control/multimanualcook.cpp
  Diff comments   View file @703beed
... ... @@ -17,25 +17,26 @@ MultiManualCook::MultiManualCook(QObject *parent) : MultiCook(parent)
17 17  
18 18 QString MultiManualCook::name()
19 19 {
20   - QString n("%1, %2, %3");
21   - QString m;
22   - switch (mode_)
23   - {
24   - case Define::InvalidMode:
25   - m = "Invalid";
26   - break;
27   - case Define::SteamMode:
28   - m = "Steam";
29   - break;
30   - case Define::CombiMode:
31   - m = "Combi";
32   - break;
33   - case Define::DryMode:
34   - m = "Dry";
35   - break;
36   - }
37   -
38   - return n.arg(m).arg(temp).arg(hum);
  20 +// QString n("%1, %2, %3");
  21 +// QString m;
  22 +// switch (mode_)
  23 +// {
  24 +// case Define::InvalidMode:
  25 +// m = "Invalid";
  26 +// break;
  27 +// case Define::SteamMode:
  28 +// m = "Steam";
  29 +// break;
  30 +// case Define::CombiMode:
  31 +// m = "Combi";
  32 +// break;
  33 +// case Define::DryMode:
  34 +// m = "Dry";
  35 +// break;
  36 +// }
  37 +
  38 +// return n.arg(m).arg(temp).arg(hum);
  39 + return tr("수동 요리");
39 40 }
40 41  
41 42 Define::Mode MultiManualCook::mode()
... ...