further debugging info() calls; marked TODO to remove when bug fixed

[disorder] / disobedience / control.c

diff --git a/disobedience/control.c b/disobedience/control.c
index d3c4e18a3a09a6388a77dd6534093565c611d045..0fde2d09a832320f38898053105988aab54abd31 100644 (file)
--- a/disobedience/control.c
+++ b/disobedience/control.c
@@ -113,20 +113,20 @@ static struct icon icons[] = {
   {
     "pause.png",                        /* icon */
     "Pause playing track",              /* tip */
-    0,                                  /* menuitem */
+    "<GdisorderMain>/Control/Playing",  /* menuitem */
     update_pause,                       /* update */
     disorder_eclient_pause,             /* action */
-    ICON_INACTIVE,                      /* flags */
+    ICON_ACTIVE,                        /* flags */
     0,                                  /* button */
     0                                   /* item */
   },
   {
     "play.png",                         /* icon */
     "Resume playing track",             /* tip */
-    0,                                  /* menuitem */
+    "<GdisorderMain>/Control/Playing",  /* menuitem */
     update_play,                        /* update */
     disorder_eclient_resume,            /* action */
-    ICON_ACTIVE,                        /* flags */
+    ICON_INACTIVE,                      /* flags */
     0,                                  /* button */
     0                                   /* item */
   },
@@ -183,7 +183,7 @@ static struct icon icons[] = {
   {
     "speaker.png",                      /* icon */
     "Play network stream",              /* tip */
-    0,                                  /* menuitem */
+    "<GdisorderMain>/Control/Network player", /* menuitem */
     update_rtp,                         /* update */
     enable_rtp,                         /* action */
     ICON_INACTIVE,                      /* flags */
@@ -193,7 +193,7 @@ static struct icon icons[] = {
   {
     "speakercross.png",                 /* icon */
     "Stop playing network stream",      /* tip */
-    0,                                  /* menuitem */
+    "<GdisorderMain>/Control/Network player", /* menuitem */
     update_nortp,                       /* update */
     disable_rtp,                        /* action */
     ICON_ACTIVE,                        /* flags */
@@ -231,6 +231,11 @@ GtkWidget *control_widget(void) {
   for(n = 0; n < NICONS; ++n) {
     NW(button);
     icons[n].button = gtk_button_new();
+    gtk_widget_modify_bg(icons[n].button, GTK_STATE_NORMAL, &tool_bg);
+    gtk_widget_modify_bg(icons[n].button, GTK_STATE_ACTIVE, &tool_active);
+    gtk_widget_modify_bg(icons[n].button, GTK_STATE_PRELIGHT, &tool_active);
+    gtk_widget_modify_bg(icons[n].button, GTK_STATE_SELECTED, &tool_active);
+    gtk_widget_modify_bg(icons[n].button, GTK_STATE_INSENSITIVE, &tool_active);
     if((pb = find_image(icons[n].icon))) {
       NW(image);
       content = gtk_image_new_from_pixbuf(pb);
@@ -279,6 +284,8 @@ GtkWidget *control_widget(void) {
   v = gtk_hscale_new(volume_adj);
   NW(hscale);
   b = gtk_hscale_new(balance_adj);
+  set_slider_colors(v);
+  set_slider_colors(b);
   gtk_scale_set_digits(GTK_SCALE(v), 10);
   gtk_scale_set_digits(GTK_SCALE(b), 10);
   gtk_widget_set_size_request(v, 192, -1);