-rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.cpp | 6 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 1 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/impl/doc/doc_lister.cpp | 40 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/impl/doc/doc_lister.h | 1 |
4 files changed, 28 insertions, 20 deletions
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp index 087db30..77597d2 100644 --- a/noncore/graphics/opie-eye/gui/iconview.cpp +++ b/noncore/graphics/opie-eye/gui/iconview.cpp | |||
@@ -241,3 +241,5 @@ void PIconView::initKeys() { | |||
241 | */ | 241 | */ |
242 | void PIconView::slotDirUp() { | 242 | void PIconView::slotDirUp() |
243 | { | ||
244 | if (m_path.isEmpty()) return; | ||
243 | QDir dir( m_path ); | 245 | QDir dir( m_path ); |
@@ -582,2 +584,4 @@ void PIconView::slotChangeMode( int mode ) { | |||
582 | m_cfg->writeEntry("ListViewMode", m_mode); | 584 | m_cfg->writeEntry("ListViewMode", m_mode); |
585 | /* performance! */ | ||
586 | m_view->clear(); | ||
583 | calculateGrid(); | 587 | calculateGrid(); |
diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp index 058fca0..ec6b051 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.cpp +++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp | |||
@@ -226,2 +226,3 @@ void PMainWindow::slotConfig() { | |||
226 | QWidget *_wid = inf->configWidget( *m_cfg ); | 226 | QWidget *_wid = inf->configWidget( *m_cfg ); |
227 | if (!_wid) continue; | ||
227 | _wid->reparent(wid, QPoint() ); | 228 | _wid->reparent(wid, QPoint() ); |
diff --git a/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp b/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp index f695a76..73b2863 100644 --- a/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp +++ b/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp | |||
@@ -33,2 +33,4 @@ Doc_DirLister::Doc_DirLister() | |||
33 | 33 | ||
34 | m_namemap.clear(); | ||
35 | m_filemap.clear(); | ||
34 | } | 36 | } |
@@ -39,18 +41,15 @@ QString Doc_DirLister::defaultPath()const { | |||
39 | 41 | ||
40 | QString Doc_DirLister::setStartPath( const QString& path ) { | 42 | QString Doc_DirLister::setStartPath(const QString&) { |
41 | m_namemap.clear(); | ||
42 | m_out.clear(); | ||
43 | static const QString Mtype_str("image/jpeg;image/gif;image/bmp;image/png"); | 43 | static const QString Mtype_str("image/jpeg;image/gif;image/bmp;image/png"); |
44 | owarn << "Set start path" << oendl; | 44 | if (m_namemap.isEmpty()) { |
45 | DocLnkSet ds; | 45 | DocLnkSet ds; |
46 | Global::findDocuments(&ds,Mtype_str); | 46 | Global::findDocuments(&ds,Mtype_str); |
47 | QListIterator<DocLnk> dit(ds.children()); | 47 | QListIterator<DocLnk> dit(ds.children()); |
48 | for( ; dit.current(); ++dit) { | 48 | for( ; dit.current(); ++dit) { |
49 | owarn << (*dit)->file() << oendl; | 49 | owarn << (*dit)->file() << oendl; |
50 | m_namemap[(*dit)->name()]=(*dit)->file(); | 50 | m_namemap[(*dit)->name()]=(*dit)->file(); |
51 | m_filemap[(*dit)->file()]=(*dit)->name(); | 51 | m_filemap[(*dit)->file()]=(*dit)->name(); |
52 | m_out.append((*dit)->name()); | 52 | } |
53 | } | 53 | } |
54 | owarn << "Set start path end" << oendl; | 54 | return QString::null; |
55 | return ""; | ||
56 | } | 55 | } |
@@ -58,3 +57,3 @@ QString Doc_DirLister::setStartPath( const QString& path ) { | |||
58 | QString Doc_DirLister::currentPath()const { | 57 | QString Doc_DirLister::currentPath()const { |
59 | return ""; | 58 | return QString::null; |
60 | } | 59 | } |
@@ -67,6 +66,12 @@ QStringList Doc_DirLister::folders()const { | |||
67 | QStringList Doc_DirLister::files()const { | 66 | QStringList Doc_DirLister::files()const { |
68 | return m_out; | 67 | QStringList out; |
68 | QMap<QString,QString>::ConstIterator it; | ||
69 | for (it = m_namemap.begin();it != m_namemap.end();++it) { | ||
70 | out.append(it.key()); | ||
71 | } | ||
72 | return out; | ||
69 | } | 73 | } |
70 | 74 | ||
71 | void Doc_DirLister::deleteImage( const QString& ) { | 75 | void Doc_DirLister::deleteImage( const QString& ) |
76 | { | ||
72 | } | 77 | } |
@@ -97,3 +102,2 @@ void Doc_DirLister::imageInfo( const QString& str) { | |||
97 | QString fname = m_namemap[str]; | 102 | QString fname = m_namemap[str]; |
98 | owarn << "Image info: " << fname << oendl; | ||
99 | SlaveMaster::self()->thumbInfo( fname ); | 103 | SlaveMaster::self()->thumbInfo( fname ); |
diff --git a/noncore/graphics/opie-eye/impl/doc/doc_lister.h b/noncore/graphics/opie-eye/impl/doc/doc_lister.h index d89b579..a65b616 100644 --- a/noncore/graphics/opie-eye/impl/doc/doc_lister.h +++ b/noncore/graphics/opie-eye/impl/doc/doc_lister.h | |||
@@ -34,3 +34,2 @@ private: | |||
34 | QMap<QString,QString> m_namemap,m_filemap; | 34 | QMap<QString,QString> m_namemap,m_filemap; |
35 | QStringList m_out; | ||
36 | protected slots: | 35 | protected slots: |