colors for properties popup

diff --git a/disobedience/misc.c b/disobedience/misc.c
index 7e44cc27512374e0ca7e42a4eb0ad3a50d36fd2e..e166dde7087226717940511e4e267c01178a70f9 100644 (file)
--- a/disobedience/misc.c
+++ b/disobedience/misc.c
@@ -64,6 +64,8 @@ GtkWidget *scroll_widget(GtkWidget *child) {
     /* Child widget requires a viewport */
     gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroller),
                                           child);
     /* Child widget requires a viewport */
     gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroller),
                                           child);

+    gtk_widget_modify_bg(gtk_bin_get_child(GTK_BIN(scroller)),
+                         GTK_STATE_NORMAL, &tool_bg);

   }
   set_slider_colors(GTK_SCROLLED_WINDOW(scroller)->hscrollbar);
   set_slider_colors(GTK_SCROLLED_WINDOW(scroller)->vscrollbar);
   }
   set_slider_colors(GTK_SCROLLED_WINDOW(scroller)->hscrollbar);
   set_slider_colors(GTK_SCROLLED_WINDOW(scroller)->vscrollbar);


@@ -164,6 +166,14 @@ GtkWidget *create_buttons(const struct button *buttons,
 
   for(n = 0; n < nbuttons; ++n) {
     GtkWidget *const button = gtk_button_new_from_stock(buttons[n].stock);
 
   for(n = 0; n < nbuttons; ++n) {
     GtkWidget *const button = gtk_button_new_from_stock(buttons[n].stock);

+    gtk_widget_modify_bg(button, GTK_STATE_NORMAL, &tool_bg);
+    gtk_widget_modify_bg(button, GTK_STATE_ACTIVE, &tool_active);
+    gtk_widget_modify_bg(button, GTK_STATE_PRELIGHT, &tool_active);
+    gtk_widget_modify_bg(button, GTK_STATE_SELECTED, &tool_active);
+    gtk_widget_modify_fg(button, GTK_STATE_NORMAL, &tool_fg);
+    gtk_widget_modify_fg(button, GTK_STATE_ACTIVE, &tool_fg);
+    gtk_widget_modify_fg(button, GTK_STATE_PRELIGHT, &tool_fg);
+    gtk_widget_modify_fg(button, GTK_STATE_SELECTED, &tool_fg);

     g_signal_connect(G_OBJECT(button), "clicked",
                      G_CALLBACK(buttons[n].clicked), 0);
     gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1);
     g_signal_connect(G_OBJECT(button), "clicked",
                      G_CALLBACK(buttons[n].clicked), 0);
     gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 1);

diff --git a/disobedience/properties.c b/disobedience/properties.c
index 82af9ad6fe5436914ce6ed70315fe5ff535a8e45..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);
   }
   /* 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);
   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");
   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");
     /* 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,
     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);
     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,
       gtk_misc_set_alignment(GTK_MISC(label), 1, 0);
       gtk_table_attach(GTK_TABLE(properties_table),
                        label,


@@ -384,6 +388,8 @@ static void kickoff_boolean(struct prefdata *f) {
 
 static void completed_boolean(struct prefdata *f) {
   f->widget = gtk_check_button_new();
 
 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;
   if(!f->value)
     /* Not set, use the default */
     f->value = f->p->default_value;