author | alwin <alwin> | 2005-03-24 12:16:23 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-03-24 12:16:23 (UTC) |
commit | 4fbd94e2fd6432bb15e24e40be59426b309cbb9d (patch) (side-by-side diff) | |
tree | b78ecad37012bb66d956e22dbaa8cfcdb8cf67fc /noncore/graphics/opie-eye/gui/iconview.cpp | |
parent | c635023dd68edd0cb0cbb2827b926f33e27e0404 (diff) | |
download | opie-4fbd94e2fd6432bb15e24e40be59426b309cbb9d.zip opie-4fbd94e2fd6432bb15e24e40be59426b309cbb9d.tar.gz opie-4fbd94e2fd6432bb15e24e40be59426b309cbb9d.tar.bz2 |
- increased max-thumbnail-size
- shortcuts for inc/dec brightness
- make max thumbnail size as a static so there is one point in code
where it is stored and not 4 time over the whole code
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 | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp index b2443e8..59091a8 100644 --- a/noncore/graphics/opie-eye/gui/iconview.cpp +++ b/noncore/graphics/opie-eye/gui/iconview.cpp @@ -33,12 +33,16 @@ #include <qtimer.h> #include <qstyle.h> using Opie::Core::OKeyConfigItem; +const int PIconView::sMAX_ICON_SIZE = 128; +const int PIconView::sMIN_ICON_SIZE = 12; +const int PIconView::sDEF_ICON_SIZE = 64; + /* * The Icons, Request Cache and IconViewItem for the IconView */ namespace { static QPixmap* _dirPix = 0; static QPixmap* _unkPix = 0; @@ -219,14 +223,14 @@ PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg ) 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; + if (m_iconsize<sMIN_ICON_SIZE)m_iconsize = sMIN_ICON_SIZE; + if (m_iconsize>sMAX_ICON_SIZE)m_iconsize = sMAX_ICON_SIZE; calculateGrid(); initKeys(); loadViews(); } @@ -405,27 +409,27 @@ void PIconView::resetView() { // Also invalidate the cache. We can't cancel the operations anyway g_stringPix.clear(); g_stringInf.clear(); if (m_mode>1) { int osize = m_iconsize; m_iconsize = m_cfg->readNumEntry("iconsize", 32); - if (m_iconsize<12)m_iconsize = 12; - if (m_iconsize>64)m_iconsize = 64; + if (m_iconsize<sMIN_ICON_SIZE)m_iconsize = sMIN_ICON_SIZE; + if (m_iconsize>sMAX_ICON_SIZE)m_iconsize = sMAX_ICON_SIZE; if (osize != m_iconsize) { if (_dirPix){ delete _dirPix; _dirPix = 0; } if (_cpyPix){ delete _cpyPix; _cpyPix = 0; } calculateGrid(); } } else { - m_iconsize = 64; + m_iconsize = sDEF_ICON_SIZE; } slotViewChanged(m_views->currentItem()); m_internalReset = false; } void PIconView::polish() @@ -830,17 +834,17 @@ void PIconView::slotChangeMode( int mode ) { if (m_mode >1) { m_view->setResizeMode(QIconView::Adjust); } else { m_view->setResizeMode(QIconView::Fixed); } if (m_mode==1) { - m_iconsize = 64; + m_iconsize = sDEF_ICON_SIZE; } else { m_iconsize = m_cfg->readNumEntry("iconsize", 32); - if (m_iconsize<12)m_iconsize = 12; - if (m_iconsize>64)m_iconsize = 64; + if (m_iconsize<sMIN_ICON_SIZE)m_iconsize = sMIN_ICON_SIZE; + if (m_iconsize>sMAX_ICON_SIZE)m_iconsize = sMAX_ICON_SIZE; } if (_dirPix){ delete _dirPix; _dirPix = 0; } if (_cpyPix){ @@ -885,13 +889,13 @@ void PIconView::calculateGrid(QResizeEvent* re) m_view->setItemTextPos( pos ); switch (m_mode) { case 2: m_view->setSpacing(2); m_view->setGridX(m_iconsize); m_view->setGridY(-1); - cache = (int)((double)64/(double)m_iconsize*40.0); + cache = (int)((double)sDEF_ICON_SIZE/(double)m_iconsize*80.0); odebug << "cache size: " << cache << oendl; PPixmapCache::self()->setMaxImages(cache); break; case 3: m_view->setSpacing(10); m_view->setGridX( fontMetrics().width("testimage.jpg")+20); |