X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/9d73c1ad7f123dfebbd1f0fade8cf8a2e3cac444..cef2c67613ef07a350d18f690b3b5960b9dfda12:/src/dolphinviewcontainer.h diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h index bc58531a2..5207d2d35 100644 --- a/src/dolphinviewcontainer.h +++ b/src/dolphinviewcontainer.h @@ -20,20 +20,19 @@ #ifndef DOLPHINVIEWCONTAINER_H #define DOLPHINVIEWCONTAINER_H +#include "config-kactivities.h" +#include "views/dolphinview.h" + +#include #include -#include -#include #include - #include #include +#include #include -#include -#include - -#ifdef KActivities_FOUND +#ifdef HAVE_KACTIVITIES namespace KActivities { class ResourceInstance; } @@ -41,7 +40,7 @@ namespace KActivities { class FilterBar; class KMessageWidget; -class KUrl; +class QUrl; class KUrlNavigator; class DolphinSearchBox; class DolphinStatusBar; @@ -70,14 +69,14 @@ public: Error }; - DolphinViewContainer(const KUrl& url, QWidget* parent); - virtual ~DolphinViewContainer(); + DolphinViewContainer(const QUrl& url, QWidget* parent); + ~DolphinViewContainer() override; /** * Returns the current active URL, where all actions are applied. * The URL navigator is synchronized with this URL. */ - KUrl url() const; + QUrl url() const; /** * If \a active is true, the view container will marked as active. The active @@ -94,6 +93,8 @@ public: void setAutoGrabFocus(bool grab); bool autoGrabFocus() const; + QString currentSearchText() const; + const DolphinStatusBar* statusBar() const; DolphinStatusBar* statusBar(); @@ -117,11 +118,8 @@ public: /** Returns true, if the filter bar is visible. */ bool isFilterBarVisible() const; - /** - * Enables the search mode, if \p enabled is true. In the search mode the URL navigator - * will be hidden and replaced by a line editor that allows to enter a search term. - */ - void setSearchModeEnabled(bool enabled); + + /** Returns true if the search mode is enabled. */ bool isSearchModeEnabled() const; /** @@ -130,6 +128,18 @@ public: */ QString placesText() const; + /** + * Reload the view of this container. This will also hide messages in a messagewidget. + */ + void reload(); + + /** + * @return Returns a Caption suitable for display to the user. It is + * calculated depending on settings, if a search is active and other + * factors. + */ + QString caption() const; + public slots: /** * Sets the current active URL, where all actions are applied. The @@ -138,7 +148,7 @@ public slots: * are emitted. * @see DolphinViewContainer::urlNavigator() */ - void setUrl(const KUrl& url); + void setUrl(const QUrl& url); /** * Popups the filter bar above the status bar if \a visible is true. @@ -147,11 +157,21 @@ public slots: */ void setFilterBarVisible(bool visible); + /** + * Enables the search mode, if \p enabled is true. In the search mode the URL navigator + * will be hidden and replaced by a line editor that allows to enter a search term. + */ + void setSearchModeEnabled(bool enabled); + signals: /** * Is emitted whenever the filter bar has changed its visibility state. */ void showFilterBarChanged(bool shown); + /** + * Is emitted whenever the search mode has changed its state. + */ + void searchModeEnabledChanged(bool enabled); /** * Is emitted when the write state of the folder has been changed. The application @@ -205,7 +225,7 @@ private 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 KUrl& url); + void slotUrlIsFileError(const QUrl& url); /** * Handles clicking on an item. If the item is a directory, the @@ -240,36 +260,29 @@ private slots: */ void activate(); - /** - * Is invoked if the signal urlAboutToBeChanged() from the DolphinView - * is emitted. Tries to save the view-state. - */ - void slotViewUrlAboutToBeChanged(const KUrl& url); - /** * Is invoked if the signal urlAboutToBeChanged() from the URL navigator * is emitted. Tries to save the view-state. */ - void slotUrlNavigatorLocationAboutToBeChanged(const KUrl& 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 KUrl& url); + void slotUrlNavigatorLocationChanged(const QUrl& url); /** - * Is connected with the URL navigator and drops the URLs - * above the destination \a destination. + * @see KUrlNavigator::urlSelectionRequested */ - void dropUrls(const KUrl& destination, QDropEvent* event); + 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 KUrl& oldUrl, const KUrl& newUrl); + void redirect(const QUrl& oldUrl, const QUrl& newUrl); /** Requests the focus for the view \a m_view. */ void requestFocus(); @@ -278,9 +291,7 @@ private slots: * Saves the currently used URL completion mode of * the URL navigator. */ - void saveUrlCompletionMode(KGlobalSettings::Completion completion); - - void slotHistoryChanged(); + void saveUrlCompletionMode(KCompletion::CompletionMode completion); void slotReturnPressed(); @@ -305,9 +316,9 @@ private slots: private: /** - * @return True if the URL protocol is a search URL (e. g. nepomuksearch:// or filenamesearch://). + * @return True if the URL protocol is a search URL (e. g. baloosearch:// or filenamesearch://). */ - bool isSearchUrl(const KUrl& url) const; + bool isSearchUrl(const QUrl& url) const; /** * Saves the state of the current view: contents position, @@ -315,10 +326,19 @@ private: */ void saveViewState(); + /** + * Restores the state of the current view iff the URL navigator contains a + * non-empty location state. + */ + void tryRestoreViewState(); + private: QVBoxLayout* m_topLayout; + QWidget* m_navigatorWidget; KUrlNavigator* m_urlNavigator; + QPushButton* m_emptyTrashButton; DolphinSearchBox* m_searchBox; + bool m_searchModeEnabled; KMessageWidget* m_messageWidget; DolphinView* m_view; @@ -330,7 +350,7 @@ private: QElapsedTimer m_statusBarTimestamp; // Time in ms since last update bool m_autoGrabFocus; -#ifdef KActivities_FOUND +#ifdef HAVE_KACTIVITIES private: KActivities::ResourceInstance * m_activityResourceInstance; #endif