author | ar <ar> | 2004-08-14 19:17:39 (UTC) |
---|---|---|
committer | ar <ar> | 2004-08-14 19:17:39 (UTC) |
commit | b7e50e77e0b22b3dd0feee43b15d0152d9ca8abb (patch) (unidiff) | |
tree | 8b1812fe843ecde7b7b12f8697ca4cf8f7444c0b | |
parent | 74363a9e1d5688d65286e7fea156227b68a28002 (diff) | |
download | opie-b7e50e77e0b22b3dd0feee43b15d0152d9ca8abb.zip opie-b7e50e77e0b22b3dd0feee43b15d0152d9ca8abb.tar.gz opie-b7e50e77e0b22b3dd0feee43b15d0152d9ca8abb.tar.bz2 |
- 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.
-rw-r--r-- | libopie2/opieui/fileselector/ofiledialog.cpp | 35 | ||||
-rw-r--r-- | libopie2/opieui/fileselector/ofiledialog.h | 5 | ||||
-rw-r--r-- | libopie2/opieui/fileselector/ofileselector.cpp | 66 | ||||
-rw-r--r-- | libopie2/opieui/fileselector/ofileselector.h | 3 |
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 | |||
@@ -71,5 +71,8 @@ void saveLastDir( const QString& key, const QString& file ) | |||
71 | cfg.setGroup( key ); | 71 | cfg.setGroup( key ); |
72 | QFileInfo inf( file ); | 72 | QFileInfo inf( file ); |
73 | cfg.writeEntry("LastDir", inf.dirPath( true ) ); | 73 | if ( inf.isFile() ) |
74 | cfg.writeEntry("LastDir", inf.dirPath( true ) ); | ||
75 | else | ||
76 | cfg.writeEntry("LastDir", file ); | ||
74 | } | 77 | } |
75 | }; | 78 | }; |
@@ -205,4 +208,34 @@ QString OFileDialog::getSaveFileName(int selector, | |||
205 | } | 208 | } |
206 | 209 | ||
210 | /** | ||
211 | * This opens up a filedialog in select directory mode | ||
212 | * | ||
213 | * @param selector the Selector Mode | ||
214 | * @param startDir Where to start from | ||
215 | * @param wid the parent | ||
216 | * @param caption of the dialog if QString::null tr("Open") will be used | ||
217 | * @return the directoryName or QString::null | ||
218 | */ | ||
219 | QString OFileDialog::getDirectory(int selector, | ||
220 | const QString &_startDir, | ||
221 | QWidget *wid, | ||
222 | const QString &caption ) | ||
223 | { | ||
224 | QString ret; | ||
225 | QString startDir = _startDir; | ||
226 | if ( startDir.isEmpty() ) | ||
227 | startDir = lastUsedDir( "FileDialog-SELECTDIR" ); | ||
228 | |||
229 | OFileDialog dlg( caption.isEmpty() ? tr( "Select Directory" ) : caption, | ||
230 | wid, OFileSelector::DirectorySelector, selector, startDir ); | ||
231 | dlg.showMaximized(); | ||
232 | if ( dlg.exec() ) | ||
233 | { | ||
234 | ret = dlg.fileName(); | ||
235 | saveLastDir( "FileDialog-SELECTDIR", ret ); | ||
236 | } | ||
237 | return ret; | ||
238 | } | ||
239 | |||
207 | void OFileDialog::slotFileSelected(const QString & ) | 240 | void OFileDialog::slotFileSelected(const QString & ) |
208 | { | 241 | { |
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 | |||
@@ -90,4 +90,9 @@ public: | |||
90 | const QString &caption = QString::null ); | 90 | const QString &caption = QString::null ); |
91 | 91 | ||
92 | static QString getDirectory(int selector, | ||
93 | const QString &startDir = QString::null, | ||
94 | QWidget *wid = 0, | ||
95 | const QString &caption = QString::null ); | ||
96 | |||
92 | //let's OFileSelector catch up first | 97 | //let's OFileSelector catch up first |
93 | //static QString getExistingDirectory(const QString& startDir = QString::null, | 98 | //static QString getExistingDirectory(const QString& startDir = QString::null, |
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 | |||
@@ -429,8 +429,11 @@ void OFileViewFileListView::reread( bool all ) | |||
429 | dir.setSorting( QDir::Name | QDir::DirsFirst | QDir::Reversed ); | 429 | dir.setSorting( QDir::Name | QDir::DirsFirst | QDir::Reversed ); |
430 | int filter; | 430 | int filter; |
431 | if (m_all ) | 431 | filter = QDir::Dirs; |
432 | filter = QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All; | 432 | if ( selector()->mode() != OFileSelector::DIRECTORYSELECTOR ) |
433 | else | 433 | filter = filter | QDir::Files | QDir::All; |
434 | filter = QDir::Files | QDir::Dirs | QDir::All; | 434 | |
435 | if ( m_all ) | ||
436 | filter = filter | QDir::Hidden; | ||
437 | |||
435 | dir.setFilter( filter ); | 438 | dir.setFilter( filter ); |
436 | 439 | ||
@@ -815,5 +818,5 @@ QWidget* OFileViewFileSystem::widget( QWidget* parent ) | |||
815 | void OFileViewFileSystem::activate( const QString& str) | 818 | void OFileViewFileSystem::activate( const QString& str) |
816 | { | 819 | { |
817 | m_all = (str != QObject::tr("Files") ); | 820 | m_all = ( str.find( "All" ) != -1 ); |
818 | } | 821 | } |
819 | 822 | ||
@@ -875,14 +878,29 @@ OFileSelector::OFileSelector( QWidget* parent, int mode, int sel, | |||
875 | default: | 878 | default: |
876 | case Normal: | 879 | case Normal: |
877 | str = QObject::tr("Documents"); | 880 | if ( m_mode == DIRECTORYSELECTOR ) |
881 | str = QObject::tr("Directories"); | ||
882 | else | ||
883 | str = QObject::tr("Documents"); | ||
878 | m_cmbView->setCurrentItem( 0 ); | 884 | m_cmbView->setCurrentItem( 0 ); |
879 | break; | 885 | break; |
880 | case Extended: | 886 | case Extended: |
881 | str = QObject::tr("Files"); | 887 | if ( m_mode == DIRECTORYSELECTOR ) |
882 | m_cmbView->setCurrentItem( 1 ); | 888 | { |
889 | str = QObject::tr("Directories"); | ||
890 | m_cmbView->setCurrentItem( 0 ); | ||
891 | } else { | ||
892 | str = QObject::tr("Files"); | ||
893 | m_cmbView->setCurrentItem( 1 ); | ||
894 | } | ||
883 | break; | 895 | break; |
884 | case ExtendedAll: | 896 | case ExtendedAll: |
885 | str = QObject::tr("All Files"); | 897 | if ( m_mode == DIRECTORYSELECTOR ) |
886 | m_cmbView->setCurrentItem( 2 ); | 898 | { |
899 | str = QObject::tr("All Directories"); | ||
900 | m_cmbView->setCurrentItem( 1 ); | ||
901 | } else { | ||
902 | str = QObject::tr("All Files"); | ||
903 | m_cmbView->setCurrentItem( 2 ); | ||
904 | } | ||
887 | break; | 905 | break; |
888 | } | 906 | } |
@@ -986,17 +1004,29 @@ void OFileSelector::initMime() | |||
986 | void OFileSelector::initViews() | 1004 | void OFileSelector::initViews() |
987 | { | 1005 | { |
988 | m_cmbView->insertItem( QObject::tr("Documents") ); | 1006 | if ( m_mode == OFileSelector::DIRECTORYSELECTOR ) |
989 | m_cmbView->insertItem( QObject::tr("Files") ); | 1007 | { |
990 | m_cmbView->insertItem( QObject::tr("All Files") ); | 1008 | m_cmbView->insertItem( QObject::tr("Directories") ); |
1009 | m_cmbView->insertItem( QObject::tr("All Directories") ); | ||
1010 | } else { | ||
1011 | m_cmbView->insertItem( QObject::tr("Documents") ); | ||
1012 | m_cmbView->insertItem( QObject::tr("Files") ); | ||
1013 | m_cmbView->insertItem( QObject::tr("All Files") ); | ||
1014 | } | ||
1015 | |||
991 | connect(m_cmbView, SIGNAL(activated(const QString&) ), | 1016 | connect(m_cmbView, SIGNAL(activated(const QString&) ), |
992 | this, SLOT(slotViewChange(const QString&) ) ); | 1017 | this, SLOT(slotViewChange(const QString&) ) ); |
993 | 1018 | ||
994 | |||
995 | m_views.insert( QObject::tr("Documents"), new ODocumentFileView(this) ); | ||
996 | |||
997 | /* see above why add both */ | 1019 | /* see above why add both */ |
998 | OFileViewInterface* in = new OFileViewFileSystem( this ); | 1020 | OFileViewInterface* in = new OFileViewFileSystem( this ); |
999 | m_views.insert( QObject::tr("Files"), in ); | 1021 | |
1000 | m_views.insert( QObject::tr("All Files"), in ); | 1022 | if ( m_mode == OFileSelector::DIRECTORYSELECTOR ) |
1023 | { | ||
1024 | m_views.insert( QObject::tr("Directories"), in ); | ||
1025 | m_views.insert( QObject::tr("All Directories"), in ); | ||
1026 | } else { | ||
1027 | m_views.insert( QObject::tr("Documents"), new ODocumentFileView(this) ); | ||
1028 | m_views.insert( QObject::tr("Files"), in ); | ||
1029 | m_views.insert( QObject::tr("All Files"), in ); | ||
1030 | } | ||
1001 | } | 1031 | } |
1002 | 1032 | ||
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 | |||
@@ -86,6 +86,7 @@ public: | |||
86 | * Save = Save a File | 86 | * Save = Save a File |
87 | * FILESELECTOR = As A GUI in a screen to select a file | 87 | * FILESELECTOR = As A GUI in a screen to select a file |
88 | * SelectDir = Select a Directory | ||
88 | */ | 89 | */ |
89 | enum Mode { Open=1, Save=2, FileSelector=4, OPEN=1, SAVE=2, FILESELECTOR=4 }; | 90 | enum Mode { Open = 1, Save = 2, DirectorySelector = 3, FileSelector = 4, OPEN = 1, SAVE = 2, DIRECTORYSELECTOR = 3, FILESELECTOR = 4 }; |
90 | // enum OldMode { OPEN=1, SAVE=2, FILESELECTOR = 4 }; | 91 | // enum OldMode { OPEN=1, SAVE=2, FILESELECTOR = 4 }; |
91 | /** | 92 | /** |