Diffstat (limited to 'noncore/net/opieftp/opieftp.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/net/opieftp/opieftp.cpp | 52 |
1 files changed, 29 insertions, 23 deletions
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; @@ -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,2 +322,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) layout->addMultiCellWidget( currentPathCombo, 3, 3, 0, 4); + currentPathCombo ->setFixedWidth(220); @@ -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); |