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

Merge branch 'Applications/18.08'

Browse source
This commit is contained in:
Andreas Krutzler 2018-10-03 20:10:04 +02:00
parent be077d3a0c ddfc86ab8c
commit 30bf49d5d1
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dolphinmainwindow.cpp
View file

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

5
src/views/dolphinview.cpp
View file

@ -757,6 +757,7 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* event)
case QEvent::GraphicsSceneDragEnter:
if (watched == m_view) {
m_dragging = true;
abortTwoClicksRenaming();
}
break;
@ -1438,8 +1439,8 @@ void DolphinView::slotTwoClicksRenamingTimerTimeout()
{
const KItemListSelectionManager* selectionManager = m_container->controller()->selectionManager();
// verify that only one item is selected and that no item is dragged
if (selectionManager->selectedItems().count() == 1 && !m_dragging) {
// verify that only one item is selected
if (selectionManager->selectedItems().count() == 1) {
const int index = selectionManager->currentItem();
const QUrl fileItemUrl = m_model->fileItem(index).url();