X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/be9746e87bb6a42e641dbf36c528a60fb564420a..d6488887ecf69d7f192b94de8dce34fae0b7eb76:/src/dolphinmainwindow.h diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index c4e303be3..53b209642 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -25,9 +25,12 @@ #include "dolphinview.h" #include "sidebarpage.h" -#include +#include + +#include +#include #include -#include +#include #include @@ -53,27 +56,33 @@ public: virtual ~DolphinMainWindow(); /** - * Activates the given view, which means that - * all menu actions are applied to this view. When - * having a split view setup the nonactive view + * Returns the currently active view. + * All menu actions are applied to this view. When + * having a split view setup, the nonactive view * is usually shown in darker colors. */ - void setActiveView(DolphinViewContainer* view); + DolphinViewContainer* activeViewContainer() const; /** - * Returns the currently active view. See - * DolphinMainWindow::setActiveView() for more details. + * Returns true, if the main window contains two instances + * of a view container. The active view constainer can be + * accessed by DolphinMainWindow::activeViewContainer(). */ - DolphinViewContainer* activeViewContainer() const - { - return m_activeViewContainer; - } + bool isSplit() const; + + /** + * If the main window contains two instances of a view container + * (DolphinMainWindow::isSplit() returns true), then the + * two views get toggled (the right view is on the left, the left + * view on the right). + */ + void toggleViews(); /** Renames the item represented by \a oldUrl to \a newUrl. */ 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(); @@ -82,10 +91,13 @@ public: * Returns the 'Create New...' sub menu which also can be shared * with other menus (e. g. a context menu). */ - KNewMenu* newMenu() const - { - return m_newMenu; - } + 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: /** @@ -105,10 +117,7 @@ public slots: /** * Returns the main window ID used through DBus. */ - int getId() const - { - return m_id; - } + int getId() const; /** * Inform all affected dolphin components (sidebars, views) of an URL @@ -146,26 +155,19 @@ 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: /** Updates the 'Create New...' sub menu. */ @@ -191,16 +193,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 +238,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 +262,35 @@ private slots: /** The sorting of the current view should be done by the type. */ void sortByType(); + /** The sorting of the current view should be done by the rating. */ + void sortByRating(); + + /** The sorting of the current view should be done by tags. */ + void sortByTags(); + /** Switches between an ascending and descending sorting order. */ void toggleSortOrder(); /** 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(); + /** Switches between showing the size as additional information for the item or not. */ + void toggleSizeInfo(); + + /** Switchtes between showing the date as additional information for the item or not. */ + void toggleDateInfo(); - /** Shows the MIME type as additional information for the item. */ - void showMimeInfo(); + /** Switchtes between showing the permissions as additional information for the item or not. */ + void togglePermissionsInfo(); - /** Shows the size as additional information for the item. */ - void showSizeInfo(); + /** Switchtes between showing the owner as additional information for the item or not. */ + void toggleOwnerInfo(); - /** Shows the date as additional information for the item. */ - void showDateInfo(); + /** Switchtes between showing the group as additional information for the item or not. */ + void toggleGroupInfo(); + + /** Switches between showing the MIME type as additional information for the item or not. */ + void toggleMimeInfo(); /** * Switches between one and two views: @@ -362,6 +361,12 @@ 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(); @@ -384,7 +389,7 @@ private slots: void slotSortOrderChanged(Qt::SortOrder order); /** Updates the state of the 'Additional Information' actions. */ - void slotAdditionalInfoChanged(KFileItemDelegate::AdditionalInformation info); + void slotAdditionalInfoChanged(KFileItemDelegate::InformationList info); /** * Updates the state of the 'Edit' menu actions and emits @@ -393,7 +398,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,21 +415,27 @@ 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(); - void setupAccel(); + /** + * Activates the given view, which means that + * all menu actions are applied to this view. When + * having a split view setup, the nonactive view + * is usually shown in darker colors. + */ + void setActiveViewContainer(DolphinViewContainer* view); + void setupActions(); void setupDockWidgets(); void updateHistory(); 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(); /** @@ -437,21 +448,28 @@ 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(); + + /** + * Helper method for the slots toggleDateInfo(), toggleSizeInfo() + * and toggleMimeInfo(). Applies \a info dependent from the current + * checked state of the action \a actionName to the file item delegate. + */ + void toggleAdditionalInfo(const char* actionName, + KFileItemDelegate::Information info); private: /** - * DolphinMainWindowsupports only one or two views, which - * are handled internally as primary and secondary view. + * DolphinMainWindow supports up to two views beside each other. */ enum ViewIndex { - PrimaryIdx = 0, - SecondaryIdx = 1 + PrimaryView = 0, ///< View shown on the left side of the main window. + SecondaryView = 1 ///< View shown on the left side of the main window. }; /** @@ -459,7 +477,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); @@ -471,15 +489,41 @@ class UndoUiInterface : public KonqUndoManager::UiInterface }; KNewMenu* m_newMenu; + KAction* m_showMenuBar; QSplitter* m_splitter; DolphinViewContainer* m_activeViewContainer; int m_id; - DolphinViewContainer* m_viewContainer[SecondaryIdx + 1]; + DolphinViewContainer* m_viewContainer[SecondaryView + 1]; /// remember pending undo operations until they are finished - QList m_undoCommandTypes; + QList m_undoCommandTypes; }; +inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const +{ + return m_activeViewContainer; +} + +inline bool DolphinMainWindow::isSplit() const +{ + return m_viewContainer[SecondaryView] != 0; +} + +inline KNewMenu* DolphinMainWindow::newMenu() const +{ + return m_newMenu; +} + +inline KAction* DolphinMainWindow::showMenuBarAction() const +{ + return m_showMenuBar; +} + +inline int DolphinMainWindow::getId() const +{ + return m_id; +} + #endif // DOLPHIN_MAINWINDOW_H