Fix temporary regression of sorting introduced by SVN commit 1126410

[dolphin.git] / src / dolphinpart.h

diff --git a/src/dolphinpart.h b/src/dolphinpart.h
index a25bc72f3d55556d128ece02bc57432d7990f321..5629b9c2dfcbcea306b5ca1486f26e4a36a56028 100644 (file)
--- a/src/dolphinpart.h
+++ b/src/dolphinpart.h
@@ -22,7 +22,10 @@
 
 #include <kparts/part.h>
 #include <kparts/browserextension.h>
-class KNewMenu;
+
+#include <QItemSelectionModel>
+
+class KNewFileMenu;
 class DolphinViewActionHandler;
 class QActionGroup;
 class KAction;
@@ -30,10 +33,10 @@ class KFileItemList;
 class KFileItem;
 class DolphinPartBrowserExtension;
 class DolphinSortFilterProxyModel;
+class DolphinRemoteEncoding;
 class DolphinModel;
 class KDirLister;
 class DolphinView;
-class QLineEdit;
 class KAboutData;
 
 class DolphinPart : public KParts::ReadOnlyPart
@@ -49,6 +52,9 @@ class DolphinPart : public KParts::ReadOnlyPart
     // Used by konqueror when typing something like /home/dfaure/*.diff in the location bar
     Q_PROPERTY( QString nameFilter READ nameFilter WRITE setNameFilter )
 
+    // Used by konqueror to implement the --select command-line option
+    Q_PROPERTY( KUrl::List filesToSelect READ filesToSelect WRITE setFilesToSelect )
+
 public:
     explicit DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args);
     ~DolphinPart();
@@ -112,7 +118,7 @@ Q_SIGNALS:
 private Q_SLOTS:
     void slotCompleted(const KUrl& url);
     void slotCanceled(const KUrl& url);
-    void slotInfoMessage(const QString& msg);
+    void slotMessage(const QString& msg);
     void slotErrorMessage(const QString& msg);
     /**
      * Shows the information for the item \a item inside the statusbar. If the
@@ -139,12 +145,6 @@ private Q_SLOTS:
                              const KUrl& url,
                              const QList<QAction*>& customActions);
 
-    /**
-     * Asks the host to open the URL \a url if the current view has
-     * a different URL.
-     */
-    void slotRequestUrlChange(const KUrl& url);
-
     /**
      * Informs the host that we are opening \a url (e.g. after a redirection
      * coming from KDirLister).
@@ -175,6 +175,18 @@ private Q_SLOTS:
      */
     void slotEditMimeType();
 
+    /**
+     * Connected to the "select_items_matching" action.
+     * Opens a dialog which permits to select all items matching a pattern like "*.jpg".
+     */
+    void slotSelectItemsMatchingPattern();
+
+    /**
+     * Connected to the "unselect_items_matching" action.
+     * Opens a dialog which permits to unselect all items matching a pattern like "*.jpg".
+     */
+    void slotUnselectItemsMatchingPattern();
+
     /**
      * Open a terminal window, starting with the current directory.
      */
@@ -197,20 +209,34 @@ private Q_SLOTS:
     */
     void updateProgress(int percent);
 
+    void createDirectory();
+
+    /**
+     * Called by konqueror --select
+     */
+    void setFilesToSelect(const KUrl::List& files);
+    KUrl::List filesToSelect() const { return KUrl::List(); } // silence moc
+
 private:
     void createActions();
     void createGoAction(const char* name, const char* iconName,
                         const QString& text, const QString& url,
                         QActionGroup* actionGroup);
 
+    void openSelectionDialog(const QString& title, const QString& text,
+                             QItemSelectionModel::SelectionFlags command);
+
+    QItemSelection childrenMatchingPattern(const QModelIndex& parent, const QRegExp& patternRegExp);
+
 private:
     DolphinView* m_view;
     DolphinViewActionHandler* m_actionHandler;
+    DolphinRemoteEncoding* m_remoteEncoding;
     KDirLister* m_dirLister;
     DolphinModel* m_dolphinModel;
     DolphinSortFilterProxyModel* m_proxyModel;
     DolphinPartBrowserExtension* m_extension;
-    KNewMenu* m_newMenu;
+    KNewFileMenu* m_newMenu;
     QString m_nameFilter;
     Q_DISABLE_COPY(DolphinPart)
 };
@@ -222,10 +248,14 @@ public:
     DolphinPartBrowserExtension( DolphinPart* part )
         : KParts::BrowserExtension( part ), m_part(part) {}
 
+    virtual void restoreState(QDataStream &stream);
+    virtual void saveState(QDataStream &stream);
+
 public Q_SLOTS:
     void cut();
     void copy();
     void paste();
+    void pasteTo(const KUrl&);
     void reparseConfiguration();
 
 private: