X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/6a6da0f0cd3ac8882d82029b82a4ddb746da4014..f4a26919bcd8352f35159793b57196d516435e26:/disobedience/properties.c

diff --git a/disobedience/properties.c b/disobedience/properties.c
index 99bda20..96d5c48 100644
--- a/disobedience/properties.c
+++ b/disobedience/properties.c
@@ -121,27 +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 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
   },
 };
 
@@ -170,8 +174,7 @@ static void propagate_clicked(GtkButton attribute((unused)) *button,
 void properties(int ntracks, const char **tracks) {
   int n, m;
   struct prefdata *f;
-  GtkWidget *buttonbox, *vbox, *label, *entry, *propagate, *content;
-  GdkPixbuf *pb;
+  GtkWidget *buttonbox, *vbox, *label, *entry, *propagate;
   
   /* If no tracks, do nothign */
   if(!ntracks)
@@ -190,13 +193,13 @@ void properties(int ntracks, const char **tracks) {
   }
   /* Create a new properties window */
   properties_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-  gtk_widget_modify_bg(properties_window, GTK_STATE_NORMAL, &tool_bg);
+  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_modify_bg(properties_table, GTK_STATE_NORMAL, &tool_bg);
+  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");
@@ -208,7 +211,7 @@ void properties(int ntracks, const char **tracks) {
     /* The track itself */
     /* Caption */
     label = gtk_label_new("Track");
-    gtk_widget_modify_fg(label, GTK_STATE_NORMAL, &tool_fg);
+    gtk_widget_set_style(label, tool_style);
     gtk_misc_set_alignment(GTK_MISC(label), 1, 0);
     gtk_table_attach(GTK_TABLE(properties_table),
                      label,
@@ -218,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),
@@ -230,7 +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_modify_fg(label, GTK_STATE_NORMAL, &tool_fg);
+      gtk_widget_set_style(label, tool_style);
       gtk_misc_set_alignment(GTK_MISC(label), 1, 0);
       gtk_table_attach(GTK_TABLE(properties_table),
                        label,
@@ -246,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),
@@ -273,7 +271,7 @@ void properties(int ntracks, const char **tracks) {
                      scroll_widget(properties_table),
                      TRUE, TRUE, 1);
   gtk_box_pack_start(GTK_BOX(vbox), buttonbox, FALSE, FALSE, 1);
-  gtk_container_add(GTK_CONTAINER(properties_window), vbox);
+  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,
@@ -388,8 +386,7 @@ static void kickoff_boolean(struct prefdata *f) {
 
 static void completed_boolean(struct prefdata *f) {
   f->widget = gtk_check_button_new();
-  gtk_widget_modify_bg(f->widget, GTK_STATE_NORMAL, &tool_bg);
-  gtk_widget_modify_bg(f->widget, GTK_STATE_PRELIGHT, &tool_active);
+  gtk_widget_set_style(f->widget, tool_style);
   if(!f->value)
     /* Not set, use the default */
     f->value = f->p->default_value;