Diffstat (limited to 'noncore/apps/advancedfm/advancedfmMenu.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 80 |
1 files changed, 48 insertions, 32 deletions
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index 5fa8d0c..27a119f 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp @@ -13,8 +13,10 @@ #include "inputDialog.h" #include "output.h" #include "filePermissions.h" +#include <opie/otabwidget.h> + #include <qpe/lnkproperties.h> #include <qpe/qpeapplication.h> #include <qpe/qpemenubar.h> #include <qpe/qpetoolbar.h> @@ -52,25 +54,39 @@ void AdvancedFm::doRemoteCd() { localListClicked( Remote_View->currentItem()); } void AdvancedFm::showMenuHidden() { - if(TabWidget->currentPageIndex() == 0) - showHidden(); - else - showRemoteHidden(); + if (b) { + 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),TRUE); +// b=FALSE; + + } else { + 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(); +// if(TabWidget->getCurrentTab() == 0) +// showHidden(); +// else +// showRemoteHidden(); // if(b) qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<< true"); if(b) b = false; else b = true; } void AdvancedFm::showHidden() { if (b) { currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); - fileMenu->setItemChecked( fileMenu->idAt(0),TRUE); +// fileMenu->setItemChecked( fileMenu->idAt(0),TRUE); // b=FALSE; } else { currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); - fileMenu->setItemChecked( fileMenu->idAt(0),FALSE); +// fileMenu->setItemChecked( fileMenu->idAt(0),FALSE); // b=TRUE; } populateLocalView(); } @@ -88,9 +104,9 @@ void AdvancedFm::showRemoteHidden() { } void AdvancedFm::runThis() { QString fs; - if (TabWidget->currentPageIndex() == 0) { + if (TabWidget->getCurrentTab() == 0) { QString curFile = Local_View->currentItem()->text(0); if(curFile != "../") { fs= getFileSystemType((const QString &) currentDir.canonicalPath()); @@ -140,9 +156,9 @@ void AdvancedFm::runThis() { } } void AdvancedFm::runText() { - if (TabWidget->currentPageIndex() == 0) { + if (TabWidget->getCurrentTab() == 0) { QString curFile = Local_View->currentItem()->text(0); if(curFile != "../") { curFile = currentDir.canonicalPath()+"/"+curFile; QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" ); @@ -322,9 +338,9 @@ void AdvancedFm::filePerms() { QStringList curFileList = getPath(); QString filePath; - if (TabWidget->currentPageIndex() == 0) { + if (TabWidget->getCurrentTab() == 0) { filePath = currentDir.canonicalPath()+"/"; } else { filePath= currentRemoteDir.canonicalPath()+"/"; } @@ -336,9 +352,9 @@ void AdvancedFm::filePerms() { filePerm->exec(); if( filePerm) delete filePerm; } - if (TabWidget->currentPageIndex() == 0) { + if (TabWidget->getCurrentTab() == 0) { populateLocalView(); } else { populateRemoteView(); } @@ -349,9 +365,9 @@ void AdvancedFm::doProperties() { QStringList curFileList = getPath(); QString filePath; - if (TabWidget->currentPageIndex() == 0) { + if (TabWidget->getCurrentTab() == 0) { filePath = currentDir.canonicalPath()+"/"; } else { filePath= currentRemoteDir.canonicalPath()+"/"; } @@ -368,9 +384,9 @@ void AdvancedFm::doProperties() { } void AdvancedFm::upDir() { - if (TabWidget->currentPageIndex() == 0) { + if (TabWidget->getCurrentTab() == 0) { QString current = currentDir.canonicalPath(); QDir dir(current); dir.cdUp(); current = dir.canonicalPath(); @@ -394,9 +410,9 @@ void AdvancedFm::copy() { qApp->processEvents(); QStringList curFileList = getPath(); if( curFileList.count() > 0) { QString curFile, item, destFile; - if (TabWidget->currentPageIndex() == 0) { + if (TabWidget->getCurrentTab() == 0) { for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { item=(*it); if(item.find("->",0,TRUE)) //symlink @@ -426,9 +442,9 @@ void AdvancedFm::copy() { return; } } populateRemoteView(); - TabWidget->setCurrentPage(1); + TabWidget->setCurrentTab(1); } else { for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { item= (*it); @@ -462,9 +478,9 @@ void AdvancedFm::copy() { } } populateLocalView(); - TabWidget->setCurrentPage(0); + TabWidget->setCurrentTab(0); } } } @@ -474,9 +490,9 @@ void AdvancedFm::copyAs() { QStringList curFileList = getPath(); QString curFile; InputDialog *fileDlg; - if (TabWidget->currentPageIndex() == 0) { + if (TabWidget->getCurrentTab() == 0) { qDebug("tab 1"); for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { QString destFile; curFile = currentDir.canonicalPath()+"/"+(*it); @@ -511,9 +527,9 @@ void AdvancedFm::copyAs() { delete fileDlg; } populateRemoteView(); - TabWidget->setCurrentPage(1); + TabWidget->setCurrentTab(1); } else { for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { @@ -551,9 +567,9 @@ void AdvancedFm::copyAs() { delete fileDlg; } populateLocalView(); - TabWidget->setCurrentPage(0); + TabWidget->setCurrentTab(0); } } void AdvancedFm::copySameDir() { @@ -561,9 +577,9 @@ void AdvancedFm::copySameDir() { QStringList curFileList = getPath(); QString curFile, item, destFile; InputDialog *fileDlg; - if (TabWidget->currentPageIndex() == 0) { + if (TabWidget->getCurrentTab() == 0) { for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { item=(*it); curFile = currentDir.canonicalPath()+"/"+ item; @@ -648,9 +664,9 @@ void AdvancedFm::move() { QStringList curFileList = getPath(); if( curFileList.count() > 0) { QString curFile, destFile, item; - if (TabWidget->currentPageIndex() == 0) { + if (TabWidget->getCurrentTab() == 0) { for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { item=(*it); QString destFile = currentRemoteDir.canonicalPath(); @@ -677,9 +693,9 @@ void AdvancedFm::move() { QFile::remove(curFile); } } - TabWidget->setCurrentPage(1); + TabWidget->setCurrentTab(1); } else { //view 2 for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { @@ -707,9 +723,9 @@ void AdvancedFm::move() { return; } else QFile::remove( curFile); } - TabWidget->setCurrentPage(0); + TabWidget->setCurrentTab(0); } } populateRemoteView(); populateLocalView(); @@ -748,9 +764,9 @@ bool AdvancedFm::copyFile( const QString & dest, const QString & src ) { } void AdvancedFm::runCommand() { QString curFile; - if (TabWidget->currentPageIndex() == 0) { + if (TabWidget->getCurrentTab() == 0) { if( Local_View->currentItem()) curFile = currentDir.canonicalPath() +"/"+ Local_View->currentItem()->text(0); } else { if(Remote_View->currentItem()) @@ -794,9 +810,9 @@ void AdvancedFm::runCommand() { } void AdvancedFm::runCommandStd() { QString curFile; - if (TabWidget->currentPageIndex() == 0) { + if (TabWidget->getCurrentTab() == 0) { if( Local_View->currentItem()) curFile = currentDir.canonicalPath() +"/"+ Local_View->currentItem()->text(0); } else { if(Remote_View->currentItem()) @@ -817,9 +833,9 @@ void AdvancedFm::runCommandStd() { } void AdvancedFm::fileStatus() { QString curFile; - if (TabWidget->currentPageIndex() == 0) { + if (TabWidget->getCurrentTab() == 0) { curFile = Local_View->currentItem()->text(0); } else { curFile = Remote_View->currentItem()->text(0); } @@ -849,25 +865,25 @@ void AdvancedFm::fileStatus() { pclose(fp); } void AdvancedFm::mkDir() { - if (TabWidget->currentPageIndex() == 0) + if (TabWidget->getCurrentTab() == 0) localMakDir(); else remoteMakDir(); } void AdvancedFm::rn() { - if (TabWidget->currentPageIndex() == 0) + if (TabWidget->getCurrentTab() == 0) localRename(); else remoteRename(); } void AdvancedFm::del() { - if (TabWidget->currentPageIndex() == 0) + if (TabWidget->getCurrentTab() == 0) localDelete(); else remoteDelete(); } @@ -876,9 +892,9 @@ void AdvancedFm::mkSym() { QString cmd; QStringList curFileList = getPath(); if( curFileList.count() > 0) { - if (TabWidget->currentPageIndex() == 0) { + if (TabWidget->getCurrentTab() == 0) { for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { QString destName = currentRemoteDir.canonicalPath()+"/"+(*it); if(destName.right(1) == "/") destName = destName.left( destName.length() -1); @@ -888,9 +904,9 @@ void AdvancedFm::mkSym() { qDebug(cmd); system(cmd.latin1() ); } populateRemoteView(); - TabWidget->setCurrentPage(1); + TabWidget->setCurrentTab(1); } else { for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { QString destName = currentDir.canonicalPath()+"/"+(*it); @@ -902,9 +918,9 @@ void AdvancedFm::mkSym() { qDebug(cmd); system(cmd.latin1() ); } populateLocalView(); - TabWidget->setCurrentPage(0); + TabWidget->setCurrentTab(0); } } } @@ -915,9 +931,9 @@ void AdvancedFm::doBeam() { QStringList curFileList = getPath(); if( curFileList.count() > 0) { - if (TabWidget->currentPageIndex() == 0) { + if (TabWidget->getCurrentTab() == 0) { for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) { QString curFile = currentDir.canonicalPath()+"/"+(*it); if( curFile.right(1) == "/") curFile = curFile.left( curFile.length() -1); |