author | zecke <zecke> | 2004-04-02 23:46:47 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-04-02 23:46:47 (UTC) |
commit | 02bb854283a7b0abecf3d3e9dd4c9ece0c5ef6a9 (patch) (unidiff) | |
tree | f0ff26b90aefd930c18735cf49b2a9e2c7c6ba9a /noncore/graphics | |
parent | cc94df750d5e0c016fad2dc12bbbf7cd8592e7c8 (diff) | |
download | opie-02bb854283a7b0abecf3d3e9dd4c9ece0c5ef6a9.zip opie-02bb854283a7b0abecf3d3e9dd4c9ece0c5ef6a9.tar.gz opie-02bb854283a7b0abecf3d3e9dd4c9ece0c5ef6a9.tar.bz2 |
Ah finally the IconView is a bit faster... Still needs a Qt patch
But hey previewing is really useful now. I think it is one of the fastest
Image Viewer available for Unix/Windoze...
-rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.cpp | 58 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.h | 1 |
2 files changed, 34 insertions, 25 deletions
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp index ed9fc9c..4a20648 100644 --- a/noncore/graphics/opie-eye/gui/iconview.cpp +++ b/noncore/graphics/opie-eye/gui/iconview.cpp | |||
@@ -64,6 +64,5 @@ namespace { | |||
64 | const QString& name, bool isDir ) | 64 | const QString& name, bool isDir ) |
65 | : QIconViewItem( view ), m_path( path ), m_isDir( isDir ), | 65 | : QIconViewItem( view, name ), m_path( path ), m_isDir( isDir ), |
66 | m_noInfo( false ) | 66 | m_noInfo( false ) |
67 | { | 67 | { |
68 | QIconViewItem::setText( name ); | ||
69 | if ( isDir && !_dirPix ) | 68 | if ( isDir && !_dirPix ) |
@@ -74,5 +73,5 @@ namespace { | |||
74 | inline QPixmap* IconViewItem::pixmap()const { | 73 | inline QPixmap* IconViewItem::pixmap()const { |
75 | qWarning( "Name is " + m_path.right( 15 ) + " rect is %d %d %d %d | %d %d", | 74 | qWarning( "Name is " + m_path.right( 15 ) + " rect is %d %d %d %d | %d %d", |
76 | rect().x(),rect().y(),rect().width(),rect().height(), | 75 | rect().x(),rect().y(),rect().width(),rect().height(), |
77 | iconView()->contentsX(), iconView()->contentsY()); | 76 | iconView()->contentsX(), iconView()->contentsY()); |
78 | 77 | ||
@@ -103,3 +102,3 @@ namespace { | |||
103 | PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg ) | 102 | PIconView::PIconView( QWidget* wid, Opie::Core::OConfig* cfg ) |
104 | : QVBox( wid ), m_cfg( cfg ) | 103 | : QVBox( wid ), m_cfg( cfg ), m_updatet( false ) |
105 | { | 104 | { |
@@ -310,22 +309,27 @@ void PIconView::slotClicked(QIconViewItem* _it) { | |||
310 | void PIconView::slotThumbInfo( const QString& _path, const QString& str ) { | 309 | void PIconView::slotThumbInfo( const QString& _path, const QString& str ) { |
311 | if ( g_stringInf.contains( _path ) ) { | 310 | IconViewItem* item = g_stringInf[_path]; |
312 | IconViewItem* item = g_stringInf[_path]; | 311 | if (!item ) |
313 | /* if set the view shows nonsens! | 312 | return; |
314 | I dont know how to fix the format of displayed text :(*/ | 313 | |
315 | item->setText( str ); | 314 | if ( item->intersects(QRect( m_view->contentsX(),m_view->contentsY(), |
316 | g_stringInf.remove( _path ); | 315 | m_view->contentsWidth(), m_view->contentsHeight() ) ) ) |
317 | } | 316 | m_updatet = true; |
317 | |||
318 | item->setText( str ); | ||
319 | g_stringInf.remove( _path ); | ||
318 | } | 320 | } |
319 | void PIconView::slotThumbNail(const QString& _path, const QPixmap &pix) { | 321 | void PIconView::slotThumbNail(const QString& _path, const QPixmap &pix) { |
320 | if ( g_stringPix.contains( _path ) ) { | 322 | IconViewItem* item = g_stringPix[_path]; |
321 | IconViewItem* item = g_stringPix[_path]; | 323 | if (!item ) |
322 | 324 | return; | |
323 | if (pix.width()>0) { | 325 | |
324 | PPixmapCache::self()->insertImage( _path, pix, 64, 64 ); | 326 | if ( item->intersects(QRect( m_view->contentsX(),m_view->contentsY(), |
325 | /* required for a recalculated rectangle. otherwise the view show nonsense! */ | 327 | m_view->contentsWidth(), m_view->contentsHeight() ) ) ) |
326 | } else { | 328 | m_updatet = true; |
327 | PPixmapCache::self()->insertImage(_path,Resource::loadPixmap( "UnknownDocument" ),64,64 ); | 329 | |
328 | } | 330 | if (pix.width()>0) |
329 | g_stringPix.remove( _path ); | 331 | PPixmapCache::self()->insertImage( _path, pix, 64, 64 ); |
330 | } | 332 | |
333 | |||
334 | g_stringPix.remove( _path ); | ||
331 | } | 335 | } |
@@ -356,2 +360,3 @@ void PIconView::slotStart() { | |||
356 | m_view->viewport()->setUpdatesEnabled( false ); | 360 | m_view->viewport()->setUpdatesEnabled( false ); |
361 | qWarning( "Sig Start" ); | ||
357 | } | 362 | } |
@@ -359,4 +364,7 @@ void PIconView::slotStart() { | |||
359 | void PIconView::slotEnd() { | 364 | void PIconView::slotEnd() { |
360 | m_view->arrangeItemsInGrid( ); | 365 | qWarning( "SLot End" ); |
366 | if ( m_updatet ) | ||
367 | m_view->arrangeItemsInGrid( ); | ||
361 | m_view->viewport()->setUpdatesEnabled( true ); | 368 | m_view->viewport()->setUpdatesEnabled( true ); |
369 | m_updatet = false; | ||
362 | } | 370 | } |
diff --git a/noncore/graphics/opie-eye/gui/iconview.h b/noncore/graphics/opie-eye/gui/iconview.h index 0fba327..7ddb023 100644 --- a/noncore/graphics/opie-eye/gui/iconview.h +++ b/noncore/graphics/opie-eye/gui/iconview.h | |||
@@ -76,2 +76,3 @@ private: | |||
76 | QString m_path; | 76 | QString m_path; |
77 | bool m_updatet : 1; | ||
77 | }; | 78 | }; |