X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/6f5f07d391043175d955d62bd09c77af14164faf..846b21edf57e7aeb83e84ee68e9f61c5981fbacd:/src/dolphinmainwindow.h diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index a165573a1..bddeba7b1 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -25,12 +25,16 @@ #include "dolphinview.h" #include "sidebarpage.h" -#include +#include + +#include +#include #include -#include +#include #include +class DolphinViewActionHandler; class DolphinApplication; class DolphinViewContainer; class KNewMenu; @@ -58,14 +62,14 @@ public: * having a split view setup, the nonactive view * is usually shown in darker colors. */ - inline DolphinViewContainer* activeViewContainer() const; + DolphinViewContainer* activeViewContainer() const; /** * Returns true, if the main window contains two instances * of a view container. The active view constainer can be * accessed by DolphinMainWindow::activeViewContainer(). */ - inline bool isSplit() const; + bool isSplit() const; /** * If the main window contains two instances of a view container @@ -79,7 +83,7 @@ public: void rename(const KUrl& oldUrl, const KUrl& newUrl); /** - * Refreshs the views of the main window by recreating them dependent from + * Refreshes the views of the main window by recreating them dependent from * the given Dolphin settings. */ void refreshViews(); @@ -88,19 +92,18 @@ public: * Returns the 'Create New...' sub menu which also can be shared * with other menus (e. g. a context menu). */ - inline KNewMenu* newMenu() const; + KNewMenu* newMenu() const; + + /** + * Returns the 'Show Menubar' action which can be shared with + * other menus (e. g. a context menu). + */ + KAction* showMenuBarAction() const; public slots: /** * Handles the dropping of URLs to the given - * destination. A context menu with the options - * 'Move Here', 'Copy Here', 'Link Here' and - * 'Cancel' is offered to the user. - * @param urls List of URLs which have been - * dropped. - * @param destination Destination URL, where the - * list or URLs should be moved, - * copied or linked to. + * destination. This is only called by the TreeViewSidebarPage. */ void dropUrls(const KUrl::List& urls, const KUrl& destination); @@ -108,7 +111,7 @@ public slots: /** * Returns the main window ID used through DBus. */ - inline int getId() const; + int getId() const; /** * Inform all affected dolphin components (sidebars, views) of an URL @@ -146,43 +149,26 @@ signals: /** * Is emitted if information of an item is requested to be shown e. g. in the sidebar. - * It the URL is empty, no item information request is pending. + * If item is null, no item information request is pending. */ - void requestItemInfo(const KUrl& url); + void requestItemInfo(const KFileItem& item); protected: - /** @see QMainWindow::closeEvent */ + /** @see QMainWindow::closeEvent() */ virtual void closeEvent(QCloseEvent* event); - /** - * This method is called when it is time for the app to save its - * properties for session management purposes. - */ - void saveProperties(KConfig*); + /** @see KMainWindow::saveProperties() */ + virtual void saveProperties(KConfigGroup& group); - /** - * This method is called when this app is restored. The KConfig - * object points to the session management config file that was saved - * with @ref saveProperties - */ - void readProperties(KConfig*); + /** @see KMainWindow::readProperties() */ + virtual void readProperties(const KConfigGroup& group); private slots: + void clearStatusBar(); + /** Updates the 'Create New...' sub menu. */ void updateNewMenu(); - /** - * Let the user input a name for the selected item(s) and trigger - * a renaming afterwards. - */ - void rename(); - - /** Moves the selected items of the active view to the trash. */ - void moveToTrash(); - - /** Deletes the selected items of the active view. */ - void deleteItems(); - /** * Opens the properties window for the selected items of the * active view. The properties windows shows information @@ -191,16 +177,10 @@ private slots: void properties(); /** - * Shows the error information of the job \a job + * Shows the error information from the places model * in the status bar. */ - void slotHandleJobError(KJob* job); - - /** - * Indicates in the status bar that the delete operation - * of the job \a job has been finished. - */ - void slotDeleteFileFinished(KJob* job); + void slotHandlePlacesError(const QString &message); /** * Updates the state of the 'Undo' menu action dependent @@ -242,14 +222,8 @@ private slots: */ void invertSelection(); - /** The current active view is switched to the icons mode. */ - void setIconsView(); - - /** The current active view is switched to the details mode. */ - void setDetailsView(); - - /** The current active view is switched to the column mode. */ - void setColumnView(); + /** The current active view is switched to a new view mode. */ + void setViewMode(QAction *); /** The sorting of the current view should be done by the name. */ void sortByName(); @@ -272,26 +246,11 @@ private slots: /** The sorting of the current view should be done by the type. */ void sortByType(); - /** Switches between an ascending and descending sorting order. */ - void toggleSortOrder(); + /** The sorting of the current view should be done by the rating. */ + void sortByRating(); - /** Switches between sorting by categories or not. */ - void toggleSortCategorization(); - - /** - * Clears any additional information for an item except for the - * name and the icon. - */ - void clearInfo(); - - /** Shows the MIME type as additional information for the item. */ - void showMimeInfo(); - - /** Shows the size as additional information for the item. */ - void showSizeInfo(); - - /** Shows the date as additional information for the item. */ - void showDateInfo(); + /** The sorting of the current view should be done by tags. */ + void sortByTags(); /** * Switches between one and two views: @@ -306,29 +265,13 @@ private slots: /** Stops the loading process for the current active view. */ void stopLoading(); - /** Switches between showing a preview of the file content and showing the icon. */ - void togglePreview(); - - /** - * Switches between showing and hiding of hidden marked files dependent - * from the current state of the 'Show Hidden Files' menu toggle action. - */ - void toggleShowHiddenFiles(); - /** - * Toggles between showing and hiding of the filter bar dependent - * from the current state of the 'Show Filter Bar' menu toggle action. + * Toggles between showing and hiding of the filter bar */ - void toggleFilterBarVisibility(); - - /** Increases the size of the current set view mode. */ - void zoomIn(); - - /** Decreases the size of the current set view mode. */ - void zoomOut(); + void toggleFilterBarVisibility(bool show); /** - * Toggles between edit and brose mode of the navigation bar. + * Toggles between edit and browse mode of the navigation bar. */ void toggleEditLocation(); @@ -362,29 +305,23 @@ private slots: /** Opens Kompare for 2 selected files. */ void compareFiles(); + /** + * Hides the menu bar if it is visible, makes the menu bar + * visible if it is hidden. + */ + void toggleShowMenuBar(); + /** Opens the settings dialog for Dolphin. */ void editSettings(); /** Updates the state of all 'View' menu actions. */ void slotViewModeChanged(); - /** Updates the state of the 'Show preview' menu action. */ - void slotShowPreviewChanged(); - - /** Updates the state of the 'Show hidden files' menu action. */ - void slotShowHiddenFilesChanged(); - - /** Updates the state of the 'Categorized sorting' menu action. */ - void slotCategorizedSortingChanged(); - /** Updates the state of the 'Sort by' actions. */ void slotSortingChanged(DolphinView::Sorting sorting); - /** Updates the state of the 'Sort Ascending/Descending' action. */ - void slotSortOrderChanged(Qt::SortOrder order); - - /** Updates the state of the 'Additional Information' actions. */ - void slotAdditionalInfoChanged(KFileItemDelegate::AdditionalInformation info); + /** Updates the state of the 'Show Full Location' action. */ + void slotEditableStateChanged(bool editable); /** * Updates the state of the 'Edit' menu actions and emits @@ -393,7 +330,7 @@ private slots: void slotSelectionChanged(const KFileItemList& selection); /** Emits the signal requestItemInfo(). */ - void slotRequestItemInfo(const KUrl& url); + void slotRequestItemInfo(const KFileItem&); /** * Updates the state of the 'Back' and 'Forward' menu @@ -410,10 +347,12 @@ private slots: /** Toggles the active view if two views are shown within the main window. */ void toggleActiveView(); + /** Called when the view is doing a file operation, like renaming, copying, moving etc. */ + void slotDoingOperation(KonqFileUndoManager::CommandType type); + private: DolphinMainWindow(int id); void init(); - void loadSettings(); /** * Activates the given view, which means that @@ -429,10 +368,6 @@ private: void updateEditActions(); void updateViewActions(); void updateGoActions(); - void copyUrls(const KUrl::List& source, const KUrl& dest); - void moveUrls(const KUrl::List& source, const KUrl& dest); - void linkUrls(const KUrl::List& source, const KUrl& dest); - void clearStatusBar(); /** * Connects the signals from the created DolphinView with @@ -444,11 +379,11 @@ private: /** * Updates the text of the split action: - * If \a isSplit is true, the text is set to "Split", + * If two views are shown, the text is set to "Split", * otherwise the text is set to "Join". The icon - * is updated to match with the text. + * is updated to match with the text and the currently active view. */ - void updateSplitAction(bool isSplit); + void updateSplitAction(); private: /** @@ -465,7 +400,7 @@ private: * assures that all errors are shown in the status bar of Dolphin * instead as modal error dialog with an OK button. */ - class UndoUiInterface : public KonqUndoManager::UiInterface + class UndoUiInterface : public KonqFileUndoManager::UiInterface { public: UndoUiInterface(DolphinMainWindow* mainWin); @@ -477,32 +412,40 @@ private: }; KNewMenu* m_newMenu; + KAction* m_showMenuBar; QSplitter* m_splitter; DolphinViewContainer* m_activeViewContainer; int m_id; DolphinViewContainer* m_viewContainer[SecondaryView + 1]; + DolphinViewActionHandler* m_actionHandler; + /// remember pending undo operations until they are finished - QList m_undoCommandTypes; + QList m_undoCommandTypes; }; -DolphinViewContainer* DolphinMainWindow::activeViewContainer() const +inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const { return m_activeViewContainer; } -bool DolphinMainWindow::isSplit() const +inline bool DolphinMainWindow::isSplit() const { return m_viewContainer[SecondaryView] != 0; } -KNewMenu* DolphinMainWindow::newMenu() const +inline KNewMenu* DolphinMainWindow::newMenu() const { return m_newMenu; } -int DolphinMainWindow::getId() const +inline KAction* DolphinMainWindow::showMenuBarAction() const +{ + return m_showMenuBar; +} + +inline int DolphinMainWindow::getId() const { return m_id; }