author | llornkcor <llornkcor> | 2005-01-03 03:09:51 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2005-01-03 03:09:51 (UTC) |
commit | 0b3bbec6703c021a188c865e822f536bfa3045fc (patch) (unidiff) | |
tree | 3458531d039a111ba39ef2e0bed2e5bbbfedad46 | |
parent | 8ce8566bf038f0293a0690fce44df2bba9c4eb52 (diff) | |
download | opie-0b3bbec6703c021a188c865e822f536bfa3045fc.zip opie-0b3bbec6703c021a188c865e822f536bfa3045fc.tar.gz opie-0b3bbec6703c021a188c865e822f536bfa3045fc.tar.bz2 |
mess with things so this runs from launcher. not sure what was going on, but this seems to fix #1507
-rw-r--r-- | noncore/net/opieftp/main.cpp | 6 | ||||
-rw-r--r-- | noncore/net/opieftp/opieftp.cpp | 52 | ||||
-rw-r--r-- | noncore/net/opieftp/opieftp.h | 6 | ||||
-rw-r--r-- | noncore/net/opieftp/opieftp.pro | 3 |
4 files changed, 39 insertions, 28 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 | |||
@@ -13,6 +13,8 @@ | |||
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> | ||
17 | using namespace Opie::Core; | 17 | using namespace Opie::Core; |
18 | OPIE_EXPORT_APP( OApplicationFactory<OpieFtp> ) | 18 | OPIE_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 | |||
@@ -22,3 +22,5 @@ extern "C" { | |||
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> |
@@ -27,3 +29,2 @@ extern "C" { | |||
27 | #include <qpe/mimetype.h> | 29 | #include <qpe/mimetype.h> |
28 | using namespace Opie::Core; | ||
29 | 30 | ||
@@ -64,7 +65,12 @@ static int log_progress(netbuf *, int xfered, void *) | |||
64 | 65 | ||
65 | OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | 66 | OpieFtp::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 | |||
75 | void OpieFtp::initializeGui() { | ||
70 | fuckeduphack=FALSE; | 76 | fuckeduphack=FALSE; |
@@ -96,5 +102,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
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 | ||
@@ -318,2 +322,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
318 | layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 4); | 322 | layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 4); |
323 | |||
319 | currentPathCombo ->setFixedWidth(220); | 324 | currentPathCombo ->setFixedWidth(220); |
@@ -338,3 +343,4 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
338 | TabWidget->setCurrentPage(2); | 343 | TabWidget->setCurrentPage(2); |
339 | odebug << "Constructor done" << oendl; | 344 | qDebug("XXXXXXXXXXXX Constructor done"); |
345 | |||
340 | } | 346 | } |
@@ -537,3 +543,3 @@ void OpieFtp::localUpload() | |||
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 | ||
@@ -598,3 +604,3 @@ void OpieFtp::remoteDownload() | |||
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 | ||
@@ -777,4 +783,4 @@ bool OpieFtp::populateRemoteView( ) | |||
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); |
@@ -1236,3 +1242,3 @@ void OpieFtp::writeConfig() | |||
1236 | { | 1242 | { |
1237 | odebug << "write config" << oendl; | 1243 | // odebug << "write config" << oendl; |
1238 | Config cfg("opieftp"); | 1244 | Config cfg("opieftp"); |
@@ -1267,3 +1273,3 @@ void OpieFtp::writeConfig() | |||
1267 | currentServerConfig = numberOfEntries+1; | 1273 | currentServerConfig = numberOfEntries+1; |
1268 | odebug << "setting currentserverconfig to " << currentServerConfig << "" << oendl; | 1274 | // odebug << "setting currentserverconfig to " << currentServerConfig << "" << oendl; |
1269 | 1275 | ||
@@ -1286,3 +1292,3 @@ void OpieFtp::writeConfig() | |||
1286 | void OpieFtp::clearCombos() { | 1292 | void OpieFtp::clearCombos() { |
1287 | odebug << "clearing" << oendl; | 1293 | // odebug << "clearing" << oendl; |
1288 | ServerComboBox->clear(); | 1294 | ServerComboBox->clear(); |
@@ -1306,6 +1312,6 @@ void OpieFtp::fillCombos() | |||
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 | ||
@@ -1317,3 +1323,3 @@ void OpieFtp::fillCombos() | |||
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 ); |
@@ -1336,3 +1342,3 @@ void OpieFtp::serverComboSelected(int index) | |||
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; |
@@ -1351,3 +1357,3 @@ void OpieFtp::serverComboSelected(int index) | |||
1351 | 1357 | ||
1352 | odebug << "Group " +temp << oendl; | 1358 | // odebug << "Group " +temp << oendl; |
1353 | cfg.setGroup(temp); | 1359 | cfg.setGroup(temp); |
@@ -1367,3 +1373,3 @@ void OpieFtp::serverComboSelected(int index) | |||
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; |
@@ -1412,3 +1418,3 @@ void OpieFtp::deleteServer() | |||
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)); |
@@ -1536,3 +1542,3 @@ void OpieFtp::serverListClicked( const QString &item) { | |||
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); |
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 | |||
@@ -49,2 +49,3 @@ class OpieFtp : public QMainWindow | |||
49 | public: | 49 | public: |
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 ); |
@@ -52,3 +53,2 @@ public: | |||
52 | 53 | ||
53 | static QString appName() { return QString::fromLatin1("opieftp"); } | ||
54 | QTabWidget *TabWidget; | 54 | QTabWidget *TabWidget; |
@@ -67,7 +67,9 @@ public: | |||
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; |
72 | protected slots: | 73 | protected slots: |
74 | void initializeGui(); | ||
73 | void timerOut(); | 75 | void timerOut(); |
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,2 +1,3 @@ | |||
1 | CONFIG += qt quick-app | 1 | TEMPLATE = app |
2 | CONFIG += qte quick-app warn_on | ||
2 | HEADERS = opieftp.h inputDialog.h | 3 | HEADERS = opieftp.h inputDialog.h |