summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opieftp/main.cpp6
-rw-r--r--noncore/net/opieftp/opieftp.cpp62
-rw-r--r--noncore/net/opieftp/opieftp.h6
-rw-r--r--noncore/net/opieftp/opieftp.pro3
4 files changed, 44 insertions, 33 deletions
diff --git a/noncore/net/opieftp/main.cpp b/noncore/net/opieftp/main.cpp
index 330ca52..763ffb4 100644
--- a/noncore/net/opieftp/main.cpp
+++ b/noncore/net/opieftp/main.cpp
@@ -12,7 +12,9 @@
12 * (at your option) any later version. * 12 * (at your option) any later version. *
13 ***************************************************************************/ 13 ***************************************************************************/
14#include <opie2/oapplicationfactory.h>
15#include "opieftp.h" 14#include "opieftp.h"
16 15#include <opie2/oapplicationfactory.h>
16//#include <qtopia/qpeapplication.h>
17using namespace Opie::Core; 17using namespace Opie::Core;
18OPIE_EXPORT_APP( OApplicationFactory<OpieFtp> ) 18OPIE_EXPORT_APP( OApplicationFactory<OpieFtp> )
19
20
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index 64146cb..4f0ca29 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -21,10 +21,11 @@ extern "C" {
21 21
22/* OPIE */ 22/* OPIE */
23#include <opie2/odebug.h> 23//#include <opie2/odebug.h>
24//using namespace Opie::Core;
25
24#include <qpe/qpeapplication.h> 26#include <qpe/qpeapplication.h>
25#include <qpe/resource.h> 27#include <qpe/resource.h>
26#include <qpe/config.h> 28#include <qpe/config.h>
27#include <qpe/mimetype.h> 29#include <qpe/mimetype.h>
28using namespace Opie::Core;
29 30
30#include <qtextstream.h> 31#include <qtextstream.h>
@@ -50,5 +51,5 @@ using namespace Opie::Core;
50 51
51QProgressBar *ProgressBar; 52QProgressBar *ProgressBar;
52static netbuf *conn=NULL; 53static netbuf *conn = NULL;
53 54
54static int log_progress(netbuf *, int xfered, void *) 55static int log_progress(netbuf *, int xfered, void *)
@@ -63,9 +64,14 @@ static int log_progress(netbuf *, int xfered, void *)
63} 64}
64 65
65OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) 66OpieFtp::OpieFtp( QWidget* , const char*, WFlags)
66 : QMainWindow( parent, name, fl ) 67 : QMainWindow( )
67{ 68{
68 odebug << "OpieFtp constructor" << oendl; 69 qDebug("OpieFtp constructor");
69 setCaption( tr( "OpieFtp" ) ); 70 setCaption( tr( "OpieFtp" ) );
71 // initializeGui();
72 QTimer::singleShot( 50, this, SLOT(initializeGui() ));
73}
74
75void OpieFtp::initializeGui() {
70 fuckeduphack=FALSE; 76 fuckeduphack=FALSE;
71 77
@@ -95,7 +101,5 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl)
95 tabMenu = new QPopupMenu( this ); 101 tabMenu = new QPopupMenu( this );
96 102
97//#if 0
98 layout->addMultiCellWidget( menuBar, 0, 0, 0, 2 ); 103 layout->addMultiCellWidget( menuBar, 0, 0, 0, 2 );
99//#endif
100 104
101 menuBar->insertItem( tr( "Connection" ), connectionMenu); 105 menuBar->insertItem( tr( "Connection" ), connectionMenu);
@@ -317,5 +321,6 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl)
317 currentPathCombo = new QComboBox( FALSE, view, "currentPathCombo" ); 321 currentPathCombo = new QComboBox( FALSE, view, "currentPathCombo" );
318 layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 4); 322 layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 4);
319 currentPathCombo ->setFixedWidth(220); 323
324 currentPathCombo ->setFixedWidth(220);
320 currentPathCombo->setEditable(TRUE); 325 currentPathCombo->setEditable(TRUE);
321 currentPathCombo->lineEdit()->setText( currentDir.canonicalPath()); 326 currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
@@ -326,7 +331,7 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl)
326 connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()), 331 connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()),
327 this,SLOT(currentPathComboChanged())); 332 this,SLOT(currentPathComboChanged()));
328 ProgressBar = new QProgressBar( view, "ProgressBar" ); 333 ProgressBar = new QProgressBar( view, "ProgressBar" );
329 layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 4); 334 layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 4);
330 ProgressBar->setMaximumHeight(10); 335 ProgressBar->setMaximumHeight(10);
331 filterStr="*"; 336 filterStr="*";
332 b=FALSE; 337 b=FALSE;
@@ -337,5 +342,6 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl)
337 342
338 TabWidget->setCurrentPage(2); 343 TabWidget->setCurrentPage(2);
339 odebug << "Constructor done" << oendl; 344 qDebug("XXXXXXXXXXXX Constructor done");
345
340} 346}
341 347
@@ -536,5 +542,5 @@ void OpieFtp::localUpload()
536 FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn); 542 FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn);
537 FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn); 543 FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn);
538 odebug << "Put: " << localFile.latin1() << ", " << remoteFile.latin1() << "" << oendl; 544// odebug << "Put: " << localFile.latin1() << ", " << remoteFile.latin1() << "" << oendl;
539 545
540 if( !FtpPut( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) { 546 if( !FtpPut( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) {
@@ -597,5 +603,5 @@ void OpieFtp::remoteDownload()
597 FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn); 603 FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn);
598 FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn); 604 FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn);
599 odebug << "Get: " << localFile.latin1() << ", " << remoteFile.latin1() << "" << oendl; 605// odebug << "Get: " << localFile.latin1() << ", " << remoteFile.latin1() << "" << oendl;
600 606
601 if(!FtpGet( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) { 607 if(!FtpGet( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) {
@@ -776,6 +782,6 @@ bool OpieFtp::populateRemoteView( )
776 if( file.exists()) 782 if( file.exists())
777 file. remove(); 783 file. remove();
778 } else 784 }
779 odebug << "temp file not opened successfully "+sfile << oendl; 785// odebug << "temp file not opened successfully "+sfile << oendl;
780 Remote_View->setSorting( 4,TRUE); 786 Remote_View->setSorting( 4,TRUE);
781 return true; 787 return true;
@@ -1235,5 +1241,5 @@ void OpieFtp::readConfig()
1235void OpieFtp::writeConfig() 1241void OpieFtp::writeConfig()
1236{ 1242{
1237 odebug << "write config" << oendl; 1243// odebug << "write config" << oendl;
1238 Config cfg("opieftp"); 1244 Config cfg("opieftp");
1239 cfg.setGroup("Server"); 1245 cfg.setGroup("Server");
@@ -1266,5 +1272,5 @@ void OpieFtp::writeConfig()
1266 1272
1267 currentServerConfig = numberOfEntries+1; 1273 currentServerConfig = numberOfEntries+1;
1268 odebug << "setting currentserverconfig to " << currentServerConfig << "" << oendl; 1274// odebug << "setting currentserverconfig to " << currentServerConfig << "" << oendl;
1269 1275
1270 cfg.setGroup(temp); 1276 cfg.setGroup(temp);
@@ -1285,5 +1291,5 @@ void OpieFtp::writeConfig()
1285 1291
1286void OpieFtp::clearCombos() { 1292void OpieFtp::clearCombos() {
1287 odebug << "clearing" << oendl; 1293// odebug << "clearing" << oendl;
1288 ServerComboBox->clear(); 1294 ServerComboBox->clear();
1289 UsernameComboBox->clear(); 1295 UsernameComboBox->clear();
@@ -1305,8 +1311,8 @@ void OpieFtp::fillCombos()
1305 for (int i = 1; i <= numberOfEntries; i++) { 1311 for (int i = 1; i <= numberOfEntries; i++) {
1306 temp.setNum(i); 1312 temp.setNum(i);
1307 odebug << temp << oendl; 1313// odebug << temp << oendl;
1308 cfg.setGroup("Server"); 1314 cfg.setGroup("Server");
1309 remoteServerStr = cfg.readEntry( temp,""); 1315 remoteServerStr = cfg.readEntry( temp,"");
1310 odebug << remoteServerStr << oendl; 1316// odebug << remoteServerStr << oendl;
1311 1317
1312 int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE); 1318 int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE);
@@ -1316,5 +1322,5 @@ void OpieFtp::fillCombos()
1316 1322
1317 remoteServerStr = remoteServerStr.left(remoteServerStr.length()-divider); 1323 remoteServerStr = remoteServerStr.left(remoteServerStr.length()-divider);
1318 odebug << "remote server string "+remoteServerStr << oendl; 1324// odebug << "remote server string "+remoteServerStr << oendl;
1319 ServerComboBox->insertItem( remoteServerStr ); 1325 ServerComboBox->insertItem( remoteServerStr );
1320 1326
@@ -1335,5 +1341,5 @@ void OpieFtp::serverComboSelected(int index)
1335 QString servername; 1341 QString servername;
1336 currentServerConfig = index+1; 1342 currentServerConfig = index+1;
1337 odebug << "server combo selected " << index + 1 << "" << oendl; 1343// odebug << "server combo selected " << index + 1 << "" << oendl;
1338 QString username, remoteServerStr, remotePathStr, password, port, temp; 1344 QString username, remoteServerStr, remotePathStr, password, port, temp;
1339 servername = remoteServerStr = ServerComboBox->text(index); 1345 servername = remoteServerStr = ServerComboBox->text(index);
@@ -1350,5 +1356,5 @@ void OpieFtp::serverComboSelected(int index)
1350 remoteServerStr = cfg.readEntry( temp,""); 1356 remoteServerStr = cfg.readEntry( temp,"");
1351 1357
1352 odebug << "Group " +temp << oendl; 1358// odebug << "Group " +temp << oendl;
1353 cfg.setGroup(temp); 1359 cfg.setGroup(temp);
1354 1360
@@ -1366,5 +1372,5 @@ void OpieFtp::serverComboSelected(int index)
1366 username = cfg.readEntry("Username", "anonymous"); 1372 username = cfg.readEntry("Username", "anonymous");
1367 UsernameComboBox->lineEdit()->setText(username); 1373 UsernameComboBox->lineEdit()->setText(username);
1368 odebug << username << oendl; 1374// odebug << username << oendl;
1369// odebug << "Password is "+cfg.readEntryCrypt(username << oendl; 1375// odebug << "Password is "+cfg.readEntryCrypt(username << oendl;
1370 PasswordEdit->setText(cfg.readEntryCrypt(username, "me@opieftp.org")); 1376 PasswordEdit->setText(cfg.readEntryCrypt(username, "me@opieftp.org"));
@@ -1411,5 +1417,5 @@ void OpieFtp::deleteServer()
1411 serverListView->removeItem(i); 1417 serverListView->removeItem(i);
1412 1418
1413 odebug << "OK DELETE "+tempname << oendl; 1419// odebug << "OK DELETE "+tempname << oendl;
1414 cfg.removeEntry(QString::number(i)); 1420 cfg.removeEntry(QString::number(i));
1415 for ( ; i <= numberOfEntries; i++) { 1421 for ( ; i <= numberOfEntries; i++) {
@@ -1535,5 +1541,5 @@ void OpieFtp::serverListClicked( const QString &item) {
1535 if(item.isEmpty()) return; 1541 if(item.isEmpty()) return;
1536 Config cfg("opieftp"); 1542 Config cfg("opieftp");
1537 odebug << "highltined "+item << oendl; 1543// odebug << "highltined "+item << oendl;
1538 int numberOfEntries = cfg.readNumEntry("numberOfEntries",0); 1544 int numberOfEntries = cfg.readNumEntry("numberOfEntries",0);
1539 for (int i = 1; i <= numberOfEntries; i++) { 1545 for (int i = 1; i <= numberOfEntries; i++) {
diff --git a/noncore/net/opieftp/opieftp.h b/noncore/net/opieftp/opieftp.h
index 076a906..ba2ddf9 100644
--- a/noncore/net/opieftp/opieftp.h
+++ b/noncore/net/opieftp/opieftp.h
@@ -48,8 +48,8 @@ class OpieFtp : public QMainWindow
48 48
49public: 49public:
50 static QString appName() { return QString::fromLatin1("opieftp"); }
50 OpieFtp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); 51 OpieFtp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
51 ~OpieFtp(); 52 ~OpieFtp();
52 53
53 static QString appName() { return QString::fromLatin1("opieftp"); }
54 QTabWidget *TabWidget; 54 QTabWidget *TabWidget;
55 QWidget *tab, *tab_2, *tab_3; 55 QWidget *tab, *tab_2, *tab_3;
@@ -66,9 +66,11 @@ public:
66 QString filterStr; 66 QString filterStr;
67 QListViewItem * item; 67 QListViewItem * item;
68 QPushButton *connectServerBtn, *newServerButton;// 68 QPushButton *connectServerBtn, *newServerButton;
69 QToolButton *cdUpButton, *homeButton, *docButton; 69 QToolButton *cdUpButton, *homeButton, *docButton;
70 bool b; 70 bool b;
71
71 int currentServerConfig; 72 int currentServerConfig;
72protected slots: 73protected slots:
74 void initializeGui();
73 void timerOut(); 75 void timerOut();
74 void upDir(); 76 void upDir();
diff --git a/noncore/net/opieftp/opieftp.pro b/noncore/net/opieftp/opieftp.pro
index fe69e15..835b6e0 100644
--- a/noncore/net/opieftp/opieftp.pro
+++ b/noncore/net/opieftp/opieftp.pro
@@ -1,3 +1,4 @@
1CONFIG += qt quick-app 1TEMPLATE = app
2CONFIG += qte quick-app warn_on
2HEADERS = opieftp.h inputDialog.h 3HEADERS = opieftp.h inputDialog.h
3SOURCES = opieftp.cpp inputDialog.cpp main.cpp 4SOURCES = opieftp.cpp inputDialog.cpp main.cpp