diff --git a/capplets/about-me/Makefile.am b/capplets/about-me/Makefile.am index 4690b6405..32ebdaa1d 100644 --- a/capplets/about-me/Makefile.am +++ b/capplets/about-me/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = icons # This is used in GNOMECC_CAPPLETS_CFLAGS cappletname = about-me -glade_files = gnome-about-me.glade gnome-about-me-fingerprint.glade +ui_files = gnome-about-me-dialog.ui gnome-about-me-password.ui gnome-about-me-fingerprint.ui Desktop_in_files = gnome-about-me.desktop.in gnome_about_me_SOURCES = \ @@ -31,8 +31,8 @@ gnome_about_me_LDFLAGS = -export-dynamic desktopdir = $(datadir)/applications desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) -gladedir = $(pkgdatadir)/glade -glade_DATA = $(glade_files) +uidir = $(pkgdatadir)/ui +ui_DATA = $(ui_files) INCLUDES = \ $(GNOMECC_CAPPLETS_CFLAGS) \ @@ -40,7 +40,7 @@ INCLUDES = \ $(POLKIT_GNOME_CFLAGS) \ -DDATADIR="\"$(datadir)\"" \ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ - -DGNOMECC_GLADE_DIR="\"$(gladedir)\"" \ + -DGNOMECC_UI_DIR="\"$(uidir)\"" \ -DGNOMECC_PIXMAP_DIR="\"$(pkgdatadir)/pixmaps\"" \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" @@ -56,6 +56,6 @@ marshal.c: marshal.h endif # BUILD_ABOUTME CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(MARSHALFILES) -EXTRA_DIST = $(glade_files) fprintd-marshal.list +EXTRA_DIST = $(ui_files) fprintd-marshal.list -include $(top_srcdir)/git.mk diff --git a/capplets/about-me/gnome-about-me-fingerprint.c b/capplets/about-me/gnome-about-me-fingerprint.c index 48e1f4dc9..bb569bf9d 100644 --- a/capplets/about-me/gnome-about-me-fingerprint.c +++ b/capplets/about-me/gnome-about-me-fingerprint.c @@ -19,15 +19,17 @@ #include #include -#include #include #include "fingerprint-strings.h" #include "capplet-util.h" -/* This must match the number of images on the 2nd page in the glade file */ +/* This must match the number of images on the 2nd page in the UI file */ #define MAX_ENROLL_STAGES 3 +#undef WID +#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s)) + static DBusGProxy *manager = NULL; static DBusGConnection *connection = NULL; static gboolean is_disable = FALSE; @@ -43,8 +45,7 @@ typedef struct { GtkWidget *disable; GtkWidget *ass; - GladeXML *dialog_page1; - GladeXML *dialog_page2; + GtkBuilder *dialog; DBusGProxy *device; gboolean is_swipe; @@ -208,7 +209,7 @@ delete_fingerprints (void) } static void -delete_fingerprints_question (GladeXML *dialog, GtkWidget *enable, GtkWidget *disable) +delete_fingerprints_question (GtkBuilder *dialog, GtkWidget *enable, GtkWidget *disable) { GtkWidget *question; GtkWidget *button; @@ -254,8 +255,7 @@ enroll_data_destroy (EnrollData *data) case STATE_NONE: g_free (data->name); g_object_unref (data->device); - g_object_unref (data->dialog_page1); - g_object_unref (data->dialog_page2); + g_object_unref (data->dialog); gtk_widget_destroy (data->ass); g_free (data); @@ -263,7 +263,7 @@ enroll_data_destroy (EnrollData *data) } static const char * -selected_finger (GladeXML *dialog) +selected_finger (GtkBuilder *dialog) { int index; @@ -304,13 +304,13 @@ selected_finger (GladeXML *dialog) static void finger_radio_button_toggled (GtkToggleButton *button, EnrollData *data) { - data->finger = selected_finger (data->dialog_page1); + data->finger = selected_finger (data->dialog); } static void finger_combobox_changed (GtkComboBox *combobox, EnrollData *data) { - data->finger = selected_finger (data->dialog_page1); + data->finger = selected_finger (data->dialog); } static void @@ -328,7 +328,7 @@ assistant_cancelled (GtkAssistant *ass, EnrollData *data) static void enroll_result (GObject *object, const char *result, gboolean done, EnrollData *data) { - GladeXML *dialog = data->dialog_page2; + GtkBuilder *dialog = data->dialog; char *msg; if (g_str_equal (result, "enroll-completed") || g_str_equal (result, "enroll-stage-passed")) { @@ -376,7 +376,7 @@ assistant_prepare (GtkAssistant *ass, GtkWidget *page, EnrollData *data) if (g_str_equal (name, "enroll")) { DBusGProxy *p; GError *error = NULL; - GladeXML *dialog = data->dialog_page2; + GtkBuilder *dialog = data->dialog; char *path; guint i; GValue value = { 0, }; @@ -488,7 +488,7 @@ enroll_fingerprints (GtkWindow *parent, GtkWidget *enable, GtkWidget *disable) { DBusGProxy *device, *p; GHashTable *props; - GladeXML *dialog; + GtkBuilder *dialog; EnrollData *data; GtkWidget *ass; char *msg; @@ -532,7 +532,11 @@ enroll_fingerprints (GtkWindow *parent, GtkWidget *enable, GtkWidget *disable) } g_object_unref (p); - ass = gtk_assistant_new (); + dialog = gtk_builder_new (); + gtk_builder_add_from_file (dialog, GNOMECC_UI_DIR "/gnome-about-me-fingerprint.ui", NULL); + data->dialog = dialog; + + ass = WID ("assistant"); gtk_window_set_title (GTK_WINDOW (ass), _("Enable Fingerprint Login")); gtk_window_set_transient_for (GTK_WINDOW (ass), parent); gtk_window_set_position (GTK_WINDOW (ass), GTK_WIN_POS_CENTER_ON_PARENT); @@ -544,13 +548,6 @@ enroll_fingerprints (GtkWindow *parent, GtkWidget *enable, GtkWidget *disable) G_CALLBACK (assistant_prepare), data); /* Page 1 */ - dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-about-me-fingerprint.glade", - "page1", NULL); - data->dialog_page1 = dialog; - - gtk_assistant_append_page (GTK_ASSISTANT (ass), WID("page1")); - gtk_assistant_set_page_title (GTK_ASSISTANT (ass), WID("page1"), _("Select finger")); - gtk_assistant_set_page_type (GTK_ASSISTANT (ass), WID("page1"), GTK_ASSISTANT_PAGE_CONTENT); gtk_combo_box_set_active (GTK_COMBO_BOX (WID ("finger_combobox")), 0); g_signal_connect (G_OBJECT (WID ("radiobutton1")), "toggled", @@ -578,15 +575,10 @@ enroll_fingerprints (GtkWindow *parent, GtkWidget *enable, GtkWidget *disable) gtk_assistant_set_page_complete (GTK_ASSISTANT (ass), WID("page1"), TRUE); /* Page 2 */ - dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-about-me-fingerprint.glade", - "page2", NULL); - data->dialog_page2 = dialog; - gtk_assistant_append_page (GTK_ASSISTANT (ass), WID("page2")); if (data->is_swipe != FALSE) gtk_assistant_set_page_title (GTK_ASSISTANT (ass), WID("page2"), _("Swipe finger on reader")); else gtk_assistant_set_page_title (GTK_ASSISTANT (ass), WID("page2"), _("Place finger on reader")); - gtk_assistant_set_page_type (GTK_ASSISTANT (ass), WID("page2"), GTK_ASSISTANT_PAGE_CONTENT); g_object_set_data (G_OBJECT (WID("page2")), "name", "enroll"); @@ -595,12 +587,6 @@ enroll_fingerprints (GtkWindow *parent, GtkWidget *enable, GtkWidget *disable) g_free (msg); /* Page 3 */ - dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-about-me-fingerprint.glade", - "page3", NULL); - gtk_assistant_append_page (GTK_ASSISTANT (ass), WID("page3")); - gtk_assistant_set_page_title (GTK_ASSISTANT (ass), WID("page3"), _("Done!")); - gtk_assistant_set_page_type (GTK_ASSISTANT (ass), WID("page3"), GTK_ASSISTANT_PAGE_SUMMARY); - g_object_set_data (G_OBJECT (WID("page3")), "name", "summary"); data->ass = ass; @@ -608,7 +594,7 @@ enroll_fingerprints (GtkWindow *parent, GtkWidget *enable, GtkWidget *disable) } void -fingerprint_button_clicked (GladeXML *dialog, +fingerprint_button_clicked (GtkBuilder *dialog, GtkWidget *enable, GtkWidget *disable) { diff --git a/capplets/about-me/gnome-about-me-fingerprint.glade b/capplets/about-me/gnome-about-me-fingerprint.glade deleted file mode 100644 index 71fce8ff2..000000000 --- a/capplets/about-me/gnome-about-me-fingerprint.glade +++ /dev/null @@ -1,378 +0,0 @@ - - - - - - - True - window1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - 12 - True - False - 12 - - - - True - False - 6 - - - - True - gtk-dialog-info - 6 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - True - - - - - - True - To enable fingerprint login, you need to save one of your fingerprints, using the Acme Foobar 5000. - False - False - GTK_JUSTIFY_LEFT - True - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - - True - False - 0 - - - - True - True - Right index finger - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - Left index finger - True - GTK_RELIEF_NORMAL - True - False - False - True - radiobutton1 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - True - Other finger: - True - GTK_RELIEF_NORMAL - True - False - False - True - radiobutton1 - - - 0 - False - False - - - - - - True - False - Left thumb -Left middle finger -Left ring finger -Left little finger -Right thumb -Right middle finger -Right ring finger -Right little finger - False - True - - - 0 - False - True - - - - - 0 - False - True - - - - - 0 - True - True - - - - - - - - True - window2 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 0 - - - - True - In order to save your fingerprints, you need to swipe your thumb on the "Acme foobar" device. - False - False - GTK_JUSTIFY_LEFT - True - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - - - - - True - gtk-no - 6 - 0.5 - 0.5 - 0 - 0 - - - 0 - True - True - - - - - - True - gtk-no - 6 - 0.5 - 0.5 - 0 - 0 - - - 0 - True - True - - - - - - True - gtk-no - 6 - 0.5 - 0.5 - 0 - 0 - - - 0 - True - True - - - - - - - - - 0 - True - True - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - True - window3 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - Your fingerprint was successfully saved. You should now be able to log in using your fingerprint reader. - False - False - GTK_JUSTIFY_LEFT - True - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - - - diff --git a/capplets/about-me/gnome-about-me-fingerprint.h b/capplets/about-me/gnome-about-me-fingerprint.h index e33e57a13..ea0e75ccc 100644 --- a/capplets/about-me/gnome-about-me-fingerprint.h +++ b/capplets/about-me/gnome-about-me-fingerprint.h @@ -17,11 +17,11 @@ * 02111-1307, USA. */ -#include +#include void set_fingerprint_label (GtkWidget *enable, GtkWidget *disable); -void fingerprint_button_clicked (GladeXML *dialog, +void fingerprint_button_clicked (GtkBuilder *dialog, GtkWidget *enable, GtkWidget *disable); diff --git a/capplets/about-me/gnome-about-me-fingerprint.ui b/capplets/about-me/gnome-about-me-fingerprint.ui new file mode 100644 index 000000000..d94a5e85f --- /dev/null +++ b/capplets/about-me/gnome-about-me-fingerprint.ui @@ -0,0 +1,256 @@ + + + + + + + + + + + + Left thumb + + + Left middle finger + + + Left ring finger + + + Left little finger + + + Right thumb + + + Right middle finger + + + Right ring finger + + + Right little finger + + + + + 12 + Enable Fingerprint Login + + + + + + True + 12 + vertical + 12 + + + True + 6 + + + True + gtk-dialog-info + 6 + + + False + 0 + + + + + True + To enable fingerprint login, you need to save one of your fingerprints, using the Acme Foobar 5000. + True + + + False + False + 1 + + + + + 0 + + + + + True + vertical + + + Right index finger + True + True + False + True + True + True + + + False + False + 0 + + + + + Left index finger + True + True + False + True + True + radiobutton1 + + + False + False + 1 + + + + + True + + + Other finger: + True + True + False + True + True + radiobutton1 + + + False + False + 0 + + + + + True + False + model1 + + + + 0 + + + + + False + 1 + + + + + False + 2 + + + + + 1 + + + + + Select finger + + + + + True + vertical + + + True + In order to save your fingerprints, you need to swipe your thumb on the "Acme foobar" device. + True + + + False + False + 0 + + + + + True + + + + + + True + gtk-no + 6 + + + 1 + + + + + True + gtk-no + 6 + + + 2 + + + + + True + gtk-no + 6 + + + 3 + + + + + + + + 1 + + + + + True + + + False + False + 2 + + + + + Swipe finger on reader + + + + + True + Your fingerprint was successfully saved. You should now be able to log in using your fingerprint reader. + True + + + summary + Done! + + + + diff --git a/capplets/about-me/gnome-about-me-password.c b/capplets/about-me/gnome-about-me-password.c index 53f6af0e5..aa405accf 100644 --- a/capplets/about-me/gnome-about-me-password.c +++ b/capplets/about-me/gnome-about-me-password.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -45,6 +44,9 @@ #include "capplet-util.h" #include "eel-alert-dialog.h" +#undef WID +#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s)) + /* Passwd states */ typedef enum { PASSWD_STATE_NONE, /* Passwd is not asking for anything */ @@ -55,7 +57,7 @@ typedef enum { } PasswdState; typedef struct { - GladeXML *xml; + GtkBuilder *ui; /* Commonly used widgets */ GtkEntry *current_password; @@ -428,7 +430,7 @@ io_watch_stdout (GIOChannel *source, GIOCondition condition, PasswordDialog *pdi GError *error = NULL; gchar *msg = NULL; /* Status error message */ - GladeXML *dialog; + GtkBuilder *dialog; gboolean reinit = FALSE; @@ -437,7 +439,7 @@ io_watch_stdout (GIOChannel *source, GIOCondition condition, PasswordDialog *pdi str = g_string_new (""); } - dialog = pdialog->xml; + dialog = pdialog->ui; if (g_io_channel_read_chars (source, buf, BUFSIZE, &bytes_read, &error) != G_IO_STATUS_NORMAL) { g_warning ("IO Channel read error: %s", error->message); @@ -661,12 +663,12 @@ update_password (PasswordDialog *pdialog) static void passdlg_set_busy (PasswordDialog *pdialog, gboolean busy) { - GladeXML *dialog; + GtkBuilder *dialog; GtkWidget *toplevel; GdkCursor *cursor = NULL; GdkDisplay *display; - dialog = pdialog->xml; + dialog = pdialog->ui; /* Set cursor */ toplevel = WID ("change-password"); @@ -738,9 +740,9 @@ passdlg_error_dialog (GtkWindow *parent, const gchar *title, static void passdlg_set_auth_state (PasswordDialog *pdialog, gboolean state) { - GladeXML *dialog; + GtkBuilder *dialog; - dialog = pdialog->xml; + dialog = pdialog->ui; /* Widgets which require a not-authenticated state to be accessible */ g_object_set (pdialog->current_password, "sensitive", !state, NULL); @@ -813,8 +815,7 @@ passdlg_spawn_passwd (PasswordDialog *pdialog) /* Spawn backend */ if (!spawn_passwd (pdialog, &error)) { - GtkWidget *parent = glade_xml_get_widget (pdialog->xml, - "change-password"); + GtkWidget *parent = GTK_WIDGET (gtk_builder_get_object (pdialog->ui, "change-password")); /* translators: Unable to launch : */ details = g_strdup_printf (_("Unable to launch %s: %s"), @@ -865,11 +866,11 @@ passdlg_authenticate (GtkButton *button, PasswordDialog *pdialog) static guint passdlg_validate_passwords (PasswordDialog *pdialog) { - GladeXML *dialog; + GtkBuilder *dialog; const gchar *new_password, *retyped_password; glong nlen, rlen; - dialog = pdialog->xml; + dialog = pdialog->ui; new_password = gtk_entry_get_text (pdialog->new_password); retyped_password = gtk_entry_get_text (pdialog->retyped_password); @@ -902,11 +903,11 @@ passdlg_validate_passwords (PasswordDialog *pdialog) static guint passdlg_refresh_password_state (PasswordDialog *pdialog) { - GladeXML *dialog; + GtkBuilder *dialog; guint ret; gboolean valid = FALSE; - dialog = pdialog->xml; + dialog = pdialog->ui; ret = passdlg_validate_passwords (pdialog); @@ -1008,13 +1009,14 @@ passdlg_activate (GtkEntry *entry, GtkWidget *w) static void passdlg_init (PasswordDialog *pdialog, GtkWindow *parent) { - GladeXML *dialog; + GtkBuilder *dialog; GtkWidget *wpassdlg; GtkAccelGroup *group; /* Initialize dialog */ - dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-about-me.glade", "change-password", NULL); - pdialog->xml = dialog; + dialog = gtk_builder_new (); + gtk_builder_add_from_file (dialog, GNOMECC_UI_DIR "/gnome-about-me-password.ui", NULL); + pdialog->ui = dialog; wpassdlg = WID ("change-password"); capplet_set_icon (wpassdlg, "user-info"); @@ -1098,7 +1100,7 @@ void gnome_about_me_password (GtkWindow *parent) { PasswordDialog *pdialog; - GladeXML *dialog; + GtkBuilder *dialog; GtkWidget *wpassdlg; gint result; @@ -1108,7 +1110,7 @@ gnome_about_me_password (GtkWindow *parent) pdialog = g_new0 (PasswordDialog, 1); passdlg_init (pdialog, parent); - dialog = pdialog->xml; + dialog = pdialog->ui; wpassdlg = WID ("change-password"); /* Go! */ diff --git a/capplets/about-me/gnome-about-me-password.ui b/capplets/about-me/gnome-about-me-password.ui new file mode 100644 index 000000000..4978383c3 --- /dev/null +++ b/capplets/about-me/gnome-about-me-password.ui @@ -0,0 +1,316 @@ + + + + + + 6 + Change password + False + dialog + False + + + True + vertical + 6 + + + True + 6 + 12 + + + True + 0 + gtk-dialog-authentication + 6 + + + False + False + 0 + + + + + True + vertical + 6 + + + True + 0 + <span size="larger" weight="bold">Change your password</span> + True + + + False + False + 0 + + + + + True + 0 + 0 + To change your password, enter your current password in the field below and click <b>Authenticate</b>. +After you have authenticated, enter your new password, retype it for verification and click <b>Change password</b>. + True + True + + + False + False + 1 + + + + + True + 6 + + + True + vertical + 6 + True + + + True + 0 + Current _password: + True + current-password + + + False + False + 0 + + + + + True + False + 0 + _New password: + True + new-password + + + False + False + 1 + + + + + True + False + 0 + _Retype new password: + True + retyped-password + + + False + False + 2 + + + + + False + False + 0 + + + + + True + vertical + 6 + True + + + True + 6 + + + True + True + False + + + 0 + + + + + True + True + False + + + True + 0 + 0 + + + True + 2 + + + True + gtk-apply + + + False + False + 0 + + + + + True + _Authenticate + True + + + False + False + 1 + + + + + + + + + False + False + 1 + + + + + 0 + + + + + True + False + True + False + + + False + False + 1 + + + + + True + False + True + False + True + + + False + False + 2 + + + + + 1 + + + + + False + False + 2 + + + + + True + Please type your password again in the <b>Retype new password</b> field. + True + center + True + + + 3 + + + + + 1 + + + + + False + False + 1 + + + + + True + end + + + gtk-close + True + True + True + False + True + + + False + False + 0 + + + + + Change pa_ssword + True + False + True + True + True + False + True + + + False + False + 1 + + + + + False + False + end + 0 + + + + + + cancel-button + change-password-button + + + diff --git a/capplets/about-me/gnome-about-me.c b/capplets/about-me/gnome-about-me.c index 211514d3c..3f35c9c57 100644 --- a/capplets/about-me/gnome-about-me.c +++ b/capplets/about-me/gnome-about-me.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -52,13 +51,17 @@ #define EMAIL_SLOTS 4 +#undef WID +#define WID(s) GTK_WIDGET (gtk_builder_get_object (dialog, s)) + typedef struct { EContact *contact; EBook *book; - GladeXML *dialog; + GtkBuilder *dialog; GtkWidget *enable_fingerprint_button; GtkWidget *disable_fingerprint_button; + GtkWidget *image_chooser; GdkScreen *screen; GtkIconTheme *theme; @@ -303,7 +306,7 @@ about_me_focus_out (GtkWidget *widget, GdkEventFocus *event, GnomeAboutMe *me) const gchar *wid; gint i; - wid = glade_get_widget_name (widget); + wid = gtk_widget_get_name (widget); if (wid == NULL) return FALSE; @@ -493,7 +496,7 @@ about_me_setup_email (GnomeAboutMe *me) /** * about_me_load_string_field: * - * wid: glade widget name + * wid: UI widget name * cid: id of the field (EDS id) * aid: position in the array WidToCid **/ @@ -501,8 +504,8 @@ about_me_setup_email (GnomeAboutMe *me) static void about_me_load_string_field (GnomeAboutMe *me, const gchar *wid, guint cid, guint aid) { - GtkWidget *widget; - GladeXML *dialog; + GtkWidget *widget; + GtkBuilder *dialog; const gchar *str; dialog = me->dialog; @@ -541,22 +544,19 @@ about_me_load_string_field (GnomeAboutMe *me, const gchar *wid, guint cid, guint static void about_me_load_photo (GnomeAboutMe *me, EContact *contact) { - GtkWidget *widget; - GladeXML *dialog; + GtkBuilder *dialog; EContactPhoto *photo; dialog = me->dialog; - widget = WID ("image-chooser"); - if (me->person) - e_image_chooser_set_from_file (E_IMAGE_CHOOSER (widget), me->person); + e_image_chooser_set_from_file (E_IMAGE_CHOOSER (me->image_chooser), me->person); photo = e_contact_get (contact, E_CONTACT_PHOTO); if (photo && photo->type == E_CONTACT_PHOTO_TYPE_INLINED) { me->have_image = TRUE; - e_image_chooser_set_image_data (E_IMAGE_CHOOSER (widget), + e_image_chooser_set_image_data (E_IMAGE_CHOOSER (me->image_chooser), (char *) photo->data.inlined.data, photo->data.inlined.length); e_contact_photo_free (photo); } else { @@ -567,8 +567,7 @@ about_me_load_photo (GnomeAboutMe *me, EContact *contact) static void about_me_update_photo (GnomeAboutMe *me) { - GtkWidget *widget; - GladeXML *dialog; + GtkBuilder *dialog; EContactPhoto *photo; gchar *file; GError *error; @@ -586,8 +585,7 @@ about_me_update_photo (GnomeAboutMe *me) gboolean do_scale = FALSE; float scale; - widget = WID ("image-chooser"); - e_image_chooser_get_image_data (E_IMAGE_CHOOSER (widget), (char **) &data, &length); + e_image_chooser_get_image_data (E_IMAGE_CHOOSER (me->image_chooser), (char **) &data, &length); /* Before updating the image in EDS scale it to a reasonable size so that the user doesn't get an application that does not respond @@ -689,19 +687,6 @@ about_me_load_info (GnomeAboutMe *me) me->disable_fingerprint_button); } -GtkWidget * -eab_create_image_chooser_widget (gchar *name, - gchar *string1, gchar *string2, - gint int1, gint int2) -{ - GtkWidget *w = NULL; - - w = e_image_chooser_new (); - gtk_widget_show_all (w); - - return w; -} - static void about_me_update_preview (GtkFileChooser *chooser, GnomeAboutMe *me) @@ -762,15 +747,13 @@ about_me_image_clicked_cb (GtkWidget *button, GnomeAboutMe *me) { GtkFileChooser *chooser_dialog; gint response; - GtkWidget *image_chooser; - GladeXML *dialog; - GtkWidget *image; + GtkBuilder *dialog; + GtkWidget *image; const gchar *chooser_dir = DATADIR"/pixmaps/faces"; const gchar *pics_dir; GtkFileFilter *filter; dialog = me->dialog; - image_chooser = WID ("image-chooser"); chooser_dialog = GTK_FILE_CHOOSER ( gtk_file_chooser_dialog_new (_("Select Image"), GTK_WINDOW (WID ("about-me-dialog")), @@ -820,13 +803,13 @@ about_me_image_clicked_cb (GtkWidget *button, GnomeAboutMe *me) me->have_image = TRUE; me->image_changed = TRUE; - e_image_chooser_set_from_file (E_IMAGE_CHOOSER (image_chooser), filename); + e_image_chooser_set_from_file (E_IMAGE_CHOOSER (me->image_chooser), filename); g_free (filename); about_me_update_photo (me); } else if (response == GTK_RESPONSE_NO) { me->have_image = FALSE; me->image_changed = TRUE; - e_image_chooser_set_from_file (E_IMAGE_CHOOSER (image_chooser), me->person); + e_image_chooser_set_from_file (E_IMAGE_CHOOSER (me->image_chooser), me->person); about_me_update_photo (me); } @@ -847,9 +830,7 @@ static void about_me_icon_theme_changed (GtkWindow *window, GtkIconTheme *theme) { - GtkWidget *widget; GtkIconInfo *icon; - GladeXML *dialog; icon = gtk_icon_theme_lookup_icon (me->theme, "stock_person", 80, 0); if (icon == NULL) { @@ -860,12 +841,8 @@ about_me_icon_theme_changed (GtkWindow *window, gtk_icon_info_free (icon); - if (me->have_image) { - dialog = me->dialog; - - widget = WID ("image-chooser"); - e_image_chooser_set_from_file (E_IMAGE_CHOOSER (widget), me->person); - } + if (me->have_image) + e_image_chooser_set_from_file (E_IMAGE_CHOOSER (me->image_chooser), me->person); } static void @@ -887,7 +864,7 @@ about_me_button_clicked_cb (GtkDialog *dialog, gint response_id, GnomeAboutMe *m static void about_me_passwd_clicked_cb (GtkWidget *button, GnomeAboutMe *me) { - GladeXML *dialog; + GtkBuilder *dialog; dialog = me->dialog; gnome_about_me_password (GTK_WINDOW (WID ("about-me-dialog"))); @@ -907,7 +884,7 @@ about_me_setup_dialog (void) GtkWidget *widget; GtkWidget *main_dialog; GtkIconInfo *icon; - GladeXML *dialog; + GtkBuilder *dialog; GError *error = NULL; GList *chain; @@ -917,8 +894,11 @@ about_me_setup_dialog (void) me = g_new0 (GnomeAboutMe, 1); - dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-about-me.glade", - "about-me-dialog", NULL); + dialog = gtk_builder_new (); + gtk_builder_add_from_file (dialog, GNOMECC_UI_DIR "/gnome-about-me-dialog.ui", NULL); + + me->image_chooser = e_image_chooser_new (); + gtk_container_add (GTK_CONTAINER (WID ("button-image")), me->image_chooser); if (dialog == NULL) { about_me_destroy (me); @@ -1053,8 +1033,7 @@ about_me_setup_dialog (void) g_signal_connect (me->disable_fingerprint_button, "clicked", G_CALLBACK (about_me_fingerprint_button_clicked_cb), me); - widget = WID ("image-chooser"); - g_signal_connect (widget, "changed", + g_signal_connect (me->image_chooser, "changed", G_CALLBACK (about_me_image_changed_cb), me); /* Address tab: set up the focus chains */ diff --git a/capplets/about-me/gnome-about-me.glade b/capplets/about-me/gnome-about-me.glade deleted file mode 100644 index 810047f5c..000000000 --- a/capplets/about-me/gnome-about-me.glade +++ /dev/null @@ -1,3173 +0,0 @@ - - - - - - - 5 - True - About Me - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - False - - - - True - False - 2 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - -7 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 5 - True - False - 12 - - - - True - False - 0 - - - - True - False - 12 - - - - 80 - 80 - True - True - GTK_RELIEF_NORMAL - True - Select your photo - - - - True - eab_create_image_chooser_widget - stock_person - 0 - 0 - Tue, 13 Apr 2004 20:51:33 GMT - - - - - 0 - False - False - - - - - - True - Full Name - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - - True - False - 6 - - - - True - False - 12 - - - - True - User name: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - True - Change Passwo_rd... - True - GTK_RELIEF_NORMAL - True - - - 0 - False - False - - - - - - False - True - Enable _Fingerprint Login... - True - GTK_RELIEF_NORMAL - True - - - 0 - False - False - - - - - - False - True - Disable _Fingerprint Login... - True - GTK_RELIEF_NORMAL - True - - - 0 - False - False - - - - - 0 - False - True - - - - - 0 - False - False - - - - - - True - False - 0 - - - - True - True - True - True - GTK_POS_TOP - False - False - - - - 12 - True - False - 18 - - - - True - False - 6 - - - - True - <b>Email</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 2 - 2 - False - 6 - 12 - - - - True - _Work: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - email-work-e - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - _Home: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - email-home-e - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - True - True - 0 - - True - False - - - 1 - 2 - 0 - 1 - - - - - - - True - True - True - True - 0 - - True - False - - - 1 - 2 - 1 - 2 - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 6 - - - - True - <b>Telephone</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 2 - 4 - False - 6 - 12 - - - - True - Wor_k: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - phone-work-e - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Hom_e: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - phone-home-e - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - True - True - 0 - - True - False - - - 1 - 2 - 0 - 1 - - - - - - - True - True - True - True - 0 - - True - False - - - 1 - 2 - 1 - 2 - - - - - - - True - True - True - True - 0 - - True - False - - - 3 - 4 - 1 - 2 - - - - - - - True - True - True - True - 0 - - True - False - - - 3 - 4 - 0 - 1 - - - - - - - True - _Mobile: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - phone-mobile-e - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 1 - 2 - fill - - - - - - - True - Work _fax: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - phone-work-fax-e - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 0 - 1 - fill - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 6 - - - - True - <b>Instant Messaging</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 3 - 4 - False - 6 - 12 - - - - True - _Jabber: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - im-jabber-e - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - True - True - 0 - - True - False - - - 1 - 2 - 0 - 1 - - - - - - - True - True - True - True - 0 - - True - False - - - 1 - 2 - 1 - 2 - - - - - - - True - _Yahoo: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - im-yahoo-e - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - M_SN: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - im-msn-e - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - fill - - - - - - True - IC_Q: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - im-icq-e - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - A_IM/iChat: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - im-aim-e - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 1 - 2 - fill - - - - - - - True - _Groupwise: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - im-groupwise-e - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 2 - 3 - fill - - - - - - - True - True - True - True - 0 - - True - False - - - 1 - 2 - 2 - 3 - - - - - - - True - True - True - True - 0 - - True - False - - - 3 - 4 - 0 - 1 - - - - - - - True - True - True - True - 0 - - True - False - - - 3 - 4 - 1 - 2 - - - - - - - True - True - True - True - 0 - - True - False - - - 3 - 4 - 2 - 3 - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - False - - - - - False - True - - - - - - True - Contact - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 12 - True - False - 18 - - - - True - False - 0 - - - - True - False - 0 - - - - True - <b>Home</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 4 - 4 - False - 6 - 12 - - - - True - _Address: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - addr-street-1 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_NEVER - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - GTK_JUSTIFY_LEFT - GTK_WRAP_NONE - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - 1 - 2 - 0 - 3 - fill - - - - - - True - C_ity: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - addr-locality-1 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - _Zip/Postal code: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - addr-code-1 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 1 - 2 - fill - - - - - - - True - _State/Province: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - addr-region-1 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 2 - 3 - fill - - - - - - - True - Co_untry: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - addr-country-1 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 3 - 4 - fill - - - - - - - True - P._O. box: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - addr-po-1 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - True - True - True - 0 - - True - False - - - 1 - 2 - 3 - 4 - - - - - - - True - True - True - True - 0 - - True - - - 3 - 4 - 0 - 1 - - - - - - - True - True - True - True - 0 - - True - - - 3 - 4 - 1 - 2 - - - - - - - True - True - True - True - 0 - - True - - - 3 - 4 - 3 - 4 - - - - - - - True - True - True - True - 0 - - True - - - 3 - 4 - 2 - 3 - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - False - - - - - 0 - False - False - - - - - - True - False - 6 - - - - True - <b>Work</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 4 - 4 - False - 6 - 12 - - - - True - A_ddress: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - addr-street-2 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_NEVER - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - GTK_JUSTIFY_LEFT - GTK_WRAP_NONE - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - 1 - 2 - 0 - 3 - fill - - - - - - True - Zip/_Postal code: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - addr-code-2 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 1 - 2 - fill - - - - - - - True - State/Pro_vince: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - addr-region-2 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 2 - 3 - fill - - - - - - - True - Cou_ntry: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - addr-country-2 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 3 - 4 - fill - - - - - - - True - P.O. _box: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - addr-po-2 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - Ci_ty: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - addr-locality-2 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 0 - 1 - fill - - - - - - - True - True - True - True - 0 - - True - False - - - 1 - 2 - 3 - 4 - - - - - - - True - True - True - True - 0 - - True - False - - - 3 - 4 - 0 - 1 - - - - - - - True - True - True - True - 0 - - True - False - - - 3 - 4 - 1 - 2 - - - - - - - True - True - True - True - 0 - - True - False - - - 3 - 4 - 2 - 3 - - - - - - - True - True - True - True - 0 - - True - False - - - 3 - 4 - 3 - 4 - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - False - - - - - False - True - - - - - - True - Address - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - - 12 - True - False - 18 - - - - True - False - 6 - - - - True - <b>Web</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 3 - 2 - False - 6 - 12 - - - - True - _Home page: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - web-homepage-e - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Web _log: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - web-weblog-e - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - Cale_ndar: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - web-calendar-e - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - True - True - True - 0 - - True - False - - - 1 - 2 - 0 - 1 - - - - - - - True - True - True - True - 0 - - True - False - - - 1 - 2 - 1 - 2 - - - - - - - True - True - True - True - 0 - - True - False - - - 1 - 2 - 2 - 3 - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 6 - - - - True - <b>Job</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 6 - 2 - False - 6 - 12 - - - - True - _Profession: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - job-profession-e - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - C_ompany: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - job-company-e - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - _Manager: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - job-manager-e - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - _Title: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - job-title-e - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 3 - 4 - fill - - - - - - - True - _Department: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - job-dept-e - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 4 - 5 - fill - - - - - - - True - A_ssistant: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - job-assistant-e - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 5 - 6 - fill - - - - - - - True - True - True - True - 0 - - True - False - - - 1 - 2 - 0 - 1 - - - - - - - True - True - True - True - 0 - - True - False - - - 1 - 2 - 1 - 2 - - - - - - - True - True - True - True - 0 - - True - False - - - 1 - 2 - 2 - 3 - - - - - - - True - True - True - True - 0 - - True - False - - - 1 - 2 - 3 - 4 - - - - - - - True - True - True - True - 0 - - True - False - - - 1 - 2 - 4 - 5 - - - - - - - True - True - True - True - 0 - - True - False - - - 1 - 2 - 5 - 6 - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - False - - - - - False - True - - - - - - True - Personal Info - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - tab - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - - 6 - Change password - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - False - - - - True - False - 6 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - -7 - - - - - - True - False - True - True - True - Change pa_ssword - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - False - GTK_PACK_END - - - - - - 6 - True - False - 12 - - - - True - 6 - gtk-dialog-authentication - 0.5 - 0 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - <span size="larger" weight="bold">Change your password</span> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - To change your password, enter your current password in the field below and click <b>Authenticate</b>. -After you have authenticated, enter your new password, retype it for verification and click <b>Change password</b>. - False - True - GTK_JUSTIFY_LEFT - True - False - 0 - 0 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - True - 6 - - - - True - Current _password: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - current-password - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - _New password: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - new-password - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - _Retype new password: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - retyped-password - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - False - False - - - - - - True - True - 6 - - - - True - False - 6 - - - - True - True - True - False - 0 - - True - False - - - 0 - True - True - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-apply - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Authenticate - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - 0 - True - True - - - - - - True - False - True - True - False - 0 - - True - False - - - 0 - False - False - - - - - - True - False - True - True - False - 0 - - True - True - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - Please type your password again in the <b>Retype new password</b> field. - False - True - GTK_JUSTIFY_CENTER - True - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - False - - - - - - - diff --git a/po/POTFILES.in b/po/POTFILES.in index 530090219..a4f6855f4 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -5,11 +5,12 @@ capplets/about-me/eel-alert-dialog.c capplets/about-me/e-image-chooser.c capplets/about-me/fingerprint-strings.h capplets/about-me/gnome-about-me.c +capplets/about-me/gnome-about-me-dialog.ui capplets/about-me/gnome-about-me.desktop.in.in capplets/about-me/gnome-about-me-fingerprint.c -capplets/about-me/gnome-about-me-fingerprint.glade -capplets/about-me/gnome-about-me.glade +capplets/about-me/gnome-about-me-fingerprint.ui capplets/about-me/gnome-about-me-password.c +capplets/about-me/gnome-about-me-password.ui [type: gettext/glade]capplets/accessibility/at-properties/at-enable-dialog.ui capplets/accessibility/at-properties/at-properties.desktop.in.in capplets/accessibility/at-properties/main.c