* Assure that the URL navigator is synchronized with the active column.

* Removed obsolete triggerUrlChangeRequest() method + signal in the DolphinController. This is not needed anymore because of the refactored column view.

svn path=/trunk/KDE/kdebase/apps/; revision=1080351

1 files changed, 11 insertions, 0 deletions

diff --git a/src/dolphincolumnviewcontainer.h b/src/dolphincolumnviewcontainer.h
index 626cd98a1..c1975ac08 100644
--- a/src/dolphincolumnviewcontainer.h
+++ b/src/dolphincolumnviewcontainer.h
@@ -32,6 +32,7 @@ class DolphinColumnView;
 class DolphinController;
 class QFrame;
 class QTimeLine;
+class QTimer;
 
 /**
  * @brief Represents a container for columns represented as instances
@@ -77,6 +78,14 @@ private slots:
      */
     void updateColumnsBackground(bool active);
 
+    /**
+     * Tells the Dolphin controller to update the active URL
+     * to m_activeUrl. The slot is called asynchronously with a
+     * small delay, as this prevents a flickering when a directory
+     * from an inactive column gets selected.
+     */
+    void updateActiveUrl();
+
 private:
     /**
      * Deactivates the currently active column and activates
@@ -127,6 +136,8 @@ private:
     QTimeLine* m_animation;
     QAbstractItemView* m_dragSource;
 
+    QTimer* m_activeUrlTimer;
+
     friend class DolphinColumnView;
 };