1 files changed, 23 insertions, 4 deletions

diff --git a/noncore/apps/opie-reader/fileBrowser.cpp b/noncore/apps/opie-reader/fileBrowser.cpp
index def988f..b21d59d 100644
--- a/noncore/apps/opie-reader/fileBrowser.cpp
+++ b/noncore/apps/opie-reader/fileBrowser.cpp
@@ -8,59 +8,68 @@ Extensive modification by Tim Wentford to allow it to work in rotated mode
 
 ****************************************************************************/
 #include "fileBrowser.h"
 
 #include "QtrListView.h"
 #include <qpushbutton.h>
 #include <qfile.h>
 #include <qmessagebox.h>
 #include <unistd.h>
 #include <qlayout.h>
 
 fileBrowser::fileBrowser( QWidget* parent,  const char* name, bool modal, WFlags fl , const QString filter, const QString iPath )
-    : QDialog( parent, name, modal, fl )
+    : QDialog( parent, name, modal, fl ), filterspec(QDir::All)
 {
 //    showMaximized();
     if ( !name )
         setName( "fileBrowser" );
     if (parent != NULL) resize( parent->width(), parent->height() );
     setCaption(tr( "Browse for file" ) );
     filterStr=filter;
 
     buttonOk = new QPushButton( this, "buttonOk" );
     buttonOk->setFixedSize( 25, 25 );
+    buttonOk->setAutoDefault( false );
     buttonOk->setText( tr( "/" ) );
 
+    buttonShowHidden = new QPushButton( this, "buttonShowHidden" );
+//    buttonShowHidden->setFixedSize( 50, 25 );
+    buttonShowHidden->setText( tr( "Hidden" ) );
+    buttonShowHidden->setAutoDefault( false );
+    buttonShowHidden->setToggleButton( true );
+    buttonShowHidden->setOn( false );
+
     dirLabel = new QLabel(this, "DirLabel");
     dirLabel->setText(currentDir.canonicalPath());
 
     ListView = new QtrListView( this, "ListView" );
     ListView->addColumn( tr( "Name" ) );
     ListView->setSorting( 2, FALSE);
     ListView->addColumn( tr( "Size" ) );
     ListView->setSelectionMode(QListView::Single);
-
     ListView->setAllColumnsShowFocus( TRUE );
 
     // signals and slots connections
+    connect( buttonShowHidden, SIGNAL( toggled(bool) ), this, SLOT( setHidden(bool) ) );
     connect( buttonOk, SIGNAL( clicked() ), this, SLOT( OnRoot() ) );
     connect( ListView, SIGNAL(doubleClicked( QListViewItem*)), SLOT(listDoubleClicked(QListViewItem *)) );
     connect( ListView, SIGNAL(clicked( QListViewItem*)), SLOT(listClicked(QListViewItem *)) );
     connect( ListView, SIGNAL(OnOKButton( QListViewItem*)), SLOT(listClicked(QListViewItem *)) );
     connect( ListView, SIGNAL(OnCentreButton( QListViewItem*)), SLOT(listClicked(QListViewItem *)) );
     connect( ListView, SIGNAL(OnCancelButton()), SLOT(OnCancel()) );
 
     QVBoxLayout* grid = new QVBoxLayout(this);
     QHBoxLayout* hgrid = new QHBoxLayout(grid);
     hgrid->addWidget(dirLabel,1);
+    hgrid->addWidget(buttonShowHidden);
     hgrid->addWidget(buttonOk);
     grid->addWidget(ListView,1);
 
     if (QFileInfo(iPath).exists())
     {
         currentDir.setPath(iPath);
         chdir(iPath.latin1());
     }
     else
     {
         currentDir.setPath(QDir::currentDirPath());
         chdir(QDir::currentDirPath().latin1());
@@ -76,54 +85,55 @@ void fileBrowser::resizeEvent(QResizeEvent* e)
 }
 
 fileBrowser::~fileBrowser()
 {
 }
 
 
 void fileBrowser::populateList()
 {
     ListView->clear();
 //qDebug(currentDir.canonicalPath());
 //    currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::NoSymLinks );
-    currentDir.setFilter( QDir::All );
+    currentDir.setFilter( filterspec );
     currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     currentDir.setMatchAllDirs(TRUE);
 
     currentDir.setNameFilter(filterStr);
 //    currentDir.setNameFilter("*.txt;*.etx");
     QString fileL, fileS;
-    const QFileInfoList *list = currentDir.entryInfoList(QDir::All);
+    const QFileInfoList *list = currentDir.entryInfoList();
     QFileInfoListIterator it(*list);
     QFileInfo *fi;
     while ( (fi=it.current()) )
     {
         if (fi->fileName() != ".")
         {
             fileS.sprintf( "%10li", fi->size() );
             fileL.sprintf( "%s",fi->fileName().data() );
             if( fi->isDir() )
             {
                 fileL+="/";
             } 
             else 
             {
 //        qDebug("Not a dir: "+currentDir.canonicalPath()+fileL);
             }
             new QListViewItem( ListView,fileL,fileS );
         }
         ++it;
     }
     ListView->setSorting( 2, FALSE);
     dirLabel->setText("Current Directory:\n"+currentDir.canonicalPath());
+    ListView->setFocus();
 }
 
 void fileBrowser::upDir()
 {
 //    qDebug(currentDir.canonicalPath());
 }
 
 void fileBrowser::listClicked(QListViewItem *selectedItem)
 {
     if (selectedItem == NULL) return;
     QString strItem=selectedItem->text(0);
 
@@ -174,12 +184,21 @@ void fileBrowser::OnOK() {
 
 void fileBrowser::OnRoot()
 {
     currentDir.cd("/", TRUE);
     populateList();
     chdir("/");
 }
 
 void fileBrowser::OnCancel()
 {
     reject();
 }
+
+void fileBrowser::setHidden(bool _hidden)
+{
+    if (_hidden)
+        filterspec = QDir::All | QDir::Hidden;
+    else
+        filterspec = QDir::All;
+    populateList();
+}