added multi selection up/down. may have broken something- who knows...

1 files changed, 28 insertions, 13 deletions

diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index fd6b028..907a812 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -125,17 +125,19 @@ OpieFtp::OpieFtp( )
 
     Local_View = new QListView( tab, "Local_View" );
 //    Local_View->setResizePolicy( QListView::AutoOneFit );
-    Local_View->addColumn( tr("File"),120);
+    Local_View->addColumn( tr("File"),150);
     Local_View->addColumn( tr("Size"),-1);
     Local_View->setColumnAlignment(1,QListView::AlignRight);
     Local_View->addColumn( tr("Date"),-1);
     Local_View->setColumnAlignment(2,QListView::AlignRight);
     Local_View->setAllColumnsShowFocus(TRUE);
+    Local_View->setMultiSelection( TRUE );
+
     QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold);
 
     tabLayout->addWidget( Local_View, 0, 0 );
 
-    connect( Local_View, SIGNAL( clicked( QListViewItem*)),
+    connect( Local_View, SIGNAL( doubleClicked( QListViewItem*)),
              this,SLOT( localListClicked(QListViewItem *)) );
     connect( Local_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
              this,SLOT( ListPressed(int, QListViewItem *, const QPoint&, int)) );
@@ -148,7 +150,7 @@ OpieFtp::OpieFtp( )
     tabLayout_2->setMargin( 2);
 
     Remote_View = new QListView( tab_2, "Remote_View" );
-    Remote_View->addColumn( tr("File"),120);
+    Remote_View->addColumn( tr("File"),150);
     Remote_View->addColumn( tr("Size"),-1);
     Remote_View->setColumnAlignment(1,QListView::AlignRight);
     Remote_View->addColumn( tr("Date"),-1);
@@ -156,9 +158,11 @@ OpieFtp::OpieFtp( )
     Remote_View->addColumn( tr("Dir"),-1);
     Remote_View->setColumnAlignment(4,QListView::AlignRight);
     Remote_View->setAllColumnsShowFocus(TRUE);
+    Remote_View->setMultiSelection( TRUE );
+
     QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold);
 
-    connect( Remote_View, SIGNAL( clicked( QListViewItem*)),
+    connect( Remote_View, SIGNAL( doubleClicked( QListViewItem*)),
              this,SLOT( remoteListClicked(QListViewItem *)) );
     connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
              this,SLOT( RemoteListPressed(int, QListViewItem *, const QPoint&, int)) );
@@ -407,7 +411,11 @@ void OpieFtp::localUpload()
     int fsz;
     QCopEnvelope ( "QPE/System", "busy()" );
 //     qApp->processEvents();
-    QString strItem = Local_View->currentItem()->text(0);
+    QList<QListViewItem> * getSelectedItems( QListView * Local_View );
+        QListViewItemIterator it( Local_View );
+        for ( ; it.current(); ++it ) {
+            if ( it.current()->isSelected() ) {
+                QString strItem = it.current()->text(0);
     QString localFile = currentDir.canonicalPath()+"/"+strItem;
     QString remoteFile= currentRemoteDir+strItem;
     QFileInfo fi(localFile);
@@ -427,11 +435,14 @@ void OpieFtp::localUpload()
             msg.replace(QRegExp(":"),"\n");
             QMessageBox::message(tr("Note"),msg);
         }
-        ProgressBar->reset();
-        nullifyCallBack();
     } else {
         QMessageBox::message(tr("Note"),tr("Cannot upload directories"));
     }
+                    ProgressBar->reset();
+                    nullifyCallBack();
+					it.current()->setSelected(FALSE);
+            } //end currentSelected
+        }
     TabWidget->setCurrentPage(1);
     remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
     QCopEnvelope ( "QPE/System", "notBusy()" );
@@ -443,7 +454,6 @@ void OpieFtp::nullifyCallBack()
         FtpOptions(FTPLIB_IDLETIME, NULL, conn);
         FtpOptions(FTPLIB_CALLBACKARG, NULL, conn);
         FtpOptions(FTPLIB_CALLBACKBYTES, NULL, conn);
-
 }
 
 void OpieFtp::remoteDownload()
@@ -451,9 +461,13 @@ void OpieFtp::remoteDownload()
 //    qApp->processEvents();
     int fsz;
     QCopEnvelope ( "QPE/System", "busy()" );
-    QString strItem = Remote_View->currentItem()->text(0);
-//      strItem=strItem.right(strItem.length()-1);
 
+    QList<QListViewItem> * getSelectedItems( QListView * Remote_View );
+    QListViewItemIterator it( Remote_View );
+    for ( ; it.current(); ++it ) {
+        if ( it.current()->isSelected() ) {
+            QString strItem = it.current()->text(0);
+//      strItem=strItem.right(strItem.length()-1);
     QString localFile = currentDir.canonicalPath();
     if(localFile.right(1).find("/",0,TRUE) == -1)
         localFile += "/";
@@ -480,6 +494,9 @@ void OpieFtp::remoteDownload()
     }
     ProgressBar->reset();
     nullifyCallBack();
+			it.current()->setSelected(FALSE);
+        }
+    }
     TabWidget->setCurrentPage(0);
     populateLocalView();
     QCopEnvelope ( "QPE/System", "notBusy()" );
@@ -567,7 +584,7 @@ void OpieFtp::populateLocalView()
                     pm = Resource::loadPixmap( "locked" );
                 else {
                     MimeType mt(fi->filePath());
-                    pm=mt.pixmap();
+                    pm=mt.pixmap(); //sets the correct pixmap for mimetype
                     if(pm.isNull())
                         pm =  Resource::loadPixmap( "UnknownDocument-14" );
                     item->setPixmap( 0,pm);
@@ -589,7 +606,6 @@ void OpieFtp::populateLocalView()
     Local_View->setSorting( 3,FALSE);
     currentPathCombo->lineEdit()->setText( currentDir.canonicalPath() );
     fillCombo( (const QString &)currentDir);
-
 }
 
 bool OpieFtp::populateRemoteView( )
@@ -911,7 +927,6 @@ void OpieFtp::remoteDelete()
                   QMessageBox::message(tr("Note"),msg);
               }
               remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
-
           }
           break;
         };