Commit 479b37a87256788febbb6c5bed38be18f982c863

Authored by 김태훈
1 parent 97e29af76f
Exists in fhd

수동 요리 종료 팝업 디자인 변경

Showing 1 changed file with 26 additions and 11 deletions   Show diff stats
app/gui/oven_control/manualcookfinishpopup.ui
... ... @@ -16,7 +16,7 @@
16 16 <property name="styleSheet">
17 17 <string notr="true">#closeButton { border: none; }
18 18 #closeButton_2 { border: none; }
19   -#background { background-image: url(:/images/background/popup/373.png); }
  19 +#background { background-image: url(:/images/background/popup/913.png); }
20 20 #background:focus { border: 4px solid gray; }
21 21  
22 22 QPushButton {
... ... @@ -51,7 +51,7 @@ QLabel { color: white; }&lt;/string&gt;
51 51 <x>0</x>
52 52 <y>511</y>
53 53 <width>1080</width>
54   - <height>447</height>
  54 + <height>831</height>
55 55 </rect>
56 56 </property>
57 57 <property name="focusPolicy">
... ... @@ -60,10 +60,10 @@ QLabel { color: white; }&lt;/string&gt;
60 60 <widget class="QPushButton" name="warmupButton">
61 61 <property name="geometry">
62 62 <rect>
63   - <x>650</x>
64   - <y>320</y>
65   - <width>182</width>
66   - <height>84</height>
  63 + <x>385</x>
  64 + <y>670</y>
  65 + <width>150</width>
  66 + <height>120</height>
67 67 </rect>
68 68 </property>
69 69 <property name="font">
... ... @@ -83,10 +83,10 @@ QLabel { color: white; }&lt;/string&gt;
83 83 <widget class="QPushButton" name="okButton">
84 84 <property name="geometry">
85 85 <rect>
86   - <x>850</x>
87   - <y>320</y>
88   - <width>182</width>
89   - <height>84</height>
  86 + <x>545</x>
  87 + <y>670</y>
  88 + <width>150</width>
  89 + <height>120</height>
90 90 </rect>
91 91 </property>
92 92 <property name="font">
... ... @@ -124,6 +124,19 @@ QLabel { color: white; }&lt;/string&gt;
124 124 <set>Qt::AlignCenter</set>
125 125 </property>
126 126 </widget>
  127 + <widget class="QLabel" name="label">
  128 + <property name="geometry">
  129 + <rect>
  130 + <x>439</x>
  131 + <y>250</y>
  132 + <width>301</width>
  133 + <height>350</height>
  134 + </rect>
  135 + </property>
  136 + <property name="pixmap">
  137 + <pixmap resource="resources.qrc">:/images/animation/pull_04.png</pixmap>
  138 + </property>
  139 + </widget>
127 140 </widget>
128 141 <widget class="QPushButton" name="closeButton">
129 142 <property name="geometry">
... ... @@ -146,6 +159,8 @@ QLabel { color: white; }&lt;/string&gt;
146 159 <tabstop>okButton</tabstop>
147 160 <tabstop>closeButton</tabstop>
148 161 </tabstops>
149   - <resources/>
  162 + <resources>
  163 + <include location="resources.qrc"/>
  164 + </resources>
150 165 <connections/>
151 166 </ui>
... ...