Implement deletion for the Document and Camera Liste

This should fix 1540

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
@@ -131,49 +131,49 @@ QStringList DCIM_DirLister::findCameras()const {
     if ( lst.isEmpty() ) {
         m_mode = ListingUnknown;
         lst << QObject::tr("Error no Camera Dir found");
     }else
         m_mode = ListingStart;
 
     return lst;
 }
 
 QStringList DCIM_DirLister::findAlbums()const {
     QStringList lst = QDir( m_path ).entryList( QDir::Dirs );
     lst.remove( "."  );
     lst.remove( ".." );
 
     return lst;
 }
 
 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() ?
                   inf.dirPath()+"/preview"+ inf.fileName() : _str;
 
     SlaveMaster::self()->thumbNail( str, w, h );
 }
 
 QImage DCIM_DirLister::image( const QString& str,  Factor f,  int m ) {
     return SlaveMaster::self()->image( str, f, m );
 }
 
 void DCIM_DirLister::imageInfo( const QString& str ) {
     SlaveMaster::self()->thumbInfo( str );
 }
 
 void DCIM_DirLister::fullImageInfo( const QString& str ) {
     SlaveMaster::self()->imageInfo( str );
 }
 
 QString DCIM_DirLister::nameToFname( const QString& name )const {
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
@@ -72,50 +72,60 @@ QString Doc_DirLister::setStartPath(const QString&) {
 QString Doc_DirLister::currentPath()const
 {
     return QString::null;
 }
 
 
 QStringList Doc_DirLister::folders()const {
     return QStringList();
 }
 
 QStringList Doc_DirLister::files()const {
     QStringList out;
     QListIterator<DocLnk> dit(m_ds.children());
     for( ; dit.current(); ++dit) {
         if (!(*dit)->isValid()) continue;
         if (!matchCat((*dit))) continue;
         QString s = (*dit)->name();
         s+=char(0);
         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 );
 }
 
 QImage Doc_DirLister::image( const QString& str, Factor f, int m)
 {
     return SlaveMaster::self()->image(str, f, m );
 }
 
 void Doc_DirLister::imageInfo( const QString& str) {
     SlaveMaster::self()->thumbInfo( str );
 }
 
 void Doc_DirLister::fullImageInfo( const QString& str) {
     SlaveMaster::self()->imageInfo(str);
 }
 
 void Doc_DirLister::slotFullInfo(const QString&f, const QString&t)
 {
     emit sig_fullInfo(f, t);
 }