에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit f72eb28cfbb99bf89bc7881652c7f33eb15054ec

Authored by 김태훈
1 parent 8e5de54f31
Exists in master and in 2 other branches fhd, fhd-demo

오류 팝업 디자인 변경

Showing 6 changed files with 29 additions and 40 deletions   Show diff stats
app/gui/oven_control/errorpopupdlg.ui
  Diff comments   View file @f72eb28
@@ -14,19 +14,16 @@ @@ -14,19 +14,16 @@
14 <string>Dialog</string> 14 <string>Dialog</string>
15 </property> 15 </property>
16 <property name="styleSheet"> 16 <property name="styleSheet">
17 - <string notr="true">#centralwidget { background-image: url(:/images/background/popup/error.png);  
18 -background-color: rgba(0, 0, 0, 255);  
19 -}  
20 - 17 + <string notr="true">#centralwidget { background-image: url(:/images/error/background.png); }
21 QDialog { background: transparent; }</string> 18 QDialog { background: transparent; }</string>
22 </property> 19 </property>
23 <widget class="QWidget" name="centralwidget" native="true"> 20 <widget class="QWidget" name="centralwidget" native="true">
24 <property name="geometry"> 21 <property name="geometry">
25 <rect> 22 <rect>
26 - <x>21</x> 23 + <x>86</x>
27 <y>446</y> 24 <y>446</y>
28 - <width>858</width>  
29 - <height>984</height> 25 + <width>727</width>
  26 + <height>467</height>
30 </rect> 27 </rect>
31 </property> 28 </property>
32 <property name="styleSheet"> 29 <property name="styleSheet">
@@ -36,9 +33,9 @@ QDialog { background: transparent; }&lt;/string&gt; @@ -36,9 +33,9 @@ QDialog { background: transparent; }&lt;/string&gt;
36 <property name="geometry"> 33 <property name="geometry">
37 <rect> 34 <rect>
38 <x>0</x> 35 <x>0</x>
39 - <y>730</y>  
40 - <width>858</width>  
41 - <height>252</height> 36 + <y>386</y>
  37 + <width>727</width>
  38 + <height>81</height>
42 </rect> 39 </rect>
43 </property> 40 </property>
44 <property name="sizePolicy"> 41 <property name="sizePolicy">
@@ -56,35 +53,26 @@ QDialog { background: transparent; }&lt;/string&gt; @@ -56,35 +53,26 @@ QDialog { background: transparent; }&lt;/string&gt;
56 </font> 53 </font>
57 </property> 54 </property>
58 <property name="styleSheet"> 55 <property name="styleSheet">
59 - <string notr="true">QPushButton {border : none;  
60 -color : white; 56 + <string notr="true">QPushButton { border : none; }
  57 +QPushButton::pressed {
  58 +background-image: url(:/images/error/button_ov.png);
  59 +color : white
61 } 60 }
62 -QPushButton::pressed {color : yellow}  
63 -QPushButton { text-align:center;}</string> 61 +</string>
64 </property> 62 </property>
65 <property name="text"> 63 <property name="text">
66 - <string>확 인</string> 64 + <string>확인</string>
67 </property> 65 </property>
68 </widget> 66 </widget>
69 <widget class="QLabel" name="ctrlWarnDescription"> 67 <widget class="QLabel" name="ctrlWarnDescription">
70 <property name="geometry"> 68 <property name="geometry">
71 <rect> 69 <rect>
72 <x>0</x> 70 <x>0</x>
73 - <y>230</y>  
74 - <width>858</width>  
75 - <height>521</height> 71 + <y>150</y>
  72 + <width>727</width>
  73 + <height>234</height>
76 </rect> 74 </rect>
77 </property> 75 </property>
78 - <property name="font">  
79 - <font>  
80 - <pointsize>12</pointsize>  
81 - <weight>75</weight>  
82 - <bold>true</bold>  
83 - </font>  
84 - </property>  
85 - <property name="styleSheet">  
86 - <string notr="true">color: rgb(255, 255, 255);</string>  
87 - </property>  
88 <property name="text"> 76 <property name="text">
89 <string>TextLabel</string> 77 <string>TextLabel</string>
90 </property> 78 </property>
@@ -95,28 +83,25 @@ QPushButton { text-align:center;}&lt;/string&gt; @@ -95,28 +83,25 @@ QPushButton { text-align:center;}&lt;/string&gt;
95 <bool>true</bool> 83 <bool>true</bool>
96 </property> 84 </property>
97 <property name="margin"> 85 <property name="margin">
98 - <number>40</number> 86 + <number>25</number>
99 </property> 87 </property>
100 </widget> 88 </widget>
101 <widget class="QLabel" name="ctrlWarnTitle"> 89 <widget class="QLabel" name="ctrlWarnTitle">
102 <property name="geometry"> 90 <property name="geometry">
103 <rect> 91 <rect>
104 <x>0</x> 92 <x>0</x>
105 - <y>100</y>  
106 - <width>858</width>  
107 - <height>51</height> 93 + <y>90</y>
  94 + <width>727</width>
  95 + <height>60</height>
108 </rect> 96 </rect>
109 </property> 97 </property>
110 <property name="font"> 98 <property name="font">
111 <font> 99 <font>
112 - <pointsize>16</pointsize> 100 + <pointsize>14</pointsize>
113 <weight>75</weight> 101 <weight>75</weight>
114 <bold>true</bold> 102 <bold>true</bold>
115 </font> 103 </font>
116 </property> 104 </property>
117 - <property name="styleSheet">  
118 - <string notr="true">color: rgb(255, 255, 255);</string>  
119 - </property>  
120 <property name="text"> 105 <property name="text">
121 <string>경 고</string> 106 <string>경 고</string>
122 </property> 107 </property>
@@ -128,16 +113,16 @@ QPushButton { text-align:center;}&lt;/string&gt; @@ -128,16 +113,16 @@ QPushButton { text-align:center;}&lt;/string&gt;
128 <property name="geometry"> 113 <property name="geometry">
129 <rect> 114 <rect>
130 <x>0</x> 115 <x>0</x>
131 - <y>30</y>  
132 - <width>858</width>  
133 - <height>51</height> 116 + <y>0</y>
  117 + <width>727</width>
  118 + <height>90</height>
134 </rect> 119 </rect>
135 </property> 120 </property>
136 <property name="text"> 121 <property name="text">
137 <string/> 122 <string/>
138 </property> 123 </property>
139 <property name="pixmap"> 124 <property name="pixmap">
140 - <pixmap resource="resources.qrc">:/images/symbol/warning.png</pixmap> 125 + <pixmap resource="resources.qrc">:/images/error/symbol.png</pixmap>
141 </property> 126 </property>
142 <property name="alignment"> 127 <property name="alignment">
143 <set>Qt::AlignCenter</set> 128 <set>Qt::AlignCenter</set>
app/gui/oven_control/images/error/background.png
  Diff comments   View file @f72eb28

5.6 KB
app/gui/oven_control/images/error/button.png
  Diff comments   View file @f72eb28

3.57 KB
app/gui/oven_control/images/error/button_ov.png
  Diff comments   View file @f72eb28

3.57 KB
app/gui/oven_control/images/error/symbol.png
  Diff comments   View file @f72eb28

3.92 KB
app/gui/oven_control/resources.qrc
  Diff comments   View file @f72eb28
@@ -562,5 +562,9 @@ @@ -562,5 +562,9 @@
562 <file>images/gauge/103_usb_graph_03.png</file> 562 <file>images/gauge/103_usb_graph_03.png</file>
563 <file>images/config/102_usb_upload_icon.png</file> 563 <file>images/config/102_usb_upload_icon.png</file>
564 <file>images/config/102_usb_download_icon.png</file> 564 <file>images/config/102_usb_download_icon.png</file>
  565 + <file>images/error/background.png</file>
  566 + <file>images/error/button.png</file>
  567 + <file>images/error/button_ov.png</file>
  568 + <file>images/error/symbol.png</file>
565 </qresource> 569 </qresource>
566 </RCC> 570 </RCC>