From 1a693bc373167f9d76cd9842c4d8cc2531e741ff Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Tue, 10 Nov 2009 15:14:07 +0100
Subject: Assistant: Make Edit name of a bookmark folder right after creation.

Task-number: Qt-5540
Reviewed-by: kh1
---
 tools/assistant/tools/assistant/bookmarkmanager.cpp | 21 +++++++++++++--------
 tools/assistant/tools/assistant/bookmarkmanager.h   |  1 +
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/tools/assistant/tools/assistant/bookmarkmanager.cpp b/tools/assistant/tools/assistant/bookmarkmanager.cpp
index 881525c..9dd5b8b 100644
--- a/tools/assistant/tools/assistant/bookmarkmanager.cpp
+++ b/tools/assistant/tools/assistant/bookmarkmanager.cpp
@@ -150,8 +150,8 @@ void BookmarkDialog::addNewFolder()
 
         const QString &name = index.data().toString();
         ui.bookmarkFolders->setCurrentIndex(ui.bookmarkFolders->findText(name));
+        renameFolder(index, newFolder);
     }
-    ui.treeView->setFocus();
 }
 
 void BookmarkDialog::toolButtonClicked()
@@ -243,14 +243,19 @@ void BookmarkDialog::customContextMenuRequested(const QPoint &point)
         if (index.isValid())
             name = index.data().toString();
         ui.bookmarkFolders->setCurrentIndex(ui.bookmarkFolders->findText(name));
+    } else if (picked == renameItem) {
+        renameFolder(index, proxyIndex);
     }
-    else if (picked == renameItem) {
-        BookmarkModel *model = bookmarkManager->treeBookmarkModel();
-        if (QStandardItem *item = model->itemFromIndex(proxyIndex)) {
-            item->setEditable(true);
-            ui.treeView->edit(index);
-            item->setEditable(false);
-        }
+}
+
+void BookmarkDialog::renameFolder(const QModelIndex &index,
+                                  const QModelIndex &proxyIndex)
+{
+    const BookmarkModel * const model = bookmarkManager->treeBookmarkModel();
+    if (QStandardItem *item = model->itemFromIndex(proxyIndex)) {
+        item->setEditable(true);
+        ui.treeView->edit(index);
+        item->setEditable(false);
     }
 }
 
diff --git a/tools/assistant/tools/assistant/bookmarkmanager.h b/tools/assistant/tools/assistant/bookmarkmanager.h
index fab8790..c6be134 100644
--- a/tools/assistant/tools/assistant/bookmarkmanager.h
+++ b/tools/assistant/tools/assistant/bookmarkmanager.h
@@ -90,6 +90,7 @@ private slots:
 
 private:
     bool eventFilter(QObject *object, QEvent *e);
+    void renameFolder(const QModelIndex &index, const QModelIndex &proxyIndex);
 
 private:
     QString m_url;
-- 
cgit v0.12