Commit 1342af7b38d7269af49e65cae43dfc3b36a46f11

Authored by 김태훈
1 parent 4a6bf58c57
Exists in master and in 2 other branches fhd, fhd-demo

도움말 버튼 연결

app/gui/oven_control/autocookconfigwindow.cpp
@@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
13 #include "mainwindow.h" 13 #include "mainwindow.h"
14 #include "autocookselectionpopup.h" 14 #include "autocookselectionpopup.h"
15 #include "autocookcheckwindow.h" 15 #include "autocookcheckwindow.h"
  16 +#include "manualviewerdlg.h"
16 17
17 AutoCookConfigWindow::AutoCookConfigWindow(QWidget *parent, Cook cook) : 18 AutoCookConfigWindow::AutoCookConfigWindow(QWidget *parent, Cook cook) :
18 QMainWindow(parent), 19 QMainWindow(parent),
@@ -471,3 +472,10 @@ void AutoCookConfigWindow::on_checkCookButton_clicked() @@ -471,3 +472,10 @@ void AutoCookConfigWindow::on_checkCookButton_clicked()
471 connect(w, SIGNAL(back()), &afterThreeSecsTimer, SLOT(start())); 472 connect(w, SIGNAL(back()), &afterThreeSecsTimer, SLOT(start()));
472 } 473 }
473 } 474 }
  475 +
  476 +void AutoCookConfigWindow::on_helpButton_clicked()
  477 +{
  478 + ManualViewerDlg* dlg = new ManualViewerDlg(this, AUTO_COOK_PAGE);
  479 + dlg->showFullScreen();
  480 + dlg->raise();
  481 +}
app/gui/oven_control/autocookconfigwindow.h
@@ -75,6 +75,7 @@ private slots: @@ -75,6 +75,7 @@ private slots:
75 void on_configButton_5_clicked(); 75 void on_configButton_5_clicked();
76 void on_selectCookButton_clicked(); 76 void on_selectCookButton_clicked();
77 void on_checkCookButton_clicked(); 77 void on_checkCookButton_clicked();
  78 + void on_helpButton_clicked();
78 }; 79 };
79 80
80 #endif // AUTOCOOKCONFIGWINDOW_H 81 #endif // AUTOCOOKCONFIGWINDOW_H
app/gui/oven_control/autocookselectionwindow.cpp
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
10 #include "configwindow.h" 10 #include "configwindow.h"
11 #include "washwindow.h" 11 #include "washwindow.h"
12 #include "mainwindow.h" 12 #include "mainwindow.h"
  13 +#include "manualviewerdlg.h"
13 14
14 AutoCookSelectionWindow::AutoCookSelectionWindow(QWidget *parent, Define::CookType type) : 15 AutoCookSelectionWindow::AutoCookSelectionWindow(QWidget *parent, Define::CookType type) :
15 QMainWindow(parent), 16 QMainWindow(parent),
@@ -148,7 +149,9 @@ void AutoCookSelectionWindow::on_washButton_clicked() @@ -148,7 +149,9 @@ void AutoCookSelectionWindow::on_washButton_clicked()
148 149
149 void AutoCookSelectionWindow::on_helpButton_clicked() 150 void AutoCookSelectionWindow::on_helpButton_clicked()
150 { 151 {
151 - 152 + ManualViewerDlg* dlg = new ManualViewerDlg(this, AUTO_COOK_PAGE);
  153 + dlg->showFullScreen();
  154 + dlg->raise();
152 } 155 }
153 156
154 void AutoCookSelectionWindow::onEncoderLeft() 157 void AutoCookSelectionWindow::onEncoderLeft()
app/gui/oven_control/autocookwindow.cpp
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
16 #include "errorpopupdlg.h" 16 #include "errorpopupdlg.h"
17 #include "autocookselectionpopup.h" 17 #include "autocookselectionpopup.h"
18 #include "autocookcheckconfigwindow.h" 18 #include "autocookcheckconfigwindow.h"
  19 +#include "manualviewerdlg.h"
19 20
20 AutoCookWindow::AutoCookWindow(QWidget *parent, Cook cook) : 21 AutoCookWindow::AutoCookWindow(QWidget *parent, Cook cook) :
21 QMainWindow(parent), 22 QMainWindow(parent),
@@ -1111,5 +1112,7 @@ void AutoCookWindow::on_washButton_clicked() @@ -1111,5 +1112,7 @@ void AutoCookWindow::on_washButton_clicked()
1111 1112
1112 void AutoCookWindow::on_helpButton_clicked() 1113 void AutoCookWindow::on_helpButton_clicked()
1113 { 1114 {
1114 - 1115 + ManualViewerDlg* dlg = new ManualViewerDlg(this, AUTO_COOK_PAGE);
  1116 + dlg->showFullScreen();
  1117 + dlg->raise();
1115 } 1118 }
app/gui/oven_control/manualcookwindow.cpp
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
21 #include "primewindow.h" 21 #include "primewindow.h"
22 #include "washwindow.h" 22 #include "washwindow.h"
23 #include "errorpopupdlg.h" 23 #include "errorpopupdlg.h"
  24 +#include "manualviewerdlg.h"
24 25
25 #include <QTime> 26 #include <QTime>
26 27
@@ -1149,7 +1150,9 @@ void ManualCookWindow::on_washButton_clicked() @@ -1149,7 +1150,9 @@ void ManualCookWindow::on_washButton_clicked()
1149 1150
1150 void ManualCookWindow::on_helpButton_clicked() 1151 void ManualCookWindow::on_helpButton_clicked()
1151 { 1152 {
1152 - 1153 + ManualViewerDlg* dlg = new ManualViewerDlg(this, MANUAL_COOK_PAGE);
  1154 + dlg->showFullScreen();
  1155 + dlg->raise();
1153 } 1156 }
1154 1157
1155 void ManualCookWindow::on_timeSlider_valueChanged() 1158 void ManualCookWindow::on_timeSlider_valueChanged()
app/gui/oven_control/multicookautowindow.cpp
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 5
6 #include "soundplayer.h" 6 #include "soundplayer.h"
7 #include "confirmpopup.h" 7 #include "confirmpopup.h"
  8 +#include "manualviewerdlg.h"
8 9
9 MultiCookAutoWindow::MultiCookAutoWindow(QWidget *parent) : 10 MultiCookAutoWindow::MultiCookAutoWindow(QWidget *parent) :
10 QMainWindow(parent), 11 QMainWindow(parent),
@@ -158,5 +159,7 @@ void MultiCookAutoWindow::on_backButton_clicked() @@ -158,5 +159,7 @@ void MultiCookAutoWindow::on_backButton_clicked()
158 159
159 void MultiCookAutoWindow::on_helpButton_clicked() 160 void MultiCookAutoWindow::on_helpButton_clicked()
160 { 161 {
161 - 162 + ManualViewerDlg* dlg = new ManualViewerDlg(this);
  163 + dlg->showFullScreen();
  164 + dlg->raise();
162 } 165 }
app/gui/oven_control/multicookmanualwindow.cpp
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 #include "mainwindow.h" 8 #include "mainwindow.h"
9 #include "configwindow.h" 9 #include "configwindow.h"
10 #include "soundplayer.h" 10 #include "soundplayer.h"
  11 +#include "manualviewerdlg.h"
11 12
12 MultiCookManualWindow::MultiCookManualWindow(QWidget *parent) : 13 MultiCookManualWindow::MultiCookManualWindow(QWidget *parent) :
13 QMainWindow(parent), 14 QMainWindow(parent),
@@ -266,7 +267,9 @@ void MultiCookManualWindow::on_backButton_clicked() @@ -266,7 +267,9 @@ void MultiCookManualWindow::on_backButton_clicked()
266 267
267 void MultiCookManualWindow::on_helpButton_clicked() 268 void MultiCookManualWindow::on_helpButton_clicked()
268 { 269 {
269 - 270 + ManualViewerDlg* dlg = new ManualViewerDlg(this);
  271 + dlg->showFullScreen();
  272 + dlg->raise();
270 } 273 }
271 274
272 void MultiCookManualWindow::on_okButton_clicked() 275 void MultiCookManualWindow::on_okButton_clicked()
app/gui/oven_control/multicookselectionwindow.cpp
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 #include "multicookmanualwindow.h" 8 #include "multicookmanualwindow.h"
9 #include "multicookautowindow.h" 9 #include "multicookautowindow.h"
10 #include "soundplayer.h" 10 #include "soundplayer.h"
  11 +#include "manualviewerdlg.h"
11 12
12 MultiCookSelectionWindow::MultiCookSelectionWindow(QWidget *parent) : 13 MultiCookSelectionWindow::MultiCookSelectionWindow(QWidget *parent) :
13 QMainWindow(parent), 14 QMainWindow(parent),
@@ -228,7 +229,9 @@ void MultiCookSelectionWindow::on_backButton_clicked() @@ -228,7 +229,9 @@ void MultiCookSelectionWindow::on_backButton_clicked()
228 229
229 void MultiCookSelectionWindow::on_helpButton_clicked() 230 void MultiCookSelectionWindow::on_helpButton_clicked()
230 { 231 {
231 - 232 + ManualViewerDlg* dlg = new ManualViewerDlg(this);
  233 + dlg->showFullScreen();
  234 + dlg->raise();
232 } 235 }
233 236
234 void MultiCookSelectionWindow::onEncoderLeft() 237 void MultiCookSelectionWindow::onEncoderLeft()
app/gui/oven_control/multicookwindow.cpp
@@ -14,6 +14,7 @@ @@ -14,6 +14,7 @@
14 #include "configwindow.h" 14 #include "configwindow.h"
15 #include "washwindow.h" 15 #include "washwindow.h"
16 #include "mainwindow.h" 16 #include "mainwindow.h"
  17 +#include "manualviewerdlg.h"
17 18
18 MultiCookWindow::MultiCookWindow(QWidget *parent) : 19 MultiCookWindow::MultiCookWindow(QWidget *parent) :
19 QMainWindow(parent), 20 QMainWindow(parent),
@@ -445,7 +446,9 @@ void MultiCookWindow::on_deleteButton_clicked() @@ -445,7 +446,9 @@ void MultiCookWindow::on_deleteButton_clicked()
445 446
446 void MultiCookWindow::on_helpButton_clicked() 447 void MultiCookWindow::on_helpButton_clicked()
447 { 448 {
448 - 449 + ManualViewerDlg* dlg = new ManualViewerDlg(this);
  450 + dlg->showFullScreen();
  451 + dlg->raise();
449 } 452 }
450 453
451 void MultiCookWindow::onEncoderLeft() 454 void MultiCookWindow::onEncoderLeft()
app/gui/oven_control/primewindow.cpp
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
12 #include "configwindow.h" 12 #include "configwindow.h"
13 #include "washwindow.h" 13 #include "washwindow.h"
14 #include "mainwindow.h" 14 #include "mainwindow.h"
  15 +#include "manualviewerdlg.h"
15 16
16 PrimeWindow::PrimeWindow(QWidget *parent) : 17 PrimeWindow::PrimeWindow(QWidget *parent) :
17 QMainWindow(parent), 18 QMainWindow(parent),
@@ -287,7 +288,9 @@ void PrimeWindow::on_washButton_clicked() @@ -287,7 +288,9 @@ void PrimeWindow::on_washButton_clicked()
287 288
288 void PrimeWindow::on_helpButton_clicked() 289 void PrimeWindow::on_helpButton_clicked()
289 { 290 {
290 - 291 + ManualViewerDlg* dlg = new ManualViewerDlg(this);
  292 + dlg->showFullScreen();
  293 + dlg->raise();
291 } 294 }
292 295
293 void PrimeWindow::onEncoderLeft() 296 void PrimeWindow::onEncoderLeft()
app/gui/oven_control/programmingautoconfigwindow.cpp
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
10 #include "mainwindow.h" 10 #include "mainwindow.h"
11 #include "autocookselectionpopup.h" 11 #include "autocookselectionpopup.h"
12 #include "autocookcheckwindow.h" 12 #include "autocookcheckwindow.h"
  13 +#include "manualviewerdlg.h"
13 14
14 ProgrammingAutoConfigWindow::ProgrammingAutoConfigWindow(QWidget *parent, Cook cook) : 15 ProgrammingAutoConfigWindow::ProgrammingAutoConfigWindow(QWidget *parent, Cook cook) :
15 QMainWindow(parent), 16 QMainWindow(parent),
@@ -389,7 +390,9 @@ void ProgrammingAutoConfigWindow::on_configButton_clicked() @@ -389,7 +390,9 @@ void ProgrammingAutoConfigWindow::on_configButton_clicked()
389 390
390 void ProgrammingAutoConfigWindow::on_helpButton_clicked() 391 void ProgrammingAutoConfigWindow::on_helpButton_clicked()
391 { 392 {
392 - 393 + ManualViewerDlg* dlg = new ManualViewerDlg(this);
  394 + dlg->showFullScreen();
  395 + dlg->raise();
393 } 396 }
394 397
395 void ProgrammingAutoConfigWindow::on_okButton_clicked() 398 void ProgrammingAutoConfigWindow::on_okButton_clicked()
app/gui/oven_control/programmingautoselectionwindow.cpp
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 #include "programmingautoconfigwindow.h" 8 #include "programmingautoconfigwindow.h"
9 #include "configwindow.h" 9 #include "configwindow.h"
10 #include "mainwindow.h" 10 #include "mainwindow.h"
  11 +#include "manualviewerdlg.h"
11 12
12 ProgrammingAutoSelectionWindow::ProgrammingAutoSelectionWindow(QWidget *parent, Define::CookType type) : 13 ProgrammingAutoSelectionWindow::ProgrammingAutoSelectionWindow(QWidget *parent, Define::CookType type) :
13 QMainWindow(parent), 14 QMainWindow(parent),
@@ -156,7 +157,9 @@ void ProgrammingAutoSelectionWindow::on_configButton_clicked() @@ -156,7 +157,9 @@ void ProgrammingAutoSelectionWindow::on_configButton_clicked()
156 157
157 void ProgrammingAutoSelectionWindow::on_helpButton_clicked() 158 void ProgrammingAutoSelectionWindow::on_helpButton_clicked()
158 { 159 {
159 - 160 + ManualViewerDlg* dlg = new ManualViewerDlg(this);
  161 + dlg->showFullScreen();
  162 + dlg->raise();
160 } 163 }
161 164
162 void ProgrammingAutoSelectionWindow::on_okButton_clicked() 165 void ProgrammingAutoSelectionWindow::on_okButton_clicked()
app/gui/oven_control/programmingmanualwindow.cpp
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
10 #include "soundplayer.h" 10 #include "soundplayer.h"
11 #include "configwindow.h" 11 #include "configwindow.h"
12 #include "mainwindow.h" 12 #include "mainwindow.h"
  13 +#include "manualviewerdlg.h"
13 14
14 ProgrammingManualWindow::ProgrammingManualWindow(QWidget *parent, Define::Mode mode) : 15 ProgrammingManualWindow::ProgrammingManualWindow(QWidget *parent, Define::Mode mode) :
15 QMainWindow(parent), 16 QMainWindow(parent),
@@ -538,7 +539,9 @@ void ProgrammingManualWindow::on_configButton_clicked() @@ -538,7 +539,9 @@ void ProgrammingManualWindow::on_configButton_clicked()
538 539
539 void ProgrammingManualWindow::on_helpButton_clicked() 540 void ProgrammingManualWindow::on_helpButton_clicked()
540 { 541 {
541 - 542 + ManualViewerDlg* dlg = new ManualViewerDlg(this);
  543 + dlg->showFullScreen();
  544 + dlg->raise();
542 } 545 }
543 546
544 void ProgrammingManualWindow::on_okButton_clicked() 547 void ProgrammingManualWindow::on_okButton_clicked()
app/gui/oven_control/programmingselectionwindow.cpp
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 #include "soundplayer.h" 8 #include "soundplayer.h"
9 #include "configwindow.h" 9 #include "configwindow.h"
10 #include "mainwindow.h" 10 #include "mainwindow.h"
  11 +#include "manualviewerdlg.h"
11 12
12 ProgrammingSelectionWindow::ProgrammingSelectionWindow(QWidget *parent) : 13 ProgrammingSelectionWindow::ProgrammingSelectionWindow(QWidget *parent) :
13 QMainWindow(parent), 14 QMainWindow(parent),
@@ -192,7 +193,9 @@ void ProgrammingSelectionWindow::on_configButton_clicked() @@ -192,7 +193,9 @@ void ProgrammingSelectionWindow::on_configButton_clicked()
192 193
193 void ProgrammingSelectionWindow::on_helpButton_clicked() 194 void ProgrammingSelectionWindow::on_helpButton_clicked()
194 { 195 {
195 - 196 + ManualViewerDlg* dlg = new ManualViewerDlg(this);
  197 + dlg->showFullScreen();
  198 + dlg->raise();
196 } 199 }
197 200
198 void ProgrammingSelectionWindow::on_okButton_clicked() 201 void ProgrammingSelectionWindow::on_okButton_clicked()
app/gui/oven_control/programmingwindow.cpp
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
11 #include "soundplayer.h" 11 #include "soundplayer.h"
12 #include "confirmpopup.h" 12 #include "confirmpopup.h"
13 #include "programmingnamepopup.h" 13 #include "programmingnamepopup.h"
  14 +#include "manualviewerdlg.h"
14 15
15 ProgrammingWindow::ProgrammingWindow(QWidget *parent) : 16 ProgrammingWindow::ProgrammingWindow(QWidget *parent) :
16 QMainWindow(parent), 17 QMainWindow(parent),
@@ -322,7 +323,9 @@ void ProgrammingWindow::on_saveButton_clicked() @@ -322,7 +323,9 @@ void ProgrammingWindow::on_saveButton_clicked()
322 323
323 void ProgrammingWindow::on_helpButton_clicked() 324 void ProgrammingWindow::on_helpButton_clicked()
324 { 325 {
325 - 326 + ManualViewerDlg* dlg = new ManualViewerDlg(this);
  327 + dlg->showFullScreen();
  328 + dlg->raise();
326 } 329 }
327 330
328 void ProgrammingWindow::onEncoderLeft() 331 void ProgrammingWindow::onEncoderLeft()
app/gui/oven_control/washwindow.cpp
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
10 #include "mainwindow.h" 10 #include "mainwindow.h"
11 #include "ovenstatics.h" 11 #include "ovenstatics.h"
12 #include "cooldownpopup.h" 12 #include "cooldownpopup.h"
  13 +#include "manualviewerdlg.h"
13 14
14 WashWindow::WashWindow(QWidget *parent) : 15 WashWindow::WashWindow(QWidget *parent) :
15 QMainWindow(parent), 16 QMainWindow(parent),
@@ -517,7 +518,9 @@ void WashWindow::on_configButton_clicked() @@ -517,7 +518,9 @@ void WashWindow::on_configButton_clicked()
517 518
518 void WashWindow::on_helpButton_clicked() 519 void WashWindow::on_helpButton_clicked()
519 { 520 {
520 - 521 + ManualViewerDlg* dlg = new ManualViewerDlg(this);
  522 + dlg->showFullScreen();
  523 + dlg->raise();
521 } 524 }
522 525
523 void WashWindow::onEncoderLeft() 526 void WashWindow::onEncoderLeft()