Merge remote-tracking branch 'origin/KDE/4.11'

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 8409975989baf1bff19e32eb43a68302ad518715..7da5801ffe5f3603b29674cf2f0686dccb38b190 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2006 by Peter Penz <peter.penz19@gmail.com>             *

  *   Copyright (C) 2006 by Stefan Monov <logixoul@gmail.com>               *
  *   Copyright (C) 2006 by Cvetoslav Ludmiloff <ludmiloff@gmail.com>       *
  *                                                                         *
  *   Copyright (C) 2006 by Stefan Monov <logixoul@gmail.com>               *
  *   Copyright (C) 2006 by Cvetoslav Ludmiloff <ludmiloff@gmail.com>       *
  *                                                                         *


@@ -22,8 +22,6 @@
 #ifndef DOLPHIN_MAINWINDOW_H
 #define DOLPHIN_MAINWINDOW_H
 
 #ifndef DOLPHIN_MAINWINDOW_H
 #define DOLPHIN_MAINWINDOW_H
 

-#include "panels/panel.h"
-

 #include <config-nepomuk.h>
 
 #include <KFileItemDelegate>
 #include <config-nepomuk.h>
 
 #include <KFileItemDelegate>


@@ -31,24 +29,28 @@
 #include <ksortablelist.h>
 #include <kxmlguiwindow.h>
 #include <KActionMenu>
 #include <ksortablelist.h>
 #include <kxmlguiwindow.h>
 #include <KActionMenu>

-
-#include "views/dolphinview.h"
+#include <KIcon>

 
 #include <QList>
 
 #include <QList>

+#include <QWeakPointer>

 
 typedef KIO::FileUndoManager::CommandType CommandType;
 
 
 typedef KIO::FileUndoManager::CommandType CommandType;
 

-class KAction;

 class DolphinViewActionHandler;
 class DolphinApplication;
 class DolphinSettingsDialog;
 class DolphinViewContainer;
 class DolphinRemoteEncoding;
 class DolphinViewActionHandler;
 class DolphinApplication;
 class DolphinSettingsDialog;
 class DolphinViewContainer;
 class DolphinRemoteEncoding;

+class KAction;
+class KFileItem;
+class KFileItemList;
+class KJob;

 class KNewFileMenu;
 class KTabBar;
 class KUrl;
 class QSplitter;
 class KNewFileMenu;
 class KTabBar;
 class KUrl;
 class QSplitter;

-class KJob;
+class QToolButton;
+class QVBoxLayout;

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


@@ -63,6 +65,7 @@ class DolphinMainWindow: public KXmlGuiWindow
     friend class DolphinApplication;
 
 public:
     friend class DolphinApplication;
 
 public:

+    DolphinMainWindow();

     virtual ~DolphinMainWindow();
 
     /**
     virtual ~DolphinMainWindow();
 
     /**


@@ -93,27 +96,12 @@ public:
      */
     bool isSplit() const;
 
      */
     bool isSplit() const;
 

-    /** Renames the item represented by \a oldUrl to \a newUrl. */
-    void rename(const KUrl& oldUrl, const KUrl& newUrl);
-
-    /**
-     * Refreshes the views of the main window by recreating them according to
-     * the given Dolphin settings.
-     */
-    void refreshViews();
-

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

-    /**
-     * Returns the 'Show Menubar' action which can be shared with
-     * other menus (e. g. a context menu).
-     */
-    KAction* showMenuBarAction() const;
-

 public slots:
     /**
      * Pastes the clipboard data into the currently selected folder
 public slots:
     /**
      * Pastes the clipboard data into the currently selected folder


@@ -134,6 +122,13 @@ public slots:
      */
     void changeUrl(const KUrl& url);
 
      */
     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();
 
     /** Stores all settings and quits Dolphin. */
     void quit();
 


@@ -156,6 +151,11 @@ signals:
      */
     void requestItemInfo(const KFileItem& item);
 
      */
     void requestItemInfo(const KFileItem& item);
 

+    /**
+     * Is emitted if the settings have been changed.
+     */
+    void settingsChanged();
+

 protected:
     /** @see QWidget::showEvent() */
     virtual void showEvent(QShowEvent* event);
 protected:
     /** @see QWidget::showEvent() */
     virtual void showEvent(QShowEvent* event);


@@ -170,6 +170,12 @@ protected:
     virtual void readProperties(const KConfigGroup& group);
 
 private slots:
     virtual void readProperties(const KConfigGroup& group);
 
 private slots:

+    /**
+     * Refreshes the views of the main window by recreating them according to
+     * the given Dolphin settings.
+     */
+    void refreshViews();
+

     void clearStatusBar();
 
     /** Updates the 'Create New...' sub menu. */
     void clearStatusBar();
 
     /** Updates the 'Create New...' sub menu. */


@@ -261,6 +267,13 @@ private slots:
      */
     void togglePanelLockState();
 
      */
     void togglePanelLockState();
 

+    /**
+     * Is invoked if the Places panel got visible/invisible and takes care
+     * that the places-selector of all views is only shown if the Places panel
+     * is invisible.
+     */
+    void slotPlacesPanelVisibilityChanged(bool visible);
+

     /** Goes back one step of the URL history. */
     void goBack();
 
     /** Goes back one step of the URL history. */
     void goBack();
 


@@ -270,6 +283,9 @@ private slots:
     /** Goes up one hierarchy of the current URL. */
     void goUp();
 
     /** Goes up one hierarchy of the current URL. */
     void goUp();
 

+    /** Changes the location to the home URL. */
+    void goHome();
+

     /**
      * Open the previous URL in the URL history in a new tab
      * if the middle mouse button is clicked.
     /**
      * Open the previous URL in the URL history in a new tab
      * if the middle mouse button is clicked.


@@ -288,8 +304,10 @@ private slots:
      */
     void goUp(Qt::MouseButtons buttons);
 
      */
     void goUp(Qt::MouseButtons buttons);
 

-    /** Goes to the home URL. */
-    void goHome();
+    /**
+     * Open the home URL in a new tab
+     */
+    void goHome(Qt::MouseButtons buttons);

 
     /** Opens Kompare for 2 selected files. */
     void compareFiles();
 
     /** Opens Kompare for 2 selected files. */
     void compareFiles();


@@ -334,10 +352,16 @@ private slots:
     void openNewTab();
 
     /**
     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);
 
      */
     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();
     void activateNextTab();
 
     void activatePrevTab();


@@ -388,13 +412,6 @@ private slots:
      */
     void slotTabMoved(int from, int to);
 
      */
     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.
     /**
      * Is connected to the KTabBar signal testCanDecode() and adjusts
      * the output parameter \a accept.


@@ -425,24 +442,31 @@ private slots:
      */
     void slotWriteStateChanged(bool isFolderWritable);
 
      */
     void slotWriteStateChanged(bool isFolderWritable);
 

-    void slotSearchModeChanged(bool enabled);
-

     /**
      * Opens the context menu on the current mouse position.
     /**
      * Opens the context menu on the current mouse position.

+     * @pos           Position in screen coordinates.

      * @item          File item context. If item is null, the context menu
      *                should be applied to \a url.
      * @url           URL which contains \a item.
      * @customActions Actions that should be added to the context menu,
      *                if the file item is null.
      */
      * @item          File item context. If item is null, the context menu
      *                should be applied to \a url.
      * @url           URL which contains \a item.
      * @customActions Actions that should be added to the context menu,
      *                if the file item is null.
      */

-    void openContextMenu(const KFileItem& item,
+    void openContextMenu(const QPoint& pos,
+                         const KFileItem& item,

                          const KUrl& url,
                          const QList<QAction*>& customActions);
 
                          const KUrl& url,
                          const QList<QAction*>& customActions);
 

-private:
-    DolphinMainWindow(int id);
-    void init();
+    void updateControlMenu();
+    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);

 
 

+private:

     /**
      * Activates the given view, which means that
      * all menu actions are applied to this view. When
     /**
      * Activates the given view, which means that
      * all menu actions are applied to this view. When


@@ -451,12 +475,27 @@ 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 updateViewActions();
     void updateGoActions();
 
     void setupActions();
     void setupDockWidgets();
     void updateEditActions();
     void updateViewActions();
     void updateGoActions();
 

+    void createControlButton();
+    void deleteControlButton();
+
+    /**
+     * Adds the action \p action to the menu \p menu in
+     * case if it has not added already to the toolbar.
+     * @return True if the action has been added to the menu.
+     */
+    bool addActionToMenu(QAction* action, KMenu* menu);
+

     /**
      * Adds the tab[\a index] to the closed tab menu's list of actions.
      */
     /**
      * Adds the tab[\a index] to the closed tab menu's list of actions.
      */


@@ -501,13 +540,15 @@ private:
     QString squeezedText(const QString& text) const;
 
     /**
     QString squeezedText(const QString& text) const;
 
     /**

-     * Adds a clone of the action \a action to the action-collection with
-     * the name \a actionName, so that the action \a action also can be
-     * added to the toolbar by the user. This is useful if the creation of
-     * \a action is e.g. done in Qt and hence cannot be added directly
-     * to the action-collection.
+     * Creates an action for showing/hiding a panel, that is accessible
+     * in "Configure toolbars..." and "Configure shortcuts...". This is necessary
+     * as the action for toggling the dock visibility is done by Qt which
+     * is no KAction instance.

      */
      */

-    void addActionCloneToCollection(QAction* action, const QString& actionName);
+    void createPanelAction(const KIcon& icon,
+                           const QKeySequence& shortcut,
+                           QAction* dockAction,
+                           const QString& actionName);

 
 private:
     /**
 
 private:
     /**


@@ -525,35 +566,33 @@ private:
 
     KNewFileMenu* m_newFileMenu;
     KActionMenu* m_recentTabsMenu;
 
     KNewFileMenu* m_newFileMenu;
     KActionMenu* m_recentTabsMenu;

-    KAction* m_showMenuBar;

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

+    // Members for the tab-handling:

     struct ViewTab
     {
     struct ViewTab
     {

-        ViewTab() : isPrimaryViewActive(true), primaryView(0), secondaryView(0), splitter(0) {}
+        ViewTab() : isPrimaryViewActive(true), wasActive(false), primaryView(0), secondaryView(0), splitter(0) {}

         bool isPrimaryViewActive;
         bool isPrimaryViewActive;

+        bool wasActive;

         DolphinViewContainer* primaryView;
         DolphinViewContainer* secondaryView;
         QSplitter* splitter;
     };
         DolphinViewContainer* primaryView;
         DolphinViewContainer* secondaryView;
         QSplitter* splitter;
     };

-

     int m_tabIndex;
     QList<ViewTab> m_viewTab;
 
     DolphinViewActionHandler* m_actionHandler;
     DolphinRemoteEncoding* m_remoteEncoding;
     int m_tabIndex;
     QList<ViewTab> m_viewTab;
 
     DolphinViewActionHandler* m_actionHandler;
     DolphinRemoteEncoding* m_remoteEncoding;

-    QPointer<DolphinSettingsDialog> m_settingsDialog;
+    QWeakPointer<DolphinSettingsDialog> m_settingsDialog;

 
 

-    KJob* m_lastHandleUrlStatJob;
+    // Members for the toolbar menu that is shown when the menubar is hidden:
+    QToolButton* m_controlButton;
+    QTimer* m_updateToolBarTimer;

 
 

-    /**
-     * Set to true, if the filter dock visibility is only temporary set
-     * to true by enabling the search mode.
-     */
-    bool m_filterDockIsTemporaryVisible;
+    KIO::Job* m_lastHandleUrlStatJob;

 };
 
 inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const
 };
 
 inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const


@@ -571,11 +610,6 @@ inline KNewFileMenu* DolphinMainWindow::newFileMenu() const
     return m_newFileMenu;
 }
 
     return m_newFileMenu;
 }
 

-inline KAction* DolphinMainWindow::showMenuBarAction() const
-{
-    return m_showMenuBar;
-}
-

 inline int DolphinMainWindow::getId() const
 {
     return m_id;
 inline int DolphinMainWindow::getId() const
 {
     return m_id;