에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 70266d5fc9c915397140de04fec52b47eb82f222

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

보온 유지 팝업 디자인 변경

Showing 4 changed files with 61 additions and 97 deletions   Show diff stats
app/gui/oven_control/images/background/popup/668.png
  Diff comments   View file @70266d5

5.92 KB
app/gui/oven_control/images/symbol/keep_warm.png
  Diff comments   View file @70266d5

5.3 KB
app/gui/oven_control/keepwarmpopup.ui
  Diff comments   View file @70266d5
... ... @@ -14,32 +14,25 @@
14 14 <string>Form</string>
15 15 </property>
16 16 <property name="styleSheet">
17   - <string notr="true">QPushButton { border: none; }</string>
  17 + <string notr="true">#background { background-image: url(:/images/background/popup/668.png); }
  18 +QPushButton { border: none; }</string>
18 19 </property>
19 20 <widget class="QWidget" name="background" native="true">
20 21 <property name="geometry">
21 22 <rect>
22   - <x>21</x>
23   - <y>446</y>
24   - <width>858</width>
25   - <height>984</height>
  23 + <x>0</x>
  24 + <y>426</y>
  25 + <width>900</width>
  26 + <height>668</height>
26 27 </rect>
27 28 </property>
28   - <property name="styleSheet">
29   - <string notr="true">#background {
30   -background-image: url(:/images/background/original.png);
31   -margin: -446px -170px -21px -21px;
32   -padding: 446px 170px 21px 21px;
33   -image: url(:/images/background/popup/error.png);
34   -}</string>
35   - </property>
36 29 <widget class="QLabel" name="label">
37 30 <property name="geometry">
38 31 <rect>
39 32 <x>0</x>
40 33 <y>0</y>
41   - <width>858</width>
42   - <height>227</height>
  34 + <width>900</width>
  35 + <height>100</height>
43 36 </rect>
44 37 </property>
45 38 <property name="palette">
... ... @@ -82,13 +75,13 @@ image: url(:/images/background/popup/error.png);
82 75 <property name="font">
83 76 <font>
84 77 <family>NanumGothic</family>
85   - <pointsize>18</pointsize>
  78 + <pointsize>16</pointsize>
86 79 <weight>75</weight>
87 80 <bold>true</bold>
88 81 </font>
89 82 </property>
90 83 <property name="text">
91   - <string>보온 유지</string>
  84 + <string>보온 유지 모드</string>
92 85 </property>
93 86 <property name="alignment">
94 87 <set>Qt::AlignCenter</set>
... ... @@ -98,9 +91,9 @@ image: url(:/images/background/popup/error.png);
98 91 <property name="geometry">
99 92 <rect>
100 93 <x>0</x>
101   - <y>227</y>
102   - <width>858</width>
103   - <height>252</height>
  94 + <y>280</y>
  95 + <width>900</width>
  96 + <height>50</height>
104 97 </rect>
105 98 </property>
106 99 <property name="palette">
... ... @@ -143,13 +136,11 @@ image: url(:/images/background/popup/error.png);
143 136 <property name="font">
144 137 <font>
145 138 <family>NanumGothic</family>
146   - <pointsize>14</pointsize>
147   - <weight>75</weight>
148   - <bold>true</bold>
  139 + <pointsize>12</pointsize>
149 140 </font>
150 141 </property>
151 142 <property name="text">
152   - <string>보온 유지 중입니다</string>
  143 + <string>보온 유지 모드 중입니다.</string>
153 144 </property>
154 145 <property name="alignment">
155 146 <set>Qt::AlignCenter</set>
... ... @@ -159,9 +150,9 @@ image: url(:/images/background/popup/error.png);
159 150 <property name="geometry">
160 151 <rect>
161 152 <x>0</x>
162   - <y>479</y>
163   - <width>858</width>
164   - <height>252</height>
  153 + <y>330</y>
  154 + <width>900</width>
  155 + <height>220</height>
165 156 </rect>
166 157 </property>
167 158 <property name="palette">
... ... @@ -204,25 +195,23 @@ image: url(:/images/background/popup/error.png);
204 195 <property name="font">
205 196 <font>
206 197 <family>NanumGothic</family>
207   - <pointsize>22</pointsize>
208   - <weight>75</weight>
209   - <bold>true</bold>
  198 + <pointsize>55</pointsize>
210 199 </font>
211 200 </property>
212 201 <property name="text">
213 202 <string>00:00</string>
214 203 </property>
215 204 <property name="alignment">
216   - <set>Qt::AlignCenter</set>
  205 + <set>Qt::AlignHCenter|Qt::AlignTop</set>
217 206 </property>
218 207 </widget>
219 208 <widget class="QPushButton" name="stopButton">
220 209 <property name="geometry">
221 210 <rect>
222 211 <x>0</x>
223   - <y>731</y>
224   - <width>858</width>
225   - <height>252</height>
  212 + <y>550</y>
  213 + <width>900</width>
  214 + <height>118</height>
226 215 </rect>
227 216 </property>
228 217 <property name="font">
... ... @@ -235,7 +224,36 @@ image: url(:/images/background/popup/error.png);
235 224 QPushButton:pressed { color: yellow; }</string>
236 225 </property>
237 226 <property name="text">
238   - <string>중단</string>
  227 + <string>확인</string>
  228 + </property>
  229 + </widget>
  230 + <widget class="Line" name="line">
  231 + <property name="geometry">
  232 + <rect>
  233 + <x>0</x>
  234 + <y>100</y>
  235 + <width>900</width>
  236 + <height>1</height>
  237 + </rect>
  238 + </property>
  239 + <property name="orientation">
  240 + <enum>Qt::Horizontal</enum>
  241 + </property>
  242 + </widget>
  243 + <widget class="QLabel" name="label_3">
  244 + <property name="geometry">
  245 + <rect>
  246 + <x>0</x>
  247 + <y>100</y>
  248 + <width>900</width>
  249 + <height>180</height>
  250 + </rect>
  251 + </property>
  252 + <property name="pixmap">
  253 + <pixmap resource="resources.qrc">:/images/symbol/keep_warm.png</pixmap>
  254 + </property>
  255 + <property name="alignment">
  256 + <set>Qt::AlignCenter</set>
239 257 </property>
240 258 </widget>
241 259 </widget>
... ... @@ -245,33 +263,7 @@ QPushButton:pressed { color: yellow; }&lt;/string&gt;
245 263 <x>0</x>
246 264 <y>0</y>
247 265 <width>900</width>
248   - <height>446</height>
249   - </rect>
250   - </property>
251   - <property name="text">
252   - <string/>
253   - </property>
254   - </widget>
255   - <widget class="QPushButton" name="leftCloseButton">
256   - <property name="geometry">
257   - <rect>
258   - <x>0</x>
259   - <y>446</y>
260   - <width>21</width>
261   - <height>984</height>
262   - </rect>
263   - </property>
264   - <property name="text">
265   - <string/>
266   - </property>
267   - </widget>
268   - <widget class="QPushButton" name="rightCloseButton">
269   - <property name="geometry">
270   - <rect>
271   - <x>879</x>
272   - <y>446</y>
273   - <width>130</width>
274   - <height>984</height>
  266 + <height>426</height>
275 267 </rect>
276 268 </property>
277 269 <property name="text">
... ... @@ -282,9 +274,9 @@ QPushButton:pressed { color: yellow; }&lt;/string&gt;
282 274 <property name="geometry">
283 275 <rect>
284 276 <x>0</x>
285   - <y>1430</y>
  277 + <y>1094</y>
286 278 <width>900</width>
287   - <height>170</height>
  279 + <height>506</height>
288 280 </rect>
289 281 </property>
290 282 <property name="text">
... ... @@ -292,7 +284,9 @@ QPushButton:pressed { color: yellow; }&lt;/string&gt;
292 284 </property>
293 285 </widget>
294 286 </widget>
295   - <resources/>
  287 + <resources>
  288 + <include location="resources.qrc"/>
  289 + </resources>
296 290 <connections>
297 291 <connection>
298 292 <sender>upperCloseButton</sender>
... ... @@ -311,38 +305,6 @@ QPushButton:pressed { color: yellow; }&lt;/string&gt;
311 305 </hints>
312 306 </connection>
313 307 <connection>
314   - <sender>leftCloseButton</sender>
315   - <signal>clicked()</signal>
316   - <receiver>KeepWarmPopup</receiver>
317   - <slot>close()</slot>
318   - <hints>
319   - <hint type="sourcelabel">
320   - <x>10</x>
321   - <y>937</y>
322   - </hint>
323   - <hint type="destinationlabel">
324   - <x>449</x>
325   - <y>799</y>
326   - </hint>
327   - </hints>
328   - </connection>
329   - <connection>
330   - <sender>rightCloseButton</sender>
331   - <signal>clicked()</signal>
332   - <receiver>KeepWarmPopup</receiver>
333   - <slot>close()</slot>
334   - <hints>
335   - <hint type="sourcelabel">
336   - <x>943</x>
337   - <y>937</y>
338   - </hint>
339   - <hint type="destinationlabel">
340   - <x>449</x>
341   - <y>799</y>
342   - </hint>
343   - </hints>
344   - </connection>
345   - <connection>
346 308 <sender>bottomCloseButton</sender>
347 309 <signal>clicked()</signal>
348 310 <receiver>KeepWarmPopup</receiver>
... ...
app/gui/oven_control/resources.qrc
  Diff comments   View file @70266d5
... ... @@ -566,5 +566,7 @@
566 566 <file>images/error/button.png</file>
567 567 <file>images/error/button_ov.png</file>
568 568 <file>images/error/symbol.png</file>
  569 + <file>images/symbol/keep_warm.png</file>
  570 + <file>images/background/popup/668.png</file>
569 571 </qresource>
570 572 </RCC>
... ...