X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/67ebd66f94356b4e66005b1072919cb7b5e858bb..8a0003bfbcc87068737ab1e2b94ae7b2ba73eca1:/src/dolphinviewcontainer.h diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h index ee1193f19..a7767ab3f 100644 --- a/src/dolphinviewcontainer.h +++ b/src/dolphinviewcontainer.h @@ -7,10 +7,10 @@ #ifndef DOLPHINVIEWCONTAINER_H #define DOLPHINVIEWCONTAINER_H -#include "config-kactivities.h" +#include "config-dolphin.h" +#include "dolphinurlnavigator.h" #include "views/dolphinview.h" -#include #include #include #include @@ -28,7 +28,6 @@ namespace KActivities { class FilterBar; class KMessageWidget; class QUrl; -class KUrlNavigator; class DolphinSearchBox; class DolphinStatusBar; @@ -85,12 +84,53 @@ public: const DolphinStatusBar* statusBar() const; DolphinStatusBar* statusBar(); - const KUrlNavigator* urlNavigator() const; - KUrlNavigator* urlNavigator(); + /** + * @return An UrlNavigator that is controlling this view + * or nullptr if there is none. + * @see connectUrlNavigator() + * @see disconnectUrlNavigator() + * + * Use urlNavigatorInternalWithHistory() if you want to access the history. + * @see urlNavigatorInternalWithHistory() + */ + const DolphinUrlNavigator *urlNavigator() const; + /** + * @return An UrlNavigator that is controlling this view + * or nullptr if there is none. + * @see connectUrlNavigator() + * @see disconnectUrlNavigator() + * + * Use urlNavigatorInternalWithHistory() if you want to access the history. + * @see urlNavigatorInternalWithHistory() + */ + DolphinUrlNavigator *urlNavigator(); + + /** + * @return An UrlNavigator that contains this view's history. + * Use urlNavigator() instead when not accessing the history. + */ + const DolphinUrlNavigator *urlNavigatorInternalWithHistory() const; + /** + * @return An UrlNavigator that contains this view's history. + * Use urlNavigator() instead when not accessing the history. + */ + DolphinUrlNavigator *urlNavigatorInternalWithHistory(); const DolphinView* view() const; DolphinView* view(); + /** + * @param urlNavigator The UrlNavigator that is supposed to control + * this view. + */ + void connectUrlNavigator(DolphinUrlNavigator *urlNavigator); + + /** + * Disconnects the navigator that is currently controlling the view. + * This method completely reverses connectUrlNavigator(). + */ + void disconnectUrlNavigator(); + /** * Shows the message \msg with the given type non-modal above * the view-content. @@ -134,7 +174,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 @@ -157,7 +206,7 @@ public slots: */ void setSearchModeEnabled(bool enabled); -signals: +Q_SIGNALS: /** * Is emitted whenever the filter bar has changed its visibility state. */ @@ -174,7 +223,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 @@ -226,7 +291,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 @@ -281,14 +346,6 @@ private slots: /** Requests the focus for the view \a m_view. */ void requestFocus(); - /** - * Saves the currently used URL completion mode of - * the URL navigator. - */ - void saveUrlCompletionMode(KCompletion::CompletionMode completion); - - void slotReturnPressed(); - /** * Gets the search URL from the searchbox and starts searching. */ @@ -308,6 +365,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://). @@ -328,9 +396,20 @@ private: private: QVBoxLayout* m_topLayout; - QWidget* m_navigatorWidget; - KUrlNavigator* m_urlNavigator; - QPushButton* m_emptyTrashButton; + + /** + * 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. + */ + std::unique_ptr m_urlNavigator; + + /** + * 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; DolphinSearchBox* m_searchBox; bool m_searchModeEnabled; KMessageWidget* m_messageWidget; @@ -343,6 +422,11 @@ private: 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 private: