KFileItemModel: interface cleanups

[dolphin.git] / src / dolphinviewcontainer.h

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index 37b06b7d6e0efba49db66c2d303dea410ca605fd..b3c48ccf98abef977f81978b5dce855a30ad0fa3 100644 (file)
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -42,7 +42,7 @@ class DolphinStatusBar;
  * @short Represents a view for the directory content
  *        including the navigation bar, filter bar and status bar.
  *
- * View modes for icons, details and columns are supported. Currently
+ * View modes for icons, compact and details are supported. Currently
  * Dolphin allows to have up to two views inside the main window.
  *
  * @see DolphinView
@@ -86,7 +86,7 @@ public:
     /**
      * Refreshes the view container to get synchronized with the (updated) Dolphin settings.
      */
-    void refresh();
+    void readSettings();
 
     /** Returns true, if the filter bar is visible. */
     bool isFilterBarVisible() const;
@@ -154,33 +154,28 @@ private slots:
      */
     void updateStatusBar();
 
-    void updateProgress(int percent);
+    void updateDirectoryLoadingProgress(int percent);
+
+    void updateDirectorySortingProgress(int percent);
 
     /**
      * Updates the statusbar to show an undetermined progress with the correct
      * context information whether a searching or a directory loading is done.
      */
-    void slotStartedPathLoading();
+    void slotDirectoryLoadingStarted();
 
     /**
      * Assures that the viewport position is restored and updates the
      * statusbar to reflect the current content.
      */
-    void slotFinishedPathLoading();
+    void slotDirectoryLoadingCompleted();
 
     /**
      * Handles clicking on an item. If the item is a directory, the
      * directory is opened in the view. If the item is a file, the file
      * gets started by the corresponding application.
      */
-    void slotItemTriggered(const KFileItem& item);
-
-    /**
-     * Opens a the file \a url by opening the corresponding application.
-     * Is connected with the signal urlIsFile() from DolphinDirLister and will
-     * get invoked if the user manually has entered a file into the URL navigator.
-     */
-    void openFile(const KUrl& url);
+    void slotItemActivated(const KFileItem& item);
 
     /**
      * Shows the information for the item \a item inside the statusbar. If the
@@ -212,10 +207,16 @@ private slots:
     void activate();
 
     /**
-     * Saves the state of the current view: contents position,
-     * root URL, ...
+     * Is invoked if the signal urlAboutToBeChanged() from the DolphinView
+     * is emitted. Tries to save the view-state.
      */
-    void saveViewState();
+    void slotViewUrlAboutToBeChanged(const KUrl& url);
+
+    /**
+     * Is invoked if the signal urlAboutToBeChanged() from the URL navigator
+     * is emitted. Tries to save the view-state.
+     */
+    void slotUrlNavigatorLocationAboutToBeChanged(const KUrl& url);
 
     /**
      * Restores the current view to show \a url and assures
@@ -266,6 +267,12 @@ private:
      */
     bool isSearchUrl(const KUrl& url) const;
 
+    /**
+     * Saves the state of the current view: contents position,
+     * root URL, ...
+     */
+    void saveViewState();
+
 private:
     QVBoxLayout* m_topLayout;
     KUrlNavigator* m_urlNavigator;