X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/16e145a5cf55ff3826656faedfba13460e4ab28b..159f3470a01211557dcd39f5701dcaf0f43f6683:/disobedience/properties.c diff --git a/disobedience/properties.c b/disobedience/properties.c index e02bb28..96d5c48 100644 --- a/disobedience/properties.c +++ b/disobedience/properties.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2006 Richard Kettlewell + * Copyright (C) 2006, 2007 Richard Kettlewell * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -121,31 +121,31 @@ static const struct pref { { "Album", "album", 0, &preftype_namepart }, { "Title", "title", 0, &preftype_namepart }, { "Tags", "tags", "", &preftype_string }, + { "Weight", "weight", "90000", &preftype_string }, { "Random", "pick_at_random", "1", &preftype_boolean }, }; #define NPREFS (int)(sizeof prefs / sizeof *prefs) /* Buttons that appear at the bottom of the window */ -static const struct button { - const gchar *stock; - void (*clicked)(GtkButton *button, gpointer userdata); - const char *tip; -} buttons[] = { +static struct button buttons[] = { { GTK_STOCK_OK, properties_ok, - "Apply all changes and close window" + "Apply all changes and close window", + 0 }, { GTK_STOCK_APPLY, properties_apply, - "Apply all changes and keep window open" + "Apply all changes and keep window open", + 0 }, { GTK_STOCK_CANCEL, properties_cancel, - "Discard all changes and close window" + "Discard all changes and close window", + 0 }, }; @@ -156,7 +156,7 @@ static int prefs_total; /* Total prefs */ static struct prefdata *prefdatas; /* Current prefdatas */ static GtkWidget *properties_window; static GtkWidget *properties_table; -static GtkWidget *progress_window, *progress_bar; +static struct progress_window *pw; static void propagate_clicked(GtkButton attribute((unused)) *button, gpointer userdata) { @@ -174,9 +174,11 @@ static void propagate_clicked(GtkButton attribute((unused)) *button, void properties(int ntracks, const char **tracks) { int n, m; struct prefdata *f; - GtkWidget *hbox, *vbox, *button, *label, *entry, *propagate, *content; - GdkPixbuf *pb; - + GtkWidget *buttonbox, *vbox, *label, *entry, *propagate; + + /* 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) { @@ -186,16 +188,18 @@ void properties(int ntracks, const char **tracks) { } assert(properties_table == 0); if(ntracks > INT_MAX / NPREFS) { - popup_error("Too many tracks selected"); + popup_msg(GTK_MESSAGE_ERROR, "Too many tracks selected"); return; } /* Create a new properties window */ properties_window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_widget_set_style(properties_window, tool_style); 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 + ntracks > 1, FALSE); + gtk_widget_set_style(properties_table, tool_style); g_signal_connect(properties_table, "destroy", G_CALLBACK(gtk_widget_destroyed), &properties_table); gtk_window_set_title(GTK_WINDOW(properties_window), "Track Properties"); @@ -207,6 +211,7 @@ void properties(int ntracks, const char **tracks) { /* The track itself */ /* Caption */ label = gtk_label_new("Track"); + gtk_widget_set_style(label, tool_style); gtk_misc_set_alignment(GTK_MISC(label), 1, 0); gtk_table_attach(GTK_TABLE(properties_table), label, @@ -216,6 +221,7 @@ void properties(int ntracks, const char **tracks) { 1, 1); /* The track name */ entry = gtk_entry_new(); + gtk_widget_set_style(entry, tool_style); gtk_entry_set_text(GTK_ENTRY(entry), tracks[n]); gtk_editable_set_editable(GTK_EDITABLE(entry), FALSE); gtk_table_attach(GTK_TABLE(properties_table), @@ -228,6 +234,7 @@ void properties(int ntracks, const char **tracks) { for(m = 0; m < NPREFS; ++m) { /* Caption */ label = gtk_label_new(prefs[m].label); + gtk_widget_set_style(label, tool_style); gtk_misc_set_alignment(GTK_MISC(label), 1, 0); gtk_table_attach(GTK_TABLE(properties_table), label, @@ -243,13 +250,7 @@ void properties(int ntracks, const char **tracks) { 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", ""); + propagate = iconbutton("propagate.png", "Copy to other tracks"); g_signal_connect(G_OBJECT(propagate), "clicked", G_CALLBACK(propagate_clicked), f); gtk_table_attach(GTK_TABLE(properties_table), @@ -263,42 +264,31 @@ void properties(int ntracks, const char **tracks) { } prefs_unfilled = prefs_total; /* Buttons */ - hbox = gtk_hbox_new(FALSE, 1); - for(n = 0; n < NBUTTONS; ++n) { - button = gtk_button_new_from_stock(buttons[n].stock); - 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, ""); - } + buttonbox = create_buttons(buttons, NBUTTONS); /* Put it all together */ vbox = gtk_vbox_new(FALSE, 1); gtk_box_pack_start(GTK_BOX(vbox), - scroll_widget(properties_table, - "properties"), + scroll_widget(properties_table), TRUE, TRUE, 1); - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 1); - gtk_container_add(GTK_CONTAINER(properties_window), vbox); + gtk_box_pack_start(GTK_BOX(vbox), buttonbox, FALSE, FALSE, 1); + gtk_container_add(GTK_CONTAINER(properties_window), frame_widget(vbox, NULL)); /* The table only really wants to be vertically scrollable */ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(GTK_WIDGET(properties_table)->parent->parent), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + /* Zot any pre-existing progress window just in case */ + if(pw) + progress_window_progress(pw, 0, 0); /* Pop up a progress bar while we're waiting */ - progress_window = gtk_window_new(GTK_WINDOW_TOPLEVEL); - g_signal_connect(progress_window, "destroy", - G_CALLBACK(gtk_widget_destroyed), &progress_window); - gtk_window_set_default_size(GTK_WINDOW(progress_window), 360, -1); - gtk_window_set_title(GTK_WINDOW(progress_window), - "Fetching Track Properties"); - progress_bar = gtk_progress_bar_new(); - gtk_container_add(GTK_CONTAINER(progress_window), progress_bar); - gtk_widget_show_all(progress_window); + pw = progress_window_new("Fetching Track Properties"); } /* Everything is filled in now */ static void prefdata_alldone(void) { - if(progress_window) - gtk_widget_destroy(progress_window); + if(pw) { + progress_window_progress(pw, 0, 0); + pw = 0; + } /* Default size may be too small */ gtk_window_set_default_size(GTK_WINDOW(properties_window), 480, 512); /* TODO: relate default size to required size more closely */ @@ -396,6 +386,7 @@ static void kickoff_boolean(struct prefdata *f) { static void completed_boolean(struct prefdata *f) { f->widget = gtk_check_button_new(); + gtk_widget_set_style(f->widget, tool_style); if(!f->value) /* Not set, use the default */ f->value = f->p->default_value; @@ -461,9 +452,8 @@ static void prefdata_completed_common(struct prefdata *f, GTK_EXPAND|GTK_FILL/*xoptions*/, 0/*yoptions*/, 1, 1); --prefs_unfilled; - if(prefs_total && progress_window) - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress_bar), - 1.0 - (double)prefs_unfilled / prefs_total); + if(prefs_total) + progress_window_progress(pw, prefs_total - prefs_unfilled, prefs_total); if(!prefs_unfilled) prefdata_alldone(); } @@ -500,6 +490,15 @@ static void properties_cancel(GtkButton attribute((unused)) *button, gtk_widget_destroy(properties_window); } +/** @brief Called on client reset + * + * Destroys the current properties window. + */ +void properties_reset(void) { + if(properties_window) + gtk_widget_destroy(properties_window); +} + /* Local Variables: c-basic-offset:2