X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/fd74aa8e2057158d2eadb835eb61564854c81020..119f7a3f:/src/dolphinmainwindow.h diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index f4ccfdce4..462d3d362 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -22,33 +22,31 @@ #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 +#include typedef KIO::FileUndoManager::CommandType CommandType; -class KAction; class DolphinViewActionHandler; class DolphinApplication; class DolphinSettingsDialog; class DolphinViewContainer; class DolphinRemoteEncoding; -class KNewFileMenu; -class KTabBar; -class KUrl; -class QSplitter; +class DolphinTabWidget; +class KFileItem; +class KFileItemList; class KJob; +class KNewFileMenu; +class QToolButton; +class QIcon; /** * @short Main window for Dolphin. @@ -63,6 +61,7 @@ class DolphinMainWindow: public KXmlGuiWindow friend class DolphinApplication; public: + DolphinMainWindow(); virtual ~DolphinMainWindow(); /** @@ -77,30 +76,14 @@ public: * 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); + void openDirectories(const QList &dirs); /** * Opens the directory which contains the files \p files * and selects all files (implements the --select option * of Dolphin). */ - void openFiles(const QList& files); - - /** - * Returns true, if the main window contains two instances - * of a view container. The active view constainer can be - * accessed by DolphinMainWindow::activeViewContainer(). - */ - bool isSplit() const; - - /** 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 according to - * the given Dolphin settings. - */ - void refreshViews(); + void openFiles(const QList& files); /** * Returns the 'Create New...' sub menu which also can be shared @@ -108,12 +91,6 @@ public: */ 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 @@ -132,7 +109,14 @@ public slots: * Inform all affected dolphin components (panels, views) of an URL * change. */ - void changeUrl(const KUrl& url); + void changeUrl(const QUrl& url); + + /** + * The current directory of the Terminal Panel has changed, probably because + * the user entered a 'cd' command. This slot calls changeUrl(url) and makes + * sure that the panel keeps the keyboard focus. + */ + void slotTerminalDirectoryChanged(const QUrl& url); /** Stores all settings and quits Dolphin. */ void quit(); @@ -148,7 +132,7 @@ signals: * Is sent if the url of the currently active view has * been changed. */ - void urlChanged(const KUrl& url); + void urlChanged(const QUrl& url); /** * Is emitted if information of an item is requested to be shown e. g. in the panel. @@ -156,20 +140,31 @@ signals: */ void requestItemInfo(const KFileItem& item); + /** + * Is emitted if the settings have been changed. + */ + void settingsChanged(); + protected: /** @see QWidget::showEvent() */ - virtual void showEvent(QShowEvent* event); + virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; /** @see QMainWindow::closeEvent() */ - virtual void closeEvent(QCloseEvent* event); + virtual void closeEvent(QCloseEvent* event) Q_DECL_OVERRIDE; /** @see KMainWindow::saveProperties() */ - virtual void saveProperties(KConfigGroup& group); + virtual void saveProperties(KConfigGroup& group) Q_DECL_OVERRIDE; /** @see KMainWindow::readProperties() */ - virtual void readProperties(const KConfigGroup& group); + virtual void readProperties(const KConfigGroup& group) Q_DECL_OVERRIDE; 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. */ @@ -186,9 +181,6 @@ private slots: */ void slotUndoAvailable(bool available); - /** Invoked when an action in the recent tabs menu is clicked. */ - void restoreClosedTab(QAction* action); - /** Sets the text of the 'Undo' menu action to \a text. */ void slotUndoTextChanged(const QString& text); @@ -270,6 +262,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. @@ -288,8 +283,10 @@ private slots: */ void goUp(Qt::MouseButtons buttons); - /** Goes to the home URL. */ - void goHome(); + /** + * Open the home URL in a new tab + */ + void goHome(Qt::MouseButtons buttons); /** Opens Kompare for 2 selected files. */ void compareFiles(); @@ -330,17 +327,21 @@ private slots: /** Open a new main window. */ void openNewMainWindow(); - /** Opens a new view with the current URL that is part of a tab. */ - void openNewTab(); - /** - * Opens a new tab showing the URL \a url. + * Opens a new view with the current URL that is part of a tab and + * activates it. */ - void openNewTab(const KUrl& url); + void openNewActivatedTab(); - void activateNextTab(); + /** + * Opens a new tab in the background showing the URL \a url. + */ + void openNewTab(const QUrl& url); - void activatePrevTab(); + /** + * Opens a new tab showing the URL \a url and activates the tab. + */ + void openNewActivatedTab(const QUrl& url); /** * Opens the selected folder in a new tab. @@ -352,9 +353,6 @@ private slots: */ void openInNewWindow(); - /** Toggles the active view if two views are shown within the main window. */ - void toggleActiveView(); - /** * Indicates in the statusbar that the execution of the command \a command * has been finished. @@ -362,105 +360,99 @@ private slots: void showCommand(CommandType command); /** - * Activates the tab with the index \a index, which means that the current view - * is replaced by the view of the given tab. + * If the URL can be listed, open it in the current view, otherwise + * run it through KRun. */ - void setActiveTab(int index); - - /** Closes the currently active tab. */ - void closeTab(); + void handleUrl(const QUrl& url); /** - * Closes the tab with the index \a index and activates the tab with index - 1. + * handleUrl() can trigger a stat job to see if the url can actually + * be listed. */ - void closeTab(int index); + void slotHandleUrlStatFinished(KJob* job); /** - * Opens a context menu for the tab with the index \a index - * on the position \a pos. + * Is invoked when the write state of a folder has been changed and + * enables/disables the "Create New..." menu entry. */ - void openTabContextMenu(int index, const QPoint& pos); + void slotWriteStateChanged(bool isFolderWritable); /** - * Is connected to the QTabBar signal tabMoved(int from, int to). - * Reorders the list of tabs after a tab was moved in the tab bar - * and sets m_tabIndex to the new index of the current tab. + * 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 slotTabMoved(int from, int to); + void openContextMenu(const QPoint& pos, + const KFileItem& item, + const QUrl& url, + const QList& customActions); - /** - * Handles a click on a places item: if the middle mouse button is - * clicked, a new tab is opened for \a url, otherwise the current - * view is replaced by \a url. - */ - void handlePlacesClick(const KUrl& url, Qt::MouseButtons buttons); + void updateControlMenu(); + void updateToolBar(); + void slotControlButtonDeleted(); /** - * Is connected to the KTabBar signal testCanDecode() and adjusts - * the output parameter \a accept. + * Is called if a panel emits an error-message and shows + * the error-message in the active view-container. */ - void slotTestCanDecode(const QDragMoveEvent* event, bool& accept); + void slotPanelErrorMessage(const QString& error); /** - * If the URL can be listed, open it in the current view, otherwise - * run it through KRun. + * Is called if the user clicked an item in the Places Panel. + * Reloads the view if \a url is the current URL already, and changes the + * current URL otherwise. */ - void handleUrl(const KUrl& url); + void slotPlaceActivated(const QUrl& url); /** - * handleUrl() can trigger a stat job to see if the url can actually - * be listed. + * Is called if the another view has been activated by changing the current + * tab or activating another view in split-view mode. + * + * 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 slotHandleUrlStatFinished(KJob* job); + void activeViewChanged(DolphinViewContainer* viewContainer); - /** - * Is connected to the KTabBar signal receivedDropEvent. - * Allows dragging and dropping files onto tabs. - */ - void tabDropEvent(int tab, QDropEvent* event); + void closedTabsCountChanged(unsigned int count); /** - * Is invoked when the write state of a folder has been changed and - * enables/disables the "Create New..." menu entry. + * Is called if a new tab has been opened or a tab has been closed to + * enable/disable the tab actions. */ - void slotWriteStateChanged(bool isFolderWritable); - - void slotSearchModeChanged(bool enabled); + void tabCountChanged(int count); /** - * Opens the context menu on the current mouse position. - * @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. + * Sets the window caption to url.fileName() if this is non-empty, + * "/" if the URL is "file:///", and url.protocol() otherwise. */ - void openContextMenu(const KFileItem& item, - const KUrl& url, - const QList& customActions); - -private: - DolphinMainWindow(int id); - void init(); + void setUrlAsCaption(const QUrl& url); /** - * 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. + * Is called when the view has finished loading the directory. */ - void setActiveViewContainer(DolphinViewContainer* view); + void slotDirectoryLoadingCompleted(); +private: void setupActions(); void setupDockWidgets(); void updateEditActions(); void updateViewActions(); void updateGoActions(); + void createControlButton(); + void deleteControlButton(); + /** - * Adds the tab[\a index] to the closed tab menu's list of actions. + * 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. */ - void rememberClosedTab(int index); + bool addActionToMenu(QAction* action, QMenu* menu); /** * Connects the signals from the created DolphinView with @@ -478,36 +470,18 @@ private: */ void updateSplitAction(); - /** Returns the name of the tab for the URL \a url. */ - QString tabName(const KUrl& url) const; - bool isKompareInstalled() const; - void createSecondaryView(int tabIndex); - - /** - * Helper method for saveProperties() and readProperties(): Returns - * the property string for a tab with the index \a tabIndex and - * the property \a property. - */ - QString tabProperty(const QString& property, int tabIndex) const; - /** - * Sets the window caption to url.fileName() if this is non-empty, - * "/" if the URL is "file:///", and url.protocol() otherwise. + * 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 setUrlAsCaption(const KUrl& url); - - 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. - */ - void addActionCloneToCollection(QAction* action, const QString& actionName); + void createPanelAction(const QIcon &icon, + const QKeySequence& shortcut, + QAction* dockAction, + const QString& actionName); private: /** @@ -520,40 +494,23 @@ private: public: UndoUiInterface(); virtual ~UndoUiInterface(); - virtual void jobError(KIO::Job* job); + virtual void jobError(KIO::Job* job) Q_DECL_OVERRIDE; }; KNewFileMenu* m_newFileMenu; - KActionMenu* m_recentTabsMenu; - KAction* m_showMenuBar; - KTabBar* m_tabBar; + DolphinTabWidget* m_tabWidget; DolphinViewContainer* m_activeViewContainer; - QVBoxLayout* m_centralWidgetLayout; int m_id; - struct ViewTab - { - ViewTab() : isPrimaryViewActive(true), primaryView(0), secondaryView(0), splitter(0) {} - bool isPrimaryViewActive; - DolphinViewContainer* primaryView; - DolphinViewContainer* secondaryView; - QSplitter* splitter; - }; - - int m_tabIndex; - QList m_viewTab; - DolphinViewActionHandler* m_actionHandler; DolphinRemoteEncoding* m_remoteEncoding; - QPointer m_settingsDialog; + QWeakPointer m_settingsDialog; - KJob* m_lastHandleUrlStatJob; + // Members for the toolbar menu that is shown when the menubar is hidden: + QToolButton* m_controlButton; + QTimer* m_updateToolBarTimer; - /** - * Set to true, if the filter dock visibility is only temporary set - * to true by enabling the search mode. - */ - bool m_filterDockIsTemporaryVisible; + KIO::Job* m_lastHandleUrlStatJob; }; inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const @@ -561,21 +518,11 @@ inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const return m_activeViewContainer; } -inline bool DolphinMainWindow::isSplit() const -{ - return m_viewTab[m_tabIndex].secondaryView != 0; -} - inline KNewFileMenu* DolphinMainWindow::newFileMenu() const { return m_newFileMenu; } -inline KAction* DolphinMainWindow::showMenuBarAction() const -{ - return m_showMenuBar; -} - inline int DolphinMainWindow::getId() const { return m_id;