Merge lp:~rodrigo-moya/ubuntuone-client/add-contacts-fixes into lp:ubuntuone-client

[Rodrigo Moya]

Several fixes in adding contacts logic

Several fixes in adding contacts logic

[Roman Yepishev (rye)]

Tested & it works the way it should according to bug reports.

review: Approve

[Rick McBride (rmcbride)]

+1

review: Approve

[dobey (dobey)]

The following files contain translations and are currently not in use. Please
consider adding these to the POTFILES.in file, located in the po/ directory.

nautilus/add-contact-dialog.c

review: Needs Fixing

[lp:~rodrigo-moya/ubuntuone-client/add-contacts-fixes]

531. By Rodrigo Moya on 2010-06-03

Added missing translatable file

=== modified file 'nautilus/Makefile.am'
--- nautilus/Makefile.am	2010-02-08 09:44:21 +0000
+++ nautilus/Makefile.am	2010-06-03 22:25:40 +0000
@@ -19,6 +19,8 @@
 ubuntuone-nautilus.c: ubuntuone-marshallers.h
 
 libnautilus_ubuntuone_la_SOURCES =	\
+	add-contact-dialog.c	\
+	add-contact-dialog.h	\
 	contacts-view.c		\
 	contacts-view.h		\
 	u1-contacts-picker.c	\
@@ -36,6 +38,8 @@
 	$(NAUTILUS_CFLAGS)
 test_contacts_picker_SOURCES = 	\
 	test-contacts-picker.c	\
+	add-contact-dialog.c	\
+	add-contact-dialog.h	\
 	contacts-view.c		\
 	contacts-view.h		\
 	u1-contacts-picker.c	\

=== added file 'nautilus/add-contact-dialog.c'
--- nautilus/add-contact-dialog.c	1970-01-01 00:00:00 +0000
+++ nautilus/add-contact-dialog.c	2010-06-03 22:25:40 +0000
@@ -0,0 +1,134 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
+ *
+ * Authors: Rodrigo Moya <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <string.h>
+#include <glib/gi18n.h>
+#include "add-contact-dialog.h"
+
+G_DEFINE_TYPE(AddContactDialog, add_contact_dialog, GTK_TYPE_DIALOG)
+
+static void
+add_contact_dialog_finalize (GObject *object)
+{
+	G_OBJECT_CLASS (add_contact_dialog_parent_class)->finalize (object);
+}
+
+static void
+add_contact_dialog_class_init (AddContactDialogClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+	object_class->finalize = add_contact_dialog_finalize;
+}
+
+static void
+entry_changed_cb (GtkEditable *entry, gpointer user_data)
+{
+	const gchar *text_name, *text_email;
+	AddContactDialog *dialog = (AddContactDialog *) user_data;
+
+	text_name = gtk_entry_get_text (GTK_ENTRY (dialog->name_entry));
+	text_email = gtk_entry_get_text (GTK_ENTRY (dialog->email_entry));
+	if (strlen (text_name) > 0 && strlen (text_email) > 0)
+		gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, TRUE);
+	else
+		gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+}
+
+static void
+entry_activated_cb (GtkEntry *entry, gpointer user_data)
+{
+	const gchar *text_name, *text_email;
+	AddContactDialog *dialog = (AddContactDialog *) user_data;
+
+	text_name = gtk_entry_get_text (GTK_ENTRY (dialog->name_entry));
+	text_email = gtk_entry_get_text (GTK_ENTRY (dialog->email_entry));
+	if (strlen (text_name) > 0 && strlen (text_email) > 0)
+		gtk_dialog_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+}
+
+static void
+add_contact_dialog_init (AddContactDialog *dialog)
+{
+	GtkWidget *table, *label;
+
+	/* Build the dialog */
+	gtk_window_set_title (GTK_WINDOW (dialog), _("Add contact"));
+	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+	gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+	gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_ADD, GTK_RESPONSE_OK);
+
+	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
+
+	table = gtk_table_new (2, 2, FALSE);
+	gtk_widget_show (table);
+	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+			    table, TRUE, TRUE, 3);
+
+	label = gtk_label_new (_("Contact name"));
+	gtk_widget_show (label);
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 3, 3);
+
+	dialog->name_entry = gtk_entry_new ();
+	g_signal_connect (G_OBJECT (dialog->name_entry), "changed", G_CALLBACK (entry_changed_cb), dialog);
+	g_signal_connect (G_OBJECT (dialog->name_entry), "activate", G_CALLBACK (entry_activated_cb), dialog);
+	gtk_widget_show (dialog->name_entry);
+	gtk_table_attach (GTK_TABLE (table), dialog->name_entry, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 3, 3);
+
+	label = gtk_label_new (_("Email address"));
+	gtk_widget_show (label);
+	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 3, 3);
+
+	dialog->email_entry = gtk_entry_new ();
+	g_signal_connect (G_OBJECT (dialog->email_entry), "changed", G_CALLBACK (entry_changed_cb), dialog);
+	g_signal_connect (G_OBJECT (dialog->email_entry), "activate", G_CALLBACK (entry_activated_cb), dialog);
+	gtk_widget_show (dialog->email_entry);
+	gtk_table_attach (GTK_TABLE (table), dialog->email_entry, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 3, 3);
+}
+
+GtkWidget *
+add_contact_dialog_new (GtkWindow *parent, const gchar *initial_text)
+{
+	AddContactDialog *dialog;
+
+	dialog = g_object_new (TYPE_ADD_CONTACT_DIALOG, NULL);
+	if (g_strrstr (initial_text, "@") != NULL)
+		gtk_entry_set_text (GTK_ENTRY (dialog->email_entry), initial_text);
+	else
+		gtk_entry_set_text (GTK_ENTRY (dialog->name_entry), initial_text);
+
+	gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);
+
+	return dialog;
+}
+
+const gchar *
+add_contact_dialog_get_name_text (AddContactDialog *dialog)
+{
+	return gtk_entry_get_text (GTK_ENTRY (dialog->name_entry));
+}
+
+const gchar *
+add_contact_dialog_get_email_text (AddContactDialog *dialog)
+{
+	return gtk_entry_get_text (GTK_ENTRY (dialog->email_entry));
+}

=== added file 'nautilus/add-contact-dialog.h'
--- nautilus/add-contact-dialog.h	1970-01-01 00:00:00 +0000
+++ nautilus/add-contact-dialog.h	2010-06-03 22:25:40 +0000
@@ -0,0 +1,50 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2009 Canonical Services Ltd (www.canonical.com)
+ *
+ * Authors: Rodrigo Moya <[e-mail]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __ADD_CONTACT_DIALOG_H__
+#define __ADD_CONTACT_DIALOG_H__
+
+#include <gtk/gtk.h>
+
+#define TYPE_ADD_CONTACT_DIALOG                (add_contact_dialog_get_type ())
+#define ADD_CONTACT_DIALOG(obj)                (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ADD_CONTACT_DIALOG, AddContactDialog))
+#define IS_ADD_CONTACT_DIALOG(obj)             (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_ADD_CONTACT_DIALOG))
+#define ADD_CONTACT_DIALOG_CLASS(klass)        (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_ADD_CONTACT_DIALOG, AddContactDialogClass))
+#define IS_ADD_CONTACT_DIALOG_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_ADD_CONTACT_DIALOG))
+#define ADD_CONTACT_DIALOG_GET_CLASS(obj)      (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_ADD_CONTACT_DIALOG, AddContactDialogClass))
+
+typedef struct {
+	GtkDialog parent;
+
+	GtkWidget *name_entry;
+	GtkWidget *email_entry;
+} AddContactDialog;
+
+typedef struct {
+	GtkDialogClass parent_class;
+} AddContactDialogClass;
+
+GType        add_contact_dialog_get_type (void);
+GtkWidget   *add_contact_dialog_new (GtkWindow *parent, const gchar *initial_text);
+const gchar *add_contact_dialog_get_name_text (AddContactDialog *dialog);
+const gchar *add_contact_dialog_get_email_text (AddContactDialog *dialog);
+
+#endif

=== modified file 'nautilus/u1-contacts-picker.c'
--- nautilus/u1-contacts-picker.c	2010-04-16 11:52:46 +0000
+++ nautilus/u1-contacts-picker.c	2010-06-03 22:25:40 +0000
@@ -21,6 +21,7 @@
 
 #include <glib/gi18n.h>
 #include "u1-contacts-picker.h"
+#include "add-contact-dialog.h"
 #include "contacts-view.h"
 
 struct _U1ContactsPickerPrivate {
@@ -83,8 +84,9 @@
 	text = gtk_entry_get_text (GTK_ENTRY (entry));
 	contacts_view_search (CONTACTS_VIEW (picker->priv->contacts_view), text);
 
-	/* If no contacts offer the user to add it to the contacts database */
-	if (contacts_view_get_matched_contacts_count (CONTACTS_VIEW (picker->priv->contacts_view)) == 0)
+	/* If no contacts, offer the user to add it to the contacts database */
+	if (contacts_view_get_matched_contacts_count (CONTACTS_VIEW (picker->priv->contacts_view)) == 0 &&
+	    g_strrstr (text, "@") != NULL)
 		gtk_widget_show (picker->priv->add_contact_button);
 	else
 		gtk_widget_hide (picker->priv->add_contact_button);
@@ -116,48 +118,19 @@
 static void
 add_contact_cb (GtkButton *button, gpointer user_data)
 {
-	GtkWidget *dialog, *table, *label, *name_entry, *email_entry;
+	GtkWidget *dialog;
 	const gchar *search_text;
 	U1ContactsPicker *picker = (U1ContactsPicker *) user_data;
 
-	/* Build the dialog */
-	dialog = gtk_dialog_new_with_buttons (_("Add contact"),
-					      GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (picker))),
-					      GTK_DIALOG_NO_SEPARATOR,
-					      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-					      GTK_STOCK_ADD, GTK_RESPONSE_OK,
-					      NULL);
-	table = gtk_table_new (2, 2, FALSE);
-	gtk_widget_show (table);
-	gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
-			    table, TRUE, TRUE, 3);
-
-	label = gtk_label_new (_("Contact name"));
-	gtk_widget_show (label);
-	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 3, 3);
-	name_entry = gtk_entry_new ();
-	gtk_widget_show (name_entry);
-	gtk_table_attach (GTK_TABLE (table), name_entry, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 3, 3);
-
-	label = gtk_label_new (_("Email address"));
-	gtk_widget_show (label);
-	gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 3, 3);
-	email_entry = gtk_entry_new ();
-	gtk_widget_show (email_entry);
-	gtk_table_attach (GTK_TABLE (table), email_entry, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 3, 3);
-
+	/* Create the dialog */
 	search_text = gtk_entry_get_text (GTK_ENTRY (picker->priv->search_entry));
-	if (g_strrstr (search_text, "@") != NULL)
-		gtk_entry_set_text (GTK_ENTRY (email_entry), search_text);
-	else
-		gtk_entry_set_text (GTK_ENTRY (name_entry), search_text);
+	dialog = add_contact_dialog_new (GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (picker))), search_text);
 
 	/* Run the dialog */
-	gtk_widget_grab_focus (name_entry);
 	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) {
 		contacts_view_add_contact (CONTACTS_VIEW (picker->priv->contacts_view),
-					   gtk_entry_get_text (GTK_ENTRY (name_entry)),
-					   gtk_entry_get_text (GTK_ENTRY (email_entry)));
+					   add_contact_dialog_get_name_text (dialog),
+					   add_contact_dialog_get_email_text (dialog));
 		gtk_entry_set_text (GTK_ENTRY (picker->priv->search_entry), "");
 	}
 

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2010-02-09 22:03:08 +0000
+++ po/POTFILES.in	2010-06-03 22:25:40 +0000
@@ -3,7 +3,7 @@
 data/emblem-ubuntuone-unsynchronized.icon.in
 data/emblem-ubuntuone-uploading.icon.in
 data/ubuntuone-preferences.desktop.in
+nautilus/add-contact-dialog.c
 nautilus/ubuntuone-nautilus.c
 nautilus/contacts-view.c
 nautilus/u1-contacts-picker.c
-