fixed some activation issues in combination with split views

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index ebc0bd43efd6856d0ad1e69a7c468ac4ae4e52ab..35c50e88d783c4e776d8ee6af89a363716c3c84b 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -21,7 +21,7 @@
 
 #include "dolphinmainwindow.h"
 
 
 #include "dolphinmainwindow.h"
 

-#include <config-kmetadata.h>
+#include "config-nepomuk.h"

 
 #include "dolphinapplication.h"
 #include "dolphinnewmenu.h"
 
 #include "dolphinapplication.h"
 #include "dolphinnewmenu.h"


@@ -83,8 +83,8 @@ DolphinMainWindow::DolphinMainWindow(int id) :
     m_id(id)
 {
     setObjectName("Dolphin");
     m_id(id)
 {
     setObjectName("Dolphin");

-    m_viewContainer[PrimaryIdx] = 0;
-    m_viewContainer[SecondaryIdx] = 0;
+    m_viewContainer[PrimaryView] = 0;
+    m_viewContainer[SecondaryView] = 0;

 
     new MainWindowAdaptor(this);
     QDBusConnection::sessionBus().registerObject(QString("/dolphin/MainWindow%1").arg(m_id), this);
 
     new MainWindowAdaptor(this);
     QDBusConnection::sessionBus().registerObject(QString("/dolphin/MainWindow%1").arg(m_id), this);


@@ -106,25 +106,43 @@ DolphinMainWindow::~DolphinMainWindow()
     DolphinApplication::app()->removeMainWindow(this);
 }
 
     DolphinApplication::app()->removeMainWindow(this);
 }
 

-void DolphinMainWindow::setActiveView(DolphinViewContainer* view)
+void DolphinMainWindow::toggleViews()

 {
 {

-    Q_ASSERT((view == m_viewContainer[PrimaryIdx]) || (view == m_viewContainer[SecondaryIdx]));
-    if (m_activeViewContainer == view) {
+    if (m_viewContainer[SecondaryView] == 0) {

         return;
     }
 
         return;
     }
 

-    m_activeViewContainer->setActive(false);
-    m_activeViewContainer = view;
-    m_activeViewContainer->setActive(true);
+    // move secondary view from the last position of the splitter
+    // to the first position
+    m_splitter->insertWidget(0, m_viewContainer[SecondaryView]);

 
 

-    updateHistory();
-    updateEditActions();
-    updateViewActions();
-    updateGoActions();
+    DolphinViewContainer* container = m_viewContainer[PrimaryView];
+    m_viewContainer[PrimaryView] = m_viewContainer[SecondaryView];
+    m_viewContainer[SecondaryView] = container;
+}

 
 

-    setCaption(m_activeViewContainer->url().fileName());
+void DolphinMainWindow::rename(const KUrl& oldUrl, const KUrl& newUrl)
+{
+    clearStatusBar();
+    KonqOperations::rename(this, oldUrl, newUrl);
+    m_undoCommandTypes.append(KonqUndoManager::RENAME);
+}

 
 

-    emit activeViewChanged();
+void DolphinMainWindow::refreshViews()
+{
+    Q_ASSERT(m_viewContainer[PrimaryView] != 0);
+
+    // remember the current active view, as because of
+    // the refreshing the active view might change to
+    // the secondary view
+    DolphinViewContainer* activeViewContainer = m_activeViewContainer;
+
+    m_viewContainer[PrimaryView]->view()->refresh();
+    if (m_viewContainer[SecondaryView] != 0) {
+        m_viewContainer[SecondaryView]->view()->refresh();
+    }
+
+    setActiveViewContainer(activeViewContainer);

 }
 
 void DolphinMainWindow::dropUrls(const KUrl::List& urls,
 }
 
 void DolphinMainWindow::dropUrls(const KUrl::List& urls,


@@ -201,34 +219,11 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls,
     }
 }
 
     }
 }
 

-void DolphinMainWindow::rename(const KUrl& oldUrl, const KUrl& newUrl)
-{
-    clearStatusBar();
-    KonqOperations::rename(this, oldUrl, newUrl);
-    m_undoCommandTypes.append(KonqUndoManager::RENAME);
-}
-
-void DolphinMainWindow::refreshViews()
-{
-    Q_ASSERT(m_viewContainer[PrimaryIdx] != 0);
-
-    // remember the current active view, as because of
-    // the refreshing the active view might change to
-    // the secondary view
-    DolphinViewContainer* activeViewContainer = m_activeViewContainer;
-
-    m_viewContainer[PrimaryIdx]->view()->refresh();
-    if (m_viewContainer[SecondaryIdx] != 0) {
-        m_viewContainer[SecondaryIdx]->view()->refresh();
-    }
-
-    setActiveView(activeViewContainer);
-}
-

 void DolphinMainWindow::changeUrl(const KUrl& url)
 {
 void DolphinMainWindow::changeUrl(const KUrl& url)
 {

-    if (activeViewContainer() != 0) {
-        activeViewContainer()->setUrl(url);
+    DolphinViewContainer* view = activeViewContainer();
+    if (view != 0) {
+        view->setUrl(url);

         updateEditActions();
         updateViewActions();
         updateGoActions();
         updateEditActions();
         updateViewActions();
         updateGoActions();


@@ -346,10 +341,10 @@ void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)
 {
     updateEditActions();
 
 {
     updateEditActions();
 

-    Q_ASSERT(m_viewContainer[PrimaryIdx] != 0);
-    int selectedUrlsCount = m_viewContainer[PrimaryIdx]->view()->selectedUrls().count();
-    if (m_viewContainer[SecondaryIdx] != 0) {
-        selectedUrlsCount += m_viewContainer[SecondaryIdx]->view()->selectedUrls().count();
+    Q_ASSERT(m_viewContainer[PrimaryView] != 0);
+    int selectedUrlsCount = m_viewContainer[PrimaryView]->view()->selectedUrls().count();
+    if (m_viewContainer[SecondaryView] != 0) {
+        selectedUrlsCount += m_viewContainer[SecondaryView]->view()->selectedUrls().count();

     }
 
     QAction* compareFilesAction = actionCollection()->action("compare_files");
     }
 
     QAction* compareFilesAction = actionCollection()->action("compare_files");


@@ -384,10 +379,10 @@ void DolphinMainWindow::openNewMainWindow()
 
 void DolphinMainWindow::toggleActiveView()
 {
 
 void DolphinMainWindow::toggleActiveView()
 {

-    if (m_activeViewContainer == m_viewContainer[PrimaryIdx]) {
-        setActiveView(m_viewContainer[SecondaryIdx]);
+    if (m_activeViewContainer == m_viewContainer[PrimaryView]) {
+        setActiveViewContainer(m_viewContainer[SecondaryView]);

     } else {
     } else {

-        setActiveView(m_viewContainer[PrimaryIdx]);
+        setActiveViewContainer(m_viewContainer[PrimaryView]);

     }
 }
 
     }
 }
 


@@ -405,31 +400,31 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
 void DolphinMainWindow::saveProperties(KConfig* config)
 {
     KConfigGroup primaryView = config->group("Primary view");
 void DolphinMainWindow::saveProperties(KConfig* config)
 {
     KConfigGroup primaryView = config->group("Primary view");

-    primaryView.writeEntry("Url", m_viewContainer[PrimaryIdx]->url().url());
-    primaryView.writeEntry("Editable Url", m_viewContainer[PrimaryIdx]->isUrlEditable());
-    if (m_viewContainer[SecondaryIdx] != 0) {
+    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");
         KConfigGroup secondaryView = config->group("Secondary view");

-        secondaryView.writeEntry("Url", m_viewContainer[SecondaryIdx]->url().url());
-        secondaryView.writeEntry("Editable Url", m_viewContainer[SecondaryIdx]->isUrlEditable());
+        secondaryView.writeEntry("Url", m_viewContainer[SecondaryView]->url().url());
+        secondaryView.writeEntry("Editable Url", m_viewContainer[SecondaryView]->isUrlEditable());

     }
 }
 
 void DolphinMainWindow::readProperties(KConfig* config)
 {
     const KConfigGroup primaryViewGroup = config->group("Primary view");
     }
 }
 
 void DolphinMainWindow::readProperties(KConfig* config)
 {
     const KConfigGroup primaryViewGroup = config->group("Primary view");

-    m_viewContainer[PrimaryIdx]->setUrl(primaryViewGroup.readEntry("Url"));
+    m_viewContainer[PrimaryView]->setUrl(primaryViewGroup.readEntry("Url"));

     bool editable = primaryViewGroup.readEntry("Editable Url", false);
     bool editable = primaryViewGroup.readEntry("Editable Url", false);

-    m_viewContainer[PrimaryIdx]->urlNavigator()->setUrlEditable(editable);
+    m_viewContainer[PrimaryView]->urlNavigator()->setUrlEditable(editable);

 
     if (config->hasGroup("Secondary view")) {
         const KConfigGroup secondaryViewGroup = config->group("Secondary view");
 
     if (config->hasGroup("Secondary view")) {
         const KConfigGroup secondaryViewGroup = config->group("Secondary view");

-        if (m_viewContainer[PrimaryIdx] == 0) {
+        if (m_viewContainer[PrimaryView] == 0) {

             toggleSplitView();
         }
             toggleSplitView();
         }

-        m_viewContainer[PrimaryIdx]->setUrl(secondaryViewGroup.readEntry("Url"));
+        m_viewContainer[PrimaryView]->setUrl(secondaryViewGroup.readEntry("Url"));

         editable = secondaryViewGroup.readEntry("Editable Url", false);
         editable = secondaryViewGroup.readEntry("Editable Url", false);

-        m_viewContainer[PrimaryIdx]->urlNavigator()->setUrlEditable(editable);
-    } else if (m_viewContainer[SecondaryIdx] != 0) {
+        m_viewContainer[PrimaryView]->urlNavigator()->setUrlEditable(editable);
+    } else if (m_viewContainer[SecondaryView] != 0) {

         toggleSplitView();
     }
 }
         toggleSplitView();
     }
 }


@@ -758,28 +753,30 @@ void DolphinMainWindow::showDateInfo()
 
 void DolphinMainWindow::toggleSplitView()
 {
 
 void DolphinMainWindow::toggleSplitView()
 {

-    if (m_viewContainer[SecondaryIdx] == 0) {
-        const int newWidth = (m_viewContainer[PrimaryIdx]->width() - m_splitter->handleWidth()) / 2;
+    if (m_viewContainer[SecondaryView] == 0) {
+        const int newWidth = (m_viewContainer[PrimaryView]->width() - m_splitter->handleWidth()) / 2;

         // create a secondary view
         // create a secondary view

-        const DolphinView* view = m_viewContainer[PrimaryIdx]->view();
-        m_viewContainer[SecondaryIdx] = new DolphinViewContainer(this,
+        const DolphinView* view = m_viewContainer[PrimaryView]->view();
+        m_viewContainer[SecondaryView] = new DolphinViewContainer(this,

                                                                  0,
                                                                  view->rootUrl(),
                                                                  view->mode(),
                                                                  view->showHiddenFiles());
                                                                  0,
                                                                  view->rootUrl(),
                                                                  view->mode(),
                                                                  view->showHiddenFiles());

-        connectViewSignals(SecondaryIdx);
-        m_splitter->addWidget(m_viewContainer[SecondaryIdx]);
+        connectViewSignals(SecondaryView);
+        m_splitter->addWidget(m_viewContainer[SecondaryView]);

         m_splitter->setSizes(QList<int>() << newWidth << newWidth);
         m_splitter->setSizes(QList<int>() << newWidth << newWidth);

-        m_viewContainer[SecondaryIdx]->view()->reload();
-        m_viewContainer[SecondaryIdx]->setActive(false);
-        m_viewContainer[SecondaryIdx]->show();
+        m_viewContainer[SecondaryView]->view()->reload();
+        m_viewContainer[SecondaryView]->setActive(false);
+        m_viewContainer[SecondaryView]->show();

     } else {
         // remove secondary view
     } else {
         // remove secondary view

-        m_viewContainer[SecondaryIdx]->close();
-        m_viewContainer[SecondaryIdx]->deleteLater();
-        m_viewContainer[SecondaryIdx] = 0;
+        m_viewContainer[SecondaryView]->close();
+        m_viewContainer[SecondaryView]->deleteLater();
+        m_viewContainer[SecondaryView] = 0;

     }
     }

-    setActiveView(m_viewContainer[PrimaryIdx]);
+
+    setActiveViewContainer(m_viewContainer[PrimaryView]);
+    updateViewActions();

     emit activeViewChanged();
 }
 
     emit activeViewChanged();
 }
 


@@ -790,7 +787,8 @@ void DolphinMainWindow::reloadView()
 }
 
 void DolphinMainWindow::stopLoading()
 }
 
 void DolphinMainWindow::stopLoading()

-{}
+{
+}

 
 void DolphinMainWindow::togglePreview()
 {
 
 void DolphinMainWindow::togglePreview()
 {


@@ -892,16 +890,16 @@ void DolphinMainWindow::compareFiles()
     // - both in the secondary view
     // - one in the primary view and the other in the secondary
     //   view
     // - both in the secondary view
     // - one in the primary view and the other in the secondary
     //   view

-    Q_ASSERT(m_viewContainer[PrimaryIdx] != 0);
+    Q_ASSERT(m_viewContainer[PrimaryView] != 0);

 
     KUrl urlA;
     KUrl urlB;
 
     KUrl urlA;
     KUrl urlB;

-    KUrl::List urls = m_viewContainer[PrimaryIdx]->view()->selectedUrls();
+    KUrl::List urls = m_viewContainer[PrimaryView]->view()->selectedUrls();

 
     switch (urls.count()) {
     case 0: {
 
     switch (urls.count()) {
     case 0: {

-        Q_ASSERT(m_viewContainer[SecondaryIdx] != 0);
-        urls = m_viewContainer[SecondaryIdx]->view()->selectedUrls();
+        Q_ASSERT(m_viewContainer[SecondaryView] != 0);
+        urls = m_viewContainer[SecondaryView]->view()->selectedUrls();

         Q_ASSERT(urls.count() == 2);
         urlA = urls[0];
         urlB = urls[1];
         Q_ASSERT(urls.count() == 2);
         urlA = urls[0];
         urlB = urls[1];


@@ -910,8 +908,8 @@ void DolphinMainWindow::compareFiles()
 
     case 1: {
         urlA = urls[0];
 
     case 1: {
         urlA = urls[0];

-        Q_ASSERT(m_viewContainer[SecondaryIdx] != 0);
-        urls = m_viewContainer[SecondaryIdx]->view()->selectedUrls();
+        Q_ASSERT(m_viewContainer[SecondaryView] != 0);
+        urls = m_viewContainer[SecondaryView]->view()->selectedUrls();

         Q_ASSERT(urls.count() == 1);
         urlB = urls[0];
         break;
         Q_ASSERT(urls.count() == 1);
         urlB = urls[0];
         break;


@@ -966,16 +964,16 @@ void DolphinMainWindow::init()
     const KUrl& homeUrl = settings.generalSettings()->homeUrl();
     setCaption(homeUrl.fileName());
     ViewProperties props(homeUrl);
     const KUrl& homeUrl = settings.generalSettings()->homeUrl();
     setCaption(homeUrl.fileName());
     ViewProperties props(homeUrl);

-    m_viewContainer[PrimaryIdx] = new DolphinViewContainer(this,
+    m_viewContainer[PrimaryView] = new DolphinViewContainer(this,

                                                            m_splitter,
                                                            homeUrl,
                                                            props.viewMode(),
                                                            props.showHiddenFiles());
 
                                                            m_splitter,
                                                            homeUrl,
                                                            props.viewMode(),
                                                            props.showHiddenFiles());
 

-    m_activeViewContainer = m_viewContainer[PrimaryIdx];
-    connectViewSignals(PrimaryIdx);
-    m_viewContainer[PrimaryIdx]->view()->reload();
-    m_viewContainer[PrimaryIdx]->show();
+    m_activeViewContainer = m_viewContainer[PrimaryView];
+    connectViewSignals(PrimaryView);
+    m_viewContainer[PrimaryView]->view()->reload();
+    m_viewContainer[PrimaryView]->show();

 
     setCentralWidget(m_splitter);
     setupDockWidgets();
 
     setCentralWidget(m_splitter);
     setupDockWidgets();


@@ -998,7 +996,7 @@ void DolphinMainWindow::init()
         // assure a proper default size if Dolphin runs the first time
         resize(700, 500);
     }
         // assure a proper default size if Dolphin runs the first time
         resize(700, 500);
     }

-#ifdef HAVE_KMETADATA
+#ifdef HAVE_NEPOMUK

     if (!MetaDataWidget::metaDataAvailable())
         activeViewContainer()->statusBar()->setMessage(i18n("Failed to contact Nepomuk service, annotation and tagging are disabled."), DolphinStatusBar::Error);
 #endif
     if (!MetaDataWidget::metaDataAvailable())
         activeViewContainer()->statusBar()->setMessage(i18n("Failed to contact Nepomuk service, annotation and tagging are disabled."), DolphinStatusBar::Error);
 #endif


@@ -1013,6 +1011,29 @@ void DolphinMainWindow::loadSettings()
     updateViewActions();
 }
 
     updateViewActions();
 }
 

+void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* view)
+{
+    Q_ASSERT((view == m_viewContainer[PrimaryView]) || (view == m_viewContainer[SecondaryView]));
+    if (m_activeViewContainer == view) {
+        return;
+    }
+
+    m_activeViewContainer->setActive(false);
+    m_activeViewContainer = view;
+    m_activeViewContainer->setActive(true);
+
+    updateHistory();
+    updateEditActions();
+    updateViewActions();
+    updateGoActions();
+
+    const KUrl& url = m_activeViewContainer->url();
+    setCaption(url.fileName());
+
+    emit activeViewChanged();
+    emit urlChanged(url);
+}
+

 void DolphinMainWindow::setupActions()
 {
     // setup 'File' menu
 void DolphinMainWindow::setupActions()
 {
     // setup 'File' menu


@@ -1419,7 +1440,7 @@ void DolphinMainWindow::updateViewActions()
         static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
     showHiddenFilesAction->setChecked(view->showHiddenFiles());
 
         static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
     showHiddenFilesAction->setChecked(view->showHiddenFiles());
 

-    updateSplitAction(m_viewContainer[SecondaryIdx] != 0);
+    updateSplitAction(m_viewContainer[SecondaryView] != 0);

 
     KToggleAction* editableLocactionAction =
         static_cast<KToggleAction*>(actionCollection()->action("editable_location"));
 
     KToggleAction* editableLocactionAction =
         static_cast<KToggleAction*>(actionCollection()->action("editable_location"));