summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/default.cpp16
-rw-r--r--noncore/apps/opie-console/default.h4
-rw-r--r--noncore/apps/opie-console/metafactory.cpp23
-rw-r--r--noncore/apps/opie-console/metafactory.h8
-rw-r--r--noncore/apps/opie-console/transferdialog.cpp47
-rw-r--r--noncore/apps/opie-console/transferdialog.h3
6 files changed, 90 insertions, 11 deletions
diff --git a/noncore/apps/opie-console/default.cpp b/noncore/apps/opie-console/default.cpp
index 4853785..dd9681d 100644
--- a/noncore/apps/opie-console/default.cpp
+++ b/noncore/apps/opie-console/default.cpp
@@ -2,6 +2,7 @@
#include "io_irda.h"
#include "io_bt.h"
#include "filetransfer.h"
+#include "filereceive.h"
#include "serialconfigwidget.h"
#include "irdaconfigwidget.h"
#include "btconfigwidget.h"
@@ -23,6 +24,17 @@ extern "C" {
return new FileTransfer(FileTransfer ::SX, lay );
}
+ // FILE Transfer Receive Stuff
+ ReceiveLayer* newSZReceive(IOLayer* lay) {
+ return new FileReceive( FileReceive::SZ, lay );
+ }
+ ReceiveLayer* newSYReceive(IOLayer* lay) {
+ return new FileReceive( FileReceive::SY, lay );
+ }
+ ReceiveLayer* newSXReceive(IOLayer* lay) {
+ return new FileReceive(FileReceive::SX, lay );
+ }
+
// Layer stuff
IOLayer* newSerialLayer( const Profile& prof) {
return new IOSerial( prof );
@@ -66,6 +78,10 @@ Default::Default( MetaFactory* fact ) {
fact->addFileTransferLayer( "SY", QObject::tr("Y-Modem"), newSYTransfer );
fact->addFileTransferLayer( "SX", QObject::tr("X-Modem"), newSXTransfer );
+ fact->addReceiveLayer( "SZ", QObject::tr("Z-Modem"), newSZReceive );
+ fact->addReceiveLayer( "SY", QObject::tr("Y-Modem"), newSYReceive );
+ fact->addReceiveLayer( "SX", QObject::tr("X-Modem"), newSXReceive );
+
fact->addIOLayerFactory( "serial", QObject::tr("Serial"), newSerialLayer );
fact->addIOLayerFactory( "irda", QObject::tr("Infrared"), newIrDaLayer );
fact->addIOLayerFactory( "bt", QObject::tr("Bluetooth"), newBTLayer );
diff --git a/noncore/apps/opie-console/default.h b/noncore/apps/opie-console/default.h
index 4d51db8..03616f3 100644
--- a/noncore/apps/opie-console/default.h
+++ b/noncore/apps/opie-console/default.h
@@ -10,6 +10,10 @@ extern "C" {
FileTransferLayer* newSYTransfer(IOLayer*);
FileTransferLayer* newSXTransfer(IOLayer*);
+ ReceiveLayer* newSZReceive(IOLayer*);
+ ReceiveLayer* newSYReceive(IOLayer*);
+ ReceiveLayer* newSXReceive(IOLayer*);
+
IOLayer* newSerialLayer(const Profile&);
IOLayer* newBTLayer(const Profile& );
IOLayer* newIrDaLayer(const Profile& );
diff --git a/noncore/apps/opie-console/metafactory.cpp b/noncore/apps/opie-console/metafactory.cpp
index 901f29f..09ba586 100644
--- a/noncore/apps/opie-console/metafactory.cpp
+++ b/noncore/apps/opie-console/metafactory.cpp
@@ -30,6 +30,12 @@ void MetaFactory::addFileTransferLayer( const QCString& name,
m_strings.insert(str, name );
m_fileFact.insert( str, lay );
}
+void MetaFactory::addReceiveLayer( const QCString& name,
+ const QString& str,
+ receivelayer lay) {
+ m_strings.insert(str, name );
+ m_receiveFact.insert( str, lay );
+}
void MetaFactory::addEmulationLayer( const QCString& name,
const QString& str,
emulationLayer em) {
@@ -68,6 +74,14 @@ QStringList MetaFactory::fileTransferLayers()const {
}
return list;
}
+QStringList MetaFactory::receiveLayers()const {
+ QStringList list;
+ QMap<QString, receivelayer>::ConstIterator it;
+ for ( it = m_receiveFact.begin(); it != m_receiveFact.end(); ++it ) {
+ list << it.key();
+ }
+ return list;
+}
QStringList MetaFactory::emulationLayers()const {
QStringList list;
QMap<QString, emulationLayer>::ConstIterator it;
@@ -135,6 +149,15 @@ FileTransferLayer* MetaFactory::newFileTransfer(const QString& str, IOLayer* lay
}
return file;
}
+ReceiveLayer* MetaFactory::newReceive(const QString& str, IOLayer* lay ) {
+ ReceiveLayer* file = 0l;
+ QMap<QString, receivelayer>::Iterator it;
+ it = m_receiveFact.find( str );
+ if ( it != m_receiveFact.end() ) {
+ file = (*(it.data() ) )(lay);
+ }
+ return file;
+}
QCString MetaFactory::internal( const QString& str )const {
return m_strings[str];
}
diff --git a/noncore/apps/opie-console/metafactory.h b/noncore/apps/opie-console/metafactory.h
index 7f0699b..d6aa5e2 100644
--- a/noncore/apps/opie-console/metafactory.h
+++ b/noncore/apps/opie-console/metafactory.h
@@ -13,6 +13,7 @@
#include "io_layer.h"
#include "file_layer.h"
+#include "receive_layer.h"
#include "profile.h"
#include "profiledialogwidget.h"
#include "emulation_layer.h"
@@ -23,6 +24,7 @@ public:
typedef ProfileDialogWidget* (*configWidget)(const QString&, QWidget* parent);
typedef IOLayer* (*iolayer)(const Profile& );
typedef FileTransferLayer* (*filelayer)(IOLayer*);
+ typedef ReceiveLayer* (*receivelayer)(IOLayer*);
typedef EmulationLayer* (*emulationLayer)(WidgetLayer* );
MetaFactory();
@@ -52,6 +54,9 @@ public:
void addFileTransferLayer( const QCString& name,
const QString&,
filelayer );
+ void addReceiveLayer( const QCString& name,
+ const QString&,
+ receivelayer);
/**
* adds a Factory for Emulation to the Layer..
@@ -69,6 +74,7 @@ public:
*/
QStringList terminalWidgets()const;
QStringList fileTransferLayers()const;
+ QStringList receiveLayers()const;
QStringList emulationLayers()const;
/**
@@ -79,6 +85,7 @@ public:
ProfileDialogWidget* newTerminalPlugin( const QString&, QWidget* );
EmulationLayer* newEmulationLayer(const QString&, WidgetLayer* );
FileTransferLayer* newFileTransfer(const QString&, IOLayer* );
+ ReceiveLayer* newReceive(const QString&, IOLayer* );
/*
* internal takes the maybe translated
@@ -100,6 +107,7 @@ private:
QMap<QString, configWidget> m_termFact;
QMap<QString, iolayer> m_layerFact;
QMap<QString, filelayer> m_fileFact;
+ QMap<QString, receivelayer> m_receiveFact;
QMap<QString, emulationLayer> m_emu;
};
diff --git a/noncore/apps/opie-console/transferdialog.cpp b/noncore/apps/opie-console/transferdialog.cpp
index d3b9c0a..0083cc1 100644
--- a/noncore/apps/opie-console/transferdialog.cpp
+++ b/noncore/apps/opie-console/transferdialog.cpp
@@ -10,8 +10,8 @@
#include <opie/ofiledialog.h>
-#include "filetransfer.h"
-#include "io_serial.h"
+#include "file_layer.h"
+#include "receive_layer.h"
#include "metafactory.h"
#include "mainwindow.h"
@@ -21,6 +21,7 @@ TransferDialog::TransferDialog(MainWindow *parent, const char *name)
: QDialog(0l, 0l, true), m_win(parent)
{
m_lay = 0l;
+ m_recvlay = 0l;
QVBoxLayout *vbox, *vbox2;
QHBoxLayout *hbox, *hbox2, *hbox3;
QLabel *file, *mode, *progress, *status;
@@ -115,18 +116,26 @@ void TransferDialog::slotTransfer()
if(m_transfermode == id_send) statusbar->setText(QObject::tr("Sending..."));
else statusbar->setText(QObject::tr("Receiving..."));
- m_lay = m_win->factory()->newFileTransfer(protocol->currentText(), m_win->currentSession()->layer());
if(m_transfermode == id_send)
{
+ m_lay = m_win->factory()->newFileTransfer(protocol->currentText(), m_win->currentSession()->layer());
m_lay->sendFile(filename->text());
+
+ connect(m_lay, SIGNAL(progress(const QString&, int, int, int, int, int)),
+ SLOT(slotProgress(const QString&, int, int, int, int, int)));
+ connect(m_lay, SIGNAL(error(int, const QString&)), SLOT(slotError(int, const QString&)));
+ connect(m_lay, SIGNAL(sent()), SLOT(slotSent()));
}
else
{
- }
+ m_recvlay = m_win->factory()->newReceive(protocol->currentText(), m_win->currentSession()->layer());
+ m_recvlay->receive();
- connect(m_lay, SIGNAL(progress(const QString&, int, int, int, int, int)), SLOT(slotProgress(const QString&, int, int, int, int, int)));
- connect(m_lay, SIGNAL(error(int, const QString&)), SLOT(slotError(int, const QString&)));
- connect(m_lay, SIGNAL(sent()), SLOT(slotSent()));
+ connect(m_recvlay, SIGNAL(progress(const QString&, int, int, int, int, int)),
+ SLOT(slotProgress(const QString&, int, int, int, int, int)));
+ connect(m_recvlay, SIGNAL(error(int, const QString&)), SLOT(slotError(int, const QString&)));
+ connect(m_recvlay, SIGNAL(received(const QString&)), SLOT(slotReceived(const QString&)));
+ }
}
void TransferDialog::slotCancel()
@@ -134,11 +143,20 @@ void TransferDialog::slotCancel()
ok->setEnabled(true);
statusbar->setText(QObject::tr("Ready"));
- if(m_lay)
+ if((m_lay) || (m_recvlay))
{
- m_lay->cancel();
- delete m_lay;
- m_lay = 0l;
+ if(m_lay)
+ {
+ m_lay->cancel();
+ delete m_lay;
+ m_lay = 0l;
+ }
+ if(m_recvlay)
+ {
+ m_recvlay->cancel();
+ delete m_recvlay;
+ m_recvlay = 0l;
+ }
QMessageBox::information(this,
QObject::tr("Cancelled"),
QObject::tr("The file transfer has been cancelled."));
@@ -201,6 +219,13 @@ void TransferDialog::slotSent()
statusbar->setText(QObject::tr("Ready"));
}
+void TransferDialog::slotReceived(const QString& file)
+{
+ QMessageBox::information(this, QObject::tr("Sent"), QObject::tr("File has been received as %1.").arg(file));
+ ok->setEnabled(true);
+ statusbar->setText(QObject::tr("Ready"));
+}
+
void TransferDialog::slotMode(int id)
{
if(id == id_send)
diff --git a/noncore/apps/opie-console/transferdialog.h b/noncore/apps/opie-console/transferdialog.h
index a567161..de3a5cf 100644
--- a/noncore/apps/opie-console/transferdialog.h
+++ b/noncore/apps/opie-console/transferdialog.h
@@ -10,6 +10,7 @@ class QLabel;
class QPushButton;
class MainWindow;
class FileTransferLayer;
+class ReceiveLayer;
class TransferDialog : public QDialog
{
@@ -25,6 +26,7 @@ class TransferDialog : public QDialog
void slotProgress(const QString&, int, int, int, int, int);
void slotError(int error, const QString& message);
void slotSent();
+ void slotReceived(const QString& file);
void slotMode(int id);
private:
@@ -41,6 +43,7 @@ class TransferDialog : public QDialog
QPushButton *ok, *cancel, *selector;
MainWindow* m_win;
FileTransferLayer* m_lay;
+ ReceiveLayer *m_recvlay;
int m_transfermode;
};