- add OFileDialog::getDirectory()

  this function open a file dialog to select a directory.
  it can show Directories and All Directories.
  the first one is without and the second is with hidden directories.

4 files changed, 89 insertions, 20 deletions

diff --git a/libopie2/opieui/fileselector/ofiledialog.cpp b/libopie2/opieui/fileselector/ofiledialog.cpp
index beb4d6c..ebce0ef 100644
--- a/libopie2/opieui/fileselector/ofiledialog.cpp
+++ b/libopie2/opieui/fileselector/ofiledialog.cpp
@@ -49,49 +49,52 @@ namespace
  * helper to extract the dir out of a file name
  */
 /**
  * This method will use Config( argv[0] );
  * @param key The group key used
  */
 QString lastUsedDir( const QString& key )
 {
     if ( qApp->argc() < 1 )
         return QString::null;
 
     Config cfg( QFileInfo(qApp->argv()[0]).fileName() ); // appname
     cfg.setGroup( key );
     return cfg.readEntry("LastDir", QPEApplication::documentDir() );
 }
 
 void saveLastDir( const QString& key, const QString& file )
 {
     if ( qApp->argc() < 1 )
         return;
 
     Config cfg(  QFileInfo(qApp->argv()[0]).fileName() );
     cfg.setGroup( key );
     QFileInfo inf( file );
-    cfg.writeEntry("LastDir", inf.dirPath( true ) );
+    if ( inf.isFile() )
+        cfg.writeEntry("LastDir", inf.dirPath( true ) );
+    else
+        cfg.writeEntry("LastDir", file );
 }
 };
 
 /**
  * This constructs a modal dialog
  *
  * @param caption The caption of the dialog
  * @param wid The parent widget
  * @param mode The mode of the OFileSelector @see OFileSelector
  * @param selector The selector of the OFileSelector
  * @param dirName the dir or resource to start from
  * @param fileName  a proposed or existing filename
  * @param mimetypes The mimeTypes
  */
 OFileDialog::OFileDialog(const QString &caption,
                          QWidget *wid, int mode, int selector,
                          const QString &dirName,
                          const QString &fileName,
                          const QMap<QString,QStringList>& mimetypes )
         : QDialog( wid, "OFileDialog", true )
 {
     //  QVBoxLayout *lay = new QVBoxLayout(this);
     //showMaximized();
     QVBoxLayout *lay = new QVBoxLayout(this );
@@ -183,40 +186,70 @@ QString OFileDialog::getOpenFileName(int selector,
 QString OFileDialog::getSaveFileName(int selector,
                                      const QString &_startDir,
                                      const QString &file,
                                      const MimeTypes &mimes,
                                      QWidget *wid,
                                      const QString &caption )
 {
     QString ret;
     QString startDir = _startDir;
     if (startDir.isEmpty() )
         startDir = lastUsedDir( "FileDialog-SAVE" );
 
     OFileDialog dlg( caption.isEmpty() ? tr("Save") : caption,
                      wid, OFileSelector::Save, selector, startDir, file, mimes);
     dlg.showMaximized();
     if( dlg.exec() )
     {
         ret = dlg.fileName();
         saveLastDir( "FileDialog-SAVE", ret );
     }
 
     return ret;
 }
 
+/**
+ * This opens up a filedialog in select directory mode
+ *
+ * @param selector the Selector Mode
+ * @param startDir Where to start from
+ * @param wid the parent
+ * @param caption of the dialog if QString::null tr("Open") will be used
+ * @return the directoryName or QString::null
+ */
+QString OFileDialog::getDirectory(int selector,
+                                 const QString &_startDir,
+                                 QWidget *wid,
+                                 const QString &caption )
+{
+    QString ret;
+    QString startDir = _startDir;
+    if ( startDir.isEmpty() )
+        startDir = lastUsedDir( "FileDialog-SELECTDIR" );
+
+    OFileDialog dlg( caption.isEmpty() ? tr( "Select Directory" ) : caption,
+                     wid, OFileSelector::DirectorySelector, selector, startDir );
+    dlg.showMaximized();
+    if ( dlg.exec() )
+    {
+        ret = dlg.fileName();
+        saveLastDir( "FileDialog-SELECTDIR", ret );
+    }
+    return ret;
+}
+
 void OFileDialog::slotFileSelected(const QString & )
 {
     accept();
 }
 
 void OFileDialog::slotSelectorOk( )
 {
     accept();
 }
 
 void OFileDialog::slotDirSelected(const QString &dir )
 {
     setCaption( dir );
     // if mode
     //accept();
 }
diff --git a/libopie2/opieui/fileselector/ofiledialog.h b/libopie2/opieui/fileselector/ofiledialog.h
index dfecf3d..569f45c 100644
--- a/libopie2/opieui/fileselector/ofiledialog.h
+++ b/libopie2/opieui/fileselector/ofiledialog.h
@@ -68,43 +68,48 @@ public:
     OFileDialog(const QString &caption,
                 QWidget *, int mode, int selector,
                 const QString &dirName,
                 const QString &fileName = QString::null,
                 const MimeTypes &mimetypes = MimeTypes()  );
     QString mimetype() const;
     QString fileName() const;
     DocLnk selectedDocument()const;
 
     // static methods
     static QString getOpenFileName(int selector,
                                    const QString& startDir = QString::null,
                                    const QString &fileName = QString::null,
                                    const MimeTypes& mime = MimeTypes(),
                                    QWidget *wid = 0,
                                    const QString &caption = QString::null );
 
     static QString getSaveFileName(int selector,
                                    const QString& startDir = QString::null,
                                    const QString& fileName = QString::null,
                                    const MimeTypes& mimefilter = MimeTypes(),
                                    QWidget *wid = 0,
                                    const QString &caption = QString::null );
 
+    static QString getDirectory(int selector,
+                                const QString &startDir = QString::null,
+                                QWidget *wid = 0,
+                                const QString &caption = QString::null );
+
     //let's OFileSelector catch up first
     //static QString getExistingDirectory(const QString& startDir = QString::null,
     //QWidget *parent = 0, const QString& caption = QString::null );
     
 private:
     class OFileDialogPrivate;
     OFileDialogPrivate *d;
     OFileSelector *file;
 
 private slots:
     void slotFileSelected( const QString & );
     void slotDirSelected(const QString & );
     void slotSelectorOk();
 };
 
 }
 }
 
 #endif
diff --git a/libopie2/opieui/fileselector/ofileselector.cpp b/libopie2/opieui/fileselector/ofileselector.cpp
index b06defd..346eeae 100644
--- a/libopie2/opieui/fileselector/ofileselector.cpp
+++ b/libopie2/opieui/fileselector/ofileselector.cpp
@@ -407,52 +407,55 @@ OFileSelectorItem* OFileViewFileListView::currentItem()const
 
 void OFileViewFileListView::reread( bool all )
 {
     m_view->clear();
 
     if (selector()->showClose() )
         m_btnClose->show();
     else
         m_btnClose->hide();
 
     if (selector()->showNew() )
         m_btnNew->show();
     else
         m_btnNew->hide();
 
     m_mimes = selector()->currentMimeType();
     m_all = all;
 
     QDir dir( m_currentDir );
     if (!dir.exists() )
         return;
 
     dir.setSorting( QDir::Name | QDir::DirsFirst | QDir::Reversed );
     int filter;
-    if (m_all )
-        filter = QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All;
-    else
-        filter = QDir::Files | QDir::Dirs | QDir::All;
+    filter = QDir::Dirs;
+    if ( selector()->mode() != OFileSelector::DIRECTORYSELECTOR )
+        filter = filter | QDir::Files | QDir::All;
+
+    if ( m_all )
+        filter = filter | QDir::Hidden;
+
     dir.setFilter( filter );
 
     // now go through all files
     const QFileInfoList *list = dir.entryInfoList();
     if (!list)
     {
         cdUP();
         return;
     }
 
     QFileInfoListIterator it( *list );
     QFileInfo *fi;
     while( (fi=it.current() ) )
     {
         if( fi->fileName() == QString::fromLatin1("..") || fi->fileName() == QString::fromLatin1(".") )
         {
             ++it;
             continue;
         }
 
         /*
          * It is a symlink we try to resolve it now but don't let us attack by DOS
          *
          */
@@ -793,49 +796,49 @@ void OFileViewFileSystem::reread()
     if (!m_view)
         return;
 
     m_view->reread( m_all );
 }
 
 int OFileViewFileSystem::fileCount()const
 {
     if (!m_view )
         return -1;
     return m_view->fileCount();
 }
 
 QWidget* OFileViewFileSystem::widget( QWidget* parent )
 {
     if (!m_view )
     {
         m_view = new OFileViewFileListView( parent, startDirectory(), selector() );
     }
     return m_view;
 }
 
 void OFileViewFileSystem::activate( const QString& str)
 {
-    m_all = (str != QObject::tr("Files") );
+    m_all = ( str.find( "All" ) != -1 );
 }
 
 
 }
 /* Selector */
 /**
  * @short new and complete c'tor
  *
  * Create a OFileSelector to let the user select a file. It can
  * either be used to open a file, select a save name in a dir or
  * as a dropin for the FileSelector.
  *
  * <pre>
  *  QMap<QString, QStringList> mimeTypes;
  *  QStringList types;
  *  types << "text@slash* ";
  *  types << "audio@slash*";
  *  mimeTypes.insert( tr("Audio and Text"), types );
  *  mimeTypes.insert( tr("All"), "*@slash*);
  *
  *  now you could create your fileselector
  * </pre>
  *
  *
@@ -853,58 +856,73 @@ OFileSelector::OFileSelector( QWidget* parent, int mode, int sel,
                               const QString& dirName, const QString& fileName,
                               const MimeTypes& mimetypes,
                               bool showNew,  bool showClose)
               :QWidget( parent, "OFileSelector" )
 {
     m_current = 0;
     m_shNew = showNew;
     m_shClose = showClose;
     m_mimeType = mimetypes;
     m_startDir = dirName;
 
     m_mode = mode;
     m_selector = sel;
 
     initUI();
     m_lneEdit->setText( fileName );
     initMime();
     initViews();
 
     QString str;
     switch ( m_selector )
     {
     default:
     case Normal:
-        str = QObject::tr("Documents");
+        if ( m_mode == DIRECTORYSELECTOR )
+            str = QObject::tr("Directories");
+        else
+            str = QObject::tr("Documents");
         m_cmbView->setCurrentItem( 0 );
         break;
     case Extended:
-        str = QObject::tr("Files");
-        m_cmbView->setCurrentItem( 1 );
+        if ( m_mode == DIRECTORYSELECTOR )
+        {
+            str = QObject::tr("Directories");
+            m_cmbView->setCurrentItem( 0 );
+        } else {
+            str = QObject::tr("Files");
+            m_cmbView->setCurrentItem( 1 );
+        }
         break;
     case ExtendedAll:
-        str = QObject::tr("All Files");
-        m_cmbView->setCurrentItem( 2 );
+        if ( m_mode == DIRECTORYSELECTOR )
+        {
+            str = QObject::tr("All Directories");
+            m_cmbView->setCurrentItem( 1 );
+        } else {
+            str = QObject::tr("All Files");
+            m_cmbView->setCurrentItem( 2 );
+        }
         break;
     }
     slotViewChange( str );
 
 }
 
 
 /**
  * This a convience c'tor to just substitute the use of FileSelector
  */
 OFileSelector::OFileSelector( const QString& mimeFilter, QWidget* parent, const char* name,
                               bool showNew, bool showClose )
         : QWidget( parent, name )
 {
     m_current = 0;
     m_shNew   = showNew;
     m_shClose = showClose;
     m_startDir = QPEApplication::documentDir();
 
     if (!mimeFilter.isEmpty() )
         m_mimeType.insert(mimeFilter, QStringList::split(";", mimeFilter ) );
 
     m_mode = OFileSelector::FileSelector;
     m_selector = OFileSelector::Normal;
@@ -964,61 +982,73 @@ bool OFileSelector::eventFilter (QObject *, QEvent *e)
 }
 
 /*
  * This will insert the MimeTypes into the Combo Box
  * And also connect the changed signal
  *
  * AutoMimeTyping is disabled for now. It used to reparse a dir and then set available mimetypes
  */
 void OFileSelector::initMime()
 {
     MimeTypes::Iterator it;
     for ( it = m_mimeType.begin(); it != m_mimeType.end(); ++it )
     {
         m_cmbMime->insertItem( it.key() );
     }
     m_cmbMime->setCurrentItem( 0 );
 
     connect( m_cmbMime, SIGNAL(activated(int) ),
              this, SLOT(slotMimeTypeChanged() ) );
 
 }
 
 void OFileSelector::initViews()
 {
-    m_cmbView->insertItem( QObject::tr("Documents") );
-    m_cmbView->insertItem( QObject::tr("Files") );
-    m_cmbView->insertItem( QObject::tr("All Files") );
+    if ( m_mode == OFileSelector::DIRECTORYSELECTOR )
+    {
+        m_cmbView->insertItem( QObject::tr("Directories") );
+        m_cmbView->insertItem( QObject::tr("All Directories") );
+    } else {
+        m_cmbView->insertItem( QObject::tr("Documents") );
+        m_cmbView->insertItem( QObject::tr("Files") );
+        m_cmbView->insertItem( QObject::tr("All Files") );
+    }
+
     connect(m_cmbView, SIGNAL(activated(const QString&) ),
             this, SLOT(slotViewChange(const QString&) ) );
 
-
-    m_views.insert( QObject::tr("Documents"), new ODocumentFileView(this) );
-
     /* see above why add both */
     OFileViewInterface* in = new OFileViewFileSystem( this );
-    m_views.insert( QObject::tr("Files"), in );
-    m_views.insert( QObject::tr("All Files"), in );
+
+    if ( m_mode == OFileSelector::DIRECTORYSELECTOR )
+    {
+        m_views.insert( QObject::tr("Directories"), in );
+        m_views.insert( QObject::tr("All Directories"), in );
+    } else {
+        m_views.insert( QObject::tr("Documents"), new ODocumentFileView(this) );
+        m_views.insert( QObject::tr("Files"), in );
+        m_views.insert( QObject::tr("All Files"), in );
+    }
 }
 
 void OFileSelector::registerView( const Internal::OFileViewInterface* iface ) {
     m_viewsPtr.append( iface );
 }
 
 
 /**
  * d'tor
  */
 OFileSelector::~OFileSelector()
 {
     m_viewsPtr.setAutoDelete( true );
     m_viewsPtr.clear();
 }
 
 
 
 /**
  * Convience function for the fileselector
  * make sure to delete the DocLnk
  *
  * @see DocLnk
  * @todo remove in ODP
diff --git a/libopie2/opieui/fileselector/ofileselector.h b/libopie2/opieui/fileselector/ofileselector.h
index de2b98a..b1cd405 100644
--- a/libopie2/opieui/fileselector/ofileselector.h
+++ b/libopie2/opieui/fileselector/ofileselector.h
@@ -64,50 +64,51 @@ class OFileViewFileListView;
 
 /**
  * @short a dropin replacement for the FileSelector
  *
  * This class is first used insert the OFileDialog.
  * It supports multiple view and mimetype filtering for now.
  *
  * @see OFileDialog
  * @see FileSelector
  * @author zecke
  * @version 0.1
  */
 class OFileSelector : public QWidget
 {
     Q_OBJECT
     friend class Internal::OFileViewInterface;
     friend class Internal::OFileViewFileListView;
 
 public:
     /**
      * The Mode of the Fileselector
      * Open = Open A File
      * Save = Save a File
      * FILESELECTOR = As A GUI in a screen to select a file
+     * SelectDir = Select a Directory
      */
-    enum Mode { Open=1, Save=2, FileSelector=4, OPEN=1, SAVE=2, FILESELECTOR=4 };
+    enum Mode { Open = 1, Save = 2, DirectorySelector = 3, FileSelector = 4, OPEN = 1, SAVE = 2, DIRECTORYSELECTOR = 3, FILESELECTOR = 4 };
     //    enum OldMode { OPEN=1, SAVE=2, FILESELECTOR = 4 };
     /**
      * Normal       = The old FileSelector
      * Extended     = Dir View
      * ExtendedAll  = Dir View with all hidden files
      * Default      = What the vendor considers best
      */
     enum Selector { Normal = 0, Extended=1,  ExtendedAll =2, Default=3,  NORMAL=0,EXTENDED=1, EXTENDED_ALL =2, DEFAULT=3 };
     //    enum OldSelector { NORMAL = 0, EXTENDED =1, EXTENDED_ALL = 2};
 
     OFileSelector(QWidget* parent, int mode, int selector,
                   const QString& dirName,
                   const QString& fileName,
                   const MimeTypes& mimetypes = MimeTypes(),
                   bool newVisible = FALSE, bool closeVisible = FALSE );
 
     OFileSelector(const QString& mimeFilter, QWidget* parent,
                   const char* name = 0,  bool newVisible = TRUE, bool closeVisible = FALSE );
     ~OFileSelector();
 
     const DocLnk* selected();
 
     QString selectedName()const;
     QString selectedPath()const;