diff options
| -rw-r--r-- | src/dolphinmainwindow.cpp | 77 | ||||
| -rw-r--r-- | src/dolphinmainwindow.h | 20 | ||||
| -rw-r--r-- | src/dolphinui.rc | 5 |
3 files changed, 99 insertions, 3 deletions
diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 627c6a43a..78e489915 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -490,6 +490,35 @@ void DolphinMainWindow::slotUndoAvailable(bool available) } } +void DolphinMainWindow::restoreClosedTab(QAction* action) +{ + //The Clear Recently Closed Tabs List QAction, has it's data set to true, so we can detect it in here, as it's an exception. + if (action->data().toBool() == true) { + // Lets preserve the separator, and the clear action within this menu. + QList<QAction*> actionlist = m_recentTabsMenu->menu()->actions(); + for (int i = 2; i < actionlist.size(); i++) { + m_recentTabsMenu->menu()->removeAction(actionlist.at(i)); + } + } else { + const ClosedTab closedTab = action->data().value<ClosedTab>(); + + openNewTab(closedTab.primaryUrl); + m_tabBar->setCurrentIndex(m_viewTab.count() - 1); + + if (closedTab.isSplit) { + //Create secondary view. + toggleSplitView(); + m_viewTab[m_tabIndex].secondaryView->setUrl(closedTab.secondaryUrl); + } + + m_recentTabsMenu->removeAction(action); + } + + if (m_recentTabsMenu->menu()->actions().count() == 2) { + m_recentTabsMenu->setEnabled(false); + } +} + void DolphinMainWindow::slotUndoTextChanged(const QString& text) { QAction* undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo)); @@ -778,8 +807,8 @@ void DolphinMainWindow::closeTab(int index) // previous tab before closing the tab. m_tabBar->setCurrentIndex((index > 0) ? index - 1 : 1); } - - // delete tab + rememberClosedTab(index); + //Delete this tab. m_viewTab[index].primaryView->deleteLater(); if (m_viewTab[index].secondaryView != 0) { m_viewTab[index].secondaryView->deleteLater(); @@ -1078,6 +1107,19 @@ void DolphinMainWindow::setupActions() backShortcut.setAlternate(Qt::Key_Backspace); backAction->setShortcut(backShortcut); + m_recentTabsMenu = new KActionMenu(i18n("&Recently Closed Tabs"), this); + m_recentTabsMenu->setIcon(KIcon("edit-undo")); + actionCollection()->addAction("closed_tabs", m_recentTabsMenu); + connect(m_recentTabsMenu->menu(), SIGNAL(triggered(QAction *)), + this, SLOT(restoreClosedTab(QAction *))); + + QAction* action = new QAction("&Empty Recently Closed Tabs", m_recentTabsMenu); + action->setIcon(KIcon("edit-clear-list")); + action->setData(QVariant::fromValue(true)); + m_recentTabsMenu->addAction(action); + m_recentTabsMenu->addSeparator(); + m_recentTabsMenu->setEnabled(false); + KStandardAction::forward(this, SLOT(goForward()), actionCollection()); KStandardAction::up(this, SLOT(goUp()), actionCollection()); KStandardAction::home(this, SLOT(goHome()), actionCollection()); @@ -1291,6 +1333,37 @@ void DolphinMainWindow::updateGoActions() goUpAction->setEnabled(currentUrl.upUrl() != currentUrl); } +void DolphinMainWindow::rememberClosedTab(int index) +{ + KMenu* tabsMenu = m_recentTabsMenu->menu(); + + const QString primaryPath = m_viewTab[index].primaryView->url().path(); + const QString iconName = KMimeType::iconNameForUrl(primaryPath); + + QAction* action = new QAction(primaryPath, tabsMenu); + + ClosedTab closedTab; + closedTab.primaryUrl = m_viewTab[index].primaryView->url(); + + if (m_viewTab[index].secondaryView != 0) { + closedTab.secondaryUrl = m_viewTab[index].secondaryView->url(); + closedTab.isSplit = true; + } else { + closedTab.isSplit = false; + } + + action->setData(QVariant::fromValue(closedTab)); + action->setIcon(KIcon(iconName)); + + //Add our action at the first element, but only do that if it isn't empty, else just append + if (tabsMenu->actions().isEmpty()) { + tabsMenu->addAction(action); + } else { + tabsMenu->insertAction(tabsMenu->actions().first() + 2, action); + } + actionCollection()->action("closed_tabs")->setEnabled(true); +} + void DolphinMainWindow::clearStatusBar() { m_activeViewContainer->statusBar()->clear(); diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index 2e49cc67a..8fe9e350a 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -31,6 +31,7 @@ #include <kio/fileundomanager.h> #include <ksortablelist.h> #include <kxmlguiwindow.h> +#include <kactionmenu.h> #include <QtCore/QList> @@ -62,6 +63,14 @@ class DolphinMainWindow: public KXmlGuiWindow public: virtual ~DolphinMainWindow(); + //TODO: This struct should be private, but I couldn't figure out how to make it that way + //when using Q_DECLARE_METATYPE(), which is a needed macro. + struct ClosedTab + { + KUrl primaryUrl; + KUrl secondaryUrl; + bool isSplit; + }; /** * Returns the currently active view. @@ -179,6 +188,9 @@ 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); @@ -390,6 +402,11 @@ private: void updateGoActions(); /** + * 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 * the DolphinMainWindow. This method must be invoked each @@ -427,6 +444,7 @@ private: }; KNewMenu* m_newMenu; + KActionMenu* m_recentTabsMenu; KAction* m_showMenuBar; KTabBar* m_tabBar; DolphinViewContainer* m_activeViewContainer; @@ -450,6 +468,8 @@ private: QPointer<DolphinSettingsDialog> m_settingsDialog; }; +Q_DECLARE_METATYPE(DolphinMainWindow::ClosedTab) + inline DolphinViewContainer* DolphinMainWindow::activeViewContainer() const { return m_activeViewContainer; diff --git a/src/dolphinui.rc b/src/dolphinui.rc index 566393e6b..b770d96f6 100644 --- a/src/dolphinui.rc +++ b/src/dolphinui.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="dolphin" version="8"> +<kpartgui name="dolphin" version="9"> <MenuBar> <Menu name="file"> <Action name="create_new" /> @@ -70,6 +70,9 @@ <Separator/> <Action name="view_properties" /> </Menu> + <Menu name="go"> + <Action name="closed_tabs" /> + </Menu> <Menu name="tools"> <Action name="find_file" /> <Action name="show_filter_bar" /> |