- embed transferdialog into menu

4 files changed, 65 insertions, 6 deletions

diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 0bd6a13..fbeaa74 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -15,2 +15,3 @@
 #include "tabwidget.h"
+#include "transferdialog.h"
 
@@ -65,2 +66,8 @@ void MainWindow::initUI() {
 
+        m_transfer = new QAction();
+        m_transfer->setText( tr("Transfer file...") );
+        m_transfer->addTo( m_console );
+        connect(m_transfer, SIGNAL(activated() ),
+                        this, SLOT(slotTransfer() ) );
+
     /*
@@ -216,2 +223,11 @@ void MainWindow::create( const Profile& prof ) {
     m_curSession = ses;
+
 }
+
+void MainWindow::slotTransfer()
+{
+        TransferDialog dlg(this);
+        dlg.showMaximized();
+        dlg.exec();
+}
+
diff --git a/noncore/apps/opie-console/mainwindow.h b/noncore/apps/opie-console/mainwindow.h
index 7ef9c26..c8b0b65 100644
--- a/noncore/apps/opie-console/mainwindow.h
+++ b/noncore/apps/opie-console/mainwindow.h
@@ -57,2 +57,3 @@ private slots:
     void slotProfile(int);
+        void slotTransfer();
 
@@ -87,2 +88,3 @@ private:
     QAction* m_terminate;
+        QAction* m_transfer;
     QAction* m_setProfiles;
diff --git a/noncore/apps/opie-console/transferdialog.cpp b/noncore/apps/opie-console/transferdialog.cpp
index 08fb32b..45522a8 100644
--- a/noncore/apps/opie-console/transferdialog.cpp
+++ b/noncore/apps/opie-console/transferdialog.cpp
@@ -2,2 +2,5 @@
 
+#include "filetransfer.h"
+#include "io_serial.h"
+
 #include "qlayout.h"
@@ -13,3 +16,3 @@
 TransferDialog::TransferDialog(QWidget *parent, const char *name)
-: QWidget(parent, name)
+: QDialog(/*parent, name*/NULL, NULL, true)
 {
@@ -18,3 +21,5 @@ TransferDialog::TransferDialog(QWidget *parent, const char *name)
         QLabel *file, *mode, *progress, *status;
-        QPushButton *selector, *ok, *cancel;
+        QPushButton *selector;
+
+        transfer = NULL;
 
@@ -39,3 +44,3 @@ TransferDialog::TransferDialog(QWidget *parent, const char *name)
         selector = new QPushButton("...", this);
-        ok = new QPushButton(QObject::tr("OK"), this);
+        ok = new QPushButton(QObject::tr("Start transfer"), this);
         cancel = new QPushButton(QObject::tr("Cancel"), this);
@@ -63,3 +68,3 @@ TransferDialog::TransferDialog(QWidget *parent, const char *name)
         connect(ok, SIGNAL(clicked()), SLOT(slotTransfer()));
-        connect(cancel, SIGNAL(clicked()), SLOT(close()));
+        connect(cancel, SIGNAL(clicked()), SLOT(slotCancel()));
 }
@@ -88,4 +93,35 @@ void TransferDialog::slotTransfer()
 
+        ok->setEnabled(false);
+
         statusbar->setText(QObject::tr("Sending..."));
         progressbar->setProgress(1);
+
+        FileTransfer::Type transfermode = FileTransfer::SX;
+        if(protocol->currentText() == "YModem") transfermode == FileTransfer::SY;
+        if(protocol->currentText() == "ZModem") transfermode == FileTransfer::SZ;
+
+        // dummy profile
+        Profile profile("Dummy", "serial", "vt102", Profile::White, Profile::Black, Profile::VT102);
+
+        transfer = new FileTransfer(transfermode, new IOSerial(profile));
+        transfer->sendFile(filename->text());
+}
+
+void TransferDialog::slotCancel()
+{
+        ok->setEnabled(true);
+
+        if(transfer)
+        {
+                transfer->cancel();
+                delete transfer;
+                transfer = NULL;
+                QMessageBox::information(this,
+                        QObject::tr("Cancelled"),
+                        QObject::tr("The file transfer has been cancelled."));
+        }
+        else
+        {
+                close();
+        }
 }
diff --git a/noncore/apps/opie-console/transferdialog.h b/noncore/apps/opie-console/transferdialog.h
index 4fe17dd..62ae14d 100644
--- a/noncore/apps/opie-console/transferdialog.h
+++ b/noncore/apps/opie-console/transferdialog.h
@@ -3,3 +3,3 @@
 
-#include "qwidget.h"
+#include "qdialog.h"
 
@@ -9,4 +9,6 @@ class QProgressBar;
 class QLabel;
+class QPushButton;
+class FileTransfer;
 
-class TransferDialog : public QWidget
+class TransferDialog : public QDialog
 {
@@ -20,2 +22,3 @@ class TransferDialog : public QWidget
                 void slotTransfer();
+                void slotCancel();
 
@@ -26,2 +29,4 @@ class TransferDialog : public QWidget
                 QLabel *statusbar;
+                QPushButton *ok, *cancel;
+                FileTransfer *transfer;
 };