split out disorder-server.deb

[disorder] / disobedience / properties.c

diff --git a/disobedience/properties.c b/disobedience/properties.c
index d306b56cdab5fbce9b261f78e6c10cbf0c99e61c..99bda206f68e091a982ef1d7eed4305380e2abb8 100644 (file)
--- a/disobedience/properties.c
+++ b/disobedience/properties.c
@@ -190,11 +190,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);
   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);
   g_signal_connect(properties_table, "destroy",
                   G_CALLBACK(gtk_widget_destroyed), &properties_table);
   gtk_window_set_title(GTK_WINDOW(properties_window), "Track Properties");
@@ -206,6 +208,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_misc_set_alignment(GTK_MISC(label), 1, 0);
     gtk_table_attach(GTK_TABLE(properties_table),
                      label,
@@ -227,6 +230,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_misc_set_alignment(GTK_MISC(label), 1, 0);
       gtk_table_attach(GTK_TABLE(properties_table),
                        label,
@@ -266,8 +270,7 @@ void properties(int ntracks, const char **tracks) {
   /* 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), buttonbox, FALSE, FALSE, 1);
   gtk_container_add(GTK_CONTAINER(properties_window), vbox);
@@ -385,6 +388,8 @@ 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);
   if(!f->value)
     /* Not set, use the default */
     f->value = f->p->default_value;