X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/4216e814d4e5e1249eb7004b990a69fc7388b884..da3bc09d21b43837873c899e2fbda1fa6c2a2e5e:/src/dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index d621b3ffc..73de1b56c 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -73,7 +73,7 @@
 #include <QDockWidget>
 
 DolphinMainWindow::DolphinMainWindow(int id) :
-        KMainWindow(0),
+        KXmlGuiWindow(0),
         m_newMenu(0),
         m_splitter(0),
         m_activeView(0),
@@ -394,7 +394,7 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
 
     settings.save();
 
-    KMainWindow::closeEvent(event);
+    KXmlGuiWindow::closeEvent(event);
 }
 
 void DolphinMainWindow::saveProperties(KConfig* config)
@@ -1105,7 +1105,7 @@ void DolphinMainWindow::setupActions()
     KToggleAction* columnView = actionCollection()->add<KToggleAction>("columns");
     columnView->setText(i18n("Columns"));
     columnView->setShortcut(Qt::CTRL | Qt::Key_3);
-    columnView->setIcon(KIcon("view-tree"));
+    columnView->setIcon(KIcon("fileview-column"));
     connect(columnView, SIGNAL(triggered()), this, SLOT(setColumnView()));
 
     QActionGroup* viewModeGroup = new QActionGroup(this);
@@ -1234,7 +1234,7 @@ void DolphinMainWindow::setupActions()
 
     QAction* findFile = actionCollection()->addAction("find_file");
     findFile->setText(i18n("Find File..."));
-    findFile->setShortcut(Qt::Key_F);
+    findFile->setShortcut(Qt::CTRL | Qt::Key_F);
     findFile->setIcon(KIcon("file-find"));
     connect(findFile, SIGNAL(triggered()), this, SLOT(findFile()));
 
@@ -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)));