X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/1ce2fb199db7bdf5baf05b61e4e58c549404b4df..0e6e4bf39170d9e327d3448064bc64cdfe15bdd5:/src/dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index ddabf21a4..5a7f32797 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -210,15 +210,18 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls,
 
     switch (action) {
     case Qt::MoveAction:
-        moveUrls(urls, destination);
+        KonqOperations::copy(this, KonqOperations::MOVE, urls, destination);
+        m_undoCommandTypes.append(KonqFileUndoManager::MOVE);
         break;
 
     case Qt::CopyAction:
-        copyUrls(urls, destination);
+        KonqOperations::copy(this, KonqOperations::COPY, urls, destination);
+        m_undoCommandTypes.append(KonqFileUndoManager::COPY);
         break;
 
     case Qt::LinkAction:
-        linkUrls(urls, destination);
+        KonqOperations::copy(this, KonqOperations::LINK, urls, destination);
+        m_undoCommandTypes.append(KonqFileUndoManager::LINK);
         break;
 
     default:
@@ -442,34 +445,44 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
     KXmlGuiWindow::closeEvent(event);
 }
 
-void DolphinMainWindow::saveProperties(KConfig* config)
+void DolphinMainWindow::saveProperties(KConfigGroup& group)
 {
-    KConfigGroup primaryView = config->group("Primary view");
-    primaryView.writeEntry("Url", m_viewContainer[PrimaryView]->url().url());
-    primaryView.writeEntry("Editable Url", m_viewContainer[PrimaryView]->isUrlEditable());
-    if (m_viewContainer[SecondaryView] != 0) {
-        KConfigGroup secondaryView = config->group("Secondary view");
-        secondaryView.writeEntry("Url", m_viewContainer[SecondaryView]->url().url());
-        secondaryView.writeEntry("Editable Url", m_viewContainer[SecondaryView]->isUrlEditable());
+    DolphinViewContainer* cont = m_viewContainer[PrimaryView];
+    group.writeEntry("Primary Url", cont->url().url());
+    group.writeEntry("Primary Editable Url", cont->isUrlEditable());
+
+    cont = m_viewContainer[SecondaryView];
+    if (cont != 0) {
+        group.writeEntry("Secondary Url", cont->url().url());
+        group.writeEntry("Secondary Editable Url", cont->isUrlEditable());
     }
 }
 
-void DolphinMainWindow::readProperties(KConfig* config)
+void DolphinMainWindow::readProperties(const KConfigGroup& group)
 {
-    const KConfigGroup primaryViewGroup = config->group("Primary view");
-    m_viewContainer[PrimaryView]->setUrl(primaryViewGroup.readEntry("Url"));
-    bool editable = primaryViewGroup.readEntry("Editable Url", false);
-    m_viewContainer[PrimaryView]->urlNavigator()->setUrlEditable(editable);
+    DolphinViewContainer* cont = m_viewContainer[PrimaryView];
 
-    if (config->hasGroup("Secondary view")) {
-        const KConfigGroup secondaryViewGroup = config->group("Secondary view");
-        if (m_viewContainer[PrimaryView] == 0) {
+    cont->setUrl(group.readEntry("Primary Url"));
+    bool editable = group.readEntry("Primary Editable Url", false);
+    cont->urlNavigator()->setUrlEditable(editable);
+
+    cont = m_viewContainer[SecondaryView];
+    const QString secondaryUrl = group.readEntry("Secondary Url");
+    if (!secondaryUrl.isEmpty()) {
+        if (cont == 0) {
+            // a secondary view should be shown, but no one is available
+            // currently -> create a new view
             toggleSplitView();
+            cont = m_viewContainer[SecondaryView];
+            Q_ASSERT(cont != 0);
         }
-        m_viewContainer[PrimaryView]->setUrl(secondaryViewGroup.readEntry("Url"));
-        editable = secondaryViewGroup.readEntry("Editable Url", false);
-        m_viewContainer[PrimaryView]->urlNavigator()->setUrlEditable(editable);
-    } else if (m_viewContainer[SecondaryView] != 0) {
+
+        cont->setUrl(secondaryUrl);
+        bool editable = group.readEntry("Secondary Editable Url", false);
+        cont->urlNavigator()->setUrlEditable(editable);
+    } else if (cont != 0) {
+        // no secondary view should be shown, but the default setting shows
+        // one already -> close the view
         toggleSplitView();
     }
 }
@@ -1437,24 +1450,6 @@ void DolphinMainWindow::updateGoActions()
     goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
 }
 
-void DolphinMainWindow::copyUrls(const KUrl::List& source, const KUrl& dest)
-{
-    KonqOperations::copy(this, KonqOperations::COPY, source, dest);
-    m_undoCommandTypes.append(KonqFileUndoManager::COPY);
-}
-
-void DolphinMainWindow::moveUrls(const KUrl::List& source, const KUrl& dest)
-{
-    KonqOperations::copy(this, KonqOperations::MOVE, source, dest);
-    m_undoCommandTypes.append(KonqFileUndoManager::MOVE);
-}
-
-void DolphinMainWindow::linkUrls(const KUrl::List& source, const KUrl& dest)
-{
-    KonqOperations::copy(this, KonqOperations::LINK, source, dest);
-    m_undoCommandTypes.append(KonqFileUndoManager::LINK);
-}
-
 void DolphinMainWindow::clearStatusBar()
 {
     m_activeViewContainer->statusBar()->clear();