diff --git a/app/gui/oven_control/configwindow.ui b/app/gui/oven_control/configwindow.ui
index 2a72e62..e035c2a 100644
--- a/app/gui/oven_control/configwindow.ui
+++ b/app/gui/oven_control/configwindow.ui
@@ -1,663 +1 @@
-
-
- ConfigWindow
-
-
-
- 0
- 0
- 900
- 1600
-
-
-
- #centralwidget { background-image: url(:/images/background/config.png); }
-#bottomBar { background-image: url(:/images/bottom_bar/background.png); }
-
-QPushButton[style="type"] {
-background-repeat: no-repeat;
-background-position: center;
-background-origin: margin;
-
-border-top: 140px;
-border-style: hidden;
-color: white;
-font-size: 30px;
-}
-
-
-
-
- QScrollBar:vertical {
-border: none;
-background: transparent;
-width: 35px;
-margin: 30px 15px 30px 0px;
-}
-QScrollBar::handle:vertical {
-background: #B7B7B7;
-border-radius: 10px;
-min-height: 100px;
-}
-QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical {
-border: none;
-background: none;
-height: 0px;
-}
-QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
-border: none;
-}
-QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
-background: none;
-}
-
-
-
-
- 0
- 0
- 900
- 426
-
-
-
- 0
-
-
-
- #clockContainer { background-image: url(:/images/clock/background.png); }
-
-
-
-
- 272
- 36
- 356
- 355
-
-
-
-
-
-
- 800
- 320
- 80
- 84
-
-
-
-
-
-
- 780
- 230
- 101
- 90
-
-
-
-
-
-
- 780
- 160
- 108
- 67
-
-
-
-
-
-
- 20
- 310
- 600
- 100
-
-
-
- Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft
-
-
-
-
-
- 670
- 290
- 111
- 121
-
-
-
-
-
-
-
-
-
- 662
- 164
- 111
- 121
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- 426
- 900
- 421
-
-
-
-
- 0
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
- QPushButton { background-image: url(:/images/config/050_setting_btn_01.png); }
-QPushButton:pressed, QPushButton:focus, QPushButton:checked { background-image: url(:/images/config/050_setting_btn_01_ov.png); }
-
-
- 즐겨찾기
-
-
- true
-
-
- true
-
-
- true
-
-
- type
-
-
-
- -
-
-
-
- 1
- 171
-
-
-
- Qt::Vertical
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- QPushButton { background-image: url(:/images/config/050_setting_btn_02.png); }
-QPushButton:pressed, QPushButton:focus,QPushButton:checked { background-image: url(:/images/config/050_setting_btn_02_ov.png); }
-
-
- 설정
-
-
- true
-
-
- true
-
-
- type
-
-
-
- -
-
-
-
- 1
- 170
-
-
-
- Qt::Vertical
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- QPushButton { background-image: url(:/images/config/050_setting_btn_03.png); }
-QPushButton:pressed, QPushButton:focus, QPushButton:checked { background-image: url(:/images/config/050_setting_btn_03_ov.png); }
-
-
- 음향 관리
-
-
- true
-
-
- true
-
-
- type
-
-
-
- -
-
-
-
- 1
- 170
-
-
-
- Qt::Vertical
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- QPushButton { background-image: url(:/images/config/050_setting_btn_04.png); }
-QPushButton:pressed, QPushButton:focus,QPushButton:checked { background-image: url(:/images/config/050_setting_btn_04_ov.png); }
-
-
- 시스템 관리
-
-
- true
-
-
- true
-
-
- type
-
-
-
-
-
- -
-
-
-
-
-
-
- 0
- 0
-
-
-
- QPushButton { background-image: url(:/images/config/050_setting_btn_05.png); }
-QPushButton:pressed, QPushButton:focus ,QPushButton:checked{ background-image: url(:/images/config/050_setting_btn_05_ov.png); }
-
-
- 에너지 관리
-
-
- true
-
-
- true
-
-
- type
-
-
-
- -
-
-
-
- 1
- 170
-
-
-
- Qt::Vertical
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- QPushButton { background-image: url(:/images/config/050_setting_btn_06.png); }
-QPushButton:pressed, QPushButton:focus,QPushButton:checked { background-image: url(:/images/config/050_setting_btn_06_ov.png); }
-
-
- 전문가 설정
-
-
- true
-
-
- true
-
-
- type
-
-
-
- -
-
-
-
- 1
- 170
-
-
-
- Qt::Vertical
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- QPushButton { background-image: url(:/images/config/050_setting_btn_07.png); }
-QPushButton:pressed, QPushButton:focus,QPushButton:checked { background-image: url(:/images/config/050_setting_btn_07_ov.png); }
-
-
- 화면 관리
-
-
- true
-
-
- true
-
-
- type
-
-
-
- -
-
-
-
- 1
- 170
-
-
-
- Qt::Vertical
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- QPushButton { background-image: url(:/images/config/050_setting_btn_08.png); }
-QPushButton:pressed, QPushButton:focus ,QPushButton:checked{ background-image: url(:/images/config/050_setting_btn_08_ov.png); }
-
-
- 서비스
-
-
- true
-
-
- true
-
-
- type
-
-
-
-
-
-
-
-
-
-
- 16
- 636
- 868
- 1
-
-
-
-
- 868
- 16777215
-
-
-
- Qt::Horizontal
-
-
-
-
-
- 0
- 1450
- 900
- 150
-
-
-
-
-
- 288
- 26
- 97
- 97
-
-
-
- QPushButton { border-image: url(:/images/bottom_bar/back.png); }
-QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/back_ov.png); }
-
-
-
-
-
-
-
-
- 402
- 26
- 97
- 97
-
-
-
- QPushButton { border-image: url(:/images/bottom_bar/wash.png); }
-QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/wash_ov.png); }
-
-
-
-
-
-
-
-
- 515
- 26
- 97
- 97
-
-
-
- QPushButton { border-image: url(:/images/bottom_bar/help.png); }
-QPushButton:pressed , QPushButton:focus { border-image: url(:/images/bottom_bar/help_ov.png); }
-
-
-
-
-
-
-
-
-
- 0
- 850
- 900
- 600
-
-
-
- Qt::TabFocus
-
-
- background-color : transparent;
-
-
- QFrame::NoFrame
-
-
- Qt::ScrollBarAsNeeded
-
-
- true
-
-
-
-
- 0
- 0
- 900
- 600
-
-
-
-
- 0
- 0
-
-
-
-
-
-
-
- 10
-
-
- QLayout::SetDefaultConstraint
-
-
- 20
-
-
- 30
-
-
- 0
-
-
- 26
-
-
-
-
-
-
-
-
- Clock
- QWidget
-
- 1
-
-
- WashWarnIcon
- QLabel
-
-
-
- DemoIcon
- QLabel
-
-
-
- HalfEnergyIcon
- QLabel
-
-
-
- DigitalClock
- QLabel
-
-
-
- IgnitionIcon
- QLabel
-
-
-
- WaterLevelIcon
- QLabel
-
-
-
-
- pushButton
- backButton
- pushButton_8
- washButton
- pushButton_7
- helpButton
- pushButton_2
- pushButton_4
- pushButton_5
- pushButton_6
- pushButton_3
-
-
-
-
+ConfigWindow0010801920#centralwidget { background-image: url(:/images/background/config.png); }
#bottomBar { background-image: url(:/images/bottom_bar/background.png); }
QPushButton[style="type"] {
background-repeat: no-repeat;
background-position: center;
background-origin: margin;
border-top: 140px;
border-style: hidden;
color: white;
font-size: 30px;
}QScrollBar:vertical {
border: none;
background: transparent;
width: 35px;
margin: 30px 15px 30px 0px;
}
QScrollBar::handle:vertical {
background: #B7B7B7;
border-radius: 10px;
min-height: 100px;
}
QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical {
border: none;
background: none;
height: 0px;
}
QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
border: none;
}
QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
background: none;
}0010805110#clockContainer { background-image: url(:/images/clock/background.png); }32643427426960384961009362761211089361921298024372720120Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft804348133145794196133145051110805050- 00QPushButton { background-image: url(:/images/config/050_setting_btn_01.png); }
QPushButton:pressed, QPushButton:focus, QPushButton:checked { background-image: url(:/images/config/050_setting_btn_01_ov.png); }즐겨찾기truetruetruetype
- 1205Qt::Vertical
- 00QPushButton { background-image: url(:/images/config/050_setting_btn_02.png); }
QPushButton:pressed, QPushButton:focus,QPushButton:checked { background-image: url(:/images/config/050_setting_btn_02_ov.png); }설정truetruetype
- 1204Qt::Vertical
- 00QPushButton { background-image: url(:/images/config/050_setting_btn_03.png); }
QPushButton:pressed, QPushButton:focus, QPushButton:checked { background-image: url(:/images/config/050_setting_btn_03_ov.png); }음향 관리truetruetype
- 1204Qt::Vertical
- 00QPushButton { background-image: url(:/images/config/050_setting_btn_04.png); }
QPushButton:pressed, QPushButton:focus,QPushButton:checked { background-image: url(:/images/config/050_setting_btn_04_ov.png); }시스템 관리truetruetype
- 00QPushButton { background-image: url(:/images/config/050_setting_btn_05.png); }
QPushButton:pressed, QPushButton:focus ,QPushButton:checked{ background-image: url(:/images/config/050_setting_btn_05_ov.png); }에너지 관리truetruetype
- 1204Qt::Vertical
- 00QPushButton { background-image: url(:/images/config/050_setting_btn_06.png); }
QPushButton:pressed, QPushButton:focus,QPushButton:checked { background-image: url(:/images/config/050_setting_btn_06_ov.png); }전문가 설정truetruetype
- 1204Qt::Vertical
- 00QPushButton { background-image: url(:/images/config/050_setting_btn_07.png); }
QPushButton:pressed, QPushButton:focus,QPushButton:checked { background-image: url(:/images/config/050_setting_btn_07_ov.png); }화면 관리truetruetype
- 1204Qt::Vertical
- 00QPushButton { background-image: url(:/images/config/050_setting_btn_08.png); }
QPushButton:pressed, QPushButton:focus ,QPushButton:checked{ background-image: url(:/images/config/050_setting_btn_08_ov.png); }서비스truetruetype
1976310411104120132658Qt::Horizontal01740108018034531116116QPushButton { border-image: url(:/images/bottom_bar/back.png); }
QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/back_ov.png); }48231116116QPushButton { border-image: url(:/images/bottom_bar/wash.png); }
QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/wash_ov.png); }61831116116QPushButton { border-image: url(:/images/bottom_bar/help.png); }
QPushButton:pressed , QPushButton:focus { border-image: url(:/images/bottom_bar/help_ov.png); }010201080720Qt::TabFocusbackground-color : transparent;QFrame::NoFrameQt::ScrollBarAsNeededtrue0010807200010QLayout::SetDefaultConstraint2030026ClockQWidget1WashWarnIconQLabelDemoIconQLabelHalfEnergyIconQLabelDigitalClockQLabelIgnitionIconQLabelWaterLevelIconQLabelpushButtonbackButtonpushButton_8washButtonpushButton_7helpButtonpushButton_2pushButton_4pushButton_5pushButton_6pushButton_3
\ No newline at end of file
diff --git a/app/gui/oven_control/mainwindow.ui b/app/gui/oven_control/mainwindow.ui
index f9e4c99..38bd3a6 100644
--- a/app/gui/oven_control/mainwindow.ui
+++ b/app/gui/oven_control/mainwindow.ui
@@ -6,8 +6,8 @@
0
0
- 900
- 1600
+ 1080
+ 1920
@@ -30,13 +30,13 @@ background-repeat: no-repeat;
background-position: center;
background-clip: border;
background-origin: border;
-margin-bottom: 50px;
+margin-bottom: 60px;
-border-top: 200px;
-border-bottom: -50px;
+border-top: 240px;
+border-bottom: -60px;
border-style: hidden;
color: white;
-font-size: 40px;
+font-size: 48px;
}
QPushButton[style="type"] {
@@ -45,10 +45,10 @@ background-position: center;
background-clip: border;
background-origin: border;
-border-top: 165px;
+border-top: 198px;
border-style: hidden;
color: white;
-font-size: 30px;
+font-size: 36px;
}
QPushButton[style="function"] {
@@ -57,10 +57,10 @@ background-position: center;
background-clip: border;
background-origin: border;
-padding-top: 206px;
+padding-top: 247.2px;
border-style: hidden;
color: white;
-font-size: 30px;
+font-size: 36px;
}
@@ -74,30 +74,30 @@ font-size: 30px;
0
- 1450
- 900
- 150
+ 1740
+ 1080
+ 180
- 900
- 150
+ 1080
+ 180
- 900
- 150
+ 1080
+ 180
- 345
- 26
- 97
- 97
+ 414
+ 31
+ 116
+ 116
@@ -108,8 +108,8 @@ font-size: 30px;
- 62
- 71
+ 74
+ 85
@@ -123,10 +123,10 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c
- 458
- 26
- 97
- 97
+ 549
+ 31
+ 116
+ 116
@@ -137,8 +137,8 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/c
- 62
- 71
+ 74
+ 85
@@ -157,9 +157,9 @@ QPushButton:pressed, QPushButton:focus { border-image: url(:/images/bottom_bar/h
0
- 1164
- 300
- 286
+ 1396
+ 360
+ 343
@@ -182,10 +182,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_but
- 300
- 1164
- 300
- 286
+ 360
+ 1396
+ 360
+ 343
@@ -208,10 +208,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_but
- 600
- 1164
- 300
- 286
+ 720
+ 1396
+ 360
+ 343
@@ -234,10 +234,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_but
- 225
- 771
+ 270
+ 925
1
- 120
+ 144
@@ -247,10 +247,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_but
- 450
- 771
+ 540
+ 925
1
- 120
+ 144
@@ -260,10 +260,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_but
- 675
- 771
+ 810
+ 925
1
- 120
+ 144
@@ -273,10 +273,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_but
- 225
- 993
+ 270
+ 1191
1
- 120
+ 144
@@ -286,10 +286,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_but
- 450
- 993
+ 540
+ 1191
1
- 120
+ 144
@@ -299,10 +299,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_but
- 675
- 993
+ 810
+ 1191
1
- 120
+ 144
@@ -312,10 +312,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/main_but
- 600
- 426
- 300
- 293
+ 720
+ 511
+ 360
+ 351
@@ -332,10 +332,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod
- 300
- 426
- 300
- 293
+ 360
+ 511
+ 360
+ 351
@@ -353,9 +353,9 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod
0
- 426
- 300
- 293
+ 511
+ 360
+ 351
@@ -372,10 +372,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_mod
- 226
- 720
- 224
- 221
+ 271
+ 864
+ 268
+ 265
@@ -398,10 +398,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
- 676
- 720
- 224
- 221
+ 811
+ 864
+ 268
+ 265
@@ -424,10 +424,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
- 451
- 943
- 224
- 221
+ 541
+ 1131
+ 268
+ 265
@@ -451,9 +451,9 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
0
- 943
- 225
- 221
+ 1131
+ 270
+ 265
@@ -477,9 +477,9 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
0
- 720
- 225
- 221
+ 864
+ 270
+ 265
@@ -502,10 +502,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
- 451
- 720
- 224
- 221
+ 541
+ 864
+ 268
+ 265
@@ -528,10 +528,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
- 226
- 943
- 224
- 221
+ 271
+ 1131
+ 268
+ 265
@@ -554,10 +554,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
- 676
- 943
- 224
- 221
+ 811
+ 1131
+ 268
+ 265
@@ -582,8 +582,8 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
0
0
- 900
- 426
+ 1080
+ 511
@@ -592,50 +592,50 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
- 272
- 36
- 356
- 355
+ 326
+ 43
+ 427
+ 426
- 800
- 320
- 80
- 84
+ 960
+ 384
+ 96
+ 100
- 780
- 230
- 101
- 90
+ 936
+ 276
+ 121
+ 108
- 780
- 160
- 108
- 67
+ 936
+ 192
+ 129
+ 80
- 20
- 310
- 600
- 100
+ 24
+ 372
+ 720
+ 120
@@ -645,10 +645,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
- 662
- 164
- 111
- 121
+ 794
+ 196
+ 133
+ 145
@@ -658,10 +658,10 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
- 670
- 290
- 111
- 121
+ 804
+ 348
+ 133
+ 145
@@ -672,9 +672,9 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
- 18
- 942
- 863
+ 21
+ 1130
+ 1035
1
@@ -689,9 +689,9 @@ QPushButton:pressed, QPushButton:focus { background-image: url(:/images/cook_typ
0
- 1164
- 600
- 286
+ 1396
+ 720
+ 343