X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c80b261505d513dda50f54ab6ececa5cf9ca2d28..504545c59ab0cd99f782cbb2afd8c2a983c9adfc:/src/dolphinmainwindow.h diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index 10fcf57fd..c7a06c00a 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -22,34 +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 +#include typedef KIO::FileUndoManager::CommandType CommandType; class DolphinViewActionHandler; -class DolphinApplication; class DolphinSettingsDialog; class DolphinViewContainer; class DolphinRemoteEncoding; -class KAction; +class DolphinTabWidget; +class KFileItem; +class KFileItemList; class KJob; class KNewFileMenu; -class KTabBar; -class KUrl; -class QSplitter; class QToolButton; +class QIcon; +class PlacesPanel; +#ifndef Q_OS_WIN +class TerminalPanel; +#endif /** * @short Main window for Dolphin. @@ -61,10 +61,10 @@ class DolphinMainWindow: public KXmlGuiWindow Q_OBJECT Q_CLASSINFO("D-Bus Interface", "org.kde.dolphin.MainWindow") Q_PROPERTY(int id READ getId SCRIPTABLE true) - friend class DolphinApplication; public: - virtual ~DolphinMainWindow(); + DolphinMainWindow(); + ~DolphinMainWindow() override; /** * Returns the currently active view. @@ -75,33 +75,18 @@ public: DolphinViewContainer* activeViewContainer() const; /** - * 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); - - /** - * 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(). + * Opens each directory in \p dirs in a separate tab. If \a splitView is set, + * 2 directories are collected within one tab. + * \pre \a dirs must contain at least one url. */ - bool isSplit() const; - - /** Renames the item represented by \a oldUrl to \a newUrl. */ - void rename(const KUrl& oldUrl, const KUrl& newUrl); + void openDirectories(const QList &dirs, bool splitView); /** - * Refreshes the views of the main window by recreating them according to - * the given Dolphin settings. + * Opens the directories which contain the files \p files and selects all files. + * If \a splitView is set, 2 directories are collected within one tab. + * \pre \a files must contain at least one url. */ - void refreshViews(); + void openFiles(const QList& files, bool splitView); /** * Returns the 'Create New...' sub menu which also can be shared @@ -109,6 +94,8 @@ public: */ KNewFileMenu* newFileMenu() const; + void setTabsToHomeIfMountPathOpen(const QString& mountPath); + public slots: /** * Pastes the clipboard data into the currently selected folder @@ -127,7 +114,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(); @@ -143,7 +137,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. @@ -151,20 +145,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); + void showEvent(QShowEvent* event) override; /** @see QMainWindow::closeEvent() */ - virtual void closeEvent(QCloseEvent* event); + void closeEvent(QCloseEvent* event) override; /** @see KMainWindow::saveProperties() */ - virtual void saveProperties(KConfigGroup& group); + void saveProperties(KConfigGroup& group) override; /** @see KMainWindow::readProperties() */ - virtual void readProperties(const KConfigGroup& group); + void readProperties(const KConfigGroup& group) 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. */ @@ -181,9 +186,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); @@ -228,6 +230,9 @@ private slots: */ void toggleSplitView(); + /** Dedicated action to open the stash:/ ioslave in split view. */ + void toggleSplitStash(); + /** Reloads the currently active view. */ void reloadView(); @@ -256,13 +261,6 @@ private slots: */ 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(); @@ -272,23 +270,20 @@ private slots: /** Goes up one hierarchy of the current URL. */ void goUp(); - /** - * Open the previous URL in the URL history in a new tab - * if the middle mouse button is clicked. - */ - void goBack(Qt::MouseButtons buttons); + /** Changes the location to the home URL. */ + void goHome(); - /** - * Open the next URL in the URL history in a new tab - * if the middle mouse button is clicked. - */ - void goForward(Qt::MouseButtons buttons); + /** Open the previous URL in the URL history in a new tab. */ + void goBackInNewTab(); - /** - * Open the URL one hierarchy above the current URL in a new tab - * if the middle mouse button is clicked. - */ - void goUp(Qt::MouseButtons buttons); + /** Open the next URL in the URL history in a new tab. */ + void goForwardInNewTab(); + + /** Open the URL one hierarchy above the current URL in a new tab. */ + void goUpInNewTab(); + + /** * Open the home URL in a new tab. */ + void goHomeInNewTab(); /** Opens Kompare for 2 selected files. */ void compareFiles(); @@ -314,9 +309,6 @@ private slots: */ void slotSelectionChanged(const KFileItemList& selection); - /** Emits the signal requestItemInfo(). */ - void slotRequestItemInfo(const KFileItem&); - /** * Updates the state of the 'Back' and 'Forward' menu * actions corresponding to the current history. @@ -329,17 +321,16 @@ 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 activateNextTab(); + void openNewActivatedTab(); - void activatePrevTab(); + /** + * Opens a new tab in the background showing the URL \a url. + */ + void openNewTab(const QUrl& url); /** * Opens the selected folder in a new tab. @@ -351,9 +342,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. @@ -361,127 +349,116 @@ 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 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 slotTestCanDecode(const QDragMoveEvent* event, bool& accept); + void slotPlaceActivated(const QUrl& url); /** - * If the URL can be listed, open it in the current view, otherwise - * run it through KRun. + * 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 handleUrl(const KUrl& url); + void activeViewChanged(DolphinViewContainer* viewContainer); + + void closedTabsCountChanged(unsigned int count); /** - * handleUrl() can trigger a stat job to see if the url can actually - * be listed. + * Is called if a new tab has been opened or a tab has been closed to + * enable/disable the tab actions. */ - void slotHandleUrlStatFinished(KJob* job); + void tabCountChanged(int count); /** - * Is connected to the KTabBar signal receivedDropEvent. - * Allows dragging and dropping files onto tabs. + * Sets the window caption to url.fileName() if this is non-empty, + * "/" if the URL is "file:///", and url.protocol() otherwise. */ - void tabDropEvent(int tab, QDropEvent* event); + void setUrlAsCaption(const QUrl& url); /** - * Is invoked when the write state of a folder has been changed and - * enables/disables the "Create New..." menu entry. + * This slot is called when the user requested to unmount a removable media + * from the places menu */ - void slotWriteStateChanged(bool isFolderWritable); - - void slotSearchModeChanged(bool enabled); + void slotStorageTearDownFromPlacesRequested(const QString& mountPath); /** - * 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. + * This slot is called when the user requested to unmount a removable media + * _not_ from the dolphin's places menu (from the notification area for e.g.) + * This slot is basically connected to each removable device's + * Solid::StorageAccess::teardownRequested(const QString & udi) + * signal through the places panel. */ - void openContextMenu(const KFileItem& item, - const KUrl& url, - const QList& customActions); - - void openToolBarMenu(); - void updateToolBarMenu(); - void updateToolBar(); - void slotToolBarSpacerDeleted(); - void slotToolBarMenuButtonDeleted(); - void slotToolBarIconSizeChanged(const QSize& iconSize); - -private: - DolphinMainWindow(int id); - void init(); + void slotStorageTearDownExternallyRequested(const QString& mountPath); /** - * 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(); /** - * Creates a view container and does a default initialization. + * Is called when the user middle clicks a toolbar button. + * + * Here middle clicking Back/Forward/Up/Home will open the resulting + * folder in a new tab. */ - DolphinViewContainer* createViewContainer(const KUrl& url, QWidget* parent); + void slotToolBarActionMiddleClicked(QAction *action); +private: void setupActions(); void setupDockWidgets(); void updateEditActions(); void updateViewActions(); void updateGoActions(); - void createToolBarMenuButton(); - void deleteToolBarMenuButton(); + void createControlButton(); + void deleteControlButton(); /** * 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. - */ - void rememberClosedTab(int index); + bool addActionToMenu(QAction* action, QMenu* menu); /** * Connects the signals from the created DolphinView with @@ -499,36 +476,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. + * 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. */ - 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. - */ - 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: /** @@ -540,46 +499,30 @@ private: { public: UndoUiInterface(); - virtual ~UndoUiInterface(); - virtual void jobError(KIO::Job* job); + ~UndoUiInterface() override; + void jobError(KIO::Job* job) override; }; KNewFileMenu* m_newFileMenu; - KActionMenu* m_recentTabsMenu; - KTabBar* m_tabBar; + DolphinTabWidget* m_tabWidget; 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) {} - bool isPrimaryViewActive; - DolphinViewContainer* primaryView; - DolphinViewContainer* secondaryView; - QSplitter* splitter; - }; - int m_tabIndex; - QList m_viewTab; - DolphinViewActionHandler* m_actionHandler; DolphinRemoteEncoding* m_remoteEncoding; QPointer m_settingsDialog; // Members for the toolbar menu that is shown when the menubar is hidden: - QWidget* m_toolBarSpacer; - QToolButton* m_openToolBarMenuButton; - QWeakPointer m_toolBarMenu; + QToolButton* m_controlButton; QTimer* m_updateToolBarTimer; - KJob* m_lastHandleUrlStatJob; + KIO::Job* m_lastHandleUrlStatJob; - /** - * Set to true, if the filter dock visibility is only temporary set - * to true by enabling the search mode. - */ - bool m_searchDockIsTemporaryVisible; +#ifndef Q_OS_WIN + TerminalPanel* m_terminalPanel; +#endif + PlacesPanel* m_placesPanel; + bool m_tearDownFromPlacesRequested; }; inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const @@ -587,11 +530,6 @@ 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;