mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-12 12:54:29 +00:00
Merge branch 'Applications/18.08'
This commit is contained in:
commit
30bf49d5d1
|
@ -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(
|
||||
|
|
|
@ -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();
|
||||
|
||||
|
|
Loading…
Reference in a new issue