X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/f7bbe21b5b2d3bc85dcba1d03494879aac9e37c7..c8d8556950005dfd96ebdb41d2f43ad90356367c:/src/dolphinmainwindow.h diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index 9a57b5452..998b6fc25 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006 by Peter Penz * + * Copyright (C) 2006 by Peter Penz * * Copyright (C) 2006 by Stefan Monov * * Copyright (C) 2006 by Cvetoslav Ludmiloff * * * @@ -22,33 +22,34 @@ #ifndef DOLPHIN_MAINWINDOW_H #define DOLPHIN_MAINWINDOW_H -#include "panels/panel.h" - #include -#include +#include #include #include #include -#include - -#include "views/dolphinview.h" +#include #include +#include typedef KIO::FileUndoManager::CommandType CommandType; -class KAction; class DolphinViewActionHandler; class DolphinApplication; class DolphinSettingsDialog; class DolphinViewContainer; class DolphinRemoteEncoding; +class KAction; +class KFileItem; +class KFileItemList; +class KJob; class KNewFileMenu; class KTabBar; class KUrl; class QSplitter; -class KJob; +class QToolButton; +class QVBoxLayout; /** * @short Main window for Dolphin. @@ -63,6 +64,7 @@ class DolphinMainWindow: public KXmlGuiWindow friend class DolphinApplication; public: + DolphinMainWindow(); virtual ~DolphinMainWindow(); /** @@ -74,7 +76,7 @@ public: DolphinViewContainer* activeViewContainer() const; /** - * Opens each directory \p in a separate tab. If the "split view" + * Opens each directory in \p dirs in a separate tab. If the "split view" * option is enabled, 2 directories are collected within one tab. */ void openDirectories(const QList& dirs); @@ -93,35 +95,15 @@ public: */ 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); - /** - * Refreshes the views of the main window by recreating them dependent from - * the given Dolphin settings. - */ - void refreshViews(); - /** * Returns the 'Create New...' sub menu which also can be shared * with other menus (e. g. a context menu). */ KNewFileMenu* newFileMenu() const; - /** - * Returns the 'Show Menubar' action which can be shared with - * other menus (e. g. a context menu). - */ - KAction* showMenuBarAction() const; - public slots: /** * Pastes the clipboard data into the currently selected folder @@ -178,6 +160,12 @@ protected: virtual void readProperties(const KConfigGroup& group); private slots: + /** + * Refreshes the views of the main window by recreating them according to + * the given Dolphin settings. + */ + void refreshViews(); + void clearStatusBar(); /** Updates the 'Create New...' sub menu. */ @@ -190,7 +178,7 @@ private slots: /** * Updates the state of the 'Undo' menu action dependent - * from the parameter \a available. + * on the parameter \a available. */ void slotUndoAvailable(bool available); @@ -219,7 +207,14 @@ private slots: void find(); /** - * Updates the text of the paste action dependent from + * Is invoked when the "Find" is active and the search location + * (From Here/Everywhere) has been changed. Updates the + * enabled state of the Search Panel. + */ + void slotSearchLocationChanged(); + + /** + * Updates the text of the paste action dependent on * the number of items which are in the clipboard. */ void updatePasteAction(); @@ -237,14 +232,14 @@ private slots: /** * Switches between one and two views: * If one view is visible, it will get split into two views. - * If already two views are visible, the nonactivated view gets closed. + * If already two views are visible, the active view gets closed. */ void toggleSplitView(); - /** Reloads the current active view. */ + /** Reloads the currently active view. */ void reloadView(); - /** Stops the loading process for the current active view. */ + /** Stops the loading process for the currently active view. */ void stopLoading(); void enableStopAction(); @@ -264,7 +259,19 @@ private slots: */ void replaceLocation(); - /** Goes back on step of the URL history. */ + /** + * Toggles the state of the panels between a locked and unlocked layout. + */ + void togglePanelLockState(); + + /** + * Is invoked if the Places panel got visible/invisible and takes care + * that the places-selector of all views is only shown if the Places panel + * is invisible. + */ + void slotPlacesPanelVisibilityChanged(bool visible); + + /** Goes back one step of the URL history. */ void goBack(); /** Goes forward one step of the URL history. */ @@ -273,6 +280,9 @@ private slots: /** Goes up one hierarchy of the current URL. */ void goUp(); + /** Changes the location to the home URL. */ + void goHome(); + /** * Open the previous URL in the URL history in a new tab * if the middle mouse button is clicked. @@ -291,9 +301,6 @@ private slots: */ void goUp(Qt::MouseButtons buttons); - /** Goes to the home URL. */ - void goHome(); - /** Opens Kompare for 2 selected files. */ void compareFiles(); @@ -374,7 +381,7 @@ private slots: void closeTab(); /** - * Closes the tab with the index \index and activates the tab with index - 1. + * Closes the tab with the index \a index and activates the tab with index - 1. */ void closeTab(int index); @@ -405,7 +412,7 @@ private slots: void slotTestCanDecode(const QDragMoveEvent* event, bool& accept); /** - * If the URL can be listed open it in the current view, otherwise + * If the URL can be listed, open it in the current view, otherwise * run it through KRun. */ void handleUrl(const KUrl& url); @@ -432,20 +439,25 @@ private slots: /** * Opens the context menu on the current mouse position. + * @pos Position in screen coordinates. * @item File item context. If item is null, the context menu * should be applied to \a url. * @url URL which contains \a item. * @customActions Actions that should be added to the context menu, * if the file item is null. */ - void openContextMenu(const KFileItem& item, + void openContextMenu(const QPoint& pos, + const KFileItem& item, const KUrl& url, const QList& customActions); -private: - DolphinMainWindow(int id); - void init(); + void updateToolBarMenu(); + void updateToolBar(); + void slotToolBarSpacerDeleted(); + void slotToolBarMenuButtonDeleted(); + void slotToolBarIconSizeChanged(const QSize& iconSize); +private: /** * Activates the given view, which means that * all menu actions are applied to this view. When @@ -454,12 +466,27 @@ private: */ void setActiveViewContainer(DolphinViewContainer* view); + /** + * Creates a view container and does a default initialization. + */ + DolphinViewContainer* createViewContainer(const KUrl& url, QWidget* parent); + void setupActions(); void setupDockWidgets(); void updateEditActions(); void updateViewActions(); void updateGoActions(); + void createToolBarMenuButton(); + void deleteToolBarMenuButton(); + + /** + * Adds the action \p action to the menu \p menu in + * case if it has not added already to the toolbar. + * @return True if the action has been added to the menu. + */ + bool addActionToMenu(QAction* action, KMenu* menu); + /** * Adds the tab[\a index] to the closed tab menu's list of actions. */ @@ -504,13 +531,15 @@ private: QString squeezedText(const QString& text) const; /** - * Adds a clone of the action \a action to the action-collection with - * the name \a actionName, so that the action \a action also can be - * added to the toolbar by the user. This is useful if the creation of - * \a action is e.g. done in Qt and hence cannot be added directly - * to the action-collection. + * Creates an action for showing/hiding a panel, that is accessible + * in "Configure toolbars..." and "Configure shortcuts...". This is necessary + * as the action for toggling the dock visibility is done by Qt which + * is no KAction instance. */ - void addActionCloneToCollection(QAction* action, const QString& actionName); + void createPanelAction(const KIcon& icon, + const QKeySequence& shortcut, + QAction* dockAction, + const QString& actionName); private: /** @@ -528,27 +557,32 @@ private: KNewFileMenu* m_newFileMenu; KActionMenu* m_recentTabsMenu; - KAction* m_showMenuBar; KTabBar* m_tabBar; DolphinViewContainer* m_activeViewContainer; QVBoxLayout* m_centralWidgetLayout; int m_id; + // Members for the tab-handling: struct ViewTab { - ViewTab() : isPrimaryViewActive(true), primaryView(0), secondaryView(0), splitter(0) {} + ViewTab() : isPrimaryViewActive(true), wasActive(false), primaryView(0), secondaryView(0), splitter(0) {} bool isPrimaryViewActive; + bool wasActive; DolphinViewContainer* primaryView; DolphinViewContainer* secondaryView; QSplitter* splitter; }; - int m_tabIndex; QList m_viewTab; DolphinViewActionHandler* m_actionHandler; DolphinRemoteEncoding* m_remoteEncoding; - QPointer m_settingsDialog; + QWeakPointer m_settingsDialog; + + // Members for the toolbar menu that is shown when the menubar is hidden: + QWidget* m_toolBarSpacer; + QToolButton* m_openToolBarMenuButton; + QTimer* m_updateToolBarTimer; KJob* m_lastHandleUrlStatJob; @@ -556,7 +590,7 @@ private: * Set to true, if the filter dock visibility is only temporary set * to true by enabling the search mode. */ - bool m_filterDockIsTemporaryVisible; + bool m_searchDockIsTemporaryVisible; }; inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const @@ -574,11 +608,6 @@ inline KNewFileMenu* DolphinMainWindow::newFileMenu() const return m_newFileMenu; } -inline KAction* DolphinMainWindow::showMenuBarAction() const -{ - return m_showMenuBar; -} - inline int DolphinMainWindow::getId() const { return m_id;