summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp2
-rw-r--r--noncore/graphics/opie-eye/impl/doc/doc_lister.cpp12
2 files changed, 12 insertions, 2 deletions
diff --git a/noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp b/noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp
index 3c3d702..147eb9c 100644
--- a/noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp
+++ b/noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp
@@ -143,25 +143,25 @@ QStringList DCIM_DirLister::findAlbums()const {
143 lst.remove( ".." ); 143 lst.remove( ".." );
144 144
145 return lst; 145 return lst;
146} 146}
147 147
148QStringList DCIM_DirLister::findImages()const { 148QStringList DCIM_DirLister::findImages()const {
149 return QDir( m_path ).entryList("*.jpg *.jpeg *.png", QDir::Files ); 149 return QDir( m_path ).entryList("*.jpg *.jpeg *.png", QDir::Files );
150} 150}
151 151
152void DCIM_DirLister::deleteImage( const QString& fl ) { 152void DCIM_DirLister::deleteImage( const QString& fl ) {
153 QFileInfo inf( fl ); 153 QFileInfo inf( fl );
154 QFile::remove( fl ); 154 QFile::remove( fl );
155 QFile::remove( inf.dirPath ()+"/preview"+ 155 QFile::remove( inf.dirPath ()+"/preview/"+
156 inf.fileName() ); 156 inf.fileName() );
157} 157}
158 158
159void DCIM_DirLister::thumbNail( const QString& _str, int w, int h ) { 159void DCIM_DirLister::thumbNail( const QString& _str, int w, int h ) {
160 QFileInfo inf( _str ); 160 QFileInfo inf( _str );
161 QString str = QFileInfo( inf.dirPath()+"/preview"+ inf.fileName() ).exists() ? 161 QString str = QFileInfo( inf.dirPath()+"/preview"+ inf.fileName() ).exists() ?
162 inf.dirPath()+"/preview"+ inf.fileName() : _str; 162 inf.dirPath()+"/preview"+ inf.fileName() : _str;
163 163
164 SlaveMaster::self()->thumbNail( str, w, h ); 164 SlaveMaster::self()->thumbNail( str, w, h );
165} 165}
166 166
167QImage DCIM_DirLister::image( const QString& str, Factor f, int m ) { 167QImage DCIM_DirLister::image( const QString& str, Factor f, int m ) {
diff --git a/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp b/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp
index 4a491e2..5281b75 100644
--- a/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp
+++ b/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp
@@ -84,26 +84,36 @@ QStringList Doc_DirLister::files()const {
84 QListIterator<DocLnk> dit(m_ds.children()); 84 QListIterator<DocLnk> dit(m_ds.children());
85 for( ; dit.current(); ++dit) { 85 for( ; dit.current(); ++dit) {
86 if (!(*dit)->isValid()) continue; 86 if (!(*dit)->isValid()) continue;
87 if (!matchCat((*dit))) continue; 87 if (!matchCat((*dit))) continue;
88 QString s = (*dit)->name(); 88 QString s = (*dit)->name();
89 s+=char(0); 89 s+=char(0);
90 s+=(*dit)->file(); 90 s+=(*dit)->file();
91 out.append(s); 91 out.append(s);
92 } 92 }
93 return out; 93 return out;
94} 94}
95 95
96void Doc_DirLister::deleteImage( const QString& ) 96void Doc_DirLister::deleteImage( const QString& f)
97{ 97{
98 /*
99 * find the file in the set of doclnks
100 */
101 QListIterator<DocLnk> dit(m_ds.children());
102 for( ; dit.current(); ++dit) {
103 if ( f == (*dit)->file() ) {
104 (*dit)->removeFiles();
105 return;
106 }
107 }
98} 108}
99 109
100void Doc_DirLister::thumbNail( const QString& str, int w, int h) 110void Doc_DirLister::thumbNail( const QString& str, int w, int h)
101{ 111{
102 SlaveMaster::self()->thumbNail( str, w, h ); 112 SlaveMaster::self()->thumbNail( str, w, h );
103} 113}
104 114
105QImage Doc_DirLister::image( const QString& str, Factor f, int m) 115QImage Doc_DirLister::image( const QString& str, Factor f, int m)
106{ 116{
107 return SlaveMaster::self()->image(str, f, m ); 117 return SlaveMaster::self()->image(str, f, m );
108} 118}
109 119