diff --git a/app/gui/oven_control/coretempsettingpopup.cpp b/app/gui/oven_control/coretempsettingpopup.cpp new file mode 100644 index 0000000..8be1c88 --- /dev/null +++ b/app/gui/oven_control/coretempsettingpopup.cpp @@ -0,0 +1,106 @@ +#include "coretempsettingpopup.h" +#include "ui_coretempsettingpopup.h" + +#include "config.h" +#include "soundplayer.h" +#include "stringer.h" + +namespace { + +enum TemperatureFormat { Celsius, Fahrenheit }; +TemperatureFormat temperatureFormat() +{ + Define::config_item item = Config::getInstance()->getConfigValue(Define::config_temptype); + switch (item.d32) + { + case Define::temp_type_f: + return Fahrenheit; + case Define::temp_type_c: + default: + return Celsius; + } +} + +int toFahrenheit(int celsius) +{ + return celsius * 1.8 + 32; +} + +} + +CoreTempSettingPopup::CoreTempSettingPopup(QWidget *parent) : + QWidget(parent), + ui(new Ui::CoreTempSettingPopup) +{ + ui->setupUi(this); + + setAttribute(Qt::WA_DeleteOnClose); + + oven = Oven::getInstance(); + connect(oven, SIGNAL(changed(Oven*)), SLOT(updateView())); + + ui->coreTempSlider->setRange(oven->minInterTemp(), oven->maxInterTemp()); + ui->coreTempSlider->setValue(oven->interTemp()); + + connect(ui->coreTempSlider, SIGNAL(sliderMoved(int)), SLOT(updateView())); + connect(ui->coreTempSlider, SIGNAL(valueChanged(int)), SLOT(updateView())); + + switch (temperatureFormat()) + { + case Fahrenheit: + ui->curTempUnitLabel->setText("℉"); + ui->curCoreTempUnitLabel->setText("℉"); + break; + case Celsius: + ui->curTempUnitLabel->setText("℃"); + ui->curCoreTempUnitLabel->setText("℃"); + break; + default: + ui->curTempUnitLabel->hide(); + ui->curCoreTempUnitLabel->hide(); + } + + foreach (QPushButton *button, findChildren()) + connect(button, &QPushButton::pressed, SoundPlayer::playClick); + + updateView(); +} + +CoreTempSettingPopup::~CoreTempSettingPopup() +{ + delete ui; +} + +void CoreTempSettingPopup::updateView() +{ + int coreTemp = ui->coreTempSlider->sliderPosition(); + ui->coreTempLabel->setText(Stringer::temperature(coreTemp, Stringer::fontSize14)); + + ui->curHumidityLabel->setText(QString::number(oven->currentHumidity())); + ui->targetHumidityLabel->setText(QString::number(oven->humidity())); + + switch (temperatureFormat()) + { + case Fahrenheit: + ui->curTempLabel->setText(QString::number(toFahrenheit(oven->currentTemp()))); + ui->curCoreTempLabel->setText(QString::number(toFahrenheit(oven->currentInterTemp()))); + break; + case Celsius: + default: + ui->curTempLabel->setText(QString::number(oven->currentTemp())); + ui->curCoreTempLabel->setText(QString::number(oven->currentInterTemp())); + break; + } +} + +void CoreTempSettingPopup::on_cancelButton_clicked() +{ + close(); +} + +void CoreTempSettingPopup::on_applyButton_clicked() +{ + oven->setInterTemp(ui->coreTempSlider->value()); + oven->setInterTempEnabled(true); + close(); +} diff --git a/app/gui/oven_control/coretempsettingpopup.h b/app/gui/oven_control/coretempsettingpopup.h new file mode 100644 index 0000000..2d0673e --- /dev/null +++ b/app/gui/oven_control/coretempsettingpopup.h @@ -0,0 +1,30 @@ +#ifndef CORETEMPSETTINGPOPUP_H +#define CORETEMPSETTINGPOPUP_H + +#include + +#include "oven.h" + +namespace Ui { +class CoreTempSettingPopup; +} + +class CoreTempSettingPopup : public QWidget +{ + Q_OBJECT + +public: + explicit CoreTempSettingPopup(QWidget *parent = 0); + ~CoreTempSettingPopup(); + +private: + Ui::CoreTempSettingPopup *ui; + Oven *oven; + +private slots: + void updateView(); + void on_cancelButton_clicked(); + void on_applyButton_clicked(); +}; + +#endif // CORETEMPSETTINGPOPUP_H diff --git a/app/gui/oven_control/coretempsettingpopup.ui b/app/gui/oven_control/coretempsettingpopup.ui new file mode 100644 index 0000000..2fabf6f --- /dev/null +++ b/app/gui/oven_control/coretempsettingpopup.ui @@ -0,0 +1,1031 @@ + + + CoreTempSettingPopup + + + + 0 + 0 + 900 + 1600 + + + + Form + + + #background { +background-image: url(:/images/background/manual_core.png); +margin-top: -720px; +} + +QPushButton[style="icon"] { +background-image: url(:/images/slider_icon/background.png); +background-repeat: no-repeat; +background-position: center; +border: none; +} + +QPushButton[style="interTemp"] { +background-repeat: no-repeat; +background-position: center; +background-clip: border; +background-origin: border; + +border-top: 130px; +border-style: hidden; +color: white; +font-size: 30px; +} + +QSlider::groove { +background-image: url(:/images/slider/groove_ticks.png); +background-repeat: no-repeat; +} + +QSlider::sub-page { +background-repeat: no-repeat; +margin: 5px; +} + +QSlider::handle { +background-image: url(:/images/slider/handle_big.png); +background-repeat: no-repeat; +width: 23px; +height: 33px; +} + + + + + 0 + 720 + 900 + 730 + + + + + + + 225 + 759 + 1 + 121 + + + + :/images/line/manual_core_temp_vertical.png + + + + + true + + + + 225 + 770 + 225 + 100 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Malgun Gothic + 16 + 75 + true + + + + 0 + + + Qt::AlignCenter + + + + + + 450 + 1260 + 250 + 190 + + + + QPushButton { background-image: url(:/images/manual_button/ok.png); } +QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); } + + + 확인/적용하기 + + + interTemp + + + + + true + + + + 850 + 770 + 50 + 100 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Roboto + 11 + 50 + false + + + + + + + Qt::AlignCenter + + + + + + 18 + 920 + 863 + 1 + + + + :/images/line/manual_core_temp_horizontal.png + + + + + true + + + + 450 + 720 + 225 + 50 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Malgun Gothic + 11 + + + + 내부 온도 + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + true + + + + 625 + 770 + 50 + 100 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Roboto + 11 + 50 + false + + + + + + + Qt::AlignCenter + + + + + true + + + + 0 + 770 + 225 + 100 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Malgun Gothic + 16 + 75 + true + + + + 0 + + + Qt::AlignCenter + + + + + + 27 + 954 + 140 + 140 + + + + QPushButton { image: url(:/images/slider_icon/core_temp_enabled.png); } +QPushButton:pressed { image: url(:/images/slider_icon/core_temp_ov.png); } + + + icon + + + + + true + + + + 450 + 770 + 225 + 100 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Malgun Gothic + 16 + 75 + true + + + + 0 + + + Qt::AlignCenter + + + + + + 185 + 1012 + 666 + 33 + + + + QSlider::sub-page { background-image: url(:/images/slider/core.png); } + + + 6 + + + 0 + + + true + + + Qt::Horizontal + + + + + true + + + + 675 + 770 + 225 + 100 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Malgun Gothic + 16 + 75 + true + + + + 0 + + + Qt::AlignCenter + + + + + true + + + + 0 + 720 + 225 + 50 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Malgun Gothic + 11 + + + + 내부 습도 + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + 675 + 759 + 1 + 121 + + + + :/images/line/manual_core_temp_vertical.png + + + + + + 200 + 1260 + 250 + 190 + + + + QPushButton { background-image: url(:/images/manual_button/back.png); } +QPushButton:pressed { background-image: url(:/images/manual_button/back_ov.png); } + + + 이전으로 + + + interTemp + + + + + + 450 + 759 + 1 + 121 + + + + :/images/line/manual_core_temp_vertical.png + + + + + true + + + + 175 + 770 + 50 + 100 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Roboto + 11 + 50 + false + + + + % + + + Qt::AlignCenter + + + + + true + + + + 675 + 720 + 225 + 50 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Malgun Gothic + 11 + + + + 중심 온도계 온도 + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + true + + + + 400 + 770 + 50 + 100 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Roboto + 11 + 50 + false + + + + % + + + Qt::AlignCenter + + + + + true + + + + 690 + 1038 + 150 + 50 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Roboto + 16 + 75 + true + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + true + + + + 225 + 720 + 225 + 50 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Malgun Gothic + 11 + + + + 목표 습도 + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + + diff --git a/app/gui/oven_control/manualcookwindow.cpp b/app/gui/oven_control/manualcookwindow.cpp index 928924c..580e41a 100644 --- a/app/gui/oven_control/manualcookwindow.cpp +++ b/app/gui/oven_control/manualcookwindow.cpp @@ -13,32 +13,10 @@ #include "confirmpopup.h" #include "stringer.h" #include "config.h" +#include "coretempsettingpopup.h" #include -namespace { - -enum TemperatureFormat { Celsius, Fahrenheit }; -TemperatureFormat temperatureFormat() -{ - Define::config_item item = Config::getInstance()->getConfigValue(Define::config_temptype); - switch (item.d32) - { - case Define::temp_type_f: - return Fahrenheit; - case Define::temp_type_c: - default: - return Celsius; - } -} - -int toFahrenheit(int celsius) -{ - return celsius * 1.8 + 32; -} - -} - ManualCookWindow::ManualCookWindow(QWidget *parent, Define::Mode mode) : QMainWindow(parent), ui(new Ui::ManualCookWindow) @@ -47,8 +25,6 @@ ManualCookWindow::ManualCookWindow(QWidget *parent, Define::Mode mode) : ui->clockContainer->setParent(ui->upperStack); ui->closeDoorWidget->setParent(ui->upperStack); - ui->outerStack->setParent(ui->bodyStack); - ui->innerStack->setParent(ui->bodyStack); setAttribute(Qt::WA_DeleteOnClose); oven = Oven::getInstance(); @@ -65,11 +41,6 @@ ManualCookWindow::ManualCookWindow(QWidget *parent, Define::Mode mode) : connect(ui->tempSlider, SIGNAL(sliderMoved(int)), this, SLOT(updateLabels())); connect(ui->timeSlider, SIGNAL(sliderMoved(int)), this, SLOT(updateLabels())); connect(ui->interTempSlider, SIGNAL(sliderMoved(int)), this, SLOT(updateLabels())); - connect(ui->innerInterTempSlider, SIGNAL(sliderMoved(int)), this, SLOT(updateLabels())); - connect(ui->innerInterTempSlider, SIGNAL(valueChanged(int)), this, SLOT(updateLabels())); - - checkTimeTimer.setInterval(100); - connect(&checkTimeTimer, SIGNAL(timeout()), SLOT(checkTime())); startCookingTimer.setSingleShot(true); startCookingTimer.setInterval(3000); @@ -83,37 +54,16 @@ ManualCookWindow::ManualCookWindow(QWidget *parent, Define::Mode mode) : showCurrentTempTimer.setInterval(3000); connect(&showCurrentTempTimer, SIGNAL(timeout()), SLOT(showCurrentTemp())); - ui->bodyStack->setCurrentIndex(0); - - QTimer *setupAnimationTimer = new QTimer(this); - setupAnimationTimer->setSingleShot(true); - connect(setupAnimationTimer, SIGNAL(timeout()), SLOT(setupAnimation())); - oven->setDefault(mode); - setupAnimationTimer->start(0); - + checkTimeTimer.setInterval(100); + connect(&checkTimeTimer, SIGNAL(timeout()), SLOT(checkTime())); checkTimeTimer.start(); - switch (temperatureFormat()) - { - case Fahrenheit: - ui->steamLabel_12->setText("℉"); - ui->steamLabel_13->setText("℉"); - break; - case Celsius: - ui->steamLabel_12->setText("℃"); - ui->steamLabel_13->setText("℃"); - break; - default: - ui->steamLabel_12->hide(); - ui->steamLabel_13->hide(); - } - foreach (QPushButton *button, findChildren()) - { connect(button, &QPushButton::pressed, SoundPlayer::playClick); - } + + QTimer::singleShot(0, this, SLOT(setupAnimation())); } ManualCookWindow::ManualCookWindow(QWidget *parent, ManualCookSetting setting) @@ -230,25 +180,6 @@ void ManualCookWindow::updateLabels() } else ui->interTempLabel->setText(Stringer::unusedTemperature(Stringer::fontSize14)); - - int innerInterTemp = ui->innerInterTempSlider->sliderPosition(); - ui->innerInterTempLabel->setText(Stringer::temperature(innerInterTemp, Stringer::fontSize14)); - - ui->curHumidityLabel->setText(buf.sprintf("%d", oven->currentHumidity())); - ui->targetHumidityLabel->setText(buf.sprintf("%d", oven->humidity())); - - switch (temperatureFormat()) - { - case Fahrenheit: - ui->curTempLabel->setText(QString::number(toFahrenheit(oven->currentTemp()))); - ui->curInterTempLabel->setText(QString::number(toFahrenheit(oven->currentInterTemp()))); - break; - case Celsius: - default: - ui->curTempLabel->setText(QString::number(oven->currentTemp())); - ui->curInterTempLabel->setText(QString::number(oven->currentInterTemp())); - break; - } } void ManualCookWindow::onOvenUpdated(Oven *oven) @@ -310,11 +241,6 @@ QPushButton:pressed {\ ui->interTempSlider->setValue(oven->interTemp()); ui->interTempSlider->blockSignals(old); - old = ui->innerInterTempSlider->blockSignals(true); - ui->innerInterTempSlider->setRange(oven->minInterTemp(), oven->maxInterTemp()); - ui->innerInterTempSlider->setValue(oven->interTemp()); - ui->innerInterTempSlider->blockSignals(old); - if (oven->cooking()) ui->runStopButton->setStyleSheet( "border-image: url(:/images/manual_button/stop.png)"); @@ -377,7 +303,6 @@ void ManualCookWindow::setOvenDefault(Define::Mode mode) stop(); oven->setDefault(mode); - ui->bodyStack->setCurrentIndex(0); } void ManualCookWindow::start() @@ -462,20 +387,10 @@ void ManualCookWindow::on_interTempButton_clicked() if (oven->interTempEnabled()) oven->setInterTempEnabled(false); else - ui->bodyStack->setCurrentIndex(1); -} - -void ManualCookWindow::on_goOuterButton_clicked() -{ - ui->bodyStack->setCurrentIndex(0); -} - -void ManualCookWindow::on_applyButton_clicked() -{ - ui->bodyStack->setCurrentIndex(0); - - oven->setInterTemp(ui->innerInterTempSlider->value()); - oven->setInterTempEnabled(true); + { + CoreTempSettingPopup *p = new CoreTempSettingPopup(this); + p->show(); + } } void ManualCookWindow::on_runStopButton_clicked() diff --git a/app/gui/oven_control/manualcookwindow.h b/app/gui/oven_control/manualcookwindow.h index cdd3578..b8e7fa2 100644 --- a/app/gui/oven_control/manualcookwindow.h +++ b/app/gui/oven_control/manualcookwindow.h @@ -48,8 +48,6 @@ private slots: void on_tempButton_pressed(); void on_tempButton_released(); void on_interTempButton_clicked(); - void on_goOuterButton_clicked(); - void on_applyButton_clicked(); void on_runStopButton_clicked(); void on_fanButton_clicked(); diff --git a/app/gui/oven_control/manualcookwindow.ui b/app/gui/oven_control/manualcookwindow.ui index 105ccf1..4c2cc43 100644 --- a/app/gui/oven_control/manualcookwindow.ui +++ b/app/gui/oven_control/manualcookwindow.ui @@ -14,10 +14,8 @@ MainWindow - #centralwidget { background-image: url(:/images/background/manual_cook.png); } -#bottomBar { background-image: url(:/images/bottom_bar/background.png); } -#outerStack { background-image: url(:/images/background/manual.png); } -#innerStack { background-image: url(:/images/background/manual_core.png); } + #bottomBar { background-image: url(:/images/bottom_bar/background.png); } +#centralwidget { background-image: url(:/images/background/manual.png); } QPushButton[style="mode"] { background-repeat: no-repeat; @@ -46,18 +44,6 @@ background-position: center; border: none; } -QPushButton[style="interTemp"] { -background-repeat: no-repeat; -background-position: center; -background-clip: border; -background-origin: border; - -border-top: 130px; -border-style: hidden; -color: white; -font-size: 30px; -} - QSlider::groove { background-image: url(:/images/slider/groove_ticks.png); background-repeat: no-repeat; @@ -315,2024 +301,944 @@ QPushButton:pressed { border-image: url(:/images/bottom_bar/help_ov.png); } - + + + true + - 0 - 0 - 900 - 1600 + 780 + 740 + 91 + 51 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Malgun Gothic + 9 + + + + 증가 + + + Qt::AlignCenter + + + + + + 185 + 783 + 666 + 33 + + + + QSlider::sub-page { background-image: url(:/images/slider/humidity.png); } + + + 100 + + + false + + + Qt::Horizontal + + + + + true + + + + 160 + 740 + 91 + 51 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Malgun Gothic + 9 + + + + 감소 + + + Qt::AlignCenter + + + + + true + + + + 539 + 1110 + 301 + 51 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Roboto + 16 + 75 + true + + + + 0<span style="font-size:11pt;">초</span> + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 27 + 875 + 140 + 140 + + + + QPushButton { image: url(:/images/slider_icon/temp.png); } +QPushButton:pressed { image: url(:/images/slider_icon/temp_ov.png); } + + + icon + + + + + true + + + + 690 + 960 + 150 + 51 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Roboto + 16 + 75 + true + + + + 30<span style="font-size:11pt;">℃</span> + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + false + + + + 185 + 1233 + 666 + 33 + + + + QSlider::sub-page { background-image: url(:/images/slider/core.png); } +QSlider::sub-page:disabled { background: #00000000; } +QSlider::handle:disabled { background: #00000000; } + + + 6 + + + 0 + + + false + + + Qt::Horizontal + + + + + + 185 + 933 + 666 + 33 + + + + QSlider::sub-page { background-image: url(:/images/slider/temp.png); } + + + 6 + + + 0 + + + false + + + Qt::Horizontal + + + + + true + + + + 690 + 810 + 150 + 51 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Roboto + 16 + 75 + true + + + + 0% + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 185 + 1083 + 666 + 33 + + + + QSlider::sub-page { background-image: url(:/images/slider/time.png); } + + + 86400 + + + 60 + + + 3600 + + + 0 + + + false + + + Qt::Horizontal + + + + + + 337 + 1319 + 563 + 131 - - + + QPushButton { +background-repeat: no-repeat; +background-position: center; +border: none; +} + + + 0 + + + - 27 - 1025 - 140 - 140 + 448 + 0 + 112 + 131 - QPushButton { image: url(:/images/slider_icon/time.png); } -QPushButton:pressed { image: url(:/images/slider_icon/time_ov.png); } - - - - - - icon + QPushButton { background-image: url(:/images/manual_button/next.png); } +QPushButton:pressed { background-image: url(:/images/manual_button/next_ov.png); } - + - 185 - 933 - 666 - 33 + 336 + 36 + 2 + 58 - QSlider::sub-page { background-image: url(:/images/slider/temp.png); } - - - 6 - - - 0 - - - false - - - Qt::Horizontal + background-image: url(:/images/line/manual_button.png); - + - 30 - 1319 - 277 - 121 + 224 + 0 + 112 + 131 - QPushButton { border-image: url(:/images/manual_button/run.png); } - - - + QPushButton { background-image: url(:/images/manual_button/side_nozzle_close.png); } - - - false - + - 185 - 1233 - 666 - 33 + 224 + 36 + 2 + 58 - QSlider::sub-page { background-image: url(:/images/slider/core.png); } -QSlider::sub-page:disabled { background: #00000000; } -QSlider::handle:disabled { background: #00000000; } - - - 6 - - - 0 - - - false - - - Qt::Horizontal + background-image: url(:/images/line/manual_button.png); - + - 185 - 783 - 666 - 33 + 0 + 0 + 112 + 131 - QSlider::sub-page { background-image: url(:/images/slider/humidity.png); } - - - 100 - - - false - - - Qt::Horizontal + QPushButton { background-image: url(:/images/manual_button/preheat.png); } +QPushButton:pressed { background-image: url(:/images/manual_button/preheat_ov.png); } - + - 27 - 725 - 140 - 140 + 336 + 0 + 112 + 131 - QPushButton { image: url(:/images/slider_icon/humidity.png); } -QPushButton:pressed { image: url(:/images/slider_icon/humidity_ov.png); } - - - - - - icon + QPushButton { background-image: url(:/images/manual_button/repeat.png); } +QPushButton:pressed { background-image: url(:/images/manual_button/repeat_ov.png); } - + - 27 - 1175 - 140 - 140 + 112 + 36 + 2 + 58 - QPushButton { image: url(:/images/slider_icon/core_temp.png); } -QPushButton:pressed { image: url(:/images/slider_icon/core_temp_ov.png); } - - - - - - icon + background-image: url(:/images/line/manual_button.png); - + - 185 - 1083 - 666 - 33 + 112 + 0 + 112 + 131 - QSlider::sub-page { background-image: url(:/images/slider/time.png); } - - - 86400 - - - 60 - - - 3600 - - - 0 - - - false - - - Qt::Horizontal + QPushButton { background-image: url(:/images/manual_button/damper_close.png); } - + + + - 27 - 875 - 140 - 140 + 448 + 0 + 112 + 131 - QPushButton { image: url(:/images/slider_icon/temp.png); } -QPushButton:pressed { image: url(:/images/slider_icon/temp_ov.png); } - - - - - - icon + QPushButton { background-image: url(:/images/manual_button/next.png); } +QPushButton:pressed { background-image: url(:/images/manual_button/next_ov.png); } - + - 337 - 1319 - 563 - 131 + 112 + 36 + 2 + 58 - QPushButton { -background-repeat: no-repeat; -background-position: center; -border: none; -} - - - 0 + background-image: url(:/images/line/manual_button.png); - - - - - 448 - 0 - 112 - 131 - - - - QPushButton { background-image: url(:/images/manual_button/next.png); } -QPushButton:pressed { background-image: url(:/images/manual_button/next_ov.png); } - - - - - - - - - 336 - 36 - 2 - 58 - - - - background-image: url(:/images/line/manual_button.png); - - - - - - 224 - 0 - 112 - 131 - - - - QPushButton { background-image: url(:/images/manual_button/side_nozzle_close.png); } - - - - - - - - - 224 - 36 - 2 - 58 - - - - background-image: url(:/images/line/manual_button.png); - - - - - - 0 - 0 - 112 - 131 - - - - QPushButton { background-image: url(:/images/manual_button/preheat.png); } -QPushButton:pressed { background-image: url(:/images/manual_button/preheat_ov.png); } - - - - - - - - - 336 - 0 - 112 - 131 - - - - QPushButton { background-image: url(:/images/manual_button/repeat.png); } -QPushButton:pressed { background-image: url(:/images/manual_button/repeat_ov.png); } - - - - - - - - - 112 - 36 - 2 - 58 - - - - background-image: url(:/images/line/manual_button.png); - - - - - - 112 - 0 - 112 - 131 - - - - QPushButton { background-image: url(:/images/manual_button/damper_close.png); } - - - - - - - - - - - 448 - 0 - 112 - 131 - - - - QPushButton { background-image: url(:/images/manual_button/next.png); } -QPushButton:pressed { background-image: url(:/images/manual_button/next_ov.png); } - - - - - - - - - 112 - 36 - 2 - 58 - - - - background-image: url(:/images/line/manual_button.png); - - - - - - 224 - 0 - 112 - 131 - - - - QPushButton { background-image: url(:/images/manual_button/reserve.png); } -QPushButton:pressed { background-image: url(:/images/manual_button/reserve_ov.png); } - - - - - - - - - 224 - 36 - 2 - 58 - - - - background-image: url(:/images/line/manual_button.png); - - - - - - 0 - 0 - 112 - 131 - - - - QPushButton { background-image: url(:/images/manual_button/cooldown.png); } -QPushButton:pressed { background-image: url(:/images/manual_button/cooldown_ov.png); } - - - - - - true - - - - - - 336 - 0 - 112 - 131 - - - - QPushButton { background-image: url(:/images/manual_button/favorites.png); } -QPushButton:pressed { background-image: url(:/images/manual_button/favorites_ov.png); } - - - - - - - - - 336 - 36 - 2 - 58 - - - - background-image: url(:/images/line/manual_button.png); - - - - - - 112 - 0 - 112 - 131 - - - - QPushButton { background-image: url(:/images/manual_button/fan_4.png); } - - - - - - - - - true - + - 160 - 740 - 91 - 51 + 224 + 0 + 112 + 131 - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 123 - 123 - 123 - - - - - - - - - Malgun Gothic - 9 - - - - 감소 - - - Qt::AlignCenter + + QPushButton { background-image: url(:/images/manual_button/reserve.png); } +QPushButton:pressed { background-image: url(:/images/manual_button/reserve_ov.png); } - - - true - + - 780 - 740 - 91 - 51 + 224 + 36 + 2 + 58 - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 123 - 123 - 123 - - - - - - - - - Malgun Gothic - 9 - - - - 증가 - - - Qt::AlignCenter + + background-image: url(:/images/line/manual_button.png); - - - true - + - 160 - 890 - 91 - 51 + 0 + 0 + 112 + 131 - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 123 - 123 - 123 - - - - - - - - - Malgun Gothic - 9 - - - - 감소 - - - Qt::AlignCenter + + QPushButton { background-image: url(:/images/manual_button/cooldown.png); } +QPushButton:pressed { background-image: url(:/images/manual_button/cooldown_ov.png); } - - - + true - - - 780 - 890 - 91 - 51 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 123 - 123 - 123 - - - - - - - - - Malgun Gothic - 9 - - - - 증가 - - - Qt::AlignCenter - - - - true - + - 690 - 810 - 150 - 51 + 336 + 0 + 112 + 131 - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 123 - 123 - 123 - - - - - - - - - Roboto - 16 - 75 - true - - - - 0% - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + QPushButton { background-image: url(:/images/manual_button/favorites.png); } +QPushButton:pressed { background-image: url(:/images/manual_button/favorites_ov.png); } - - - true - + - 690 - 960 - 150 - 51 + 336 + 36 + 2 + 58 - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 123 - 123 - 123 - - - - - - - - - Roboto - 16 - 75 - true - - - - 30<span style="font-size:11pt;">℃</span> - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + background-image: url(:/images/line/manual_button.png); - - - true - + - 539 - 1110 - 301 - 51 + 112 + 0 + 112 + 131 - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 123 - 123 - 123 - - - - - - - - - Roboto - 16 - 75 - true - - - - 0<span style="font-size:11pt;">초</span> - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + QPushButton { background-image: url(:/images/manual_button/fan_4.png); } - - - true - - - - 690 - 1260 - 150 - 50 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 123 - 123 - 123 - - - - - - - - - Roboto - 16 - 75 - true - - - - <span style="font-size:11pt;">℃</span> - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - tempSlider - runStopButton - interTempSlider - humiditySlider - humidityButton - interTempButton - timeSlider - tempButton - buttonStack - timeButton - steamLabel_2 - steamLabel_3 - steamLabel_4 - steamLabel_5 - humidityLabel - tempLabel - timeLabel - interTempLabel - - - - - 185 - 1012 - 666 - 33 - - - - QSlider::sub-page { background-image: url(:/images/slider/core.png); } - - - 6 - - - 0 - - - true - - - Qt::Horizontal - - - - - false - - - - 27 - 954 - 140 - 140 - - - - QPushButton { image: url(:/images/slider_icon/core_temp_enabled.png); } + + + + true + + + + 160 + 890 + 91 + 51 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Malgun Gothic + 9 + + + + 감소 + + + Qt::AlignCenter + + + + + + 27 + 725 + 140 + 140 + + + + QPushButton { image: url(:/images/slider_icon/humidity.png); } +QPushButton:pressed { image: url(:/images/slider_icon/humidity_ov.png); } + + + icon + + + + + + 27 + 1175 + 140 + 140 + + + + QPushButton { image: url(:/images/slider_icon/core_temp.png); } QPushButton:pressed { image: url(:/images/slider_icon/core_temp_ov.png); } - - - - - - true - - - icon - - - - - - 200 - 1260 - 250 - 190 - - - - QPushButton { background-image: url(:/images/manual_button/back.png); } -QPushButton:pressed { background-image: url(:/images/manual_button/back_ov.png); } - - - 이전으로 - - - interTemp - - - - - - 450 - 1260 - 250 - 190 - - - - QPushButton { background-image: url(:/images/manual_button/ok.png); } -QPushButton:pressed { background-image: url(:/images/manual_button/ok_ov.png); } - - - 확인/적용하기 - - - interTemp - - - - - - 18 - 920 - 863 - 1 - - - - - - - :/images/line/manual_core_temp_horizontal.png - - - - - - 225 - 759 - 1 - 121 - - - - - - - :/images/line/manual_core_temp_vertical.png - - - - - - 450 - 759 - 1 - 121 - - - - - - - :/images/line/manual_core_temp_vertical.png - - - - - - 675 - 759 - 1 - 121 - - - - - - - :/images/line/manual_core_temp_vertical.png - - - - - true - - - - 690 - 1038 - 150 - 50 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 123 - 123 - 123 - - - - - - - - - Roboto - 16 - 75 - true - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - true - - - - 0 - 720 - 225 - 50 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 123 - 123 - 123 - - - - - - - - - Malgun Gothic - 11 - - - - 내부 습도 - - - Qt::AlignBottom|Qt::AlignHCenter - - - - - true - - - - 225 - 720 - 225 - 50 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 123 - 123 - 123 - - - - - - - - - Malgun Gothic - 11 - - - - 목표 습도 - - - Qt::AlignBottom|Qt::AlignHCenter - - - - - true - - - - 450 - 720 - 225 - 50 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 123 - 123 - 123 - - - - - - - - - Malgun Gothic - 11 - - - - 내부 온도 - - - Qt::AlignBottom|Qt::AlignHCenter - - - - - true - - - - 675 - 720 - 225 - 50 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 123 - 123 - 123 - - - - - - - - - Malgun Gothic - 11 - - - - 중심 온도계 온도 - - - Qt::AlignBottom|Qt::AlignHCenter - - - - - true - - - - 175 - 770 - 50 - 100 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 123 - 123 - 123 - - - - - - - - - Roboto - 11 - 50 - false - - - - % - - - Qt::AlignCenter - - - - - true - - - - 400 - 770 - 50 - 100 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 123 - 123 - 123 - - - - - - - - - Roboto - 11 - 50 - false - - - - % - - - Qt::AlignCenter - - - - - true - - - - 625 - 770 - 50 - 100 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 123 - 123 - 123 - - - - - - - - - Roboto - 11 - 50 - false - - - - - - - Qt::AlignCenter - - - - - true - - - - 850 - 770 - 50 - 100 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 123 - 123 - 123 - - - - - - - - - Roboto - 11 - 50 - false - - - - - - - Qt::AlignCenter - - - - - true - - - - 0 - 770 - 225 - 100 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 123 - 123 - 123 - - - - - - - - - Malgun Gothic - 16 - 75 - true - - - - 0 - - - Qt::AlignCenter - - - - - true - - - - 225 - 770 - 225 - 100 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 123 - 123 - 123 - - - - - - - - - Malgun Gothic - 16 - 75 - true - - - - 0 - - - Qt::AlignCenter - - - - - true - - - - 450 - 770 - 225 - 100 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 123 - 123 - 123 - - - - - - - - - Malgun Gothic - 16 - 75 - true - - - - 0 - - - Qt::AlignCenter - - - - - true - - - - 675 - 770 - 225 - 100 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 255 - 255 - 255 - - - - - - - - - 123 - 123 - 123 - - - - - - - - - Malgun Gothic - 16 - 75 - true - - - - 0 - - - Qt::AlignCenter - - - curHumidityLabel - targetHumidityLabel - curTempLabel - curInterTempLabel - innerInterTempSlider - innerInterTempButton - goOuterButton - applyButton - label - label_2 - label_3 - label_4 - innerInterTempLabel - steamLabel_6 - steamLabel_7 - steamLabel_8 - steamLabel_9 - steamLabel_10 - steamLabel_11 - steamLabel_12 - steamLabel_13 - + + + icon + + + + + + 27 + 1025 + 140 + 140 + + + + QPushButton { image: url(:/images/slider_icon/time.png); } +QPushButton:pressed { image: url(:/images/slider_icon/time_ov.png); } + + + icon + + + + + true + + + + 690 + 1260 + 150 + 50 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Roboto + 16 + 75 + true + + + + <span style="font-size:11pt;">℃</span> + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + true + + + + 780 + 890 + 91 + 51 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 255 + 255 + 255 + + + + + + + + + 123 + 123 + 123 + + + + + + + + + Malgun Gothic + 9 + + + + 증가 + + + Qt::AlignCenter + + + + + + 30 + 1319 + 277 + 121 + + + + QPushButton { border-image: url(:/images/manual_button/run.png); } + + + + - bodyStack - upperStack - combiButton - steamButton - dryheatButton - bottomBar diff --git a/app/gui/oven_control/oven_control.pro b/app/gui/oven_control/oven_control.pro index db6020c..30087d8 100644 --- a/app/gui/oven_control/oven_control.pro +++ b/app/gui/oven_control/oven_control.pro @@ -102,7 +102,8 @@ SOURCES += main.cpp\ servicepassinputdlg.cpp \ backlight.cpp \ dirtylevel.cpp \ - washwarnicon.cpp + washwarnicon.cpp \ + coretempsettingpopup.cpp HEADERS += mainwindow.h \ cook.h \ @@ -194,7 +195,8 @@ HEADERS += mainwindow.h \ servicepassinputdlg.h \ backlight.h \ dirtylevel.h \ - washwarnicon.h + washwarnicon.h \ + coretempsettingpopup.h FORMS += mainwindow.ui \ manualcookwindow.ui \ @@ -256,7 +258,8 @@ FORMS += mainwindow.ui \ modelsettingwindow.ui \ gasmodelsettingwindow.ui \ electricmodelsettingwindow.ui \ - servicepassinputdlg.ui + servicepassinputdlg.ui \ + coretempsettingpopup.ui RESOURCES += \ resources.qrc