gui update

1 files changed, 133 insertions, 114 deletions

diff --git a/core/applets/obex/obexinc.ui b/core/applets/obex/obexinc.ui
index f8a21dc..05eb6ee 100644
--- a/core/applets/obex/obexinc.ui
+++ b/core/applets/obex/obexinc.ui
@@ -13,3 +13,3 @@
             <y>0</y>
-            <width>216</width>
+            <width>208</width>
             <height>254</height>
@@ -21,2 +21,23 @@
     </property>
+    <spacer>
+        <property>
+            <name>name</name>
+            <cstring>Spacer19</cstring>
+        </property>
+        <property stdset="1">
+            <name>orientation</name>
+            <enum>Horizontal</enum>
+        </property>
+        <property stdset="1">
+            <name>sizeType</name>
+            <enum>Fixed</enum>
+        </property>
+        <property>
+            <name>sizeHint</name>
+            <size>
+                <width>20</width>
+                <height>20</height>
+            </size>
+        </property>
+    </spacer>
     <widget>
@@ -25,3 +46,3 @@
             <name>name</name>
-            <cstring>Layout9</cstring>
+            <cstring>Layout7</cstring>
         </property>
@@ -30,5 +51,5 @@
             <rect>
-                <x>0</x>
-                <y>0</y>
-                <width>253</width>
+                <x>-14</x>
+                <y>-2</y>
+                <width>248</width>
                 <height>240</height>
@@ -36,3 +57,3 @@
         </property>
-        <vbox>
+        <grid>
             <property stdset="1">
@@ -45,24 +66,3 @@
             </property>
-            <spacer>
-                <property>
-                    <name>name</name>
-                    <cstring>Spacer8</cstring>
-                </property>
-                <property stdset="1">
-                    <name>orientation</name>
-                    <enum>Vertical</enum>
-                </property>
-                <property stdset="1">
-                    <name>sizeType</name>
-                    <enum>Expanding</enum>
-                </property>
-                <property>
-                    <name>sizeHint</name>
-                    <size>
-                        <width>20</width>
-                        <height>20</height>
-                    </size>
-                </property>
-            </spacer>
-            <widget>
+            <widget row="3"  column="0"  rowspan="1"  colspan="3" >
                 <class>QLayoutWidget</class>
@@ -70,3 +70,3 @@
                     <name>name</name>
-                    <cstring>Layout7</cstring>
+                    <cstring>Layout4</cstring>
                 </property>
@@ -84,3 +84,3 @@
                             <name>name</name>
-                            <cstring>Spacer19</cstring>
+                            <cstring>Spacer9</cstring>
                         </property>
@@ -103,6 +103,6 @@
                     <widget>
-                        <class>QLabel</class>
+                        <class>QPushButton</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>TextLabel1</cstring>
+                            <cstring>InsertButton</cstring>
                         </property>
@@ -110,13 +110,35 @@
                             <name>text</name>
-                            <string>Receiving is active 
-now.
-
-Beam now!</string>
+                            <string>Insert</string>
+                        </property>
+                    </widget>
+                    <spacer>
+                        <property>
+                            <name>name</name>
+                            <cstring>Spacer11</cstring>
                         </property>
                         <property stdset="1">
-                            <name>alignment</name>
-                            <set>AlignTop|AlignLeft</set>
+                            <name>orientation</name>
+                            <enum>Horizontal</enum>
+                        </property>
+                        <property stdset="1">
+                            <name>sizeType</name>
+                            <enum>Expanding</enum>
                         </property>
                         <property>
-                            <name>vAlign</name>
+                            <name>sizeHint</name>
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
+                    <widget>
+                        <class>QPushButton</class>
+                        <property stdset="1">
+                            <name>name</name>
+                            <cstring>RecjectButton</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>text</name>
+                            <string>Reject</string>
                         </property>
@@ -126,3 +148,3 @@ Beam now!</string>
                             <name>name</name>
-                            <cstring>Spacer20</cstring>
+                            <cstring>Spacer10</cstring>
                         </property>
@@ -146,3 +168,35 @@ Beam now!</string>
             </widget>
-            <spacer>
+            <spacer row="1"  column="2" >
+                <property>
+                    <name>name</name>
+                    <cstring>Spacer20</cstring>
+                </property>
+                <property stdset="1">
+                    <name>orientation</name>
+                    <enum>Horizontal</enum>
+                </property>
+                <property stdset="1">
+                    <name>sizeType</name>
+                    <enum>Fixed</enum>
+                </property>
+                <property>
+                    <name>sizeHint</name>
+                    <size>
+                        <width>53</width>
+                        <height>20</height>
+                    </size>
+                </property>
+            </spacer>
+            <widget row="1"  column="0" >
+                <class>QLabel</class>
+                <property stdset="1">
+                    <name>name</name>
+                    <cstring>PixmapLabel</cstring>
+                </property>
+                <property stdset="1">
+                    <name>scaledContents</name>
+                    <bool>true</bool>
+                </property>
+            </widget>
+            <spacer row="2"  column="1" >
                 <property>
@@ -157,3 +211,3 @@ Beam now!</string>
                     <name>sizeType</name>
-                    <enum>Expanding</enum>
+                    <enum>Fixed</enum>
                 </property>
@@ -163,3 +217,3 @@ Beam now!</string>
                         <width>20</width>
-                        <height>20</height>
+                        <height>58</height>
                     </size>
@@ -167,3 +221,3 @@ Beam now!</string>
             </spacer>
-            <widget>
+            <widget row="1"  column="1" >
                 <class>QLayoutWidget</class>
@@ -171,5 +225,5 @@ Beam now!</string>
                     <name>name</name>
-                    <cstring>Layout4</cstring>
+                    <cstring>Layout5</cstring>
                 </property>
-                <hbox>
+                <vbox>
                     <property stdset="1">
@@ -182,28 +236,7 @@ Beam now!</string>
                     </property>
-                    <spacer>
-                        <property>
-                            <name>name</name>
-                            <cstring>Spacer9</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>orientation</name>
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property stdset="1">
-                            <name>sizeType</name>
-                            <enum>Expanding</enum>
-                        </property>
-                        <property>
-                            <name>sizeHint</name>
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
                     <widget>
-                        <class>QPushButton</class>
+                        <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>AcceptButton</cstring>
+                            <cstring>TextLabel1_2</cstring>
                         </property>
@@ -211,31 +244,10 @@ Beam now!</string>
                             <name>text</name>
-                            <string>Accept</string>
+                            <string>TextLabel1</string>
                         </property>
                     </widget>
-                    <spacer>
-                        <property>
-                            <name>name</name>
-                            <cstring>Spacer11</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>orientation</name>
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property stdset="1">
-                            <name>sizeType</name>
-                            <enum>Expanding</enum>
-                        </property>
-                        <property>
-                            <name>sizeHint</name>
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
-                        </property>
-                    </spacer>
                     <widget>
-                        <class>QPushButton</class>
+                        <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>RecjectButton</cstring>
+                            <cstring>TextLabel1</cstring>
                         </property>
@@ -243,29 +255,36 @@ Beam now!</string>
                             <name>text</name>
-                            <string>Reject</string>
-                        </property>
-                    </widget>
-                    <spacer>
-                        <property>
-                            <name>name</name>
-                            <cstring>Spacer10</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>orientation</name>
-                            <enum>Horizontal</enum>
+                            <string>Filename</string>
                         </property>
                         <property stdset="1">
-                            <name>sizeType</name>
-                            <enum>Expanding</enum>
+                            <name>alignment</name>
+                            <set>AlignTop|AlignLeft</set>
                         </property>
                         <property>
-                            <name>sizeHint</name>
-                            <size>
-                                <width>20</width>
-                                <height>20</height>
-                            </size>
+                            <name>vAlign</name>
                         </property>
-                    </spacer>
-                </hbox>
+                    </widget>
+                </vbox>
             </widget>
-        </vbox>
+            <spacer row="0"  column="1" >
+                <property>
+                    <name>name</name>
+                    <cstring>Spacer8</cstring>
+                </property>
+                <property stdset="1">
+                    <name>orientation</name>
+                    <enum>Vertical</enum>
+                </property>
+                <property stdset="1">
+                    <name>sizeType</name>
+                    <enum>Fixed</enum>
+                </property>
+                <property>
+                    <name>sizeHint</name>
+                    <size>
+                        <width>20</width>
+                        <height>59</height>
+                    </size>
+                </property>
+            </spacer>
+        </grid>
     </widget>