DeforaOS/Phone
DeforaOS/Phone
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implemented the "cancel" button and added a confirmation password entry

Browse Source
This commit is contained in:
Pierre Pronchery 2013-02-10 04:47:11 +01:00
parent 666a8290b0
commit 5cbf6bbab7
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/password.c
View File

@ -32,6 +32,7 @@ typedef struct _PhonePlugin
GtkWidget * entry; GtkWidget * entry;
GtkWidget * oldpassword; GtkWidget * oldpassword;
GtkWidget * newpassword; GtkWidget * newpassword;
GtkWidget * newpassword2;
} PasswordPhonePlugin; } PasswordPhonePlugin;
@ -92,6 +93,7 @@ static int _password_event(PasswordPhonePlugin * password, PhoneEvent * event)
/* password_settings */ /* password_settings */
static void _on_settings_cancel(gpointer data);
static gboolean _on_settings_closex(gpointer data); static gboolean _on_settings_closex(gpointer data);
static void _password_settings(PasswordPhonePlugin * password) static void _password_settings(PasswordPhonePlugin * password)
@ -124,7 +126,8 @@ static void _password_settings(PasswordPhonePlugin * password)
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5); gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_size_group_add_widget(group, widget); gtk_size_group_add_widget(group, widget);
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
password->entry = gtk_entry_new(); password->entry = gtk_combo_box_entry_new_text();
gtk_combo_box_append_text(GTK_COMBO_BOX(password->entry), "SIM PIN");
gtk_box_pack_start(GTK_BOX(hbox), password->entry, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), password->entry, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
/* old password */ /* old password */
@ -147,12 +150,24 @@ static void _password_settings(PasswordPhonePlugin * password)
gtk_entry_set_visibility(GTK_ENTRY(password->newpassword), FALSE); gtk_entry_set_visibility(GTK_ENTRY(password->newpassword), FALSE);
gtk_box_pack_start(GTK_BOX(hbox), password->newpassword, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), password->newpassword, TRUE, TRUE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
/* new password */
hbox = gtk_hbox_new(FALSE, 0);
widget = gtk_label_new("Confirm: ");
gtk_misc_set_alignment(GTK_MISC(widget), 0.0, 0.5);
gtk_size_group_add_widget(group, widget);
gtk_box_pack_start(GTK_BOX(hbox), widget, FALSE, TRUE, 0);
password->newpassword2 = gtk_entry_new();
gtk_entry_set_visibility(GTK_ENTRY(password->newpassword2), FALSE);
gtk_box_pack_start(GTK_BOX(hbox), password->newpassword2, TRUE, TRUE,
0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
/* buttons */ /* buttons */
hbox = gtk_hbutton_box_new(); hbox = gtk_hbutton_box_new();
gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END); gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbox), 4); gtk_button_box_set_spacing(GTK_BUTTON_BOX(hbox), 4);
widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL); widget = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
/* FIXME implement the callback */ g_signal_connect_swapped(widget, "clicked", G_CALLBACK(
_on_settings_cancel), password);
gtk_container_add(GTK_CONTAINER(hbox), widget); gtk_container_add(GTK_CONTAINER(hbox), widget);
widget = gtk_button_new_from_stock(GTK_STOCK_OK); widget = gtk_button_new_from_stock(GTK_STOCK_OK);
/* FIXME implement the callback */ /* FIXME implement the callback */
@ -162,6 +177,16 @@ static void _password_settings(PasswordPhonePlugin * password)
gtk_widget_show_all(password->window); gtk_widget_show_all(password->window);
} }
static void _on_settings_cancel(gpointer data)
{
PasswordPhonePlugin * password = data;
gtk_widget_hide(password->window);
gtk_entry_set_text(GTK_ENTRY(password->oldpassword), "");
gtk_entry_set_text(GTK_ENTRY(password->newpassword), "");
gtk_entry_set_text(GTK_ENTRY(password->newpassword2), "");
}
static gboolean _on_settings_closex(gpointer data) static gboolean _on_settings_closex(gpointer data)
{ {
PasswordPhonePlugin * password = data; PasswordPhonePlugin * password = data;