Commit e63e026460bca0285942768b0559a3ab29bbd655
1 parent
9a89ea55c2
Exists in
master
and in
2 other branches
필요 없는 파일 제거
Showing
7 changed files
with
0 additions
and
921 deletions
Show diff stats
app/gui/oven_control/basicsettingwindow.cpp
| ... | ... | @@ -1,46 +0,0 @@ |
| 1 | -#include "basicsettingwindow.h" | |
| 2 | -#include "ui_basicsettingwindow.h" | |
| 3 | - | |
| 4 | -#include "soundplayer.h" | |
| 5 | - | |
| 6 | -BasicSettingWindow::BasicSettingWindow(QWidget *parent) : | |
| 7 | - QMainWindow(parent), | |
| 8 | - ui(new Ui::BasicSettingWindow) | |
| 9 | -{ | |
| 10 | - ui->setupUi(this); | |
| 11 | - | |
| 12 | - foreach (QPushButton *button, findChildren<QPushButton *>()) | |
| 13 | - connect(button, &QPushButton::pressed, SoundPlayer::playClick); | |
| 14 | -} | |
| 15 | - | |
| 16 | -BasicSettingWindow::~BasicSettingWindow() | |
| 17 | -{ | |
| 18 | - delete ui; | |
| 19 | -} | |
| 20 | - | |
| 21 | -void BasicSettingWindow::keyPressEvent(QKeyEvent *event) | |
| 22 | -{ | |
| 23 | - | |
| 24 | -} | |
| 25 | - | |
| 26 | -void BasicSettingWindow::keyReleaseEvent(QKeyEvent *event) | |
| 27 | -{ | |
| 28 | - | |
| 29 | -} | |
| 30 | - | |
| 31 | -void BasicSettingWindow::onEncoderLeft() | |
| 32 | -{ | |
| 33 | - focusPreviousChild(); | |
| 34 | -} | |
| 35 | - | |
| 36 | -void BasicSettingWindow::onEncoderRight() | |
| 37 | -{ | |
| 38 | - focusNextChild(); | |
| 39 | -} | |
| 40 | - | |
| 41 | -void BasicSettingWindow::onEncoderClicked(QWidget *clicked) | |
| 42 | -{ | |
| 43 | - QPushButton *b = qobject_cast<QPushButton *>(clicked); | |
| 44 | - if (b) | |
| 45 | - b->click(); | |
| 46 | -} |
app/gui/oven_control/basicsettingwindow.h
| ... | ... | @@ -1,32 +0,0 @@ |
| 1 | -#ifndef BASICSETTINGWINDOW_H | |
| 2 | -#define BASICSETTINGWINDOW_H | |
| 3 | - | |
| 4 | -#include <QMainWindow> | |
| 5 | - | |
| 6 | -namespace Ui { | |
| 7 | -class BasicSettingWindow; | |
| 8 | -} | |
| 9 | - | |
| 10 | -class BasicSettingWindow : public QMainWindow | |
| 11 | -{ | |
| 12 | - Q_OBJECT | |
| 13 | - | |
| 14 | -public: | |
| 15 | - explicit BasicSettingWindow(QWidget *parent = 0); | |
| 16 | - ~BasicSettingWindow(); | |
| 17 | - | |
| 18 | -protected: | |
| 19 | - void keyPressEvent(QKeyEvent *event); | |
| 20 | - void keyReleaseEvent(QKeyEvent *event); | |
| 21 | - | |
| 22 | -private: | |
| 23 | - Ui::BasicSettingWindow *ui; | |
| 24 | - | |
| 25 | - QWidget *pushed = NULL; | |
| 26 | - | |
| 27 | - void onEncoderLeft(); | |
| 28 | - void onEncoderRight(); | |
| 29 | - void onEncoderClicked(QWidget *clicked); | |
| 30 | -}; | |
| 31 | - | |
| 32 | -#endif // BASICSETTINGWINDOW_H |
app/gui/oven_control/basicsettingwindow.ui
| ... | ... | @@ -1,470 +0,0 @@ |
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | |
| 2 | -<ui version="4.0"> | |
| 3 | - <class>BasicSettingWindow</class> | |
| 4 | - <widget class="QMainWindow" name="BasicSettingWindow"> | |
| 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="styleSheet"> | |
| 14 | - <string notr="true">#centralwidget { background-image: url(:/images/background/config_service.png); } | |
| 15 | -#bottomBar { background-image: url(:/images/bottom_bar/background.png); } | |
| 16 | -#midWidget { background-image: url(:/images/config/service/basic_setting_bgnd.png); }</string> | |
| 17 | - </property> | |
| 18 | - <widget class="QWidget" name="centralwidget"> | |
| 19 | - <property name="styleSheet"> | |
| 20 | - <string notr="true"/> | |
| 21 | - </property> | |
| 22 | - <widget class="QStackedWidget" name="upperStack"> | |
| 23 | - <property name="geometry"> | |
| 24 | - <rect> | |
| 25 | - <x>0</x> | |
| 26 | - <y>0</y> | |
| 27 | - <width>900</width> | |
| 28 | - <height>426</height> | |
| 29 | - </rect> | |
| 30 | - </property> | |
| 31 | - <widget class="QWidget" name="clockContainer"> | |
| 32 | - <property name="styleSheet"> | |
| 33 | - <string notr="true">#clockContainer { background-image: url(:/images/clock/background.png); }</string> | |
| 34 | - </property> | |
| 35 | - <widget class="Clock" name="clock" native="true"> | |
| 36 | - <property name="geometry"> | |
| 37 | - <rect> | |
| 38 | - <x>272</x> | |
| 39 | - <y>36</y> | |
| 40 | - <width>356</width> | |
| 41 | - <height>355</height> | |
| 42 | - </rect> | |
| 43 | - </property> | |
| 44 | - </widget> | |
| 45 | - <widget class="WashWarnIcon" name="label"> | |
| 46 | - <property name="geometry"> | |
| 47 | - <rect> | |
| 48 | - <x>800</x> | |
| 49 | - <y>320</y> | |
| 50 | - <width>80</width> | |
| 51 | - <height>84</height> | |
| 52 | - </rect> | |
| 53 | - </property> | |
| 54 | - </widget> | |
| 55 | - <widget class="DemoIcon" name="label_2"> | |
| 56 | - <property name="geometry"> | |
| 57 | - <rect> | |
| 58 | - <x>780</x> | |
| 59 | - <y>230</y> | |
| 60 | - <width>101</width> | |
| 61 | - <height>90</height> | |
| 62 | - </rect> | |
| 63 | - </property> | |
| 64 | - </widget> | |
| 65 | - <widget class="HalfEnergyIcon" name="label_3"> | |
| 66 | - <property name="geometry"> | |
| 67 | - <rect> | |
| 68 | - <x>780</x> | |
| 69 | - <y>160</y> | |
| 70 | - <width>108</width> | |
| 71 | - <height>67</height> | |
| 72 | - </rect> | |
| 73 | - </property> | |
| 74 | - </widget> | |
| 75 | - <widget class="DigitalClock" name="label_4"> | |
| 76 | - <property name="geometry"> | |
| 77 | - <rect> | |
| 78 | - <x>20</x> | |
| 79 | - <y>310</y> | |
| 80 | - <width>300</width> | |
| 81 | - <height>100</height> | |
| 82 | - </rect> | |
| 83 | - </property> | |
| 84 | - <property name="alignment"> | |
| 85 | - <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> | |
| 86 | - </property> | |
| 87 | - </widget> | |
| 88 | - </widget> | |
| 89 | - <widget class="QWidget" name="page_2"/> | |
| 90 | - </widget> | |
| 91 | - <widget class="QLabel" name="label_15"> | |
| 92 | - <property name="geometry"> | |
| 93 | - <rect> | |
| 94 | - <x>55</x> | |
| 95 | - <y>426</y> | |
| 96 | - <width>900</width> | |
| 97 | - <height>84</height> | |
| 98 | - </rect> | |
| 99 | - </property> | |
| 100 | - <property name="font"> | |
| 101 | - <font> | |
| 102 | - <family>Malgun Gothic</family> | |
| 103 | - <pointsize>11</pointsize> | |
| 104 | - </font> | |
| 105 | - </property> | |
| 106 | - <property name="styleSheet"> | |
| 107 | - <string notr="true">color: rgb(255, 255, 255);</string> | |
| 108 | - </property> | |
| 109 | - <property name="text"> | |
| 110 | - <string>서비스단계(엔지니어모드) > 기본설정</string> | |
| 111 | - </property> | |
| 112 | - </widget> | |
| 113 | - <widget class="QWidget" name="bottomBar" native="true"> | |
| 114 | - <property name="geometry"> | |
| 115 | - <rect> | |
| 116 | - <x>0</x> | |
| 117 | - <y>1450</y> | |
| 118 | - <width>900</width> | |
| 119 | - <height>150</height> | |
| 120 | - </rect> | |
| 121 | - </property> | |
| 122 | - <widget class="QPushButton" name="backButton"> | |
| 123 | - <property name="geometry"> | |
| 124 | - <rect> | |
| 125 | - <x>401</x> | |
| 126 | - <y>26</y> | |
| 127 | - <width>97</width> | |
| 128 | - <height>97</height> | |
| 129 | - </rect> | |
| 130 | - </property> | |
| 131 | - <property name="sizePolicy"> | |
| 132 | - <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> | |
| 133 | - <horstretch>0</horstretch> | |
| 134 | - <verstretch>0</verstretch> | |
| 135 | - </sizepolicy> | |
| 136 | - </property> | |
| 137 | - <property name="styleSheet"> | |
| 138 | - <string notr="true">QPushButton { border-image: url(:/images/bottom_bar/back.png); } | |
| 139 | -QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/back_ov.png); }</string> | |
| 140 | - </property> | |
| 141 | - <property name="text"> | |
| 142 | - <string/> | |
| 143 | - </property> | |
| 144 | - </widget> | |
| 145 | - </widget> | |
| 146 | - <widget class="QWidget" name="gridLayoutWidget"> | |
| 147 | - <property name="geometry"> | |
| 148 | - <rect> | |
| 149 | - <x>40</x> | |
| 150 | - <y>545</y> | |
| 151 | - <width>821</width> | |
| 152 | - <height>66</height> | |
| 153 | - </rect> | |
| 154 | - </property> | |
| 155 | - <layout class="QGridLayout" name="gridLayout" columnstretch="67,33"> | |
| 156 | - <property name="spacing"> | |
| 157 | - <number>0</number> | |
| 158 | - </property> | |
| 159 | - <item row="0" column="0" colspan="2"> | |
| 160 | - <widget class="QPushButton" name="button"> | |
| 161 | - <property name="enabled"> | |
| 162 | - <bool>false</bool> | |
| 163 | - </property> | |
| 164 | - <property name="sizePolicy"> | |
| 165 | - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> | |
| 166 | - <horstretch>0</horstretch> | |
| 167 | - <verstretch>0</verstretch> | |
| 168 | - </sizepolicy> | |
| 169 | - </property> | |
| 170 | - <property name="font"> | |
| 171 | - <font> | |
| 172 | - <family>Roboto</family> | |
| 173 | - <pointsize>10</pointsize> | |
| 174 | - <weight>75</weight> | |
| 175 | - <bold>true</bold> | |
| 176 | - <underline>false</underline> | |
| 177 | - </font> | |
| 178 | - </property> | |
| 179 | - <property name="styleSheet"> | |
| 180 | - <string notr="true">QPushButton { border-image: url(:/images/config/pannel.png);color: rgb(255, 255, 255); } | |
| 181 | -QPushButton:pressed { border-image: url(:/images/config/pannel_ov.png); } | |
| 182 | -QPushButton { text-align: left;} | |
| 183 | -</string> | |
| 184 | - </property> | |
| 185 | - <property name="text"> | |
| 186 | - <string> 기본설정</string> | |
| 187 | - </property> | |
| 188 | - </widget> | |
| 189 | - </item> | |
| 190 | - <item row="0" column="1"> | |
| 191 | - <widget class="QLabel" name="label_17"> | |
| 192 | - <property name="enabled"> | |
| 193 | - <bool>true</bool> | |
| 194 | - </property> | |
| 195 | - <property name="font"> | |
| 196 | - <font> | |
| 197 | - <family>Malgun Gothic</family> | |
| 198 | - <pointsize>11</pointsize> | |
| 199 | - <weight>75</weight> | |
| 200 | - <bold>true</bold> | |
| 201 | - </font> | |
| 202 | - </property> | |
| 203 | - <property name="styleSheet"> | |
| 204 | - <string notr="true">color: rgb(255, 255, 255);</string> | |
| 205 | - </property> | |
| 206 | - <property name="text"> | |
| 207 | - <string>EM-2</string> | |
| 208 | - </property> | |
| 209 | - <property name="alignment"> | |
| 210 | - <set>Qt::AlignCenter</set> | |
| 211 | - </property> | |
| 212 | - <property name="margin"> | |
| 213 | - <number>0</number> | |
| 214 | - </property> | |
| 215 | - </widget> | |
| 216 | - </item> | |
| 217 | - </layout> | |
| 218 | - </widget> | |
| 219 | - <widget class="QWidget" name="midWidget" native="true"> | |
| 220 | - <property name="geometry"> | |
| 221 | - <rect> | |
| 222 | - <x>43</x> | |
| 223 | - <y>627</y> | |
| 224 | - <width>813</width> | |
| 225 | - <height>647</height> | |
| 226 | - </rect> | |
| 227 | - </property> | |
| 228 | - <property name="styleSheet"> | |
| 229 | - <string notr="true">QLabel{ | |
| 230 | - color : white; | |
| 231 | -}</string> | |
| 232 | - </property> | |
| 233 | - <widget class="QLabel" name="ctrlLbList_1_1"> | |
| 234 | - <property name="geometry"> | |
| 235 | - <rect> | |
| 236 | - <x>0</x> | |
| 237 | - <y>70</y> | |
| 238 | - <width>460</width> | |
| 239 | - <height>94</height> | |
| 240 | - </rect> | |
| 241 | - </property> | |
| 242 | - <property name="font"> | |
| 243 | - <font> | |
| 244 | - <family>나눔고딕</family> | |
| 245 | - <pointsize>10</pointsize> | |
| 246 | - </font> | |
| 247 | - </property> | |
| 248 | - <property name="text"> | |
| 249 | - <string>스팀발생기 수동 스케일 제거 후 물의 양</string> | |
| 250 | - </property> | |
| 251 | - <property name="margin"> | |
| 252 | - <number>7</number> | |
| 253 | - </property> | |
| 254 | - </widget> | |
| 255 | - <widget class="QLabel" name="ctrlLbList_1_2"> | |
| 256 | - <property name="geometry"> | |
| 257 | - <rect> | |
| 258 | - <x>0</x> | |
| 259 | - <y>166</y> | |
| 260 | - <width>460</width> | |
| 261 | - <height>94</height> | |
| 262 | - </rect> | |
| 263 | - </property> | |
| 264 | - <property name="font"> | |
| 265 | - <font> | |
| 266 | - <family>나눔고딕</family> | |
| 267 | - <pointsize>10</pointsize> | |
| 268 | - </font> | |
| 269 | - </property> | |
| 270 | - <property name="text"> | |
| 271 | - <string>소형펌프모터 모드</string> | |
| 272 | - </property> | |
| 273 | - <property name="margin"> | |
| 274 | - <number>7</number> | |
| 275 | - </property> | |
| 276 | - </widget> | |
| 277 | - <widget class="QLabel" name="ctrlLbList_1_3"> | |
| 278 | - <property name="geometry"> | |
| 279 | - <rect> | |
| 280 | - <x>0</x> | |
| 281 | - <y>263</y> | |
| 282 | - <width>460</width> | |
| 283 | - <height>94</height> | |
| 284 | - </rect> | |
| 285 | - </property> | |
| 286 | - <property name="font"> | |
| 287 | - <font> | |
| 288 | - <family>나눔고딕</family> | |
| 289 | - <pointsize>10</pointsize> | |
| 290 | - </font> | |
| 291 | - </property> | |
| 292 | - <property name="text"> | |
| 293 | - <string>소형펌프모터 인터벌시간 설정</string> | |
| 294 | - </property> | |
| 295 | - <property name="margin"> | |
| 296 | - <number>7</number> | |
| 297 | - </property> | |
| 298 | - </widget> | |
| 299 | - <widget class="QLabel" name="ctrlLbList_1_4"> | |
| 300 | - <property name="geometry"> | |
| 301 | - <rect> | |
| 302 | - <x>0</x> | |
| 303 | - <y>360</y> | |
| 304 | - <width>460</width> | |
| 305 | - <height>94</height> | |
| 306 | - </rect> | |
| 307 | - </property> | |
| 308 | - <property name="font"> | |
| 309 | - <font> | |
| 310 | - <family>나눔고딕</family> | |
| 311 | - <pointsize>10</pointsize> | |
| 312 | - </font> | |
| 313 | - </property> | |
| 314 | - <property name="text"> | |
| 315 | - <string>건열퀀칭 작동 온도</string> | |
| 316 | - </property> | |
| 317 | - <property name="margin"> | |
| 318 | - <number>7</number> | |
| 319 | - </property> | |
| 320 | - </widget> | |
| 321 | - <widget class="QLabel" name="ctrlLbList_1_5"> | |
| 322 | - <property name="geometry"> | |
| 323 | - <rect> | |
| 324 | - <x>0</x> | |
| 325 | - <y>458</y> | |
| 326 | - <width>460</width> | |
| 327 | - <height>94</height> | |
| 328 | - </rect> | |
| 329 | - </property> | |
| 330 | - <property name="font"> | |
| 331 | - <font> | |
| 332 | - <family>나눔고딕</family> | |
| 333 | - <pointsize>10</pointsize> | |
| 334 | - </font> | |
| 335 | - </property> | |
| 336 | - <property name="text"> | |
| 337 | - <string>스팀퀀칭 작동 온도</string> | |
| 338 | - </property> | |
| 339 | - <property name="margin"> | |
| 340 | - <number>7</number> | |
| 341 | - </property> | |
| 342 | - </widget> | |
| 343 | - <widget class="QLabel" name="ctrlLbList_1_6"> | |
| 344 | - <property name="geometry"> | |
| 345 | - <rect> | |
| 346 | - <x>0</x> | |
| 347 | - <y>553</y> | |
| 348 | - <width>460</width> | |
| 349 | - <height>94</height> | |
| 350 | - </rect> | |
| 351 | - </property> | |
| 352 | - <property name="font"> | |
| 353 | - <font> | |
| 354 | - <family>나눔고딕</family> | |
| 355 | - <pointsize>10</pointsize> | |
| 356 | - </font> | |
| 357 | - </property> | |
| 358 | - <property name="text"> | |
| 359 | - <string>드레인볼밸브 </string> | |
| 360 | - </property> | |
| 361 | - <property name="margin"> | |
| 362 | - <number>7</number> | |
| 363 | - </property> | |
| 364 | - </widget> | |
| 365 | - <widget class="QLabel" name="ctrlLbCol_1"> | |
| 366 | - <property name="geometry"> | |
| 367 | - <rect> | |
| 368 | - <x>0</x> | |
| 369 | - <y>0</y> | |
| 370 | - <width>460</width> | |
| 371 | - <height>69</height> | |
| 372 | - </rect> | |
| 373 | - </property> | |
| 374 | - <property name="font"> | |
| 375 | - <font> | |
| 376 | - <family>나눔고딕</family> | |
| 377 | - <pointsize>10</pointsize> | |
| 378 | - </font> | |
| 379 | - </property> | |
| 380 | - <property name="text"> | |
| 381 | - <string>설정구분</string> | |
| 382 | - </property> | |
| 383 | - <property name="margin"> | |
| 384 | - <number>7</number> | |
| 385 | - </property> | |
| 386 | - </widget> | |
| 387 | - <widget class="QLabel" name="ctrlLbCol_2"> | |
| 388 | - <property name="geometry"> | |
| 389 | - <rect> | |
| 390 | - <x>460</x> | |
| 391 | - <y>0</y> | |
| 392 | - <width>201</width> | |
| 393 | - <height>69</height> | |
| 394 | - </rect> | |
| 395 | - </property> | |
| 396 | - <property name="font"> | |
| 397 | - <font> | |
| 398 | - <family>나눔고딕</family> | |
| 399 | - <pointsize>10</pointsize> | |
| 400 | - </font> | |
| 401 | - </property> | |
| 402 | - <property name="text"> | |
| 403 | - <string>설 정</string> | |
| 404 | - </property> | |
| 405 | - <property name="alignment"> | |
| 406 | - <set>Qt::AlignCenter</set> | |
| 407 | - </property> | |
| 408 | - <property name="margin"> | |
| 409 | - <number>7</number> | |
| 410 | - </property> | |
| 411 | - </widget> | |
| 412 | - <widget class="QLabel" name="ctrlLbCol_3"> | |
| 413 | - <property name="geometry"> | |
| 414 | - <rect> | |
| 415 | - <x>660</x> | |
| 416 | - <y>0</y> | |
| 417 | - <width>151</width> | |
| 418 | - <height>69</height> | |
| 419 | - </rect> | |
| 420 | - </property> | |
| 421 | - <property name="font"> | |
| 422 | - <font> | |
| 423 | - <family>나눔고딕</family> | |
| 424 | - <pointsize>10</pointsize> | |
| 425 | - </font> | |
| 426 | - </property> | |
| 427 | - <property name="text"> | |
| 428 | - <string>상태</string> | |
| 429 | - </property> | |
| 430 | - <property name="alignment"> | |
| 431 | - <set>Qt::AlignCenter</set> | |
| 432 | - </property> | |
| 433 | - <property name="margin"> | |
| 434 | - <number>7</number> | |
| 435 | - </property> | |
| 436 | - </widget> | |
| 437 | - </widget> | |
| 438 | - </widget> | |
| 439 | - </widget> | |
| 440 | - <customwidgets> | |
| 441 | - <customwidget> | |
| 442 | - <class>Clock</class> | |
| 443 | - <extends>QWidget</extends> | |
| 444 | - <header>clock.h</header> | |
| 445 | - <container>1</container> | |
| 446 | - </customwidget> | |
| 447 | - <customwidget> | |
| 448 | - <class>WashWarnIcon</class> | |
| 449 | - <extends>QLabel</extends> | |
| 450 | - <header>washwarnicon.h</header> | |
| 451 | - </customwidget> | |
| 452 | - <customwidget> | |
| 453 | - <class>DemoIcon</class> | |
| 454 | - <extends>QLabel</extends> | |
| 455 | - <header>demoicon.h</header> | |
| 456 | - </customwidget> | |
| 457 | - <customwidget> | |
| 458 | - <class>HalfEnergyIcon</class> | |
| 459 | - <extends>QLabel</extends> | |
| 460 | - <header>halfenergyicon.h</header> | |
| 461 | - </customwidget> | |
| 462 | - <customwidget> | |
| 463 | - <class>DigitalClock</class> | |
| 464 | - <extends>QLabel</extends> | |
| 465 | - <header>digitalclock.h</header> | |
| 466 | - </customwidget> | |
| 467 | - </customwidgets> | |
| 468 | - <resources/> | |
| 469 | - <connections/> | |
| 470 | -</ui> |
app/gui/oven_control/oven_control.pro
| ... | ... | @@ -65,7 +65,6 @@ SOURCES += main.cpp\ |
| 65 | 65 | yesnopopupdlg.cpp \ |
| 66 | 66 | configpanelbutton.cpp \ |
| 67 | 67 | config.cpp \ |
| 68 | -#basicsettingwindow.cpp \ | |
| 69 | 68 | programmingwindow.cpp \ |
| 70 | 69 | primewindow.cpp \ |
| 71 | 70 | cookpanelbutton.cpp \ |
| ... | ... | @@ -122,7 +121,6 @@ SOURCES += main.cpp\ |
| 122 | 121 | autocookselectionpopup.cpp \ |
| 123 | 122 | autocookcheckwindow.cpp \ |
| 124 | 123 | autocookcheckconfigwindow.cpp \ |
| 125 | - #programmedcookpanelbutton.cpp \ | |
| 126 | 124 | configdemomodedlg.cpp \ |
| 127 | 125 | demoicon.cpp \ |
| 128 | 126 | halfenergyicon.cpp \ |
| ... | ... | @@ -199,7 +197,6 @@ HEADERS += mainwindow.h \ |
| 199 | 197 | yesnopopupdlg.h \ |
| 200 | 198 | configpanelbutton.h \ |
| 201 | 199 | config.h \ |
| 202 | - #basicsettingwindow.h \ | |
| 203 | 200 | programmingwindow.h \ |
| 204 | 201 | primewindow.h \ |
| 205 | 202 | cookpanelbutton.h \ |
| ... | ... | @@ -256,7 +253,6 @@ HEADERS += mainwindow.h \ |
| 256 | 253 | autocookselectionpopup.h \ |
| 257 | 254 | autocookcheckwindow.h \ |
| 258 | 255 | autocookcheckconfigwindow.h \ |
| 259 | - #programmedcookpanelbutton.h \ | |
| 260 | 256 | configdemomodedlg.h \ |
| 261 | 257 | demoicon.h \ |
| 262 | 258 | halfenergyicon.h \ |
| ... | ... | @@ -310,7 +306,6 @@ FORMS += mainwindow.ui \ |
| 310 | 306 | adjustmentwindow.ui \ |
| 311 | 307 | yesnopopupdlg.ui \ |
| 312 | 308 | configpanelbutton.ui \ |
| 313 | - #basicsettingwindow.ui \ | |
| 314 | 309 | programmingwindow.ui \ |
| 315 | 310 | primewindow.ui \ |
| 316 | 311 | cookpanelbutton.ui \ |
| ... | ... | @@ -355,7 +350,6 @@ FORMS += mainwindow.ui \ |
| 355 | 350 | autocookselectionpopup.ui \ |
| 356 | 351 | autocookcheckwindow.ui \ |
| 357 | 352 | autocookcheckconfigwindow.ui \ |
| 358 | - #programmedcookpanelbutton.ui \ | |
| 359 | 353 | configdemomodedlg.ui \ |
| 360 | 354 | notipopupdlg.ui \ |
| 361 | 355 | configsteamwashdlg.ui \ | ... | ... |
app/gui/oven_control/programmedcookpanelbutton.cpp
| ... | ... | @@ -1,175 +0,0 @@ |
| 1 | -#include "programmedcookpanelbutton.h" | |
| 2 | -#include "ui_programmedcookpanelbutton.h" | |
| 3 | - | |
| 4 | -#include <QKeyEvent> | |
| 5 | - | |
| 6 | -#include "soundplayer.h" | |
| 7 | - | |
| 8 | -ProgrammedCookPanelButton::ProgrammedCookPanelButton(CookRecord record, QWidget *parent) : | |
| 9 | - QWidget(parent), | |
| 10 | - record(record), | |
| 11 | - ui(new Ui::ProgrammedCookPanelButton), | |
| 12 | - rendered(false), | |
| 13 | - longPressEnabled(false) | |
| 14 | -{ | |
| 15 | - ui->setupUi(this); | |
| 16 | - | |
| 17 | - setText(record.name); | |
| 18 | - | |
| 19 | - foreach (QPushButton *button, findChildren<QPushButton *>()) | |
| 20 | - connect(button, &QPushButton::pressed, SoundPlayer::playClick); | |
| 21 | - | |
| 22 | - longPressedTimer.setSingleShot(true); | |
| 23 | - longPressedTimer.setInterval(3000); | |
| 24 | - connect(&longPressedTimer, SIGNAL(timeout()), SLOT(emitLongPressed())); | |
| 25 | -} | |
| 26 | - | |
| 27 | -ProgrammedCookPanelButton::~ProgrammedCookPanelButton() | |
| 28 | -{ | |
| 29 | - delete ui; | |
| 30 | -} | |
| 31 | - | |
| 32 | -void ProgrammedCookPanelButton::setText(QString text) | |
| 33 | -{ | |
| 34 | - ui->pushButton->setText(text); | |
| 35 | -} | |
| 36 | - | |
| 37 | -void ProgrammedCookPanelButton::showInfo() | |
| 38 | -{ | |
| 39 | - if (!rendered) | |
| 40 | - { | |
| 41 | - QPixmap p = CookHistory::render(record); | |
| 42 | - | |
| 43 | - label = new QLabel(this); | |
| 44 | - label->setPixmap(p); | |
| 45 | - label->setGeometry((width() - p.width()) / 2, 65, p.width(), p.height()); | |
| 46 | - } | |
| 47 | - | |
| 48 | - label->show(); | |
| 49 | - setMinimumHeight(ui->pushButton->height() + label->height()); | |
| 50 | -} | |
| 51 | - | |
| 52 | -void ProgrammedCookPanelButton::hideInfo() | |
| 53 | -{ | |
| 54 | - label->hide(); | |
| 55 | - setMinimumHeight(ui->pushButton->height()); | |
| 56 | -} | |
| 57 | - | |
| 58 | -void ProgrammedCookPanelButton::setLongPressEnabled(bool enabled) | |
| 59 | -{ | |
| 60 | - longPressEnabled = enabled; | |
| 61 | -} | |
| 62 | - | |
| 63 | -QPushButton *ProgrammedCookPanelButton::bar() | |
| 64 | -{ | |
| 65 | - return ui->pushButton; | |
| 66 | -} | |
| 67 | - | |
| 68 | -QPushButton *ProgrammedCookPanelButton::infoButton() | |
| 69 | -{ | |
| 70 | - return ui->showInfoButton; | |
| 71 | -} | |
| 72 | - | |
| 73 | -QPushButton *ProgrammedCookPanelButton::deleteButton() | |
| 74 | -{ | |
| 75 | - return ui->deleteButton; | |
| 76 | -} | |
| 77 | - | |
| 78 | -void ProgrammedCookPanelButton::setEnabled(bool enabled) | |
| 79 | -{ | |
| 80 | - ui->pushButton->setEnabled(enabled); | |
| 81 | - ui->showInfoButton->setEnabled(enabled); | |
| 82 | - ui->deleteButton->setEnabled(enabled); | |
| 83 | -} | |
| 84 | - | |
| 85 | -void ProgrammedCookPanelButton::keyPressEvent(QKeyEvent *event) | |
| 86 | -{ | |
| 87 | - switch (event->key()) | |
| 88 | - { | |
| 89 | - case 0x01000032: // Turn left | |
| 90 | - event->ignore(); | |
| 91 | - break; | |
| 92 | - case 0x01000031: // Push | |
| 93 | - pushed = focusWidget(); | |
| 94 | - if (pushed == ui->pushButton) | |
| 95 | - on_pushButton_pressed(); | |
| 96 | - break; | |
| 97 | - case 0x01000030: // Turn right | |
| 98 | - event->ignore(); | |
| 99 | - break; | |
| 100 | - } | |
| 101 | -} | |
| 102 | - | |
| 103 | -void ProgrammedCookPanelButton::keyReleaseEvent(QKeyEvent *event) | |
| 104 | -{ | |
| 105 | - switch (event->key()) | |
| 106 | - { | |
| 107 | - case 0x01000032: // Turn left | |
| 108 | - event->ignore(); | |
| 109 | - break; | |
| 110 | - case 0x01000031: // Push | |
| 111 | - if (pushed == ui->pushButton) | |
| 112 | - on_pushButton_released(); | |
| 113 | - | |
| 114 | - if (focusWidget() == pushed) | |
| 115 | - onEncoderClicked(pushed); | |
| 116 | - | |
| 117 | - pushed = NULL; | |
| 118 | - break; | |
| 119 | - case 0x01000030: // Turn right | |
| 120 | - event->ignore(); | |
| 121 | - break; | |
| 122 | - } | |
| 123 | -} | |
| 124 | - | |
| 125 | -void ProgrammedCookPanelButton::onEncoderLeft() | |
| 126 | -{ | |
| 127 | - | |
| 128 | -} | |
| 129 | - | |
| 130 | -void ProgrammedCookPanelButton::onEncoderRight() | |
| 131 | -{ | |
| 132 | - | |
| 133 | -} | |
| 134 | - | |
| 135 | -void ProgrammedCookPanelButton::onEncoderClicked(QWidget *clicked) | |
| 136 | -{ | |
| 137 | - QPushButton *b = qobject_cast<QPushButton *>(clicked); | |
| 138 | - if (b) | |
| 139 | - b->click(); | |
| 140 | -} | |
| 141 | - | |
| 142 | -void ProgrammedCookPanelButton::emitLongPressed() | |
| 143 | -{ | |
| 144 | - emitted = true; | |
| 145 | - emit longPressed(this); | |
| 146 | -} | |
| 147 | - | |
| 148 | -void ProgrammedCookPanelButton::on_pushButton_pressed() | |
| 149 | -{ | |
| 150 | - longPressedTimer.start(); | |
| 151 | - emitted = false; | |
| 152 | -} | |
| 153 | - | |
| 154 | -void ProgrammedCookPanelButton::on_pushButton_released() | |
| 155 | -{ | |
| 156 | - longPressedTimer.stop(); | |
| 157 | -} | |
| 158 | - | |
| 159 | -void ProgrammedCookPanelButton::on_pushButton_clicked() | |
| 160 | -{ | |
| 161 | - if (longPressEnabled && emitted) | |
| 162 | - return; | |
| 163 | - | |
| 164 | - emit clicked(this); | |
| 165 | -} | |
| 166 | - | |
| 167 | -void ProgrammedCookPanelButton::on_showInfoButton_clicked() | |
| 168 | -{ | |
| 169 | - emit infoClicked(this); | |
| 170 | -} | |
| 171 | - | |
| 172 | -void ProgrammedCookPanelButton::on_deleteButton_clicked() | |
| 173 | -{ | |
| 174 | - emit deleteClicked(this); | |
| 175 | -} |
app/gui/oven_control/programmedcookpanelbutton.h
| ... | ... | @@ -1,74 +0,0 @@ |
| 1 | -#ifndef PROGRAMMEDCOOKPANELBUTTON_H | |
| 2 | -#define PROGRAMMEDCOOKPANELBUTTON_H | |
| 3 | - | |
| 4 | -#include <QWidget> | |
| 5 | -#include <QLabel> | |
| 6 | -#include <QButtonGroup> | |
| 7 | -#include <QTimer> | |
| 8 | -#include <QPushButton> | |
| 9 | - | |
| 10 | -#include "cookhistory.h" | |
| 11 | - | |
| 12 | -namespace Ui { | |
| 13 | -class ProgrammedCookPanelButton; | |
| 14 | -} | |
| 15 | - | |
| 16 | -class ProgrammedCookPanelButton : public QWidget | |
| 17 | -{ | |
| 18 | - Q_OBJECT | |
| 19 | - | |
| 20 | -public: | |
| 21 | - explicit ProgrammedCookPanelButton(CookRecord record, QWidget *parent = 0); | |
| 22 | - ~ProgrammedCookPanelButton(); | |
| 23 | - | |
| 24 | - void setText(QString text); | |
| 25 | - void showInfo(); | |
| 26 | - void hideInfo(); | |
| 27 | - | |
| 28 | - void setLongPressEnabled(bool enabled); | |
| 29 | - | |
| 30 | - QPushButton *bar(); | |
| 31 | - QPushButton *infoButton(); | |
| 32 | - QPushButton *deleteButton(); | |
| 33 | - | |
| 34 | - CookRecord record; | |
| 35 | - | |
| 36 | -public slots: | |
| 37 | - void setEnabled(bool enabled = true); | |
| 38 | - | |
| 39 | -protected: | |
| 40 | - void keyPressEvent(QKeyEvent *event); | |
| 41 | - void keyReleaseEvent(QKeyEvent *event); | |
| 42 | - | |
| 43 | -private: | |
| 44 | - Ui::ProgrammedCookPanelButton *ui; | |
| 45 | - | |
| 46 | - QTimer longPressedTimer; | |
| 47 | - bool rendered; | |
| 48 | - QLabel *label; | |
| 49 | - bool emitted; | |
| 50 | - bool longPressEnabled; | |
| 51 | - | |
| 52 | - QWidget *pushed = NULL; | |
| 53 | - | |
| 54 | - void onEncoderLeft(); | |
| 55 | - void onEncoderRight(); | |
| 56 | - void onEncoderClicked(QWidget *clicked); | |
| 57 | - | |
| 58 | -private slots: | |
| 59 | - void emitLongPressed(); | |
| 60 | - | |
| 61 | - void on_pushButton_pressed(); | |
| 62 | - void on_pushButton_released(); | |
| 63 | - void on_pushButton_clicked(); | |
| 64 | - void on_showInfoButton_clicked(); | |
| 65 | - void on_deleteButton_clicked(); | |
| 66 | - | |
| 67 | -signals: | |
| 68 | - void clicked(ProgrammedCookPanelButton *); | |
| 69 | - void infoClicked(ProgrammedCookPanelButton *); | |
| 70 | - void deleteClicked(ProgrammedCookPanelButton *); | |
| 71 | - void longPressed(ProgrammedCookPanelButton *); | |
| 72 | -}; | |
| 73 | - | |
| 74 | -#endif // PROGRAMMEDCOOKPANELBUTTON_H |
app/gui/oven_control/programmedcookpanelbutton.ui
| ... | ... | @@ -1,118 +0,0 @@ |
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | |
| 2 | -<ui version="4.0"> | |
| 3 | - <class>ProgrammedCookPanelButton</class> | |
| 4 | - <widget class="QWidget" name="ProgrammedCookPanelButton"> | |
| 5 | - <property name="geometry"> | |
| 6 | - <rect> | |
| 7 | - <x>0</x> | |
| 8 | - <y>0</y> | |
| 9 | - <width>821</width> | |
| 10 | - <height>65</height> | |
| 11 | - </rect> | |
| 12 | - </property> | |
| 13 | - <property name="windowTitle"> | |
| 14 | - <string>Form</string> | |
| 15 | - </property> | |
| 16 | - <property name="styleSheet"> | |
| 17 | - <string notr="true">QPushButton { | |
| 18 | -background-position: center; | |
| 19 | -background-repeat: no-repeat; | |
| 20 | -border: none; | |
| 21 | -}</string> | |
| 22 | - </property> | |
| 23 | - <widget class="QPushButton" name="showInfoButton"> | |
| 24 | - <property name="geometry"> | |
| 25 | - <rect> | |
| 26 | - <x>670</x> | |
| 27 | - <y>0</y> | |
| 28 | - <width>70</width> | |
| 29 | - <height>65</height> | |
| 30 | - </rect> | |
| 31 | - </property> | |
| 32 | - <property name="styleSheet"> | |
| 33 | - <string notr="true">QPushButton { background-image: url(:/images/etc/bar_icon_01.png); } | |
| 34 | -QPushButton:pressed { background-image: url(:/images/etc/bar_icon_01_ov.png); } | |
| 35 | -QPushButton:focus { background-image: url(:/images/etc/bar_icon_01_ov.png); }</string> | |
| 36 | - </property> | |
| 37 | - <property name="text"> | |
| 38 | - <string/> | |
| 39 | - </property> | |
| 40 | - <property name="checkable"> | |
| 41 | - <bool>true</bool> | |
| 42 | - </property> | |
| 43 | - <property name="autoExclusive"> | |
| 44 | - <bool>true</bool> | |
| 45 | - </property> | |
| 46 | - </widget> | |
| 47 | - <widget class="QPushButton" name="deleteButton"> | |
| 48 | - <property name="geometry"> | |
| 49 | - <rect> | |
| 50 | - <x>750</x> | |
| 51 | - <y>0</y> | |
| 52 | - <width>60</width> | |
| 53 | - <height>65</height> | |
| 54 | - </rect> | |
| 55 | - </property> | |
| 56 | - <property name="styleSheet"> | |
| 57 | - <string notr="true">QPushButton { background-image: url(:/images/etc/bar_icon_02.png); } | |
| 58 | -QPushButton:pressed { background-image: url(:/images/etc/bar_icon_02_ov.png); } | |
| 59 | -QPushButton:focus { background-image: url(:/images/etc/bar_icon_02_ov.png); }</string> | |
| 60 | - </property> | |
| 61 | - <property name="text"> | |
| 62 | - <string/> | |
| 63 | - </property> | |
| 64 | - </widget> | |
| 65 | - <widget class="QPushButton" name="pushButton"> | |
| 66 | - <property name="geometry"> | |
| 67 | - <rect> | |
| 68 | - <x>0</x> | |
| 69 | - <y>0</y> | |
| 70 | - <width>821</width> | |
| 71 | - <height>65</height> | |
| 72 | - </rect> | |
| 73 | - </property> | |
| 74 | - <property name="sizePolicy"> | |
| 75 | - <sizepolicy hsizetype="Fixed" vsizetype="Fixed"> | |
| 76 | - <horstretch>0</horstretch> | |
| 77 | - <verstretch>0</verstretch> | |
| 78 | - </sizepolicy> | |
| 79 | - </property> | |
| 80 | - <property name="minimumSize"> | |
| 81 | - <size> | |
| 82 | - <width>821</width> | |
| 83 | - <height>65</height> | |
| 84 | - </size> | |
| 85 | - </property> | |
| 86 | - <property name="maximumSize"> | |
| 87 | - <size> | |
| 88 | - <width>821</width> | |
| 89 | - <height>65</height> | |
| 90 | - </size> | |
| 91 | - </property> | |
| 92 | - <property name="font"> | |
| 93 | - <font> | |
| 94 | - <family>Roboto</family> | |
| 95 | - <pointsize>11</pointsize> | |
| 96 | - </font> | |
| 97 | - </property> | |
| 98 | - <property name="styleSheet"> | |
| 99 | - <string notr="true">QPushButton { | |
| 100 | -background-image: url(:/images/etc/bar_03.png); | |
| 101 | -color: white; | |
| 102 | -text-align: left; | |
| 103 | -padding: 0px 40px; | |
| 104 | -} | |
| 105 | -QPushButton:pressed { background-image: url(:/images/etc/bar_02.png); } | |
| 106 | -QPushButton:focus { background-image: url(:/images/etc/bar_02.png); }</string> | |
| 107 | - </property> | |
| 108 | - <property name="text"> | |
| 109 | - <string/> | |
| 110 | - </property> | |
| 111 | - </widget> | |
| 112 | - <zorder>pushButton</zorder> | |
| 113 | - <zorder>showInfoButton</zorder> | |
| 114 | - <zorder>deleteButton</zorder> | |
| 115 | - </widget> | |
| 116 | - <resources/> | |
| 117 | - <connections/> | |
| 118 | -</ui> |