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

List:       kde-commits
Subject:    kdebase/klipper
From:       Esben Mose Hansen <kde () mosehansen ! dk>
Date:       2005-01-04 20:45:48
Message-ID: 20050104204548.7F6601C1B3 () office ! kde ! org
[Download RAW message or body]

CVS commit by esben: 

Fixed regression: Replay actions did not work.


  M +3 -0      history.cpp   1.6
  M +5 -0      history.h   1.6
  M +5 -2      toplevel.cpp   1.169
  M +1 -1      toplevel.h   1.59


--- kdebase/klipper/history.cpp  #1.5:1.6
@@ -59,4 +59,6 @@ void History::insert( const HistoryItem*
     forceInsert( item );
 
+    emit topChanged();
+
 }
 
@@ -115,4 +117,5 @@ void History::slotMoveToTop(int pos ) {
     itemList.prepend( item );
     emit changed();
+    emit topChanged();
 }
 

--- kdebase/klipper/history.h  #1.5:1.6
@@ -126,4 +126,9 @@ signals:
     void changed();
 
+    /**
+     * Emitted when the first history item has changed.
+     */
+    void topChanged();
+
 private:
 

--- kdebase/klipper/toplevel.cpp  #1.168:1.169
@@ -187,5 +187,5 @@ KlipperWidget::KlipperWidget( QWidget *p
 
     KlipperPopup* popup = history()->popup();
-    connect ( history(),  SIGNAL( changed() ), SLOT( slotHistoryChanged() ) );
+    connect ( history(),  SIGNAL( topChanged() ), SLOT( slotHistoryTopChanged() ) );
     popup->plugAction( toggleURLGrabAction );
     popup->plugAction( clearHistoryAction );
@@ -585,5 +585,5 @@ void KlipperWidget::toggleURLGrabber()
 }
 
-void KlipperWidget::slotHistoryChanged() {
+void KlipperWidget::slotHistoryTopChanged() {
     if ( locklevel ) {
         return;
@@ -594,4 +594,7 @@ void KlipperWidget::slotHistoryChanged()
         setClipboard( *topitem, Clipboard | Selection );
     }
+    if ( bReplayActionInHistory && bURLGrabber ) {
+        slotRepeatAction();
+    }
 
 }

--- kdebase/klipper/toplevel.h  #1.58:1.59
@@ -74,5 +74,5 @@ public slots:
     void saveSession();
     void slotSettingsChanged( int category );
-    void slotHistoryChanged();
+    void slotHistoryTopChanged();
     void slotConfigure();
 


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