summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/obex/obeximpl.cc19
-rw-r--r--core/applets/obex/obexinc.ui204
2 files changed, 115 insertions, 108 deletions
diff --git a/core/applets/obex/obeximpl.cc b/core/applets/obex/obeximpl.cc
index da47e5b..eb0e67b 100644
--- a/core/applets/obex/obeximpl.cc
+++ b/core/applets/obex/obeximpl.cc
@@ -24,18 +24,23 @@ ObexImpl::ObexImpl( )
m_recvgui = new ObexInc();
m_chan = new QCopChannel("QPE/Obex" );
connect(m_chan, SIGNAL(received(const QCString&, const QByteArray& ) ),
this, SLOT(slotMessage(const QCString&, const QByteArray&) ) );
connect(m_obex, SIGNAL(receivedFile(const QString& ) ),
this, SLOT(slotReceivedFile(const QString& ) ) );
+ connect((QObject*) m_recvgui->InsertButton, SIGNAL(clicked()),
+ m_recvgui, SLOT( accept() ));
+ connect((QObject*) m_recvgui->RejectButton, SIGNAL(clicked()),
+ m_recvgui, SLOT( reject() ));
}
ObexImpl::~ObexImpl() {
delete m_obex;
delete m_chan;
delete m_sendgui;
+ delete m_recvgui;
}
QRESULT ObexImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) {
*iface = 0;
if( uuid == IID_QUnknown )
*iface = this;
@@ -126,20 +131,22 @@ void ObexImpl::slotReceivedFile( const QString &fileName ) {
} // now prompt and then add it
m_recvgui->PixmapLabel->setPixmap(lnk.pixmap());
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;
+ if( m_recvgui->exec() != -1 ) {
+ QCString str= "QPE/Application/";
+ str += exec.latin1();
+ qWarning("channel %s", str.data() );
+ QCopEnvelope e(str , "setDocument(QString)" );
+ e << fileName;
+ }
}
+
Q_EXPORT_INTERFACE()
{
Q_CREATE_INSTANCE( ObexImpl )
}
diff --git a/core/applets/obex/obexinc.ui b/core/applets/obex/obexinc.ui
index 13d2767..4cc8056 100644
--- a/core/applets/obex/obexinc.ui
+++ b/core/applets/obex/obexinc.ui
@@ -1,38 +1,134 @@
<!DOCTYPE UI><UI>
<class>ObexInc</class>
<widget>
- <class>QWidget</class>
+ <class>QDialog</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>204</width>
- <height>254</height>
+ <width>208</width>
+ <height>248</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
<string>OBEX Receiving</string>
</property>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
+ <cstring>Layout5</cstring>
+ </property>
+ <property stdset="1">
+ <name>geometry</name>
+ <rect>
+ <x>90</x>
+ <y>100</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>30</x>
+ <y>30</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>
+ <widget>
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>PixmapLabel</cstring>
+ </property>
+ <property stdset="1">
+ <name>geometry</name>
+ <rect>
+ <x>30</x>
+ <y>100</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>Layout4</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
- <x>1</x>
- <y>206</y>
+ <x>0</x>
+ <y>210</y>
<width>246</width>
<height>33</height>
</rect>
</property>
<hbox>
<property stdset="1">
@@ -97,13 +193,13 @@
</property>
</spacer>
<widget>
<class>QPushButton</class>
<property stdset="1">
<name>name</name>
- <cstring>RecjectButton</cstring>
+ <cstring>RejectButton</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Reject</string>
</property>
</widget>
@@ -127,104 +223,8 @@
<height>20</height>
</size>
</property>
</spacer>
</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>
</widget>
</UI>