X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/02b251372efb53344388a9e3da098b08289e7e3b..d4fb129710d7fadf8e21f2cfd2588a794f774e41:/src/dolphinmainwindow.h diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index ab79fb0e6..fd231cf0b 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -22,14 +22,14 @@ #ifndef DOLPHIN_MAINWINDOW_H #define DOLPHIN_MAINWINDOW_H -#include +#include #include #include #include #include -#include #include +#include #include #include @@ -41,16 +41,13 @@ 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 QVBoxLayout; +class QIcon; /** * @short Main window for Dolphin. @@ -89,13 +86,6 @@ public: */ 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; - /** * Returns the 'Create New...' sub menu which also can be shared * with other menus (e. g. a context menu). @@ -151,6 +141,11 @@ 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); @@ -187,9 +182,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); @@ -262,13 +254,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(); @@ -343,23 +328,23 @@ 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 in the background 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(); /** - * Opens a new tab showing the URL \a url and activates - * the tab. + * Opens a new tab in the background showing the URL \a primaryUrl and the + * optional URL \a secondaryUrl. */ - void openNewActivatedTab(const KUrl& url); - - void activateNextTab(); + void openNewTab(const KUrl& primaryUrl, const KUrl& secondaryUrl = KUrl()); - void activatePrevTab(); + /** + * Opens a new tab showing the URL \a primaryUrl and the optional URL + * \a secondaryUrl and activates the tab. + */ + void openNewActivatedTab(const KUrl& primaryUrl, const KUrl& secondaryUrl = KUrl()); /** * Opens the selected folder in a new tab. @@ -371,48 +356,12 @@ 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. */ 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. - */ - void setActiveTab(int index); - - /** Closes the currently active tab. */ - void closeTab(); - - /** - * Closes the tab with the index \a index and activates the tab with index - 1. - */ - void closeTab(int index); - - /** - * Opens a context menu for the tab with the index \a index - * on the position \a pos. - */ - void openTabContextMenu(int index, const QPoint& pos); - - /** - * 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. - */ - void slotTabMoved(int from, int to); - - /** - * Is connected to the KTabBar signal testCanDecode() and adjusts - * the output parameter \a accept. - */ - void slotTestCanDecode(const QDragMoveEvent* event, bool& accept); - /** * If the URL can be listed, open it in the current view, otherwise * run it through KRun. @@ -425,12 +374,6 @@ private slots: */ void slotHandleUrlStatFinished(KJob* job); - /** - * Is connected to the KTabBar signal receivedDropEvent. - * Allows dragging and dropping files onto tabs. - */ - void tabDropEvent(int tab, QDropEvent* event); - /** * Is invoked when the write state of a folder has been changed and * enables/disables the "Create New..." menu entry. @@ -461,20 +404,38 @@ private slots: */ void slotPanelErrorMessage(const QString& error); -private: /** - * 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 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 setActiveViewContainer(DolphinViewContainer* view); + void slotPlaceActivated(const KUrl& url); /** - * Creates a view container and does a default initialization. + * 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. */ - DolphinViewContainer* createViewContainer(const KUrl& url, QWidget* parent); + void activeViewChanged(DolphinViewContainer* viewContainer); + + void closedTabsCountChanged(unsigned int count); + /** + * Is called if a new tab has been opened or a tab has been closed to + * enable/disable the tab actions. + */ + void tabCountChanged(int count); + + /** + * 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); + +private: void setupActions(); void setupDockWidgets(); void updateEditActions(); @@ -491,11 +452,6 @@ private: */ bool addActionToMenu(QAction* action, KMenu* menu); - /** - * Adds the tab[\a index] to the closed tab menu's list of actions. - */ - void rememberClosedTab(int index); - /** * Connects the signals from the created DolphinView with * the DolphinViewContainer \a container with the corresponding slots of @@ -512,35 +468,15 @@ 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. - */ - void setUrlAsCaption(const KUrl& url); - - QString squeezedText(const QString& text) const; - /** * 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 createPanelAction(const KIcon& icon, + void createPanelAction(const QIcon &icon, const QKeySequence& shortcut, QAction* dockAction, const QString& actionName); @@ -560,25 +496,10 @@ private: }; 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), 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; QWeakPointer m_settingsDialog; @@ -595,11 +516,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;