fixed for bug 855, changed currentChanged(...) to clicked(...). also changed UnknownDocument-14 to scaled UnknownDocument

1 files changed, 11 insertions, 4 deletions

diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc
index 7481360..6748bec 100644
--- a/libopie/ofileselector.cc
+++ b/libopie/ofileselector.cc
@@ -1,34 +1,35 @@
 
 
+#include <qwmatrix.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qheader.h>
 #include <qlabel.h>
 #include <qabstractlayout.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 #include <qmessagebox.h>
 #include <qpainter.h>
 #include <qpushbutton.h>
 #include <qwidgetstack.h>
 #include <qpopupmenu.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qtimer.h>
 
 #include <qpe/qpeapplication.h>
 #include <qpe/applnk.h>
 #include <qpe/fileselector.h>
 #include <qpe/global.h>
 #include <qpe/mimetype.h>
 #include <qpe/resource.h>
 #include <qpe/storage.h>
 
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 
 #include "ofileselector.h"
 
@@ -105,65 +106,64 @@ OFileSelector::OFileSelector( QWidget *wid, int mode, int selector,
 {
   m_mimetypes = mimeTypes;
   if (mode == SAVE )
       m_name = fileName;
   initVars();
   m_mode = mode;
   m_selector = selector;
   m_currentDir =  dirName;
   init();
   //QTimer::singleShot(6*1000, this, SLOT( slotTest() ) );
 }
 
 OFileSelector::OFileSelector(const QString &mimeFilter, QWidget *parent,
 			     const char *name, bool newVisible,
 			     bool closeVisible )
   : QWidget( parent, name )
 {
   if (!mimeFilter.isEmpty() ) {
       QStringList list = QStringList::split(";", mimeFilter );
       m_mimetypes.insert(mimeFilter, list );
   }
   initVars();
   m_currentDir = QPEApplication::documentDir();
   m_mode = FILESELECTOR;
   m_selector = NORMAL;
   m_shClose = closeVisible;
   m_shNew = newVisible;
   m_shLne = false;
   m_shPerm = false;
   m_shYesNo = false;
   init();
 
-
 }
 
 OFileSelector::~OFileSelector()
 {
 
 
 }
 
 void OFileSelector::setNewVisible( bool visible )
 {
   m_shNew = visible;
   if( m_selector == NORMAL ){
     delete m_select;
     // we need to initialize but keep the selected mimetype
     QString mime = currentMimeType();
     m_select = new FileSelector( mime ,
 				 m_stack, "fileselector",
 				 m_shNew, m_shClose);
     connect(m_select, SIGNAL(fileSelected( const DocLnk & ) ),
 	    this, SLOT( slotFileBridgeSelected(const DocLnk & ) ) );
     connect(m_select, SIGNAL(closeMe() ),
 	    this, SIGNAL(closeMe() ) );
     //connect to close me and other signals as well
     m_stack->addWidget( m_select, NORMAL );
   }else{
     m_new->show();
   }
 }
 void OFileSelector::setCloseVisible( bool visible )
 {
   m_shClose = visible;
   if( m_selector == NORMAL ){
@@ -667,66 +667,72 @@ void OFileSelector::initVars()
   m_View = 0;
   m_checkPerm = 0;
   m_pseudo = 0;
   m_pseudoLayout = 0;
   m_select = 0;
   m_stack = 0;
   m_lay = 0;
   m_Oselector = 0;
   m_boxToolbar = 0;
   m_boxOk = 0;
   m_boxName = 0;
   m_boxView = 0;
   m_custom = 0;
   m_edit = 0;
   m_fnLabel = 0;
   m_new = 0;
   m_close = 0;
 }
 void OFileSelector::addFile(const QString &/*mime*/, QFileInfo *info, bool symlink)
 {
   if(!m_files)
     return;
   //  if( !compliesMime(info->absFilePath(), mime ) )
   //  return;
   MimeType type( info->absFilePath() );
   if (!compliesMime( type.id() ) )
       return;
 
   QPixmap pix = type.pixmap();
   QString dir;
   QString name;
   bool locked;
-  if( pix.isNull() )
-    pix = Resource::loadPixmap( "UnknownDocument-14");
+  if( pix.isNull() ) {
+     //TODO make this scaled pixmap global, so we dont have to keep doing this 
+    QWMatrix matrix;
+    QPixmap pixer(Resource::loadPixmap( "UnknownDocument" ));
+    matrix.scale( .4, .4);
+   pix = pixer.xForm(matrix);
+//    pix = Resource::loadPixmap( "UnknownDocument-14");
+  }
   dir = info->dirPath( true );
   if( symlink )
     name = info->fileName() + " -> " +info->dirPath() + "/" + info->readLink();
   else {
     name = info->fileName();
     if( ( m_mode == OPEN && !info->isReadable() )||
 	( m_mode == SAVE && !info->isWritable() ) ){
 
       locked = true; pix = Resource::loadPixmap("locked");
     }
   }
   new OFileSelectorItem( m_View, pix, name,
 			 info->lastModified().toString(),
 			 QString::number( info->size() ),
 			 dir, locked );
 }
 void OFileSelector::addDir(const QString &/*mime*/, QFileInfo *info, bool symlink )
 {
   if(!m_dir)
     return;
   if( m_selector == EXTENDED_ALL || m_selector == EXTENDED ){
     bool locked = false;
     QString name;
     QPixmap pix;
     if( ( m_mode == OPEN && !info->isReadable() ) || ( m_mode == SAVE && !info->isWritable() ) ){
       locked = true;
       if( symlink )
 	pix = (*m_pixmaps)["symlinkedlocked"];
       else
 	pix = Resource::loadPixmap("lockedfolder");
     }else { // readable
       pix = symlink ?  (*m_pixmaps)["dirsymlink"] : Resource::loadPixmap("folder") ;
@@ -893,65 +899,66 @@ void OFileSelector::initializeListView()
       m_location->setCurrentItem( count );
       // due to the New and Close button we can not simply hide m_boxToolBar to not show it
       if( !m_shTool ){
 	m_location->hide(  );
 	m_up->hide(  );
 	m_homeButton->hide(  );
 	m_docButton->hide( );
       }
       if(!m_shClose )
 	m_close->hide();
       //if(!m_shNew)
       //m_close->hide();
 
     } // off toolbar
     // the Main ListView
     // make a QWidgetStack first so Views can share the Toolbar
     m_View = new QListView( m_pseudo, "Extended view");
     QPEApplication::setStylusOperation( m_View->viewport(),
 					QPEApplication::RightOnHold);
     m_View->addColumn(" " );
     m_View->addColumn(tr("Name"), 135 );
     m_View->addColumn(tr("Size"), -1 );
     m_View->addColumn(tr("Date"), 60 );
     m_View->addColumn(tr("Mime Type"), -1 );
     QHeader *header = m_View->header();
     header->hide();
     m_View->setSorting( 1 );
     m_View->setAllColumnsShowFocus( TRUE );
 
     connect(m_View, SIGNAL(selectionChanged() ),
 	    this, SLOT(slotSelectionChanged() ) );
 
-    connect(m_View, SIGNAL(currentChanged(QListViewItem *) ),
+    connect(m_View, SIGNAL(clicked(QListViewItem *) ),
+//    connect(m_View, SIGNAL(currentChanged(QListViewItem *) ),
 	    this, SLOT(slotCurrentChanged(QListViewItem * ) ) );
 
     connect(m_View, SIGNAL(mouseButtonClicked(int, QListViewItem*, const QPoint &, int) ),
 	    this, SLOT(slotClicked( int, QListViewItem *, const QPoint &, int) ) );
 
     connect(m_View, SIGNAL(mouseButtonPressed(int, QListViewItem *, const QPoint &, int )),
 	    this, SLOT(slotRightButton(int, QListViewItem *, const QPoint &, int  ) ) );
 
     m_pseudoLayout->addWidget( m_View, 288 );
     m_stack->addWidget( m_pseudo, EXTENDED );
   }
 }
 void OFileSelector::initializePerm()
 {
   if( m_checkPerm == 0 ){
     m_checkPerm = new QCheckBox(tr("Ser Permission"), this, "perm");
     m_checkPerm->setChecked( false );
     m_lay->addWidget( m_checkPerm );
 
   }
 }
 void OFileSelector::initPics()
 {
   m_pixmaps = new QMap<QString,QPixmap>;
   QPixmap pm  = Resource::loadPixmap( "folder"  );
   QPixmap lnk = Resource::loadPixmap( "opie/symlink"  );
   QPainter painter( &pm );
   painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
   pm.setMask( pm.createHeuristicMask( FALSE ) );
   m_pixmaps->insert("dirsymlink", pm );
 
   QPixmap pm2 = Resource::loadPixmap( "lockedfolder" );