X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/1b4572dac9fb529d31b786f93e4f02c6f8aeeb21..6e05c6365eec005caa3198a13bb071c782b8b192:/src/dolphinmainwindow.h diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index 36a16e518..637f41f21 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -23,20 +23,18 @@ #define DOLPHIN_MAINWINDOW_H #include - #include #include #include -#include -#include +#include #include -#include +#include +#include typedef KIO::FileUndoManager::CommandType CommandType; class DolphinViewActionHandler; -class DolphinApplication; class DolphinSettingsDialog; class DolphinViewContainer; class DolphinRemoteEncoding; @@ -47,6 +45,8 @@ class KJob; class KNewFileMenu; class QToolButton; class QIcon; +class PlacesPanel; +class TerminalPanel; /** * @short Main window for Dolphin. @@ -57,12 +57,10 @@ class DolphinMainWindow: public KXmlGuiWindow { Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.kde.dolphin.MainWindow") - Q_PROPERTY(int id READ getId SCRIPTABLE true) - friend class DolphinApplication; public: DolphinMainWindow(); - virtual ~DolphinMainWindow(); + ~DolphinMainWindow() override; /** * Returns the currently active view. @@ -73,17 +71,18 @@ public: 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 &dirs); + void openDirectories(const QList &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& files); + void openFiles(const QList& files, bool splitView); /** * Returns the 'Create New...' sub menu which also can be shared @@ -91,6 +90,8 @@ public: */ KNewFileMenu* newFileMenu() const; + void setTabsToHomeIfMountPathOpen(const QString& mountPath); + public slots: /** * Pastes the clipboard data into the currently selected folder @@ -99,11 +100,6 @@ public slots: */ 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 @@ -147,16 +143,16 @@ signals: protected: /** @see QWidget::showEvent() */ - virtual void showEvent(QShowEvent* event); + void showEvent(QShowEvent* event) override; /** @see QMainWindow::closeEvent() */ - virtual void closeEvent(QCloseEvent* event); + void closeEvent(QCloseEvent* event) override; /** @see KMainWindow::saveProperties() */ - virtual void saveProperties(KConfigGroup& group); + void saveProperties(KConfigGroup& group) override; /** @see KMainWindow::readProperties() */ - virtual void readProperties(const KConfigGroup& group); + void readProperties(const KConfigGroup& group) override; private slots: /** @@ -225,6 +221,9 @@ private slots: */ void toggleSplitView(); + /** Dedicated action to open the stash:/ ioslave in split view. */ + void toggleSplitStash(); + /** Reloads the currently active view. */ void reloadView(); @@ -253,6 +252,12 @@ private slots: */ void togglePanelLockState(); + /** + * 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 slotTerminalPanelVisibilityChanged(); + /** Goes back one step of the URL history. */ void goBack(); @@ -265,28 +270,17 @@ private slots: /** 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(); @@ -312,9 +306,6 @@ private slots: */ 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. @@ -338,11 +329,6 @@ private slots: */ void openNewTab(const QUrl& url); - /** - * Opens a new tab showing the URL \a url and activates the tab. - */ - void openNewActivatedTab(const QUrl& url); - /** * Opens the selected folder in a new tab. */ @@ -353,6 +339,11 @@ private slots: */ void openInNewWindow(); + /** + * Show the target of the selected symlink + */ + void showTarget(); + /** * Indicates in the statusbar that the execution of the command \a command * has been finished. @@ -395,12 +386,6 @@ 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 @@ -432,6 +417,34 @@ private slots: */ 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 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(); @@ -488,24 +501,27 @@ private: { public: UndoUiInterface(); - virtual ~UndoUiInterface(); - virtual void jobError(KIO::Job* job); + ~UndoUiInterface() override; + void jobError(KIO::Job* job) override; }; KNewFileMenu* m_newFileMenu; DolphinTabWidget* m_tabWidget; DolphinViewContainer* m_activeViewContainer; - int m_id; DolphinViewActionHandler* m_actionHandler; DolphinRemoteEncoding* m_remoteEncoding; - QWeakPointer m_settingsDialog; + QPointer 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; + + TerminalPanel* m_terminalPanel; + PlacesPanel* m_placesPanel; + bool m_tearDownFromPlacesRequested; }; inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const @@ -518,10 +534,5 @@ inline KNewFileMenu* DolphinMainWindow::newFileMenu() const return m_newFileMenu; } -inline int DolphinMainWindow::getId() const -{ - return m_id; -} - #endif // DOLPHIN_MAINWINDOW_H