Re: [evolution-patches] Patch to make Name Selector dialog intuitive (libedataserverui)

[Vivek Jain <jvivek novell com>]

hi,

Thanks for the comments. I have added the code in the patch to have
icons for add and remove. Attached is the revised patch. Please let me
know if it looks ok now, so that I can commit before UI freeze today.

Thanks,
Vivek Jain


On Fri, 2005-07-22 at 16:46 +0530, Srinivasa Ragavan wrote:
> Vivek,
> 
> Yes it makes more intuitive. Buttons are to be associated with actions
> not with data. You 'save' 'open' which are actions. But 'To', 'CC' etc
> cant be actions. Also removing is not very clear. double click/delkey.
> Most users wont require to come to the dialog to add it. But for users
> who cant add in normal way, would find it difficult adding/removing
> here.
> 
> Few comments in the dialog
> 
> * use gtk_label_set_use_underline to make the accelerator work properly.
> * Use stock for  -> and <-. I showed you my earlier patch. It looks
> ugly.
> 
> I havent seen the code DEEPLY. Some one should be able to comment on it.
> 
> Apart from that, it looks neat.
> -Srini
> 
> On Fri, 2005-07-22 at 12:22 +0530, Vivek Jain wrote:
> > hi,
> > 
> > This patch "tries" to make Name Selector dialog more intuitive. It
> > provides the option for removing a selected entry as well. Though I
> > myself have a feeling its little bit too ugly to have six buttons there
> > (when invoked from composer) but guess some users would prefer it that
> > way. Please gimme some ideas if you agree with me there.
> > And of course in code, if something is not taken care of. 
> > 
> > Thanks,
> > Vivek Jain
> > _______________________________________________
> > evolution-patches mailing list
> > evolution-patches lists ximian com
> > http://lists.ximian.com/mailman/listinfo/evolution-patches
> 

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/ChangeLog,v
retrieving revision 1.56
diff -u -p -r1.56 ChangeLog
--- ChangeLog	22 Jul 2005 08:44:14 -0000	1.56
+++ ChangeLog	25 Jul 2005 05:49:02 -0000
@@ -1,3 +1,16 @@
+2005-07-22  Vivek Jain  <jvivek novell com>
+	
+	* e-name-selector-dialog.c: "Section" structure has two new members
+	label and remove button
+	(add_section): set these new members properly
+	add a callback on the changed signal of gtktreeview in section
+	Have new structure SelData to give us the selection data in callback
+	(destination_key_press) : moved actual code to new local function
+	(remove_selection).
+	(selection_changed):
+	(remove_button clicked): new functions to get the entry back from the
+	destination store and making sure UI is consistent
+
 2005-07-20  Sushma Rai  <rsushma novell com>
 
 	* e-name-selector-entry.c (populate_popup): In the popup menu, changed
Index: e-name-selector-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/e-name-selector-dialog.c,v
retrieving revision 1.17
diff -u -p -r1.17 e-name-selector-dialog.c
--- e-name-selector-dialog.c	11 Jul 2005 08:25:32 -0000	1.17
+++ e-name-selector-dialog.c	25 Jul 2005 05:49:03 -0000
@@ -43,11 +43,19 @@ typedef struct {
 	gchar        *name;
 
 	GtkBox       *section_box;
+	GtkLabel     *label;  
 	GtkButton    *transfer_button;
+	GtkButton    *remove_button;
 	GtkTreeView  *destination_view;
 }
 Section;
 
+typedef struct {
+	GtkTreeView *view;
+	GtkButton   *button;
+	ENameSelectorDialog *dlg_ptr;
+} SelData;
+
 static ESource *find_first_source             (ESourceList *source_list);
 static void     search_changed                (ENameSelectorDialog *name_selector_dialog);
 static void     source_selected               (ENameSelectorDialog *name_selector_dialog, ESource *source);
@@ -58,6 +66,7 @@ static void     contact_activated       
 static void     destination_activated         (ENameSelectorDialog *name_selector_dialog, GtkTreePath *path,
 					       GtkTreeViewColumn *column, GtkTreeView *tree_view);
 static gboolean destination_key_press         (ENameSelectorDialog *name_selector_dialog, GdkEventKey *event, GtkTreeView *tree_view);
+static void remove_button_clicked (GtkButton *button, SelData *data);
 static void     remove_books                  (ENameSelectorDialog *name_selector_dialog);
 static void     contact_column_formatter      (GtkTreeViewColumn *column, GtkCellRenderer *cell,
 					       GtkTreeModel *model, GtkTreeIter *iter,
@@ -402,6 +411,17 @@ find_section_by_name (ENameSelectorDialo
 	return -1;
 }
 
+static void
+selection_changed (GtkTreeSelection *selection, SelData *data)
+{
+	GtkTreeSelection *contact_selection;
+	gboolean          have_selection;
+		
+	contact_selection = gtk_tree_view_get_selection (data->view);
+	have_selection = gtk_tree_selection_get_selected (contact_selection, NULL, NULL);
+	gtk_widget_set_sensitive (GTK_WIDGET (data->button), have_selection);
+}
+
 static gint
 add_section (ENameSelectorDialog *name_selector_dialog,
 	     const gchar *name, const gchar *pretty_name, EDestinationStore *destination_store)
@@ -409,8 +429,10 @@ add_section (ENameSelectorDialog *name_s
 	Section            section;
 	GtkTreeViewColumn *column;
 	GtkCellRenderer   *cell_renderer;
-	GtkWidget         *widget;
-	gchar		  *text;
+	GtkWidget  	  *vbox, *hbox, *chbox;
+	GtkWidget 	  *widget, *image, *label;
+	SelData		  *data;
+	GtkTreeSelection  *selection;
 
 	g_assert (name != NULL);
 	g_assert (pretty_name != NULL);
@@ -420,20 +442,22 @@ add_section (ENameSelectorDialog *name_s
 
 	section.name = g_strdup (name);
 	section.section_box      = GTK_BOX (gtk_hbox_new (FALSE, 12));
-	section.transfer_button  = GTK_BUTTON (gtk_button_new_with_mnemonic (pretty_name));
+	section.label = GTK_LABEL (gtk_label_new (pretty_name));
+	section.transfer_button  = GTK_BUTTON (gtk_button_new());
+	section.remove_button  = GTK_BUTTON (gtk_button_new());
 	section.destination_view = GTK_TREE_VIEW (gtk_tree_view_new ());
 
-	if (pango_parse_markup (pretty_name, -1, '_', NULL,
-				&text, NULL, NULL))  {
-		atk_object_set_name (gtk_widget_get_accessible (
-					GTK_WIDGET (section.destination_view)), text);
-		g_free (text);
-	}
-
 	/* Set up transfer button */
 	g_signal_connect_swapped (section.transfer_button, "clicked",
 				  G_CALLBACK (transfer_button_clicked), name_selector_dialog);
-
+	
+	/*data for the remove callback*/
+	data = g_malloc0(sizeof(SelData));
+	data->view = section.destination_view;
+	data->dlg_ptr = name_selector_dialog;
+	g_signal_connect(section.remove_button, "clicked",
+				  G_CALLBACK (remove_button_clicked), data);
+	
 	/* Set up view */
 	column = gtk_tree_view_column_new ();
 	cell_renderer = GTK_CELL_RENDERER (gtk_cell_renderer_text_new ());
@@ -445,18 +469,77 @@ add_section (ENameSelectorDialog *name_s
 	gtk_tree_view_set_headers_visible (section.destination_view, FALSE);
 	gtk_tree_view_set_model (section.destination_view, GTK_TREE_MODEL (destination_store));
 
+	vbox = gtk_vbox_new (FALSE, 0);
+	chbox = gtk_hbox_new (FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (chbox), vbox, FALSE, FALSE, 12);
+
 	/* Pack button (in an alignment) */
 	widget = gtk_alignment_new (0.5, 0.0, 0.0, 0.0);
 	gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (section.transfer_button));
-	gtk_box_pack_start (section.section_box, widget, FALSE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, TRUE, 6);
 	gtk_size_group_add_widget (name_selector_dialog->button_size_group, GTK_WIDGET (section.transfer_button));
+	
+	/*to get the image embedded in the button*/
+	widget = gtk_alignment_new (0.7, 0.5, 0.0, 0.0);
+	gtk_container_add (GTK_CONTAINER (section.transfer_button), GTK_WIDGET (widget));
+
+	hbox = gtk_hbox_new (FALSE, 2);
+	gtk_widget_show (GTK_WIDGET(hbox));
+	gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET(hbox));
+
+	label = gtk_label_new_with_mnemonic (_("_Add"));
+	gtk_widget_show (label);
+	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+
+	image = gtk_image_new_from_stock ("gtk-go-forward", GTK_ICON_SIZE_BUTTON);
+	gtk_widget_show (image);
+	gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
+
+
+	widget = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+	gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (section.remove_button));
+	gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, TRUE, 0);
+	gtk_size_group_add_widget (name_selector_dialog->button_size_group, GTK_WIDGET (section.remove_button));
+	gtk_widget_set_sensitive (GTK_WIDGET (section.remove_button), FALSE);
+
+	widget = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+	gtk_container_add (GTK_CONTAINER (section.remove_button), widget);
+
+	hbox = gtk_hbox_new (FALSE, 2);
+	gtk_widget_show (hbox);
+	gtk_container_add (GTK_CONTAINER (widget), hbox);
+
+	image = gtk_image_new_from_stock ("gtk-go-back", GTK_ICON_SIZE_BUTTON);
+	gtk_widget_show (image);
+	gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0);
+
+	label = gtk_label_new_with_mnemonic (_("_Remove"));
+	gtk_widget_show (label);
+	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+
+	vbox = gtk_vbox_new (FALSE, 0);
+	
+	widget = gtk_alignment_new (0.5, 0.0, 0.0, 0.0);
+	gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (section.label));
+	gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, TRUE, 0);
 
 	/* Pack view (in a scrolled window) */
 	widget = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (widget), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN);
 	gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (section.destination_view));
-	gtk_box_pack_start (section.section_box, widget, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (chbox), widget, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (vbox), chbox, TRUE, TRUE, 0);
+	gtk_box_pack_start (section.section_box, vbox, TRUE, TRUE, 0);
+
+	/*data for 'changed' callback*/
+	data = g_malloc0(sizeof(SelData));
+	data->view = section.destination_view;
+	data->button = section.remove_button;
+	selection = gtk_tree_view_get_selection(section.destination_view);
+	g_signal_connect(selection, "changed",
+				  G_CALLBACK (selection_changed), data);
+	
 	g_signal_connect_swapped (section.destination_view, "row-activated",
 				  G_CALLBACK (destination_activated), name_selector_dialog);
 	g_signal_connect_swapped (section.destination_view, "key-press-event",
@@ -671,8 +754,7 @@ destination_activated (ENameSelectorDial
 }
 
 static gboolean 
-destination_key_press (ENameSelectorDialog *name_selector_dialog, 
-		       GdkEventKey *event, GtkTreeView *tree_view)
+remove_selection (ENameSelectorDialog *name_selector_dialog, GtkTreeView *tree_view)
 {
 	gint               section_index;
 	EDestinationStore *destination_store;
@@ -680,10 +762,6 @@ destination_key_press (ENameSelectorDial
 	Section           *section;
 	GtkTreeIter        iter;
 
-	/* we only care about DEL key */
-	if (event->keyval != GDK_Delete)
-		return FALSE;
-
 	section_index = find_section_by_tree_view (name_selector_dialog, tree_view);
 	if (section_index < 0) {
 		g_warning ("ENameSelectorDialog got key press from unknown view!");
@@ -706,6 +784,29 @@ destination_key_press (ENameSelectorDial
 	e_destination_store_remove_destination (destination_store, destination);
 
 	return TRUE;
+}
+
+static void
+remove_button_clicked (GtkButton *button, SelData *data)
+{
+	GtkTreeView *view;
+	ENameSelectorDialog *name_selector_dialog;
+	
+	view = data->view; 
+	name_selector_dialog = data->dlg_ptr;
+	remove_selection (name_selector_dialog, view);
+}
+	
+static gboolean 
+destination_key_press (ENameSelectorDialog *name_selector_dialog, 
+		       GdkEventKey *event, GtkTreeView *tree_view)
+{
+
+	/* we only care about DEL key */
+	if (event->keyval != GDK_Delete)
+		return FALSE;
+	return remove_selection (name_selector_dialog, tree_view);
+
 }
 
 static void