From 90d458c63d274a66ca427710b88e2f090a0ab11b Mon Sep 17 00:00:00 2001 From: alwin Date: Sat, 06 Nov 2004 02:57:25 +0000 Subject: a lots of tests with the iconview, user can now setup the prefered icon-size, but still some rewrites/redesigns needed. QIconView(Item) is sometimes horrible. some default-values changed --- diff --git a/noncore/graphics/opie-eye/gui/basesetup.cpp b/noncore/graphics/opie-eye/gui/basesetup.cpp index 20dda5a..fdf3466 100644 --- a/noncore/graphics/opie-eye/gui/basesetup.cpp +++ b/noncore/graphics/opie-eye/gui/basesetup.cpp @@ -13,6 +13,7 @@ BaseSetup::BaseSetup(Opie::Core::OConfig *a_cfg,QWidget * parent, const char * n m_MainLayout = new QVBoxLayout( this, 11, 6, "m_MainLayout"); m_SlidetimeLayout = new QGridLayout( 0, 1, 1, 0, 6, "m_SlidetimeLayout"); + m_IconsizeLayout = new QGridLayout( 0, 1, 1, 0, 6, "m_IconsizeLayout"); m_SlideShowTime = new QSpinBox( this, "m_SlideShowTime" ); m_SlideShowTime->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Fixed)); @@ -29,6 +30,20 @@ BaseSetup::BaseSetup(Opie::Core::OConfig *a_cfg,QWidget * parent, const char * n m_SlidetimeLayout->addWidget( m_SlidetimeLabel, 0, 0 ); m_MainLayout->addLayout( m_SlidetimeLayout ); + m_Iconsize = new QSpinBox( this, "m_Iconsize" ); + m_Iconsize->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Fixed)); + m_Iconsize->setButtonSymbols( QSpinBox::PlusMinus ); + m_Iconsize->setMaxValue( 64 ); + m_Iconsize->setMinValue(12); + m_Iconsize->setValue( 32 ); + m_Iconsize->setSuffix(tr(" pixel")); + m_IconsizeLayout->addWidget( m_Iconsize, 0, 1 ); + m_IconsizeLabel = new QLabel( this, "m_IconsizeLabel" ); + m_IconsizeLabel->setText(tr("Size of thumbnails:")); + m_IconsizeLayout->addWidget( m_IconsizeLabel, 0, 0 ); + m_MainLayout->addLayout(m_IconsizeLayout); + + #if 0 m_ShowToolBar = new QCheckBox( this, "m_ShowToolBar" ); m_ShowToolBar->setText(tr("Show toolbar on startup")); @@ -41,11 +56,15 @@ BaseSetup::BaseSetup(Opie::Core::OConfig *a_cfg,QWidget * parent, const char * n spacer1 = new QSpacerItem( 20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding ); m_MainLayout->addItem( spacer1 ); - int stime = m_cfg->readNumEntry("base_slideshowtimeout",2); + int stime = m_cfg->readNumEntry("slideshowtimeout",2); if (stime<0) stime=2; if (stime>60) stime=60; m_SlideShowTime->setValue(stime); - m_SaveStateAuto->setChecked(m_cfg->readBoolEntry("base_savestatus",false)); + m_SaveStateAuto->setChecked(m_cfg->readBoolEntry("savestatus",true)); + stime = m_cfg->readNumEntry("iconsize", 32); + if (stime<12)stime = 12; + if (stime>64)stime = 64; + m_Iconsize->setValue(stime); } BaseSetup::~BaseSetup() @@ -55,6 +74,7 @@ BaseSetup::~BaseSetup() void BaseSetup::save_values() { if (!m_cfg) return; - m_cfg->writeEntry("base_slideshowtimeout",m_SlideShowTime->value()); - m_cfg->writeEntry("base_savestatus",m_SaveStateAuto->isChecked()); + m_cfg->writeEntry("slideshowtimeout",m_SlideShowTime->value()); + m_cfg->writeEntry("savestatus",m_SaveStateAuto->isChecked()); + m_cfg->writeEntry("iconsize",m_Iconsize->value()); } diff --git a/noncore/graphics/opie-eye/gui/basesetup.h b/noncore/graphics/opie-eye/gui/basesetup.h index c343f88..95929f2 100644 --- a/noncore/graphics/opie-eye/gui/basesetup.h +++ b/noncore/graphics/opie-eye/gui/basesetup.h @@ -30,6 +30,9 @@ protected: QLabel * m_SlidetimeLabel; QCheckBox *m_SaveStateAuto; QSpacerItem *spacer1; + QGridLayout * m_IconsizeLayout; + QSpinBox * m_Iconsize; + QLabel * m_IconsizeLabel; }; #endif 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 @@ -41,10 +41,11 @@ using Opie::Core::OKeyConfigItem; 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; } @@ -58,6 +59,8 @@ namespace { protected: mutable QPixmap* m_pix; + int m_iconsize; + void check_pix()const; private: QString m_path; @@ -68,12 +71,12 @@ namespace { 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& ); }; @@ -87,14 +90,55 @@ namespace { static QMap 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 ) @@ -121,16 +165,17 @@ namespace { return _dirPix; else{ if (!m_noInfo && !g_stringInf.contains( m_path ) ) { - currentView()->dirLister()->imageInfo( m_path ); g_stringInf.insert( m_path, const_cast(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(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 ) { @@ -153,6 +198,7 @@ PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg ) } m_path = QDir::homeDirPath(); m_mode = 0; + m_iconsize = 32; m_internalReset = false; QHBox *hbox = new QHBox( this ); @@ -175,6 +221,14 @@ PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg ) 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(); @@ -280,6 +334,10 @@ void PIconView::slotChangeDir(const QString& path) { 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 */ @@ -287,10 +345,6 @@ void PIconView::slotChangeDir(const QString& path) { 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(parent())->setCaption( QObject::tr("%1 - O View", "Name of the dir").arg( m_path ) ); } @@ -365,6 +419,16 @@ void PIconView::loadViews() { 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; } @@ -413,8 +477,9 @@ void PIconView::slotViewChanged( int i) { /* 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())); } @@ -432,7 +497,7 @@ void PIconView::addFolders( const QStringList& lst) { 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); } } @@ -446,8 +511,8 @@ void PIconView::addFiles( const QStringList& lst) { 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()); @@ -524,12 +589,27 @@ void PIconView::slotThumbNail(const QString& _path, const QPixmap &pix) { m_updatet = true; if (pix.width()>0) { - PPixmapCache::self()->insertImage( _path, pix, 64, 64 ); - item->setPixmap(pix,true); + if (pix.width()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); } @@ -691,7 +771,7 @@ void PIconView::slotStartSlide() { } else { slotShowImage( name ); } - int t = m_cfg->readNumEntry("base_slideshowtimeout", 2); + int t = m_cfg->readNumEntry("slideshowtimeout", 2); emit sig_startslide(t); } @@ -710,26 +790,46 @@ void PIconView::slotImageInfo( const QString& 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 ) { @@ -745,8 +845,8 @@ void PIconView::calculateGrid() { 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: @@ -761,4 +861,5 @@ void PIconView::calculateGrid() { PPixmapCache::self()->setMaxImages(20); break; } + m_view->setSpacing(10); } diff --git a/noncore/graphics/opie-eye/gui/iconview.h b/noncore/graphics/opie-eye/gui/iconview.h index bea35c2..b018c51 100644 --- a/noncore/graphics/opie-eye/gui/iconview.h +++ b/noncore/graphics/opie-eye/gui/iconview.h @@ -55,7 +55,7 @@ private: QString nextFileName(bool &isDir)const; QString prevFileName(bool &isDir)const; void loadViews(); - void calculateGrid(); + void calculateGrid(QResizeEvent*e = 0); private slots: void slotDirUp(); @@ -96,6 +96,7 @@ private: bool m_updatet : 1; int m_mode; bool m_internalReset:1; + int m_iconsize; }; #endif diff --git a/noncore/graphics/opie-eye/gui/mainwindow.cpp b/noncore/graphics/opie-eye/gui/mainwindow.cpp index 30c9bf1..67eb277 100644 --- a/noncore/graphics/opie-eye/gui/mainwindow.cpp +++ b/noncore/graphics/opie-eye/gui/mainwindow.cpp @@ -204,12 +204,12 @@ void PMainWindow::slotConfig() { if ( act ) { - m_view->resetView(); keyWid->save(); m_disp->manager()->save(); m_info->manager()->save(); m_view->manager()->save(); bSetup->save_values(); + m_view->resetView(); readConfig(); } delete keyWid; @@ -692,5 +692,5 @@ void PMainWindow::listviewselected(QAction*which) void PMainWindow::readConfig() { - autoSave =m_cfg->readBoolEntry("base_savestatus",true); + autoSave =m_cfg->readBoolEntry("savestatus",true); } -- cgit v0.9.0.2