-rw-r--r-- | noncore/net/opieftp/opieftp.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp index 907a812..efcaf84 100644 --- a/noncore/net/opieftp/opieftp.cpp +++ b/noncore/net/opieftp/opieftp.cpp | |||
@@ -132,18 +132,20 @@ OpieFtp::OpieFtp( ) | |||
132 | Local_View->setColumnAlignment(2,QListView::AlignRight); | 132 | Local_View->setColumnAlignment(2,QListView::AlignRight); |
133 | Local_View->setAllColumnsShowFocus(TRUE); | 133 | Local_View->setAllColumnsShowFocus(TRUE); |
134 | Local_View->setMultiSelection( TRUE ); | 134 | Local_View->setMultiSelection( TRUE ); |
135 | 135 | ||
136 | QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold); | 136 | QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold); |
137 | 137 | ||
138 | tabLayout->addWidget( Local_View, 0, 0 ); | 138 | tabLayout->addWidget( Local_View, 0, 0 ); |
139 | 139 | ||
140 | connect( Local_View, SIGNAL( doubleClicked( QListViewItem*)), | 140 | connect( Local_View, SIGNAL( clicked( QListViewItem*)), |
141 | this,SLOT( localListClicked(QListViewItem *)) ); | 141 | this,SLOT( localListClicked(QListViewItem *)) ); |
142 | // connect( Local_View, SIGNAL( doubleClicked( QListViewItem*)), | ||
143 | // this,SLOT( localListClicked(QListViewItem *)) ); | ||
142 | connect( Local_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), | 144 | connect( Local_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), |
143 | this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) ); | 145 | this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) ); |
144 | 146 | ||
145 | TabWidget->insertTab( tab, tr( "Local" ) ); | 147 | TabWidget->insertTab( tab, tr( "Local" ) ); |
146 | 148 | ||
147 | tab_2 = new QWidget( TabWidget, "tab_2" ); | 149 | tab_2 = new QWidget( TabWidget, "tab_2" ); |
148 | tabLayout_2 = new QGridLayout( tab_2 ); | 150 | tabLayout_2 = new QGridLayout( tab_2 ); |
149 | tabLayout_2->setSpacing( 2); | 151 | tabLayout_2->setSpacing( 2); |
@@ -157,17 +159,17 @@ OpieFtp::OpieFtp( ) | |||
157 | Remote_View->setColumnAlignment(2,QListView::AlignRight); | 159 | Remote_View->setColumnAlignment(2,QListView::AlignRight); |
158 | Remote_View->addColumn( tr("Dir"),-1); | 160 | Remote_View->addColumn( tr("Dir"),-1); |
159 | Remote_View->setColumnAlignment(4,QListView::AlignRight); | 161 | Remote_View->setColumnAlignment(4,QListView::AlignRight); |
160 | Remote_View->setAllColumnsShowFocus(TRUE); | 162 | Remote_View->setAllColumnsShowFocus(TRUE); |
161 | Remote_View->setMultiSelection( TRUE ); | 163 | Remote_View->setMultiSelection( TRUE ); |
162 | 164 | ||
163 | QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold); | 165 | QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold); |
164 | 166 | ||
165 | connect( Remote_View, SIGNAL( doubleClicked( QListViewItem*)), | 167 | connect( Remote_View, SIGNAL( clicked( QListViewItem*)), |
166 | this,SLOT( remoteListClicked(QListViewItem *)) ); | 168 | this,SLOT( remoteListClicked(QListViewItem *)) ); |
167 | connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), | 169 | connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), |
168 | this,SLOT( RemoteListPressed(int, QListViewItem *, const QPoint&, int)) ); | 170 | this,SLOT( RemoteListPressed(int, QListViewItem *, const QPoint&, int)) ); |
169 | 171 | ||
170 | tabLayout_2->addWidget( Remote_View, 0, 0 ); | 172 | tabLayout_2->addWidget( Remote_View, 0, 0 ); |
171 | 173 | ||
172 | TabWidget->insertTab( tab_2, tr( "Remote" ) ); | 174 | TabWidget->insertTab( tab_2, tr( "Remote" ) ); |
173 | 175 | ||
@@ -435,17 +437,17 @@ void OpieFtp::localUpload() | |||
435 | msg.replace(QRegExp(":"),"\n"); | 437 | msg.replace(QRegExp(":"),"\n"); |
436 | QMessageBox::message(tr("Note"),msg); | 438 | QMessageBox::message(tr("Note"),msg); |
437 | } | 439 | } |
438 | } else { | 440 | } else { |
439 | QMessageBox::message(tr("Note"),tr("Cannot upload directories")); | 441 | QMessageBox::message(tr("Note"),tr("Cannot upload directories")); |
440 | } | 442 | } |
441 | ProgressBar->reset(); | 443 | ProgressBar->reset(); |
442 | nullifyCallBack(); | 444 | nullifyCallBack(); |
443 | it.current()->setSelected(FALSE); | 445 | it.current()->setSelected(FALSE); |
444 | } //end currentSelected | 446 | } //end currentSelected |
445 | } | 447 | } |
446 | TabWidget->setCurrentPage(1); | 448 | TabWidget->setCurrentPage(1); |
447 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate | 449 | remoteDirList( (const QString &)currentRemoteDir); //this also calls populate |
448 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 450 | QCopEnvelope ( "QPE/System", "notBusy()" ); |
449 | } | 451 | } |
450 | 452 | ||
451 | void OpieFtp::nullifyCallBack() | 453 | void OpieFtp::nullifyCallBack() |
@@ -489,17 +491,17 @@ void OpieFtp::remoteDownload() | |||
489 | if(!FtpGet( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) { | 491 | if(!FtpGet( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) { |
490 | QString msg; | 492 | QString msg; |
491 | msg.sprintf(tr("Unable to download \n")+"%s",FtpLastResponse(conn)); | 493 | msg.sprintf(tr("Unable to download \n")+"%s",FtpLastResponse(conn)); |
492 | msg.replace(QRegExp(":"),"\n"); | 494 | msg.replace(QRegExp(":"),"\n"); |
493 | QMessageBox::message(tr("Note"),msg); | 495 | QMessageBox::message(tr("Note"),msg); |
494 | } | 496 | } |
495 | ProgressBar->reset(); | 497 | ProgressBar->reset(); |
496 | nullifyCallBack(); | 498 | nullifyCallBack(); |
497 | it.current()->setSelected(FALSE); | 499 | it.current()->setSelected(FALSE); |
498 | } | 500 | } |
499 | } | 501 | } |
500 | TabWidget->setCurrentPage(0); | 502 | TabWidget->setCurrentPage(0); |
501 | populateLocalView(); | 503 | populateLocalView(); |
502 | QCopEnvelope ( "QPE/System", "notBusy()" ); | 504 | QCopEnvelope ( "QPE/System", "notBusy()" ); |
503 | } | 505 | } |
504 | 506 | ||
505 | bool OpieFtp::remoteDirList(const QString &dir) | 507 | bool OpieFtp::remoteDirList(const QString &dir) |
@@ -744,17 +746,17 @@ void OpieFtp::localListClicked(QListViewItem *selectedItem) | |||
744 | } | 746 | } |
745 | if(QDir(strItem).exists()){ | 747 | if(QDir(strItem).exists()){ |
746 | currentDir.cd(strItem, TRUE); | 748 | currentDir.cd(strItem, TRUE); |
747 | populateLocalView(); | 749 | populateLocalView(); |
748 | } | 750 | } |
749 | } else { | 751 | } else { |
750 | strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem); | 752 | strItem=QDir::cleanDirPath(currentDir.canonicalPath()+"/"+strItem); |
751 | if( QFile::exists(strItem ) ) { | 753 | if( QFile::exists(strItem ) ) { |
752 | qDebug("upload "+strItem); | 754 | // qDebug("upload "+strItem); |
753 | } | 755 | } |
754 | } //end not symlink | 756 | } //end not symlink |
755 | chdir(strItem.latin1()); | 757 | chdir(strItem.latin1()); |
756 | } | 758 | } |
757 | } | 759 | } |
758 | } | 760 | } |
759 | 761 | ||
760 | void OpieFtp::doLocalCd() | 762 | void OpieFtp::doLocalCd() |