X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/75a6e8fb2ae418960769d4870f4b3dbabb20d049..ee0f3435b28908478dec8fc8bca651fa7795f139:/src/dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 0c9a1f4e7..3e63dc6c9 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2006 by Peter Penz <peter.penz19@gmail.com>             *
  *   Copyright (C) 2006 by Stefan Monov <logixoul@gmail.com>               *
  *   Copyright (C) 2006 by Cvetoslav Ludmiloff <ludmiloff@gmail.com>       *
  *                                                                         *
@@ -31,11 +31,12 @@
 #include "mainwindowadaptor.h"
 #ifdef HAVE_NEPOMUK
     #include "panels/filter/filterpanel.h"
-    #include <nepomuk/resourcemanager.h>
+    #include <Nepomuk/ResourceManager>
 #endif
 #include "panels/folders/folderspanel.h"
 #include "panels/places/placespanel.h"
 #include "panels/information/informationpanel.h"
+#include "search/dolphinsearchinformation.h"
 #include "settings/dolphinsettings.h"
 #include "settings/dolphinsettingsdialog.h"
 #include "statusbar/dolphinstatusbar.h"
@@ -51,41 +52,41 @@
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
 
-#include <kaction.h>
-#include <kactioncollection.h>
-#include <kactionmenu.h>
-#include <kconfig.h>
-#include <kdesktopfile.h>
+#include <KAction>
+#include <KActionCollection>
+#include <KActionMenu>
+#include <KConfig>
+#include <KDesktopFile>
 #include <kdeversion.h>
 #include <kdualaction.h>
-#include <kfiledialog.h>
-#include <kfileplacesmodel.h>
-#include <kglobal.h>
-#include <klineedit.h>
+#include <KFileDialog>
+#include <KFilePlacesModel>
+#include <KGlobal>
+#include <KLineEdit>
 #include <ktoolbar.h>
-#include <kicon.h>
-#include <kiconloader.h>
-#include <kio/netaccess.h>
-#include <kinputdialog.h>
-#include <klocale.h>
-#include <kprotocolmanager.h>
-#include <kmenu.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
-#include <kfileitemlistproperties.h>
+#include <KIcon>
+#include <KIconLoader>
+#include <KIO/NetAccess>
+#include <KInputDialog>
+#include <KLocale>
+#include <KProtocolManager>
+#include <KMenu>
+#include <KMenuBar>
+#include <KMessageBox>
+#include <KFileItemListProperties>
 #include <konqmimedata.h>
-#include <kprotocolinfo.h>
-#include <krun.h>
-#include <kshell.h>
-#include <kstandarddirs.h>
+#include <KProtocolInfo>
+#include <KRun>
+#include <KShell>
+#include <KStandardDirs>
 #include <kstatusbar.h>
-#include <kstandardaction.h>
+#include <KStandardAction>
 #include <ktabbar.h>
-#include <ktoggleaction.h>
-#include <kurlnavigator.h>
-#include <kurl.h>
-#include <kurlcombobox.h>
-#include <ktoolinvocation.h>
+#include <KToggleAction>
+#include <KUrlNavigator>
+#include <KUrl>
+#include <KUrlComboBox>
+#include <KToolInvocation>
 
 #include <QDBusMessage>
 #include <QKeyEvent>
@@ -212,7 +213,7 @@ void DolphinMainWindow::openFiles(const QList<KUrl>& files)
     const int tabCount = m_viewTab.count();
     for (int i = 0; i < tabCount; ++i) {
         m_viewTab[i].primaryView->view()->markUrlsAsSelected(files);
-        if (m_viewTab[i].secondaryView != 0) {
+        if (m_viewTab[i].secondaryView) {
             m_viewTab[i].secondaryView->view()->markUrlsAsSelected(files);
         }
     }
@@ -255,7 +256,7 @@ void DolphinMainWindow::showCommand(CommandType command)
 
 void DolphinMainWindow::refreshViews()
 {
-    Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0);
+    Q_ASSERT(m_viewTab[m_tabIndex].primaryView);
 
     // remember the current active view, as because of
     // the refreshing the active view might change to
@@ -265,7 +266,7 @@ void DolphinMainWindow::refreshViews()
     const int tabCount = m_viewTab.count();
     for (int i = 0; i < tabCount; ++i) {
         m_viewTab[i].primaryView->refresh();
-        if (m_viewTab[i].secondaryView != 0) {
+        if (m_viewTab[i].secondaryView) {
             m_viewTab[i].secondaryView->refresh();
         }
     }
@@ -278,8 +279,8 @@ void DolphinMainWindow::refreshViews()
         // Synchronize the split-view setting with the active view:
         const bool splitView = generalSettings->splitView();
         const ViewTab& activeTab = m_viewTab[m_tabIndex];
-        const bool toggle =    ( splitView && (activeTab.secondaryView == 0))
-                            || (!splitView && (activeTab.secondaryView != 0));
+        const bool toggle =    ( splitView && !activeTab.secondaryView)
+                            || (!splitView &&  activeTab.secondaryView);
         if (toggle) {
             toggleSplitView();
         }
@@ -301,7 +302,7 @@ void DolphinMainWindow::changeUrl(const KUrl& url)
     }
 
     DolphinViewContainer* view = activeViewContainer();
-    if (view != 0) {
+    if (view) {
         view->setUrl(url);
         updateEditActions();
         updateViewActions();
@@ -327,9 +328,9 @@ void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)
 {
     updateEditActions();
 
-    Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0);
+    Q_ASSERT(m_viewTab[m_tabIndex].primaryView);
     int selectedUrlsCount = m_viewTab[m_tabIndex].primaryView->view()->selectedItemsCount();
-    if (m_viewTab[m_tabIndex].secondaryView != 0) {
+    if (m_viewTab[m_tabIndex].secondaryView) {
         selectedUrlsCount += m_viewTab[m_tabIndex].secondaryView->view()->selectedItemsCount();
     }
 
@@ -355,13 +356,13 @@ void DolphinMainWindow::updateHistory()
 
     QAction* backAction = actionCollection()->action("go_back");
     backAction->setToolTip(i18nc("@info", "Go back"));
-    if (backAction != 0) {
+    if (backAction) {
         backAction->setEnabled(index < urlNavigator->historySize() - 1);
     }
 
     QAction* forwardAction = actionCollection()->action("go_forward");
     forwardAction->setToolTip(i18nc("@info", "Go forward"));
-    if (forwardAction != 0) {
+    if (forwardAction) {
         forwardAction->setEnabled(index > 0);
     }
 }
@@ -433,7 +434,7 @@ void DolphinMainWindow::openNewTab(const KUrl& url)
         m_viewTab[tabIndex].isPrimaryViewActive = false;
     }
 
-    if (focusWidget != 0) {
+    if (focusWidget) {
         // The DolphinViewContainer grabbed the keyboard focus. As the tab is opened
         // in background, assure that the previous focused widget gets the focus back.
         focusWidget->setFocus();
@@ -493,13 +494,13 @@ void DolphinMainWindow::openInNewWindow()
 
 void DolphinMainWindow::toggleActiveView()
 {
-    if (m_viewTab[m_tabIndex].secondaryView == 0) {
+    if (!m_viewTab[m_tabIndex].secondaryView) {
         // only one view is available
         return;
     }
 
-    Q_ASSERT(m_activeViewContainer != 0);
-    Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0);
+    Q_ASSERT(m_activeViewContainer);
+    Q_ASSERT(m_viewTab[m_tabIndex].primaryView);
 
     DolphinViewContainer* left  = m_viewTab[m_tabIndex].primaryView;
     DolphinViewContainer* right = m_viewTab[m_tabIndex].secondaryView;
@@ -575,7 +576,7 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
 
     if (m_filterDockIsTemporaryVisible) {
         QDockWidget* filterDock = findChild<QDockWidget*>("filterDock");
-        if (filterDock != 0) {
+        if (filterDock) {
             filterDock->hide();
         }
         m_filterDockIsTemporaryVisible = false;
@@ -597,7 +598,7 @@ void DolphinMainWindow::saveProperties(KConfigGroup& group)
                          cont->urlNavigator()->isUrlEditable());
 
         cont = m_viewTab[i].secondaryView;
-        if (cont != 0) {
+        if (cont) {
             group.writeEntry(tabProperty("Secondary URL", i), cont->url().url());
             group.writeEntry(tabProperty("Secondary Editable", i),
                              cont->urlNavigator()->isUrlEditable());
@@ -618,18 +619,18 @@ void DolphinMainWindow::readProperties(const KConfigGroup& group)
         cont = m_viewTab[i].secondaryView;
         const QString secondaryUrl = group.readEntry(tabProperty("Secondary URL", i));
         if (!secondaryUrl.isEmpty()) {
-            if (cont == 0) {
+            if (!cont) {
                 // a secondary view should be shown, but no one is available
                 // currently -> create a new view
                 toggleSplitView();
                 cont = m_viewTab[i].secondaryView;
-                Q_ASSERT(cont != 0);
+                Q_ASSERT(cont);
             }
 
             cont->setUrl(secondaryUrl);
             const bool editable = group.readEntry(tabProperty("Secondary Editable", i), false);
             cont->urlNavigator()->setUrlEditable(editable);
-        } else if (cont != 0) {
+        } else if (cont) {
             // no secondary view should be shown, but the default setting shows
             // one already -> close the view
             toggleSplitView();
@@ -675,7 +676,7 @@ void DolphinMainWindow::showErrorMessage(const QString& message)
 void DolphinMainWindow::slotUndoAvailable(bool available)
 {
     QAction* undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo));
-    if (undoAction != 0) {
+    if (undoAction) {
         undoAction->setEnabled(available);
     }
 }
@@ -712,7 +713,7 @@ void DolphinMainWindow::restoreClosedTab(QAction* action)
 void DolphinMainWindow::slotUndoTextChanged(const QString& text)
 {
     QAction* undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo));
-    if (undoAction != 0) {
+    if (undoAction) {
         undoAction->setText(text);
     }
 }
@@ -778,7 +779,7 @@ void DolphinMainWindow::invertSelection()
 
 void DolphinMainWindow::toggleSplitView()
 {
-    if (m_viewTab[m_tabIndex].secondaryView == 0) {
+    if (!m_viewTab[m_tabIndex].secondaryView) {
         createSecondaryView(m_tabIndex);
         setActiveViewContainer(m_viewTab[m_tabIndex].secondaryView);
     } else if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) {
@@ -858,7 +859,7 @@ void DolphinMainWindow::togglePanelLockState()
     const bool newLockState = !generalSettings->lockPanels();
     foreach (QObject* child, children()) {
         DolphinDockWidget* dock = qobject_cast<DolphinDockWidget*>(child);
-        if (dock != 0) {
+        if (dock) {
             dock->setLocked(newLockState);
         }
     }
@@ -934,7 +935,7 @@ void DolphinMainWindow::compareFiles()
     // - both in the secondary view
     // - one in the primary view and the other in the secondary
     //   view
-    Q_ASSERT(m_viewTab[m_tabIndex].primaryView != 0);
+    Q_ASSERT(m_viewTab[m_tabIndex].primaryView);
 
     KUrl urlA;
     KUrl urlB;
@@ -943,7 +944,7 @@ void DolphinMainWindow::compareFiles()
 
     switch (items.count()) {
     case 0: {
-        Q_ASSERT(m_viewTab[m_tabIndex].secondaryView != 0);
+        Q_ASSERT(m_viewTab[m_tabIndex].secondaryView);
         items = m_viewTab[m_tabIndex].secondaryView->view()->selectedItems();
         Q_ASSERT(items.count() == 2);
         urlA = items[0].url();
@@ -953,7 +954,7 @@ void DolphinMainWindow::compareFiles()
 
     case 1: {
         urlA = items[0].url();
-        Q_ASSERT(m_viewTab[m_tabIndex].secondaryView != 0);
+        Q_ASSERT(m_viewTab[m_tabIndex].secondaryView);
         items = m_viewTab[m_tabIndex].secondaryView->view()->selectedItems();
         Q_ASSERT(items.count() == 1);
         urlB = items[0].url();
@@ -1005,7 +1006,7 @@ void DolphinMainWindow::openTerminal()
 
 void DolphinMainWindow::editSettings()
 {
-    if (m_settingsDialog == 0) {
+    if (!m_settingsDialog) {
         const KUrl url = activeViewContainer()->url();
         m_settingsDialog = new DolphinSettingsDialog(url, this);
         m_settingsDialog->setAttribute(Qt::WA_DeleteOnClose);
@@ -1027,7 +1028,7 @@ void DolphinMainWindow::setActiveTab(int index)
     ViewTab& hiddenTab = m_viewTab[m_tabIndex];
     hiddenTab.isPrimaryViewActive = hiddenTab.primaryView->isActive();
     hiddenTab.primaryView->setActive(false);
-    if (hiddenTab.secondaryView != 0) {
+    if (hiddenTab.secondaryView) {
         hiddenTab.secondaryView->setActive(false);
     }
     QSplitter* splitter = m_viewTab[m_tabIndex].splitter;
@@ -1040,7 +1041,7 @@ void DolphinMainWindow::setActiveTab(int index)
     ViewTab& viewTab = m_viewTab[index];
     m_centralWidgetLayout->addWidget(viewTab.splitter, 1);
     viewTab.primaryView->show();
-    if (viewTab.secondaryView != 0) {
+    if (viewTab.secondaryView) {
         viewTab.secondaryView->show();
     }
     viewTab.splitter->show();
@@ -1072,7 +1073,7 @@ void DolphinMainWindow::closeTab(int index)
 
     // delete tab
     m_viewTab[index].primaryView->deleteLater();
-    if (m_viewTab[index].secondaryView != 0) {
+    if (m_viewTab[index].secondaryView) {
         m_viewTab[index].secondaryView->deleteLater();
     }
     m_viewTab[index].splitter->deleteLater();
@@ -1112,21 +1113,23 @@ void DolphinMainWindow::openTabContextMenu(int index, const QPoint& pos)
     QAction* selectedAction = menu.exec(pos);
     if (selectedAction == newTabAction) {
         const ViewTab& tab = m_viewTab[index];
-        Q_ASSERT(tab.primaryView != 0);
-        const KUrl url = (tab.secondaryView != 0) && tab.secondaryView->isActive() ?
+        Q_ASSERT(tab.primaryView);
+        const KUrl url = tab.secondaryView && tab.secondaryView->isActive() ?
                          tab.secondaryView->url() : tab.primaryView->url();
         openNewTab(url);
         m_tabBar->setCurrentIndex(m_viewTab.count() - 1);
     } else if (selectedAction == detachTabAction) {
         const ViewTab& tab = m_viewTab[index];
-        Q_ASSERT(tab.primaryView != 0);
+        Q_ASSERT(tab.primaryView);
         const KUrl primaryUrl = tab.primaryView->url();
         DolphinMainWindow* window = DolphinApplication::app()->createMainWindow();
         window->changeUrl(primaryUrl);
 
-        if (tab.secondaryView != 0) {
+        if (tab.secondaryView) {
             const KUrl secondaryUrl = tab.secondaryView->url();
-            window->toggleSplitView();
+            if (!window->m_viewTab[0].secondaryView) {
+                window->toggleSplitView();
+            }
             window->m_viewTab[0].secondaryView->setUrl(secondaryUrl);
             if (tab.primaryView->isActive()) {
                 window->m_viewTab[0].primaryView->setActive(true);
@@ -1218,13 +1221,14 @@ void DolphinMainWindow::slotWriteStateChanged(bool isFolderWritable)
 void DolphinMainWindow::slotSearchModeChanged(bool enabled)
 {
 #ifdef HAVE_NEPOMUK
-    if (Nepomuk::ResourceManager::instance()->init() != 0) {
-        // Currently the Filter Panel only works with Nepomuk enabled
+    const KUrl url = m_activeViewContainer->url();
+    const DolphinSearchInformation& searchInfo = DolphinSearchInformation::instance();
+    if (!searchInfo.isIndexingEnabled() || !searchInfo.isPathIndexed(url)) {
         return;
     }
 
     QDockWidget* filterDock = findChild<QDockWidget*>("filterDock");
-    if ((filterDock == 0) || !filterDock->isEnabled()) {
+    if (!filterDock) {
         return;
     }
 
@@ -1371,7 +1375,7 @@ void DolphinMainWindow::init()
 
 void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContainer)
 {
-    Q_ASSERT(viewContainer != 0);
+    Q_ASSERT(viewContainer);
     Q_ASSERT((viewContainer == m_viewTab[m_tabIndex].primaryView) ||
              (viewContainer == m_viewTab[m_tabIndex].secondaryView));
     if (m_activeViewContainer == viewContainer) {
@@ -1408,7 +1412,7 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContain
 void DolphinMainWindow::setupActions()
 {
     // setup 'File' menu
-    m_newFileMenu = new DolphinNewFileMenu(this, this);
+    m_newFileMenu = new DolphinNewFileMenu(this);
     KMenu* menu = m_newFileMenu->menu();
     menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
     menu->setIcon(KIcon("document-new"));
@@ -1792,7 +1796,7 @@ void DolphinMainWindow::rememberClosedTab(int index)
     ClosedTab closedTab;
     closedTab.primaryUrl = m_viewTab[index].primaryView->url();
 
-    if (m_viewTab[index].secondaryView != 0) {
+    if (m_viewTab[index].secondaryView) {
         closedTab.secondaryUrl = m_viewTab[index].secondaryView->url();
         closedTab.isSplit = true;
     } else {
@@ -1862,7 +1866,7 @@ void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container)
 void DolphinMainWindow::updateSplitAction()
 {
     QAction* splitAction = actionCollection()->action("split_view");
-    if (m_viewTab[m_tabIndex].secondaryView != 0) {
+    if (m_viewTab[m_tabIndex].secondaryView) {
         if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) {
             splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
             splitAction->setToolTip(i18nc("@info", "Close right view"));