Merge branch 'KDE/4.11' into KDE/4.12

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 8bf7616587386589309e53fb7c1788f137cec818..6b046c2ea076ee168e2c6b042ae0e2abfd0625cf 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -29,6 +29,7 @@
 #include <ksortablelist.h>
 #include <kxmlguiwindow.h>
 #include <KActionMenu>
+#include <KIcon>
 
 #include <QList>
 #include <QWeakPointer>
@@ -95,9 +96,6 @@ public:
      */
     bool isSplit() const;
 
-    /** Renames the item represented by \a oldUrl to \a newUrl. */
-    void rename(const KUrl& oldUrl, const KUrl& newUrl);
-
     /**
      * Returns the 'Create New...' sub menu which also can be shared
      * with other menus (e. g. a context menu).
@@ -124,6 +122,13 @@ public slots:
      */
     void changeUrl(const KUrl& url);
 
+    /**
+     * The current directory of the Terminal Panel has changed, probably because
+     * the user entered a 'cd' command. This slot calls changeUrl(url) and makes
+     * sure that the panel keeps the keyboard focus.
+     */
+    void slotTerminalDirectoryChanged(const KUrl& url);
+
     /** Stores all settings and quits Dolphin. */
     void quit();
 
@@ -146,6 +151,11 @@ signals:
      */
     void requestItemInfo(const KFileItem& item);
 
+    /**
+     * Is emitted if the settings have been changed.
+     */
+    void settingsChanged();
+
 protected:
     /** @see QWidget::showEvent() */
     virtual void showEvent(QShowEvent* event);
@@ -206,13 +216,6 @@ private slots:
     /** Replaces the URL navigator by a search box to find files. */
     void find();
 
-    /**
-     * Is invoked when the "Find" is active and the search location
-     * (From Here/Everywhere) has been changed. Updates the
-     * enabled state of the Search Panel.
-     */
-    void slotSearchLocationChanged();
-
     /**
      * Updates the text of the paste action dependent on
      * the number of items which are in the clipboard.
@@ -349,10 +352,16 @@ private slots:
     void openNewTab();
 
     /**
-     * Opens a new tab showing the URL \a url.
+     * Opens a new tab in the background showing the URL \a url.
      */
     void openNewTab(const KUrl& url);
 
+    /**
+     * Opens a new tab showing the URL \a url and activates
+     * the tab.
+     */
+    void openNewActivatedTab(const KUrl& url);
+
     void activateNextTab();
 
     void activatePrevTab();
@@ -403,13 +412,6 @@ private slots:
      */
     void slotTabMoved(int from, int to);
 
-    /**
-     * Handles a click on a places item: if the middle mouse button is
-     * clicked, a new tab is opened for \a url, otherwise the current
-     * view is replaced by \a url.
-     */
-    void handlePlacesClick(const KUrl& url, Qt::MouseButtons buttons);
-
     /**
      * Is connected to the KTabBar signal testCanDecode() and adjusts
      * the output parameter \a accept.
@@ -440,8 +442,6 @@ private slots:
      */
     void slotWriteStateChanged(bool isFolderWritable);
 
-    void slotSearchModeChanged(bool enabled);
-
     /**
      * Opens the context menu on the current mouse position.
      * @pos           Position in screen coordinates.
@@ -460,6 +460,19 @@ private slots:
     void updateToolBar();
     void slotControlButtonDeleted();
 
+    /**
+     * Is called if a panel emits an error-message and shows
+     * the error-message in the active view-container.
+     */
+    void slotPanelErrorMessage(const QString& error);
+
+    /**
+     * Is called if the user clicked an item in the Places Panel.
+     * Reloads the view if \a url is the current URL already, and changes the
+     * current URL otherwise.
+     */
+    void slotPlaceActivated(const KUrl& url);
+
 private:
     /**
      * Activates the given view, which means that
@@ -586,13 +599,7 @@ private:
     QToolButton* m_controlButton;
     QTimer* m_updateToolBarTimer;
 
-    KJob* m_lastHandleUrlStatJob;
-
-    /**
-     * Set to true, if the filter dock visibility is only temporary set
-     * to true by enabling the search mode.
-     */
-    bool m_searchDockIsTemporaryVisible;
+    KIO::Job* m_lastHandleUrlStatJob;
 };
 
 inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const