allow to turn on/off the places panel by the menu

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

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index d621b3ffc1e930faa54cbd41a907c4ecd24b606d..a6d584d377298f12c925dfea292146394a6f9e1d 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1265,7 +1265,6 @@ void DolphinMainWindow::setupDockWidgets()
     SidebarPage* infoWidget = new InfoSidebarPage(infoDock);
     infoDock->setWidget(infoWidget);
 
-
     infoDock->toggleViewAction()->setText(i18n("Show Information Panel"));
     actionCollection()->addAction("show_info_panel", infoDock->toggleViewAction());
 
@@ -1273,7 +1272,7 @@ void DolphinMainWindow::setupDockWidgets()
     connectSidebarPage(infoWidget);
 
     // setup "Tree View"
-    QDockWidget* treeViewDock = new QDockWidget(i18n("Folders")); // TODO: naming?
+    QDockWidget* treeViewDock = new QDockWidget(i18n("Folders"));
     treeViewDock->setObjectName("treeViewDock");
     treeViewDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
     TreeViewSidebarPage* treeWidget = new TreeViewSidebarPage(treeViewDock);
@@ -1297,6 +1296,10 @@ void DolphinMainWindow::setupDockWidgets()
     KFilePlacesView *listView = new KFilePlacesView(placesDock);
     placesDock->setWidget(listView);
     listView->setModel(DolphinSettings::instance().placesModel());
+
+    placesDock->toggleViewAction()->setText(i18n("Show Places Panel"));
+    actionCollection()->addAction("show_places_panel", placesDock->toggleViewAction());
+
     addDockWidget(Qt::LeftDockWidgetArea, placesDock);
     connect(listView, SIGNAL(urlChanged(KUrl)),
             this, SLOT(changeUrl(KUrl)));

diff --git a/src/dolphinui.rc b/src/dolphinui.rc
index 17edc1aa79478969cf259e1f290569dd87ab6df7..a6cfa18c7c1d44cb95be13449979fe73d836353f 100644 (file)
--- a/src/dolphinui.rc
+++ b/src/dolphinui.rc
@@ -50,7 +50,7 @@
    <Separator/>
    <Menu name="panels">
     <text>Panels</text>
-    <Action name="show_bookmarks_panel" />
+    <Action name="show_places_panel" />
     <Action name="show_info_panel" />
     <Action name="show_folders_panel" />
    </Menu>