-rw-r--r-- | noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp | 2 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/impl/doc/doc_lister.cpp | 12 |
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 | |||
@@ -147,17 +147,17 @@ QStringList DCIM_DirLister::findAlbums()const { | |||
147 | 147 | ||
148 | QStringList DCIM_DirLister::findImages()const { | 148 | QStringList 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 | ||
152 | void DCIM_DirLister::deleteImage( const QString& fl ) { | 152 | void 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 | ||
159 | void DCIM_DirLister::thumbNail( const QString& _str, int w, int h ) { | 159 | void 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 | ||
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 | |||
@@ -88,18 +88,28 @@ QStringList Doc_DirLister::files()const { | |||
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 | ||
96 | void Doc_DirLister::deleteImage( const QString& ) | 96 | void 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 | ||
100 | void Doc_DirLister::thumbNail( const QString& str, int w, int h) | 110 | void 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 | ||
105 | QImage Doc_DirLister::image( const QString& str, Factor f, int m) | 115 | QImage Doc_DirLister::image( const QString& str, Factor f, int m) |