From 1ddd9c4032870f97fd2e578b246a923cce72088e Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Fri, 8 Jun 2012 22:43:43 +0200 Subject: Inline renaming: Improve focus handling Fix issue that cancelling the inline-renaming by clicking on the other split view applies the wrong focus. Thanks to Frank Reininghaus for the initial patch and noticing this issue. CCBUG: 301252 --- src/views/dolphinview.cpp | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'src/views/dolphinview.cpp') diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index 53f9b45bf..e06aad6f2 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -168,8 +168,6 @@ DolphinView::DolphinView(const KUrl& url, QWidget* parent) : this, SLOT(slotSortRoleChangedByHeader(QByteArray,QByteArray))); connect(m_view, SIGNAL(visibleRolesChanged(QList,QList)), this, SLOT(slotVisibleRolesChangedByHeader(QList,QList))); - connect(m_view, SIGNAL(roleEditingCanceled(int,QByteArray,QVariant)), - this, SLOT(slotRoleEditingCanceled(int,QByteArray,QVariant))); connect(m_view, SIGNAL(roleEditingFinished(int,QByteArray,QVariant)), this, SLOT(slotRoleEditingFinished(int,QByteArray,QVariant))); connect(m_view->header(), SIGNAL(columnWidthChanged(QByteArray,qreal,qreal)), @@ -1320,14 +1318,6 @@ void DolphinView::slotVisibleRolesChangedByHeader(const QList& curre emit visibleRolesChanged(m_visibleRoles, previousVisibleRoles); } -void DolphinView::slotRoleEditingCanceled(int index, const QByteArray& role, const QVariant& value) -{ - Q_UNUSED(index); - Q_UNUSED(role); - Q_UNUSED(value); - setFocus(); -} - void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, const QVariant& value) { if (role == "text") { @@ -1343,7 +1333,6 @@ void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, con KonqOperations::rename(this, oldUrl, newName); } } - setFocus(); } void DolphinView::loadDirectory(const KUrl& url, bool reload) -- cgit v1.3