Commit 6f96c947af6920f10c55257446a936e716aa636e
1 parent
d66d7f5b44
Exists in
master
and in
2 other branches
GUI 0.1.4
Showing
39 changed files
with
3113 additions
and
1831 deletions
Show diff stats
app/gui/oven_control/animatedimagebox.cpp
| @@ -22,13 +22,13 @@ void AnimatedImageBox::load(QString fileName) | @@ -22,13 +22,13 @@ void AnimatedImageBox::load(QString fileName) | ||
| 22 | setPixmap(pixmap); | 22 | setPixmap(pixmap); |
| 23 | 23 | ||
| 24 | images.append(pixmap); | 24 | images.append(pixmap); |
| 25 | - index = 0; | 25 | +// index = 0; |
| 26 | } | 26 | } |
| 27 | 27 | ||
| 28 | void AnimatedImageBox::clear() | 28 | void AnimatedImageBox::clear() |
| 29 | { | 29 | { |
| 30 | images.clear(); | 30 | images.clear(); |
| 31 | - index = 0; | 31 | +// index = 0; |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | void AnimatedImageBox::start(int msec) | 34 | void AnimatedImageBox::start(int msec) |
app/gui/oven_control/autocookconfigwindow.cpp
| @@ -0,0 +1,228 @@ | @@ -0,0 +1,228 @@ | ||
| 1 | +#include "autocookconfigwindow.h" | ||
| 2 | +#include "ui_autocookconfigwindow.h" | ||
| 3 | + | ||
| 4 | +AutoCookConfigWindow::AutoCookConfigWindow(QWidget *parent, Oven *oven, AbstractCook *cook) : | ||
| 5 | + QMainWindow(parent), | ||
| 6 | + ui(new Ui::AutoCookConfigWindow), | ||
| 7 | + oven(oven), | ||
| 8 | + cook(cook) | ||
| 9 | +{ | ||
| 10 | + ui->setupUi(this); | ||
| 11 | + | ||
| 12 | + ui->clockContainer->setParent(ui->upperStack); | ||
| 13 | + setAttribute(Qt::WA_DeleteOnClose); | ||
| 14 | + | ||
| 15 | + ui->cookTypeIcon->setPixmap(Cook::icon(cook->type())); | ||
| 16 | + ui->selectCookButton->setText(cook->name()); | ||
| 17 | + | ||
| 18 | + configWidgets.append( | ||
| 19 | + ConfigWidget { | ||
| 20 | + ui->configButton_1, | ||
| 21 | + ui->configBlock_1, | ||
| 22 | + ui->configMinLabel_1, | ||
| 23 | + ui->configMaxLabel_1, | ||
| 24 | + ui->configCurrentLabel_1, | ||
| 25 | + ui->configSlider_1 | ||
| 26 | + }); | ||
| 27 | + configWidgets.append( | ||
| 28 | + ConfigWidget { | ||
| 29 | + ui->configButton_2, | ||
| 30 | + ui->configBlock_2, | ||
| 31 | + ui->configMinLabel_2, | ||
| 32 | + ui->configMaxLabel_2, | ||
| 33 | + ui->configCurrentLabel_2, | ||
| 34 | + ui->configSlider_2 | ||
| 35 | + }); | ||
| 36 | + configWidgets.append( | ||
| 37 | + ConfigWidget { | ||
| 38 | + ui->configButton_3, | ||
| 39 | + ui->configBlock_3, | ||
| 40 | + ui->configMinLabel_3, | ||
| 41 | + ui->configMaxLabel_3, | ||
| 42 | + ui->configCurrentLabel_3, | ||
| 43 | + ui->configSlider_3 | ||
| 44 | + }); | ||
| 45 | + configWidgets.append( | ||
| 46 | + ConfigWidget { | ||
| 47 | + ui->configButton_4, | ||
| 48 | + ui->configBlock_4, | ||
| 49 | + ui->configMinLabel_4, | ||
| 50 | + ui->configMaxLabel_4, | ||
| 51 | + ui->configCurrentLabel_4, | ||
| 52 | + ui->configSlider_4 | ||
| 53 | + }); | ||
| 54 | + configWidgets.append( | ||
| 55 | + ConfigWidget { | ||
| 56 | + ui->configButton_5, | ||
| 57 | + ui->configBlock_5, | ||
| 58 | + ui->configMinLabel_5, | ||
| 59 | + ui->configMaxLabel_5, | ||
| 60 | + ui->configCurrentLabel_5, | ||
| 61 | + ui->configSlider_5 | ||
| 62 | + }); | ||
| 63 | + | ||
| 64 | + for (int idx = 0; idx < 5; idx++) | ||
| 65 | + { | ||
| 66 | + AbstractCookConfig *config = cook->configurations[idx]; | ||
| 67 | + if (config == NULL) | ||
| 68 | + { | ||
| 69 | + ConfigWidget cw = configWidgets.at(idx); | ||
| 70 | + cw.button->hide(); | ||
| 71 | + cw.block->hide(); | ||
| 72 | + cw.minimum->hide(); | ||
| 73 | + cw.maximum->hide(); | ||
| 74 | + cw.current->hide(); | ||
| 75 | + cw.slider->hide(); | ||
| 76 | + } | ||
| 77 | + else | ||
| 78 | + { | ||
| 79 | + ConfigWidget cw = configWidgets.at(idx); | ||
| 80 | + cw.button->setStyleSheet( | ||
| 81 | + "QPushButton { border-image: url(" | ||
| 82 | + + config->icon() | ||
| 83 | + + ") } QPushButton::pressed { border-image: url(" | ||
| 84 | + + config->overlayIcon() | ||
| 85 | + + ") }"); | ||
| 86 | + | ||
| 87 | + cw.minimum->setText(config->minLabel()); | ||
| 88 | + cw.maximum->setText(config->maxLabel()); | ||
| 89 | + cw.slider->blockSignals(true); | ||
| 90 | + cw.slider->setMinimum(1); | ||
| 91 | + cw.slider->setMaximum(config->count()); | ||
| 92 | + cw.slider->setValue(config->current()); | ||
| 93 | + cw.slider->blockSignals(false); | ||
| 94 | + | ||
| 95 | + switch (config->type()) | ||
| 96 | + { | ||
| 97 | + case Cook::Time: | ||
| 98 | + cw.slider->setProperty("sliderColor", "white"); | ||
| 99 | + break; | ||
| 100 | + case Cook::BurnDegree: | ||
| 101 | + cw.slider->setProperty("sliderColor", "yellow"); | ||
| 102 | + break; | ||
| 103 | + case Cook::Brightness: | ||
| 104 | + cw.slider->setProperty("sliderColor", "red"); | ||
| 105 | + break; | ||
| 106 | + default: | ||
| 107 | + cw.slider->setProperty("sliderColor", "blue"); | ||
| 108 | + break; | ||
| 109 | + } | ||
| 110 | + | ||
| 111 | + cw.slider->style()->unpolish(cw.slider); | ||
| 112 | + cw.slider->style()->polish(cw.slider); | ||
| 113 | + cw.slider->update(); | ||
| 114 | + | ||
| 115 | + connect(cw.slider, SIGNAL(valueChanged(int)), SLOT(updateConfig())); | ||
| 116 | + } | ||
| 117 | + } | ||
| 118 | + | ||
| 119 | + if (cook->interTempEnabled()) | ||
| 120 | + { | ||
| 121 | + interTempEnabled = true; | ||
| 122 | + | ||
| 123 | + ConfigWidget cw = configWidgets.at(3); | ||
| 124 | + cw.button->show(); | ||
| 125 | + cw.button->setStyleSheet( | ||
| 126 | + "QPushButton {" | ||
| 127 | + " border-image: url(:/images/images/auto/011_icon_04_ov_01.png)" | ||
| 128 | + "} QPushButton::pressed {" | ||
| 129 | + " border-image: url(:/images/images/auto/011_icon_04_ov.png)" | ||
| 130 | + "}"); | ||
| 131 | + | ||
| 132 | + cw.block->show(); | ||
| 133 | + cw.minimum->hide(); | ||
| 134 | + cw.maximum->hide(); | ||
| 135 | + cw.current->hide(); | ||
| 136 | + cw.slider->hide(); | ||
| 137 | + | ||
| 138 | + connect(cw.button, SIGNAL(clicked()), SLOT(changeInterTemp())); | ||
| 139 | + } | ||
| 140 | + | ||
| 141 | +} | ||
| 142 | + | ||
| 143 | +AutoCookConfigWindow::~AutoCookConfigWindow() | ||
| 144 | +{ | ||
| 145 | + delete ui; | ||
| 146 | +} | ||
| 147 | + | ||
| 148 | +void AutoCookConfigWindow::updateView() | ||
| 149 | +{ | ||
| 150 | + for (int idx = 0; idx < 5; idx++) | ||
| 151 | + { | ||
| 152 | + if (interTempEnabled && idx == 3) | ||
| 153 | + continue; | ||
| 154 | + | ||
| 155 | + AbstractCookConfig *config = cook->configurations[idx]; | ||
| 156 | + if (config == NULL) | ||
| 157 | + continue; | ||
| 158 | + | ||
| 159 | + ConfigWidget cw = configWidgets.at(idx); | ||
| 160 | + | ||
| 161 | + switch (config->type()) | ||
| 162 | + { | ||
| 163 | + case Cook::Time: | ||
| 164 | + { | ||
| 165 | + int time = cook->time(); | ||
| 166 | + if (time >= 3600) | ||
| 167 | + cw.current->setText(QString().sprintf( | ||
| 168 | + "%d" | ||
| 169 | + "<span style=\"font-size:11pt;\">시간</span>" | ||
| 170 | + " %02d" | ||
| 171 | + "<span style=\"font-size:11pt;\">분</span>", | ||
| 172 | + time / 3600, | ||
| 173 | + (time % 3600) / 60)); | ||
| 174 | + else if (time >= 60) | ||
| 175 | + cw.current->setText(QString().sprintf( | ||
| 176 | + "%d" | ||
| 177 | + "<span style=\"font-size:11pt;\">분</span>" | ||
| 178 | + " %02d" | ||
| 179 | + "<span style=\"font-size:11pt;\">초</span>", | ||
| 180 | + time / 60, | ||
| 181 | + time % 60)); | ||
| 182 | + else | ||
| 183 | + cw.current->setText(QString().sprintf( | ||
| 184 | + "%d" | ||
| 185 | + "<span style=\"font-size:11pt;\">초</span>", | ||
| 186 | + time)); | ||
| 187 | + break; | ||
| 188 | + } | ||
| 189 | + case Cook::BurnDegree: | ||
| 190 | + cw.slider->setProperty("sliderColor", "yellow"); | ||
| 191 | + break; | ||
| 192 | + case Cook::Brightness: | ||
| 193 | + cw.slider->setProperty("sliderColor", "red"); | ||
| 194 | + break; | ||
| 195 | + default: | ||
| 196 | + cw.slider->setProperty("sliderColor", "blue"); | ||
| 197 | + break; | ||
| 198 | + } | ||
| 199 | + } | ||
| 200 | + | ||
| 201 | + if (cook->interTempEnabled()) | ||
| 202 | + { | ||
| 203 | + ConfigWidget cw = configWidgets.at(3); | ||
| 204 | + cw.button->show(); | ||
| 205 | + cw.button->setStyleSheet( | ||
| 206 | + "QPushButton {" | ||
| 207 | + " border-image: url(:/images/images/auto/011_icon_04_ov_01.png)" | ||
| 208 | + "} QPushButton::pressed {" | ||
| 209 | + " border-image: url(:/images/images/auto/011_icon_04_ov.png)" | ||
| 210 | + "}"); | ||
| 211 | + | ||
| 212 | + cw.block->show(); | ||
| 213 | + cw.minimum->hide(); | ||
| 214 | + cw.maximum->hide(); | ||
| 215 | + cw.current->hide(); | ||
| 216 | + cw.slider->hide(); | ||
| 217 | + } | ||
| 218 | +} | ||
| 219 | + | ||
| 220 | +void AutoCookConfigWindow::updateConfig() | ||
| 221 | +{ | ||
| 222 | + | ||
| 223 | +} | ||
| 224 | + | ||
| 225 | +void AutoCookConfigWindow::changeInterTemp() | ||
| 226 | +{ | ||
| 227 | + cook->setInterTempEnabled(!cook->interTempEnabled()); | ||
| 228 | +} |
app/gui/oven_control/autocookconfigwindow.h
| @@ -0,0 +1,50 @@ | @@ -0,0 +1,50 @@ | ||
| 1 | +#ifndef AUTOCOOKCONFIGWINDOW_H | ||
| 2 | +#define AUTOCOOKCONFIGWINDOW_H | ||
| 3 | + | ||
| 4 | +#include <QMainWindow> | ||
| 5 | +#include <QTimer> | ||
| 6 | +#include <QPushButton> | ||
| 7 | +#include <QLabel> | ||
| 8 | +#include <QSlider> | ||
| 9 | + | ||
| 10 | +#include "oven.h" | ||
| 11 | +#include "cook.h" | ||
| 12 | + | ||
| 13 | +namespace Ui { | ||
| 14 | +class AutoCookConfigWindow; | ||
| 15 | +} | ||
| 16 | + | ||
| 17 | +class AutoCookConfigWindow : public QMainWindow | ||
| 18 | +{ | ||
| 19 | + Q_OBJECT | ||
| 20 | + | ||
| 21 | +public: | ||
| 22 | + explicit AutoCookConfigWindow(QWidget *parent = 0, Oven *oven = 0, AbstractCook *cook = 0); | ||
| 23 | + ~AutoCookConfigWindow(); | ||
| 24 | + | ||
| 25 | +private: | ||
| 26 | + Ui::AutoCookConfigWindow *ui; | ||
| 27 | + Oven *oven; | ||
| 28 | + AbstractCook *cook; | ||
| 29 | + | ||
| 30 | + QTimer cookStartTimer; | ||
| 31 | + bool interTempEnabled; | ||
| 32 | + | ||
| 33 | + struct ConfigWidget { | ||
| 34 | + QPushButton *button; | ||
| 35 | + QWidget *block; | ||
| 36 | + QLabel *minimum; | ||
| 37 | + QLabel *maximum; | ||
| 38 | + QLabel *current; | ||
| 39 | + QSlider *slider; | ||
| 40 | + }; | ||
| 41 | + | ||
| 42 | + QList<ConfigWidget> configWidgets; | ||
| 43 | + | ||
| 44 | +private slots: | ||
| 45 | + void updateView(); | ||
| 46 | + void updateConfig(); | ||
| 47 | + void changeInterTemp(); | ||
| 48 | +}; | ||
| 49 | + | ||
| 50 | +#endif // AUTOCOOKCONFIGWINDOW_H |
app/gui/oven_control/autocookconfigwindow.ui
| @@ -0,0 +1,1598 @@ | @@ -0,0 +1,1598 @@ | ||
| 1 | +<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | +<ui version="4.0"> | ||
| 3 | + <class>AutoCookConfigWindow</class> | ||
| 4 | + <widget class="QMainWindow" name="AutoCookConfigWindow"> | ||
| 5 | + <property name="geometry"> | ||
| 6 | + <rect> | ||
| 7 | + <x>0</x> | ||
| 8 | + <y>0</y> | ||
| 9 | + <width>900</width> | ||
| 10 | + <height>1600</height> | ||
| 11 | + </rect> | ||
| 12 | + </property> | ||
| 13 | + <property name="windowTitle"> | ||
| 14 | + <string>MainWindow</string> | ||
| 15 | + </property> | ||
| 16 | + <property name="styleSheet"> | ||
| 17 | + <string notr="true">#centralwidget { | ||
| 18 | +background-image: url(:/images/images/auto/ba_ground_set(full)_01); | ||
| 19 | +} | ||
| 20 | + | ||
| 21 | +QSlider::groove { | ||
| 22 | +background-image: url(:/images/images/auto/gau_04.png); | ||
| 23 | +background-repeat: no-repeat; | ||
| 24 | +background-position: center; | ||
| 25 | +} | ||
| 26 | + | ||
| 27 | +QSlider::sub-page { | ||
| 28 | +background-repeat: no-repeat; | ||
| 29 | +background-position: left center; | ||
| 30 | +margin: 0px 5px; | ||
| 31 | +} | ||
| 32 | + | ||
| 33 | +QSlider[sliderColor="red"]::sub-page { | ||
| 34 | +background-image: url(:/images/images/auto/gau_05.png); | ||
| 35 | +} | ||
| 36 | + | ||
| 37 | +QSlider[sliderColor="yellow"]::sub-page { | ||
| 38 | +background-image: url(:/images/images/auto/gau_06.png); | ||
| 39 | +} | ||
| 40 | + | ||
| 41 | +QSlider[sliderColor="white"]::sub-page { | ||
| 42 | +background-image: url(:/images/images/auto/gau_07.png); | ||
| 43 | +} | ||
| 44 | + | ||
| 45 | +QSlider[sliderColor="blue"]::sub-page { | ||
| 46 | +background-image: url(:/images/images/auto/gau_09.png); | ||
| 47 | +} | ||
| 48 | + | ||
| 49 | +QSlider[sliderColor="green"]::sub-page { | ||
| 50 | +background-image: url(:/images/images/auto/sys_icon_01_gau.png); | ||
| 51 | +} | ||
| 52 | + | ||
| 53 | +QSlider::handle { | ||
| 54 | +background-image: url(:/images/images/manual/graphe_BTN_Bigsize.png); | ||
| 55 | +background-repeat: no-repeat; | ||
| 56 | +background-position: center; | ||
| 57 | +width: 23px; | ||
| 58 | +height: 33px; | ||
| 59 | +}</string> | ||
| 60 | + </property> | ||
| 61 | + <widget class="QWidget" name="centralwidget"> | ||
| 62 | + <widget class="QStackedWidget" name="upperStack"> | ||
| 63 | + <property name="geometry"> | ||
| 64 | + <rect> | ||
| 65 | + <x>0</x> | ||
| 66 | + <y>0</y> | ||
| 67 | + <width>900</width> | ||
| 68 | + <height>426</height> | ||
| 69 | + </rect> | ||
| 70 | + </property> | ||
| 71 | + <widget class="QWidget" name="clockContainer"> | ||
| 72 | + <property name="styleSheet"> | ||
| 73 | + <string notr="true">QWidget#clockContainer { | ||
| 74 | +background-image: url(:/images/images/config/001_01_background_time.png); | ||
| 75 | +}</string> | ||
| 76 | + </property> | ||
| 77 | + <widget class="Clock" name="clock" native="true"> | ||
| 78 | + <property name="geometry"> | ||
| 79 | + <rect> | ||
| 80 | + <x>272</x> | ||
| 81 | + <y>36</y> | ||
| 82 | + <width>356</width> | ||
| 83 | + <height>355</height> | ||
| 84 | + </rect> | ||
| 85 | + </property> | ||
| 86 | + </widget> | ||
| 87 | + </widget> | ||
| 88 | + <widget class="QWidget" name="page_2"/> | ||
| 89 | + </widget> | ||
| 90 | + <widget class="QWidget" name="bottomBar" native="true"> | ||
| 91 | + <property name="geometry"> | ||
| 92 | + <rect> | ||
| 93 | + <x>0</x> | ||
| 94 | + <y>1450</y> | ||
| 95 | + <width>900</width> | ||
| 96 | + <height>150</height> | ||
| 97 | + </rect> | ||
| 98 | + </property> | ||
| 99 | + <property name="styleSheet"> | ||
| 100 | + <string notr="true">QWidget#bottomBar { | ||
| 101 | +background-image: url(:/images/images/config_service/001_01_background_under_down.png); | ||
| 102 | +}</string> | ||
| 103 | + </property> | ||
| 104 | + <widget class="QPushButton" name="backButton"> | ||
| 105 | + <property name="geometry"> | ||
| 106 | + <rect> | ||
| 107 | + <x>175</x> | ||
| 108 | + <y>26</y> | ||
| 109 | + <width>97</width> | ||
| 110 | + <height>97</height> | ||
| 111 | + </rect> | ||
| 112 | + </property> | ||
| 113 | + <property name="sizePolicy"> | ||
| 114 | + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> | ||
| 115 | + <horstretch>0</horstretch> | ||
| 116 | + <verstretch>0</verstretch> | ||
| 117 | + </sizepolicy> | ||
| 118 | + </property> | ||
| 119 | + <property name="styleSheet"> | ||
| 120 | + <string notr="true">QPushButton { border-image: url(:/images/images/auto/006_sys_icon_03.png); } | ||
| 121 | +QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_03_ov.png); }</string> | ||
| 122 | + </property> | ||
| 123 | + <property name="text"> | ||
| 124 | + <string/> | ||
| 125 | + </property> | ||
| 126 | + </widget> | ||
| 127 | + <widget class="QPushButton" name="backButton_3"> | ||
| 128 | + <property name="geometry"> | ||
| 129 | + <rect> | ||
| 130 | + <x>514</x> | ||
| 131 | + <y>26</y> | ||
| 132 | + <width>97</width> | ||
| 133 | + <height>97</height> | ||
| 134 | + </rect> | ||
| 135 | + </property> | ||
| 136 | + <property name="sizePolicy"> | ||
| 137 | + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> | ||
| 138 | + <horstretch>0</horstretch> | ||
| 139 | + <verstretch>0</verstretch> | ||
| 140 | + </sizepolicy> | ||
| 141 | + </property> | ||
| 142 | + <property name="styleSheet"> | ||
| 143 | + <string notr="true">QPushButton { border-image: url(:/images/images/auto/006_sys_icon_05.png); } | ||
| 144 | +QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_05_ov.png); }</string> | ||
| 145 | + </property> | ||
| 146 | + <property name="text"> | ||
| 147 | + <string/> | ||
| 148 | + </property> | ||
| 149 | + </widget> | ||
| 150 | + <widget class="QPushButton" name="backButton_2"> | ||
| 151 | + <property name="geometry"> | ||
| 152 | + <rect> | ||
| 153 | + <x>288</x> | ||
| 154 | + <y>26</y> | ||
| 155 | + <width>97</width> | ||
| 156 | + <height>97</height> | ||
| 157 | + </rect> | ||
| 158 | + </property> | ||
| 159 | + <property name="sizePolicy"> | ||
| 160 | + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> | ||
| 161 | + <horstretch>0</horstretch> | ||
| 162 | + <verstretch>0</verstretch> | ||
| 163 | + </sizepolicy> | ||
| 164 | + </property> | ||
| 165 | + <property name="styleSheet"> | ||
| 166 | + <string notr="true">QPushButton { border-image: url(:/images/images/auto/006_sys_icon_01.png); } | ||
| 167 | +QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_01_ov.png); }</string> | ||
| 168 | + </property> | ||
| 169 | + <property name="text"> | ||
| 170 | + <string/> | ||
| 171 | + </property> | ||
| 172 | + </widget> | ||
| 173 | + <widget class="QPushButton" name="backButton_4"> | ||
| 174 | + <property name="geometry"> | ||
| 175 | + <rect> | ||
| 176 | + <x>627</x> | ||
| 177 | + <y>26</y> | ||
| 178 | + <width>97</width> | ||
| 179 | + <height>97</height> | ||
| 180 | + </rect> | ||
| 181 | + </property> | ||
| 182 | + <property name="sizePolicy"> | ||
| 183 | + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> | ||
| 184 | + <horstretch>0</horstretch> | ||
| 185 | + <verstretch>0</verstretch> | ||
| 186 | + </sizepolicy> | ||
| 187 | + </property> | ||
| 188 | + <property name="styleSheet"> | ||
| 189 | + <string notr="true">QPushButton { border-image: url(:/images/images/auto/006_sys_icon_02.png); } | ||
| 190 | +QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_02_ov.png); }</string> | ||
| 191 | + </property> | ||
| 192 | + <property name="text"> | ||
| 193 | + <string/> | ||
| 194 | + </property> | ||
| 195 | + </widget> | ||
| 196 | + <widget class="QPushButton" name="backButton_5"> | ||
| 197 | + <property name="geometry"> | ||
| 198 | + <rect> | ||
| 199 | + <x>401</x> | ||
| 200 | + <y>26</y> | ||
| 201 | + <width>97</width> | ||
| 202 | + <height>97</height> | ||
| 203 | + </rect> | ||
| 204 | + </property> | ||
| 205 | + <property name="sizePolicy"> | ||
| 206 | + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> | ||
| 207 | + <horstretch>0</horstretch> | ||
| 208 | + <verstretch>0</verstretch> | ||
| 209 | + </sizepolicy> | ||
| 210 | + </property> | ||
| 211 | + <property name="styleSheet"> | ||
| 212 | + <string notr="true"/> | ||
| 213 | + </property> | ||
| 214 | + <property name="text"> | ||
| 215 | + <string/> | ||
| 216 | + </property> | ||
| 217 | + </widget> | ||
| 218 | + </widget> | ||
| 219 | + <widget class="QLabel" name="configMaxLabel_5"> | ||
| 220 | + <property name="enabled"> | ||
| 221 | + <bool>true</bool> | ||
| 222 | + </property> | ||
| 223 | + <property name="geometry"> | ||
| 224 | + <rect> | ||
| 225 | + <x>700</x> | ||
| 226 | + <y>1300</y> | ||
| 227 | + <width>151</width> | ||
| 228 | + <height>51</height> | ||
| 229 | + </rect> | ||
| 230 | + </property> | ||
| 231 | + <property name="palette"> | ||
| 232 | + <palette> | ||
| 233 | + <active> | ||
| 234 | + <colorrole role="WindowText"> | ||
| 235 | + <brush brushstyle="SolidPattern"> | ||
| 236 | + <color alpha="255"> | ||
| 237 | + <red>255</red> | ||
| 238 | + <green>255</green> | ||
| 239 | + <blue>255</blue> | ||
| 240 | + </color> | ||
| 241 | + </brush> | ||
| 242 | + </colorrole> | ||
| 243 | + </active> | ||
| 244 | + <inactive> | ||
| 245 | + <colorrole role="WindowText"> | ||
| 246 | + <brush brushstyle="SolidPattern"> | ||
| 247 | + <color alpha="255"> | ||
| 248 | + <red>255</red> | ||
| 249 | + <green>255</green> | ||
| 250 | + <blue>255</blue> | ||
| 251 | + </color> | ||
| 252 | + </brush> | ||
| 253 | + </colorrole> | ||
| 254 | + </inactive> | ||
| 255 | + <disabled> | ||
| 256 | + <colorrole role="WindowText"> | ||
| 257 | + <brush brushstyle="SolidPattern"> | ||
| 258 | + <color alpha="255"> | ||
| 259 | + <red>123</red> | ||
| 260 | + <green>123</green> | ||
| 261 | + <blue>123</blue> | ||
| 262 | + </color> | ||
| 263 | + </brush> | ||
| 264 | + </colorrole> | ||
| 265 | + </disabled> | ||
| 266 | + </palette> | ||
| 267 | + </property> | ||
| 268 | + <property name="font"> | ||
| 269 | + <font> | ||
| 270 | + <family>Malgun Gothic</family> | ||
| 271 | + <pointsize>9</pointsize> | ||
| 272 | + </font> | ||
| 273 | + </property> | ||
| 274 | + <property name="text"> | ||
| 275 | + <string>증가</string> | ||
| 276 | + </property> | ||
| 277 | + <property name="alignment"> | ||
| 278 | + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | ||
| 279 | + </property> | ||
| 280 | + </widget> | ||
| 281 | + <widget class="QLabel" name="configMinLabel_5"> | ||
| 282 | + <property name="enabled"> | ||
| 283 | + <bool>true</bool> | ||
| 284 | + </property> | ||
| 285 | + <property name="geometry"> | ||
| 286 | + <rect> | ||
| 287 | + <x>185</x> | ||
| 288 | + <y>1300</y> | ||
| 289 | + <width>151</width> | ||
| 290 | + <height>51</height> | ||
| 291 | + </rect> | ||
| 292 | + </property> | ||
| 293 | + <property name="palette"> | ||
| 294 | + <palette> | ||
| 295 | + <active> | ||
| 296 | + <colorrole role="WindowText"> | ||
| 297 | + <brush brushstyle="SolidPattern"> | ||
| 298 | + <color alpha="255"> | ||
| 299 | + <red>255</red> | ||
| 300 | + <green>255</green> | ||
| 301 | + <blue>255</blue> | ||
| 302 | + </color> | ||
| 303 | + </brush> | ||
| 304 | + </colorrole> | ||
| 305 | + </active> | ||
| 306 | + <inactive> | ||
| 307 | + <colorrole role="WindowText"> | ||
| 308 | + <brush brushstyle="SolidPattern"> | ||
| 309 | + <color alpha="255"> | ||
| 310 | + <red>255</red> | ||
| 311 | + <green>255</green> | ||
| 312 | + <blue>255</blue> | ||
| 313 | + </color> | ||
| 314 | + </brush> | ||
| 315 | + </colorrole> | ||
| 316 | + </inactive> | ||
| 317 | + <disabled> | ||
| 318 | + <colorrole role="WindowText"> | ||
| 319 | + <brush brushstyle="SolidPattern"> | ||
| 320 | + <color alpha="255"> | ||
| 321 | + <red>123</red> | ||
| 322 | + <green>123</green> | ||
| 323 | + <blue>123</blue> | ||
| 324 | + </color> | ||
| 325 | + </brush> | ||
| 326 | + </colorrole> | ||
| 327 | + </disabled> | ||
| 328 | + </palette> | ||
| 329 | + </property> | ||
| 330 | + <property name="font"> | ||
| 331 | + <font> | ||
| 332 | + <family>Malgun Gothic</family> | ||
| 333 | + <pointsize>9</pointsize> | ||
| 334 | + </font> | ||
| 335 | + </property> | ||
| 336 | + <property name="text"> | ||
| 337 | + <string>감소</string> | ||
| 338 | + </property> | ||
| 339 | + <property name="alignment"> | ||
| 340 | + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> | ||
| 341 | + </property> | ||
| 342 | + </widget> | ||
| 343 | + <widget class="QPushButton" name="selectCookButton"> | ||
| 344 | + <property name="geometry"> | ||
| 345 | + <rect> | ||
| 346 | + <x>420</x> | ||
| 347 | + <y>480</y> | ||
| 348 | + <width>288</width> | ||
| 349 | + <height>70</height> | ||
| 350 | + </rect> | ||
| 351 | + </property> | ||
| 352 | + <property name="font"> | ||
| 353 | + <font> | ||
| 354 | + <family>Roboto</family> | ||
| 355 | + <pointsize>10</pointsize> | ||
| 356 | + <weight>75</weight> | ||
| 357 | + <bold>true</bold> | ||
| 358 | + </font> | ||
| 359 | + </property> | ||
| 360 | + <property name="styleSheet"> | ||
| 361 | + <string notr="true">QPushButton { | ||
| 362 | +border-image: url(:/images/images/auto/btn_01.png); | ||
| 363 | +} | ||
| 364 | +QPushButton::pressed { | ||
| 365 | +border-image: url(:/images/images/auto/btn_01_ov.png); | ||
| 366 | +}</string> | ||
| 367 | + </property> | ||
| 368 | + <property name="text"> | ||
| 369 | + <string/> | ||
| 370 | + </property> | ||
| 371 | + </widget> | ||
| 372 | + <widget class="QLabel" name="configCurrentLabel_2"> | ||
| 373 | + <property name="enabled"> | ||
| 374 | + <bool>true</bool> | ||
| 375 | + </property> | ||
| 376 | + <property name="geometry"> | ||
| 377 | + <rect> | ||
| 378 | + <x>199</x> | ||
| 379 | + <y>850</y> | ||
| 380 | + <width>641</width> | ||
| 381 | + <height>51</height> | ||
| 382 | + </rect> | ||
| 383 | + </property> | ||
| 384 | + <property name="palette"> | ||
| 385 | + <palette> | ||
| 386 | + <active> | ||
| 387 | + <colorrole role="WindowText"> | ||
| 388 | + <brush brushstyle="SolidPattern"> | ||
| 389 | + <color alpha="255"> | ||
| 390 | + <red>255</red> | ||
| 391 | + <green>255</green> | ||
| 392 | + <blue>255</blue> | ||
| 393 | + </color> | ||
| 394 | + </brush> | ||
| 395 | + </colorrole> | ||
| 396 | + </active> | ||
| 397 | + <inactive> | ||
| 398 | + <colorrole role="WindowText"> | ||
| 399 | + <brush brushstyle="SolidPattern"> | ||
| 400 | + <color alpha="255"> | ||
| 401 | + <red>255</red> | ||
| 402 | + <green>255</green> | ||
| 403 | + <blue>255</blue> | ||
| 404 | + </color> | ||
| 405 | + </brush> | ||
| 406 | + </colorrole> | ||
| 407 | + </inactive> | ||
| 408 | + <disabled> | ||
| 409 | + <colorrole role="WindowText"> | ||
| 410 | + <brush brushstyle="SolidPattern"> | ||
| 411 | + <color alpha="255"> | ||
| 412 | + <red>123</red> | ||
| 413 | + <green>123</green> | ||
| 414 | + <blue>123</blue> | ||
| 415 | + </color> | ||
| 416 | + </brush> | ||
| 417 | + </colorrole> | ||
| 418 | + </disabled> | ||
| 419 | + </palette> | ||
| 420 | + </property> | ||
| 421 | + <property name="font"> | ||
| 422 | + <font> | ||
| 423 | + <family>Roboto</family> | ||
| 424 | + <pointsize>16</pointsize> | ||
| 425 | + <weight>75</weight> | ||
| 426 | + <bold>true</bold> | ||
| 427 | + </font> | ||
| 428 | + </property> | ||
| 429 | + <property name="text"> | ||
| 430 | + <string>스팀</string> | ||
| 431 | + </property> | ||
| 432 | + <property name="alignment"> | ||
| 433 | + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | ||
| 434 | + </property> | ||
| 435 | + </widget> | ||
| 436 | + <widget class="QLabel" name="configMaxLabel_3"> | ||
| 437 | + <property name="enabled"> | ||
| 438 | + <bool>true</bool> | ||
| 439 | + </property> | ||
| 440 | + <property name="geometry"> | ||
| 441 | + <rect> | ||
| 442 | + <x>700</x> | ||
| 443 | + <y>950</y> | ||
| 444 | + <width>151</width> | ||
| 445 | + <height>51</height> | ||
| 446 | + </rect> | ||
| 447 | + </property> | ||
| 448 | + <property name="palette"> | ||
| 449 | + <palette> | ||
| 450 | + <active> | ||
| 451 | + <colorrole role="WindowText"> | ||
| 452 | + <brush brushstyle="SolidPattern"> | ||
| 453 | + <color alpha="255"> | ||
| 454 | + <red>255</red> | ||
| 455 | + <green>255</green> | ||
| 456 | + <blue>255</blue> | ||
| 457 | + </color> | ||
| 458 | + </brush> | ||
| 459 | + </colorrole> | ||
| 460 | + </active> | ||
| 461 | + <inactive> | ||
| 462 | + <colorrole role="WindowText"> | ||
| 463 | + <brush brushstyle="SolidPattern"> | ||
| 464 | + <color alpha="255"> | ||
| 465 | + <red>255</red> | ||
| 466 | + <green>255</green> | ||
| 467 | + <blue>255</blue> | ||
| 468 | + </color> | ||
| 469 | + </brush> | ||
| 470 | + </colorrole> | ||
| 471 | + </inactive> | ||
| 472 | + <disabled> | ||
| 473 | + <colorrole role="WindowText"> | ||
| 474 | + <brush brushstyle="SolidPattern"> | ||
| 475 | + <color alpha="255"> | ||
| 476 | + <red>123</red> | ||
| 477 | + <green>123</green> | ||
| 478 | + <blue>123</blue> | ||
| 479 | + </color> | ||
| 480 | + </brush> | ||
| 481 | + </colorrole> | ||
| 482 | + </disabled> | ||
| 483 | + </palette> | ||
| 484 | + </property> | ||
| 485 | + <property name="font"> | ||
| 486 | + <font> | ||
| 487 | + <family>Malgun Gothic</family> | ||
| 488 | + <pointsize>9</pointsize> | ||
| 489 | + </font> | ||
| 490 | + </property> | ||
| 491 | + <property name="text"> | ||
| 492 | + <string>증가</string> | ||
| 493 | + </property> | ||
| 494 | + <property name="alignment"> | ||
| 495 | + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | ||
| 496 | + </property> | ||
| 497 | + </widget> | ||
| 498 | + <widget class="QLabel" name="configMinLabel_3"> | ||
| 499 | + <property name="enabled"> | ||
| 500 | + <bool>true</bool> | ||
| 501 | + </property> | ||
| 502 | + <property name="geometry"> | ||
| 503 | + <rect> | ||
| 504 | + <x>185</x> | ||
| 505 | + <y>950</y> | ||
| 506 | + <width>151</width> | ||
| 507 | + <height>51</height> | ||
| 508 | + </rect> | ||
| 509 | + </property> | ||
| 510 | + <property name="palette"> | ||
| 511 | + <palette> | ||
| 512 | + <active> | ||
| 513 | + <colorrole role="WindowText"> | ||
| 514 | + <brush brushstyle="SolidPattern"> | ||
| 515 | + <color alpha="255"> | ||
| 516 | + <red>255</red> | ||
| 517 | + <green>255</green> | ||
| 518 | + <blue>255</blue> | ||
| 519 | + </color> | ||
| 520 | + </brush> | ||
| 521 | + </colorrole> | ||
| 522 | + </active> | ||
| 523 | + <inactive> | ||
| 524 | + <colorrole role="WindowText"> | ||
| 525 | + <brush brushstyle="SolidPattern"> | ||
| 526 | + <color alpha="255"> | ||
| 527 | + <red>255</red> | ||
| 528 | + <green>255</green> | ||
| 529 | + <blue>255</blue> | ||
| 530 | + </color> | ||
| 531 | + </brush> | ||
| 532 | + </colorrole> | ||
| 533 | + </inactive> | ||
| 534 | + <disabled> | ||
| 535 | + <colorrole role="WindowText"> | ||
| 536 | + <brush brushstyle="SolidPattern"> | ||
| 537 | + <color alpha="255"> | ||
| 538 | + <red>123</red> | ||
| 539 | + <green>123</green> | ||
| 540 | + <blue>123</blue> | ||
| 541 | + </color> | ||
| 542 | + </brush> | ||
| 543 | + </colorrole> | ||
| 544 | + </disabled> | ||
| 545 | + </palette> | ||
| 546 | + </property> | ||
| 547 | + <property name="font"> | ||
| 548 | + <font> | ||
| 549 | + <family>Malgun Gothic</family> | ||
| 550 | + <pointsize>9</pointsize> | ||
| 551 | + </font> | ||
| 552 | + </property> | ||
| 553 | + <property name="text"> | ||
| 554 | + <string>감소</string> | ||
| 555 | + </property> | ||
| 556 | + <property name="alignment"> | ||
| 557 | + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> | ||
| 558 | + </property> | ||
| 559 | + </widget> | ||
| 560 | + <widget class="QLabel" name="configMinLabel_4"> | ||
| 561 | + <property name="enabled"> | ||
| 562 | + <bool>true</bool> | ||
| 563 | + </property> | ||
| 564 | + <property name="geometry"> | ||
| 565 | + <rect> | ||
| 566 | + <x>185</x> | ||
| 567 | + <y>1130</y> | ||
| 568 | + <width>151</width> | ||
| 569 | + <height>51</height> | ||
| 570 | + </rect> | ||
| 571 | + </property> | ||
| 572 | + <property name="palette"> | ||
| 573 | + <palette> | ||
| 574 | + <active> | ||
| 575 | + <colorrole role="WindowText"> | ||
| 576 | + <brush brushstyle="SolidPattern"> | ||
| 577 | + <color alpha="255"> | ||
| 578 | + <red>255</red> | ||
| 579 | + <green>255</green> | ||
| 580 | + <blue>255</blue> | ||
| 581 | + </color> | ||
| 582 | + </brush> | ||
| 583 | + </colorrole> | ||
| 584 | + </active> | ||
| 585 | + <inactive> | ||
| 586 | + <colorrole role="WindowText"> | ||
| 587 | + <brush brushstyle="SolidPattern"> | ||
| 588 | + <color alpha="255"> | ||
| 589 | + <red>255</red> | ||
| 590 | + <green>255</green> | ||
| 591 | + <blue>255</blue> | ||
| 592 | + </color> | ||
| 593 | + </brush> | ||
| 594 | + </colorrole> | ||
| 595 | + </inactive> | ||
| 596 | + <disabled> | ||
| 597 | + <colorrole role="WindowText"> | ||
| 598 | + <brush brushstyle="SolidPattern"> | ||
| 599 | + <color alpha="255"> | ||
| 600 | + <red>123</red> | ||
| 601 | + <green>123</green> | ||
| 602 | + <blue>123</blue> | ||
| 603 | + </color> | ||
| 604 | + </brush> | ||
| 605 | + </colorrole> | ||
| 606 | + </disabled> | ||
| 607 | + </palette> | ||
| 608 | + </property> | ||
| 609 | + <property name="font"> | ||
| 610 | + <font> | ||
| 611 | + <family>Malgun Gothic</family> | ||
| 612 | + <pointsize>9</pointsize> | ||
| 613 | + </font> | ||
| 614 | + </property> | ||
| 615 | + <property name="text"> | ||
| 616 | + <string>감소</string> | ||
| 617 | + </property> | ||
| 618 | + <property name="alignment"> | ||
| 619 | + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> | ||
| 620 | + </property> | ||
| 621 | + </widget> | ||
| 622 | + <widget class="QPushButton" name="pushButton_4"> | ||
| 623 | + <property name="geometry"> | ||
| 624 | + <rect> | ||
| 625 | + <x>720</x> | ||
| 626 | + <y>480</y> | ||
| 627 | + <width>152</width> | ||
| 628 | + <height>70</height> | ||
| 629 | + </rect> | ||
| 630 | + </property> | ||
| 631 | + <property name="styleSheet"> | ||
| 632 | + <string notr="true">QPushButton { | ||
| 633 | +border-image: url(:/images/images/auto/btn_02.png); | ||
| 634 | +} | ||
| 635 | +QPushButton::pressed { | ||
| 636 | +border-image: url(:/images/images/auto/btn_02_ov.png); | ||
| 637 | +}</string> | ||
| 638 | + </property> | ||
| 639 | + <property name="text"> | ||
| 640 | + <string/> | ||
| 641 | + </property> | ||
| 642 | + <property name="icon"> | ||
| 643 | + <iconset resource="resources.qrc"> | ||
| 644 | + <normaloff>:/images/images/auto/btn_icon_01.png</normaloff>:/images/images/auto/btn_icon_01.png</iconset> | ||
| 645 | + </property> | ||
| 646 | + <property name="iconSize"> | ||
| 647 | + <size> | ||
| 648 | + <width>40</width> | ||
| 649 | + <height>51</height> | ||
| 650 | + </size> | ||
| 651 | + </property> | ||
| 652 | + </widget> | ||
| 653 | + <widget class="QPushButton" name="configButton_1"> | ||
| 654 | + <property name="geometry"> | ||
| 655 | + <rect> | ||
| 656 | + <x>49</x> | ||
| 657 | + <y>627</y> | ||
| 658 | + <width>96</width> | ||
| 659 | + <height>96</height> | ||
| 660 | + </rect> | ||
| 661 | + </property> | ||
| 662 | + <property name="styleSheet"> | ||
| 663 | + <string notr="true">QPushButton { | ||
| 664 | + border-image: url(:/images/images/manual/011_icon_01.png); | ||
| 665 | +} | ||
| 666 | + | ||
| 667 | +QPushButton:pressed { | ||
| 668 | + border-image: url(:/images/images/manual/011_icon_01_ov.png); | ||
| 669 | +} | ||
| 670 | +</string> | ||
| 671 | + </property> | ||
| 672 | + <property name="text"> | ||
| 673 | + <string/> | ||
| 674 | + </property> | ||
| 675 | + </widget> | ||
| 676 | + <widget class="QSlider" name="configSlider_4"> | ||
| 677 | + <property name="geometry"> | ||
| 678 | + <rect> | ||
| 679 | + <x>185</x> | ||
| 680 | + <y>1173</y> | ||
| 681 | + <width>666</width> | ||
| 682 | + <height>33</height> | ||
| 683 | + </rect> | ||
| 684 | + </property> | ||
| 685 | + <property name="maximum"> | ||
| 686 | + <number>100</number> | ||
| 687 | + </property> | ||
| 688 | + <property name="pageStep"> | ||
| 689 | + <number>1</number> | ||
| 690 | + </property> | ||
| 691 | + <property name="value"> | ||
| 692 | + <number>0</number> | ||
| 693 | + </property> | ||
| 694 | + <property name="tracking"> | ||
| 695 | + <bool>true</bool> | ||
| 696 | + </property> | ||
| 697 | + <property name="orientation"> | ||
| 698 | + <enum>Qt::Horizontal</enum> | ||
| 699 | + </property> | ||
| 700 | + </widget> | ||
| 701 | + <widget class="QPushButton" name="configButton_4"> | ||
| 702 | + <property name="geometry"> | ||
| 703 | + <rect> | ||
| 704 | + <x>49</x> | ||
| 705 | + <y>1137</y> | ||
| 706 | + <width>96</width> | ||
| 707 | + <height>96</height> | ||
| 708 | + </rect> | ||
| 709 | + </property> | ||
| 710 | + <property name="styleSheet"> | ||
| 711 | + <string notr="true">QPushButton { | ||
| 712 | + border-image: url(:/images/images/manual/011_icon_01.png); | ||
| 713 | +} | ||
| 714 | + | ||
| 715 | +QPushButton:pressed { | ||
| 716 | + border-image: url(:/images/images/manual/011_icon_01_ov.png); | ||
| 717 | +} | ||
| 718 | +</string> | ||
| 719 | + </property> | ||
| 720 | + <property name="text"> | ||
| 721 | + <string/> | ||
| 722 | + </property> | ||
| 723 | + </widget> | ||
| 724 | + <widget class="QLabel" name="configMaxLabel_2"> | ||
| 725 | + <property name="enabled"> | ||
| 726 | + <bool>true</bool> | ||
| 727 | + </property> | ||
| 728 | + <property name="geometry"> | ||
| 729 | + <rect> | ||
| 730 | + <x>700</x> | ||
| 731 | + <y>780</y> | ||
| 732 | + <width>151</width> | ||
| 733 | + <height>51</height> | ||
| 734 | + </rect> | ||
| 735 | + </property> | ||
| 736 | + <property name="palette"> | ||
| 737 | + <palette> | ||
| 738 | + <active> | ||
| 739 | + <colorrole role="WindowText"> | ||
| 740 | + <brush brushstyle="SolidPattern"> | ||
| 741 | + <color alpha="255"> | ||
| 742 | + <red>255</red> | ||
| 743 | + <green>255</green> | ||
| 744 | + <blue>255</blue> | ||
| 745 | + </color> | ||
| 746 | + </brush> | ||
| 747 | + </colorrole> | ||
| 748 | + </active> | ||
| 749 | + <inactive> | ||
| 750 | + <colorrole role="WindowText"> | ||
| 751 | + <brush brushstyle="SolidPattern"> | ||
| 752 | + <color alpha="255"> | ||
| 753 | + <red>255</red> | ||
| 754 | + <green>255</green> | ||
| 755 | + <blue>255</blue> | ||
| 756 | + </color> | ||
| 757 | + </brush> | ||
| 758 | + </colorrole> | ||
| 759 | + </inactive> | ||
| 760 | + <disabled> | ||
| 761 | + <colorrole role="WindowText"> | ||
| 762 | + <brush brushstyle="SolidPattern"> | ||
| 763 | + <color alpha="255"> | ||
| 764 | + <red>123</red> | ||
| 765 | + <green>123</green> | ||
| 766 | + <blue>123</blue> | ||
| 767 | + </color> | ||
| 768 | + </brush> | ||
| 769 | + </colorrole> | ||
| 770 | + </disabled> | ||
| 771 | + </palette> | ||
| 772 | + </property> | ||
| 773 | + <property name="font"> | ||
| 774 | + <font> | ||
| 775 | + <family>Malgun Gothic</family> | ||
| 776 | + <pointsize>9</pointsize> | ||
| 777 | + </font> | ||
| 778 | + </property> | ||
| 779 | + <property name="text"> | ||
| 780 | + <string>증가</string> | ||
| 781 | + </property> | ||
| 782 | + <property name="alignment"> | ||
| 783 | + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | ||
| 784 | + </property> | ||
| 785 | + </widget> | ||
| 786 | + <widget class="QWidget" name="configBlock_3" native="true"> | ||
| 787 | + <property name="geometry"> | ||
| 788 | + <rect> | ||
| 789 | + <x>27</x> | ||
| 790 | + <y>935</y> | ||
| 791 | + <width>140</width> | ||
| 792 | + <height>140</height> | ||
| 793 | + </rect> | ||
| 794 | + </property> | ||
| 795 | + <property name="styleSheet"> | ||
| 796 | + <string notr="true">background-image: url(:/images/images/manual/010_icon_block.png);</string> | ||
| 797 | + </property> | ||
| 798 | + </widget> | ||
| 799 | + <widget class="QWidget" name="configBlock_4" native="true"> | ||
| 800 | + <property name="geometry"> | ||
| 801 | + <rect> | ||
| 802 | + <x>27</x> | ||
| 803 | + <y>1115</y> | ||
| 804 | + <width>140</width> | ||
| 805 | + <height>140</height> | ||
| 806 | + </rect> | ||
| 807 | + </property> | ||
| 808 | + <property name="styleSheet"> | ||
| 809 | + <string notr="true">background-image: url(:/images/images/manual/010_icon_block.png);</string> | ||
| 810 | + </property> | ||
| 811 | + </widget> | ||
| 812 | + <widget class="QSlider" name="configSlider_2"> | ||
| 813 | + <property name="geometry"> | ||
| 814 | + <rect> | ||
| 815 | + <x>185</x> | ||
| 816 | + <y>823</y> | ||
| 817 | + <width>666</width> | ||
| 818 | + <height>33</height> | ||
| 819 | + </rect> | ||
| 820 | + </property> | ||
| 821 | + <property name="maximum"> | ||
| 822 | + <number>100</number> | ||
| 823 | + </property> | ||
| 824 | + <property name="pageStep"> | ||
| 825 | + <number>1</number> | ||
| 826 | + </property> | ||
| 827 | + <property name="value"> | ||
| 828 | + <number>10</number> | ||
| 829 | + </property> | ||
| 830 | + <property name="tracking"> | ||
| 831 | + <bool>true</bool> | ||
| 832 | + </property> | ||
| 833 | + <property name="orientation"> | ||
| 834 | + <enum>Qt::Horizontal</enum> | ||
| 835 | + </property> | ||
| 836 | + </widget> | ||
| 837 | + <widget class="QLabel" name="configCurrentLabel_5"> | ||
| 838 | + <property name="enabled"> | ||
| 839 | + <bool>true</bool> | ||
| 840 | + </property> | ||
| 841 | + <property name="geometry"> | ||
| 842 | + <rect> | ||
| 843 | + <x>189</x> | ||
| 844 | + <y>1370</y> | ||
| 845 | + <width>651</width> | ||
| 846 | + <height>51</height> | ||
| 847 | + </rect> | ||
| 848 | + </property> | ||
| 849 | + <property name="palette"> | ||
| 850 | + <palette> | ||
| 851 | + <active> | ||
| 852 | + <colorrole role="WindowText"> | ||
| 853 | + <brush brushstyle="SolidPattern"> | ||
| 854 | + <color alpha="255"> | ||
| 855 | + <red>255</red> | ||
| 856 | + <green>255</green> | ||
| 857 | + <blue>255</blue> | ||
| 858 | + </color> | ||
| 859 | + </brush> | ||
| 860 | + </colorrole> | ||
| 861 | + </active> | ||
| 862 | + <inactive> | ||
| 863 | + <colorrole role="WindowText"> | ||
| 864 | + <brush brushstyle="SolidPattern"> | ||
| 865 | + <color alpha="255"> | ||
| 866 | + <red>255</red> | ||
| 867 | + <green>255</green> | ||
| 868 | + <blue>255</blue> | ||
| 869 | + </color> | ||
| 870 | + </brush> | ||
| 871 | + </colorrole> | ||
| 872 | + </inactive> | ||
| 873 | + <disabled> | ||
| 874 | + <colorrole role="WindowText"> | ||
| 875 | + <brush brushstyle="SolidPattern"> | ||
| 876 | + <color alpha="255"> | ||
| 877 | + <red>123</red> | ||
| 878 | + <green>123</green> | ||
| 879 | + <blue>123</blue> | ||
| 880 | + </color> | ||
| 881 | + </brush> | ||
| 882 | + </colorrole> | ||
| 883 | + </disabled> | ||
| 884 | + </palette> | ||
| 885 | + </property> | ||
| 886 | + <property name="font"> | ||
| 887 | + <font> | ||
| 888 | + <family>Roboto</family> | ||
| 889 | + <pointsize>16</pointsize> | ||
| 890 | + <weight>75</weight> | ||
| 891 | + <bold>true</bold> | ||
| 892 | + </font> | ||
| 893 | + </property> | ||
| 894 | + <property name="text"> | ||
| 895 | + <string>스팀</string> | ||
| 896 | + </property> | ||
| 897 | + <property name="alignment"> | ||
| 898 | + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | ||
| 899 | + </property> | ||
| 900 | + </widget> | ||
| 901 | + <widget class="QLabel" name="configMinLabel_2"> | ||
| 902 | + <property name="enabled"> | ||
| 903 | + <bool>true</bool> | ||
| 904 | + </property> | ||
| 905 | + <property name="geometry"> | ||
| 906 | + <rect> | ||
| 907 | + <x>185</x> | ||
| 908 | + <y>780</y> | ||
| 909 | + <width>151</width> | ||
| 910 | + <height>51</height> | ||
| 911 | + </rect> | ||
| 912 | + </property> | ||
| 913 | + <property name="palette"> | ||
| 914 | + <palette> | ||
| 915 | + <active> | ||
| 916 | + <colorrole role="WindowText"> | ||
| 917 | + <brush brushstyle="SolidPattern"> | ||
| 918 | + <color alpha="255"> | ||
| 919 | + <red>255</red> | ||
| 920 | + <green>255</green> | ||
| 921 | + <blue>255</blue> | ||
| 922 | + </color> | ||
| 923 | + </brush> | ||
| 924 | + </colorrole> | ||
| 925 | + </active> | ||
| 926 | + <inactive> | ||
| 927 | + <colorrole role="WindowText"> | ||
| 928 | + <brush brushstyle="SolidPattern"> | ||
| 929 | + <color alpha="255"> | ||
| 930 | + <red>255</red> | ||
| 931 | + <green>255</green> | ||
| 932 | + <blue>255</blue> | ||
| 933 | + </color> | ||
| 934 | + </brush> | ||
| 935 | + </colorrole> | ||
| 936 | + </inactive> | ||
| 937 | + <disabled> | ||
| 938 | + <colorrole role="WindowText"> | ||
| 939 | + <brush brushstyle="SolidPattern"> | ||
| 940 | + <color alpha="255"> | ||
| 941 | + <red>123</red> | ||
| 942 | + <green>123</green> | ||
| 943 | + <blue>123</blue> | ||
| 944 | + </color> | ||
| 945 | + </brush> | ||
| 946 | + </colorrole> | ||
| 947 | + </disabled> | ||
| 948 | + </palette> | ||
| 949 | + </property> | ||
| 950 | + <property name="font"> | ||
| 951 | + <font> | ||
| 952 | + <family>Malgun Gothic</family> | ||
| 953 | + <pointsize>9</pointsize> | ||
| 954 | + </font> | ||
| 955 | + </property> | ||
| 956 | + <property name="text"> | ||
| 957 | + <string>감소</string> | ||
| 958 | + </property> | ||
| 959 | + <property name="alignment"> | ||
| 960 | + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> | ||
| 961 | + </property> | ||
| 962 | + </widget> | ||
| 963 | + <widget class="QSlider" name="configSlider_3"> | ||
| 964 | + <property name="geometry"> | ||
| 965 | + <rect> | ||
| 966 | + <x>185</x> | ||
| 967 | + <y>993</y> | ||
| 968 | + <width>666</width> | ||
| 969 | + <height>33</height> | ||
| 970 | + </rect> | ||
| 971 | + </property> | ||
| 972 | + <property name="maximum"> | ||
| 973 | + <number>100</number> | ||
| 974 | + </property> | ||
| 975 | + <property name="pageStep"> | ||
| 976 | + <number>1</number> | ||
| 977 | + </property> | ||
| 978 | + <property name="value"> | ||
| 979 | + <number>0</number> | ||
| 980 | + </property> | ||
| 981 | + <property name="tracking"> | ||
| 982 | + <bool>true</bool> | ||
| 983 | + </property> | ||
| 984 | + <property name="orientation"> | ||
| 985 | + <enum>Qt::Horizontal</enum> | ||
| 986 | + </property> | ||
| 987 | + </widget> | ||
| 988 | + <widget class="QLabel" name="configMaxLabel_4"> | ||
| 989 | + <property name="enabled"> | ||
| 990 | + <bool>true</bool> | ||
| 991 | + </property> | ||
| 992 | + <property name="geometry"> | ||
| 993 | + <rect> | ||
| 994 | + <x>700</x> | ||
| 995 | + <y>1130</y> | ||
| 996 | + <width>151</width> | ||
| 997 | + <height>51</height> | ||
| 998 | + </rect> | ||
| 999 | + </property> | ||
| 1000 | + <property name="palette"> | ||
| 1001 | + <palette> | ||
| 1002 | + <active> | ||
| 1003 | + <colorrole role="WindowText"> | ||
| 1004 | + <brush brushstyle="SolidPattern"> | ||
| 1005 | + <color alpha="255"> | ||
| 1006 | + <red>255</red> | ||
| 1007 | + <green>255</green> | ||
| 1008 | + <blue>255</blue> | ||
| 1009 | + </color> | ||
| 1010 | + </brush> | ||
| 1011 | + </colorrole> | ||
| 1012 | + </active> | ||
| 1013 | + <inactive> | ||
| 1014 | + <colorrole role="WindowText"> | ||
| 1015 | + <brush brushstyle="SolidPattern"> | ||
| 1016 | + <color alpha="255"> | ||
| 1017 | + <red>255</red> | ||
| 1018 | + <green>255</green> | ||
| 1019 | + <blue>255</blue> | ||
| 1020 | + </color> | ||
| 1021 | + </brush> | ||
| 1022 | + </colorrole> | ||
| 1023 | + </inactive> | ||
| 1024 | + <disabled> | ||
| 1025 | + <colorrole role="WindowText"> | ||
| 1026 | + <brush brushstyle="SolidPattern"> | ||
| 1027 | + <color alpha="255"> | ||
| 1028 | + <red>123</red> | ||
| 1029 | + <green>123</green> | ||
| 1030 | + <blue>123</blue> | ||
| 1031 | + </color> | ||
| 1032 | + </brush> | ||
| 1033 | + </colorrole> | ||
| 1034 | + </disabled> | ||
| 1035 | + </palette> | ||
| 1036 | + </property> | ||
| 1037 | + <property name="font"> | ||
| 1038 | + <font> | ||
| 1039 | + <family>Malgun Gothic</family> | ||
| 1040 | + <pointsize>9</pointsize> | ||
| 1041 | + </font> | ||
| 1042 | + </property> | ||
| 1043 | + <property name="text"> | ||
| 1044 | + <string>증가</string> | ||
| 1045 | + </property> | ||
| 1046 | + <property name="alignment"> | ||
| 1047 | + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | ||
| 1048 | + </property> | ||
| 1049 | + </widget> | ||
| 1050 | + <widget class="QPushButton" name="configButton_2"> | ||
| 1051 | + <property name="geometry"> | ||
| 1052 | + <rect> | ||
| 1053 | + <x>49</x> | ||
| 1054 | + <y>787</y> | ||
| 1055 | + <width>96</width> | ||
| 1056 | + <height>96</height> | ||
| 1057 | + </rect> | ||
| 1058 | + </property> | ||
| 1059 | + <property name="styleSheet"> | ||
| 1060 | + <string notr="true">QPushButton { | ||
| 1061 | + border-image: url(:/images/images/manual/011_icon_01.png); | ||
| 1062 | +} | ||
| 1063 | + | ||
| 1064 | +QPushButton:pressed { | ||
| 1065 | + border-image: url(:/images/images/manual/011_icon_01_ov.png); | ||
| 1066 | +} | ||
| 1067 | +</string> | ||
| 1068 | + </property> | ||
| 1069 | + <property name="text"> | ||
| 1070 | + <string/> | ||
| 1071 | + </property> | ||
| 1072 | + </widget> | ||
| 1073 | + <widget class="QLabel" name="configMinLabel_1"> | ||
| 1074 | + <property name="enabled"> | ||
| 1075 | + <bool>true</bool> | ||
| 1076 | + </property> | ||
| 1077 | + <property name="geometry"> | ||
| 1078 | + <rect> | ||
| 1079 | + <x>185</x> | ||
| 1080 | + <y>620</y> | ||
| 1081 | + <width>151</width> | ||
| 1082 | + <height>51</height> | ||
| 1083 | + </rect> | ||
| 1084 | + </property> | ||
| 1085 | + <property name="palette"> | ||
| 1086 | + <palette> | ||
| 1087 | + <active> | ||
| 1088 | + <colorrole role="WindowText"> | ||
| 1089 | + <brush brushstyle="SolidPattern"> | ||
| 1090 | + <color alpha="255"> | ||
| 1091 | + <red>255</red> | ||
| 1092 | + <green>255</green> | ||
| 1093 | + <blue>255</blue> | ||
| 1094 | + </color> | ||
| 1095 | + </brush> | ||
| 1096 | + </colorrole> | ||
| 1097 | + </active> | ||
| 1098 | + <inactive> | ||
| 1099 | + <colorrole role="WindowText"> | ||
| 1100 | + <brush brushstyle="SolidPattern"> | ||
| 1101 | + <color alpha="255"> | ||
| 1102 | + <red>255</red> | ||
| 1103 | + <green>255</green> | ||
| 1104 | + <blue>255</blue> | ||
| 1105 | + </color> | ||
| 1106 | + </brush> | ||
| 1107 | + </colorrole> | ||
| 1108 | + </inactive> | ||
| 1109 | + <disabled> | ||
| 1110 | + <colorrole role="WindowText"> | ||
| 1111 | + <brush brushstyle="SolidPattern"> | ||
| 1112 | + <color alpha="255"> | ||
| 1113 | + <red>123</red> | ||
| 1114 | + <green>123</green> | ||
| 1115 | + <blue>123</blue> | ||
| 1116 | + </color> | ||
| 1117 | + </brush> | ||
| 1118 | + </colorrole> | ||
| 1119 | + </disabled> | ||
| 1120 | + </palette> | ||
| 1121 | + </property> | ||
| 1122 | + <property name="font"> | ||
| 1123 | + <font> | ||
| 1124 | + <family>Malgun Gothic</family> | ||
| 1125 | + <pointsize>9</pointsize> | ||
| 1126 | + </font> | ||
| 1127 | + </property> | ||
| 1128 | + <property name="text"> | ||
| 1129 | + <string>감소</string> | ||
| 1130 | + </property> | ||
| 1131 | + <property name="alignment"> | ||
| 1132 | + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> | ||
| 1133 | + </property> | ||
| 1134 | + </widget> | ||
| 1135 | + <widget class="QWidget" name="configBlock_2" native="true"> | ||
| 1136 | + <property name="geometry"> | ||
| 1137 | + <rect> | ||
| 1138 | + <x>27</x> | ||
| 1139 | + <y>765</y> | ||
| 1140 | + <width>140</width> | ||
| 1141 | + <height>140</height> | ||
| 1142 | + </rect> | ||
| 1143 | + </property> | ||
| 1144 | + <property name="styleSheet"> | ||
| 1145 | + <string notr="true">background-image: url(:/images/images/manual/010_icon_block.png);</string> | ||
| 1146 | + </property> | ||
| 1147 | + </widget> | ||
| 1148 | + <widget class="QLabel" name="configMaxLabel_1"> | ||
| 1149 | + <property name="enabled"> | ||
| 1150 | + <bool>true</bool> | ||
| 1151 | + </property> | ||
| 1152 | + <property name="geometry"> | ||
| 1153 | + <rect> | ||
| 1154 | + <x>700</x> | ||
| 1155 | + <y>620</y> | ||
| 1156 | + <width>151</width> | ||
| 1157 | + <height>51</height> | ||
| 1158 | + </rect> | ||
| 1159 | + </property> | ||
| 1160 | + <property name="palette"> | ||
| 1161 | + <palette> | ||
| 1162 | + <active> | ||
| 1163 | + <colorrole role="WindowText"> | ||
| 1164 | + <brush brushstyle="SolidPattern"> | ||
| 1165 | + <color alpha="255"> | ||
| 1166 | + <red>255</red> | ||
| 1167 | + <green>255</green> | ||
| 1168 | + <blue>255</blue> | ||
| 1169 | + </color> | ||
| 1170 | + </brush> | ||
| 1171 | + </colorrole> | ||
| 1172 | + </active> | ||
| 1173 | + <inactive> | ||
| 1174 | + <colorrole role="WindowText"> | ||
| 1175 | + <brush brushstyle="SolidPattern"> | ||
| 1176 | + <color alpha="255"> | ||
| 1177 | + <red>255</red> | ||
| 1178 | + <green>255</green> | ||
| 1179 | + <blue>255</blue> | ||
| 1180 | + </color> | ||
| 1181 | + </brush> | ||
| 1182 | + </colorrole> | ||
| 1183 | + </inactive> | ||
| 1184 | + <disabled> | ||
| 1185 | + <colorrole role="WindowText"> | ||
| 1186 | + <brush brushstyle="SolidPattern"> | ||
| 1187 | + <color alpha="255"> | ||
| 1188 | + <red>123</red> | ||
| 1189 | + <green>123</green> | ||
| 1190 | + <blue>123</blue> | ||
| 1191 | + </color> | ||
| 1192 | + </brush> | ||
| 1193 | + </colorrole> | ||
| 1194 | + </disabled> | ||
| 1195 | + </palette> | ||
| 1196 | + </property> | ||
| 1197 | + <property name="font"> | ||
| 1198 | + <font> | ||
| 1199 | + <family>Malgun Gothic</family> | ||
| 1200 | + <pointsize>9</pointsize> | ||
| 1201 | + </font> | ||
| 1202 | + </property> | ||
| 1203 | + <property name="text"> | ||
| 1204 | + <string>증가</string> | ||
| 1205 | + </property> | ||
| 1206 | + <property name="alignment"> | ||
| 1207 | + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | ||
| 1208 | + </property> | ||
| 1209 | + </widget> | ||
| 1210 | + <widget class="QLabel" name="configCurrentLabel_3"> | ||
| 1211 | + <property name="enabled"> | ||
| 1212 | + <bool>true</bool> | ||
| 1213 | + </property> | ||
| 1214 | + <property name="geometry"> | ||
| 1215 | + <rect> | ||
| 1216 | + <x>199</x> | ||
| 1217 | + <y>1020</y> | ||
| 1218 | + <width>641</width> | ||
| 1219 | + <height>51</height> | ||
| 1220 | + </rect> | ||
| 1221 | + </property> | ||
| 1222 | + <property name="palette"> | ||
| 1223 | + <palette> | ||
| 1224 | + <active> | ||
| 1225 | + <colorrole role="WindowText"> | ||
| 1226 | + <brush brushstyle="SolidPattern"> | ||
| 1227 | + <color alpha="255"> | ||
| 1228 | + <red>255</red> | ||
| 1229 | + <green>255</green> | ||
| 1230 | + <blue>255</blue> | ||
| 1231 | + </color> | ||
| 1232 | + </brush> | ||
| 1233 | + </colorrole> | ||
| 1234 | + </active> | ||
| 1235 | + <inactive> | ||
| 1236 | + <colorrole role="WindowText"> | ||
| 1237 | + <brush brushstyle="SolidPattern"> | ||
| 1238 | + <color alpha="255"> | ||
| 1239 | + <red>255</red> | ||
| 1240 | + <green>255</green> | ||
| 1241 | + <blue>255</blue> | ||
| 1242 | + </color> | ||
| 1243 | + </brush> | ||
| 1244 | + </colorrole> | ||
| 1245 | + </inactive> | ||
| 1246 | + <disabled> | ||
| 1247 | + <colorrole role="WindowText"> | ||
| 1248 | + <brush brushstyle="SolidPattern"> | ||
| 1249 | + <color alpha="255"> | ||
| 1250 | + <red>123</red> | ||
| 1251 | + <green>123</green> | ||
| 1252 | + <blue>123</blue> | ||
| 1253 | + </color> | ||
| 1254 | + </brush> | ||
| 1255 | + </colorrole> | ||
| 1256 | + </disabled> | ||
| 1257 | + </palette> | ||
| 1258 | + </property> | ||
| 1259 | + <property name="font"> | ||
| 1260 | + <font> | ||
| 1261 | + <family>Roboto</family> | ||
| 1262 | + <pointsize>16</pointsize> | ||
| 1263 | + <weight>75</weight> | ||
| 1264 | + <bold>true</bold> | ||
| 1265 | + </font> | ||
| 1266 | + </property> | ||
| 1267 | + <property name="text"> | ||
| 1268 | + <string>스팀</string> | ||
| 1269 | + </property> | ||
| 1270 | + <property name="alignment"> | ||
| 1271 | + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | ||
| 1272 | + </property> | ||
| 1273 | + </widget> | ||
| 1274 | + <widget class="QLabel" name="configCurrentLabel_1"> | ||
| 1275 | + <property name="enabled"> | ||
| 1276 | + <bool>true</bool> | ||
| 1277 | + </property> | ||
| 1278 | + <property name="geometry"> | ||
| 1279 | + <rect> | ||
| 1280 | + <x>199</x> | ||
| 1281 | + <y>690</y> | ||
| 1282 | + <width>641</width> | ||
| 1283 | + <height>51</height> | ||
| 1284 | + </rect> | ||
| 1285 | + </property> | ||
| 1286 | + <property name="palette"> | ||
| 1287 | + <palette> | ||
| 1288 | + <active> | ||
| 1289 | + <colorrole role="WindowText"> | ||
| 1290 | + <brush brushstyle="SolidPattern"> | ||
| 1291 | + <color alpha="255"> | ||
| 1292 | + <red>255</red> | ||
| 1293 | + <green>255</green> | ||
| 1294 | + <blue>255</blue> | ||
| 1295 | + </color> | ||
| 1296 | + </brush> | ||
| 1297 | + </colorrole> | ||
| 1298 | + </active> | ||
| 1299 | + <inactive> | ||
| 1300 | + <colorrole role="WindowText"> | ||
| 1301 | + <brush brushstyle="SolidPattern"> | ||
| 1302 | + <color alpha="255"> | ||
| 1303 | + <red>255</red> | ||
| 1304 | + <green>255</green> | ||
| 1305 | + <blue>255</blue> | ||
| 1306 | + </color> | ||
| 1307 | + </brush> | ||
| 1308 | + </colorrole> | ||
| 1309 | + </inactive> | ||
| 1310 | + <disabled> | ||
| 1311 | + <colorrole role="WindowText"> | ||
| 1312 | + <brush brushstyle="SolidPattern"> | ||
| 1313 | + <color alpha="255"> | ||
| 1314 | + <red>123</red> | ||
| 1315 | + <green>123</green> | ||
| 1316 | + <blue>123</blue> | ||
| 1317 | + </color> | ||
| 1318 | + </brush> | ||
| 1319 | + </colorrole> | ||
| 1320 | + </disabled> | ||
| 1321 | + </palette> | ||
| 1322 | + </property> | ||
| 1323 | + <property name="font"> | ||
| 1324 | + <font> | ||
| 1325 | + <family>Roboto</family> | ||
| 1326 | + <pointsize>16</pointsize> | ||
| 1327 | + <weight>75</weight> | ||
| 1328 | + <bold>true</bold> | ||
| 1329 | + </font> | ||
| 1330 | + </property> | ||
| 1331 | + <property name="text"> | ||
| 1332 | + <string>스팀</string> | ||
| 1333 | + </property> | ||
| 1334 | + <property name="alignment"> | ||
| 1335 | + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | ||
| 1336 | + </property> | ||
| 1337 | + </widget> | ||
| 1338 | + <widget class="QLabel" name="cookTypeIcon"> | ||
| 1339 | + <property name="geometry"> | ||
| 1340 | + <rect> | ||
| 1341 | + <x>0</x> | ||
| 1342 | + <y>430</y> | ||
| 1343 | + <width>250</width> | ||
| 1344 | + <height>150</height> | ||
| 1345 | + </rect> | ||
| 1346 | + </property> | ||
| 1347 | + <property name="text"> | ||
| 1348 | + <string/> | ||
| 1349 | + </property> | ||
| 1350 | + <property name="pixmap"> | ||
| 1351 | + <pixmap resource="resources.qrc">:/images/images/auto/005_auto_icon_01_ov.png</pixmap> | ||
| 1352 | + </property> | ||
| 1353 | + <property name="alignment"> | ||
| 1354 | + <set>Qt::AlignCenter</set> | ||
| 1355 | + </property> | ||
| 1356 | + </widget> | ||
| 1357 | + <widget class="QWidget" name="configBlock_1" native="true"> | ||
| 1358 | + <property name="geometry"> | ||
| 1359 | + <rect> | ||
| 1360 | + <x>27</x> | ||
| 1361 | + <y>605</y> | ||
| 1362 | + <width>140</width> | ||
| 1363 | + <height>140</height> | ||
| 1364 | + </rect> | ||
| 1365 | + </property> | ||
| 1366 | + <property name="styleSheet"> | ||
| 1367 | + <string notr="true">background-image: url(:/images/images/manual/010_icon_block.png);</string> | ||
| 1368 | + </property> | ||
| 1369 | + </widget> | ||
| 1370 | + <widget class="QWidget" name="configBlock_5" native="true"> | ||
| 1371 | + <property name="geometry"> | ||
| 1372 | + <rect> | ||
| 1373 | + <x>27</x> | ||
| 1374 | + <y>1285</y> | ||
| 1375 | + <width>140</width> | ||
| 1376 | + <height>140</height> | ||
| 1377 | + </rect> | ||
| 1378 | + </property> | ||
| 1379 | + <property name="styleSheet"> | ||
| 1380 | + <string notr="true">background-image: url(:/images/images/manual/010_icon_block.png);</string> | ||
| 1381 | + </property> | ||
| 1382 | + </widget> | ||
| 1383 | + <widget class="QPushButton" name="configButton_5"> | ||
| 1384 | + <property name="geometry"> | ||
| 1385 | + <rect> | ||
| 1386 | + <x>49</x> | ||
| 1387 | + <y>1307</y> | ||
| 1388 | + <width>96</width> | ||
| 1389 | + <height>96</height> | ||
| 1390 | + </rect> | ||
| 1391 | + </property> | ||
| 1392 | + <property name="styleSheet"> | ||
| 1393 | + <string notr="true">QPushButton { | ||
| 1394 | + border-image: url(:/images/images/manual/011_icon_01.png); | ||
| 1395 | +} | ||
| 1396 | + | ||
| 1397 | +QPushButton:pressed { | ||
| 1398 | + border-image: url(:/images/images/manual/011_icon_01_ov.png); | ||
| 1399 | +} | ||
| 1400 | +</string> | ||
| 1401 | + </property> | ||
| 1402 | + <property name="text"> | ||
| 1403 | + <string/> | ||
| 1404 | + </property> | ||
| 1405 | + </widget> | ||
| 1406 | + <widget class="QSlider" name="configSlider_5"> | ||
| 1407 | + <property name="geometry"> | ||
| 1408 | + <rect> | ||
| 1409 | + <x>185</x> | ||
| 1410 | + <y>1343</y> | ||
| 1411 | + <width>666</width> | ||
| 1412 | + <height>33</height> | ||
| 1413 | + </rect> | ||
| 1414 | + </property> | ||
| 1415 | + <property name="maximum"> | ||
| 1416 | + <number>100</number> | ||
| 1417 | + </property> | ||
| 1418 | + <property name="pageStep"> | ||
| 1419 | + <number>1</number> | ||
| 1420 | + </property> | ||
| 1421 | + <property name="value"> | ||
| 1422 | + <number>0</number> | ||
| 1423 | + </property> | ||
| 1424 | + <property name="tracking"> | ||
| 1425 | + <bool>true</bool> | ||
| 1426 | + </property> | ||
| 1427 | + <property name="orientation"> | ||
| 1428 | + <enum>Qt::Horizontal</enum> | ||
| 1429 | + </property> | ||
| 1430 | + </widget> | ||
| 1431 | + <widget class="QLabel" name="configCurrentLabel_4"> | ||
| 1432 | + <property name="enabled"> | ||
| 1433 | + <bool>true</bool> | ||
| 1434 | + </property> | ||
| 1435 | + <property name="geometry"> | ||
| 1436 | + <rect> | ||
| 1437 | + <x>199</x> | ||
| 1438 | + <y>1200</y> | ||
| 1439 | + <width>641</width> | ||
| 1440 | + <height>51</height> | ||
| 1441 | + </rect> | ||
| 1442 | + </property> | ||
| 1443 | + <property name="palette"> | ||
| 1444 | + <palette> | ||
| 1445 | + <active> | ||
| 1446 | + <colorrole role="WindowText"> | ||
| 1447 | + <brush brushstyle="SolidPattern"> | ||
| 1448 | + <color alpha="255"> | ||
| 1449 | + <red>255</red> | ||
| 1450 | + <green>255</green> | ||
| 1451 | + <blue>255</blue> | ||
| 1452 | + </color> | ||
| 1453 | + </brush> | ||
| 1454 | + </colorrole> | ||
| 1455 | + </active> | ||
| 1456 | + <inactive> | ||
| 1457 | + <colorrole role="WindowText"> | ||
| 1458 | + <brush brushstyle="SolidPattern"> | ||
| 1459 | + <color alpha="255"> | ||
| 1460 | + <red>255</red> | ||
| 1461 | + <green>255</green> | ||
| 1462 | + <blue>255</blue> | ||
| 1463 | + </color> | ||
| 1464 | + </brush> | ||
| 1465 | + </colorrole> | ||
| 1466 | + </inactive> | ||
| 1467 | + <disabled> | ||
| 1468 | + <colorrole role="WindowText"> | ||
| 1469 | + <brush brushstyle="SolidPattern"> | ||
| 1470 | + <color alpha="255"> | ||
| 1471 | + <red>123</red> | ||
| 1472 | + <green>123</green> | ||
| 1473 | + <blue>123</blue> | ||
| 1474 | + </color> | ||
| 1475 | + </brush> | ||
| 1476 | + </colorrole> | ||
| 1477 | + </disabled> | ||
| 1478 | + </palette> | ||
| 1479 | + </property> | ||
| 1480 | + <property name="font"> | ||
| 1481 | + <font> | ||
| 1482 | + <family>Roboto</family> | ||
| 1483 | + <pointsize>16</pointsize> | ||
| 1484 | + <weight>75</weight> | ||
| 1485 | + <bold>true</bold> | ||
| 1486 | + </font> | ||
| 1487 | + </property> | ||
| 1488 | + <property name="text"> | ||
| 1489 | + <string>스팀</string> | ||
| 1490 | + </property> | ||
| 1491 | + <property name="alignment"> | ||
| 1492 | + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> | ||
| 1493 | + </property> | ||
| 1494 | + </widget> | ||
| 1495 | + <widget class="QPushButton" name="configButton_3"> | ||
| 1496 | + <property name="geometry"> | ||
| 1497 | + <rect> | ||
| 1498 | + <x>49</x> | ||
| 1499 | + <y>957</y> | ||
| 1500 | + <width>96</width> | ||
| 1501 | + <height>96</height> | ||
| 1502 | + </rect> | ||
| 1503 | + </property> | ||
| 1504 | + <property name="styleSheet"> | ||
| 1505 | + <string notr="true">QPushButton { | ||
| 1506 | + border-image: url(:/images/images/manual/011_icon_01.png); | ||
| 1507 | +} | ||
| 1508 | + | ||
| 1509 | +QPushButton:pressed { | ||
| 1510 | + border-image: url(:/images/images/manual/011_icon_01_ov.png); | ||
| 1511 | +} | ||
| 1512 | +</string> | ||
| 1513 | + </property> | ||
| 1514 | + <property name="text"> | ||
| 1515 | + <string/> | ||
| 1516 | + </property> | ||
| 1517 | + </widget> | ||
| 1518 | + <widget class="QSlider" name="configSlider_1"> | ||
| 1519 | + <property name="geometry"> | ||
| 1520 | + <rect> | ||
| 1521 | + <x>185</x> | ||
| 1522 | + <y>663</y> | ||
| 1523 | + <width>666</width> | ||
| 1524 | + <height>33</height> | ||
| 1525 | + </rect> | ||
| 1526 | + </property> | ||
| 1527 | + <property name="maximum"> | ||
| 1528 | + <number>100</number> | ||
| 1529 | + </property> | ||
| 1530 | + <property name="pageStep"> | ||
| 1531 | + <number>1</number> | ||
| 1532 | + </property> | ||
| 1533 | + <property name="value"> | ||
| 1534 | + <number>39</number> | ||
| 1535 | + </property> | ||
| 1536 | + <property name="tracking"> | ||
| 1537 | + <bool>true</bool> | ||
| 1538 | + </property> | ||
| 1539 | + <property name="orientation"> | ||
| 1540 | + <enum>Qt::Horizontal</enum> | ||
| 1541 | + </property> | ||
| 1542 | + <property name="tickPosition"> | ||
| 1543 | + <enum>QSlider::TicksBelow</enum> | ||
| 1544 | + </property> | ||
| 1545 | + <property name="tickInterval"> | ||
| 1546 | + <number>1</number> | ||
| 1547 | + </property> | ||
| 1548 | + </widget> | ||
| 1549 | + <zorder>configBlock_4</zorder> | ||
| 1550 | + <zorder>configBlock_2</zorder> | ||
| 1551 | + <zorder>configBlock_1</zorder> | ||
| 1552 | + <zorder>upperStack</zorder> | ||
| 1553 | + <zorder>bottomBar</zorder> | ||
| 1554 | + <zorder>configMaxLabel_5</zorder> | ||
| 1555 | + <zorder>configMinLabel_5</zorder> | ||
| 1556 | + <zorder>selectCookButton</zorder> | ||
| 1557 | + <zorder>configCurrentLabel_2</zorder> | ||
| 1558 | + <zorder>configMaxLabel_3</zorder> | ||
| 1559 | + <zorder>configMinLabel_3</zorder> | ||
| 1560 | + <zorder>configMinLabel_4</zorder> | ||
| 1561 | + <zorder>pushButton_4</zorder> | ||
| 1562 | + <zorder>configButton_1</zorder> | ||
| 1563 | + <zorder>configSlider_4</zorder> | ||
| 1564 | + <zorder>configButton_4</zorder> | ||
| 1565 | + <zorder>configMaxLabel_2</zorder> | ||
| 1566 | + <zorder>configBlock_3</zorder> | ||
| 1567 | + <zorder>configSlider_2</zorder> | ||
| 1568 | + <zorder>configCurrentLabel_5</zorder> | ||
| 1569 | + <zorder>configMinLabel_2</zorder> | ||
| 1570 | + <zorder>configSlider_3</zorder> | ||
| 1571 | + <zorder>configMaxLabel_4</zorder> | ||
| 1572 | + <zorder>configButton_2</zorder> | ||
| 1573 | + <zorder>configMinLabel_1</zorder> | ||
| 1574 | + <zorder>configMaxLabel_1</zorder> | ||
| 1575 | + <zorder>configCurrentLabel_3</zorder> | ||
| 1576 | + <zorder>configCurrentLabel_1</zorder> | ||
| 1577 | + <zorder>cookTypeIcon</zorder> | ||
| 1578 | + <zorder>configBlock_5</zorder> | ||
| 1579 | + <zorder>configButton_5</zorder> | ||
| 1580 | + <zorder>configSlider_5</zorder> | ||
| 1581 | + <zorder>configCurrentLabel_4</zorder> | ||
| 1582 | + <zorder>configButton_3</zorder> | ||
| 1583 | + <zorder>configSlider_1</zorder> | ||
| 1584 | + </widget> | ||
| 1585 | + </widget> | ||
| 1586 | + <customwidgets> | ||
| 1587 | + <customwidget> | ||
| 1588 | + <class>Clock</class> | ||
| 1589 | + <extends>QWidget</extends> | ||
| 1590 | + <header>clock.h</header> | ||
| 1591 | + <container>1</container> | ||
| 1592 | + </customwidget> | ||
| 1593 | + </customwidgets> | ||
| 1594 | + <resources> | ||
| 1595 | + <include location="resources.qrc"/> | ||
| 1596 | + </resources> | ||
| 1597 | + <connections/> | ||
| 1598 | +</ui> |
app/gui/oven_control/autocookselectionwindow.cpp
| @@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
| 2 | #include "ui_autocookselectionwindow.h" | 2 | #include "ui_autocookselectionwindow.h" |
| 3 | 3 | ||
| 4 | #include <QSignalMapper> | 4 | #include <QSignalMapper> |
| 5 | +#include <QtDebug> | ||
| 5 | 6 | ||
| 6 | #include "autocookwindow.h" | 7 | #include "autocookwindow.h" |
| 7 | 8 | ||
| @@ -12,6 +13,7 @@ AutoCookSelectionWindow::AutoCookSelectionWindow(QWidget *parent, Oven *oven, Co | @@ -12,6 +13,7 @@ AutoCookSelectionWindow::AutoCookSelectionWindow(QWidget *parent, Oven *oven, Co | ||
| 12 | { | 13 | { |
| 13 | ui->setupUi(this); | 14 | ui->setupUi(this); |
| 14 | 15 | ||
| 16 | + ui->clockContainer->setParent(ui->upperStack); | ||
| 15 | setAttribute(Qt::WA_DeleteOnClose); | 17 | setAttribute(Qt::WA_DeleteOnClose); |
| 16 | 18 | ||
| 17 | ui->cookTypeIcon->setPixmap(Cook::icon(type)); | 19 | ui->cookTypeIcon->setPixmap(Cook::icon(type)); |
| @@ -76,14 +78,11 @@ void AutoCookSelectionWindow::onCookSelected(int idx) | @@ -76,14 +78,11 @@ void AutoCookSelectionWindow::onCookSelected(int idx) | ||
| 76 | 78 | ||
| 77 | autoCookWindowOpened = true; | 79 | autoCookWindowOpened = true; |
| 78 | 80 | ||
| 79 | - AutoCookWindow *w = new AutoCookWindow(this, oven, cookList.at(idx)); | 81 | + AutoCookWindow *w = new AutoCookWindow(parentWidget(), oven, cookList.takeAt(idx)); |
| 82 | + w->setWindowModality(Qt::WindowModal); | ||
| 80 | w->showFullScreen(); | 83 | w->showFullScreen(); |
| 81 | - connect(w, SIGNAL(destroyed(QObject*)), SLOT(onAutoCookWindowDestroyed())); | ||
| 82 | -} | ||
| 83 | 84 | ||
| 84 | -void AutoCookSelectionWindow::onAutoCookWindowDestroyed() | ||
| 85 | -{ | ||
| 86 | - autoCookWindowOpened = false; | 85 | + close(); |
| 87 | } | 86 | } |
| 88 | 87 | ||
| 89 | void AutoCookSelectionWindow::on_backButton_clicked() | 88 | void AutoCookSelectionWindow::on_backButton_clicked() |
app/gui/oven_control/autocookselectionwindow.h
app/gui/oven_control/autocookselectionwindow.ui
| @@ -62,7 +62,7 @@ background-image: url(:/images/images/config/001_01_background_time.png); | @@ -62,7 +62,7 @@ background-image: url(:/images/images/config/001_01_background_time.png); | ||
| 62 | <widget class="QPushButton" name="backButton"> | 62 | <widget class="QPushButton" name="backButton"> |
| 63 | <property name="geometry"> | 63 | <property name="geometry"> |
| 64 | <rect> | 64 | <rect> |
| 65 | - <x>401</x> | 65 | + <x>232</x> |
| 66 | <y>26</y> | 66 | <y>26</y> |
| 67 | <width>97</width> | 67 | <width>97</width> |
| 68 | <height>97</height> | 68 | <height>97</height> |
| @@ -75,8 +75,77 @@ background-image: url(:/images/images/config/001_01_background_time.png); | @@ -75,8 +75,77 @@ background-image: url(:/images/images/config/001_01_background_time.png); | ||
| 75 | </sizepolicy> | 75 | </sizepolicy> |
| 76 | </property> | 76 | </property> |
| 77 | <property name="styleSheet"> | 77 | <property name="styleSheet"> |
| 78 | - <string notr="true">QPushButton { border-image: url(:/images/images/config_service/006_sys_icon_03.png); } | ||
| 79 | -QPushButton:pressed { border-image: url(:/images/images/config_service/006_sys_icon_03_ov.png); }</string> | 78 | + <string notr="true">QPushButton { border-image: url(:/images/images/auto/006_sys_icon_03.png); } |
| 79 | +QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_03_ov.png); }</string> | ||
| 80 | + </property> | ||
| 81 | + <property name="text"> | ||
| 82 | + <string/> | ||
| 83 | + </property> | ||
| 84 | + </widget> | ||
| 85 | + <widget class="QPushButton" name="backButton_2"> | ||
| 86 | + <property name="geometry"> | ||
| 87 | + <rect> | ||
| 88 | + <x>345</x> | ||
| 89 | + <y>26</y> | ||
| 90 | + <width>97</width> | ||
| 91 | + <height>97</height> | ||
| 92 | + </rect> | ||
| 93 | + </property> | ||
| 94 | + <property name="sizePolicy"> | ||
| 95 | + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> | ||
| 96 | + <horstretch>0</horstretch> | ||
| 97 | + <verstretch>0</verstretch> | ||
| 98 | + </sizepolicy> | ||
| 99 | + </property> | ||
| 100 | + <property name="styleSheet"> | ||
| 101 | + <string notr="true">QPushButton { border-image: url(:/images/images/auto/006_sys_icon_01.png); } | ||
| 102 | +QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_01_ov.png); }</string> | ||
| 103 | + </property> | ||
| 104 | + <property name="text"> | ||
| 105 | + <string/> | ||
| 106 | + </property> | ||
| 107 | + </widget> | ||
| 108 | + <widget class="QPushButton" name="backButton_3"> | ||
| 109 | + <property name="geometry"> | ||
| 110 | + <rect> | ||
| 111 | + <x>458</x> | ||
| 112 | + <y>26</y> | ||
| 113 | + <width>97</width> | ||
| 114 | + <height>97</height> | ||
| 115 | + </rect> | ||
| 116 | + </property> | ||
| 117 | + <property name="sizePolicy"> | ||
| 118 | + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> | ||
| 119 | + <horstretch>0</horstretch> | ||
| 120 | + <verstretch>0</verstretch> | ||
| 121 | + </sizepolicy> | ||
| 122 | + </property> | ||
| 123 | + <property name="styleSheet"> | ||
| 124 | + <string notr="true">QPushButton { border-image: url(:/images/images/auto/006_sys_icon_05.png); } | ||
| 125 | +QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_05_ov.png); }</string> | ||
| 126 | + </property> | ||
| 127 | + <property name="text"> | ||
| 128 | + <string/> | ||
| 129 | + </property> | ||
| 130 | + </widget> | ||
| 131 | + <widget class="QPushButton" name="backButton_4"> | ||
| 132 | + <property name="geometry"> | ||
| 133 | + <rect> | ||
| 134 | + <x>571</x> | ||
| 135 | + <y>26</y> | ||
| 136 | + <width>97</width> | ||
| 137 | + <height>97</height> | ||
| 138 | + </rect> | ||
| 139 | + </property> | ||
| 140 | + <property name="sizePolicy"> | ||
| 141 | + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> | ||
| 142 | + <horstretch>0</horstretch> | ||
| 143 | + <verstretch>0</verstretch> | ||
| 144 | + </sizepolicy> | ||
| 145 | + </property> | ||
| 146 | + <property name="styleSheet"> | ||
| 147 | + <string notr="true">QPushButton { border-image: url(:/images/images/auto/006_sys_icon_02.png); } | ||
| 148 | +QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_02_ov.png); }</string> | ||
| 80 | </property> | 149 | </property> |
| 81 | <property name="text"> | 150 | <property name="text"> |
| 82 | <string/> | 151 | <string/> |
app/gui/oven_control/autocookwindow.cpp
| @@ -7,25 +7,20 @@ AutoCookWindow::AutoCookWindow(QWidget *parent, Oven *oven, AbstractCook *cook) | @@ -7,25 +7,20 @@ AutoCookWindow::AutoCookWindow(QWidget *parent, Oven *oven, AbstractCook *cook) | ||
| 7 | oven(oven), | 7 | oven(oven), |
| 8 | cook(cook), | 8 | cook(cook), |
| 9 | started(false), | 9 | started(false), |
| 10 | + done(false), | ||
| 10 | selectedStepIndex(0) | 11 | selectedStepIndex(0) |
| 11 | { | 12 | { |
| 12 | ui->setupUi(this); | 13 | ui->setupUi(this); |
| 13 | 14 | ||
| 14 | - setAttribute(Qt::WA_DeleteOnClose); | ||
| 15 | - | ||
| 16 | ui->clockContainer->setParent(ui->upperStack); | 15 | ui->clockContainer->setParent(ui->upperStack); |
| 17 | - | ||
| 18 | - bulletPixmap.load(":/images/images/auto/window_arrow_pin_02.png"); | ||
| 19 | - selectedBulletPixmap.load(":/images/images/auto/window_arrow_pin_01.png"); | ||
| 20 | - steamModeIcon.load(":/images/images/auto/window_icon_04.png"); | ||
| 21 | - dryModeIcon.load(":/images/images/auto/window_icon_06.png"); | ||
| 22 | - combiModeIcon.load(":/images/images/auto/window_icon_05.png"); | 16 | + setAttribute(Qt::WA_DeleteOnClose); |
| 23 | 17 | ||
| 24 | connect(oven, SIGNAL(changed(Oven*)), SLOT(onOvenUpdated())); | 18 | connect(oven, SIGNAL(changed(Oven*)), SLOT(onOvenUpdated())); |
| 25 | oven->setDefault(Oven::CombinationMode); | 19 | oven->setDefault(Oven::CombinationMode); |
| 26 | 20 | ||
| 27 | lastHumidity = oven->currentHumidity(); | 21 | lastHumidity = oven->currentHumidity(); |
| 28 | lastTemp = oven->currentTemp(); | 22 | lastTemp = oven->currentTemp(); |
| 23 | + lastDoorView = Cook::Invalid; | ||
| 29 | 24 | ||
| 30 | QTimer *cookStartTimer = new QTimer(this); | 25 | QTimer *cookStartTimer = new QTimer(this); |
| 31 | cookStartTimer->setSingleShot(true); | 26 | cookStartTimer->setSingleShot(true); |
| @@ -102,10 +97,18 @@ AutoCookWindow::AutoCookWindow(QWidget *parent, Oven *oven, AbstractCook *cook) | @@ -102,10 +97,18 @@ AutoCookWindow::AutoCookWindow(QWidget *parent, Oven *oven, AbstractCook *cook) | ||
| 102 | AutoCookWindow::~AutoCookWindow() | 97 | AutoCookWindow::~AutoCookWindow() |
| 103 | { | 98 | { |
| 104 | delete ui; | 99 | delete ui; |
| 100 | + | ||
| 101 | + delete cook; | ||
| 105 | } | 102 | } |
| 106 | 103 | ||
| 107 | void AutoCookWindow::setupUi() | 104 | void AutoCookWindow::setupUi() |
| 108 | { | 105 | { |
| 106 | + bulletPixmap.load(":/images/images/auto/window_arrow_pin_02.png"); | ||
| 107 | + selectedBulletPixmap.load(":/images/images/auto/window_arrow_pin_01.png"); | ||
| 108 | + steamModeIcon.load(":/images/images/auto/window_icon_04.png"); | ||
| 109 | + dryModeIcon.load(":/images/images/auto/window_icon_06.png"); | ||
| 110 | + combiModeIcon.load(":/images/images/auto/window_icon_05.png"); | ||
| 111 | + | ||
| 109 | QString cookTypeIcon = Cook::icon(cook->type()); | 112 | QString cookTypeIcon = Cook::icon(cook->type()); |
| 110 | ui->cookTypeIcon_1->setPixmap(cookTypeIcon); | 113 | ui->cookTypeIcon_1->setPixmap(cookTypeIcon); |
| 111 | ui->cookTypeIcon_2->setPixmap(cookTypeIcon); | 114 | ui->cookTypeIcon_2->setPixmap(cookTypeIcon); |
| @@ -191,7 +194,25 @@ void AutoCookWindow::setupUi() | @@ -191,7 +194,25 @@ void AutoCookWindow::setupUi() | ||
| 191 | slider->setValue(config->current()); | 194 | slider->setValue(config->current()); |
| 192 | slider->blockSignals(false); | 195 | slider->blockSignals(false); |
| 193 | 196 | ||
| 194 | - qDebug() << "Current value" << config->current(); | 197 | + switch (config->type()) |
| 198 | + { | ||
| 199 | + case Cook::Time: | ||
| 200 | + slider->setProperty("sliderColor", QString("white")); | ||
| 201 | + break; | ||
| 202 | + case Cook::BurnDegree: | ||
| 203 | + slider->setProperty("sliderColor", QString("yellow")); | ||
| 204 | + break; | ||
| 205 | + case Cook::Brightness: | ||
| 206 | + slider->setProperty("sliderColor", QString("red")); | ||
| 207 | + break; | ||
| 208 | + default: | ||
| 209 | + slider->setProperty("sliderColor", QString("blue")); | ||
| 210 | + break; | ||
| 211 | + } | ||
| 212 | + | ||
| 213 | + slider->style()->unpolish(slider); | ||
| 214 | + slider->style()->polish(slider); | ||
| 215 | + slider->update(); | ||
| 195 | } | 216 | } |
| 196 | else | 217 | else |
| 197 | { | 218 | { |
| @@ -243,12 +264,38 @@ void AutoCookWindow::setupUi() | @@ -243,12 +264,38 @@ void AutoCookWindow::setupUi() | ||
| 243 | ui->heatGauge->setMaximum(300); | 264 | ui->heatGauge->setMaximum(300); |
| 244 | ui->heatGauge->setValue(30); | 265 | ui->heatGauge->setValue(30); |
| 245 | 266 | ||
| 267 | + ui->openDoorAnimation->load(":/images/images/auto/ani_01.png"); | ||
| 268 | + ui->openDoorAnimation->load(":/images/images/auto/ani_02.png"); | ||
| 269 | + ui->openDoorAnimation->load(":/images/images/auto/ani_03.png"); | ||
| 270 | + ui->openDoorAnimation->load(":/images/images/auto/ani_04.png"); | ||
| 271 | + ui->openDoorAnimation->load(":/images/images/auto/ani_05.png"); | ||
| 272 | + ui->openDoorAnimation->load(":/images/images/auto/ani_06.png"); | ||
| 273 | + ui->openDoorAnimation->load(":/images/images/auto/ani_07.png"); | ||
| 274 | + ui->openDoorAnimation->load(":/images/images/auto/ani_08.png"); | ||
| 275 | + ui->openDoorAnimation->load(":/images/images/auto/ani_09.png"); | ||
| 276 | + ui->openDoorAnimation->start(300); | ||
| 277 | + ui->openDoorAnimation->hide(); | ||
| 278 | + ui->openDoorArrow->hide(); | ||
| 279 | + | ||
| 280 | + ui->closeDoorAnimation->load(":/images/images/auto/ani_09.png"); | ||
| 281 | + ui->closeDoorAnimation->load(":/images/images/auto/ani_08.png"); | ||
| 282 | + ui->closeDoorAnimation->load(":/images/images/auto/ani_07.png"); | ||
| 283 | + ui->closeDoorAnimation->load(":/images/images/auto/ani_06.png"); | ||
| 284 | + ui->closeDoorAnimation->load(":/images/images/auto/ani_05.png"); | ||
| 285 | + ui->closeDoorAnimation->load(":/images/images/auto/ani_04.png"); | ||
| 286 | + ui->closeDoorAnimation->load(":/images/images/auto/ani_03.png"); | ||
| 287 | + ui->closeDoorAnimation->load(":/images/images/auto/ani_02.png"); | ||
| 288 | + ui->closeDoorAnimation->load(":/images/images/auto/ani_01.png"); | ||
| 289 | + ui->closeDoorAnimation->start(300); | ||
| 290 | + ui->closeDoorAnimation->hide(); | ||
| 291 | + ui->closeDoorArrow->hide(); | ||
| 292 | + | ||
| 246 | updateView(); | 293 | updateView(); |
| 247 | } | 294 | } |
| 248 | 295 | ||
| 249 | void AutoCookWindow::updateView() | 296 | void AutoCookWindow::updateView() |
| 250 | { | 297 | { |
| 251 | - qDebug() << "updateView"; | 298 | +// qDebug() << "updateView"; |
| 252 | if (started) | 299 | if (started) |
| 253 | { | 300 | { |
| 254 | ui->stackedWidget->setCurrentIndex(1); | 301 | ui->stackedWidget->setCurrentIndex(1); |
| @@ -266,15 +313,48 @@ void AutoCookWindow::updateView() | @@ -266,15 +313,48 @@ void AutoCookWindow::updateView() | ||
| 266 | 313 | ||
| 267 | int time = oven->time(); | 314 | int time = oven->time(); |
| 268 | if (time >= 3600) | 315 | if (time >= 3600) |
| 269 | - ui->timeLabel->setText(QString().sprintf("%d시간 %02d분", time / 3600, (time % 3600) / 60)); | 316 | + ui->timeLabel->setText(QString().sprintf("%d<span style=\"font-size:11pt;\">시간</span> %02d<span style=\"font-size:11pt;\">분</span>", time / 3600, (time % 3600) / 60)); |
| 270 | else if (time >= 60) | 317 | else if (time >= 60) |
| 271 | - ui->timeLabel->setText(QString().sprintf("%d분 %02d초", time / 60, time % 60)); | 318 | + ui->timeLabel->setText(QString().sprintf("%d<span style=\"font-size:11pt;\">분</span> %02d<span style=\"font-size:11pt;\">초</span>", time / 60, time % 60)); |
| 272 | else | 319 | else |
| 273 | - ui->timeLabel->setText(QString().sprintf("%d초", time)); | 320 | + ui->timeLabel->setText(QString().sprintf("%d<span style=\"font-size:11pt;\">초</span>", time)); |
| 274 | 321 | ||
| 275 | int curInterTemp = oven->currentInterTemp(); | 322 | int curInterTemp = oven->currentInterTemp(); |
| 276 | - int interTemp = oven->interTemp(); | ||
| 277 | - ui->interTempLabel->setText(QString().sprintf("%d℃ / %d℃", curInterTemp, interTemp)); | 323 | + if (interTempEnabled) |
| 324 | + { | ||
| 325 | + int interTemp = oven->interTemp(); | ||
| 326 | + ui->interTempLabel->setText(QString().sprintf("%d<span style=\"font-size:11pt;\">℃ / %d</span><span style=\"font-size:9pt;\">℃</span>", curInterTemp, interTemp)); | ||
| 327 | + } | ||
| 328 | + else | ||
| 329 | + ui->interTempLabel->setText(QString().sprintf("%d<span style=\"font-size:11pt;\">℃</span>", curInterTemp)); | ||
| 330 | + | ||
| 331 | + if (!done) | ||
| 332 | + { | ||
| 333 | + if (oven->door()) | ||
| 334 | + { | ||
| 335 | + ui->closeDoorAnimation->show(); | ||
| 336 | + ui->closeDoorArrow->show(); | ||
| 337 | + ui->openDoorAnimation->hide(); | ||
| 338 | + ui->openDoorArrow->hide(); | ||
| 339 | + } | ||
| 340 | + else | ||
| 341 | + { | ||
| 342 | + ui->closeDoorAnimation->hide(); | ||
| 343 | + ui->closeDoorArrow->hide(); | ||
| 344 | + | ||
| 345 | + Cook::Step step = cook->currentStep(); | ||
| 346 | + if (Cook::classify(step.type) == Cook::DoorClass) | ||
| 347 | + { | ||
| 348 | + ui->openDoorAnimation->show(); | ||
| 349 | + ui->openDoorArrow->show(); | ||
| 350 | + } | ||
| 351 | + else | ||
| 352 | + { | ||
| 353 | + ui->openDoorAnimation->hide(); | ||
| 354 | + ui->openDoorArrow->hide(); | ||
| 355 | + } | ||
| 356 | + } | ||
| 357 | + } | ||
| 278 | } | 358 | } |
| 279 | else | 359 | else |
| 280 | { | 360 | { |
| @@ -312,13 +392,24 @@ void AutoCookWindow::updateView() | @@ -312,13 +392,24 @@ void AutoCookWindow::updateView() | ||
| 312 | break; | 392 | break; |
| 313 | } | 393 | } |
| 314 | 394 | ||
| 395 | + int time = cook->time(); | ||
| 396 | + int interTemp = cook->interTemp(); | ||
| 397 | + | ||
| 315 | switch (config->type()) | 398 | switch (config->type()) |
| 316 | { | 399 | { |
| 317 | -// case Cook::Time: | ||
| 318 | -// l->setText(QString().sprintf("%d", cook->time())); | ||
| 319 | -// break; | 400 | + case Cook::Time: |
| 401 | + if (time >= 3600) | ||
| 402 | + l->setText(QString().sprintf("%d<span style=\"font-size:11pt;\">시간</span> %02d<span style=\"font-size:11pt;\">분</span>", time / 3600, (time % 3600) / 60)); | ||
| 403 | + else if (time >= 60) | ||
| 404 | + l->setText(QString().sprintf("%d<span style=\"font-size:11pt;\">분</span> %02d<span style=\"font-size:11pt;\">초</span>", time / 60, time % 60)); | ||
| 405 | + else | ||
| 406 | + l->setText(QString().sprintf("%d<span style=\"font-size:11pt;\">초</span>", time)); | ||
| 407 | + break; | ||
| 408 | + case Cook::BurnDegree: | ||
| 409 | + l->setText(QString().sprintf("%d<span style=\"font-size:11pt;\">℃</span>", interTemp)); | ||
| 410 | + break; | ||
| 320 | default: | 411 | default: |
| 321 | - l->setText(QString().sprintf("%d / %d", config->current(), config->count())); | 412 | + l->setText(QString().sprintf("%d<span style=\"font-size:11pt;\">/%d</span>", config->current(), config->count())); |
| 322 | break; | 413 | break; |
| 323 | } | 414 | } |
| 324 | } | 415 | } |
| @@ -346,7 +437,7 @@ void AutoCookWindow::updateView() | @@ -346,7 +437,7 @@ void AutoCookWindow::updateView() | ||
| 346 | 437 | ||
| 347 | void AutoCookWindow::viewStep(Cook::Step step) | 438 | void AutoCookWindow::viewStep(Cook::Step step) |
| 348 | { | 439 | { |
| 349 | - qDebug() << "viewStep" << step.type; | 440 | +// qDebug() << "viewStep" << step.type; |
| 350 | switch (Cook::classify(step.type)) | 441 | switch (Cook::classify(step.type)) |
| 351 | { | 442 | { |
| 352 | case Cook::PreheatClass: | 443 | case Cook::PreheatClass: |
| @@ -405,12 +496,11 @@ void AutoCookWindow::viewPreheatStep(Cook::Step step) | @@ -405,12 +496,11 @@ void AutoCookWindow::viewPreheatStep(Cook::Step step) | ||
| 405 | 496 | ||
| 406 | void AutoCookWindow::viewDoorStep(Cook::Step step) | 497 | void AutoCookWindow::viewDoorStep(Cook::Step step) |
| 407 | { | 498 | { |
| 408 | - qDebug() << "viewDoorStep"; | 499 | +// qDebug() << "viewDoorStep"; |
| 409 | ui->cookStepLabel->hide(); | 500 | ui->cookStepLabel->hide(); |
| 410 | ui->cookStepIcon->hide(); | 501 | ui->cookStepIcon->hide(); |
| 411 | ui->doorStepLabel->show(); | 502 | ui->doorStepLabel->show(); |
| 412 | ui->cookStepAnimation->show(); | 503 | ui->cookStepAnimation->show(); |
| 413 | - ui->cookStepAnimation->clear(); | ||
| 414 | 504 | ||
| 415 | ui->humidityGauge->hide(); | 505 | ui->humidityGauge->hide(); |
| 416 | ui->humidityLabel->hide(); | 506 | ui->humidityLabel->hide(); |
| @@ -418,39 +508,49 @@ void AutoCookWindow::viewDoorStep(Cook::Step step) | @@ -418,39 +508,49 @@ void AutoCookWindow::viewDoorStep(Cook::Step step) | ||
| 418 | ui->heatLabel->hide(); | 508 | ui->heatLabel->hide(); |
| 419 | ui->cookModeIcon->hide(); | 509 | ui->cookModeIcon->hide(); |
| 420 | 510 | ||
| 421 | - switch (step.type) | 511 | + if (lastDoorView != step.type) |
| 422 | { | 512 | { |
| 423 | - case Cook::PutThermometer: | ||
| 424 | - ui->doorStepLabel->setText("중심 온도계 삽입"); | ||
| 425 | - ui->cookStepAnimation->load(":/images/images/auto/ani_d_01.png"); | ||
| 426 | - ui->cookStepAnimation->load(":/images/images/auto/ani_d_02.png"); | ||
| 427 | - ui->cookStepAnimation->setGeometry((900-210)/2, 800, 210, 307); | ||
| 428 | - break; | ||
| 429 | - case Cook::Load: | ||
| 430 | - ui->doorStepLabel->setText("식재료 적재"); | ||
| 431 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_c_01.png"); | ||
| 432 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_c_02.png"); | ||
| 433 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_c_03.png"); | ||
| 434 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_c_04.png"); | ||
| 435 | - ui->cookStepAnimation->setGeometry((900-264)/2, 800, 264, 307); | ||
| 436 | - break; | ||
| 437 | - case Cook::Cut: | ||
| 438 | - ui->doorStepLabel->setText("자르기"); | ||
| 439 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_b_01.png"); | ||
| 440 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_b_02.png"); | ||
| 441 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_b_03.png"); | ||
| 442 | - ui->cookStepAnimation->setGeometry((900-264)/2, 800, 264, 307); | ||
| 443 | - break; | ||
| 444 | - case Cook::Pour: | ||
| 445 | - ui->doorStepLabel->setText("물 붓기"); | ||
| 446 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_a_01.png"); | ||
| 447 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_a_02.png"); | ||
| 448 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_a_03.png"); | ||
| 449 | - ui->cookStepAnimation->load(":/images/images/auto/ani_frame_a_04.png"); | ||
| 450 | - ui->cookStepAnimation->setGeometry((900-264)/2, 800, 264, 307); | ||
| 451 | - break; | ||
| 452 | - default: | ||
| 453 | - ui->doorStepLabel->hide(); | 513 | + lastDoorView = step.type; |
| 514 | + qDebug() << "clearStepAnimation"; | ||
| 515 | + | ||
| 516 | + ui->cookStepAnimation->clear(); | ||
| 517 | + switch (step.type) | ||
| 518 | + { | ||
| 519 | + case Cook::PutThermometer: | ||
| 520 | + ui->doorStepLabel->setText("중심 온도계 삽입"); | ||
| 521 | + ui->cookStepAnimation->load(":/images/images/auto/ani_d_01.png"); | ||
| 522 | + ui->cookStepAnimation->load(":/images/images/auto/ani_d_02.png"); | ||
| 523 | + ui->cookStepAnimation->setGeometry((900-210)/2, 800, 210, 307); | ||
| 524 | + break; | ||
| 525 | + case Cook::Load: | ||
| 526 | + ui->doorStepLabel->setText("식재료 적재"); | ||
| 527 | + ui->cookStepAnimation->load(":/images/images/auto/ani_frame_c_01.png"); | ||
| 528 | + ui->cookStepAnimation->load(":/images/images/auto/ani_frame_c_02.png"); | ||
| 529 | + ui->cookStepAnimation->load(":/images/images/auto/ani_frame_c_03.png"); | ||
| 530 | + ui->cookStepAnimation->load(":/images/images/auto/ani_frame_c_04.png"); | ||
| 531 | + ui->cookStepAnimation->load(":/images/images/auto/ani_frame_c_03.png"); | ||
| 532 | + ui->cookStepAnimation->load(":/images/images/auto/ani_frame_c_02.png"); | ||
| 533 | + ui->cookStepAnimation->load(":/images/images/auto/ani_frame_c_01.png"); | ||
| 534 | + ui->cookStepAnimation->setGeometry((900-264)/2, 800, 264, 307); | ||
| 535 | + break; | ||
| 536 | + case Cook::Cut: | ||
| 537 | + ui->doorStepLabel->setText("자르기"); | ||
| 538 | + ui->cookStepAnimation->load(":/images/images/auto/ani_frame_b_01.png"); | ||
| 539 | + ui->cookStepAnimation->load(":/images/images/auto/ani_frame_b_02.png"); | ||
| 540 | + ui->cookStepAnimation->load(":/images/images/auto/ani_frame_b_03.png"); | ||
| 541 | + ui->cookStepAnimation->setGeometry((900-264)/2, 800, 264, 307); | ||
| 542 | + break; | ||
| 543 | + case Cook::Pour: | ||
| 544 | + ui->doorStepLabel->setText("물 붓기"); | ||
| 545 | + ui->cookStepAnimation->load(":/images/images/auto/ani_frame_a_01.png"); | ||
| 546 | + ui->cookStepAnimation->load(":/images/images/auto/ani_frame_a_02.png"); | ||
| 547 | + ui->cookStepAnimation->load(":/images/images/auto/ani_frame_a_03.png"); | ||
| 548 | + ui->cookStepAnimation->load(":/images/images/auto/ani_frame_a_04.png"); | ||
| 549 | + ui->cookStepAnimation->setGeometry((900-264)/2, 800, 264, 307); | ||
| 550 | + break; | ||
| 551 | + default: | ||
| 552 | + ui->doorStepLabel->hide(); | ||
| 553 | + } | ||
| 454 | } | 554 | } |
| 455 | } | 555 | } |
| 456 | 556 | ||
| @@ -504,6 +604,13 @@ void AutoCookWindow::doPreheatStep(Cook::Step step) | @@ -504,6 +604,13 @@ void AutoCookWindow::doPreheatStep(Cook::Step step) | ||
| 504 | 604 | ||
| 505 | lastHumidity = oven->currentHumidity(); | 605 | lastHumidity = oven->currentHumidity(); |
| 506 | lastTemp = oven->currentTemp(); | 606 | lastTemp = oven->currentTemp(); |
| 607 | + | ||
| 608 | + ui->preheatIcon->show(); | ||
| 609 | + ui->preheatLabel->show(); | ||
| 610 | + ui->preheatGauge->show(); | ||
| 611 | + ui->preheatGauge->setMaximum(step.temp); | ||
| 612 | + ui->preheatGauge->setMinimum(lastTemp); | ||
| 613 | + ui->preheatGauge->setValue(lastTemp); | ||
| 507 | } | 614 | } |
| 508 | 615 | ||
| 509 | void AutoCookWindow::doDoorStep(Cook::Step /*step*/) | 616 | void AutoCookWindow::doDoorStep(Cook::Step /*step*/) |
| @@ -531,12 +638,20 @@ static bool checkReached(int target, int last, int current) | @@ -531,12 +638,20 @@ static bool checkReached(int target, int last, int current) | ||
| 531 | 638 | ||
| 532 | void AutoCookWindow::checkPreheatStep(Cook::Step step) | 639 | void AutoCookWindow::checkPreheatStep(Cook::Step step) |
| 533 | { | 640 | { |
| 641 | + int curTemp = oven->currentTemp(); | ||
| 642 | + | ||
| 643 | + ui->preheatGauge->setValue(curTemp); | ||
| 644 | + | ||
| 534 | if (/*checkReached(step.humidity, lastHumidity, oven->currentHumidity()) | 645 | if (/*checkReached(step.humidity, lastHumidity, oven->currentHumidity()) |
| 535 | - && */checkReached(step.temp, lastTemp, oven->currentTemp())) | 646 | + && */checkReached(step.temp, lastTemp, curTemp)) |
| 536 | { | 647 | { |
| 537 | if (selectedStepIndex == cook->currentStepIndex()) | 648 | if (selectedStepIndex == cook->currentStepIndex()) |
| 538 | selectedStepIndex = cook->currentStepIndex() + 1; | 649 | selectedStepIndex = cook->currentStepIndex() + 1; |
| 539 | 650 | ||
| 651 | + ui->preheatIcon->hide(); | ||
| 652 | + ui->preheatLabel->hide(); | ||
| 653 | + ui->preheatGauge->hide(); | ||
| 654 | + | ||
| 540 | cook->setCurrentStepIndex(cook->currentStepIndex() + 1); | 655 | cook->setCurrentStepIndex(cook->currentStepIndex() + 1); |
| 541 | doStep(); | 656 | doStep(); |
| 542 | } | 657 | } |
| @@ -544,7 +659,7 @@ void AutoCookWindow::checkPreheatStep(Cook::Step step) | @@ -544,7 +659,7 @@ void AutoCookWindow::checkPreheatStep(Cook::Step step) | ||
| 544 | 659 | ||
| 545 | void AutoCookWindow::checkDoorStep(Cook::Step /*step*/) | 660 | void AutoCookWindow::checkDoorStep(Cook::Step /*step*/) |
| 546 | { | 661 | { |
| 547 | - qDebug() << "checkDoorStep" << opened << oven->door(); | 662 | +// qDebug() << "checkDoorStep" << opened << oven->door(); |
| 548 | if (opened) | 663 | if (opened) |
| 549 | { | 664 | { |
| 550 | if (!oven->door()) | 665 | if (!oven->door()) |
| @@ -588,6 +703,27 @@ void AutoCookWindow::checkCookStep(Cook::Step step) | @@ -588,6 +703,27 @@ void AutoCookWindow::checkCookStep(Cook::Step step) | ||
| 588 | } | 703 | } |
| 589 | } | 704 | } |
| 590 | } | 705 | } |
| 706 | + else /*if current step == last step*/ | ||
| 707 | + { | ||
| 708 | + if (done) | ||
| 709 | + { | ||
| 710 | + | ||
| 711 | + } | ||
| 712 | + else | ||
| 713 | + { | ||
| 714 | + if ((interTempEnabled && cook->interTemp() == oven->currentInterTemp()) | ||
| 715 | + || oven->time() == 0) | ||
| 716 | + { | ||
| 717 | + done = true; | ||
| 718 | + ui->openDoorAnimation->show(); | ||
| 719 | + ui->openDoorArrow->show(); | ||
| 720 | + ui->closeDoorAnimation->hide(); | ||
| 721 | + ui->closeDoorArrow->hide(); | ||
| 722 | + | ||
| 723 | + oven->setTime(0); | ||
| 724 | + } | ||
| 725 | + } | ||
| 726 | + } | ||
| 591 | } | 727 | } |
| 592 | 728 | ||
| 593 | void AutoCookWindow::start() | 729 | void AutoCookWindow::start() |
| @@ -596,8 +732,8 @@ void AutoCookWindow::start() | @@ -596,8 +732,8 @@ void AutoCookWindow::start() | ||
| 596 | 732 | ||
| 597 | started = true; | 733 | started = true; |
| 598 | oven->setTime(cook->time()); | 734 | oven->setTime(cook->time()); |
| 599 | - oven->setInterTempEnabled(interTempEnabled); | ||
| 600 | oven->setInterTemp(cook->interTemp()); | 735 | oven->setInterTemp(cook->interTemp()); |
| 736 | + oven->setInterTempEnabled(interTempEnabled); | ||
| 601 | 737 | ||
| 602 | doStep(); | 738 | doStep(); |
| 603 | checkCookTimer.start(); | 739 | checkCookTimer.start(); |
| @@ -636,7 +772,7 @@ void AutoCookWindow::doStep() | @@ -636,7 +772,7 @@ void AutoCookWindow::doStep() | ||
| 636 | 772 | ||
| 637 | void AutoCookWindow::checkCook() | 773 | void AutoCookWindow::checkCook() |
| 638 | { | 774 | { |
| 639 | - qDebug() << "checkCook"; | 775 | +// qDebug() << "checkCook"; |
| 640 | Cook::Step step = cook->currentStep(); | 776 | Cook::Step step = cook->currentStep(); |
| 641 | switch (Cook::classify(step.type)) | 777 | switch (Cook::classify(step.type)) |
| 642 | { | 778 | { |
app/gui/oven_control/autocookwindow.h
| @@ -31,6 +31,7 @@ private: | @@ -31,6 +31,7 @@ private: | ||
| 31 | Oven *oven; | 31 | Oven *oven; |
| 32 | AbstractCook *cook; | 32 | AbstractCook *cook; |
| 33 | bool started; | 33 | bool started; |
| 34 | + bool done; | ||
| 34 | bool opened; | 35 | bool opened; |
| 35 | bool interTempEnabled; | 36 | bool interTempEnabled; |
| 36 | 37 | ||
| @@ -52,6 +53,8 @@ private: | @@ -52,6 +53,8 @@ private: | ||
| 52 | int lastHumidity; | 53 | int lastHumidity; |
| 53 | int lastTemp; | 54 | int lastTemp; |
| 54 | 55 | ||
| 56 | + Cook::StepType lastDoorView; | ||
| 57 | + | ||
| 55 | void setupUi(); | 58 | void setupUi(); |
| 56 | void viewStep(Cook::Step step); | 59 | void viewStep(Cook::Step step); |
| 57 | void viewPreheatStep(Cook::Step step); | 60 | void viewPreheatStep(Cook::Step step); |
app/gui/oven_control/autocookwindow.ui
| @@ -16,6 +16,52 @@ | @@ -16,6 +16,52 @@ | ||
| 16 | <property name="styleSheet"> | 16 | <property name="styleSheet"> |
| 17 | <string notr="true">#centralwidget { | 17 | <string notr="true">#centralwidget { |
| 18 | background-image: url(:/images/images/auto/ba_ground_a01.png); | 18 | background-image: url(:/images/images/auto/ba_ground_a01.png); |
| 19 | +} | ||
| 20 | + | ||
| 21 | +QSlider::groove { | ||
| 22 | +background-image: url(:/images/images/auto/gau_04.png); | ||
| 23 | +background-repeat: no-repeat; | ||
| 24 | +background-position: center; | ||
| 25 | +} | ||
| 26 | + | ||
| 27 | +QSlider::sub-page { | ||
| 28 | +background-repeat: no-repeat; | ||
| 29 | +background-position: left center; | ||
| 30 | +margin: 0px 5px; | ||
| 31 | +} | ||
| 32 | + | ||
| 33 | +QSlider[sliderColor="red"]::sub-page { | ||
| 34 | +background-image: url(:/images/images/auto/gau_05.png); | ||
| 35 | +} | ||
| 36 | + | ||
| 37 | +QSlider[sliderColor="yellow"]::sub-page { | ||
| 38 | +background-image: url(:/images/images/auto/gau_06.png); | ||
| 39 | +} | ||
| 40 | + | ||
| 41 | +QSlider[sliderColor="white"]::sub-page { | ||
| 42 | +background-image: url(:/images/images/auto/gau_07.png); | ||
| 43 | +} | ||
| 44 | + | ||
| 45 | +QSlider[sliderColor="blue"]::sub-page { | ||
| 46 | +background-image: url(:/images/images/auto/gau_09.png); | ||
| 47 | +} | ||
| 48 | + | ||
| 49 | +QSlider[sliderColor="green"]::sub-page { | ||
| 50 | +background-image: url(:/images/images/auto/sys_icon_01_gau.png); | ||
| 51 | +} | ||
| 52 | + | ||
| 53 | +QSlider::handle { | ||
| 54 | +background-image: url(:/images/images/manual/graphe_BTN_Bigsize.png); | ||
| 55 | +background-repeat: no-repeat; | ||
| 56 | +background-position: center; | ||
| 57 | +width: 23px; | ||
| 58 | +height: 33px; | ||
| 59 | +} | ||
| 60 | + | ||
| 61 | +QPushButton { | ||
| 62 | +background-repeat: no-repeat; | ||
| 63 | +background-position: center; | ||
| 64 | +border: none; | ||
| 19 | }</string> | 65 | }</string> |
| 20 | </property> | 66 | </property> |
| 21 | <widget class="QWidget" name="centralwidget"> | 67 | <widget class="QWidget" name="centralwidget"> |
| @@ -150,33 +196,6 @@ border-image: url(:/images/images/auto/btn_02_ov.png); | @@ -150,33 +196,6 @@ border-image: url(:/images/images/auto/btn_02_ov.png); | ||
| 150 | <height>33</height> | 196 | <height>33</height> |
| 151 | </rect> | 197 | </rect> |
| 152 | </property> | 198 | </property> |
| 153 | - <property name="styleSheet"> | ||
| 154 | - <string notr="true">QSlider::groove { | ||
| 155 | -background-image: url(:/images/images/manual/010_gauge_bar_bar.png); | ||
| 156 | -height: 25px; | ||
| 157 | -margin-bottom: 8px; | ||
| 158 | -} | ||
| 159 | - | ||
| 160 | -QSlider::sub-page { | ||
| 161 | -background-image: url(:/images/images/manual/010_gauge_bar_stick_01.png); | ||
| 162 | -height: 25px; | ||
| 163 | -margin-top: 5px; | ||
| 164 | -margin-left: 5px; | ||
| 165 | -margin-bottom: 13px; | ||
| 166 | -} | ||
| 167 | - | ||
| 168 | -QSlider::handle { | ||
| 169 | -background-image: url(:/images/images/manual/graphe_BTN_Bigsize.png); | ||
| 170 | -width: 23px; | ||
| 171 | -margin-bottom: -7px; | ||
| 172 | -} | ||
| 173 | - | ||
| 174 | -QSlider { | ||
| 175 | -background-image: url(:/images/images/auto/gau_04.png); | ||
| 176 | -background-repeat: no-repeat; | ||
| 177 | -} | ||
| 178 | -</string> | ||
| 179 | - </property> | ||
| 180 | <property name="maximum"> | 199 | <property name="maximum"> |
| 181 | <number>100</number> | 200 | <number>100</number> |
| 182 | </property> | 201 | </property> |
| @@ -184,7 +203,7 @@ background-repeat: no-repeat; | @@ -184,7 +203,7 @@ background-repeat: no-repeat; | ||
| 184 | <number>1</number> | 203 | <number>1</number> |
| 185 | </property> | 204 | </property> |
| 186 | <property name="value"> | 205 | <property name="value"> |
| 187 | - <number>0</number> | 206 | + <number>39</number> |
| 188 | </property> | 207 | </property> |
| 189 | <property name="tracking"> | 208 | <property name="tracking"> |
| 190 | <bool>true</bool> | 209 | <bool>true</bool> |
| @@ -192,6 +211,12 @@ background-repeat: no-repeat; | @@ -192,6 +211,12 @@ background-repeat: no-repeat; | ||
| 192 | <property name="orientation"> | 211 | <property name="orientation"> |
| 193 | <enum>Qt::Horizontal</enum> | 212 | <enum>Qt::Horizontal</enum> |
| 194 | </property> | 213 | </property> |
| 214 | + <property name="tickPosition"> | ||
| 215 | + <enum>QSlider::TicksBelow</enum> | ||
| 216 | + </property> | ||
| 217 | + <property name="tickInterval"> | ||
| 218 | + <number>1</number> | ||
| 219 | + </property> | ||
| 195 | </widget> | 220 | </widget> |
| 196 | <widget class="QLabel" name="configCurrentLabel_1"> | 221 | <widget class="QLabel" name="configCurrentLabel_1"> |
| 197 | <property name="enabled"> | 222 | <property name="enabled"> |
| @@ -199,9 +224,9 @@ background-repeat: no-repeat; | @@ -199,9 +224,9 @@ background-repeat: no-repeat; | ||
| 199 | </property> | 224 | </property> |
| 200 | <property name="geometry"> | 225 | <property name="geometry"> |
| 201 | <rect> | 226 | <rect> |
| 202 | - <x>690</x> | 227 | + <x>199</x> |
| 203 | <y>690</y> | 228 | <y>690</y> |
| 204 | - <width>150</width> | 229 | + <width>641</width> |
| 205 | <height>51</height> | 230 | <height>51</height> |
| 206 | </rect> | 231 | </rect> |
| 207 | </property> | 232 | </property> |
| @@ -244,8 +269,10 @@ background-repeat: no-repeat; | @@ -244,8 +269,10 @@ background-repeat: no-repeat; | ||
| 244 | </property> | 269 | </property> |
| 245 | <property name="font"> | 270 | <property name="font"> |
| 246 | <font> | 271 | <font> |
| 247 | - <family>Malgun Gothic</family> | ||
| 248 | - <pointsize>11</pointsize> | 272 | + <family>Roboto</family> |
| 273 | + <pointsize>16</pointsize> | ||
| 274 | + <weight>75</weight> | ||
| 275 | + <bold>true</bold> | ||
| 249 | </font> | 276 | </font> |
| 250 | </property> | 277 | </property> |
| 251 | <property name="text"> | 278 | <property name="text"> |
| @@ -568,9 +595,9 @@ QPushButton:pressed { | @@ -568,9 +595,9 @@ QPushButton:pressed { | ||
| 568 | </property> | 595 | </property> |
| 569 | <property name="geometry"> | 596 | <property name="geometry"> |
| 570 | <rect> | 597 | <rect> |
| 571 | - <x>690</x> | 598 | + <x>199</x> |
| 572 | <y>850</y> | 599 | <y>850</y> |
| 573 | - <width>150</width> | 600 | + <width>641</width> |
| 574 | <height>51</height> | 601 | <height>51</height> |
| 575 | </rect> | 602 | </rect> |
| 576 | </property> | 603 | </property> |
| @@ -613,8 +640,10 @@ QPushButton:pressed { | @@ -613,8 +640,10 @@ QPushButton:pressed { | ||
| 613 | </property> | 640 | </property> |
| 614 | <property name="font"> | 641 | <property name="font"> |
| 615 | <font> | 642 | <font> |
| 616 | - <family>Malgun Gothic</family> | ||
| 617 | - <pointsize>11</pointsize> | 643 | + <family>Roboto</family> |
| 644 | + <pointsize>16</pointsize> | ||
| 645 | + <weight>75</weight> | ||
| 646 | + <bold>true</bold> | ||
| 618 | </font> | 647 | </font> |
| 619 | </property> | 648 | </property> |
| 620 | <property name="text"> | 649 | <property name="text"> |
| @@ -646,33 +675,6 @@ QPushButton:pressed { | @@ -646,33 +675,6 @@ QPushButton:pressed { | ||
| 646 | <height>33</height> | 675 | <height>33</height> |
| 647 | </rect> | 676 | </rect> |
| 648 | </property> | 677 | </property> |
| 649 | - <property name="styleSheet"> | ||
| 650 | - <string notr="true">QSlider::groove { | ||
| 651 | -background-image: url(:/images/images/manual/010_gauge_bar_bar.png); | ||
| 652 | -height: 25px; | ||
| 653 | -margin-bottom: 8px; | ||
| 654 | -} | ||
| 655 | - | ||
| 656 | -QSlider::sub-page { | ||
| 657 | -background-image: url(:/images/images/manual/010_gauge_bar_stick_01.png); | ||
| 658 | -height: 25px; | ||
| 659 | -margin-top: 5px; | ||
| 660 | -margin-left: 5px; | ||
| 661 | -margin-bottom: 13px; | ||
| 662 | -} | ||
| 663 | - | ||
| 664 | -QSlider::handle { | ||
| 665 | -background-image: url(:/images/images/manual/graphe_BTN_Bigsize.png); | ||
| 666 | -width: 23px; | ||
| 667 | -margin-bottom: -7px; | ||
| 668 | -} | ||
| 669 | - | ||
| 670 | -QSlider { | ||
| 671 | -background-image: url(:/images/images/auto/gau_04.png); | ||
| 672 | -background-repeat: no-repeat; | ||
| 673 | -} | ||
| 674 | -</string> | ||
| 675 | - </property> | ||
| 676 | <property name="maximum"> | 678 | <property name="maximum"> |
| 677 | <number>100</number> | 679 | <number>100</number> |
| 678 | </property> | 680 | </property> |
| @@ -680,7 +682,7 @@ background-repeat: no-repeat; | @@ -680,7 +682,7 @@ background-repeat: no-repeat; | ||
| 680 | <number>1</number> | 682 | <number>1</number> |
| 681 | </property> | 683 | </property> |
| 682 | <property name="value"> | 684 | <property name="value"> |
| 683 | - <number>0</number> | 685 | + <number>10</number> |
| 684 | </property> | 686 | </property> |
| 685 | <property name="tracking"> | 687 | <property name="tracking"> |
| 686 | <bool>true</bool> | 688 | <bool>true</bool> |
| @@ -842,9 +844,9 @@ QPushButton:pressed { | @@ -842,9 +844,9 @@ QPushButton:pressed { | ||
| 842 | </property> | 844 | </property> |
| 843 | <property name="geometry"> | 845 | <property name="geometry"> |
| 844 | <rect> | 846 | <rect> |
| 845 | - <x>690</x> | 847 | + <x>199</x> |
| 846 | <y>1020</y> | 848 | <y>1020</y> |
| 847 | - <width>150</width> | 849 | + <width>641</width> |
| 848 | <height>51</height> | 850 | <height>51</height> |
| 849 | </rect> | 851 | </rect> |
| 850 | </property> | 852 | </property> |
| @@ -887,8 +889,10 @@ QPushButton:pressed { | @@ -887,8 +889,10 @@ QPushButton:pressed { | ||
| 887 | </property> | 889 | </property> |
| 888 | <property name="font"> | 890 | <property name="font"> |
| 889 | <font> | 891 | <font> |
| 890 | - <family>Malgun Gothic</family> | ||
| 891 | - <pointsize>11</pointsize> | 892 | + <family>Roboto</family> |
| 893 | + <pointsize>16</pointsize> | ||
| 894 | + <weight>75</weight> | ||
| 895 | + <bold>true</bold> | ||
| 892 | </font> | 896 | </font> |
| 893 | </property> | 897 | </property> |
| 894 | <property name="text"> | 898 | <property name="text"> |
| @@ -920,33 +924,6 @@ QPushButton:pressed { | @@ -920,33 +924,6 @@ QPushButton:pressed { | ||
| 920 | <height>33</height> | 924 | <height>33</height> |
| 921 | </rect> | 925 | </rect> |
| 922 | </property> | 926 | </property> |
| 923 | - <property name="styleSheet"> | ||
| 924 | - <string notr="true">QSlider::groove { | ||
| 925 | -background-image: url(:/images/images/manual/010_gauge_bar_bar.png); | ||
| 926 | -height: 25px; | ||
| 927 | -margin-bottom: 8px; | ||
| 928 | -} | ||
| 929 | - | ||
| 930 | -QSlider::sub-page { | ||
| 931 | -background-image: url(:/images/images/manual/010_gauge_bar_stick_01.png); | ||
| 932 | -height: 25px; | ||
| 933 | -margin-top: 5px; | ||
| 934 | -margin-left: 5px; | ||
| 935 | -margin-bottom: 13px; | ||
| 936 | -} | ||
| 937 | - | ||
| 938 | -QSlider::handle { | ||
| 939 | -background-image: url(:/images/images/manual/graphe_BTN_Bigsize.png); | ||
| 940 | -width: 23px; | ||
| 941 | -margin-bottom: -7px; | ||
| 942 | -} | ||
| 943 | - | ||
| 944 | -QSlider { | ||
| 945 | -background-image: url(:/images/images/auto/gau_04.png); | ||
| 946 | -background-repeat: no-repeat; | ||
| 947 | -} | ||
| 948 | -</string> | ||
| 949 | - </property> | ||
| 950 | <property name="maximum"> | 927 | <property name="maximum"> |
| 951 | <number>100</number> | 928 | <number>100</number> |
| 952 | </property> | 929 | </property> |
| @@ -1116,9 +1093,9 @@ QPushButton:pressed { | @@ -1116,9 +1093,9 @@ QPushButton:pressed { | ||
| 1116 | </property> | 1093 | </property> |
| 1117 | <property name="geometry"> | 1094 | <property name="geometry"> |
| 1118 | <rect> | 1095 | <rect> |
| 1119 | - <x>690</x> | 1096 | + <x>199</x> |
| 1120 | <y>1200</y> | 1097 | <y>1200</y> |
| 1121 | - <width>150</width> | 1098 | + <width>641</width> |
| 1122 | <height>51</height> | 1099 | <height>51</height> |
| 1123 | </rect> | 1100 | </rect> |
| 1124 | </property> | 1101 | </property> |
| @@ -1161,8 +1138,10 @@ QPushButton:pressed { | @@ -1161,8 +1138,10 @@ QPushButton:pressed { | ||
| 1161 | </property> | 1138 | </property> |
| 1162 | <property name="font"> | 1139 | <property name="font"> |
| 1163 | <font> | 1140 | <font> |
| 1164 | - <family>Malgun Gothic</family> | ||
| 1165 | - <pointsize>11</pointsize> | 1141 | + <family>Roboto</family> |
| 1142 | + <pointsize>16</pointsize> | ||
| 1143 | + <weight>75</weight> | ||
| 1144 | + <bold>true</bold> | ||
| 1166 | </font> | 1145 | </font> |
| 1167 | </property> | 1146 | </property> |
| 1168 | <property name="text"> | 1147 | <property name="text"> |
| @@ -1194,33 +1173,6 @@ QPushButton:pressed { | @@ -1194,33 +1173,6 @@ QPushButton:pressed { | ||
| 1194 | <height>33</height> | 1173 | <height>33</height> |
| 1195 | </rect> | 1174 | </rect> |
| 1196 | </property> | 1175 | </property> |
| 1197 | - <property name="styleSheet"> | ||
| 1198 | - <string notr="true">QSlider::groove { | ||
| 1199 | -background-image: url(:/images/images/manual/010_gauge_bar_bar.png); | ||
| 1200 | -height: 25px; | ||
| 1201 | -margin-bottom: 8px; | ||
| 1202 | -} | ||
| 1203 | - | ||
| 1204 | -QSlider::sub-page { | ||
| 1205 | -background-image: url(:/images/images/manual/010_gauge_bar_stick_01.png); | ||
| 1206 | -height: 25px; | ||
| 1207 | -margin-top: 5px; | ||
| 1208 | -margin-left: 5px; | ||
| 1209 | -margin-bottom: 13px; | ||
| 1210 | -} | ||
| 1211 | - | ||
| 1212 | -QSlider::handle { | ||
| 1213 | -background-image: url(:/images/images/manual/graphe_BTN_Bigsize.png); | ||
| 1214 | -width: 23px; | ||
| 1215 | -margin-bottom: -7px; | ||
| 1216 | -} | ||
| 1217 | - | ||
| 1218 | -QSlider { | ||
| 1219 | -background-image: url(:/images/images/auto/gau_04.png); | ||
| 1220 | -background-repeat: no-repeat; | ||
| 1221 | -} | ||
| 1222 | -</string> | ||
| 1223 | - </property> | ||
| 1224 | <property name="maximum"> | 1176 | <property name="maximum"> |
| 1225 | <number>100</number> | 1177 | <number>100</number> |
| 1226 | </property> | 1178 | </property> |
| @@ -1390,9 +1342,9 @@ QPushButton:pressed { | @@ -1390,9 +1342,9 @@ QPushButton:pressed { | ||
| 1390 | </property> | 1342 | </property> |
| 1391 | <property name="geometry"> | 1343 | <property name="geometry"> |
| 1392 | <rect> | 1344 | <rect> |
| 1393 | - <x>690</x> | 1345 | + <x>189</x> |
| 1394 | <y>1370</y> | 1346 | <y>1370</y> |
| 1395 | - <width>150</width> | 1347 | + <width>651</width> |
| 1396 | <height>51</height> | 1348 | <height>51</height> |
| 1397 | </rect> | 1349 | </rect> |
| 1398 | </property> | 1350 | </property> |
| @@ -1435,8 +1387,10 @@ QPushButton:pressed { | @@ -1435,8 +1387,10 @@ QPushButton:pressed { | ||
| 1435 | </property> | 1387 | </property> |
| 1436 | <property name="font"> | 1388 | <property name="font"> |
| 1437 | <font> | 1389 | <font> |
| 1438 | - <family>Malgun Gothic</family> | ||
| 1439 | - <pointsize>11</pointsize> | 1390 | + <family>Roboto</family> |
| 1391 | + <pointsize>16</pointsize> | ||
| 1392 | + <weight>75</weight> | ||
| 1393 | + <bold>true</bold> | ||
| 1440 | </font> | 1394 | </font> |
| 1441 | </property> | 1395 | </property> |
| 1442 | <property name="text"> | 1396 | <property name="text"> |
| @@ -1468,33 +1422,6 @@ QPushButton:pressed { | @@ -1468,33 +1422,6 @@ QPushButton:pressed { | ||
| 1468 | <height>33</height> | 1422 | <height>33</height> |
| 1469 | </rect> | 1423 | </rect> |
| 1470 | </property> | 1424 | </property> |
| 1471 | - <property name="styleSheet"> | ||
| 1472 | - <string notr="true">QSlider::groove { | ||
| 1473 | -background-image: url(:/images/images/manual/010_gauge_bar_bar.png); | ||
| 1474 | -height: 25px; | ||
| 1475 | -margin-bottom: 8px; | ||
| 1476 | -} | ||
| 1477 | - | ||
| 1478 | -QSlider::sub-page { | ||
| 1479 | -background-image: url(:/images/images/manual/010_gauge_bar_stick_01.png); | ||
| 1480 | -height: 25px; | ||
| 1481 | -margin-top: 5px; | ||
| 1482 | -margin-left: 5px; | ||
| 1483 | -margin-bottom: 13px; | ||
| 1484 | -} | ||
| 1485 | - | ||
| 1486 | -QSlider::handle { | ||
| 1487 | -background-image: url(:/images/images/manual/graphe_BTN_Bigsize.png); | ||
| 1488 | -width: 23px; | ||
| 1489 | -margin-bottom: -7px; | ||
| 1490 | -} | ||
| 1491 | - | ||
| 1492 | -QSlider { | ||
| 1493 | -background-image: url(:/images/images/auto/gau_04.png); | ||
| 1494 | -background-repeat: no-repeat; | ||
| 1495 | -} | ||
| 1496 | -</string> | ||
| 1497 | - </property> | ||
| 1498 | <property name="maximum"> | 1425 | <property name="maximum"> |
| 1499 | <number>100</number> | 1426 | <number>100</number> |
| 1500 | </property> | 1427 | </property> |
| @@ -1664,18 +1591,18 @@ border-image: url(:/images/images/auto/btn_01_ov.png); | @@ -1664,18 +1591,18 @@ border-image: url(:/images/images/auto/btn_01_ov.png); | ||
| 1664 | <widget class="QPushButton" name="showPrevStepButton"> | 1591 | <widget class="QPushButton" name="showPrevStepButton"> |
| 1665 | <property name="geometry"> | 1592 | <property name="geometry"> |
| 1666 | <rect> | 1593 | <rect> |
| 1667 | - <x>20</x> | ||
| 1668 | - <y>860</y> | ||
| 1669 | - <width>38</width> | ||
| 1670 | - <height>60</height> | 1594 | + <x>10</x> |
| 1595 | + <y>715</y> | ||
| 1596 | + <width>60</width> | ||
| 1597 | + <height>400</height> | ||
| 1671 | </rect> | 1598 | </rect> |
| 1672 | </property> | 1599 | </property> |
| 1673 | <property name="styleSheet"> | 1600 | <property name="styleSheet"> |
| 1674 | <string notr="true">QPushButton { | 1601 | <string notr="true">QPushButton { |
| 1675 | -border-image: url(:/images/images/auto/time_window_02.png); | 1602 | +background-image: url(:/images/images/auto/time_window_02.png); |
| 1676 | } | 1603 | } |
| 1677 | QPushButton::pressed { | 1604 | QPushButton::pressed { |
| 1678 | -border-image: url(:/images/images/auto/window_arrow_01_expand.png); | 1605 | +background-image: url(:/images/images/auto/window_arrow_01_expand.png); |
| 1679 | }</string> | 1606 | }</string> |
| 1680 | </property> | 1607 | </property> |
| 1681 | <property name="text"> | 1608 | <property name="text"> |
| @@ -1685,18 +1612,18 @@ border-image: url(:/images/images/auto/window_arrow_01_expand.png); | @@ -1685,18 +1612,18 @@ border-image: url(:/images/images/auto/window_arrow_01_expand.png); | ||
| 1685 | <widget class="QPushButton" name="showNextStepButton"> | 1612 | <widget class="QPushButton" name="showNextStepButton"> |
| 1686 | <property name="geometry"> | 1613 | <property name="geometry"> |
| 1687 | <rect> | 1614 | <rect> |
| 1688 | - <x>840</x> | ||
| 1689 | - <y>850</y> | ||
| 1690 | - <width>38</width> | ||
| 1691 | - <height>60</height> | 1615 | + <x>830</x> |
| 1616 | + <y>715</y> | ||
| 1617 | + <width>60</width> | ||
| 1618 | + <height>400</height> | ||
| 1692 | </rect> | 1619 | </rect> |
| 1693 | </property> | 1620 | </property> |
| 1694 | <property name="styleSheet"> | 1621 | <property name="styleSheet"> |
| 1695 | <string notr="true">QPushButton { | 1622 | <string notr="true">QPushButton { |
| 1696 | -border-image: url(:/images/images/auto/time_window_03.png); | 1623 | +background-image: url(:/images/images/auto/time_window_03.png); |
| 1697 | } | 1624 | } |
| 1698 | QPushButton::pressed { | 1625 | QPushButton::pressed { |
| 1699 | -border-image: url(:/images/images/auto/window_arrow_02_expand.png); | 1626 | +background-image: url(:/images/images/auto/window_arrow_02_expand.png); |
| 1700 | }</string> | 1627 | }</string> |
| 1701 | </property> | 1628 | </property> |
| 1702 | <property name="text"> | 1629 | <property name="text"> |
| @@ -1899,7 +1826,7 @@ border-image: url(:/images/images/auto/window_icon_03_ov.png); | @@ -1899,7 +1826,7 @@ border-image: url(:/images/images/auto/window_icon_03_ov.png); | ||
| 1899 | <set>Qt::AlignCenter</set> | 1826 | <set>Qt::AlignCenter</set> |
| 1900 | </property> | 1827 | </property> |
| 1901 | </widget> | 1828 | </widget> |
| 1902 | - <widget class="AnimatedImageBox" name="animation"> | 1829 | + <widget class="AnimatedImageBox" name="openDoorAnimation"> |
| 1903 | <property name="geometry"> | 1830 | <property name="geometry"> |
| 1904 | <rect> | 1831 | <rect> |
| 1905 | <x>40</x> | 1832 | <x>40</x> |
| @@ -2067,8 +1994,10 @@ border-image: url(:/images/images/auto/window_icon_03_ov.png); | @@ -2067,8 +1994,10 @@ border-image: url(:/images/images/auto/window_icon_03_ov.png); | ||
| 2067 | </property> | 1994 | </property> |
| 2068 | <property name="font"> | 1995 | <property name="font"> |
| 2069 | <font> | 1996 | <font> |
| 2070 | - <family>Malgun Gothic</family> | ||
| 2071 | - <pointsize>14</pointsize> | 1997 | + <family>Roboto</family> |
| 1998 | + <pointsize>16</pointsize> | ||
| 1999 | + <weight>75</weight> | ||
| 2000 | + <bold>true</bold> | ||
| 2072 | </font> | 2001 | </font> |
| 2073 | </property> | 2002 | </property> |
| 2074 | <property name="text"> | 2003 | <property name="text"> |
| @@ -2126,8 +2055,10 @@ border-image: url(:/images/images/auto/window_icon_03_ov.png); | @@ -2126,8 +2055,10 @@ border-image: url(:/images/images/auto/window_icon_03_ov.png); | ||
| 2126 | </property> | 2055 | </property> |
| 2127 | <property name="font"> | 2056 | <property name="font"> |
| 2128 | <font> | 2057 | <font> |
| 2129 | - <family>Malgun Gothic</family> | ||
| 2130 | - <pointsize>14</pointsize> | 2058 | + <family>Roboto</family> |
| 2059 | + <pointsize>16</pointsize> | ||
| 2060 | + <weight>75</weight> | ||
| 2061 | + <bold>true</bold> | ||
| 2131 | </font> | 2062 | </font> |
| 2132 | </property> | 2063 | </property> |
| 2133 | <property name="text"> | 2064 | <property name="text"> |
| @@ -2185,8 +2116,8 @@ border-image: url(:/images/images/auto/window_icon_03_ov.png); | @@ -2185,8 +2116,8 @@ border-image: url(:/images/images/auto/window_icon_03_ov.png); | ||
| 2185 | </property> | 2116 | </property> |
| 2186 | <property name="font"> | 2117 | <property name="font"> |
| 2187 | <font> | 2118 | <font> |
| 2188 | - <family>Malgun Gothic</family> | ||
| 2189 | - <pointsize>14</pointsize> | 2119 | + <family>Roboto</family> |
| 2120 | + <pointsize>16</pointsize> | ||
| 2190 | <weight>75</weight> | 2121 | <weight>75</weight> |
| 2191 | <bold>true</bold> | 2122 | <bold>true</bold> |
| 2192 | </font> | 2123 | </font> |
| @@ -2243,8 +2174,8 @@ border-image: url(:/images/images/auto/window_icon_03_ov.png); | @@ -2243,8 +2174,8 @@ border-image: url(:/images/images/auto/window_icon_03_ov.png); | ||
| 2243 | </property> | 2174 | </property> |
| 2244 | <property name="font"> | 2175 | <property name="font"> |
| 2245 | <font> | 2176 | <font> |
| 2246 | - <family>Malgun Gothic</family> | ||
| 2247 | - <pointsize>14</pointsize> | 2177 | + <family>Roboto</family> |
| 2178 | + <pointsize>16</pointsize> | ||
| 2248 | <weight>75</weight> | 2179 | <weight>75</weight> |
| 2249 | <bold>true</bold> | 2180 | <bold>true</bold> |
| 2250 | </font> | 2181 | </font> |
| @@ -2341,6 +2272,185 @@ border-image: url(:/images/images/auto/window_icon_03_ov.png); | @@ -2341,6 +2272,185 @@ border-image: url(:/images/images/auto/window_icon_03_ov.png); | ||
| 2341 | <string/> | 2272 | <string/> |
| 2342 | </property> | 2273 | </property> |
| 2343 | </widget> | 2274 | </widget> |
| 2275 | + <widget class="PreheatTempGauge" name="preheatGauge" native="true"> | ||
| 2276 | + <property name="geometry"> | ||
| 2277 | + <rect> | ||
| 2278 | + <x>460</x> | ||
| 2279 | + <y>1360</y> | ||
| 2280 | + <width>415</width> | ||
| 2281 | + <height>58</height> | ||
| 2282 | + </rect> | ||
| 2283 | + </property> | ||
| 2284 | + </widget> | ||
| 2285 | + <widget class="QLabel" name="preheatIcon"> | ||
| 2286 | + <property name="geometry"> | ||
| 2287 | + <rect> | ||
| 2288 | + <x>260</x> | ||
| 2289 | + <y>1370</y> | ||
| 2290 | + <width>100</width> | ||
| 2291 | + <height>48</height> | ||
| 2292 | + </rect> | ||
| 2293 | + </property> | ||
| 2294 | + <property name="palette"> | ||
| 2295 | + <palette> | ||
| 2296 | + <active> | ||
| 2297 | + <colorrole role="WindowText"> | ||
| 2298 | + <brush brushstyle="SolidPattern"> | ||
| 2299 | + <color alpha="255"> | ||
| 2300 | + <red>255</red> | ||
| 2301 | + <green>255</green> | ||
| 2302 | + <blue>255</blue> | ||
| 2303 | + </color> | ||
| 2304 | + </brush> | ||
| 2305 | + </colorrole> | ||
| 2306 | + </active> | ||
| 2307 | + <inactive> | ||
| 2308 | + <colorrole role="WindowText"> | ||
| 2309 | + <brush brushstyle="SolidPattern"> | ||
| 2310 | + <color alpha="255"> | ||
| 2311 | + <red>255</red> | ||
| 2312 | + <green>255</green> | ||
| 2313 | + <blue>255</blue> | ||
| 2314 | + </color> | ||
| 2315 | + </brush> | ||
| 2316 | + </colorrole> | ||
| 2317 | + </inactive> | ||
| 2318 | + <disabled> | ||
| 2319 | + <colorrole role="WindowText"> | ||
| 2320 | + <brush brushstyle="SolidPattern"> | ||
| 2321 | + <color alpha="255"> | ||
| 2322 | + <red>123</red> | ||
| 2323 | + <green>123</green> | ||
| 2324 | + <blue>123</blue> | ||
| 2325 | + </color> | ||
| 2326 | + </brush> | ||
| 2327 | + </colorrole> | ||
| 2328 | + </disabled> | ||
| 2329 | + </palette> | ||
| 2330 | + </property> | ||
| 2331 | + <property name="font"> | ||
| 2332 | + <font> | ||
| 2333 | + <family>Malgun Gothic</family> | ||
| 2334 | + <pointsize>14</pointsize> | ||
| 2335 | + </font> | ||
| 2336 | + </property> | ||
| 2337 | + <property name="text"> | ||
| 2338 | + <string/> | ||
| 2339 | + </property> | ||
| 2340 | + <property name="pixmap"> | ||
| 2341 | + <pixmap resource="resources.qrc">:/images/images/auto/sys_icon_05.png</pixmap> | ||
| 2342 | + </property> | ||
| 2343 | + <property name="alignment"> | ||
| 2344 | + <set>Qt::AlignCenter</set> | ||
| 2345 | + </property> | ||
| 2346 | + </widget> | ||
| 2347 | + <widget class="QLabel" name="preheatLabel"> | ||
| 2348 | + <property name="geometry"> | ||
| 2349 | + <rect> | ||
| 2350 | + <x>330</x> | ||
| 2351 | + <y>1370</y> | ||
| 2352 | + <width>131</width> | ||
| 2353 | + <height>48</height> | ||
| 2354 | + </rect> | ||
| 2355 | + </property> | ||
| 2356 | + <property name="palette"> | ||
| 2357 | + <palette> | ||
| 2358 | + <active> | ||
| 2359 | + <colorrole role="WindowText"> | ||
| 2360 | + <brush brushstyle="SolidPattern"> | ||
| 2361 | + <color alpha="255"> | ||
| 2362 | + <red>255</red> | ||
| 2363 | + <green>255</green> | ||
| 2364 | + <blue>255</blue> | ||
| 2365 | + </color> | ||
| 2366 | + </brush> | ||
| 2367 | + </colorrole> | ||
| 2368 | + </active> | ||
| 2369 | + <inactive> | ||
| 2370 | + <colorrole role="WindowText"> | ||
| 2371 | + <brush brushstyle="SolidPattern"> | ||
| 2372 | + <color alpha="255"> | ||
| 2373 | + <red>255</red> | ||
| 2374 | + <green>255</green> | ||
| 2375 | + <blue>255</blue> | ||
| 2376 | + </color> | ||
| 2377 | + </brush> | ||
| 2378 | + </colorrole> | ||
| 2379 | + </inactive> | ||
| 2380 | + <disabled> | ||
| 2381 | + <colorrole role="WindowText"> | ||
| 2382 | + <brush brushstyle="SolidPattern"> | ||
| 2383 | + <color alpha="255"> | ||
| 2384 | + <red>123</red> | ||
| 2385 | + <green>123</green> | ||
| 2386 | + <blue>123</blue> | ||
| 2387 | + </color> | ||
| 2388 | + </brush> | ||
| 2389 | + </colorrole> | ||
| 2390 | + </disabled> | ||
| 2391 | + </palette> | ||
| 2392 | + </property> | ||
| 2393 | + <property name="font"> | ||
| 2394 | + <font> | ||
| 2395 | + <family>Malgun Gothic</family> | ||
| 2396 | + <pointsize>14</pointsize> | ||
| 2397 | + </font> | ||
| 2398 | + </property> | ||
| 2399 | + <property name="text"> | ||
| 2400 | + <string>예열 중</string> | ||
| 2401 | + </property> | ||
| 2402 | + <property name="alignment"> | ||
| 2403 | + <set>Qt::AlignCenter</set> | ||
| 2404 | + </property> | ||
| 2405 | + </widget> | ||
| 2406 | + <widget class="AnimatedImageBox" name="closeDoorAnimation"> | ||
| 2407 | + <property name="geometry"> | ||
| 2408 | + <rect> | ||
| 2409 | + <x>40</x> | ||
| 2410 | + <y>1220</y> | ||
| 2411 | + <width>251</width> | ||
| 2412 | + <height>201</height> | ||
| 2413 | + </rect> | ||
| 2414 | + </property> | ||
| 2415 | + <property name="text"> | ||
| 2416 | + <string/> | ||
| 2417 | + </property> | ||
| 2418 | + <property name="pixmap"> | ||
| 2419 | + <pixmap resource="resources.qrc">:/images/images/auto/ani_04.png</pixmap> | ||
| 2420 | + </property> | ||
| 2421 | + </widget> | ||
| 2422 | + <widget class="QLabel" name="closeDoorArrow"> | ||
| 2423 | + <property name="geometry"> | ||
| 2424 | + <rect> | ||
| 2425 | + <x>80</x> | ||
| 2426 | + <y>1320</y> | ||
| 2427 | + <width>85</width> | ||
| 2428 | + <height>24</height> | ||
| 2429 | + </rect> | ||
| 2430 | + </property> | ||
| 2431 | + <property name="text"> | ||
| 2432 | + <string/> | ||
| 2433 | + </property> | ||
| 2434 | + <property name="pixmap"> | ||
| 2435 | + <pixmap resource="resources.qrc">:/images/images/auto/object_arrow_002.png</pixmap> | ||
| 2436 | + </property> | ||
| 2437 | + </widget> | ||
| 2438 | + <widget class="QLabel" name="openDoorArrow"> | ||
| 2439 | + <property name="geometry"> | ||
| 2440 | + <rect> | ||
| 2441 | + <x>80</x> | ||
| 2442 | + <y>1320</y> | ||
| 2443 | + <width>85</width> | ||
| 2444 | + <height>24</height> | ||
| 2445 | + </rect> | ||
| 2446 | + </property> | ||
| 2447 | + <property name="text"> | ||
| 2448 | + <string/> | ||
| 2449 | + </property> | ||
| 2450 | + <property name="pixmap"> | ||
| 2451 | + <pixmap resource="resources.qrc">:/images/images/auto/object_arrow_001.png</pixmap> | ||
| 2452 | + </property> | ||
| 2453 | + </widget> | ||
| 2344 | </widget> | 2454 | </widget> |
| 2345 | <widget class="QWidget" name="selectionPage"> | 2455 | <widget class="QWidget" name="selectionPage"> |
| 2346 | <property name="styleSheet"> | 2456 | <property name="styleSheet"> |
| @@ -2367,6 +2477,98 @@ background-image: url(:/images/images/config_service/001_01_background_under_dow | @@ -2367,6 +2477,98 @@ background-image: url(:/images/images/config_service/001_01_background_under_dow | ||
| 2367 | <widget class="QPushButton" name="backButton"> | 2477 | <widget class="QPushButton" name="backButton"> |
| 2368 | <property name="geometry"> | 2478 | <property name="geometry"> |
| 2369 | <rect> | 2479 | <rect> |
| 2480 | + <x>175</x> | ||
| 2481 | + <y>26</y> | ||
| 2482 | + <width>97</width> | ||
| 2483 | + <height>97</height> | ||
| 2484 | + </rect> | ||
| 2485 | + </property> | ||
| 2486 | + <property name="sizePolicy"> | ||
| 2487 | + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> | ||
| 2488 | + <horstretch>0</horstretch> | ||
| 2489 | + <verstretch>0</verstretch> | ||
| 2490 | + </sizepolicy> | ||
| 2491 | + </property> | ||
| 2492 | + <property name="styleSheet"> | ||
| 2493 | + <string notr="true">QPushButton { border-image: url(:/images/images/auto/006_sys_icon_03.png); } | ||
| 2494 | +QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_03_ov.png); }</string> | ||
| 2495 | + </property> | ||
| 2496 | + <property name="text"> | ||
| 2497 | + <string/> | ||
| 2498 | + </property> | ||
| 2499 | + </widget> | ||
| 2500 | + <widget class="QPushButton" name="backButton_3"> | ||
| 2501 | + <property name="geometry"> | ||
| 2502 | + <rect> | ||
| 2503 | + <x>514</x> | ||
| 2504 | + <y>26</y> | ||
| 2505 | + <width>97</width> | ||
| 2506 | + <height>97</height> | ||
| 2507 | + </rect> | ||
| 2508 | + </property> | ||
| 2509 | + <property name="sizePolicy"> | ||
| 2510 | + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> | ||
| 2511 | + <horstretch>0</horstretch> | ||
| 2512 | + <verstretch>0</verstretch> | ||
| 2513 | + </sizepolicy> | ||
| 2514 | + </property> | ||
| 2515 | + <property name="styleSheet"> | ||
| 2516 | + <string notr="true">QPushButton { border-image: url(:/images/images/auto/006_sys_icon_05.png); } | ||
| 2517 | +QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_05_ov.png); }</string> | ||
| 2518 | + </property> | ||
| 2519 | + <property name="text"> | ||
| 2520 | + <string/> | ||
| 2521 | + </property> | ||
| 2522 | + </widget> | ||
| 2523 | + <widget class="QPushButton" name="backButton_2"> | ||
| 2524 | + <property name="geometry"> | ||
| 2525 | + <rect> | ||
| 2526 | + <x>288</x> | ||
| 2527 | + <y>26</y> | ||
| 2528 | + <width>97</width> | ||
| 2529 | + <height>97</height> | ||
| 2530 | + </rect> | ||
| 2531 | + </property> | ||
| 2532 | + <property name="sizePolicy"> | ||
| 2533 | + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> | ||
| 2534 | + <horstretch>0</horstretch> | ||
| 2535 | + <verstretch>0</verstretch> | ||
| 2536 | + </sizepolicy> | ||
| 2537 | + </property> | ||
| 2538 | + <property name="styleSheet"> | ||
| 2539 | + <string notr="true">QPushButton { border-image: url(:/images/images/auto/006_sys_icon_01.png); } | ||
| 2540 | +QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_01_ov.png); }</string> | ||
| 2541 | + </property> | ||
| 2542 | + <property name="text"> | ||
| 2543 | + <string/> | ||
| 2544 | + </property> | ||
| 2545 | + </widget> | ||
| 2546 | + <widget class="QPushButton" name="backButton_4"> | ||
| 2547 | + <property name="geometry"> | ||
| 2548 | + <rect> | ||
| 2549 | + <x>627</x> | ||
| 2550 | + <y>26</y> | ||
| 2551 | + <width>97</width> | ||
| 2552 | + <height>97</height> | ||
| 2553 | + </rect> | ||
| 2554 | + </property> | ||
| 2555 | + <property name="sizePolicy"> | ||
| 2556 | + <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> | ||
| 2557 | + <horstretch>0</horstretch> | ||
| 2558 | + <verstretch>0</verstretch> | ||
| 2559 | + </sizepolicy> | ||
| 2560 | + </property> | ||
| 2561 | + <property name="styleSheet"> | ||
| 2562 | + <string notr="true">QPushButton { border-image: url(:/images/images/auto/006_sys_icon_02.png); } | ||
| 2563 | +QPushButton:pressed { border-image: url(:/images/images/auto/006_sys_icon_02_ov.png); }</string> | ||
| 2564 | + </property> | ||
| 2565 | + <property name="text"> | ||
| 2566 | + <string/> | ||
| 2567 | + </property> | ||
| 2568 | + </widget> | ||
| 2569 | + <widget class="QPushButton" name="backButton_5"> | ||
| 2570 | + <property name="geometry"> | ||
| 2571 | + <rect> | ||
| 2370 | <x>401</x> | 2572 | <x>401</x> |
| 2371 | <y>26</y> | 2573 | <y>26</y> |
| 2372 | <width>97</width> | 2574 | <width>97</width> |
| @@ -2380,8 +2582,7 @@ background-image: url(:/images/images/config_service/001_01_background_under_dow | @@ -2380,8 +2582,7 @@ background-image: url(:/images/images/config_service/001_01_background_under_dow | ||
| 2380 | </sizepolicy> | 2582 | </sizepolicy> |
| 2381 | </property> | 2583 | </property> |
| 2382 | <property name="styleSheet"> | 2584 | <property name="styleSheet"> |
| 2383 | - <string notr="true">QPushButton { border-image: url(:/images/images/config_service/006_sys_icon_03.png); } | ||
| 2384 | -QPushButton:pressed { border-image: url(:/images/images/config_service/006_sys_icon_03_ov.png); }</string> | 2585 | + <string notr="true"/> |
| 2385 | </property> | 2586 | </property> |
| 2386 | <property name="text"> | 2587 | <property name="text"> |
| 2387 | <string/> | 2588 | <string/> |
| @@ -2417,6 +2618,12 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/006_sys_i | @@ -2417,6 +2618,12 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/006_sys_i | ||
| 2417 | <header>heatcirculargauge.h</header> | 2618 | <header>heatcirculargauge.h</header> |
| 2418 | <container>1</container> | 2619 | <container>1</container> |
| 2419 | </customwidget> | 2620 | </customwidget> |
| 2621 | + <customwidget> | ||
| 2622 | + <class>PreheatTempGauge</class> | ||
| 2623 | + <extends>QWidget</extends> | ||
| 2624 | + <header>preheattempgauge.h</header> | ||
| 2625 | + <container>1</container> | ||
| 2626 | + </customwidget> | ||
| 2420 | </customwidgets> | 2627 | </customwidgets> |
| 2421 | <resources> | 2628 | <resources> |
| 2422 | <include location="resources.qrc"/> | 2629 | <include location="resources.qrc"/> |
app/gui/oven_control/burnertestwindow.cpp
| @@ -8,7 +8,9 @@ BurnerTestWindow::BurnerTestWindow(QWidget *parent, UdpHandler *udp) : | @@ -8,7 +8,9 @@ BurnerTestWindow::BurnerTestWindow(QWidget *parent, UdpHandler *udp) : | ||
| 8 | ui(new Ui::BurnerTestWindow), udp(udp) | 8 | ui(new Ui::BurnerTestWindow), udp(udp) |
| 9 | { | 9 | { |
| 10 | ui->setupUi(this); | 10 | ui->setupUi(this); |
| 11 | + | ||
| 11 | ui->clockContainer->setParent(ui->upperStack); | 12 | ui->clockContainer->setParent(ui->upperStack); |
| 13 | + setAttribute(Qt::WA_DeleteOnClose); | ||
| 12 | 14 | ||
| 13 | steamTimer.setInterval(5 * 60 * 1000); | 15 | steamTimer.setInterval(5 * 60 * 1000); |
| 14 | upperTimer.setInterval(5 * 60 * 1000); | 16 | upperTimer.setInterval(5 * 60 * 1000); |
| @@ -141,7 +143,7 @@ void BurnerTestWindow::on_backButton_clicked() | @@ -141,7 +143,7 @@ void BurnerTestWindow::on_backButton_clicked() | ||
| 141 | udp->turnOff(TG_MANUAL_BURNER3); | 143 | udp->turnOff(TG_MANUAL_BURNER3); |
| 142 | udp->turnOff(TG_SYSTEM); | 144 | udp->turnOff(TG_SYSTEM); |
| 143 | 145 | ||
| 144 | - deleteLater(); | 146 | + close(); |
| 145 | } | 147 | } |
| 146 | 148 | ||
| 147 | void BurnerTestWindow::steamOn() | 149 | void BurnerTestWindow::steamOn() |
app/gui/oven_control/componenttestwindow.cpp
| @@ -6,7 +6,10 @@ ComponentTestWindow::ComponentTestWindow(QWidget *parent, UdpHandler *udp) : | @@ -6,7 +6,10 @@ ComponentTestWindow::ComponentTestWindow(QWidget *parent, UdpHandler *udp) : | ||
| 6 | ui(new Ui::ComponentTestWindow), udp(udp) | 6 | ui(new Ui::ComponentTestWindow), udp(udp) |
| 7 | { | 7 | { |
| 8 | ui->setupUi(this); | 8 | ui->setupUi(this); |
| 9 | + | ||
| 9 | ui->clockContainer->setParent(ui->upperStack); | 10 | ui->clockContainer->setParent(ui->upperStack); |
| 11 | + setAttribute(Qt::WA_DeleteOnClose); | ||
| 12 | + | ||
| 10 | connect(udp, SIGNAL(changed()), this, SLOT(onDataChanged())); | 13 | connect(udp, SIGNAL(changed()), this, SLOT(onDataChanged())); |
| 11 | 14 | ||
| 12 | damperTimer.setInterval(10 * 1000); | 15 | damperTimer.setInterval(10 * 1000); |
| @@ -71,7 +74,7 @@ void ComponentTestWindow::on_backButton_clicked() | @@ -71,7 +74,7 @@ void ComponentTestWindow::on_backButton_clicked() | ||
| 71 | udp->turnOff(TG_MANUAL_RELAY); | 74 | udp->turnOff(TG_MANUAL_RELAY); |
| 72 | udp->turnOff(TG_SYSTEM); | 75 | udp->turnOff(TG_SYSTEM); |
| 73 | 76 | ||
| 74 | - deleteLater(); | 77 | + close(); |
| 75 | } | 78 | } |
| 76 | 79 | ||
| 77 | void ComponentTestWindow::lampOn() | 80 | void ComponentTestWindow::lampOn() |
app/gui/oven_control/configwindow.cpp
| @@ -8,6 +8,9 @@ ConfigWindow::ConfigWindow(QWidget *parent, UdpHandler *udp) : | @@ -8,6 +8,9 @@ ConfigWindow::ConfigWindow(QWidget *parent, UdpHandler *udp) : | ||
| 8 | ui(new Ui::ConfigWindow), udp(udp) | 8 | ui(new Ui::ConfigWindow), udp(udp) |
| 9 | { | 9 | { |
| 10 | ui->setupUi(this); | 10 | ui->setupUi(this); |
| 11 | + | ||
| 12 | + ui->clockContainer->setParent(ui->upperStack); | ||
| 13 | + setAttribute(Qt::WA_DeleteOnClose); | ||
| 11 | } | 14 | } |
| 12 | 15 | ||
| 13 | ConfigWindow::~ConfigWindow() | 16 | ConfigWindow::~ConfigWindow() |
app/gui/oven_control/cook.cpp
| @@ -40,6 +40,11 @@ bool AbstractCook::interTempEnabled() | @@ -40,6 +40,11 @@ bool AbstractCook::interTempEnabled() | ||
| 40 | return interTempEnabled_; | 40 | return interTempEnabled_; |
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | +void AbstractCook::setInterTempEnabled(bool enabled) | ||
| 44 | +{ | ||
| 45 | + interTempEnabled_ = enabled; | ||
| 46 | +} | ||
| 47 | + | ||
| 43 | int AbstractCook::interTemp() | 48 | int AbstractCook::interTemp() |
| 44 | { | 49 | { |
| 45 | int t = interTemp_; | 50 | int t = interTemp_; |
| @@ -462,7 +467,7 @@ MeatPie::MeatPie() | @@ -462,7 +467,7 @@ MeatPie::MeatPie() | ||
| 462 | stepList[3] = { Cook::CoolDown, Cook::DryMode, 100, 120 }; | 467 | stepList[3] = { Cook::CoolDown, Cook::DryMode, 100, 120 }; |
| 463 | stepList[4] = { Cook::Bake, Cook::DryMode, 40, 120 }; | 468 | stepList[4] = { Cook::Bake, Cook::DryMode, 40, 120 }; |
| 464 | 469 | ||
| 465 | - time_ = 77 * 60; | 470 | + time_ = 1 * 60; |
| 466 | interTempEnabled_ = true; | 471 | interTempEnabled_ = true; |
| 467 | interTemp_ = 62; | 472 | interTemp_ = 62; |
| 468 | 473 |
app/gui/oven_control/cook.h
| @@ -132,6 +132,7 @@ public: | @@ -132,6 +132,7 @@ public: | ||
| 132 | QString name(); | 132 | QString name(); |
| 133 | int time(); | 133 | int time(); |
| 134 | bool interTempEnabled(); | 134 | bool interTempEnabled(); |
| 135 | + void setInterTempEnabled(bool enabled); | ||
| 135 | int interTemp(); | 136 | int interTemp(); |
| 136 | 137 | ||
| 137 | Cook::Step currentStep(); | 138 | Cook::Step currentStep(); |
app/gui/oven_control/fantestwindow.cpp
| @@ -6,7 +6,10 @@ FanTestWindow::FanTestWindow(QWidget *parent, UdpHandler *udp) : | @@ -6,7 +6,10 @@ FanTestWindow::FanTestWindow(QWidget *parent, UdpHandler *udp) : | ||
| 6 | ui(new Ui::FanTestWindow), udp(udp) | 6 | ui(new Ui::FanTestWindow), udp(udp) |
| 7 | { | 7 | { |
| 8 | ui->setupUi(this); | 8 | ui->setupUi(this); |
| 9 | + | ||
| 9 | ui->clockContainer->setParent(ui->upperStack); | 10 | ui->clockContainer->setParent(ui->upperStack); |
| 11 | + setAttribute(Qt::WA_DeleteOnClose); | ||
| 12 | + | ||
| 10 | connect(udp, SIGNAL(changed()), this, SLOT(onDataChanged())); | 13 | connect(udp, SIGNAL(changed()), this, SLOT(onDataChanged())); |
| 11 | 14 | ||
| 12 | currentFan = Fan1; | 15 | currentFan = Fan1; |
app/gui/oven_control/functiontestwindow.cpp
| @@ -13,7 +13,10 @@ FunctionTestWindow::FunctionTestWindow(QWidget *parent, UdpHandler *udp) : | @@ -13,7 +13,10 @@ FunctionTestWindow::FunctionTestWindow(QWidget *parent, UdpHandler *udp) : | ||
| 13 | ui(new Ui::FunctionTestWindow), udp(udp) | 13 | ui(new Ui::FunctionTestWindow), udp(udp) |
| 14 | { | 14 | { |
| 15 | ui->setupUi(this); | 15 | ui->setupUi(this); |
| 16 | + | ||
| 16 | ui->clockContainer->setParent(ui->upperStack); | 17 | ui->clockContainer->setParent(ui->upperStack); |
| 18 | + setAttribute(Qt::WA_DeleteOnClose); | ||
| 19 | + | ||
| 17 | connect(ui->backButton, SIGNAL(clicked(bool)), this, SLOT(deleteLater())); | 20 | connect(ui->backButton, SIGNAL(clicked(bool)), this, SLOT(deleteLater())); |
| 18 | } | 21 | } |
| 19 | 22 | ||
| @@ -54,6 +57,6 @@ void FunctionTestWindow::on_fanTestButton_clicked() | @@ -54,6 +57,6 @@ void FunctionTestWindow::on_fanTestButton_clicked() | ||
| 54 | 57 | ||
| 55 | void FunctionTestWindow::on_gasTestButton_clicked() | 58 | void FunctionTestWindow::on_gasTestButton_clicked() |
| 56 | { | 59 | { |
| 57 | -// GasTestWindow *w = new GasTestWindow(this, udp); | ||
| 58 | -// w->showFullScreen(); | 60 | + GasTestWindow *w = new GasTestWindow(this, udp); |
| 61 | + w->showFullScreen(); | ||
| 59 | } | 62 | } |
app/gui/oven_control/functiontestwindow.ui
| @@ -87,8 +87,6 @@ background-image: url(:/images/images/config/001_01_background_time.png); | @@ -87,8 +87,6 @@ background-image: url(:/images/images/config/001_01_background_time.png); | ||
| 87 | <pointsize>10</pointsize> | 87 | <pointsize>10</pointsize> |
| 88 | <weight>75</weight> | 88 | <weight>75</weight> |
| 89 | <bold>true</bold> | 89 | <bold>true</bold> |
| 90 | - <strikeout>false</strikeout> | ||
| 91 | - <kerning>false</kerning> | ||
| 92 | </font> | 90 | </font> |
| 93 | </property> | 91 | </property> |
| 94 | <property name="styleSheet"> | 92 | <property name="styleSheet"> |
| @@ -120,8 +118,6 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e | @@ -120,8 +118,6 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e | ||
| 120 | <pointsize>10</pointsize> | 118 | <pointsize>10</pointsize> |
| 121 | <weight>75</weight> | 119 | <weight>75</weight> |
| 122 | <bold>true</bold> | 120 | <bold>true</bold> |
| 123 | - <strikeout>false</strikeout> | ||
| 124 | - <kerning>false</kerning> | ||
| 125 | </font> | 121 | </font> |
| 126 | </property> | 122 | </property> |
| 127 | <property name="styleSheet"> | 123 | <property name="styleSheet"> |
| @@ -153,8 +149,6 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e | @@ -153,8 +149,6 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e | ||
| 153 | <pointsize>10</pointsize> | 149 | <pointsize>10</pointsize> |
| 154 | <weight>75</weight> | 150 | <weight>75</weight> |
| 155 | <bold>true</bold> | 151 | <bold>true</bold> |
| 156 | - <strikeout>false</strikeout> | ||
| 157 | - <kerning>false</kerning> | ||
| 158 | </font> | 152 | </font> |
| 159 | </property> | 153 | </property> |
| 160 | <property name="styleSheet"> | 154 | <property name="styleSheet"> |
| @@ -186,8 +180,6 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e | @@ -186,8 +180,6 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e | ||
| 186 | <pointsize>10</pointsize> | 180 | <pointsize>10</pointsize> |
| 187 | <weight>75</weight> | 181 | <weight>75</weight> |
| 188 | <bold>true</bold> | 182 | <bold>true</bold> |
| 189 | - <strikeout>false</strikeout> | ||
| 190 | - <kerning>false</kerning> | ||
| 191 | </font> | 183 | </font> |
| 192 | </property> | 184 | </property> |
| 193 | <property name="styleSheet"> | 185 | <property name="styleSheet"> |
| @@ -219,8 +211,6 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e | @@ -219,8 +211,6 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e | ||
| 219 | <pointsize>10</pointsize> | 211 | <pointsize>10</pointsize> |
| 220 | <weight>75</weight> | 212 | <weight>75</weight> |
| 221 | <bold>true</bold> | 213 | <bold>true</bold> |
| 222 | - <strikeout>false</strikeout> | ||
| 223 | - <kerning>false</kerning> | ||
| 224 | </font> | 214 | </font> |
| 225 | </property> | 215 | </property> |
| 226 | <property name="styleSheet"> | 216 | <property name="styleSheet"> |
| @@ -252,8 +242,6 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e | @@ -252,8 +242,6 @@ QPushButton:pressed { border-image: url(:/images/images/config_service/090_set_e | ||
| 252 | <pointsize>10</pointsize> | 242 | <pointsize>10</pointsize> |
| 253 | <weight>75</weight> | 243 | <weight>75</weight> |
| 254 | <bold>true</bold> | 244 | <bold>true</bold> |
| 255 | - <strikeout>false</strikeout> | ||
| 256 | - <kerning>false</kerning> | ||
| 257 | </font> | 245 | </font> |
| 258 | </property> | 246 | </property> |
| 259 | <property name="styleSheet"> | 247 | <property name="styleSheet"> |
app/gui/oven_control/gastestwindow.cpp
| @@ -6,7 +6,10 @@ GasTestWindow::GasTestWindow(QWidget *parent, UdpHandler *udp) : | @@ -6,7 +6,10 @@ GasTestWindow::GasTestWindow(QWidget *parent, UdpHandler *udp) : | ||
| 6 | ui(new Ui::GasTestWindow), udp(udp) | 6 | ui(new Ui::GasTestWindow), udp(udp) |
| 7 | { | 7 | { |
| 8 | ui->setupUi(this); | 8 | ui->setupUi(this); |
| 9 | + | ||
| 9 | ui->clockContainer->setParent(ui->upperStack); | 10 | ui->clockContainer->setParent(ui->upperStack); |
| 11 | + setAttribute(Qt::WA_DeleteOnClose); | ||
| 12 | + | ||
| 10 | connect(udp, SIGNAL(changed()), this, SLOT(onDataChanged())); | 13 | connect(udp, SIGNAL(changed()), this, SLOT(onDataChanged())); |
| 11 | } | 14 | } |
| 12 | 15 | ||
| @@ -19,3 +22,8 @@ void GasTestWindow::onDataChanged() | @@ -19,3 +22,8 @@ void GasTestWindow::onDataChanged() | ||
| 19 | { | 22 | { |
| 20 | 23 | ||
| 21 | } | 24 | } |
| 25 | + | ||
| 26 | +void GasTestWindow::on_backButton_clicked() | ||
| 27 | +{ | ||
| 28 | + close(); | ||
| 29 | +} |
app/gui/oven_control/gastestwindow.h
app/gui/oven_control/images/auto/object_arrow_001.png
4.48 KB
app/gui/oven_control/images/auto/object_arrow_002.png
4.49 KB
app/gui/oven_control/images/auto/sys_icon_01_gau.png
3.47 KB
app/gui/oven_control/images/auto/sys_icon_01_ov.png
6.69 KB
app/gui/oven_control/images/test/bgi-1.BMP
No preview for this file type
app/gui/oven_control/images/test/bgi-1.png
32.8 KB
app/gui/oven_control/images/test/bgi-2.png
13.2 KB
app/gui/oven_control/mainwindow.cpp
| @@ -26,6 +26,15 @@ MainWindow::MainWindow(QWidget *parent) : | @@ -26,6 +26,15 @@ MainWindow::MainWindow(QWidget *parent) : | ||
| 26 | qDebug() << udp->init(); | 26 | qDebug() << udp->init(); |
| 27 | interface->setUdpHandler(udp); | 27 | interface->setUdpHandler(udp); |
| 28 | 28 | ||
| 29 | + QSignalMapper *sm = new QSignalMapper(this); | ||
| 30 | + sm->setMapping(ui->steamButton, (int) Oven::SteamMode); | ||
| 31 | + sm->setMapping(ui->combiButton, (int) Oven::CombinationMode); | ||
| 32 | + sm->setMapping(ui->dryheatButton, (int) Oven::HeatMode); | ||
| 33 | + connect(ui->steamButton, SIGNAL(clicked()), sm, SLOT(map())); | ||
| 34 | + connect(ui->combiButton, SIGNAL(clicked()), sm, SLOT(map())); | ||
| 35 | + connect(ui->dryheatButton, SIGNAL(clicked()), sm, SLOT(map())); | ||
| 36 | + connect(sm, SIGNAL(mapped(int)), this, SLOT(onModeButtonClicked(int))); | ||
| 37 | + | ||
| 29 | ManualCookWindow *window = new ManualCookWindow(this, oven, udp); | 38 | ManualCookWindow *window = new ManualCookWindow(this, oven, udp); |
| 30 | window->setWindowModality(Qt::WindowModal); | 39 | window->setWindowModality(Qt::WindowModal); |
| 31 | window->hide(); | 40 | window->hide(); |
| @@ -36,15 +45,6 @@ MainWindow::MainWindow(QWidget *parent) : | @@ -36,15 +45,6 @@ MainWindow::MainWindow(QWidget *parent) : | ||
| 36 | 45 | ||
| 37 | connect(this, SIGNAL(modeButtonClicked()), window, SLOT(showFullScreen())); | 46 | connect(this, SIGNAL(modeButtonClicked()), window, SLOT(showFullScreen())); |
| 38 | connect(this, SIGNAL(modeButtonClicked()), window, SLOT(raise())); | 47 | connect(this, SIGNAL(modeButtonClicked()), window, SLOT(raise())); |
| 39 | - | ||
| 40 | - QSignalMapper *sm = new QSignalMapper(this); | ||
| 41 | - sm->setMapping(ui->steamButton, (int) Oven::SteamMode); | ||
| 42 | - sm->setMapping(ui->combiButton, (int) Oven::CombinationMode); | ||
| 43 | - sm->setMapping(ui->dryheatButton, (int) Oven::HeatMode); | ||
| 44 | - connect(ui->steamButton, SIGNAL(clicked()), sm, SLOT(map())); | ||
| 45 | - connect(ui->combiButton, SIGNAL(clicked()), sm, SLOT(map())); | ||
| 46 | - connect(ui->dryheatButton, SIGNAL(clicked()), sm, SLOT(map())); | ||
| 47 | - connect(sm, SIGNAL(mapped(int)), this, SLOT(onModeButtonClicked(int))); | ||
| 48 | } | 48 | } |
| 49 | 49 | ||
| 50 | MainWindow::~MainWindow() | 50 | MainWindow::~MainWindow() |
app/gui/oven_control/mainwindow.ui
| @@ -22,6 +22,45 @@ | @@ -22,6 +22,45 @@ | ||
| 22 | <property name="autoFillBackground"> | 22 | <property name="autoFillBackground"> |
| 23 | <bool>true</bool> | 23 | <bool>true</bool> |
| 24 | </property> | 24 | </property> |
| 25 | + <property name="styleSheet"> | ||
| 26 | + <string notr="true">QPushButton[style="mode"] { | ||
| 27 | +background-repeat: no-repeat; | ||
| 28 | +background-position: center; | ||
| 29 | +background-clip: border; | ||
| 30 | +background-origin: border; | ||
| 31 | +margin-bottom: 50px; | ||
| 32 | + | ||
| 33 | +border-top: 200px; | ||
| 34 | +border-bottom: -50px; | ||
| 35 | +border-style: hidden; | ||
| 36 | +color: white; | ||
| 37 | +font-size: 40px; | ||
| 38 | +} | ||
| 39 | + | ||
| 40 | +QPushButton[style="type"] { | ||
| 41 | +background-repeat: no-repeat; | ||
| 42 | +background-position: center; | ||
| 43 | +background-clip: border; | ||
| 44 | +background-origin: border; | ||
| 45 | + | ||
| 46 | +border-top: 165px; | ||
| 47 | +border-style: hidden; | ||
| 48 | +color: white; | ||
| 49 | +font-size: 30px; | ||
| 50 | +} | ||
| 51 | + | ||
| 52 | +QPushButton[style="function"] { | ||
| 53 | +background-repeat: no-repeat; | ||
| 54 | +background-position: center; | ||
| 55 | +background-clip: border; | ||
| 56 | +background-origin: border; | ||
| 57 | + | ||
| 58 | +border-top: 206px; | ||
| 59 | +border-style: hidden; | ||
| 60 | +color: white; | ||
| 61 | +font-size: 30px; | ||
| 62 | +}</string> | ||
| 63 | + </property> | ||
| 25 | <widget class="QWidget" name="centralWidget"> | 64 | <widget class="QWidget" name="centralWidget"> |
| 26 | <property name="sizePolicy"> | 65 | <property name="sizePolicy"> |
| 27 | <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> | 66 | <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> |
| @@ -63,7 +102,7 @@ | @@ -63,7 +102,7 @@ | ||
| 63 | <widget class="QPushButton" name="configButton"> | 102 | <widget class="QPushButton" name="configButton"> |
| 64 | <property name="geometry"> | 103 | <property name="geometry"> |
| 65 | <rect> | 104 | <rect> |
| 66 | - <x>343</x> | 105 | + <x>345</x> |
| 67 | <y>26</y> | 106 | <y>26</y> |
| 68 | <width>97</width> | 107 | <width>97</width> |
| 69 | <height>97</height> | 108 | <height>97</height> |
| @@ -97,7 +136,7 @@ QPushButton:pressed { | @@ -97,7 +136,7 @@ QPushButton:pressed { | ||
| 97 | <widget class="QPushButton" name="helpButton"> | 136 | <widget class="QPushButton" name="helpButton"> |
| 98 | <property name="geometry"> | 137 | <property name="geometry"> |
| 99 | <rect> | 138 | <rect> |
| 100 | - <x>460</x> | 139 | + <x>458</x> |
| 101 | <y>26</y> | 140 | <y>26</y> |
| 102 | <width>97</width> | 141 | <width>97</width> |
| 103 | <height>97</height> | 142 | <height>97</height> |
| @@ -132,10 +171,10 @@ QPushButton:pressed { | @@ -132,10 +171,10 @@ QPushButton:pressed { | ||
| 132 | <widget class="QPushButton" name="multiButton"> | 171 | <widget class="QPushButton" name="multiButton"> |
| 133 | <property name="geometry"> | 172 | <property name="geometry"> |
| 134 | <rect> | 173 | <rect> |
| 135 | - <x>109</x> | ||
| 136 | - <y>1251</y> | ||
| 137 | - <width>83</width> | ||
| 138 | - <height>113</height> | 174 | + <x>0</x> |
| 175 | + <y>1164</y> | ||
| 176 | + <width>300</width> | ||
| 177 | + <height>286</height> | ||
| 139 | </rect> | 178 | </rect> |
| 140 | </property> | 179 | </property> |
| 141 | <property name="sizePolicy"> | 180 | <property name="sizePolicy"> |
| @@ -144,32 +183,29 @@ QPushButton:pressed { | @@ -144,32 +183,29 @@ QPushButton:pressed { | ||
| 144 | <verstretch>0</verstretch> | 183 | <verstretch>0</verstretch> |
| 145 | </sizepolicy> | 184 | </sizepolicy> |
| 146 | </property> | 185 | </property> |
| 147 | - <property name="minimumSize"> | ||
| 148 | - <size> | ||
| 149 | - <width>62</width> | ||
| 150 | - <height>71</height> | ||
| 151 | - </size> | ||
| 152 | - </property> | ||
| 153 | <property name="styleSheet"> | 186 | <property name="styleSheet"> |
| 154 | - <string notr="true">QPushButton#multiButton { | ||
| 155 | - border-image: url(:/images/images/main/005_auto_icon_09.png); | 187 | + <string notr="true">QPushButton { |
| 188 | + background-image: url(:/images/images/main/005_auto_icon_09.png); | ||
| 156 | } | 189 | } |
| 157 | 190 | ||
| 158 | -QPushButton#multiButton:pressed { | ||
| 159 | - border-image: url(:/images/images/main/005_auto_icon_09_ov.png); | 191 | +QPushButton:pressed { |
| 192 | + background-image: url(:/images/images/main/005_auto_icon_09_ov.png); | ||
| 160 | }</string> | 193 | }</string> |
| 161 | </property> | 194 | </property> |
| 162 | <property name="text"> | 195 | <property name="text"> |
| 163 | - <string/> | 196 | + <string>다중요리</string> |
| 197 | + </property> | ||
| 198 | + <property name="style" stdset="0"> | ||
| 199 | + <string>function</string> | ||
| 164 | </property> | 200 | </property> |
| 165 | </widget> | 201 | </widget> |
| 166 | <widget class="QPushButton" name="programmingButton"> | 202 | <widget class="QPushButton" name="programmingButton"> |
| 167 | <property name="geometry"> | 203 | <property name="geometry"> |
| 168 | <rect> | 204 | <rect> |
| 169 | - <x>403</x> | ||
| 170 | - <y>1254</y> | ||
| 171 | - <width>94</width> | ||
| 172 | - <height>107</height> | 205 | + <x>300</x> |
| 206 | + <y>1164</y> | ||
| 207 | + <width>300</width> | ||
| 208 | + <height>286</height> | ||
| 173 | </rect> | 209 | </rect> |
| 174 | </property> | 210 | </property> |
| 175 | <property name="sizePolicy"> | 211 | <property name="sizePolicy"> |
| @@ -178,32 +214,29 @@ QPushButton#multiButton:pressed { | @@ -178,32 +214,29 @@ QPushButton#multiButton:pressed { | ||
| 178 | <verstretch>0</verstretch> | 214 | <verstretch>0</verstretch> |
| 179 | </sizepolicy> | 215 | </sizepolicy> |
| 180 | </property> | 216 | </property> |
| 181 | - <property name="minimumSize"> | ||
| 182 | - <size> | ||
| 183 | - <width>62</width> | ||
| 184 | - <height>71</height> | ||
| 185 | - </size> | ||
| 186 | - </property> | ||
| 187 | <property name="styleSheet"> | 217 | <property name="styleSheet"> |
| 188 | - <string notr="true">QPushButton#programmingButton { | ||
| 189 | - border-image: url(:/images/images/main/005_auto_icon_10.png); | 218 | + <string notr="true">QPushButton { |
| 219 | + background-image: url(:/images/images/main/005_auto_icon_10.png); | ||
| 190 | } | 220 | } |
| 191 | 221 | ||
| 192 | -QPushButton#programmingButton:pressed { | ||
| 193 | - border-image: url(:/images/images/main/005_auto_icon_10_ov.png); | 222 | +QPushButton:pressed { |
| 223 | + background-image: url(:/images/images/main/005_auto_icon_10_ov.png); | ||
| 194 | }</string> | 224 | }</string> |
| 195 | </property> | 225 | </property> |
| 196 | <property name="text"> | 226 | <property name="text"> |
| 197 | - <string/> | 227 | + <string>프로그래밍모드</string> |
| 228 | + </property> | ||
| 229 | + <property name="style" stdset="0"> | ||
| 230 | + <string>function</string> | ||
| 198 | </property> | 231 | </property> |
| 199 | </widget> | 232 | </widget> |
| 200 | <widget class="QPushButton" name="washButton"> | 233 | <widget class="QPushButton" name="washButton"> |
| 201 | <property name="geometry"> | 234 | <property name="geometry"> |
| 202 | <rect> | 235 | <rect> |
| 203 | - <x>702</x> | ||
| 204 | - <y>1262</y> | ||
| 205 | - <width>97</width> | ||
| 206 | - <height>91</height> | 236 | + <x>600</x> |
| 237 | + <y>1164</y> | ||
| 238 | + <width>300</width> | ||
| 239 | + <height>286</height> | ||
| 207 | </rect> | 240 | </rect> |
| 208 | </property> | 241 | </property> |
| 209 | <property name="sizePolicy"> | 242 | <property name="sizePolicy"> |
| @@ -212,23 +245,20 @@ QPushButton#programmingButton:pressed { | @@ -212,23 +245,20 @@ QPushButton#programmingButton:pressed { | ||
| 212 | <verstretch>0</verstretch> | 245 | <verstretch>0</verstretch> |
| 213 | </sizepolicy> | 246 | </sizepolicy> |
| 214 | </property> | 247 | </property> |
| 215 | - <property name="minimumSize"> | ||
| 216 | - <size> | ||
| 217 | - <width>62</width> | ||
| 218 | - <height>71</height> | ||
| 219 | - </size> | ||
| 220 | - </property> | ||
| 221 | <property name="styleSheet"> | 248 | <property name="styleSheet"> |
| 222 | - <string notr="true">QPushButton#washButton { | ||
| 223 | - border-image: url(:/images/images/main/005_auto_icon_11.png); | 249 | + <string notr="true">QPushButton { |
| 250 | + background-image: url(:/images/images/main/005_auto_icon_11.png); | ||
| 224 | } | 251 | } |
| 225 | 252 | ||
| 226 | -QPushButton#washButton:pressed { | ||
| 227 | - border-image: url(:/images/images/main/005_auto_icon_11_ov.png); | 253 | +QPushButton:pressed { |
| 254 | + background-image: url(:/images/images/main/005_auto_icon_11_ov.png); | ||
| 228 | }</string> | 255 | }</string> |
| 229 | </property> | 256 | </property> |
| 230 | <property name="text"> | 257 | <property name="text"> |
| 231 | - <string/> | 258 | + <string>세척모드</string> |
| 259 | + </property> | ||
| 260 | + <property name="style" stdset="0"> | ||
| 261 | + <string>function</string> | ||
| 232 | </property> | 262 | </property> |
| 233 | </widget> | 263 | </widget> |
| 234 | <widget class="QWidget" name="horizontalBar" native="true"> | 264 | <widget class="QWidget" name="horizontalBar" native="true"> |
| @@ -327,112 +357,84 @@ QPushButton#washButton:pressed { | @@ -327,112 +357,84 @@ QPushButton#washButton:pressed { | ||
| 327 | <widget class="QPushButton" name="dryheatButton"> | 357 | <widget class="QPushButton" name="dryheatButton"> |
| 328 | <property name="geometry"> | 358 | <property name="geometry"> |
| 329 | <rect> | 359 | <rect> |
| 330 | - <x>686</x> | ||
| 331 | - <y>479</y> | ||
| 332 | - <width>129</width> | ||
| 333 | - <height>128</height> | 360 | + <x>600</x> |
| 361 | + <y>426</y> | ||
| 362 | + <width>300</width> | ||
| 363 | + <height>293</height> | ||
| 334 | </rect> | 364 | </rect> |
| 335 | </property> | 365 | </property> |
| 336 | - <property name="minimumSize"> | ||
| 337 | - <size> | ||
| 338 | - <width>129</width> | ||
| 339 | - <height>128</height> | ||
| 340 | - </size> | ||
| 341 | - </property> | ||
| 342 | - <property name="maximumSize"> | ||
| 343 | - <size> | ||
| 344 | - <width>129</width> | ||
| 345 | - <height>128</height> | ||
| 346 | - </size> | ||
| 347 | - </property> | ||
| 348 | <property name="styleSheet"> | 366 | <property name="styleSheet"> |
| 349 | - <string notr="true">QPushButton#dryheatButton { | ||
| 350 | - border-image: url(:/images/images/main/003_dryheat_icon.png); | 367 | + <string notr="true">QPushButton { |
| 368 | +background-image: url(:/images/images/main/003_dryheat_icon.png); | ||
| 351 | } | 369 | } |
| 352 | 370 | ||
| 353 | -QPushButton#dryheatButton:pressed { | ||
| 354 | - border-image: url(:/images/images/main/003_dryheat_icon_ov.png); | 371 | +QPushButton:pressed { |
| 372 | +background-image: url(:/images/images/main/003_dryheat_icon_ov.png); | ||
| 355 | }</string> | 373 | }</string> |
| 356 | </property> | 374 | </property> |
| 357 | <property name="text"> | 375 | <property name="text"> |
| 358 | - <string/> | 376 | + <string>건열</string> |
| 377 | + </property> | ||
| 378 | + <property name="style" stdset="0"> | ||
| 379 | + <string>mode</string> | ||
| 359 | </property> | 380 | </property> |
| 360 | </widget> | 381 | </widget> |
| 361 | <widget class="QPushButton" name="combiButton"> | 382 | <widget class="QPushButton" name="combiButton"> |
| 362 | <property name="geometry"> | 383 | <property name="geometry"> |
| 363 | <rect> | 384 | <rect> |
| 364 | - <x>386</x> | ||
| 365 | - <y>479</y> | ||
| 366 | - <width>129</width> | ||
| 367 | - <height>128</height> | 385 | + <x>300</x> |
| 386 | + <y>426</y> | ||
| 387 | + <width>300</width> | ||
| 388 | + <height>293</height> | ||
| 368 | </rect> | 389 | </rect> |
| 369 | </property> | 390 | </property> |
| 370 | - <property name="minimumSize"> | ||
| 371 | - <size> | ||
| 372 | - <width>129</width> | ||
| 373 | - <height>128</height> | ||
| 374 | - </size> | ||
| 375 | - </property> | ||
| 376 | - <property name="maximumSize"> | ||
| 377 | - <size> | ||
| 378 | - <width>129</width> | ||
| 379 | - <height>128</height> | ||
| 380 | - </size> | ||
| 381 | - </property> | ||
| 382 | <property name="styleSheet"> | 391 | <property name="styleSheet"> |
| 383 | - <string notr="true">QPushButton#combiButton { | ||
| 384 | - border-image: url(:/images/images/main/003_combi_icon.png); | 392 | + <string notr="true">QPushButton { |
| 393 | +background-image: url(:/images/images/main/003_combi_icon.png); | ||
| 385 | } | 394 | } |
| 386 | 395 | ||
| 387 | -QPushButton#combiButton:pressed { | ||
| 388 | - border-image: url(:/images/images/main/003_combi_icon_ov.png); | 396 | +QPushButton:pressed { |
| 397 | + background-image: url(:/images/images/main/003_combi_icon_ov.png); | ||
| 389 | }</string> | 398 | }</string> |
| 390 | </property> | 399 | </property> |
| 391 | <property name="text"> | 400 | <property name="text"> |
| 392 | - <string/> | 401 | + <string>콤비</string> |
| 402 | + </property> | ||
| 403 | + <property name="style" stdset="0"> | ||
| 404 | + <string>mode</string> | ||
| 393 | </property> | 405 | </property> |
| 394 | </widget> | 406 | </widget> |
| 395 | <widget class="QPushButton" name="steamButton"> | 407 | <widget class="QPushButton" name="steamButton"> |
| 396 | <property name="geometry"> | 408 | <property name="geometry"> |
| 397 | <rect> | 409 | <rect> |
| 398 | - <x>86</x> | ||
| 399 | - <y>479</y> | ||
| 400 | - <width>129</width> | ||
| 401 | - <height>128</height> | 410 | + <x>0</x> |
| 411 | + <y>426</y> | ||
| 412 | + <width>300</width> | ||
| 413 | + <height>293</height> | ||
| 402 | </rect> | 414 | </rect> |
| 403 | </property> | 415 | </property> |
| 404 | - <property name="minimumSize"> | ||
| 405 | - <size> | ||
| 406 | - <width>129</width> | ||
| 407 | - <height>128</height> | ||
| 408 | - </size> | ||
| 409 | - </property> | ||
| 410 | - <property name="maximumSize"> | ||
| 411 | - <size> | ||
| 412 | - <width>129</width> | ||
| 413 | - <height>128</height> | ||
| 414 | - </size> | ||
| 415 | - </property> | ||
| 416 | <property name="styleSheet"> | 416 | <property name="styleSheet"> |
| 417 | - <string notr="true">QPushButton#steamButton { | ||
| 418 | - border-image: url(:/images/images/main/003_steam_icon.png); | 417 | + <string notr="true">QPushButton { |
| 418 | +background-image: url(:/images/images/main/003_steam_icon.png); | ||
| 419 | } | 419 | } |
| 420 | - | ||
| 421 | -QPushButton#steamButton:pressed { | ||
| 422 | - border-image: url(:/images/images/main/003_steam_icon_ov.png); | 420 | +QPushButton:pressed { |
| 421 | +background-image: url(:/images/images/main/003_steam_icon_ov.png); | ||
| 423 | }</string> | 422 | }</string> |
| 424 | </property> | 423 | </property> |
| 425 | <property name="text"> | 424 | <property name="text"> |
| 426 | - <string/> | 425 | + <string>스팀</string> |
| 426 | + </property> | ||
| 427 | + <property name="style" stdset="0"> | ||
| 428 | + <string>mode</string> | ||
| 427 | </property> | 429 | </property> |
| 428 | </widget> | 430 | </widget> |
| 429 | <widget class="QPushButton" name="meatButton"> | 431 | <widget class="QPushButton" name="meatButton"> |
| 430 | <property name="geometry"> | 432 | <property name="geometry"> |
| 431 | <rect> | 433 | <rect> |
| 432 | - <x>273</x> | ||
| 433 | - <y>797</y> | ||
| 434 | - <width>129</width> | ||
| 435 | - <height>69</height> | 434 | + <x>225</x> |
| 435 | + <y>720</y> | ||
| 436 | + <width>225</width> | ||
| 437 | + <height>222</height> | ||
| 436 | </rect> | 438 | </rect> |
| 437 | </property> | 439 | </property> |
| 438 | <property name="sizePolicy"> | 440 | <property name="sizePolicy"> |
| @@ -441,32 +443,29 @@ QPushButton#steamButton:pressed { | @@ -441,32 +443,29 @@ QPushButton#steamButton:pressed { | ||
| 441 | <verstretch>0</verstretch> | 443 | <verstretch>0</verstretch> |
| 442 | </sizepolicy> | 444 | </sizepolicy> |
| 443 | </property> | 445 | </property> |
| 444 | - <property name="minimumSize"> | ||
| 445 | - <size> | ||
| 446 | - <width>129</width> | ||
| 447 | - <height>69</height> | ||
| 448 | - </size> | ||
| 449 | - </property> | ||
| 450 | <property name="styleSheet"> | 446 | <property name="styleSheet"> |
| 451 | - <string notr="true">QPushButton#meatButton { | ||
| 452 | - border-image: url(:/images/images/main/005_auto_icon_02.png); | 447 | + <string notr="true">QPushButton { |
| 448 | +background-image: url(:/images/images/main/005_auto_icon_02.png); | ||
| 453 | } | 449 | } |
| 454 | 450 | ||
| 455 | -QPushButton#meatButton:pressed { | ||
| 456 | - border-image: url(:/images/images/main/005_auto_icon_02_ov.png); | 451 | +QPushButton:pressed { |
| 452 | +background-image: url(:/images/images/main/005_auto_icon_02_ov.png); | ||
| 457 | }</string> | 453 | }</string> |
| 458 | </property> | 454 | </property> |
| 459 | <property name="text"> | 455 | <property name="text"> |
| 460 | - <string/> | 456 | + <string>육류</string> |
| 457 | + </property> | ||
| 458 | + <property name="style" stdset="0"> | ||
| 459 | + <string>type</string> | ||
| 461 | </property> | 460 | </property> |
| 462 | </widget> | 461 | </widget> |
| 463 | <widget class="QPushButton" name="dessertButton"> | 462 | <widget class="QPushButton" name="dessertButton"> |
| 464 | <property name="geometry"> | 463 | <property name="geometry"> |
| 465 | <rect> | 464 | <rect> |
| 466 | - <x>749</x> | ||
| 467 | - <y>793</y> | ||
| 468 | - <width>77</width> | ||
| 469 | - <height>81</height> | 465 | + <x>675</x> |
| 466 | + <y>720</y> | ||
| 467 | + <width>225</width> | ||
| 468 | + <height>222</height> | ||
| 470 | </rect> | 469 | </rect> |
| 471 | </property> | 470 | </property> |
| 472 | <property name="sizePolicy"> | 471 | <property name="sizePolicy"> |
| @@ -475,32 +474,29 @@ QPushButton#meatButton:pressed { | @@ -475,32 +474,29 @@ QPushButton#meatButton:pressed { | ||
| 475 | <verstretch>0</verstretch> | 474 | <verstretch>0</verstretch> |
| 476 | </sizepolicy> | 475 | </sizepolicy> |
| 477 | </property> | 476 | </property> |
| 478 | - <property name="minimumSize"> | ||
| 479 | - <size> | ||
| 480 | - <width>77</width> | ||
| 481 | - <height>81</height> | ||
| 482 | - </size> | ||
| 483 | - </property> | ||
| 484 | <property name="styleSheet"> | 477 | <property name="styleSheet"> |
| 485 | - <string notr="true">QPushButton#dessertButton { | ||
| 486 | - border-image: url(:/images/images/main/005_auto_icon_04.png); | 478 | + <string notr="true">QPushButton { |
| 479 | + background-image: url(:/images/images/main/005_auto_icon_04.png); | ||
| 487 | } | 480 | } |
| 488 | 481 | ||
| 489 | -QPushButton#dessertButton:pressed { | ||
| 490 | - border-image: url(:/images/images/main/005_auto_icon_04_ov.png); | 482 | +QPushButton:pressed { |
| 483 | + background-image: url(:/images/images/main/005_auto_icon_04_ov.png); | ||
| 491 | }</string> | 484 | }</string> |
| 492 | </property> | 485 | </property> |
| 493 | <property name="text"> | 486 | <property name="text"> |
| 494 | - <string/> | 487 | + <string>디저트류</string> |
| 488 | + </property> | ||
| 489 | + <property name="style" stdset="0"> | ||
| 490 | + <string>type</string> | ||
| 495 | </property> | 491 | </property> |
| 496 | </widget> | 492 | </widget> |
| 497 | <widget class="QPushButton" name="etcButton"> | 493 | <widget class="QPushButton" name="etcButton"> |
| 498 | <property name="geometry"> | 494 | <property name="geometry"> |
| 499 | <rect> | 495 | <rect> |
| 500 | - <x>519</x> | ||
| 501 | - <y>1012</y> | ||
| 502 | - <width>87</width> | ||
| 503 | - <height>82</height> | 496 | + <x>450</x> |
| 497 | + <y>942</y> | ||
| 498 | + <width>225</width> | ||
| 499 | + <height>222</height> | ||
| 504 | </rect> | 500 | </rect> |
| 505 | </property> | 501 | </property> |
| 506 | <property name="sizePolicy"> | 502 | <property name="sizePolicy"> |
| @@ -509,32 +505,29 @@ QPushButton#dessertButton:pressed { | @@ -509,32 +505,29 @@ QPushButton#dessertButton:pressed { | ||
| 509 | <verstretch>0</verstretch> | 505 | <verstretch>0</verstretch> |
| 510 | </sizepolicy> | 506 | </sizepolicy> |
| 511 | </property> | 507 | </property> |
| 512 | - <property name="minimumSize"> | ||
| 513 | - <size> | ||
| 514 | - <width>87</width> | ||
| 515 | - <height>82</height> | ||
| 516 | - </size> | ||
| 517 | - </property> | ||
| 518 | <property name="styleSheet"> | 508 | <property name="styleSheet"> |
| 519 | - <string notr="true">QPushButton#etcButton { | ||
| 520 | - border-image: url(:/images/images/main/005_auto_icon_07.png); | 509 | + <string notr="true">QPushButton { |
| 510 | + background-image: url(:/images/images/main/005_auto_icon_07.png); | ||
| 521 | } | 511 | } |
| 522 | 512 | ||
| 523 | -QPushButton#etcButton:pressed { | ||
| 524 | - border-image: url(:/images/images/main/005_auto_icon_07_ov.png); | 513 | +QPushButton:pressed { |
| 514 | + background-image: url(:/images/images/main/005_auto_icon_07_ov.png); | ||
| 525 | }</string> | 515 | }</string> |
| 526 | </property> | 516 | </property> |
| 527 | <property name="text"> | 517 | <property name="text"> |
| 528 | - <string/> | 518 | + <string>기타요리</string> |
| 519 | + </property> | ||
| 520 | + <property name="style" stdset="0"> | ||
| 521 | + <string>type</string> | ||
| 529 | </property> | 522 | </property> |
| 530 | </widget> | 523 | </widget> |
| 531 | <widget class="QPushButton" name="grainButton"> | 524 | <widget class="QPushButton" name="grainButton"> |
| 532 | <property name="geometry"> | 525 | <property name="geometry"> |
| 533 | <rect> | 526 | <rect> |
| 534 | - <x>58</x> | ||
| 535 | - <y>1009</y> | ||
| 536 | - <width>109</width> | ||
| 537 | - <height>89</height> | 527 | + <x>0</x> |
| 528 | + <y>942</y> | ||
| 529 | + <width>225</width> | ||
| 530 | + <height>222</height> | ||
| 538 | </rect> | 531 | </rect> |
| 539 | </property> | 532 | </property> |
| 540 | <property name="sizePolicy"> | 533 | <property name="sizePolicy"> |
| @@ -543,32 +536,29 @@ QPushButton#etcButton:pressed { | @@ -543,32 +536,29 @@ QPushButton#etcButton:pressed { | ||
| 543 | <verstretch>0</verstretch> | 536 | <verstretch>0</verstretch> |
| 544 | </sizepolicy> | 537 | </sizepolicy> |
| 545 | </property> | 538 | </property> |
| 546 | - <property name="minimumSize"> | ||
| 547 | - <size> | ||
| 548 | - <width>109</width> | ||
| 549 | - <height>89</height> | ||
| 550 | - </size> | ||
| 551 | - </property> | ||
| 552 | <property name="styleSheet"> | 539 | <property name="styleSheet"> |
| 553 | - <string notr="true">QPushButton#grainButton { | ||
| 554 | - border-image: url(:/images/images/main/005_auto_icon_05.png); | 540 | + <string notr="true">QPushButton { |
| 541 | + background-image: url(:/images/images/main/005_auto_icon_05.png); | ||
| 555 | } | 542 | } |
| 556 | 543 | ||
| 557 | -QPushButton#grainButton:pressed { | ||
| 558 | - border-image: url(:/images/images/main/005_auto_icon_05_ov.png); | 544 | +QPushButton:pressed { |
| 545 | + background-image: url(:/images/images/main/005_auto_icon_05_ov.png); | ||
| 559 | }</string> | 546 | }</string> |
| 560 | </property> | 547 | </property> |
| 561 | <property name="text"> | 548 | <property name="text"> |
| 562 | - <string/> | 549 | + <string>채소및곡류</string> |
| 550 | + </property> | ||
| 551 | + <property name="style" stdset="0"> | ||
| 552 | + <string>type</string> | ||
| 563 | </property> | 553 | </property> |
| 564 | </widget> | 554 | </widget> |
| 565 | <widget class="QPushButton" name="poultryButton"> | 555 | <widget class="QPushButton" name="poultryButton"> |
| 566 | <property name="geometry"> | 556 | <property name="geometry"> |
| 567 | <rect> | 557 | <rect> |
| 568 | - <x>49</x> | ||
| 569 | - <y>788</y> | ||
| 570 | - <width>127</width> | ||
| 571 | - <height>87</height> | 558 | + <x>0</x> |
| 559 | + <y>720</y> | ||
| 560 | + <width>225</width> | ||
| 561 | + <height>222</height> | ||
| 572 | </rect> | 562 | </rect> |
| 573 | </property> | 563 | </property> |
| 574 | <property name="sizePolicy"> | 564 | <property name="sizePolicy"> |
| @@ -577,32 +567,29 @@ QPushButton#grainButton:pressed { | @@ -577,32 +567,29 @@ QPushButton#grainButton:pressed { | ||
| 577 | <verstretch>0</verstretch> | 567 | <verstretch>0</verstretch> |
| 578 | </sizepolicy> | 568 | </sizepolicy> |
| 579 | </property> | 569 | </property> |
| 580 | - <property name="minimumSize"> | ||
| 581 | - <size> | ||
| 582 | - <width>127</width> | ||
| 583 | - <height>87</height> | ||
| 584 | - </size> | ||
| 585 | - </property> | ||
| 586 | <property name="styleSheet"> | 570 | <property name="styleSheet"> |
| 587 | - <string notr="true">QPushButton#poultryButton { | ||
| 588 | - border-image: url(:/images/images/main/005_auto_icon_01.png); | 571 | + <string notr="true">QPushButton { |
| 572 | +background-image: url(:/images/images/main/005_auto_icon_01.png); | ||
| 589 | } | 573 | } |
| 590 | 574 | ||
| 591 | -QPushButton#poultryButton:pressed { | ||
| 592 | - border-image: url(:/images/images/main/005_auto_icon_01_ov.png); | 575 | +QPushButton:pressed { |
| 576 | +background-image: url(:/images/images/main/005_auto_icon_01_ov.png); | ||
| 593 | }</string> | 577 | }</string> |
| 594 | </property> | 578 | </property> |
| 595 | <property name="text"> | 579 | <property name="text"> |
| 596 | - <string/> | 580 | + <string>가금류</string> |
| 581 | + </property> | ||
| 582 | + <property name="style" stdset="0"> | ||
| 583 | + <string>type</string> | ||
| 597 | </property> | 584 | </property> |
| 598 | </widget> | 585 | </widget> |
| 599 | <widget class="QPushButton" name="fishButton"> | 586 | <widget class="QPushButton" name="fishButton"> |
| 600 | <property name="geometry"> | 587 | <property name="geometry"> |
| 601 | <rect> | 588 | <rect> |
| 602 | - <x>499</x> | ||
| 603 | - <y>798</y> | ||
| 604 | - <width>127</width> | ||
| 605 | - <height>67</height> | 589 | + <x>450</x> |
| 590 | + <y>720</y> | ||
| 591 | + <width>225</width> | ||
| 592 | + <height>222</height> | ||
| 606 | </rect> | 593 | </rect> |
| 607 | </property> | 594 | </property> |
| 608 | <property name="sizePolicy"> | 595 | <property name="sizePolicy"> |
| @@ -611,32 +598,29 @@ QPushButton#poultryButton:pressed { | @@ -611,32 +598,29 @@ QPushButton#poultryButton:pressed { | ||
| 611 | <verstretch>0</verstretch> | 598 | <verstretch>0</verstretch> |
| 612 | </sizepolicy> | 599 | </sizepolicy> |
| 613 | </property> | 600 | </property> |
| 614 | - <property name="minimumSize"> | ||
| 615 | - <size> | ||
| 616 | - <width>127</width> | ||
| 617 | - <height>67</height> | ||
| 618 | - </size> | ||
| 619 | - </property> | ||
| 620 | <property name="styleSheet"> | 601 | <property name="styleSheet"> |
| 621 | - <string notr="true">QPushButton#fishButton { | ||
| 622 | - border-image: url(:/images/images/main/005_auto_icon_03.png); | 602 | + <string notr="true">QPushButton { |
| 603 | + background-image: url(:/images/images/main/005_auto_icon_03.png); | ||
| 623 | } | 604 | } |
| 624 | 605 | ||
| 625 | -QPushButton#fishButton:pressed { | ||
| 626 | - border-image: url(:/images/images/main/005_auto_icon_03_ov.png); | 606 | +QPushButton:pressed { |
| 607 | + background-image: url(:/images/images/main/005_auto_icon_03_ov.png); | ||
| 627 | }</string> | 608 | }</string> |
| 628 | </property> | 609 | </property> |
| 629 | <property name="text"> | 610 | <property name="text"> |
| 630 | - <string/> | 611 | + <string>생선류</string> |
| 612 | + </property> | ||
| 613 | + <property name="style" stdset="0"> | ||
| 614 | + <string>type</string> | ||
| 631 | </property> | 615 | </property> |
| 632 | </widget> | 616 | </widget> |
| 633 | <widget class="QPushButton" name="breadButton"> | 617 | <widget class="QPushButton" name="breadButton"> |
| 634 | <property name="geometry"> | 618 | <property name="geometry"> |
| 635 | <rect> | 619 | <rect> |
| 636 | - <x>291</x> | ||
| 637 | - <y>1017</y> | ||
| 638 | - <width>93</width> | ||
| 639 | - <height>73</height> | 620 | + <x>225</x> |
| 621 | + <y>942</y> | ||
| 622 | + <width>225</width> | ||
| 623 | + <height>222</height> | ||
| 640 | </rect> | 624 | </rect> |
| 641 | </property> | 625 | </property> |
| 642 | <property name="sizePolicy"> | 626 | <property name="sizePolicy"> |
| @@ -645,32 +629,29 @@ QPushButton#fishButton:pressed { | @@ -645,32 +629,29 @@ QPushButton#fishButton:pressed { | ||
| 645 | <verstretch>0</verstretch> | 629 | <verstretch>0</verstretch> |
| 646 | </sizepolicy> | 630 | </sizepolicy> |
| 647 | </property> | 631 | </property> |
| 648 | - <property name="minimumSize"> | ||
| 649 | - <size> | ||
| 650 | - <width>93</width> | ||
| 651 | - <height>73</height> | ||
| 652 | - </size> | ||
| 653 | - </property> | ||
| 654 | <property name="styleSheet"> | 632 | <property name="styleSheet"> |
| 655 | - <string notr="true">QPushButton#breadButton { | ||
| 656 | - border-image: url(:/images/images/main/005_auto_icon_06.png); | 633 | + <string notr="true">QPushButton { |
| 634 | + background-image: url(:/images/images/main/005_auto_icon_06.png); | ||
| 657 | } | 635 | } |
| 658 | 636 | ||
| 659 | -QPushButton#breadButton:pressed { | ||
| 660 | - border-image: url(:/images/images/main/005_auto_icon_06_ov.png); | 637 | +QPushButton:pressed { |
| 638 | + background-image: url(:/images/images/main/005_auto_icon_06_ov.png); | ||
| 661 | }</string> | 639 | }</string> |
| 662 | </property> | 640 | </property> |
| 663 | <property name="text"> | 641 | <property name="text"> |
| 664 | - <string/> | 642 | + <string>제과제빵류</string> |
| 643 | + </property> | ||
| 644 | + <property name="style" stdset="0"> | ||
| 645 | + <string>type</string> | ||
| 665 | </property> | 646 | </property> |
| 666 | </widget> | 647 | </widget> |
| 667 | <widget class="QPushButton" name="primeButton"> | 648 | <widget class="QPushButton" name="primeButton"> |
| 668 | <property name="geometry"> | 649 | <property name="geometry"> |
| 669 | <rect> | 650 | <rect> |
| 670 | - <x>756</x> | ||
| 671 | - <y>1018</y> | ||
| 672 | - <width>62</width> | ||
| 673 | - <height>71</height> | 651 | + <x>675</x> |
| 652 | + <y>942</y> | ||
| 653 | + <width>225</width> | ||
| 654 | + <height>222</height> | ||
| 674 | </rect> | 655 | </rect> |
| 675 | </property> | 656 | </property> |
| 676 | <property name="sizePolicy"> | 657 | <property name="sizePolicy"> |
| @@ -679,23 +660,20 @@ QPushButton#breadButton:pressed { | @@ -679,23 +660,20 @@ QPushButton#breadButton:pressed { | ||
| 679 | <verstretch>0</verstretch> | 660 | <verstretch>0</verstretch> |
| 680 | </sizepolicy> | 661 | </sizepolicy> |
| 681 | </property> | 662 | </property> |
| 682 | - <property name="minimumSize"> | ||
| 683 | - <size> | ||
| 684 | - <width>62</width> | ||
| 685 | - <height>71</height> | ||
| 686 | - </size> | ||
| 687 | - </property> | ||
| 688 | <property name="styleSheet"> | 663 | <property name="styleSheet"> |
| 689 | - <string notr="true">QPushButton#primeButton { | ||
| 690 | - border-image: url(:/images/images/main/005_auto_icon_08.png); | 664 | + <string notr="true">QPushButton { |
| 665 | + background-image: url(:/images/images/main/005_auto_icon_08.png); | ||
| 691 | } | 666 | } |
| 692 | 667 | ||
| 693 | -QPushButton#primeButton:pressed { | ||
| 694 | - border-image: url(:/images/images/main/005_auto_icon_08_ov.png); | 668 | +QPushButton:pressed { |
| 669 | + background-image: url(:/images/images/main/005_auto_icon_08_ov.png); | ||
| 695 | }</string> | 670 | }</string> |
| 696 | </property> | 671 | </property> |
| 697 | <property name="text"> | 672 | <property name="text"> |
| 698 | - <string/> | 673 | + <string>부가기능</string> |
| 674 | + </property> | ||
| 675 | + <property name="style" stdset="0"> | ||
| 676 | + <string>type</string> | ||
| 699 | </property> | 677 | </property> |
| 700 | </widget> | 678 | </widget> |
| 701 | <widget class="QWidget" name="clockContainer" native="true"> | 679 | <widget class="QWidget" name="clockContainer" native="true"> |
| @@ -723,884 +701,16 @@ QPushButton#primeButton:pressed { | @@ -723,884 +701,16 @@ QPushButton#primeButton:pressed { | ||
| 723 | </property> | 701 | </property> |
| 724 | </widget> | 702 | </widget> |
| 725 | </widget> | 703 | </widget> |
| 726 | - <widget class="QLabel" name="steamLabel"> | ||
| 727 | - <property name="enabled"> | ||
| 728 | - <bool>true</bool> | ||
| 729 | - </property> | ||
| 730 | - <property name="geometry"> | ||
| 731 | - <rect> | ||
| 732 | - <x>86</x> | ||
| 733 | - <y>607</y> | ||
| 734 | - <width>129</width> | ||
| 735 | - <height>113</height> | ||
| 736 | - </rect> | ||
| 737 | - </property> | ||
| 738 | - <property name="palette"> | ||
| 739 | - <palette> | ||
| 740 | - <active> | ||
| 741 | - <colorrole role="WindowText"> | ||
| 742 | - <brush brushstyle="SolidPattern"> | ||
| 743 | - <color alpha="255"> | ||
| 744 | - <red>255</red> | ||
| 745 | - <green>255</green> | ||
| 746 | - <blue>255</blue> | ||
| 747 | - </color> | ||
| 748 | - </brush> | ||
| 749 | - </colorrole> | ||
| 750 | - </active> | ||
| 751 | - <inactive> | ||
| 752 | - <colorrole role="WindowText"> | ||
| 753 | - <brush brushstyle="SolidPattern"> | ||
| 754 | - <color alpha="255"> | ||
| 755 | - <red>255</red> | ||
| 756 | - <green>255</green> | ||
| 757 | - <blue>255</blue> | ||
| 758 | - </color> | ||
| 759 | - </brush> | ||
| 760 | - </colorrole> | ||
| 761 | - </inactive> | ||
| 762 | - <disabled> | ||
| 763 | - <colorrole role="WindowText"> | ||
| 764 | - <brush brushstyle="SolidPattern"> | ||
| 765 | - <color alpha="255"> | ||
| 766 | - <red>123</red> | ||
| 767 | - <green>123</green> | ||
| 768 | - <blue>123</blue> | ||
| 769 | - </color> | ||
| 770 | - </brush> | ||
| 771 | - </colorrole> | ||
| 772 | - </disabled> | ||
| 773 | - </palette> | ||
| 774 | - </property> | ||
| 775 | - <property name="font"> | ||
| 776 | - <font> | ||
| 777 | - <family>Malgun Gothic</family> | ||
| 778 | - <pointsize>12</pointsize> | ||
| 779 | - </font> | ||
| 780 | - </property> | ||
| 781 | - <property name="text"> | ||
| 782 | - <string>스팀</string> | ||
| 783 | - </property> | ||
| 784 | - <property name="alignment"> | ||
| 785 | - <set>Qt::AlignCenter</set> | ||
| 786 | - </property> | ||
| 787 | - </widget> | ||
| 788 | - <widget class="QLabel" name="combiLabel"> | 704 | + <widget class="QLabel" name="steamLabel_13"> |
| 789 | <property name="enabled"> | 705 | <property name="enabled"> |
| 790 | <bool>true</bool> | 706 | <bool>true</bool> |
| 791 | </property> | 707 | </property> |
| 792 | <property name="geometry"> | 708 | <property name="geometry"> |
| 793 | <rect> | 709 | <rect> |
| 794 | - <x>386</x> | ||
| 795 | - <y>607</y> | ||
| 796 | - <width>129</width> | ||
| 797 | - <height>113</height> | ||
| 798 | - </rect> | ||
| 799 | - </property> | ||
| 800 | - <property name="palette"> | ||
| 801 | - <palette> | ||
| 802 | - <active> | ||
| 803 | - <colorrole role="WindowText"> | ||
| 804 | - <brush brushstyle="SolidPattern"> | ||
| 805 | - <color alpha="255"> | ||
| 806 | - <red>255</red> | ||
| 807 | - <green>255</green> | ||
| 808 | - <blue>255</blue> | ||
| 809 | - </color> | ||
| 810 | - </brush> | ||
| 811 | - </colorrole> | ||
| 812 | - </active> | ||
| 813 | - <inactive> | ||
| 814 | - <colorrole role="WindowText"> | ||
| 815 | - <brush brushstyle="SolidPattern"> | ||
| 816 | - <color alpha="255"> | ||
| 817 | - <red>255</red> | ||
| 818 | - <green>255</green> | ||
| 819 | - <blue>255</blue> | ||
| 820 | - </color> | ||
| 821 | - </brush> | ||
| 822 | - </colorrole> | ||
| 823 | - </inactive> | ||
| 824 | - <disabled> | ||
| 825 | - <colorrole role="WindowText"> | ||
| 826 | - <brush brushstyle="SolidPattern"> | ||
| 827 | - <color alpha="255"> | ||
| 828 | - <red>123</red> | ||
| 829 | - <green>123</green> | ||
| 830 | - <blue>123</blue> | ||
| 831 | - </color> | ||
| 832 | - </brush> | ||
| 833 | - </colorrole> | ||
| 834 | - </disabled> | ||
| 835 | - </palette> | ||
| 836 | - </property> | ||
| 837 | - <property name="font"> | ||
| 838 | - <font> | ||
| 839 | - <family>Malgun Gothic</family> | ||
| 840 | - <pointsize>12</pointsize> | ||
| 841 | - </font> | ||
| 842 | - </property> | ||
| 843 | - <property name="text"> | ||
| 844 | - <string>콤비</string> | ||
| 845 | - </property> | ||
| 846 | - <property name="alignment"> | ||
| 847 | - <set>Qt::AlignCenter</set> | ||
| 848 | - </property> | ||
| 849 | - </widget> | ||
| 850 | - <widget class="QLabel" name="dryheatLabel"> | ||
| 851 | - <property name="enabled"> | ||
| 852 | - <bool>true</bool> | ||
| 853 | - </property> | ||
| 854 | - <property name="geometry"> | ||
| 855 | - <rect> | ||
| 856 | - <x>686</x> | ||
| 857 | - <y>607</y> | ||
| 858 | - <width>129</width> | ||
| 859 | - <height>113</height> | ||
| 860 | - </rect> | ||
| 861 | - </property> | ||
| 862 | - <property name="palette"> | ||
| 863 | - <palette> | ||
| 864 | - <active> | ||
| 865 | - <colorrole role="WindowText"> | ||
| 866 | - <brush brushstyle="SolidPattern"> | ||
| 867 | - <color alpha="255"> | ||
| 868 | - <red>255</red> | ||
| 869 | - <green>255</green> | ||
| 870 | - <blue>255</blue> | ||
| 871 | - </color> | ||
| 872 | - </brush> | ||
| 873 | - </colorrole> | ||
| 874 | - </active> | ||
| 875 | - <inactive> | ||
| 876 | - <colorrole role="WindowText"> | ||
| 877 | - <brush brushstyle="SolidPattern"> | ||
| 878 | - <color alpha="255"> | ||
| 879 | - <red>255</red> | ||
| 880 | - <green>255</green> | ||
| 881 | - <blue>255</blue> | ||
| 882 | - </color> | ||
| 883 | - </brush> | ||
| 884 | - </colorrole> | ||
| 885 | - </inactive> | ||
| 886 | - <disabled> | ||
| 887 | - <colorrole role="WindowText"> | ||
| 888 | - <brush brushstyle="SolidPattern"> | ||
| 889 | - <color alpha="255"> | ||
| 890 | - <red>123</red> | ||
| 891 | - <green>123</green> | ||
| 892 | - <blue>123</blue> | ||
| 893 | - </color> | ||
| 894 | - </brush> | ||
| 895 | - </colorrole> | ||
| 896 | - </disabled> | ||
| 897 | - </palette> | ||
| 898 | - </property> | ||
| 899 | - <property name="font"> | ||
| 900 | - <font> | ||
| 901 | - <family>Malgun Gothic</family> | ||
| 902 | - <pointsize>12</pointsize> | ||
| 903 | - </font> | ||
| 904 | - </property> | ||
| 905 | - <property name="text"> | ||
| 906 | - <string>건열</string> | ||
| 907 | - </property> | ||
| 908 | - <property name="alignment"> | ||
| 909 | - <set>Qt::AlignCenter</set> | ||
| 910 | - </property> | ||
| 911 | - </widget> | ||
| 912 | - <widget class="QLabel" name="steamLabel_2"> | ||
| 913 | - <property name="enabled"> | ||
| 914 | - <bool>true</bool> | ||
| 915 | - </property> | ||
| 916 | - <property name="geometry"> | ||
| 917 | - <rect> | ||
| 918 | - <x>0</x> | ||
| 919 | - <y>882</y> | ||
| 920 | - <width>225</width> | ||
| 921 | - <height>60</height> | ||
| 922 | - </rect> | ||
| 923 | - </property> | ||
| 924 | - <property name="palette"> | ||
| 925 | - <palette> | ||
| 926 | - <active> | ||
| 927 | - <colorrole role="WindowText"> | ||
| 928 | - <brush brushstyle="SolidPattern"> | ||
| 929 | - <color alpha="255"> | ||
| 930 | - <red>255</red> | ||
| 931 | - <green>255</green> | ||
| 932 | - <blue>255</blue> | ||
| 933 | - </color> | ||
| 934 | - </brush> | ||
| 935 | - </colorrole> | ||
| 936 | - </active> | ||
| 937 | - <inactive> | ||
| 938 | - <colorrole role="WindowText"> | ||
| 939 | - <brush brushstyle="SolidPattern"> | ||
| 940 | - <color alpha="255"> | ||
| 941 | - <red>255</red> | ||
| 942 | - <green>255</green> | ||
| 943 | - <blue>255</blue> | ||
| 944 | - </color> | ||
| 945 | - </brush> | ||
| 946 | - </colorrole> | ||
| 947 | - </inactive> | ||
| 948 | - <disabled> | ||
| 949 | - <colorrole role="WindowText"> | ||
| 950 | - <brush brushstyle="SolidPattern"> | ||
| 951 | - <color alpha="255"> | ||
| 952 | - <red>123</red> | ||
| 953 | - <green>123</green> | ||
| 954 | - <blue>123</blue> | ||
| 955 | - </color> | ||
| 956 | - </brush> | ||
| 957 | - </colorrole> | ||
| 958 | - </disabled> | ||
| 959 | - </palette> | ||
| 960 | - </property> | ||
| 961 | - <property name="font"> | ||
| 962 | - <font> | ||
| 963 | - <family>Malgun Gothic</family> | ||
| 964 | - <pointsize>10</pointsize> | ||
| 965 | - </font> | ||
| 966 | - </property> | ||
| 967 | - <property name="text"> | ||
| 968 | - <string>가금류</string> | ||
| 969 | - </property> | ||
| 970 | - <property name="alignment"> | ||
| 971 | - <set>Qt::AlignCenter</set> | ||
| 972 | - </property> | ||
| 973 | - </widget> | ||
| 974 | - <widget class="QLabel" name="steamLabel_3"> | ||
| 975 | - <property name="enabled"> | ||
| 976 | - <bool>true</bool> | ||
| 977 | - </property> | ||
| 978 | - <property name="geometry"> | ||
| 979 | - <rect> | ||
| 980 | - <x>225</x> | ||
| 981 | - <y>882</y> | ||
| 982 | - <width>225</width> | ||
| 983 | - <height>60</height> | ||
| 984 | - </rect> | ||
| 985 | - </property> | ||
| 986 | - <property name="palette"> | ||
| 987 | - <palette> | ||
| 988 | - <active> | ||
| 989 | - <colorrole role="WindowText"> | ||
| 990 | - <brush brushstyle="SolidPattern"> | ||
| 991 | - <color alpha="255"> | ||
| 992 | - <red>255</red> | ||
| 993 | - <green>255</green> | ||
| 994 | - <blue>255</blue> | ||
| 995 | - </color> | ||
| 996 | - </brush> | ||
| 997 | - </colorrole> | ||
| 998 | - </active> | ||
| 999 | - <inactive> | ||
| 1000 | - <colorrole role="WindowText"> | ||
| 1001 | - <brush brushstyle="SolidPattern"> | ||
| 1002 | - <color alpha="255"> | ||
| 1003 | - <red>255</red> | ||
| 1004 | - <green>255</green> | ||
| 1005 | - <blue>255</blue> | ||
| 1006 | - </color> | ||
| 1007 | - </brush> | ||
| 1008 | - </colorrole> | ||
| 1009 | - </inactive> | ||
| 1010 | - <disabled> | ||
| 1011 | - <colorrole role="WindowText"> | ||
| 1012 | - <brush brushstyle="SolidPattern"> | ||
| 1013 | - <color alpha="255"> | ||
| 1014 | - <red>123</red> | ||
| 1015 | - <green>123</green> | ||
| 1016 | - <blue>123</blue> | ||
| 1017 | - </color> | ||
| 1018 | - </brush> | ||
| 1019 | - </colorrole> | ||
| 1020 | - </disabled> | ||
| 1021 | - </palette> | ||
| 1022 | - </property> | ||
| 1023 | - <property name="font"> | ||
| 1024 | - <font> | ||
| 1025 | - <family>Malgun Gothic</family> | ||
| 1026 | - <pointsize>10</pointsize> | ||
| 1027 | - </font> | ||
| 1028 | - </property> | ||
| 1029 | - <property name="text"> | ||
| 1030 | - <string>육류</string> | ||
| 1031 | - </property> | ||
| 1032 | - <property name="alignment"> | ||
| 1033 | - <set>Qt::AlignCenter</set> | ||
| 1034 | - </property> | ||
| 1035 | - </widget> | ||
| 1036 | - <widget class="QLabel" name="steamLabel_4"> | ||
| 1037 | - <property name="enabled"> | ||
| 1038 | - <bool>true</bool> | ||
| 1039 | - </property> | ||
| 1040 | - <property name="geometry"> | ||
| 1041 | - <rect> | ||
| 1042 | - <x>450</x> | ||
| 1043 | - <y>882</y> | ||
| 1044 | - <width>225</width> | ||
| 1045 | - <height>60</height> | ||
| 1046 | - </rect> | ||
| 1047 | - </property> | ||
| 1048 | - <property name="palette"> | ||
| 1049 | - <palette> | ||
| 1050 | - <active> | ||
| 1051 | - <colorrole role="WindowText"> | ||
| 1052 | - <brush brushstyle="SolidPattern"> | ||
| 1053 | - <color alpha="255"> | ||
| 1054 | - <red>255</red> | ||
| 1055 | - <green>255</green> | ||
| 1056 | - <blue>255</blue> | ||
| 1057 | - </color> | ||
| 1058 | - </brush> | ||
| 1059 | - </colorrole> | ||
| 1060 | - </active> | ||
| 1061 | - <inactive> | ||
| 1062 | - <colorrole role="WindowText"> | ||
| 1063 | - <brush brushstyle="SolidPattern"> | ||
| 1064 | - <color alpha="255"> | ||
| 1065 | - <red>255</red> | ||
| 1066 | - <green>255</green> | ||
| 1067 | - <blue>255</blue> | ||
| 1068 | - </color> | ||
| 1069 | - </brush> | ||
| 1070 | - </colorrole> | ||
| 1071 | - </inactive> | ||
| 1072 | - <disabled> | ||
| 1073 | - <colorrole role="WindowText"> | ||
| 1074 | - <brush brushstyle="SolidPattern"> | ||
| 1075 | - <color alpha="255"> | ||
| 1076 | - <red>123</red> | ||
| 1077 | - <green>123</green> | ||
| 1078 | - <blue>123</blue> | ||
| 1079 | - </color> | ||
| 1080 | - </brush> | ||
| 1081 | - </colorrole> | ||
| 1082 | - </disabled> | ||
| 1083 | - </palette> | ||
| 1084 | - </property> | ||
| 1085 | - <property name="font"> | ||
| 1086 | - <font> | ||
| 1087 | - <family>Malgun Gothic</family> | ||
| 1088 | - <pointsize>10</pointsize> | ||
| 1089 | - </font> | ||
| 1090 | - </property> | ||
| 1091 | - <property name="text"> | ||
| 1092 | - <string>생선류</string> | ||
| 1093 | - </property> | ||
| 1094 | - <property name="alignment"> | ||
| 1095 | - <set>Qt::AlignCenter</set> | ||
| 1096 | - </property> | ||
| 1097 | - </widget> | ||
| 1098 | - <widget class="QLabel" name="steamLabel_5"> | ||
| 1099 | - <property name="enabled"> | ||
| 1100 | - <bool>true</bool> | ||
| 1101 | - </property> | ||
| 1102 | - <property name="geometry"> | ||
| 1103 | - <rect> | ||
| 1104 | - <x>675</x> | ||
| 1105 | - <y>882</y> | ||
| 1106 | - <width>225</width> | ||
| 1107 | - <height>60</height> | ||
| 1108 | - </rect> | ||
| 1109 | - </property> | ||
| 1110 | - <property name="palette"> | ||
| 1111 | - <palette> | ||
| 1112 | - <active> | ||
| 1113 | - <colorrole role="WindowText"> | ||
| 1114 | - <brush brushstyle="SolidPattern"> | ||
| 1115 | - <color alpha="255"> | ||
| 1116 | - <red>255</red> | ||
| 1117 | - <green>255</green> | ||
| 1118 | - <blue>255</blue> | ||
| 1119 | - </color> | ||
| 1120 | - </brush> | ||
| 1121 | - </colorrole> | ||
| 1122 | - </active> | ||
| 1123 | - <inactive> | ||
| 1124 | - <colorrole role="WindowText"> | ||
| 1125 | - <brush brushstyle="SolidPattern"> | ||
| 1126 | - <color alpha="255"> | ||
| 1127 | - <red>255</red> | ||
| 1128 | - <green>255</green> | ||
| 1129 | - <blue>255</blue> | ||
| 1130 | - </color> | ||
| 1131 | - </brush> | ||
| 1132 | - </colorrole> | ||
| 1133 | - </inactive> | ||
| 1134 | - <disabled> | ||
| 1135 | - <colorrole role="WindowText"> | ||
| 1136 | - <brush brushstyle="SolidPattern"> | ||
| 1137 | - <color alpha="255"> | ||
| 1138 | - <red>123</red> | ||
| 1139 | - <green>123</green> | ||
| 1140 | - <blue>123</blue> | ||
| 1141 | - </color> | ||
| 1142 | - </brush> | ||
| 1143 | - </colorrole> | ||
| 1144 | - </disabled> | ||
| 1145 | - </palette> | ||
| 1146 | - </property> | ||
| 1147 | - <property name="font"> | ||
| 1148 | - <font> | ||
| 1149 | - <family>Malgun Gothic</family> | ||
| 1150 | - <pointsize>10</pointsize> | ||
| 1151 | - </font> | ||
| 1152 | - </property> | ||
| 1153 | - <property name="text"> | ||
| 1154 | - <string>디저트류</string> | ||
| 1155 | - </property> | ||
| 1156 | - <property name="alignment"> | ||
| 1157 | - <set>Qt::AlignCenter</set> | ||
| 1158 | - </property> | ||
| 1159 | - </widget> | ||
| 1160 | - <widget class="QLabel" name="steamLabel_6"> | ||
| 1161 | - <property name="enabled"> | ||
| 1162 | - <bool>true</bool> | ||
| 1163 | - </property> | ||
| 1164 | - <property name="geometry"> | ||
| 1165 | - <rect> | ||
| 1166 | - <x>0</x> | ||
| 1167 | - <y>1104</y> | ||
| 1168 | - <width>225</width> | ||
| 1169 | - <height>60</height> | ||
| 1170 | - </rect> | ||
| 1171 | - </property> | ||
| 1172 | - <property name="palette"> | ||
| 1173 | - <palette> | ||
| 1174 | - <active> | ||
| 1175 | - <colorrole role="WindowText"> | ||
| 1176 | - <brush brushstyle="SolidPattern"> | ||
| 1177 | - <color alpha="255"> | ||
| 1178 | - <red>255</red> | ||
| 1179 | - <green>255</green> | ||
| 1180 | - <blue>255</blue> | ||
| 1181 | - </color> | ||
| 1182 | - </brush> | ||
| 1183 | - </colorrole> | ||
| 1184 | - </active> | ||
| 1185 | - <inactive> | ||
| 1186 | - <colorrole role="WindowText"> | ||
| 1187 | - <brush brushstyle="SolidPattern"> | ||
| 1188 | - <color alpha="255"> | ||
| 1189 | - <red>255</red> | ||
| 1190 | - <green>255</green> | ||
| 1191 | - <blue>255</blue> | ||
| 1192 | - </color> | ||
| 1193 | - </brush> | ||
| 1194 | - </colorrole> | ||
| 1195 | - </inactive> | ||
| 1196 | - <disabled> | ||
| 1197 | - <colorrole role="WindowText"> | ||
| 1198 | - <brush brushstyle="SolidPattern"> | ||
| 1199 | - <color alpha="255"> | ||
| 1200 | - <red>123</red> | ||
| 1201 | - <green>123</green> | ||
| 1202 | - <blue>123</blue> | ||
| 1203 | - </color> | ||
| 1204 | - </brush> | ||
| 1205 | - </colorrole> | ||
| 1206 | - </disabled> | ||
| 1207 | - </palette> | ||
| 1208 | - </property> | ||
| 1209 | - <property name="font"> | ||
| 1210 | - <font> | ||
| 1211 | - <family>Malgun Gothic</family> | ||
| 1212 | - <pointsize>10</pointsize> | ||
| 1213 | - </font> | ||
| 1214 | - </property> | ||
| 1215 | - <property name="text"> | ||
| 1216 | - <string>채소및곡류</string> | ||
| 1217 | - </property> | ||
| 1218 | - <property name="alignment"> | ||
| 1219 | - <set>Qt::AlignCenter</set> | ||
| 1220 | - </property> | ||
| 1221 | - </widget> | ||
| 1222 | - <widget class="QLabel" name="steamLabel_7"> | ||
| 1223 | - <property name="enabled"> | ||
| 1224 | - <bool>true</bool> | ||
| 1225 | - </property> | ||
| 1226 | - <property name="geometry"> | ||
| 1227 | - <rect> | ||
| 1228 | - <x>225</x> | ||
| 1229 | - <y>1104</y> | ||
| 1230 | - <width>225</width> | ||
| 1231 | - <height>60</height> | ||
| 1232 | - </rect> | ||
| 1233 | - </property> | ||
| 1234 | - <property name="palette"> | ||
| 1235 | - <palette> | ||
| 1236 | - <active> | ||
| 1237 | - <colorrole role="WindowText"> | ||
| 1238 | - <brush brushstyle="SolidPattern"> | ||
| 1239 | - <color alpha="255"> | ||
| 1240 | - <red>255</red> | ||
| 1241 | - <green>255</green> | ||
| 1242 | - <blue>255</blue> | ||
| 1243 | - </color> | ||
| 1244 | - </brush> | ||
| 1245 | - </colorrole> | ||
| 1246 | - </active> | ||
| 1247 | - <inactive> | ||
| 1248 | - <colorrole role="WindowText"> | ||
| 1249 | - <brush brushstyle="SolidPattern"> | ||
| 1250 | - <color alpha="255"> | ||
| 1251 | - <red>255</red> | ||
| 1252 | - <green>255</green> | ||
| 1253 | - <blue>255</blue> | ||
| 1254 | - </color> | ||
| 1255 | - </brush> | ||
| 1256 | - </colorrole> | ||
| 1257 | - </inactive> | ||
| 1258 | - <disabled> | ||
| 1259 | - <colorrole role="WindowText"> | ||
| 1260 | - <brush brushstyle="SolidPattern"> | ||
| 1261 | - <color alpha="255"> | ||
| 1262 | - <red>123</red> | ||
| 1263 | - <green>123</green> | ||
| 1264 | - <blue>123</blue> | ||
| 1265 | - </color> | ||
| 1266 | - </brush> | ||
| 1267 | - </colorrole> | ||
| 1268 | - </disabled> | ||
| 1269 | - </palette> | ||
| 1270 | - </property> | ||
| 1271 | - <property name="font"> | ||
| 1272 | - <font> | ||
| 1273 | - <family>Malgun Gothic</family> | ||
| 1274 | - <pointsize>10</pointsize> | ||
| 1275 | - </font> | ||
| 1276 | - </property> | ||
| 1277 | - <property name="text"> | ||
| 1278 | - <string>제과제빵류</string> | ||
| 1279 | - </property> | ||
| 1280 | - <property name="alignment"> | ||
| 1281 | - <set>Qt::AlignCenter</set> | ||
| 1282 | - </property> | ||
| 1283 | - </widget> | ||
| 1284 | - <widget class="QLabel" name="steamLabel_8"> | ||
| 1285 | - <property name="enabled"> | ||
| 1286 | - <bool>true</bool> | ||
| 1287 | - </property> | ||
| 1288 | - <property name="geometry"> | ||
| 1289 | - <rect> | ||
| 1290 | - <x>450</x> | ||
| 1291 | - <y>1104</y> | ||
| 1292 | - <width>225</width> | ||
| 1293 | - <height>60</height> | ||
| 1294 | - </rect> | ||
| 1295 | - </property> | ||
| 1296 | - <property name="palette"> | ||
| 1297 | - <palette> | ||
| 1298 | - <active> | ||
| 1299 | - <colorrole role="WindowText"> | ||
| 1300 | - <brush brushstyle="SolidPattern"> | ||
| 1301 | - <color alpha="255"> | ||
| 1302 | - <red>255</red> | ||
| 1303 | - <green>255</green> | ||
| 1304 | - <blue>255</blue> | ||
| 1305 | - </color> | ||
| 1306 | - </brush> | ||
| 1307 | - </colorrole> | ||
| 1308 | - </active> | ||
| 1309 | - <inactive> | ||
| 1310 | - <colorrole role="WindowText"> | ||
| 1311 | - <brush brushstyle="SolidPattern"> | ||
| 1312 | - <color alpha="255"> | ||
| 1313 | - <red>255</red> | ||
| 1314 | - <green>255</green> | ||
| 1315 | - <blue>255</blue> | ||
| 1316 | - </color> | ||
| 1317 | - </brush> | ||
| 1318 | - </colorrole> | ||
| 1319 | - </inactive> | ||
| 1320 | - <disabled> | ||
| 1321 | - <colorrole role="WindowText"> | ||
| 1322 | - <brush brushstyle="SolidPattern"> | ||
| 1323 | - <color alpha="255"> | ||
| 1324 | - <red>123</red> | ||
| 1325 | - <green>123</green> | ||
| 1326 | - <blue>123</blue> | ||
| 1327 | - </color> | ||
| 1328 | - </brush> | ||
| 1329 | - </colorrole> | ||
| 1330 | - </disabled> | ||
| 1331 | - </palette> | ||
| 1332 | - </property> | ||
| 1333 | - <property name="font"> | ||
| 1334 | - <font> | ||
| 1335 | - <family>Malgun Gothic</family> | ||
| 1336 | - <pointsize>10</pointsize> | ||
| 1337 | - </font> | ||
| 1338 | - </property> | ||
| 1339 | - <property name="text"> | ||
| 1340 | - <string>기타요리</string> | ||
| 1341 | - </property> | ||
| 1342 | - <property name="alignment"> | ||
| 1343 | - <set>Qt::AlignCenter</set> | ||
| 1344 | - </property> | ||
| 1345 | - </widget> | ||
| 1346 | - <widget class="QLabel" name="steamLabel_9"> | ||
| 1347 | - <property name="enabled"> | ||
| 1348 | - <bool>true</bool> | ||
| 1349 | - </property> | ||
| 1350 | - <property name="geometry"> | ||
| 1351 | - <rect> | ||
| 1352 | - <x>675</x> | ||
| 1353 | - <y>1104</y> | ||
| 1354 | - <width>225</width> | ||
| 1355 | - <height>60</height> | ||
| 1356 | - </rect> | ||
| 1357 | - </property> | ||
| 1358 | - <property name="palette"> | ||
| 1359 | - <palette> | ||
| 1360 | - <active> | ||
| 1361 | - <colorrole role="WindowText"> | ||
| 1362 | - <brush brushstyle="SolidPattern"> | ||
| 1363 | - <color alpha="255"> | ||
| 1364 | - <red>255</red> | ||
| 1365 | - <green>255</green> | ||
| 1366 | - <blue>255</blue> | ||
| 1367 | - </color> | ||
| 1368 | - </brush> | ||
| 1369 | - </colorrole> | ||
| 1370 | - </active> | ||
| 1371 | - <inactive> | ||
| 1372 | - <colorrole role="WindowText"> | ||
| 1373 | - <brush brushstyle="SolidPattern"> | ||
| 1374 | - <color alpha="255"> | ||
| 1375 | - <red>255</red> | ||
| 1376 | - <green>255</green> | ||
| 1377 | - <blue>255</blue> | ||
| 1378 | - </color> | ||
| 1379 | - </brush> | ||
| 1380 | - </colorrole> | ||
| 1381 | - </inactive> | ||
| 1382 | - <disabled> | ||
| 1383 | - <colorrole role="WindowText"> | ||
| 1384 | - <brush brushstyle="SolidPattern"> | ||
| 1385 | - <color alpha="255"> | ||
| 1386 | - <red>123</red> | ||
| 1387 | - <green>123</green> | ||
| 1388 | - <blue>123</blue> | ||
| 1389 | - </color> | ||
| 1390 | - </brush> | ||
| 1391 | - </colorrole> | ||
| 1392 | - </disabled> | ||
| 1393 | - </palette> | ||
| 1394 | - </property> | ||
| 1395 | - <property name="font"> | ||
| 1396 | - <font> | ||
| 1397 | - <family>Malgun Gothic</family> | ||
| 1398 | - <pointsize>10</pointsize> | ||
| 1399 | - </font> | ||
| 1400 | - </property> | ||
| 1401 | - <property name="text"> | ||
| 1402 | - <string>부가기능</string> | ||
| 1403 | - </property> | ||
| 1404 | - <property name="alignment"> | ||
| 1405 | - <set>Qt::AlignCenter</set> | ||
| 1406 | - </property> | ||
| 1407 | - </widget> | ||
| 1408 | - <widget class="QLabel" name="steamLabel_10"> | ||
| 1409 | - <property name="enabled"> | ||
| 1410 | - <bool>true</bool> | ||
| 1411 | - </property> | ||
| 1412 | - <property name="geometry"> | ||
| 1413 | - <rect> | ||
| 1414 | - <x>40</x> | ||
| 1415 | - <y>1370</y> | ||
| 1416 | - <width>225</width> | ||
| 1417 | - <height>60</height> | ||
| 1418 | - </rect> | ||
| 1419 | - </property> | ||
| 1420 | - <property name="palette"> | ||
| 1421 | - <palette> | ||
| 1422 | - <active> | ||
| 1423 | - <colorrole role="WindowText"> | ||
| 1424 | - <brush brushstyle="SolidPattern"> | ||
| 1425 | - <color alpha="255"> | ||
| 1426 | - <red>255</red> | ||
| 1427 | - <green>255</green> | ||
| 1428 | - <blue>255</blue> | ||
| 1429 | - </color> | ||
| 1430 | - </brush> | ||
| 1431 | - </colorrole> | ||
| 1432 | - </active> | ||
| 1433 | - <inactive> | ||
| 1434 | - <colorrole role="WindowText"> | ||
| 1435 | - <brush brushstyle="SolidPattern"> | ||
| 1436 | - <color alpha="255"> | ||
| 1437 | - <red>255</red> | ||
| 1438 | - <green>255</green> | ||
| 1439 | - <blue>255</blue> | ||
| 1440 | - </color> | ||
| 1441 | - </brush> | ||
| 1442 | - </colorrole> | ||
| 1443 | - </inactive> | ||
| 1444 | - <disabled> | ||
| 1445 | - <colorrole role="WindowText"> | ||
| 1446 | - <brush brushstyle="SolidPattern"> | ||
| 1447 | - <color alpha="255"> | ||
| 1448 | - <red>123</red> | ||
| 1449 | - <green>123</green> | ||
| 1450 | - <blue>123</blue> | ||
| 1451 | - </color> | ||
| 1452 | - </brush> | ||
| 1453 | - </colorrole> | ||
| 1454 | - </disabled> | ||
| 1455 | - </palette> | ||
| 1456 | - </property> | ||
| 1457 | - <property name="font"> | ||
| 1458 | - <font> | ||
| 1459 | - <family>Malgun Gothic</family> | ||
| 1460 | - <pointsize>10</pointsize> | ||
| 1461 | - </font> | ||
| 1462 | - </property> | ||
| 1463 | - <property name="text"> | ||
| 1464 | - <string>다중요리</string> | ||
| 1465 | - </property> | ||
| 1466 | - <property name="alignment"> | ||
| 1467 | - <set>Qt::AlignCenter</set> | ||
| 1468 | - </property> | ||
| 1469 | - </widget> | ||
| 1470 | - <widget class="QLabel" name="steamLabel_11"> | ||
| 1471 | - <property name="enabled"> | ||
| 1472 | - <bool>true</bool> | ||
| 1473 | - </property> | ||
| 1474 | - <property name="geometry"> | ||
| 1475 | - <rect> | ||
| 1476 | - <x>330</x> | ||
| 1477 | - <y>1370</y> | ||
| 1478 | - <width>225</width> | ||
| 1479 | - <height>60</height> | ||
| 1480 | - </rect> | ||
| 1481 | - </property> | ||
| 1482 | - <property name="palette"> | ||
| 1483 | - <palette> | ||
| 1484 | - <active> | ||
| 1485 | - <colorrole role="WindowText"> | ||
| 1486 | - <brush brushstyle="SolidPattern"> | ||
| 1487 | - <color alpha="255"> | ||
| 1488 | - <red>255</red> | ||
| 1489 | - <green>255</green> | ||
| 1490 | - <blue>255</blue> | ||
| 1491 | - </color> | ||
| 1492 | - </brush> | ||
| 1493 | - </colorrole> | ||
| 1494 | - </active> | ||
| 1495 | - <inactive> | ||
| 1496 | - <colorrole role="WindowText"> | ||
| 1497 | - <brush brushstyle="SolidPattern"> | ||
| 1498 | - <color alpha="255"> | ||
| 1499 | - <red>255</red> | ||
| 1500 | - <green>255</green> | ||
| 1501 | - <blue>255</blue> | ||
| 1502 | - </color> | ||
| 1503 | - </brush> | ||
| 1504 | - </colorrole> | ||
| 1505 | - </inactive> | ||
| 1506 | - <disabled> | ||
| 1507 | - <colorrole role="WindowText"> | ||
| 1508 | - <brush brushstyle="SolidPattern"> | ||
| 1509 | - <color alpha="255"> | ||
| 1510 | - <red>123</red> | ||
| 1511 | - <green>123</green> | ||
| 1512 | - <blue>123</blue> | ||
| 1513 | - </color> | ||
| 1514 | - </brush> | ||
| 1515 | - </colorrole> | ||
| 1516 | - </disabled> | ||
| 1517 | - </palette> | ||
| 1518 | - </property> | ||
| 1519 | - <property name="font"> | ||
| 1520 | - <font> | ||
| 1521 | - <family>Malgun Gothic</family> | ||
| 1522 | - <pointsize>10</pointsize> | ||
| 1523 | - </font> | ||
| 1524 | - </property> | ||
| 1525 | - <property name="text"> | ||
| 1526 | - <string>프로그래밍모드</string> | ||
| 1527 | - </property> | ||
| 1528 | - <property name="alignment"> | ||
| 1529 | - <set>Qt::AlignCenter</set> | ||
| 1530 | - </property> | ||
| 1531 | - </widget> | ||
| 1532 | - <widget class="QLabel" name="steamLabel_12"> | ||
| 1533 | - <property name="enabled"> | ||
| 1534 | - <bool>true</bool> | ||
| 1535 | - </property> | ||
| 1536 | - <property name="geometry"> | ||
| 1537 | - <rect> | ||
| 1538 | - <x>640</x> | ||
| 1539 | - <y>1370</y> | ||
| 1540 | - <width>225</width> | ||
| 1541 | - <height>60</height> | ||
| 1542 | - </rect> | ||
| 1543 | - </property> | ||
| 1544 | - <property name="palette"> | ||
| 1545 | - <palette> | ||
| 1546 | - <active> | ||
| 1547 | - <colorrole role="WindowText"> | ||
| 1548 | - <brush brushstyle="SolidPattern"> | ||
| 1549 | - <color alpha="255"> | ||
| 1550 | - <red>255</red> | ||
| 1551 | - <green>255</green> | ||
| 1552 | - <blue>255</blue> | ||
| 1553 | - </color> | ||
| 1554 | - </brush> | ||
| 1555 | - </colorrole> | ||
| 1556 | - </active> | ||
| 1557 | - <inactive> | ||
| 1558 | - <colorrole role="WindowText"> | ||
| 1559 | - <brush brushstyle="SolidPattern"> | ||
| 1560 | - <color alpha="255"> | ||
| 1561 | - <red>255</red> | ||
| 1562 | - <green>255</green> | ||
| 1563 | - <blue>255</blue> | ||
| 1564 | - </color> | ||
| 1565 | - </brush> | ||
| 1566 | - </colorrole> | ||
| 1567 | - </inactive> | ||
| 1568 | - <disabled> | ||
| 1569 | - <colorrole role="WindowText"> | ||
| 1570 | - <brush brushstyle="SolidPattern"> | ||
| 1571 | - <color alpha="255"> | ||
| 1572 | - <red>123</red> | ||
| 1573 | - <green>123</green> | ||
| 1574 | - <blue>123</blue> | ||
| 1575 | - </color> | ||
| 1576 | - </brush> | ||
| 1577 | - </colorrole> | ||
| 1578 | - </disabled> | ||
| 1579 | - </palette> | ||
| 1580 | - </property> | ||
| 1581 | - <property name="font"> | ||
| 1582 | - <font> | ||
| 1583 | - <family>Malgun Gothic</family> | ||
| 1584 | - <pointsize>10</pointsize> | ||
| 1585 | - </font> | ||
| 1586 | - </property> | ||
| 1587 | - <property name="text"> | ||
| 1588 | - <string>세척모드</string> | ||
| 1589 | - </property> | ||
| 1590 | - <property name="alignment"> | ||
| 1591 | - <set>Qt::AlignCenter</set> | ||
| 1592 | - </property> | ||
| 1593 | - </widget> | ||
| 1594 | - <widget class="QLabel" name="steamLabel_13"> | ||
| 1595 | - <property name="enabled"> | ||
| 1596 | - <bool>true</bool> | ||
| 1597 | - </property> | ||
| 1598 | - <property name="geometry"> | ||
| 1599 | - <rect> | ||
| 1600 | - <x>600</x> | ||
| 1601 | - <y>1500</y> | ||
| 1602 | - <width>300</width> | ||
| 1603 | - <height>100</height> | 710 | + <x>750</x> |
| 711 | + <y>1550</y> | ||
| 712 | + <width>150</width> | ||
| 713 | + <height>50</height> | ||
| 1604 | </rect> | 714 | </rect> |
| 1605 | </property> | 715 | </property> |
| 1606 | <property name="palette"> | 716 | <property name="palette"> |
| @@ -1647,7 +757,7 @@ QPushButton#primeButton:pressed { | @@ -1647,7 +757,7 @@ QPushButton#primeButton:pressed { | ||
| 1647 | </font> | 757 | </font> |
| 1648 | </property> | 758 | </property> |
| 1649 | <property name="text"> | 759 | <property name="text"> |
| 1650 | - <string>V0.1.2</string> | 760 | + <string>V0.1.4</string> |
| 1651 | </property> | 761 | </property> |
| 1652 | <property name="alignment"> | 762 | <property name="alignment"> |
| 1653 | <set>Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing</set> | 763 | <set>Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing</set> |
app/gui/oven_control/manualcookwindow.cpp
| @@ -11,6 +11,9 @@ ManualCookWindow::ManualCookWindow(QWidget *parent, Oven *oven, UdpHandler *udp) | @@ -11,6 +11,9 @@ ManualCookWindow::ManualCookWindow(QWidget *parent, Oven *oven, UdpHandler *udp) | ||
| 11 | { | 11 | { |
| 12 | ui->setupUi(this); | 12 | ui->setupUi(this); |
| 13 | 13 | ||
| 14 | + ui->clockContainer->setParent(ui->upperStack); | ||
| 15 | + setAttribute(Qt::WA_DeleteOnClose); | ||
| 16 | + | ||
| 14 | connect(oven, SIGNAL(changed(Oven*)), this, SLOT(onOvenUpdated(Oven*))); | 17 | connect(oven, SIGNAL(changed(Oven*)), this, SLOT(onOvenUpdated(Oven*))); |
| 15 | 18 | ||
| 16 | connect(ui->steamButton, SIGNAL(clicked()), this, SIGNAL(modeButtonClicked())); | 19 | connect(ui->steamButton, SIGNAL(clicked()), this, SIGNAL(modeButtonClicked())); |
| @@ -149,7 +152,7 @@ void ManualCookWindow::updateLabels() | @@ -149,7 +152,7 @@ void ManualCookWindow::updateLabels() | ||
| 149 | else | 152 | else |
| 150 | temp = oven->temp(); | 153 | temp = oven->temp(); |
| 151 | 154 | ||
| 152 | - ui->tempLabel->setText(buf.sprintf("%d℃", temp)); | 155 | + ui->tempLabel->setText(buf.sprintf("%d<span style=\"font-size:11pt;\">℃</span>", temp)); |
| 153 | 156 | ||
| 154 | int time; | 157 | int time; |
| 155 | if (ui->timeSlider->isSliderDown()) | 158 | if (ui->timeSlider->isSliderDown()) |
| @@ -158,11 +161,11 @@ void ManualCookWindow::updateLabels() | @@ -158,11 +161,11 @@ void ManualCookWindow::updateLabels() | ||
| 158 | time = oven->time(); | 161 | time = oven->time(); |
| 159 | 162 | ||
| 160 | if (time >= 3600) | 163 | if (time >= 3600) |
| 161 | - ui->timeLabel->setText(buf.sprintf("%d시간 %02d분", time / 3600, (time % 3600) / 60)); | 164 | + ui->timeLabel->setText(buf.sprintf("%d<span style=\"font-size:11pt;\">시간</span> %02d<span style=\"font-size:11pt;\">분</span>", time / 3600, (time % 3600) / 60)); |
| 162 | else if (time >= 60) | 165 | else if (time >= 60) |
| 163 | - ui->timeLabel->setText(buf.sprintf("%d분 %02d초", time / 60, time % 60)); | 166 | + ui->timeLabel->setText(buf.sprintf("%d<span style=\"font-size:11pt;\">분</span> %02d<span style=\"font-size:11pt;\">초</span>", time / 60, time % 60)); |
| 164 | else | 167 | else |
| 165 | - ui->timeLabel->setText(buf.sprintf("%d초", time)); | 168 | + ui->timeLabel->setText(buf.sprintf("%d<span style=\"font-size:11pt;\">초</span>", time)); |
| 166 | 169 | ||
| 167 | if (oven->interTempEnabled()) | 170 | if (oven->interTempEnabled()) |
| 168 | { | 171 | { |
| @@ -172,10 +175,10 @@ void ManualCookWindow::updateLabels() | @@ -172,10 +175,10 @@ void ManualCookWindow::updateLabels() | ||
| 172 | else | 175 | else |
| 173 | interTemp = oven->interTemp(); | 176 | interTemp = oven->interTemp(); |
| 174 | 177 | ||
| 175 | - ui->interTempLabel->setText(buf.sprintf("%d℃", interTemp)); | 178 | + ui->interTempLabel->setText(buf.sprintf("%d<span style=\"font-size:11pt;\">℃</span>", interTemp)); |
| 176 | } | 179 | } |
| 177 | else | 180 | else |
| 178 | - ui->interTempLabel->setText("℃"); | 181 | + ui->interTempLabel->setText("<span style=\"font-size:11pt;\">℃</span>"); |
| 179 | 182 | ||
| 180 | int innerInterTemp = ui->innerInterTempSlider->sliderPosition(); | 183 | int innerInterTemp = ui->innerInterTempSlider->sliderPosition(); |
| 181 | // if (ui->innerInterTempSlider->isSliderDown()) | 184 | // if (ui->innerInterTempSlider->isSliderDown()) |
| @@ -183,7 +186,7 @@ void ManualCookWindow::updateLabels() | @@ -183,7 +186,7 @@ void ManualCookWindow::updateLabels() | ||
| 183 | // else | 186 | // else |
| 184 | // innerInterTemp = oven->interTemp(); | 187 | // innerInterTemp = oven->interTemp(); |
| 185 | 188 | ||
| 186 | - ui->innerInterTempLabel->setText(buf.sprintf("%d℃", innerInterTemp)); | 189 | + ui->innerInterTempLabel->setText(buf.sprintf("%d<span style=\"font-size:11pt;\">℃</span>", innerInterTemp)); |
| 187 | 190 | ||
| 188 | ui->curHumidityLabel->setText(buf.sprintf("%d", oven->currentHumidity())); | 191 | ui->curHumidityLabel->setText(buf.sprintf("%d", oven->currentHumidity())); |
| 189 | ui->targetHumidityLabel->setText(buf.sprintf("%d", oven->humidity())); | 192 | ui->targetHumidityLabel->setText(buf.sprintf("%d", oven->humidity())); |
| @@ -200,29 +203,16 @@ void ManualCookWindow::onModeButtonClicked(int mode) | @@ -200,29 +203,16 @@ void ManualCookWindow::onModeButtonClicked(int mode) | ||
| 200 | 203 | ||
| 201 | void ManualCookWindow::onOvenUpdated(Oven *oven) | 204 | void ManualCookWindow::onOvenUpdated(Oven *oven) |
| 202 | { | 205 | { |
| 203 | - ui->steamIndicator->hide(); | ||
| 204 | - ui->combiIndicator->hide(); | ||
| 205 | - ui->dryheatIndicator->hide(); | ||
| 206 | - ui->steamLabel->setEnabled(false); | ||
| 207 | - ui->combiLabel->setEnabled(false); | ||
| 208 | - ui->dryheatLabel->setEnabled(false); | ||
| 209 | - | ||
| 210 | switch (oven->mode()) | 206 | switch (oven->mode()) |
| 211 | { | 207 | { |
| 212 | case Oven::HeatMode: | 208 | case Oven::HeatMode: |
| 213 | ui->dryheatButton->setChecked(true); | 209 | ui->dryheatButton->setChecked(true); |
| 214 | - ui->dryheatIndicator->show(); | ||
| 215 | - ui->dryheatLabel->setEnabled(true); | ||
| 216 | break; | 210 | break; |
| 217 | case Oven::SteamMode: | 211 | case Oven::SteamMode: |
| 218 | ui->steamButton->setChecked(true); | 212 | ui->steamButton->setChecked(true); |
| 219 | - ui->steamIndicator->show(); | ||
| 220 | - ui->steamLabel->setEnabled(true); | ||
| 221 | break; | 213 | break; |
| 222 | case Oven::CombinationMode: | 214 | case Oven::CombinationMode: |
| 223 | ui->combiButton->setChecked(true); | 215 | ui->combiButton->setChecked(true); |
| 224 | - ui->combiIndicator->show(); | ||
| 225 | - ui->combiLabel->setEnabled(true); | ||
| 226 | break; | 216 | break; |
| 227 | default: | 217 | default: |
| 228 | break; | 218 | break; |
| @@ -249,18 +239,18 @@ void ManualCookWindow::onOvenUpdated(Oven *oven) | @@ -249,18 +239,18 @@ void ManualCookWindow::onOvenUpdated(Oven *oven) | ||
| 249 | // ui->interTempButton->setChecked(oven->interTempEnabled()); | 239 | // ui->interTempButton->setChecked(oven->interTempEnabled()); |
| 250 | if (oven->interTempEnabled()) | 240 | if (oven->interTempEnabled()) |
| 251 | ui->interTempButton->setStyleSheet("\ | 241 | ui->interTempButton->setStyleSheet("\ |
| 252 | -QPushButton#interTempButton {\ | 242 | +QPushButton {\ |
| 253 | border-image: url(:/images/images/manual/011_icon_04_ov_01.png);\ | 243 | border-image: url(:/images/images/manual/011_icon_04_ov_01.png);\ |
| 254 | }\ | 244 | }\ |
| 255 | -QPushButton#interTempButton:pressed {\ | 245 | +QPushButton:pressed {\ |
| 256 | border-image: url(:/images/images/manual/011_icon_04_ov.png);\ | 246 | border-image: url(:/images/images/manual/011_icon_04_ov.png);\ |
| 257 | }"); | 247 | }"); |
| 258 | else | 248 | else |
| 259 | ui->interTempButton->setStyleSheet("\ | 249 | ui->interTempButton->setStyleSheet("\ |
| 260 | -QPushButton#interTempButton {\ | 250 | +QPushButton {\ |
| 261 | border-image: url(:/images/images/manual/011_icon_04.png);\ | 251 | border-image: url(:/images/images/manual/011_icon_04.png);\ |
| 262 | }\ | 252 | }\ |
| 263 | -QPushButton#interTempButton:pressed {\ | 253 | +QPushButton:pressed {\ |
| 264 | border-image: url(:/images/images/manual/011_icon_04_ov.png);\ | 254 | border-image: url(:/images/images/manual/011_icon_04_ov.png);\ |
| 265 | }"); | 255 | }"); |
| 266 | 256 | ||
| @@ -284,57 +274,57 @@ QPushButton#interTempButton:pressed {\ | @@ -284,57 +274,57 @@ QPushButton#interTempButton:pressed {\ | ||
| 284 | 274 | ||
| 285 | if (oven->preheating()) | 275 | if (oven->preheating()) |
| 286 | ui->preheatButton->setStyleSheet( | 276 | ui->preheatButton->setStyleSheet( |
| 287 | - "border-image: url(:/images/images/manual/013_sys_icon_01_ov.png)"); | 277 | + "background-image: url(:/images/images/manual/013_sys_icon_01_ov.png)"); |
| 288 | else | 278 | else |
| 289 | ui->preheatButton->setStyleSheet( | 279 | ui->preheatButton->setStyleSheet( |
| 290 | - "border-image: url(:/images/images/manual/013_sys_icon_01.png)"); | 280 | + "background-image: url(:/images/images/manual/013_sys_icon_01.png)"); |
| 291 | 281 | ||
| 292 | if (oven->damper()) | 282 | if (oven->damper()) |
| 293 | ui->damperButton->setStyleSheet( | 283 | ui->damperButton->setStyleSheet( |
| 294 | - "border-image: url(:/images/images/manual/013_sys_icon_02_ov.png)"); | 284 | + "background-image: url(:/images/images/manual/013_sys_icon_02_ov.png)"); |
| 295 | else | 285 | else |
| 296 | ui->damperButton->setStyleSheet( | 286 | ui->damperButton->setStyleSheet( |
| 297 | - "border-image: url(:/images/images/manual/013_sys_icon_02.png)"); | 287 | + "background-image: url(:/images/images/manual/013_sys_icon_02.png)"); |
| 298 | 288 | ||
| 299 | if (oven->humidification()) | 289 | if (oven->humidification()) |
| 300 | ui->humidificationButton->setStyleSheet( | 290 | ui->humidificationButton->setStyleSheet( |
| 301 | - "border-image: url(:/images/images/manual/013_sys_icon_03_ov.png)"); | 291 | + "background-image: url(:/images/images/manual/013_sys_icon_03_ov.png)"); |
| 302 | else | 292 | else |
| 303 | ui->humidificationButton->setStyleSheet( | 293 | ui->humidificationButton->setStyleSheet( |
| 304 | - "border-image: url(:/images/images/manual/013_sys_icon_03.png)"); | 294 | + "background-image: url(:/images/images/manual/013_sys_icon_03.png)"); |
| 305 | 295 | ||
| 306 | if (oven->cooldown()) | 296 | if (oven->cooldown()) |
| 307 | ui->cooldownButton->setStyleSheet( | 297 | ui->cooldownButton->setStyleSheet( |
| 308 | - "border-image: url(:/images/images/manual/013_sys_icon_05_ov.png)"); | 298 | + "background-image: url(:/images/images/manual/013_sys_icon_05_ov.png)"); |
| 309 | else | 299 | else |
| 310 | ui->cooldownButton->setStyleSheet( | 300 | ui->cooldownButton->setStyleSheet( |
| 311 | - "border-image: url(:/images/images/manual/013_sys_icon_05.png)"); | 301 | + "background-image: url(:/images/images/manual/013_sys_icon_05.png)"); |
| 312 | 302 | ||
| 313 | switch (oven->fan()) | 303 | switch (oven->fan()) |
| 314 | { | 304 | { |
| 315 | case 1: | 305 | case 1: |
| 316 | ui->fanButton->setStyleSheet( | 306 | ui->fanButton->setStyleSheet( |
| 317 | - "border-image: url(:/images/images/manual/013_sys_icon_06.png)"); | 307 | + "background-image: url(:/images/images/manual/013_sys_icon_06.png)"); |
| 318 | break; | 308 | break; |
| 319 | case 2: | 309 | case 2: |
| 320 | ui->fanButton->setStyleSheet( | 310 | ui->fanButton->setStyleSheet( |
| 321 | - "border-image: url(:/images/images/manual/013_sys_icon_06_01.png)"); | 311 | + "background-image: url(:/images/images/manual/013_sys_icon_06_01.png)"); |
| 322 | break; | 312 | break; |
| 323 | case 3: | 313 | case 3: |
| 324 | ui->fanButton->setStyleSheet( | 314 | ui->fanButton->setStyleSheet( |
| 325 | - "border-image: url(:/images/images/manual/013_sys_icon_06_02.png)"); | 315 | + "background-image: url(:/images/images/manual/013_sys_icon_06_02.png)"); |
| 326 | break; | 316 | break; |
| 327 | case 4: | 317 | case 4: |
| 328 | ui->fanButton->setStyleSheet( | 318 | ui->fanButton->setStyleSheet( |
| 329 | - "border-image: url(:/images/images/manual/013_sys_icon_06_03.png)"); | 319 | + "background-image: url(:/images/images/manual/013_sys_icon_06_03.png)"); |
| 330 | break; | 320 | break; |
| 331 | case 5: | 321 | case 5: |
| 332 | ui->fanButton->setStyleSheet( | 322 | ui->fanButton->setStyleSheet( |
| 333 | - "border-image: url(:/images/images/manual/013_sys_icon_06_04.png)"); | 323 | + "background-image: url(:/images/images/manual/013_sys_icon_06_04.png)"); |
| 334 | break; | 324 | break; |
| 335 | default: | 325 | default: |
| 336 | ui->fanButton->setStyleSheet( | 326 | ui->fanButton->setStyleSheet( |
| 337 | - "border-image: url(:/images/images/manual/013_sys_icon_06.png)"); | 327 | + "background-image: url(:/images/images/manual/013_sys_icon_06.png)"); |
| 338 | break; | 328 | break; |
| 339 | } | 329 | } |
| 340 | 330 |
app/gui/oven_control/manualcookwindow.ui
| @@ -13,6 +13,27 @@ | @@ -13,6 +13,27 @@ | ||
| 13 | <property name="windowTitle"> | 13 | <property name="windowTitle"> |
| 14 | <string>MainWindow</string> | 14 | <string>MainWindow</string> |
| 15 | </property> | 15 | </property> |
| 16 | + <property name="styleSheet"> | ||
| 17 | + <string notr="true">QPushButton[style="mode"] { | ||
| 18 | +background-repeat: no-repeat; | ||
| 19 | +background-position: center; | ||
| 20 | +background-clip: border; | ||
| 21 | +background-origin: border; | ||
| 22 | +margin-bottom: 50px; | ||
| 23 | + | ||
| 24 | +border-top: 200px; | ||
| 25 | +border-bottom: -50px; | ||
| 26 | +border-style: hidden; | ||
| 27 | +color: #7B7B7B; | ||
| 28 | +font-size: 40px; | ||
| 29 | +} | ||
| 30 | + | ||
| 31 | +QPushButton[style="mode"]:checked { | ||
| 32 | +color: white; | ||
| 33 | +image: url(:/images/images/manual/003_02__mainicon_arrow.png); | ||
| 34 | +image-position: bottom; | ||
| 35 | +}</string> | ||
| 36 | + </property> | ||
| 16 | <widget class="QWidget" name="centralwidget"> | 37 | <widget class="QWidget" name="centralwidget"> |
| 17 | <property name="styleSheet"> | 38 | <property name="styleSheet"> |
| 18 | <string notr="true">QWidget#centralwidget { | 39 | <string notr="true">QWidget#centralwidget { |
| @@ -46,13 +67,13 @@ | @@ -46,13 +67,13 @@ | ||
| 46 | <height>426</height> | 67 | <height>426</height> |
| 47 | </size> | 68 | </size> |
| 48 | </property> | 69 | </property> |
| 49 | - <widget class="QWidget" name="clockContainer_2"> | 70 | + <widget class="QWidget" name="clockContainer"> |
| 50 | <property name="styleSheet"> | 71 | <property name="styleSheet"> |
| 51 | <string notr="true">#clockContainer_2 { | 72 | <string notr="true">#clockContainer_2 { |
| 52 | background-image: url(:/images/images/manual/001_01_background_time.png) | 73 | background-image: url(:/images/images/manual/001_01_background_time.png) |
| 53 | }</string> | 74 | }</string> |
| 54 | </property> | 75 | </property> |
| 55 | - <widget class="Clock" name="clock_2" native="true"> | 76 | + <widget class="Clock" name="clock" native="true"> |
| 56 | <property name="geometry"> | 77 | <property name="geometry"> |
| 57 | <rect> | 78 | <rect> |
| 58 | <x>272</x> | 79 | <x>272</x> |
| @@ -67,39 +88,27 @@ | @@ -67,39 +88,27 @@ | ||
| 67 | <widget class="QPushButton" name="combiButton"> | 88 | <widget class="QPushButton" name="combiButton"> |
| 68 | <property name="geometry"> | 89 | <property name="geometry"> |
| 69 | <rect> | 90 | <rect> |
| 70 | - <x>386</x> | ||
| 71 | - <y>479</y> | ||
| 72 | - <width>129</width> | ||
| 73 | - <height>128</height> | 91 | + <x>300</x> |
| 92 | + <y>426</y> | ||
| 93 | + <width>300</width> | ||
| 94 | + <height>293</height> | ||
| 74 | </rect> | 95 | </rect> |
| 75 | </property> | 96 | </property> |
| 76 | - <property name="minimumSize"> | ||
| 77 | - <size> | ||
| 78 | - <width>129</width> | ||
| 79 | - <height>128</height> | ||
| 80 | - </size> | ||
| 81 | - </property> | ||
| 82 | - <property name="maximumSize"> | ||
| 83 | - <size> | ||
| 84 | - <width>129</width> | ||
| 85 | - <height>128</height> | ||
| 86 | - </size> | ||
| 87 | - </property> | ||
| 88 | <property name="styleSheet"> | 97 | <property name="styleSheet"> |
| 89 | - <string notr="true">QPushButton#combiButton { | ||
| 90 | - border-image: url(:/images/images/manual/003_combi_icon_hide.png); | 98 | + <string notr="true">QPushButton { |
| 99 | + background-image: url(:/images/images/manual/003_combi_icon_hide.png); | ||
| 91 | } | 100 | } |
| 92 | 101 | ||
| 93 | -QPushButton#combiButton:pressed { | ||
| 94 | - border-image: url(:/images/images/manual/003_combi_icon_ov.png); | 102 | +QPushButton:pressed { |
| 103 | + background-image: url(:/images/images/manual/003_combi_icon_ov.png); | ||
| 95 | } | 104 | } |
| 96 | 105 | ||
| 97 | -QPushButton#combiButton:checked { | ||
| 98 | - border-image: url(:/images/images/manual/003_combi_icon.png); | 106 | +QPushButton:checked { |
| 107 | + background-image: url(:/images/images/manual/003_combi_icon.png); | ||
| 99 | }</string> | 108 | }</string> |
| 100 | </property> | 109 | </property> |
| 101 | <property name="text"> | 110 | <property name="text"> |
| 102 | - <string/> | 111 | + <string>콤비</string> |
| 103 | </property> | 112 | </property> |
| 104 | <property name="checkable"> | 113 | <property name="checkable"> |
| 105 | <bool>true</bool> | 114 | <bool>true</bool> |
| @@ -107,43 +116,34 @@ QPushButton#combiButton:checked { | @@ -107,43 +116,34 @@ QPushButton#combiButton:checked { | ||
| 107 | <property name="autoExclusive"> | 116 | <property name="autoExclusive"> |
| 108 | <bool>true</bool> | 117 | <bool>true</bool> |
| 109 | </property> | 118 | </property> |
| 119 | + <property name="style" stdset="0"> | ||
| 120 | + <string>mode</string> | ||
| 121 | + </property> | ||
| 110 | </widget> | 122 | </widget> |
| 111 | <widget class="QPushButton" name="steamButton"> | 123 | <widget class="QPushButton" name="steamButton"> |
| 112 | <property name="geometry"> | 124 | <property name="geometry"> |
| 113 | <rect> | 125 | <rect> |
| 114 | - <x>86</x> | ||
| 115 | - <y>479</y> | ||
| 116 | - <width>129</width> | ||
| 117 | - <height>128</height> | 126 | + <x>0</x> |
| 127 | + <y>426</y> | ||
| 128 | + <width>300</width> | ||
| 129 | + <height>293</height> | ||
| 118 | </rect> | 130 | </rect> |
| 119 | </property> | 131 | </property> |
| 120 | - <property name="minimumSize"> | ||
| 121 | - <size> | ||
| 122 | - <width>129</width> | ||
| 123 | - <height>128</height> | ||
| 124 | - </size> | ||
| 125 | - </property> | ||
| 126 | - <property name="maximumSize"> | ||
| 127 | - <size> | ||
| 128 | - <width>129</width> | ||
| 129 | - <height>128</height> | ||
| 130 | - </size> | ||
| 131 | - </property> | ||
| 132 | <property name="styleSheet"> | 132 | <property name="styleSheet"> |
| 133 | - <string notr="true">QPushButton#steamButton { | ||
| 134 | - border-image: url(:/images/images/manual/003_steam_icon_hide.png); | 133 | + <string notr="true">QPushButton { |
| 134 | + background-image: url(:/images/images/manual/003_steam_icon_hide.png); | ||
| 135 | } | 135 | } |
| 136 | 136 | ||
| 137 | -QPushButton#steamButton:pressed { | ||
| 138 | - border-image: url(:/images/images/main/003_steam_icon_ov.png); | 137 | +QPushButton:pressed { |
| 138 | + background-image: url(:/images/images/main/003_steam_icon_ov.png); | ||
| 139 | } | 139 | } |
| 140 | 140 | ||
| 141 | -QPushButton#steamButton:checked { | ||
| 142 | - border-image: url(:/images/images/manual/003_steam_icon.png); | 141 | +QPushButton:checked { |
| 142 | + background-image: url(:/images/images/manual/003_steam_icon.png); | ||
| 143 | }</string> | 143 | }</string> |
| 144 | </property> | 144 | </property> |
| 145 | <property name="text"> | 145 | <property name="text"> |
| 146 | - <string/> | 146 | + <string>스팀</string> |
| 147 | </property> | 147 | </property> |
| 148 | <property name="checkable"> | 148 | <property name="checkable"> |
| 149 | <bool>true</bool> | 149 | <bool>true</bool> |
| @@ -151,43 +151,34 @@ QPushButton#steamButton:checked { | @@ -151,43 +151,34 @@ QPushButton#steamButton:checked { | ||
| 151 | <property name="autoExclusive"> | 151 | <property name="autoExclusive"> |
| 152 | <bool>true</bool> | 152 | <bool>true</bool> |
| 153 | </property> | 153 | </property> |
| 154 | + <property name="style" stdset="0"> | ||
| 155 | + <string>mode</string> | ||
| 156 | + </property> | ||
| 154 | </widget> | 157 | </widget> |
| 155 | <widget class="QPushButton" name="dryheatButton"> | 158 | <widget class="QPushButton" name="dryheatButton"> |
| 156 | <property name="geometry"> | 159 | <property name="geometry"> |
| 157 | <rect> | 160 | <rect> |
| 158 | - <x>686</x> | ||
| 159 | - <y>479</y> | ||
| 160 | - <width>129</width> | ||
| 161 | - <height>128</height> | 161 | + <x>600</x> |
| 162 | + <y>426</y> | ||
| 163 | + <width>300</width> | ||
| 164 | + <height>293</height> | ||
| 162 | </rect> | 165 | </rect> |
| 163 | </property> | 166 | </property> |
| 164 | - <property name="minimumSize"> | ||
| 165 | - <size> | ||
| 166 | - <width>129</width> | ||
| 167 | - <height>128</height> | ||
| 168 | - </size> | ||
| 169 | - </property> | ||
| 170 | - <property name="maximumSize"> | ||
| 171 | - <size> | ||
| 172 | - <width>129</width> | ||
| 173 | - <height>128</height> | ||
| 174 | - </size> | ||
| 175 | - </property> | ||
| 176 | <property name="styleSheet"> | 167 | <property name="styleSheet"> |
| 177 | - <string notr="true">QPushButton#dryheatButton { | ||
| 178 | - border-image: url(:/images/images/manual/003_dryheat_icon_hide.png); | 168 | + <string notr="true">QPushButton { |
| 169 | + background-image: url(:/images/images/manual/003_dryheat_icon_hide.png); | ||
| 179 | } | 170 | } |
| 180 | 171 | ||
| 181 | -QPushButton#dryheatButton:pressed { | ||
| 182 | - border-image: url(:/images/images/manual/003_dryheat_icon_ov.png); | 172 | +QPushButton:pressed { |
| 173 | + background-image: url(:/images/images/manual/003_dryheat_icon_ov.png); | ||
| 183 | } | 174 | } |
| 184 | 175 | ||
| 185 | -QPushButton#dryheatButton:checked { | ||
| 186 | - border-image: url(:/images/images/manual/003_dryheat_icon.png); | 176 | +QPushButton:checked { |
| 177 | + background-image: url(:/images/images/manual/003_dryheat_icon.png); | ||
| 187 | }</string> | 178 | }</string> |
| 188 | </property> | 179 | </property> |
| 189 | <property name="text"> | 180 | <property name="text"> |
| 190 | - <string/> | 181 | + <string>건열</string> |
| 191 | </property> | 182 | </property> |
| 192 | <property name="checkable"> | 183 | <property name="checkable"> |
| 193 | <bool>true</bool> | 184 | <bool>true</bool> |
| @@ -195,6 +186,9 @@ QPushButton#dryheatButton:checked { | @@ -195,6 +186,9 @@ QPushButton#dryheatButton:checked { | ||
| 195 | <property name="autoExclusive"> | 186 | <property name="autoExclusive"> |
| 196 | <bool>true</bool> | 187 | <bool>true</bool> |
| 197 | </property> | 188 | </property> |
| 189 | + <property name="style" stdset="0"> | ||
| 190 | + <string>mode</string> | ||
| 191 | + </property> | ||
| 198 | </widget> | 192 | </widget> |
| 199 | <widget class="QWidget" name="underBar" native="true"> | 193 | <widget class="QWidget" name="underBar" native="true"> |
| 200 | <property name="geometry"> | 194 | <property name="geometry"> |
| @@ -613,11 +607,11 @@ QPushButton#humidityButton:pressed { | @@ -613,11 +607,11 @@ QPushButton#humidityButton:pressed { | ||
| 613 | </rect> | 607 | </rect> |
| 614 | </property> | 608 | </property> |
| 615 | <property name="styleSheet"> | 609 | <property name="styleSheet"> |
| 616 | - <string notr="true">QPushButton#interTempButton { | 610 | + <string notr="true">QPushButton { |
| 617 | border-image: url(:/images/images/manual/011_icon_04.png); | 611 | border-image: url(:/images/images/manual/011_icon_04.png); |
| 618 | } | 612 | } |
| 619 | 613 | ||
| 620 | -QPushButton#interTempButton:pressed { | 614 | +QPushButton:pressed { |
| 621 | border-image: url(:/images/images/manual/011_icon_04_ov.png); | 615 | border-image: url(:/images/images/manual/011_icon_04_ov.png); |
| 622 | }</string> | 616 | }</string> |
| 623 | </property> | 617 | </property> |
| @@ -711,23 +705,30 @@ QPushButton#tempButton:pressed { | @@ -711,23 +705,30 @@ QPushButton#tempButton:pressed { | ||
| 711 | <height>131</height> | 705 | <height>131</height> |
| 712 | </rect> | 706 | </rect> |
| 713 | </property> | 707 | </property> |
| 708 | + <property name="styleSheet"> | ||
| 709 | + <string notr="true">QPushButton { | ||
| 710 | +background-repeat: no-repeat; | ||
| 711 | +background-position: center; | ||
| 712 | +border: none; | ||
| 713 | +}</string> | ||
| 714 | + </property> | ||
| 714 | <widget class="QWidget" name="frontButtonStack"> | 715 | <widget class="QWidget" name="frontButtonStack"> |
| 715 | <widget class="QPushButton" name="goBackStackButton"> | 716 | <widget class="QPushButton" name="goBackStackButton"> |
| 716 | <property name="geometry"> | 717 | <property name="geometry"> |
| 717 | <rect> | 718 | <rect> |
| 718 | - <x>488</x> | ||
| 719 | - <y>36</y> | ||
| 720 | - <width>37</width> | ||
| 721 | - <height>60</height> | 719 | + <x>448</x> |
| 720 | + <y>0</y> | ||
| 721 | + <width>112</width> | ||
| 722 | + <height>131</height> | ||
| 722 | </rect> | 723 | </rect> |
| 723 | </property> | 724 | </property> |
| 724 | <property name="styleSheet"> | 725 | <property name="styleSheet"> |
| 725 | <string notr="true">QPushButton { | 726 | <string notr="true">QPushButton { |
| 726 | -border-image: url(:/images/images/manual/013_sys_icon_arrow.png); | 727 | +background-image: url(:/images/images/manual/013_sys_icon_arrow.png); |
| 727 | } | 728 | } |
| 728 | 729 | ||
| 729 | QPushButton:pressed { | 730 | QPushButton:pressed { |
| 730 | -border-image: url(:/images/images/manual/013_sys_icon_arrow_ov.png); | 731 | +background-image: url(:/images/images/manual/013_sys_icon_arrow_ov.png); |
| 731 | }</string> | 732 | }</string> |
| 732 | </property> | 733 | </property> |
| 733 | <property name="text"> | 734 | <property name="text"> |
| @@ -750,19 +751,19 @@ border-image: url(:/images/images/manual/013_sys_icon_arrow_ov.png); | @@ -750,19 +751,19 @@ border-image: url(:/images/images/manual/013_sys_icon_arrow_ov.png); | ||
| 750 | <widget class="QPushButton" name="humidificationButton"> | 751 | <widget class="QPushButton" name="humidificationButton"> |
| 751 | <property name="geometry"> | 752 | <property name="geometry"> |
| 752 | <rect> | 753 | <rect> |
| 753 | - <x>250</x> | ||
| 754 | - <y>26</y> | ||
| 755 | - <width>63</width> | ||
| 756 | - <height>79</height> | 754 | + <x>224</x> |
| 755 | + <y>0</y> | ||
| 756 | + <width>112</width> | ||
| 757 | + <height>131</height> | ||
| 757 | </rect> | 758 | </rect> |
| 758 | </property> | 759 | </property> |
| 759 | <property name="styleSheet"> | 760 | <property name="styleSheet"> |
| 760 | <string notr="true">QPushButton { | 761 | <string notr="true">QPushButton { |
| 761 | -border-image: url(:/images/images/manual/013_sys_icon_03.png); | 762 | +background-image: url(:/images/images/manual/013_sys_icon_03.png); |
| 762 | } | 763 | } |
| 763 | 764 | ||
| 764 | QPushButton:pressed { | 765 | QPushButton:pressed { |
| 765 | -border-image: url(:/images/images/manual/013_sys_icon_03_ov.png); | 766 | +background-image: url(:/images/images/manual/013_sys_icon_03_ov.png); |
| 766 | }</string> | 767 | }</string> |
| 767 | </property> | 768 | </property> |
| 768 | <property name="text"> | 769 | <property name="text"> |
| @@ -785,19 +786,19 @@ border-image: url(:/images/images/manual/013_sys_icon_03_ov.png); | @@ -785,19 +786,19 @@ border-image: url(:/images/images/manual/013_sys_icon_03_ov.png); | ||
| 785 | <widget class="QPushButton" name="preheatButton"> | 786 | <widget class="QPushButton" name="preheatButton"> |
| 786 | <property name="geometry"> | 787 | <property name="geometry"> |
| 787 | <rect> | 788 | <rect> |
| 788 | - <x>29</x> | ||
| 789 | - <y>35</y> | ||
| 790 | - <width>55</width> | ||
| 791 | - <height>61</height> | 789 | + <x>0</x> |
| 790 | + <y>0</y> | ||
| 791 | + <width>112</width> | ||
| 792 | + <height>131</height> | ||
| 792 | </rect> | 793 | </rect> |
| 793 | </property> | 794 | </property> |
| 794 | <property name="styleSheet"> | 795 | <property name="styleSheet"> |
| 795 | <string notr="true">QPushButton { | 796 | <string notr="true">QPushButton { |
| 796 | -border-image: url(:/images/images/manual/013_sys_icon_01.png); | 797 | +background-image: url(:/images/images/manual/013_sys_icon_01.png); |
| 797 | } | 798 | } |
| 798 | 799 | ||
| 799 | QPushButton:pressed { | 800 | QPushButton:pressed { |
| 800 | -border-image: url(:/images/images/manual/013_sys_icon_01_ov.png); | 801 | +background-image: url(:/images/images/manual/013_sys_icon_01_ov.png); |
| 801 | }</string> | 802 | }</string> |
| 802 | </property> | 803 | </property> |
| 803 | <property name="text"> | 804 | <property name="text"> |
| @@ -807,19 +808,19 @@ border-image: url(:/images/images/manual/013_sys_icon_01_ov.png); | @@ -807,19 +808,19 @@ border-image: url(:/images/images/manual/013_sys_icon_01_ov.png); | ||
| 807 | <widget class="QPushButton" name="repeatButton"> | 808 | <widget class="QPushButton" name="repeatButton"> |
| 808 | <property name="geometry"> | 809 | <property name="geometry"> |
| 809 | <rect> | 810 | <rect> |
| 810 | - <x>358</x> | ||
| 811 | - <y>32</y> | ||
| 812 | - <width>72</width> | ||
| 813 | - <height>68</height> | 811 | + <x>336</x> |
| 812 | + <y>0</y> | ||
| 813 | + <width>112</width> | ||
| 814 | + <height>131</height> | ||
| 814 | </rect> | 815 | </rect> |
| 815 | </property> | 816 | </property> |
| 816 | <property name="styleSheet"> | 817 | <property name="styleSheet"> |
| 817 | <string notr="true">QPushButton { | 818 | <string notr="true">QPushButton { |
| 818 | -border-image: url(:/images/images/manual/013_sys_icon_04.png); | 819 | +background-image: url(:/images/images/manual/013_sys_icon_04.png); |
| 819 | } | 820 | } |
| 820 | 821 | ||
| 821 | QPushButton:pressed { | 822 | QPushButton:pressed { |
| 822 | -border-image: url(:/images/images/manual/013_sys_icon_04_ov.png); | 823 | +background-image: url(:/images/images/manual/013_sys_icon_04_ov.png); |
| 823 | }</string> | 824 | }</string> |
| 824 | </property> | 825 | </property> |
| 825 | <property name="text"> | 826 | <property name="text"> |
| @@ -842,19 +843,19 @@ border-image: url(:/images/images/manual/013_sys_icon_04_ov.png); | @@ -842,19 +843,19 @@ border-image: url(:/images/images/manual/013_sys_icon_04_ov.png); | ||
| 842 | <widget class="QPushButton" name="damperButton"> | 843 | <widget class="QPushButton" name="damperButton"> |
| 843 | <property name="geometry"> | 844 | <property name="geometry"> |
| 844 | <rect> | 845 | <rect> |
| 845 | - <x>131</x> | ||
| 846 | - <y>33</y> | ||
| 847 | - <width>76</width> | ||
| 848 | - <height>66</height> | 846 | + <x>112</x> |
| 847 | + <y>0</y> | ||
| 848 | + <width>112</width> | ||
| 849 | + <height>131</height> | ||
| 849 | </rect> | 850 | </rect> |
| 850 | </property> | 851 | </property> |
| 851 | <property name="styleSheet"> | 852 | <property name="styleSheet"> |
| 852 | <string notr="true">QPushButton { | 853 | <string notr="true">QPushButton { |
| 853 | -border-image: url(:/images/images/manual/013_sys_icon_02.png); | 854 | +background-image: url(:/images/images/manual/013_sys_icon_02.png); |
| 854 | } | 855 | } |
| 855 | 856 | ||
| 856 | QPushButton:pressed { | 857 | QPushButton:pressed { |
| 857 | -border-image: url(:/images/images/manual/013_sys_icon_02_ov.png); | 858 | +background-image: url(:/images/images/manual/013_sys_icon_02_ov.png); |
| 858 | }</string> | 859 | }</string> |
| 859 | </property> | 860 | </property> |
| 860 | <property name="text"> | 861 | <property name="text"> |
| @@ -866,19 +867,19 @@ border-image: url(:/images/images/manual/013_sys_icon_02_ov.png); | @@ -866,19 +867,19 @@ border-image: url(:/images/images/manual/013_sys_icon_02_ov.png); | ||
| 866 | <widget class="QPushButton" name="goFrontStackButton"> | 867 | <widget class="QPushButton" name="goFrontStackButton"> |
| 867 | <property name="geometry"> | 868 | <property name="geometry"> |
| 868 | <rect> | 869 | <rect> |
| 869 | - <x>488</x> | ||
| 870 | - <y>36</y> | ||
| 871 | - <width>37</width> | ||
| 872 | - <height>60</height> | 870 | + <x>448</x> |
| 871 | + <y>0</y> | ||
| 872 | + <width>112</width> | ||
| 873 | + <height>131</height> | ||
| 873 | </rect> | 874 | </rect> |
| 874 | </property> | 875 | </property> |
| 875 | <property name="styleSheet"> | 876 | <property name="styleSheet"> |
| 876 | <string notr="true">QPushButton { | 877 | <string notr="true">QPushButton { |
| 877 | -border-image: url(:/images/images/manual/013_sys_icon_arrow.png); | 878 | +background-image: url(:/images/images/manual/013_sys_icon_arrow.png); |
| 878 | } | 879 | } |
| 879 | 880 | ||
| 880 | QPushButton:pressed { | 881 | QPushButton:pressed { |
| 881 | -border-image: url(:/images/images/manual/013_sys_icon_arrow_ov.png); | 882 | +background-image: url(:/images/images/manual/013_sys_icon_arrow_ov.png); |
| 882 | }</string> | 883 | }</string> |
| 883 | </property> | 884 | </property> |
| 884 | <property name="text"> | 885 | <property name="text"> |
| @@ -901,27 +902,24 @@ border-image: url(:/images/images/manual/013_sys_icon_arrow_ov.png); | @@ -901,27 +902,24 @@ border-image: url(:/images/images/manual/013_sys_icon_arrow_ov.png); | ||
| 901 | <widget class="QPushButton" name="reserveButton"> | 902 | <widget class="QPushButton" name="reserveButton"> |
| 902 | <property name="geometry"> | 903 | <property name="geometry"> |
| 903 | <rect> | 904 | <rect> |
| 904 | - <x>247</x> | ||
| 905 | - <y>37</y> | ||
| 906 | - <width>69</width> | ||
| 907 | - <height>58</height> | 905 | + <x>224</x> |
| 906 | + <y>0</y> | ||
| 907 | + <width>112</width> | ||
| 908 | + <height>131</height> | ||
| 908 | </rect> | 909 | </rect> |
| 909 | </property> | 910 | </property> |
| 910 | <property name="styleSheet"> | 911 | <property name="styleSheet"> |
| 911 | <string notr="true">QPushButton { | 912 | <string notr="true">QPushButton { |
| 912 | -border-image: url(:/images/images/manual/013_sys_icon_07.png); | 913 | +background-image: url(:/images/images/manual/013_sys_icon_07.png); |
| 913 | } | 914 | } |
| 914 | 915 | ||
| 915 | QPushButton:pressed { | 916 | QPushButton:pressed { |
| 916 | -border-image: url(:/images/images/manual/013_sys_icon_07_ov.png); | 917 | +background-image: url(:/images/images/manual/013_sys_icon_07_ov.png); |
| 917 | }</string> | 918 | }</string> |
| 918 | </property> | 919 | </property> |
| 919 | <property name="text"> | 920 | <property name="text"> |
| 920 | <string/> | 921 | <string/> |
| 921 | </property> | 922 | </property> |
| 922 | - <property name="checkable"> | ||
| 923 | - <bool>true</bool> | ||
| 924 | - </property> | ||
| 925 | </widget> | 923 | </widget> |
| 926 | <widget class="QWidget" name="sysLine_5" native="true"> | 924 | <widget class="QWidget" name="sysLine_5" native="true"> |
| 927 | <property name="geometry"> | 925 | <property name="geometry"> |
| @@ -939,19 +937,19 @@ border-image: url(:/images/images/manual/013_sys_icon_07_ov.png); | @@ -939,19 +937,19 @@ border-image: url(:/images/images/manual/013_sys_icon_07_ov.png); | ||
| 939 | <widget class="QPushButton" name="cooldownButton"> | 937 | <widget class="QPushButton" name="cooldownButton"> |
| 940 | <property name="geometry"> | 938 | <property name="geometry"> |
| 941 | <rect> | 939 | <rect> |
| 942 | - <x>29</x> | ||
| 943 | - <y>35</y> | ||
| 944 | - <width>55</width> | ||
| 945 | - <height>61</height> | 940 | + <x>0</x> |
| 941 | + <y>0</y> | ||
| 942 | + <width>112</width> | ||
| 943 | + <height>131</height> | ||
| 946 | </rect> | 944 | </rect> |
| 947 | </property> | 945 | </property> |
| 948 | <property name="styleSheet"> | 946 | <property name="styleSheet"> |
| 949 | <string notr="true">QPushButton { | 947 | <string notr="true">QPushButton { |
| 950 | -border-image: url(:/images/images/manual/013_sys_icon_05.png); | 948 | +background-image: url(:/images/images/manual/013_sys_icon_05.png); |
| 951 | } | 949 | } |
| 952 | 950 | ||
| 953 | QPushButton:pressed { | 951 | QPushButton:pressed { |
| 954 | -border-image: url(:/images/images/manual/013_sys_icon_05_ov.png); | 952 | +background-image: url(:/images/images/manual/013_sys_icon_05_ov.png); |
| 955 | }</string> | 953 | }</string> |
| 956 | </property> | 954 | </property> |
| 957 | <property name="text"> | 955 | <property name="text"> |
| @@ -964,31 +962,25 @@ border-image: url(:/images/images/manual/013_sys_icon_05_ov.png); | @@ -964,31 +962,25 @@ border-image: url(:/images/images/manual/013_sys_icon_05_ov.png); | ||
| 964 | <widget class="QPushButton" name="favoritesButton"> | 962 | <widget class="QPushButton" name="favoritesButton"> |
| 965 | <property name="geometry"> | 963 | <property name="geometry"> |
| 966 | <rect> | 964 | <rect> |
| 967 | - <x>361</x> | ||
| 968 | - <y>39</y> | ||
| 969 | - <width>66</width> | ||
| 970 | - <height>54</height> | 965 | + <x>336</x> |
| 966 | + <y>0</y> | ||
| 967 | + <width>112</width> | ||
| 968 | + <height>131</height> | ||
| 971 | </rect> | 969 | </rect> |
| 972 | </property> | 970 | </property> |
| 973 | <property name="styleSheet"> | 971 | <property name="styleSheet"> |
| 974 | <string notr="true">QPushButton { | 972 | <string notr="true">QPushButton { |
| 975 | -border-image: url(:/images/images/manual/013_sys_icon_08.png); | 973 | +background-image: url(:/images/images/manual/013_sys_icon_08.png); |
| 976 | } | 974 | } |
| 977 | 975 | ||
| 978 | QPushButton:pressed { | 976 | QPushButton:pressed { |
| 979 | -border-image: url(:/images/images/manual/013_sys_icon_08_ov.png); | 977 | +background-image: url(:/images/images/manual/013_sys_icon_08_ov.png); |
| 980 | } | 978 | } |
| 981 | - | ||
| 982 | -QPushButton:checked { | ||
| 983 | -border-image: url(:/images/images/manual/013_sys_icon_08_ov.png); | ||
| 984 | -}</string> | 979 | +</string> |
| 985 | </property> | 980 | </property> |
| 986 | <property name="text"> | 981 | <property name="text"> |
| 987 | <string/> | 982 | <string/> |
| 988 | </property> | 983 | </property> |
| 989 | - <property name="checkable"> | ||
| 990 | - <bool>true</bool> | ||
| 991 | - </property> | ||
| 992 | </widget> | 984 | </widget> |
| 993 | <widget class="QWidget" name="sysLine_6" native="true"> | 985 | <widget class="QWidget" name="sysLine_6" native="true"> |
| 994 | <property name="geometry"> | 986 | <property name="geometry"> |
| @@ -1006,15 +998,15 @@ border-image: url(:/images/images/manual/013_sys_icon_08_ov.png); | @@ -1006,15 +998,15 @@ border-image: url(:/images/images/manual/013_sys_icon_08_ov.png); | ||
| 1006 | <widget class="QPushButton" name="fanButton"> | 998 | <widget class="QPushButton" name="fanButton"> |
| 1007 | <property name="geometry"> | 999 | <property name="geometry"> |
| 1008 | <rect> | 1000 | <rect> |
| 1009 | - <x>139</x> | ||
| 1010 | - <y>36</y> | ||
| 1011 | - <width>60</width> | ||
| 1012 | - <height>59</height> | 1001 | + <x>112</x> |
| 1002 | + <y>0</y> | ||
| 1003 | + <width>112</width> | ||
| 1004 | + <height>131</height> | ||
| 1013 | </rect> | 1005 | </rect> |
| 1014 | </property> | 1006 | </property> |
| 1015 | <property name="styleSheet"> | 1007 | <property name="styleSheet"> |
| 1016 | <string notr="true">QPushButton { | 1008 | <string notr="true">QPushButton { |
| 1017 | -border-image: url(:/images/images/manual/013_sys_icon_06.png); | 1009 | +background-image: url(:/images/images/manual/013_sys_icon_06.png); |
| 1018 | } | 1010 | } |
| 1019 | </string> | 1011 | </string> |
| 1020 | </property> | 1012 | </property> |
| @@ -1323,8 +1315,10 @@ border-image: url(:/images/images/manual/013_sys_icon_06.png); | @@ -1323,8 +1315,10 @@ border-image: url(:/images/images/manual/013_sys_icon_06.png); | ||
| 1323 | </property> | 1315 | </property> |
| 1324 | <property name="font"> | 1316 | <property name="font"> |
| 1325 | <font> | 1317 | <font> |
| 1326 | - <family>Malgun Gothic</family> | ||
| 1327 | - <pointsize>11</pointsize> | 1318 | + <family>Roboto</family> |
| 1319 | + <pointsize>16</pointsize> | ||
| 1320 | + <weight>75</weight> | ||
| 1321 | + <bold>true</bold> | ||
| 1328 | </font> | 1322 | </font> |
| 1329 | </property> | 1323 | </property> |
| 1330 | <property name="text"> | 1324 | <property name="text"> |
| @@ -1385,8 +1379,10 @@ border-image: url(:/images/images/manual/013_sys_icon_06.png); | @@ -1385,8 +1379,10 @@ border-image: url(:/images/images/manual/013_sys_icon_06.png); | ||
| 1385 | </property> | 1379 | </property> |
| 1386 | <property name="font"> | 1380 | <property name="font"> |
| 1387 | <font> | 1381 | <font> |
| 1388 | - <family>Malgun Gothic</family> | ||
| 1389 | - <pointsize>11</pointsize> | 1382 | + <family>Roboto</family> |
| 1383 | + <pointsize>16</pointsize> | ||
| 1384 | + <weight>75</weight> | ||
| 1385 | + <bold>true</bold> | ||
| 1390 | </font> | 1386 | </font> |
| 1391 | </property> | 1387 | </property> |
| 1392 | <property name="text"> | 1388 | <property name="text"> |
| @@ -1402,9 +1398,9 @@ border-image: url(:/images/images/manual/013_sys_icon_06.png); | @@ -1402,9 +1398,9 @@ border-image: url(:/images/images/manual/013_sys_icon_06.png); | ||
| 1402 | </property> | 1398 | </property> |
| 1403 | <property name="geometry"> | 1399 | <property name="geometry"> |
| 1404 | <rect> | 1400 | <rect> |
| 1405 | - <x>690</x> | 1401 | + <x>539</x> |
| 1406 | <y>1110</y> | 1402 | <y>1110</y> |
| 1407 | - <width>150</width> | 1403 | + <width>301</width> |
| 1408 | <height>51</height> | 1404 | <height>51</height> |
| 1409 | </rect> | 1405 | </rect> |
| 1410 | </property> | 1406 | </property> |
| @@ -1447,8 +1443,10 @@ border-image: url(:/images/images/manual/013_sys_icon_06.png); | @@ -1447,8 +1443,10 @@ border-image: url(:/images/images/manual/013_sys_icon_06.png); | ||
| 1447 | </property> | 1443 | </property> |
| 1448 | <property name="font"> | 1444 | <property name="font"> |
| 1449 | <font> | 1445 | <font> |
| 1450 | - <family>Malgun Gothic</family> | ||
| 1451 | - <pointsize>11</pointsize> | 1446 | + <family>Roboto</family> |
| 1447 | + <pointsize>16</pointsize> | ||
| 1448 | + <weight>75</weight> | ||
| 1449 | + <bold>true</bold> | ||
| 1452 | </font> | 1450 | </font> |
| 1453 | </property> | 1451 | </property> |
| 1454 | <property name="text"> | 1452 | <property name="text"> |
| @@ -1509,8 +1507,10 @@ border-image: url(:/images/images/manual/013_sys_icon_06.png); | @@ -1509,8 +1507,10 @@ border-image: url(:/images/images/manual/013_sys_icon_06.png); | ||
| 1509 | </property> | 1507 | </property> |
| 1510 | <property name="font"> | 1508 | <property name="font"> |
| 1511 | <font> | 1509 | <font> |
| 1512 | - <family>Malgun Gothic</family> | ||
| 1513 | - <pointsize>11</pointsize> | 1510 | + <family>Roboto</family> |
| 1511 | + <pointsize>16</pointsize> | ||
| 1512 | + <weight>75</weight> | ||
| 1513 | + <bold>true</bold> | ||
| 1514 | </font> | 1514 | </font> |
| 1515 | </property> | 1515 | </property> |
| 1516 | <property name="text"> | 1516 | <property name="text"> |
| @@ -1800,8 +1800,10 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); | @@ -1800,8 +1800,10 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); | ||
| 1800 | </property> | 1800 | </property> |
| 1801 | <property name="font"> | 1801 | <property name="font"> |
| 1802 | <font> | 1802 | <font> |
| 1803 | - <family>Malgun Gothic</family> | ||
| 1804 | - <pointsize>11</pointsize> | 1803 | + <family>Roboto</family> |
| 1804 | + <pointsize>16</pointsize> | ||
| 1805 | + <weight>75</weight> | ||
| 1806 | + <bold>true</bold> | ||
| 1805 | </font> | 1807 | </font> |
| 1806 | </property> | 1808 | </property> |
| 1807 | <property name="text"> | 1809 | <property name="text"> |
| @@ -1863,7 +1865,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); | @@ -1863,7 +1865,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); | ||
| 1863 | <property name="font"> | 1865 | <property name="font"> |
| 1864 | <font> | 1866 | <font> |
| 1865 | <family>Malgun Gothic</family> | 1867 | <family>Malgun Gothic</family> |
| 1866 | - <pointsize>9</pointsize> | 1868 | + <pointsize>11</pointsize> |
| 1867 | </font> | 1869 | </font> |
| 1868 | </property> | 1870 | </property> |
| 1869 | <property name="text"> | 1871 | <property name="text"> |
| @@ -1925,7 +1927,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); | @@ -1925,7 +1927,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); | ||
| 1925 | <property name="font"> | 1927 | <property name="font"> |
| 1926 | <font> | 1928 | <font> |
| 1927 | <family>Malgun Gothic</family> | 1929 | <family>Malgun Gothic</family> |
| 1928 | - <pointsize>9</pointsize> | 1930 | + <pointsize>11</pointsize> |
| 1929 | </font> | 1931 | </font> |
| 1930 | </property> | 1932 | </property> |
| 1931 | <property name="text"> | 1933 | <property name="text"> |
| @@ -1987,7 +1989,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); | @@ -1987,7 +1989,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); | ||
| 1987 | <property name="font"> | 1989 | <property name="font"> |
| 1988 | <font> | 1990 | <font> |
| 1989 | <family>Malgun Gothic</family> | 1991 | <family>Malgun Gothic</family> |
| 1990 | - <pointsize>9</pointsize> | 1992 | + <pointsize>11</pointsize> |
| 1991 | </font> | 1993 | </font> |
| 1992 | </property> | 1994 | </property> |
| 1993 | <property name="text"> | 1995 | <property name="text"> |
| @@ -2049,7 +2051,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); | @@ -2049,7 +2051,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); | ||
| 2049 | <property name="font"> | 2051 | <property name="font"> |
| 2050 | <font> | 2052 | <font> |
| 2051 | <family>Malgun Gothic</family> | 2053 | <family>Malgun Gothic</family> |
| 2052 | - <pointsize>9</pointsize> | 2054 | + <pointsize>11</pointsize> |
| 2053 | </font> | 2055 | </font> |
| 2054 | </property> | 2056 | </property> |
| 2055 | <property name="text"> | 2057 | <property name="text"> |
| @@ -2367,7 +2369,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); | @@ -2367,7 +2369,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); | ||
| 2367 | <property name="font"> | 2369 | <property name="font"> |
| 2368 | <font> | 2370 | <font> |
| 2369 | <family>Malgun Gothic</family> | 2371 | <family>Malgun Gothic</family> |
| 2370 | - <pointsize>14</pointsize> | 2372 | + <pointsize>16</pointsize> |
| 2371 | <weight>75</weight> | 2373 | <weight>75</weight> |
| 2372 | <bold>true</bold> | 2374 | <bold>true</bold> |
| 2373 | </font> | 2375 | </font> |
| @@ -2431,7 +2433,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); | @@ -2431,7 +2433,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); | ||
| 2431 | <property name="font"> | 2433 | <property name="font"> |
| 2432 | <font> | 2434 | <font> |
| 2433 | <family>Malgun Gothic</family> | 2435 | <family>Malgun Gothic</family> |
| 2434 | - <pointsize>14</pointsize> | 2436 | + <pointsize>16</pointsize> |
| 2435 | <weight>75</weight> | 2437 | <weight>75</weight> |
| 2436 | <bold>true</bold> | 2438 | <bold>true</bold> |
| 2437 | </font> | 2439 | </font> |
| @@ -2495,7 +2497,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); | @@ -2495,7 +2497,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); | ||
| 2495 | <property name="font"> | 2497 | <property name="font"> |
| 2496 | <font> | 2498 | <font> |
| 2497 | <family>Malgun Gothic</family> | 2499 | <family>Malgun Gothic</family> |
| 2498 | - <pointsize>14</pointsize> | 2500 | + <pointsize>16</pointsize> |
| 2499 | <weight>75</weight> | 2501 | <weight>75</weight> |
| 2500 | <bold>true</bold> | 2502 | <bold>true</bold> |
| 2501 | </font> | 2503 | </font> |
| @@ -2559,7 +2561,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); | @@ -2559,7 +2561,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); | ||
| 2559 | <property name="font"> | 2561 | <property name="font"> |
| 2560 | <font> | 2562 | <font> |
| 2561 | <family>Malgun Gothic</family> | 2563 | <family>Malgun Gothic</family> |
| 2562 | - <pointsize>14</pointsize> | 2564 | + <pointsize>16</pointsize> |
| 2563 | <weight>75</weight> | 2565 | <weight>75</weight> |
| 2564 | <bold>true</bold> | 2566 | <bold>true</bold> |
| 2565 | </font> | 2567 | </font> |
| @@ -2623,7 +2625,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); | @@ -2623,7 +2625,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); | ||
| 2623 | <property name="font"> | 2625 | <property name="font"> |
| 2624 | <font> | 2626 | <font> |
| 2625 | <family>Malgun Gothic</family> | 2627 | <family>Malgun Gothic</family> |
| 2626 | - <pointsize>9</pointsize> | 2628 | + <pointsize>11</pointsize> |
| 2627 | </font> | 2629 | </font> |
| 2628 | </property> | 2630 | </property> |
| 2629 | <property name="text"> | 2631 | <property name="text"> |
| @@ -2685,7 +2687,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); | @@ -2685,7 +2687,7 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); | ||
| 2685 | <property name="font"> | 2687 | <property name="font"> |
| 2686 | <font> | 2688 | <font> |
| 2687 | <family>Malgun Gothic</family> | 2689 | <family>Malgun Gothic</family> |
| 2688 | - <pointsize>9</pointsize> | 2690 | + <pointsize>11</pointsize> |
| 2689 | </font> | 2691 | </font> |
| 2690 | </property> | 2692 | </property> |
| 2691 | <property name="text"> | 2693 | <property name="text"> |
| @@ -2721,252 +2723,12 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); | @@ -2721,252 +2723,12 @@ border-image: url(:/images/images/manual/016_btn_02_ov.png); | ||
| 2721 | <zorder>steamLabel_15</zorder> | 2723 | <zorder>steamLabel_15</zorder> |
| 2722 | </widget> | 2724 | </widget> |
| 2723 | </widget> | 2725 | </widget> |
| 2724 | - <widget class="QLabel" name="dryheatLabel"> | ||
| 2725 | - <property name="enabled"> | ||
| 2726 | - <bool>false</bool> | ||
| 2727 | - </property> | ||
| 2728 | - <property name="geometry"> | ||
| 2729 | - <rect> | ||
| 2730 | - <x>686</x> | ||
| 2731 | - <y>607</y> | ||
| 2732 | - <width>129</width> | ||
| 2733 | - <height>113</height> | ||
| 2734 | - </rect> | ||
| 2735 | - </property> | ||
| 2736 | - <property name="palette"> | ||
| 2737 | - <palette> | ||
| 2738 | - <active> | ||
| 2739 | - <colorrole role="WindowText"> | ||
| 2740 | - <brush brushstyle="SolidPattern"> | ||
| 2741 | - <color alpha="255"> | ||
| 2742 | - <red>255</red> | ||
| 2743 | - <green>255</green> | ||
| 2744 | - <blue>255</blue> | ||
| 2745 | - </color> | ||
| 2746 | - </brush> | ||
| 2747 | - </colorrole> | ||
| 2748 | - </active> | ||
| 2749 | - <inactive> | ||
| 2750 | - <colorrole role="WindowText"> | ||
| 2751 | - <brush brushstyle="SolidPattern"> | ||
| 2752 | - <color alpha="255"> | ||
| 2753 | - <red>255</red> | ||
| 2754 | - <green>255</green> | ||
| 2755 | - <blue>255</blue> | ||
| 2756 | - </color> | ||
| 2757 | - </brush> | ||
| 2758 | - </colorrole> | ||
| 2759 | - </inactive> | ||
| 2760 | - <disabled> | ||
| 2761 | - <colorrole role="WindowText"> | ||
| 2762 | - <brush brushstyle="SolidPattern"> | ||
| 2763 | - <color alpha="255"> | ||
| 2764 | - <red>123</red> | ||
| 2765 | - <green>123</green> | ||
| 2766 | - <blue>123</blue> | ||
| 2767 | - </color> | ||
| 2768 | - </brush> | ||
| 2769 | - </colorrole> | ||
| 2770 | - </disabled> | ||
| 2771 | - </palette> | ||
| 2772 | - </property> | ||
| 2773 | - <property name="font"> | ||
| 2774 | - <font> | ||
| 2775 | - <family>Malgun Gothic</family> | ||
| 2776 | - <pointsize>12</pointsize> | ||
| 2777 | - </font> | ||
| 2778 | - </property> | ||
| 2779 | - <property name="text"> | ||
| 2780 | - <string>건열</string> | ||
| 2781 | - </property> | ||
| 2782 | - <property name="alignment"> | ||
| 2783 | - <set>Qt::AlignCenter</set> | ||
| 2784 | - </property> | ||
| 2785 | - </widget> | ||
| 2786 | - <widget class="QLabel" name="combiIndicator"> | ||
| 2787 | - <property name="geometry"> | ||
| 2788 | - <rect> | ||
| 2789 | - <x>417</x> | ||
| 2790 | - <y>681</y> | ||
| 2791 | - <width>67</width> | ||
| 2792 | - <height>37</height> | ||
| 2793 | - </rect> | ||
| 2794 | - </property> | ||
| 2795 | - <property name="text"> | ||
| 2796 | - <string/> | ||
| 2797 | - </property> | ||
| 2798 | - <property name="pixmap"> | ||
| 2799 | - <pixmap resource="resources.qrc">:/images/images/manual/003_02__mainicon_arrow.png</pixmap> | ||
| 2800 | - </property> | ||
| 2801 | - </widget> | ||
| 2802 | - <widget class="QLabel" name="combiLabel"> | ||
| 2803 | - <property name="enabled"> | ||
| 2804 | - <bool>false</bool> | ||
| 2805 | - </property> | ||
| 2806 | - <property name="geometry"> | ||
| 2807 | - <rect> | ||
| 2808 | - <x>386</x> | ||
| 2809 | - <y>607</y> | ||
| 2810 | - <width>129</width> | ||
| 2811 | - <height>113</height> | ||
| 2812 | - </rect> | ||
| 2813 | - </property> | ||
| 2814 | - <property name="palette"> | ||
| 2815 | - <palette> | ||
| 2816 | - <active> | ||
| 2817 | - <colorrole role="WindowText"> | ||
| 2818 | - <brush brushstyle="SolidPattern"> | ||
| 2819 | - <color alpha="255"> | ||
| 2820 | - <red>255</red> | ||
| 2821 | - <green>255</green> | ||
| 2822 | - <blue>255</blue> | ||
| 2823 | - </color> | ||
| 2824 | - </brush> | ||
| 2825 | - </colorrole> | ||
| 2826 | - </active> | ||
| 2827 | - <inactive> | ||
| 2828 | - <colorrole role="WindowText"> | ||
| 2829 | - <brush brushstyle="SolidPattern"> | ||
| 2830 | - <color alpha="255"> | ||
| 2831 | - <red>255</red> | ||
| 2832 | - <green>255</green> | ||
| 2833 | - <blue>255</blue> | ||
| 2834 | - </color> | ||
| 2835 | - </brush> | ||
| 2836 | - </colorrole> | ||
| 2837 | - </inactive> | ||
| 2838 | - <disabled> | ||
| 2839 | - <colorrole role="WindowText"> | ||
| 2840 | - <brush brushstyle="SolidPattern"> | ||
| 2841 | - <color alpha="255"> | ||
| 2842 | - <red>123</red> | ||
| 2843 | - <green>123</green> | ||
| 2844 | - <blue>123</blue> | ||
| 2845 | - </color> | ||
| 2846 | - </brush> | ||
| 2847 | - </colorrole> | ||
| 2848 | - </disabled> | ||
| 2849 | - </palette> | ||
| 2850 | - </property> | ||
| 2851 | - <property name="font"> | ||
| 2852 | - <font> | ||
| 2853 | - <family>Malgun Gothic</family> | ||
| 2854 | - <pointsize>12</pointsize> | ||
| 2855 | - </font> | ||
| 2856 | - </property> | ||
| 2857 | - <property name="text"> | ||
| 2858 | - <string>콤비</string> | ||
| 2859 | - </property> | ||
| 2860 | - <property name="alignment"> | ||
| 2861 | - <set>Qt::AlignCenter</set> | ||
| 2862 | - </property> | ||
| 2863 | - </widget> | ||
| 2864 | - <widget class="QLabel" name="steamIndicator"> | ||
| 2865 | - <property name="geometry"> | ||
| 2866 | - <rect> | ||
| 2867 | - <x>117</x> | ||
| 2868 | - <y>681</y> | ||
| 2869 | - <width>67</width> | ||
| 2870 | - <height>37</height> | ||
| 2871 | - </rect> | ||
| 2872 | - </property> | ||
| 2873 | - <property name="text"> | ||
| 2874 | - <string/> | ||
| 2875 | - </property> | ||
| 2876 | - <property name="pixmap"> | ||
| 2877 | - <pixmap resource="resources.qrc">:/images/images/manual/003_02__mainicon_arrow.png</pixmap> | ||
| 2878 | - </property> | ||
| 2879 | - </widget> | ||
| 2880 | - <widget class="QLabel" name="dryheatIndicator"> | ||
| 2881 | - <property name="geometry"> | ||
| 2882 | - <rect> | ||
| 2883 | - <x>717</x> | ||
| 2884 | - <y>681</y> | ||
| 2885 | - <width>67</width> | ||
| 2886 | - <height>37</height> | ||
| 2887 | - </rect> | ||
| 2888 | - </property> | ||
| 2889 | - <property name="text"> | ||
| 2890 | - <string/> | ||
| 2891 | - </property> | ||
| 2892 | - <property name="pixmap"> | ||
| 2893 | - <pixmap resource="resources.qrc">:/images/images/manual/003_02__mainicon_arrow.png</pixmap> | ||
| 2894 | - </property> | ||
| 2895 | - </widget> | ||
| 2896 | - <widget class="QLabel" name="steamLabel"> | ||
| 2897 | - <property name="enabled"> | ||
| 2898 | - <bool>false</bool> | ||
| 2899 | - </property> | ||
| 2900 | - <property name="geometry"> | ||
| 2901 | - <rect> | ||
| 2902 | - <x>86</x> | ||
| 2903 | - <y>607</y> | ||
| 2904 | - <width>129</width> | ||
| 2905 | - <height>113</height> | ||
| 2906 | - </rect> | ||
| 2907 | - </property> | ||
| 2908 | - <property name="palette"> | ||
| 2909 | - <palette> | ||
| 2910 | - <active> | ||
| 2911 | - <colorrole role="WindowText"> | ||
| 2912 | - <brush brushstyle="SolidPattern"> | ||
| 2913 | - <color alpha="255"> | ||
| 2914 | - <red>255</red> | ||
| 2915 | - <green>255</green> | ||
| 2916 | - <blue>255</blue> | ||
| 2917 | - </color> | ||
| 2918 | - </brush> | ||
| 2919 | - </colorrole> | ||
| 2920 | - </active> | ||
| 2921 | - <inactive> | ||
| 2922 | - <colorrole role="WindowText"> | ||
| 2923 | - <brush brushstyle="SolidPattern"> | ||
| 2924 | - <color alpha="255"> | ||
| 2925 | - <red>255</red> | ||
| 2926 | - <green>255</green> | ||
| 2927 | - <blue>255</blue> | ||
| 2928 | - </color> | ||
| 2929 | - </brush> | ||
| 2930 | - </colorrole> | ||
| 2931 | - </inactive> | ||
| 2932 | - <disabled> | ||
| 2933 | - <colorrole role="WindowText"> | ||
| 2934 | - <brush brushstyle="SolidPattern"> | ||
| 2935 | - <color alpha="255"> | ||
| 2936 | - <red>123</red> | ||
| 2937 | - <green>123</green> | ||
| 2938 | - <blue>123</blue> | ||
| 2939 | - </color> | ||
| 2940 | - </brush> | ||
| 2941 | - </colorrole> | ||
| 2942 | - </disabled> | ||
| 2943 | - </palette> | ||
| 2944 | - </property> | ||
| 2945 | - <property name="font"> | ||
| 2946 | - <font> | ||
| 2947 | - <family>Malgun Gothic</family> | ||
| 2948 | - <pointsize>12</pointsize> | ||
| 2949 | - </font> | ||
| 2950 | - </property> | ||
| 2951 | - <property name="text"> | ||
| 2952 | - <string>스팀</string> | ||
| 2953 | - </property> | ||
| 2954 | - <property name="alignment"> | ||
| 2955 | - <set>Qt::AlignCenter</set> | ||
| 2956 | - </property> | ||
| 2957 | - </widget> | ||
| 2958 | <zorder>bodyStack</zorder> | 2726 | <zorder>bodyStack</zorder> |
| 2959 | <zorder>upperStack</zorder> | 2727 | <zorder>upperStack</zorder> |
| 2960 | <zorder>combiButton</zorder> | 2728 | <zorder>combiButton</zorder> |
| 2961 | <zorder>steamButton</zorder> | 2729 | <zorder>steamButton</zorder> |
| 2962 | <zorder>dryheatButton</zorder> | 2730 | <zorder>dryheatButton</zorder> |
| 2963 | <zorder>underBar</zorder> | 2731 | <zorder>underBar</zorder> |
| 2964 | - <zorder>dryheatLabel</zorder> | ||
| 2965 | - <zorder>combiIndicator</zorder> | ||
| 2966 | - <zorder>combiLabel</zorder> | ||
| 2967 | - <zorder>steamIndicator</zorder> | ||
| 2968 | - <zorder>dryheatIndicator</zorder> | ||
| 2969 | - <zorder>steamLabel</zorder> | ||
| 2970 | </widget> | 2732 | </widget> |
| 2971 | </widget> | 2733 | </widget> |
| 2972 | <customwidgets> | 2734 | <customwidgets> |
app/gui/oven_control/oven_control.pro
| @@ -35,7 +35,9 @@ SOURCES += main.cpp\ | @@ -35,7 +35,9 @@ SOURCES += main.cpp\ | ||
| 35 | animatedimagebox.cpp \ | 35 | animatedimagebox.cpp \ |
| 36 | circulargauge.cpp \ | 36 | circulargauge.cpp \ |
| 37 | humiditycirculargauge.cpp \ | 37 | humiditycirculargauge.cpp \ |
| 38 | - heatcirculargauge.cpp | 38 | + heatcirculargauge.cpp \ |
| 39 | + preheattempgauge.cpp \ | ||
| 40 | + autocookconfigwindow.cpp | ||
| 39 | 41 | ||
| 40 | HEADERS += mainwindow.h \ | 42 | HEADERS += mainwindow.h \ |
| 41 | cook.h \ | 43 | cook.h \ |
| @@ -59,7 +61,9 @@ HEADERS += mainwindow.h \ | @@ -59,7 +61,9 @@ HEADERS += mainwindow.h \ | ||
| 59 | animatedimagebox.h \ | 61 | animatedimagebox.h \ |
| 60 | circulargauge.h \ | 62 | circulargauge.h \ |
| 61 | humiditycirculargauge.h \ | 63 | humiditycirculargauge.h \ |
| 62 | - heatcirculargauge.h | 64 | + heatcirculargauge.h \ |
| 65 | + preheattempgauge.h \ | ||
| 66 | + autocookconfigwindow.h | ||
| 63 | 67 | ||
| 64 | FORMS += mainwindow.ui \ | 68 | FORMS += mainwindow.ui \ |
| 65 | manualcookwindow.ui \ | 69 | manualcookwindow.ui \ |
| @@ -72,7 +76,8 @@ FORMS += mainwindow.ui \ | @@ -72,7 +76,8 @@ FORMS += mainwindow.ui \ | ||
| 72 | fantestwindow.ui \ | 76 | fantestwindow.ui \ |
| 73 | gastestwindow.ui \ | 77 | gastestwindow.ui \ |
| 74 | autocookselectionwindow.ui \ | 78 | autocookselectionwindow.ui \ |
| 75 | - autocookwindow.ui | 79 | + autocookwindow.ui \ |
| 80 | + autocookconfigwindow.ui | ||
| 76 | 81 | ||
| 77 | RESOURCES += \ | 82 | RESOURCES += \ |
| 78 | resources.qrc | 83 | resources.qrc |
app/gui/oven_control/ovencontroller.cpp
| @@ -2,6 +2,8 @@ | @@ -2,6 +2,8 @@ | ||
| 2 | 2 | ||
| 3 | OvenController::OvenController(QObject *parent) : OvenInterface(parent) | 3 | OvenController::OvenController(QObject *parent) : OvenInterface(parent) |
| 4 | { | 4 | { |
| 5 | + bzero(&control, sizeof(control)); | ||
| 6 | + bzero(&state, sizeof(state)); | ||
| 5 | } | 7 | } |
| 6 | 8 | ||
| 7 | void OvenController::setUdpHandler(UdpHandler *udp) | 9 | void OvenController::setUdpHandler(UdpHandler *udp) |
| @@ -42,7 +44,7 @@ int OvenController::currentHumidity() | @@ -42,7 +44,7 @@ int OvenController::currentHumidity() | ||
| 42 | 44 | ||
| 43 | int OvenController::currentInterTemp() | 45 | int OvenController::currentInterTemp() |
| 44 | { | 46 | { |
| 45 | - return 0; | 47 | + return state.sensor6; |
| 46 | } | 48 | } |
| 47 | 49 | ||
| 48 | bool OvenController::door() | 50 | bool OvenController::door() |
app/gui/oven_control/preheattempgauge.cpp
| @@ -0,0 +1,62 @@ | @@ -0,0 +1,62 @@ | ||
| 1 | +#include "preheattempgauge.h" | ||
| 2 | + | ||
| 3 | +#include <QPainter> | ||
| 4 | +#include <QtDebug> | ||
| 5 | + | ||
| 6 | +PreheatTempGauge::PreheatTempGauge(QWidget *parent) : QWidget(parent) | ||
| 7 | +{ | ||
| 8 | + border.load(":/images/images/auto/graphe_hit_01.png"); | ||
| 9 | + indicator.load(":/images/images/auto/graphe_hit_02.png"); | ||
| 10 | + body.load(":/images/images/auto/graphe_hit_03.png"); | ||
| 11 | + | ||
| 12 | + value = 0; | ||
| 13 | + min = 0; | ||
| 14 | + max = 1; | ||
| 15 | +} | ||
| 16 | + | ||
| 17 | +void PreheatTempGauge::setValue(int value) | ||
| 18 | +{ | ||
| 19 | + this->value = qBound(min, value, max); | ||
| 20 | + | ||
| 21 | + update(); | ||
| 22 | +} | ||
| 23 | + | ||
| 24 | +void PreheatTempGauge::setMinimum(int minimum) | ||
| 25 | +{ | ||
| 26 | + min = minimum; | ||
| 27 | + max = qMax(min, max); | ||
| 28 | + value = qBound(min, value, max); | ||
| 29 | + | ||
| 30 | + update(); | ||
| 31 | +} | ||
| 32 | + | ||
| 33 | +void PreheatTempGauge::setMaximum(int maximum) | ||
| 34 | +{ | ||
| 35 | + max = maximum; | ||
| 36 | + min = qMin(min, max); | ||
| 37 | + value = qBound(min, value, max); | ||
| 38 | + | ||
| 39 | + update(); | ||
| 40 | +} | ||
| 41 | + | ||
| 42 | +void PreheatTempGauge::paintEvent(QPaintEvent */*event*/) | ||
| 43 | +{ | ||
| 44 | + QPainter painter(this); | ||
| 45 | + painter.setBrush(Qt::NoBrush); | ||
| 46 | + painter.setPen(Qt::NoPen); | ||
| 47 | + | ||
| 48 | + qreal percentage = (qreal) (value - min) / qMax(max - min, 1); | ||
| 49 | + percentage = qBound((qreal) 0.0, percentage, (qreal) 1.0); | ||
| 50 | + | ||
| 51 | + QRect targetRect( | ||
| 52 | + (border.size().width() - body.size().width()) / 2 + indicator.size().width() / 2, | ||
| 53 | + (border.size().height() - body.size().height()) / 2 + indicator.size().height(), | ||
| 54 | + body.size().width() * percentage, body.height()); | ||
| 55 | + | ||
| 56 | + QRect sourceRect(0, 0, body.size().width() * percentage, body.height()); | ||
| 57 | + | ||
| 58 | + painter.drawPixmap(targetRect, body, sourceRect); | ||
| 59 | + painter.drawPixmap(indicator.size().width() / 2, indicator.size().height(), border); | ||
| 60 | + painter.drawPixmap(targetRect.right() - indicator.size().width() / 2, 0, indicator); | ||
| 61 | +} | ||
| 62 | + |
app/gui/oven_control/preheattempgauge.h
| @@ -0,0 +1,33 @@ | @@ -0,0 +1,33 @@ | ||
| 1 | +#ifndef INTERTEMPGAUGE_H | ||
| 2 | +#define INTERTEMPGAUGE_H | ||
| 3 | + | ||
| 4 | +#include <QWidget> | ||
| 5 | +#include <QPixmap> | ||
| 6 | + | ||
| 7 | +class PreheatTempGauge : public QWidget | ||
| 8 | +{ | ||
| 9 | + Q_OBJECT | ||
| 10 | +public: | ||
| 11 | + explicit PreheatTempGauge(QWidget *parent = 0); | ||
| 12 | + | ||
| 13 | +signals: | ||
| 14 | + | ||
| 15 | +public slots: | ||
| 16 | + void setValue(int value); | ||
| 17 | + void setMinimum(int minimum); | ||
| 18 | + void setMaximum(int maximum); | ||
| 19 | + | ||
| 20 | +protected: | ||
| 21 | + void paintEvent(QPaintEvent *event); | ||
| 22 | + | ||
| 23 | +private: | ||
| 24 | + QPixmap body; | ||
| 25 | + QPixmap border; | ||
| 26 | + QPixmap indicator; | ||
| 27 | + | ||
| 28 | + int value; | ||
| 29 | + int min; | ||
| 30 | + int max; | ||
| 31 | +}; | ||
| 32 | + | ||
| 33 | +#endif // INTERTEMPGAUGE_H |
app/gui/oven_control/resources.qrc
| @@ -644,5 +644,10 @@ | @@ -644,5 +644,10 @@ | ||
| 644 | <file>images/auto/Gau_icon_06_ov.png</file> | 644 | <file>images/auto/Gau_icon_06_ov.png</file> |
| 645 | <file>images/auto/Gau_icon_07.png</file> | 645 | <file>images/auto/Gau_icon_07.png</file> |
| 646 | <file>images/auto/Gau_icon_07_ov.png</file> | 646 | <file>images/auto/Gau_icon_07_ov.png</file> |
| 647 | + <file>images/test/bgi-1.BMP</file> | ||
| 648 | + <file>images/test/bgi-1.png</file> | ||
| 649 | + <file>images/test/bgi-2.png</file> | ||
| 650 | + <file>images/auto/object_arrow_001.png</file> | ||
| 651 | + <file>images/auto/object_arrow_002.png</file> | ||
| 647 | </qresource> | 652 | </qresource> |
| 648 | </RCC> | 653 | </RCC> |
app/gui/oven_control/udphandler.cpp
| @@ -48,11 +48,11 @@ void UdpHandler::processDatagram(QByteArray &datagram) | @@ -48,11 +48,11 @@ void UdpHandler::processDatagram(QByteArray &datagram) | ||
| 48 | switch (packet->header) | 48 | switch (packet->header) |
| 49 | { | 49 | { |
| 50 | case HDR_OVEN_CONTROL: | 50 | case HDR_OVEN_CONTROL: |
| 51 | - qDebug() << "Received Control"; | 51 | +// qDebug() << "Received Control"; |
| 52 | processControl((oven_control_t *) packet->body); | 52 | processControl((oven_control_t *) packet->body); |
| 53 | break; | 53 | break; |
| 54 | case HDR_OVEN_STATE: | 54 | case HDR_OVEN_STATE: |
| 55 | - qDebug() << "Received State"; | 55 | +// qDebug() << "Received State"; |
| 56 | processState((oven_state_t *) packet->body); | 56 | processState((oven_state_t *) packet->body); |
| 57 | break; | 57 | break; |
| 58 | case HDR_ERROR_CODE: | 58 | case HDR_ERROR_CODE: |
app/gui/oven_control/valvetestwindow.cpp
| @@ -6,7 +6,10 @@ ValveTestWindow::ValveTestWindow(QWidget *parent, UdpHandler *udp) : | @@ -6,7 +6,10 @@ ValveTestWindow::ValveTestWindow(QWidget *parent, UdpHandler *udp) : | ||
| 6 | ui(new Ui::ValveTestWindow), udp(udp) | 6 | ui(new Ui::ValveTestWindow), udp(udp) |
| 7 | { | 7 | { |
| 8 | ui->setupUi(this); | 8 | ui->setupUi(this); |
| 9 | + | ||
| 9 | ui->clockContainer->setParent(ui->upperStack); | 10 | ui->clockContainer->setParent(ui->upperStack); |
| 11 | + setAttribute(Qt::WA_DeleteOnClose); | ||
| 12 | + | ||
| 10 | connect(udp, SIGNAL(changed()), this, SLOT(onDataChanged())); | 13 | connect(udp, SIGNAL(changed()), this, SLOT(onDataChanged())); |
| 11 | 14 | ||
| 12 | udp->set(TG_OVEN_MODE, 4); | 15 | udp->set(TG_OVEN_MODE, 4); |
| @@ -92,7 +95,7 @@ void ValveTestWindow::on_backButton_clicked() | @@ -92,7 +95,7 @@ void ValveTestWindow::on_backButton_clicked() | ||
| 92 | udp->turnOff(TG_MANUAL_RELAY); | 95 | udp->turnOff(TG_MANUAL_RELAY); |
| 93 | udp->turnOff(TG_SYSTEM); | 96 | udp->turnOff(TG_SYSTEM); |
| 94 | 97 | ||
| 95 | - deleteLater(); | 98 | + close(); |
| 96 | } | 99 | } |
| 97 | 100 | ||
| 98 | void ValveTestWindow::steamValveOpen() | 101 | void ValveTestWindow::steamValveOpen() |
app/gui/oven_control/washtestwindow.cpp
| @@ -6,7 +6,10 @@ WashTestWindow::WashTestWindow(QWidget *parent, UdpHandler *udp) : | @@ -6,7 +6,10 @@ WashTestWindow::WashTestWindow(QWidget *parent, UdpHandler *udp) : | ||
| 6 | ui(new Ui::WashTestWindow), udp(udp) | 6 | ui(new Ui::WashTestWindow), udp(udp) |
| 7 | { | 7 | { |
| 8 | ui->setupUi(this); | 8 | ui->setupUi(this); |
| 9 | + | ||
| 9 | ui->clockContainer->setParent(ui->upperStack); | 10 | ui->clockContainer->setParent(ui->upperStack); |
| 11 | + setAttribute(Qt::WA_DeleteOnClose); | ||
| 12 | + | ||
| 10 | connect(udp, SIGNAL(changed()), this, SLOT(onDataChanged())); | 13 | connect(udp, SIGNAL(changed()), this, SLOT(onDataChanged())); |
| 11 | 14 | ||
| 12 | udp->set(TG_OVEN_MODE, 4); | 15 | udp->set(TG_OVEN_MODE, 4); |
| @@ -83,7 +86,7 @@ void WashTestWindow::on_backButton_clicked() | @@ -83,7 +86,7 @@ void WashTestWindow::on_backButton_clicked() | ||
| 83 | udp->turnOff(TG_MANUAL_RELAY); | 86 | udp->turnOff(TG_MANUAL_RELAY); |
| 84 | udp->turnOff(TG_SYSTEM); | 87 | udp->turnOff(TG_SYSTEM); |
| 85 | 88 | ||
| 86 | - deleteLater(); | 89 | + close(); |
| 87 | } | 90 | } |
| 88 | 91 | ||
| 89 | void WashTestWindow::steamPumpOn() | 92 | void WashTestWindow::steamPumpOn() |