author | llornkcor <llornkcor> | 2005-01-03 03:09:51 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2005-01-03 03:09:51 (UTC) |
commit | 0b3bbec6703c021a188c865e822f536bfa3045fc (patch) (side-by-side diff) | |
tree | 3458531d039a111ba39ef2e0bed2e5bbbfedad46 /noncore/net | |
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 | 62 | ||||
-rw-r--r-- | noncore/net/opieftp/opieftp.h | 6 | ||||
-rw-r--r-- | noncore/net/opieftp/opieftp.pro | 3 |
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 @@ -10,9 +10,11 @@ * 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 @@ -19,14 +19,15 @@ extern "C" { #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> @@ -48,9 +49,9 @@ using namespace Opie::Core; #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; @@ -61,13 +62,18 @@ static int log_progress(netbuf *, int xfered, void *) 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 ); @@ -93,11 +99,9 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) 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); @@ -315,29 +319,31 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) // 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() { @@ -534,9 +540,9 @@ void OpieFtp::localUpload() 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)); @@ -595,9 +601,9 @@ void OpieFtp::remoteDownload() 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)); @@ -774,10 +780,10 @@ bool OpieFtp::populateRemoteView( ) 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; } @@ -1233,9 +1239,9 @@ void OpieFtp::readConfig() } void OpieFtp::writeConfig() { - odebug << "write config" << oendl; +// odebug << "write config" << oendl; Config cfg("opieftp"); cfg.setGroup("Server"); QString username, remoteServerStr, remotePathStr, password, port, temp; @@ -1264,9 +1270,9 @@ void OpieFtp::writeConfig() 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); @@ -1283,9 +1289,9 @@ void OpieFtp::writeConfig() } } void OpieFtp::clearCombos() { - odebug << "clearing" << oendl; +// odebug << "clearing" << oendl; ServerComboBox->clear(); UsernameComboBox->clear(); PasswordEdit->clear(); serverListView->clear(); @@ -1303,20 +1309,20 @@ void OpieFtp::fillCombos() 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); @@ -1333,9 +1339,9 @@ 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); @@ -1348,9 +1354,9 @@ void OpieFtp::serverComboSelected(int index) 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); @@ -1364,9 +1370,9 @@ void OpieFtp::serverComboSelected(int index) 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 @@ -1409,9 +1415,9 @@ void OpieFtp::deleteServer() // 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 )); @@ -1533,9 +1539,9 @@ 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) 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 @@ -46,12 +46,12 @@ 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; @@ -64,13 +64,15 @@ public: 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(); 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,5 +1,6 @@ -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 |