8 files changed, 96 insertions, 30 deletions

diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp
index 7c8c88d..eafff1d 100644
--- a/noncore/graphics/opie-eye/gui/iconview.cpp
+++ b/noncore/graphics/opie-eye/gui/iconview.cpp
@@ -144,24 +144,25 @@ namespace {
 /*
  * Set up the GUI.. initialize the slave set up gui
  * and also load a dir
  */
 PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg )
     : QVBox( wid ), m_cfg( cfg ), m_updatet( false )
 {
     {
         QCopEnvelope( "QPE/Application/opie-eye_slave", "refUp()" );
     }
     m_path = QDir::homeDirPath();
     m_mode = 0;
+    m_internalReset = false;
 
     QHBox *hbox = new QHBox( this );
     QLabel* lbl = new QLabel( hbox );
     lbl->setText(  tr("View as" ) );
 
     m_views = new QComboBox( hbox, "View As" );
 
     m_view= new QIconView( this );
     connect(m_view, SIGNAL(clicked(QIconViewItem*) ),
             this, SLOT(slotClicked(QIconViewItem*)) );
     connect(m_view, SIGNAL(returnPressed(QIconViewItem*)),
             this, SLOT(slotClicked(QIconViewItem*)) );
@@ -354,25 +355,27 @@ void PIconView::slotTrash() {
 
 /*
  * see what views are available
  */
 void PIconView::loadViews() {
     ViewMap::Iterator it;
     ViewMap* map = viewMap();
     for ( it = map->begin(); it != map->end(); ++it )
         m_views->insertItem(  it.key()  );
 }
 
 void PIconView::resetView() {
+    m_internalReset = true;
     slotViewChanged(m_views->currentItem());
+    m_internalReset = false;
 }
 
 /*
  *swicth view reloadDir and connect signals
  */
 void PIconView::slotViewChanged( int i) {
     if (!m_views->count() ) {
         setCurrentView( 0l);
         return;
     }
 
     PDirView* cur = currentView();
@@ -398,26 +401,29 @@ void PIconView::slotViewChanged( int i) {
     /* connect to the signals of the lister */
     PDirLister* lis = cur->dirLister();
     connect(lis, SIGNAL(sig_thumbInfo(const QString&, const QString& )),
             this, SLOT( slotThumbInfo(const QString&, const QString&)));
     connect(lis, SIGNAL( sig_thumbNail(const QString&, const QPixmap&)),
             this, SLOT(slotThumbNail(const QString&, const QPixmap&)));
     connect(lis, SIGNAL(sig_start()),
             this, SLOT(slotStart()));
     connect(lis, SIGNAL(sig_end()) ,
             this, SLOT(slotEnd()) );
 
 
-    /*  reload now with default Path*/
-    m_path = lis->defaultPath();
+    /*  reload now with default Path
+     * but only if it isn't a reset like from setupdlg
+     */
+    if (!m_internalReset)
+        m_path = lis->defaultPath();
     QTimer::singleShot( 0,  this, SLOT(slotReloadDir()));
 }
 
 
 void PIconView::slotReloadDir() {
     slotChangeDir( m_path );
 }
 
 
 /*
  * add files and folders
  */
diff --git a/noncore/graphics/opie-eye/gui/iconview.h b/noncore/graphics/opie-eye/gui/iconview.h
index dff55ed..bea35c2 100644
--- a/noncore/graphics/opie-eye/gui/iconview.h
+++ b/noncore/graphics/opie-eye/gui/iconview.h
@@ -86,15 +86,16 @@ private slots:
     void slotThumbInfo(const QString&, const QString&);
     void slotThumbNail(const QString&, const QPixmap&);
 
     void  slotChangeMode( int );
 private:
     Opie::Core::OKeyConfigManager *m_viewManager;
     Opie::Core::OConfig *m_cfg;
     QComboBox* m_views;
     QIconView* m_view;
     QString m_path;
     bool m_updatet : 1;
     int m_mode;
+    bool m_internalReset:1;
 };
 
 #endif
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp
index 6660eb2..30c9bf1 100644
--- a/noncore/graphics/opie-eye/gui/mainwindow.cpp
+++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp
@@ -164,31 +164,33 @@ void PMainWindow::slotConfig() {
 /*
  * Add the KeyConfigWidget
  */
     Opie::Ui::OKeyConfigWidget* keyWid = new Opie::Ui::OKeyConfigWidget( wid, "key config" );
     keyWid->setChangeMode( Opie::Ui::OKeyConfigWidget::Queue );
     keyWid->insert( tr("Browser Keyboard Actions"), m_view->manager() );
     QWidget*w = m_stack->visibleWidget();
 
     bool reminfo = false;
     if ( !m_info ) {
         reminfo = true;
         initInfo();
+        m_info->hide();
     }
     keyWid->insert( tr("Imageinfo Keyboard Actions"), m_info->manager() );
 
     bool remdisp = false;
     if ( !m_disp ) {
         remdisp = true;
         initDisp();
+        m_disp->hide();
     }
     keyWid->insert( tr("Imageview Keyboard Actions"), m_disp->manager() );
 
     keyWid->load();
     wid->addTab( keyWid, QString::fromLatin1("AppsIcon" ), tr("Keyboard Configuration") );
     wid->setCurrentTab(0);
     bool act = ( QPEApplication::execDialog( &dlg ) == QDialog::Accepted );
 
 /*
  * clean up
  *apply changes
  */
diff --git a/noncore/graphics/opie-eye/impl/dir/dir_dirview.cpp b/noncore/graphics/opie-eye/impl/dir/dir_dirview.cpp
index 97e3dcb..fc502d4 100644
--- a/noncore/graphics/opie-eye/impl/dir/dir_dirview.cpp
+++ b/noncore/graphics/opie-eye/impl/dir/dir_dirview.cpp
@@ -1,29 +1,33 @@
 #include "dir_lister.h"
 #include "dir_ifaceinfo.h"
 #include "dir_dirview.h"
 
 PHUNK_VIEW_INTERFACE("Dir View", Dir_DirView );
 
 
 Dir_DirView::Dir_DirView( const Config& cfg)
     : PDirView(cfg)
 {
-    m_cfg = cfg.readBoolEntry( "Dir_Check_All_Files", true);
+    m_cfg = cfg.readBoolEntry( "Dir_Check_All_Files", false);
+    m_recursive = cfg.readBoolEntry( "Dir_Check_Recursive_Files", false);
+    m_recursive_depth = cfg.readNumEntry("Dir_Recursive_Files_Depth",10);
     m_lister = 0;
     m_info = 0;
 }
 
 Dir_DirView::~Dir_DirView() {
 }
 
 PInterfaceInfo* Dir_DirView::interfaceInfo()const{
-    if (!m_info )
-        m_info =new DirInterfaceInfo;
+    if (!m_info ) {
+        m_info = new DirInterfaceInfo;
+    }
     return m_info;
 }
 
 PDirLister* Dir_DirView::dirLister()const{
-    if (!m_lister )
-        m_lister = new Dir_DirLister(m_cfg);
+    if (!m_lister ) {
+        m_lister = new Dir_DirLister(m_cfg,m_recursive,m_recursive_depth);
+    }
     return m_lister;
 }
diff --git a/noncore/graphics/opie-eye/impl/dir/dir_dirview.h b/noncore/graphics/opie-eye/impl/dir/dir_dirview.h
index 3b9b7a6..89cf6c9 100644
--- a/noncore/graphics/opie-eye/impl/dir/dir_dirview.h
+++ b/noncore/graphics/opie-eye/impl/dir/dir_dirview.h
@@ -7,18 +7,20 @@
 
 #include <iface/dirview.h>
 
 
 struct Dir_DirView : public PDirView {
     Dir_DirView(  const Config& );
     ~Dir_DirView();
 
     PInterfaceInfo* interfaceInfo()const;
     PDirLister* dirLister()const;
 private:
     bool m_cfg : 1;
+    bool m_recursive:1;
+    int m_recursive_depth;
     mutable PDirLister* m_lister;
     mutable PInterfaceInfo *m_info;
 };
 
 
 #endif
diff --git a/noncore/graphics/opie-eye/impl/dir/dir_ifaceinfo.cpp b/noncore/graphics/opie-eye/impl/dir/dir_ifaceinfo.cpp
index 9c69ce5..1e4ec40 100644
--- a/noncore/graphics/opie-eye/impl/dir/dir_ifaceinfo.cpp
+++ b/noncore/graphics/opie-eye/impl/dir/dir_ifaceinfo.cpp
@@ -7,52 +7,76 @@
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qpe/config.h>
 
 /* QT */
 #include <qwidget.h>
 #include <qcheckbox.h>
 #include <qframe.h>
 #include <qhbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
+#include <qspinbox.h>
 
 namespace {
     class DirImageWidget : public QFrame {
     public:
         DirImageWidget(): QFrame() {
             setFrameStyle(Box|Raised);
             QVBoxLayout *m_MainLayout = new QVBoxLayout( this, 6, 2, "m_MainLayout");
+            QGridLayout*RecDepthLayout = new QGridLayout( 0, 1, 1, 0, 6, "RecDepthLayout");
+
             chkbox = new QCheckBox( QObject::tr("Show all files"), this );
             m_MainLayout->addWidget(chkbox);
+            recWarningLabel = new QLabel(this);
+            recWarningLabel->setText(QObject::tr("<center><b>Be carefull with the following options!</b></center>"));
+            m_MainLayout->addWidget(recWarningLabel);
+            recBox = new QCheckBox( QObject::tr("Show files recursive"),this);
+            m_MainLayout->addWidget(recBox);
+            recDepthLabel = new QLabel(this);
+            recDepthLabel->setText(QObject::tr("Recursion depth:"));
+            RecDepthLayout->addWidget(recDepthLabel,0,0);
+            recDepth = new QSpinBox(this);
+            recDepth->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Fixed));
+            recDepth->setMaxValue(10);
+            recDepth->setMinValue(1);
+            recDepth->setSuffix(QObject::tr(" directories"));
+            RecDepthLayout->addWidget(recDepth,0,1);
+            m_MainLayout->addLayout(RecDepthLayout);
             QSpacerItem *spacer1 = new QSpacerItem( 20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding );
             m_MainLayout->addItem( spacer1 );
 
         }
         ~DirImageWidget() {}
-        QCheckBox* chkbox;
+        QCheckBox* chkbox,*recBox;
+        QSpinBox * recDepth;
+        QLabel* recDepthLabel,*recWarningLabel;
+
     };
 }
 
 
 DirInterfaceInfo::DirInterfaceInfo() {
 }
 DirInterfaceInfo::~DirInterfaceInfo() {
 }
 
 QString DirInterfaceInfo::name()const {
     return QObject::tr("Directory View" );
 }
 
 QWidget* DirInterfaceInfo::configWidget(const Config& cfg) {
     DirImageWidget* wid = new DirImageWidget();
-    wid->chkbox->setChecked(  cfg.readBoolEntry("Dir_Check_All_Files", true) );
-
+    wid->chkbox->setChecked(cfg.readBoolEntry("Dir_Check_All_Files",false));
+    wid->recBox->setChecked(cfg.readBoolEntry("Dir_Check_Recursive_Files",false));
+    wid->recDepth->setValue(cfg.readNumEntry("Dir_Recursive_Files_Depth",10));
     return wid;
 }
 
 void DirInterfaceInfo::writeConfig( QWidget* _wid, Config& cfg) {
     owarn << "Write Config" << oendl;
     DirImageWidget* wid = static_cast<DirImageWidget*>(_wid);
-    cfg.writeEntry("Dir_Check_All_Files", wid->chkbox->isChecked() );
+    cfg.writeEntry("Dir_Check_All_Files", wid->chkbox->isChecked());
+    cfg.writeEntry("Dir_Check_Recursive_Files", wid->recBox->isChecked());
+    cfg.writeEntry("Dir_Recursive_Files_Depth",wid->recDepth->value());
 }
diff --git a/noncore/graphics/opie-eye/impl/dir/dir_lister.cpp b/noncore/graphics/opie-eye/impl/dir/dir_lister.cpp
index d8b332a..ff33cf2 100644
--- a/noncore/graphics/opie-eye/impl/dir/dir_lister.cpp
+++ b/noncore/graphics/opie-eye/impl/dir/dir_lister.cpp
@@ -7,72 +7,91 @@
 #include <lib/slavemaster.h>
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 using namespace Opie::Core;
 
 /* QT */
 #include <qdir.h>
 #include <qfileinfo.h>
 
-Dir_DirLister::Dir_DirLister( bool list )
+Dir_DirLister::Dir_DirLister( bool list,bool rec,int recdepth )
     : PDirLister( "dir_dir_lister" )
 {
     m_allFiles = list;
+    m_recursive = rec;
+    m_recDepth = recdepth;
+    if (m_recDepth<1) m_recDepth = 1;
+    if (m_recDepth>10) m_recDepth = 10;
     owarn << "All Files " << m_allFiles << "" << oendl;
     SlaveHelper::slaveConnectSignals( this );
+    m_Filter = (m_allFiles?"*":"*.jpg;*.jpeg;*.JPG;*.PNG;*.GIF;*.BMP;*.png;*.bmp;*.gif");
 }
 
 QString Dir_DirLister::defaultPath()const {
     return QPEApplication::documentDir();
 }
 
 QString Dir_DirLister::setStartPath( const QString& path ) {
     m_currentDir.cd( path );
     if (!m_currentDir.exists() )
         m_currentDir.cd(defaultPath());
 
 
     return m_currentDir.absPath();
 }
 
 QString Dir_DirLister::currentPath()const {
     return m_currentDir.absPath();
 }
 
 
 QStringList Dir_DirLister::folders()const {
     return m_currentDir.entryList( QDir::Dirs );
 }
 
-QStringList Dir_DirLister::files()const {
-    if ( m_allFiles )
-        return m_currentDir.entryList( QDir::Files );
-    else {
-        QStringList out;
-        QStringList list = m_currentDir.entryList(  QDir::Files | QDir::Readable );
-        for (QStringList::Iterator it = list.begin(); it != list.end();++it ) {
-            QFileInfo inf( *it );
-            QString ext = inf.extension(false).lower();
-            if( ext == QString::fromLatin1("jpg") ||
-                ext == QString::fromLatin1("jpeg" ) ||
-                ext == QString::fromLatin1("png" ) ||
-                ext == QString::fromLatin1("bmp" ) ||
-                ext == QString::fromLatin1("gif" ) )
-                out.append( *it );
+QStringList Dir_DirLister::recFiles(const QString&aPath,int currentDepth)const
+{
+    QStringList all;
+    if (currentDepth>m_recDepth) return all;
+
+    QString subPath;
+    subPath = aPath;
+    if (subPath.length()==0) {
+        subPath=".";
+    }
+    QDir checkDir(currentPath()+"/"+aPath);
+
+    QStringList p = checkDir.entryList( QDir::Dirs );
+    all+=checkDir.entryList(m_Filter,QDir::Files|QDir::Readable);
+    QStringList tmp;
+    for (unsigned i = 0; i < p.count();++i) {
+        if (p[i]=="." || p[i]=="..") continue;
+        tmp =recFiles(subPath+"/"+p[i],currentDepth+1);
+        for (unsigned j = 0; j < tmp.count();++j) {
+            all.append(p[i]+"/"+tmp[j]);
         }
-        return out;
     }
+    return all;
+}
+
+QStringList Dir_DirLister::files()const
+{
+    if (m_recursive) {
+        odebug << "Startpfad: "<<m_currentDir.absPath()<<oendl;
+        return recFiles("",0);
+    }
+    return m_currentDir.entryList(m_Filter,QDir::Files|QDir::Readable);
 }
 
 void Dir_DirLister::deleteImage( const QString& fl) {
     QFile::remove( fl );
 }
 
 void Dir_DirLister::thumbNail( const QString& str, int w, int h) {
     SlaveMaster::self()->thumbNail( str, w, h );
 }
 
 QImage Dir_DirLister::image( const QString& str, Factor f, int m) {
     return SlaveMaster::self()->image( str, f, m );
diff --git a/noncore/graphics/opie-eye/impl/dir/dir_lister.h b/noncore/graphics/opie-eye/impl/dir/dir_lister.h
index d6ca6c0..445adbf 100644
--- a/noncore/graphics/opie-eye/impl/dir/dir_lister.h
+++ b/noncore/graphics/opie-eye/impl/dir/dir_lister.h
@@ -4,34 +4,42 @@
 
 #ifndef DIR_LISTER_INTERFACE_LISTER_H
 #define DIR_LISTER_INTERFACE_LISTER_H
 
 #include <qdir.h>
 
 #include <iface/dirlister.h>
 
 class Config;
 class Dir_DirLister : public PDirLister {
     Q_OBJECT
 public:
-    Dir_DirLister( bool );
+    Dir_DirLister(bool,bool,int);
     virtual ~Dir_DirLister(){}
 
     QString defaultPath()const;
     QString setStartPath( const QString& );
     QString currentPath()const;
     QStringList folders()const;
     QStringList files()const;
 
     void deleteImage( const QString& );
     void thumbNail( const QString&, int, int );
     QImage image( const QString&, Factor, int );
     void imageInfo( const QString& );
     void fullImageInfo( const QString& );
     virtual QString nameToFname(const QString&name)const;
 
 private:
-    bool m_allFiles;
+    bool m_allFiles:1;
+    bool m_recursive:1;
+    int m_recDepth;
     QDir m_currentDir;
+    //! recursive listing.
+    /*!
+     * \param path this is the offset to the current path. eg. when currentDepth = 0 then it MUST empty
+     */
+    QStringList recFiles(const QString&path,int currentDepth)const;
+    QString m_Filter;
 };
 
 #endif