Merge remote-tracking branch 'origin/KDE/4.10'

[dolphin.git] / src / dolphinpart.h

diff --git a/src/dolphinpart.h b/src/dolphinpart.h
index 17650469ded7cd0083545219cc4c1f6f06497cec..172bfafc6d14b0dac5c7a5bc3b327902d9b43bbd 100644 (file)
--- a/src/dolphinpart.h
+++ b/src/dolphinpart.h
@@ -39,6 +39,7 @@ class DolphinModel;
 class KDirLister;
 class DolphinView;
 class KAboutData;
 class KDirLister;
 class DolphinView;
 class KAboutData;

+class DolphinRemoveAction;

 
 class DolphinPart : public KParts::ReadOnlyPart
 {
 
 class DolphinPart : public KParts::ReadOnlyPart
 {


@@ -117,7 +118,6 @@ Q_SIGNALS:
     void aboutToOpenURL();
 
 private Q_SLOTS:
     void aboutToOpenURL();
 
 private Q_SLOTS:

-    void slotCompleted(const KUrl& url);

     void slotMessage(const QString& msg);
     void slotErrorMessage(const QString& msg);
     /**
     void slotMessage(const QString& msg);
     void slotErrorMessage(const QString& msg);
     /**


@@ -128,20 +128,26 @@ private Q_SLOTS:
     /**
      * Handles clicking on an item
      */
     /**
      * Handles clicking on an item
      */

-    void slotItemTriggered(const KFileItem& item);
+    void slotItemActivated(const KFileItem& item);
+    /**
+     * Handles activation of multiple items
+     */
+    void slotItemsActivated(const KFileItemList& items);

     /**
      * Creates a new window showing the content of \a url.
      */
     void createNewWindow(const KUrl& url);
     /**
      * Opens the context menu on the current mouse position.
     /**
      * Creates a new window showing the content of \a url.
      */
     void createNewWindow(const KUrl& url);
     /**
      * Opens the context menu on the current mouse position.

+     * @pos           Position in screen coordinates.

      * @item          File item context. If item is null, the context menu
      *                should be applied to \a url.
      * @url           URL which contains \a item.
      * @customActions Actions that should be added to the context menu,
      *                if the file item is null.
      */
      * @item          File item context. If item is null, the context menu
      *                should be applied to \a url.
      * @url           URL which contains \a item.
      * @customActions Actions that should be added to the context menu,
      *                if the file item is null.
      */

-    void slotOpenContextMenu(const KFileItem& item,
+    void slotOpenContextMenu(const QPoint& pos,
+                             const KFileItem& item,

                              const KUrl& url,
                              const QList<QAction*>& customActions);
 
                              const KUrl& url,
                              const QList<QAction*>& customActions);
 


@@ -151,7 +157,7 @@ private Q_SLOTS:
      * Testcase 1: fish://localhost
      * Testcase 2: showing a directory that is being renamed by another window (#180156)
      */
      * Testcase 1: fish://localhost
      * Testcase 2: showing a directory that is being renamed by another window (#180156)
      */

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

 
     /**
      * Updates the state of the 'Edit' menu actions and emits
 
     /**
      * Updates the state of the 'Edit' menu actions and emits


@@ -222,6 +228,8 @@ private Q_SLOTS:
     void setFilesToSelect(const KUrl::List& files);
     KUrl::List filesToSelect() const { return KUrl::List(); } // silence moc
 
     void setFilesToSelect(const KUrl::List& files);
     KUrl::List filesToSelect() const { return KUrl::List(); } // silence moc
 

+    virtual bool eventFilter(QObject*, QEvent*);
+

 private:
     void createActions();
     void createGoAction(const char* name, const char* iconName,
 private:
     void createActions();
     void createGoAction(const char* name, const char* iconName,


@@ -237,7 +245,10 @@ private:
     DolphinRemoteEncoding* m_remoteEncoding;
     DolphinPartBrowserExtension* m_extension;
     KNewFileMenu* m_newFileMenu;
     DolphinRemoteEncoding* m_remoteEncoding;
     DolphinPartBrowserExtension* m_extension;
     KNewFileMenu* m_newFileMenu;

+    KAction* m_findFileAction;
+    KAction* m_openTerminalAction;

     QString m_nameFilter;
     QString m_nameFilter;

+    DolphinRemoveAction* m_removeAction;

     Q_DISABLE_COPY(DolphinPart)
 };
 
     Q_DISABLE_COPY(DolphinPart)
 };