r1263 - in trunk/src/target/OM-2007/applications/openmoko-contacts: . po src

thomas at sita.openmoko.org thomas at sita.openmoko.org
Wed Mar 7 16:57:06 CET 2007


Author: thomas
Date: 2007-03-07 16:57:04 +0100 (Wed, 07 Mar 2007)
New Revision: 1263

Modified:
   trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
   trunk/src/target/OM-2007/applications/openmoko-contacts/configure.ac
   trunk/src/target/OM-2007/applications/openmoko-contacts/po/ChangeLog
   trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ui.c
   trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-gtk.c
   trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-main.c
Log:
Merge in various changes from mainline contacts


Modified: trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog	2007-03-07 13:25:35 UTC (rev 1262)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/ChangeLog	2007-03-07 15:57:04 UTC (rev 1263)
@@ -1,3 +1,63 @@
+2007-03-07  Thomas Wood  <thomas at openedhand.com>
+
+	Merge in various changes from mainline contacts:
+
+	........
+	r180 | thomas | 2007-03-06 15:22:37 +0000 (Tue, 06 Mar 2007) | 6 lines
+
+	2007-03-06  Thomas Wood  <thomas at openedhand.com>
+
+		* src/contacts-callbacks-ui.c: (contacts_search_changed_cb): Prevent
+		the search entry selecting text on backspace (partially fixes bug 53).
+		(contacts_treeview_search_cb): Replace deprecated function
+
+	........
+	r179 | thomas | 2007-03-06 14:44:37 +0000 (Tue, 06 Mar 2007) | 8 lines
+
+	2007-03-06  Thomas Wood  <thomas at openedhand.com>
+
+		* src/contacts-edit-pane.c: (contacts_change_groups_cb): Fix group editing/management (
+		fixes bug 217)
+
+		* src/contacts-gtk.c: (create_main_window):
+		* src/contacts-main.c: (main):
+		Tweaks to make UI more stable and consistent
+
+	........
+	r177 | ross | 2007-03-04 11:34:40 +0000 (Sun, 04 Mar 2007) | 5 lines
+
+	2007-03-04  Ross Burton  <ross at openedhand.com>
+
+		* pl.po:
+		Polish translation, thanks Tomasz Dominikowski.
+
+	........
+	r176 | thomas | 2007-03-01 13:58:10 +0000 (Thu, 01 Mar 2007) | 4 lines
+
+		* po/LINGUAS: Added new translations
+		* po/bg.po: New Bulgarian translation from Yavor Doganov <yavor at doganov.org> (Bug 208)
+		* po/da.po: New Danish translation from Kristian Poul Herkild <kristian at herkild.dk> (Bug 212)
+
+	........
+	r158 | ross | 2007-01-26 16:51:33 +0000 (Fri, 26 Jan 2007) | 7 lines
+
+	2007-01-26  Ross Burton  <ross at openedhand.com>
+
+		* configure.ac
+		* po/LINGUAS:
+		Modified the intltool part to make use of a LINGUAS file (thanks
+		Olivier Le Thanh Duong <olivier at lethanh.be>)
+
+	........
+	r153 | ross | 2007-01-25 10:45:44 +0000 (Thu, 25 Jan 2007) | 5 lines
+
+	2007-01-25  Ross Burton  <ross at openedhand.com>
+
+		* src/contacts-main.c:
+		Pass a GError when creating the address book.
+	........
+
+
 2007-03-05  Thomas Wood  <thomas at openedhand.com>
 
 	* src/contacts-contact-pane.c: (field_button_add_cb),

Modified: trunk/src/target/OM-2007/applications/openmoko-contacts/configure.ac
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/configure.ac	2007-03-07 13:25:35 UTC (rev 1262)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/configure.ac	2007-03-07 15:57:04 UTC (rev 1263)
@@ -9,13 +9,12 @@
 AC_PROG_CC
 AC_STDC_HEADERS
 AC_PROG_LIBTOOL
-AC_PROG_INTLTOOL
+IT_PROG_INTLTOOL([0.35.0])
 
 dnl i18n support
 GETTEXT_PACKAGE=Contacts
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
 AC_SUBST(GETTEXT_PACKAGE)
-ALL_LINGUAS="de et fi fr it nl sv ca"
 AM_GLIB_GNU_GETTEXT
 
 PKG_CHECK_MODULES(CONTACTS, glib-2.0 glib-2.0 gtk+-2.0 libebook-1.2)

Modified: trunk/src/target/OM-2007/applications/openmoko-contacts/po/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/po/ChangeLog	2007-03-07 13:25:35 UTC (rev 1262)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/po/ChangeLog	2007-03-07 15:57:04 UTC (rev 1263)
@@ -1,3 +1,20 @@
+2007-03-07  Thomas Wood  <thos at gnome.org>
+
+	reviewed by: <delete if not using a buddy>
+
+	* ChangeLog:
+
+2007-03-04  Ross Burton  <ross at openedhand.com>
+
+	* pl.po:
+	Polish translation, thanks Tomasz Dominikowski.
+
+2007-02-06  Ross Burton  <ross at openedhand.com>
+
+	* LINGUAS:
+	* ru.po:
+	Add Russian translation, by Alexander Bokovoy.
+
 2006-11-24  Thomas Wood  <thomas at openedhand.com>
 
 	* POTFILES.in:

Modified: trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ui.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ui.c	2007-03-07 13:25:35 UTC (rev 1262)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-callbacks-ui.c	2007-03-07 15:57:04 UTC (rev 1263)
@@ -85,11 +85,12 @@
 void
 contacts_search_changed_cb (GtkWidget *widget, ContactsData *data)
 {
+	/* save the search string for use in the filter menu */
 	g_free (data->search_string);
 	data->search_string =
 		g_strdup (gtk_entry_get_text (GTK_ENTRY (widget)));
 
-	gtk_widget_grab_focus (data->ui->search_entry);
+	/* update the contacts list */
 	contacts_update_treeview (data);
 }
 
@@ -637,7 +638,7 @@
 	GtkTreeView *treeview)
 {
 	gtk_widget_event (search_entry, (GdkEvent *)event);
-	gtk_entry_set_position (GTK_ENTRY (search_entry), -1);
+	gtk_editable_set_position (GTK_EDITABLE (search_entry), -1);
 	
 	return FALSE;
 }

Modified: trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-gtk.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-gtk.c	2007-03-07 13:25:35 UTC (rev 1262)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-gtk.c	2007-03-07 15:57:04 UTC (rev 1263)
@@ -166,8 +166,8 @@
 
 	main_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_title (GTK_WINDOW (main_window), _("Contacts"));
-	gtk_window_set_default_size (GTK_WINDOW (main_window), -1, 300);
 	gtk_window_set_icon_name (GTK_WINDOW (main_window), "stock_contact");
+	gtk_window_set_default_size (GTK_WINDOW (main_window), 320, 240);
 
 	vbox7 = gtk_vbox_new (FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (main_window), vbox7);
@@ -204,6 +204,7 @@
 
 	contact_menu = gtk_menu_item_new_with_mnemonic (_("_Contact"));
 	gtk_container_add (GTK_CONTAINER (main_menubar), contact_menu);
+	g_object_set (G_OBJECT (contact_menu), "no-show-all", TRUE, NULL);
 
 	contact_menu_menu = gtk_menu_new ();
 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (contact_menu), contact_menu_menu);
@@ -256,7 +257,6 @@
 
 	main_hpane = gtk_hpaned_new ();
 	gtk_container_add (GTK_CONTAINER (main_notebook), main_hpane);
-	gtk_paned_set_position (GTK_PANED (main_hpane), 1);
 
 	contacts_vbox = gtk_vbox_new (FALSE, 6);
 	gtk_paned_pack1 (GTK_PANED (main_hpane), contacts_vbox, FALSE, FALSE);
@@ -299,6 +299,7 @@
 
 	search_tab_hbox = gtk_hbox_new (FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (search_hbox), search_tab_hbox, TRUE, TRUE, 0);
+	g_object_set (G_OBJECT (search_tab_hbox), "no-show-all", TRUE, NULL);
 
 	symbols_radiobutton = gtk_radio_button_new_with_mnemonic (NULL, _("0-9#"));
 	gtk_box_pack_start (GTK_BOX (search_tab_hbox), symbols_radiobutton, TRUE, FALSE, 0);
@@ -336,7 +337,7 @@
 	preview_header_hbox = gtk_hbox_new (FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (summary_vbox), preview_header_hbox, FALSE, TRUE, 0);
 
-	summary_name_label = gtk_label_new (_("<span><big><b>Welcome to Contacts</b></big></span>"));
+	summary_name_label = gtk_label_new (NULL);
 	gtk_box_pack_start (GTK_BOX (preview_header_hbox), summary_name_label, TRUE, TRUE, 0);
 	GTK_WIDGET_SET_FLAGS (summary_name_label, GTK_CAN_FOCUS);
 	gtk_label_set_use_markup (GTK_LABEL (summary_name_label), TRUE);
@@ -345,7 +346,7 @@
 	gtk_misc_set_padding (GTK_MISC (summary_name_label), 6, 0);
 	gtk_label_set_ellipsize (GTK_LABEL (summary_name_label), PANGO_ELLIPSIZE_END);
 
-	photo_image = gtk_image_new_from_icon_name ("stock_contact", GTK_ICON_SIZE_DIALOG);
+	photo_image = gtk_image_new ();
 	gtk_box_pack_end (GTK_BOX (preview_header_hbox), photo_image, FALSE, TRUE, 6);
 	gtk_misc_set_padding (GTK_MISC (photo_image), 1, 0);
 
@@ -363,7 +364,8 @@
 
 	summary_hbuttonbox = gtk_hbutton_box_new ();
 	gtk_box_pack_end (GTK_BOX (vbox3), summary_hbuttonbox, FALSE, FALSE, 0);
-	gtk_button_box_set_layout (GTK_BUTTON_BOX (summary_hbuttonbox), GTK_BUTTONBOX_SPREAD);
+	gtk_button_box_set_layout (GTK_BUTTON_BOX (summary_hbuttonbox), GTK_BUTTONBOX_END);
+	gtk_box_set_spacing (GTK_BOX (summary_hbuttonbox), 6);
 
 	new_button = gtk_button_new_from_stock ("gtk-new");
 	gtk_container_add (GTK_CONTAINER (summary_hbuttonbox), new_button);
@@ -399,6 +401,7 @@
 	hbuttonbox2 = gtk_hbutton_box_new ();
 	gtk_box_pack_start (GTK_BOX (vbox4), hbuttonbox2, FALSE, TRUE, 0);
 	gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox2), GTK_BUTTONBOX_END);
+	gtk_box_set_spacing (GTK_BOX (hbuttonbox2), 6);
 
 	add_field_button = gtk_button_new_with_mnemonic (_("_Add Field"));
 	gtk_container_add (GTK_CONTAINER (hbuttonbox2), add_field_button);
@@ -541,11 +544,6 @@
 	ui->summary_table = summary_table;
 	ui->summary_vbox = summary_vbox;
 
-	gtk_widget_show_all (main_window);
-	gtk_widget_hide (search_tab_hbox);
-	gtk_widget_hide (contact_menu);
-
-
 #ifdef HAVE_GCONF
 	client = gconf_client_get_default ();
 	search = gconf_client_get_string (client, GCONF_KEY_SEARCH, NULL);

Modified: trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-main.c	2007-03-07 13:25:35 UTC (rev 1262)
+++ trunk/src/target/OM-2007/applications/openmoko-contacts/src/contacts-main.c	2007-03-07 15:57:04 UTC (rev 1263)
@@ -136,6 +136,7 @@
 int
 main (int argc, char **argv)
 {
+	GError *error = NULL;
 	BaconMessageConnection *mc;
 #ifdef HAVE_GCONF
 	const char *search;
@@ -155,9 +156,9 @@
 	};
 
         /* Initialise the i18n support code */
-        bindtextdomain (GETTEXT_PACKAGE, CONTACTS_LOCALE_DIR);
-        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-        textdomain (GETTEXT_PACKAGE);
+	bindtextdomain (GETTEXT_PACKAGE, CONTACTS_LOCALE_DIR);
+	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+	textdomain (GETTEXT_PACKAGE);
 
 	context = g_option_context_new (" - A light-weight address-book");
 	g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
@@ -221,12 +222,11 @@
 		g_signal_connect (G_OBJECT (plug_widget), "destroy",
 				  G_CALLBACK (gtk_main_quit), NULL);
 		widget = data->ui->main_menubar;
-		gtk_widget_hide (widget);
 		gtk_widget_show (plug_widget);
 	} else {
 		g_signal_connect (G_OBJECT (widget), "destroy",
 				  G_CALLBACK (gtk_main_quit), NULL);
-		gtk_widget_show (widget);
+		gtk_widget_show_all (widget);
 	}
 
 	/* fix icon sizes to 16x16 for the moment... */





More information about the commitlog mailing list