Merge branch 'master' into frameworks

[dolphin.git] / src / views / viewproperties.h

diff --git a/src/views/viewproperties.h b/src/views/viewproperties.h
index b46249eb2b520113425a40dfe558a8f791bbad03..b9c2fa546737378af587d63264c903e15c367cf3 100644 (file)
--- a/src/views/viewproperties.h
+++ b/src/views/viewproperties.h
@@ -22,8 +22,8 @@
 #define VIEWPROPERTIES_H
 
 #include <views/dolphinview.h>
 #define VIEWPROPERTIES_H
 
 #include <views/dolphinview.h>

-#include <KUrl>
-#include <libdolphin_export.h>
+#include <QUrl>
+#include "libdolphin_export.h"

 
 class ViewPropertySettings;
 /**
 
 class ViewPropertySettings;
 /**


@@ -35,7 +35,7 @@ class ViewPropertySettings;
  * just construct an instance by passing the path of the directory:
  *
  * \code
  * just construct an instance by passing the path of the directory:
  *
  * \code

- * ViewProperties props(KUrl("/home/peter/Documents"));
+ * ViewProperties props(QUrl::fromLocalFile("/home/peter/Documents"));

  * const DolphinView::Mode mode = props.viewMode();
  * const bool hiddenFilesShown = props.hiddenFilesShown();
  * \endcode
  * const DolphinView::Mode mode = props.viewMode();
  * const bool hiddenFilesShown = props.hiddenFilesShown();
  * \endcode


@@ -50,7 +50,7 @@ class ViewPropertySettings;
 class LIBDOLPHINPRIVATE_EXPORT ViewProperties
 {
 public:
 class LIBDOLPHINPRIVATE_EXPORT ViewProperties
 {
 public:

-    explicit ViewProperties(const KUrl& url);
+    explicit ViewProperties(const QUrl& url);

     virtual ~ViewProperties();
 
     void setViewMode(DolphinView::Mode mode);
     virtual ~ViewProperties();
 
     void setViewMode(DolphinView::Mode mode);


@@ -88,6 +88,9 @@ public:
      */
     QList<QByteArray> visibleRoles() const;
 
      */
     QList<QByteArray> visibleRoles() const;
 

+    void setHeaderColumnWidths(const QList<int>& widths);
+    QList<int> headerColumnWidths() const;
+

     /**
      * Sets the directory properties view mode, show preview,
      * show hidden files, sorting and sort order like
     /**
      * Sets the directory properties view mode, show preview,
      * show hidden files, sorting and sort order like


@@ -115,13 +118,12 @@ public:
     void save();
 
     /**
     void save();
 
     /**

-     * Returns the URL of the directory, where the mirrored view properties
-     * are stored into. Mirrored view properties are used if:
-     * - there is no write access for storing the view properties into
-     *   the original directory
-     * - for non local directories
+     * @return True if properties for the given URL exist:
+     *         As soon as the properties for an URL have been saved with
+     *         ViewProperties::save(), true will be returned. If false is
+     *         returned, the default view-properties are used.

      */
      */

-    static KUrl mirroredDirectory();
+    bool exist() const;

 
 private:
     /**
 
 private:
     /**


@@ -137,11 +139,31 @@ private:
      */
     QString viewModePrefix() const;
 
      */
     QString viewModePrefix() const;
 

+    /**
+     * Provides backward compatibility with .directory files created with
+     * Dolphin < 2.0: Converts the old additionalInfo-property into
+     * the visibleRoles-property and clears the additionalInfo-property.
+     */
+    void convertAdditionalInfo();
+
+    /**
+     * Provides backward compatibility with .directory files created with
+     * Dolphin < 2.1: Converts the old name-role "name" to the generic
+     * role "text".
+     */
+    void convertNameRoleToTextRole();
+

     /**
      * Returns true, if \a filePath is part of the home-path (see QDir::homePath()).
      */
     static bool isPartOfHome(const QString& filePath);
 
     /**
      * Returns true, if \a filePath is part of the home-path (see QDir::homePath()).
      */
     static bool isPartOfHome(const QString& filePath);
 

+    /**
+     * @return A hash-value for an URL that can be used as directory name.
+     *         Is used to be able to remember view-properties for long baloo-URLs.
+     */
+    static QString directoryHashForUrl(const QUrl &url);
+

     Q_DISABLE_COPY(ViewProperties)
 
 private:
     Q_DISABLE_COPY(ViewProperties)
 
 private: