kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-15 18:01:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make CTRL+SHIFT+T reopen last closed tab

Browse source 
BUG: 336818
FEATURE: 118994
This commit is contained in:
Arjun AK 2014-07-22 17:31:49 +05:30
parent 0f2f9fd5b8
commit 9a69506572
5 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/dolphinmainwindow.cpp
View file

@ -1220,6 +1220,11 @@ void DolphinMainWindow::activeViewChanged()
setActiveViewContainer(tabPage->activeViewContainer());
}
void DolphinMainWindow::closedTabsCountChanged(unsigned int count)
{
actionCollection()->action("undo_close_tab")->setEnabled(count > 0);
}
void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContainer)
{
Q_ASSERT(viewContainer);
@ -1350,6 +1355,15 @@ void DolphinMainWindow::setupActions()
recentTabsMenu, SLOT(rememberClosedTab(KUrl,KUrl)));
connect(recentTabsMenu, SIGNAL(restoreClosedTab(KUrl,KUrl)),
this, SLOT(openNewActivatedTab(KUrl,KUrl)));
connect(recentTabsMenu, SIGNAL(closedTabsCountChanged(uint)),
this, SLOT(closedTabsCountChanged(uint)));
KAction* undoCloseTab = actionCollection()->addAction("undo_close_tab");
undoCloseTab->setText(i18nc("@action:inmenu File", "Undo close tab"));
undoCloseTab->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_T);
undoCloseTab->setIcon(KIcon("edit-undo"));
undoCloseTab->setEnabled(false);
connect(undoCloseTab, SIGNAL(triggered()), recentTabsMenu, SLOT(undoCloseTab()));
KAction* forwardAction = KStandardAction::forward(this, SLOT(goForward()), actionCollection());
connect(forwardAction, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)), this, SLOT(goForward(Qt::MouseButtons)));

2
src/dolphinmainwindow.h
View file

@ -468,6 +468,8 @@ private slots:
void activeViewChanged();
void closedTabsCountChanged(unsigned int count);
private:
/**
* Activates the given view, which means that

16
src/dolphinrecenttabsmenu.cpp
View file

@ -60,7 +60,7 @@ void DolphinRecentTabsMenu::rememberClosedTab(const KUrl& primaryUrl, const KUrl
} else {
insertAction(menu()->actions().at(2), action);
}
emit closedTabsCountChanged(menu()->actions().size() - 2);
// Assure that only up to 6 closed tabs are shown in the menu.
// 8 because of clear action + separator + 6 closed tabs
if (menu()->actions().size() > 8) {
@ -70,6 +70,12 @@ void DolphinRecentTabsMenu::rememberClosedTab(const KUrl& primaryUrl, const KUrl
KAcceleratorManager::manage(menu());
}
void DolphinRecentTabsMenu::undoCloseTab()
{
Q_ASSERT(menu()->actions().size() > 2);
handleAction(menu()->actions().at(2));
}
void DolphinRecentTabsMenu::handleAction(QAction* action)
{
if (action == m_clearListAction) {
@ -80,14 +86,16 @@ void DolphinRecentTabsMenu::handleAction(QAction* action)
for (int i = 2; i < count; ++i) {
removeAction(actions.at(i));
}
emit closedTabsCountChanged(0);
} else {
const KUrl::List urls = action->data().value<KUrl::List>();
if (urls.count() == 2) {
emit restoreClosedTab(urls.first(), urls.last());
}
removeAction(action);
delete action;
action = 0;
if (urls.count() == 2) {
emit restoreClosedTab(urls.first(), urls.last());
}
emit closedTabsCountChanged(menu()->actions().size() - 2);
}
if (menu()->actions().count() <= 2) {

2
src/dolphinrecenttabsmenu.h
View file

@ -35,9 +35,11 @@ public:
public slots:
void rememberClosedTab(const KUrl& primaryUrl, const KUrl& secondaryUrl);
void undoCloseTab();
signals:
void restoreClosedTab(const KUrl& primaryUrl, const KUrl& secondaryUrl);
void closedTabsCountChanged(unsigned int count);
private slots:
void handleAction(QAction* action);

1
src/dolphinui.rc
View file

@ -6,6 +6,7 @@
<Action name="new_window" />
<Action name="new_tab" />
<Action name="close_tab" />
<Action name="undo_close_tab" />
<Separator/>
<Action name="rename" />
<Action name="move_to_trash" />