author | zecke <zecke> | 2002-10-29 19:08:40 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-10-29 19:08:40 (UTC) |
commit | 2957aae1073f4c41dd6783c41d1199be71cd9f4a (patch) (unidiff) | |
tree | 2aa5c4f61105aa151867e170601de58511479fd8 /libopie | |
parent | a575fd4c862693705018902b4482c5135a8cb6a2 (diff) | |
download | opie-2957aae1073f4c41dd6783c41d1199be71cd9f4a.zip opie-2957aae1073f4c41dd6783c41d1199be71cd9f4a.tar.gz opie-2957aae1073f4c41dd6783c41d1199be71cd9f4a.tar.bz2 |
the reverse getting of filenames is actually enabled
There will be some code clean ups...
but the interfaces should be fine now
-rw-r--r-- | libopie/ofileselector/ofileselector.cpp | 15 | ||||
-rw-r--r-- | libopie/ofileselector/olister.cpp | 10 | ||||
-rw-r--r-- | libopie/ofileselector/olister.h | 18 | ||||
-rw-r--r-- | libopie/ofileselector/olocallister.cpp | 29 | ||||
-rw-r--r-- | libopie/ofileselector/olocallister.h | 5 |
5 files changed, 62 insertions, 15 deletions
diff --git a/libopie/ofileselector/ofileselector.cpp b/libopie/ofileselector/ofileselector.cpp index 255e79e..9ce07dd 100644 --- a/libopie/ofileselector/ofileselector.cpp +++ b/libopie/ofileselector/ofileselector.cpp | |||
@@ -261,22 +261,16 @@ void OFileSelector::setPopupFactory(OPopupMenuFactory */*popup*/ ) | |||
261 | m_showPopup = true; | 261 | m_showPopup = true; |
262 | */ | 262 | */ |
263 | } | 263 | } |
264 | 264 | ||
265 | //void OFileSelector::updateL | ||
266 | |||
267 | QString OFileSelector::selectedName() const | 265 | QString OFileSelector::selectedName() const |
268 | { | 266 | { |
269 | QString name; | 267 | QString name; |
270 | if( m_selector == Normal ){ | 268 | if( m_selector == Normal ){ |
271 | DocLnk lnk = m_select->selectedDocument(); | 269 | DocLnk lnk = m_select->selectedDocument(); |
272 | name = lnk.file(); | 270 | name = lnk.file(); |
273 | }else { | 271 | }else { |
274 | if ( m_shLne ) { | 272 | name = currentLister()->selectedName(); |
275 | name = m_currentDir + "/" +m_edit->text(); | ||
276 | }else{ | ||
277 | name = m_currentDir + "/" + currentView()->selectedName(); | ||
278 | } | ||
279 | } | 273 | } |
280 | return name; | 274 | return name; |
281 | } | 275 | } |
282 | QStringList OFileSelector::selectedNames()const | 276 | QStringList OFileSelector::selectedNames()const |
@@ -421,9 +415,8 @@ void OFileSelector::slotLocationActivated(const QString &file) | |||
421 | if ( info.isFile() ) | 415 | if ( info.isFile() ) |
422 | cd(info.dirPath( TRUE ) ); //absolute | 416 | cd(info.dirPath( TRUE ) ); //absolute |
423 | else | 417 | else |
424 | cd(name ); | 418 | cd(name ); |
425 | reparse(); | ||
426 | } | 419 | } |
427 | void OFileSelector::slotInsertLocationPath(const QString ¤tPath, int count) | 420 | void OFileSelector::slotInsertLocationPath(const QString ¤tPath, int count) |
428 | { | 421 | { |
429 | QStringList pathList; | 422 | QStringList pathList; |
@@ -453,10 +446,8 @@ void OFileSelector::locationComboChanged() | |||
453 | if (info.isFile() ) | 446 | if (info.isFile() ) |
454 | cd(info.dirPath(TRUE) ); //absolute path | 447 | cd(info.dirPath(TRUE) ); //absolute path |
455 | else | 448 | else |
456 | cd( m_location->lineEdit()->text() ); | 449 | cd( m_location->lineEdit()->text() ); |
457 | |||
458 | reparse(); | ||
459 | } | 450 | } |
460 | void OFileSelector::init() | 451 | void OFileSelector::init() |
461 | { | 452 | { |
462 | initFactory(); | 453 | initFactory(); |
@@ -853,18 +844,18 @@ void OFileSelector::slotDelete() | |||
853 | */ | 844 | */ |
854 | } | 845 | } |
855 | void OFileSelector::cdUP() | 846 | void OFileSelector::cdUP() |
856 | { | 847 | { |
848 | // FIXME won't work on non filesystem based systems | ||
849 | // better call the Olister | ||
857 | QDir dir( m_currentDir ); | 850 | QDir dir( m_currentDir ); |
858 | dir.cdUp(); | 851 | dir.cdUp(); |
859 | if(dir.exists() ){ | 852 | if(dir.exists() ){ |
860 | m_currentDir = dir.absPath(); | 853 | m_currentDir = dir.absPath(); |
861 | reparse(); | 854 | reparse(); |
862 | int count = m_location->count(); | 855 | int count = m_location->count(); |
863 | slotInsertLocationPath( m_currentDir, count); | 856 | slotInsertLocationPath( m_currentDir, count); |
864 | m_location->setCurrentItem( indexByString( m_location, m_currentDir)); | 857 | m_location->setCurrentItem( indexByString( m_location, m_currentDir)); |
865 | //this wont work in all instances | ||
866 | // FIXME | ||
867 | } | 858 | } |
868 | } | 859 | } |
869 | void OFileSelector::slotHome() | 860 | void OFileSelector::slotHome() |
870 | { | 861 | { |
diff --git a/libopie/ofileselector/olister.cpp b/libopie/ofileselector/olister.cpp index ea09940..aaaf6a2 100644 --- a/libopie/ofileselector/olister.cpp +++ b/libopie/ofileselector/olister.cpp | |||
@@ -1,5 +1,6 @@ | |||
1 | #include <qcombobox.h> | 1 | #include <qcombobox.h> |
2 | #include <qlineedit.h> | ||
2 | 3 | ||
3 | #include "olister.h" | 4 | #include "olister.h" |
4 | #include "ofileview.h" | 5 | #include "ofileview.h" |
5 | #include "opixmapprovider.h" | 6 | #include "opixmapprovider.h" |
@@ -111,8 +112,11 @@ void OLister::addSymlink( const QString& mine, | |||
111 | } | 112 | } |
112 | OFileSelector* OLister::view() { | 113 | OFileSelector* OLister::view() { |
113 | return m_view; | 114 | return m_view; |
114 | } | 115 | } |
116 | OFileSelector* OLister::view()const { | ||
117 | return m_view; | ||
118 | } | ||
115 | OPixmapProvider* OLister::provider() { | 119 | OPixmapProvider* OLister::provider() { |
116 | return m_prov; | 120 | return m_prov; |
117 | } | 121 | } |
118 | bool OLister::compliesMime( const QString& mime ) { | 122 | bool OLister::compliesMime( const QString& mime ) { |
@@ -168,4 +172,10 @@ QString OListerCmbAccess::currentText()const { | |||
168 | str = m_cmb->currentText(); | 172 | str = m_cmb->currentText(); |
169 | 173 | ||
170 | return str; | 174 | return str; |
171 | } | 175 | } |
176 | QString OLister::lineEdit()const { | ||
177 | if ( view()->m_shLne ) | ||
178 | return view()->m_edit->text(); | ||
179 | |||
180 | return QString::null; | ||
181 | } | ||
diff --git a/libopie/ofileselector/olister.h b/libopie/ofileselector/olister.h index cd84316..4adb9f8 100644 --- a/libopie/ofileselector/olister.h +++ b/libopie/ofileselector/olister.h | |||
@@ -22,9 +22,13 @@ class OListerCmbAccess; | |||
22 | class OLister { | 22 | class OLister { |
23 | public: | 23 | public: |
24 | OLister( OFileSelector* ); | 24 | OLister( OFileSelector* ); |
25 | virtual ~OLister(); | 25 | virtual ~OLister(); |
26 | virtual void reparse(const QString& path) = 0; | 26 | |
27 | /** | ||
28 | * if path == QString::null reread current dir | ||
29 | */ | ||
30 | virtual void reparse(const QString& path = QString::null ) = 0; | ||
27 | 31 | ||
28 | /** | 32 | /** |
29 | * return a list of available mimetypes | 33 | * return a list of available mimetypes |
30 | */ | 34 | */ |
@@ -34,8 +38,10 @@ public: | |||
34 | 38 | ||
35 | /* some way a slot */ | 39 | /* some way a slot */ |
36 | virtual void fileSelected( const QString& dir, const QString& file, const QString& extra ) = 0; | 40 | virtual void fileSelected( const QString& dir, const QString& file, const QString& extra ) = 0; |
37 | virtual void changedDir( const QString& dir, const QString& file, const QString& extra ) = 0; | 41 | virtual void changedDir( const QString& dir, const QString& file, const QString& extra ) = 0; |
42 | virtual QString selectedName()const = 0; | ||
43 | virtual QStringList selectedNames()const = 0; | ||
38 | protected: | 44 | protected: |
39 | /** | 45 | /** |
40 | * I hate too big classes | 46 | * I hate too big classes |
41 | * this is a way to group | 47 | * this is a way to group |
@@ -76,11 +82,21 @@ protected: | |||
76 | const QString& name, | 82 | const QString& name, |
77 | const QString& extra = QString::null, | 83 | const QString& extra = QString::null, |
78 | bool isSymlink = FALSE ); | 84 | bool isSymlink = FALSE ); |
79 | OFileSelector* view(); | 85 | OFileSelector* view(); |
86 | OFileSelector* view()const; | ||
80 | OPixmapProvider* provider(); | 87 | OPixmapProvider* provider(); |
81 | void internFileSelected( const QString& file ); | 88 | void internFileSelected( const QString& file ); |
82 | void internChangedDir( const QString& dir ); | 89 | void internChangedDir( const QString& dir ); |
90 | |||
91 | /** | ||
92 | * try to take | ||
93 | * the text from the mainwindows | ||
94 | * lineedit | ||
95 | * if it's not available QString::null | ||
96 | * will be returned | ||
97 | */ | ||
98 | QString lineEdit()const; | ||
83 | private: | 99 | private: |
84 | OFileSelector* m_view; | 100 | OFileSelector* m_view; |
85 | OPixmapProvider* m_prov; | 101 | OPixmapProvider* m_prov; |
86 | OListerCmbAccess* m_acc; | 102 | OListerCmbAccess* m_acc; |
diff --git a/libopie/ofileselector/olocallister.cpp b/libopie/ofileselector/olocallister.cpp index 5d7884d..4d36d64 100644 --- a/libopie/ofileselector/olocallister.cpp +++ b/libopie/ofileselector/olocallister.cpp | |||
@@ -4,13 +4,15 @@ | |||
4 | 4 | ||
5 | #include <qpe/mimetype.h> | 5 | #include <qpe/mimetype.h> |
6 | 6 | ||
7 | #include "ofileselector.h" | 7 | #include "ofileselector.h" |
8 | #include "ofileview.h" | ||
8 | #include "olocallister.h" | 9 | #include "olocallister.h" |
9 | 10 | ||
10 | OLocalLister::OLocalLister( OFileSelector* file ) | 11 | OLocalLister::OLocalLister( OFileSelector* file ) |
11 | : OLister( file ) | 12 | : OLister( file ) |
12 | { | 13 | { |
14 | m_dir = QDir::homeDirPath(); | ||
13 | } | 15 | } |
14 | OLocalLister::~OLocalLister() { | 16 | OLocalLister::~OLocalLister() { |
15 | } | 17 | } |
16 | 18 | ||
@@ -50,11 +52,14 @@ QMap<QString, QStringList> OLocalLister::mimeTypes( const QString& curDir ) { | |||
50 | * filter filters | 52 | * filter filters |
51 | * filter files | 53 | * filter files |
52 | * filter mimetypes | 54 | * filter mimetypes |
53 | */ | 55 | */ |
54 | void OLocalLister::reparse( const QString& path ) { | 56 | void OLocalLister::reparse( const QString& pa ) { |
57 | if (!pa.isEmpty() ) | ||
58 | m_dir = pa; | ||
59 | |||
55 | QString currentMimeType; | 60 | QString currentMimeType; |
56 | QDir dir( path ); | 61 | QDir dir( m_dir ); |
57 | 62 | ||
58 | dir.setSorting( view()->sorting() ); | 63 | dir.setSorting( view()->sorting() ); |
59 | dir.setFilter( view()->filter() ); | 64 | dir.setFilter( view()->filter() ); |
60 | 65 | ||
@@ -122,4 +127,24 @@ void OLocalLister::fileSelected( const QString& dir, const QString& file, const | |||
122 | } | 127 | } |
123 | void OLocalLister::changedDir( const QString& dir, const QString& file, const QString& ) { | 128 | void OLocalLister::changedDir( const QString& dir, const QString& file, const QString& ) { |
124 | internChangedDir( dir + "/" + file ); | 129 | internChangedDir( dir + "/" + file ); |
125 | } | 130 | } |
131 | /* | ||
132 | * assemble the the Url now | ||
133 | */ | ||
134 | QString OLocalLister::selectedName()const { | ||
135 | QString str = m_dir; | ||
136 | QString name = lineEdit(); | ||
137 | |||
138 | if ( name.isEmpty() ) | ||
139 | name = view()->currentView()->selectedName(); | ||
140 | |||
141 | str += "/" + name; | ||
142 | |||
143 | return str; | ||
144 | } | ||
145 | QStringList OLocalLister::selectedNames()const { | ||
146 | QStringList list; | ||
147 | list << selectedName(); | ||
148 | |||
149 | return list; | ||
150 | } | ||
diff --git a/libopie/ofileselector/olocallister.h b/libopie/ofileselector/olocallister.h index 01e6f3c..0cdf51f 100644 --- a/libopie/ofileselector/olocallister.h +++ b/libopie/ofileselector/olocallister.h | |||
@@ -10,7 +10,12 @@ public: | |||
10 | void reparse( const QString& path ); | 10 | void reparse( const QString& path ); |
11 | QMap<QString, QStringList> mimeTypes(const QString& dir ); | 11 | QMap<QString, QStringList> mimeTypes(const QString& dir ); |
12 | void fileSelected( const QString& dir, const QString& file, const QString& ); | 12 | void fileSelected( const QString& dir, const QString& file, const QString& ); |
13 | void changedDir( const QString& dir, const QString& file,const QString& ); | 13 | void changedDir( const QString& dir, const QString& file,const QString& ); |
14 | QString selectedName()const; | ||
15 | QStringList selectedNames()const; | ||
16 | |||
17 | private: | ||
18 | QString m_dir; | ||
14 | }; | 19 | }; |
15 | 20 | ||
16 | #endif | 21 | #endif |