summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-03-31 02:00:57 (UTC)
committer llornkcor <llornkcor>2002-03-31 02:00:57 (UTC)
commit13da5064c21e124f2202310ac4c54cb3ddc8c0b1 (patch) (unidiff)
treed95a8c039a1240aace32be1751382ea43b8c77cc
parent04158decf6fa76d966be178d07e1895336a47bd9 (diff)
downloadopie-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)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opieftp/opieftp.cpp33
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
@@ -134,5 +134,6 @@ OpieFtp::OpieFtp( )
134 Local_View->setMultiSelection( TRUE ); 134 Local_View->setMultiSelection( TRUE );
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
138 tabLayout->addWidget( Local_View, 0, 0 ); 139 tabLayout->addWidget( Local_View, 0, 0 );
@@ -319,5 +320,4 @@ void OpieFtp::newConnection()
319 PortSpinBox->setValue( 21); 320 PortSpinBox->setValue( 21);
320 TabWidget->setCurrentPage(2); 321 TabWidget->setCurrentPage(2);
321 currentServerConfig = -1;
322} 322}
323 323
@@ -433,6 +433,6 @@ void OpieFtp::localUpload()
433 ProgressBar->reset(); 433 ProgressBar->reset();
434 nullifyCallBack(); 434 nullifyCallBack();
435 it.current()->setSelected(FALSE);
436 } //end currentSelected 435 } //end currentSelected
436 it.current()->setSelected(FALSE);
437 } 437 }
438 TabWidget->setCurrentPage(1); 438 TabWidget->setCurrentPage(1);
@@ -487,6 +487,6 @@ void OpieFtp::remoteDownload()
487 ProgressBar->reset(); 487 ProgressBar->reset();
488 nullifyCallBack(); 488 nullifyCallBack();
489 it.current()->setSelected(FALSE);
490 } 489 }
490 it.current()->setSelected(FALSE);
491 } 491 }
492 TabWidget->setCurrentPage(0); 492 TabWidget->setCurrentPage(0);
@@ -658,5 +658,5 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
658{ 658{
659 if( selectedItem) { 659 if( selectedItem) {
660 QCopEnvelope ( "QPE/System", "busy()" ); 660// QCopEnvelope ( "QPE/System", "busy()" );
661 QString oldRemoteCurrentDir = currentRemoteDir; 661 QString oldRemoteCurrentDir = currentRemoteDir;
662 QString strItem=selectedItem->text(0); 662 QString strItem=selectedItem->text(0);
@@ -687,12 +687,11 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
687 currentRemoteDir = oldRemoteCurrentDir; 687 currentRemoteDir = oldRemoteCurrentDir;
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)) {
694 currentRemoteDir = oldRemoteCurrentDir; 693 currentRemoteDir = oldRemoteCurrentDir;
695 strItem=""; 694 strItem="";
696 qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir); 695// qDebug("RemoteCurrentDir1 "+oldRemoteCurrentDir);
697 696
698 } else { 697 } else {
@@ -700,5 +699,6 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
700 } 699 }
701 } else { 700 } else {
702 qDebug("download "+strItem); 701 QCopEnvelope ( "QPE/System", "notBusy()" );
702 return;
703 } 703 }
704 } 704 }
@@ -706,7 +706,7 @@ void OpieFtp::remoteListClicked(QListViewItem *selectedItem)
706 if(currentRemoteDir.right(1) !="/") 706 if(currentRemoteDir.right(1) !="/")
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 }
712} 712}
@@ -728,4 +728,5 @@ void OpieFtp::localListClicked(QListViewItem *selectedItem)
728 } else { // not a symlink 728 } else { // not a symlink
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() ) {
731 strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem); 732 strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem);
@@ -744,4 +745,5 @@ void OpieFtp::localListClicked(QListViewItem *selectedItem)
744 if( QFile::exists(strItem ) ) { 745 if( QFile::exists(strItem ) ) {
745 // qDebug("upload "+strItem); 746 // qDebug("upload "+strItem);
747 return;
746 } 748 }
747 } //end not symlink 749 } //end not symlink
@@ -1069,5 +1071,4 @@ void OpieFtp::readConfig()
1069void OpieFtp::writeConfig() 1071void OpieFtp::writeConfig()
1070{ 1072{
1071
1072 Config cfg("opieftp"); 1073 Config cfg("opieftp");
1073 cfg.setGroup("Server"); 1074 cfg.setGroup("Server");
@@ -1075,4 +1076,9 @@ void OpieFtp::writeConfig()
1075 int numberOfEntries = cfg.readNumEntry("numberOfEntries",0); 1076 int numberOfEntries = cfg.readNumEntry("numberOfEntries",0);
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
1078 temp.setNum( numberOfEntries + 1); 1084 temp.setNum( numberOfEntries + 1);
@@ -1091,5 +1097,4 @@ void OpieFtp::writeConfig()
1091 cfg.setGroup("Server"); 1097 cfg.setGroup("Server");
1092 cfg.writeEntry("numberOfEntries", QString::number(numberOfEntries + 1 )); 1098 cfg.writeEntry("numberOfEntries", QString::number(numberOfEntries + 1 ));
1093
1094 } 1099 }
1095} 1100}