X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/772a55aafc2e558302d042eb65026b9b50302ccc..dbc8874c00c35aaefacdd03f8aef9e4ac4e2be01:/src/dolphinview.h

diff --git a/src/dolphinview.h b/src/dolphinview.h
index 3f5b9f596..60864dd9b 100644
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -136,11 +136,6 @@ public:
      */
     const KUrl& url() const;
 
-    /**
-     * Sets the root URL of the view (see also DolphinView::rootUrl())
-     */
-    void setRootUrl(const KUrl& url);
-
     /**
      * Returns the root URL of the view, which is defined as the first
      * visible path of DolphinView::url(). Usually the root URL is
@@ -284,10 +279,13 @@ public:
     Qt::SortOrder sortOrder() const;
 
     /** Sets the additional information which should be shown for the items. */
-    void setAdditionalInfo(KFileItemDelegate::AdditionalInformation info);
+    void setAdditionalInfo(KFileItemDelegate::InformationList info);
+
+    /** Sets the additional information which should be shown for the items. */
+    void setAdditionalInfo(KFileItemDelegate::Information info);
 
     /** Returns the additional information which should be shown for the items. */
-    KFileItemDelegate::AdditionalInformation additionalInfo() const;
+    KFileItemDelegate::InformationList additionalInfo() const;
 
     /** Reloads the current directory. */
     void reload();
@@ -299,6 +297,16 @@ public:
      */
     void refresh();
 
+    /**
+     * Changes the directory of the view to \a url. If \a rootUrl is empty, the view
+     * properties from \a url are used for adjusting the view mode and the other properties.
+     * If \a rootUrl is not empty, the view properties from the root URL are considered
+     * instead. Specifying a root URL is only required if a view having a different root URL
+     * (e. g. the column view) should be restored. Usually using DolphinView::setUrl()
+     * is enough for changing the current URL.
+     */
+    void updateView(const KUrl& url, const KUrl& rootUrl);
+
 public slots:
     /**
      * Changes the directory to \a url. If the current directory is equal to
@@ -350,7 +358,7 @@ signals:
     void sortOrderChanged(Qt::SortOrder order);
 
     /** Is emitted if the additional information for an item has been changed. */
-    void additionalInfoChanged(KFileItemDelegate::AdditionalInformation info);
+    void additionalInfoChanged(KFileItemDelegate::InformationList info);
 
     /**
      * Is emitted if information of an item is requested to be shown e. g. in the sidebar.
@@ -394,10 +402,12 @@ signals:
     void errorMessage(const QString& msg);
 
     /**
-     * Is emitted if the root URL of the view has been changed
-     * to \a url (see also DolphinView::rootUrl()).
+     * Is emitted after DolphinView::setUrl() has been invoked and
+     * the path \a url is currently loaded. If this signal is emitted,
+     * it is assured that the view contains already the correct root
+     * URL and property settings.
      */
-    void rootUrlChanged(const KUrl& url);
+    void startedPathLoading(const KUrl& url);
 
 protected:
     /** @see QWidget::mouseReleaseEvent */
@@ -566,6 +576,7 @@ private:
     bool m_active;
     bool m_loadingDirectory;
     bool m_initializeColumnView;
+    bool m_storedCategorizedSorting;
     Mode m_mode;
 
     DolphinMainWindow* m_mainWindow;