Diffstat (limited to 'noncore/graphics/opie-eye/gui/iconview.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.cpp | 173 |
1 files changed, 137 insertions, 36 deletions
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp index eafff1d..c037d0d 100644 --- a/noncore/graphics/opie-eye/gui/iconview.cpp +++ b/noncore/graphics/opie-eye/gui/iconview.cpp @@ -32,78 +32,122 @@ #include <qtimer.h> #include <qstyle.h> using Opie::Core::OKeyConfigItem; /* * The Icons, Request Cache and IconViewItem for the IconView */ namespace { static QPixmap* _dirPix = 0; static QPixmap* _unkPix = 0; + static QPixmap* _cpyPix = 0; static QPixmap* _emptyPix = 0; class IconViewItem : public QIconViewItem { public: - IconViewItem( QIconView*, const QString& path, const QString& name, bool isDir = false); + IconViewItem( QIconView*, const QString& path, const QString& name,int a_iconsize, bool isDir = false); QPixmap* pixmap()const; QString path()const { return m_path; } bool isDir()const { return m_isDir; } void setText( const QString& ); bool textOnly()const{return m_textOnly;} void setTextOnly(bool how){m_textOnly=how;} /* just for starting recalc of item rect! */ virtual void setPixmap( const QPixmap & icon, bool recalc, bool redraw = TRUE ); /* just for starting recalc of item rect! */ virtual void setPixmap( const QPixmap & icon); protected: mutable QPixmap* m_pix; + int m_iconsize; + void check_pix()const; private: QString m_path; bool m_isDir : 1; bool m_noInfo :1; bool m_textOnly:1; bool m_NameOnly:1; bool m_Pixset:1; }; class TextViewItem : public IconViewItem { - TextViewItem( QIconView*, const QString& path, const QString& name, bool isDir = false ); + TextViewItem( QIconView*, const QString& path, const QString& name, int a_iconsize , bool isDir = false); QPixmap *pixmap()const; void setText( const QString& ); }; class ThumbViewItem : public IconViewItem { - ThumbViewItem( QIconView*, const QString& path, const QString& name, bool isDir = false ); + ThumbViewItem( QIconView*, const QString& path, const QString& name, int a_iconsize, bool isDir = false ); QPixmap *pixmap()const; void setText( const QString& ); }; /* * If we request an Image or String * we add it to the map */ static QMap<QString, IconViewItem*> g_stringInf; static QMap<QString, IconViewItem*> g_stringPix; IconViewItem::IconViewItem( QIconView* view,const QString& path, - const QString& name, bool isDir ) + const QString& name, int a_iconsize, bool isDir) : QIconViewItem( view, name ), m_path( path ), m_isDir( isDir ), m_noInfo( false ),m_textOnly(false),m_Pixset(false) { - if ( isDir && !_dirPix ) - _dirPix = new QPixmap( Resource::loadPixmap("advancedfm/FileBrowser")); - else if ( !isDir && !_unkPix ) - _unkPix = new QPixmap( Resource::loadPixmap( "UnknownDocument" ) ); + m_iconsize = a_iconsize; + if ( isDir ) { + if (_dirPix && _dirPix->width()!=m_iconsize) { + delete _dirPix; + _dirPix = 0; + } + if (!_dirPix ) { + _dirPix = new QPixmap( Resource::loadPixmap("advancedfm/FileBrowser")); + } + } else { + if (!_unkPix ) { + _unkPix = new QPixmap( Resource::loadPixmap( "UnknownDocument" ) ); + } + } + check_pix(); + } + + inline void IconViewItem::check_pix()const + { + if (_cpyPix && _cpyPix->width()!=m_iconsize) { + delete _cpyPix; + _cpyPix = 0; + } + if (_dirPix && _dirPix->width()>m_iconsize) { + QPixmap*Pix = new QPixmap(*_dirPix); + Pix->resize(m_iconsize,m_iconsize); + delete _dirPix; + _dirPix = Pix; + } + if (!_cpyPix && _unkPix) { + if (_unkPix->width()>=m_iconsize) { + _cpyPix = new QPixmap(*_unkPix); + if (_unkPix->width()>m_iconsize) + _cpyPix->resize(m_iconsize,m_iconsize); + } else { + _cpyPix = new QPixmap(m_iconsize,m_iconsize); + _cpyPix->fill(); + QPainter pa(_cpyPix); + int offset = (m_iconsize-_unkPix->width())/2; + int offy = (m_iconsize-_unkPix->height())/2; + if (offy<0) offy=0; + pa.drawPixmap(offset,offy,*_unkPix); + pa.end(); + } + } } inline void IconViewItem::setPixmap( const QPixmap & , bool, bool ) { m_Pixset = true; calcRect(text()); } inline void IconViewItem::setPixmap( const QPixmap & ) { m_Pixset = true; calcRect(text()); } @@ -112,78 +156,88 @@ namespace { // owarn << "Name is " << m_path.right( 15 ) << " rect is " << rect().x() << " " << rect().y() // << " " << rect().width() << " " << rect().height() << " | " << iconView()->contentsX() // << " " << iconView()->contentsY() << oendl; if (textOnly()&&!m_isDir) { if (!_emptyPix) _emptyPix = new QPixmap(0,0,1); return _emptyPix; } if ( m_isDir ) return _dirPix; else{ if (!m_noInfo && !g_stringInf.contains( m_path ) ) { - currentView()->dirLister()->imageInfo( m_path ); g_stringInf.insert( m_path, const_cast<IconViewItem*>(this)); + currentView()->dirLister()->imageInfo( m_path ); } - m_pix = PPixmapCache::self()->cachedImage( m_path, 64, 64 ); + m_pix = PPixmapCache::self()->cachedImage( m_path, m_iconsize, m_iconsize ); if (!m_pix && !g_stringPix.contains( m_path )) { - currentView()->dirLister()->thumbNail( m_path, 64, 64 ); + check_pix(); g_stringPix.insert( m_path, const_cast<IconViewItem*>(this)); + currentView()->dirLister()->thumbNail( m_path, m_iconsize, m_iconsize); } - return m_pix ? m_pix : _unkPix; + return m_pix ? m_pix : _cpyPix; } } inline void IconViewItem::setText( const QString& str ) { QString text = QIconViewItem::text()+"\n"+str; m_noInfo = true; QIconViewItem::setText( text ); } } /* * Set up the GUI.. initialize the slave set up gui * and also load a dir */ PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg ) : QVBox( wid ), m_cfg( cfg ), m_updatet( false ) { { QCopEnvelope( "QPE/Application/opie-eye_slave", "refUp()" ); } m_path = QDir::homeDirPath(); m_mode = 0; + m_iconsize = 32; m_internalReset = false; QHBox *hbox = new QHBox( this ); QLabel* lbl = new QLabel( hbox ); lbl->setText( tr("View as" ) ); m_views = new QComboBox( hbox, "View As" ); m_view= new QIconView( this ); connect(m_view, SIGNAL(clicked(QIconViewItem*) ), this, SLOT(slotClicked(QIconViewItem*)) ); connect(m_view, SIGNAL(returnPressed(QIconViewItem*)), this, SLOT(slotClicked(QIconViewItem*)) ); m_view->setArrangement( QIconView::LeftToRight ); m_mode = m_cfg->readNumEntry("ListViewMode", 1); QString lastView = m_cfg->readEntry("LastView",""); if (m_mode < 1 || m_mode>3) m_mode = 1; m_view->setItemTextPos( QIconView::Right ); + if (m_mode >1) { + m_view->setResizeMode(QIconView::Adjust); + } else { + m_view->setResizeMode(QIconView::Fixed); + } + m_iconsize = m_cfg->readNumEntry("iconsize", 32); + if (m_iconsize<12)m_iconsize = 12; + if (m_iconsize>64)m_iconsize = 64; calculateGrid(); initKeys(); loadViews(); int cc=0; for (; cc<m_views->count();++cc) { if (m_views->text(cc)==lastView) { break; } } @@ -271,35 +325,35 @@ void PIconView::slotChangeDir(const QString& path) { if (!lister ) return; /* * Say what we want and take what we get */ lister->setStartPath( path ); m_path = lister->currentPath(); m_view->viewport()->setUpdatesEnabled( false ); m_view->clear(); + // Also invalidate the cache. We can't cancel the operations anyway + g_stringPix.clear(); + g_stringInf.clear(); + /* * add files and folders */ addFolders( lister->folders() ); addFiles( lister->files() ); m_view->viewport()->setUpdatesEnabled( true ); - // Also invalidate the cache. We can't cancel the operations anyway - g_stringPix.clear(); - g_stringInf.clear(); - // looks ugly static_cast<QMainWindow*>(parent())->setCaption( QObject::tr("%1 - O View", "Name of the dir").arg( m_path ) ); } /** * get the current file name * @param isDir see if this is a dir or real file */ QString PIconView::currentFileName(bool &isDir)const { isDir = false; QIconViewItem* _it = m_view->currentItem(); if ( !_it ) @@ -356,24 +410,34 @@ void PIconView::slotTrash() { /* * see what views are available */ void PIconView::loadViews() { ViewMap::Iterator it; ViewMap* map = viewMap(); for ( it = map->begin(); it != map->end(); ++it ) m_views->insertItem( it.key() ); } void PIconView::resetView() { m_internalReset = true; + // Also invalidate the cache. We can't cancel the operations anyway + g_stringPix.clear(); + g_stringInf.clear(); + if (m_mode>1) { + m_iconsize = m_cfg->readNumEntry("iconsize", 32); + if (m_iconsize<12)m_iconsize = 12; + if (m_iconsize>64)m_iconsize = 64; + } else { + m_iconsize = 64; + } slotViewChanged(m_views->currentItem()); m_internalReset = false; } /* *swicth view reloadDir and connect signals */ void PIconView::slotViewChanged( int i) { if (!m_views->count() ) { setCurrentView( 0l); return; } @@ -404,59 +468,60 @@ void PIconView::slotViewChanged( int i) { this, SLOT( slotThumbInfo(const QString&, const QString&))); connect(lis, SIGNAL( sig_thumbNail(const QString&, const QPixmap&)), this, SLOT(slotThumbNail(const QString&, const QPixmap&))); connect(lis, SIGNAL(sig_start()), this, SLOT(slotStart())); connect(lis, SIGNAL(sig_end()) , this, SLOT(slotEnd()) ); /* reload now with default Path * but only if it isn't a reset like from setupdlg */ - if (!m_internalReset) + if (!m_internalReset) { m_path = lis->defaultPath(); + } QTimer::singleShot( 0, this, SLOT(slotReloadDir())); } void PIconView::slotReloadDir() { slotChangeDir( m_path ); } /* * add files and folders */ void PIconView::addFolders( const QStringList& lst) { QStringList::ConstIterator it; IconViewItem * _iv; for(it=lst.begin(); it != lst.end(); ++it ) { - _iv = new IconViewItem( m_view, m_path+"/"+(*it), (*it), true ); + _iv = new IconViewItem( m_view, m_path+"/"+(*it), (*it),m_iconsize, true ); if (m_mode==3) _iv->setTextOnly(true); } } void PIconView::addFiles( const QStringList& lst) { QStringList::ConstIterator it; IconViewItem * _iv; QPixmap*m_pix = 0; QString pre = ""; if (!m_path.isEmpty()) { pre = m_path+"/"; } for (it=lst.begin(); it!= lst.end(); ++it ) { - m_pix = PPixmapCache::self()->cachedImage( pre+(*it), 64, 64 ); - _iv = new IconViewItem( m_view, pre+(*it), (*it) ); + m_pix = PPixmapCache::self()->cachedImage( pre+(*it), m_iconsize, m_iconsize ); + _iv = new IconViewItem( m_view, pre+(*it), (*it),m_iconsize ); if (m_mode==3) { _iv->setTextOnly(true); _iv->setPixmap(QPixmap()); } else { if (m_pix) _iv->setPixmap(*m_pix); } } } @@ -515,30 +580,45 @@ void PIconView::slotThumbInfo( const QString& _path, const QString& str ) { * got thumbnail and see if it is visible so we need to update later */ void PIconView::slotThumbNail(const QString& _path, const QPixmap &pix) { IconViewItem* item = g_stringPix[_path]; if (!item ) return; if ( item->intersects(QRect( m_view->contentsX(),m_view->contentsY(), m_view->contentsWidth(), m_view->contentsHeight() ) ) ) m_updatet = true; if (pix.width()>0) { - PPixmapCache::self()->insertImage( _path, pix, 64, 64 ); - item->setPixmap(pix,true); + if (pix.width()<m_iconsize) { + QPixmap p(m_iconsize,m_iconsize); + p.fill(); + QPainter pa(&p); + int offset = (m_iconsize-pix.width())/2; + int offy = (m_iconsize-pix.height())/2; + if (offy<0) offy=0; + pa.drawPixmap(offset,offy,pix); + pa.end(); + PPixmapCache::self()->insertImage( _path, p, m_iconsize, m_iconsize ); + item->setPixmap(p,true); + } else { + PPixmapCache::self()->insertImage( _path, pix, m_iconsize, m_iconsize ); + item->setPixmap(pix,true); + } + } else { - PPixmapCache::self()->insertImage( _path, Resource::loadPixmap( "UnknownDocument" ), 64, 64 ); + PPixmapCache::self()->insertImage( _path, Resource::loadPixmap( "UnknownDocument" ), m_iconsize, m_iconsize ); } g_stringPix.remove( _path ); + m_view->arrangeItemsInGrid(true); } /* * FIXME rename */ void PIconView::slotRename() { } /* @@ -682,83 +762,104 @@ void PIconView::slotShowImage( const QString& name) { emit sig_display(r_name); } void PIconView::slotStartSlide() { bool isDir = false; QString name = currentFileName(isDir); if (isDir) { if (!slotShowFirst()) return; } else { slotShowImage( name ); } - int t = m_cfg->readNumEntry("base_slideshowtimeout", 2); + int t = m_cfg->readNumEntry("slideshowtimeout", 2); emit sig_startslide(t); } void PIconView::slotImageInfo() { bool isDir = false; QString name = currentFileName(isDir); if (isDir) return; slotImageInfo( name ); } void PIconView::slotImageInfo( const QString& name) { PDirLister *lister = currentView()->dirLister(); QString r_name = lister->nameToFname(name); emit sig_showInfo(r_name ); } void PIconView::slotChangeMode( int mode ) { - if ( mode >= 1 && mode <= 3 ) + if ( mode >= 1 && mode <= 3 ) { m_mode = mode; + m_cfg->writeEntry("ListViewMode", m_mode); + /* performance! */ + m_view->clear(); + if (m_mode >1) { + m_view->setResizeMode(QIconView::Adjust); + } else { + m_view->setResizeMode(QIconView::Fixed); + } + if (m_mode==1) { + m_iconsize = 64; + } else { + m_iconsize = m_cfg->readNumEntry("iconsize", 32); + if (m_iconsize<12)m_iconsize = 12; + if (m_iconsize>64)m_iconsize = 64; + } - m_cfg->writeEntry("ListViewMode", m_mode); - /* performance! */ - m_view->clear(); - calculateGrid(); - slotReloadDir(); + calculateGrid(); + slotReloadDir(); + } } void PIconView::resizeEvent( QResizeEvent* re ) { + calculateGrid(re); QVBox::resizeEvent( re ); - calculateGrid(); + //calculateGrid(); } -void PIconView::calculateGrid() { - int dw = QApplication::desktop()->width(); - int viewerWidth = dw-style().scrollBarExtent().width(); +void PIconView::calculateGrid(QResizeEvent* re) +{ + int viewerWidth; + if (re) { + viewerWidth=re->size().width(); + } else { + int dw = QApplication::desktop()->width(); + viewerWidth = dw-style().scrollBarExtent().width(); + } QIconView::ItemTextPos pos; switch( m_mode ) { case 2: pos = QIconView::Bottom; break; case 3: case 1: default: pos = QIconView::Right; break; } m_view->setItemTextPos( pos ); switch (m_mode) { case 2: - m_view->setGridX(50); - m_view->setGridY(20); + m_view->setGridX(m_iconsize); + m_view->setGridY(-1); PPixmapCache::self()->setMaxImages(40); break; case 3: m_view->setGridX( fontMetrics().width("testimage.jpg")+20); m_view->setGridY(8); PPixmapCache::self()->setMaxImages(2); break; case 1: default: m_view->setGridX( viewerWidth-3*m_view->spacing()); m_view->setGridY( fontMetrics().height()*2+40 ); PPixmapCache::self()->setMaxImages(20); break; } + m_view->setSpacing(10); } |