X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/f23e9496f303995557b744c03178f5dbd9b35016..bd47eb2e6d:/src/dolphinviewcontainer.h diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h index 7aea304b8..41c8f0b04 100644 --- a/src/dolphinviewcontainer.h +++ b/src/dolphinviewcontainer.h @@ -21,8 +21,7 @@ #define DOLPHINVIEWCONTAINER_H #include -#include -#include +#include #include #include @@ -31,9 +30,17 @@ #include #include +#include + +#ifdef KF5Activities_FOUND +namespace KActivities { + class ResourceInstance; +} +#endif class FilterBar; -class KUrl; +class KMessageWidget; +class QUrl; class KUrlNavigator; class DolphinSearchBox; class DolphinStatusBar; @@ -55,14 +62,21 @@ class DolphinViewContainer : public QWidget Q_OBJECT public: - DolphinViewContainer(const KUrl& url, QWidget* parent); + enum MessageType + { + Information, + Warning, + Error + }; + + DolphinViewContainer(const QUrl& url, QWidget* parent); virtual ~DolphinViewContainer(); /** * 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 @@ -71,6 +85,14 @@ public: void setActive(bool active); bool isActive() const; + /** + * If \a grab is set to true, the container automatically grabs the focus + * as soon as the URL has been changed. Per default the grabbing + * of the focus is enabled. + */ + void setAutoGrabFocus(bool grab); + bool autoGrabFocus() const; + const DolphinStatusBar* statusBar() const; DolphinStatusBar* statusBar(); @@ -80,13 +102,16 @@ public: const DolphinView* view() const; DolphinView* view(); - const DolphinSearchBox* searchBox() const; - DolphinSearchBox* searchBox(); + /** + * Shows the message \msg with the given type non-modal above + * the view-content. + */ + void showMessage(const QString& msg, MessageType type); /** * Refreshes the view container to get synchronized with the (updated) Dolphin settings. */ - void refresh(); + void readSettings(); /** Returns true, if the filter bar is visible. */ bool isFilterBarVisible() const; @@ -98,6 +123,17 @@ public: void setSearchModeEnabled(bool enabled); bool isSearchModeEnabled() const; + /** + * @return Text that should be used for the current URL when creating + * a new place. + */ + QString placesText() const; + + /** + * Reload the view of this container. This will also hide messages in a messagewidget. + */ + void reload(); + public slots: /** * Sets the current active URL, where all actions are applied. The @@ -106,7 +142,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. @@ -128,13 +164,6 @@ signals: */ void writeStateChanged(bool isFolderWritable); - /** - * Is emitted if the search mode has been enabled or disabled. - * (see DolphinViewContainer::setSearchModeEnabled() and - * DolphinViewContainer::isSearchModeEnabled()) - */ - void searchModeChanged(bool enabled); - private slots: /** * Updates the number of items (= number of files + number of @@ -154,33 +183,46 @@ private slots: */ void updateStatusBar(); - void updateProgress(int percent); + void updateDirectoryLoadingProgress(int percent); + + void updateDirectorySortingProgress(int percent); /** * Updates the statusbar to show an undetermined progress with the correct * context information whether a searching or a directory loading is done. */ - void slotStartedPathLoading(); + void slotDirectoryLoadingStarted(); /** * Assures that the viewport position is restored and updates the * statusbar to reflect the current content. */ - void slotFinishedPathLoading(); + void slotDirectoryLoadingCompleted(); + + /** + * Updates the statusbar to show, that the directory loading has + * been canceled. + */ + void slotDirectoryLoadingCanceled(); + + /** + * 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); /** * Handles clicking on an item. If the item is a directory, the * directory is opened in the view. If the item is a file, the file * gets started by the corresponding application. */ - void slotItemTriggered(const KFileItem& item); + void slotItemActivated(const KFileItem& item); /** - * Opens a the file \a url by opening the corresponding application. - * Is connected with the signal urlIsFile() from DolphinDirLister and will - * get invoked if the user manually has entered a file into the URL navigator. + * Handles activation of multiple files. The files get started by + * the corresponding applications. */ - void openFile(const KUrl& url); + void slotItemsActivated(const KFileItemList& items); /** * Shows the information for the item \a item inside the statusbar. If the @@ -188,15 +230,6 @@ private slots: */ void showItemInfo(const KFileItem& item); - /** Shows the information \a msg inside the statusbar. */ - void showInfoMessage(const QString& msg); - - /** Shows the error message \a msg inside the statusbar. */ - void showErrorMessage(const QString& msg); - - /** Shows the "operation completed" message \a msg inside the statusbar. */ - void showOperationCompletedMessage(const QString& msg); - void closeFilterBar(); /** @@ -211,36 +244,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(); @@ -249,28 +275,34 @@ private slots: * Saves the currently used URL completion mode of * the URL navigator. */ - void saveUrlCompletionMode(KGlobalSettings::Completion completion); + void saveUrlCompletionMode(KCompletion::CompletionMode completion); - void slotHistoryChanged(); + void slotReturnPressed(); /** * Gets the search URL from the searchbox and starts searching. - * @param text Text the user has entered into the searchbox. */ - void startSearching(const QString& text); + void startSearching(); void closeSearchBox(); /** * Stops the loading of a directory. Is connected with the "stopPressed" signal * from the statusbar. */ - void stopLoading(); + void stopDirectoryLoading(); + + void slotStatusBarZoomLevelChanged(int zoomLevel); + + /** + * Slot that calls showMessage(msg, Error). + */ + void showErrorMessage(const QString& msg); 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, @@ -278,10 +310,17 @@ 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; KUrlNavigator* m_urlNavigator; DolphinSearchBox* m_searchBox; + KMessageWidget* m_messageWidget; DolphinView* m_view; @@ -290,6 +329,12 @@ private: DolphinStatusBar* m_statusBar; QTimer* m_statusBarTimer; // Triggers a delayed update QElapsedTimer m_statusBarTimestamp; // Time in ms since last update + bool m_autoGrabFocus; + +#ifdef KF5Activities_FOUND +private: + KActivities::ResourceInstance * m_activityResourceInstance; +#endif }; #endif // DOLPHINVIEWCONTAINER_H