에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 6defa93ae313976e73b403c8d855f247793eeba5

Authored by 고영탁
1 parent f8661a1506
Exists in master and in 2 other branches fhd, fhd-demo

에러 팝업 디자인 변경 

- 고객사 디자인 적용
Showing 3 changed files with 44 additions and 31 deletions   Show diff stats
app/gui/oven_control/errorpopupdlg.cpp
  Diff comments   View file @6defa93
1 1 #include "errorpopupdlg.h"
2 2 #include "ui_errorpopupdlg.h"
3 3  
4   -errorPopupDlg::errorPopupDlg(QWidget *parent, const QString &MsgDesc) :
  4 +errorPopupDlg::errorPopupDlg(QWidget *parent, const QString &MsgDesc, const QString &MsgTitle) :
5 5 QDialog(parent),
6 6 ui(new Ui::errorPopupDlg)
7 7 {
8 8 ui->setupUi(this);
9   - this->setAttribute(Qt::WA_TranslucentBackground);
  9 + this->setAttribute( Qt::WA_TranslucentBackground);
  10 + this->setAttribute( Qt::WA_DeleteOnClose);
10 11 this->setWindowFlags(Qt::FramelessWindowHint);
11 12  
12 13 ui->centralwidget->setWindowFlags(Qt::FramelessWindowHint);
13 14 ui->ctrlWarnDescription->setText(MsgDesc);
  15 + ui->ctrlWarnTitle->setText(MsgTitle);
14 16 }
15 17  
16 18 errorPopupDlg::~errorPopupDlg()
... ... @@ -18,7 +20,7 @@ errorPopupDlg::~errorPopupDlg()
18 20 delete ui;
19 21 }
20 22  
21   -void errorPopupDlg::on_ctrlOkBtn_released()
  23 +void errorPopupDlg::on_ctrlOkBtn_clicked()
22 24 {
23   - deleteLater();
  25 + close();
24 26 }
... ...
app/gui/oven_control/errorpopupdlg.h
  Diff comments   View file @6defa93
... ... @@ -12,11 +12,11 @@ class errorPopupDlg : public QDialog
12 12 Q_OBJECT
13 13  
14 14 public:
15   - explicit errorPopupDlg(QWidget *parent = 0, const QString &MsgDesc=0);
  15 + explicit errorPopupDlg(QWidget *parent = 0, const QString &MsgDesc=0, const QString &MsgTitle=0);
16 16 ~errorPopupDlg();
17 17  
18 18 private slots:
19   - void on_ctrlOkBtn_released();
  19 + void on_ctrlOkBtn_clicked();
20 20  
21 21 private:
22 22 Ui::errorPopupDlg *ui;
... ...
app/gui/oven_control/errorpopupdlg.ui
  Diff comments   View file @6defa93
... ... @@ -14,18 +14,17 @@
14 14 <string>Dialog</string>
15 15 </property>
16 16 <property name="styleSheet">
17   - <string notr="true">#centralwidget { background-image: url(:/images/background/popup/503.png);
18   -border-color: rgb(255,255,255);
19   -border-width: 2px;
20   -border-style: solid;}</string>
  17 + <string notr="true">#centralwidget { background-image: url(:/images/background/popup/error.png);
  18 +background-color: rgba(0, 0, 0, 255);
  19 +}</string>
21 20 </property>
22 21 <widget class="QWidget" name="centralwidget" native="true">
23 22 <property name="geometry">
24 23 <rect>
25   - <x>0</x>
26   - <y>510</y>
27   - <width>900</width>
28   - <height>503</height>
  24 + <x>21</x>
  25 + <y>446</y>
  26 + <width>858</width>
  27 + <height>984</height>
29 28 </rect>
30 29 </property>
31 30 <property name="styleSheet">
... ... @@ -34,10 +33,10 @@ border-style: solid;}&lt;/string&gt;
34 33 <widget class="QPushButton" name="ctrlOkBtn">
35 34 <property name="geometry">
36 35 <rect>
37   - <x>374</x>
38   - <y>370</y>
39   - <width>152</width>
40   - <height>70</height>
  36 + <x>0</x>
  37 + <y>730</y>
  38 + <width>858</width>
  39 + <height>252</height>
41 40 </rect>
42 41 </property>
43 42 <property name="sizePolicy">
... ... @@ -51,11 +50,14 @@ border-style: solid;}&lt;/string&gt;
51 50 <pointsize>10</pointsize>
52 51 <weight>75</weight>
53 52 <bold>true</bold>
  53 + <underline>true</underline>
54 54 </font>
55 55 </property>
56 56 <property name="styleSheet">
57   - <string notr="true">QPushButton {border-image: url(:/images/button/152.png);}
58   -QPushButton::pressed {border-image: url(:/images/button/152_ov.png);}
  57 + <string notr="true">QPushButton {border : none;
  58 +color : white;
  59 +}
  60 +QPushButton::pressed {color : yellow}
59 61 QPushButton { text-align:center;}</string>
60 62 </property>
61 63 <property name="text">
... ... @@ -66,9 +68,9 @@ QPushButton { text-align:center;}&lt;/string&gt;
66 68 <property name="geometry">
67 69 <rect>
68 70 <x>0</x>
69   - <y>120</y>
70   - <width>901</width>
71   - <height>201</height>
  71 + <y>230</y>
  72 + <width>858</width>
  73 + <height>521</height>
72 74 </rect>
73 75 </property>
74 76 <property name="font">
... ... @@ -85,15 +87,21 @@ QPushButton { text-align:center;}&lt;/string&gt;
85 87 <string>TextLabel</string>
86 88 </property>
87 89 <property name="alignment">
88   - <set>Qt::AlignCenter</set>
  90 + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
  91 + </property>
  92 + <property name="wordWrap">
  93 + <bool>true</bool>
  94 + </property>
  95 + <property name="margin">
  96 + <number>40</number>
89 97 </property>
90 98 </widget>
91   - <widget class="QLabel" name="label">
  99 + <widget class="QLabel" name="ctrlWarnTitle">
92 100 <property name="geometry">
93 101 <rect>
94   - <x>40</x>
95   - <y>5</y>
96   - <width>861</width>
  102 + <x>0</x>
  103 + <y>100</y>
  104 + <width>858</width>
97 105 <height>51</height>
98 106 </rect>
99 107 </property>
... ... @@ -117,9 +125,9 @@ QPushButton { text-align:center;}&lt;/string&gt;
117 125 <widget class="QLabel" name="label_3">
118 126 <property name="geometry">
119 127 <rect>
120   - <x>350</x>
121   - <y>6</y>
122   - <width>61</width>
  128 + <x>0</x>
  129 + <y>30</y>
  130 + <width>858</width>
123 131 <height>51</height>
124 132 </rect>
125 133 </property>
... ... @@ -129,6 +137,9 @@ QPushButton { text-align:center;}&lt;/string&gt;
129 137 <property name="pixmap">
130 138 <pixmap resource="resources.qrc">:/images/symbol/warning.png</pixmap>
131 139 </property>
  140 + <property name="alignment">
  141 + <set>Qt::AlignCenter</set>
  142 + </property>
132 143 </widget>
133 144 </widget>
134 145 </widget>
... ...