summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/bookmark_editor_gtk.cc
diff options
context:
space:
mode:
authortony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-22 17:27:59 +0000
committertony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-22 17:27:59 +0000
commit6b64b0265e7d066fdb3426643cbc0ed739747695 (patch)
tree0dcb5804dc0f07a2636e21c9927211bbcca94780 /chrome/browser/gtk/bookmark_editor_gtk.cc
parent9652a2d7599c3f4a42e2a078dfac6db241bc2ccc (diff)
downloadchromium_src-6b64b0265e7d066fdb3426643cbc0ed739747695.zip
chromium_src-6b64b0265e7d066fdb3426643cbc0ed739747695.tar.gz
chromium_src-6b64b0265e7d066fdb3426643cbc0ed739747695.tar.bz2
Make it possible to edit bookmark folder names inline. This
works in both the edit bookmark dialog and in the bookmark manager. BUG=20328 Review URL: http://codereview.chromium.org/210036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26828 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/bookmark_editor_gtk.cc')
-rw-r--r--chrome/browser/gtk/bookmark_editor_gtk.cc13
1 files changed, 9 insertions, 4 deletions
diff --git a/chrome/browser/gtk/bookmark_editor_gtk.cc b/chrome/browser/gtk/bookmark_editor_gtk.cc
index 93d2c14..1ff0197 100644
--- a/chrome/browser/gtk/bookmark_editor_gtk.cc
+++ b/chrome/browser/gtk/bookmark_editor_gtk.cc
@@ -313,11 +313,11 @@ void BookmarkEditorGtk::AddNewGroup(GtkTreeIter* parent, GtkTreeIter* child) {
gtk_tree_store_append(tree_store_, child, parent);
gtk_tree_store_set(
tree_store_, child,
- bookmark_utils::FOLDER_ICON,
- GtkThemeProvider::GetFolderIcon(true),
+ bookmark_utils::FOLDER_ICON, GtkThemeProvider::GetFolderIcon(true),
bookmark_utils::FOLDER_NAME,
- l10n_util::GetStringUTF8(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME).c_str(),
+ l10n_util::GetStringUTF8(IDS_BOOMARK_EDITOR_NEW_FOLDER_NAME).c_str(),
bookmark_utils::ITEM_ID, static_cast<int64>(0),
+ bookmark_utils::IS_EDITABLE, TRUE,
-1);
}
@@ -394,6 +394,11 @@ void BookmarkEditorGtk::OnNewFolderClicked(GtkWidget* button,
GtkTreePath* path = gtk_tree_model_get_path(
GTK_TREE_MODEL(dialog->tree_store_), &new_item_iter);
gtk_tree_view_expand_to_path(GTK_TREE_VIEW(dialog->tree_view_), path);
- gtk_tree_selection_select_path(dialog->tree_selection_, path);
+
+ // Make the folder name editable.
+ gtk_tree_view_set_cursor(GTK_TREE_VIEW(dialog->tree_view_), path,
+ gtk_tree_view_get_column(GTK_TREE_VIEW(dialog->tree_view_), 0),
+ TRUE);
+
gtk_tree_path_free(path);
}