X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c33b01efb2aed904af9ffaef27fb3b0b4bdda37b..b1c9b5126d:/src/dolphinmainwindow.h diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index 2fbb742fd..2e49cc67a 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -23,23 +23,29 @@ #define DOLPHIN_MAINWINDOW_H #include "dolphinview.h" -#include "sidebarpage.h" +#include "panels/panel.h" #include #include -#include +#include #include #include #include +typedef KIO::FileUndoManager::CommandType CommandType; + class KAction; class DolphinViewActionHandler; class DolphinApplication; +class DolphinSearchBox; +class DolphinSettingsDialog; class DolphinViewContainer; class KNewMenu; +class KTabBar; class KUrl; +class QDropEvent; class QSplitter; /** @@ -102,13 +108,6 @@ public: KAction* showMenuBarAction() const; public slots: - /** - * Handles the dropping of URLs to the given - * destination. This is only called by the TreeViewSidebarPage. - */ - void dropUrls(const KUrl::List& urls, - const KUrl& destination); - /** * Pastes the clipboard data into the currently selected folder * of the active view. If not exactly one folder is selected, @@ -122,7 +121,7 @@ public slots: int getId() const; /** - * Inform all affected dolphin components (sidebars, views) of an URL + * Inform all affected dolphin components (panels, views) of an URL * change. */ void changeUrl(const KUrl& url); @@ -150,7 +149,7 @@ signals: void urlChanged(const KUrl& url); /** - * Is emitted if information of an item is requested to be shown e. g. in the sidebar. + * Is emitted if information of an item is requested to be shown e. g. in the panel. * If item is null, no item information request is pending. */ void requestItemInfo(const KFileItem& item); @@ -171,18 +170,8 @@ private slots: /** Updates the 'Create New...' sub menu. */ void updateNewMenu(); - /** - * Opens the properties window for the selected items of the - * active view. The properties windows shows information - * like name, size and permissions. - */ - void properties(); - - /** - * Shows the error information from the places model - * in the status bar. - */ - void slotHandlePlacesError(const QString &message); + /** Shows the error message in the status bar of the active view. */ + void showErrorMessage(const QString& message); /** * Updates the state of the 'Undo' menu action dependent @@ -248,16 +237,11 @@ private slots: void toggleEditLocation(); /** - * Switches to the edit mode of the navigation bar. If the edit mode is + * Switches to the edit mode of the navigation bar and selects + * the whole URL, so that it can be replaced by the user. If the edit mode is * already active, it is assured that the navigation bar get focused. */ - void editLocation(); - - /** - * Opens the view properties dialog, which allows to modify the properties - * of the currently active view. - */ - void adjustViewProperties(); + void replaceLocation(); /** Goes back on step of the URL history. */ void goBack(); @@ -271,12 +255,15 @@ private slots: /** Goes to the home URL. */ void goHome(); - /** Opens KFind for the current shown directory. */ - void findFile(); - /** Opens Kompare for 2 selected files. */ void compareFiles(); + /** + * Initiates a preview of the selected files + * on the desktop by the Previewer plasmoid. + */ + void quickView(); + /** * Hides the menu bar if it is visible, makes the menu bar * visible if it is hidden. @@ -295,12 +282,15 @@ private slots: */ void slotSelectionChanged(const KFileItemList& selection); + /** Enables changing of tabs via mouse wheel. */ + void slotWheelMoved(int wheelDelta); + /** Emits the signal requestItemInfo(). */ void slotRequestItemInfo(const KFileItem&); /** * Updates the state of the 'Back' and 'Forward' menu - * actions corresponding the the current history. + * actions corresponding to the current history. */ void updateHistory(); @@ -310,11 +300,76 @@ 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. + */ + void openNewTab(const KUrl& url); + + void activateNextTab(); + + void activatePrevTab(); + + /** + * Opens the selected folder in a new tab. + */ + void openInNewTab(); + + /** + * Opens the selected folder in a new window. + */ + void openInNewWindow(); + /** 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); + /** + * 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 \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); + + /** + * 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); + + /** + * Is connected to the KTabBar signal testCanDecode() and adjusts + * the output parameter \a accept. + */ + void slotTestCanDecode(const QDragMoveEvent* event, bool& accept); + + /** + * Is connected with the Dolphin search box and searchs items that + * match to the text entered in the search bar. + */ + void searchItems(const KUrl& url); private: DolphinMainWindow(int id); @@ -336,11 +391,11 @@ private: /** * Connects the signals from the created DolphinView with - * the index \a viewIndex with the corresponding slots of + * the DolphinViewContainer \a container with the corresponding slots of * the DolphinMainWindow. This method must be invoked each * time a DolphinView has been created. */ - void connectViewSignals(int viewIndex); + void connectViewSignals(DolphinViewContainer* container); /** * Updates the text of the split action: @@ -350,44 +405,49 @@ private: */ void updateSplitAction(); -private: - /** - * DolphinMainWindow supports up to two views beside each other. - */ - enum ViewIndex - { - PrimaryView = 0, ///< View shown on the left side of the main window. - SecondaryView = 1 ///< View shown on the left side of the main window. - }; + /** Returns the name of the tab for the URL \a url. */ + QString tabName(const KUrl& url) const; + bool isKompareInstalled() const; + + void createSecondaryView(int tabIndex); + +private: /** * Implements a custom error handling for the undo manager. This * assures that all errors are shown in the status bar of Dolphin * instead as modal error dialog with an OK button. */ - class UndoUiInterface : public KonqFileUndoManager::UiInterface + class UndoUiInterface : public KIO::FileUndoManager::UiInterface { public: - UndoUiInterface(DolphinMainWindow* mainWin); + UndoUiInterface(); virtual ~UndoUiInterface(); virtual void jobError(KIO::Job* job); - - private: - DolphinMainWindow* m_mainWin; }; KNewMenu* m_newMenu; KAction* m_showMenuBar; - QSplitter* m_splitter; + KTabBar* m_tabBar; DolphinViewContainer* m_activeViewContainer; + QVBoxLayout* m_centralWidgetLayout; + DolphinSearchBox* m_searchBox; int m_id; - DolphinViewContainer* m_viewContainer[SecondaryView + 1]; + struct ViewTab + { + ViewTab() : isPrimaryViewActive(true), primaryView(0), secondaryView(0), splitter(0) {} + bool isPrimaryViewActive; + DolphinViewContainer* primaryView; + DolphinViewContainer* secondaryView; + QSplitter* splitter; + }; - DolphinViewActionHandler* m_actionHandler; + int m_tabIndex; + QList m_viewTab; - /// remember pending undo operations until they are finished - QList m_undoCommandTypes; + DolphinViewActionHandler* m_actionHandler; + QPointer m_settingsDialog; }; inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const @@ -397,7 +457,7 @@ inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const inline bool DolphinMainWindow::isSplit() const { - return m_viewContainer[SecondaryView] != 0; + return m_viewTab[m_tabIndex].secondaryView != 0; } inline KNewMenu* DolphinMainWindow::newMenu() const