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

user-accounts: Move CcAddUserDialog signals into .ui file

Browse source
This commit is contained in:
Robert Ancell 2018-11-07 12:34:36 +13:00
parent a4b76204ff
commit 043b6dc907
2 changed files with 78 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

156
panels/user-accounts/cc-add-user-dialog.c
View file

@ -339,12 +339,8 @@ local_username_timeout (CcAddUserDialog *self)
} }
static gboolean static gboolean
on_username_focus_out (GtkEntry *entry, local_username_focus_out_event_cb (CcAddUserDialog *self)
GParamSpec *pspec,
gpointer user_data)
{ {
CcAddUserDialog *self = CC_ADD_USER_DIALOG (user_data);
if (self->local_username_timeout_id != 0) { if (self->local_username_timeout_id != 0) {
g_source_remove (self->local_username_timeout_id); g_source_remove (self->local_username_timeout_id);
self->local_username_timeout_id = 0; self->local_username_timeout_id = 0;
@ -356,10 +352,8 @@ on_username_focus_out (GtkEntry *entry,
} }
static void static void
on_username_changed (GtkComboBoxText *combo, local_username_changed_cb (CcAddUserDialog *self)
gpointer user_data)
{ {
CcAddUserDialog *self = CC_ADD_USER_DIALOG (user_data);
const gchar *username; const gchar *username;
username = gtk_entry_get_text (self->local_username_entry); username = gtk_entry_get_text (self->local_username_entry);
@ -391,12 +385,8 @@ local_name_timeout (CcAddUserDialog *self)
} }
static gboolean static gboolean
on_name_focus_out (GtkEntry *entry, local_name_focus_out_event_cb (CcAddUserDialog *self)
GParamSpec *pspec,
gpointer user_data)
{ {
CcAddUserDialog *self = CC_ADD_USER_DIALOG (user_data);
if (self->local_name_timeout_id != 0) { if (self->local_name_timeout_id != 0) {
g_source_remove (self->local_name_timeout_id); g_source_remove (self->local_name_timeout_id);
self->local_name_timeout_id = 0; self->local_name_timeout_id = 0;
@ -408,17 +398,15 @@ on_name_focus_out (GtkEntry *entry,
} }
static void static void
on_name_changed (GtkEditable *editable, local_name_changed_cb (CcAddUserDialog *self)
gpointer user_data)
{ {
CcAddUserDialog *self = CC_ADD_USER_DIALOG (user_data);
GtkTreeModel *model; GtkTreeModel *model;
const char *name; const char *name;
model = gtk_combo_box_get_model (GTK_COMBO_BOX (self->local_username)); model = gtk_combo_box_get_model (GTK_COMBO_BOX (self->local_username));
gtk_list_store_clear (GTK_LIST_STORE (model)); gtk_list_store_clear (GTK_LIST_STORE (model));
name = gtk_entry_get_text (GTK_ENTRY (editable)); name = gtk_entry_get_text (self->local_name);
if ((name == NULL || strlen (name) == 0) && !self->has_custom_username) { if ((name == NULL || strlen (name) == 0) && !self->has_custom_username) {
gtk_entry_set_text (self->local_username_entry, ""); gtk_entry_set_text (self->local_username_entry, "");
} else if (name != NULL && strlen (name) != 0) { } else if (name != NULL && strlen (name) != 0) {
@ -432,7 +420,7 @@ on_name_changed (GtkEditable *editable,
self->local_name_timeout_id = 0; self->local_name_timeout_id = 0;
} }
clear_entry_validation_error (GTK_ENTRY (editable)); clear_entry_validation_error (self->local_name);
gtk_dialog_set_response_sensitive (GTK_DIALOG (self), GTK_RESPONSE_OK, FALSE); gtk_dialog_set_response_sensitive (GTK_DIALOG (self), GTK_RESPONSE_OK, FALSE);
self->local_name_timeout_id = g_timeout_add (PASSWORD_CHECK_TIMEOUT, (GSourceFunc) local_name_timeout, self); self->local_name_timeout_id = g_timeout_add (PASSWORD_CHECK_TIMEOUT, (GSourceFunc) local_name_timeout, self);
@ -458,10 +446,7 @@ update_password_match (CcAddUserDialog *self)
} }
static void static void
on_generate (GtkEntry *entry, local_password_icon_press_cb (CcAddUserDialog *self)
GtkEntryIconPosition pos,
GdkEventButton *event,
CcAddUserDialog *self)
{ {
gchar *pwd; gchar *pwd;
@ -489,12 +474,8 @@ local_password_timeout (CcAddUserDialog *self)
} }
static gboolean static gboolean
on_password_focus_out (GtkEntry *entry, password_focus_out_event_cb (CcAddUserDialog *self)
GParamSpec *pspec,
gpointer user_data)
{ {
CcAddUserDialog *self = CC_ADD_USER_DIALOG (user_data);
if (self->local_password_timeout_id != 0) { if (self->local_password_timeout_id != 0) {
g_source_remove (self->local_password_timeout_id); g_source_remove (self->local_password_timeout_id);
self->local_password_timeout_id = 0; self->local_password_timeout_id = 0;
@ -506,11 +487,9 @@ on_password_focus_out (GtkEntry *entry,
} }
static gboolean static gboolean
on_password_key_press_cb (GtkEntry *entry, local_password_key_press_event_cb (CcAddUserDialog *self,
GdkEvent *event, GdkEvent *event)
gpointer user_data)
{ {
CcAddUserDialog *self = CC_ADD_USER_DIALOG (user_data);
GdkEventKey *key = (GdkEventKey *)event; GdkEventKey *key = (GdkEventKey *)event;
if (key->keyval == GDK_KEY_Tab) if (key->keyval == GDK_KEY_Tab)
@ -520,11 +499,8 @@ on_password_key_press_cb (GtkEntry *entry,
} }
static void static void
on_password_changed (GtkEntry *entry, recheck_password_match (CcAddUserDialog *self)
GParamSpec *pspec,
gpointer user_data)
{ {
CcAddUserDialog *self = CC_ADD_USER_DIALOG (user_data);
const char *password; const char *password;
if (self->local_password_timeout_id != 0) { if (self->local_password_timeout_id != 0) {
@ -532,8 +508,6 @@ on_password_changed (GtkEntry *entry,
self->local_password_timeout_id = 0; self->local_password_timeout_id = 0;
} }
clear_entry_validation_error (GTK_ENTRY (entry));
clear_entry_validation_error (self->local_verify);
gtk_dialog_set_response_sensitive (GTK_DIALOG (self), GTK_RESPONSE_OK, FALSE); gtk_dialog_set_response_sensitive (GTK_DIALOG (self), GTK_RESPONSE_OK, FALSE);
password = gtk_entry_get_text (self->local_password); password = gtk_entry_get_text (self->local_password);
@ -545,13 +519,26 @@ on_password_changed (GtkEntry *entry,
} }
static void static void
on_password_radio_changed (GtkRadioButton *radio, local_password_changed_cb (CcAddUserDialog *self)
gpointer user_data) {
clear_entry_validation_error (self->local_password);
clear_entry_validation_error (self->local_verify);
recheck_password_match (self);
}
static void
local_verify_changed_cb (CcAddUserDialog *self)
{
clear_entry_validation_error (self->local_verify);
recheck_password_match (self);
}
static void
local_password_radio_changed_cb (CcAddUserDialog *self)
{ {
CcAddUserDialog *self = CC_ADD_USER_DIALOG (user_data);
gboolean active; gboolean active;
active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (radio)); active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (self->local_password_radio));
self->local_password_mode = active ? ACT_USER_PASSWORD_MODE_REGULAR : ACT_USER_PASSWORD_MODE_SET_AT_LOGIN; self->local_password_mode = active ? ACT_USER_PASSWORD_MODE_REGULAR : ACT_USER_PASSWORD_MODE_SET_AT_LOGIN;
gtk_widget_set_sensitive (GTK_WIDGET (self->local_password), active); gtk_widget_set_sensitive (GTK_WIDGET (self->local_password), active);
@ -565,30 +552,7 @@ on_password_radio_changed (GtkRadioButton *radio,
static void static void
local_init (CcAddUserDialog *self) local_init (CcAddUserDialog *self)
{ {
g_signal_connect (self->local_username, "changed",
G_CALLBACK (on_username_changed), self);
g_signal_connect_after (self->local_username, "focus-out-event", G_CALLBACK (on_username_focus_out), self);
g_signal_connect_swapped (self->local_username_entry, "activate", G_CALLBACK (dialog_validate), self);
g_signal_connect (self->local_name, "changed", G_CALLBACK (on_name_changed), self);
g_signal_connect_after (self->local_name, "focus-out-event", G_CALLBACK (on_name_focus_out), self);
g_signal_connect_swapped (self->local_name, "activate", G_CALLBACK (dialog_validate), self);
g_signal_connect (self->local_password_radio, "toggled", G_CALLBACK (on_password_radio_changed), self);
self->local_password_mode = ACT_USER_PASSWORD_MODE_SET_AT_LOGIN; self->local_password_mode = ACT_USER_PASSWORD_MODE_SET_AT_LOGIN;
g_signal_connect (self->local_password, "notify::text", G_CALLBACK (on_password_changed), self);
g_signal_connect_after (self->local_password, "focus-out-event", G_CALLBACK (on_password_focus_out), self);
g_signal_connect (self->local_password, "key-press-event", G_CALLBACK (on_password_key_press_cb), self);
g_signal_connect_swapped (self->local_password, "activate", G_CALLBACK (dialog_validate), self);
g_signal_connect (self->local_password, "icon-press", G_CALLBACK (on_generate), self);
g_signal_connect (self->local_verify, "notify::text", G_CALLBACK (on_password_changed), self);
g_signal_connect_after (self->local_verify, "focus-out-event", G_CALLBACK (on_password_focus_out), self);
g_signal_connect_swapped (self->local_verify, "activate", G_CALLBACK (dialog_validate), self);
dialog_validate (self); dialog_validate (self);
update_password_strength (self); update_password_strength (self);
} }
@ -1276,11 +1240,8 @@ enterprise_domain_timeout (CcAddUserDialog *self)
} }
static void static void
on_domain_changed (GtkComboBox *widget, enterprise_domain_changed_cb (CcAddUserDialog *self)
gpointer user_data)
{ {
CcAddUserDialog *self = CC_ADD_USER_DIALOG (user_data);
if (self->enterprise_domain_timeout_id != 0) { if (self->enterprise_domain_timeout_id != 0) {
g_source_remove (self->enterprise_domain_timeout_id); g_source_remove (self->enterprise_domain_timeout_id);
self->enterprise_domain_timeout_id = 0; self->enterprise_domain_timeout_id = 0;
@ -1296,12 +1257,8 @@ on_domain_changed (GtkComboBox *widget,
} }
static gboolean static gboolean
on_enterprise_domain_focus_out (GtkEntry *entry, enterprise_domain_focus_out_event_cb (CcAddUserDialog *self)
GParamSpec *pspec,
gpointer user_data)
{ {
CcAddUserDialog *self = CC_ADD_USER_DIALOG (user_data);
if (self->enterprise_domain_timeout_id != 0) { if (self->enterprise_domain_timeout_id != 0) {
g_source_remove (self->enterprise_domain_timeout_id); g_source_remove (self->enterprise_domain_timeout_id);
self->enterprise_domain_timeout_id = 0; self->enterprise_domain_timeout_id = 0;
@ -1315,13 +1272,17 @@ on_enterprise_domain_focus_out (GtkEntry *entry,
} }
static void static void
on_entry_changed (GtkEditable *editable, enterprise_login_changed_cb (CcAddUserDialog *self)
gpointer user_data) {
dialog_validate (self);
clear_entry_validation_error (self->enterprise_login);
clear_entry_validation_error (self->enterprise_password);
}
static void
enterprise_password_changed_cb (CcAddUserDialog *self)
{ {
CcAddUserDialog *self = CC_ADD_USER_DIALOG (user_data);
dialog_validate (self); dialog_validate (self);
clear_entry_validation_error (GTK_ENTRY (editable));
clear_entry_validation_error (self->enterprise_password); clear_entry_validation_error (self->enterprise_password);
} }
@ -1329,17 +1290,8 @@ static void
enterprise_init (CcAddUserDialog *self) enterprise_init (CcAddUserDialog *self)
{ {
GNetworkMonitor *monitor; GNetworkMonitor *monitor;
self->enterprise_check_credentials = FALSE;
g_signal_connect (self->enterprise_domain, "changed", G_CALLBACK (on_domain_changed), self);
g_signal_connect_after (self->enterprise_domain, "focus-out-event", G_CALLBACK (on_enterprise_domain_focus_out), self);
enterprise_check_domain (self); enterprise_check_domain (self);
g_signal_connect (self->enterprise_login, "changed", G_CALLBACK (on_entry_changed), self);
g_signal_connect (self->enterprise_password, "changed", G_CALLBACK (on_entry_changed), self);
self->realmd_watch = g_bus_watch_name (G_BUS_TYPE_SYSTEM, "org.freedesktop.realmd", self->realmd_watch = g_bus_watch_name (G_BUS_TYPE_SYSTEM, "org.freedesktop.realmd",
G_BUS_NAME_WATCHER_FLAGS_AUTO_START, G_BUS_NAME_WATCHER_FLAGS_AUTO_START,
on_realmd_appeared, on_realmd_disappeared, on_realmd_appeared, on_realmd_disappeared,
@ -1401,22 +1353,14 @@ mode_change (CcAddUserDialog *self,
} }
static void static void
on_enterprise_toggle (GtkToggleButton *toggle, enterprise_button_toggled_cb (CcAddUserDialog *self)
gpointer user_data)
{ {
CcAddUserDialog *self = CC_ADD_USER_DIALOG (user_data);
AccountMode mode; AccountMode mode;
mode = gtk_toggle_button_get_active (toggle) ? MODE_ENTERPRISE : MODE_LOCAL; mode = gtk_toggle_button_get_active (self->enterprise_button) ? MODE_ENTERPRISE : MODE_LOCAL;
mode_change (self, mode); mode_change (self, mode);
} }
static void
mode_init (CcAddUserDialog *self)
{
g_signal_connect (self->enterprise_button, "toggled", G_CALLBACK (on_enterprise_toggle), self);
}
static void static void
cc_add_user_dialog_init (CcAddUserDialog *self) cc_add_user_dialog_init (CcAddUserDialog *self)
{ {
@ -1425,7 +1369,6 @@ cc_add_user_dialog_init (CcAddUserDialog *self)
local_init (self); local_init (self);
enterprise_init (self); enterprise_init (self);
join_init (self); join_init (self);
mode_init (self);
} }
static void static void
@ -1578,6 +1521,23 @@ cc_add_user_dialog_class_init (CcAddUserDialogClass *klass)
gtk_widget_class_bind_template_child (widget_class, CcAddUserDialog, local_verify_hint); gtk_widget_class_bind_template_child (widget_class, CcAddUserDialog, local_verify_hint);
gtk_widget_class_bind_template_child (widget_class, CcAddUserDialog, spinner); gtk_widget_class_bind_template_child (widget_class, CcAddUserDialog, spinner);
gtk_widget_class_bind_template_child (widget_class, CcAddUserDialog, stack); gtk_widget_class_bind_template_child (widget_class, CcAddUserDialog, stack);
gtk_widget_class_bind_template_callback (widget_class, dialog_validate);
gtk_widget_class_bind_template_callback (widget_class, enterprise_button_toggled_cb);
gtk_widget_class_bind_template_callback (widget_class, enterprise_domain_changed_cb);
gtk_widget_class_bind_template_callback (widget_class, enterprise_domain_focus_out_event_cb);
gtk_widget_class_bind_template_callback (widget_class, enterprise_login_changed_cb);
gtk_widget_class_bind_template_callback (widget_class, enterprise_password_changed_cb);
gtk_widget_class_bind_template_callback (widget_class, local_name_changed_cb);
gtk_widget_class_bind_template_callback (widget_class, local_name_focus_out_event_cb);
gtk_widget_class_bind_template_callback (widget_class, local_password_changed_cb);
gtk_widget_class_bind_template_callback (widget_class, local_password_icon_press_cb);
gtk_widget_class_bind_template_callback (widget_class, local_password_key_press_event_cb);
gtk_widget_class_bind_template_callback (widget_class, local_password_radio_changed_cb);
gtk_widget_class_bind_template_callback (widget_class, local_username_changed_cb);
gtk_widget_class_bind_template_callback (widget_class, local_username_focus_out_event_cb);
gtk_widget_class_bind_template_callback (widget_class, local_verify_changed_cb);
gtk_widget_class_bind_template_callback (widget_class, password_focus_out_event_cb);
} }
CcAddUserDialog * CcAddUserDialog *

20
panels/user-accounts/cc-add-user-dialog.ui
View file

@ -99,9 +99,12 @@
<property name="entry_text_column">0</property> <property name="entry_text_column">0</property>
<property name="model">username-model</property> <property name="model">username-model</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<signal name="changed" handler="local_username_changed_cb" object="CcAddUserDialog" swapped="yes"/>
<signal name="focus-out-event" handler="local_username_focus_out_event_cb" after="yes" object="CcAddUserDialog" swapped="yes"/>
<child internal-child="entry"> <child internal-child="entry">
<object class="GtkEntry" id="local_username_entry"> <object class="GtkEntry" id="local_username_entry">
<property name="activates_default">True</property> <property name="activates_default">True</property>
<signal name="activate" handler="dialog_validate" object="CcAddUserDialog" swapped="yes"/>
</object> </object>
</child> </child>
</object> </object>
@ -158,6 +161,9 @@
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="activates_default">True</property> <property name="activates_default">True</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<signal name="changed" handler="local_name_changed_cb" object="CcAddUserDialog" swapped="yes"/>
<signal name="focus-out-event" handler="local_name_focus_out_event_cb" after="yes" object="CcAddUserDialog" swapped="yes"/>
<signal name="activate" handler="dialog_validate" object="CcAddUserDialog" swapped="yes"/>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -279,6 +285,7 @@
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">local_password_login_radio</property> <property name="group">local_password_login_radio</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<signal name="toggled" handler="local_password_radio_changed_cb" object="CcAddUserDialog" swapped="yes"/>
</object> </object>
<packing> <packing>
<property name="position">1</property> <property name="position">1</property>
@ -324,6 +331,11 @@
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="activates_default">True</property> <property name="activates_default">True</property>
<property name="input_purpose">password</property> <property name="input_purpose">password</property>
<signal name="notify::text" handler="local_password_changed_cb" object="CcAddUserDialog" swapped="yes"/>
<signal name="icon-press" handler="local_password_icon_press_cb" object="CcAddUserDialog" swapped="yes"/>
<signal name="focus-out-event" handler="password_focus_out_event_cb" after="yes" object="CcAddUserDialog" swapped="yes"/>
<signal name="key-press-event" handler="local_password_key_press_event_cb" object="CcAddUserDialog" swapped="yes"/>
<signal name="activate" handler="dialog_validate" object="CcAddUserDialog" swapped="yes"/>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -412,6 +424,9 @@
<property name="invisible_char_set">True</property> <property name="invisible_char_set">True</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="input_purpose">password</property> <property name="input_purpose">password</property>
<signal name="notify::text" handler="local_verify_changed_cb" object="CcAddUserDialog" swapped="yes"/>
<signal name="focus-out-event" handler="password_focus_out_event_cb" after="yes" object="CcAddUserDialog" swapped="yes"/>
<signal name="activate" handler="dialog_validate" object="CcAddUserDialog" swapped="yes"/>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -576,6 +591,8 @@
<property name="has_entry">True</property> <property name="has_entry">True</property>
<property name="entry_text_column">0</property> <property name="entry_text_column">0</property>
<property name="model">enterprise_realms</property> <property name="model">enterprise_realms</property>
<signal name="changed" handler="enterprise_domain_changed_cb" object="CcAddUserDialog" swapped="yes"/>
<signal name="focus-out-event" handler="enterprise_domain_focus_out_event_cb" after="yes" object="CcAddUserDialog" swapped="yes"/>
<child internal-child="entry"> <child internal-child="entry">
<object class="GtkEntry" id="enterprise_domain_entry"> <object class="GtkEntry" id="enterprise_domain_entry">
<property name="can_focus">True</property> <property name="can_focus">True</property>
@ -626,6 +643,7 @@
<property name="activates_default">True</property> <property name="activates_default">True</property>
<property name="invisible_char_set">True</property> <property name="invisible_char_set">True</property>
<property name="input_purpose">password</property> <property name="input_purpose">password</property>
<signal name="changed" handler="enterprise_login_changed_cb" object="CcAddUserDialog" swapped="yes"/>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -644,6 +662,7 @@
<property name="activates_default">True</property> <property name="activates_default">True</property>
<property name="invisible_char_set">True</property> <property name="invisible_char_set">True</property>
<property name="input_purpose">password</property> <property name="input_purpose">password</property>
<signal name="changed" handler="enterprise_password_changed_cb" object="CcAddUserDialog" swapped="yes"/>
</object> </object>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>
@ -768,6 +787,7 @@
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="border_width">20</property> <property name="border_width">20</property>
<signal name="toggled" handler="enterprise_button_toggled_cb" object="CcAddUserDialog" swapped="yes"/>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>