에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 599b9c3504de5db6e40115ef7b8a40e3900c93ca

Authored by 고영탁
1 parent 6ae1e1599b
Exists in master and in 2 other branches fhd, fhd-demo

부가기능 복구 

 - 고객사 요청
Showing 5 changed files with 59 additions and 59 deletions   Show diff stats
app/gui/oven_control/autocookconfigwindow.cpp
  Diff comments   View file @599b9c3
... ... @@ -384,16 +384,16 @@ void AutoCookConfigWindow::on_configButton_clicked()
384 384  
385 385 void AutoCookConfigWindow::on_favoritesButton_clicked()
386 386 {
387   -// ConfirmPopup *p = new ConfirmPopup(this, tr("즐겨찾기 항목에 추가하시겠습니까?"));
388   -// p->showFullScreen();
  387 + ConfirmPopup *p = new ConfirmPopup(this, tr("즐겨찾기 항목에 추가하시겠습니까?"));
  388 + p->showFullScreen();
389 389  
390   -// connect(p, SIGNAL(accepted()), SLOT(addFavorite()));
  390 + connect(p, SIGNAL(accepted()), SLOT(addFavorite()));
391 391  
392   -// if (afterThreeSecsTimer.isActive())
393   -// {
394   -// afterThreeSecsTimer.stop();
395   -// connect(p, SIGNAL(rejected()), &afterThreeSecsTimer, SLOT(start()));
396   -// }
  392 + if (afterThreeSecsTimer.isActive())
  393 + {
  394 + afterThreeSecsTimer.stop();
  395 + connect(p, SIGNAL(rejected()), &afterThreeSecsTimer, SLOT(start()));
  396 + }
397 397 }
398 398  
399 399 void AutoCookConfigWindow::on_washButton_clicked()
... ...
app/gui/oven_control/autocookwindow.cpp
  Diff comments   View file @599b9c3
... ... @@ -824,14 +824,14 @@ void AutoCookWindow::showCurrentTemp()
824 824  
825 825 void AutoCookWindow::addFavorite()
826 826 {
827   -// AutoCookSetting s;
828   -// s.type = cook.type;
829   -// s.root = cook.root;
830   -// for (int i = 0; i < 5; i++)
831   -// s.configs[i] = cook.configs[i].current;
832   -
833   -// FavoriteNamePopup *p = new FavoriteNamePopup(this, s);
834   -// p->showFullScreen();
  827 + AutoCookSetting s;
  828 + s.type = cook.type;
  829 + s.root = cook.root;
  830 + for (int i = 0; i < 5; i++)
  831 + s.configs[i] = cook.configs[i].current;
  832 +
  833 + FavoriteNamePopup *p = new FavoriteNamePopup(this, s);
  834 + p->showFullScreen();
835 835 }
836 836  
837 837 void AutoCookWindow::jumpConfig()
... ... @@ -1080,13 +1080,13 @@ void AutoCookWindow::on_configButton_clicked()
1080 1080  
1081 1081 void AutoCookWindow::on_favoritesButton_clicked()
1082 1082 {
1083   -// if (!autocook.done())
1084   -// return;
  1083 + if (!autocook.done())
  1084 + return;
1085 1085  
1086   -// ConfirmPopup *p = new ConfirmPopup(this, tr("즐겨찾기 항목에 추가하시겠습니까?"));
1087   -// p->showFullScreen();
  1086 + ConfirmPopup *p = new ConfirmPopup(this, tr("즐겨찾기 항목에 추가하시겠습니까?"));
  1087 + p->showFullScreen();
1088 1088  
1089   -// connect(p, SIGNAL(accepted()), SLOT(addFavorite()));
  1089 + connect(p, SIGNAL(accepted()), SLOT(addFavorite()));
1090 1090 }
1091 1091  
1092 1092 void AutoCookWindow::on_washButton_clicked()
... ...
app/gui/oven_control/mainwindow.cpp
  Diff comments   View file @599b9c3
... ... @@ -217,12 +217,12 @@ void MainWindow::on_etcButton_clicked()
217 217  
218 218 void MainWindow::on_primeButton_clicked()
219 219 {
220   -// PrimeWindow *w = new PrimeWindow(this);
221   -// w->setWindowModality(Qt::WindowModal);
222   -// w->showFullScreen();
223   -// w->raise();
  220 + PrimeWindow *w = new PrimeWindow(this);
  221 + w->setWindowModality(Qt::WindowModal);
  222 + w->showFullScreen();
  223 + w->raise();
224 224  
225   -// newChild(w);
  225 + newChild(w);
226 226 }
227 227  
228 228 void MainWindow::on_multiButton_clicked()
... ...
app/gui/oven_control/mainwindow.ui
  Diff comments   View file @599b9c3
... ... @@ -574,7 +574,7 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
574 574 QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_type/additional_ov.png); }</string>
575 575 </property>
576 576 <property name="text">
577   - <string/>
  577 + <string>부가기능</string>
578 578 </property>
579 579 <property name="style" stdset="0">
580 580 <string>type</string>
... ...
app/gui/oven_control/manualcookwindow.cpp
  Diff comments   View file @599b9c3
... ... @@ -1014,21 +1014,21 @@ void ManualCookWindow::on_reserveButton_clicked()
1014 1014  
1015 1015 void ManualCookWindow::on_favoriteButton_clicked()
1016 1016 {
1017   -// if (oven->cooking())
1018   -// return;
  1017 + if (oven->cooking())
  1018 + return;
1019 1019  
1020   -// ConfirmPopup *p = new ConfirmPopup(this, tr("즐겨찾기 항목에 추가하시겠습니까?"));
1021   -// p->showFullScreen();
  1020 + ConfirmPopup *p = new ConfirmPopup(this, tr("즐겨찾기 항목에 추가하시겠습니까?"));
  1021 + p->showFullScreen();
1022 1022  
1023   -// focused = ui->favoriteButton;
1024   -// connect(p, SIGNAL(rejected()), SLOT(focusAgain()));
1025   -// connect(p, SIGNAL(accepted()), SLOT(addFavorite()));
  1023 + focused = ui->favoriteButton;
  1024 + connect(p, SIGNAL(rejected()), SLOT(focusAgain()));
  1025 + connect(p, SIGNAL(accepted()), SLOT(addFavorite()));
1026 1026  
1027   -// if (startCookingTimer.isActive())
1028   -// {
1029   -// startCookingTimer.stop();
1030   -// connect(p, SIGNAL(rejected()), &startCookingTimer, SLOT(start()));
1031   -// }
  1027 + if (startCookingTimer.isActive())
  1028 + {
  1029 + startCookingTimer.stop();
  1030 + connect(p, SIGNAL(rejected()), &startCookingTimer, SLOT(start()));
  1031 + }
1032 1032 }
1033 1033  
1034 1034 void ManualCookWindow::on_goFrontStackButton_clicked()
... ... @@ -1069,26 +1069,26 @@ void ManualCookWindow::on_configButton_clicked()
1069 1069  
1070 1070 void ManualCookWindow::on_favoritesButton_clicked()
1071 1071 {
1072   -// if (oven->cooking())
1073   -// {
1074   -// ConfirmPopup *p = new ConfirmPopup(this, tr("요리가 중단되고 즐겨찾기 모드로 들어갑니다. 진행할까요?"));
1075   -// p->showFullScreen();
1076   -
1077   -// connect(p, SIGNAL(accepted()), SLOT(jumpFavorites()));
1078   -
1079   -// focused = ui->favoritesButton;
1080   -// connect(p, SIGNAL(destroyed(QObject*)), SLOT(focusAgain()));
1081   -// }
1082   -// else
1083   -// {
1084   -// PrimeWindow *w = new PrimeWindow(MainWindow::getInstance());
1085   -// w->setWindowModality(Qt::WindowModal);
1086   -// w->listFavorites();
1087   -// w->showFullScreen();
1088   -// w->raise();
1089   -
1090   -// MainWindow::jump(w);
1091   -// }
  1072 + if (oven->cooking())
  1073 + {
  1074 + ConfirmPopup *p = new ConfirmPopup(this, tr("요리가 중단되고 즐겨찾기 모드로 들어갑니다. 진행할까요?"));
  1075 + p->showFullScreen();
  1076 +
  1077 + connect(p, SIGNAL(accepted()), SLOT(jumpFavorites()));
  1078 +
  1079 + focused = ui->favoritesButton;
  1080 + connect(p, SIGNAL(destroyed(QObject*)), SLOT(focusAgain()));
  1081 + }
  1082 + else
  1083 + {
  1084 + PrimeWindow *w = new PrimeWindow(MainWindow::getInstance());
  1085 + w->setWindowModality(Qt::WindowModal);
  1086 + w->listFavorites();
  1087 + w->showFullScreen();
  1088 + w->raise();
  1089 +
  1090 + MainWindow::jump(w);
  1091 + }
1092 1092 }
1093 1093  
1094 1094 void ManualCookWindow::on_washButton_clicked()
... ...