fixed some activation issues in combination with split views

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

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index bb4ff90b7440593d53e2a6a1a0f5c6da3bc2337d..35c50e88d783c4e776d8ee6af89a363716c3c84b 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -221,8 +221,9 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls,
 
 void DolphinMainWindow::changeUrl(const KUrl& url)
 {
 
 void DolphinMainWindow::changeUrl(const KUrl& url)
 {

-    if (activeViewContainer() != 0) {
-        activeViewContainer()->setUrl(url);
+    DolphinViewContainer* view = activeViewContainer();
+    if (view != 0) {
+        view->setUrl(url);

         updateEditActions();
         updateViewActions();
         updateGoActions();
         updateEditActions();
         updateViewActions();
         updateGoActions();


@@ -1026,9 +1027,11 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* view)
     updateViewActions();
     updateGoActions();
 
     updateViewActions();
     updateGoActions();
 

-    setCaption(m_activeViewContainer->url().fileName());
+    const KUrl& url = m_activeViewContainer->url();
+    setCaption(url.fileName());

 
     emit activeViewChanged();
 
     emit activeViewChanged();

+    emit urlChanged(url);

 }
 
 void DolphinMainWindow::setupActions()
 }
 
 void DolphinMainWindow::setupActions()

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 01cc27896e24fce1beb37fcdee574e16681bb00b..f70c5bb4565d93b1e27232c249557675c97fbfbb 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -90,6 +90,8 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
     m_urlNavigator = new KUrlNavigator(DolphinSettings::instance().placesModel(), url, this);
     connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)),
             m_mainWindow, SLOT(dropUrls(const KUrl::List&, const KUrl&)));
     m_urlNavigator = new KUrlNavigator(DolphinSettings::instance().placesModel(), url, this);
     connect(m_urlNavigator, SIGNAL(urlsDropped(const KUrl::List&, const KUrl&)),
             m_mainWindow, SLOT(dropUrls(const KUrl::List&, const KUrl&)));

+    connect(m_urlNavigator, SIGNAL(activated()),
+            this, SLOT(activate()));

 
     const GeneralSettings* settings = DolphinSettings::instance().generalSettings();
     m_urlNavigator->setUrlEditable(settings->editableUrl());
 
     const GeneralSettings* settings = DolphinSettings::instance().generalSettings();
     m_urlNavigator->setUrlEditable(settings->editableUrl());


@@ -487,5 +489,9 @@ void DolphinViewContainer::restoreContentsPos()
     }
 }
 
     }
 }
 

+void DolphinViewContainer::activate()
+{
+    setActive(true);
+}

 
 #include "dolphinviewcontainer.moc"
 
 #include "dolphinviewcontainer.moc"

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index 83ef159448c2865e9a869be0ab8a73a170f6e7de..88b4b3b47c6a0df694a2e66696d648ad5826e0a3 100644 (file)
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -196,6 +196,12 @@ private slots:
      */
     void restoreContentsPos();
 
      */
     void restoreContentsPos();
 

+    /**
+     * Marks the view container as active
+     * (see DolphinViewContainer::setActive()).
+     */
+    void activate();
+

 private:
     /**
      * Returns the default text of the status bar, if no item is
 private:
     /**
      * Returns the default text of the status bar, if no item is