author | llornkcor <llornkcor> | 2002-03-31 02:00:57 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-03-31 02:00:57 (UTC) |
commit | 13da5064c21e124f2202310ac4c54cb3ddc8c0b1 (patch) (unidiff) | |
tree | d95a8c039a1240aace32be1751382ea43b8c77cc /noncore | |
parent | 04158decf6fa76d966be178d07e1895336a47bd9 (diff) | |
download | opie-13da5064c21e124f2202310ac4c54cb3ddc8c0b1.zip opie-13da5064c21e124f2202310ac4c54cb3ddc8c0b1.tar.gz opie-13da5064c21e124f2202310ac4c54cb3ddc8c0b1.tar.bz2 |
fixed some goofy crap I thought I fixed earlier with server combo and multiple entries. oh well. Also fixed single click going into a repopulate(bad when remote)
-rw-r--r-- | noncore/net/opieftp/opieftp.cpp | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp index 3dda17e..e64fd73 100644 --- a/noncore/net/opieftp/opieftp.cpp +++ b/noncore/net/opieftp/opieftp.cpp | |||
@@ -135,3 +135,4 @@ OpieFtp::OpieFtp( ) | |||
135 | Local_View->setSelectionMode(QListView::Extended); | 135 | Local_View->setSelectionMode(QListView::Extended); |
136 | QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold); | 136 | |
137 | QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold); | ||
137 | 138 | ||
@@ -320,3 +321,2 @@ void OpieFtp::newConnection() | |||
320 | TabWidget->setCurrentPage(2); | 321 | TabWidget->setCurrentPage(2); |
321 | currentServerConfig = -1; | ||
322 | } | 322 | } |
@@ -434,4 +434,4 @@ void OpieFtp::localUpload() | |||
434 | nullifyCallBack(); | 434 | nullifyCallBack(); |
435 | it.current()->setSelected(FALSE); | ||
436 | } //end currentSelected | 435 | } //end currentSelected |
436 | it.current()->setSelected(FALSE); | ||
437 | } | 437 | } |
@@ -488,4 +488,4 @@ void OpieFtp::remoteDownload() | |||
488 | nullifyCallBack(); | 488 | nullifyCallBack(); |
489 | it.current()->setSelected(FALSE); | ||
490 | } | 489 | } |
490 | it.current()->setSelected(FALSE); | ||
491 | } | 491 | } |
@@ -659,3 +659,3 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem) | |||
659 | if( selectedItem) { | 659 | if( selectedItem) { |
660 | QCopEnvelope ( "QPE/System", "busy()" ); | 660 | // QCopEnvelope ( "QPE/System", "busy()" ); |
661 | QString oldRemoteCurrentDir = currentRemoteDir; | 661 | QString oldRemoteCurrentDir = currentRemoteDir; |
@@ -688,6 +688,5 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem) | |||
688 | strItem=""; | 688 | strItem=""; |
689 | qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir); | 689 | // qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir); |
690 | } | 690 | } |
691 | } else if(strItem.find("/",0,TRUE) != -1) { // this is a directory | 691 | } else if(strItem.find("/",0,TRUE) != -1) { // this is a directory |
692 | qDebug("trying directory"); | ||
693 | if( !remoteChDir( (const QString &)currentRemoteDir + strItem)) { | 692 | if( !remoteChDir( (const QString &)currentRemoteDir + strItem)) { |
@@ -695,3 +694,3 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem) | |||
695 | strItem=""; | 694 | strItem=""; |
696 | qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir); | 695 | // qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir); |
697 | 696 | ||
@@ -701,3 +700,4 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem) | |||
701 | } else { | 700 | } else { |
702 | qDebug("download "+strItem); | 701 | QCopEnvelope ( "QPE/System", "notBusy()" ); |
702 | return; | ||
703 | } | 703 | } |
@@ -707,5 +707,5 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem) | |||
707 | currentRemoteDir +="/"; | 707 | currentRemoteDir +="/"; |
708 | currentPathCombo->lineEdit()->setText( currentRemoteDir ); | 708 | currentPathCombo->lineEdit()->setText( currentRemoteDir); |
709 | fillRemoteCombo( (const QString &)currentDir); | 709 | fillRemoteCombo( (const QString &)currentRemoteDir); |
710 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 710 | // QCopEnvelope ( "QPE/System", "notBusy()" ); |
711 | } | 711 | } |
@@ -729,2 +729,3 @@ void OpieFtp::localListClicked(QListViewItem *selectedItem) | |||
729 | if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) { | 729 | if(strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) { |
730 | |||
730 | if(QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem)).exists() ) { | 731 | if(QDir(QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem)).exists() ) { |
@@ -745,2 +746,3 @@ void OpieFtp::localListClicked(QListViewItem *selectedItem) | |||
745 | // qDebug("upload "+strItem); | 746 | // qDebug("upload "+strItem); |
747 | return; | ||
746 | } | 748 | } |
@@ -1070,3 +1072,2 @@ void OpieFtp::writeConfig() | |||
1070 | { | 1072 | { |
1071 | |||
1072 | Config cfg("opieftp"); | 1073 | Config cfg("opieftp"); |
@@ -1076,2 +1077,7 @@ void OpieFtp::writeConfig() | |||
1076 | if( currentServerConfig == -1) { | 1077 | if( currentServerConfig == -1) { |
1078 | for (int i = 1; i <= numberOfEntries; i++) { | ||
1079 | temp.setNum(i); | ||
1080 | cfg.setGroup("Server"); | ||
1081 | QString tempStr = cfg.readEntry( temp,""); | ||
1082 | } | ||
1077 | 1083 | ||
@@ -1092,3 +1098,2 @@ void OpieFtp::writeConfig() | |||
1092 | cfg.writeEntry("numberOfEntries", QString::number(numberOfEntries + 1 )); | 1098 | cfg.writeEntry("numberOfEntries", QString::number(numberOfEntries + 1 )); |
1093 | |||
1094 | } | 1099 | } |