summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/obex/obeximpl.cc3
-rw-r--r--core/applets/obex/obexinc.ui322
2 files changed, 132 insertions, 193 deletions
diff --git a/core/applets/obex/obeximpl.cc b/core/applets/obex/obeximpl.cc
index 7df933a..da47e5b 100644
--- a/core/applets/obex/obeximpl.cc
+++ b/core/applets/obex/obeximpl.cc
@@ -128,3 +128,4 @@ void ObexImpl::slotReceivedFile( const QString &fileName ) {
m_recvgui->PixmapLabel->setPixmap(lnk.pixmap());
- m_recvgui->TextLabel1_2->setText(lnk.name());
+ m_recvgui->AppLabel->setText(lnk.name());
+ m_recvgui->FileLabel->setText(fileName);
m_recvgui->showMaximized();
diff --git a/core/applets/obex/obexinc.ui b/core/applets/obex/obexinc.ui
index 05eb6ee..13d2767 100644
--- a/core/applets/obex/obexinc.ui
+++ b/core/applets/obex/obexinc.ui
@@ -13,3 +13,3 @@
<y>0</y>
- <width>208</width>
+ <width>204</width>
<height>254</height>
@@ -21,23 +21,2 @@
</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>
@@ -46,3 +25,3 @@
<name>name</name>
- <cstring>Layout7</cstring>
+ <cstring>Layout4</cstring>
</property>
@@ -51,9 +30,9 @@
<rect>
- <x>-14</x>
- <y>-2</y>
- <width>248</width>
- <height>240</height>
+ <x>1</x>
+ <y>206</y>
+ <width>246</width>
+ <height>33</height>
</rect>
</property>
- <grid>
+ <hbox>
<property stdset="1">
@@ -66,108 +45,6 @@
</property>
- <widget row="3" column="0" rowspan="1" colspan="3" >
- <class>QLayoutWidget</class>
- <property stdset="1">
- <name>name</name>
- <cstring>Layout4</cstring>
- </property>
- <hbox>
- <property stdset="1">
- <name>margin</name>
- <number>0</number>
- </property>
- <property stdset="1">
- <name>spacing</name>
- <number>6</number>
- </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>
- <property stdset="1">
- <name>name</name>
- <cstring>InsertButton</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Insert</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>
- <property stdset="1">
- <name>name</name>
- <cstring>RecjectButton</cstring>
- </property>
- <property stdset="1">
- <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>
- </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>
- </hbox>
- </widget>
- <spacer row="1" column="2" >
+ <spacer>
<property>
<name>name</name>
- <cstring>Spacer20</cstring>
+ <cstring>Spacer9</cstring>
</property>
@@ -179,3 +56,3 @@
<name>sizeType</name>
- <enum>Fixed</enum>
+ <enum>Expanding</enum>
</property>
@@ -184,3 +61,3 @@
<size>
- <width>53</width>
+ <width>20</width>
<height>20</height>
@@ -189,17 +66,17 @@
</spacer>
- <widget row="1" column="0" >
- <class>QLabel</class>
+ <widget>
+ <class>QPushButton</class>
<property stdset="1">
<name>name</name>
- <cstring>PixmapLabel</cstring>
+ <cstring>InsertButton</cstring>
</property>
<property stdset="1">
- <name>scaledContents</name>
- <bool>true</bool>
+ <name>text</name>
+ <string>Insert</string>
</property>
</widget>
- <spacer row="2" column="1" >
+ <spacer>
<property>
<name>name</name>
- <cstring>Spacer7</cstring>
+ <cstring>Spacer11</cstring>
</property>
@@ -207,3 +84,3 @@
<name>orientation</name>
- <enum>Vertical</enum>
+ <enum>Horizontal</enum>
</property>
@@ -211,3 +88,3 @@
<name>sizeType</name>
- <enum>Fixed</enum>
+ <enum>Expanding</enum>
</property>
@@ -217,3 +94,3 @@
<width>20</width>
- <height>58</height>
+ <height>20</height>
</size>
@@ -221,52 +98,17 @@
</spacer>
- <widget row="1" column="1" >
- <class>QLayoutWidget</class>
+ <widget>
+ <class>QPushButton</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout5</cstring>
+ <cstring>RecjectButton</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Reject</string>
</property>
- <vbox>
- <property stdset="1">
- <name>margin</name>
- <number>0</number>
- </property>
- <property stdset="1">
- <name>spacing</name>
- <number>6</number>
- </property>
- <widget>
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TextLabel1_2</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>TextLabel1</string>
- </property>
- </widget>
- <widget>
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TextLabel1</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Filename</string>
- </property>
- <property stdset="1">
- <name>alignment</name>
- <set>AlignTop|AlignLeft</set>
- </property>
- <property>
- <name>vAlign</name>
- </property>
- </widget>
- </vbox>
</widget>
- <spacer row="0" column="1" >
+ <spacer>
<property>
<name>name</name>
- <cstring>Spacer8</cstring>
+ <cstring>Spacer10</cstring>
</property>
@@ -274,3 +116,3 @@
<name>orientation</name>
- <enum>Vertical</enum>
+ <enum>Horizontal</enum>
</property>
@@ -278,3 +120,3 @@
<name>sizeType</name>
- <enum>Fixed</enum>
+ <enum>Expanding</enum>
</property>
@@ -284,3 +126,3 @@
<width>20</width>
- <height>59</height>
+ <height>20</height>
</size>
@@ -288,3 +130,99 @@
</spacer>
- </grid>
+ </hbox>
+ </widget>
+ <widget>
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>PixmapLabel</cstring>
+ </property>
+ <property stdset="1">
+ <name>geometry</name>
+ <rect>
+ <x>20</x>
+ <y>90</y>
+ <width>40</width>
+ <height>40</height>
+ </rect>
+ </property>
+ <property stdset="1">
+ <name>scaledContents</name>
+ <bool>true</bool>
+ </property>
+ </widget>
+ <widget>
+ <class>QLayoutWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Layout5</cstring>
+ </property>
+ <property stdset="1">
+ <name>geometry</name>
+ <rect>
+ <x>80</x>
+ <y>90</y>
+ <width>79</width>
+ <height>68</height>
+ </rect>
+ </property>
+ <vbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>0</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget>
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>AppLabel</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>TextLabel1</string>
+ </property>
+ </widget>
+ <widget>
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>FileLabel</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Filename</string>
+ </property>
+ <property stdset="1">
+ <name>alignment</name>
+ <set>AlignTop|AlignLeft</set>
+ </property>
+ <property>
+ <name>vAlign</name>
+ </property>
+ </widget>
+ </vbox>
+ </widget>
+ <widget>
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel1</cstring>
+ </property>
+ <property stdset="1">
+ <name>geometry</name>
+ <rect>
+ <x>20</x>
+ <y>20</y>
+ <width>161</width>
+ <height>41</height>
+ </rect>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>A file was beamed
+to you.</string>
+ </property>
</widget>