summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/test/console.pro6
-rw-r--r--noncore/apps/opie-console/test/senderui.cpp18
-rw-r--r--noncore/apps/opie-console/test/senderui.h10
3 files changed, 23 insertions, 11 deletions
diff --git a/noncore/apps/opie-console/test/console.pro b/noncore/apps/opie-console/test/console.pro
index b10b651..f5761e2 100644
--- a/noncore/apps/opie-console/test/console.pro
+++ b/noncore/apps/opie-console/test/console.pro
@@ -5,6 +5,6 @@ CONFIG = qt debug
HEADERS = ../io_layer.h ../io_serial.h ../sz_transfer.h ../file_layer.h\
- senderui.h ../profile.h
+ senderui.h ../profile.h ../filetransfer.h
SOURCES = ../io_layer.cpp ../io_serial.cpp \
../profile.cpp ../sz_transfer.cpp ../file_layer.cpp\
- main.cpp senderui.cpp
+ main.cpp senderui.cpp ../filetransfer.cpp
INTERFACES = sender.ui
@@ -12,3 +12,3 @@ INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -lopie
+LIBS += -lqpe -lopie
TARGET = test
diff --git a/noncore/apps/opie-console/test/senderui.cpp b/noncore/apps/opie-console/test/senderui.cpp
index 24d3eb2..3d7c534 100644
--- a/noncore/apps/opie-console/test/senderui.cpp
+++ b/noncore/apps/opie-console/test/senderui.cpp
@@ -2,4 +2,7 @@
#include <stdio.h>
+#include <fcntl.h>
+#include <sys/termios.h>
#include <qmultilineedit.h>
+#include <qsocketnotifier.h>
@@ -7,4 +10,5 @@
#include "../io_serial.h"
-#include "../sz_transfer.h"
+#include "../filetransfer.h"
+#include <opie/oprocess.h>
@@ -17,3 +21,3 @@ SenderUI::SenderUI()
Profile prof;
- QString str = "/dev/ttyS1";
+ QString str = "/dev/ttyS0";
prof.writeEntry("Device",str );
@@ -32,3 +36,2 @@ SenderUI::SenderUI()
-
}
@@ -39,6 +42,6 @@ void SenderUI::slotSendFile() {
- sz = new SzTransfer(SzTransfer::SZ, ser);
- sz->sendFile("/home/jake/test");
+ sz = new FileTransfer(FileTransfer::SZ, ser);
+ sz->sendFile("/home/ich/bootopie-v06-13.jffs2");
- connect (sz, SIGNAL(sent()),
+ connect (sz, SIGNAL(sent()),
this, SLOT(fileTransComplete()));
@@ -62 +65,4 @@ void SenderUI::fileTransComplete() {
}
+void SenderUI::send() {
+
+}
diff --git a/noncore/apps/opie-console/test/senderui.h b/noncore/apps/opie-console/test/senderui.h
index f6230cc..5e613cd 100644
--- a/noncore/apps/opie-console/test/senderui.h
+++ b/noncore/apps/opie-console/test/senderui.h
@@ -8,3 +8,5 @@
class IOSerial;
-class SzTransfer;
+class FileTransfer;
+class QSocketNotifier;
+class OProcess;
class SenderUI : public Sender {
@@ -16,2 +18,3 @@ public:
public slots:
+ void send();
void slotSendFile();
@@ -22,3 +25,6 @@ private:
IOSerial* ser;
- SzTransfer* sz;
+ FileTransfer* sz;
+ int m_fd;
+ QSocketNotifier* m_sock;
+ OProcess* m_proc;
};