reactivated info sidebar again and temporary removed the code which resets the URL...

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

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 1c3d6789bda4a59e2a22e3db7385d8ce148287b4..6eb4fa94e065c6aeeceee1a7422ac4a71448844a 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1274,7 +1274,6 @@ void DolphinMainWindow::setupDockWidgets()
 
     // TODO: temporary deactivated info sidebar because of some minor side effects
 
-    /*
     QDockWidget* infoDock = new QDockWidget(i18n("Information"));
     infoDock->setObjectName("infoDock");
     infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
@@ -1285,7 +1284,7 @@ void DolphinMainWindow::setupDockWidgets()
     actionCollection()->addAction("show_info_panel", infoDock->toggleViewAction());
 
     addDockWidget(Qt::RightDockWidgetArea, infoDock);
-    connectSidebarPage(infoWidget);*/
+    connectSidebarPage(infoWidget);
 
     // setup "Tree View"
     QDockWidget* treeViewDock = new QDockWidget(i18n("Folders"));
@@ -1302,7 +1301,7 @@ void DolphinMainWindow::setupDockWidgets()
 
     const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun();
     if (firstRun) {
-        //infoDock->hide();
+        infoDock->hide();
         treeViewDock->hide();
     }
 

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index 47e350ab09d9c73cb5af635961a51a583ff84cdd..e4ca55b470d0cefc0a46d8d18264fb1c8a9d0044 100644 (file)
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -129,10 +129,16 @@ void InfoSidebarPage::setUrl(const KUrl& url)
 
 void InfoSidebarPage::setSelection(const KFileItemList& selection)
 {
-    cancelRequest();
+    // TODO: deactivated the following code, as it has side effects. To
+    // reproduce start Dolphin and open a folder -> the URL navigator gets
+    // reset. First guess: it seems that a setUrl signal is emitted
+    // by the following code
+
+    Q_UNUSED(selection);
+    /*cancelRequest();
     m_currentSelection = selection;
     m_multipleSelection = (m_currentSelection.size() > 1);
-    showItemInfo();
+    showItemInfo();*/
 }
 
 void InfoSidebarPage::requestDelayedItemInfo(const KUrl& url)