X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d567bc3aea444ff3bc70e4180faaaa1f124be93b..352dd42ccb46cb83ee65fc381372a2a209199b09:/src/dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index e26968472..64678202a 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -819,12 +819,15 @@ void DolphinMainWindow::toggleSortOrder()
 void DolphinMainWindow::toggleSplitView()
 {
     if (m_view[SecondaryIdx] == 0) {
+        const int newWidth = (m_view[PrimaryIdx]->width() - m_splitter->handleWidth()) / 2;
         // create a secondary view
         m_view[SecondaryIdx] = new DolphinView(this,
-                                               m_splitter,
+                                               0,
                                                m_view[PrimaryIdx]->url(),
                                                m_view[PrimaryIdx]->mode(),
                                                m_view[PrimaryIdx]->isShowHiddenFilesEnabled());
+        m_splitter->addWidget(m_view[SecondaryIdx]);
+        m_splitter->setSizes(QList<int>() << newWidth << newWidth);
         m_view[SecondaryIdx]->show();
     }
     else {
@@ -841,7 +844,7 @@ void DolphinMainWindow::toggleSplitView()
             // From an implementation point of view it is more efficient to close
             // the primary view and exchange the internal pointers afterwards.
             m_view[PrimaryIdx]->close();
-            m_view[PrimaryIdx]->deleteLater();
+            delete m_view[PrimaryIdx];
             m_view[PrimaryIdx] = m_view[SecondaryIdx];
             m_view[SecondaryIdx] = 0;
             setActiveView(m_view[PrimaryIdx]);
@@ -1122,6 +1125,7 @@ void DolphinMainWindow::init()
                                          homeUrl,
                                          props.viewMode(),
                                          props.isShowHiddenFilesEnabled());
+    m_view[PrimaryIdx]->show();
 
     m_activeView = m_view[PrimaryIdx];
 
@@ -1593,15 +1597,25 @@ void DolphinMainWindow::clearStatusBar()
 void DolphinMainWindow::setupDockWidgets()
 {
     QDockWidget *shortcutsDock = new QDockWidget(i18n("Shortcuts"));
+
     shortcutsDock->setObjectName("shortcutsDock");
-    shortcutsDock->setFeatures(QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable);
     shortcutsDock->setWidget(new BookmarksSidebarPage(this));
+
+    shortcutsDock->toggleViewAction()->setObjectName("show_shortcuts_pane");
+    shortcutsDock->toggleViewAction()->setText(i18n("Show Shortcuts Panel"));
+    actionCollection()->insert(shortcutsDock->toggleViewAction());
+
     addDockWidget(Qt::LeftDockWidgetArea, shortcutsDock);
 
     QDockWidget *infoDock = new QDockWidget(i18n("Information"));
+
     infoDock->setObjectName("infoDock");
-    infoDock->setFeatures(QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable);
     infoDock->setWidget(new InfoSidebarPage(this));
+
+    infoDock->toggleViewAction()->setObjectName("show_info_pane");
+    infoDock->toggleViewAction()->setText(i18n("Show Information Panel"));
+    actionCollection()->insert(infoDock->toggleViewAction());
+
     addDockWidget(Qt::RightDockWidgetArea, infoDock);
 }