X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/4062c4cf2d9c3a6716ced8686fa2e2324261c0ec..d6488887ecf69d7f192b94de8dce34fae0b7eb76:/src/dolphinmainwindow.h diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index 93ab2762a..53b209642 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -27,9 +27,10 @@ #include -#include +#include +#include #include -#include +#include #include @@ -60,14 +61,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 @@ -81,7 +82,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(); @@ -90,7 +91,13 @@ 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: /** @@ -110,7 +117,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 @@ -148,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. */ @@ -198,18 +198,6 @@ private slots: */ void slotHandlePlacesError(const QString &message); - /** - * Shows the error information of the job \a job - * 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); - /** * Updates the state of the 'Undo' menu action dependent * from the parameter \a available. @@ -250,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(); @@ -292,20 +274,23 @@ private slots: /** 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(); - /** Shows the MIME type as additional information for the item. */ - void showMimeInfo(); + /** Switchtes between showing the date as additional information for the item or not. */ + void toggleDateInfo(); - /** Shows the size as additional information for the item. */ - void showSizeInfo(); + /** Switchtes between showing the permissions as additional information for the item or not. */ + void togglePermissionsInfo(); - /** Shows the date as additional information for the item. */ - void showDateInfo(); + /** Switchtes between showing the owner as additional information for the item or not. */ + void toggleOwnerInfo(); + + /** 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: @@ -376,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(); @@ -398,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 @@ -407,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 @@ -424,6 +415,9 @@ 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(); @@ -442,9 +436,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(); /** @@ -457,11 +448,19 @@ 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(); + + /** + * 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 updateSplitAction(bool isSplit); + void toggleAdditionalInfo(const char* actionName, + KFileItemDelegate::Information info); private: /** @@ -478,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); @@ -490,6 +489,7 @@ private: }; KNewMenu* m_newMenu; + KAction* m_showMenuBar; QSplitter* m_splitter; DolphinViewContainer* m_activeViewContainer; int m_id; @@ -497,25 +497,30 @@ private: DolphinViewContainer* m_viewContainer[SecondaryView + 1]; /// 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; }