X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/df75b3130473c72b458e551d2f431e6ceb3039e2..40cc5f665d:/src/dolphinmainwindow.h diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index fbe926cef..e7355e3ed 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -10,12 +10,13 @@ #define DOLPHIN_MAINWINDOW_H #include "dolphintabwidget.h" -#include +#include "selectionmode/bottombar.h" +#include "config-dolphin.h" #include #include #include -#ifdef HAVE_BALOO +#if HAVE_BALOO #include "panels/information/informationpanel.h" #endif @@ -38,7 +39,6 @@ class KFileItem; class KFileItemList; class KJob; class KNewFileMenu; -class KHelpMenu; class KToolBarPopupAction; class QToolButton; class PlacesPanel; @@ -47,6 +47,9 @@ class TerminalPanel; namespace KIO { class OpenUrlJob; } +namespace SelectionMode { + class ActionTextHelper; +} /** * @short Main window for Dolphin. @@ -138,6 +141,8 @@ public Q_SLOTS: */ void activateWindow(); + bool isActiveWindow(); + /** * Determines if a URL is open in any tab. * @note Use of QString instead of QUrl is required to be callable via DBus. @@ -147,6 +152,15 @@ public Q_SLOTS: */ bool isUrlOpen(const QString &url); + /** + * Determines if a URL or it's parent is open in any tab. + * @note Use of QString instead of QUrl is required to be callable via DBus. + * + * @param url URL to look for + * @returns true if url or it's parent is currently open in a tab, false otherwise. + */ + bool isUrlOrParentOpen(const QString &url); + /** * Pastes the clipboard data into the currently selected folder @@ -233,11 +247,6 @@ protected: /** @see KMainWindow::readProperties() */ void readProperties(const KConfigGroup& group) override; - /** Handles QWhatsThisClickedEvent and passes all others on. */ - bool event(QEvent* event) override; - /** Handles QWhatsThisClickedEvent and passes all others on. */ - bool eventFilter(QObject*, QEvent*) override; - /** Sets a sane initial window size **/ QSize sizeHint() const override; @@ -302,6 +311,9 @@ private Q_SLOTS: */ void updatePasteAction(); + /** Calls DolphinViewContainer::setSelectionMode() for m_activeViewContainer. */ + void slotSetSelectionMode(bool enabled, SelectionMode::BottomBar::Contents bottomBarContents); + /** Selects all items from the active view. */ void selectAll(); @@ -322,6 +334,12 @@ private Q_SLOTS: /** Dedicated action to open the stash:/ ioslave in split view. */ void toggleSplitStash(); + /** Copies all selected items to the inactive view. */ + void copyToInactiveSplitView(); + + /** Moves all selected items to the inactive view. */ + void moveToInactiveSplitView(); + /** Reloads the currently active view. */ void reloadView(); @@ -331,6 +349,8 @@ private Q_SLOTS: void enableStopAction(); void disableStopAction(); + void toggleSelectionMode(); + void showFilterBar(); void toggleFilterBar(); @@ -399,6 +419,12 @@ private Q_SLOTS: /** Opens a terminal window for the current location. */ void openTerminal(); + /** Opens terminal windows for the selected items' locations. */ + void openTerminalHere(); + + /** Opens a terminal window for the URL. */ + void openTerminalJob(const QUrl& url); + /** Focus a Terminal Panel. */ void focusTerminalPanel(); @@ -475,14 +501,11 @@ private Q_SLOTS: * @pos Position in screen coordinates. * @item File item context. If item is null, the context menu * should be applied to \a url. + * @selectedItems The selected items for which the context menu + * is opened. This list generally includes \a item. * @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 QPoint& pos, - const KFileItem& item, - const QUrl& url, - const QList& customActions); + void openContextMenu(const QPoint& pos, const KFileItem& item, const KFileItemList &selectedItems, const QUrl& url); /** * Updates the menu that is by default at the right end of the toolbar. @@ -671,7 +694,6 @@ private: }; KNewFileMenu* m_newFileMenu; - KHelpMenu* m_helpMenu; DolphinTabWidget* m_tabWidget; DolphinViewContainer* m_activeViewContainer; @@ -679,10 +701,7 @@ private: DolphinRemoteEncoding* m_remoteEncoding; QPointer m_settingsDialog; DolphinBookmarkHandler* m_bookmarkHandler; - - // Members for the toolbar menu that is shown when the menubar is hidden: - QToolButton* m_controlButton; - QTimer* m_updateToolBarTimer; + SelectionMode::ActionTextHelper* m_actionTextHelper; KIO::OpenUrlJob *m_lastHandleUrlOpenJob; @@ -696,6 +715,7 @@ private: QMenu m_searchTools; KFileItemActions m_fileItemActions; + friend class DolphinMainWindowTest; }; inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const