The &-shortcut from another action is not set until the action has been shown at...

[dolphin.git] / src / dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index c8db1c1e158f582b3285119d0f660d158663287d..a01e072658a9fa7d05a38c3c56cbef418a9aa5a1 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -18,12 +18,6 @@
 */
 
 #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 <konq_operations.h>
 
 #include <kfileitemlistproperties.h>
 #include <konq_operations.h>


@@ -32,7 +26,6 @@
 #include <kactioncollection.h>
 #include <kconfiggroup.h>
 #include <kdebug.h>
 #include <kactioncollection.h>
 #include <kconfiggroup.h>
 #include <kdebug.h>

-#include <kdirlister.h>

 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <klocale.h>


@@ -47,6 +40,13 @@
 #include <kinputdialog.h>
 
 #include "settings/dolphinsettings.h"
 #include <kinputdialog.h>
 
 #include "settings/dolphinsettings.h"

+#include "views/dolphinview.h"
+#include "views/dolphinviewactionhandler.h"
+#include "views/dolphinsortfilterproxymodel.h"
+#include "views/dolphinmodel.h"
+#include "views/dolphinnewfilemenuobserver.h"
+#include "views/dolphinremoteencoding.h"
+#include "views/dolphindirlister.h"

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


@@ -65,7 +65,7 @@ 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 = new DolphinDirLister;

     m_dirLister->setAutoUpdate(true);
     if (parentWidget) {
         m_dirLister->setMainWindow(parentWidget->window());
     m_dirLister->setAutoUpdate(true);
     if (parentWidget) {
         m_dirLister->setMainWindow(parentWidget->window());


@@ -75,9 +75,10 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
     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(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 = new DolphinModel(this);

-    m_dolphinModel->setDirLister(m_dirLister);
+    m_dolphinModel->setDirLister(m_dirLister); // m_dolphinModel takes ownership of m_dirLister

 
     m_proxyModel = new DolphinSortFilterProxyModel(this);
     m_proxyModel->setSourceModel(m_dolphinModel);
 
     m_proxyModel = new DolphinSortFilterProxyModel(this);
     m_proxyModel->setSourceModel(m_dolphinModel);


@@ -106,8 +107,6 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
             this, SLOT(slotSelectionChanged(KFileItemList)));
     connect(m_view, SIGNAL(requestItemInfo(KFileItem)),
             this, SLOT(slotRequestItemInfo(KFileItem)));
             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()),
             this, SIGNAL(viewModeChanged())); // relay signal
     connect(m_view, SIGNAL(redirection(KUrl, KUrl)),
     connect(m_view, SIGNAL(modeChanged()),
             this, SIGNAL(viewModeChanged())); // relay signal
     connect(m_view, SIGNAL(redirection(KUrl, KUrl)),


@@ -148,17 +147,17 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
 DolphinPart::~DolphinPart()
 {
     DolphinSettings::instance().save();
 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 KNewFileMenu(actionCollection(), "new_menu", widget());
-    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" );
             this, SLOT(updateNewMenu()));
 
     KAction *editMimeTypeAction = actionCollection()->addAction( "editMimeType" );


@@ -332,7 +331,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)


@@ -348,7 +349,11 @@ void DolphinPart::slotRequestItemInfo(const KFileItem& item)
 void DolphinPart::slotItemTriggered(const KFileItem& item)
 {
     KParts::OpenUrlArguments args;
 void DolphinPart::slotItemTriggered(const KFileItem& item)
 {
     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...


@@ -385,8 +390,13 @@ void DolphinPart::slotOpenContextMenu(const KFileItem& _item,
 
     // TODO: We should change the signature of the slots (and signals) for being able
     //       to tell for which items we want a popup.
 
     // TODO: We should change the signature of the slots (and signals) for being able
     //       to tell for which items we want a popup.

-    const KFileItemList items = (m_view->selectedItems().count() ? m_view->selectedItems()
-                                 : KFileItemList() << item);
+    KFileItemList items;
+    if (m_view->selectedItems().isEmpty()) {
+        items.append(item);
+    } else {
+        items = m_view->selectedItems();
+    }
+

     KFileItemListProperties capabilities(items);
 
     KParts::BrowserExtension::ActionGroupMap actionGroups;
     KFileItemListProperties capabilities(items);
 
     KParts::BrowserExtension::ActionGroupMap actionGroups;


@@ -455,16 +465,6 @@ void DolphinPart::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl)
     }
 }
 
     }
 }
 

-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::restoreState(QDataStream &stream)
 ////
 
 void DolphinPartBrowserExtension::restoreState(QDataStream &stream)


@@ -602,10 +602,10 @@ void DolphinPart::slotOpenTerminal()
 void DolphinPart::updateNewMenu()
 {
     // As requested by KNewFileMenu :
 void DolphinPart::updateNewMenu()
 {
     // As requested by KNewFileMenu :

-    m_newMenu->checkUpToDate();
-    m_newMenu->setViewShowsHiddenFiles(m_view->showHiddenFiles());
+    m_newFileMenu->checkUpToDate();
+    m_newFileMenu->setViewShowsHiddenFiles(m_view->showHiddenFiles());

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


@@ -620,9 +620,14 @@ void DolphinPart::updateProgress(int percent)
 
 void DolphinPart::createDirectory()
 {
 
 void DolphinPart::createDirectory()
 {

-    m_newMenu->setViewShowsHiddenFiles(m_view->showHiddenFiles());
-    m_newMenu->setPopupFiles(url());
-    m_newMenu->createDirectory();
+    m_newFileMenu->setViewShowsHiddenFiles(m_view->showHiddenFiles());
+    m_newFileMenu->setPopupFiles(url());
+    m_newFileMenu->createDirectory();
+}
+
+void DolphinPart::setFilesToSelect(const KUrl::List& files)
+{
+    m_view->markUrlsAsSelected(files);

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