diff --git a/app/gui/oven_control/autocookconfigwindow.cpp b/app/gui/oven_control/autocookconfigwindow.cpp index e91f933..5fe98ed 100644 --- a/app/gui/oven_control/autocookconfigwindow.cpp +++ b/app/gui/oven_control/autocookconfigwindow.cpp @@ -384,16 +384,16 @@ void AutoCookConfigWindow::on_configButton_clicked() void AutoCookConfigWindow::on_favoritesButton_clicked() { -// ConfirmPopup *p = new ConfirmPopup(this, tr("즐겨찾기 항목에 추가하시겠습니까?")); -// p->showFullScreen(); + ConfirmPopup *p = new ConfirmPopup(this, tr("즐겨찾기 항목에 추가하시겠습니까?")); + p->showFullScreen(); -// connect(p, SIGNAL(accepted()), SLOT(addFavorite())); + connect(p, SIGNAL(accepted()), SLOT(addFavorite())); -// if (afterThreeSecsTimer.isActive()) -// { -// afterThreeSecsTimer.stop(); -// connect(p, SIGNAL(rejected()), &afterThreeSecsTimer, SLOT(start())); -// } + if (afterThreeSecsTimer.isActive()) + { + afterThreeSecsTimer.stop(); + connect(p, SIGNAL(rejected()), &afterThreeSecsTimer, SLOT(start())); + } } void AutoCookConfigWindow::on_washButton_clicked() diff --git a/app/gui/oven_control/autocookwindow.cpp b/app/gui/oven_control/autocookwindow.cpp index d0aa220..7cf444d 100644 --- a/app/gui/oven_control/autocookwindow.cpp +++ b/app/gui/oven_control/autocookwindow.cpp @@ -824,14 +824,14 @@ void AutoCookWindow::showCurrentTemp() void AutoCookWindow::addFavorite() { -// AutoCookSetting s; -// s.type = cook.type; -// s.root = cook.root; -// for (int i = 0; i < 5; i++) -// s.configs[i] = cook.configs[i].current; - -// FavoriteNamePopup *p = new FavoriteNamePopup(this, s); -// p->showFullScreen(); + AutoCookSetting s; + s.type = cook.type; + s.root = cook.root; + for (int i = 0; i < 5; i++) + s.configs[i] = cook.configs[i].current; + + FavoriteNamePopup *p = new FavoriteNamePopup(this, s); + p->showFullScreen(); } void AutoCookWindow::jumpConfig() @@ -1080,13 +1080,13 @@ void AutoCookWindow::on_configButton_clicked() void AutoCookWindow::on_favoritesButton_clicked() { -// if (!autocook.done()) -// return; + if (!autocook.done()) + return; -// ConfirmPopup *p = new ConfirmPopup(this, tr("즐겨찾기 항목에 추가하시겠습니까?")); -// p->showFullScreen(); + ConfirmPopup *p = new ConfirmPopup(this, tr("즐겨찾기 항목에 추가하시겠습니까?")); + p->showFullScreen(); -// connect(p, SIGNAL(accepted()), SLOT(addFavorite())); + connect(p, SIGNAL(accepted()), SLOT(addFavorite())); } void AutoCookWindow::on_washButton_clicked() diff --git a/app/gui/oven_control/mainwindow.cpp b/app/gui/oven_control/mainwindow.cpp index 3663ea6..bde7591 100644 --- a/app/gui/oven_control/mainwindow.cpp +++ b/app/gui/oven_control/mainwindow.cpp @@ -217,12 +217,12 @@ void MainWindow::on_etcButton_clicked() void MainWindow::on_primeButton_clicked() { -// PrimeWindow *w = new PrimeWindow(this); -// w->setWindowModality(Qt::WindowModal); -// w->showFullScreen(); -// w->raise(); + PrimeWindow *w = new PrimeWindow(this); + w->setWindowModality(Qt::WindowModal); + w->showFullScreen(); + w->raise(); -// newChild(w); + newChild(w); } void MainWindow::on_multiButton_clicked() diff --git a/app/gui/oven_control/mainwindow.ui b/app/gui/oven_control/mainwindow.ui index 165ab3d..e1ecd9b 100644 --- a/app/gui/oven_control/mainwindow.ui +++ b/app/gui/oven_control/mainwindow.ui @@ -574,7 +574,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/additional_ov.png); } - + 부가기능 type diff --git a/app/gui/oven_control/manualcookwindow.cpp b/app/gui/oven_control/manualcookwindow.cpp index 93a3ea3..e8a73c4 100644 --- a/app/gui/oven_control/manualcookwindow.cpp +++ b/app/gui/oven_control/manualcookwindow.cpp @@ -1014,21 +1014,21 @@ void ManualCookWindow::on_reserveButton_clicked() void ManualCookWindow::on_favoriteButton_clicked() { -// if (oven->cooking()) -// return; + if (oven->cooking()) + return; -// ConfirmPopup *p = new ConfirmPopup(this, tr("즐겨찾기 항목에 추가하시겠습니까?")); -// p->showFullScreen(); + ConfirmPopup *p = new ConfirmPopup(this, tr("즐겨찾기 항목에 추가하시겠습니까?")); + p->showFullScreen(); -// focused = ui->favoriteButton; -// connect(p, SIGNAL(rejected()), SLOT(focusAgain())); -// connect(p, SIGNAL(accepted()), SLOT(addFavorite())); + focused = ui->favoriteButton; + connect(p, SIGNAL(rejected()), SLOT(focusAgain())); + connect(p, SIGNAL(accepted()), SLOT(addFavorite())); -// if (startCookingTimer.isActive()) -// { -// startCookingTimer.stop(); -// connect(p, SIGNAL(rejected()), &startCookingTimer, SLOT(start())); -// } + if (startCookingTimer.isActive()) + { + startCookingTimer.stop(); + connect(p, SIGNAL(rejected()), &startCookingTimer, SLOT(start())); + } } void ManualCookWindow::on_goFrontStackButton_clicked() @@ -1069,26 +1069,26 @@ void ManualCookWindow::on_configButton_clicked() void ManualCookWindow::on_favoritesButton_clicked() { -// if (oven->cooking()) -// { -// ConfirmPopup *p = new ConfirmPopup(this, tr("요리가 중단되고 즐겨찾기 모드로 들어갑니다. 진행할까요?")); -// p->showFullScreen(); - -// connect(p, SIGNAL(accepted()), SLOT(jumpFavorites())); - -// focused = ui->favoritesButton; -// connect(p, SIGNAL(destroyed(QObject*)), SLOT(focusAgain())); -// } -// else -// { -// PrimeWindow *w = new PrimeWindow(MainWindow::getInstance()); -// w->setWindowModality(Qt::WindowModal); -// w->listFavorites(); -// w->showFullScreen(); -// w->raise(); - -// MainWindow::jump(w); -// } + if (oven->cooking()) + { + ConfirmPopup *p = new ConfirmPopup(this, tr("요리가 중단되고 즐겨찾기 모드로 들어갑니다. 진행할까요?")); + p->showFullScreen(); + + connect(p, SIGNAL(accepted()), SLOT(jumpFavorites())); + + focused = ui->favoritesButton; + connect(p, SIGNAL(destroyed(QObject*)), SLOT(focusAgain())); + } + else + { + PrimeWindow *w = new PrimeWindow(MainWindow::getInstance()); + w->setWindowModality(Qt::WindowModal); + w->listFavorites(); + w->showFullScreen(); + w->raise(); + + MainWindow::jump(w); + } } void ManualCookWindow::on_washButton_clicked()