Assure that when requesting the context menu for the column-view, that the correct...

[dolphin.git] / src / dolphinview.h

diff --git a/src/dolphinview.h b/src/dolphinview.h
index 40d3827387f853f7d55ee2302dfdd2495b7dac0e..d9c273d38139a536a570bb413f67da566d472de6 100644 (file)
--- a/src/dolphinview.h
+++ b/src/dolphinview.h
@@ -29,7 +29,7 @@
 #include <kparts/part.h>
 #include <kfileitem.h>
 #include <kfileitemdelegate.h>
-#include <konq_fileundomanager.h>
+#include <kio/fileundomanager.h>
 #include <kio/job.h>
 
 #include <QBoxLayout>
@@ -52,6 +52,7 @@ class KDirLister;
 class KFileItemDelegate;
 class KUrl;
 class KToggleAction;
+class ToolTipManager;
 class QModelIndex;
 class ViewProperties;
 
@@ -217,11 +218,6 @@ public:
      */
     KUrl::List selectedUrls() const;
 
-    /**
-     * Returns the file item for the given model index \a index.
-     */
-    KFileItem fileItem(const QModelIndex& index) const;
-
     /**
      * Sets the upper left position of the view content
      * to (x,y). The content of the view might be larger than the visible area
@@ -315,6 +311,15 @@ public:
      */
     QPair<bool, QString> pasteInfo() const;
 
+    /**
+     * If \a tabsForFiles is true, the signal tabRequested() will also
+     * emitted also for files. Per default tabs for files is disabled
+     * and hence the signal tabRequested() will only be emitted for
+     * directories.
+     */
+    void setTabsForFilesEnabled(bool tabsForFiles);
+    bool isTabsForFilesEnabled() const;
+
 public slots:
     /**
      * Changes the directory to \a url. If the current directory is equal to
@@ -411,10 +416,21 @@ signals:
     void urlChanged(const KUrl& url);
 
     /**
-     * Is emitted when clicking on an item
+     * Is emitted if the view requests a changing of the current
+     * URL to \a url (see DolphinController::triggerUrlChangeRequest()).
+     */
+    void requestUrlChange(const KUrl& url);
+
+    /**
+     * Is emitted when clicking on an item with the left mouse button.
      */
     void itemTriggered(const KFileItem& item);
 
+    /**
+     * Is emitted if a new tab should be opened for the URL \a url.
+     */
+    void tabRequested(const KUrl& url);
+
     /**
      * Is emitted if the view mode (IconsView, DetailsView,
      * PreviewsView) has been changed.
@@ -490,7 +506,7 @@ signals:
      * Is emitted when renaming, copying, moving, linking etc.
      * Used for feedback in the mainwindow.
      */
-    void doingOperation(KonqFileUndoManager::CommandType type);
+    void doingOperation(KIO::FileUndoManager::CommandType type);
 
 protected:
     /** @see QWidget::mouseReleaseEvent */
@@ -580,6 +596,24 @@ private slots:
      */
     void slotDeleteFileFinished(KJob* job);
 
+    /**
+     * Called when KDirLister emits redirection.
+     * Testcase: fish://localhost
+     */
+    void slotRedirection(const KUrl& oldUrl, const KUrl& newUrl);
+
+    /**
+     * Is emitted if the controller requests a changing of the current
+     * URL to \a url
+     */
+    void slotRequestUrlChange(const KUrl& url);
+
+    /**
+     * Restores the current item (= item that has the keyboard focus)
+     * to m_currentItemUrl.
+     */
+    void restoreCurrentItem();
+
 private:
     void loadDirectory(const KUrl& url, bool reload = false);
 
@@ -635,11 +669,13 @@ private:
     }
 
 private:
-    bool m_active;
-    bool m_showPreview;
-    bool m_loadingDirectory;
-    bool m_storedCategorizedSorting;
-    bool m_isContextMenuOpen;   // TODO: workaround for Qt-issue xxxxxx
+    bool m_active : 1;
+    bool m_showPreview : 1;
+    bool m_loadingDirectory : 1;
+    bool m_storedCategorizedSorting : 1;
+    bool m_tabsForFiles : 1;
+    bool m_isContextMenuOpen : 1;   // TODO: workaround for Qt-issue 207192
+
     Mode m_mode;
 
     DolphinMainWindow* m_mainWindow;
@@ -657,8 +693,10 @@ private:
     DolphinSortFilterProxyModel* m_proxyModel;
 
     IconManager* m_iconManager;
+    ToolTipManager* m_toolTipManager;
 
     KUrl m_rootUrl;
+    KUrl m_currentItemUrl;
 };
 
 /// Allow using DolphinView::Mode in QVariant