부가기능 복구

- 고객사 요청

부가기능 복구
- 고객사 요청
고영탁
1 parent 6ae1e1599b
Showing 5 changed files with 59 additions and 59 deletions Show diff stats
app/gui/oven_control/autocookconfigwindow.cpp
app/gui/oven_control/autocookwindow.cpp
app/gui/oven_control/mainwindow.cpp
app/gui/oven_control/mainwindow.ui
app/gui/oven_control/manualcookwindow.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()
@@ -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()
@@ -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()
@@ -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); }</string>
     </property>
     <property name="text">
-     <string/>
+     <string>부가기능</string>
     </property>
     <property name="style" stdset="0">
      <string>type</string>
@@ -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()
	@@ -574,7 +574,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ		@@ -574,7 +574,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
574	QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/additional_ov.png); }</string>	574	QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/additional_ov.png); }</string>
575	</property>	575	</property>
576	<property name="text">	576	<property name="text">
577	- <string/>	577	+ <string>부가기능</string>
578	</property>	578	</property>
579	<property name="style" stdset="0">	579	<property name="style" stdset="0">
580	<string>type</string>	580	<string>type</string>