X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/460b9539a7c15580e41a71bbc0f47ae776238915..5459347d6b363c0e673b5995d6aff1ce8c456cc3:/disobedience/properties.c diff --git a/disobedience/properties.c b/disobedience/properties.c index ae945be..e9f61a2 100644 --- a/disobedience/properties.c +++ b/disobedience/properties.c @@ -27,17 +27,20 @@ struct prefdata; static void kickoff_namepart(struct prefdata *f); static void completed_namepart(struct prefdata *f); static const char *get_edited_namepart(struct prefdata *f); +static void set_edited_namepart(struct prefdata *f, const char *value); static void set_namepart(struct prefdata *f, const char *value); static void set_namepart_completed(void *v); static void kickoff_string(struct prefdata *f); static void completed_string(struct prefdata *f); static const char *get_edited_string(struct prefdata *f); +static void set_edited_string(struct prefdata *f, const char *value); static void set_string(struct prefdata *f, const char *value); static void kickoff_boolean(struct prefdata *f); static void completed_boolean(struct prefdata *f); static const char *get_edited_boolean(struct prefdata *f); +static void set_edited_boolean(struct prefdata *f, const char *value); static void set_boolean(struct prefdata *f, const char *value); static void prefdata_completed(void *v, const char *value); @@ -52,12 +55,12 @@ static void properties_ok(GtkButton *button, gpointer userdata); static void properties_apply(GtkButton *button, gpointer userdata); static void properties_cancel(GtkButton *button, gpointer userdata); -/* Data for a single preference */ +/** @brief Data for a single preference */ struct prefdata { const char *track; int row; - const struct pref *p; - const char *value; + const struct pref *p; /**< @brief kind of preference */ + const char *value; /**< @brief value from server */ GtkWidget *widget; }; @@ -73,6 +76,9 @@ struct preftype { const char *(*get_edited)(struct prefdata *f); /* Get the edited value from the widget. */ + /** @brief Update the edited value */ + void (*set_edited)(struct prefdata *f, const char *value); + void (*set)(struct prefdata *f, const char *value); /* Set the new value and (if necessary) arrange for our display to update. */ }; @@ -82,6 +88,7 @@ static const struct preftype preftype_namepart = { kickoff_namepart, completed_namepart, get_edited_namepart, + set_edited_namepart, set_namepart }; @@ -90,6 +97,7 @@ static const struct preftype preftype_string = { kickoff_string, completed_string, get_edited_string, + set_edited_string, set_string }; @@ -98,15 +106,16 @@ static const struct preftype preftype_boolean = { kickoff_boolean, completed_boolean, get_edited_boolean, + set_edited_boolean, set_boolean }; -/* The known prefs for each track */ +/* @brief The known prefs for each track */ static const struct pref { - const char *label; - const char *part; - const char *default_value; - const struct preftype *type; + const char *label; /**< @brief user-level description */ + const char *part; /**< @brief protocol-level tag */ + const char *default_value; /**< @brief default value or NULL */ + const struct preftype *type; /**< @brief underlying data type */ } prefs[] = { { "Artist", "artist", 0, &preftype_namepart }, { "Album", "album", 0, &preftype_namepart }, @@ -121,10 +130,23 @@ static const struct pref { static const struct button { const gchar *stock; void (*clicked)(GtkButton *button, gpointer userdata); + const char *tip; } buttons[] = { - { GTK_STOCK_OK, properties_ok }, - { GTK_STOCK_APPLY, properties_apply }, - { GTK_STOCK_CANCEL, properties_cancel }, + { + GTK_STOCK_OK, + properties_ok, + "Apply all changes and close window" + }, + { + GTK_STOCK_APPLY, + properties_apply, + "Apply all changes and keep window open" + }, + { + GTK_STOCK_CANCEL, + properties_cancel, + "Discard all changes and close window" + }, }; #define NBUTTONS (int)(sizeof buttons / sizeof *buttons) @@ -136,11 +158,28 @@ static GtkWidget *properties_window; static GtkWidget *properties_table; static GtkWidget *progress_window, *progress_bar; -void properties(int ntracks, char **tracks) { +static void propagate_clicked(GtkButton attribute((unused)) *button, + gpointer userdata) { + struct prefdata *f = (struct prefdata *)userdata, *g; + int p; + const char *value = f->p->type->get_edited(f); + + for(p = 0; p < prefs_total; ++p) { + g = &prefdatas[p]; + if(f->p == g->p && f != g) + g->p->type->set_edited(g, value); + } +} + +void properties(int ntracks, const char **tracks) { int n, m; struct prefdata *f; - GtkWidget *hbox, *vbox, *button, *label, *entry; - + GtkWidget *hbox, *vbox, *button, *label, *entry, *propagate, *content; + GdkPixbuf *pb; + + /* If no tracks, do nothign */ + if(!ntracks) + return; /* If there is a properties window open then just bring it to the * front. It might not have the right values in... */ if(properties_window) { @@ -158,7 +197,8 @@ void properties(int ntracks, char **tracks) { g_signal_connect(properties_window, "destroy", G_CALLBACK(gtk_widget_destroyed), &properties_window); /* Most of the action is the table of preferences */ - properties_table = gtk_table_new((NPREFS + 1) * ntracks, 2, FALSE); + properties_table = gtk_table_new((NPREFS + 1) * ntracks, 2 + ntracks > 1, + FALSE); g_signal_connect(properties_table, "destroy", G_CALLBACK(gtk_widget_destroyed), &properties_table); gtk_window_set_title(GTK_WINDOW(properties_window), "Track Properties"); @@ -167,6 +207,8 @@ void properties(int ntracks, char **tracks) { prefs_total = NPREFS * ntracks; prefdatas = xcalloc(prefs_total, sizeof *prefdatas); for(n = 0; n < ntracks; ++n) { + /* The track itself */ + /* Caption */ label = gtk_label_new("Track"); gtk_misc_set_alignment(GTK_MISC(label), 1, 0); gtk_table_attach(GTK_TABLE(properties_table), @@ -175,6 +217,7 @@ void properties(int ntracks, char **tracks) { (NPREFS + 1) * n, (NPREFS + 1) * n + 1, GTK_FILL, 0, 1, 1); + /* The track name */ entry = gtk_entry_new(); gtk_entry_set_text(GTK_ENTRY(entry), tracks[n]); gtk_editable_set_editable(GTK_EDITABLE(entry), FALSE); @@ -184,7 +227,9 @@ void properties(int ntracks, char **tracks) { (NPREFS + 1) * n, (NPREFS + 1) * n + 1, GTK_EXPAND|GTK_FILL, 0, 1, 1); + /* Each preference */ for(m = 0; m < NPREFS; ++m) { + /* Caption */ label = gtk_label_new(prefs[m].label); gtk_misc_set_alignment(GTK_MISC(label), 1, 0); gtk_table_attach(GTK_TABLE(properties_table), @@ -193,11 +238,30 @@ void properties(int ntracks, char **tracks) { (NPREFS + 1) * n + 1 + m, (NPREFS + 1) * n + 2 + m, GTK_FILL/*xoptions*/, 0/*yoptions*/, 1, 1); + /* Editing the preference is specific */ f = &prefdatas[NPREFS * n + m]; f->track = tracks[n]; f->row = (NPREFS + 1) * n + 1 + m; f->p = &prefs[m]; prefs[m].type->kickoff(f); + if(ntracks > 1) { + /* Propagation button */ + propagate = gtk_button_new(); + if((pb = find_image("propagate.png"))) + content = gtk_image_new_from_pixbuf(pb); + else + content = gtk_label_new("propagate.png"); + gtk_container_add(GTK_CONTAINER(propagate), content); + gtk_tooltips_set_tip(tips, propagate, "Copy to other tracks", ""); + g_signal_connect(G_OBJECT(propagate), "clicked", + G_CALLBACK(propagate_clicked), f); + gtk_table_attach(GTK_TABLE(properties_table), + propagate, + 2/*left*/, 3/*right*/, + (NPREFS + 1) * n + 1 + m, (NPREFS + 1) * n + 2 + m, + GTK_FILL/*xoptions*/, 0/*yoptions*/, + 1/*xpadding*/, 1/*ypadding*/); + } } } prefs_unfilled = prefs_total; @@ -208,6 +272,7 @@ void properties(int ntracks, char **tracks) { g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(buttons[n].clicked), 0); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1); + gtk_tooltips_set_tip(tips, button, buttons[n].tip, ""); } /* Put it all together */ vbox = gtk_vbox_new(FALSE, 1); @@ -246,38 +311,42 @@ static void prefdata_alldone(void) { /* Namepart preferences ---------------------------------------------------- */ static void kickoff_namepart(struct prefdata *f) { - char *s; - - byte_xasprintf(&s, "trackname_display_%s", f->p->part); - disorder_eclient_get(client, prefdata_completed, f->track, s, - make_callbackdata(f)); + /* We ask for the display name part. This is a bit bizarre if what we really + * wanted was the underlying preference, but in fact it should always match + * and will supply a sane default without having to know how to parse tracks + * names (which implies knowing collection roots). */ + disorder_eclient_namepart(client, prefdata_completed, f->track, "display", f->p->part, + make_callbackdata(f)); } static void completed_namepart(struct prefdata *f) { - if(!f->value) - /* No setting, use the computed default value instead */ - f->value = trackname_part(f->track, "display", f->p->part); + if(!f->value) { + /* No setting */ + f->value = ""; + } f->widget = gtk_entry_new(); - gtk_entry_set_text(GTK_ENTRY(f->widget), f->value); } static const char *get_edited_namepart(struct prefdata *f) { return gtk_entry_get_text(GTK_ENTRY(f->widget)); } +static void set_edited_namepart(struct prefdata *f, const char *value) { + gtk_entry_set_text(GTK_ENTRY(f->widget), value); +} + static void set_namepart(struct prefdata *f, const char *value) { char *s; struct callbackdata *cbd = xmalloc(sizeof *cbd); cbd->u.f = f; byte_xasprintf(&s, "trackname_display_%s", f->p->part); - if(strcmp(trackname_part(f->track, "display", f->p->part), value)) - /* Different from default, set it */ - disorder_eclient_set(client, set_namepart_completed, f->track, s, value, - cbd); - else - /* Same as default, just unset */ - disorder_eclient_unset(client, set_namepart_completed, f->track, s, cbd); + /* We don't know what the default is so can never unset. This is a bug + * relative to the original design, which is supposed to only ever allow for + * non-trivial namepart preferences. I suppose the server could spot a + * default being set and translate it into an unset. */ + disorder_eclient_set(client, set_namepart_completed, f->track, s, value, + cbd); } /* Called when we've set a namepart */ @@ -300,13 +369,16 @@ static void completed_string(struct prefdata *f) { /* No setting, use the default value instead */ f->value = f->p->default_value; f->widget = gtk_entry_new(); - gtk_entry_set_text(GTK_ENTRY(f->widget), f->value); } static const char *get_edited_string(struct prefdata *f) { return gtk_entry_get_text(GTK_ENTRY(f->widget)); } +static void set_edited_string(struct prefdata *f, const char *value) { + gtk_entry_set_text(GTK_ENTRY(f->widget), value); +} + static void set_string(struct prefdata *f, const char *value) { if(strcmp(f->p->default_value, value)) /* Different from default, set it */ @@ -330,8 +402,6 @@ static void completed_boolean(struct prefdata *f) { if(!f->value) /* Not set, use the default */ f->value = f->p->default_value; - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(f->widget), - strcmp(f->value, "0")); } static const char *get_edited_boolean(struct prefdata *f) { @@ -339,6 +409,11 @@ static const char *get_edited_boolean(struct prefdata *f) { ? "1" : "0"); } +static void set_edited_boolean(struct prefdata *f, const char *value) { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(f->widget), + strcmp(value, "0")); +} + static void set_boolean(struct prefdata *f, const char *value) { char *s; @@ -381,6 +456,7 @@ static void prefdata_completed_common(struct prefdata *f, const char *value) { f->value = value; f->p->type->completed(f); + f->p->type->set_edited(f, f->value); assert(f->value != 0); /* Had better set a default */ gtk_table_attach(GTK_TABLE(properties_table), f->widget, 1, 2, @@ -435,4 +511,3 @@ fill-column:79 indent-tabs-mode:nil End: */ -/* arch-tag:+COG6p7PaNPZjzknPrKdcw */