기능 보충 구현

- 화면 하단 버튼으로 다른 계열 화면 이동

기능 보충 구현
- 화면 하단 버튼으로 다른 계열 화면 이동
김태훈
1 parent e00c6a2a9d
Showing 4 changed files with 28 additions and 0 deletions Show diff stats
app/gui/oven_control/programmingautoconfigwindow.cpp
app/gui/oven_control/programmingautoselectionwindow.cpp
app/gui/oven_control/programmingmanualwindow.cpp
app/gui/oven_control/programmingselectionwindow.cpp
@@ -4,6 +4,8 @@
 #include "soundplayer.h"
 #include "stringer.h"
 #include "cookprogram.h"
+#include "configwindow.h"
+#include "mainwindow.h"
  
 ProgrammingAutoConfigWindow::ProgrammingAutoConfigWindow(QWidget *parent, Cook cook) :
     QMainWindow(parent),
@@ -171,7 +173,12 @@ void ProgrammingAutoConfigWindow::on_backButton_clicked()
  
 void ProgrammingAutoConfigWindow::on_configButton_clicked()
 {
+    ConfigWindow *w = new ConfigWindow(MainWindow::getInstance());
+    w->setWindowModality(Qt::WindowModal);
+    w->showFullScreen();
+    w->raise();
  
+    MainWindow::jump(w);
 }
  
 void ProgrammingAutoConfigWindow::on_helpButton_clicked()
@@ -5,6 +5,8 @@
  
 #include "soundplayer.h"
 #include "programmingautoconfigwindow.h"
+#include "configwindow.h"
+#include "mainwindow.h"
  
 ProgrammingAutoSelectionWindow::ProgrammingAutoSelectionWindow(QWidget *parent, Define::CookType type) :
     QMainWindow(parent),
@@ -79,7 +81,12 @@ void ProgrammingAutoSelectionWindow::on_backButton_clicked()
  
 void ProgrammingAutoSelectionWindow::on_configButton_clicked()
 {
+    ConfigWindow *w = new ConfigWindow(MainWindow::getInstance());
+    w->setWindowModality(Qt::WindowModal);
+    w->showFullScreen();
+    w->raise();
  
+    MainWindow::jump(w);
 }
  
 void ProgrammingAutoSelectionWindow::on_helpButton_clicked()
@@ -5,6 +5,8 @@
 #include "programmingmanualcoretemppopup.h"
 #include "cookprogram.h"
 #include "soundplayer.h"
+#include "configwindow.h"
+#include "mainwindow.h"
  
 ProgrammingManualWindow::ProgrammingManualWindow(QWidget *parent, Define::Mode mode) :
     QMainWindow(parent),
@@ -219,7 +221,12 @@ void ProgrammingManualWindow::on_backButton_clicked()
  
 void ProgrammingManualWindow::on_configButton_clicked()
 {
+    ConfigWindow *w = new ConfigWindow(MainWindow::getInstance());
+    w->setWindowModality(Qt::WindowModal);
+    w->showFullScreen();
+    w->raise();
  
+    MainWindow::jump(w);
 }
  
 void ProgrammingManualWindow::on_helpButton_clicked()
@@ -4,6 +4,8 @@
 #include "programmingmanualwindow.h"
 #include "programmingautoselectionwindow.h"
 #include "soundplayer.h"
+#include "configwindow.h"
+#include "mainwindow.h"
  
 ProgrammingSelectionWindow::ProgrammingSelectionWindow(QWidget *parent) :
     QMainWindow(parent),
@@ -122,7 +124,12 @@ void ProgrammingSelectionWindow::on_backButton_clicked()
  
 void ProgrammingSelectionWindow::on_configButton_clicked()
 {
+    ConfigWindow *w = new ConfigWindow(MainWindow::getInstance());
+    w->setWindowModality(Qt::WindowModal);
+    w->showFullScreen();
+    w->raise();
  
+    MainWindow::jump(w);
 }
  
 void ProgrammingSelectionWindow::on_helpButton_clicked()
...	...	@@ -4,6 +4,8 @@
4	4	#include "soundplayer.h"
5	5	#include "stringer.h"
6	6	#include "cookprogram.h"
	7	+#include "configwindow.h"
	8	+#include "mainwindow.h"
7	9
8	10	ProgrammingAutoConfigWindow::ProgrammingAutoConfigWindow(QWidget *parent, Cook cook) :
9	11	QMainWindow(parent),
...	...	@@ -171,7 +173,12 @@ void ProgrammingAutoConfigWindow::on_backButton_clicked()
171	173
172	174	void ProgrammingAutoConfigWindow::on_configButton_clicked()
173	175	{
	176	+ ConfigWindow *w = new ConfigWindow(MainWindow::getInstance());
	177	+ w->setWindowModality(Qt::WindowModal);
	178	+ w->showFullScreen();
	179	+ w->raise();
174	180
	181	+ MainWindow::jump(w);
175	182	}
176	183
177	184	void ProgrammingAutoConfigWindow::on_helpButton_clicked()
...	...
...	...	@@ -5,6 +5,8 @@
5	5
6	6	#include "soundplayer.h"
7	7	#include "programmingautoconfigwindow.h"
	8	+#include "configwindow.h"
	9	+#include "mainwindow.h"
8	10
9	11	ProgrammingAutoSelectionWindow::ProgrammingAutoSelectionWindow(QWidget *parent, Define::CookType type) :
10	12	QMainWindow(parent),
...	...	@@ -79,7 +81,12 @@ void ProgrammingAutoSelectionWindow::on_backButton_clicked()
79	81
80	82	void ProgrammingAutoSelectionWindow::on_configButton_clicked()
81	83	{
	84	+ ConfigWindow *w = new ConfigWindow(MainWindow::getInstance());
	85	+ w->setWindowModality(Qt::WindowModal);
	86	+ w->showFullScreen();
	87	+ w->raise();
82	88
	89	+ MainWindow::jump(w);
83	90	}
84	91
85	92	void ProgrammingAutoSelectionWindow::on_helpButton_clicked()
...	...
...	...	@@ -5,6 +5,8 @@
5	5	#include "programmingmanualcoretemppopup.h"
6	6	#include "cookprogram.h"
7	7	#include "soundplayer.h"
	8	+#include "configwindow.h"
	9	+#include "mainwindow.h"
8	10
9	11	ProgrammingManualWindow::ProgrammingManualWindow(QWidget *parent, Define::Mode mode) :
10	12	QMainWindow(parent),
...	...	@@ -219,7 +221,12 @@ void ProgrammingManualWindow::on_backButton_clicked()
219	221
220	222	void ProgrammingManualWindow::on_configButton_clicked()
221	223	{
	224	+ ConfigWindow *w = new ConfigWindow(MainWindow::getInstance());
	225	+ w->setWindowModality(Qt::WindowModal);
	226	+ w->showFullScreen();
	227	+ w->raise();
222	228
	229	+ MainWindow::jump(w);
223	230	}
224	231
225	232	void ProgrammingManualWindow::on_helpButton_clicked()
...	...
...	...	@@ -4,6 +4,8 @@
4	4	#include "programmingmanualwindow.h"
5	5	#include "programmingautoselectionwindow.h"
6	6	#include "soundplayer.h"
	7	+#include "configwindow.h"
	8	+#include "mainwindow.h"
7	9
8	10	ProgrammingSelectionWindow::ProgrammingSelectionWindow(QWidget *parent) :
9	11	QMainWindow(parent),
...	...	@@ -122,7 +124,12 @@ void ProgrammingSelectionWindow::on_backButton_clicked()
122	124
123	125	void ProgrammingSelectionWindow::on_configButton_clicked()
124	126	{
	127	+ ConfigWindow *w = new ConfigWindow(MainWindow::getInstance());
	128	+ w->setWindowModality(Qt::WindowModal);
	129	+ w->showFullScreen();
	130	+ w->raise();
125	131
	132	+ MainWindow::jump(w);
126	133	}
127	134
128	135	void ProgrammingSelectionWindow::on_helpButton_clicked()
...	...