-rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.cpp | 19 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/gui/iconview.h | 1 |
2 files changed, 20 insertions, 0 deletions
diff --git a/noncore/graphics/opie-eye/gui/iconview.cpp b/noncore/graphics/opie-eye/gui/iconview.cpp index 211314b..652acc9 100644 --- a/noncore/graphics/opie-eye/gui/iconview.cpp +++ b/noncore/graphics/opie-eye/gui/iconview.cpp | |||
@@ -433,16 +433,19 @@ void PIconView::addFiles( const QStringList& lst) { | |||
433 | pre = m_path+"/"; | 433 | pre = m_path+"/"; |
434 | } | 434 | } |
435 | for (it=lst.begin(); it!= lst.end(); ++it ) { | 435 | for (it=lst.begin(); it!= lst.end(); ++it ) { |
436 | m_pix = PPixmapCache::self()->cachedImage( pre+(*it), 64, 64 ); | 436 | m_pix = PPixmapCache::self()->cachedImage( pre+(*it), 64, 64 ); |
437 | _iv = new IconViewItem( m_view, pre+(*it), (*it) ); | 437 | _iv = new IconViewItem( m_view, pre+(*it), (*it) ); |
438 | if (m_mode==3) { | 438 | if (m_mode==3) { |
439 | _iv->setTextOnly(true); | 439 | _iv->setTextOnly(true); |
440 | _iv->setPixmap(QPixmap()); | 440 | _iv->setPixmap(QPixmap()); |
441 | |||
442 | |||
443 | |||
441 | } else { | 444 | } else { |
442 | if (m_pix) _iv->setPixmap(*m_pix); | 445 | if (m_pix) _iv->setPixmap(*m_pix); |
443 | } | 446 | } |
444 | } | 447 | } |
445 | 448 | ||
446 | } | 449 | } |
447 | 450 | ||
448 | /* | 451 | /* |
@@ -455,16 +458,32 @@ void PIconView::slotClicked(QIconViewItem* _it) { | |||
455 | IconViewItem* it = static_cast<IconViewItem*>(_it); | 458 | IconViewItem* it = static_cast<IconViewItem*>(_it); |
456 | if( it->isDir() ) | 459 | if( it->isDir() ) |
457 | slotChangeDir( it->path() ); | 460 | slotChangeDir( it->path() ); |
458 | else // view image | 461 | else // view image |
459 | slotShowImage(); | 462 | slotShowImage(); |
460 | } | 463 | } |
461 | 464 | ||
462 | /* | 465 | /* |
466 | * Return was pressed. which is triggered by the keydown | ||
467 | * handler. The problem is that the key up will be handled | ||
468 | * by the ImageDisplayer and goes to the next image | ||
469 | */ | ||
470 | void PIconView::slotRetrun( QIconViewItem *_it ) { | ||
471 | if(!_it ) | ||
472 | return; | ||
473 | |||
474 | IconViewItem* it = static_cast<IconViewItem*>(_it); | ||
475 | if( it->isDir() ) | ||
476 | slotChangeDir( it->path() ); | ||
477 | else | ||
478 | QTimer::singleShot(0, this, SLOT(slotShowImage()) ); | ||
479 | } | ||
480 | |||
481 | /* | ||
463 | * got thumb info add to the cache if items is visible | 482 | * got thumb info add to the cache if items is visible |
464 | * we later need update after processing of slave is done | 483 | * we later need update after processing of slave is done |
465 | */ | 484 | */ |
466 | void PIconView::slotThumbInfo( const QString& _path, const QString& str ) { | 485 | void PIconView::slotThumbInfo( const QString& _path, const QString& str ) { |
467 | IconViewItem* item = g_stringInf[_path]; | 486 | IconViewItem* item = g_stringInf[_path]; |
468 | if (!item ) | 487 | if (!item ) |
469 | return; | 488 | return; |
470 | 489 | ||
diff --git a/noncore/graphics/opie-eye/gui/iconview.h b/noncore/graphics/opie-eye/gui/iconview.h index 14ad168..a424c5c 100644 --- a/noncore/graphics/opie-eye/gui/iconview.h +++ b/noncore/graphics/opie-eye/gui/iconview.h | |||
@@ -71,16 +71,17 @@ private slots: | |||
71 | 71 | ||
72 | void slotStart(); | 72 | void slotStart(); |
73 | void slotEnd(); | 73 | void slotEnd(); |
74 | 74 | ||
75 | /* for performance reasons make it inline in the future */ | 75 | /* for performance reasons make it inline in the future */ |
76 | void addFolders( const QStringList& ); | 76 | void addFolders( const QStringList& ); |
77 | void addFiles( const QStringList& ); | 77 | void addFiles( const QStringList& ); |
78 | void slotClicked(QIconViewItem* ); | 78 | void slotClicked(QIconViewItem* ); |
79 | void slotRetrun(QIconViewItem* ); | ||
79 | 80 | ||
80 | /**/ | 81 | /**/ |
81 | void slotThumbInfo(const QString&, const QString&); | 82 | void slotThumbInfo(const QString&, const QString&); |
82 | void slotThumbNail(const QString&, const QPixmap&); | 83 | void slotThumbNail(const QString&, const QPixmap&); |
83 | 84 | ||
84 | void slotChangeMode( int ); | 85 | void slotChangeMode( int ); |
85 | private: | 86 | private: |
86 | Opie::Core::OKeyConfigManager *m_viewManager; | 87 | Opie::Core::OKeyConfigManager *m_viewManager; |