X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/772a55aafc2e558302d042eb65026b9b50302ccc..148282e2d856b47ceb191eeef4c834118c8cdffd:/src/dolphinviewcontainer.h

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index b7cb4ca5b..1c6f8a6bc 100644
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -90,16 +90,8 @@ public:
     void setActive(bool active);
     bool isActive() const;
 
-    /**
-     * Triggers the renaming of the currently selected items, where
-     * the user must input a new name for the items.
-     */
-    void renameSelectedItems();
-
-    KFileItem fileItem(const QModelIndex& index) const;
-
-    inline const DolphinStatusBar* statusBar() const;
-    inline DolphinStatusBar* statusBar();
+    const DolphinStatusBar* statusBar() const;
+    DolphinStatusBar* statusBar();
 
     /**
      * Returns true, if the URL shown by the navigation bar is editable.
@@ -107,21 +99,20 @@ public:
      */
     bool isUrlEditable() const;
 
-    inline const KUrlNavigator* urlNavigator() const;
-    inline KUrlNavigator* urlNavigator();
+    const KUrlNavigator* urlNavigator() const;
+    KUrlNavigator* urlNavigator();
 
-    inline const DolphinView* view() const;
-    inline DolphinView* view();
+    const DolphinView* view() const;
+    DolphinView* view();
+    
+    /**
+     * Refreshes the view container to get synchronized with the (updated) Dolphin settings.
+     */
+    void refresh();
 
     /** Returns true, if the filter bar is visible. */
     bool isFilterBarVisible() const;
 
-    /**
-     * Return the DolphinMainWindow this View belongs to. It is guaranteed
-     * that we have one.
-     */
-    inline const DolphinMainWindow* mainWindow() const;
-
 public slots:
     /**
      * Popups the filter bar above the status bar if \a show is true.
@@ -145,10 +136,10 @@ private slots:
     void updateProgress(int percent);
 
     /**
-     * Updates the number of items (= number of directories + number of files)
-     * and shows this information in the statusbar.
+     * Assures that the viewport position is restored and updates the
+     * statusbar to reflect the current content.
      */
-    void updateItemCount();
+    void slotDirListerCompleted();
 
     /**
      * Handles clicking on an item
@@ -167,13 +158,16 @@ private slots:
     /** Shows the error message \a msg inside the statusbar. */
     void showErrorMessage(const QString& msg);
 
+    /** Shows the "operation completed" message \a msg inside the statusbar. */
+    void showOperationCompletedMessage(const QString& msg);
+
     void closeFilterBar();
 
     /**
      * Filters the currently shown items by \a nameFilter. All items
      * which contain the given filter string will be shown.
      */
-    void changeNameFilter(const QString& nameFilter);
+    void setNameFilter(const QString& nameFilter);
 
     /**
      * Opens the context menu on the current mouse position.
@@ -207,26 +201,28 @@ private slots:
      */
     void restoreView(const KUrl& url);
 
-private:
     /**
-     * Returns the default text of the status bar, if no item is
-     * selected.
+     * Saves the root URL of the current URL \a url
+     * into the URL navigator.
      */
-    QString defaultStatusBarText() const;
-
+    void saveRootUrl(const KUrl& url);
+    
+    /**
+     * Is connected with the URL navigator and drops the URLs
+     * above the destination \a destination.
+     */
+    void dropUrls(const KUrl& destination, QDropEvent* event);
+    
     /**
-     * Returns the text for the status bar, if at least one item
-     * is selected.
+     * Is invoked when a redirection is done and changes the
+     * URL of the URL navigator to \a newUrl without triggering
+     * a reloading of the directory.
      */
-    QString selectionStatusBarText() const;
+    void redirect(const KUrl& oldUrl, const KUrl& newUrl);
 
 private:
     bool m_showProgress;
 
-    int m_iconSize;
-    int m_folderCount;
-    int m_fileCount;
-
     DolphinMainWindow* m_mainWindow;
     QVBoxLayout* m_topLayout;
     KUrlNavigator* m_urlNavigator;
@@ -241,38 +237,34 @@ private:
     DolphinSortFilterProxyModel* m_proxyModel;
 };
 
-const DolphinStatusBar* DolphinViewContainer::statusBar() const
+inline const DolphinStatusBar* DolphinViewContainer::statusBar() const
 {
     return m_statusBar;
 }
 
-DolphinStatusBar* DolphinViewContainer::statusBar()
+inline DolphinStatusBar* DolphinViewContainer::statusBar()
 {
     return m_statusBar;
 }
 
-const KUrlNavigator* DolphinViewContainer::urlNavigator() const
+inline const KUrlNavigator* DolphinViewContainer::urlNavigator() const
 {
     return m_urlNavigator;
 }
 
-KUrlNavigator* DolphinViewContainer::urlNavigator()
+inline KUrlNavigator* DolphinViewContainer::urlNavigator()
 {
     return m_urlNavigator;
 }
 
-const DolphinView* DolphinViewContainer::view() const
+inline const DolphinView* DolphinViewContainer::view() const
 {
     return m_view;
 }
 
-DolphinView* DolphinViewContainer::view()
+inline DolphinView* DolphinViewContainer::view()
 {
     return m_view;
 }
 
-const DolphinMainWindow* DolphinViewContainer::mainWindow() const
-{
-    return m_mainWindow;
-}
 #endif // DOLPHINVIEWCONTAINER_H