** Related to bug #558322

2008-11-07  Matthew Barnes  <mbarnes@redhat.com>

	** Related to bug #558322

	* libedataserverui/e-source-selector.c
	(e_source_selector_edit_primary_selection):
	New function allows the user to rename the primary selected source
	by opening an entry box directly in the source selector.

svn path=/trunk/; revision=9743

diff --git a/libedataserverui/ChangeLog b/libedataserverui/ChangeLog
index e258a32..93847b0 100644 (file)
--- a/libedataserverui/ChangeLog
+++ b/libedataserverui/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-07  Matthew Barnes  <mbarnes@redhat.com>
+
+       ** Related to bug #558322
+
+       * e-source-selector.c (e_source_selector_edit_primary_selection):
+       New function allows the user to rename the primary selected source
+       by opening an entry box directly in the source selector.
+
 2008-11-03  Sankar P  <psankar@novell.com>
 
 License Changes

diff --git a/libedataserverui/e-source-selector.c b/libedataserverui/e-source-selector.c
index f836cc6..90594a1 100644 (file)
--- a/libedataserverui/e-source-selector.c
+++ b/libedataserverui/e-source-selector.c
@@ -548,6 +548,31 @@ selection_func (GtkTreeSelection *selection,
 /* Callbacks.  */
 
 static void
+text_cell_edited_cb (ESourceSelector *selector,
+                     const gchar *path_string,
+                     const gchar *new_name)
+{
+       GtkTreeView *tree_view;
+       GtkTreeModel *model;
+       GtkTreePath *path;
+       GtkTreeIter iter;
+       ESource *source;
+
+       tree_view = GTK_TREE_VIEW (selector);
+       model = gtk_tree_view_get_model (tree_view);
+       path = gtk_tree_path_new_from_string (path_string);
+
+       gtk_tree_model_get_iter (model, &iter, path);
+       gtk_tree_model_get (model, &iter, 0, &source, -1);
+       gtk_tree_path_free (path);
+
+       g_return_if_fail (E_IS_SOURCE (source));
+
+       if (new_name != NULL && *new_name != '\0')
+               e_source_set_name (source, new_name);
+}
+
+static void
 cell_toggled_callback (GtkCellRendererToggle *renderer,
                       const char *path_string,
                       ESourceSelector *selector)
@@ -943,8 +968,10 @@ e_source_selector_init (ESourceSelector *selector)
        g_signal_connect (cell_renderer, "toggled", G_CALLBACK (cell_toggled_callback), selector);
 
        cell_renderer = gtk_cell_renderer_text_new ();
-       g_object_set (G_OBJECT (cell_renderer), "mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE, NULL);
        g_object_set (G_OBJECT (cell_renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+       g_signal_connect_swapped (
+               cell_renderer, "edited",
+               G_CALLBACK (text_cell_edited_cb), selector);
        gtk_tree_view_column_pack_start (column, cell_renderer, TRUE);
        gtk_tree_view_column_set_cell_data_func (column, cell_renderer, (GtkTreeCellDataFunc) text_cell_data_func, selector, NULL);
 
@@ -1215,6 +1242,64 @@ e_source_selector_source_is_selected (ESourceSelector *selector,
 }
 
 /**
+ * e_source_selector_edit_primary_selection:
+ * @selector: An #ESourceSelector widget
+ *
+ * Allows the user to rename the primary selected source by opening an
+ * entry box directly in @selector.
+ **/
+void
+e_source_selector_edit_primary_selection (ESourceSelector *selector)
+{
+       GtkTreeRowReference *reference;
+       GtkTreeSelection *selection;
+       GtkTreeViewColumn *column;
+       GtkCellRenderer *renderer;
+       GtkTreeView *tree_view;
+       GtkTreeModel *model;
+       GtkTreePath *path = NULL;
+       GtkTreeIter iter;
+       GList *list;
+
+       g_return_if_fail (E_IS_SOURCE_SELECTOR (selector));
+
+       tree_view = GTK_TREE_VIEW (selector);
+       column = gtk_tree_view_get_column (tree_view, 0);
+       reference = selector->priv->saved_primary_selection;
+       selection = gtk_tree_view_get_selection (tree_view);
+
+       if (reference != NULL)
+               path = gtk_tree_row_reference_get_path (reference);
+       else if (gtk_tree_selection_get_selected (selection, &model, &iter))
+               path = gtk_tree_model_get_path (model, &iter);
+
+       if (path == NULL)
+               return;
+
+       /* XXX Because we stuff three renderers in a single column,
+        *     we have to manually hunt for the text renderer. */
+       list = gtk_tree_view_column_get_cell_renderers (column);
+       while (list != NULL) {
+               renderer = list->data;
+               if (GTK_IS_CELL_RENDERER_TEXT (renderer))
+                       break;
+               list = g_list_delete_link (list, list);
+       }
+       g_list_free (list);
+
+       /* Make the text cell renderer editable, but only temporarily.
+        * We don't want editing to be activated by simply clicking on
+        * the source name.  Too easy for accidental edits to occur. */
+       g_object_set (renderer, "editable", TRUE, NULL);
+       gtk_tree_view_expand_to_path (tree_view, path);
+       gtk_tree_view_set_cursor_on_cell (
+               tree_view, path, column, renderer, TRUE);
+       g_object_set (renderer, "editable", FALSE, NULL);
+
+       gtk_tree_path_free (path);
+}
+
+/**
  * e_source_selector_peek_primary_selection:
  * @selector: An #ESourceSelector widget
  *

diff --git a/libedataserverui/e-source-selector.h b/libedataserverui/e-source-selector.h
index b312d42..308d9f3 100644 (file)
--- a/libedataserverui/e-source-selector.h
+++ b/libedataserverui/e-source-selector.h
@@ -76,11 +76,13 @@ gboolean  e_source_selector_selection_shown  (ESourceSelector *selector);
 
 void e_source_selector_set_select_new (ESourceSelector *selector, gboolean state);
 
+void     e_source_selector_edit_primary_selection  (ESourceSelector *selector);
 ESource *e_source_selector_peek_primary_selection  (ESourceSelector *selector);
 void     e_source_selector_set_primary_selection   (ESourceSelector *selector,
                                                    ESource         *source);
 
 ESourceGroup *e_source_selector_get_primary_source_group (ESourceSelector *selector);
+
 G_END_DECLS
 
 #endif /* _E_SOURCE_SELECTOR_H_ */