fixed functions for x86

author: llornkcor <llornkcor> 2002-04-28 13:51:21 (UTC)
committer: llornkcor <llornkcor> 2002-04-28 13:51:21 (UTC)
commit: c55ffe32ced1ecbac991ca2e85c6993cf8a04ee0 (patch) (unidiff)
tree: 479063624eb052aa80198c157a3acc5ea9e3ccac
parent: caae6c7deade10081709daa8a0de8ad548b6e30d (diff)
download: opie-c55ffe32ced1ecbac991ca2e85c6993cf8a04ee0.zip
opie-c55ffe32ced1ecbac991ca2e85c6993cf8a04ee0.tar.gz
opie-c55ffe32ced1ecbac991ca2e85c6993cf8a04ee0.tar.bz2
1 files changed, 50 insertions, 15 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index faa03dc..bd513c0 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -709,257 +709,256 @@ void AdvancedFm::showRemoteMenu(QListViewItem * item)
            m.setItemChecked(m.idAt(0),FALSE);
        m.exec( QCursor::pos() );
    }    
 }
 void AdvancedFm::runThis() {
 //    QFileInfo *fi;
    if (TabWidget->currentPageIndex() == 0) {
        QString curFile = Local_View->currentItem()->text(0);
        QFileInfo fileInfo( currentDir.canonicalPath()+"/"+curFile);
        if(fileInfo.isExecutable()) {
            QCopEnvelope e("QPE/System", "execute(QString)" );
            e << curFile;
        } else {
        curFile =  currentDir.canonicalPath()+"/"+curFile;
            DocLnk nf(curFile);
            QString execStr = nf.exec();
            qDebug( execStr);
            if( execStr.isEmpty() ) {
            } else {
                nf.execute();
            }
        }
 //         MimeType mt( curFile);
    } else {
        QString curFile = Remote_View->currentItem()->text(0);
        QFileInfo fileInfo( currentRemoteDir.canonicalPath()+"/"+curFile);
        if(fileInfo.isExecutable()) {
                QCopEnvelope e("QPE/System", "execute(QString)" );
                e << curFile;
        } else {
        curFile =  currentRemoteDir.canonicalPath()+"/"+curFile;
            DocLnk nf(curFile);
            QString execStr = nf.exec();
            qDebug(execStr);
            if( execStr.isEmpty() ) {
            } else {
                nf.execute();
            }
        }
 //         MimeType mt( curFile);
    }
 }
 void AdvancedFm::runText() {
    if (TabWidget->currentPageIndex() == 0) {
        QString curFile = Local_View->currentItem()->text(0);
        curFile =  currentDir.canonicalPath()+"/"+curFile;
        QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
        e << curFile;
    } else {
        QString curFile = Remote_View->currentItem()->text(0);
        curFile =  currentRemoteDir.canonicalPath()+"/"+curFile;
        DocLnk nf(curFile);
        QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
        e << curFile;
    }
 }
 void AdvancedFm::localMakDir()
 {
    InputDialog *fileDlg;
    fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
    fileDlg->exec();
    if( fileDlg->result() == 1 ) {
       QString  filename = fileDlg->LineEdit1->text();
       currentDir.mkdir( currentDir.canonicalPath()+"/"+filename);
    }
    populateLocalView();
 }
 void AdvancedFm::remoteMakDir()
 {
    InputDialog *fileDlg;
    fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
    fileDlg->exec();
    if( fileDlg->result() == 1 ) {
       QString  filename = fileDlg->LineEdit1->text();
        currentRemoteDir.mkdir(  currentRemoteDir.canonicalPath()+"/"+filename);
    }
    populateRemoteView();
 }
 void AdvancedFm::localDelete()
 {
    QStringList curFileList = getPath();
    QString myFile;
    for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
        myFile = (*it);
        if( myFile.find(" -> ",0,TRUE) != -1)
            myFile = myFile.left( myFile.find(" -> ",0,TRUE));
                    
        QString f = currentDir.canonicalPath();
        if(f.right(1).find("/",0,TRUE) == -1)
            f+="/";
        f+=myFile;
        if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) {
            switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f+
                                          "\nand all it's contents ?"
                                          ,tr("Yes"),tr("No"),0,0,1) ) {
              case 0: {
                  f=f.left(f.length()-1);
                  QString cmd="rm -rf "+f;
                  system( cmd.latin1());
                  populateLocalView();
              }
                  break;
              case 1:
                    // exit
                  break;
            };
        } else {
            switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f
                                          +" ?",tr("Yes"),tr("No"),0,0,1) ) {
              case 0: {
                  QString cmd="rm "+f;
                  QFile file(f);
                  file.remove();
 //                   system( cmd.latin1());
                  populateLocalView();
              }
                  break;
              case 1:
                    // exit
                  break;
            };
        }
-            
    }
 }
 void AdvancedFm::remoteDelete()
 {
    QStringList curFileList = getPath();
    QString myFile;
    for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
        myFile = (*it);
        if(myFile.find(" -> ",0,TRUE) != -1)
            myFile = myFile.left(myFile.find(" -> ",0,TRUE));
        QString f = currentDir.canonicalPath();
         if(f.right(1).find("/",0,TRUE) == -1)
             f+="/";
        f+=myFile;
        if(QDir(f).exists() && !QFileInfo(f).isSymLink()  ) {
            switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f+
                                          "\nand all it's contents ?",
                                          tr("Yes"),tr("No"),0,0,1) ) {
              case 0: {
                  f=f.left(f.length()-1);
                  QString cmd="rm -rf "+f;
                  system( cmd.latin1());
                  populateRemoteView();
              }
                  break;
              case 1:
                    // exit
                  break;
            };
        } else {
            switch ( QMessageBox::warning(this,tr("Delete"),tr("Do you really want to delete\n")+f
                                          +" ?",tr("Yes"),tr("No"),0,0,1) ) {
              case 0: {
                  QString cmd="rm "+f;
                  QFile file(f);
                  file.remove();
 //                   system( cmd.latin1());
                  populateRemoteView();
              }
                  break;
              case 1:
                    // exit
                  break;
            };
        }
    }
 }
 void AdvancedFm::localRename()
 {
    QString curFile = Local_View->currentItem()->text(0);
    InputDialog *fileDlg;
    fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
    fileDlg->setInputText((const QString &)curFile);
    fileDlg->exec();
    if( fileDlg->result() == 1 ) {
        QString oldname = currentDir.canonicalPath() + "/" + curFile;
        QString newName = currentDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist";
        if( rename(oldname.latin1(), newName.latin1())== -1)
            QMessageBox::message(tr("Note"),tr("Could not rename"));
    }
    populateLocalView();
 }
 void AdvancedFm::remoteRename()
 {
    QString curFile = Local_View->currentItem()->text(0);
    InputDialog *fileDlg;
    fileDlg = new InputDialog(this,tr("Rename"),TRUE, 0);
    fileDlg->setInputText((const QString &)curFile);
    fileDlg->exec();
    if( fileDlg->result() == 1 ) {
        QString oldname = currentRemoteDir.canonicalPath() + "/" + curFile;
        QString newName = currentRemoteDir.canonicalPath() + "/" + fileDlg->LineEdit1->text();//+".playlist";
        if( rename(oldname.latin1(), newName.latin1())== -1)
            QMessageBox::message(tr("Note"),tr("Could not rename"));
    }
    populateRemoteView();
 }
 void AdvancedFm::switchToLocalTab()
 {
    TabWidget->setCurrentPage(0);
    Local_View->setFocus();
 }
 void AdvancedFm::switchToRemoteTab()
 {
    TabWidget->setCurrentPage(1);
    Remote_View->setFocus();
 }
 void AdvancedFm::readConfig()
 {
    Config cfg("AdvancedFm");
 }
 void AdvancedFm::writeConfig()
 {
    Config cfg("AdvancedFm");
 }
 void  AdvancedFm::currentPathComboChanged()
 {
    if (TabWidget->currentPageIndex() == 0) {
        if(QDir( currentPathCombo->lineEdit()->text()).exists()) {
            currentDir.setPath( currentPathCombo->lineEdit()->text() );
            populateLocalView();
        } else {
            QMessageBox::message(tr("Note"),tr("That directory does not exist"));
        }
    }
    if (TabWidget->currentPageIndex() == 0) {
        if(QDir( currentPathCombo->lineEdit()->text()).exists()) {
             currentRemoteDir.setPath( currentPathCombo->lineEdit()->text() );
            populateRemoteView();
        } else {
            QMessageBox::message(tr("Note"),tr("That directory does not exist"));
        }
    }
 }
 void  AdvancedFm::fillCombo(const QString &currentPath) {
    if (TabWidget->currentPageIndex() == 0) {
@@ -1015,365 +1014,401 @@ void AdvancedFm::filePerms() {
 }
 void AdvancedFm::doProperties() {
    QStringList curFileList = getPath();
    QString filePath;
    if (TabWidget->currentPageIndex() == 0) {
        filePath = currentDir.canonicalPath()+"/";
    } else {
        filePath= currentRemoteDir.canonicalPath()+"/";
    }
    for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
        DocLnk lnk( (filePath+*it));
        LnkProperties prop( &lnk );
 //  connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *)));
        prop.showMaximized();
        prop.exec();
    }
 }
 QStringList AdvancedFm::getPath() {
    QStringList strList;
    if (TabWidget->currentPageIndex() == 0) {
        QList<QListViewItem> * getSelectedItems( QListView * Local_View );
        QListViewItemIterator it( Local_View );
        for ( ; it.current(); ++it ) {
            if ( it.current()->isSelected() ) {
                strList <<  it.current()->text(0);
            }
        }
        return strList;
    } else {
        QList<QListViewItem> * getSelectedItems( QListView * Remote_View );
        QListViewItemIterator it( Remote_View );
        for ( ; it.current(); ++it ) {
            if ( it.current()->isSelected() ) {
                strList << currentDir.canonicalPath()+"/"+ it.current()->text(0);
            }
        }
        return strList;
    }
    return "";
 }
 void AdvancedFm::homeButtonPushed() {
    QString current = QDir::homeDirPath();
    chdir( current.latin1() );
    if (TabWidget->currentPageIndex() == 0) {
        currentDir.cd(  current, TRUE);
        populateLocalView();
    } else {
        currentRemoteDir.cd(  current, TRUE);
        populateRemoteView();
    }
    update();
 }
 void AdvancedFm::docButtonPushed() {
    QString current = QPEApplication::documentDir();
    chdir( current.latin1() );
    if (TabWidget->currentPageIndex() == 0) {
        currentDir.cd( current, TRUE);
        populateLocalView();
    } else {
        currentRemoteDir.cd( current, TRUE);
        populateRemoteView();
    }
    update();
 }
 void AdvancedFm::SDButtonPushed() {
    QString current = "/mnt/card";
    chdir( current.latin1() );
    if (TabWidget->currentPageIndex() == 0) {
        currentDir.cd( current, TRUE);
        populateLocalView();
    } else {
        currentRemoteDir.cd( current, TRUE);
        populateRemoteView();
    }
    update();
 }
 void AdvancedFm::CFButtonPushed() {
    QString current = "/mnt/cf";
    chdir( current.latin1() );
    if (TabWidget->currentPageIndex() == 0) {
        currentDir.cd( current, TRUE);
        populateLocalView();
    } else {
        currentRemoteDir.cd( current, TRUE);
        populateRemoteView();
    }
    update();
 }
 void AdvancedFm::upDir()
 {
    if (TabWidget->currentPageIndex() == 0) {
        QString current = currentDir.canonicalPath();
        QDir dir(current);
        dir.cdUp();
        current = dir.canonicalPath();
        chdir( current.latin1() );
        currentDir.cd(  current, TRUE);
        populateLocalView();
        update();
    } else {
        QString current = currentRemoteDir.canonicalPath();
        QDir dir(current);
        dir.cdUp();
        current = dir.canonicalPath();
        chdir( current.latin1() );
        currentRemoteDir.cd(  current, TRUE);
        populateRemoteView();
        update();
    }
 }
 void AdvancedFm::copy()
 {
    QStringList curFileList = getPath();
    QString curFile;
    if (TabWidget->currentPageIndex() == 0) {
        for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-            QString destFile = currentRemoteDir.canonicalPath()+"/"+(*it);
+            QString destFile = currentRemoteDir.canonicalPath(); 
-            curFile = currentDir.canonicalPath()+"/"+(*it);
+            if(destFile.right(1).find("/",0,TRUE) == -1)
+                destFile+="/";
+            destFile +=(*it);
+            curFile = currentDir.canonicalPath();
+            if(curFile.right(1).find("/",0,TRUE) == -1)
+                curFile +="/";
+            curFile +=(*it);
            QFile f(destFile);
            if( f.exists())
                f.remove();
            if(!copyFile(destFile, curFile) )
                qWarning("nothin doing");
        }
        populateRemoteView();
        TabWidget->setCurrentPage(1);
    } else {
        for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-            QString destFile = currentDir.canonicalPath()+"/"+(*it);
+            QString destFile = currentDir.canonicalPath();
-            curFile = currentRemoteDir.canonicalPath()+"/"+(*it);
+            if(destFile.right(1).find("/",0,TRUE) == -1)
+                destFile+="/";
+            destFile +=(*it);
+            curFile = currentRemoteDir.canonicalPath();
+            if(curFile.right(1).find("/",0,TRUE) == -1)
+                curFile +="/";
+            curFile +=(*it);
            QFile f(destFile);
            if( f.exists())
                f.remove();
            if(!copyFile(destFile, curFile) )
                qWarning("nothin doing");
        }
        populateLocalView();
        TabWidget->setCurrentPage(0);
    }
 }
 void AdvancedFm::copyAs()
 {
    QStringList curFileList = getPath();
    QString curFile;
    InputDialog *fileDlg;
    fileDlg = new InputDialog(this,tr("Copy As"),TRUE, 0);
    if (TabWidget->currentPageIndex() == 0) {
        for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-            QString destFile = *it;
+            QString destFile;
-            curFile = currentDir.canonicalPath()+"/"+(*it);
+            curFile = currentDir.canonicalPath();
+            if(curFile.right(1).find("/",0,TRUE) == -1)
+                curFile +="/";
+            curFile+=(*it);
 //             InputDialog *fileDlg;
 //             fileDlg = new InputDialog(this,tr("Copy As"),TRUE, 0);
            fileDlg->setInputText((const QString &) destFile );
            fileDlg->exec();
            if( fileDlg->result() == 1 ) {
                QString  filename = fileDlg->LineEdit1->text();
-                destFile = currentRemoteDir.canonicalPath()+"/"+destFile;
+                destFile = currentRemoteDir.canonicalPath();
+                if(destFile.right(1).find("/",0,TRUE) == -1)
+                    destFile+="/";
+                destFile +=(*it);
                QFile f(destFile);
                if( f.exists())
                    f.remove();
                if(!copyFile(destFile, curFile) )
                    qWarning("nothin doing");
            }
        }
        
        populateRemoteView();
        TabWidget->setCurrentPage(1);
    } else {
        if (TabWidget->currentPageIndex() == 0) {
            for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-                curFile = currentDir.canonicalPath()+"/"+(*it);
+                curFile = currentDir.canonicalPath();
-                QString destFile  = *it;
+                if(curFile.right(1).find("/",0,TRUE) == -1)
+                    curFile +="/";
+                curFile+=(*it);
+                QString destFile;
                fileDlg->setInputText((const QString &) destFile);
                fileDlg->exec();
                if( fileDlg->result() == 1 ) {
                    QString  filename = fileDlg->LineEdit1->text();
-                    destFile = currentDir.canonicalPath()+"/"+destFile;
+                    destFile = currentDir.canonicalPath();
+                    if(destFile.right(1).find("/",0,TRUE) == -1)
+                        destFile+="/";
+                    destFile +=(*it);
                    QFile f(destFile);
                    if( f.exists())
                        f.remove();
                    if(!copyFile(destFile, curFile) )
                        qWarning("nothin doing");
                }
            }
            populateLocalView();
            TabWidget->setCurrentPage(0);
        }
    }
 }
 void AdvancedFm::move() {
    QStringList curFileList = getPath();
    QString curFile;
 //    qDebug(curFile);
    QString destFile;
    if (TabWidget->currentPageIndex() == 0) {
        for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-            QString destFile =  currentRemoteDir.canonicalPath() + "/" + *it;
+            QString destFile =  currentRemoteDir.canonicalPath();
-            curFile = currentDir.canonicalPath()+"/"+(*it);
+                if(destFile.right(1).find("/",0,TRUE) == -1)
+                    destFile+="/";
+                destFile +=(*it);
+            curFile = currentDir.canonicalPath();
            qDebug("Destination file is "+destFile);
+            if(curFile.right(1).find("/",0,TRUE) == -1)
+                curFile +="/";
+            curFile+=(*it);
            QFile f(destFile);
            if( f.exists())
                f.remove();
            if(!copyFile( destFile, curFile) ) {
                QMessageBox::message(tr("Note"),tr("Could not move\n"+curFile));
                return;
            }
            QFile::remove(curFile);
        }
        TabWidget->setCurrentPage(1);
    } else {
        for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-            QString destFile = currentRemoteDir.canonicalPath() + "/" + *it;
+            QString destFile = currentRemoteDir.canonicalPath();
+                if(destFile.right(1).find("/",0,TRUE) == -1)
+                    destFile+="/";
+                destFile +=(*it);
            qDebug("Destination file is "+destFile);
-            curFile = currentDir.canonicalPath()+"/"+(*it);
+            curFile = currentDir.canonicalPath();
+            if(curFile.right(1).find("/",0,TRUE) == -1)
+                curFile +="/";
+            curFile+=(*it);
            QFile f(destFile);
            if( f.exists())
                f.remove();
            if(!copyFile(destFile, curFile) ) {
                QMessageBox::message(tr("Note"),tr("Could not move\n"+curFile));
                return;
            }
            QFile::remove(curFile);
            TabWidget->setCurrentPage(0);
        }
    }
        populateRemoteView();
        populateLocalView();
 }
 bool AdvancedFm::copyFile( const QString & dest, const QString & src )
 {
    char bf[ 50000 ];
    int  bytesRead;
    bool success = TRUE;
    struct stat status;
    QFile s( src );
    QFile d( dest );
    if( s.open( IO_ReadOnly | IO_Raw ) &&  d.open( IO_WriteOnly | IO_Raw ) )  {
        while( (bytesRead = s.readBlock( bf, sizeof( bf ) )) == sizeof( bf ) ) {
            if( d.writeBlock( bf, sizeof( bf ) ) != sizeof( bf ) ){
                success = FALSE;
                break;
            }
        }
        if( success && (bytesRead > 0) ){
            d.writeBlock( bf, bytesRead );
        }
    } else {
        success = FALSE;
    }
      // Set file permissions
    if( stat( (const char *) src, &status ) == 0 ){
        chmod( (const char *) dest, status.st_mode );
    }
    return success;
 }
 void AdvancedFm::runCommand() {
     QString curFile;
     if (TabWidget->currentPageIndex() == 0) {
         if( Local_View->currentItem())
         curFile = currentDir.canonicalPath() + Local_View->currentItem()->text(0);
     } else {
         if(Remote_View->currentItem())
         curFile = currentRemoteDir.canonicalPath() + Remote_View->currentItem()->text(0);
     }
    
    InputDialog *fileDlg;
    fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);
    fileDlg->setInputText(curFile);
    fileDlg->exec();
    QString command;
    if( fileDlg->result() == 1 ) {
        command = fileDlg->LineEdit1->text();
        int err=0;
        Output *outDlg;
        outDlg = new Output(this, tr("AdvancedFm Output"),FALSE);
        outDlg->showMaximized();
        outDlg->show();
        qApp->processEvents();
        FILE *fp;
        char line[130];
        sleep(1);
 //         if(command.find("2>",0,TRUE) != -1)
            command +=" 2>&1";
        fp = popen(  (const char *) command, "r"); 
        if ( !fp ) {
            qDebug("Could not execute '" + command + "'! err=%d", fp); 
            QMessageBox::warning( this, tr("AdvancedFm"), tr("command failed!"), tr("&OK") );
            pclose(fp);             
            return;
        } else {
            while ( fgets( line, sizeof line, fp)) {
                QString lineStr = line;
                lineStr=lineStr.left(lineStr.length()-1);
                outDlg->OutputEdit->append(lineStr);
                outDlg->OutputEdit->setCursorPosition(outDlg->OutputEdit->numLines() + 1,0,FALSE);
            }
        }
    }
 }
 void AdvancedFm::runCommandStd() {
    QString curFile;
    if (TabWidget->currentPageIndex() == 0) {
        if( Local_View->currentItem())
            curFile = currentDir.canonicalPath() + Local_View->currentItem()->text(0);
    } else {
        if(Remote_View->currentItem())
            curFile = currentRemoteDir.canonicalPath() + Remote_View->currentItem()->text(0);
    }
    
    InputDialog *fileDlg;
    fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);
    fileDlg->setInputText(curFile);
    fileDlg->exec();
    QString command;
    if( fileDlg->result() == 1 ) {
        qApp->processEvents();
        command = fileDlg->LineEdit1->text() + " &";
        system(command.latin1());
    }
 }
 void AdvancedFm::fileStatus() {
    QString curFile;
    if (TabWidget->currentPageIndex() == 0) {
        curFile = Local_View->currentItem()->text(0);
    } else {
        curFile = Remote_View->currentItem()->text(0);
    }
    QString command = " stat -l "+ curFile +" 2>&1";
    int err=0;
    Output *outDlg;
    outDlg = new Output(this, tr("AdvancedFm Output"),FALSE);
    outDlg->showMaximized();
author	llornkcor <llornkcor>	2002-04-28 13:51:21 (UTC)
committer	llornkcor <llornkcor>	2002-04-28 13:51:21 (UTC)
commit	c55ffe32ced1ecbac991ca2e85c6993cf8a04ee0 (patch) (unidiff)
tree	479063624eb052aa80198c157a3acc5ea9e3ccac
parent	caae6c7deade10081709daa8a0de8ad548b6e30d (diff)
download	opie-c55ffe32ced1ecbac991ca2e85c6993cf8a04ee0.zip opie-c55ffe32ced1ecbac991ca2e85c6993cf8a04ee0.tar.gz opie-c55ffe32ced1ecbac991ca2e85c6993cf8a04ee0.tar.bz2