X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/caf49dafa557caa9bd985702a240284348c82b40..6b00c8b911ef0ea6a31caf7b0d2f405460d33e25:/src/dolphinviewcontainer.h diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h index f78f85e55..7d5e87c32 100644 --- a/src/dolphinviewcontainer.h +++ b/src/dolphinviewcontainer.h @@ -7,8 +7,9 @@ #ifndef DOLPHINVIEWCONTAINER_H #define DOLPHINVIEWCONTAINER_H -#include "config-kactivities.h" +#include "config-dolphin.h" #include "dolphinurlnavigator.h" +#include "selectionmode/bottombar.h" #include "views/dolphinview.h" #include @@ -19,17 +20,24 @@ #include #include -#ifdef HAVE_KACTIVITIES -namespace KActivities { - class ResourceInstance; +#if HAVE_KACTIVITIES +namespace KActivities +{ +class ResourceInstance; } #endif class FilterBar; class KMessageWidget; +class QAction; +class QGridLayout; class QUrl; class DolphinSearchBox; class DolphinStatusBar; +namespace SelectionMode +{ +class TopBar; +} /** * @short Represents a view for the directory content @@ -48,14 +56,9 @@ class DolphinViewContainer : public QWidget Q_OBJECT public: - enum MessageType - { - Information, - Warning, - Error - }; - - DolphinViewContainer(const QUrl& url, QWidget* parent); + enum MessageType { Information, Warning, Error }; + + DolphinViewContainer(const QUrl &url, QWidget *parent); ~DolphinViewContainer() override; /** @@ -81,8 +84,8 @@ public: QString currentSearchText() const; - const DolphinStatusBar* statusBar() const; - DolphinStatusBar* statusBar(); + const DolphinStatusBar *statusBar() const; + DolphinStatusBar *statusBar(); /** * @return An UrlNavigator that is controlling this view @@ -116,8 +119,8 @@ public: */ DolphinUrlNavigator *urlNavigatorInternalWithHistory(); - const DolphinView* view() const; - DolphinView* view(); + const DolphinView *view() const; + DolphinView *view(); /** * @param urlNavigator The UrlNavigator that is supposed to control @@ -131,11 +134,29 @@ public: */ void disconnectUrlNavigator(); + /** + * Sets a selection mode that is useful for quick and easy selecting or deselecting of files. + * This method is the central authority about enabling or disabling selection mode: + * All other classes that want to enable or disable selection mode should trigger a call of this method. + * + * This method sets the selection mode for the view of this viewContainer and sets the visibility of the + * selection mode top and bottom bar which also belong to this viewContainer. + * + * @param enabled Whether to enable or disable selection mode. + * @param actionCollection The collection of actions from which the actions on the bottom bar are retrieved. + * @param bottomBarContents The contents the bar is supposed to show after this call. + */ + void setSelectionModeEnabled(bool enabled, + KActionCollection *actionCollection = nullptr, + SelectionMode::BottomBar::Contents bottomBarContents = SelectionMode::BottomBar::Contents::GeneralContents); + /** @see setSelectionModeEnabled() */ + bool isSelectionModeEnabled() const; + /** * Shows the message \msg with the given type non-modal above * the view-content. */ - void showMessage(const QString& msg, MessageType type); + void showMessage(const QString &msg, MessageType type); /** * Refreshes the view container to get synchronized with the (updated) Dolphin settings. @@ -145,7 +166,6 @@ public: /** Returns true, if the filter bar is visible. */ bool isFilterBarVisible() const; - /** Returns true if the search mode is enabled. */ bool isSearchModeEnabled() const; @@ -182,6 +202,7 @@ public: */ void disableUrlNavigatorSelectionRequests(); void enableUrlNavigatorSelectionRequests(); + void clearFilterBar(); public Q_SLOTS: /** @@ -191,7 +212,7 @@ public Q_SLOTS: * are emitted. * @see DolphinViewContainer::urlNavigator() */ - void setUrl(const QUrl& url); + void setUrl(const QUrl &url); /** * Popups the filter bar above the status bar if \a visible is true. @@ -206,6 +227,9 @@ public Q_SLOTS: */ void setSearchModeEnabled(bool enabled); + /** Used to notify the m_selectionModeBottomBar that there is no other ViewContainer in the tab. */ + void slotSplitTabDisabled(); + Q_SIGNALS: /** * Is emitted whenever the filter bar has changed its visibility state. @@ -216,6 +240,8 @@ Q_SIGNALS: */ void searchModeEnabledChanged(bool enabled); + void selectionModeChanged(bool enabled); + /** * Is emitted when the write state of the folder has been changed. The application * should disable all actions like "Create New..." that depend on the write @@ -284,7 +310,7 @@ private Q_SLOTS: * Is called if the URL set by DolphinView::setUrl() represents * a file and not a directory. Takes care to activate the file. */ - void slotUrlIsFileError(const QUrl& url); + void slotUrlIsFileError(const QUrl &url); /** * Handles clicking on an item. If the item is a directory, the @@ -297,13 +323,13 @@ private Q_SLOTS: * Handles activation of multiple files. The files get started by * the corresponding applications. */ - void slotItemsActivated(const KFileItemList& items); + void slotItemsActivated(const KFileItemList &items); /** * Shows the information for the item \a item inside the statusbar. If the * item is null, the default statusbar information is shown. */ - void showItemInfo(const KFileItem& item); + void showItemInfo(const KFileItem &item); void closeFilterBar(); @@ -311,7 +337,7 @@ private Q_SLOTS: * Filters the currently shown items by \a nameFilter. All items * which contain the given filter string will be shown. */ - void setNameFilter(const QString& nameFilter); + void setNameFilter(const QString &nameFilter); /** * Marks the view container as active @@ -323,25 +349,25 @@ private Q_SLOTS: * Is invoked if the signal urlAboutToBeChanged() from the URL navigator * is emitted. Tries to save the view-state. */ - void slotUrlNavigatorLocationAboutToBeChanged(const QUrl& url); + void slotUrlNavigatorLocationAboutToBeChanged(const QUrl &url); /** * Restores the current view to show \a url and assures * that the root URL of the view is respected. */ - void slotUrlNavigatorLocationChanged(const QUrl& url); + void slotUrlNavigatorLocationChanged(const QUrl &url); /** * @see KUrlNavigator::urlSelectionRequested */ - void slotUrlSelectionRequested(const QUrl& url); + void slotUrlSelectionRequested(const QUrl &url); /** * Is invoked when a redirection is done and changes the * URL of the URL navigator to \a newUrl without triggering * a reloading of the directory. */ - void redirect(const QUrl& oldUrl, const QUrl& newUrl); + void redirect(const QUrl &oldUrl, const QUrl &newUrl); /** Requests the focus for the view \a m_view. */ void requestFocus(); @@ -363,7 +389,7 @@ private Q_SLOTS: /** * Slot that calls showMessage(msg, Error). */ - void showErrorMessage(const QString& msg); + void showErrorMessage(const QString &msg); /** * Is invoked when a KFilePlacesModel has been changed @@ -373,14 +399,15 @@ private Q_SLOTS: void slotHiddenFilesShownChanged(bool showHiddenFiles); void slotSortHiddenLastChanged(bool hiddenLast); + void slotCurrentDirectoryRemoved(); - void slotOpenUrlFinished(KJob* job); + void slotOpenUrlFinished(KJob *job); private: /** * @return True if the URL protocol is a search URL (e. g. baloosearch:// or filenamesearch://). */ - bool isSearchUrl(const QUrl& url) const; + bool isSearchUrl(const QUrl &url) const; /** * Saves the state of the current view: contents position, @@ -394,8 +421,13 @@ private: */ void tryRestoreViewState(); + /** + * @return Path of nearest existing ancestor directory. + */ + QString getNearestExistingAncestorOfPath(const QString &path) const; + private: - QVBoxLayout* m_topLayout; + QGridLayout *m_topLayout; /** * The internal UrlNavigator which is never visible to the user. @@ -410,17 +442,25 @@ private: * Otherwise it's one of the UrlNavigators visible in the toolbar. */ QPointer m_urlNavigatorConnected; - DolphinSearchBox* m_searchBox; + + DolphinSearchBox *m_searchBox; bool m_searchModeEnabled; - KMessageWidget* m_messageWidget; - DolphinView* m_view; + KMessageWidget *m_messageWidget; + + /// A bar shown at the top of the view to signify that selection mode is currently active. + SelectionMode::TopBar *m_selectionModeTopBar; + + DolphinView *m_view; + + FilterBar *m_filterBar; - FilterBar* m_filterBar; + /// A bar shown at the bottom of the view whose contents depend on what the user is currently doing. + SelectionMode::BottomBar *m_selectionModeBottomBar; - DolphinStatusBar* m_statusBar; - QTimer* m_statusBarTimer; // Triggers a delayed update - QElapsedTimer m_statusBarTimestamp; // Time in ms since last update + DolphinStatusBar *m_statusBar; + QTimer *m_statusBarTimer; // Triggers a delayed update + QElapsedTimer m_statusBarTimestamp; // Time in ms since last update bool m_autoGrabFocus; /** * The visual state to be applied to the next UrlNavigator that gets @@ -428,9 +468,9 @@ private: */ std::unique_ptr m_urlNavigatorVisualState; -#ifdef HAVE_KACTIVITIES +#if HAVE_KACTIVITIES private: - KActivities::ResourceInstance * m_activityResourceInstance; + KActivities::ResourceInstance *m_activityResourceInstance; #endif };