From 7350d76e136f230b86ccd152a5f81fc95b423cfa Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Fri, 31 Jul 2009 09:23:31 +1000 Subject: [PATCH] Change localization from Glade to GtkBuilder --- capplets/localization/Makefile.am | 6 +- .../{localization.glade => localization.ui} | 160 ++++++++++-------- capplets/localization/main.c | 11 +- 3 files changed, 102 insertions(+), 75 deletions(-) rename capplets/localization/{localization.glade => localization.ui} (63%) diff --git a/capplets/localization/Makefile.am b/capplets/localization/Makefile.am index 639336e27..f3bff03b1 100644 --- a/capplets/localization/Makefile.am +++ b/capplets/localization/Makefile.am @@ -13,13 +13,13 @@ desktopdir = $(datadir)/applications Desktop_in_files = localization.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) -gladedir = $(pkgdatadir)/glade -dist_glade_DATA = localization.glade +uidir = $(pkgdatadir)/ui +dist_ui_DATA = localization.ui INCLUDES = \ $(CAPPLET_CFLAGS) \ $(GNOMECC_CAPPLETS_CFLAGS) \ - -DGNOMECC_GLADEDIR="\"$(gladedir)\"" \ + -DGNOMECC_UI_DIR="\"$(uidir)\"" \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" diff --git a/capplets/localization/localization.glade b/capplets/localization/localization.ui similarity index 63% rename from capplets/localization/localization.glade rename to capplets/localization/localization.ui index ee8dfbebd..352bda024 100644 --- a/capplets/localization/localization.glade +++ b/capplets/localization/localization.ui @@ -1,136 +1,150 @@ - - - - - + + + + + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 5 Localization Preferences - GTK_WIN_POS_CENTER_ON_PARENT + center-on-parent preferences-desktop-locale - GDK_WINDOW_TYPE_HINT_DIALOG + dialog False - + True + vertical 2 - + True 5 + vertical 18 - + True 6 - + True gtk-dialog-info - 5 - + 5 + False + 0 - + 280 True 0 <i>Region and language changes take effect the next time you log in.</i> True True - + 1 - + False + 0 - + True 12 - + True Region: True - + False + 0 - + True True + False True - 0 - + 1 - + False 1 - + True + vertical 6 - + True 0 Selected languages: - + False + 0 - + True - 1 2 3 - + True + vertical 3 - GTK_BUTTONBOX_START + start - + + gtk-add True True True - gtk-add + False True - 0 - + + + False + False + 0 + - + + gtk-remove True True True - gtk-remove + False True - 0 - + + False + False 1 - + 1 2 @@ -139,84 +153,96 @@ - + True True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN + automatic + automatic + in - + 100 True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - + - + GTK_EXPAND | GTK_SHRINK | GTK_FILL GTK_EXPAND | GTK_SHRINK | GTK_FILL - + 1 - + True 6 - GTK_BUTTONBOX_END - + end + False 2 - + 2 - + 1 - + True - GTK_BUTTONBOX_END + end - + + gtk-help True True - gtk-help + False True - -11 - + + + False + False + 0 + - + + gtk-close True True - gtk-close + False True - 0 - + + False + False 1 - + False - GTK_PACK_END + end + 0 - + - - + + button14 + button13 + + + diff --git a/capplets/localization/main.c b/capplets/localization/main.c index 660f2feb2..d21eeb155 100644 --- a/capplets/localization/main.c +++ b/capplets/localization/main.c @@ -20,17 +20,18 @@ */ #include -#include +#include static GtkWidget * create_dialog (void) { - GladeXML *xml; + GtkBuilder *ui; GtkWidget *dialog; - xml = glade_xml_new (GNOMECC_GLADEDIR "/localization.glade", "i18n_dialog", NULL); - dialog = glade_xml_get_widget (xml, "i18n_dialog"); - g_object_unref (xml); + ui = gtk_builder_new (); + gtk_builder_add_from_file (ui, GNOMECC_UI_DIR "/localization.ui", NULL); + dialog = GTK_WIDGET (gtk_builder_get_object (ui, "i18n_dialog")); + g_object_unref (ui); return dialog; }