Merge branch 'master' into frameworks

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 7da5801ffe5f3603b29674cf2f0686dccb38b190..4fe13d29fd2a86def323f1241d651c153fb8c1e5 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -22,13 +22,12 @@
 #ifndef DOLPHIN_MAINWINDOW_H
 #define DOLPHIN_MAINWINDOW_H
 
-#include <config-nepomuk.h>
+#include <config-baloo.h>
 
 #include <KFileItemDelegate>
 #include <kio/fileundomanager.h>
 #include <ksortablelist.h>
 #include <kxmlguiwindow.h>
-#include <KActionMenu>
 #include <KIcon>
 
 #include <QList>
@@ -51,6 +50,7 @@ class KUrl;
 class QSplitter;
 class QToolButton;
 class QVBoxLayout;
+class QIcon;
 
 /**
  * @short Main window for Dolphin.
@@ -156,6 +156,11 @@ signals:
      */
     void settingsChanged();
 
+    /**
+     * Is emitted when a tab has been closed.
+     */
+    void rememberClosedTab(const KUrl& primaryUrl, const KUrl& secondaryUrl);
+
 protected:
     /** @see QWidget::showEvent() */
     virtual void showEvent(QShowEvent* event);
@@ -192,9 +197,6 @@ private slots:
      */
     void slotUndoAvailable(bool available);
 
-    /** Invoked when an action in the recent tabs menu is clicked. */
-    void restoreClosedTab(QAction* action);
-
     /** Sets the text of the 'Undo' menu action to \a text. */
     void slotUndoTextChanged(const QString& text);
 
@@ -466,6 +468,19 @@ private slots:
      */
     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);
+
+    /**
+     * Is called when the user wants to reopen a previously closed \a tab from
+     * the recent tabs menu.
+     */
+    void restoreClosedTab(const KUrl& primaryUrl, const KUrl& secondaryUrl);
+
 private:
     /**
      * Activates the given view, which means that
@@ -496,11 +511,6 @@ private:
      */
     bool addActionToMenu(QAction* action, KMenu* menu);
 
-    /**
-     * Adds the tab[\a index] to the closed tab menu's list of actions.
-     */
-    void rememberClosedTab(int index);
-
     /**
      * Connects the signals from the created DolphinView with
      * the DolphinViewContainer \a container with the corresponding slots of
@@ -545,7 +555,7 @@ private:
      * as the action for toggling the dock visibility is done by Qt which
      * is no KAction instance.
      */
-    void createPanelAction(const KIcon& icon,
+    void createPanelAction(const QIcon &icon,
                            const QKeySequence& shortcut,
                            QAction* dockAction,
                            const QString& actionName);
@@ -565,7 +575,6 @@ private:
     };
 
     KNewFileMenu* m_newFileMenu;
-    KActionMenu* m_recentTabsMenu;
     KTabBar* m_tabBar;
     DolphinViewContainer* m_activeViewContainer;
     QVBoxLayout* m_centralWidgetLayout;