Merge branch 'Applications/15.08'

2 files changed, 10 insertions, 1 deletions

diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index be9e34c4a..60b7b16c1 100644
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -108,7 +108,6 @@ RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
 
     m_lineEdit->setText(m_newName);
     m_lineEdit->setSelection(0, selectionLength);
-    m_lineEdit->setFocus();
 
     topLayout->addWidget(editLabel);
     topLayout->addWidget(m_lineEdit);
@@ -197,6 +196,13 @@ void RenameDialog::slotTextChanged(const QString& newName)
     m_okButton->setEnabled(enable);
 }
 
+void RenameDialog::showEvent(QShowEvent* event)
+{
+    m_lineEdit->setFocus();
+
+    QDialog::showEvent(event);
+}
+
 void RenameDialog::renameItems()
 {
     // Iterate through all items and rename them...
diff --git a/src/views/renamedialog.h b/src/views/renamedialog.h
index a1953e8b3..3964c0a5c 100644
--- a/src/views/renamedialog.h
+++ b/src/views/renamedialog.h
@@ -45,6 +45,9 @@ private slots:
     void slotAccepted();
     void slotTextChanged(const QString& newName);
 
+protected:
+    void showEvent(QShowEvent* event) override;
+
 private:
     void renameItems();
     void renameItem(const KFileItem &item, const QString& newName);