author | llornkcor <llornkcor> | 2002-10-16 15:48:52 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-10-16 15:48:52 (UTC) |
commit | 0176ce245c348baf392dba790878458a5e39077f (patch) (side-by-side diff) | |
tree | 91665a3e143c14d3a785d1c660df88e2aafde9fc /noncore/apps/advancedfm | |
parent | 321cea04e34658fde3de47c104682b5cefce6eeb (diff) | |
download | opie-0176ce245c348baf392dba790878458a5e39077f.zip opie-0176ce245c348baf392dba790878458a5e39077f.tar.gz opie-0176ce245c348baf392dba790878458a5e39077f.tar.bz2 |
fix showhidden files handling
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 9 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 18 |
2 files changed, 12 insertions, 15 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index b6e7a30..f23fd86 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp @@ -716,46 +716,41 @@ QString AdvancedFm::getDiskSpace( const QString &path) { void AdvancedFm::showFileMenu() { QString curApp; bool isLocalView = false; if (TabWidget->currentPageIndex() == 0) { isLocalView = TRUE; curApp = Local_View->currentItem()->text(0); } else { curApp = Remote_View->currentItem()->text(0); } MimeType mt( curApp ); - const AppLnk* app = mt.application(); - QFile fi(curApp); - QPopupMenu *m = new QPopupMenu(0); QPopupMenu *n = new QPopupMenu(0); // QPopupMenu *o = new QPopupMenu(0); - - m->insertItem( tr( "Show Hidden Files" ), this, SLOT( showHidden() )); + m->insertItem( tr( "Show Hidden Files" ), this, SLOT( showMenuHidden() )); if ( QFileInfo(fi).isDir() ) { m->insertSeparator(); m->insertItem( tr( "Change Directory" ), this, SLOT( doLocalCd() )); } else { if ( app ) m->insertItem( app->pixmap(), tr( "Open in " + app->name() ), this, SLOT( runThis() ) ); else if( QFileInfo(fi).isExecutable() ) //damn opie doesnt like this - m->insertItem( /*Resource::loadPixmap( app->name()),*/ tr( "Execute" ), this, SLOT( runThis() ) ); - + m->insertItem( tr( "Execute" ), this, SLOT( runThis() ) ); m->insertItem( Resource::loadPixmap( "txt" ), tr( "Open as text" ),this, SLOT( runText() ) ); } m->insertItem(tr("Actions"),n); if(isLocalView) n->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() )); else n->insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() )); n->insertItem( tr( "Make Symlink" ), this, SLOT( mkSym() )); n->insertSeparator(); diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index 6d37904..5fa8d0c 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp @@ -44,52 +44,54 @@ #include <dirent.h> void AdvancedFm::doLocalCd() { localListClicked( Local_View->currentItem()); } void AdvancedFm::doRemoteCd() { localListClicked( Remote_View->currentItem()); } void AdvancedFm::showMenuHidden() { - showHidden(); - if(b) b= false; else b=true; - showRemoteHidden(); + if(TabWidget->currentPageIndex() == 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); - b=FALSE; +// b=FALSE; } else { currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); fileMenu->setItemChecked( fileMenu->idAt(0),FALSE); - b=TRUE; +// b=TRUE; } populateLocalView(); - } void AdvancedFm::showRemoteHidden() { if (b) { currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All); - b=TRUE; +// b=TRUE; } else { currentRemoteDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All); - b=FALSE; +// b=FALSE; } populateRemoteView(); } void AdvancedFm::runThis() { QString fs; if (TabWidget->currentPageIndex() == 0) { QString curFile = Local_View->currentItem()->text(0); if(curFile != "../") { fs= getFileSystemType((const QString &) currentDir.canonicalPath()); QFileInfo fileInfo( currentDir.canonicalPath()+"/"+curFile); |