applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

user-accounts: Fix fingerprint assistant

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=649678
This commit is contained in:
Matthias Clasen 2011-06-10 17:57:29 +01:00 • committed by Bastien Nocera
parent 8473ed33eb
commit 5ffae5b569
2 changed files with 8 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

11
panels/user-accounts/data/account-fingerprint.ui
View file

@ -184,9 +184,8 @@
<child> <child>
<object class="GtkHBox" id="enroll_hbox"> <object class="GtkHBox" id="enroll_hbox">
<property name="visible">True</property> <property name="visible">True</property>
<child> <property name="margin-top">24</property>
<placeholder/> <property name="margin-bottom">24</property>
</child>
<child> <child>
<object class="GtkImage" id="image1"> <object class="GtkImage" id="image1">
<property name="visible">True</property> <property name="visible">True</property>
@ -237,17 +236,17 @@
<property name="position">5</property> <property name="position">5</property>
</packing> </packing>
</child> </child>
<child>
<placeholder/>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkLabel" id="status-label"> <object class="GtkLabel" id="status-label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="wrap">True</property>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>

26
panels/user-accounts/um-fingerprint-dialog.c
View file

@ -501,21 +501,6 @@ assistant_prepare (GtkAssistant *ass, GtkWidget *page, EnrollData *data)
} }
} }
static void
align_image (GtkWidget *child, gpointer data)
{
if (GTK_IS_IMAGE (child)) {
gtk_misc_set_alignment (GTK_MISC (child), 0, 0.5);
gtk_misc_set_padding (GTK_MISC (child), 10, 10);
}
if (GTK_IS_LABEL (child)) {
gtk_label_set_use_markup (GTK_LABEL (child), TRUE);
gtk_widget_override_font (child, NULL);
gtk_misc_set_padding (GTK_MISC (child), 68, 10);
}
}
static void static void
enroll_fingerprints (GtkWindow *parent, enroll_fingerprints (GtkWindow *parent,
GtkWidget *label1, GtkWidget *label1,
@ -530,7 +515,6 @@ enroll_fingerprints (GtkWindow *parent,
const char *filename; const char *filename;
char *msg; char *msg;
GError *error = NULL; GError *error = NULL;
gchar *title;
device = NULL; device = NULL;
@ -624,13 +608,9 @@ enroll_fingerprints (GtkWindow *parent,
gtk_assistant_set_page_complete (GTK_ASSISTANT (ass), WID("page1"), TRUE); gtk_assistant_set_page_complete (GTK_ASSISTANT (ass), WID("page1"), TRUE);
title = g_strdup_printf (_("Enrolling fingerprints for\n<b><big>%s</big></b>"), um_user_get_real_name (user)); gtk_assistant_set_page_title (GTK_ASSISTANT (ass), WID("page1"), _("Selecting finger"));
gtk_assistant_set_page_title (GTK_ASSISTANT (ass), WID("page2"), _("Enrolling fingerprints"));
gtk_assistant_set_page_title (GTK_ASSISTANT (ass), WID("page1"), title); gtk_assistant_set_page_title (GTK_ASSISTANT (ass), WID("page3"), _("Summary"));
gtk_assistant_set_page_title (GTK_ASSISTANT (ass), WID("page2"), title);
gtk_assistant_set_page_title (GTK_ASSISTANT (ass), WID("page3"), title);
gtk_container_forall (GTK_CONTAINER (ass), align_image, NULL);
g_free (title);
/* Page 2 */ /* Page 2 */
g_object_set_data (G_OBJECT (WID("page2")), "name", "enroll"); g_object_set_data (G_OBJECT (WID("page2")), "name", "enroll");