fixed a workaround for an apparent bug in libqte when the listview is multi, and you try to select one item and popup the menu.., it needs extended mode selection to work

1 files changed, 43 insertions, 46 deletions

diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index 3e13466..956409f 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -123,25 +123,25 @@ OpieFtp::OpieFtp( )
     tabLayout->setSpacing( 2);
     tabLayout->setMargin( 2);
 
     Local_View = new QListView( tab, "Local_View" );
 //    Local_View->setResizePolicy( QListView::AutoOneFit );
     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 );
-
+    Local_View->setSelectionMode(QlistView::Extended);
      QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold);
 
     tabLayout->addWidget( Local_View, 0, 0 );
 
      connect( Local_View, SIGNAL( clicked( QListViewItem*)),
               this,SLOT( localListClicked(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)) );
 
     TabWidget->insertTab( tab, tr( "Local" ) );
@@ -152,24 +152,25 @@ OpieFtp::OpieFtp( )
     tabLayout_2->setMargin( 2);
 
     Remote_View = new QListView( tab_2, "Remote_View" );
     Remote_View->addColumn( tr("File"),150);
     Remote_View->addColumn( tr("Size"),-1);
     Remote_View->setColumnAlignment(1,QListView::AlignRight);
     Remote_View->addColumn( tr("Date"),-1);
     Remote_View->setColumnAlignment(2,QListView::AlignRight);
     Remote_View->addColumn( tr("Dir"),-1);
     Remote_View->setColumnAlignment(4,QListView::AlignRight);
     Remote_View->setAllColumnsShowFocus(TRUE);
     Remote_View->setMultiSelection( TRUE );
+    Remote_View->setSelectionMode(QlistView::Extended);
 
     QPEApplication::setStylusOperation( Remote_View->viewport(),QPEApplication::RightOnHold);
 
     connect( Remote_View, SIGNAL( clicked( QListViewItem*)),
              this,SLOT( remoteListClicked(QListViewItem *)) );
     connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
              this,SLOT( RemoteListPressed(int, QListViewItem *, const QPoint&, int)) );
 
     tabLayout_2->addWidget( Remote_View, 0, 0 );
 
     TabWidget->insertTab( tab_2, tr( "Remote" ) );
 
@@ -276,24 +277,25 @@ OpieFtp::~OpieFtp()
 void OpieFtp::cleanUp()
 {
     if(conn)
         FtpQuit(conn);
     QString sfile=QDir::homeDirPath();
     if(sfile.right(1) != "/")
         sfile+="/._temp";
     else
         sfile+="._temp";
     QFile file( sfile);
     if(file.exists())
         file.remove();
+    exit(0);
 }
 
 void OpieFtp::tabChanged(QWidget *w)
 {
     if (TabWidget->currentPageIndex() == 0) {
             currentPathCombo->lineEdit()->setText( currentDir.canonicalPath());
             tabMenu->setItemChecked(tabMenu->idAt(0),TRUE);
             tabMenu->setItemChecked(tabMenu->idAt(1),FALSE);
             tabMenu->setItemChecked(tabMenu->idAt(2),FALSE);
     }
   if (TabWidget->currentPageIndex() == 1) {
             currentPathCombo->lineEdit()->setText( currentRemoteDir );
@@ -385,67 +387,66 @@ void OpieFtp::connector()
     QCopEnvelope ( "QPE/System", "notBusy()" );
 }
 
 void OpieFtp::disConnector()
 {
     if(conn)
         FtpQuit(conn);
     setCaption("OpieFtp");
     currentRemoteDir="/";
     Remote_View->clear();
     connectServerBtn->setText( tr("Connect"));
     connectServerBtn->setOn(FALSE);
-
 }
 
 void OpieFtp::localUpload()
 {
     int fsz;
     QCopEnvelope ( "QPE/System", "busy()" );
 //    qApp->processEvents();
     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);
-                if( !fi.isDir()) {
-                    fsz=fi.size();
-                    ProgressBar->setTotalSteps(fsz);
-
-                    FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn);
-                    FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn);
-                    FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn);
-                    FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn);
-                    qDebug("Put: %s, %s",localFile.latin1(),remoteFile.latin1());
-
-                    if( !FtpPut( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) {
-                        QString msg;
-                        msg.sprintf(tr("Unable to upload\n")+"%s",FtpLastResponse(conn));
-                        msg.replace(QRegExp(":"),"\n");
-                        QMessageBox::message(tr("Note"),msg);
-                    }
-                } else {
-                    QMessageBox::message(tr("Note"),tr("Cannot upload directories"));
+    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);
+            if( !fi.isDir()) {
+                fsz=fi.size();
+                ProgressBar->setTotalSteps(fsz);
+
+                FtpOptions(FTPLIB_CALLBACK, (long) log_progress, conn);
+                FtpOptions(FTPLIB_IDLETIME, (long) 1000, conn);
+                FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn);
+                FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn);
+                qDebug("Put: %s, %s",localFile.latin1(),remoteFile.latin1());
+
+                if( !FtpPut( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) {
+                    QString msg;
+                    msg.sprintf(tr("Unable to upload\n")+"%s",FtpLastResponse(conn));
+                    msg.replace(QRegExp(":"),"\n");
+                    QMessageBox::message(tr("Note"),msg);
                 }
-                    ProgressBar->reset();
-                    nullifyCallBack();
-          it.current()->setSelected(FALSE);
-            } //end currentSelected
-        }
-        TabWidget->setCurrentPage(1);
-        remoteDirList( (const QString &)currentRemoteDir); //this also calls populate
-        QCopEnvelope ( "QPE/System", "notBusy()" );
+            } 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()" );
 }
 
 void OpieFtp::nullifyCallBack()
 {
         FtpOptions(FTPLIB_CALLBACK, NULL, conn);
         FtpOptions(FTPLIB_IDLETIME, NULL, conn);
         FtpOptions(FTPLIB_CALLBACKARG, NULL, conn);
         FtpOptions(FTPLIB_CALLBACKBYTES, NULL, conn);
 }
 
 void OpieFtp::remoteDownload()
 {
@@ -476,25 +477,25 @@ void OpieFtp::remoteDownload()
             FtpOptions(FTPLIB_CALLBACKARG, (long) &fsz, conn);
             FtpOptions(FTPLIB_CALLBACKBYTES, (long) fsz/10, conn);
             qDebug("Get: %s, %s",localFile.latin1(),remoteFile.latin1());
 
             if(!FtpGet( localFile.latin1(), remoteFile.latin1(),FTPLIB_IMAGE, conn ) ) {
                 QString msg;
                 msg.sprintf(tr("Unable to download \n")+"%s",FtpLastResponse(conn));
                 msg.replace(QRegExp(":"),"\n");
                 QMessageBox::message(tr("Note"),msg);
             }
             ProgressBar->reset();
             nullifyCallBack();
-      it.current()->setSelected(FALSE);
+            it.current()->setSelected(FALSE);
         }
     }
     TabWidget->setCurrentPage(0);
     populateLocalView();
     QCopEnvelope ( "QPE/System", "notBusy()" );
 }
 
 bool OpieFtp::remoteDirList(const QString &dir)
 {
     QString tmp = QDir::homeDirPath();
     if(tmp.right(1) != "/")
         tmp+="/._temp";
@@ -513,25 +514,25 @@ bool OpieFtp::remoteDirList(const QString &dir)
     QCopEnvelope ( "QPE/System", "notBusy()" );
     return true;
 }
 
 bool OpieFtp::remoteChDir(const QString &dir)
 {
     QCopEnvelope ( "QPE/System", "busy()" );
     if (!FtpChdir( dir.latin1(), conn )) {
         QString msg;
         msg.sprintf(tr("Unable to change directories\n")+dir+"\n%s",FtpLastResponse(conn));
         msg.replace(QRegExp(":"),"\n");
         QMessageBox::message(tr("Note"),msg);
-            qDebug(msg);
+        qDebug(msg);
         QCopEnvelope ( "QPE/System", "notBusy()" );
         return FALSE;
     }
     QCopEnvelope ( "QPE/System", "notBusy()" );
     return TRUE;
 }
 
 void OpieFtp::populateLocalView()
 {
     Local_View->clear();
     currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     currentDir.setMatchAllDirs(TRUE);
@@ -771,38 +772,34 @@ void OpieFtp::showHidden()
     }  else {
     currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
     localMenu->setItemChecked(localMenu->idAt(0),FALSE);
 //    currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     b=FALSE;
     }
     populateLocalView();
 }
 
 void OpieFtp::ListPressed( int mouse, QListViewItem *item, const QPoint &point, int i)
 {
 // if(item)
-if (mouse == 2) {
-          showLocalMenu(item);
+    if (mouse == 2) {
+        showLocalMenu(item);
     }
 }
 
 void OpieFtp::RemoteListPressed( int mouse, QListViewItem *item, const QPoint &point, int i)
 {
- switch (mouse) {
-      case 1:
-          break;
-      case 2:
-          showRemoteMenu(item);
-    break;
-    };
+    if(mouse == 2) {
+        showRemoteMenu(item);
+    }
 }
 
 void OpieFtp::showRemoteMenu(QListViewItem * item)
 {
     QPopupMenu  m;// = new QPopupMenu( Local_View );
     if( /*item->text(0).right(1) == "/" ||*/ item->text(0).find("/",0,TRUE) != -1)
         m.insertItem( tr( "Change Directory" ), this, SLOT( doRemoteCd() ));
     else
     m.insertItem( tr( "Download" ), this, SLOT( remoteDownload() ));
     m.insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
     m.insertItem( tr( "Rename" ), this, SLOT( remoteRename() ));
     m.insertSeparator();