using big icons on small screens makes no sense. Half of screen will

just used by unsharp icons - not a good idea. Now it depends on desktopsize

1 files changed, 7 insertions, 6 deletions

diff --git a/libopie2/opieui/fileselector/ofileselector.cpp b/libopie2/opieui/fileselector/ofileselector.cpp
index f3e7501..a30bd8b 100644
--- a/libopie2/opieui/fileselector/ofileselector.cpp
+++ b/libopie2/opieui/fileselector/ofileselector.cpp
@@ -131,432 +131,433 @@ void OFileViewInterface::ok()
 {
     emit selector()->ok();
 }
 
 void OFileViewInterface::cancel()
 {
     emit selector()->cancel();
 }
 
 void OFileViewInterface::closeMe()
 {
     emit selector()->closeMe();
 }
 
 void OFileViewInterface::fileSelected( const QString& str)
 {
     emit selector()->fileSelected( str);
 }
 
 void OFileViewInterface::fileSelected( const DocLnk& lnk)
 {
     emit selector()->fileSelected( lnk );
 }
 
 void OFileViewInterface::setCurrentFileName( const QString& str )
 {
     selector()->m_lneEdit->setText( str );
 }
 
 QString OFileViewInterface::currentFileName()const
 {
     return selector()->m_lneEdit->text();
 }
 
 QString OFileViewInterface::startDirectory()const
 {
     return selector()->m_startDir;
 }
 
 bool OFileViewInterface::allItem( const QString& item )const
 {
     return selector()->m_allList.contains( item );
 }
 
 
 ODocumentFileView::ODocumentFileView( OFileSelector* selector )
                   :OFileViewInterface( selector )
 {
     m_selector = 0;
     setName( QObject::tr("Documents") );
 }
 
 ODocumentFileView::~ODocumentFileView()
 {
 }
 
 QString ODocumentFileView::selectedName()const
 {
     if (!m_selector)
         return QString::null;
 
     return m_selector->selectedDocument().file();
 }
 
 QString ODocumentFileView::selectedPath()const
 {
     return QPEApplication::documentDir();
 }
 
 QString ODocumentFileView::directory()const
 {
     return selectedPath();
 }
 
 void ODocumentFileView::reread()
 {
     if (!m_selector)
         return;
 
     m_selector->setNewVisible( showNew() );
     m_selector->setCloseVisible( showClose() );
     m_selector->filter = currentMimeType().join(";");
     m_selector->reread();
 }
 
 int ODocumentFileView::fileCount()const
 {
     if (!m_selector)
         return -1;
 
     return m_selector->fileCount();
 }
 
 DocLnk ODocumentFileView::selectedDocument()const
 {
     if (!m_selector)
         return DocLnk();
 
     return m_selector->selectedDocument();
 }
 
 QWidget* ODocumentFileView::widget( QWidget* parent )
 {
     if (!m_selector )
     {
         m_selector = new FileSelector(currentMimeType().join(";"), parent, "fileselector", showNew(), showClose() );
         QObject::connect(m_selector, SIGNAL(fileSelected(const DocLnk&) ),
                          selector(), SLOT(slotDocLnkBridge(const DocLnk&) ) );
         QObject::connect(m_selector, SIGNAL(closeMe() ),
                          selector(), SIGNAL(closeMe() ) );
         QObject::connect(m_selector, SIGNAL(newSelected(const DocLnk&) ),
                          selector(), SIGNAL(newSelected(const DocLnk&) ) );
     }
 
     return m_selector;
 }
 
 /*
  * This is the file system view used
  * we use a QListView + QListViewItems for it
  */
 
 OFileSelectorItem::OFileSelectorItem( QListView* view, const QPixmap& pixmap,
                                       const QString& path, const QString& date,
                                       const QString& size, const QString& dir,
                                       bool isLocked, bool isDir )
         : QListViewItem( view ), m_dir(dir), m_isDir(isDir), m_locked(isLocked)
 {
     setPixmap(0, pixmap );
     setText(1, path );
     setText(2, size );
     setText(3, date );
 }
 
 OFileSelectorItem::~OFileSelectorItem()
 {
 }
 
 bool OFileSelectorItem::isLocked()const
 {
     return m_locked;
 }
 
 QString OFileSelectorItem::directory()const
 {
     return m_dir;
 }
 
 bool OFileSelectorItem::isDir()const
 {
     return m_isDir;
 }
 
 QString OFileSelectorItem::path()const
 {
     return text( 1 );
 }
 
 QString OFileSelectorItem::key( int id, bool )const
 {
     QString ke;
 
     /*
      * id = 0 ||id == 1 : Sort By Name but Directories at Top
      * id = 2           : Sort By Size: Prepend '0' to the key
      */
     if( id == 0 || id == 1 )
     { // name
         if( m_isDir )
         {
             ke.append("0" );
             ke.append( text(1) );
         }
         else
         {
             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;
+    bool bigicons = qApp->desktop()->size().width()>330;
 
     /*
      * 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 );
 
     QToolButton *btn = new QToolButton( box );
-    btn->setUsesBigPixmap( true );
+    btn->setUsesBigPixmap(bigicons);
     btn->setPixmap( Opie::Core::OResource::loadPixmap( "up", Opie::Core::OResource::SmallIcon ) );
     connect(btn, SIGNAL(clicked() ),
             this, SLOT( cdUP() ) );
 
     btn = new QToolButton( box );
-    btn->setUsesBigPixmap( true );
+    btn->setUsesBigPixmap(bigicons);
     btn->setPixmap( Opie::Core::OResource::loadPixmap( "home", Opie::Core::OResource::SmallIcon ) );
     connect(btn, SIGNAL(clicked() ),
             this, SLOT( cdHome() ) );
 
     btn = new QToolButton( box );
-    btn->setUsesBigPixmap( true );
+    btn->setUsesBigPixmap(bigicons);
     btn->setPixmap( Opie::Core::OResource::loadPixmap( "DocsIcon", Opie::Core::OResource::SmallIcon ) );
     connect(btn, SIGNAL(clicked() ),
             this, SLOT(cdDoc() ) );
 
     m_btnNew = new QToolButton( box );
-    m_btnNew->setUsesBigPixmap( true );
+    m_btnNew->setUsesBigPixmap(bigicons);
     m_btnNew->setPixmap( Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ) );
     connect(m_btnNew, SIGNAL(clicked() ),
             this, SLOT(slotNew() ) );
 
 
     m_btnClose = new QToolButton( box );
-    m_btnClose->setUsesBigPixmap( true );
+    m_btnClose->setUsesBigPixmap(bigicons);
     m_btnClose->setPixmap( Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ) );
     connect(m_btnClose, SIGNAL(clicked() ),
             selector(), SIGNAL(closeMe() ) );
 
     btn = new QToolButton( box );
-    btn->setUsesBigPixmap( true );
+    btn->setUsesBigPixmap(bigicons);
     btn->setPixmap( Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon ) );
 
     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 );
     m_view->addColumn(tr("Date"), 60 );
     m_view->addColumn(tr("Mime Type"), -1 );
 
 
     m_view->setSorting( 1 );
     m_view->setAllColumnsShowFocus( TRUE );
 
     lay->addWidget( m_view, 1000 );
     connectSlots();
 }
 
 void OFileViewFileListView::slotFSpressed()
 {
     m_fsPop->exec(QPoint( QCursor::pos().x(), QCursor::pos().y()));
     m_fsButton->setDown(false);
 }
 
 OFileViewFileListView::~OFileViewFileListView()
 {
 }
 
 void OFileViewFileListView::slotNew()
 {
     DocLnk lnk;
     emit selector()->newSelected( lnk );
 }
 
 OFileSelectorItem* OFileViewFileListView::currentItem()const
 {
     QListViewItem* item = m_view->currentItem();
     if (!item )
         return 0l;
 
     return static_cast<OFileSelectorItem*>(item);
 }
 
 void OFileViewFileListView::reread( bool all )
 {
     m_view->clear();
 
     if (selector()->showClose() )
         m_btnClose->show();
     else
         m_btnClose->hide();
 
     if (selector()->showNew() )
         m_btnNew->show();
     else
         m_btnNew->hide();
 
     m_mimes = selector()->currentMimeType();
     m_all = all;
 
     QDir dir( m_currentDir );
     if (!dir.exists() )
         return;
 
     dir.setSorting( QDir::Name | QDir::DirsFirst | QDir::Reversed );
     int filter;
     filter = QDir::Dirs;
     if ( selector()->mode() != OFileSelector::DIRECTORYSELECTOR )
         filter = filter | QDir::Files | QDir::All;
 
     if ( m_all )
         filter = filter | QDir::Hidden;
 
     dir.setFilter( filter );
 
     // now go through all files
     const QFileInfoList *list = dir.entryInfoList();
     if (!list)
     {
         cdUP();
         return;
     }
 
     QFileInfoListIterator it( *list );
     QFileInfo *fi;
     while( (fi=it.current() ) )
     {
         if( fi->fileName() == QString::fromLatin1("..") || fi->fileName() == QString::fromLatin1(".") )
         {
             ++it;
             continue;
         }
 
         /*
          * It is a symlink we try to resolve it now but don't let us attack by DOS
          *
          */
         if( fi->isSymLink() )
         {
             QString file = createNewPath(fi->dirPath( true ),fi->readLink());
             for( int i = 0; i<=4; i++)
             { // 5 tries to prevent dos
                 QFileInfo info( file );
                 if( !info.exists() )
                 {
                     addSymlink( fi, TRUE );
                     break;
                 }
                 else if( info.isDir() )
                 {
                     addDir( fi, TRUE );
                     break;
                 }
                 else if( info.isFile() )
                 {
                     addFile( fi, TRUE );
                     break;
                 }
                 else if( info.isSymLink() )
                 {
                     file = createNewPath(info.dirPath(true ),info.readLink());
                     break;
                 }
                 else if( i == 4)
                 { // couldn't resolve symlink add it as symlink
                     addSymlink( fi );
                 }
             } // off for loop for symlink resolving
         }
         else if( fi->isDir() )
             addDir(  fi );
         else if( fi->isFile() )
             addFile( fi );
 
         ++it;
     } // of while loop
     m_view->sort();
 
 }
 int OFileViewFileListView::fileCount()const
 {
     return m_view->childCount();
 }
 
 QString OFileViewFileListView::currentDir()const
 {
     return m_currentDir;
 }
 
 OFileSelector* OFileViewFileListView::selector()
 {
     return m_sel;
 }
 
 bool OFileViewFileListView::eventFilter (QObject *, QEvent *e)
 {
     if ( e->type() == QEvent::KeyPress )
     {
         QKeyEvent *k = (QKeyEvent *)e;
         if ( (k->key()==Key_Enter) || (k->key()==Key_Return))
         {
             slotClicked( Qt::LeftButton,m_view->currentItem(),QPoint(0,0),0);
             return true;
         }
     }
     return false;