[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeextragear-3/digikam/digikam
From:       Jörn Ahrens <kde () jokele ! de>
Date:       2004-08-31 19:56:49
Message-ID: 20040831195649.CE76D9266 () office ! kde ! org
[Download RAW message or body]

CVS commit by jahrens: 

Minor drag and drop changes


  M +8 -7      albumfolderview.cpp   1.33
  M +2 -2      albumfolderview.h   1.12


--- kdeextragear-3/digikam/digikam/albumfolderview.cpp  #1.32:1.33
@@ -99,4 +99,5 @@ AlbumFolderView::AlbumFolderView(QWidget
     phyRootItem_ = 0;
     tagRootItem_ = 0;
+    openAlbumTimer_ = new QTimer(this);
     
     connect(this, SIGNAL(signalSelectionChanged(ListItem*)),
@@ -118,6 +119,6 @@ AlbumFolderView::AlbumFolderView(QWidget
             this, SLOT(slotAllAlbumsLoaded()));
 
-    connect(&openAlbumTimer_, SIGNAL(timeout()),
-            this, SLOT(slotOpenAlbum()));
+    connect(openAlbumTimer_, SIGNAL(timeout()),
+            this, SLOT(slotOpenAlbumFolderItem()));
             
     connect(ThemeEngine::instance(), SIGNAL(signalThemeChanged()),
@@ -1255,5 +1256,5 @@ void AlbumFolderView::contentsDragMoveEv
     }
     
-    openAlbumTimer_.start(750, true);
+    openAlbumTimer_->start(500, true);
     
     event->accept();
@@ -1276,5 +1277,5 @@ void AlbumFolderView::contentsDragLeaveE
 void AlbumFolderView::contentsDropEvent(QDropEvent* event)
 {
-    openAlbumTimer_.stop();
+    openAlbumTimer_->stop();
     
     if (!dropTarget_||  dropTarget_->isGroupItem())
@@ -1512,10 +1513,10 @@ void AlbumFolderView::clearDropTarget()
         dropTarget_->removeDropHighlight();
     dropTarget_ = 0;    
-    openAlbumTimer_.stop();
+    openAlbumTimer_->stop();
 }
 
-void AlbumFolderView::slotOpenAlbum()
+void AlbumFolderView::slotOpenAlbumFolderItem()
 {
-    openAlbumTimer_.stop();
+    openAlbumTimer_->stop();
     if(dropTarget_ && !dropTarget_->isOpen())
         dropTarget_->setOpen(true);

--- kdeextragear-3/digikam/digikam/albumfolderview.h  #1.11:1.12
@@ -141,5 +141,5 @@ private:
     QPoint                             dragStartPos_;
     ListItem                           *dragItem_;
-    QTimer                             openAlbumTimer_;    
+    QTimer                             *openAlbumTimer_;    
     
     QMap<int,int>                      stateAlbumOpen_;
@@ -164,5 +164,5 @@ private slots:
     void slotAlbumImportResult(KIO::Job* job);
 
-    void slotOpenAlbum();
+    void slotOpenAlbumFolderItem();
         
     void slotGotThumbnail(const KFileItem* fileItem, const QPixmap& thumbnail,


[prev in list] [next in list] [prev in thread] [next in thread]