mess with things so this runs from launcher. not sure what was going on, but this seems to fix #1507

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
@@ -13,6 +13,8 @@
  ***************************************************************************/
-#include <opie2/oapplicationfactory.h>
 #include "opieftp.h"
-
+#include <opie2/oapplicationfactory.h>
+//#include <qtopia/qpeapplication.h>
 using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<OpieFtp> )
+
+		
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" {
 /* OPIE */
-#include <opie2/odebug.h>
+//#include <opie2/odebug.h>
+//using namespace Opie::Core;
+
 #include <qpe/qpeapplication.h>
@@ -27,3 +29,2 @@ extern "C" {
 #include <qpe/mimetype.h>
-using namespace Opie::Core;
 
@@ -51,3 +52,3 @@ using namespace Opie::Core;
 QProgressBar *ProgressBar;
-static netbuf *conn=NULL;
+static netbuf *conn = NULL;
 
@@ -64,7 +65,12 @@ static int log_progress(netbuf *, int xfered, void *)
 
-OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl)
-        : QMainWindow( parent,  name, fl )
+OpieFtp::OpieFtp( QWidget* , const char*, WFlags)
+        : QMainWindow( )
 {
-    odebug << "OpieFtp constructor" << oendl; 
+    qDebug("OpieFtp constructor");
     setCaption( tr( "OpieFtp" ) );
+//		initializeGui();
+	 QTimer::singleShot( 50, this, SLOT(initializeGui() ));
+}
+
+void OpieFtp::initializeGui() {
     fuckeduphack=FALSE;
@@ -96,5 +102,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl)
 
-//#if 0
     layout->addMultiCellWidget( menuBar, 0, 0, 0, 2 );
-//#endif
 
@@ -318,3 +322,4 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl)
     layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 4);
-   currentPathCombo ->setFixedWidth(220);
+
+		currentPathCombo ->setFixedWidth(220);
     currentPathCombo->setEditable(TRUE);
@@ -327,5 +332,5 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl)
              this,SLOT(currentPathComboChanged()));
-    ProgressBar = new QProgressBar( view, "ProgressBar" );
-    layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 4);
-    ProgressBar->setMaximumHeight(10);
+     ProgressBar = new QProgressBar( view, "ProgressBar" );
+     layout->addMultiCellWidget( ProgressBar, 4, 4, 0, 4);
+     ProgressBar->setMaximumHeight(10);
     filterStr="*";
@@ -338,3 +343,4 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl)
     TabWidget->setCurrentPage(2);
-	odebug << "Constructor done" << oendl; 
+		qDebug("XXXXXXXXXXXX Constructor done");
+
 }
@@ -537,3 +543,3 @@ void OpieFtp::localUpload()
                 FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn);
-                odebug << "Put: " << localFile.latin1() << ", " << remoteFile.latin1() << "" << oendl; 
+//                odebug << "Put: " << localFile.latin1() << ", " << remoteFile.latin1() << "" << oendl; 
 
@@ -598,3 +604,3 @@ void OpieFtp::remoteDownload()
             FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn);
-            odebug << "Get: " << localFile.latin1() << ", " << remoteFile.latin1() << "" << oendl; 
+//            odebug << "Get: " << localFile.latin1() << ", " << remoteFile.latin1() << "" << oendl; 
 
@@ -777,4 +783,4 @@ bool OpieFtp::populateRemoteView( )
             file. remove();
-    } else
-        odebug << "temp file not opened successfully "+sfile << oendl; 
+    } 
+//        odebug << "temp file not opened successfully "+sfile << oendl; 
     Remote_View->setSorting( 4,TRUE);
@@ -1236,3 +1242,3 @@ void OpieFtp::writeConfig()
 {
-    odebug << "write config" << oendl; 
+//    odebug << "write config" << oendl; 
     Config cfg("opieftp");
@@ -1267,3 +1273,3 @@ void OpieFtp::writeConfig()
         currentServerConfig = numberOfEntries+1;
-        odebug << "setting currentserverconfig to " << currentServerConfig << "" << oendl; 
+//        odebug << "setting currentserverconfig to " << currentServerConfig << "" << oendl; 
 
@@ -1286,3 +1292,3 @@ void OpieFtp::writeConfig()
 void OpieFtp::clearCombos() {
-    odebug << "clearing" << oendl; 
+//    odebug << "clearing" << oendl; 
     ServerComboBox->clear();
@@ -1306,6 +1312,6 @@ void OpieFtp::fillCombos()
         temp.setNum(i);
-        odebug << temp << oendl; 
+//        odebug << temp << oendl; 
         cfg.setGroup("Server");
         remoteServerStr = cfg.readEntry( temp,"");
-        odebug << remoteServerStr << oendl; 
+//        odebug << remoteServerStr << oendl; 
 
@@ -1317,3 +1323,3 @@ void OpieFtp::fillCombos()
         remoteServerStr = remoteServerStr.left(remoteServerStr.length()-divider);
-        odebug << "remote server string "+remoteServerStr << oendl; 
+//        odebug << "remote server string "+remoteServerStr << oendl; 
         ServerComboBox->insertItem( remoteServerStr );
@@ -1336,3 +1342,3 @@ void OpieFtp::serverComboSelected(int index)
     currentServerConfig = index+1;
-    odebug << "server combo selected " << index + 1 << "" << oendl; 
+//    odebug << "server combo selected " << index + 1 << "" << oendl; 
     QString username, remoteServerStr, remotePathStr, password, port, temp;
@@ -1351,3 +1357,3 @@ void OpieFtp::serverComboSelected(int index)
 
-    odebug << "Group " +temp << oendl; 
+//    odebug << "Group " +temp << oendl; 
     cfg.setGroup(temp);
@@ -1367,3 +1373,3 @@ void OpieFtp::serverComboSelected(int index)
     UsernameComboBox->lineEdit()->setText(username);
-    odebug << username << oendl; 
+//    odebug << username << oendl; 
 //    odebug << "Password is "+cfg.readEntryCrypt(username << oendl; 
@@ -1412,3 +1418,3 @@ void OpieFtp::deleteServer()
 
-            odebug << "OK DELETE "+tempname << oendl; 
+//            odebug << "OK DELETE "+tempname << oendl; 
             cfg.removeEntry(QString::number(i));
@@ -1536,3 +1542,3 @@ void OpieFtp::serverListClicked( const QString &item) {
     Config cfg("opieftp");
-    odebug << "highltined "+item << oendl; 
+//    odebug << "highltined "+item << oendl; 
     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
 public:
+    static QString appName() { return QString::fromLatin1("opieftp"); }
     OpieFtp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
@@ -52,3 +53,2 @@ public:
 
-    static QString appName() { return QString::fromLatin1("opieftp"); }
     QTabWidget *TabWidget;
@@ -67,7 +67,9 @@ public:
     QListViewItem * item;
-    QPushButton *connectServerBtn, *newServerButton;//
+    QPushButton *connectServerBtn, *newServerButton;
     QToolButton  *cdUpButton, *homeButton, *docButton;
     bool b;
+		
     int currentServerConfig;
 protected slots:
+		void initializeGui();
     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 @@
-CONFIG      += qt quick-app
+TEMPLATE  = app
+CONFIG      += qte  quick-app warn_on 
 HEADERS     = opieftp.h inputDialog.h