thumbnail for images for 'hash', also added secret config [View] ThumbSize = 72 for specifying thumbnail size, and added cleanup for tmp dir

2 files changed, 178 insertions, 26 deletions

diff --git a/noncore/unsupported/filebrowser/filebrowser.cpp b/noncore/unsupported/filebrowser/filebrowser.cpp
index 8c01655..10e50f0 100644
--- a/noncore/unsupported/filebrowser/filebrowser.cpp
+++ b/noncore/unsupported/filebrowser/filebrowser.cpp
@@ -19,4 +19,5 @@
 **********************************************************************/
 
+
 #include "inlineedit.h"
 #include "filebrowser.h"
@@ -44,8 +45,10 @@
 #include <qfont.h>
 #include <qpainter.h>
+#include <qprogressbar.h>
 
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/stat.h>
+#include <qpe/qpeapplication.h>
 
 //
@@ -84,8 +87,11 @@ FileItem::FileItem( QListView * parent, const QFileInfo & fi )
     else if( isLib() )
   pm = Resource::loadPixmap( "library" );
-    else
+    else if( ((FileView* )parent)->getShowThumbnails() && mt.id().contains(QRegExp("^image/", FALSE, FALSE)) )
+      pm = drawThumbnail(fi);
+  else
   pm = mt.pixmap();
     if ( pm.isNull() )
   pm = Resource::loadPixmap("UnknownDocument-14");
+
    if( fi.isSymLink() ){
     // overlay link image
@@ -173,4 +179,55 @@ bool FileItem::rename( const QString & name )
 }
 
+QPixmap FileItem::drawThumbnail(const QFileInfo &file) {
+
+  /*
+   * this thing is sloooooow, and it also doesn't load 
+   * dynamicly (like a web browser). if anyone knows how to 
+   * do that, please do!
+   */
+  QString cacheDir = "/tmp/filebrowserThumbnailCache";
+  QFileInfo cachedFile (cacheDir + file.filePath());
+
+  if (cachedFile.exists() && cachedFile.lastModified() == file.lastModified()) {
+
+    QPixmap cachedImage (cachedFile.filePath());
+    return cachedImage;
+  }
+  else {
+
+    QImage image (file.filePath());
+
+    // if inside of cache dir, don't render thumbnails! recursive error!
+    if (image.isNull() || file.filePath().contains(QRegExp("^" + cacheDir))) { 
+      DocLnk doc (file.filePath());
+      return doc.pixmap(); 
+    }
+    Config cfg("Filebrowser");
+    cfg.setGroup("View");
+    int size;
+    size =cfg.readNumEntry("ThumbSize", 72);
+    QPixmap thumb (size, size);
+
+    double scale = (double)image.height() / (double)image.width();
+    int newHeight = int(size * scale);
+    thumb.convertFromImage (image.smoothScale(size, newHeight));
+
+    if (!cachedFile.dir().exists()) {
+      QString cmd = "/bin/mkdir -p \"" + cachedFile.dirPath() +"\"";
+          system( (const char *) cmd );
+    }
+
+    if (thumb.save(cachedFile.filePath(), QPixmap::imageFormat(file.filePath()), 70)) {
+      // make thumbnail modify time the same as the image
+      QString cmd = "/bin/touch -r \"" + file.filePath() +"\" " +
+          "\"" + cachedFile.filePath() + "\"";
+          system( (const char *) cmd );
+
+    }
+
+    return thumb;
+  }
+}
+
 //
 //  FileView
@@ -178,5 +235,5 @@ bool FileItem::rename( const QString & name )
 FileView::FileView( const QString & dir, QWidget * parent,
           const char * name, 
-          bool hidden, bool symlinks )
+          bool hidden, bool symlinks, bool thumbnails )
     : QListView( parent, name ),
       menuTimer( this ),
@@ -184,5 +241,6 @@ FileView::FileView( const QString & dir, QWidget * parent,
       itemToRename( NULL ),
       showHidden( hidden ),
-      showSymlinks( symlinks),
+      showSymlinks( symlinks ),
+      showThumbnails( thumbnails ),
     menuKeepsOpen( FALSE )
 {
@@ -254,23 +312,43 @@ void FileView::generateDir( const QString & dir )
      d.setSorting( QDir::Name | QDir::DirsFirst | QDir::IgnoreCase |  QDir::Reversed );
         
-
     const QFileInfoList * list = d.entryInfoList();
     QFileInfoListIterator it( *list );
     QFileInfo *fi;
 
+  QProgressBar *thumbProgress = 0;
+  if (showThumbnails) {
+
+    thumbProgress = new QProgressBar(it.count(), this);
+    thumbProgress->show();
+  }
+
     clear();
-    while( (fi = it.current()) ){
-        if( (fi->fileName() == ".") || (fi->fileName() == "..") ){
+
+  int fileCount = 1; // used in the thumbnail progress meter
+  while( (fi = it.current()) ){
+    if( (fi->fileName() == ".") || (fi->fileName() == "..") ){
+      ++it;
+      continue;
+    }
+    if(!showSymlinks && fi->isSymLink()){
       ++it;
       continue;
     }
-  if(!showSymlinks && fi->isSymLink()){
+    // thumbnail progress
+    if (showThumbnails) {
+
+      thumbProgress->setProgress(fileCount);
+    }
+    (void) new FileItem( (QListView *) this, *fi );
+
     ++it;
-    continue;
+    ++fileCount;
+  }
+
+  if (showThumbnails) { 
+    thumbProgress->close();
   }
-   (void) new FileItem( (QListView *) this, *fi );
-    ++it;
-    }
     emit dirChanged();
+
 }
 
@@ -464,4 +542,23 @@ void FileView::cut()
     flist.clear();
     while( item ){
+        if( ite
+    // ##### a better inmplementation might be to rename the CUT file

+    // ##### to ".QPE-FILEBROWSER-MOVING" rather than copying it.

+    QString cmd, dest, basename, cd = "/tmp/qpemoving";

+  QStringList newflist;

+  newflist.clear();

+  

+  cmd = "rm -rf " + cd;

+  system ( (const char *) cmd );

+  cmd = "mkdir " + cd;

+  system( (const char *) cmd );

+

+// get the names of the files to cut

+    FileItem * item;

+ 

+    if((item = (FileItem *) firstChild()) == 0) return;

+ 

+    flist.clear();

+    while( item ){

         if( item->isSelected() /*&& !item->isDir()*/ ){
             flist += item->getFilePath();
@@ -714,4 +811,9 @@ void FileView::setShowSymlinks(bool symlinks)
 }
 
+void FileView::setShowThumbnails(bool thumbnails)
+{
+  showThumbnails=thumbnails;
+}
+
 void FileView::setMenuKeepsOpen(bool keepOpen)
 {
@@ -737,4 +839,6 @@ void FileBrowser::init(const QString & dir)
     setCaption( tr("File Manager") );
     setIcon( Resource::loadPixmap( "filebrowser_icon" ) );
+    connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
+
 
   Config cfg("Filebrowser");
@@ -742,4 +846,5 @@ void FileBrowser::init(const QString & dir)
   bool showHidden=(cfg.readEntry("Hidden","FALSE") == "TRUE");
   bool showSymlinks=(cfg.readEntry("Symlinks","FALSE") == "TRUE");
+  bool showThumbnails=(cfg.readEntry("Thumbnails","FALSE") == "TRUE");
 
   cfg.setGroup("Menu"); 
@@ -747,5 +852,5 @@ void FileBrowser::init(const QString & dir)
   
 
-    fileView = new FileView( dir, this, 0, showHidden, showSymlinks );
+    fileView = new FileView( dir, this, 0, showHidden, showSymlinks, showThumbnails );
     fileView->setAllColumnsShowFocus( TRUE );
   fileView->setMenuKeepsOpen(menuKeepsOpen);
@@ -777,6 +882,8 @@ void FileBrowser::init(const QString & dir)
   viewMenu->insertItem( tr( "Hidden"), this, SLOT( updateShowHidden() ) );
   viewMenu->insertItem( tr( "Symlinks"), this, SLOT( updateShowSymlinks() ) );
+  viewMenu->insertItem( tr( "Thumbnails"), this, SLOT( updateShowThumbnails() ) );
     viewMenu->setItemChecked( viewMenu->idAt( 0 ), showHidden );
     viewMenu->setItemChecked( viewMenu->idAt( 1 ), showSymlinks );
+    viewMenu->setItemChecked( viewMenu->idAt( 2 ), showThumbnails );
 
   menuBar->insertItem( tr("View"), viewMenu );
@@ -931,5 +1038,4 @@ void FileView::chPerm() {
     QStringList fl;
     QString cmd;
-    int err;
 
     if((i = (FileItem *) firstChild()) == 0) return;
@@ -983,2 +1089,41 @@ void FileBrowser::updateShowSymlinks()
   fileView->updateDir();
 }
+
+void FileBrowser::updateShowThumbnails()
+{
+  bool valShowThumbnails=viewMenu->isItemChecked( viewMenu->idAt( 2 ) );
+  valShowThumbnails=!valShowThumbnails;
+    viewMenu->setItemChecked( viewMenu->idAt( 2 ), valShowThumbnails );
+  fileView->setShowThumbnails(valShowThumbnails);
+
+    Config cfg("Filebrowser");
+    cfg.setGroup("View");
+    cfg.writeEntry("Thumbnails",valShowThumbnails?"TRUE":"FALSE");
+
+  fileView->updateDir();
+}
+
+void FileBrowser::cleanUp() {
+  QString cmdr = "rm -rf /tmp/filebrowserThumbnailCache";
+//  qDebug("exit");  
+  system(cmdr.latin1());
+}
+

+{

+  bool valShowThumbnails=viewMenu->isItemChecked( viewMenu->idAt( 2 ) );

+  valShowThumbnails=!valShowThumbnails;

+    viewMenu->setItemChecked( viewMenu->idAt( 2 ), valShowThumbnails );

+  fileView->setShowThumbnails(valShowThumbnails);

+

+    Config cfg("Filebrowser");

+    cfg.setGroup("View");

+    cfg.writeEntry("Thumbnails",valShowThumbnails?"TRUE":"FALSE");

+

+  fileView->updateDir();

+}

+

+void FileBrowser::cleanUp() {

+  QString cmdr = "rm -rf /tmp/filebrowserThumbnailCache";

+//  qDebug("exit");  

+  system(cmdr.latin1());

+}

diff --git a/noncore/unsupported/filebrowser/filebrowser.h b/noncore/unsupported/filebrowser/filebrowser.h
index 983e58e..549d463 100644
--- a/noncore/unsupported/filebrowser/filebrowser.h
+++ b/noncore/unsupported/filebrowser/filebrowser.h
@@ -46,4 +46,5 @@ private:
     QString sizeString( unsigned int size );
     QFileInfo fileInfo;
+  QPixmap FileItem::drawThumbnail(const QFileInfo &file);
 };
 
@@ -55,7 +56,8 @@ class FileView : public QListView
 public:
     FileView( const QString & dir, QWidget * parent = 0,
-                          const char * name = 0, 
-                          bool hidden = FALSE,
-                          bool symlinks = FALSE );
+        const char * name = 0, 
+        bool hidden = FALSE,
+        bool symlinks = FALSE,
+        bool thumbnails = FALSE );
 
     void    setDir( const QString & dir );
@@ -64,8 +66,10 @@ public:
     bool showingHidden;
 
-        void setShowHidden(bool hidden);
-        void setShowSymlinks(bool symlinks);
-        void setMenuKeepsOpen(bool keepOpen);
-        
+  void setShowHidden(bool hidden);
+  void setShowSymlinks(bool symlinks);
+  void setShowThumbnails(bool thumbnails);
+  bool getShowThumbnails () const { return showThumbnails; }
+  void setMenuKeepsOpen(bool keepOpen);
+  
 public slots:
     void updateDir();
@@ -97,5 +101,4 @@ protected slots:
     void run();
     void endRenaming();
-
 private:
     QString     currentDir;
@@ -105,7 +108,8 @@ private:
     FileItem   * itemToRename;
     bool         selected;
-            bool        showHidden;
-            bool        showSymlinks;
-                bool menuKeepsOpen;
+    bool    showHidden;
+    bool    showSymlinks;
+  bool    showThumbnails;
+  bool menuKeepsOpen; 
 
     bool copyFile( const QString & dest, const QString & src );
@@ -147,8 +151,11 @@ private slots:
     void sortType();
     void updateSorting();
-        void updateShowHidden();
-        void updateShowSymlinks();
+    void updateShowHidden();
+    void updateShowSymlinks();
+    void updateShowThumbnails();
     void updateDirMenu();
     void dirSelected( int id );
+    void cleanUp();
+    
 };