-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; | |||
44 | #include <qvbox.h> | 44 | #include <qvbox.h> |
45 | |||
46 | /* STD */ | 45 | /* STD */ |
@@ -304,6 +303,4 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
304 | 303 | ||
305 | #if 0 | ||
306 | connect(TabWidget,SIGNAL(currentChanged(QWidget*)), | 304 | connect(TabWidget,SIGNAL(currentChanged(QWidget*)), |
307 | this,SLOT(tabChanged(QWidget*))); | 305 | this,SLOT(tabChanged(QWidget*))); |
308 | #endif | ||
309 | 306 | ||
@@ -319,3 +316,2 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
319 | 316 | ||
320 | #if 0 | ||
321 | connect( currentPathCombo, SIGNAL( activated(const QString&) ), | 317 | connect( currentPathCombo, SIGNAL( activated(const QString&) ), |
@@ -325,3 +321,2 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
325 | this,SLOT(currentPathComboChanged())); | 321 | this,SLOT(currentPathComboChanged())); |
326 | #endif | ||
327 | ProgressBar = new QProgressBar( view, "ProgressBar" ); | 322 | ProgressBar = new QProgressBar( view, "ProgressBar" ); |
@@ -331,5 +326,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl) | |||
331 | b=FALSE; | 326 | b=FALSE; |
332 | #if 0 | ||
333 | populateLocalView(); | 327 | populateLocalView(); |
334 | #endif | ||
335 | readConfig(); | 328 | readConfig(); |
@@ -669,3 +662,3 @@ void OpieFtp::populateLocalView() | |||
669 | QString symLink=fi->readLink(); | 662 | QString symLink=fi->readLink(); |
670 | odebug << "Symlink detected "+symLink << oendl; | 663 | // odebug << "Symlink detected "+symLink << oendl; |
671 | QFileInfo sym( symLink); | 664 | QFileInfo sym( symLink); |
@@ -675,3 +668,3 @@ void OpieFtp::populateLocalView() | |||
675 | } else { | 668 | } else { |
676 | odebug << "Not a dir: "+currentDir.canonicalPath()+fileL << oendl; | 669 | // odebug << "Not a dir: "+currentDir.canonicalPath()+fileL << oendl; |
677 | fileS.sprintf( "%10i", fi->size() ); | 670 | fileS.sprintf( "%10i", fi->size() ); |
@@ -682,5 +675,7 @@ void OpieFtp::populateLocalView() | |||
682 | isDir=TRUE; | 675 | isDir=TRUE; |
683 | odebug << fileL << oendl; | 676 | // odebug << fileL << oendl; |
684 | } | 677 | } |
685 | } | 678 | } |
679 | |||
680 | |||
686 | if(fileL !="./" && fi->exists()) { | 681 | if(fileL !="./" && fi->exists()) { |
@@ -720,3 +715,3 @@ void OpieFtp::populateLocalView() | |||
720 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath() ); | 715 | currentPathCombo->lineEdit()->setText( currentDir.canonicalPath() ); |
721 | fillCombo( (const QString &)currentDir); | 716 | // fillCombo( (const QString &)currentDir); |
722 | } | 717 | } |
@@ -1147,5 +1142,7 @@ void OpieFtp::currentPathComboActivated(const QString & currentPath) { | |||
1147 | void OpieFtp::fillCombo(const QString ¤tPath) { | 1142 | void OpieFtp::fillCombo(const QString ¤tPath) { |
1148 | 1143 | qDebug("Fill Combo "+currentPath); | |
1149 | currentPathCombo->lineEdit()->setText(currentPath); | 1144 | currentPathCombo->lineEdit()->setText(currentPath); |
1145 | |||
1150 | if( localDirPathStringList.grep(currentPath,TRUE).isEmpty() ) { | 1146 | if( localDirPathStringList.grep(currentPath,TRUE).isEmpty() ) { |
1147 | qDebug("Clearing local"); | ||
1151 | currentPathCombo->clear(); | 1148 | currentPathCombo->clear(); |
@@ -1154,4 +1151,7 @@ void OpieFtp::fillCombo(const QString ¤tPath) { | |||
1154 | } | 1151 | } |
1152 | |||
1155 | currentPathCombo->lineEdit()->setText(currentPath); | 1153 | currentPathCombo->lineEdit()->setText(currentPath); |
1156 | if( remoteDirPathStringList.grep(currentPath,TRUE).isEmpty() ) { | 1154 | |
1155 | if( remoteDirPathStringList.grep(currentPath,TRUE).isEmpty() ) { | ||
1156 | qDebug("Clearing remote"); | ||
1157 | currentPathCombo->clear(); | 1157 | currentPathCombo->clear(); |
@@ -1289,2 +1289,3 @@ void OpieFtp::fillCombos() | |||
1289 | clearCombos(); | 1289 | clearCombos(); |
1290 | qDebug("did we get here yet?"); | ||
1290 | 1291 | ||