Fix for bug #1613 - scale file dialog icons appropriately

1 files changed, 13 insertions, 6 deletions

diff --git a/libopie2/opieui/fileselector/ofileselector.cpp b/libopie2/opieui/fileselector/ofileselector.cpp
index dbba4b9..2746732 100644
--- a/libopie2/opieui/fileselector/ofileselector.cpp
+++ b/libopie2/opieui/fileselector/ofileselector.cpp
@@ -305,92 +305,99 @@ QString OFileSelectorItem::key( int id, bool )const
             ke.append("1" );
             ke.append( text(1) );
         }
         return ke;
     }else if(id == 2) {
     return text(2).rightJustify(20, '0');
     }else
         return text( id );
 
 }
 
 OFileViewFileListView::OFileViewFileListView( QWidget* parent, const QString& startDir, OFileSelector* sel)
                       :QWidget( parent ), m_sel( sel )
 {
     m_all = false;
     QVBoxLayout* lay = new QVBoxLayout( this );
     m_currentDir = startDir;
 
     /*
      * now we add a special bar
      * One Button For Up
      * Home
      * Doc
      * And a dropdown menu with FileSystems
      * FUTURE: one to change dir with lineedit
      * Bookmarks
      * Create Dir
      */
     QHBox* box = new QHBox(this );
     box->setBackgroundMode( PaletteButton );
     box->setSpacing( 0 );
 
+    QPixmap pic;
     QToolButton *btn = new QToolButton( box );
-    btn->setIconSet( Resource::loadIconSet("up") );
+    pic.convertFromImage( Resource::loadImage( "up" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+    btn->setPixmap( pic );
     connect(btn, SIGNAL(clicked() ),
             this, SLOT( cdUP() ) );
 
     btn = new QToolButton( box );
-    btn->setIconSet( Resource::loadIconSet("home") );
+    pic.convertFromImage( Resource::loadImage( "home" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+    btn->setPixmap( pic );
     connect(btn, SIGNAL(clicked() ),
             this, SLOT( cdHome() ) );
 
     btn = new QToolButton( box );
-    btn->setIconSet( Resource::loadIconSet("DocsIcon") );
+    pic.convertFromImage( Resource::loadImage( "DocsIcon" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+    btn->setPixmap( pic );
     connect(btn, SIGNAL(clicked() ),
             this, SLOT(cdDoc() ) );
 
     m_btnNew = new QToolButton( box );
-    m_btnNew->setIconSet( Resource::loadIconSet("new") );
+    pic.convertFromImage( Resource::loadImage( "new" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+    btn->setPixmap( pic );
     connect(m_btnNew, SIGNAL(clicked() ),
             this, SLOT(slotNew() ) );
 
 
     m_btnClose = new QToolButton( box );
-    m_btnClose->setIconSet( Resource::loadIconSet("close") );
+    pic.convertFromImage( Resource::loadImage( "close" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+    btn->setPixmap( pic );
     connect(m_btnClose, SIGNAL(clicked() ),
             selector(), SIGNAL(closeMe() ) );
 
     btn = new QToolButton( box );
-    btn->setIconSet( Resource::loadIconSet("cardmon/pcmcia") );
+    pic.convertFromImage( Resource::loadImage( "cardmon/pcmcia" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
+    btn->setPixmap( pic );
 
     m_fsButton = btn;
     /* let's fill device parts */
     QPopupMenu* pop = new QPopupMenu(this);
     connect(pop, SIGNAL( activated(int) ),
             this, SLOT(slotFSActivated(int) ) );
 
     StorageInfo storage;
     const QList<FileSystem> &fs = storage.fileSystems();
     QListIterator<FileSystem> it(fs);
     for ( ; it.current(); ++it )
     {
         const QString disk = (*it)->name();
         const QString path = (*it)->path();
         m_dev.insert( disk, path );
         pop->insertItem( disk );
     }
     m_fsPop = pop;
 
     connect(btn,SIGNAL(pressed()),this,SLOT(slotFSpressed()));
 
     lay->addWidget( box );
 
     m_view = new QListView( this );
 
     m_view->installEventFilter(this);
 
     QPEApplication::setStylusOperation( m_view->viewport(),
                                         QPEApplication::RightOnHold);
     m_view->addColumn(" " );
     m_view->addColumn(tr("Name"), 135 );
     m_view->addColumn(tr("Size"), -1 );