X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/0ad893ae2b2bcc88c56587b57d227d65e593d2db..8eb9b508ca87fb1d634d8b8ba62c054ed04466d2:/src/dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 0691791a5..99784de1a 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -19,26 +19,26 @@
 
 #include "dolphinpart.h"
 
-#include <kfileitemlistproperties.h>
+#include <KFileItemListProperties>
 #include <konq_operations.h>
 
 #include <kaboutdata.h>
-#include <kactioncollection.h>
-#include <kconfiggroup.h>
-#include <kdebug.h>
-#include <kglobalsettings.h>
-#include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kpluginfactory.h>
-#include <ktoggleaction.h>
-#include <kio/netaccess.h>
+#include <KActionCollection>
+#include <KConfigGroup>
+#include <KDebug>
+#include <KGlobalSettings>
+#include <KIconLoader>
+#include <KLocale>
+#include <KMessageBox>
+#include <KPluginFactory>
+#include <KToggleAction>
+#include <KIO/NetAccess>
 #include <ktoolinvocation.h>
 #include <kauthorized.h>
 #include <knewfilemenu.h>
-#include <kmenu.h>
+#include <KMenu>
 #include <kinputdialog.h>
-#include <kprotocolinfo.h>
+#include <KProtocolInfo>
 
 #include "settings/dolphinsettings.h"
 #include "views/dolphinview.h"
@@ -67,28 +67,14 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
     // make sure that other apps using this part find Dolphin's view-file-columns icons
     KIconLoader::global()->addAppDir("dolphin");
 
-    m_dirLister = new DolphinDirLister;
-    m_dirLister->setAutoUpdate(true);
-    if (parentWidget) {
-        m_dirLister->setMainWindow(parentWidget->window());
-    }
-    m_dirLister->setDelayedMimeTypes(true);
-
-    connect(m_dirLister, SIGNAL(completed(KUrl)), this, SLOT(slotCompleted(KUrl)));
-    connect(m_dirLister, SIGNAL(canceled(KUrl)), this, SLOT(slotCanceled(KUrl)));
-    connect(m_dirLister, SIGNAL(percent(int)), this, SLOT(updateProgress(int)));
-    connect(m_dirLister, SIGNAL(errorMessage(QString)), this, SLOT(slotErrorMessage(QString)));
-
-    m_dolphinModel = new DolphinModel(this);
-    m_dolphinModel->setDirLister(m_dirLister); // m_dolphinModel takes ownership of m_dirLister
-
-    m_proxyModel = new DolphinSortFilterProxyModel(this);
-    m_proxyModel->setSourceModel(m_dolphinModel);
-
-    m_view = new DolphinView(parentWidget, KUrl(), m_proxyModel);
+    m_view = new DolphinView(KUrl(), parentWidget);
     m_view->setTabsForFilesEnabled(true);
     setWidget(m_view);
 
+    connect(m_view, SIGNAL(finishedPathLoading(KUrl)), this, SLOT(slotCompleted(KUrl)));
+    connect(m_view, SIGNAL(pathLoadingProgress(int)), this, SLOT(updateProgress(int)));
+    connect(m_view, SIGNAL(errorMessage(QString)), this, SLOT(slotErrorMessage(QString)));
+
     setXMLFile("dolphinpart.rc");
 
     connect(m_view, SIGNAL(infoMessage(QString)),
@@ -116,12 +102,8 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
 
     // Watch for changes that should result in updates to the
     // status bar text.
-    connect(m_dirLister, SIGNAL(itemsDeleted(const KFileItemList&)),
-            this, SLOT(updateStatusBar()));
-    connect(m_dirLister, SIGNAL(clear()),
-            this, SLOT(updateStatusBar()));
-    connect(m_view,  SIGNAL(selectionChanged(const KFileItemList)),
-            this, SLOT(updateStatusBar()));
+    connect(m_view, SIGNAL(itemCountChanged()), this, SLOT(updateStatusBar()));
+    connect(m_view,  SIGNAL(selectionChanged(const KFileItemList)), this, SLOT(updateStatusBar()));
 
     m_actionHandler = new DolphinViewActionHandler(actionCollection(), this);
     m_actionHandler->setCurrentView(m_view);
@@ -292,7 +274,7 @@ bool DolphinPart::openUrl(const KUrl& url)
     bool reload = arguments().reload();
     // A bit of a workaround so that changing the namefilter works: force reload.
     // Otherwise DolphinView wouldn't relist the URL, so nothing would happen.
-    if (m_nameFilter != m_dirLister->nameFilter())
+    if (m_nameFilter != m_view->nameFilter())
         reload = true;
     if (m_view->url() == url && !reload) { // DolphinView won't do anything in that case, so don't emit started
         return true;
@@ -306,7 +288,7 @@ bool DolphinPart::openUrl(const KUrl& url)
     emit setWindowCaption(prettyUrl);
     emit m_extension->setLocationBarUrl(prettyUrl);
     emit started(0); // get the wheel to spin
-    m_dirLister->setNameFilter(m_nameFilter);
+    m_view->setNameFilter(m_nameFilter);
     m_view->setUrl(url);
     updatePasteAction();
     emit aboutToOpenURL();
@@ -321,11 +303,6 @@ void DolphinPart::slotCompleted(const KUrl& url)
     emit completed();
 }
 
-void DolphinPart::slotCanceled(const KUrl& url)
-{
-    slotCompleted(url);
-}
-
 void DolphinPart::slotMessage(const QString& msg)
 {
     emit setStatusBarText(msg);
@@ -383,7 +360,7 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item,
 
     if (item.isNull()) { // viewport context menu
         popupFlags |= KParts::BrowserExtension::ShowNavigationItems | KParts::BrowserExtension::ShowUp;
-        item = m_dirLister->rootItem();
+        item = m_view->rootItem();
         if (item.isNull())
             item = KFileItem( S_IFDIR, (mode_t)-1, url() );
         else
@@ -480,49 +457,27 @@ void DolphinPart::slotSelectItemsMatchingPattern()
 {
     openSelectionDialog(i18nc("@title:window", "Select"),
                         i18n("Select all items matching this pattern:"),
-                        QItemSelectionModel::Select);
+                        true);
 }
 
 void DolphinPart::slotUnselectItemsMatchingPattern()
 {
     openSelectionDialog(i18nc("@title:window", "Unselect"),
                         i18n("Unselect all items matching this pattern:"),
-                        QItemSelectionModel::Deselect);
+                        false);
 }
 
-void DolphinPart::openSelectionDialog(const QString& title, const QString& text, QItemSelectionModel::SelectionFlags command)
+void DolphinPart::openSelectionDialog(const QString& title, const QString& text, bool selectItems)
 {
     bool okClicked;
     QString pattern = KInputDialog::getText(title, text, "*", &okClicked, m_view);
 
     if (okClicked && !pattern.isEmpty()) {
         QRegExp patternRegExp(pattern, Qt::CaseSensitive, QRegExp::Wildcard);
-        QItemSelection matchingIndexes = childrenMatchingPattern(QModelIndex(), patternRegExp);
-        m_view->selectionModel()->select(matchingIndexes, command);
+        m_view->setItemSelectionEnabled(patternRegExp, selectItems);
     }
 }
 
-QItemSelection DolphinPart::childrenMatchingPattern(const QModelIndex& parent, const QRegExp& patternRegExp)
-{
-    QItemSelection matchingIndexes;
-    int numRows = m_proxyModel->rowCount(parent);
-
-    for (int row = 0; row < numRows; row++) {
-        QModelIndex index = m_proxyModel->index(row, 0, parent);
-        QModelIndex sourceIndex = m_proxyModel->mapToSource(index);
-
-        if (sourceIndex.isValid() && patternRegExp.exactMatch(m_dolphinModel->data(sourceIndex).toString())) {
-            matchingIndexes += QItemSelectionRange(index);
-        }
-
-        if (m_proxyModel->hasChildren(index)) {
-            matchingIndexes += childrenMatchingPattern(index, patternRegExp);
-        }
-    }
-
-    return matchingIndexes;
-}
-
 void DolphinPart::setCurrentViewMode(const QString& viewModeName)
 {
     QAction* action = actionCollection()->action(viewModeName);
@@ -669,7 +624,7 @@ KFileItemList DolphinPartFileInfoExtension::queryFor(KParts::FileInfoExtension::
               return part()->view()->selectedItems();
           break;
       case KParts::FileInfoExtension::AllItems:
-          return part()->view()->allItems();
+          return part()->view()->items();
       default:
           break;
     }