SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / dolphinviewcontainer.h

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index 77b74d18999b2bda5dac5ae960d8413a47a8ca89..5d23219529017f585a7afc85f3123784d1c1ba1b 100644 (file)
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -28,7 +28,6 @@ namespace KActivities {
 class FilterBar;
 class KMessageWidget;
 class QUrl;
-class KUrlNavigator;
 class DolphinSearchBox;
 class DolphinStatusBar;
 
@@ -127,7 +126,7 @@ public:
     void connectUrlNavigator(DolphinUrlNavigator *urlNavigator);
 
     /**
-     * Disconnects the navigator that is currently controling the view.
+     * Disconnects the navigator that is currently controlling the view.
      * This method completely reverses connectUrlNavigator().
      */
     void disconnectUrlNavigator();
@@ -175,7 +174,16 @@ public:
      */
     QString caption() const;
 
-public slots:
+    /**
+     * Disable/enable the behavior of "select child when moving to parent folder"
+     * offered by KUrlNavigator.
+     *
+     * See KUrlNavigator::urlSelectionRequested
+     */
+    void disableUrlNavigatorSelectionRequests();
+    void enableUrlNavigatorSelectionRequests();
+
+public Q_SLOTS:
     /**
      * Sets the current active URL, where all actions are applied. The
      * URL navigator is synchronized with this URL. The signals
@@ -198,7 +206,7 @@ public slots:
      */
     void setSearchModeEnabled(bool enabled);
 
-signals:
+Q_SIGNALS:
     /**
      * Is emitted whenever the filter bar has changed its visibility state.
      */
@@ -215,7 +223,13 @@ signals:
      */
     void writeStateChanged(bool isFolderWritable);
 
-private slots:
+    /**
+     * Is emitted when the Caption has been changed.
+     * @see DolphinViewContainer::caption()
+     */
+    void captionChanged();
+
+private Q_SLOTS:
     /**
      * Updates the number of items (= number of files + number of
      * directories) in the statusbar. If files are selected, the number
@@ -341,6 +355,17 @@ private slots:
      */
     void showErrorMessage(const QString& msg);
 
+    /**
+     * Is invoked when a KFilePlacesModel has been changed
+     * @see DolphinPlacesModelSingleton::instance().placesModel()
+     */
+    void slotPlacesModelChanged();
+
+    void slotHiddenFilesShownChanged(bool showHiddenFiles);
+    void slotSortHiddenLastChanged(bool hiddenLast);
+
+    void slotOpenUrlFinished(KJob* job);
+
 private:
     /**
      * @return True if the URL protocol is a search URL (e. g. baloosearch:// or filenamesearch://).