X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/b6fc58c3c32b03f504a5f697b62c4834dc3f650a..40cc5f665d:/src/dolphinviewcontainer.h diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h index 77c734949..3ff575970 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,7 +20,7 @@ #include #include -#ifdef HAVE_KACTIVITIES +#if HAVE_KACTIVITIES namespace KActivities { class ResourceInstance; } @@ -27,10 +28,14 @@ namespace KActivities { class FilterBar; class KMessageWidget; +class QAction; +class QGridLayout; class QUrl; -class KUrlNavigator; class DolphinSearchBox; class DolphinStatusBar; +namespace SelectionMode { + class TopBar; +} /** * @short Represents a view for the directory content @@ -90,9 +95,9 @@ public: * or nullptr if there is none. * @see connectUrlNavigator() * @see disconnectUrlNavigator() - * - * Use urlNavigatorInternal() if you want to access the history. - * @see urlNavigatorInternal() + * + * Use urlNavigatorInternalWithHistory() if you want to access the history. + * @see urlNavigatorInternalWithHistory() */ const DolphinUrlNavigator *urlNavigator() const; /** @@ -100,9 +105,9 @@ public: * or nullptr if there is none. * @see connectUrlNavigator() * @see disconnectUrlNavigator() - * - * Use urlNavigatorInternal() if you want to access the history. - * @see urlNavigatorInternal() + * + * Use urlNavigatorInternalWithHistory() if you want to access the history. + * @see urlNavigatorInternalWithHistory() */ DolphinUrlNavigator *urlNavigator(); @@ -110,12 +115,12 @@ public: * @return An UrlNavigator that contains this view's history. * Use urlNavigator() instead when not accessing the history. */ - const DolphinUrlNavigator *urlNavigatorInternal() const; + const DolphinUrlNavigator *urlNavigatorInternalWithHistory() const; /** * @return An UrlNavigator that contains this view's history. * Use urlNavigator() instead when not accessing the history. */ - DolphinUrlNavigator *urlNavigatorInternal(); + DolphinUrlNavigator *urlNavigatorInternalWithHistory(); const DolphinView* view() const; DolphinView* view(); @@ -126,23 +131,33 @@ public: */ void connectUrlNavigator(DolphinUrlNavigator *urlNavigator); - inline void connectToInternalUrlNavigator() - { - connectUrlNavigator(m_urlNavigator); - } - /** - * Disconnects the navigator that is currently controling the view. + * Disconnects the navigator that is currently controlling the view. * This method completely reverses connectUrlNavigator(). */ 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. - * @return the KMessageWidget used to show the message */ - KMessageWidget *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. @@ -181,7 +196,16 @@ public: */ QString caption() const; -public slots: + /** + * Disable/enable the behavior of "select child when moving to parent folder" + * offered by KUrlNavigator. + * + * See KUrlNavigator::urlSelectionRequested + */ + void disableUrlNavigatorSelectionRequests(); + void enableUrlNavigatorSelectionRequests(); + +public Q_SLOTS: /** * Sets the current active URL, where all actions are applied. The * URL navigator is synchronized with this URL. The signals @@ -204,7 +228,10 @@ public slots: */ void setSearchModeEnabled(bool enabled); -signals: + /** 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. */ @@ -214,6 +241,8 @@ 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 @@ -221,7 +250,23 @@ signals: */ void writeStateChanged(bool isFolderWritable); -private slots: + /** + * Is emitted when the Caption has been changed. + * @see DolphinViewContainer::caption() + */ + void captionChanged(); + + /** + * Is emitted if a new tab should be opened in the background for the URL \a url. + */ + void tabRequested(const QUrl &url); + + /** + * Is emitted if a new tab should be opened for the URL \a url and set as active. + */ + void activeTabRequested(const QUrl &url); + +private Q_SLOTS: /** * Updates the number of items (= number of files + number of * directories) in the statusbar. If files are selected, the number @@ -244,8 +289,6 @@ private slots: void updateDirectorySortingProgress(int percent); - void updateNavigatorWidgetVisibility(); - /** * Updates the statusbar to show an undetermined progress with the correct * context information whether a searching or a directory loading is done. @@ -275,7 +318,7 @@ private slots: * directory is opened in the view. If the item is a file, the file * gets started by the corresponding application. */ - void slotItemActivated(const KFileItem& item); + void slotItemActivated(const KFileItem &item); /** * Handles activation of multiple files. The files get started by @@ -349,6 +392,17 @@ private slots: */ void showErrorMessage(const QString& msg); + /** + * Is invoked when a KFilePlacesModel has been changed + * @see DolphinPlacesModelSingleton::instance().placesModel() + */ + void slotPlacesModelChanged(); + + void slotHiddenFilesShownChanged(bool showHiddenFiles); + void slotSortHiddenLastChanged(bool hiddenLast); + + void slotOpenUrlFinished(KJob* job); + private: /** * @return True if the URL protocol is a search URL (e. g. baloosearch:// or filenamesearch://). @@ -368,36 +422,48 @@ private: void tryRestoreViewState(); private: - QVBoxLayout* m_topLayout; - QWidget* m_navigatorWidget; + QGridLayout *m_topLayout; /** - * The UrlNavigator within the m_navigatorWidget. m_urlNavigator is - * used even when another UrlNavigator is controlling the view to keep - * track of this view containers history. + * The internal UrlNavigator which is never visible to the user. + * m_urlNavigator is used even when another UrlNavigator is controlling + * the view to keep track of this object's history. */ - DolphinUrlNavigator *m_urlNavigator; + std::unique_ptr m_urlNavigator; /** - * The UrlNavigator that is currently connected to the view. This could - * either be m_urlNavigator, the urlNavigator in the toolbar or nullptr. + * The UrlNavigator that is currently connected to the view. + * This is a nullptr if no UrlNavigator is connected. + * Otherwise it's one of the UrlNavigators visible in the toolbar. */ QPointer m_urlNavigatorConnected; - QPushButton* m_emptyTrashButton; + DolphinSearchBox* m_searchBox; bool m_searchModeEnabled; + 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; + /// 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 bool m_autoGrabFocus; + /** + * The visual state to be applied to the next UrlNavigator that gets + * connected to this ViewContainer. + */ + std::unique_ptr m_urlNavigatorVisualState; -#ifdef HAVE_KACTIVITIES +#if HAVE_KACTIVITIES private: KActivities::ResourceInstance * m_activityResourceInstance; #endif