X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/f44417cf9d3d5ddea2f0dfb2e238a2826eb6691d..34239ce49a947bf2c10d4bdb6ea67d80a8acf69c:/disobedience/users.c diff --git a/disobedience/users.c b/disobedience/users.c index 80b6f42..9125730 100644 --- a/disobedience/users.c +++ b/disobedience/users.c @@ -57,6 +57,13 @@ static int users_mode; #define MODE_ADD 1 #define MODE_EDIT 2 +#define mode(X) do { \ + users_mode = MODE_##X; \ + fprintf(stderr, "%s:%d: %s(): mode -> %s\n", \ + __FILE__, __LINE__, __FUNCTION__, #X); \ + users_details_sensitize_all(); \ +} while(0) + static const char *users_email, *users_rights, *users_password; /** @brief qsort() callback for username comparison */ @@ -159,36 +166,28 @@ static void users_add_right(const char *title, static void users_details_sensitize(rights_type r) { const int bit = leftmost_bit(r); const GtkWidget *all = users_details_rights[bit]; - const int sensitive = !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(all)); - + const int sensitive = (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(all)) + && users_mode != MODE_ADD); + gtk_widget_set_sensitive(users_details_rights[bit + 1], sensitive); gtk_widget_set_sensitive(users_details_rights[bit + 2], sensitive); } /** @brief Set sensitivity of everything in sight */ static void users_details_sensitize_all(void) { - int apply_sensitive; + int n; - /* Three-right groups */ + for(n = 0; n < 32; ++n) + if(users_details_rights[n]) + gtk_widget_set_sensitive(users_details_rights[n], users_mode != MODE_NONE); + gtk_widget_set_sensitive(users_details_name, users_mode != MODE_NONE); + gtk_widget_set_sensitive(users_details_email, users_mode != MODE_NONE); + gtk_widget_set_sensitive(users_details_password, users_mode != MODE_NONE); + gtk_widget_set_sensitive(users_details_password2, users_mode != MODE_NONE); users_details_sensitize(RIGHT_MOVE_ANY); users_details_sensitize(RIGHT_REMOVE_ANY); users_details_sensitize(RIGHT_SCRATCH_ANY); - /* Apply button */ - switch(users_mode) { - case MODE_NONE: - apply_sensitive = 0; - break; - case MODE_EDIT: - apply_sensitive = 1; - break; - case MODE_ADD: - apply_sensitive = !!*gtk_entry_get_text(GTK_ENTRY(users_details_name)); - break; - default: - assert(!"reached"); - } - gtk_widget_set_sensitive(users_apply_button, apply_sensitive); - /* Delete button */ + gtk_widget_set_sensitive(users_apply_button, users_mode != MODE_NONE); gtk_widget_set_sensitive(users_delete_button, !!users_selected); } @@ -295,14 +294,16 @@ static void users_add(GtkButton attribute((unused)) *button, /* Unselect whatever is selected */ gtk_tree_selection_unselect_all(users_selection); /* Reset the form */ + /* TODO it would be better to use the server default_rights if there's no + * client setting. */ users_makedetails("", "", - "", /* TODO default_rights */ + config->default_rights, "", DETAIL_EDITABLE|DETAIL_VISIBLE, DETAIL_EDITABLE|DETAIL_VISIBLE); /* Remember we're adding a user */ - users_mode = MODE_ADD; + mode(ADD); } /** @brief Called when the 'Apply' button is pressed */ @@ -312,12 +313,32 @@ static void users_apply(GtkButton attribute((unused)) *button, case MODE_NONE: return; case MODE_ADD: - if(!*gtk_entry_get_text(GTK_ENTRY(users_details_name))) + if(!*gtk_entry_get_text(GTK_ENTRY(users_details_name))) { + /* No username. Really we wanted to desensitize the Apply button when + * there's no userame but there doesn't seem to be a signal to detect + * changes to the entry text. Consequently we have error messages + * instead. */ + popup_submsg(users_window, GTK_MESSAGE_ERROR, "Must enter a username"); + return; + } + if(strcmp(gtk_entry_get_text(GTK_ENTRY(users_details_password)), + gtk_entry_get_text(GTK_ENTRY(users_details_password2)))) { + popup_submsg(users_window, GTK_MESSAGE_ERROR, "Passwords do not match"); return; + } /* TODO create user */ + mode(NONE); + popup_submsg(users_window, GTK_MESSAGE_INFO, "Would create user"); break; case MODE_EDIT: + if(strcmp(gtk_entry_get_text(GTK_ENTRY(users_details_password)), + gtk_entry_get_text(GTK_ENTRY(users_details_password2)))) { + popup_submsg(users_window, GTK_MESSAGE_ERROR, "Passwords do not match"); + return; + } /* TODO */ + mode(NONE); + popup_submsg(users_window, GTK_MESSAGE_INFO, "Would edit user"); break; } } @@ -326,7 +347,7 @@ static void users_apply(GtkButton attribute((unused)) *button, static void users_deleted_error(struct callbackdata attribute((unused)) *cbd, int attribute((unused)) code, const char *msg) { - popup_msg(GTK_MESSAGE_ERROR, msg); + popup_submsg(users_window, GTK_MESSAGE_ERROR, msg); } /** @brief Called when a user has been deleted */ @@ -393,7 +414,7 @@ static void users_got_password(void attribute((unused)) *v, const char *value) { users_password, DETAIL_VISIBLE, DETAIL_EDITABLE|DETAIL_VISIBLE); - users_mode = MODE_EDIT; + mode(EDIT); } /** @brief Called when the selection MIGHT have changed */ @@ -421,13 +442,15 @@ static void users_selection_changed(GtkTreeSelection attribute((unused)) *treese users_makedetails("", "", "", "", DETAIL_VISIBLE, DETAIL_VISIBLE); - disorder_eclient_userinfo(client, users_got_email, users_selected, - "email", 0); - disorder_eclient_userinfo(client, users_got_rights, users_selected, - "rights", 0); - disorder_eclient_userinfo(client, users_got_password, users_selected, - "password", 0); - users_mode = MODE_NONE; /* not editing *yet* */ + if(users_selected) { + disorder_eclient_userinfo(client, users_got_email, users_selected, + "email", 0); + disorder_eclient_userinfo(client, users_got_rights, users_selected, + "rights", 0); + disorder_eclient_userinfo(client, users_got_password, users_selected, + "password", 0); + } + mode(NONE); /* not editing *yet* */ } /** @brief Table of buttons below the user list */ @@ -498,10 +521,11 @@ void manage_users(void) { gtk_box_pack_start(GTK_BOX(vbox), buttons, FALSE/*expand*/, FALSE, 0); /* Create an empty user details table, and put an apply button below it */ + users_apply_button = gtk_button_new_from_stock(GTK_STOCK_APPLY); users_makedetails("", "", "", "", DETAIL_VISIBLE, DETAIL_VISIBLE); - users_apply_button = gtk_button_new_from_stock(GTK_STOCK_APPLY); + /* TODO apply button is much too wide right now... */ g_signal_connect(users_apply_button, "clicked", G_CALLBACK(users_apply), NULL); vbox2 = gtk_vbox_new(FALSE, 2);