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
@@ -8,11 +8,13 @@
     email                : ljp@llornkcor.com
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  ***************************************************************************/
-#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
@@ -17,18 +17,19 @@ extern "C" {
 #include <ftplib.h>
 }
 
 #include "inputDialog.h"
 
 /* OPIE */
-#include <opie2/odebug.h>
+//#include <opie2/odebug.h>
+//using namespace Opie::Core;
+
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/mimetype.h>
-using namespace Opie::Core;
 
 #include <qtextstream.h>
 #include <qpushbutton.h>
 #include <qtoolbutton.h>
 #include <qcombobox.h>
 #include <qlistview.h>
@@ -46,30 +47,35 @@ using namespace Opie::Core;
 #include <qvbox.h>
 /* STD */
 #include <unistd.h>
 #include <stdlib.h>
 
 QProgressBar *ProgressBar;
-static netbuf *conn=NULL;
+static netbuf *conn = NULL;
 
 static int log_progress(netbuf *, int xfered, void *)
 {
 //    int fsz = *(int *)arg;
 //    int pct = (xfered * 100) / fsz;
 //      printf("%3d%%\r", pct);
 //      fflush(stdout);
     ProgressBar->setProgress(xfered);
     qApp->processEvents();
     return 1;
 }
 
-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;
 
     QVBox* wrapperBox = new QVBox( this );
     setCentralWidget( wrapperBox );
 
     QWidget *view = new QWidget( wrapperBox );
@@ -91,15 +97,13 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl)
 
     connectionMenu  = new QPopupMenu( this );
     localMenu  = new QPopupMenu( this );
     remoteMenu  = new QPopupMenu( this );
     tabMenu = new QPopupMenu( this );
 
-//#if 0
     layout->addMultiCellWidget( menuBar, 0, 0, 0, 2 );
-//#endif
 
     menuBar->insertItem( tr( "Connection" ), connectionMenu);
 //      menuBar->insertItem( tr( "Local" ), localMenu);
 //      menuBar->insertItem( tr( "Remote" ), remoteMenu);
     menuBar->insertItem( tr( "View" ), tabMenu);
 
@@ -313,33 +317,35 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl)
     currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
     currentDir.setPath( QDir::currentDirPath());
 //      currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
 
     currentPathCombo = new QComboBox( FALSE, view, "currentPathCombo" );
     layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 4);
-   currentPathCombo ->setFixedWidth(220);
+
+		currentPathCombo ->setFixedWidth(220);
     currentPathCombo->setEditable(TRUE);
     currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
 
     connect( currentPathCombo, SIGNAL( activated(const QString&) ),
               this, SLOT(  currentPathComboActivated(const QString&) ) );
 
     connect( currentPathCombo->lineEdit(),SIGNAL(returnPressed()),
              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="*";
     b=FALSE;
     populateLocalView();
     readConfig();
 
 //    ServerComboBox->setCurrentItem(currentServerConfig);
 
     TabWidget->setCurrentPage(2);
-	odebug << "Constructor done" << oendl; 
+		qDebug("XXXXXXXXXXXX Constructor done");
+
 }
 
 OpieFtp::~OpieFtp()
 {
 }
 
@@ -532,13 +538,13 @@ void OpieFtp::localUpload()
                 ProgressBar->setTotalSteps(fsz);
 
                 FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn);
                 FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn);
                 FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn);
                 FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn);
-                odebug << "Put: " << localFile.latin1() << ", " << remoteFile.latin1() << "" << oendl; 
+//                odebug << "Put: " << localFile.latin1() << ", " << remoteFile.latin1() << "" << oendl; 
 
                 if( !FtpPut( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) {
                     QString msg;
                     msg.sprintf(tr("Unable to upload\n")+"%s",FtpLastResponse(conn));
                     msg.replace(QRegExp(":"),"\n");
                     QMessageBox::message(tr("Note"),msg);
@@ -593,13 +599,13 @@ void OpieFtp::remoteDownload()
 
             ProgressBar->setTotalSteps(fsz);
             FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn);
             FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn);
             FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn);
             FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn);
-            odebug << "Get: " << localFile.latin1() << ", " << remoteFile.latin1() << "" << oendl; 
+//            odebug << "Get: " << localFile.latin1() << ", " << remoteFile.latin1() << "" << oendl; 
 
             if(!FtpGet( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) {
                 QString msg;
                 msg.sprintf(tr("Unable to download \n")+"%s",FtpLastResponse(conn));
                 msg.replace(QRegExp(":"),"\n");
                 QMessageBox::message(tr("Note"),msg);
@@ -772,14 +778,14 @@ bool OpieFtp::populateRemoteView( )
         }
         QListViewItem * item1 = new QListViewItem( Remote_View, "../");
         item1->setPixmap( 0, Resource::loadPixmap( "folder" ));
         file.close();
         if( file.exists())
             file. remove();
-    } else
-        odebug << "temp file not opened successfully "+sfile << oendl; 
+    } 
+//        odebug << "temp file not opened successfully "+sfile << oendl; 
     Remote_View->setSorting( 4,TRUE);
     return true;
 }
 
 void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
 {
@@ -1231,13 +1237,13 @@ void OpieFtp::readConfig()
     serverComboSelected( currentServerConfig-1);
 
 }
 
 void OpieFtp::writeConfig()
 {
-    odebug << "write config" << oendl; 
+//    odebug << "write config" << oendl; 
     Config cfg("opieftp");
     cfg.setGroup("Server");
 
     QString username, remoteServerStr, remotePathStr, password, port, temp;
 
     int numberOfEntries = cfg.readNumEntry("numberOfEntries",0);
@@ -1262,13 +1268,13 @@ void OpieFtp::writeConfig()
         cfg.setGroup("Server");
 
         cfg.writeEntry( temp, ServerComboBox->currentText() +":"+PortSpinBox->cleanText() );
         cfg.writeEntry("currentServer", numberOfEntries+1);
 
         currentServerConfig = numberOfEntries+1;
-        odebug << "setting currentserverconfig to " << currentServerConfig << "" << oendl; 
+//        odebug << "setting currentserverconfig to " << currentServerConfig << "" << oendl; 
 
         cfg.setGroup(temp);
         if(!newServerName.isEmpty())
             cfg.writeEntry("ServerName", newServerName);
 
         cfg.writeEntry("RemotePath", remotePath->text());
@@ -1281,13 +1287,13 @@ void OpieFtp::writeConfig()
         cfg.writeEntry("numberOfEntries", QString::number(numberOfEntries + 1 ));
 
     }
 }
 
 void OpieFtp::clearCombos() {
-    odebug << "clearing" << oendl; 
+//    odebug << "clearing" << oendl; 
     ServerComboBox->clear();
     UsernameComboBox->clear();
     PasswordEdit->clear();
     serverListView->clear();
 }
 
@@ -1301,24 +1307,24 @@ void OpieFtp::fillCombos()
     cfg.setGroup("Server");
     QString username, remoteServerStr, remotePathStr, password, port, temp;
     int numberOfEntries = cfg.readNumEntry("numberOfEntries",0);
 
     for (int i = 1; i <= numberOfEntries; i++) {
         temp.setNum(i);
-        odebug << temp << oendl; 
+//        odebug << temp << oendl; 
         cfg.setGroup("Server");
         remoteServerStr = cfg.readEntry( temp,"");
-        odebug << remoteServerStr << oendl; 
+//        odebug << remoteServerStr << oendl; 
 
         int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE);
         port = remoteServerStr.right( divider - 1);
         bool ok;
         PortSpinBox->setValue( port.toInt(&ok,10));
 
         remoteServerStr = remoteServerStr.left(remoteServerStr.length()-divider);
-        odebug << "remote server string "+remoteServerStr << oendl; 
+//        odebug << "remote server string "+remoteServerStr << oendl; 
         ServerComboBox->insertItem( remoteServerStr );
 
         cfg.setGroup(temp);
 
         username = cfg.readEntry(temp);
         UsernameComboBox->insertItem(username);
@@ -1331,13 +1337,13 @@ void OpieFtp::fillCombos()
 
 
 void OpieFtp::serverComboSelected(int index)
 {
 		QString servername;
     currentServerConfig = index+1;
-    odebug << "server combo selected " << index + 1 << "" << oendl; 
+//    odebug << "server combo selected " << index + 1 << "" << oendl; 
     QString username, remoteServerStr, remotePathStr, password, port, temp;
     servername = remoteServerStr = ServerComboBox->text(index);
 		qDebug("server text "  + remoteServerStr);
 
     Config cfg("opieftp");
     cfg.setGroup("Server");
@@ -1346,13 +1352,13 @@ void OpieFtp::serverComboSelected(int index)
 			//  for (int i = 1; i <= numberOfEntries; i++) {
 //    int numberOfEntries = cfg.readNumEntry("numberOfEntries",0);
 
     temp.setNum(index + 1);
     remoteServerStr = cfg.readEntry( temp,"");
 
-    odebug << "Group " +temp << oendl; 
+//    odebug << "Group " +temp << oendl; 
     cfg.setGroup(temp);
 
     int divider = remoteServerStr.length() - remoteServerStr.find(":",0,TRUE);
     port = remoteServerStr.right( divider - 1);
     bool ok;
     int portInt = port.toInt(&ok,10);
@@ -1362,13 +1368,13 @@ void OpieFtp::serverComboSelected(int index)
     PortSpinBox->setValue( portInt);
 
     remotePath->setText(cfg.readEntry("RemotePath", "/"));
 
     username = cfg.readEntry("Username", "anonymous");
     UsernameComboBox->lineEdit()->setText(username);
-    odebug << username << oendl; 
+//    odebug << username << oendl; 
 //    odebug << "Password is "+cfg.readEntryCrypt(username << oendl; 
     PasswordEdit->setText(cfg.readEntryCrypt(username, "me@opieftp.org"));
 //   UsernameComboBox
 //        PasswordEdit
 
     cfg.setGroup("Server");
@@ -1407,13 +1413,13 @@ void OpieFtp::deleteServer()
 //             servername.find( cfg.readEntry("ServerName"))  != -1 &&
 //             remoteServerStr.find( cfg.readEntry("RemotePath")) != -1 &&
 //             username.find( cfg.readEntry("Username")) != -1) {
 
             serverListView->removeItem(i);
 
-            odebug << "OK DELETE "+tempname << oendl; 
+//            odebug << "OK DELETE "+tempname << oendl; 
             cfg.removeEntry(QString::number(i));
             for ( ; i <= numberOfEntries; i++) {
                 cfg.setGroup("Server");
                 cfg.writeEntry("Server", QString::number(numberOfEntries + 1 ));
 
                 cfg.setGroup(QString::number(i+1)); //get next server config
@@ -1531,13 +1537,13 @@ void OpieFtp::NewServer() {
     }
 }
 
 void OpieFtp::serverListClicked( const QString &item) {
     if(item.isEmpty()) return;
     Config cfg("opieftp");
-    odebug << "highltined "+item << oendl; 
+//    odebug << "highltined "+item << oendl; 
     int numberOfEntries = cfg.readNumEntry("numberOfEntries",0);
         for (int i = 1; i <= numberOfEntries; i++) {
             cfg.setGroup(QString::number(i));
               if(cfg.readEntry( "ServerName").find(item) != -1 && !fuckeduphack)
                   serverComboSelected(i-1);
     }
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
@@ -44,16 +44,16 @@ class QTimer;
 
 class OpieFtp : public QMainWindow
 {
     Q_OBJECT
 
 public:
+    static QString appName() { return QString::fromLatin1("opieftp"); }
     OpieFtp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~OpieFtp();
 
-    static QString appName() { return QString::fromLatin1("opieftp"); }
     QTabWidget *TabWidget;
     QWidget *tab, *tab_2, *tab_3;
     QListView *Local_View, *Remote_View;
     QListBox *serverListView;
 
     QComboBox *UsernameComboBox, *ServerComboBox, *currentPathCombo;
@@ -62,17 +62,19 @@ public:
     QSpinBox* PortSpinBox;
     QPopupMenu *connectionMenu, *localMenu, *remoteMenu, *tabMenu, *aboutMenu;
     QDir currentDir;
     QString currentRemoteDir;
     QString filterStr;
     QListViewItem * item;
-    QPushButton *connectServerBtn, *newServerButton;//
+    QPushButton *connectServerBtn, *newServerButton;
     QToolButton  *cdUpButton, *homeButton, *docButton;
     bool b;
+		
     int currentServerConfig;
 protected slots:
+		void initializeGui();
     void timerOut();
     void upDir();
     void homeButtonPushed();
     void docButtonPushed();
     void doAbout(); 
 
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,7 +1,8 @@
-CONFIG      += qt quick-app
+TEMPLATE  = app
+CONFIG      += qte  quick-app warn_on 
 HEADERS     = opieftp.h inputDialog.h
 SOURCES     = opieftp.cpp inputDialog.cpp main.cpp
 TARGET      = opieftp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2 -lftplib