Merge remote-tracking branch 'origin/Applications/18.08'

merge https://phabricator.kde.org/D15371
This commit is contained in:
Jaime Torres Amate 2018-10-06 10:32:29 +02:00
commit b610ce5913

View file

@ -1041,7 +1041,7 @@ void DolphinMainWindow::setupActions()
QAction* newTab = actionCollection()->addAction(QStringLiteral("new_tab")); QAction* newTab = actionCollection()->addAction(QStringLiteral("new_tab"));
newTab->setIcon(QIcon::fromTheme(QStringLiteral("tab-new"))); newTab->setIcon(QIcon::fromTheme(QStringLiteral("tab-new")));
newTab->setText(i18nc("@action:inmenu File", "New Tab")); newTab->setText(i18nc("@action:inmenu File", "New Tab"));
actionCollection()->setDefaultShortcuts(newTab, {QKeySequence::AddTab}); actionCollection()->setDefaultShortcuts(newTab, {Qt::CTRL + Qt::Key_T, 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 = KStandardAction::close( QAction* closeTab = KStandardAction::close(