From 92fef6124962d92c541a4def104963980ad27ea0 Mon Sep 17 00:00:00 2001 From: byloveletter Date: Mon, 15 May 2017 18:05:07 +0900 Subject: [PATCH] =?UTF-8?q?=ED=99=98=EA=B2=BD=20=EC=84=A4=EC=A0=95=20-=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20UI=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 환경 설정 -> 설정 UI 완료 - 키보드 추가 - 커스텀 스핀 박스 추가 - 볼륨조정, 화면 밝기 조정용 프로그레스 바 추가 --- app/gui/oven_control/config.cpp | 44 +- app/gui/oven_control/config.h | 55 +- app/gui/oven_control/configbacklightdlg.cpp | 65 + app/gui/oven_control/configbacklightdlg.h | 34 + app/gui/oven_control/configbacklightdlg.ui | 237 ++++ app/gui/oven_control/configdatetimedlg.cpp | 32 + app/gui/oven_control/configdatetimedlg.h | 29 + app/gui/oven_control/configdatetimedlg.ui | 493 ++++++++ app/gui/oven_control/configlanguagedlg.cpp | 35 + app/gui/oven_control/configlanguagedlg.h | 27 + app/gui/oven_control/configlanguagedlg.ui | 263 ++++ app/gui/oven_control/configmastervolumedlg.cpp | 53 + app/gui/oven_control/configmastervolumedlg.h | 32 + app/gui/oven_control/configmastervolumedlg.ui | 237 ++++ app/gui/oven_control/configresttimeformatdlg.cpp | 69 ++ app/gui/oven_control/configresttimeformatdlg.h | 35 + app/gui/oven_control/configresttimeformatdlg.ui | 225 ++++ app/gui/oven_control/configsoundselelectdlg.cpp | 43 + app/gui/oven_control/configsoundselelectdlg.h | 34 + app/gui/oven_control/configsoundselelectdlg.ui | 650 ++++++++++ app/gui/oven_control/configtemptypedlg.cpp | 69 ++ app/gui/oven_control/configtemptypedlg.h | 35 + app/gui/oven_control/configtemptypedlg.ui | 228 ++++ app/gui/oven_control/configtimeformatdlg.cpp | 71 ++ app/gui/oven_control/configtimeformatdlg.h | 36 + app/gui/oven_control/configtimeformatdlg.ui | 225 ++++ app/gui/oven_control/configwindow.cpp | 2 + app/gui/oven_control/configwindow.h | 4 +- app/gui/oven_control/dotprogressbarwidget.cpp | 57 + app/gui/oven_control/dotprogressbarwidget.h | 36 + app/gui/oven_control/dotprogressbarwidget.ui | 32 + app/gui/oven_control/formatterspinbox.cpp | 29 + app/gui/oven_control/formatterspinbox.h | 24 + .../oven_control/images/config/101_br_icon_01.png | Bin 0 -> 3001 bytes .../images/config/101_br_icon_01_ov.png | Bin 0 -> 3346 bytes .../oven_control/images/config/101_br_icon_02.png | Bin 0 -> 2801 bytes .../images/config/101_br_icon_02_ov.png | Bin 0 -> 3192 bytes .../oven_control/images/config/101_br_icon_03.png | Bin 0 -> 2702 bytes .../images/config/101_br_icon_03_ov.png | Bin 0 -> 3101 bytes .../oven_control/images/config/101_br_icon_04.png | Bin 0 -> 2462 bytes .../images/config/101_br_icon_04_ov.png | Bin 0 -> 2871 bytes .../oven_control/images/config/102_icon_play.png | Bin 0 -> 682 bytes .../images/config/102_icon_play_ov.png | Bin 0 -> 777 bytes app/gui/oven_control/keyboardwidget.cpp | 128 ++ app/gui/oven_control/keyboardwidget.h | 45 + app/gui/oven_control/keyboardwidget.ui | 1301 ++++++++++++++++++++ app/gui/oven_control/manualcookwindow.ui | 17 +- app/gui/oven_control/oven_control.pro | 38 +- app/gui/oven_control/resources.qrc | 99 ++ 49 files changed, 5132 insertions(+), 36 deletions(-) create mode 100644 app/gui/oven_control/configbacklightdlg.cpp create mode 100644 app/gui/oven_control/configbacklightdlg.h create mode 100644 app/gui/oven_control/configbacklightdlg.ui create mode 100644 app/gui/oven_control/configdatetimedlg.cpp create mode 100644 app/gui/oven_control/configdatetimedlg.h create mode 100644 app/gui/oven_control/configdatetimedlg.ui create mode 100644 app/gui/oven_control/configlanguagedlg.cpp create mode 100644 app/gui/oven_control/configlanguagedlg.h create mode 100644 app/gui/oven_control/configlanguagedlg.ui create mode 100644 app/gui/oven_control/configmastervolumedlg.cpp create mode 100644 app/gui/oven_control/configmastervolumedlg.h create mode 100644 app/gui/oven_control/configmastervolumedlg.ui create mode 100644 app/gui/oven_control/configresttimeformatdlg.cpp create mode 100644 app/gui/oven_control/configresttimeformatdlg.h create mode 100644 app/gui/oven_control/configresttimeformatdlg.ui create mode 100644 app/gui/oven_control/configsoundselelectdlg.cpp create mode 100644 app/gui/oven_control/configsoundselelectdlg.h create mode 100644 app/gui/oven_control/configsoundselelectdlg.ui create mode 100644 app/gui/oven_control/configtemptypedlg.cpp create mode 100644 app/gui/oven_control/configtemptypedlg.h create mode 100644 app/gui/oven_control/configtemptypedlg.ui create mode 100644 app/gui/oven_control/configtimeformatdlg.cpp create mode 100644 app/gui/oven_control/configtimeformatdlg.h create mode 100644 app/gui/oven_control/configtimeformatdlg.ui create mode 100644 app/gui/oven_control/dotprogressbarwidget.cpp create mode 100644 app/gui/oven_control/dotprogressbarwidget.h create mode 100644 app/gui/oven_control/dotprogressbarwidget.ui create mode 100644 app/gui/oven_control/formatterspinbox.cpp create mode 100644 app/gui/oven_control/formatterspinbox.h create mode 100644 app/gui/oven_control/images/config/101_br_icon_01.png create mode 100644 app/gui/oven_control/images/config/101_br_icon_01_ov.png create mode 100644 app/gui/oven_control/images/config/101_br_icon_02.png create mode 100644 app/gui/oven_control/images/config/101_br_icon_02_ov.png create mode 100644 app/gui/oven_control/images/config/101_br_icon_03.png create mode 100644 app/gui/oven_control/images/config/101_br_icon_03_ov.png create mode 100644 app/gui/oven_control/images/config/101_br_icon_04.png create mode 100644 app/gui/oven_control/images/config/101_br_icon_04_ov.png create mode 100644 app/gui/oven_control/images/config/102_icon_play.png create mode 100644 app/gui/oven_control/images/config/102_icon_play_ov.png create mode 100644 app/gui/oven_control/keyboardwidget.cpp create mode 100644 app/gui/oven_control/keyboardwidget.h create mode 100644 app/gui/oven_control/keyboardwidget.ui diff --git a/app/gui/oven_control/config.cpp b/app/gui/oven_control/config.cpp index 3129f4c..2a419cb 100644 --- a/app/gui/oven_control/config.cpp +++ b/app/gui/oven_control/config.cpp @@ -1,6 +1,13 @@ #include #include #include "config.h" +#include "configdatetimedlg.h" +#include "configlanguagedlg.h" +#include "configtemptypedlg.h" +#include "configbacklightdlg.h" +#include "configtimeformatdlg.h" +#include "configresttimeformatdlg.h" +#include "configmastervolumedlg.h" using namespace Define; @@ -158,8 +165,43 @@ QString Config::getTempString(int cel_temp){ } void Config::execConfigWindow(QWidget *parent, Define::ConfigType idx){ - + QDialog *dlg; + switch(idx){ + case config_datetime: + dlg = new ConfigDateTimeDlg(parent); + break; + case config_language: + dlg = new ConfigLanguageDlg(parent); + break; + case config_temptype: + dlg = new ConfigTempTypeDlg(parent); + break; + case config_backlight: + dlg = new ConfigBackLightDlg(parent); + break; + case config_time_type: + dlg = new ConfigTimeFormatDlg(parent); + break; + case config_resttime_format: + dlg = new configResttimeFormatDlg(parent); + break; + case config_marster_vol: + dlg = new ConfigMasterVolumeDlg(parent); + break; + } + dlg->setWindowModality(Qt::ApplicationModal); + dlg->exec(); + if(dlg->result() == QDialog::Accepted){ + qDebug()<<"Accepted"; + } + else{ + qDebug() << "rejected"; + } } + + + + diff --git a/app/gui/oven_control/config.h b/app/gui/oven_control/config.h index 080843e..625723d 100644 --- a/app/gui/oven_control/config.h +++ b/app/gui/oven_control/config.h @@ -75,6 +75,36 @@ namespace Define config_item sound_factory_reset; }items; }STRUCT_PACK config_lists; + + const char language_menu[3][20]{ + "한국어\0", + "中國語\0", + "English" + }; + + const char time_type_menu[2][16]={ + "24h\0", + "am/pm\0" + }; + + const char temptype_menu[2][16]{ + "섭씨(℃)\0", + "화씨(℉)\0" + }; + + const char best_dish_weight_menu[4][16]={ + "700g\0", + "700-899g\0", + "900-1099g\0", + "1100g" + }; + + + + const char rest_time_type_menu[2][16] = { + "잔여시간\0", + "타겟시간\0" + }; } @@ -88,33 +118,9 @@ class Config : public QObject static Config *instance; - const char language_menu[3][20]{ - "한국어\0", - "中國語\0", - "English" - }; - - const char temptype_menu[2][16]{ - "섭씨(℃)\0", - "화씨(℉)\0" - }; - const char best_dish_weight_menu[4][16]={ - "700g\0", - "700-899g\0", - "900-1099g\0", - "1100g" - }; - const char time_type_menu[2][16]={ - "24h\0", - "am/pm\0" - }; - const char rest_time_type_menu[2][16] = { - "잔여시간\0", - "타겟시간\0" - }; @@ -153,6 +159,7 @@ class Config : public QObject "공장초기화" }; + char config_format[MAX_CONFIG_COUNT][64]; const char config_title[MAX_CONFIG_COUNT][64]={ diff --git a/app/gui/oven_control/configbacklightdlg.cpp b/app/gui/oven_control/configbacklightdlg.cpp new file mode 100644 index 0000000..8e88d92 --- /dev/null +++ b/app/gui/oven_control/configbacklightdlg.cpp @@ -0,0 +1,65 @@ +#include "configbacklightdlg.h" +#include "ui_configbacklightdlg.h" +#include "config.h" + +using namespace Define; + +#define MAX_LIGHT 7 +#define MIN_LIGHT 0 + +ConfigBackLightDlg::ConfigBackLightDlg(QWidget *parent) : + QDialog(parent), + ui(new Ui::ConfigBackLightDlg) +{ + Config* cfg = Config::getInstance(); + Define::config_item item; + ui->setupUi(this); + this->setWindowFlags( Qt::FramelessWindowHint); + this->setAttribute( Qt::WA_DeleteOnClose); + showFullScreen(); + item = cfg->getConfigValue(config_backlight); + m_nSelBackLight = item.d32; + ui->ctrProgressLight->setMaxProgress(0,MAX_LIGHT); + ui->ctrProgressLight->setCurrentProgress(m_nSelBackLight); +} + +ConfigBackLightDlg::~ConfigBackLightDlg() +{ + delete ui; +} + +void ConfigBackLightDlg::on_ctrBtnOk_clicked() +{ + Config* cfg = Config::getInstance(); + config_item item; + item.d32 = m_nSelBackLight; + cfg->setConfigValue(config_backlight,item); + accept(); +} + + + +void ConfigBackLightDlg::on_ctrBtnCancel_clicked() +{ + reject(); +} + +void ConfigBackLightDlg::on_pushButton_clicked() +{ + +} + +void ConfigBackLightDlg::on_ctrBtnPlus_clicked() +{ + //minus button; + m_nSelBackLight = m_nSelBackLight>0?m_nSelBackLight-1:0; + ui->ctrProgressLight->setCurrentProgress(m_nSelBackLight); +} + + + +void ConfigBackLightDlg::on_ctrBtnMinus_clicked() +{ + m_nSelBackLight = m_nSelBackLight<7?m_nSelBackLight+1:7; + ui->ctrProgressLight->setCurrentProgress(m_nSelBackLight); +} diff --git a/app/gui/oven_control/configbacklightdlg.h b/app/gui/oven_control/configbacklightdlg.h new file mode 100644 index 0000000..0fb1791 --- /dev/null +++ b/app/gui/oven_control/configbacklightdlg.h @@ -0,0 +1,34 @@ +#ifndef CONFIGBACKLIGHTDLG_H +#define CONFIGBACKLIGHTDLG_H + +#include + +namespace Ui { +class ConfigBackLightDlg; +} + +class ConfigBackLightDlg : public QDialog +{ + Q_OBJECT + +public: + explicit ConfigBackLightDlg(QWidget *parent = 0); + ~ConfigBackLightDlg(); + +private slots: + void on_ctrBtnOk_clicked(); + + void on_ctrBtnCancel_clicked(); + + void on_pushButton_clicked(); + + void on_ctrBtnPlus_clicked(); + + void on_ctrBtnMinus_clicked(); + +private: + Ui::ConfigBackLightDlg *ui; + int m_nSelBackLight; +}; + +#endif // CONFIGBACKLIGHTDLG_H diff --git a/app/gui/oven_control/configbacklightdlg.ui b/app/gui/oven_control/configbacklightdlg.ui new file mode 100644 index 0000000..53d8bc1 --- /dev/null +++ b/app/gui/oven_control/configbacklightdlg.ui @@ -0,0 +1,237 @@ + + + ConfigBackLightDlg + + + + 0 + 0 + 900 + 1600 + + + + Dialog + + + false + + + #centralwidget{ + background-image : url(:/images/background/popup/503.png); +} + +QLabel{ + color : white; +} + +QPushButton{ + color : white; +} + +QPushButton::pressed, QPushButton::focus{ + color : yellow; +} + + + + + 0 + 450 + 900 + 425 + + + + + + + + 0 + + + QLayout::SetDefaultConstraint + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 18 + 75 + true + + + + 화면밝기 + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + + + + + 6 + + + 50 + + + 50 + + + + + + 108 + 108 + + + + + 108 + 108 + + + + QPushButton{ + border-image : url(:/images/config/101_br_icon_02.png); +} + +QPushButton::pressed, QPushButton::focus{ + border-image : url(:/images/config/101_br_icon_02_ov.png); +} + + + + + + + + + + + 0 + 200 + + + + + + + + + 108 + 108 + + + + + 108 + 108 + + + + QPushButton{ + border-image : url(:/images/config/101_br_icon_01.png); +} + +QPushButton::pressed, QPushButton::focus{ + border-image : url(:/images/config/101_br_icon_01_ov.png); +} + + + + + + + + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 10 + 75 + true + true + + + + 취소 + + + true + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 10 + 75 + true + true + + + + 확인 + + + true + + + + + + + + + + + DotProgressBarWidget + QWidget +
dotprogressbarwidget.h
+ 1 + + + + + diff --git a/app/gui/oven_control/configdatetimedlg.cpp b/app/gui/oven_control/configdatetimedlg.cpp new file mode 100644 index 0000000..74a8e35 --- /dev/null +++ b/app/gui/oven_control/configdatetimedlg.cpp @@ -0,0 +1,32 @@ +#include "configdatetimedlg.h" +#include "ui_configdatetimedlg.h" + +ConfigDateTimeDlg::ConfigDateTimeDlg(QWidget *parent) : + QDialog(parent), + ui(new Ui::ConfigDateTimeDlg) +{ + ui->setupUi(this); + this->setWindowFlags( Qt::FramelessWindowHint); + this->setAttribute( Qt::WA_DeleteOnClose); + ui->ctrSpBxYear->setFormatterWidth(4); +} + +ConfigDateTimeDlg::~ConfigDateTimeDlg() +{ + delete ui; +} + +void ConfigDateTimeDlg::on_ctrBtnOk_clicked() +{ + this->accept(); +} + +void ConfigDateTimeDlg::on_spinBox_valueChanged(int arg1) +{ + +} + +void ConfigDateTimeDlg::on_ctrBtnCancel_clicked() +{ + this->reject(); +} diff --git a/app/gui/oven_control/configdatetimedlg.h b/app/gui/oven_control/configdatetimedlg.h new file mode 100644 index 0000000..dda080b --- /dev/null +++ b/app/gui/oven_control/configdatetimedlg.h @@ -0,0 +1,29 @@ +#ifndef CONFIGDATETIMEDLG_H +#define CONFIGDATETIMEDLG_H + +#include + +namespace Ui { +class ConfigDateTimeDlg; +} + +class ConfigDateTimeDlg : public QDialog +{ + Q_OBJECT + +public: + explicit ConfigDateTimeDlg(QWidget *parent = 0); + ~ConfigDateTimeDlg(); + +private slots: + void on_ctrBtnOk_clicked(); + + void on_spinBox_valueChanged(int arg1); + + void on_ctrBtnCancel_clicked(); + +private: + Ui::ConfigDateTimeDlg *ui; +}; + +#endif // CONFIGDATETIMEDLG_H diff --git a/app/gui/oven_control/configdatetimedlg.ui b/app/gui/oven_control/configdatetimedlg.ui new file mode 100644 index 0000000..f77df90 --- /dev/null +++ b/app/gui/oven_control/configdatetimedlg.ui @@ -0,0 +1,493 @@ + + + ConfigDateTimeDlg + + + + 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 + 421 + + + + + 0 + + + QLayout::SetDefaultConstraint + + + + + + 16777215 + 94 + + + + + 나눔고딕 + 18 + 75 + true + + + + color : white; + + + 날짜와 시간 + + + Qt::AlignCenter + + + + + + + color: rgb(255, 255, 255); + + + Qt::Horizontal + + + + + + + 15 + + + 20 + + + 20 + + + + + + 0 + 0 + + + + + 나눔고딕 + 18 + true + + + + Qt::StrongFocus + + + false + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + QAbstractSpinBox::NoButtons + + + 2000 + + + 2100 + + + 2000 + + + + + + + + 나눔고딕 + 18 + 75 + true + + + + 년 + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 18 + true + + + + Qt::StrongFocus + + + false + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + QAbstractSpinBox::NoButtons + + + 1 + + + 12 + + + 12 + + + + + + + + 나눔고딕 + 18 + 75 + true + + + + 월 + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 18 + true + + + + Qt::StrongFocus + + + false + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + QAbstractSpinBox::NoButtons + + + 1 + + + 31 + + + 20 + + + + + + + + 나눔고딕 + 18 + 75 + true + + + + 일 + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 18 + true + + + + Qt::StrongFocus + + + false + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + QAbstractSpinBox::NoButtons + + + 0 + + + 23 + + + 20 + + + + + + + + 나눔고딕 + 18 + 75 + true + + + + 시 + + + + + + + + 0 + 0 + + + + + 86 + 0 + + + + + 나눔고딕 + 18 + true + true + + + + Qt::StrongFocus + + + false + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + QAbstractSpinBox::NoButtons + + + + + + + + + 0 + + + 60 + + + 20 + + + + + + + + 나눔고딕 + 18 + 75 + true + + + + 분 + + + + + + + + + 10 + + + 10 + + + 20 + + + + + + 0 + 0 + + + + + 나눔고딕 + 12 + true + + + + 취소 + + + true + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 12 + true + + + + 확인 + + + true + + + + + + + + + + + 0 + 425 + 900 + 600 + + + centralwidget + centralwidget + centralwidget + + + centralwidget + keyboardwidget + + + + KeyboardWidget + QWidget +
keyboardwidget.h
+ 1 + + + FormatterSpinBox + QSpinBox +
formatterspinbox.h
+ + + + + diff --git a/app/gui/oven_control/configlanguagedlg.cpp b/app/gui/oven_control/configlanguagedlg.cpp new file mode 100644 index 0000000..b6459de --- /dev/null +++ b/app/gui/oven_control/configlanguagedlg.cpp @@ -0,0 +1,35 @@ +#include "config.h" +#include "configlanguagedlg.h" +#include "ui_configlanguagedlg.h" + +using namespace Define; + +ConfigLanguageDlg::ConfigLanguageDlg(QWidget *parent) : + QDialog(parent), + ui(new Ui::ConfigLanguageDlg) +{ + ui->setupUi(this); + this->setWindowFlags( Qt::FramelessWindowHint); + this->setAttribute( Qt::WA_DeleteOnClose); + + + ui->pushButton_1->setText(tr(language_menu[0])); + ui->pushButton_2->setText(tr(language_menu[1])); + ui->pushButton_3->setText(tr(language_menu[2])); + +} + +ConfigLanguageDlg::~ConfigLanguageDlg() +{ + delete ui; +} + +void ConfigLanguageDlg::on_ctrBtnOk_clicked() +{ + this->accept(); +} + +void ConfigLanguageDlg::on_ctrBtnCancel_clicked() +{ + this->reject(); +} diff --git a/app/gui/oven_control/configlanguagedlg.h b/app/gui/oven_control/configlanguagedlg.h new file mode 100644 index 0000000..119301f --- /dev/null +++ b/app/gui/oven_control/configlanguagedlg.h @@ -0,0 +1,27 @@ +#ifndef CONFIGLANGUAGEDLG_H +#define CONFIGLANGUAGEDLG_H + +#include + +namespace Ui { +class ConfigLanguageDlg; +} + +class ConfigLanguageDlg : public QDialog +{ + Q_OBJECT + +public: + explicit ConfigLanguageDlg(QWidget *parent = 0); + ~ConfigLanguageDlg(); + +private slots: + void on_ctrBtnOk_clicked(); + + void on_ctrBtnCancel_clicked(); + +private: + Ui::ConfigLanguageDlg *ui; +}; + +#endif // CONFIGLANGUAGEDLG_H diff --git a/app/gui/oven_control/configlanguagedlg.ui b/app/gui/oven_control/configlanguagedlg.ui new file mode 100644 index 0000000..09d892b --- /dev/null +++ b/app/gui/oven_control/configlanguagedlg.ui @@ -0,0 +1,263 @@ + + + ConfigLanguageDlg + + + + 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 + 450 + + + + + 900 + 450 + + + + + + + + 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 + + + + + 나눔고딕 + 16 + + + + PushButton + + + true + + + true + + + true + + + + + + + Qt::Horizontal + + + + + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 10 + 75 + true + true + + + + 취소 + + + true + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 10 + 75 + true + true + + + + 확인 + + + true + + + + + + + label + + line + + + + + diff --git a/app/gui/oven_control/configmastervolumedlg.cpp b/app/gui/oven_control/configmastervolumedlg.cpp new file mode 100644 index 0000000..c5e2dec --- /dev/null +++ b/app/gui/oven_control/configmastervolumedlg.cpp @@ -0,0 +1,53 @@ +#include "config.h" +#include "configmastervolumedlg.h" +#include "ui_configmastervolumedlg.h" + +using namespace Define; + +#define MAX_MASTER_VOL 7 + +ConfigMasterVolumeDlg::ConfigMasterVolumeDlg(QWidget *parent) : + QDialog(parent), + ui(new Ui::ConfigMasterVolumeDlg) +{ + Config* cfg = Config::getInstance(); + config_item item; + ui->setupUi(this); + this->setWindowFlags( Qt::FramelessWindowHint); + this->setAttribute( Qt::WA_DeleteOnClose); + + item = cfg->getConfigValue(config_marster_vol); + m_nCurMasterVol = item.d32; + ui->ctrProgressLight->setMaxProgress(m_nCurMasterVol,MAX_MASTER_VOL); +} + +ConfigMasterVolumeDlg::~ConfigMasterVolumeDlg() +{ + delete ui; +} + +void ConfigMasterVolumeDlg::on_ctrBtnOk_clicked() +{ + Config* cfg = Config::getInstance(); + config_item item; + item.d32 = m_nCurMasterVol; + cfg->setConfigValue(config_marster_vol,item); + accept(); +} + +void ConfigMasterVolumeDlg::on_ctrBtnCancel_clicked() +{ + reject(); +} + +void ConfigMasterVolumeDlg::on_ctrBtnMinus_clicked() +{ + m_nCurMasterVol = m_nCurMasterVol > 0?m_nCurMasterVol-1:0; + ui->ctrProgressLight->setCurrentProgress(m_nCurMasterVol); +} + +void ConfigMasterVolumeDlg::on_ctrBtnPlus_clicked() +{ + m_nCurMasterVol = m_nCurMasterVolctrProgressLight->setCurrentProgress(m_nCurMasterVol); +} diff --git a/app/gui/oven_control/configmastervolumedlg.h b/app/gui/oven_control/configmastervolumedlg.h new file mode 100644 index 0000000..6be6244 --- /dev/null +++ b/app/gui/oven_control/configmastervolumedlg.h @@ -0,0 +1,32 @@ +#ifndef CONFIGMASTERVOLUMEDLG_H +#define CONFIGMASTERVOLUMEDLG_H + +#include + +namespace Ui { +class ConfigMasterVolumeDlg; +} + +class ConfigMasterVolumeDlg : public QDialog +{ + Q_OBJECT + +public: + explicit ConfigMasterVolumeDlg(QWidget *parent = 0); + ~ConfigMasterVolumeDlg(); + +private slots: + void on_ctrBtnOk_clicked(); + + void on_ctrBtnCancel_clicked(); + + void on_ctrBtnMinus_clicked(); + + void on_ctrBtnPlus_clicked(); + +private: + Ui::ConfigMasterVolumeDlg *ui; + int m_nCurMasterVol; +}; + +#endif // CONFIGMASTERVOLUMEDLG_H diff --git a/app/gui/oven_control/configmastervolumedlg.ui b/app/gui/oven_control/configmastervolumedlg.ui new file mode 100644 index 0000000..4c5fcde --- /dev/null +++ b/app/gui/oven_control/configmastervolumedlg.ui @@ -0,0 +1,237 @@ + + + ConfigMasterVolumeDlg + + + + 0 + 0 + 900 + 1600 + + + + Dialog + + + false + + + #centralwidget{ + background-image : url(:/images/background/popup/503.png); +} + +QLabel{ + color : white; +} + +QPushButton{ + color : white; +} + +QPushButton::pressed, QPushButton::focus{ + color : yellow; +} + + + + + 0 + 450 + 900 + 425 + + + + + + + + 0 + + + QLayout::SetDefaultConstraint + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 18 + 75 + true + + + + 마스터 볼륨 + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + + + + + 6 + + + 50 + + + 50 + + + + + + 108 + 108 + + + + + 108 + 108 + + + + QPushButton{ + border-image : url(:/images/config/101_br_icon_04.png); +} + +QPushButton::pressed, QPushButton::focus{ + border-image : url(:/images/config/101_br_icon_04_ov.png); +} + + + + + + + + + + + 0 + 200 + + + + + + + + + 108 + 108 + + + + + 108 + 108 + + + + QPushButton{ + border-image : url(:/images/config/101_br_icon_03.png); +} + +QPushButton::pressed, QPushButton::focus{ + border-image : url(:/images/config/101_br_icon_03_ov.png); +} + + + + + + + + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 10 + 75 + true + true + + + + 취소 + + + true + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 10 + 75 + true + true + + + + 확인 + + + true + + + + + + + + + + + DotProgressBarWidget + QWidget +
dotprogressbarwidget.h
+ 1 + + + + + diff --git a/app/gui/oven_control/configresttimeformatdlg.cpp b/app/gui/oven_control/configresttimeformatdlg.cpp new file mode 100644 index 0000000..8bab67f --- /dev/null +++ b/app/gui/oven_control/configresttimeformatdlg.cpp @@ -0,0 +1,69 @@ +#include "configresttimeformatdlg.h" +#include "ui_configresttimeformatdlg.h" +#include "config.h" + +using namespace Define; + +configResttimeFormatDlg::configResttimeFormatDlg(QWidget *parent) : + QDialog(parent), + ui(new Ui::configResttimeFormatDlg) +{ + Config* cfg = Config::getInstance(); + config_item item; + item = cfg->getConfigValue(config_resttime_format); + m_nCurSel = item.d32; + ui->setupUi(this); + this->setWindowFlags( Qt::FramelessWindowHint); + this->setAttribute( Qt::WA_DeleteOnClose); + + ui->pushButton_1->setText(tr(rest_time_type_menu[0])); + ui->pushButton_2->setText(tr(rest_time_type_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))); +} + +configResttimeFormatDlg::~configResttimeFormatDlg() +{ + delete ui; +} + +void configResttimeFormatDlg::on_ctrBtnOk_clicked() +{ + Config* cfg = Config::getInstance(); + config_item item; + item.d32 = m_nCurSel; + cfg->setConfigValue(config_resttime_format,item); + accept(); +} + +void configResttimeFormatDlg::on_ctrBtnCancel_clicked() +{ + reject(); +} + +void configResttimeFormatDlg::onConfigBtnClicked(const int sel){ + m_nCurSel = sel; +} + +void configResttimeFormatDlg::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/configresttimeformatdlg.h b/app/gui/oven_control/configresttimeformatdlg.h new file mode 100644 index 0000000..c30999f --- /dev/null +++ b/app/gui/oven_control/configresttimeformatdlg.h @@ -0,0 +1,35 @@ +#ifndef CONFIGRESTTIMEFORMATDLG_H +#define CONFIGRESTTIMEFORMATDLG_H + +#include +#include + +namespace Ui { +class configResttimeFormatDlg; +} + +class configResttimeFormatDlg : public QDialog +{ + Q_OBJECT + + void reloadUi(void); + +public: + explicit configResttimeFormatDlg(QWidget *parent = 0); + ~configResttimeFormatDlg(); + +private slots: + void on_ctrBtnOk_clicked(); + + void on_ctrBtnCancel_clicked(); + +public slots: + void onConfigBtnClicked(const int sel); + +private: + Ui::configResttimeFormatDlg *ui; + QSignalMapper *m_pSignalMapper; + int m_nCurSel; +}; + +#endif // CONFIGRESTTIMEFORMATDLG_H diff --git a/app/gui/oven_control/configresttimeformatdlg.ui b/app/gui/oven_control/configresttimeformatdlg.ui new file mode 100644 index 0000000..ba01656 --- /dev/null +++ b/app/gui/oven_control/configresttimeformatdlg.ui @@ -0,0 +1,225 @@ + + + configResttimeFormatDlg + + + + 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/configsoundselelectdlg.cpp b/app/gui/oven_control/configsoundselelectdlg.cpp new file mode 100644 index 0000000..09d72d7 --- /dev/null +++ b/app/gui/oven_control/configsoundselelectdlg.cpp @@ -0,0 +1,43 @@ +#include "configsoundselelectdlg.h" +#include "ui_configsoundselelectdlg.h" + +ConfigSoundSelelectDlg::ConfigSoundSelelectDlg(QWidget *parent, ConfigType cfgtype) : + QDialog(parent), + ui(new Ui::ConfigSoundSelelectDlg) +{ + Config* cfg = Config::getInstance(); + config_item item; + ui->setupUi(this); + + switch(cfgtype){ + + case config_keypad_sound1: + default: + item = cfg->getConfigValue(cfgtype); + break; + } + m_nCurSel = item.d32; + reloadUi(); +} + +ConfigSoundSelelectDlg::~ConfigSoundSelelectDlg() +{ + delete ui; +} + +void ConfigSoundSelelectDlg::on_ctrBtnOk_clicked() +{ + accept(); +} + +void ConfigSoundSelelectDlg::on_ctrBtnCancel_clicked() +{ + reject(); +} + +void ConfigSoundSelelectDlg::reloadUi(){ + switch(m_nCurSel){ + case 0: + break; + } +} diff --git a/app/gui/oven_control/configsoundselelectdlg.h b/app/gui/oven_control/configsoundselelectdlg.h new file mode 100644 index 0000000..28370ee --- /dev/null +++ b/app/gui/oven_control/configsoundselelectdlg.h @@ -0,0 +1,34 @@ +#ifndef CONFIGSOUNDSELELECTDLG_H +#define CONFIGSOUNDSELELECTDLG_H + +#include +#include +#include + +using namespace Define; + +namespace Ui { +class ConfigSoundSelelectDlg; +} + +class ConfigSoundSelelectDlg : public QDialog +{ + Q_OBJECT + + void reloadUi(void); + +public: + explicit ConfigSoundSelelectDlg(QWidget *parent = 0, ConfigType cfgtype=config_keypad_sound1); + ~ConfigSoundSelelectDlg(); + +private slots: + void on_ctrBtnOk_clicked(); + + void on_ctrBtnCancel_clicked(); + +private: + Ui::ConfigSoundSelelectDlg *ui; + int m_nCurSel; +}; + +#endif // CONFIGSOUNDSELELECTDLG_H diff --git a/app/gui/oven_control/configsoundselelectdlg.ui b/app/gui/oven_control/configsoundselelectdlg.ui new file mode 100644 index 0000000..0e2adad --- /dev/null +++ b/app/gui/oven_control/configsoundselelectdlg.ui @@ -0,0 +1,650 @@ + + + ConfigSoundSelelectDlg + + + + 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 + 912 + + + + + 900 + 450 + + + + + 0 + + + + + + 18 + 75 + true + + + + + + + TITLE + + + Qt::AlignCenter + + + + + + + Qt::Horizontal + + + + + + + 0 + + + + + + 0 + 0 + + + + + 나눔고딕 + 14 + + + + PushButton + + + + :/images/config/102_icon_play.png + :/images/config/102_icon_play_ov.png:/images/config/102_icon_play.png + + + + 34 + 34 + + + + true + + + true + + + true + + + true + + + + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 14 + + + + PushButton + + + + :/images/config/102_icon_play.png + :/images/config/102_icon_play_ov.png:/images/config/102_icon_play.png + + + + 34 + 34 + + + + true + + + true + + + true + + + true + + + + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 14 + + + + PushButton + + + + :/images/config/102_icon_play.png + :/images/config/102_icon_play_ov.png:/images/config/102_icon_play.png + + + + 34 + 34 + + + + true + + + true + + + true + + + true + + + + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 14 + + + + PushButton + + + + :/images/config/102_icon_play.png + :/images/config/102_icon_play_ov.png:/images/config/102_icon_play.png + + + + 34 + 34 + + + + true + + + true + + + true + + + true + + + + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 14 + + + + PushButton + + + + :/images/config/102_icon_play.png + :/images/config/102_icon_play_ov.png:/images/config/102_icon_play.png + + + + 34 + 34 + + + + true + + + true + + + true + + + true + + + + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 14 + + + + PushButton + + + + :/images/config/102_icon_play.png + :/images/config/102_icon_play_ov.png:/images/config/102_icon_play.png + + + + 34 + 34 + + + + true + + + true + + + true + + + true + + + + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 14 + + + + PushButton + + + + :/images/config/102_icon_play.png + :/images/config/102_icon_play_ov.png:/images/config/102_icon_play.png + + + + 34 + 34 + + + + true + + + true + + + true + + + true + + + + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 14 + + + + PushButton + + + + :/images/config/102_icon_play.png + :/images/config/102_icon_play_ov.png:/images/config/102_icon_play.png + + + + 34 + 34 + + + + true + + + true + + + true + + + true + + + + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 14 + + + + PushButton + + + + :/images/config/102_icon_play.png + :/images/config/102_icon_play_ov.png:/images/config/102_icon_play.png + + + + 34 + 34 + + + + true + + + true + + + true + + + true + + + + + + + Qt::Horizontal + + + + + + + + 0 + 0 + + + + + 나눔고딕 + 14 + + + + PushButton + + + + :/images/config/102_icon_play.png + :/images/config/102_icon_play_ov.png:/images/config/102_icon_play.png + + + + 34 + 34 + + + + true + + + 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/configtemptypedlg.cpp b/app/gui/oven_control/configtemptypedlg.cpp new file mode 100644 index 0000000..92ddfe8 --- /dev/null +++ b/app/gui/oven_control/configtemptypedlg.cpp @@ -0,0 +1,69 @@ +#include "config.h" +#include "configtemptypedlg.h" +#include "ui_configtemptypedlg.h" + +using namespace Define; + +ConfigTempTypeDlg::ConfigTempTypeDlg(QWidget *parent) : + QDialog(parent), + ui(new Ui::ConfigTempTypeDlg) +{ + Config* cfg = Config::getInstance(); + config_item item; + item = cfg->getConfigValue(config_temptype); + m_nCurSel = item.d32; + ui->setupUi(this); + this->setWindowFlags( Qt::FramelessWindowHint); + this->setAttribute( Qt::WA_DeleteOnClose); + + ui->pushButton_1->setText(tr(temptype_menu[0])); + ui->pushButton_2->setText(tr(temptype_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))); +} + +ConfigTempTypeDlg::~ConfigTempTypeDlg() +{ + delete ui; +} + +void ConfigTempTypeDlg::on_ctrBtnOk_clicked() +{ + Config* cfg = Config::getInstance(); + config_item item; + item.d32 = m_nCurSel; + cfg->setConfigValue(config_temptype,item); + this->accept(); +} + +void ConfigTempTypeDlg::on_ctrBtnCancel_clicked() +{ + this->reject(); +} + +void ConfigTempTypeDlg::onConfigBtnClicked(const int sel){ + m_nCurSel = sel; +} + +void ConfigTempTypeDlg::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/configtemptypedlg.h b/app/gui/oven_control/configtemptypedlg.h new file mode 100644 index 0000000..d16d665 --- /dev/null +++ b/app/gui/oven_control/configtemptypedlg.h @@ -0,0 +1,35 @@ +#ifndef CONFIGTEMPTYPEDLG_H +#define CONFIGTEMPTYPEDLG_H + +#include +#include + +namespace Ui { +class ConfigTempTypeDlg; +} + +class ConfigTempTypeDlg : public QDialog +{ + Q_OBJECT + + void reloadUi(void); + +public: + explicit ConfigTempTypeDlg(QWidget *parent = 0); + ~ConfigTempTypeDlg(); + +private slots: + void on_ctrBtnOk_clicked(); + + void on_ctrBtnCancel_clicked(); + +public slots: + void onConfigBtnClicked(const int sel); + +private: + Ui::ConfigTempTypeDlg *ui; + QSignalMapper *m_pSignalMapper; + int m_nCurSel; +}; + +#endif // CONFIGTEMPTYPEDLG_H diff --git a/app/gui/oven_control/configtemptypedlg.ui b/app/gui/oven_control/configtemptypedlg.ui new file mode 100644 index 0000000..0be0348 --- /dev/null +++ b/app/gui/oven_control/configtemptypedlg.ui @@ -0,0 +1,228 @@ + + + ConfigTempTypeDlg + + + + 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 + + + + + + + label + + line + + + + + diff --git a/app/gui/oven_control/configtimeformatdlg.cpp b/app/gui/oven_control/configtimeformatdlg.cpp new file mode 100644 index 0000000..6cd3109 --- /dev/null +++ b/app/gui/oven_control/configtimeformatdlg.cpp @@ -0,0 +1,71 @@ +#include "config.h" +#include "configtimeformatdlg.h" +#include "ui_configtimeformatdlg.h" + +using namespace Define; + +ConfigTimeFormatDlg::ConfigTimeFormatDlg(QWidget *parent) : + QDialog(parent), + ui(new Ui::ConfigTimeFormatDlg) +{ + Config* cfg = Config::getInstance(); + config_item item; + item = cfg->getConfigValue(config_time_type); + m_nCurSel = item.d32; + ui->setupUi(this); + this->setWindowFlags( Qt::FramelessWindowHint); + this->setAttribute( Qt::WA_DeleteOnClose); + + + ui->pushButton_1->setText(tr(time_type_menu[0])); + ui->pushButton_2->setText(tr(time_type_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))); +} + +ConfigTimeFormatDlg::~ConfigTimeFormatDlg() +{ + delete ui; +} + +void ConfigTimeFormatDlg::on_ctrBtnOk_clicked() +{ + Config* cfg = Config::getInstance(); + config_item item; + item.d32 = m_nCurSel; + cfg->setConfigValue(config_time_type,item); + accept(); +} + +void ConfigTimeFormatDlg::on_ctrBtnCancel_clicked() +{ + reject(); +} + +void ConfigTimeFormatDlg::onConfigBtnClicked(const int sel){ + m_nCurSel = sel; +} + + + +void ConfigTimeFormatDlg::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/configtimeformatdlg.h b/app/gui/oven_control/configtimeformatdlg.h new file mode 100644 index 0000000..682d254 --- /dev/null +++ b/app/gui/oven_control/configtimeformatdlg.h @@ -0,0 +1,36 @@ +#ifndef CONFIGTIMEFORMATDLG_H +#define CONFIGTIMEFORMATDLG_H + +#include +#include + +namespace Ui { +class ConfigTimeFormatDlg; +} + +class ConfigTimeFormatDlg : public QDialog +{ + Q_OBJECT + + void reloadUi(void); + +public: + explicit ConfigTimeFormatDlg(QWidget *parent = 0); + ~ConfigTimeFormatDlg(); + +private slots: + void on_ctrBtnOk_clicked(); + + void on_ctrBtnCancel_clicked(); + + +public slots: + void onConfigBtnClicked(const int sel); + +private: + Ui::ConfigTimeFormatDlg *ui; + QSignalMapper *m_pSignalMapper; + int m_nCurSel; +}; + +#endif // CONFIGTIMEFORMATDLG_H diff --git a/app/gui/oven_control/configtimeformatdlg.ui b/app/gui/oven_control/configtimeformatdlg.ui new file mode 100644 index 0000000..4e13c46 --- /dev/null +++ b/app/gui/oven_control/configtimeformatdlg.ui @@ -0,0 +1,225 @@ + + + ConfigTimeFormatDlg + + + + 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/configwindow.cpp b/app/gui/oven_control/configwindow.cpp index 91a3994..ac310a5 100644 --- a/app/gui/oven_control/configwindow.cpp +++ b/app/gui/oven_control/configwindow.cpp @@ -77,6 +77,8 @@ void ConfigWindow::on_pushButton_8_clicked() //설정 버튼 void ConfigWindow::onConfigBtnClicked(uint16_t id){ qDebug() << "config id prsess : " << id; + Config *cfg = Config::getInstance(); + cfg->execConfigWindow(this,(Define::ConfigType)id); } diff --git a/app/gui/oven_control/configwindow.h b/app/gui/oven_control/configwindow.h index 3146451..2779cdc 100644 --- a/app/gui/oven_control/configwindow.h +++ b/app/gui/oven_control/configwindow.h @@ -31,10 +31,10 @@ class ConfigWindow : public QMainWindow private: const uint16_t m_arrMaxMenuCount[7] ={ - 9,8,0, + 5,8,0, }; const Define::ConfigType m_arrConfigListInfos[7][20] = { - {config_language, config_datetime, config_temptype,config_backlight, config_stop_delay , config_best_dish_weight,config_party_dish_weight, config_time_type,config_resttime_format,}, + {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_invalid,}, {config_invalid,}, diff --git a/app/gui/oven_control/dotprogressbarwidget.cpp b/app/gui/oven_control/dotprogressbarwidget.cpp new file mode 100644 index 0000000..be2ce45 --- /dev/null +++ b/app/gui/oven_control/dotprogressbarwidget.cpp @@ -0,0 +1,57 @@ +#include "dotprogressbarwidget.h" +#include "ui_dotprogressbarwidget.h" + + +DotProgressBarWidget::DotProgressBarWidget(QWidget *parent) : + QWidget(parent), + ui(new Ui::DotProgressBarWidget) +{ + ui->setupUi(this); + + m_nCurProgress = 0; + m_nMaximumProgress = 0; + + basePixmap.load(":/images/symbol/step_bullet.png"); + coverPixmap.load(":/images/symbol/selected_step_bullet.png"); + + +} + +DotProgressBarWidget::~DotProgressBarWidget() +{ + delete ui; +} + +void DotProgressBarWidget::setCurrentProgress(int progress){ + m_nCurProgress = progress; + reloadUi(); +} + + +void DotProgressBarWidget::reloadUi(){ + for(int i = 0;i= (i+1)){ + m_ctrLabelList[i]->setPixmap(coverPixmap); + } + else m_ctrLabelList[i]->setPixmap(basePixmap); + } +} + +void DotProgressBarWidget::setMaxProgress(int curProgress, int maxProgress){ + QRect defaultGeometry; + m_nCurProgress = curProgress; + m_nMaximumProgress = maxProgress; + defaultGeometry.setSize(basePixmap.size()); + QLabel *label; + for(int i=0;i=(i+1)){ + label->setPixmap(coverPixmap); + } + else label->setPixmap(basePixmap); + label->setGeometry(defaultGeometry); + label->setAlignment(Qt::AlignCenter); + ui->horizontalLayout_2->addWidget(label); + } +} diff --git a/app/gui/oven_control/dotprogressbarwidget.h b/app/gui/oven_control/dotprogressbarwidget.h new file mode 100644 index 0000000..330f3f8 --- /dev/null +++ b/app/gui/oven_control/dotprogressbarwidget.h @@ -0,0 +1,36 @@ +#ifndef DOTPROGRESSBARWIDGET_H +#define DOTPROGRESSBARWIDGET_H + +#include +#include + + +namespace Ui { +class DotProgressBarWidget; +} + +class DotProgressBarWidget : public QWidget +{ + Q_OBJECT + +public: + explicit DotProgressBarWidget(QWidget *parent = 0); + ~DotProgressBarWidget(); + void setMaxProgress(int curProgress, int maxProgress); + void setCurrentProgress(int progress); + + +private: + void reloadUi(void); + + Ui::DotProgressBarWidget *ui; + QPixmap basePixmap; + QPixmap coverPixmap; + + QListm_ctrLabelList; + + int m_nCurProgress; + int m_nMaximumProgress; +}; + +#endif // DOTPROGRESSBARWIDGET_H diff --git a/app/gui/oven_control/dotprogressbarwidget.ui b/app/gui/oven_control/dotprogressbarwidget.ui new file mode 100644 index 0000000..b4bc3fd --- /dev/null +++ b/app/gui/oven_control/dotprogressbarwidget.ui @@ -0,0 +1,32 @@ + + + + + DotProgressBarWidget + + + + 0 + 0 + 710 + 126 + + + + Form + + + + 0 + + + 0 + + + + + + + + + diff --git a/app/gui/oven_control/formatterspinbox.cpp b/app/gui/oven_control/formatterspinbox.cpp new file mode 100644 index 0000000..3e0437e --- /dev/null +++ b/app/gui/oven_control/formatterspinbox.cpp @@ -0,0 +1,29 @@ +#include + +#include "formatterspinbox.h" + +FormatterSpinBox::FormatterSpinBox(QWidget *parent) + : QSpinBox(parent) +{ + m_nwidth = 2; +} + + //! [1] + int FormatterSpinBox::valueFromText(const QString &text) const + { + return text.toInt(); + } + //! [1] + + //! [2] + QString FormatterSpinBox::textFromValue(int value) const + { + QString strTemp; + + return tr("%1").arg(value,m_nwidth,10,QLatin1Char('0')); + } + //! [2] + + void FormatterSpinBox::setFormatterWidth(int wid){ + m_nwidth = wid; + } diff --git a/app/gui/oven_control/formatterspinbox.h b/app/gui/oven_control/formatterspinbox.h new file mode 100644 index 0000000..8ae6cc3 --- /dev/null +++ b/app/gui/oven_control/formatterspinbox.h @@ -0,0 +1,24 @@ +#ifndef FORMATTERSPINBOX_H +#define FORMATTERSPINBOX_H + +#include +#include + + + +class FormatterSpinBox : public QSpinBox +{ + Q_OBJECT +private: + int m_nwidth; + +public: + explicit FormatterSpinBox(QWidget *parent = Q_NULLPTR); + + int valueFromText(const QString &text) const Q_DECL_OVERRIDE; + QString textFromValue(int value) const Q_DECL_OVERRIDE; + + void setFormatterWidth(int wid); +}; + +#endif // SPINBOX_H diff --git a/app/gui/oven_control/images/config/101_br_icon_01.png b/app/gui/oven_control/images/config/101_br_icon_01.png new file mode 100644 index 0000000000000000000000000000000000000000..48840d89b7bde0137d7e0fa29b98a0b67e272e12 GIT binary patch literal 3001 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 v3@i(g@KxFo?|4n;U00000NkvXXu0mjf2&B{f literal 0 HcmV?d00001 diff --git a/app/gui/oven_control/images/config/101_br_icon_01_ov.png b/app/gui/oven_control/images/config/101_br_icon_01_ov.png new file mode 100644 index 0000000000000000000000000000000000000000..3fb0beb04b8a66639be138e9ae0f3c17625249a2 GIT binary patch literal 3346 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 DUK}`v literal 0 HcmV?d00001 diff --git a/app/gui/oven_control/images/config/101_br_icon_02_ov.png b/app/gui/oven_control/images/config/101_br_icon_02_ov.png new file mode 100644 index 0000000000000000000000000000000000000000..5599a420b5c3ec3c4151dabcd759a79807df839e GIT binary patch literal 3192 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 literal 0 HcmV?d00001 diff --git a/app/gui/oven_control/images/config/101_br_icon_03.png b/app/gui/oven_control/images/config/101_br_icon_03.png new file mode 100644 index 0000000000000000000000000000000000000000..6c39d8cc18c0d5f425f712e3ba46190965b1e62f GIT binary patch literal 2702 zcmV;93UT#`P)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_000McNliru;RFr>E+*a`>&pND3G+!rK~#9!-JEMsRo4~A z|L2NO#1tEd320S)3e_!pIVN^cgSd%zVuD4Icep7gzd6q3 z#h5{L%O%c@E>s$K#T=?zb~DY1uMRqB{t#P{>G)|h;w&0*1=r9HAQ5-rZrp*@OxfBnRVuAbpG`m8A%mcwphnm>?M?0^AGsBE!zEVjc3?=gl+r<6QY3y z08HR3Y_s_wGu#*+$T~~2$2dA#P^J%~SZnD+ow_?wne?&T(&X>hKiXIT!2aB5=|?$r zXX*iiYb}iVIWHDarZ3O%mW4NKotS#U!cdbp4Z9<>LN;1>^n|XNOg1Tv{F@KP8Vdk8 z&Z2#8qRt4G1`k+ZMbdjjhGx~H9@H2?axu`QsZrR%w(3ZCZrBsumm1acv+n0~D=8N%l+tRIUvkAXq z{*15k9gfw0$Ch9$HTMeMRL!=Ss#qBBT4v%)V&;C)R2kb9U-og9GDR244veb-bPxQguQgFa-58UKj4 zzuIy_OwCe(eHCwiwdJ2GFlpJ!Z(NMGzq(>H;)al%nE>hZ#09t2@cUSUo;lZj0Du%$ z2B{pyO5=`}t-G)xtYNr`4aTP-Y4r$iKhtC|_eUb%!KARX1O(5;rl1Bpv~0bAMMCOB zVc(eKZJH0Mo`N-bq@&ggPnEn)mA6`Ny9Qf`67-B1AI2;Ieyk7D_}n<8Y3l=Ygf(q` zYzx!tlnQ&ihio+Bt)Bl_f>{7=8EahG>c9tDir1w?pH|WTZxQ#QWw4m+FMB3FIk8np zb##C(?jm{H>XRGGc>5YLShEb~==7R}bd3qFIWNd%{8al?spM_54-G={w|Ji?VCAU5 z1*~?Am5VY=#}58dLpL4LfBkHzuDbt;MZ#jd0++2G5#Cj=@FDm@!G%-W$8kwj(D%s9m zoat=C$!7U&f_X;ZK=4*Zn3X?@{!9bY#f)zhW)fM%VivQQPYIg>7rCA}&=lJR(@{JV z$g5MIDdkt9|LJhDN)=*q3YT*^mxS$HS8ioRUAtkdp`9(lzbkb}`dt zfjh{!bRM*gTRGMGyo}bSL@Eyj@`sE03q;?ycMV4li}lXb1rsG1^Kl5L`D@uBT`^iQ z1MlM&{$QLF6=sR4T||ntd%yMCeb7@2ePio5hZW|^dnXTY9+QP~5$$LKwrlrpcUzQT zYXE?mTp6^O*}`|3?>U(DZcC*5V=`DEuaH}K&CEH;S9``Z9)Q{Ik4>g5`C8^JzyN?L ze2$f7?rr{+v)Mm#FpgJvJ-J6kwFkY+3$TDzHh&XT%Vll|tn9l7lg|yD@6{GZa%w;i z3;^ikbbh2b;p-5LIf~%C-e-iB=R9_L2^P>F#GeVj4yRyp@7o#Hy(mxS6xdeb5G+t? z95=fMW4^-M@^ICu3e}^uS@3ZO1~9c(pz#+Duzbq+sHu{=>h#<4=zsy7%?ehsl9k-! zB=CnzR4+kRe_Ww{-8xX-J(xRTmh!yfk9xF%J~QKQI3ij~!M5lH=Qzenz&6OI6OI@a zA{c;I6xQ;wF5W<U8WT`-faih^ybhM$Ez z7dSoN!WPzg5sM zA{wb){}7m`SUDD0%^ad@#wvcSk&`sdc!xF7llU>fCgSg=x`m7i)>D>2sBbtk*3TwJ zb7PERG!wYN(hsLGni^5HH5?UntdTaC0XUDU1vKKIZ}8_{L{TVe@5dF&F=3aui-QIL z-ftVZUKgEER2JD@s8Ao#9adU*4eWLwb|BW7t8vLjsnG-s*EuTt;d`FR)7PvF9Gs%A4|02l6$OYup}-wumAuJu5xr| z&Pi_O0*+TZ!2ul41>DS&4y-!3Gbj4D9Q_Ap(1a%QJV`3jk&Y2?{yAO5e9vz=3ZSKN zw}a>FtvI}w$~oLzUWz$Xv~Lm%p!LnW-vV%B`rvJSCR|^(BJ;9Sv5dV9EJq9xYlaPzNc;4*%KlvPWoK{&1i~s-t07*qo IM6N<$f;JflUH||9 literal 0 HcmV?d00001 diff --git a/app/gui/oven_control/images/config/101_br_icon_03_ov.png b/app/gui/oven_control/images/config/101_br_icon_03_ov.png new file mode 100644 index 0000000000000000000000000000000000000000..7c5ee4687c7734d5f189959df02e481dd987a8ed GIT binary patch literal 3101 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 XbhkBe*^DvIemr1mbl0$6A0PW)TNpbk literal 0 HcmV?d00001 diff --git a/app/gui/oven_control/images/config/101_br_icon_04.png b/app/gui/oven_control/images/config/101_br_icon_04.png new file mode 100644 index 0000000000000000000000000000000000000000..faeb536eda53b3e515bc9eef3a12b9d990fe1815 GIT binary patch literal 2462 zcmV;P31Rk$P)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00002VoOIv0RM-N%)bBt010qN zS#tmY3ljhU3ljkVnw%H_000McNliru;RFr>E+*a`>&pND2?I$)K~#9!-JE}H6vq|E zzk3`I49&SY1H~bLW5N%IxJg4WU?`wQQCgvtDj`2Wq!tvXZ4#v^sYFp*(GrzPQA3JS zsVKBcPzaP?r2))85Luz3*npulB&AA$IF6y%Mm7Nx^W(n#!{_z+{APD%ckZt8`|oDn zy!Sr4dpol;^Tt6&gaa`VUqvy-U=)TSju-|et2)qz7F<9*&f-5ffe)RIOhn*V28!cB z%s@Fx(ND9e*^QtwdF8PA%IVpEg_p{16QmRz(f$T$#=gy2mb;(Xn%pO!e*YZYIut@R-*JkBE z$N4;$HK;B*&-s~!igR1mp}J%{<0i2hbkO_;HlWb>YBb?2ns5=H;~Ibg_!4fzP>jJ) zV@r*A+SzaWUO8ND)cJnI^<2s_4pCYh!ZI%98~n(?>P@bo&9M^mxK-122X}D^M;cil z$;I5o4(&%W&lc8j)@Zpr${+H}fxX1|10L1#Q_JBtu)(z zFv?|Y_jw>k1Tj2>b)IIAa(t$s+!)63uxAW)>h45kGQvHcCV$8NnZ^PD_U9VUIQCHY zOFe0Dm4~qoF3bj$8_QGt!XuhhCZ-;Z$Y!OH&v;L^u>gRR zJl@aE)EU9j;XV(nFug}OG_M|Yzs3lXOFgbkPVSZ)S&7F3xzw+5AzKwqud>{FsJ~`2 zTiME1Hu7-|{pre{t+X+CtpqCBLC@}R28!-@v&Hs6ID$2Ghtc+ms{Sj@|cNFSCP zsK#Y4T0)BQQSNuGUQGKc*9HUlf+EtxlJabYa-HF5Ob%rvf5}GIW(_NN3-1jK7U}gM zcggJD%DWY+Az$)z_z-ux6RcPGM%QO)a4>+=6w&TZR~)VQApc7!s5oCr`KJ4j&-2!l z+7Ms>|18Fv;OL%es}yP_fuW{xgF7m}#?747OCuauiQ-nIj`r!WUR2s12x$nP;c?f- zCtSf{qFyL4fLp|v>r=*!ELS|SQ;nTX;_rFMz2AE{ml36ISg;2aQFnhM zF5m&T?FFvp7@rm)!2rd(ac#H4X;I-BAG1?f!3r+oFc$GQyx_KbpHFdsMp)s&mWXkm z?y4RyR$u3Bo<@t^SNKKuZ+wZb^KR|1!h^*W6XTuJOng?X+%1}Vjn@=U_HkBnuu)i{ z!2s?OV|li-a+B_Zs2H6j_?G!=#uC`~#E3QlQ2_Gf%wC~v8i33ABLH9|9!-{Ba=sfR zC@Zp8ES&*>anCNK?**;63>JJ#P(Y8h8mu0SF4Gq>JgBk5!%ehF=wnWe<6yL(H5)ouMg>-iYN7NLfC8k?=jZVSY;)$(Oi?I9L*?S^^C(bM^huKwwB`zO`2nk^*Ic{ zJgXMa$b-JZA7^e-oBjBra!lAM!SbL1fOq<4uGeKI6_qo54^(Ifb%vGJSp(aHryYns zOEeDI2;ZY}l*Z{032w8~32-X6YMl;YV}4otJdeYyWGt|k7%P=IM(KWRt+z5y`w*ZG z?qY>jUUIkf5v<6`2`m6WhbxTE%sI(*T+GSpAehI=T+DSmX<*gh%$&@ha`a!EK{J}& z{Uk9Ipa5fF{y3e(BI~CdCDG#CZg73=is89b=5X_QKI>4KK1nQz);G_7OTta;gQxYm zaDDN7MHj9wo`~tf^~EzxQ}Bwpf;AfBJe4F^!=Kwbbv6^{1kc3u+@BL{8O#M7h!T|M c@?_`#0Y%>;O{A!|hyVZp07*qoM6N<$f_5>eWdHyG literal 0 HcmV?d00001 diff --git a/app/gui/oven_control/images/config/101_br_icon_04_ov.png b/app/gui/oven_control/images/config/101_br_icon_04_ov.png new file mode 100644 index 0000000000000000000000000000000000000000..9b729900d8ccb293e2ca0af1342d361cf039a2a9 GIT binary patch literal 2871 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 QtN;K207*qoM6N<$f*=ng&j0`b literal 0 HcmV?d00001 diff --git a/app/gui/oven_control/images/config/102_icon_play_ov.png b/app/gui/oven_control/images/config/102_icon_play_ov.png new file mode 100644 index 0000000000000000000000000000000000000000..e4fa42a3bb2615237cefe2a3627eca9241803f46 GIT binary patch literal 777 zcmeAS@N?(olHy`uVBq!ia0vp^N+8U^3=*07`vZ_tNcITwWnidMWngG%W?=aFA4tDs zU???UV0e|lz+g3lfk8ZfQv6XjpxOfgJ|V9Ef#4IvP(}a$2kneJ5A=&&NswPK1A|=l zsw-bS_Wsk{pZxvK{K_=O?ulBxDjC6&7I;J!Gca%qgD@k*tT_@uLG}_)Usv{r zEPPCQ>MNyg#{%_4db&7MbJ@Z$(Ds7!al7#eoQpHC3xE4&9si@$`tNfmzgBb3v#S) zy~t=7C+_YOlTi|2BQGq-{lGxhEojYYB^O8kewT#GnB2K@*wT{(7oX<}{FuH}e)H!) zi(K>=!sdwqEvuji(6kBljAWKC_n`E-(t5{fr|?ceA=)AjR5 ijbHuj*Zb68u*W@$ikkR9=`=9h89ZJ6T-G@yGywoyEnxBh literal 0 HcmV?d00001 diff --git a/app/gui/oven_control/keyboardwidget.cpp b/app/gui/oven_control/keyboardwidget.cpp new file mode 100644 index 0000000..a30fe65 --- /dev/null +++ b/app/gui/oven_control/keyboardwidget.cpp @@ -0,0 +1,128 @@ +#include +#include +#include "keyboardwidget.h" +#include "ui_keyboardwidget.h" + +KeyboardWidget::KeyboardWidget(QWidget *parent) : + QWidget(parent), + ui(new Ui::KeyboardWidget) +{ + ui->setupUi(this); + m_pSignalMapper = new QSignalMapper(this); + + m_pSignalMapper->setMapping(ui->pushButton_1, tr("1")); + m_pSignalMapper->setMapping(ui->pushButton_2, tr("2")); + m_pSignalMapper->setMapping(ui->pushButton_3, tr("3")); + m_pSignalMapper->setMapping(ui->pushButton_4, tr("4")); + m_pSignalMapper->setMapping(ui->pushButton_5, tr("5")); + m_pSignalMapper->setMapping(ui->pushButton_6, tr("6")); + m_pSignalMapper->setMapping(ui->pushButton_7, tr("7")); + m_pSignalMapper->setMapping(ui->pushButton_8, tr("8")); + m_pSignalMapper->setMapping(ui->pushButton_9, tr("9")); + m_pSignalMapper->setMapping(ui->pushButton_11, tr("Q")); + m_pSignalMapper->setMapping(ui->pushButton_12, tr("W")); + m_pSignalMapper->setMapping(ui->pushButton_13, tr("E")); + m_pSignalMapper->setMapping(ui->pushButton_14, tr("R")); + m_pSignalMapper->setMapping(ui->pushButton_15, tr("T")); + m_pSignalMapper->setMapping(ui->pushButton_16, tr("Y")); + m_pSignalMapper->setMapping(ui->pushButton_17, tr("U")); + m_pSignalMapper->setMapping(ui->pushButton_18, tr("I")); + m_pSignalMapper->setMapping(ui->pushButton_19, tr("O")); + m_pSignalMapper->setMapping(ui->pushButton_20, tr("P")); + m_pSignalMapper->setMapping(ui->pushButton_21, tr("A")); + m_pSignalMapper->setMapping(ui->pushButton_22, tr("S")); + m_pSignalMapper->setMapping(ui->pushButton_23, tr("D")); + m_pSignalMapper->setMapping(ui->pushButton_24, tr("F")); + m_pSignalMapper->setMapping(ui->pushButton_25, tr("G")); + m_pSignalMapper->setMapping(ui->pushButton_26, tr("H")); + m_pSignalMapper->setMapping(ui->pushButton_27, tr("J")); + m_pSignalMapper->setMapping(ui->pushButton_28, tr("K")); + m_pSignalMapper->setMapping(ui->pushButton_29, tr("L")); + m_pSignalMapper->setMapping(ui->pushButton_30, tr("Z")); + m_pSignalMapper->setMapping(ui->pushButton_31, tr("X")); + m_pSignalMapper->setMapping(ui->pushButton_32, tr("C")); + m_pSignalMapper->setMapping(ui->pushButton_33, tr("V")); + m_pSignalMapper->setMapping(ui->pushButton_34, tr("B")); + m_pSignalMapper->setMapping(ui->pushButton_35, tr("N")); + m_pSignalMapper->setMapping(ui->pushButton_36, tr("M")); + m_pSignalMapper->setMapping(ui->pushButton_37, tr("-")); + m_pSignalMapper->setMapping(ui->pushButton_38, tr(",")); + + + connect(ui->pushButton_1,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_2,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_3,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_4,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_5,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_6,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_7,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_8,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_9,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_10,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_11,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_12,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_13,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_14,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_15,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_16,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_17,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_18,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_19,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_20,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_21,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_22,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_23,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_24,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_25,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_26,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_27,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_28,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_29,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_30,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_31,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_32,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_33,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_34,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_35,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_36,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_37,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + connect(ui->pushButton_38,SIGNAL(clicked(bool)),m_pSignalMapper,SLOT(map())); + + connect(m_pSignalMapper,SIGNAL(mapped(QString)), this, SLOT(onKeyboardClicked(QString))); +} + +KeyboardWidget::~KeyboardWidget() +{ + delete ui; +} + +void KeyboardWidget::on_pushButton_41_clicked() +{ + QKeyEvent key(QEvent::KeyPress, Qt::Key_Enter, Qt::NoModifier); + QGuiApplication::sendEvent(QApplication::focusObject(),&key); + emit onOkKeyClicked(); +} + +void KeyboardWidget::on_pushButton_42_clicked() +{ + emit onCancelKeyClicked(); +} + +void KeyboardWidget::on_pushButton_39_clicked() +{ + QKeyEvent key(QEvent::KeyPress, Qt::Key_Backspace, Qt::NoModifier); + QGuiApplication::sendEvent(QApplication::focusObject(),&key); + emit onBackspaceKeyClicked(); +} + +void KeyboardWidget::onKeyboardClicked(const QString in){ + QInputMethodEvent event; + event.setCommitString(in); + QGuiApplication::sendEvent(QApplication::focusObject(),&event); + emit onKeyboardClickSignal(in); +} + +void KeyboardWidget::on_pushButton_40_clicked() +{ + emit onSpaceKeyClicked(); +} diff --git a/app/gui/oven_control/keyboardwidget.h b/app/gui/oven_control/keyboardwidget.h new file mode 100644 index 0000000..bc7d4ea --- /dev/null +++ b/app/gui/oven_control/keyboardwidget.h @@ -0,0 +1,45 @@ + #ifndef KEYBOARDWIDGET_H +#define KEYBOARDWIDGET_H + +#include +#include +#include + +namespace Ui { +class KeyboardWidget; +} + +class KeyboardWidget : public QWidget +{ + Q_OBJECT + +public: + explicit KeyboardWidget(QWidget *parent = 0); + ~KeyboardWidget(); + +private slots: + void on_pushButton_41_clicked(); + + void on_pushButton_42_clicked(); + + void on_pushButton_39_clicked(); + + void on_pushButton_40_clicked(); + +signals: + void onKeyboardClickSignal(const QString in); + void onBackspaceKeyClicked(); + void onOkKeyClicked(); + void onCancelKeyClicked(); + void onSpaceKeyClicked(); + +public slots: + void onKeyboardClicked(const QString in); + +private: + Ui::KeyboardWidget *ui; + + QSignalMapper *m_pSignalMapper; +}; + +#endif // KEYBOARDWIDGET_H diff --git a/app/gui/oven_control/keyboardwidget.ui b/app/gui/oven_control/keyboardwidget.ui new file mode 100644 index 0000000..fee02fd --- /dev/null +++ b/app/gui/oven_control/keyboardwidget.ui @@ -0,0 +1,1301 @@ + + + KeyboardWidget + + + + 0 + 0 + 900 + 600 + + + + Form + + + #KeyboardWidget{ + background-color: rgba(25, 25, 25, 200); +} + + + + + + + 10 + 10 + 881 + 581 + + + + + QLayout::SetDefaultConstraint + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a033.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a033_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a016.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a016_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a009.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a009_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a020.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a020_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a012.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a012_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a022.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a022_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a034.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a034_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a036.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a036_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a038.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a038_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a019.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a019_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a006.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a006_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a021.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a021_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a014.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a014_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a023.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a023_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a008.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a008_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a003.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a003_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a002.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a002_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a029.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a029_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a010.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a010_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a028.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a028_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a018.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a018_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a001.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a001_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a015.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a015_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a035.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a035_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a026.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a026_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a011.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a011_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a031.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a031_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a004.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a004_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a017.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a017_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a030.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a030_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a005.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a005_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a007.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a007_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a032.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a032_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a013.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a013_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a025.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a025_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a039.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a039_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a024.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a024_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a037.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a037_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a027.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a027_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 474 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a040.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a040_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a041.png);} +QPushButton:pressed , QPushButton::focus { border-image: url(:/images/keyboard/088_keyboard_a041_ov.png); } + + + + + + + false + + + + + + + + 0 + 0 + + + + + 74 + 103 + + + + Qt::NoFocus + + + QPushButton { border-image: url(:/images/keyboard/088_keyboard_a042.png);} +QPushButton:pressed { border-image: url(:/images/keyboard/088_keyboard_a042_ov.png); } + + + + + + + false + + + + + + + + + diff --git a/app/gui/oven_control/manualcookwindow.ui b/app/gui/oven_control/manualcookwindow.ui index 0e80ef5..17f7727 100644 --- a/app/gui/oven_control/manualcookwindow.ui +++ b/app/gui/oven_control/manualcookwindow.ui @@ -124,7 +124,7 @@ height: 33px; - :/images/animation/close_door_arrow.png + :/images/animation/close_door_arrow.png @@ -535,6 +535,9 @@ background-position: center; border: none; } + + 0 + @@ -1416,7 +1419,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); } - :/images/line/manual_core_temp_horizontal.png + :/images/line/manual_core_temp_horizontal.png @@ -1432,7 +1435,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); } - :/images/line/manual_core_temp_vertical.png + :/images/line/manual_core_temp_vertical.png @@ -1448,7 +1451,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); } - :/images/line/manual_core_temp_vertical.png + :/images/line/manual_core_temp_vertical.png @@ -1464,7 +1467,7 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); } - :/images/line/manual_core_temp_vertical.png + :/images/line/manual_core_temp_vertical.png @@ -2335,6 +2338,8 @@ QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); }
animatedimagebox.h
- + + + diff --git a/app/gui/oven_control/oven_control.pro b/app/gui/oven_control/oven_control.pro index 1ea4a01..207cef5 100644 --- a/app/gui/oven_control/oven_control.pro +++ b/app/gui/oven_control/oven_control.pro @@ -69,7 +69,18 @@ SOURCES += main.cpp\ programmingwindow.cpp \ primewindow.cpp \ cookpanelbutton.cpp \ - cookhistory.cpp + cookhistory.cpp \ + keyboardwidget.cpp \ + configdatetimedlg.cpp \ + formatterspinbox.cpp \ + configlanguagedlg.cpp \ + configtemptypedlg.cpp \ + configbacklightdlg.cpp \ + dotprogressbarwidget.cpp \ + configtimeformatdlg.cpp \ + configresttimeformatdlg.cpp \ + configmastervolumedlg.cpp \ + configsoundselelectdlg.cpp HEADERS += mainwindow.h \ cook.h \ @@ -128,7 +139,18 @@ HEADERS += mainwindow.h \ programmingwindow.h \ primewindow.h \ cookpanelbutton.h \ - cookhistory.h + cookhistory.h \ + keyboardwidget.h \ + configdatetimedlg.h \ + formatterspinbox.h \ + configlanguagedlg.h \ + configtemptypedlg.h \ + configbacklightdlg.h \ + dotprogressbarwidget.h \ + configtimeformatdlg.h \ + configresttimeformatdlg.h \ + configmastervolumedlg.h \ + configsoundselelectdlg.h FORMS += mainwindow.ui \ manualcookwindow.ui \ @@ -164,7 +186,17 @@ FORMS += mainwindow.ui \ basicsettingwindow.ui \ programmingwindow.ui \ primewindow.ui \ - cookpanelbutton.ui + cookpanelbutton.ui \ + keyboardwidget.ui \ + configdatetimedlg.ui \ + configlanguagedlg.ui \ + configtemptypedlg.ui \ + configbacklightdlg.ui \ + dotprogressbarwidget.ui \ + configtimeformatdlg.ui \ + configresttimeformatdlg.ui \ + configmastervolumedlg.ui \ + configsoundselelectdlg.ui RESOURCES += \ resources.qrc diff --git a/app/gui/oven_control/resources.qrc b/app/gui/oven_control/resources.qrc index 939543b..536ad04 100644 --- a/app/gui/oven_control/resources.qrc +++ b/app/gui/oven_control/resources.qrc @@ -433,5 +433,104 @@ images/config/service/realtime_sensor_bgnd.png images/config/service/adjustment_line.png images/config/service/basic_setting_bgnd.png + images/keyboard/051_password_bar.png + images/keyboard/051_password_bar_command.png + images/keyboard/051_password_bar_ov.png + images/keyboard/088_keyboard_a001.png + images/keyboard/088_keyboard_a001_ov.png + images/keyboard/088_keyboard_a002.png + images/keyboard/088_keyboard_a002_ov.png + images/keyboard/088_keyboard_a003.png + images/keyboard/088_keyboard_a003_ov.png + images/keyboard/088_keyboard_a004.png + images/keyboard/088_keyboard_a004_ov.png + images/keyboard/088_keyboard_a005.png + images/keyboard/088_keyboard_a005_ov.png + images/keyboard/088_keyboard_a006.png + images/keyboard/088_keyboard_a006_ov.png + images/keyboard/088_keyboard_a007.png + images/keyboard/088_keyboard_a007_ov.png + images/keyboard/088_keyboard_a008.png + images/keyboard/088_keyboard_a008_ov.png + images/keyboard/088_keyboard_a009.png + images/keyboard/088_keyboard_a009_ov.png + images/keyboard/088_keyboard_a010.png + images/keyboard/088_keyboard_a010_ov.png + images/keyboard/088_keyboard_a011.png + images/keyboard/088_keyboard_a011_ov.png + images/keyboard/088_keyboard_a012.png + images/keyboard/088_keyboard_a012_ov.png + images/keyboard/088_keyboard_a013.png + images/keyboard/088_keyboard_a013_ov.png + images/keyboard/088_keyboard_a014.png + images/keyboard/088_keyboard_a014_ov.png + images/keyboard/088_keyboard_a015.png + images/keyboard/088_keyboard_a015_ov.png + images/keyboard/088_keyboard_a016.png + images/keyboard/088_keyboard_a016_ov.png + images/keyboard/088_keyboard_a017.png + images/keyboard/088_keyboard_a017_ov.png + images/keyboard/088_keyboard_a018.png + images/keyboard/088_keyboard_a018_ov.png + images/keyboard/088_keyboard_a019.png + images/keyboard/088_keyboard_a019_ov.png + images/keyboard/088_keyboard_a020.png + images/keyboard/088_keyboard_a020_ov.png + images/keyboard/088_keyboard_a021.png + images/keyboard/088_keyboard_a021_ov.png + images/keyboard/088_keyboard_a022.png + images/keyboard/088_keyboard_a022_ov.png + images/keyboard/088_keyboard_a023.png + images/keyboard/088_keyboard_a023_ov.png + images/keyboard/088_keyboard_a024.png + images/keyboard/088_keyboard_a024_ov.png + images/keyboard/088_keyboard_a025.png + images/keyboard/088_keyboard_a025_ov.png + images/keyboard/088_keyboard_a026.png + images/keyboard/088_keyboard_a026_ov.png + images/keyboard/088_keyboard_a027.png + images/keyboard/088_keyboard_a027_ov.png + images/keyboard/088_keyboard_a028.png + images/keyboard/088_keyboard_a028_ov.png + images/keyboard/088_keyboard_a029.png + images/keyboard/088_keyboard_a029_ov.png + images/keyboard/088_keyboard_a030.png + images/keyboard/088_keyboard_a030_ov.png + images/keyboard/088_keyboard_a031.png + images/keyboard/088_keyboard_a031_ov.png + images/keyboard/088_keyboard_a032.png + images/keyboard/088_keyboard_a032_ov.png + images/keyboard/088_keyboard_a033.png + images/keyboard/088_keyboard_a033_ov.png + images/keyboard/088_keyboard_a034.png + images/keyboard/088_keyboard_a034_ov.png + images/keyboard/088_keyboard_a035.png + images/keyboard/088_keyboard_a035_ov.png + images/keyboard/088_keyboard_a036.png + images/keyboard/088_keyboard_a036_ov.png + images/keyboard/088_keyboard_a037.png + images/keyboard/088_keyboard_a037_ov.png + images/keyboard/088_keyboard_a038.png + images/keyboard/088_keyboard_a038_ov.png + images/keyboard/088_keyboard_a039.png + images/keyboard/088_keyboard_a039_ov.png + images/keyboard/088_keyboard_a040.png + images/keyboard/088_keyboard_a040_ov.png + images/keyboard/088_keyboard_a041.png + images/keyboard/088_keyboard_a041_ov.png + images/keyboard/088_keyboard_a042.png + images/keyboard/088_keyboard_a042_ov.png + images/keyboard/088_keyboard_all.png + images/keyboard/088_keyboard_all_ov.png + images/config/101_br_icon_01_ov.png + images/config/101_br_icon_01.png + images/config/101_br_icon_02_ov.png + images/config/101_br_icon_02.png + images/config/101_br_icon_03_ov.png + images/config/101_br_icon_03.png + images/config/101_br_icon_04_ov.png + images/config/101_br_icon_04.png + images/config/102_icon_play_ov.png + images/config/102_icon_play.png -- 2.1.4