| -rw-r--r-- | noncore/net/opieftp/opieftp.cpp | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp index aa4314a..817943b 100644 --- a/noncore/net/opieftp/opieftp.cpp +++ b/noncore/net/opieftp/opieftp.cpp @@ -44,3 +44,2 @@ using namespace Opie::Core; #include <qvbox.h> - /* STD */ @@ -304,6 +303,4 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) -#if 0 connect(TabWidget,SIGNAL(currentChanged(QWidget*)), this,SLOT(tabChanged(QWidget*))); -#endif @@ -319,3 +316,2 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) -#if 0 connect( currentPathCombo, SIGNAL( activated(const QString&) ), @@ -325,3 +321,2 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) this,SLOT(currentPathComboChanged())); -#endif ProgressBar = new QProgressBar( view, "ProgressBar" ); @@ -331,5 +326,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) b=FALSE; -#if 0 populateLocalView(); -#endif readConfig(); @@ -669,3 +662,3 @@ void OpieFtp::populateLocalView() QString symLink=fi->readLink(); - odebug << "Symlink detected "+symLink << oendl; +// odebug << "Symlink detected "+symLink << oendl; QFileInfo sym( symLink); @@ -675,3 +668,3 @@ void OpieFtp::populateLocalView() } else { - odebug << "Not a dir: "+currentDir.canonicalPath()+fileL << oendl; +// odebug << "Not a dir: "+currentDir.canonicalPath()+fileL << oendl; fileS.sprintf( "%10i", fi->size() ); @@ -682,5 +675,7 @@ void OpieFtp::populateLocalView() isDir=TRUE; - odebug << fileL << oendl; +// odebug << fileL << oendl; } } + + if(fileL !="./" && fi->exists()) { @@ -720,3 +715,3 @@ void OpieFtp::populateLocalView() currentPathCombo->lineEdit()->setText( currentDir.canonicalPath() ); - fillCombo( (const QString &)currentDir); + // fillCombo( (const QString &)currentDir); } @@ -1147,5 +1142,7 @@ void OpieFtp::currentPathComboActivated(const QString & currentPath) { void OpieFtp::fillCombo(const QString ¤tPath) { - + qDebug("Fill Combo "+currentPath); currentPathCombo->lineEdit()->setText(currentPath); + if( localDirPathStringList.grep(currentPath,TRUE).isEmpty() ) { + qDebug("Clearing local"); currentPathCombo->clear(); @@ -1154,4 +1151,7 @@ void OpieFtp::fillCombo(const QString ¤tPath) { } + currentPathCombo->lineEdit()->setText(currentPath); - if( remoteDirPathStringList.grep(currentPath,TRUE).isEmpty() ) { + + if( remoteDirPathStringList.grep(currentPath,TRUE).isEmpty() ) { + qDebug("Clearing remote"); currentPathCombo->clear(); @@ -1289,2 +1289,3 @@ void OpieFtp::fillCombos() clearCombos(); + qDebug("did we get here yet?"); |