Merge branch 'master' into frameworks

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 6b046c2ea076ee168e2c6b042ae0e2abfd0625cf..d5181711cf656172a5fc314698bc38252eba6af1 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -22,14 +22,14 @@
 #ifndef DOLPHIN_MAINWINDOW_H
 #define DOLPHIN_MAINWINDOW_H
 
 #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 <KFileItemDelegate>
 #include <kio/fileundomanager.h>
 #include <ksortablelist.h>
 #include <kxmlguiwindow.h>

-#include <KActionMenu>

 #include <KIcon>
 #include <KIcon>

+#include <KUrl>

 
 #include <QList>
 #include <QWeakPointer>
 
 #include <QList>
 #include <QWeakPointer>


@@ -39,18 +39,19 @@ typedef KIO::FileUndoManager::CommandType CommandType;
 class DolphinViewActionHandler;
 class DolphinApplication;
 class DolphinSettingsDialog;
 class DolphinViewActionHandler;
 class DolphinApplication;
 class DolphinSettingsDialog;

+class DolphinTabBar;

 class DolphinViewContainer;
 class DolphinRemoteEncoding;
 class DolphinViewContainer;
 class DolphinRemoteEncoding;

+class DolphinTabPage;

 class KAction;
 class KFileItem;
 class KFileItemList;
 class KJob;
 class KNewFileMenu;
 class KAction;
 class KFileItem;
 class KFileItemList;
 class KJob;
 class KNewFileMenu;

-class KTabBar;
-class KUrl;

 class QSplitter;
 class QToolButton;
 class QVBoxLayout;
 class QSplitter;
 class QToolButton;
 class QVBoxLayout;

+class QIcon;

 
 /**
  * @short Main window for Dolphin.
 
 /**
  * @short Main window for Dolphin.


@@ -89,13 +90,6 @@ public:
      */
     void openFiles(const QList<KUrl>& files);
 
      */
     void openFiles(const QList<KUrl>& files);
 

-    /**
-     * Returns true, if the main window contains two instances
-     * of a view container. The active view constainer can be
-     * accessed by DolphinMainWindow::activeViewContainer().
-     */
-    bool isSplit() const;
-

     /**
      * Returns the 'Create New...' sub menu which also can be shared
      * with other menus (e. g. a context menu).
     /**
      * Returns the 'Create New...' sub menu which also can be shared
      * with other menus (e. g. a context menu).


@@ -156,6 +150,11 @@ signals:
      */
     void settingsChanged();
 
      */
     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);
 protected:
     /** @see QWidget::showEvent() */
     virtual void showEvent(QShowEvent* event);


@@ -192,9 +191,6 @@ private slots:
      */
     void slotUndoAvailable(bool available);
 
      */
     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);
 
     /** Sets the text of the 'Undo' menu action to \a text. */
     void slotUndoTextChanged(const QString& text);
 


@@ -352,15 +348,22 @@ private slots:
     void openNewTab();
 
     /**
     void openNewTab();
 
     /**

-     * Opens a new tab in the background showing the URL \a url.
+     * Opens a new tab in the background showing the URL \a primaryUrl and the
+     * optional URL \a secondaryUrl.
+     */
+    void openNewTab(const KUrl& primaryUrl, const KUrl& secondaryUrl = KUrl());
+
+    /**
+     * Opens a new tab showing the  URL \a primaryUrl and the optional URL
+     * \a secondaryUrl and activates the tab.

      */
      */

-    void openNewTab(const KUrl& url);
+    void openNewActivatedTab(const KUrl& primaryUrl, const KUrl& secondaryUrl = KUrl());

 
     /**
 
     /**

-     * Opens a new tab showing the URL \a url and activates
-     * the tab.
+     * Opens a new tab showing the url from tab at the given \a index and
+     * activates the tab.

      */
      */

-    void openNewActivatedTab(const KUrl& url);
+    void openNewActivatedTab(int index);

 
     void activateNextTab();
 
 
     void activateNextTab();
 


@@ -376,9 +379,6 @@ private slots:
      */
     void openInNewWindow();
 
      */
     void openInNewWindow();
 

-    /** Toggles the active view if two views are shown within the main window. */
-    void toggleActiveView();
-

     /**
      * Indicates in the statusbar that the execution of the command \a command
      * has been finished.
     /**
      * Indicates in the statusbar that the execution of the command \a command
      * has been finished.


@@ -400,10 +400,10 @@ private slots:
     void closeTab(int index);
 
     /**
     void closeTab(int index);
 
     /**

-     * Opens a context menu for the tab with the index \a index
-     * on the position \a pos.
+     * Opens the tab with the index \a index in a new Dolphin instance and closes
+     * this tab.

      */
      */

-    void openTabContextMenu(int index, const QPoint& pos);
+    void detachTab(int index);

 
     /**
      * Is connected to the QTabBar signal tabMoved(int from, int to).
 
     /**
      * Is connected to the QTabBar signal tabMoved(int from, int to).


@@ -412,12 +412,6 @@ private slots:
      */
     void slotTabMoved(int from, int to);
 
      */
     void slotTabMoved(int from, int to);
 

-    /**
-     * Is connected to the KTabBar signal testCanDecode() and adjusts
-     * the output parameter \a accept.
-     */
-    void slotTestCanDecode(const QDragMoveEvent* event, bool& accept);
-

     /**
      * If the URL can be listed, open it in the current view, otherwise
      * run it through KRun.
     /**
      * If the URL can be listed, open it in the current view, otherwise
      * run it through KRun.


@@ -473,6 +467,10 @@ private slots:
      */
     void slotPlaceActivated(const KUrl& url);
 
      */
     void slotPlaceActivated(const KUrl& url);
 

+    void activeViewChanged();
+
+    void closedTabsCountChanged(unsigned int count);
+

 private:
     /**
      * Activates the given view, which means that
 private:
     /**
      * Activates the given view, which means that


@@ -482,11 +480,6 @@ private:
      */
     void setActiveViewContainer(DolphinViewContainer* view);
 
      */
     void setActiveViewContainer(DolphinViewContainer* view);
 

-    /**
-     * Creates a view container and does a default initialization.
-     */
-    DolphinViewContainer* createViewContainer(const KUrl& url, QWidget* parent);
-

     void setupActions();
     void setupDockWidgets();
     void updateEditActions();
     void setupActions();
     void setupDockWidgets();
     void updateEditActions();


@@ -503,11 +496,6 @@ private:
      */
     bool addActionToMenu(QAction* action, KMenu* menu);
 
      */
     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
     /**
      * Connects the signals from the created DolphinView with
      * the DolphinViewContainer \a container with the corresponding slots of


@@ -527,16 +515,8 @@ private:
     /** Returns the name of the tab for the URL \a url. */
     QString tabName(const KUrl& url) const;
 
     /** Returns the name of the tab for the URL \a url. */
     QString tabName(const KUrl& url) const;
 

-    bool isKompareInstalled() const;
-
-    void createSecondaryView(int tabIndex);

 
 

-    /**
-     * Helper method for saveProperties() and readProperties(): Returns
-     * the property string for a tab with the index \a tabIndex and
-     * the property \a property.
-     */
-    QString tabProperty(const QString& property, int tabIndex) const;
+    bool isKompareInstalled() const;

 
     /**
      * Sets the window caption to url.fileName() if this is non-empty,
 
     /**
      * Sets the window caption to url.fileName() if this is non-empty,


@@ -552,7 +532,7 @@ private:
      * as the action for toggling the dock visibility is done by Qt which
      * is no KAction instance.
      */
      * 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);
                            const QKeySequence& shortcut,
                            QAction* dockAction,
                            const QString& actionName);


@@ -572,24 +552,13 @@ private:
     };
 
     KNewFileMenu* m_newFileMenu;
     };
 
     KNewFileMenu* m_newFileMenu;

-    KActionMenu* m_recentTabsMenu;
-    KTabBar* m_tabBar;
+    DolphinTabBar* m_tabBar;

     DolphinViewContainer* m_activeViewContainer;
     QVBoxLayout* m_centralWidgetLayout;
     int m_id;
 
     DolphinViewContainer* m_activeViewContainer;
     QVBoxLayout* m_centralWidgetLayout;
     int m_id;
 

-    // Members for the tab-handling:
-    struct ViewTab
-    {
-        ViewTab() : isPrimaryViewActive(true), wasActive(false), primaryView(0), secondaryView(0), splitter(0) {}
-        bool isPrimaryViewActive;
-        bool wasActive;
-        DolphinViewContainer* primaryView;
-        DolphinViewContainer* secondaryView;
-        QSplitter* splitter;
-    };

     int m_tabIndex;
     int m_tabIndex;

-    QList<ViewTab> m_viewTab;
+    QList<DolphinTabPage*> m_viewTab;

 
     DolphinViewActionHandler* m_actionHandler;
     DolphinRemoteEncoding* m_remoteEncoding;
 
     DolphinViewActionHandler* m_actionHandler;
     DolphinRemoteEncoding* m_remoteEncoding;


@@ -607,11 +576,6 @@ inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const
     return m_activeViewContainer;
 }
 
     return m_activeViewContainer;
 }
 

-inline bool DolphinMainWindow::isSplit() const
-{
-    return m_viewTab[m_tabIndex].secondaryView != 0;
-}
-

 inline KNewFileMenu* DolphinMainWindow::newFileMenu() const
 {
     return m_newFileMenu;
 inline KNewFileMenu* DolphinMainWindow::newFileMenu() const
 {
     return m_newFileMenu;