diff --git a/app/gui/oven_control/autocookcheckwindow.cpp b/app/gui/oven_control/autocookcheckwindow.cpp index a23f92a..92d1464 100644 --- a/app/gui/oven_control/autocookcheckwindow.cpp +++ b/app/gui/oven_control/autocookcheckwindow.cpp @@ -322,36 +322,3 @@ void AutoCookCheckWindow::on_backButton_clicked() emit back(); close(); } - -void AutoCookCheckWindow::on_configButton_clicked() -{ - ConfigWindow *w = new ConfigWindow(MainWindow::getInstance()); - w->setWindowModality(Qt::WindowModal); - w->showFullScreen(); - w->raise(); - - MainWindow::jump(w); -} - -void AutoCookCheckWindow::on_favoritesButton_clicked() -{ - ConfirmPopup *p = new ConfirmPopup(this, tr("즐겨찾기 항목에 추가하시겠습니까?")); - p->showFullScreen(); - - connect(p, SIGNAL(accepted()), SLOT(addFavorite())); -} - -void AutoCookCheckWindow::on_washButton_clicked() -{ - WashWindow *w = new WashWindow(MainWindow::getInstance()); - w->setWindowModality(Qt::WindowModal); - w->showFullScreen(); - w->raise(); - - MainWindow::jump(w); -} - -void AutoCookCheckWindow::on_helpButton_clicked() -{ - -} diff --git a/app/gui/oven_control/autocookcheckwindow.h b/app/gui/oven_control/autocookcheckwindow.h index aae636a..80ba21a 100644 --- a/app/gui/oven_control/autocookcheckwindow.h +++ b/app/gui/oven_control/autocookcheckwindow.h @@ -57,10 +57,6 @@ private slots: void on_showPrevStepButton_clicked(); void on_showNextStepButton_clicked(); void on_backButton_clicked(); - void on_configButton_clicked(); - void on_favoritesButton_clicked(); - void on_washButton_clicked(); - void on_helpButton_clicked(); signals: void back(); diff --git a/app/gui/oven_control/autocookcheckwindow.ui b/app/gui/oven_control/autocookcheckwindow.ui index 0fb473a..026cd6a 100644 --- a/app/gui/oven_control/autocookcheckwindow.ui +++ b/app/gui/oven_control/autocookcheckwindow.ui @@ -235,7 +235,7 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/auto_bu - 584 + 420 480 288 70 @@ -589,7 +589,7 @@ QPushButton::pressed, QPushButton:focus { background-image: url(:/images/auto_bu - 175 + 401 26 97 97 @@ -609,98 +609,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/b - - - - 514 - 26 - 97 - 97 - - - - - 0 - 0 - - - - QPushButton { border-image: url(:/images/bottom_bar/wash.png); } -QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/wash_ov.png); } - - - - - - - - - 288 - 26 - 97 - 97 - - - - - 0 - 0 - - - - QPushButton { border-image: url(:/images/bottom_bar/config.png); } -QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/config_ov.png); } - - - - - - - - - 627 - 26 - 97 - 97 - - - - - 0 - 0 - - - - QPushButton { border-image: url(:/images/bottom_bar/help.png); } -QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/help_ov.png); } - - - - - - - - - 401 - 26 - 97 - 97 - - - - - 0 - 0 - - - - QPushButton { border-image: url(:/images/bottom_bar/favorites.png); } -QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/favorites_ov.png); } - - - - - @@ -925,10 +833,6 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/f showPrevStepButton showNextStepButton backButton - configButton - favoritesButton - washButton - helpButton diff --git a/app/gui/oven_control/programmingautoconfigwindow.cpp b/app/gui/oven_control/programmingautoconfigwindow.cpp index f070c1f..dd82be2 100644 --- a/app/gui/oven_control/programmingautoconfigwindow.cpp +++ b/app/gui/oven_control/programmingautoconfigwindow.cpp @@ -8,6 +8,8 @@ #include "cookprogram.h" #include "configwindow.h" #include "mainwindow.h" +#include "autocookselectionpopup.h" +#include "autocookcheckwindow.h" ProgrammingAutoConfigWindow::ProgrammingAutoConfigWindow(QWidget *parent, Cook cook) : QMainWindow(parent), @@ -75,8 +77,6 @@ ProgrammingAutoConfigWindow::ProgrammingAutoConfigWindow(QWidget *parent, Cook c foreach (QWidget *w, findChildren()) w->installEventFilter(this); - installEventFilter(this); - setFocus(); } @@ -150,31 +150,26 @@ void ProgrammingAutoConfigWindow::onEncoderRight() void ProgrammingAutoConfigWindow::onEncoderClicked(QWidget *clicked) { - if (clicked == NULL) - return; - - if (clicked->inherits("QPushButton")) + QPushButton *pb = qobject_cast(clicked); + if (pb) { - QPushButton *pb = qobject_cast(clicked); - if (pb) - pb->click(); + pb->click(); + return; } - else if (clicked->inherits("Slider")) + + Slider *slider = qobject_cast(clicked); + if (slider) { - Slider *slider = qobject_cast(clicked); - if (slider) - { - if (slider == ui->configSlider_1) - ui->configButton_1->setFocus(); - else if (slider == ui->configSlider_2) - ui->configButton_2->setFocus(); - else if (slider == ui->configSlider_3) - ui->configButton_3->setFocus(); - else if (slider == ui->configSlider_4) - ui->configButton_4->setFocus(); - else if (slider == ui->configSlider_5) - ui->configButton_5->setFocus(); - } + if (slider == ui->configSlider_1) + ui->configButton_1->setFocus(); + else if (slider == ui->configSlider_2) + ui->configButton_2->setFocus(); + else if (slider == ui->configSlider_3) + ui->configButton_3->setFocus(); + else if (slider == ui->configSlider_4) + ui->configButton_4->setFocus(); + else if (slider == ui->configSlider_5) + ui->configButton_5->setFocus(); } } @@ -204,6 +199,12 @@ QPushButton:checked { image: url(%3); }"); } else { + cw.button->show(); + cw.minimum->show(); + cw.maximum->show(); + cw.current->show(); + cw.slider->show(); + cw.button->setStyleSheet(styleSheet .arg(Define::icon(config.type)) .arg(Define::iconOverlay(config.type)) @@ -268,6 +269,13 @@ void ProgrammingAutoConfigWindow::updateView() break; } } + + QWidget *focused = focusWidget(); + ui->configButton_1->setChecked(focused == ui->configSlider_1); + ui->configButton_2->setChecked(focused == ui->configSlider_2); + ui->configButton_3->setChecked(focused == ui->configSlider_3); + ui->configButton_4->setChecked(focused == ui->configSlider_4); + ui->configButton_5->setChecked(focused == ui->configSlider_5); } void ProgrammingAutoConfigWindow::updateConfig() @@ -299,65 +307,101 @@ void ProgrammingAutoConfigWindow::afterThreeSecs() } } -void ProgrammingAutoConfigWindow::on_backButton_clicked() +void ProgrammingAutoConfigWindow::changeCook(Cook cook) { - close(); -} + if (this->cook.root == cook.root) + return; -void ProgrammingAutoConfigWindow::on_configButton_clicked() -{ - ConfigWindow *w = new ConfigWindow(MainWindow::getInstance()); - w->setWindowModality(Qt::WindowModal); - w->showFullScreen(); - w->raise(); + this->cook = cook; - MainWindow::jump(w); + setupUi(); } -void ProgrammingAutoConfigWindow::on_helpButton_clicked() +void ProgrammingAutoConfigWindow::on_selectCookButton_clicked() { + AutoCookSelectionPopup *p = new AutoCookSelectionPopup(this, cook.type); + p->showFullScreen(); + p->raise(); + connect(p, SIGNAL(selected(Cook)), SLOT(changeCook(Cook))); + connect(p, SIGNAL(selected(Cook)), SLOT(setFocus())); + connect(p, SIGNAL(canceled()), SLOT(setFocus())); } -void ProgrammingAutoConfigWindow::on_okButton_clicked() +void ProgrammingAutoConfigWindow::on_checkCookButton_clicked() { - if (!cook.isLoaded()) - cook.load(); - - AutoCookSetting s; - s.type = cook.type; - s.name = cook.name; - s.root = cook.root; - for (int i = 0; i < 5; i++) - s.configs[i] = cook.configs[i].current; + setFocus(); - CookProgram::add(s); + AutoCookCheckWindow *w = new AutoCookCheckWindow(this, cook); + w->setWindowModality(Qt::WindowModal); + w->showFullScreen(); + w->raise(); +} - emit added(); +void ProgrammingAutoConfigWindow::on_backButton_clicked() +{ close(); } void ProgrammingAutoConfigWindow::on_configButton_1_clicked() { ui->configSlider_1->setFocus(); + updateView(); } void ProgrammingAutoConfigWindow::on_configButton_2_clicked() { ui->configSlider_2->setFocus(); + updateView(); } void ProgrammingAutoConfigWindow::on_configButton_3_clicked() { ui->configSlider_3->setFocus(); + updateView(); } void ProgrammingAutoConfigWindow::on_configButton_4_clicked() { ui->configSlider_4->setFocus(); + updateView(); } void ProgrammingAutoConfigWindow::on_configButton_5_clicked() { ui->configSlider_5->setFocus(); + updateView(); +} + +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() +{ + +} + +void ProgrammingAutoConfigWindow::on_okButton_clicked() +{ + if (!cook.isLoaded()) + cook.load(); + + AutoCookSetting s; + s.type = cook.type; + s.name = cook.name; + s.root = cook.root; + for (int i = 0; i < 5; i++) + s.configs[i] = cook.configs[i].current; + + CookProgram::add(s); + + emit added(); + close(); } diff --git a/app/gui/oven_control/programmingautoconfigwindow.h b/app/gui/oven_control/programmingautoconfigwindow.h index 262b0e1..38506f5 100644 --- a/app/gui/oven_control/programmingautoconfigwindow.h +++ b/app/gui/oven_control/programmingautoconfigwindow.h @@ -54,25 +54,22 @@ private slots: void updateView(); void updateConfig(); void afterThreeSecs(); + void changeCook(Cook cook); - void on_backButton_clicked(); - - void on_configButton_clicked(); - - void on_helpButton_clicked(); - - void on_okButton_clicked(); + void on_selectCookButton_clicked(); + void on_checkCookButton_clicked(); void on_configButton_1_clicked(); - void on_configButton_2_clicked(); - void on_configButton_3_clicked(); - void on_configButton_4_clicked(); - void on_configButton_5_clicked(); + void on_backButton_clicked(); + void on_configButton_clicked(); + void on_helpButton_clicked(); + void on_okButton_clicked(); + signals: void added(); }; diff --git a/app/gui/oven_control/programmingautoconfigwindow.ui b/app/gui/oven_control/programmingautoconfigwindow.ui index 9ae4044..94e2e42 100644 --- a/app/gui/oven_control/programmingautoconfigwindow.ui +++ b/app/gui/oven_control/programmingautoconfigwindow.ui @@ -124,7 +124,7 @@ border: none; Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - + 720 @@ -1432,7 +1432,7 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c selectCookButton - pushButton_4 + checkCookButton configButton_1 configButton_2 configButton_3