Try to get the Keyup Event inside the IconView to not 'move'

forward later.

Long Return press triggers autorepeat

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
@@ -425,54 +425,73 @@ void PIconView::addFolders(  const QStringList& lst) {
 }
 
 void PIconView::addFiles(  const QStringList& lst) {
     QStringList::ConstIterator it;
     IconViewItem * _iv;
     QPixmap*m_pix = 0;
     QString pre = "";
     if (!m_path.isEmpty()) {
         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) );
         if (m_mode==3) {
             _iv->setTextOnly(true);
             _iv->setPixmap(QPixmap());
+
+
+
         } else {
             if (m_pix) _iv->setPixmap(*m_pix);
         }
     }
 
 }
 
 /*
  * user clicked on the item. Change dir or view
  */
 void PIconView::slotClicked(QIconViewItem* _it) {
     if(!_it )
         return;
 
     IconViewItem* it = static_cast<IconViewItem*>(_it);
     if( it->isDir() )
         slotChangeDir( it->path() );
     else // view image
         slotShowImage();
 }
 
 /*
+ * Return was pressed. which is triggered by the keydown
+ * handler. The problem is that the key up will be handled
+ * by the ImageDisplayer and goes to the next image
+ */
+void PIconView::slotRetrun( QIconViewItem *_it ) {
+    if(!_it )
+        return;
+
+    IconViewItem* it = static_cast<IconViewItem*>(_it);
+    if( it->isDir() )
+        slotChangeDir( it->path() );
+    else
+        QTimer::singleShot(0, this, SLOT(slotShowImage()) );
+}
+
+/*
  * got thumb info add to the cache if items is visible
  * we later need update after processing of slave is done
  */
 void PIconView::slotThumbInfo( const QString& _path, const QString& str ) {
     IconViewItem* item = g_stringInf[_path];
     if (!item )
         return;
 
     if (m_mode == 2) {
         return;
     }
     if ( item->intersects(QRect( m_view->contentsX(),m_view->contentsY(),
                                  m_view->contentsWidth(), m_view->contentsHeight() ) ) )
         m_updatet = true;
 
     item->setText( str );
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
@@ -63,32 +63,33 @@ private slots:
     void slotRename();
     void slotBeam();
     void slotBeamDone( Ir* );
 
     void slotShowImage();
     void slotShowImage( const QString& );
     void slotImageInfo();
     void slotImageInfo( const QString& );
 
     void slotStart();
     void slotEnd();
 
 /* for performance reasons make it inline in the future */
     void addFolders(  const QStringList& );
     void addFiles( const QStringList& );
     void slotClicked(QIconViewItem* );
+    void slotRetrun(QIconViewItem* );
 
 /**/
     void slotThumbInfo(const QString&, const QString&);
     void slotThumbNail(const QString&, const QPixmap&);
 
     void  slotChangeMode( int );
 private:
     Opie::Core::OKeyConfigManager *m_viewManager;
     Opie::Core::OConfig *m_cfg;
     QComboBox* m_views;
     QIconView* m_view;
     QString m_path;
     bool m_updatet : 1;
     int m_mode;
 };