kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 09:50:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

simple setShortcuts => setDefaultShortcuts porting

Browse source
This commit is contained in:
Christoph Cullmann 2014-09-14 22:45:10 +02:00
parent d380d27f47
commit 81f7a1aa80
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/dolphinmainwindow.cpp
View file

@ -1000,7 +1000,7 @@ void DolphinMainWindow::setupActions()
QAction* newTab = actionCollection()->addAction("new_tab"); QAction* newTab = actionCollection()->addAction("new_tab");
newTab->setIcon(QIcon::fromTheme("tab-new")); newTab->setIcon(QIcon::fromTheme("tab-new"));
newTab->setText(i18nc("@action:inmenu File", "New Tab")); newTab->setText(i18nc("@action:inmenu File", "New Tab"));
newTab->setShortcuts(QList<QKeySequence>() << QKeySequence(Qt::CTRL | Qt::Key_T) << QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_N)); actionCollection()->setDefaultShortcuts(newTab, QList<QKeySequence>() << QKeySequence(Qt::CTRL | Qt::Key_T) << QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_N));
connect(newTab, &QAction::triggered, this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::openNewActivatedTab)); connect(newTab, &QAction::triggered, this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::openNewActivatedTab));
QAction* closeTab = actionCollection()->addAction("close_tab"); QAction* closeTab = actionCollection()->addAction("close_tab");
@ -1022,7 +1022,7 @@ void DolphinMainWindow::setupActions()
QAction* cut = KStandardAction::cut(this, SLOT(cut()), actionCollection()); QAction* cut = KStandardAction::cut(this, SLOT(cut()), actionCollection());
auto cutShortcuts = cut->shortcuts(); auto cutShortcuts = cut->shortcuts();
cutShortcuts.removeAll(QKeySequence(Qt::SHIFT | Qt::Key_Delete)); cutShortcuts.removeAll(QKeySequence(Qt::SHIFT | Qt::Key_Delete));
cut->setShortcuts(cutShortcuts); actionCollection()->setDefaultShortcuts(cut, cutShortcuts);
KStandardAction::copy(this, SLOT(copy()), actionCollection()); KStandardAction::copy(this, SLOT(copy()), actionCollection());
QAction* paste = KStandardAction::paste(this, SLOT(paste()), actionCollection()); QAction* paste = KStandardAction::paste(this, SLOT(paste()), actionCollection());
// The text of the paste-action is modified dynamically by Dolphin // The text of the paste-action is modified dynamically by Dolphin
@ -1075,7 +1075,7 @@ void DolphinMainWindow::setupActions()
QAction* backAction = KStandardAction::back(this, SLOT(goBack()), actionCollection()); QAction* backAction = KStandardAction::back(this, SLOT(goBack()), actionCollection());
auto backShortcuts = backAction->shortcuts(); auto backShortcuts = backAction->shortcuts();
backShortcuts.append(QKeySequence(Qt::Key_Backspace)); backShortcuts.append(QKeySequence(Qt::Key_Backspace));
backAction->setShortcuts(backShortcuts); actionCollection()->setDefaultShortcuts(backAction, backShortcuts);
DolphinRecentTabsMenu* recentTabsMenu = new DolphinRecentTabsMenu(this); DolphinRecentTabsMenu* recentTabsMenu = new DolphinRecentTabsMenu(this);
actionCollection()->addAction("closed_tabs", recentTabsMenu); actionCollection()->addAction("closed_tabs", recentTabsMenu);
@ -1136,14 +1136,14 @@ void DolphinMainWindow::setupActions()
activateNextTab->setText(i18nc("@action:inmenu", "Activate Next Tab")); activateNextTab->setText(i18nc("@action:inmenu", "Activate Next Tab"));
activateNextTab->setEnabled(false); activateNextTab->setEnabled(false);
connect(activateNextTab, &QAction::triggered, m_tabWidget, &DolphinTabWidget::activateNextTab); connect(activateNextTab, &QAction::triggered, m_tabWidget, &DolphinTabWidget::activateNextTab);
activateNextTab->setShortcuts(QApplication::isRightToLeft() ? prevTabKeys : nextTabKeys); actionCollection()->setDefaultShortcuts(activateNextTab, QApplication::isRightToLeft() ? prevTabKeys : nextTabKeys);
QAction* activatePrevTab = actionCollection()->addAction("activate_prev_tab"); QAction* activatePrevTab = actionCollection()->addAction("activate_prev_tab");
activatePrevTab->setIconText(i18nc("@action:inmenu", "Previous Tab")); activatePrevTab->setIconText(i18nc("@action:inmenu", "Previous Tab"));
activatePrevTab->setText(i18nc("@action:inmenu", "Activate Previous Tab")); activatePrevTab->setText(i18nc("@action:inmenu", "Activate Previous Tab"));
activatePrevTab->setEnabled(false); activatePrevTab->setEnabled(false);
connect(activatePrevTab, &QAction::triggered, m_tabWidget, &DolphinTabWidget::activatePrevTab); connect(activatePrevTab, &QAction::triggered, m_tabWidget, &DolphinTabWidget::activatePrevTab);
activatePrevTab->setShortcuts(QApplication::isRightToLeft() ? nextTabKeys : prevTabKeys); actionCollection()->setDefaultShortcuts(activatePrevTab, QApplication::isRightToLeft() ? nextTabKeys : prevTabKeys);
// for context menu // for context menu
QAction* openInNewTab = actionCollection()->addAction("open_in_new_tab"); QAction* openInNewTab = actionCollection()->addAction("open_in_new_tab");

2
src/dolphinremoveaction.cpp
View file

@ -55,7 +55,7 @@ void DolphinRemoveAction::update()
if (m_action) { if (m_action) {
setIcon(m_action->icon()); setIcon(m_action->icon());
setShortcuts(m_action->shortcuts()); m_collection->setDefaultShortcuts(this, m_action->shortcuts());
setEnabled(m_action->isEnabled()); setEnabled(m_action->isEnabled());
} }
} }