Diffstat (limited to 'noncore/apps/advancedfm/advancedfmMenu.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 102 |
1 files changed, 41 insertions, 61 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 @@ -70,4 +70,4 @@ void AdvancedFm::showMenuHidden() } - populateLocalView(); - populateRemoteView(); + populateView(); +// populateRemoteView(); // if(b) qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<< true"); @@ -91,3 +91,3 @@ void AdvancedFm::showHidden() } - PopulateView(); + populateView(); } @@ -167,3 +167,3 @@ void AdvancedFm::makeDir() } - PopulateView(); + populateView(); } @@ -216,3 +216,3 @@ void AdvancedFm::doDelete() startProcess( (const QString)cmd.latin1() ); - PopulateView(); + populateView(); } @@ -240,3 +240,3 @@ void AdvancedFm::doDelete() } - PopulateView(); + populateView(); } @@ -259,3 +259,3 @@ void AdvancedFm::filePerms() } - PopulateView(); + populateView(); } @@ -295,3 +295,3 @@ void AdvancedFm::upDir() - PopulateView(); + populateView(); update(); @@ -362,5 +362,4 @@ void AdvancedFm::copy() } - - PopulateView(); -// TabWidget->setCurrentTab(1); + setOtherTabCurrent(); + populateView(); } @@ -419,3 +418,4 @@ void AdvancedFm::copyAs() } - PopulateView(); + setOtherTabCurrent(); + populateView(); } @@ -472,3 +472,3 @@ void AdvancedFm::copySameDir() } - PopulateView(); + populateView(); } @@ -514,4 +514,5 @@ void AdvancedFm::move() } - populateRemoteView(); - populateLocalView(); + setOtherTabCurrent(); + populateView(); +// populateLocalView(); } @@ -645,48 +646,28 @@ void AdvancedFm::mkSym() { - 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 ) { - for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) + + QString destName = thatDir->canonicalPath()+"/"+(*it); + if(destName.right(1) == "/") { + destName = destName.left( destName.length() -1); + } - QString destName = currentDir.canonicalPath()+"/"+(*it); - if(destName.right(1) == "/") - { - destName = destName.left( destName.length() -1); - } - QString curFile = currentRemoteDir.canonicalPath()+"/"+(*it); - if( curFile.right(1) == "/") - { - curFile = curFile.left( curFile.length() -1); - } + QString curFile = thisDir->canonicalPath()+"/"+(*it); - cmd = "ln -s "+curFile+" "+destName; - qDebug(cmd); - startProcess( (const QString)cmd ); - } - populateLocalView(); - TabWidget->setCurrentTab(0); - } - } + if( curFile.right(1) == "/") + { + curFile = curFile.left( curFile.length() -1); + } + + cmd = "ln -s "+curFile+" "+destName; + qDebug(cmd); + startProcess( (const QString)cmd ); + } + setOtherTabCurrent(); + populateView(); + } } @@ -701,3 +682,2 @@ void AdvancedFm::doBeam() { - QStringList curFileList = getPath(); @@ -757,4 +737,4 @@ void AdvancedFm::processEnded() { - populateLocalView(); - populateRemoteView(); +// populateLocalView(); + populateView(); } @@ -845,3 +825,3 @@ void AdvancedFm::renameIt() doRename( thisView ); - PopulateView(); + populateView(); } @@ -867,3 +847,3 @@ void AdvancedFm::okRename() delete view->currentItem(); - PopulateView(); + populateView(); } |