KFileItemModel: interface cleanups

[dolphin.git] / src / dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 686dde5b877c58ab83314752e78dc8307e58ca82..70d35740f3409fa6076c293a87803a10f3770395 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -18,38 +18,41 @@
 */
 
 #include "dolphinpart.h"
 */
 
 #include "dolphinpart.h"

-#include "dolphinviewactionhandler.h"
-#include "dolphinsortfilterproxymodel.h"
-#include "dolphinview.h"
-#include "dolphinmodel.h"

 
 

-#include <konq_fileitemcapabilities.h>
+#include <KFileItemListProperties>

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

-#include <kaboutdata.h>
-#include <kactioncollection.h>
-#include <kconfiggroup.h>
-#include <kdebug.h>
-#include <kdirlister.h>
-#include <kglobalsettings.h>
-#include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kpluginfactory.h>
-#include <kpropertiesdialog.h>
-#include <ktoggleaction.h>
-#include <kio/netaccess.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 <kshell.h>
+#include <KNewFileMenu>
+#include <KMenu>
+#include <KInputDialog>
+#include <KProtocolInfo>
+
+#include "views/dolphinview.h"
+#include "views/dolphinviewactionhandler.h"
+#include "views/dolphinnewfilemenuobserver.h"
+#include "views/dolphinremoteencoding.h"

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

+#include <QDir>

 
 K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)
 
 K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)

-// 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"))
+K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart", "dolphin"))

 
 DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args)
     : KParts::ReadOnlyPart(parent)
 
 DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args)
     : KParts::ReadOnlyPart(parent)


@@ -57,60 +60,56 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
     Q_UNUSED(args)
     setComponentData(DolphinPartFactory::componentData(), false);
     m_extension = new DolphinPartBrowserExtension(this);
     Q_UNUSED(args)
     setComponentData(DolphinPartFactory::componentData(), false);
     m_extension = new DolphinPartBrowserExtension(this);

+    new DolphinPartFileInfoExtension(this);

 
     // 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);
-    m_dirLister->setMainWindow(parentWidget->window());
-    m_dirLister->setDelayedMimeTypes(true);
-
-    //connect(m_dirLister, SIGNAL(started(KUrl)), this, SLOT(slotStarted()));
-    connect(m_dirLister, SIGNAL(completed(KUrl)), this, SLOT(slotCompleted(KUrl)));
-    connect(m_dirLister, SIGNAL(canceled(KUrl)), this, SLOT(slotCanceled(KUrl)));
-
-    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_dirLister,
-                             m_dolphinModel,
-                             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(finishedDirLoading(KUrl)), this, SLOT(slotCompleted(KUrl)));
+    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)),

-            this, SLOT(slotInfoMessage(QString)));
+            this, SLOT(slotMessage(QString)));
+    connect(m_view, SIGNAL(operationCompletedMessage(QString)),
+            this, SLOT(slotMessage(QString)));

     connect(m_view, SIGNAL(errorMessage(QString)),
             this, SLOT(slotErrorMessage(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(tabRequested(KUrl)),
             this, SLOT(createNewWindow(KUrl)));
     connect(m_view, SIGNAL(tabRequested(KUrl)),
             this, SLOT(createNewWindow(KUrl)));

-    connect(m_view, SIGNAL(requestContextMenu(KFileItem,KUrl)),
-            this, SLOT(slotOpenContextMenu(KFileItem,KUrl)));
+    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(urlChanged(KUrl)),
-            this, SLOT(slotUrlChanged(KUrl)));
-    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(slotDirectoryRedirection(KUrl,KUrl)));
+
+    // Watch for changes that should result in updates to the
+    // status bar text.
+    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);

+    connect(m_actionHandler, SIGNAL(createDirectory()), SLOT(createDirectory()));
+
+    m_remoteEncoding = new DolphinRemoteEncoding(this, m_actionHandler);
+    connect(this, SIGNAL(aboutToOpenURL()),
+            m_remoteEncoding, SLOT(slotAboutToOpenUrl()));

 
     QClipboard* clipboard = QApplication::clipboard();
     connect(clipboard, SIGNAL(dataChanged()),
 
     QClipboard* clipboard = QApplication::clipboard();
     connect(clipboard, SIGNAL(dataChanged()),


@@ -120,29 +119,51 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
     m_actionHandler->updateViewActions();
     slotSelectionChanged(KFileItemList()); // initially disable selection-dependent actions
 
     m_actionHandler->updateViewActions();
     slotSelectionChanged(KFileItemList()); // initially disable selection-dependent actions
 

-    // TODO sort_by_* actions
-

     // 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()
 {

-    delete m_dirLister;
+    DolphinNewFileMenuObserver::instance().detach(m_newFileMenu);

 }
 
 void DolphinPart::createActions()
 {
 }
 
 void DolphinPart::createActions()
 {

+    // Edit menu
+
+    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()));
 
     KAction *editMimeTypeAction = actionCollection()->addAction( "editMimeType" );
     editMimeTypeAction->setText( i18nc("@action:inmenu Edit", "&Edit File Type..." ) );
     connect(editMimeTypeAction, SIGNAL(triggered()), SLOT(slotEditMimeType()));
 

-    KAction *propertiesAction = actionCollection()->addAction( "properties" );
-    propertiesAction->setText( i18nc("@action:inmenu Edit", "Properties") );
-    propertiesAction->setShortcut(Qt::ALT+Qt::Key_Return);
-    connect(propertiesAction, SIGNAL(triggered()), SLOT(slotProperties()));
+    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
 
 
     // View menu: all done by DolphinViewActionHandler
 


@@ -169,6 +190,12 @@ void DolphinPart::createActions()
                    goActionGroup);
 
     // Tools menu
                    goActionGroup);
 
     // Tools menu

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

     if (KAuthorized::authorizeKAction("shell_access")) {
         KAction* action = actionCollection()->addAction("open_terminal");
         action->setIcon(KIcon("utilities-terminal"));
     if (KAuthorized::authorizeKAction("shell_access")) {
         KAction* action = actionCollection()->addAction("open_terminal");
         action->setIcon(KIcon("utilities-terminal"));


@@ -176,7 +203,6 @@ void DolphinPart::createActions()
         connect(action, SIGNAL(triggered()), SLOT(slotOpenTerminal()));
         action->setShortcut(Qt::Key_F4);
     }
         connect(action, SIGNAL(triggered()), SLOT(slotOpenTerminal()));
         action->setShortcut(Qt::Key_F4);
     }

-

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


@@ -205,26 +231,27 @@ void DolphinPart::slotSelectionChanged(const KFileItemList& selection)
     QAction* deleteAction = actionCollection()->action("delete");
     QAction* editMimeTypeAction = actionCollection()->action("editMimeType");
     QAction* propertiesAction = actionCollection()->action("properties");
     QAction* deleteAction = actionCollection()->action("delete");
     QAction* editMimeTypeAction = actionCollection()->action("editMimeType");
     QAction* propertiesAction = actionCollection()->action("properties");

+    QAction* deleteWithTrashShortcut = actionCollection()->action("delete_shortcut"); // see DolphinViewActionHandler

 
     if (!hasSelection) {
         stateChanged("has_no_selection");
 
         emit m_extension->enableAction("cut", false);
         emit m_extension->enableAction("copy", false);
 
     if (!hasSelection) {
         stateChanged("has_no_selection");
 
         emit m_extension->enableAction("cut", false);
         emit m_extension->enableAction("copy", false);

-        renameAction->setEnabled(false);
-        moveToTrashAction->setEnabled(false);
-        deleteAction->setEnabled(false);
+        deleteWithTrashShortcut->setEnabled(false);

         editMimeTypeAction->setEnabled(false);
         editMimeTypeAction->setEnabled(false);

-        propertiesAction->setEnabled(false);

     } else {
         stateChanged("has_selection");
 
     } else {
         stateChanged("has_selection");
 

-        KonqFileItemCapabilities capabilities(selection);
+        // TODO share this code with DolphinMainWindow::updateEditActions (and the desktop code)
+        // in libkonq
+        KFileItemListProperties capabilities(selection);

         const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving();
 
         renameAction->setEnabled(capabilities.supportsMoving());
         moveToTrashAction->setEnabled(enableMoveToTrash);
         deleteAction->setEnabled(capabilities.supportsDeleting());
         const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving();
 
         renameAction->setEnabled(capabilities.supportsMoving());
         moveToTrashAction->setEnabled(enableMoveToTrash);
         deleteAction->setEnabled(capabilities.supportsDeleting());

+        deleteWithTrashShortcut->setEnabled(capabilities.supportsDeleting() && !enableMoveToTrash);

         editMimeTypeAction->setEnabled(true);
         propertiesAction->setEnabled(true);
         emit m_extension->enableAction("cut", capabilities.supportsMoving());
         editMimeTypeAction->setEnabled(true);
         propertiesAction->setEnabled(true);
         emit m_extension->enableAction("cut", capabilities.supportsMoving());


@@ -249,7 +276,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;


@@ -263,8 +290,9 @@ 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);
     m_view->setUrl(url);

+    updatePasteAction();

     emit aboutToOpenURL();
     if (reload)
         m_view->reload();
     emit aboutToOpenURL();
     if (reload)
         m_view->reload();


@@ -277,30 +305,36 @@ void DolphinPart::slotCompleted(const KUrl& url)
     emit completed();
 }
 
     emit completed();
 }
 

-void DolphinPart::slotCanceled(const KUrl& url)
-{
-    slotCompleted(url);
-}
-
-void DolphinPart::slotInfoMessage(const QString& msg)
+void DolphinPart::slotMessage(const QString& msg)

 {
     emit setStatusBarText(msg);
 }
 
 void DolphinPart::slotErrorMessage(const QString& msg)
 {
 {
     emit setStatusBarText(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)
 {
     emit m_extension->mouseOverInfo(item);
 }
 
 void DolphinPart::slotRequestItemInfo(const KFileItem& item)
 {
     emit m_extension->mouseOverInfo(item);

+    if (item.isNull()) {
+        updateStatusBar();
+    } else {
+        ReadOnlyPart::setStatusBarText(item.getStatusBarInfo());
+    }

 }
 
 }
 

-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...


@@ -312,14 +346,14 @@ void DolphinPart::slotItemTriggered(const KFileItem& 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()
-    KFileItem item(S_IFDIR, (mode_t)-1, url);
-    KParts::OpenUrlArguments args;
-    args.setMimeType(item.mimetype());
-    emit m_extension->createNewWindow(url, args);
+    // should be moved into DolphinPart::slotItemActivated()
+    emit m_extension->createNewWindow(url);

 }
 
 }
 

-void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
+void DolphinPart::slotOpenContextMenu(const QPoint& pos,
+                                      const KFileItem& _item,
+                                      const KUrl&,
+                                      const QList<QAction*>& customActions)

 {
     KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::DefaultPopupItems
                                                       | KParts::BrowserExtension::ShowProperties
 {
     KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::DefaultPopupItems
                                                       | KParts::BrowserExtension::ShowProperties


@@ -329,39 +363,44 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
 
     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
 
     if (!_item.isNull()) { // only for context menu on one or more items

-        bool sDeleting = true;
-        bool sMoving = true;
+        bool supportsDeleting = capabilities.supportsDeleting();
+        bool supportsMoving = capabilities.supportsMoving();

 
 

-        // If the parent directory of the selected item is writable, moving
-        // and deleting are possible.
-        KFileItem parentDir = m_dirLister->rootItem();
-        if (!parentDir.isWritable()) {
+        if (!supportsDeleting) {

             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 addTrash = capabilities.isLocal() && supportsMoving;

         bool addDel = false;
         bool addDel = false;

-
-        bool isIntoTrash = _item.url().protocol() == "trash";
-
-        if ( sMoving && !isIntoTrash && item.isLocalFile() )
-            addTrash = true;
-
-        if ( sDeleting ) {
+        if (supportsDeleting) {

             if ( !item.isLocalFile() )
                 addDel = true;
             else if (QApplication::keyboardModifiers() & Qt::ShiftModifier) {
             if ( !item.isLocalFile() )
                 addDel = true;
             else if (QApplication::keyboardModifiers() & Qt::ShiftModifier) {


@@ -369,9 +408,9 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
                 addDel = true;
             }
             else {
                 addDel = true;
             }
             else {

-                KConfigGroup configGroup( KGlobal::config(), "KDE" );
-                if ( configGroup.readEntry( "ShowDeleteCommand", false) )
-                    addDel = true;
+                KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals);
+                KConfigGroup configGroup(globalConfig, "KDE");
+                addDel = configGroup.readEntry("ShowDeleteCommand", false);

             }
         }
 
             }
         }
 


@@ -379,14 +418,18 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
             editActions.append(actionCollection()->action("move_to_trash"));
         if (addDel)
             editActions.append(actionCollection()->action("delete"));
             editActions.append(actionCollection()->action("move_to_trash"));
         if (addDel)
             editActions.append(actionCollection()->action("delete"));

-        actionGroups.insert("editactions", editActions);
+
+        // 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())
+            popupFlags |= KParts::BrowserExtension::ShowCreateDirectory;
+

     }
 
     }
 

-    // 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(),
+    actionGroups.insert("editactions", editActions);
+
+    emit m_extension->popupMenu(pos,

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


@@ -394,60 +437,47 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
                                 actionGroups);
 }
 
                                 actionGroups);
 }
 

-void DolphinPart::slotUrlChanged(const KUrl& url)
-{
-    QString prettyUrl = url.pathOrUrl();
-    emit m_extension->setLocationBarUrl(prettyUrl);
-}
-
-void DolphinPart::slotRequestUrlChange(const KUrl& url)
+void DolphinPart::slotDirectoryRedirection(const KUrl& oldUrl, const KUrl& newUrl)

 {
 {

-    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();
+    //kDebug() << oldUrl << newUrl << "currentUrl=" << url();
+    if (oldUrl.equals(url(), KUrl::CompareWithoutTrailingSlash /* #207572 */)) {
+        KParts::ReadOnlyPart::setUrl(newUrl);
+        const QString prettyUrl = newUrl.pathOrUrl();
+        emit m_extension->setLocationBarUrl(prettyUrl);

     }
 }
 
     }
 }
 

-////

 
 

-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);
-    }
-}
-
-void DolphinPart::slotProperties()
-{
-    const KFileItemList items = m_view->selectedItems();
-    if (!items.isEmpty()) {
-        KPropertiesDialog dialog(items.first().url(), m_view);
-        dialog.exec();
+    if (okClicked && !pattern.isEmpty()) {
+        QRegExp patternRegExp(pattern, Qt::CaseSensitive, QRegExp::Wildcard);
+        m_view->selectItems(patternRegExp, selectItems);

     }
 }
 
     }
 }
 


@@ -473,9 +503,6 @@ void DolphinPart::setNameFilter(const QString& nameFilter)
 
 void DolphinPart::slotOpenTerminal()
 {
 
 void DolphinPart::slotOpenTerminal()
 {

-    KConfigGroup confGroup(KGlobal::config(), "General"); // set by componentchooser kcm
-    const QString preferredTerminal = confGroup.readPathEntry("TerminalApplication", "konsole");
-

     QString dir(QDir::homePath());
 
     KUrl u(url());
     QString dir(QDir::homePath());
 
     KUrl u(url());


@@ -486,20 +513,131 @@ void DolphinPart::slotOpenTerminal()
 
     //If the URL is local after the above conversion, set the directory.
     if (u.isLocalFile()) {
 
     //If the URL is local after the above conversion, set the directory.
     if (u.isLocalFile()) {

-        dir = u.path();
+        dir = u.toLocalFile();

     }
 
     }
 

-    // Compensate for terminal having arguments.
-    QStringList args = KShell::splitArgs(preferredTerminal);
-    if (args.isEmpty()) {
-        return;
-    }
-    const QString prog = args.takeFirst();
-    if (prog == "konsole") {
-        args << "--workdir";
-        args << dir;
+    KToolInvocation::invokeTerminal(QString(), dir);
+}
+
+void DolphinPart::slotFindFile()
+{
+    KRun::run("kfind", url(), widget());
+}
+
+void DolphinPart::updateNewMenu()
+{
+    // As requested by KNewFileMenu :
+    m_newFileMenu->checkUpToDate();
+    m_newFileMenu->setViewShowsHiddenFiles(m_view->hiddenFilesShown());
+    // And set the files that the menu apply on :
+    m_newFileMenu->setPopupFiles(url());
+}
+
+void DolphinPart::updateStatusBar()
+{
+    emit ReadOnlyPart::setStatusBarText(m_view->statusBarText());
+}
+
+void DolphinPart::updateProgress(int percent)
+{
+    m_extension->loadingProgress(percent);
+}
+
+void DolphinPart::createDirectory()
+{
+    m_newFileMenu->setViewShowsHiddenFiles(m_view->hiddenFilesShown());
+    m_newFileMenu->setPopupFiles(url());
+    m_newFileMenu->createDirectory();
+}
+
+void DolphinPart::setFilesToSelect(const KUrl::List& files)
+{
+    m_view->markUrlsAsSelected(files);
+}
+
+////
+
+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;

     }
     }

-    QProcess::startDetached(prog, args);
+
+    return list;

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