Commit 489f496b91bfab9667f484c4f0b735766ebf5c47
1 parent
618320ecd0
Exists in
master
and in
2 other branches
디자인 안 반영
Showing
1 changed file
with
82 additions
and
7 deletions
Show diff stats
app/gui/oven_control/washwindow.ui
| @@ -92,8 +92,8 @@ border: none; | @@ -92,8 +92,8 @@ border: none; | ||
| 92 | <widget class="WashStepGauge" name="washStepGauge" native="true"> | 92 | <widget class="WashStepGauge" name="washStepGauge" native="true"> |
| 93 | <property name="geometry"> | 93 | <property name="geometry"> |
| 94 | <rect> | 94 | <rect> |
| 95 | - <x>184</x> | ||
| 96 | - <y>320</y> | 95 | + <x>249</x> |
| 96 | + <y>300</y> | ||
| 97 | <width>532</width> | 97 | <width>532</width> |
| 98 | <height>58</height> | 98 | <height>58</height> |
| 99 | </rect> | 99 | </rect> |
| @@ -106,9 +106,9 @@ border: none; | @@ -106,9 +106,9 @@ border: none; | ||
| 106 | <property name="geometry"> | 106 | <property name="geometry"> |
| 107 | <rect> | 107 | <rect> |
| 108 | <x>0</x> | 108 | <x>0</x> |
| 109 | - <y>120</y> | 109 | + <y>0</y> |
| 110 | <width>900</width> | 110 | <width>900</width> |
| 111 | - <height>51</height> | 111 | + <height>88</height> |
| 112 | </rect> | 112 | </rect> |
| 113 | </property> | 113 | </property> |
| 114 | <property name="palette"> | 114 | <property name="palette"> |
| @@ -170,9 +170,84 @@ border: none; | @@ -170,9 +170,84 @@ border: none; | ||
| 170 | <property name="geometry"> | 170 | <property name="geometry"> |
| 171 | <rect> | 171 | <rect> |
| 172 | <x>0</x> | 172 | <x>0</x> |
| 173 | - <y>220</y> | 173 | + <y>88</y> |
| 174 | <width>900</width> | 174 | <width>900</width> |
| 175 | - <height>51</height> | 175 | + <height>176</height> |
| 176 | + </rect> | ||
| 177 | + </property> | ||
| 178 | + <property name="palette"> | ||
| 179 | + <palette> | ||
| 180 | + <active> | ||
| 181 | + <colorrole role="WindowText"> | ||
| 182 | + <brush brushstyle="SolidPattern"> | ||
| 183 | + <color alpha="255"> | ||
| 184 | + <red>255</red> | ||
| 185 | + <green>255</green> | ||
| 186 | + <blue>255</blue> | ||
| 187 | + </color> | ||
| 188 | + </brush> | ||
| 189 | + </colorrole> | ||
| 190 | + </active> | ||
| 191 | + <inactive> | ||
| 192 | + <colorrole role="WindowText"> | ||
| 193 | + <brush brushstyle="SolidPattern"> | ||
| 194 | + <color alpha="255"> | ||
| 195 | + <red>255</red> | ||
| 196 | + <green>255</green> | ||
| 197 | + <blue>255</blue> | ||
| 198 | + </color> | ||
| 199 | + </brush> | ||
| 200 | + </colorrole> | ||
| 201 | + </inactive> | ||
| 202 | + <disabled> | ||
| 203 | + <colorrole role="WindowText"> | ||
| 204 | + <brush brushstyle="SolidPattern"> | ||
| 205 | + <color alpha="255"> | ||
| 206 | + <red>123</red> | ||
| 207 | + <green>123</green> | ||
| 208 | + <blue>123</blue> | ||
| 209 | + </color> | ||
| 210 | + </brush> | ||
| 211 | + </colorrole> | ||
| 212 | + </disabled> | ||
| 213 | + </palette> | ||
| 214 | + </property> | ||
| 215 | + <property name="font"> | ||
| 216 | + <font> | ||
| 217 | + <family>Roboto</family> | ||
| 218 | + <pointsize>13</pointsize> | ||
| 219 | + </font> | ||
| 220 | + </property> | ||
| 221 | + <property name="text"> | ||
| 222 | + <string/> | ||
| 223 | + </property> | ||
| 224 | + <property name="alignment"> | ||
| 225 | + <set>Qt::AlignCenter</set> | ||
| 226 | + </property> | ||
| 227 | + </widget> | ||
| 228 | + <widget class="Line" name="line"> | ||
| 229 | + <property name="geometry"> | ||
| 230 | + <rect> | ||
| 231 | + <x>0</x> | ||
| 232 | + <y>88</y> | ||
| 233 | + <width>900</width> | ||
| 234 | + <height>1</height> | ||
| 235 | + </rect> | ||
| 236 | + </property> | ||
| 237 | + <property name="orientation"> | ||
| 238 | + <enum>Qt::Horizontal</enum> | ||
| 239 | + </property> | ||
| 240 | + </widget> | ||
| 241 | + <widget class="QLabel" name="washStepCountLabel_2"> | ||
| 242 | + <property name="enabled"> | ||
| 243 | + <bool>true</bool> | ||
| 244 | + </property> | ||
| 245 | + <property name="geometry"> | ||
| 246 | + <rect> | ||
| 247 | + <x>119</x> | ||
| 248 | + <y>300</y> | ||
| 249 | + <width>130</width> | ||
| 250 | + <height>58</height> | ||
| 176 | </rect> | 251 | </rect> |
| 177 | </property> | 252 | </property> |
| 178 | <property name="palette"> | 253 | <property name="palette"> |
| @@ -221,7 +296,7 @@ border: none; | @@ -221,7 +296,7 @@ border: none; | ||
| 221 | </font> | 296 | </font> |
| 222 | </property> | 297 | </property> |
| 223 | <property name="text"> | 298 | <property name="text"> |
| 224 | - <string/> | 299 | + <string>세척 중</string> |
| 225 | </property> | 300 | </property> |
| 226 | <property name="alignment"> | 301 | <property name="alignment"> |
| 227 | <set>Qt::AlignCenter</set> | 302 | <set>Qt::AlignCenter</set> |