Fix crash when dropping URLs on the URL navigator's drop down menus

[dolphin.git] / src / dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 21b0ccdfc8cdd4686f56b46e0697e64b750ec42b..e8138eb8e9f2d54554e37eeb2f0d9e8439dc4234 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -18,43 +18,54 @@
 */
 
 #include "dolphinpart.h"
 */
 
 #include "dolphinpart.h"

-#include "dolphinviewactionhandler.h"
-#include "dolphinsortfilterproxymodel.h"
-#include "dolphinview.h"
-#include "dolphinmodel.h"
-#include "dolphinnewmenuobserver.h"
-#include "dolphinremoteencoding.h"
-
-#include <kfileitemlistproperties.h>
+#include "dolphinremoveaction.h"
+
+#include <KFileItemListProperties>

 #include <konq_operations.h>
 
 #include <konq_operations.h>
 

-#include <kaboutdata.h>
-#include <kactioncollection.h>
-#include <kconfiggroup.h>
-#include <kdirlister.h>
-#include <kglobalsettings.h>
-#include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kpluginfactory.h>
-#include <ktoggleaction.h>
-#include <kio/netaccess.h>
-#include <ktoolinvocation.h>
+#include <KAboutData>
+#include <KActionCollection>
+#include <KConfigGroup>
+#include <KDebug>
+#include <KGlobalSettings>
+#include <KIconLoader>
+#include <KLocale>
+#include <KMessageBox>
+#include <KPluginFactory>
+#include <KRun>
+#include <KToggleAction>
+#include <KIO/NetAccess>
+#include <KToolInvocation>

 #include <kauthorized.h>
 #include <kauthorized.h>

-#include <knewmenu.h>
-#include <kmenu.h>
-
-#include "settings/dolphinsettings.h"
+#include <KNewFileMenu>
+#include <KMenu>
+#include <KInputDialog>
+#include <KProtocolInfo>
+#include <kdeversion.h>
+
+#if KDE_IS_VERSION(4, 9, 2)
+#include "dolphinpart_ext.h"
+#endif
+
+#include "views/dolphinview.h"
+#include "views/dolphinviewactionhandler.h"
+#include "views/dolphinnewfilemenuobserver.h"
+#include "views/dolphinremoteencoding.h"
+#include "kitemviews/kfileitemmodel.h"
+#include "kitemviews/private/kfileitemmodeldirlister.h"

 
 #include <QActionGroup>
 #include <QApplication>
 #include <QClipboard>
 
 #include <QActionGroup>
 #include <QApplication>
 #include <QClipboard>

+#include <QDir>

 
 K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)
 K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart", "dolphin"))
 
 DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args)
     : KParts::ReadOnlyPart(parent)
 
 K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)
 K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart", "dolphin"))
 
 DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args)
     : KParts::ReadOnlyPart(parent)

+      ,m_openTerminalAction(0)
+      ,m_removeAction(0)

 {
     Q_UNUSED(args)
     setComponentData(DolphinPartFactory::componentData(), false);
 {
     Q_UNUSED(args)
     setComponentData(DolphinPartFactory::componentData(), false);


@@ -63,27 +74,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");
 
     // make sure that other apps using this part find Dolphin's view-file-columns icons
     KIconLoader::global()->addAppDir("dolphin");
 

-    m_dirLister = new KDirLister;
-    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)));
-
-    m_dolphinModel = new DolphinModel(this);
-    m_dolphinModel->setDirLister(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);
 
     m_view->setTabsForFilesEnabled(true);
     setWidget(m_view);
 

+    connect(m_view, SIGNAL(directoryLoadingCompleted()), this, SIGNAL(completed()));
+    connect(m_view, SIGNAL(directoryLoadingProgress(int)), this, SLOT(updateProgress(int)));
+    connect(m_view, SIGNAL(errorMessage(QString)), this, SLOT(slotErrorMessage(QString)));
+

     setXMLFile("dolphinpart.rc");
 
     connect(m_view, SIGNAL(infoMessage(QString)),
     setXMLFile("dolphinpart.rc");
 
     connect(m_view, SIGNAL(infoMessage(QString)),


@@ -92,33 +90,29 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
             this, SLOT(slotMessage(QString)));
     connect(m_view, SIGNAL(errorMessage(QString)),
             this, SLOT(slotErrorMessage(QString)));
             this, SLOT(slotMessage(QString)));
     connect(m_view, SIGNAL(errorMessage(QString)),
             this, SLOT(slotErrorMessage(QString)));

-    connect(m_view, SIGNAL(itemTriggered(KFileItem)),
-            this, SLOT(slotItemTriggered(KFileItem)));
+    connect(m_view, SIGNAL(itemActivated(KFileItem)),
+            this, SLOT(slotItemActivated(KFileItem)));
+    connect(m_view, SIGNAL(itemsActivated(KFileItemList)),
+            this, SLOT(slotItemsActivated(KFileItemList)));

     connect(m_view, SIGNAL(tabRequested(KUrl)),
             this, SLOT(createNewWindow(KUrl)));
     connect(m_view, SIGNAL(tabRequested(KUrl)),
             this, SLOT(createNewWindow(KUrl)));

-    connect(m_view, SIGNAL(requestContextMenu(KFileItem,KUrl,QList<QAction*>)),
-            this, SLOT(slotOpenContextMenu(KFileItem,KUrl,QList<QAction*>)));
+    connect(m_view, SIGNAL(requestContextMenu(QPoint,KFileItem,KUrl,QList<QAction*>)),
+            this, SLOT(slotOpenContextMenu(QPoint,KFileItem,KUrl,QList<QAction*>)));

     connect(m_view, SIGNAL(selectionChanged(KFileItemList)),
             m_extension, SIGNAL(selectionInfo(KFileItemList)));
     connect(m_view, SIGNAL(selectionChanged(KFileItemList)),
             this, SLOT(slotSelectionChanged(KFileItemList)));
     connect(m_view, SIGNAL(requestItemInfo(KFileItem)),
             this, SLOT(slotRequestItemInfo(KFileItem)));
     connect(m_view, SIGNAL(selectionChanged(KFileItemList)),
             m_extension, SIGNAL(selectionInfo(KFileItemList)));
     connect(m_view, SIGNAL(selectionChanged(KFileItemList)),
             this, SLOT(slotSelectionChanged(KFileItemList)));
     connect(m_view, SIGNAL(requestItemInfo(KFileItem)),
             this, SLOT(slotRequestItemInfo(KFileItem)));

-    connect(m_view, SIGNAL(requestUrlChange(KUrl)),
-            this, SLOT(slotRequestUrlChange(KUrl)));
-    connect(m_view, SIGNAL(modeChanged()),
+    connect(m_view, SIGNAL(modeChanged(DolphinView::Mode,DolphinView::Mode)),

             this, SIGNAL(viewModeChanged())); // relay signal
             this, SIGNAL(viewModeChanged())); // relay signal

-    connect(m_view, SIGNAL(redirection(KUrl, KUrl)),
-            this, SLOT(slotRedirection(KUrl, KUrl)));
+    connect(m_view, SIGNAL(redirection(KUrl,KUrl)),
+            this, SLOT(slotDirectoryRedirection(KUrl,KUrl)));

 
     // Watch for changes that should result in updates to the
     // status bar text.
 
     // 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(KFileItemList)), this, SLOT(updateStatusBar()));

 
     m_actionHandler = new DolphinViewActionHandler(actionCollection(), this);
     m_actionHandler->setCurrentView(m_view);
 
     m_actionHandler = new DolphinViewActionHandler(actionCollection(), this);
     m_actionHandler->setCurrentView(m_view);


@@ -132,37 +126,76 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
     connect(clipboard, SIGNAL(dataChanged()),
             this, SLOT(updatePasteAction()));
 
     connect(clipboard, SIGNAL(dataChanged()),
             this, SLOT(updatePasteAction()));
 

+    // Create file info and listing filter extensions.
+    // NOTE: Listing filter needs to be instantiated after the creation of the view.
+    new DolphinPartFileInfoExtension(this);
+
+#if KDE_IS_VERSION(4, 9, 2)
+    new DolphinPartListingFilterExtension(this);
+
+    KDirLister* lister = m_view->m_model->m_dirLister;
+    if (lister) {
+        DolphinPartListingNotificationExtension* notifyExt = new DolphinPartListingNotificationExtension(this);
+        connect(lister, SIGNAL(newItems(KFileItemList)), notifyExt, SLOT(slotNewItems(KFileItemList)));
+        connect(lister, SIGNAL(itemsDeleted(KFileItemList)), notifyExt, SLOT(slotItemsDeleted(KFileItemList)));
+    } else {
+        kWarning() << "NULL KDirLister object! KParts::ListingNotificationExtension will NOT be supported";
+    }
+#endif
+

     createActions();
     m_actionHandler->updateViewActions();
     slotSelectionChanged(KFileItemList()); // initially disable selection-dependent actions
 
     createActions();
     m_actionHandler->updateViewActions();
     slotSelectionChanged(KFileItemList()); // initially disable selection-dependent actions
 

+    // Listen to events from the app so we can update the remove key by
+    // checking for a Shift key press.
+    qApp->installEventFilter(this);
+

     // TODO there was a "always open a new window" (when clicking on a directory) setting in konqueror
     // (sort of spacial navigation)
 
     loadPlugins(this, this, componentData());
     // TODO there was a "always open a new window" (when clicking on a directory) setting in konqueror
     // (sort of spacial navigation)
 
     loadPlugins(this, this, componentData());

-

 }
 
 DolphinPart::~DolphinPart()
 {
 }
 
 DolphinPart::~DolphinPart()
 {

-    DolphinSettings::instance().save();
-    DolphinNewMenuObserver::instance().detach(m_newMenu);
-    delete m_dirLister;
+    DolphinNewFileMenuObserver::instance().detach(m_newFileMenu);

 }
 
 void DolphinPart::createActions()
 {
     // Edit menu
 
 }
 
 void DolphinPart::createActions()
 {
     // Edit menu
 

-    m_newMenu = new KNewMenu(actionCollection(), widget(), "new_menu");
-    DolphinNewMenuObserver::instance().attach(m_newMenu);
-    connect(m_newMenu->menu(), SIGNAL(aboutToShow()),
+    m_newFileMenu = new KNewFileMenu(actionCollection(), "new_menu", this);
+    m_newFileMenu->setParentWidget(widget());
+    DolphinNewFileMenuObserver::instance().attach(m_newFileMenu);
+    connect(m_newFileMenu->menu(), SIGNAL(aboutToShow()),

             this, SLOT(updateNewMenu()));
 
     KAction *editMimeTypeAction = actionCollection()->addAction( "editMimeType" );
     editMimeTypeAction->setText( i18nc("@action:inmenu Edit", "&Edit File Type..." ) );
     connect(editMimeTypeAction, SIGNAL(triggered()), SLOT(slotEditMimeType()));
 
             this, SLOT(updateNewMenu()));
 
     KAction *editMimeTypeAction = actionCollection()->addAction( "editMimeType" );
     editMimeTypeAction->setText( i18nc("@action:inmenu Edit", "&Edit File Type..." ) );
     connect(editMimeTypeAction, SIGNAL(triggered()), SLOT(slotEditMimeType()));
 

+    KAction* selectItemsMatching = actionCollection()->addAction("select_items_matching");
+    selectItemsMatching->setText(i18nc("@action:inmenu Edit", "Select Items Matching..."));
+    selectItemsMatching->setShortcut(Qt::CTRL | Qt::Key_S);
+    connect(selectItemsMatching, SIGNAL(triggered()), this, SLOT(slotSelectItemsMatchingPattern()));
+
+    KAction* unselectItemsMatching = actionCollection()->addAction("unselect_items_matching");
+    unselectItemsMatching->setText(i18nc("@action:inmenu Edit", "Unselect Items Matching..."));
+    connect(unselectItemsMatching, SIGNAL(triggered()), this, SLOT(slotUnselectItemsMatchingPattern()));
+
+    actionCollection()->addAction(KStandardAction::SelectAll, "select_all", m_view, SLOT(selectAll()));
+
+    KAction* unselectAll = actionCollection()->addAction("unselect_all");
+    unselectAll->setText(i18nc("@action:inmenu Edit", "Unselect All"));
+    connect(unselectAll, SIGNAL(triggered()), m_view, SLOT(clearSelection()));
+
+    KAction* invertSelection = actionCollection()->addAction("invert_selection");
+    invertSelection->setText(i18nc("@action:inmenu Edit", "Invert Selection"));
+    invertSelection->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_A);
+    connect(invertSelection, SIGNAL(triggered()), m_view, SLOT(invertSelection()));
+

     // View menu: all done by DolphinViewActionHandler
 
     // Go menu
     // View menu: all done by DolphinViewActionHandler
 
     // Go menu


@@ -188,14 +221,19 @@ void DolphinPart::createActions()
                    goActionGroup);
 
     // Tools menu
                    goActionGroup);
 
     // Tools menu

+    m_findFileAction = actionCollection()->addAction("find_file");
+    m_findFileAction->setText(i18nc("@action:inmenu Tools", "Find File..."));
+    m_findFileAction->setShortcut(Qt::CTRL | Qt::Key_F);
+    m_findFileAction->setIcon(KIcon("edit-find"));
+    connect(m_findFileAction, SIGNAL(triggered()), this, SLOT(slotFindFile()));
+

     if (KAuthorized::authorizeKAction("shell_access")) {
     if (KAuthorized::authorizeKAction("shell_access")) {

-        KAction* action = actionCollection()->addAction("open_terminal");
-        action->setIcon(KIcon("utilities-terminal"));
-        action->setText(i18nc("@action:inmenu Tools", "Open &Terminal"));
-        connect(action, SIGNAL(triggered()), SLOT(slotOpenTerminal()));
-        action->setShortcut(Qt::Key_F4);
+        m_openTerminalAction = actionCollection()->addAction("open_terminal");
+        m_openTerminalAction->setIcon(KIcon("utilities-terminal"));
+        m_openTerminalAction->setText(i18nc("@action:inmenu Tools", "Open &Terminal"));
+        connect(m_openTerminalAction, SIGNAL(triggered()), SLOT(slotOpenTerminal()));
+        m_openTerminalAction->setShortcut(Qt::Key_F4);

     }
     }

-

 }
 
 void DolphinPart::createGoAction(const char* name, const char* iconName,
 }
 
 void DolphinPart::createGoAction(const char* name, const char* iconName,


@@ -269,7 +307,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.
     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;
         reload = true;
     if (m_view->url() == url && !reload) { // DolphinView won't do anything in that case, so don't emit started
         return true;


@@ -283,26 +321,22 @@ bool DolphinPart::openUrl(const KUrl& url)
     emit setWindowCaption(prettyUrl);
     emit m_extension->setLocationBarUrl(prettyUrl);
     emit started(0); // get the wheel to spin
     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();
     if (reload)
         m_view->reload();
     m_view->setUrl(url);
     updatePasteAction();
     emit aboutToOpenURL();
     if (reload)
         m_view->reload();

+    // Disable "Find File" and "Open Terminal" actions for non-file URLs,
+    // e.g. ftp, smb, etc. #279283
+    const bool isLocalUrl = url.isLocalFile();
+    m_findFileAction->setEnabled(isLocalUrl);
+    if (m_openTerminalAction) {
+        m_openTerminalAction->setEnabled(isLocalUrl);
+    }

     return true;
 }
 
     return true;
 }
 

-void DolphinPart::slotCompleted(const KUrl& url)
-{
-    Q_UNUSED(url)
-    emit completed();
-}
-
-void DolphinPart::slotCanceled(const KUrl& url)
-{
-    slotCompleted(url);
-}
-

 void DolphinPart::slotMessage(const QString& msg)
 {
     emit setStatusBarText(msg);
 void DolphinPart::slotMessage(const QString& msg)
 {
     emit setStatusBarText(msg);


@@ -310,7 +344,9 @@ void DolphinPart::slotMessage(const QString& msg)
 
 void DolphinPart::slotErrorMessage(const QString& msg)
 {
 
 void DolphinPart::slotErrorMessage(const QString& msg)
 {

-    KMessageBox::error(m_view, msg);
+    kDebug() << msg;
+    emit canceled(msg);
+    //KMessageBox::error(m_view, msg);

 }
 
 void DolphinPart::slotRequestItemInfo(const KFileItem& item)
 }
 
 void DolphinPart::slotRequestItemInfo(const KFileItem& item)


@@ -323,10 +359,14 @@ void DolphinPart::slotRequestItemInfo(const KFileItem& item)
     }
 }
 
     }
 }
 

-void DolphinPart::slotItemTriggered(const KFileItem& item)
+void DolphinPart::slotItemActivated(const KFileItem& item)

 {
     KParts::OpenUrlArguments args;
 {
     KParts::OpenUrlArguments args;

-    args.setMimeType(item.mimetype());
+    // Forget about the known mimetype if a target URL is used.
+    // Testcase: network:/ with a item (mimetype "inode/some-foo-service") pointing to a http URL (html)
+    if (item.targetUrl() == item.url()) {
+        args.setMimeType(item.mimetype());
+    }

 
     // Ideally, konqueror should be changed to not require trustedSource for directory views,
     // since the idea was not to need BrowserArguments for non-browser stuff...
 
     // Ideally, konqueror should be changed to not require trustedSource for directory views,
     // since the idea was not to need BrowserArguments for non-browser stuff...


@@ -335,14 +375,22 @@ void DolphinPart::slotItemTriggered(const KFileItem& item)
     emit m_extension->openUrlRequest(item.targetUrl(), args, browserArgs);
 }
 
     emit m_extension->openUrlRequest(item.targetUrl(), args, browserArgs);
 }
 

+void DolphinPart::slotItemsActivated(const KFileItemList& items)
+{
+    foreach (const KFileItem& item, items) {
+        slotItemActivated(item);
+    }
+}
+

 void DolphinPart::createNewWindow(const KUrl& url)
 {
     // TODO: Check issue N176832 for the missing QAIV signal; task 177399 - maybe this code
 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()
+    // should be moved into DolphinPart::slotItemActivated()

     emit m_extension->createNewWindow(url);
 }
 
     emit m_extension->createNewWindow(url);
 }
 

-void DolphinPart::slotOpenContextMenu(const KFileItem& _item,
+void DolphinPart::slotOpenContextMenu(const QPoint& pos,
+                                      const KFileItem& _item,

                                       const KUrl&,
                                       const QList<QAction*>& customActions)
 {
                                       const KUrl&,
                                       const QList<QAction*>& customActions)
 {


@@ -354,61 +402,59 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item,
 
     if (item.isNull()) { // viewport context menu
         popupFlags |= KParts::BrowserExtension::ShowNavigationItems | KParts::BrowserExtension::ShowUp;
 
     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() );
         if (item.isNull())
             item = KFileItem( S_IFDIR, (mode_t)-1, url() );

+        else
+            item.setUrl(url()); // ensure we use the view url, not the canonical path (#213799)

     }
 
     }
 

+    // 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;
+    if (m_view->selectedItems().isEmpty()) {
+        items.append(item);
+    } else {
+        items = m_view->selectedItems();
+    }
+
+    KFileItemListProperties capabilities(items);
+

     KParts::BrowserExtension::ActionGroupMap actionGroups;
     QList<QAction *> editActions;
     KParts::BrowserExtension::ActionGroupMap actionGroups;
     QList<QAction *> editActions;

-
+    editActions += m_view->versionControlActions(m_view->selectedItems());

     editActions += customActions;
 
     if (!_item.isNull()) { // only for context menu on one or more items
     editActions += customActions;
 
     if (!_item.isNull()) { // only for context menu on one or more items

-        bool sDeleting = true;
-        bool sMoving = true;
-
-        // If the parent directory of the selected item is writable, moving
-        // and deleting are possible.
-        KFileItem parentDir = m_dirLister->rootItem();
-        if (!parentDir.isNull() && !parentDir.isWritable()) {
+        const bool supportsMoving = capabilities.supportsMoving();
+
+        if (capabilities.supportsDeleting()) {
+            const bool showDeleteAction = (KGlobal::config()->group("KDE").readEntry("ShowDeleteCommand", false) ||
+                                           !item.isLocalFile());
+            const bool showMoveToTrashAction = capabilities.isLocal() && supportsMoving;
+
+            if (showDeleteAction && showMoveToTrashAction) {
+                delete m_removeAction;
+                m_removeAction = 0;
+                editActions.append(actionCollection()->action("move_to_trash"));
+                editActions.append(actionCollection()->action("delete"));
+            } else if (showDeleteAction && !showMoveToTrashAction) {
+                editActions.append(actionCollection()->action("delete"));
+            } else {
+                if (!m_removeAction)
+                    m_removeAction = new DolphinRemoveAction(this, actionCollection());
+                editActions.append(m_removeAction);
+                m_removeAction->update();
+            }
+        } else {

             popupFlags |= KParts::BrowserExtension::NoDeletion;
             popupFlags |= KParts::BrowserExtension::NoDeletion;

-            sDeleting = false;
-            sMoving = false;

         }
 
         }
 

-        if ( sMoving )
+        if (supportsMoving) {

             editActions.append(actionCollection()->action("rename"));
             editActions.append(actionCollection()->action("rename"));

-
-        bool addTrash = false;
-        bool addDel = false;
-
-        bool isIntoTrash = _item.url().protocol() == "trash";
-
-        if ( sMoving && !isIntoTrash && item.isLocalFile() )
-            addTrash = true;
-
-        if ( sDeleting ) {
-            if ( !item.isLocalFile() )
-                addDel = true;
-            else if (QApplication::keyboardModifiers() & Qt::ShiftModifier) {
-                addTrash = false;
-                addDel = true;
-            }
-            else {
-                KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals);
-                KConfigGroup configGroup(globalConfig, "KDE");
-                if ( configGroup.readEntry("ShowDeleteCommand", false) )
-                    addDel = true;
-            }

         }
 
         }
 

-        if (addTrash)
-            editActions.append(actionCollection()->action("move_to_trash"));
-        if (addDel)
-            editActions.append(actionCollection()->action("delete"));
-
-        // Normally KonqPopupMenu only shows the "Create new" subdir in the current view
+        // Normally KonqPopupMenu only shows the "Create new" submenu in the current view

         // since otherwise the created file would not be visible.
         // But in treeview mode we should allow it.
         if (m_view->itemsExpandable())
         // since otherwise the created file would not be visible.
         // But in treeview mode we should allow it.
         if (m_view->itemsExpandable())


@@ -418,11 +464,7 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item,
 
     actionGroups.insert("editactions", editActions);
 
 
     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(),
+    emit m_extension->popupMenu(pos,

                                 items,
                                 KParts::OpenUrlArguments(),
                                 KParts::BrowserArguments(),
                                 items,
                                 KParts::OpenUrlArguments(),
                                 KParts::BrowserArguments(),


@@ -430,55 +472,47 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item,
                                 actionGroups);
 }
 
                                 actionGroups);
 }
 

-void DolphinPart::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl)
+void DolphinPart::slotDirectoryRedirection(const KUrl& oldUrl, const KUrl& newUrl)

 {
     //kDebug() << oldUrl << newUrl << "currentUrl=" << url();
 {
     //kDebug() << oldUrl << newUrl << "currentUrl=" << url();

-    if (oldUrl == url()) {
+    if (oldUrl.equals(url(), KUrl::CompareWithoutTrailingSlash /* #207572 */)) {

         KParts::ReadOnlyPart::setUrl(newUrl);
         const QString prettyUrl = newUrl.pathOrUrl();
         emit m_extension->setLocationBarUrl(prettyUrl);
     }
 }
 
         KParts::ReadOnlyPart::setUrl(newUrl);
         const QString prettyUrl = newUrl.pathOrUrl();
         emit m_extension->setLocationBarUrl(prettyUrl);
     }
 }
 

-void DolphinPart::slotRequestUrlChange(const KUrl& url)
-{
-    if (m_view->url() != url) {
-        // If the view URL is not equal to 'url', then an inner URL change has
-        // been done (e. g. by activating an existing column in the column view).
-        openUrl(url);
-        emit m_extension->openUrlNotify();
-    }
-}
-
-////

 
 

-void DolphinPartBrowserExtension::cut()
+void DolphinPart::slotEditMimeType()

 {
 {

-    m_part->view()->cutSelectedItems();
+    const KFileItemList items = m_view->selectedItems();
+    if (!items.isEmpty()) {
+        KonqOperations::editMimeType(items.first().mimetype(), m_view);
+    }

 }
 
 }
 

-void DolphinPartBrowserExtension::copy()
+void DolphinPart::slotSelectItemsMatchingPattern()

 {
 {

-    m_part->view()->copySelectedItems();
+    openSelectionDialog(i18nc("@title:window", "Select"),
+                        i18n("Select all items matching this pattern:"),
+                        true);

 }
 
 }
 

-void DolphinPartBrowserExtension::paste()
+void DolphinPart::slotUnselectItemsMatchingPattern()

 {
 {

-    m_part->view()->paste();
+    openSelectionDialog(i18nc("@title:window", "Unselect"),
+                        i18n("Unselect all items matching this pattern:"),
+                        false);

 }
 
 }
 

-void DolphinPartBrowserExtension::reparseConfiguration()
+void DolphinPart::openSelectionDialog(const QString& title, const QString& text, bool selectItems)

 {
 {

-    m_part->view()->refresh();
-}
-
-////
+    bool okClicked;
+    QString pattern = KInputDialog::getText(title, text, "*", &okClicked, m_view);

 
 

-void DolphinPart::slotEditMimeType()
-{
-    const KFileItemList items = m_view->selectedItems();
-    if (!items.isEmpty()) {
-        KonqOperations::editMimeType(items.first().mimetype(), m_view);
+    if (okClicked && !pattern.isEmpty()) {
+        QRegExp patternRegExp(pattern, Qt::CaseSensitive, QRegExp::Wildcard);
+        m_view->selectItems(patternRegExp, selectItems);

     }
 }
 
     }
 }
 


@@ -520,12 +554,18 @@ void DolphinPart::slotOpenTerminal()
     KToolInvocation::invokeTerminal(QString(), dir);
 }
 
     KToolInvocation::invokeTerminal(QString(), dir);
 }
 

+void DolphinPart::slotFindFile()
+{
+    KRun::run("kfind", url(), widget());
+}
+

 void DolphinPart::updateNewMenu()
 {
 void DolphinPart::updateNewMenu()
 {

-    // As requested by KNewMenu :
-    m_newMenu->slotCheckUpToDate();
+    // As requested by KNewFileMenu :
+    m_newFileMenu->checkUpToDate();
+    m_newFileMenu->setViewShowsHiddenFiles(m_view->hiddenFilesShown());

     // And set the files that the menu apply on :
     // And set the files that the menu apply on :

-    m_newMenu->setPopupFiles(url());
+    m_newFileMenu->setPopupFiles(url());

 }
 
 void DolphinPart::updateStatusBar()
 }
 
 void DolphinPart::updateStatusBar()


@@ -540,8 +580,121 @@ void DolphinPart::updateProgress(int percent)
 
 void DolphinPart::createDirectory()
 {
 
 void DolphinPart::createDirectory()
 {

-    m_newMenu->setPopupFiles(url());
-    m_newMenu->createDirectory();
+    m_newFileMenu->setViewShowsHiddenFiles(m_view->hiddenFilesShown());
+    m_newFileMenu->setPopupFiles(url());
+    m_newFileMenu->createDirectory();
+}
+
+void DolphinPart::setFilesToSelect(const KUrl::List& files)
+{
+    if (files.isEmpty()) {
+        return;
+    }
+
+    m_view->markUrlsAsSelected(files);
+    m_view->markUrlAsCurrent(files.at(0));
+}
+
+bool DolphinPart::eventFilter(QObject* obj, QEvent* event)
+{
+    const int type = event->type();
+
+    if ((type == QEvent::KeyPress || type == QEvent::KeyRelease) && m_removeAction) {
+        QMenu* menu = qobject_cast<QMenu*>(obj);
+        if (menu && menu->parent() == m_view) {
+            QKeyEvent* ev = static_cast<QKeyEvent*>(event);
+            if (ev->key() == Qt::Key_Shift) {
+                m_removeAction->update();
+            }
+        }
+    }
+
+    return KParts::ReadOnlyPart::eventFilter(obj, event);
+}
+
+////
+
+void DolphinPartBrowserExtension::restoreState(QDataStream &stream)
+{
+    KParts::BrowserExtension::restoreState(stream);
+    m_part->view()->restoreState(stream);
+}
+
+void DolphinPartBrowserExtension::saveState(QDataStream &stream)
+{
+    KParts::BrowserExtension::saveState(stream);
+    m_part->view()->saveState(stream);
+}
+
+void DolphinPartBrowserExtension::cut()
+{
+    m_part->view()->cutSelectedItems();
+}
+
+void DolphinPartBrowserExtension::copy()
+{
+    m_part->view()->copySelectedItems();
+}
+
+void DolphinPartBrowserExtension::paste()
+{
+    m_part->view()->paste();
+}
+
+void DolphinPartBrowserExtension::pasteTo(const KUrl&)
+{
+    m_part->view()->pasteIntoFolder();
+}
+
+void DolphinPartBrowserExtension::reparseConfiguration()
+{
+    m_part->view()->readSettings();
+}
+
+////
+
+DolphinPartFileInfoExtension::DolphinPartFileInfoExtension(DolphinPart* part)
+                             : KParts::FileInfoExtension(part)
+{
+}
+
+DolphinPart* DolphinPartFileInfoExtension::part() const
+{
+    return static_cast<DolphinPart*>(parent());
+}
+
+bool DolphinPartFileInfoExtension::hasSelection() const
+{
+    return part()->view()->selectedItemsCount() > 0;
+}
+
+KParts::FileInfoExtension::QueryModes DolphinPartFileInfoExtension::supportedQueryModes() const
+{
+    return (KParts::FileInfoExtension::AllItems | KParts::FileInfoExtension::SelectedItems);
+}
+
+KFileItemList DolphinPartFileInfoExtension::queryFor(KParts::FileInfoExtension::QueryMode mode) const
+{
+    KFileItemList list;
+
+    if (mode == KParts::FileInfoExtension::None)
+      return list;
+
+    if (!(supportedQueryModes() & mode))
+      return list;
+
+    switch (mode) {
+      case KParts::FileInfoExtension::SelectedItems:
+          if (hasSelection())
+              return part()->view()->selectedItems();
+          break;
+      case KParts::FileInfoExtension::AllItems:
+          return part()->view()->items();
+      default:
+          break;
+    }
+
+    return list;

 }
 
 #include "dolphinpart.moc"
 }
 
 #include "dolphinpart.moc"