Merge branch 'Applications/18.04'

[dolphin.git] / src / dolphinmainwindow.h

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 7c3bff47fdd288c9e56f9e58461385659fdc80fd..637f41f2108e2d143abc2beeadb6cd9b6ff0c624 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -23,34 +23,30 @@
 #define DOLPHIN_MAINWINDOW_H
 
 #include <config-baloo.h>
 #define DOLPHIN_MAINWINDOW_H
 
 #include <config-baloo.h>

-
-#include <KFileItemDelegate>

 #include <kio/fileundomanager.h>
 #include <ksortablelist.h>
 #include <kxmlguiwindow.h>
 #include <kio/fileundomanager.h>
 #include <ksortablelist.h>
 #include <kxmlguiwindow.h>

-#include <KIcon>

 
 

+#include <QIcon>

 #include <QList>
 #include <QList>

-#include <QWeakPointer>
+#include <QPointer>
+#include <QUrl>

 
 typedef KIO::FileUndoManager::CommandType CommandType;
 
 class DolphinViewActionHandler;
 
 typedef KIO::FileUndoManager::CommandType CommandType;
 
 class DolphinViewActionHandler;

-class DolphinApplication;

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

-class DolphinTabPage;
-class KAction;
+class DolphinTabWidget;

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

-class KTabBar;
-class KUrl;
-class QSplitter;

 class QToolButton;
 class QToolButton;

-class QVBoxLayout;
+class QIcon;
+class PlacesPanel;
+class TerminalPanel;

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


@@ -61,12 +57,10 @@ class DolphinMainWindow: public KXmlGuiWindow
 {
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "org.kde.dolphin.MainWindow")
 {
     Q_OBJECT
     Q_CLASSINFO("D-Bus Interface", "org.kde.dolphin.MainWindow")

-    Q_PROPERTY(int id READ getId SCRIPTABLE true)
-    friend class DolphinApplication;

 
 public:
     DolphinMainWindow();
 
 public:
     DolphinMainWindow();

-    virtual ~DolphinMainWindow();
+    ~DolphinMainWindow() override;

 
     /**
      * Returns the currently active view.
 
     /**
      * Returns the currently active view.


@@ -77,17 +71,18 @@ public:
     DolphinViewContainer* activeViewContainer() const;
 
     /**
     DolphinViewContainer* activeViewContainer() const;
 
     /**

-     * Opens each directory in \p dirs in a separate tab. If the "split view"
-     * option is enabled, 2 directories are collected within one tab.
+     * Opens each directory in \p dirs in a separate tab. If \a splitView is set,
+     * 2 directories are collected within one tab.
+     * \pre \a dirs must contain at least one url.

      */
      */

-    void openDirectories(const QList<KUrl>& dirs);
+    void openDirectories(const QList<QUrl> &dirs, bool splitView);

 
     /**
 
     /**

-     * Opens the directory which contains the files \p files
-     * and selects all files (implements the --select option
-     * of Dolphin).
+     * Opens the directories which contain the files \p files and selects all files.
+     * If \a splitView is set, 2 directories are collected within one tab.
+     * \pre \a files must contain at least one url.

      */
      */

-    void openFiles(const QList<KUrl>& files);
+    void openFiles(const QList<QUrl>& files, bool splitView);

 
     /**
      * Returns the 'Create New...' sub menu which also can be shared
 
     /**
      * Returns the 'Create New...' sub menu which also can be shared


@@ -95,6 +90,8 @@ public:
      */
     KNewFileMenu* newFileMenu() const;
 
      */
     KNewFileMenu* newFileMenu() const;
 

+    void setTabsToHomeIfMountPathOpen(const QString& mountPath);
+

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


@@ -103,24 +100,19 @@ public slots:
      */
     void pasteIntoFolder();
 
      */
     void pasteIntoFolder();
 

-    /**
-     * Returns the main window ID used through DBus.
-     */
-    int getId() const;
-

     /**
      * Implementation of the MainWindowAdaptor/QDBusAbstractAdaptor interface.
      * Inform all affected dolphin components (panels, views) of an URL
      * change.
      */
     /**
      * Implementation of the MainWindowAdaptor/QDBusAbstractAdaptor interface.
      * Inform all affected dolphin components (panels, views) of an URL
      * change.
      */

-    void changeUrl(const KUrl& url);
+    void changeUrl(const QUrl& 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.
      */
 
     /**
      * 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);
+    void slotTerminalDirectoryChanged(const QUrl& url);

 
     /** Stores all settings and quits Dolphin. */
     void quit();
 
     /** Stores all settings and quits Dolphin. */
     void quit();


@@ -136,7 +128,7 @@ signals:
      * Is sent if the url of the currently active view has
      * been changed.
      */
      * Is sent if the url of the currently active view has
      * been changed.
      */

-    void urlChanged(const KUrl& url);
+    void urlChanged(const QUrl& url);

 
     /**
      * Is emitted if information of an item is requested to be shown e. g. in the panel.
 
     /**
      * Is emitted if information of an item is requested to be shown e. g. in the panel.


@@ -149,23 +141,18 @@ 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() */
 protected:
     /** @see QWidget::showEvent() */

-    virtual void showEvent(QShowEvent* event);
+    void showEvent(QShowEvent* event) override;

 
     /** @see QMainWindow::closeEvent() */
 
     /** @see QMainWindow::closeEvent() */

-    virtual void closeEvent(QCloseEvent* event);
+    void closeEvent(QCloseEvent* event) override;

 
     /** @see KMainWindow::saveProperties() */
 
     /** @see KMainWindow::saveProperties() */

-    virtual void saveProperties(KConfigGroup& group);
+    void saveProperties(KConfigGroup& group) override;

 
     /** @see KMainWindow::readProperties() */
 
     /** @see KMainWindow::readProperties() */

-    virtual void readProperties(const KConfigGroup& group);
+    void readProperties(const KConfigGroup& group) override;

 
 private slots:
     /**
 
 private slots:
     /**


@@ -234,6 +221,9 @@ private slots:
      */
     void toggleSplitView();
 
      */
     void toggleSplitView();
 

+    /** Dedicated action to open the stash:/ ioslave in split view. */
+    void toggleSplitStash();
+

     /** Reloads the currently active view. */
     void reloadView();
 
     /** Reloads the currently active view. */
     void reloadView();
 


@@ -263,11 +253,10 @@ 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.
+     * Is invoked if the Terminal panel got visible/invisible and takes care
+     * that the active view has the focus if the Terminal panel is invisible.

      */
      */

-    void slotPlacesPanelVisibilityChanged(bool visible);
+    void slotTerminalPanelVisibilityChanged();

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


@@ -281,28 +270,17 @@ private slots:
     /** Changes the location to the home URL. */
     void goHome();
 
     /** 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.
-     */
-    void goBack(Qt::MouseButtons buttons);
+    /** Open the previous URL in the URL history in a new tab. */
+    void goBackInNewTab();

 
 

-    /**
-     * Open the next URL in the URL history in a new tab
-     * if the middle mouse button is clicked.
-     */
-    void goForward(Qt::MouseButtons buttons);
+    /** Open the next URL in the URL history in a new tab. */
+    void goForwardInNewTab();

 
 

-    /**
-     * Open the URL one hierarchy above the current URL in a new tab
-     * if the middle mouse button is clicked.
-     */
-    void goUp(Qt::MouseButtons buttons);
+    /** Open the URL one hierarchy above the current URL in a new tab. */
+    void goUpInNewTab();

 
 

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

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


@@ -328,9 +306,6 @@ private slots:
      */
     void slotSelectionChanged(const KFileItemList& selection);
 
      */
     void slotSelectionChanged(const KFileItemList& selection);
 

-    /** Emits the signal requestItemInfo(). */
-    void slotRequestItemInfo(const KFileItem&);
-

     /**
      * Updates the state of the 'Back' and 'Forward' menu
      * actions corresponding to the current history.
     /**
      * Updates the state of the 'Back' and 'Forward' menu
      * actions corresponding to the current history.


@@ -343,24 +318,16 @@ private slots:
     /** Open a new main window. */
     void openNewMainWindow();
 
     /** Open a new main window. */
     void openNewMainWindow();
 

-    /** Opens a new view with the current URL that is part of a tab. */
-    void openNewTab();
-

     /**
     /**

-     * Opens a new tab in the background showing the URL \a primaryUrl and the
-     * optional URL \a secondaryUrl.
+     * Opens a new view with the current URL that is part of a tab and
+     * activates it.

      */
      */

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

 
     /**
 
     /**

-     * Opens a new tab showing the  URL \a primaryUrl and the optional URL
-     * \a secondaryUrl and activates the tab.
+     * Opens a new tab in the background showing the URL \a url.

      */
      */

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

 
     /**
      * Opens the selected folder in a new tab.
 
     /**
      * Opens the selected folder in a new tab.


@@ -373,49 +340,21 @@ private slots:
     void openInNewWindow();
 
     /**
     void openInNewWindow();
 
     /**

-     * Indicates in the statusbar that the execution of the command \a command
-     * has been finished.
+     * Show the target of the selected symlink

      */
      */

-    void showCommand(CommandType command);
+    void showTarget();

 
     /**
 
     /**

-     * Activates the tab with the index \a index, which means that the current view
-     * is replaced by the view of the given tab.
-     */
-    void setActiveTab(int index);
-
-    /** Closes the currently active tab. */
-    void closeTab();
-
-    /**
-     * Closes the tab with the index \a index and activates the tab with index - 1.
-     */
-    void closeTab(int index);
-
-    /**
-     * Opens a context menu for the tab with the index \a index
-     * on the position \a pos.
-     */
-    void openTabContextMenu(int index, const QPoint& pos);
-
-    /**
-     * Is connected to the QTabBar signal tabMoved(int from, int to).
-     * Reorders the list of tabs after a tab was moved in the tab bar
-     * and sets m_tabIndex to the new index of the current tab.
-     */
-    void slotTabMoved(int from, int to);
-
-    /**
-     * Is connected to the KTabBar signal testCanDecode() and adjusts
-     * the output parameter \a accept.
+     * Indicates in the statusbar that the execution of the command \a command
+     * has been finished.

      */
      */

-    void slotTestCanDecode(const QDragMoveEvent* event, bool& accept);
+    void showCommand(CommandType command);

 
     /**
      * 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.
      */

-    void handleUrl(const KUrl& url);
+    void handleUrl(const QUrl& url);

 
     /**
      * handleUrl() can trigger a stat job to see if the url can actually
 
     /**
      * handleUrl() can trigger a stat job to see if the url can actually


@@ -423,12 +362,6 @@ private slots:
      */
     void slotHandleUrlStatFinished(KJob* job);
 
      */
     void slotHandleUrlStatFinished(KJob* job);
 

-    /**
-     * Is connected to the KTabBar signal receivedDropEvent.
-     * Allows dragging and dropping files onto tabs.
-     */
-    void tabDropEvent(int tab, QDropEvent* event);
-

     /**
      * Is invoked when the write state of a folder has been changed and
      * enables/disables the "Create New..." menu entry.
     /**
      * Is invoked when the write state of a folder has been changed and
      * enables/disables the "Create New..." menu entry.


@@ -446,37 +379,73 @@ private slots:
      */
     void openContextMenu(const QPoint& pos,
                          const KFileItem& item,
      */
     void openContextMenu(const QPoint& pos,
                          const KFileItem& item,

-                         const KUrl& url,
+                         const QUrl& url,

                          const QList<QAction*>& customActions);
 
     void updateControlMenu();
     void updateToolBar();
     void slotControlButtonDeleted();
 
                          const QList<QAction*>& customActions);
 
     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);
-

     /**
      * 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.
      */
     /**
      * 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);
+    void slotPlaceActivated(const QUrl& url);

 
 

-    void activeViewChanged();
+    /**
+     * Is called if the another view has been activated by changing the current
+     * tab or activating another view in split-view mode.
+     *
+     * Activates the given view, which means that all menu actions are applied
+     * to this view. When having a split view setup, the nonactive view is
+     * usually shown in darker colors.
+     */
+    void activeViewChanged(DolphinViewContainer* viewContainer);
+
+    void closedTabsCountChanged(unsigned int count);

 
 

-private:

     /**
     /**

-     * Activates the given view, which means that
-     * all menu actions are applied to this view. When
-     * having a split view setup, the nonactive view
-     * is usually shown in darker colors.
+     * Is called if a new tab has been opened or a tab has been closed to
+     * enable/disable the tab actions.
+     */
+    void tabCountChanged(int count);
+
+    /**
+     * Sets the window caption to url.fileName() if this is non-empty,
+     * "/" if the URL is "file:///", and url.protocol() otherwise.
+     */
+    void setUrlAsCaption(const QUrl& url);
+
+    /**
+     * This slot is called when the user requested to unmount a removable media
+     * from the places menu
+     */
+    void slotStorageTearDownFromPlacesRequested(const QString& mountPath);
+
+    /**
+     * This slot is called when the user requested to unmount a removable media
+     * _not_ from the dolphin's places menu (from the notification area for e.g.)
+     * This slot is basically connected to each removable device's
+     * Solid::StorageAccess::teardownRequested(const QString & udi)
+     * signal through the places panel.

      */
      */

-    void setActiveViewContainer(DolphinViewContainer* view);
+    void slotStorageTearDownExternallyRequested(const QString& mountPath);

 
 

+    /**
+     * Is called when the view has finished loading the directory.
+     */
+    void slotDirectoryLoadingCompleted();
+
+    /**
+     * Is called when the user middle clicks a toolbar button.
+     *
+     * Here middle clicking Back/Forward/Up/Home will open the resulting
+     * folder in a new tab.
+     */
+    void slotToolBarActionMiddleClicked(QAction *action);
+
+private:

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


@@ -491,7 +460,7 @@ private:
      * case if it has not added already to the toolbar.
      * @return True if the action has been added to the menu.
      */
      * 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);
+    bool addActionToMenu(QAction* action, QMenu* menu);

 
     /**
      * Connects the signals from the created DolphinView with
 
     /**
      * Connects the signals from the created DolphinView with


@@ -509,27 +478,15 @@ private:
      */
     void updateSplitAction();
 
      */
     void updateSplitAction();
 

-    /** Returns the name of the tab for the URL \a url. */
-    QString tabName(const KUrl& url) const;
-
-

     bool isKompareInstalled() const;
 
     bool isKompareInstalled() const;
 

-    /**
-     * Sets the window caption to url.fileName() if this is non-empty,
-     * "/" if the URL is "file:///", and url.protocol() otherwise.
-     */
-    void setUrlAsCaption(const KUrl& url);
-
-    QString squeezedText(const QString& text) const;
-

     /**
      * 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.
      */
     /**
      * 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 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);


@@ -544,28 +501,27 @@ private:
     {
     public:
         UndoUiInterface();
     {
     public:
         UndoUiInterface();

-        virtual ~UndoUiInterface();
-        virtual void jobError(KIO::Job* job);
+        ~UndoUiInterface() override;
+        void jobError(KIO::Job* job) override;

     };
 
     KNewFileMenu* m_newFileMenu;
     };
 
     KNewFileMenu* m_newFileMenu;

-    KTabBar* m_tabBar;
+    DolphinTabWidget* m_tabWidget;

     DolphinViewContainer* m_activeViewContainer;
     DolphinViewContainer* m_activeViewContainer;

-    QVBoxLayout* m_centralWidgetLayout;
-    int m_id;
-
-    int m_tabIndex;
-    QList<DolphinTabPage*> m_viewTab;

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

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

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

+
+    TerminalPanel* m_terminalPanel;
+    PlacesPanel* m_placesPanel;
+    bool m_tearDownFromPlacesRequested;

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


@@ -578,10 +534,5 @@ inline KNewFileMenu* DolphinMainWindow::newFileMenu() const
     return m_newFileMenu;
 }
 
     return m_newFileMenu;
 }
 

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

 #endif // DOLPHIN_MAINWINDOW_H
 
 #endif // DOLPHIN_MAINWINDOW_H