diff --git a/app/gui/oven_control/config.cpp b/app/gui/oven_control/config.cpp index 0609774..d605fe0 100644 --- a/app/gui/oven_control/config.cpp +++ b/app/gui/oven_control/config.cpp @@ -10,6 +10,12 @@ #include "configmastervolumedlg.h" #include "configsoundselelectdlg.h" #include "yesnopopupdlg.h" +#include "usbcheckpopupdlg.h" +#include "configipdlg.h" +#include "configfileprocessdlg.h" +#include "confighalfenergydlg.h" +#include "config1digitsetdlg.h" +#include "configdutywashdlg.h" using namespace Define; @@ -116,8 +122,17 @@ QString Config::getValueString(Define::ConfigType idx){ break; case config_ip: qstrTemp.sprintf("%3d.%3d.%3d.%3d", configlist.items.ip.d8.d8_0,configlist.items.ip.d8.d8_1,configlist.items.ip.d8.d8_2,configlist.items.ip.d8.d8_3); + case config_set_half_energy: + if(configlist.items.set_half_energy.d32 >=2) configlist.items.set_half_energy.d32 = 0; + qstrTemp = tr(on_off_menu[configlist.items.set_half_energy.d32]); + break; + case config_duty_wash: + if(configlist.items.duty_wash.d32 >=2) configlist.items.duty_wash.d32 = 0; + qDebug() << "duty wash is "< Config::getConstBeginFavorite(){ return i; } +QList Config::getConstSortedFavorite(){ + QList list = m_setFavorite.toList(); + qSort(list); + return list; +} + bool Config::loadFavorite(void){ return false; } @@ -174,6 +195,7 @@ QString Config::getTempString(int cel_temp){ void Config::execConfigWindow(QWidget *parent, Define::ConfigType idx){ QDialog *dlg; + bool bUsbDetect = false; switch(idx){ case config_datetime: dlg = new ConfigDateTimeDlg(parent); @@ -207,6 +229,40 @@ void Config::execConfigWindow(QWidget *parent, Define::ConfigType idx){ case config_sound_factory_reset: dlg = new YesNoPopupDlg(parent, tr("모든 음향설정 값을 공장초기화\r하시겠습니까?")); break; + case config_ip: + dlg=new ConfigIpDlg(parent); + break; + case config_info_data_download: + case config_service_data_download: + case config_program_download: + case config_set_download: + if(!bUsbDetect){ + dlg = new UsbCheckPopupDlg(parent); + dlg->exec(); + } + dlg = new ConfigFileProcessDlg(parent,idx); + dlg->exec(); + return; + case config_set_upload: + case config_program_upload: + if(!bUsbDetect){ + dlg = new UsbCheckPopupDlg(parent); + dlg->exec(); + } + dlg = new ConfigFileProcessDlg(parent,idx,false); + dlg->exec(); + return; + case config_set_half_energy: + dlg = new ConfigHalfEnergyDlg(parent); + break; + case config_set_auto_darkness: + dlg = new Config1DigitSetDlg(parent,idx); + break; + case config_duty_wash: + dlg = new ConfigDutyWashDlg(parent); + break; + default: + dlg=NULL; } if(dlg == NULL) return; dlg->setWindowModality(Qt::WindowModal); diff --git a/app/gui/oven_control/config.h b/app/gui/oven_control/config.h index 63e7c02..0c189d3 100644 --- a/app/gui/oven_control/config.h +++ b/app/gui/oven_control/config.h @@ -8,7 +8,11 @@ #define STRUCT_PACK __attribute__ ((packed)) -#define MAX_CONFIG_COUNT 39 +#define MAX_CONFIG_COUNT 45 +#define MAX_SOFTWARE_INFO_CNT 3 +#define MAX_HOTLINE_CHEF_CNT 3 +#define MAX_HOTLINE_SERVICE_CNT 2 + namespace Define { @@ -52,6 +56,12 @@ namespace Define config_duty_wash, config_loading_door_monitoring, config_cooking_door_monitoring, + config_software_info, + config_hotline_chef, + config_hotline_service, + config_steam_wash, + config_demo_mode, + config_enter_engineer_mode, config_invalid = MAX_CONFIG_COUNT }; @@ -109,7 +119,12 @@ namespace Define config_item duty_wash; config_item loading_door_monitoring; config_item cooking_door_monitoring; - + config_item software_info; + config_item hotline_chef; + config_item hotline_service; + config_item steam_wash; + config_item demo_mode; + config_item enter_engineer_mode; }items; }STRUCT_PACK config_lists; @@ -189,6 +204,23 @@ namespace Define 2, 10, }; + + const char software_item_name[3][32] ={ + "모 델 명", + "제조일자", + "소프트웨어 버전" + }; + + const char hotline_chef_item_name[3][32] = { + "연 락 처", + "이 름", + "위치정보" + }; + + const char hotline_service_item_name[3][32] ={ + "연 락 처", + "위치정보" + }; } @@ -220,7 +252,8 @@ class Config : public QObject 0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02, 0x02,0x02, 0x02,0x02, 0x80, 0x80, 0x80, 0x02, 0x02, 0x80, 0x00, 0x00,0x00, - 0x80, 0x00, 0x00 + 0x80, 0x00, 0x00, + 0x80, 0x80, 0x80,0x80,0x80,0x80 }; const char config_format_kr[MAX_CONFIG_COUNT][64]={ @@ -262,7 +295,13 @@ class Config : public QObject "%d", //config_set_load_ready, "%s", //config_duty_wash, "%d단계", //config_loading_door_monitoring, - "%d단계" //config_cooking_door_monitoring + "%d단계", //config_cooking_door_monitoring + "%s", //config_software_info, + "%s", //config_hotline_chef, + "%s", //config_hotline_service, + "%s", //config_steam_wash + "%s", //config_demo_mode, + "%s", //config_enter_engineer_mode, }; @@ -307,7 +346,13 @@ class Config : public QObject "적재중 대기 시간", //config_set_load_ready, "의무 세척과정", //config_duty_wash, "적재 중 문열림 시간 모니터링",//config_loading_door_monitoring, - "조리 중 문열림 시간 모니터링"//config_cooking_door_monitoring + "조리 중 문열림 시간 모니터링" ,//config_cooking_door_monitoring + "제품유형/소프트웨어에 관한 정보",//config_software_info, + "핫라인-쉐프", //config_hotline_chef, + "핫라인-서비스", //config_hotline_service, + "증기 발생기 헹굼", //config_steam_wash + "시연모드", //config_demo_mode, + "서비스단계(엔지니어모드)" //config_enter_engineer_mode, }; QSet m_setFavorite; @@ -324,6 +369,7 @@ public: QString getTitleString(Define::ConfigType idx); bool isFavorite(Define::ConfigType idx); QSetIterator getConstBeginFavorite(); + QList getConstSortedFavorite(); bool loadFavorite(void); bool saveFavorite(void); void insertFavorite(Define::ConfigType idx); diff --git a/app/gui/oven_control/config1digitsetdlg.cpp b/app/gui/oven_control/config1digitsetdlg.cpp new file mode 100644 index 0000000..4263305 --- /dev/null +++ b/app/gui/oven_control/config1digitsetdlg.cpp @@ -0,0 +1,70 @@ +#include +#include "config1digitsetdlg.h" +#include "ui_config1digitsetdlg.h" + +using namespace Define; + +Config1DigitSetDlg::Config1DigitSetDlg(QWidget *parent, ConfigType type) : + QDialog(parent), + ui(new Ui::Config1DigitSetDlg) +{ + Config* cfg = Config::getInstance(); + QString strTemp1,strTemp2; + config_1digit_set setting_val; + config_item item; + ui->setupUi(this); + this->setWindowFlags( Qt::FramelessWindowHint); + this->setAttribute( Qt::WA_DeleteOnClose); + + m_nType = type; + + ui->ctrLbTitle->setText(cfg->getTitleString(m_nType)); + item = cfg->getConfigValue(m_nType); + ui->ctrSpBxValue->setValue(item.d32); + + switch(m_nType){ + case config_set_auto_darkness: + setting_val = auto_darkness_dlgset; + break; + case config_set_load_ready: + setting_val = load_ready_dlgset; + break; + default: + setting_val.min = 0; + setting_val.str_unit[0] = 0; + setting_val.maxlen=2; + setting_val.max = 10; + break; + } + + ui->ctrSpBxValue->setMaximum(setting_val.max); + ui->ctrSpBxValue->setMinimum(setting_val.min); + strTemp1.sprintf("(%%0%dd ~ %%0%dd %s)", setting_val.maxlen,setting_val.maxlen,setting_val.str_unit); + qDebug() <ctrLbRange->setText(strTemp2); + + strTemp1.sprintf("%%0%d",setting_val.maxlen); + + +} + +Config1DigitSetDlg::~Config1DigitSetDlg() +{ + delete ui; +} + +void Config1DigitSetDlg::on_ctrBtnOk_clicked() +{ + Config* cfg = Config::getInstance(); + config_item item; + item.d32 = ui->ctrSpBxValue->value(); + cfg->setConfigValue(m_nType,item); + accept(); +} + +void Config1DigitSetDlg::on_ctrBtnCancel_clicked() +{ + reject(); +} diff --git a/app/gui/oven_control/config1digitsetdlg.h b/app/gui/oven_control/config1digitsetdlg.h new file mode 100644 index 0000000..4bca143 --- /dev/null +++ b/app/gui/oven_control/config1digitsetdlg.h @@ -0,0 +1,31 @@ +#ifndef CONFIG1DIGITSETDLG_H +#define CONFIG1DIGITSETDLG_H + +#include +#include "config.h" + +using namespace Define; + +namespace Ui { +class Config1DigitSetDlg; +} + +class Config1DigitSetDlg : public QDialog +{ + Q_OBJECT + +public: + explicit Config1DigitSetDlg(QWidget *parent = 0, ConfigType type=config_invalid); + ~Config1DigitSetDlg(); + +private slots: + void on_ctrBtnOk_clicked(); + + void on_ctrBtnCancel_clicked(); + +private: + Ui::Config1DigitSetDlg *ui; + ConfigType m_nType; +}; + +#endif // CONFIG1DIGITSETDLG_H diff --git a/app/gui/oven_control/config1digitsetdlg.ui b/app/gui/oven_control/config1digitsetdlg.ui new file mode 100644 index 0000000..9b29d85 --- /dev/null +++ b/app/gui/oven_control/config1digitsetdlg.ui @@ -0,0 +1,299 @@ + + + Config1DigitSetDlg + + + + 0 + 0 + 900 + 1600 + + + + Dialog + + + #ConfigDateTimeDlg{ + /*background-color : transparent;*/ +} + +#centralwidget{ + background-image : url(:/images/background/popup/913.png); +} + +QLabel { + color : white; +} +QLineEdit{ + background-color : transparent; + color : white; +} + +QSpinBox{ + background-color : transparent; + color : white; +} + +QPushButton{ + border-color : transparent; + background-color : transparent; + color : white; +} +QPushButton::pressed, QPushButton::focus{ + color : yellow; +} + + + + + 0 + 425 + 900 + 1025 + + + + + + 0 + 0 + 901 + 441 + + + + + 0 + + + QLayout::SetDefaultConstraint + + + + + + 16777215 + 94 + + + + + 나눔고딕 + 18 + 75 + true + + + + color : white; + + + TITLE + + + Qt::AlignCenter + + + + + + + color: rgb(255, 255, 255); + + + Qt::Horizontal + + + + + + + 20 + + + 35 + + + 20 + + + 13 + + + 0 + + + + + + 나눔고딕 + 21 + 75 + true + + + + min + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + + 0 + 0 + + + + + 16777215 + 80 + + + + + 나눔고딕 + 21 + 75 + true + true + + + + Qt::StrongFocus + + + false + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + QAbstractSpinBox::NoButtons + + + 0 + + + 2100 + + + 5 + + + + + + + + 16777215 + 50 + + + + + 나눔고딕 + 13 + 50 + false + + + + (01 ~ 30 min) + + + Qt::AlignCenter + + + + + + + + + 10 + + + 10 + + + 0 + + + + + + 0 + 0 + + + + + 나눔고딕 + 12 + true + + + + 취소 + + + true + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 12 + true + + + + 확인 + + + true + + + + + + + + + + + 0 + 425 + 900 + 600 + + + + + + + + KeyboardWidget + QWidget +
keyboardwidget.h
+ 1 + + + + + diff --git a/app/gui/oven_control/configdutywashdlg.cpp b/app/gui/oven_control/configdutywashdlg.cpp new file mode 100644 index 0000000..348ee06 --- /dev/null +++ b/app/gui/oven_control/configdutywashdlg.cpp @@ -0,0 +1,69 @@ +#include "config.h" +#include "configdutywashdlg.h" +#include "ui_configdutywashdlg.h" + +using namespace Define; + +ConfigDutyWashDlg::ConfigDutyWashDlg(QWidget *parent) : + QDialog(parent), + ui(new Ui::ConfigDutyWashDlg) +{ + Config* cfg = Config::getInstance(); + config_item item; + item = cfg->getConfigValue(config_duty_wash); + m_nCurSel = item.d32; + ui->setupUi(this); + this->setWindowFlags( Qt::FramelessWindowHint); + this->setAttribute( Qt::WA_DeleteOnClose); + + ui->pushButton_1->setText(tr(active_on_off_menu[0])); + ui->pushButton_2->setText(tr(active_on_off_menu[1])); + + reloadUi(); + + m_pSignalMapper = new QSignalMapper(this); + m_pSignalMapper->setMapping(ui->pushButton_1,0); + m_pSignalMapper->setMapping(ui->pushButton_2,1); + + connect(ui->pushButton_1,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_2,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + + connect(m_pSignalMapper,SIGNAL(mapped(int)),this,SLOT(onConfigBtnClicked(int))); +} + +ConfigDutyWashDlg::~ConfigDutyWashDlg() +{ + delete ui; +} + +void ConfigDutyWashDlg::on_ctrBtnOk_clicked() +{ + Config* cfg = Config::getInstance(); + config_item item; + item.d32 = m_nCurSel; + cfg->setConfigValue(config_duty_wash,item); + accept(); +} + +void ConfigDutyWashDlg::on_ctrBtnCancel_clicked() +{ + reject(); +} + + +void ConfigDutyWashDlg::onConfigBtnClicked(const int sel){ + m_nCurSel = sel; +} + +void ConfigDutyWashDlg::reloadUi(){ + switch(m_nCurSel){ + case 0: + ui->pushButton_1->setChecked(true); + break; + case 1: + ui->pushButton_2->setChecked(true); + break; + default: + break; + } +} diff --git a/app/gui/oven_control/configdutywashdlg.h b/app/gui/oven_control/configdutywashdlg.h new file mode 100644 index 0000000..127531e --- /dev/null +++ b/app/gui/oven_control/configdutywashdlg.h @@ -0,0 +1,34 @@ +#ifndef CONFIGDUTYWASHDLG_H +#define CONFIGDUTYWASHDLG_H + +#include +#include + +namespace Ui { +class ConfigDutyWashDlg; +} + +class ConfigDutyWashDlg : public QDialog +{ + Q_OBJECT + +public: + explicit ConfigDutyWashDlg(QWidget *parent = 0); + ~ConfigDutyWashDlg(); + + void reloadUi(); + +private slots: + void on_ctrBtnOk_clicked(); + + void on_ctrBtnCancel_clicked(); + + void onConfigBtnClicked(const int sel); + +private: + Ui::ConfigDutyWashDlg *ui; + QSignalMapper *m_pSignalMapper; + int m_nCurSel; +}; + +#endif // CONFIGDUTYWASHDLG_H diff --git a/app/gui/oven_control/configdutywashdlg.ui b/app/gui/oven_control/configdutywashdlg.ui new file mode 100644 index 0000000..d6ce395 --- /dev/null +++ b/app/gui/oven_control/configdutywashdlg.ui @@ -0,0 +1,225 @@ + + + ConfigDutyWashDlg + + + + 0 + 0 + 900 + 1600 + + + + Dialog + + + false + + + #centralwidget{ + background-image : url(:/images/background/popup/503.png); +} + +QPushButton{ + border-color : transparent; + background-color : transparent; + color : white; +} + +QPushButton::focus{ + color : yellow; +} + +QPushButton::pressed{ + color : green; +} + +QPushButton::checked{ + color : red; +} + +QLabel{ + color : white; +} + + + + + 0 + 450 + 900 + 362 + + + + + 900 + 0 + + + + + + + + 18 + 75 + true + + + + + + + 의무 세척 과정 + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 16 + + + + PushButton + + + true + + + true + + + true + + + true + + + + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 16 + + + + PushButton + + + true + + + true + + + true + + + + + + + Qt::Horizontal + + + + + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 10 + 75 + true + true + + + + 취소 + + + true + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 10 + 75 + true + true + + + + 확인 + + + true + + + + + + + + + + + diff --git a/app/gui/oven_control/configfavoritebutton.cpp b/app/gui/oven_control/configfavoritebutton.cpp new file mode 100644 index 0000000..76099cb --- /dev/null +++ b/app/gui/oven_control/configfavoritebutton.cpp @@ -0,0 +1,32 @@ +#include "configfavoritebutton.h" +#include "ui_configfavoritebutton.h" + +ConfigFavoriteButton::ConfigFavoriteButton(QWidget *parent,uint16_t btn_id) : + QWidget(parent), + ui(new Ui::ConfigFavoriteButton) +{ + ui->setupUi(this); + btnid = btn_id; + +} + +ConfigFavoriteButton::~ConfigFavoriteButton() +{ + delete ui; +} + +void ConfigFavoriteButton::setText(const QString &text){ + ui->pushButton->setText(text); +} + + + +void ConfigFavoriteButton::on_favoriteButton_clicked() +{ + emit delBtnClicked(btnid); +} + +void ConfigFavoriteButton::on_pushButton_clicked() +{ + emit clicked(btnid); +} diff --git a/app/gui/oven_control/configfavoritebutton.h b/app/gui/oven_control/configfavoritebutton.h new file mode 100644 index 0000000..ff28a2d --- /dev/null +++ b/app/gui/oven_control/configfavoritebutton.h @@ -0,0 +1,37 @@ +#ifndef CONFIGFAVORITEBUTTON_H +#define CONFIGFAVORITEBUTTON_H + +#include + +namespace Ui { +class ConfigFavoriteButton; +} + +class ConfigFavoriteButton : public QWidget +{ + Q_OBJECT + +public: + explicit ConfigFavoriteButton(QWidget *parent = 0,uint16_t id = 0); + ~ConfigFavoriteButton(); + void setText(const QString &text); + + +private: + Ui::ConfigFavoriteButton *ui; + QString text_; + QRect textRect; + uint16_t btnid; + +signals: + void clicked(uint16_t); + void delBtnClicked(uint16_t); +private slots: + void on_favoriteButton_clicked(); + void on_pushButton_clicked(); + +public: + uint16_t getBtnId(void){return btnid;}; +}; + +#endif // CONFIGFAVORITEBUTTON_H diff --git a/app/gui/oven_control/configfavoritebutton.ui b/app/gui/oven_control/configfavoritebutton.ui new file mode 100644 index 0000000..2f953f4 --- /dev/null +++ b/app/gui/oven_control/configfavoritebutton.ui @@ -0,0 +1,111 @@ + + + ConfigFavoriteButton + + + + 0 + 0 + 821 + 65 + + + + + 821 + 65 + + + + + 821 + 65 + + + + Form + + + QPushButton { +background-position: center; +background-repeat: no-repeat; +border : none; +} + + + + + 0 + 0 + 821 + 65 + + + + + 0 + 0 + + + + + 821 + 65 + + + + + 821 + 65 + + + + + Roboto + 11 + + + + QPushButton { background-image: url(:/images/config/pannel.png); + color : white; + text-align: left; + border : 20px; + padding-left : 20px; +} +QPushButton:pressed { background-image: url(:/images/config/pannel_ov.png); } +QPushButton:focus { background-image: url(:/images/config/pannel_ov.png); } + + + test + + + + + + 650 + 0 + 77 + 65 + + + + Qt::NoFocus + + + QPushButton { background-image: url(:/images/config/100_fav_pannel_icon.png); } +QPushButton:checked { background-image: url(:/images/config/100_fav_pannel_icon_ov.png); } + + + + + + false + + + false + + + + + + diff --git a/app/gui/oven_control/configfileprocessdlg.cpp b/app/gui/oven_control/configfileprocessdlg.cpp new file mode 100644 index 0000000..addab20 --- /dev/null +++ b/app/gui/oven_control/configfileprocessdlg.cpp @@ -0,0 +1,49 @@ +#include "configfileprocessdlg.h" +#include "ui_configfileprocessdlg.h" +#include "config.h" + +ConfigFileProcessDlg::ConfigFileProcessDlg(QWidget *parent, ConfigType type, bool isDown) : + QDialog(parent), + ui(new Ui::ConfigFileProcessDlg) +{ + Config* cfg = Config::getInstance(); + ui->setupUi(this); + setWindowFlags(Qt::FramelessWindowHint); + setAttribute(Qt::WA_NoSystemBackground); + setAttribute(Qt::WA_TranslucentBackground); + setAttribute(Qt::WA_DeleteOnClose); + if(type < config_invalid) + { + m_nCfgtype = type; + ui->ctrLbTitle->setText(cfg->getTitleString(m_nCfgtype)); + if(!isDown){ + ui->ctrBtnOk->setStyleSheet(" QPushButton{ \ + border-image : url(:/images/config/111_icon_upload.png);\ + }\ + QPushButton::pressed, QPushButton::focus{\ + border-image : url(:/images/config/111_icon_upload.png);\ + });"); + + } + } +} + +ConfigFileProcessDlg::~ConfigFileProcessDlg() +{ + delete ui; +} + +void ConfigFileProcessDlg::on_ctrBtnOk_clicked() +{ + switch(m_nCfgtype){ + default: + break; + } + + deleteLater(); +} + +void ConfigFileProcessDlg::on_ctrBtnCancel_clicked() +{ + deleteLater(); +} diff --git a/app/gui/oven_control/configfileprocessdlg.h b/app/gui/oven_control/configfileprocessdlg.h new file mode 100644 index 0000000..a661a7e --- /dev/null +++ b/app/gui/oven_control/configfileprocessdlg.h @@ -0,0 +1,31 @@ +#ifndef CONFIGFILEPROCESSDLG_H +#define CONFIGFILEPROCESSDLG_H + +#include +#include "config.h" + +using namespace Define; + +namespace Ui { + class ConfigFileProcessDlg; +} + +class ConfigFileProcessDlg : public QDialog +{ + Q_OBJECT + +public: + explicit ConfigFileProcessDlg(QWidget *parent = 0,ConfigType type = config_invalid, bool isDown = true); + ~ConfigFileProcessDlg(); + +private slots: + void on_ctrBtnOk_clicked(); + + void on_ctrBtnCancel_clicked(); + +private: + Ui::ConfigFileProcessDlg *ui; + ConfigType m_nCfgtype; +}; + +#endif // CONFIGFILEPROCESSDLG_H diff --git a/app/gui/oven_control/configfileprocessdlg.ui b/app/gui/oven_control/configfileprocessdlg.ui new file mode 100644 index 0000000..638af30 --- /dev/null +++ b/app/gui/oven_control/configfileprocessdlg.ui @@ -0,0 +1,145 @@ + + + ConfigFileProcessDlg + + + + 0 + 0 + 900 + 1600 + + + + Dialog + + + 1.000000000000000 + + + #centralWidget { background-image: url(:/images/background/popup/503.png); +} + + + + true + + + + + 0 + 430 + 900 + 503 + + + + + + + + + 260 + 320 + 157 + 77 + + + + + 75 + true + true + + + + QPushButton{ + border-image : url(:/images/config/105_icon_download.png); +} + +QPushButton::pressed, QPushButton::focus{ + border-image : url(:/images/config/105_icon_download_ov.png); +} + + + + + + + + + 510 + 317 + 82 + 82 + + + + + 75 + true + true + + + + QPushButton{ + border-image : url(:/images/config/105_icon_cancel.png); +} + +QPushButton::pressed{ + border-image : url(:/images/config/105_icon_cancel_ov.png); +} + + + + + + + + + + 0 + 0 + 900 + 91 + + + + + 나눔고딕 + 13 + 75 + true + + + + QLabel { + color : white; + border : none; +} + + + 서비스 데이터 다운로드 + + + Qt::AlignCenter + + + + + + 0 + 93 + 900 + 3 + + + + Qt::Horizontal + + + + + + + diff --git a/app/gui/oven_control/confighalfenergydlg.cpp b/app/gui/oven_control/confighalfenergydlg.cpp new file mode 100644 index 0000000..36f7fb2 --- /dev/null +++ b/app/gui/oven_control/confighalfenergydlg.cpp @@ -0,0 +1,69 @@ +#include "config.h" +#include "confighalfenergydlg.h" +#include "ui_confighalfenergydlg.h" + +using namespace Define; + +ConfigHalfEnergyDlg::ConfigHalfEnergyDlg(QWidget *parent) : + QDialog(parent), + ui(new Ui::ConfigHalfEnergyDlg) +{ + Config* cfg = Config::getInstance(); + config_item item; + item = cfg->getConfigValue(config_set_half_energy); + m_nCurSel = item.d32; + ui->setupUi(this); + this->setWindowFlags( Qt::FramelessWindowHint); + this->setAttribute( Qt::WA_DeleteOnClose); + + ui->pushButton_1->setText(tr(on_off_menu[0])); + ui->pushButton_2->setText(tr(on_off_menu[1])); + + reloadUi(); + + m_pSignalMapper = new QSignalMapper(this); + m_pSignalMapper->setMapping(ui->pushButton_1,0); + m_pSignalMapper->setMapping(ui->pushButton_2,1); + + connect(ui->pushButton_1,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_2,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + + connect(m_pSignalMapper,SIGNAL(mapped(int)),this,SLOT(onConfigBtnClicked(int))); +} + +ConfigHalfEnergyDlg::~ConfigHalfEnergyDlg() +{ + delete ui; +} + +void ConfigHalfEnergyDlg::on_ctrBtnOk_clicked() +{ + Config* cfg = Config::getInstance(); + config_item item; + item.d32 = m_nCurSel; + cfg->setConfigValue(config_set_half_energy,item); + accept(); +} + +void ConfigHalfEnergyDlg::onConfigBtnClicked(const int sel){ + m_nCurSel = sel; +} + + +void ConfigHalfEnergyDlg::on_ctrBtnCancel_clicked() +{ + reject(); +} + +void ConfigHalfEnergyDlg::reloadUi(){ + switch(m_nCurSel){ + case 0: + ui->pushButton_1->setChecked(true); + break; + case 1: + ui->pushButton_2->setChecked(true); + break; + default: + break; + } +} diff --git a/app/gui/oven_control/confighalfenergydlg.h b/app/gui/oven_control/confighalfenergydlg.h new file mode 100644 index 0000000..1a48df1 --- /dev/null +++ b/app/gui/oven_control/confighalfenergydlg.h @@ -0,0 +1,33 @@ +#ifndef CONFIGHALFENERGYDLG_H +#define CONFIGHALFENERGYDLG_H + +#include +#include + +namespace Ui { +class ConfigHalfEnergyDlg; +} + +class ConfigHalfEnergyDlg : public QDialog +{ + Q_OBJECT + +public: + explicit ConfigHalfEnergyDlg(QWidget *parent = 0); + ~ConfigHalfEnergyDlg(); + void reloadUi(void); + +private slots: + void on_ctrBtnOk_clicked(); + + void on_ctrBtnCancel_clicked(); + + void onConfigBtnClicked(const int sel); + +private: + Ui::ConfigHalfEnergyDlg *ui; + QSignalMapper *m_pSignalMapper; + int m_nCurSel; +}; + +#endif // CONFIGHALFENERGYDLG_H diff --git a/app/gui/oven_control/confighalfenergydlg.ui b/app/gui/oven_control/confighalfenergydlg.ui new file mode 100644 index 0000000..fe10051 --- /dev/null +++ b/app/gui/oven_control/confighalfenergydlg.ui @@ -0,0 +1,225 @@ + + + ConfigHalfEnergyDlg + + + + 0 + 0 + 900 + 1600 + + + + Dialog + + + false + + + #centralwidget{ + background-image : url(:/images/background/popup/503.png); +} + +QPushButton{ + border-color : transparent; + background-color : transparent; + color : white; +} + +QPushButton::focus{ + color : yellow; +} + +QPushButton::pressed{ + color : green; +} + +QPushButton::checked{ + color : red; +} + +QLabel{ + color : white; +} + + + + + 0 + 450 + 900 + 362 + + + + + 900 + 0 + + + + + + + + 18 + 75 + true + + + + + + + 하프에너지 + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 16 + + + + PushButton + + + true + + + true + + + true + + + true + + + + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 16 + + + + PushButton + + + true + + + true + + + true + + + + + + + Qt::Horizontal + + + + + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 10 + 75 + true + true + + + + 취소 + + + true + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 10 + 75 + true + true + + + + 확인 + + + true + + + + + + + + + + + diff --git a/app/gui/oven_control/configinfodlg.cpp b/app/gui/oven_control/configinfodlg.cpp new file mode 100644 index 0000000..8a12119 --- /dev/null +++ b/app/gui/oven_control/configinfodlg.cpp @@ -0,0 +1,110 @@ +#include +#include +#include +#include "configinfodlg.h" +#include "ui_configinfodlg.h" + +ConfigInfoDlg::ConfigInfoDlg(QWidget *parent, ConfigType type) : + QDialog(parent), + ui(new Ui::ConfigInfoDlg) +{ + Config* cfg = Config::getInstance(); + ui->setupUi(this); + this->setWindowFlags( Qt::FramelessWindowHint); + this->setAttribute( Qt::WA_DeleteOnClose); + + m_nType = type; + + ui->ctrTitle->setText(cfg->getTitleString(type)); + + switch(type){ + case config_hotline_chef: + loadHotlineChefInfo(); + break; + case config_hotline_service: + loadHotlineServiceInfo(); + break; + case config_software_info: + default: + loadSoftwareInfo(); + break; + } +} + +ConfigInfoDlg::~ConfigInfoDlg() +{ + delete ui; +} + +void ConfigInfoDlg::on_ctrBtnOk_clicked() +{ + deleteLater(); +} + +void ConfigInfoDlg::loadSoftwareInfo(){ + QString strTemp; + QMap mapInfos; + QLabel* label; + mapInfos["모델명"] = "PRIME ST-01"; + mapInfos["제조일자"] = "2017-06"; + mapInfos["소프트웨어버전"] ="0.1 BETA"; + + for(int i =0;isetText(tr(software_item_name[i]).append(":")); + ui->gridLayout_info->addWidget(label,i,0); + label = new QLabel(this); + label->setText(strTemp); + ui->gridLayout_info->addWidget(label,i,1); + } +} + +void ConfigInfoDlg::loadHotlineChefInfo(){ + QString strTemp; + QMap mapInfos; + QLabel* label; + mapInfos["연락처"] = "010-3004-6517"; + mapInfos["이름"] = "김성우"; + mapInfos["위치정보"] ="인천광역시 남동구 남동동로 34번길 56"; + + for(int i =0;isetText(tr(hotline_chef_item_name[i]).append(":")); + ui->gridLayout_info->addWidget(label,i,0); + label = new QLabel(this); + label->setText(strTemp); + ui->gridLayout_info->addWidget(label,i,1); + } +} + +void ConfigInfoDlg::loadHotlineServiceInfo(){ + QString strTemp; + QMap mapInfos; + QLabel* label; + mapInfos["연락처"] = "1644-9533"; + mapInfos["위치정보"] ="인천광역시 남동구 남동동로 34번길 56"; + + for(int i =0;isetText(tr(hotline_service_item_name[i]).append(":")); + ui->gridLayout_info->addWidget(label,i,0); + label = new QLabel(this); + label->setText(strTemp); + ui->gridLayout_info->addWidget(label,i,1); + } +} diff --git a/app/gui/oven_control/configinfodlg.h b/app/gui/oven_control/configinfodlg.h new file mode 100644 index 0000000..ec8f89c --- /dev/null +++ b/app/gui/oven_control/configinfodlg.h @@ -0,0 +1,34 @@ +#ifndef CONFIGINFODLG_H +#define CONFIGINFODLG_H + +#include +#include "config.h" + + +using namespace Define; + +namespace Ui { +class ConfigInfoDlg; +} + +class ConfigInfoDlg : public QDialog +{ + Q_OBJECT + void loadHotlineChefInfo(); + void loadHotlineServiceInfo(); + void loadSoftwareInfo(); + + +public: + explicit ConfigInfoDlg(QWidget *parent = 0,ConfigType type=config_invalid ); + ~ConfigInfoDlg(); + +private slots: + void on_ctrBtnOk_clicked(); + +private: + Ui::ConfigInfoDlg *ui; + ConfigType m_nType; +}; + +#endif // CONFIGINFODLG_H diff --git a/app/gui/oven_control/configinfodlg.ui b/app/gui/oven_control/configinfodlg.ui new file mode 100644 index 0000000..1642392 --- /dev/null +++ b/app/gui/oven_control/configinfodlg.ui @@ -0,0 +1,160 @@ + + + ConfigInfoDlg + + + + 0 + 0 + 900 + 1600 + + + + Dialog + + + #ConfigDateTimeDlg{ + /*background-color : transparent;*/ +} + +#centralwidget{ + background-image : url(:/images/background/popup/913.png); +} + +QLabel { + color : white; +} +QLineEdit{ + background-color : transparent; + color : white; +} + +QSpinBox{ + background-color : transparent; + color : white; +} + +QPushButton{ + border-color : transparent; + background-color : transparent; + color : white; +} +QPushButton::pressed, QPushButton::focus{ + color : yellow; +} + + + + + 0 + 425 + 900 + 425 + + + + + + 0 + 0 + 901 + 421 + + + + + 0 + + + QLayout::SetDefaultConstraint + + + 10 + + + + + + 16777215 + 94 + + + + + 나눔고딕 + 18 + 75 + true + + + + color : white; + + + TITLE + + + Qt::AlignCenter + + + + + + + color: rgb(255, 255, 255); + + + Qt::Horizontal + + + + + + + 20 + + + 10 + + + 20 + + + 10 + + + 3 + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 12 + true + + + + 확인 + + + true + + + + + + + + + + diff --git a/app/gui/oven_control/configipdlg.cpp b/app/gui/oven_control/configipdlg.cpp new file mode 100644 index 0000000..e587596 --- /dev/null +++ b/app/gui/oven_control/configipdlg.cpp @@ -0,0 +1,39 @@ +#include "configipdlg.h" +#include "ui_configipdlg.h" + +ConfigIpDlg::ConfigIpDlg(QWidget *parent) : + QDialog(parent), + ui(new Ui::ConfigIpDlg) +{ + ui->setupUi(this); + setWindowFlags(Qt::FramelessWindowHint); + setAttribute(Qt::WA_NoSystemBackground); + setAttribute(Qt::WA_TranslucentBackground); + ui->ctrGw_0->setFormatterWidth(3); + ui->ctrGw_1->setFormatterWidth(3); + ui->ctrGw_2->setFormatterWidth(3); + ui->ctrGw_3->setFormatterWidth(3); + ui->ctrIp_0->setFormatterWidth(3); + ui->ctrIp_1->setFormatterWidth(3); + ui->ctrIp_2->setFormatterWidth(3); + ui->ctrIp_3->setFormatterWidth(3); + ui->ctrNetmask_0->setFormatterWidth(3); + ui->ctrNetmask_1->setFormatterWidth(3); + ui->ctrNetmask_2->setFormatterWidth(3); + ui->ctrNetmask_3->setFormatterWidth(3); +} + +ConfigIpDlg::~ConfigIpDlg() +{ + delete ui; +} + +void ConfigIpDlg::on_ctrBtnOk_clicked() +{ + accept(); +} + +void ConfigIpDlg::on_ctrBtnCancel_clicked() +{ + reject(); +} diff --git a/app/gui/oven_control/configipdlg.h b/app/gui/oven_control/configipdlg.h new file mode 100644 index 0000000..6e42466 --- /dev/null +++ b/app/gui/oven_control/configipdlg.h @@ -0,0 +1,27 @@ +#ifndef CONFIGIPDLG_H +#define CONFIGIPDLG_H + +#include + +namespace Ui { +class ConfigIpDlg; +} + +class ConfigIpDlg : public QDialog +{ + Q_OBJECT + +public: + explicit ConfigIpDlg(QWidget *parent = 0); + ~ConfigIpDlg(); + +private slots: + void on_ctrBtnOk_clicked(); + + void on_ctrBtnCancel_clicked(); + +private: + Ui::ConfigIpDlg *ui; +}; + +#endif // CONFIGIPDLG_H diff --git a/app/gui/oven_control/configipdlg.ui b/app/gui/oven_control/configipdlg.ui new file mode 100644 index 0000000..2618fca --- /dev/null +++ b/app/gui/oven_control/configipdlg.ui @@ -0,0 +1,673 @@ + + + ConfigIpDlg + + + + 0 + 0 + 900 + 1600 + + + + Dialog + + + #ConfigDateTimeDlg{ + /*background-color : transparent;*/ +} + +#centralwidget{ + background-image : url(:/images/background/popup/913.png); +} + +QLabel { + color : white; +} +QLineEdit{ + background-color : transparent; + color : white; +} + +QSpinBox{ + background-color : transparent; + color : white; +/* border-bottom-color : white; + border-top-color : transparent; + border-left-color : transparent; + border-right-color : transparent; + border-width : 1px; + border-style : solid;*/ +} + +QPushButton{ + border-color : transparent; + background-color : transparent; + color : white; +} +QPushButton::pressed, QPushButton::focus{ + color : yellow; +} + + + + + 0 + 425 + 900 + 1025 + + + + + + + + + 0 + 0 + 901 + 421 + + + + + 0 + + + QLayout::SetDefaultConstraint + + + + + + 16777215 + 94 + + + + + 나눔고딕 + 18 + 75 + true + + + + color : white; + + + IP 주소 + + + Qt::AlignCenter + + + + + + + color: rgb(255, 255, 255); + + + Qt::Horizontal + + + + + + + 5 + + + 10 + + + 10 + + + + + 15 + + + 5 + + + 2 + + + 15 + + + + + + 14 + true + + + + Qt::AlignCenter + + + QAbstractSpinBox::NoButtons + + + 255 + + + + + + + + 14 + true + + + + Qt::AlignCenter + + + QAbstractSpinBox::NoButtons + + + 255 + + + + + + + + 나눔고딕 + 15 + 75 + true + + + + . + + + + + + + + 14 + true + + + + Qt::AlignCenter + + + QAbstractSpinBox::NoButtons + + + 255 + + + + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 15 + 75 + true + + + + IP 주소 + + + + + + + + 14 + true + + + + Qt::AlignCenter + + + QAbstractSpinBox::NoButtons + + + 255 + + + + + + + + 나눔고딕 + 15 + 75 + true + + + + . + + + + + + + + 14 + true + + + + Qt::AlignCenter + + + QAbstractSpinBox::NoButtons + + + 255 + + + + + + + + 14 + true + + + + Qt::AlignCenter + + + QAbstractSpinBox::NoButtons + + + 255 + + + + + + + Qt::Horizontal + + + + + + + + 나눔고딕 + 15 + 75 + true + + + + . + + + + + + + + 나눔고딕 + 15 + 75 + true + + + + . + + + + + + + + 나눔고딕 + 15 + 75 + true + + + + . + + + + + + + + 나눔고딕 + 15 + 75 + true + + + + . + + + + + + + + 나눔고딕 + 15 + 75 + true + + + + . + + + + + + + + 14 + true + + + + + + + Qt::AlignCenter + + + QAbstractSpinBox::NoButtons + + + 255 + + + + + + + + 나눔고딕 + 15 + 75 + true + + + + . + + + + + + + + 14 + true + + + + Qt::AlignCenter + + + QAbstractSpinBox::NoButtons + + + 255 + + + + + + + + 14 + true + + + + Qt::AlignCenter + + + QAbstractSpinBox::NoButtons + + + 255 + + + + + + + + 나눔고딕 + 15 + 75 + true + + + + 게이트웨이 주소 + + + + + + + + 14 + true + + + + Qt::AlignCenter + + + QAbstractSpinBox::NoButtons + + + 255 + + + + + + + + 나눔고딕 + 15 + 75 + true + + + + . + + + + + + + + 14 + true + + + + Qt::AlignCenter + + + QAbstractSpinBox::NoButtons + + + 255 + + + + + + + + 나눔고딕 + 15 + 75 + true + + + + 넷마스크 + + + + + + + Qt::Vertical + + + + + + + + 14 + true + + + + Qt::AlignCenter + + + QAbstractSpinBox::NoButtons + + + 255 + + + + + + + + + + + 10 + + + 10 + + + 20 + + + + + + 0 + 0 + + + + + 나눔고딕 + 12 + true + + + + 취소 + + + true + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 12 + true + + + + 확인 + + + true + + + + + + + + + + + 0 + 425 + 900 + 600 + + + + + + + + KeyboardWidget + QWidget +
keyboardwidget.h
+ 1 + + + FormatterSpinBox + QSpinBox +
formatterspinbox.h
+ + + + + diff --git a/app/gui/oven_control/configsoundselelectdlg.cpp b/app/gui/oven_control/configsoundselelectdlg.cpp index 26d0611..d19468f 100644 --- a/app/gui/oven_control/configsoundselelectdlg.cpp +++ b/app/gui/oven_control/configsoundselelectdlg.cpp @@ -14,7 +14,6 @@ ConfigSoundSelelectDlg::ConfigSoundSelelectDlg(QWidget *parent, ConfigType cfgty setWindowFlags(Qt::Widget | Qt::FramelessWindowHint); setAttribute(Qt::WA_NoSystemBackground); setAttribute(Qt::WA_TranslucentBackground); - setAttribute(Qt::WA_PaintOnScreen); this->setAttribute( Qt::WA_DeleteOnClose); diff --git a/app/gui/oven_control/configwindow.cpp b/app/gui/oven_control/configwindow.cpp index ca49f62..9569a94 100644 --- a/app/gui/oven_control/configwindow.cpp +++ b/app/gui/oven_control/configwindow.cpp @@ -1,9 +1,11 @@ +#include #include "configwindow.h" #include "ui_configwindow.h" - +#include "configfavoritebutton.h" #include "functiontestwindow.h" #include "engineermenuwindow.h" #include "config.h" +#include "configinfodlg.h" @@ -43,7 +45,10 @@ ConfigWindow::~ConfigWindow() void ConfigWindow::on_pushButton_clicked() { - + if(m_nCurConfigPos != config_menu_favorite){ + m_nCurConfigPos = config_menu_favorite; + reloadUi(); + } } void ConfigWindow::on_backButton_clicked() @@ -53,9 +58,14 @@ void ConfigWindow::on_backButton_clicked() void ConfigWindow::on_pushButton_3_clicked() { - EngineerMenuWindow *w = new EngineerMenuWindow(this); + /*EngineerMenuWindow *w = new EngineerMenuWindow(this); w->setWindowModality(Qt::WindowModal); - w->showFullScreen(); + w->showFullScreen();*/ + if(m_nCurConfigPos != config_menu_service){ + m_nCurConfigPos = config_menu_service; + reloadUi(); + } + } void ConfigWindow::on_pushButton_8_clicked() //설정 버튼 @@ -76,32 +86,74 @@ void ConfigWindow::reloadValue(){ } void ConfigWindow::onConfigBtnClicked(uint16_t id){ - qDebug() << "config id prsess : " << id; Config *cfg = Config::getInstance(); - cfg->execConfigWindow(this,(Define::ConfigType)id); - reloadValue(); + QDialog* dlg; + switch(id){ + case config_enter_engineer_mode: + { + EngineerMenuWindow *w = new EngineerMenuWindow(this); + w->setWindowModality(Qt::WindowModal); + w->showFullScreen(); + break; + } + case config_software_info: + case config_hotline_chef: + case config_hotline_service: + dlg = new ConfigInfoDlg(this,(ConfigType)id); + dlg->exec(); + break; + default: + cfg->execConfigWindow(this,(Define::ConfigType)id); + if(m_nCurConfigPos != config_menu_favorite) reloadValue(); + break; + + } } void ConfigWindow::onConfigCheckBtnClicked(uint16_t id, bool checked){ - + Config* cfg = Config::getInstance(); + qDebug()<<"favorite pressed " << id; + if(checked){ + cfg->insertFavorite((ConfigType)id); + } + else{ + cfg->removeFavorite((ConfigType)id); + } } void ConfigWindow::reloadUi(void){ ConfigPanelButton** pws = m_vectorMenuList.data(); + ConfigFavoriteButton** fpws = m_vectorFavorMenuList.data(); + ConfigPanelButton* pw; ConfigPanelButton *pcb; + + ConfigFavoriteButton* fpw; + ConfigFavoriteButton* fpcb; + + uint32_t idx; + + int i = 0; + Config* cfg = Config::getInstance(); QString strtemp=""; - for(int i = 0; i < m_vectorMenuList.count();i++){ + for(i = 0; i < m_vectorMenuList.count();i++){ pw = pws[i]; ui->scrollAreaMenuLayout->removeWidget(pw); delete pw; } m_vectorMenuList.clear(); + for(i=0;iscrollAreaMenuLayout->removeWidget(fpw); + delete fpw; + } + m_vectorFavorMenuList.clear(); + if(m_nCurConfigPos != config_menu_favorite){ - for(int i=0 ; i < m_arrMaxMenuCount[m_nCurConfigPos] ;i++){ + for(i=0 ; i < m_arrMaxMenuCount[m_nCurConfigPos] ;i++){ pcb = new ConfigPanelButton(this,m_arrConfigListInfos[m_nCurConfigPos][i]); qDebug() <getTitleString(m_arrConfigListInfos[m_nCurConfigPos][i]); strtemp = cfg->getTitleString(m_arrConfigListInfos[m_nCurConfigPos][i]); @@ -113,6 +165,20 @@ void ConfigWindow::reloadUi(void){ ui->scrollAreaMenuLayout->addWidget(pcb); m_vectorMenuList.append(pcb); connect(pcb ,SIGNAL(clicked(uint16_t)),SLOT(onConfigBtnClicked(uint16_t))); + connect(pcb,SIGNAL(checkButtonClicked(uint16_t,bool)),SLOT(onConfigCheckBtnClicked(uint16_t,bool))); + } + } + else{ + QList list = cfg->getConstSortedFavorite(); + for(i=0;i < list.count();i++){ + idx = list[i]; + fpcb = new ConfigFavoriteButton(this,idx); + strtemp = cfg->getTitleString((ConfigType)idx); + fpcb->setText(strtemp); + ui->scrollAreaMenuLayout->addWidget(fpcb); + m_vectorFavorMenuList.append(fpcb); + connect(fpcb,SIGNAL(clicked(uint16_t)),SLOT(onConfigBtnClicked(uint16_t))); + connect(fpcb,SIGNAL(delBtnClicked(uint16_t)),SLOT(onDeleteFavoriteBtnClicked(uint16_t))); } } @@ -135,3 +201,33 @@ void ConfigWindow::on_pushButton_2_clicked() reloadUi(); } } + +void ConfigWindow::on_pushButton_4_clicked() +{ + if(m_nCurConfigPos != config_menu_energy){ + m_nCurConfigPos = config_menu_energy; + reloadUi(); + } +} + +void ConfigWindow::on_pushButton_5_clicked() +{ + if(m_nCurConfigPos != config_menu_expert){ + m_nCurConfigPos = config_menu_expert; + reloadUi(); + } +} + +void ConfigWindow::onDeleteFavoriteBtnClicked(uint16_t id){ + Config* cfg = Config::getInstance(); + ConfigFavoriteButton* btn; + for(int i = 0;igetBtnId() == id){ + btn = m_vectorFavorMenuList[i]; + ui->scrollAreaMenuLayout->removeWidget(btn); + m_vectorFavorMenuList.remove(i); + delete btn; + cfg->removeFavorite((ConfigType)id); + } + } +} diff --git a/app/gui/oven_control/configwindow.h b/app/gui/oven_control/configwindow.h index 480d95a..b686a51 100644 --- a/app/gui/oven_control/configwindow.h +++ b/app/gui/oven_control/configwindow.h @@ -6,6 +6,7 @@ #include "udphandler.h" #include "configpanelbutton.h" +#include "configfavoritebutton.h" #include "config.h" using namespace Define; @@ -31,16 +32,16 @@ class ConfigWindow : public QMainWindow private: const uint16_t m_arrMaxMenuCount[7] ={ - 5,8,8, + 5,8,7,2,1,0,5 }; const Define::ConfigType m_arrConfigListInfos[7][20] = { {config_datetime, config_temptype,config_backlight, config_time_type,config_resttime_format,}, {config_marster_vol,config_keypad_sound1,config_keypad_sound2,config_request_loadexec,config_programstep_finish,config_cooktime_finish,config_stoperror_distinguish,config_sound_factory_reset}, - {config_info_data_download,config_service_data_download,config_program_download,config_program_upload,config_program_initialize ,config_ip,config_set_download,config_set_upload}, + {config_info_data_download,config_service_data_download,config_program_download,config_program_upload ,config_ip,config_set_download,config_set_upload}, + {config_set_half_energy,config_set_auto_darkness,}, + {config_duty_wash,}, {config_invalid,}, - {config_invalid,}, - {config_invalid,}, - {config_invalid,} + {config_software_info,config_hotline_chef,config_hotline_service,config_steam_wash,config_enter_engineer_mode} }; void reloadUi(void); void reloadValue(void); @@ -63,13 +64,19 @@ private slots: void on_pushButton_2_clicked(); + void on_pushButton_4_clicked(); + + void on_pushButton_5_clicked(); + public slots: void onConfigBtnClicked(uint16_t id); void onConfigCheckBtnClicked(uint16_t id, bool checked); + void onDeleteFavoriteBtnClicked(uint16_t id); private: Ui::ConfigWindow *ui; QVector m_vectorMenuList; + QVector m_vectorFavorMenuList; CONFIG_MENU_POS m_nCurConfigPos; }; diff --git a/app/gui/oven_control/images/config/100_fav_pannel_icon.png b/app/gui/oven_control/images/config/100_fav_pannel_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..93ed20ebd8c8fa44f5d45cbb54928a837c34836c GIT binary patch literal 1513 zcmb7Dc{r476#on&OVnVL7g@RzH{lWP zBwNhbnTXQ0yDhG0xh51^rqZ2zZvN@t`+J`EJLmnK^Zw2`@AH1C?o20Tg^dabf+#bb z>7HP5uuSBo;rqo4B>22qFqakR4YM1QV4NB6LI$ z6x!Xz+hJ*G8IGa;Ka`Y|w6(QOOiajRvZbY^v9Yn5nwq@4{HhX!va+&-LSaWo2b;}? z(2o_mySwY_8}NAik0kiDwY4!Zr=z3UadB}iEiHULA7oc^Kp85ks;Z*VXcZL|3WZWy zT1Fy~Fc=J(yam)Cv|0ty3=9k+BO?@!>gqcj4u{L-3Iu}I*49-uU0vOZiVA4E zr>BQNAV8nMgK|Vf1UR5?XlMvgeSLk%gsuR+0$u z3L^ljzN50T3K$#?S6*HY4nSKQTT)U24i<|oEG+!ap;jF&Ev>w~Jm{0jWHvT7W@cvY z+C|IB$%XrbG<9|LjEoF$;JRXCW98)JpdydQgG&Pv29Zc4larz$coVlzcrv{ZL`qf} zt**8~Nk)F7r44Nt#mvT&wKpWlg^aTBC=$;nGYHZc>ia>T&FgU_#|IaZQ>LE;n&@q_ zcXIIxZwLw4JLJAw&ek{KQr7*9tYW#f*ue5 zv)I3V_Q1Y@+;EYqRlw7bpsfMHTl~jH{d^y7^7iUzZ&UQ(n<}`~88d%hYg9#aDOor= zer>#6w&`JDI~u@6G*ue z3|9xa=Q8V17Q{)NH~sJnoMh1Lysi7=vp@TJ+NmW*9bJrT%=O<}Nf!?H;oZ$l6mxoI z=<)ewgoXSY8Wy+wBeQ=iZ+xEH6t!$=buO2^@5|Z7Q(#z7k#fuFUiw zjUBH(>TEOeR!H{kVAs6J7O>ARJaZ#ZV^X&MQe1zZd|Ajf*4z_#=H85v+xor{ngR8Z zeg1ij<(8r06X_@={#*g;=Ac+XfB1-j{#)g~M_rWdMnMOWT47*fr&nnGRlBMhb`i6d3ZUuq#zai*gO zrYhz}vzII9eX!2qM-H2`@`%0{KaIb>!o6^hh`mO$nwc1xunm4WKJ$&0c3tdtdCaQd zG41Zm#F$8I-`v8HKIn816L8A!>M`=!ZPO7Ie-mT*J8TN3=4MA#|H4dvO&Ndx(K_kW zhlHErx8E#u$D{Pprfb(6`}RQ8p??v#v0KtZrG^#94EI)R(K98BnfRxFF5uK8!`FL} zE7Q8AVvp^-BBKEt$HnkTYn7OLEx)Q2&FXwgbhFvaSiFJ`#EHvRhSg~EMN1tIsuC>x ziRR1E1WKOAiIZ3uTn8hZ|)GZy6?b+Wmgl8%yoz|ErX*WG|;T3->N37FKsxR67 z$6>ux*{;W5)|9qcjg2d*-f60LU3?OBZM|N`+}r|3ki>}<*leKUHRoGLiL^@(`M3AK xTXA2Kv+#L;$eSk}eA+rxoN)84Oju!h9*q*RZsbGJeG$A#gyF!X^Xx;D{{=z7QYHWZ literal 0 HcmV?d00001 diff --git a/app/gui/oven_control/images/config/100_fav_pannel_icon_ov.png b/app/gui/oven_control/images/config/100_fav_pannel_icon_ov.png new file mode 100644 index 0000000000000000000000000000000000000000..835a2f3ed81b385defc7db016a6de0f6daf26935 GIT binary patch literal 1514 zcmb7Cdo%frYzS7kYlmn9(e(5TxTgL81%ts@TU*oVbS{_6VzFp6nwgmy8jaR40qC@Y!vulwibTp{ zu>kaS1r?F_5J7BhZNClz|DK&)u8S~}%iZVdI%I3xPo)A{O%7lN6^)FHOifL(SS+8< zZ*_2FGMP9Wj>~ldYyi?!0cjKpC4j#dlF4L{*$2b-VHm{0OYQBMqa-p=P#5&}2tg+C_Ni;uSO+J3*Bi<)CNh2Q=4S03c@{}0ed{Uq z3zlDwiCA|pa23iUEb~BN$H9S@%ebLUYZszEV5Le2|L9m*NOu=6QZ}KAdV2rURHyTJ zd|Y>lTxGN(qCe(9)bfb6PHP@M2oLLFhXl8_G#dn6W9SE5r1{tC*_}iDew$2uba+Gc z3(9vD1fM)tS)0iA4CW88^^n&3Rbub+-HFFJ;73p48<7G*2Bx2n7F1sG4G5xAC96fK z;U&wo9g*kwiB7QoX%g?1A-qmy(OkGmklF5}M9#80IBZRXiTS1t#;1x)a`KCGs((JQ zIq$kS7^%+_#kd?+Vc%?@?vpY^tB98onRE63O^q$&XhDHI~{V}zL0!LU4qQ65WMP+ zuJu1>p%>P!GLv+CC_)cp9`xLyMvoK4R)uB)3u5*9{iipN2UNOw(I_+gVUfkXTTL0o zl_d#rA+g-}v6tmtuY}pm^Ih4E&NO%ISbs(0aXsGIS}5m4OZ=$EnF}~+#<6IMZbXqu zZ=g?yhgDFBUvIm}SUOY-*U*pA9WG3_G&C zv*VpfB^A`w9aBG5ZQ?(VDGeZ~tgVt0=O1Uwp$<8TP%c+yjM0k4h?)9 zqe~-)IGaUr9N7@V`*7j z53Ri*P4TgjbAyvloN3?D>N43`rN#_4;1+W8B>6`x*y>hy^Rg4_@s=WDe7sJIr}9of z-$~i29$DpC|>RrT&sY08I;!Krs_o+ zBK5J6QG-?Q9^ITT*ZXtDmCN*9>EAnHyz7q)GzB{Uu1MN0&J{0_Kfdy$c;kgD>{JJHJd#qaq6ot_@?eUW3JiBqD$BI?vdwe*q=t3(x=n literal 0 HcmV?d00001 diff --git a/app/gui/oven_control/images/config/105_icon_cancel.png b/app/gui/oven_control/images/config/105_icon_cancel.png new file mode 100644 index 0000000000000000000000000000000000000000..6507651e6a05778efabd521c0157ce8fbd039f5a GIT binary patch literal 1931 zcmeH{`#;kQ7{|YoYq@Nb+OmuLER<21MC{VWhFC>mPNY;Lv=!;l5~Fh4WM)&xDTkMG zO?t^CmsTpOSx!T8Ysb)KB1z@!oWJ7ya9*$H^Ljte^V9P@pV#Zj3h>))pbygr0KkAk zCIqVauXHul*{8Y0N;OcC<`JY%!bu?&&yjB{4118nJMqk7 zG}GBQjsN=3I7HNbpD!sV)gx&f^4(1UxLRgJ6dF-y zY_;JkN1GA&%u@hZ-9#aH(Sy4hi$m}bC*w58lRfA={Hue~z)L1K(sqIJ67)-tI-t>* z@X_;&dkEdjBkjzhUMsm}iTxAz_cpw^h90ZpVpO^@n}=brXiPDqirZd&w|sE_;UF(I zXncC(sw+YoOw)k2jMv8Z{z5~IT@85Qj0H1ag<7-G<9bm4J28PVz65@L5B8QpA z>E7QmR)Z^)^MWyn4WSoAkc702k7O+(t|}#a<8zH2*r%l7R3EL1r^*c_i?`OvJ7!hS zLiSon{_1mHo~=d6g+2Ba5U23RwX7&oc?fbRXcKkdxl1lpD(?I^R@2kouX<*Mvnp|W zS3IWRLiOvUw{oBGpd*LAqO{lxK6Ap zJo2fxyq0e_^$k%kq`O$qwR}$3UbaKQ9=p@`nj@2@5fX4Y_b4j!V}Tp;{imHO?90RF zA|u11f+g8F5~ga8K~i(>n_^Kg?bWWF{6QGqw-gbvx18w(CA&5p-vdud=B_LLVtovC zmU0fxDV*1>a)NIIYbJ5fUqKbIhd_y9TMzbY;o2xuIvVTfJ#K(dx_D?~+Za(b#!KB9 z^zSOxMWkn%aw(29&xe5o-<*kMFJ#w(f-<$1ybIBcyzC*#MA7t+Bz0(bfGo~scGOrA z790c!6FjzT*-NF~DdCa)I)5rz)N1}tV?;j11BV&D!J5o`AVKbF@5dcdWk+BL)g7jG zYqu-o9BK<(briQ>=;9OyGj13@yDRS<_nSN2d9%~$t&4=-&C;*Q>Y_ia*ss~$fL-+T zeXBVA+fLR>e7d%sU5imMXW%_jB#S-z(OT`N!GDas?ct9qEq@gyerUj zTG%N~)h+duX6Qwc63l;uWNpbE7LGTzs2XZpqi+}8B(&PbLZsbH zq7=%y9+(V862L7Mpho%+9sEJPN(Q=n_~_{%Qb)=trpbj^O+a9_KX$ literal 0 HcmV?d00001 diff --git a/app/gui/oven_control/images/config/105_icon_cancel_ov.png b/app/gui/oven_control/images/config/105_icon_cancel_ov.png new file mode 100644 index 0000000000000000000000000000000000000000..199c33ae2464c21ca8912987b1f419300171ba9c GIT binary patch literal 1931 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 literal 0 HcmV?d00001 diff --git a/app/gui/oven_control/oven_control.pro b/app/gui/oven_control/oven_control.pro index ef691b3..c1b9ec5 100644 --- a/app/gui/oven_control/oven_control.pro +++ b/app/gui/oven_control/oven_control.pro @@ -86,7 +86,14 @@ SOURCES += main.cpp\ favoritenamepopup.cpp \ confirmpopup.cpp \ usbcheckpopupdlg.cpp \ - stringer.cpp + stringer.cpp \ + config1digitsetdlg.cpp \ + configdutywashdlg.cpp \ + configfileprocessdlg.cpp \ + confighalfenergydlg.cpp \ + configinfodlg.cpp \ + configipdlg.cpp \ + configfavoritebutton.cpp HEADERS += mainwindow.h \ cook.h \ @@ -162,7 +169,14 @@ HEADERS += mainwindow.h \ favoritenamepopup.h \ confirmpopup.h \ usbcheckpopupdlg.h \ - stringer.h + stringer.h \ + config1digitsetdlg.h \ + configdutywashdlg.h \ + configfileprocessdlg.h \ + confighalfenergydlg.h \ + configinfodlg.h \ + configipdlg.h \ + configfavoritebutton.h FORMS += mainwindow.ui \ manualcookwindow.ui \ @@ -213,7 +227,14 @@ FORMS += mainwindow.ui \ autocooksettingwidget.ui \ favoritenamepopup.ui \ confirmpopup.ui \ - usbcheckpopupdlg.ui + usbcheckpopupdlg.ui \ + config1digitsetdlg.ui \ + configdutywashdlg.ui \ + configfileprocessdlg.ui \ + confighalfenergydlg.ui \ + configinfodlg.ui \ + configipdlg.ui \ + configfavoritebutton.ui RESOURCES += \ resources.qrc diff --git a/app/gui/oven_control/resources.qrc b/app/gui/oven_control/resources.qrc index 7ab1798..f1647db 100644 --- a/app/gui/oven_control/resources.qrc +++ b/app/gui/oven_control/resources.qrc @@ -538,5 +538,12 @@ sounds/start.wav sounds/stop.wav sounds/button.wav + images/config/100_fav_pannel_icon_ov.png + images/config/100_fav_pannel_icon.png + images/config/105_icon_cancel_ov.png + images/config/105_icon_cancel.png + images/config/105_icon_download_ov.png + images/config/105_icon_download.png + images/config/111_icon_upload.png diff --git a/app/gui/oven_control/usbcheckpopupdlg.cpp b/app/gui/oven_control/usbcheckpopupdlg.cpp index 42e4b24..4f0bbf9 100644 --- a/app/gui/oven_control/usbcheckpopupdlg.cpp +++ b/app/gui/oven_control/usbcheckpopupdlg.cpp @@ -1,3 +1,4 @@ +#include #include "usbcheckpopupdlg.h" #include "ui_usbcheckpopupdlg.h" @@ -6,9 +7,27 @@ UsbCheckPopupDlg::UsbCheckPopupDlg(QWidget *parent) : ui(new Ui::UsbCheckPopupDlg) { ui->setupUi(this); + setAttribute(Qt::WA_DeleteOnClose); + setWindowFlags(Qt::Widget | Qt::FramelessWindowHint); + setAttribute(Qt::WA_NoSystemBackground); + setAttribute(Qt::WA_TranslucentBackground); + + + timer = new QTimer(this); + connect(timer,SIGNAL(timeout()),SLOT(usbCheckTimerFired())); + timer->start(500); } UsbCheckPopupDlg::~UsbCheckPopupDlg() { delete ui; } + +void UsbCheckPopupDlg::on_ctrBtnYes_clicked() +{ + accept(); +} + +void UsbCheckPopupDlg::usbCheckTimerFired(){ + +} diff --git a/app/gui/oven_control/usbcheckpopupdlg.h b/app/gui/oven_control/usbcheckpopupdlg.h index 60e543c..c023693 100644 --- a/app/gui/oven_control/usbcheckpopupdlg.h +++ b/app/gui/oven_control/usbcheckpopupdlg.h @@ -2,6 +2,7 @@ #define USBCHECKPOPUPDLG_H #include +#include namespace Ui { class UsbCheckPopupDlg; @@ -15,8 +16,13 @@ public: explicit UsbCheckPopupDlg(QWidget *parent = 0); ~UsbCheckPopupDlg(); +private slots: + void on_ctrBtnYes_clicked(); + void usbCheckTimerFired(); + private: Ui::UsbCheckPopupDlg *ui; + QTimer *timer; }; #endif // USBCHECKPOPUPDLG_H