diff --git a/app/gui/oven_control/configwindow.cpp b/app/gui/oven_control/configwindow.cpp index dee3efa..c05a912 100644 --- a/app/gui/oven_control/configwindow.cpp +++ b/app/gui/oven_control/configwindow.cpp @@ -445,6 +445,7 @@ void ConfigWindow::on_washButton_clicked() void ConfigWindow::on_helpButton_clicked() { ManualViewerDlg* dlg = new ManualViewerDlg(this); - dlg->exec(); + dlg->showFullScreen(); + dlg->raise(); } diff --git a/app/gui/oven_control/mainwindow.cpp b/app/gui/oven_control/mainwindow.cpp index e27fc66..9e618ce 100644 --- a/app/gui/oven_control/mainwindow.cpp +++ b/app/gui/oven_control/mainwindow.cpp @@ -14,6 +14,7 @@ #include "ovenstatics.h" #include "notipopupdlg.h" #include "multicookwindow.h" +#include "manualviewerdlg.h" MainWindow *MainWindow::instance = NULL; @@ -275,5 +276,7 @@ void MainWindow::on_configButton_clicked() void MainWindow::on_helpButton_clicked() { - + ManualViewerDlg* dlg = new ManualViewerDlg(this); + dlg->showFullScreen(); + dlg->raise(); } diff --git a/app/gui/oven_control/operationtimeheat.cpp b/app/gui/oven_control/operationtimeheat.cpp index ea8a498..25de9c8 100644 --- a/app/gui/oven_control/operationtimeheat.cpp +++ b/app/gui/oven_control/operationtimeheat.cpp @@ -3,6 +3,7 @@ #include "ui_operationtimeheat.h" #include "ovenstatics.h" #include "soundplayer.h" +#include "manualviewerdlg.h" OperationTimeHeat::OperationTimeHeat(QWidget *parent) : QMainWindow(parent), @@ -105,3 +106,10 @@ void OperationTimeHeat::keyReleaseEvent(QKeyEvent *event) break; } } + +void OperationTimeHeat::on_helpButton_clicked() +{ + ManualViewerDlg* dlg = new ManualViewerDlg(this); + dlg->showFullScreen(); + dlg->raise(); +} diff --git a/app/gui/oven_control/operationtimeheat.h b/app/gui/oven_control/operationtimeheat.h index 086e819..bd5df58 100644 --- a/app/gui/oven_control/operationtimeheat.h +++ b/app/gui/oven_control/operationtimeheat.h @@ -26,6 +26,8 @@ private slots: void on_backButton_clicked(); + void on_helpButton_clicked(); + private: Ui::OperationTimeHeat *ui; void reloadUI(void); diff --git a/app/gui/oven_control/operationtimemode.cpp b/app/gui/oven_control/operationtimemode.cpp index f52205b..7e96c60 100644 --- a/app/gui/oven_control/operationtimemode.cpp +++ b/app/gui/oven_control/operationtimemode.cpp @@ -3,6 +3,7 @@ #include "ui_operationtimemode.h" #include "ovenstatics.h" #include "soundplayer.h" +#include "manualviewerdlg.h" OperationTimeMode::OperationTimeMode(QWidget *parent) : QMainWindow(parent), @@ -133,3 +134,10 @@ void OperationTimeMode::keyReleaseEvent(QKeyEvent *event) break; } } + +void OperationTimeMode::on_helpButton_clicked() +{ + ManualViewerDlg* dlg = new ManualViewerDlg(this); + dlg->showFullScreen(); + dlg->raise(); +} diff --git a/app/gui/oven_control/operationtimemode.h b/app/gui/oven_control/operationtimemode.h index 9d7fffd..48383c1 100644 --- a/app/gui/oven_control/operationtimemode.h +++ b/app/gui/oven_control/operationtimemode.h @@ -22,6 +22,8 @@ protected: private slots: void on_backButton_clicked(); + void on_helpButton_clicked(); + private: Ui::OperationTimeMode *ui; void reloadUi(void); diff --git a/app/gui/oven_control/operationtimeparts.cpp b/app/gui/oven_control/operationtimeparts.cpp index 35f0f90..b36f690 100644 --- a/app/gui/oven_control/operationtimeparts.cpp +++ b/app/gui/oven_control/operationtimeparts.cpp @@ -4,6 +4,7 @@ #include "ui_operationtimeparts.h" #include "ovenstatics.h" #include "soundplayer.h" +#include "manualviewerdlg.h" OperationTimeParts::OperationTimeParts(QWidget *parent) : QMainWindow(parent), @@ -144,3 +145,10 @@ void OperationTimeParts::keyReleaseEvent(QKeyEvent *event) break; } } + +void OperationTimeParts::on_helpButton_clicked() +{ + ManualViewerDlg* dlg = new ManualViewerDlg(this); + dlg->showFullScreen(); + dlg->raise(); +} diff --git a/app/gui/oven_control/operationtimeparts.h b/app/gui/oven_control/operationtimeparts.h index 630087a..71519f5 100644 --- a/app/gui/oven_control/operationtimeparts.h +++ b/app/gui/oven_control/operationtimeparts.h @@ -27,6 +27,8 @@ private slots: void onBtnResetsClicked(int); + void on_helpButton_clicked(); + protected: void keyPressEvent(QKeyEvent *event); void keyReleaseEvent(QKeyEvent *event); diff --git a/app/gui/oven_control/realtimepartswindow.cpp b/app/gui/oven_control/realtimepartswindow.cpp index 1a5a3ab..0796232 100644 --- a/app/gui/oven_control/realtimepartswindow.cpp +++ b/app/gui/oven_control/realtimepartswindow.cpp @@ -3,6 +3,7 @@ #include "ui_realtimepartswindow.h" #include "ovenstatics.h" #include "soundplayer.h" +#include "manualviewerdlg.h" RealtimePartsWindow::RealtimePartsWindow(QWidget *parent) : QMainWindow(parent), @@ -159,3 +160,10 @@ void RealtimePartsWindow::keyReleaseEvent(QKeyEvent *event) break; } } + +void RealtimePartsWindow::on_helpButton_clicked() +{ + ManualViewerDlg *dlg = new ManualViewerDlg(this); + dlg->showFullScreen(); + dlg->raise(); +} diff --git a/app/gui/oven_control/realtimepartswindow.h b/app/gui/oven_control/realtimepartswindow.h index a496d17..9746f46 100644 --- a/app/gui/oven_control/realtimepartswindow.h +++ b/app/gui/oven_control/realtimepartswindow.h @@ -28,6 +28,8 @@ private slots: void on_backButton_clicked(); void oneSecTimerFired(void); + void on_helpButton_clicked(); + private: Ui::RealtimePartsWindow *ui; QLabel *m_arrLbState[CONTROL_LIST_COL_MAX][CONTROL_LIST_ITEM_MAX]; diff --git a/app/gui/oven_control/realtimesensorwindow.cpp b/app/gui/oven_control/realtimesensorwindow.cpp index bed32b3..b2eee70 100644 --- a/app/gui/oven_control/realtimesensorwindow.cpp +++ b/app/gui/oven_control/realtimesensorwindow.cpp @@ -5,6 +5,7 @@ #include "stringer.h" #include "QDateTime" #include "soundplayer.h" +#include "manualviewerdlg.h" RealtimeSensorWindow::RealtimeSensorWindow(QWidget *parent) : QMainWindow(parent), @@ -186,3 +187,10 @@ void RealtimeSensorWindow::on_resetButton_clicked() ovs->resetSensorHistory(); reloadUi(); } + +void RealtimeSensorWindow::on_helpButton_clicked() +{ + ManualViewerDlg* dlg = new ManualViewerDlg(this); + dlg->showFullScreen(); + dlg->raise(); +} diff --git a/app/gui/oven_control/realtimesensorwindow.h b/app/gui/oven_control/realtimesensorwindow.h index 61939bf..ac19187 100644 --- a/app/gui/oven_control/realtimesensorwindow.h +++ b/app/gui/oven_control/realtimesensorwindow.h @@ -30,6 +30,8 @@ private slots: void on_resetButton_clicked(); + void on_helpButton_clicked(); + private: const uint16_t m_arrSensorItemIdxs[REALSENSOR_CONTROL_LIST_ITEM_MAX]={ 0,1,3,4,5,6,7,8,12,13