X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/41156288b25b058b1f52f9c36de98eee43a07f7d..bd47eb2e6d:/src/dolphinmainwindow.h diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index 1bce50bc6..634c2a9e7 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -46,6 +46,8 @@ class KJob; class KNewFileMenu; class QToolButton; class QIcon; +class PlacesPanel; +class TerminalPanel; /** * @short Main window for Dolphin. @@ -90,6 +92,8 @@ public: */ KNewFileMenu* newFileMenu() const; + void setTabsToHomeIfMountPathOpen(const QString& mountPath); + public slots: /** * Pastes the clipboard data into the currently selected folder @@ -225,7 +229,6 @@ private slots: void toggleSplitView(); /** Dedicated action to open the stash:/ ioslave in split view. */ - void toggleSplitStash(); /** Reloads the currently active view. */ @@ -268,28 +271,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(); @@ -421,11 +413,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(); @@ -500,6 +515,10 @@ private: QTimer* m_updateToolBarTimer; KIO::Job* m_lastHandleUrlStatJob; + + TerminalPanel* m_terminalPanel; + PlacesPanel* m_placesPanel; + bool m_tearDownFromPlacesRequested; }; inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const @@ -518,3 +537,4 @@ inline int DolphinMainWindow::getId() const } #endif // DOLPHIN_MAINWINDOW_H +