fixed some activation issues in combination with split views

[dolphin.git] / src / dolphinview.h

diff --git a/src/dolphinview.h b/src/dolphinview.h
index 24c4f60a14e18366f8a227b2aedbdcee45437e6d..3d0f9a548ddb13ce361d280d28c9ce9bc882ed71 100644 (file)
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -123,8 +123,7 @@ public:
                 KDirLister* dirLister,
                 KDirModel* dirModel,
                 DolphinSortFilterProxyModel* proxyModel,
-                Mode mode = IconsView,
-                bool showHiddenFiles = false);
+                Mode mode);
 
     virtual ~DolphinView();
 
@@ -199,12 +198,6 @@ public:
      */
     bool supportsCategorizedSorting() const;
 
-    /**
-     * Triggers the renaming of the currently selected items, where
-     * the user must input a new name for the items.
-     */
-    void renameSelectedItems();
-
     /**
      * Selects all items.
      * @see DolphinView::selectedItems()
@@ -243,25 +236,14 @@ public:
     KFileItem* fileItem(const QModelIndex index) const;
 
     /**
-     * Renames the filename of the source URL by the new file name.
-     * If the new file name already exists, a dialog is opened which
-     * asks the user to enter a new name.
-     */
-    void rename(const KUrl& source, const QString& newName);
-
-    /**
-     * Returns the x-position of the view content.
-     * The content of the view might be larger than the visible area
+     * Sets the upper left position of the view content
+     * to (x,y). The content of the view might be larger than the visible area
      * and hence a scrolling must be done.
      */
-    int contentsX() const;
+    void setContentsPosition(int x, int y);
 
-    /**
-     * Returns the y-position of the view content.
-     * The content of the view might be larger than the visible area
-     * and hence a scrolling must be done.
-     */
-    int contentsY() const;
+    /** Returns the upper left position of the view content. */
+    QPoint contentsPosition() const;
 
     /** Increases the size of the current set view mode. */
     void zoomIn();
@@ -354,7 +336,7 @@ signals:
     /** Is emitted if the sort order (ascending or descending) has been changed. */
     void sortOrderChanged(Qt::SortOrder order);
 
-    /** Is emitted if the addtional information for an item has been changed. */
+    /** Is emitted if the additional information for an item has been changed. */
     void additionalInfoChanged(KFileItemDelegate::AdditionalInformation info);
 
     /**
@@ -371,11 +353,6 @@ signals:
      */
     void selectionChanged(const KFileItemList& selection);
 
-    /**
-     * Is emitted whenever the filter bar has been turned show or hidden.
-     */
-    void showFilterBarChanged(bool shown);
-
     /**
      * Is emitted if a context menu is requested for the item \a item,
      * which is part of \a url. If the item is 0, the context menu
@@ -391,6 +368,18 @@ signals:
      */
     void urlsDropped(const KUrl::List& urls, const KUrl& destination);
 
+    /**
+     * Is emitted if an information message with the content \a msg
+     * should be shown.
+     */
+    void infoMessage(const QString& msg);
+
+    /**
+     * Is emitted if an error message with the content \a msg
+     * should be shown.
+     */
+    void errorMessage(const QString& msg);
+
 protected:
     /** @see QWidget::mouseReleaseEvent */
     virtual void mouseReleaseEvent(QMouseEvent* event);
@@ -422,12 +411,6 @@ private slots:
      */
     void showPreview(const KFileItem& item, const QPixmap& pixmap);
 
-    /**
-     * Restores the x- and y-position of the contents if the
-     * current view is part of the history.
-     */
-    void restoreContentsPos();
-
     void emitSelectionChangedSignal();
 
     /**
@@ -544,7 +527,7 @@ private:
     };
 
     bool m_active;
-    bool m_blockContentsMovedSignal;
+    bool m_loadingDirectory;
     bool m_initializeColumnView;
     Mode m_mode;