Diffstat (limited to 'noncore/apps/advancedfm/advancedfmMenu.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 76 |
1 files changed, 28 insertions, 48 deletions
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index 13dad33..c553017 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp @@ -65,14 +65,14 @@ void AdvancedFm::showMenuHidden() { currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); currentRemoteDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); fileMenu->setItemChecked( fileMenu->idAt(0),FALSE); // b=TRUE; } - populateLocalView(); - populateRemoteView(); + populateView(); +// populateRemoteView(); // if(b) qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<< true"); if(b) b = false; else b = true; } void AdvancedFm::showHidden() { @@ -86,13 +86,13 @@ void AdvancedFm::showHidden() else { CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); // fileMenu->setItemChecked( fileMenu->idAt(0),FALSE); // b=TRUE; } - PopulateView(); + populateView(); } QString AdvancedFm::dealWithSymName(const QString &fileName) { QString strItem = fileName; return strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4); @@ -162,13 +162,13 @@ void AdvancedFm::makeDir() if( fileDlg->result() == 1 ) { QDir *thisDir = CurrentDir(); QString filename = fileDlg->LineEdit1->text(); thisDir->mkdir( thisDir->canonicalPath()+"/"+filename); } - PopulateView(); + populateView(); } void AdvancedFm::doDelete() { QStringList curFileList = getPath(); @@ -211,13 +211,13 @@ void AdvancedFm::doDelete() { case 0: { f=f.left(f.length()-1); QString cmd="rm -rf "+f; startProcess( (const QString)cmd.latin1() ); - PopulateView(); + populateView(); } break; case 1: // exit break; }; @@ -235,13 +235,13 @@ void AdvancedFm::doDelete() QFile file(f); if(QFileInfo(myFile).fileName().find("../",0,TRUE)==-1) file.remove(); } } } - PopulateView(); + populateView(); } void AdvancedFm::filePerms() { QStringList curFileList = getPath(); QString filePath; @@ -254,13 +254,13 @@ void AdvancedFm::filePerms() filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)(filePath+*it)); filePerm->showMaximized(); filePerm->exec(); if( filePerm) delete filePerm; } - PopulateView(); + populateView(); } void AdvancedFm::doProperties() { #if defined(QT_QWS_OPIE) @@ -290,13 +290,13 @@ void AdvancedFm::upDir() QDir dir(current); dir.cdUp(); current = dir.canonicalPath(); chdir( current.latin1() ); thisDir->cd( current, TRUE); - PopulateView(); + populateView(); update(); } void AdvancedFm::copy() { qApp->processEvents(); @@ -357,15 +357,14 @@ void AdvancedFm::copy() { QMessageBox::message("AdvancedFm", tr( "Could not copy %1 to %2").arg( curFile ).arg( destFile ) ); return; } } - - PopulateView(); -// TabWidget->setCurrentTab(1); + setOtherTabCurrent(); + populateView(); } } void AdvancedFm::copyAs() { qApp->processEvents(); @@ -414,13 +413,14 @@ void AdvancedFm::copyAs() return; } } delete fileDlg; } - PopulateView(); + setOtherTabCurrent(); + populateView(); } void AdvancedFm::copySameDir() { qApp->processEvents(); QStringList curFileList = getPath(); @@ -467,13 +467,13 @@ void AdvancedFm::copySameDir() } qDebug("copy "+curFile+" as "+destFile); } delete fileDlg; } - PopulateView(); + populateView(); } void AdvancedFm::move() { qApp->processEvents(); @@ -509,14 +509,15 @@ void AdvancedFm::move() } else QFile::remove(curFile); } } } - populateRemoteView(); - populateLocalView(); + setOtherTabCurrent(); + populateView(); +// populateLocalView(); } bool AdvancedFm::copyFile( const QString & src, const QString & dest ) { char bf[ 50000 ]; int bytesRead; @@ -640,69 +641,48 @@ void AdvancedFm::del() void AdvancedFm::mkSym() { QString cmd; QStringList curFileList = getPath(); if( curFileList.count() > 0) { - if ( whichTab == 1) - { - for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) - { + QDir *thisDir = CurrentDir(); + QDir * thatDir = OtherDir(); - QString destName = currentRemoteDir.canonicalPath()+"/"+(*it); - if(destName.right(1) == "/") - { - destName = destName.left( destName.length() -1); - } - QString curFile = currentDir.canonicalPath()+"/"+(*it); - if( curFile.right(1) == "/") - { - curFile = curFile.left( curFile.length() -1); - } - cmd = "ln -s "+curFile+" "+destName; - qDebug(cmd); - startProcess( (const QString)cmd ); - } - populateRemoteView(); - TabWidget->setCurrentTab(1); - } - else - { for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { - QString destName = currentDir.canonicalPath()+"/"+(*it); + QString destName = thatDir->canonicalPath()+"/"+(*it); if(destName.right(1) == "/") { destName = destName.left( destName.length() -1); } - QString curFile = currentRemoteDir.canonicalPath()+"/"+(*it); + + QString curFile = thisDir->canonicalPath()+"/"+(*it); + if( curFile.right(1) == "/") { curFile = curFile.left( curFile.length() -1); } cmd = "ln -s "+curFile+" "+destName; qDebug(cmd); startProcess( (const QString)cmd ); } - populateLocalView(); - TabWidget->setCurrentTab(0); - } + setOtherTabCurrent(); + populateView(); } } void AdvancedFm::doBeam() { Ir ir; if(!ir.supported()) { } else { - QStringList curFileList = getPath(); if( curFileList.count() > 0) { for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { @@ -752,14 +732,14 @@ void AdvancedFm::startProcess(const QString & cmd) if(!process->start(OProcess::NotifyOnExit) ) qDebug("could not start process"); } void AdvancedFm::processEnded() { - populateLocalView(); - populateRemoteView(); +// populateLocalView(); + populateView(); } bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) { if ( o->inherits( "QLineEdit" ) ) { @@ -840,13 +820,13 @@ void AdvancedFm::doRename(QListView * view) void AdvancedFm::renameIt() { QListView *thisView = CurrentView(); oldName = thisView->currentItem()->text(0); doRename( thisView ); - PopulateView(); + populateView(); } void AdvancedFm::okRename() { QString newName = renameBox->text(); cancelRename(); @@ -862,8 +842,8 @@ void AdvancedFm::okRename() QMessageBox::message(tr("Note"),tr("Could not rename")); else oldName = ""; view->takeItem( view->currentItem() ); delete view->currentItem(); - PopulateView(); + populateView(); } |