diff --git a/app/gui/oven_control/multicookselectionwindow.cpp b/app/gui/oven_control/multicookselectionwindow.cpp index a5a7113..ef64797 100644 --- a/app/gui/oven_control/multicookselectionwindow.cpp +++ b/app/gui/oven_control/multicookselectionwindow.cpp @@ -79,6 +79,8 @@ void MultiCookSelectionWindow::updateView() { if (mode == Define::InvalidMode) { + ui->description->setText(tr("1. 다중 요리에서 사용할 요리 카테고리를 선택해주세요\n2. 스팀, 콤비, 건열 중에서 선택하시면 자동으로 다음 단계로 진행됩니다")); + ui->steamButton->setEnabled(true); ui->combiButton->setEnabled(true); ui->dryheatButton->setEnabled(true); @@ -93,6 +95,22 @@ void MultiCookSelectionWindow::updateView() } else { + QString modeString; + switch (mode) + { + case Define::SteamMode: + modeString = tr("스팀을"); + break; + case Define::CombiMode: + modeString = tr("콤비를"); + break; + case Define::DryMode: + modeString = tr("건열을"); + break; + } + + ui->description->setText(tr("1. %1 선택하였습니다\n2. 수동 메뉴 혹은 원하시는 자동 메뉴 상세 목록을 선택하세요").arg(modeString)); + ui->steamButton->setEnabled(mode == Define::SteamMode); ui->combiButton->setEnabled(mode == Define::CombiMode); ui->dryheatButton->setEnabled(mode == Define::DryMode); @@ -213,11 +231,6 @@ void MultiCookSelectionWindow::on_helpButton_clicked() } -void MultiCookSelectionWindow::on_okButton_clicked() -{ - -} - void MultiCookSelectionWindow::onEncoderLeft() { focusPreviousChild(); diff --git a/app/gui/oven_control/multicookselectionwindow.h b/app/gui/oven_control/multicookselectionwindow.h index cd34f86..c43e5e3 100644 --- a/app/gui/oven_control/multicookselectionwindow.h +++ b/app/gui/oven_control/multicookselectionwindow.h @@ -47,7 +47,6 @@ private slots: void on_backButton_clicked(); void on_helpButton_clicked(); - void on_okButton_clicked(); private: Ui::MultiCookSelectionWindow *ui; diff --git a/app/gui/oven_control/multicookselectionwindow.ui b/app/gui/oven_control/multicookselectionwindow.ui index 9076753..df295a8 100644 --- a/app/gui/oven_control/multicookselectionwindow.ui +++ b/app/gui/oven_control/multicookselectionwindow.ui @@ -529,7 +529,7 @@ QPushButton:disabled { background-image: url(:/images/cook_type/additional_hide. - 401 + 514 26 97 97 @@ -572,18 +572,24 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/b - + - 514 + 401 26 97 97 + + + 0 + 0 + + - QPushButton { border-image: url(:/images/bottom_bar/006_sys_icon_16.png); } -QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/006_sys_icon_16_ov.png); } + QPushButton { border-image: url(:/images/bottom_bar/config.png); } +QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/config_ov.png); } @@ -660,57 +666,44 @@ QPushButton:disabled { background-image: url(:/images/cook_type/fish_hide.png); #clockContainer { background-image: url(:/images/clock/background.png); } - + - 272 - 36 - 356 - 355 + 407 + 75 + 112 + 113 - - - - - 800 - 320 - 80 - 84 - + + :/images/symbol/info_shadow.png - + - 780 - 230 - 101 - 90 + 0 + 175 + 900 + 251 - - - - - 780 - 160 - 108 - 67 - + + + 13 + - - - - - 20 - 310 - 600 - 100 - + + color: white; +padding-left: 50px; +padding-right: 50px; + + + 1. 다중 요리에서 사용할 요리 카테고리를 선택해주세요 +2. 스팀, 콤비, 건열 중에서 선택하시면 자동으로 다음 단계로 진행됩니다 - - Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + true @@ -718,34 +711,6 @@ QPushButton:disabled { background-image: url(:/images/cook_type/fish_hide.png); - - - Clock - QWidget -
clock.h
- 1 - - - WashWarnIcon - QLabel -
washwarnicon.h
- - - DemoIcon - QLabel -
demoicon.h
- - - HalfEnergyIcon - QLabel -
halfenergyicon.h
- - - DigitalClock - QLabel -
digitalclock.h
- - steamButton combiButton @@ -760,8 +725,9 @@ QPushButton:disabled { background-image: url(:/images/cook_type/fish_hide.png); primeButton backButton helpButton - okButton - + + + diff --git a/app/gui/oven_control/multicookwindow.cpp b/app/gui/oven_control/multicookwindow.cpp index b15d186..5c7ea25 100644 --- a/app/gui/oven_control/multicookwindow.cpp +++ b/app/gui/oven_control/multicookwindow.cpp @@ -40,23 +40,17 @@ MultiCookWindow::MultiCookWindow(QWidget *parent) : buttons.append(ui->selectButton_9); buttons.append(ui->selectButton_10); - cookButtons.append(ui->cookButton_1); - cookButtons.append(ui->cookButton_2); - cookButtons.append(ui->cookButton_3); - cookButtons.append(ui->cookButton_4); - cookButtons.append(ui->cookButton_5); - cookButtons.append(ui->cookButton_6); - cookButtons.append(ui->cookButton_7); - cookButtons.append(ui->cookButton_8); - cookButtons.append(ui->cookButton_9); - cookButtons.append(ui->cookButton_10); - cookButtons.append(ui->cookButton_11); - cookButtons.append(ui->cookButton_12); + recentButtons.append(ui->recentButton_1); + recentButtons.append(ui->recentButton_2); + recentButtons.append(ui->recentButton_3); + recentButtons.append(ui->recentButton_4); + recentButtons.append(ui->recentButton_5); + recentButtons.append(ui->recentButton_6); mode = Define::InvalidMode; lastClickedButton = -1; - lastClickedCookButton = -1; + lastClickedRecentCook = -1; trashClicked = false; updateViewTimer.start(100); @@ -161,6 +155,8 @@ void MultiCookWindow::updateView() .arg(currentTime.hour(), 2, 10, QLatin1Char('0')) .arg(currentTime.minute(), 2, 10, QLatin1Char('0'))); + QString infoText; + for (int i = 0; i < 10; i++) { QPushButton *button = buttons.at(i); @@ -169,12 +165,94 @@ void MultiCookWindow::updateView() if (cook == Q_NULLPTR) button->setText("-"); else + { + if (cook->remainingTime() <= 0) + { + if (!infoText.isEmpty()) + infoText += "\n"; + + infoText += tr("%1번 단 요리(%2)가 종료되었습니다") + .arg(i + 1).arg(cook->name()); + } + button->setText(Stringer::time(cook->remainingTime())); + } + } + + if (!infoText.isEmpty()) + { + ui->upperStack->setCurrentIndex(2); + ui->info->setText(infoText); + } + else if (ui->upperStack->currentIndex() == 2) + ui->upperStack->setCurrentIndex(0); + + if (ui->upperStack->currentIndex() == 1) + updateRecents(); +} + +void MultiCookWindow::updateRecents() +{ + if (favorites.size() > 0) + { + if (favorites.size() > 6) + { + int currentPage = ui->pageIndicator->currentIndex(); + int from = currentPage * 6; + int to = qMin(6, favorites.size() - from) + from; + + for (int i = from; i < to; i++) + { + QPushButton *b = recentButtons.at(i - from); + b->show(); + b->setText(favorites.at(i)->name()); + } + + for (int i = to - from; i < 6; i++) + recentButtons.at(i)->hide(); + + ui->showNextPageButton->show(); + ui->showPrevPageButton->show(); + ui->pageIndicator->show(); + } + else + { + int max = qMin(6, favorites.size()); + for (int i = 0; i < max; i++) + { + QPushButton *b = recentButtons.at(i); + b->show(); + b->setText(favorites.at(i)->name()); + } + + for (int i = max; i < 6; i++) + recentButtons.at(i)->hide(); + + ui->showNextPageButton->hide(); + ui->showPrevPageButton->hide(); + ui->pageIndicator->hide(); + } + } + else + { + foreach (QPushButton *b, recentButtons) + b->hide(); + + ui->showNextPageButton->hide(); + ui->showPrevPageButton->hide(); + ui->pageIndicator->hide(); } } void MultiCookWindow::handleButtonClick(int button) { + if (lastClickedButton != -1) + { + MultiCook *cook = container->at(lastClickedButton); + if (cook) + cook->setTime(); + } + MultiCook *cook = container->at(button); if (cook) { @@ -186,20 +264,17 @@ void MultiCookWindow::handleButtonClick(int button) } else { - if (lastClickedButton == -1) - lastClickedButton = button; - else - cook->setTime(); + lastClickedButton = button; } } else { - if (lastClickedCookButton != -1) + if (lastClickedRecentCook != -1) { - MultiCook *c = favorites.at(lastClickedCookButton)->clone(this); + MultiCook *c = favorites.at(lastClickedRecentCook)->clone(this); addCook(button, c); - lastClickedCookButton = -1; + lastClickedRecentCook = -1; } else { @@ -213,9 +288,9 @@ void MultiCookWindow::handleButtonClick(int button) } } -void MultiCookWindow::handleFavoriteButtonClick(int button) +void MultiCookWindow::handleRecentButtonClick(int button) { - lastClickedCookButton = button; + lastClickedRecentCook = button + ui->pageIndicator->currentIndex() * 6; } void MultiCookWindow::selectCook() @@ -243,21 +318,15 @@ void MultiCookWindow::onCookSelected(MultiCook *cook) } } -void MultiCookWindow::showFavorites() +void MultiCookWindow::showRecents() { favorites = MultiCookRecorder::list(); - int max = qMin(12, favorites.size()); - for (int i = 0; i < max; i++) - { - cookButtons.at(i)->show(); - cookButtons.at(i)->setText(favorites.at(i)->name()); - } - - for (int i = max; i < 12; i++) - cookButtons.at(i)->hide(); - ui->upperStack->setCurrentIndex(1); + ui->pageIndicator->setMaximum(favorites.size() / 6); + ui->pageIndicator->setCurrentIndex(0); + + updateRecents(); } void MultiCookWindow::showClock() @@ -310,7 +379,7 @@ void MultiCookWindow::on_showNextButton_clicked() void MultiCookWindow::on_showFavoritesButton_clicked() { if (ui->upperStack->currentIndex() == 0) - showFavorites(); + showRecents(); else showClock(); } @@ -477,62 +546,44 @@ void MultiCookWindow::on_selectButton_10_clicked() handleButtonClick(9); } -void MultiCookWindow::on_cookButton_1_clicked() -{ - handleFavoriteButtonClick(0); -} - -void MultiCookWindow::on_cookButton_2_clicked() -{ - handleFavoriteButtonClick(1); -} - -void MultiCookWindow::on_cookButton_3_clicked() -{ - handleFavoriteButtonClick(2); -} - -void MultiCookWindow::on_cookButton_4_clicked() -{ - handleFavoriteButtonClick(3); -} - -void MultiCookWindow::on_cookButton_5_clicked() +void MultiCookWindow::on_recentButton_1_clicked() { - handleFavoriteButtonClick(4); + handleRecentButtonClick(0); } -void MultiCookWindow::on_cookButton_6_clicked() +void MultiCookWindow::on_recentButton_2_clicked() { - handleFavoriteButtonClick(5); + handleRecentButtonClick(1); } -void MultiCookWindow::on_cookButton_7_clicked() +void MultiCookWindow::on_recentButton_3_clicked() { - handleFavoriteButtonClick(6); + handleRecentButtonClick(2); } -void MultiCookWindow::on_cookButton_8_clicked() +void MultiCookWindow::on_recentButton_4_clicked() { - handleFavoriteButtonClick(7); + handleRecentButtonClick(3); } -void MultiCookWindow::on_cookButton_9_clicked() +void MultiCookWindow::on_recentButton_5_clicked() { - handleFavoriteButtonClick(8); + handleRecentButtonClick(4); } -void MultiCookWindow::on_cookButton_10_clicked() +void MultiCookWindow::on_recentButton_6_clicked() { - handleFavoriteButtonClick(9); + handleRecentButtonClick(5); } -void MultiCookWindow::on_cookButton_11_clicked() +void MultiCookWindow::on_showPrevPageButton_clicked() { - handleFavoriteButtonClick(10); + ui->pageIndicator->setCurrentIndex(ui->pageIndicator->currentIndex() - 1); + updateView(); } -void MultiCookWindow::on_cookButton_12_clicked() +void MultiCookWindow::on_showNextPageButton_clicked() { - handleFavoriteButtonClick(11); + ui->pageIndicator->setCurrentIndex(ui->pageIndicator->currentIndex() + 1); + updateView(); } diff --git a/app/gui/oven_control/multicookwindow.h b/app/gui/oven_control/multicookwindow.h index 9ab4152..e93562a 100644 --- a/app/gui/oven_control/multicookwindow.h +++ b/app/gui/oven_control/multicookwindow.h @@ -25,11 +25,12 @@ protected: private slots: void updateView(); + void updateRecents(); void handleButtonClick(int button); - void handleFavoriteButtonClick(int button); + void handleRecentButtonClick(int button); void selectCook(); void onCookSelected(MultiCook *cook); - void showFavorites(); + void showRecents(); void showClock(); void addCook(int slot, MultiCook *cook); void jumpConfig(); @@ -61,18 +62,15 @@ private slots: void on_selectButton_9_clicked(); void on_selectButton_10_clicked(); - void on_cookButton_1_clicked(); - void on_cookButton_2_clicked(); - void on_cookButton_3_clicked(); - void on_cookButton_4_clicked(); - void on_cookButton_5_clicked(); - void on_cookButton_6_clicked(); - void on_cookButton_7_clicked(); - void on_cookButton_8_clicked(); - void on_cookButton_9_clicked(); - void on_cookButton_10_clicked(); - void on_cookButton_11_clicked(); - void on_cookButton_12_clicked(); + void on_recentButton_1_clicked(); + void on_recentButton_2_clicked(); + void on_recentButton_3_clicked(); + void on_recentButton_4_clicked(); + void on_recentButton_5_clicked(); + void on_recentButton_6_clicked(); + + void on_showPrevPageButton_clicked(); + void on_showNextPageButton_clicked(); private: Ui::MultiCookWindow *ui; @@ -81,12 +79,12 @@ private: MultiCookController *controller; QList buttons; - QList cookButtons; + QList recentButtons; QList favorites; QTimer updateViewTimer; int lastClickedButton; - int lastClickedCookButton; + int lastClickedRecentCook; bool trashClicked; Define::Mode mode; diff --git a/app/gui/oven_control/multicookwindow.ui b/app/gui/oven_control/multicookwindow.ui index 68af0bf..55ba962 100644 --- a/app/gui/oven_control/multicookwindow.ui +++ b/app/gui/oven_control/multicookwindow.ui @@ -14,14 +14,17 @@ MainWindow - #centralwidget { background-image: url(:/images/background/original.png); } + #centralwidget { background-image: url(:/images/background/multi.png); } #bottomBar { background-image: url(:/images/bottom_bar/background.png); } +#closeDoorAnimationArea, +#openDoorAnimationArea +{ background-image: url(:/images/background/popup/509.png); } -QWidget { etch-disabled-text: 0; } QPushButton { background-position: center; background-repeat: no-repeat; border: none; +color: black; } QPushButton[style="select"] @@ -45,14 +48,14 @@ QLabel[style="slotLabel"] { color: #C4C4C4; font-size: 24px; font-styl 0 426 900 - 1024 + 509 366 - 366 + 40 251 292 @@ -62,7 +65,7 @@ QLabel[style="slotLabel"] { color: #C4C4C4; font-size: 24px; font-styl 440 - 520 + 194 85 24 @@ -71,6 +74,46 @@ QLabel[style="slotLabel"] { color: #C4C4C4; font-size: 24px; font-styl :/images/animation/close_door_arrow.png + + + + 220 + 380 + 100 + 100 + + + + :/images/symbol/warning_medium.png + + + Qt::AlignCenter + + + + + + 329 + 380 + 571 + 100 + + + + + 10 + 75 + true + + + + color: white; + + + 문이 열려있습니다 +문을 닫으시면 다시 시작됩니다 + + @@ -78,14 +121,14 @@ QLabel[style="slotLabel"] { color: #C4C4C4; font-size: 24px; font-styl 0 426 900 - 1024 + 509 366 - 366 + 40 251 292 @@ -95,7 +138,7 @@ QLabel[style="slotLabel"] { color: #C4C4C4; font-size: 24px; font-styl 440 - 520 + 194 85 24 @@ -104,6 +147,45 @@ QLabel[style="slotLabel"] { color: #C4C4C4; font-size: 24px; font-styl :/images/animation/open_door_arrow.png + + + + 370 + 380 + 531 + 100 + + + + + 10 + 75 + true + + + + color: white; + + + 문을 열어주세요 + + + + + + 260 + 380 + 100 + 100 + + + + :/images/symbol/warning_medium.png + + + Qt::AlignCenter + + @@ -118,9 +200,9 @@ QLabel[style="slotLabel"] { color: #C4C4C4; font-size: 24px; font-styl 0 - 1314 + 1329 70 - 136 + 121 @@ -135,9 +217,9 @@ QPushButton:focus 830 - 1314 + 1329 70 - 136 + 121 @@ -152,9 +234,9 @@ QPushButton:focus 70 - 1314 + 1329 85 - 136 + 121 @@ -166,7 +248,7 @@ QPushButton:focus QPushButton -{ background-image: url(:/images/multi/button.png); font-size: 24px; font-weight: bold; } +{ background-image: url(:/images/multi/button.png); font-size: 24px; font-weight: bold; color: black; } QPushButton:pressed, QPushButton:focus { background-image: url(:/images/multi/button_ov.png); } @@ -176,9 +258,9 @@ QPushButton:focus 160 - 1314 + 1329 85 - 136 + 121 @@ -190,7 +272,8 @@ QPushButton:focus - :/images/multi/icon_prime.png:/images/multi/icon_prime.png + :/images/multi/icon_prime.png + :/images/multi/icon_prime.png:/images/multi/icon_prime.png @@ -203,9 +286,9 @@ QPushButton:focus 215 - 554 + 551 685 - 760 + 771 @@ -213,9 +296,9 @@ QPushButton:focus 200 - 1314 + 1329 700 - 136 + 121 @@ -229,9 +312,9 @@ QPushButton:focus 0 - 554 + 551 200 - 76 + 77 @@ -242,9 +325,9 @@ QPushButton:focus 0 - 630 + 628 200 - 76 + 77 @@ -255,9 +338,9 @@ QPushButton:focus 0 - 706 + 705 200 - 76 + 77 @@ -270,7 +353,7 @@ QPushButton:focus 0 782 200 - 76 + 77 @@ -281,9 +364,9 @@ QPushButton:focus 0 - 858 + 859 200 - 76 + 77 @@ -294,9 +377,9 @@ QPushButton:focus 0 - 934 + 936 200 - 76 + 77 @@ -307,9 +390,9 @@ QPushButton:focus 0 - 1010 + 1013 200 - 76 + 77 @@ -320,9 +403,9 @@ QPushButton:focus 0 - 1086 + 1090 200 - 76 + 77 @@ -333,9 +416,9 @@ QPushButton:focus 0 - 1162 + 1167 200 - 76 + 77 @@ -346,9 +429,9 @@ QPushButton:focus 0 - 1238 + 1244 200 - 76 + 77 @@ -422,9 +505,9 @@ QPushButton:focus - + - #progressContainer { background-image: url(:/images/clock/background.png); } + #recentsContainer { background-image: url(:/images/clock/background.png); } @@ -435,46 +518,9 @@ QPushButton:focus 0 0 900 - 88 + 130 - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 123 - 123 - 123 - - - - - - Roboto @@ -483,31 +529,23 @@ QPushButton:focus true + + color: white; +font-size: 13pt; +font-weight: bold; + - 다중 요리 즐겨찾기 목록입니다 + 다중 요리 최근 요리 목록입니다 Qt::AlignCenter - - - - 0 - 88 - 900 - 1 - - - - Qt::Horizontal - - - + 0 - 102 + 130 300 70 @@ -522,11 +560,11 @@ QPushButton:focus favorite - + 300 - 102 + 130 300 70 @@ -541,11 +579,11 @@ QPushButton:focus favorite - + 600 - 102 + 130 300 70 @@ -560,11 +598,11 @@ QPushButton:focus favorite - + 0 - 182 + 210 300 70 @@ -579,11 +617,11 @@ QPushButton:focus favorite - + 600 - 182 + 210 300 70 @@ -598,11 +636,11 @@ QPushButton:focus favorite - + 300 - 182 + 210 300 70 @@ -617,118 +655,77 @@ QPushButton:focus favorite - + - 600 - 262 - 300 - 70 + 815 + 300 + 85 + 100 - - - 75 - true - + + QPushButton { background-image: url(:/images/auto_button/next_step.png); } +QPushButton::pressed, QPushButton:focus { background-image: url(:/images/auto_button/next_step_ov.png); } - - favorite + + - + 0 - 262 - 300 - 70 + 300 + 85 + 100 - - - 75 - true - + + QPushButton { background-image: url(:/images/auto_button/prev_step.png); } +QPushButton::pressed, QPushButton:focus { background-image: url(:/images/auto_button/prev_step_ov.png); } - - favorite + + - + - 300 - 262 - 300 - 70 + 85 + 300 + 730 + 100 - - - 75 - true - - - - favorite - - + + + + #infoContainer { background-image: url(:/images/clock/background.png); } + + 0 - 342 - 300 - 70 - - - - - 75 - true - - - - favorite - - - - - - 300 - 342 - 300 - 70 + 0 + 900 + 426 - 75 - true + 12 - - favorite - - - - - - 600 - 342 - 300 - 70 - + + color: white; - - - 75 - true - + + - - favorite + + Qt::AlignCenter @@ -737,9 +734,9 @@ QPushButton:focus 170 - 554 + 551 50 - 76 + 77 @@ -761,9 +758,9 @@ QPushButton:focus 170 - 630 + 628 50 - 76 + 77 @@ -785,9 +782,9 @@ QPushButton:focus 170 - 706 + 705 50 - 76 + 77 @@ -811,7 +808,7 @@ QPushButton:focus 170 782 50 - 76 + 77 @@ -833,9 +830,9 @@ QPushButton:focus 170 - 858 + 859 50 - 76 + 77 @@ -857,9 +854,9 @@ QPushButton:focus 170 - 934 + 936 50 - 76 + 77 @@ -881,9 +878,9 @@ QPushButton:focus 170 - 1010 + 1013 50 - 76 + 77 @@ -905,9 +902,9 @@ QPushButton:focus 170 - 1086 + 1090 50 - 76 + 77 @@ -929,9 +926,9 @@ QPushButton:focus 170 - 1162 + 1167 50 - 76 + 77 @@ -953,9 +950,9 @@ QPushButton:focus 170 - 1238 + 1244 50 - 76 + 77 @@ -979,7 +976,7 @@ QPushButton:focus 0 426 125 - 128 + 121 @@ -995,7 +992,7 @@ QPushButton:focus 750 426 150 - 128 + 121 @@ -1007,7 +1004,8 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/button/ - :/images/auto_button/btn_icon_02.png:/images/auto_button/btn_icon_02.png + :/images/auto_button/btn_icon_02.png + :/images/auto_button/btn_icon_02.png:/images/auto_button/btn_icon_02.png @@ -1022,7 +1020,7 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/button/ 0 426 900 - 128 + 121 @@ -1242,6 +1240,12 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0
multicooktimebar.h
1 + + BulletIndicator + QWidget +
bulletindicator.h
+ 1 + selectButton_1 @@ -1263,18 +1267,12 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/0 washButton deleteButton helpButton - cookButton_1 - cookButton_2 - cookButton_3 - cookButton_4 - cookButton_5 - cookButton_6 - cookButton_7 - cookButton_8 - cookButton_9 - cookButton_10 - cookButton_11 - cookButton_12 + recentButton_1 + recentButton_2 + recentButton_3 + recentButton_4 + recentButton_5 + recentButton_6 diff --git a/app/gui/oven_control/multimanualcook.cpp b/app/gui/oven_control/multimanualcook.cpp index 99de1ac..02819c6 100644 --- a/app/gui/oven_control/multimanualcook.cpp +++ b/app/gui/oven_control/multimanualcook.cpp @@ -17,25 +17,26 @@ MultiManualCook::MultiManualCook(QObject *parent) : MultiCook(parent) QString MultiManualCook::name() { - QString n("%1, %2, %3"); - QString m; - switch (mode_) - { - case Define::InvalidMode: - m = "Invalid"; - break; - case Define::SteamMode: - m = "Steam"; - break; - case Define::CombiMode: - m = "Combi"; - break; - case Define::DryMode: - m = "Dry"; - break; - } - - return n.arg(m).arg(temp).arg(hum); +// QString n("%1, %2, %3"); +// QString m; +// switch (mode_) +// { +// case Define::InvalidMode: +// m = "Invalid"; +// break; +// case Define::SteamMode: +// m = "Steam"; +// break; +// case Define::CombiMode: +// m = "Combi"; +// break; +// case Define::DryMode: +// m = "Dry"; +// break; +// } + +// return n.arg(m).arg(temp).arg(hum); + return tr("수동 요리"); } Define::Mode MultiManualCook::mode()