X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/2a4f4c4b9ca1953f5859898b4e6bfc44cddd02be..d4287eb8e36ead543eb595bfcaa217fa0edd2654:/src/dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 41c6ff3a3..296e101d6 100644
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -43,7 +43,9 @@
 #include <QClipboard>
 
 K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)
-K_EXPORT_PLUGIN(DolphinPartFactory("dolphin"))
+// The componentdata name must be dolphinpart so that dolphinpart.rc is found
+// Alternatively we would have to install it as dolphin/dolphinpart.rc
+K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart"))
 
 DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args)
     : KParts::ReadOnlyPart(parent)
@@ -75,6 +77,7 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
                              m_dirLister,
                              m_dolphinModel,
                              m_proxyModel);
+    m_view->setTabsForFilesEnabled(true);
     setWidget(m_view);
 
     setXMLFile("dolphinpart.rc");
@@ -214,15 +217,24 @@ KAboutData* DolphinPart::createAboutData()
 
 bool DolphinPart::openUrl(const KUrl& url)
 {
-    const bool reload = arguments().reload();
+    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())
+        reload = true;
     if (m_view->url() == url && !reload) { // DolphinView won't do anything in that case, so don't emit started
         return true;
     }
     setUrl(url); // remember it at the KParts level
-    const QString prettyUrl = url.pathOrUrl();
+    KUrl visibleUrl(url);
+    if (!m_nameFilter.isEmpty()) {
+        visibleUrl.addPath(m_nameFilter);
+    }
+    QString prettyUrl = visibleUrl.pathOrUrl();
     emit setWindowCaption(prettyUrl);
     emit m_extension->setLocationBarUrl(prettyUrl);
     emit started(0); // get the wheel to spin
+    m_dirLister->setNameFilter(m_nameFilter);
     m_view->setUrl(url);
     emit aboutToOpenURL();
     if (reload)
@@ -273,7 +285,6 @@ void DolphinPart::createNewWindow(const KUrl& url)
     // TODO: Check issue N176832 for the missing QAIV signal; task 177399 - maybe this code
     // should be moved into DolphinPart::slotItemTriggered()
     KFileItem item(S_IFDIR, (mode_t)-1, url);
-    Q_ASSERT(item.mimeTypePtr()->is("inode/directory"));  // the signal 'tabRequested' is only emitted for dirs
     KParts::OpenUrlArguments args;
     args.setMimeType(item.mimetype());
     emit m_extension->createNewWindow(url, args);
@@ -299,15 +310,17 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
     KParts::BrowserExtension::ActionGroupMap actionGroups;
     QList<QAction *> editActions;
 
-    if (!item.isNull()) { // only for context menu on one or more items
+    if (!_item.isNull()) { // only for context menu on one or more items
         // TODO if ( sMoving )
         editActions.append(actionCollection()->action("rename"));
 
         bool addTrash = false;
         bool addDel = false;
 
-        // TODO if ( sMoving && !isIntoTrash && !isTrashLink )
-        addTrash = true;
+        bool isIntoTrash = _item.url().protocol() == "trash";
+
+        if ( /*TODO sMoving &&*/ !isIntoTrash )
+            addTrash = true;
 
         /* TODO if ( sDeleting ) */ {
             if ( !item.isLocalFile() )
@@ -328,18 +341,18 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
         if (addDel)
             editActions.append(actionCollection()->action("delete"));
         actionGroups.insert("editactions", editActions);
-
-        // TODO: We should change the signature of the slots (and signals) for being able
-        //       to tell for which items we want a popup.
-        KFileItemList items = (m_view->selectedItems().count() ? m_view->selectedItems()
-                                                               : KFileItemList() << item);
-        emit m_extension->popupMenu(QCursor::pos(),
-                                    items,
-                                    KParts::OpenUrlArguments(),
-                                    KParts::BrowserArguments(),
-                                    popupFlags,
-                                    actionGroups);
     }
+
+    // TODO: We should change the signature of the slots (and signals) for being able
+    //       to tell for which items we want a popup.
+    KFileItemList items = (m_view->selectedItems().count() ? m_view->selectedItems()
+                           : KFileItemList() << item);
+    emit m_extension->popupMenu(QCursor::pos(),
+                                items,
+                                KParts::OpenUrlArguments(),
+                                KParts::BrowserArguments(),
+                                popupFlags,
+                                actionGroups);
 }
 
 void DolphinPart::slotUrlChanged(const KUrl& url)
@@ -405,4 +418,12 @@ QString DolphinPart::currentViewMode() const
     return m_actionHandler->currentViewModeActionName();
 }
 
+void DolphinPart::setNameFilter(const QString& nameFilter)
+{
+    // This is the "/home/dfaure/*.diff" kind of name filter (KDirLister::setNameFilter)
+    // which is unrelated to DolphinView::setNameFilter which is substring filtering in a proxy.
+    m_nameFilter = nameFilter;
+    // TODO save/restore name filter in saveState/restoreState like KonqDirPart did in kde3?
+}
+
 #include "dolphinpart.moc"