고객사 요청 반영

- 부가 기능, 프로그래밍 모드 접근 불가 처리

고객사 요청 반영
- 부가 기능, 프로그래밍 모드 접근 불가 처리
김태훈
1 parent fef63f1aa3
Showing 4 changed files with 63 additions and 63 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/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()
@@ -232,12 +232,12 @@ void MainWindow::on_multiButton_clicked()
  
 void MainWindow::on_programmingButton_clicked()
 {
-    ProgrammingWindow *w = new ProgrammingWindow(this);
-    w->setWindowModality(Qt::WindowModal);
-    w->showFullScreen();
-    w->raise();
+//    ProgrammingWindow *w = new ProgrammingWindow(this);
+//    w->setWindowModality(Qt::WindowModal);
+//    w->showFullScreen();
+//    w->raise();
  
-    newChild(w);
+//    newChild(w);
 }
  
 void MainWindow::on_washButton_clicked()
@@ -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()
...	...	@@ -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()
...	...
...	...	@@ -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()
...	...
...	...	@@ -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()
...	...	@@ -232,12 +232,12 @@ void MainWindow::on_multiButton_clicked()
232	232
233	233	void MainWindow::on_programmingButton_clicked()
234	234	{
235		- ProgrammingWindow *w = new ProgrammingWindow(this);
236		- w->setWindowModality(Qt::WindowModal);
237		- w->showFullScreen();
238		- w->raise();
	235	+// ProgrammingWindow *w = new ProgrammingWindow(this);
	236	+// w->setWindowModality(Qt::WindowModal);
	237	+// w->showFullScreen();
	238	+// w->raise();
239	239
240		- newChild(w);
	240	+// newChild(w);
241	241	}
242	242
243	243	void MainWindow::on_washButton_clicked()
...	...
...	...	@@ -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()
...	...