[SCM] calf/master: Prelight state of buttons MIDI lamp in rack

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0674eead40d96cf234c351ead2da022e656dca93
Author: Markus Schmidt <schmidt at boomshop.net>
Date:   Sun Nov 20 05:01:09 2011 +0100

    Prelight state of buttons
    MIDI lamp in rack

diff --git a/gui/button_default_prelight.png b/gui/button_default_prelight.png
index a2802de..6d65189 100644
Binary files a/gui/button_default_prelight.png and b/gui/button_default_prelight.png differ
diff --git a/gui/button_prelight.png b/gui/button_prelight.png
index 886caaf..fa64f02 100644
Binary files a/gui/button_prelight.png and b/gui/button_prelight.png differ
diff --git a/gui/gui-monosynth.xml b/gui/gui-monosynth.xml
index 86ed900..d0edc3e 100644
--- a/gui/gui-monosynth.xml
+++ b/gui/gui-monosynth.xml
@@ -161,10 +161,10 @@
           </frame>
           <frame label="LFO 1">
             <vbox spacing="10">
-              <align>
-                <hbox>
-                  <label param="lfo1_trig" text="Mode" />
-                  <combo param="lfo1_trig" />
+              <align fill="1" expand="1">
+                <hbox fill="1" expand="1">
+                  <label param="lfo1_trig" text="Mode" fill="0" expand="0" />
+                  <combo param="lfo1_trig" fill="1" expand="1" />
                 </hbox>
               </align>
               <hbox>
@@ -205,10 +205,10 @@
           </frame>
           <frame label="LFO 2">
             <vbox spacing="10">
-              <align>
-                <hbox>
-                  <label param="lfo2_trig" text="Mode" />
-                  <combo param="lfo2_trig" />
+              <align fill="1" expand="1">
+                <hbox fill="1" expand="1">
+                  <label param="lfo2_trig" text="Mode" fill="0" expand="0" />
+                  <combo param="lfo2_trig" fill="1" expand="1" />
                 </hbox>
               </align>
               <hbox>
diff --git a/src/gtk_main_win.cpp b/src/gtk_main_win.cpp
index f767d30..1c62d95 100644
--- a/src/gtk_main_win.cpp
+++ b/src/gtk_main_win.cpp
@@ -346,7 +346,7 @@ gtk_main_window::plugin_strip *gtk_main_window::create_strip(plugin_ctl_iface *p
     } else {
         label = gtk_label_new("");
         gtk_table_attach(GTK_TABLE(strips_table), label, 2, 3, row, row + 1, GTK_FILL, GTK_EXPAND, 5, 3);
-        gtk_widget_set_size_request(GTK_WIDGET(label), 40, 36);
+        gtk_widget_set_size_request(GTK_WIDGET(label), 25, 25);
         strip->midi_in = label;
         gtk_widget_show(strip->midi_in);
     }
@@ -365,15 +365,17 @@ gtk_main_window::plugin_strip *gtk_main_window::create_strip(plugin_ctl_iface *p
         label = calf_vumeter_new();
         calf_vumeter_set_falloff(CALF_VUMETER(label), 2.5);
         calf_vumeter_set_hold(CALF_VUMETER(label), 1.5);
+        calf_vumeter_set_width(CALF_VUMETER(label), 120);
         calf_vumeter_set_height(CALF_VUMETER(label), 12);
-        gtk_box_pack_start(GTK_BOX(inBox), label,TRUE, TRUE, 0);
+        gtk_box_pack_start(GTK_BOX(inBox), label,FALSE, FALSE, 0);
         strip->audio_in[0] = label;
         
         label = calf_vumeter_new();
         calf_vumeter_set_falloff(CALF_VUMETER(label), 2.5);
         calf_vumeter_set_hold(CALF_VUMETER(label), 1.5);
+        calf_vumeter_set_width(CALF_VUMETER(label), 120);
         calf_vumeter_set_height(CALF_VUMETER(label), 12);
-        gtk_box_pack_start(GTK_BOX(inBox), label,TRUE, TRUE, 0);
+        gtk_box_pack_start(GTK_BOX(inBox), label,FALSE, FALSE, 0);
         strip->audio_in[1] = label;
         
         gtk_widget_show_all(inBox);
@@ -391,15 +393,17 @@ gtk_main_window::plugin_strip *gtk_main_window::create_strip(plugin_ctl_iface *p
         label = calf_vumeter_new();
         calf_vumeter_set_falloff(CALF_VUMETER(label), 2.5);
         calf_vumeter_set_hold(CALF_VUMETER(label), 1.5);
+        calf_vumeter_set_width(CALF_VUMETER(label), 120);
         calf_vumeter_set_height(CALF_VUMETER(label), 12);
-        gtk_box_pack_start(GTK_BOX(outBox), label,TRUE, TRUE, 0);
+        gtk_box_pack_start(GTK_BOX(outBox), label,FALSE, FALSE, 0);
         strip->audio_out[0] = label;
         
         label = calf_vumeter_new();
         calf_vumeter_set_falloff(CALF_VUMETER(label), 2.5);
         calf_vumeter_set_hold(CALF_VUMETER(label), 1.5);
+        calf_vumeter_set_width(CALF_VUMETER(label), 120);
         calf_vumeter_set_height(CALF_VUMETER(label), 12);
-        gtk_box_pack_start(GTK_BOX(outBox), label,TRUE, TRUE, 0);
+        gtk_box_pack_start(GTK_BOX(outBox), label,FALSE, FALSE, 0);
         strip->audio_out[1] = label;
         
         gtk_widget_show_all(outBox);

-- 
calf audio plugins packaging