From 6defa93ae313976e73b403c8d855f247793eeba5 Mon Sep 17 00:00:00 2001
From: byloveletter <byloveletter@falinux.com>
Date: Wed, 19 Apr 2017 16:52:04 +0900
Subject: [PATCH] =?UTF-8?q?=EC=97=90=EB=9F=AC=20=ED=8C=9D=EC=97=85=20?=
 =?UTF-8?q?=EB=94=94=EC=9E=90=EC=9D=B8=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 고객사 디자인 적용
---
 app/gui/oven_control/errorpopupdlg.cpp | 10 +++---
 app/gui/oven_control/errorpopupdlg.h   |  4 +--
 app/gui/oven_control/errorpopupdlg.ui  | 61 ++++++++++++++++++++--------------
 3 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/app/gui/oven_control/errorpopupdlg.cpp b/app/gui/oven_control/errorpopupdlg.cpp
index ff9f892..be00abc 100644
--- a/app/gui/oven_control/errorpopupdlg.cpp
+++ b/app/gui/oven_control/errorpopupdlg.cpp
@@ -1,16 +1,18 @@
 #include "errorpopupdlg.h"
 #include "ui_errorpopupdlg.h"
 
-errorPopupDlg::errorPopupDlg(QWidget *parent, const QString &MsgDesc) :
+errorPopupDlg::errorPopupDlg(QWidget *parent, const QString &MsgDesc, const QString &MsgTitle) :
     QDialog(parent),
     ui(new Ui::errorPopupDlg)
 {
     ui->setupUi(this);
-    this->setAttribute(Qt::WA_TranslucentBackground);
+    this->setAttribute( Qt::WA_TranslucentBackground);
+    this->setAttribute( Qt::WA_DeleteOnClose);
     this->setWindowFlags(Qt::FramelessWindowHint);
 
     ui->centralwidget->setWindowFlags(Qt::FramelessWindowHint);
     ui->ctrlWarnDescription->setText(MsgDesc);
+    ui->ctrlWarnTitle->setText(MsgTitle);
 }
 
 errorPopupDlg::~errorPopupDlg()
@@ -18,7 +20,7 @@ errorPopupDlg::~errorPopupDlg()
     delete ui;
 }
 
-void errorPopupDlg::on_ctrlOkBtn_released()
+void errorPopupDlg::on_ctrlOkBtn_clicked()
 {
-    deleteLater();
+    close();
 }
diff --git a/app/gui/oven_control/errorpopupdlg.h b/app/gui/oven_control/errorpopupdlg.h
index 008f904..1dc8b16 100644
--- a/app/gui/oven_control/errorpopupdlg.h
+++ b/app/gui/oven_control/errorpopupdlg.h
@@ -12,11 +12,11 @@ class errorPopupDlg : public QDialog
     Q_OBJECT
 
 public:
-    explicit errorPopupDlg(QWidget *parent = 0, const QString &MsgDesc=0);
+    explicit errorPopupDlg(QWidget *parent = 0, const QString &MsgDesc=0, const QString &MsgTitle=0);
     ~errorPopupDlg();
 
 private slots:
-    void on_ctrlOkBtn_released();
+    void on_ctrlOkBtn_clicked();
 
 private:
     Ui::errorPopupDlg *ui;
diff --git a/app/gui/oven_control/errorpopupdlg.ui b/app/gui/oven_control/errorpopupdlg.ui
index 7903be1..986a9e8 100644
--- a/app/gui/oven_control/errorpopupdlg.ui
+++ b/app/gui/oven_control/errorpopupdlg.ui
@@ -14,18 +14,17 @@
    <string>Dialog</string>
   </property>
   <property name="styleSheet">
-   <string notr="true">#centralwidget { background-image: url(:/images/background/popup/503.png); 
-border-color: rgb(255,255,255);
-border-width: 2px;
-border-style: solid;}</string>
+   <string notr="true">#centralwidget { background-image: url(:/images/background/popup/error.png); 
+background-color: rgba(0, 0, 0, 255);
+}</string>
   </property>
   <widget class="QWidget" name="centralwidget" native="true">
    <property name="geometry">
     <rect>
-     <x>0</x>
-     <y>510</y>
-     <width>900</width>
-     <height>503</height>
+     <x>21</x>
+     <y>446</y>
+     <width>858</width>
+     <height>984</height>
     </rect>
    </property>
    <property name="styleSheet">
@@ -34,10 +33,10 @@ border-style: solid;}</string>
    <widget class="QPushButton" name="ctrlOkBtn">
     <property name="geometry">
      <rect>
-      <x>374</x>
-      <y>370</y>
-      <width>152</width>
-      <height>70</height>
+      <x>0</x>
+      <y>730</y>
+      <width>858</width>
+      <height>252</height>
      </rect>
     </property>
     <property name="sizePolicy">
@@ -51,11 +50,14 @@ border-style: solid;}</string>
       <pointsize>10</pointsize>
       <weight>75</weight>
       <bold>true</bold>
+      <underline>true</underline>
      </font>
     </property>
     <property name="styleSheet">
-     <string notr="true">QPushButton {border-image: url(:/images/button/152.png);}
-QPushButton::pressed {border-image: url(:/images/button/152_ov.png);}
+     <string notr="true">QPushButton {border : none;
+color : white;
+}
+QPushButton::pressed {color : yellow}
 QPushButton { text-align:center;}</string>
     </property>
     <property name="text">
@@ -66,9 +68,9 @@ QPushButton { text-align:center;}</string>
     <property name="geometry">
      <rect>
       <x>0</x>
-      <y>120</y>
-      <width>901</width>
-      <height>201</height>
+      <y>230</y>
+      <width>858</width>
+      <height>521</height>
      </rect>
     </property>
     <property name="font">
@@ -85,15 +87,21 @@ QPushButton { text-align:center;}</string>
      <string>TextLabel</string>
     </property>
     <property name="alignment">
-     <set>Qt::AlignCenter</set>
+     <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+    </property>
+    <property name="wordWrap">
+     <bool>true</bool>
+    </property>
+    <property name="margin">
+     <number>40</number>
     </property>
    </widget>
-   <widget class="QLabel" name="label">
+   <widget class="QLabel" name="ctrlWarnTitle">
     <property name="geometry">
      <rect>
-      <x>40</x>
-      <y>5</y>
-      <width>861</width>
+      <x>0</x>
+      <y>100</y>
+      <width>858</width>
       <height>51</height>
      </rect>
     </property>
@@ -117,9 +125,9 @@ QPushButton { text-align:center;}</string>
    <widget class="QLabel" name="label_3">
     <property name="geometry">
      <rect>
-      <x>350</x>
-      <y>6</y>
-      <width>61</width>
+      <x>0</x>
+      <y>30</y>
+      <width>858</width>
       <height>51</height>
      </rect>
     </property>
@@ -129,6 +137,9 @@ QPushButton { text-align:center;}</string>
     <property name="pixmap">
      <pixmap resource="resources.qrc">:/images/symbol/warning.png</pixmap>
     </property>
+    <property name="alignment">
+     <set>Qt::AlignCenter</set>
+    </property>
    </widget>
   </widget>
  </widget>
-- 
2.1.4