| -rw-r--r-- | core/applets/obex/obeximpl.cc | 3 | ||||
| -rw-r--r-- | core/applets/obex/obexinc.ui | 146 |
2 files changed, 44 insertions, 105 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 @@ -117,25 +117,26 @@ void ObexImpl::slotReceivedFile( const QString &fileName ) { QString exec = lnk.exec(); qWarning("executing %s", exec.latin1() ); if ( exec.isEmpty() || exec == "" ) { qWarning("empty"); if ( fileName.right(4) == ".vcf" ) exec = "addressbook"; else if ( fileName.right(4) == ".vcs" ) { exec = "datebook"; } } // now prompt and then add it 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(); QCString str= "QPE/Application/"; str += exec.latin1(); qWarning("channel %s", str.data() ); QCopEnvelope e(str , "setDocument(QString)" ); e << fileName; } Q_EXPORT_INTERFACE() 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 @@ -2,83 +2,47 @@ <class>ObexInc</class> <widget> <class>QWidget</class> <property stdset="1"> <name>name</name> <cstring>ObexInc</cstring> </property> <property stdset="1"> <name>geometry</name> <rect> <x>0</x> <y>0</y> - <width>208</width> + <width>204</width> <height>254</height> </rect> </property> <property stdset="1"> <name>caption</name> <string>OBEX Receiving</string> </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> <class>QLayoutWidget</class> <property stdset="1"> <name>name</name> - <cstring>Layout7</cstring> + <cstring>Layout4</cstring> </property> <property stdset="1"> <name>geometry</name> <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> - <property stdset="1"> - <name>margin</name> - <number>0</number> - </property> - <property stdset="1"> - <name>spacing</name> - <number>6</number> - </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> @@ -157,136 +121,110 @@ <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" > - <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" > + <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> - <spacer row="2" column="1" > - <property> - <name>name</name> - <cstring>Spacer7</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>58</height> - </size> - </property> - </spacer> - <widget row="1" column="1" > + <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>TextLabel1_2</cstring> + <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>TextLabel1</cstring> + <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> - <spacer row="0" column="1" > - <property> + <widget> + <class>QLabel</class> + <property stdset="1"> <name>name</name> - <cstring>Spacer8</cstring> + <cstring>TextLabel1</cstring> </property> <property stdset="1"> - <name>orientation</name> - <enum>Vertical</enum> + <name>geometry</name> + <rect> + <x>20</x> + <y>20</y> + <width>161</width> + <height>41</height> + </rect> </property> <property stdset="1"> - <name>sizeType</name> - <enum>Fixed</enum> - </property> - <property> - <name>sizeHint</name> - <size> - <width>20</width> - <height>59</height> - </size> + <name>text</name> + <string>A file was beamed +to you.</string> </property> - </spacer> - </grid> </widget> </widget> </UI> |