From 70266d5fc9c915397140de04fec52b47eb82f222 Mon Sep 17 00:00:00 2001 From: victor Date: Fri, 2 Jun 2017 14:24:57 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B3=B4=EC=98=A8=20=EC=9C=A0=EC=A7=80=20?= =?UTF-8?q?=ED=8C=9D=EC=97=85=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oven_control/images/background/popup/668.png | Bin 0 -> 6065 bytes app/gui/oven_control/images/symbol/keep_warm.png | Bin 0 -> 5429 bytes app/gui/oven_control/keepwarmpopup.ui | 156 ++++++++------------- app/gui/oven_control/resources.qrc | 2 + 4 files changed, 61 insertions(+), 97 deletions(-) create mode 100644 app/gui/oven_control/images/background/popup/668.png create mode 100644 app/gui/oven_control/images/symbol/keep_warm.png diff --git a/app/gui/oven_control/images/background/popup/668.png b/app/gui/oven_control/images/background/popup/668.png new file mode 100644 index 0000000000000000000000000000000000000000..21eb0fe08e2e190fa5a5b7e84ac76cd944497188 GIT binary patch literal 6065 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 literal 0 HcmV?d00001 diff --git a/app/gui/oven_control/keepwarmpopup.ui b/app/gui/oven_control/keepwarmpopup.ui index 0643911..7175348 100644 --- a/app/gui/oven_control/keepwarmpopup.ui +++ b/app/gui/oven_control/keepwarmpopup.ui @@ -14,32 +14,25 @@ Form - QPushButton { border: none; } + #background { background-image: url(:/images/background/popup/668.png); } +QPushButton { border: none; } - 21 - 446 - 858 - 984 + 0 + 426 + 900 + 668 - - #background { -background-image: url(:/images/background/original.png); -margin: -446px -170px -21px -21px; -padding: 446px 170px 21px 21px; -image: url(:/images/background/popup/error.png); -} - 0 0 - 858 - 227 + 900 + 100 @@ -82,13 +75,13 @@ image: url(:/images/background/popup/error.png); NanumGothic - 18 + 16 75 true - 보온 유지 + 보온 유지 모드 Qt::AlignCenter @@ -98,9 +91,9 @@ image: url(:/images/background/popup/error.png); 0 - 227 - 858 - 252 + 280 + 900 + 50 @@ -143,13 +136,11 @@ image: url(:/images/background/popup/error.png); NanumGothic - 14 - 75 - true + 12 - 보온 유지 중입니다 + 보온 유지 모드 중입니다. Qt::AlignCenter @@ -159,9 +150,9 @@ image: url(:/images/background/popup/error.png); 0 - 479 - 858 - 252 + 330 + 900 + 220 @@ -204,25 +195,23 @@ image: url(:/images/background/popup/error.png); NanumGothic - 22 - 75 - true + 55 00:00 - Qt::AlignCenter + Qt::AlignHCenter|Qt::AlignTop 0 - 731 - 858 - 252 + 550 + 900 + 118 @@ -235,7 +224,36 @@ image: url(:/images/background/popup/error.png); QPushButton:pressed { color: yellow; } - 중단 + 확인 + + + + + + 0 + 100 + 900 + 1 + + + + Qt::Horizontal + + + + + + 0 + 100 + 900 + 180 + + + + :/images/symbol/keep_warm.png + + + Qt::AlignCenter @@ -245,33 +263,7 @@ QPushButton:pressed { color: yellow; } 0 0 900 - 446 - - - - - - - - - - 0 - 446 - 21 - 984 - - - - - - - - - - 879 - 446 - 130 - 984 + 426 @@ -282,9 +274,9 @@ QPushButton:pressed { color: yellow; } 0 - 1430 + 1094 900 - 170 + 506 @@ -292,7 +284,9 @@ QPushButton:pressed { color: yellow; } - + + + upperCloseButton @@ -311,38 +305,6 @@ QPushButton:pressed { color: yellow; } - leftCloseButton - clicked() - KeepWarmPopup - close() - - - 10 - 937 - - - 449 - 799 - - - - - rightCloseButton - clicked() - KeepWarmPopup - close() - - - 943 - 937 - - - 449 - 799 - - - - bottomCloseButton clicked() KeepWarmPopup diff --git a/app/gui/oven_control/resources.qrc b/app/gui/oven_control/resources.qrc index 45c3da6..32ea4f5 100644 --- a/app/gui/oven_control/resources.qrc +++ b/app/gui/oven_control/resources.qrc @@ -566,5 +566,7 @@ images/error/button.png images/error/button_ov.png images/error/symbol.png + images/symbol/keep_warm.png + images/background/popup/668.png -- 2.1.4