-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 @@ -149,13 +149,13 @@ QStringList DCIM_DirLister::findImages()const { return QDir( m_path ).entryList("*.jpg *.jpeg *.png", QDir::Files ); } void DCIM_DirLister::deleteImage( const QString& fl ) { QFileInfo inf( fl ); QFile::remove( fl ); - QFile::remove( inf.dirPath ()+"/preview"+ + QFile::remove( inf.dirPath ()+"/preview/"+ inf.fileName() ); } void DCIM_DirLister::thumbNail( const QString& _str, int w, int h ) { QFileInfo inf( _str ); QString str = QFileInfo( inf.dirPath()+"/preview"+ inf.fileName() ).exists() ? 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 @@ -90,14 +90,24 @@ QStringList Doc_DirLister::files()const { s+=(*dit)->file(); out.append(s); } return out; } -void Doc_DirLister::deleteImage( const QString& ) +void Doc_DirLister::deleteImage( const QString& f) { + /* + * find the file in the set of doclnks + */ + QListIterator<DocLnk> dit(m_ds.children()); + for( ; dit.current(); ++dit) { + if ( f == (*dit)->file() ) { + (*dit)->removeFiles(); + return; + } + } } void Doc_DirLister::thumbNail( const QString& str, int w, int h) { SlaveMaster::self()->thumbNail( str, w, h ); } |