| -rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.cpp | 80 | ||||
| -rw-r--r-- | noncore/graphics/opie-eye/gui/mainwindow.cpp | 41 |
2 files changed, 91 insertions, 30 deletions
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp index 7231bfb..039f53f 100644 --- a/noncore/graphics/opie-eye/gui/iconview.cpp +++ b/noncore/graphics/opie-eye/gui/iconview.cpp @@ -43,4 +43,5 @@ namespace { static QPixmap* _unkPix = 0; static QPixmap* _picPix = 0; + static QPixmap* _emptyPix = 0; class IconViewItem : public QIconViewItem { public: @@ -50,4 +51,8 @@ namespace { bool isDir()const { return m_isDir; } void setText( const QString& ); + bool textOnly()const{return m_textOnly;} + void setTextOnly(bool how){m_textOnly=how;} + virtual void setPixmap( const QPixmap & icon, bool recalc, bool redraw = TRUE ); + virtual void setPixmap( const QPixmap & icon); protected: @@ -58,4 +63,7 @@ namespace { bool m_isDir : 1; bool m_noInfo :1; + bool m_textOnly:1; + bool m_NameOnly:1; + bool m_Pixset:1; }; class TextViewItem : public IconViewItem { @@ -81,5 +89,5 @@ namespace { const QString& name, bool isDir ) : QIconViewItem( view, name ), m_path( path ), m_isDir( isDir ), - m_noInfo( false ) + m_noInfo( false ),m_textOnly(false),m_Pixset(false) { if ( isDir && !_dirPix ) @@ -88,4 +96,16 @@ namespace { _unkPix = new QPixmap( Resource::loadPixmap( "UnknownDocument" ) ); } + + inline void IconViewItem::setPixmap( const QPixmap & icon, bool recalc, bool redraw) + { + m_Pixset = true; + QIconViewItem::setPixmap(icon,recalc,redraw); + } + inline void IconViewItem::setPixmap( const QPixmap & icon) + { + m_Pixset = true; + QIconViewItem::setPixmap(icon); + } + inline QPixmap* IconViewItem::pixmap()const { // qWarning( "Name is " + m_path.right( 15 ) + " rect is %d %d %d %d | %d %d", @@ -93,4 +113,8 @@ namespace { // iconView()->contentsX(), iconView()->contentsY()); + if (textOnly()&&!m_isDir) { + if (!_emptyPix) _emptyPix = new QPixmap(0,0,1); + return _emptyPix; + } if ( m_isDir ) return _dirPix; @@ -102,8 +126,11 @@ namespace { m_pix = PPixmapCache::self()->cachedImage( m_path, 64, 64 ); - if ( !m_pix && !g_stringPix.contains( m_path )) { + if (!m_pix && !g_stringPix.contains( m_path )&&!m_Pixset) { currentView()->dirLister()->thumbNail( m_path, 64, 64 ); g_stringPix.insert( m_path, const_cast<IconViewItem*>(this)); } + if (m_Pixset) { + return QIconViewItem::pixmap(); + } return m_pix ? m_pix : _unkPix; } @@ -368,15 +395,22 @@ void PIconView::slotReloadDir() { void PIconView::addFolders( const QStringList& lst) { QStringList::ConstIterator it; + IconViewItem * _iv; - for(it=lst.begin(); it != lst.end(); ++it ) - (void)new IconViewItem( m_view, m_path+"/"+(*it), (*it), true ); - - + for(it=lst.begin(); it != lst.end(); ++it ) { + _iv = new IconViewItem( m_view, m_path+"/"+(*it), (*it), true ); + if (m_mode==3) _iv->setTextOnly(true); + } } void PIconView::addFiles( const QStringList& lst) { QStringList::ConstIterator it; - for (it=lst.begin(); it!= lst.end(); ++it ) - (void)new IconViewItem( m_view, m_path+"/"+(*it), (*it) ); + IconViewItem * _iv; + QPixmap*m_pix = 0; + for (it=lst.begin(); it!= lst.end(); ++it ) { + m_pix = PPixmapCache::self()->cachedImage( m_path+"/"+(*it), 64, 64 ); + _iv = new IconViewItem( m_view, m_path+"/"+(*it), (*it) ); + if (m_mode==3) _iv->setTextOnly(true); + if (m_pix) _iv->setPixmap(*m_pix); + } } @@ -405,4 +439,7 @@ void PIconView::slotThumbInfo( const QString& _path, const QString& str ) { return; + if (m_mode == 2) { + return; + } if ( item->intersects(QRect( m_view->contentsX(),m_view->contentsY(), m_view->contentsWidth(), m_view->contentsHeight() ) ) ) @@ -425,8 +462,10 @@ void PIconView::slotThumbNail(const QString& _path, const QPixmap &pix) { m_updatet = true; - if (pix.width()>0) + if (pix.width()>0) { PPixmapCache::self()->insertImage( _path, pix, 64, 64 ); - - + item->setPixmap(pix,true); + } else { + PPixmapCache::self()->insertImage( _path, Resource::loadPixmap( "UnknownDocument" ), 64, 64 ); + } g_stringPix.remove( _path ); } @@ -549,4 +588,21 @@ void PIconView::resizeEvent( QResizeEvent* re ) { void PIconView::calculateGrid() { - + odebug << "Calc grid: x=" << m_view->gridX() << " y=" << m_view->gridY() << oendl; + odebug << "Size of view: " << m_view->size() << oendl; + + switch (m_mode) { + case 2: + m_view->setGridX(80); + m_view->setGridY(80); + break; + case 3: + m_view->setGridX(m_view->width()); + m_view->setGridY(8); + break; + case 1: + default: + m_view->setGridX(m_view->width()); + m_view->setGridY(80); + break; + } } diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp index 5ba4c8e..4852bf6 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.cpp +++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp @@ -106,10 +106,8 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) prevButton->setIconSet( Resource::loadIconSet( "back" ) ); connect(prevButton,SIGNAL(clicked()),m_view,SLOT(slotShowPrev())); - prevButton->hide(); nextButton = new QToolButton(bar); nextButton->setIconSet( Resource::loadIconSet( "forward" ) ); connect(nextButton,SIGNAL(clicked()),m_view,SLOT(slotShowNext())); - nextButton->hide(); rotateButton = new QToolButton(bar); @@ -117,8 +115,9 @@ PMainWindow::PMainWindow(QWidget* wid, const char* name, WFlags style) rotateButton->setToggleButton(true); - odebug << "Mode = " << m_stack->mode() << oendl; if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) { rotateButton->setOn(true); autoRotate = true; + prevButton->hide(); + nextButton->hide(); } else { rotateButton->setOn(false); @@ -300,9 +299,11 @@ void PMainWindow::slotShowInfo( const QString& inf ) { } m_info->setPath( inf ); - prevButton->hide(); - nextButton->hide(); - upButton->hide(); - fsButton->hide(); - viewModeButton->hide(); + if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) { + prevButton->hide(); + nextButton->hide(); + upButton->hide(); + fsButton->hide(); + viewModeButton->hide(); + } m_stack->raiseWidget( ImageInfo ); } @@ -313,9 +314,11 @@ void PMainWindow::slotDisplay( const QString& inf ) { } m_disp->setImage( inf ); - prevButton->show(); - nextButton->show(); - upButton->hide(); - fsButton->hide(); - viewModeButton->hide(); + if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) { + prevButton->show(); + nextButton->show(); + upButton->hide(); + fsButton->hide(); + viewModeButton->hide(); + } m_stack->raiseWidget( ImageDisplay ); } @@ -342,9 +345,11 @@ void PMainWindow::closeEvent( QCloseEvent* ev ) { void PMainWindow::raiseIconView() { - prevButton->hide(); - nextButton->hide(); - upButton->show(); - fsButton->show(); - viewModeButton->show(); + if (m_stack->mode() == Opie::Ui::OWidgetStack::SmallScreen) { + prevButton->hide(); + nextButton->hide(); + upButton->show(); + fsButton->show(); + viewModeButton->show(); + } m_stack->raiseWidget( IconView ); } |