[SCM] calf/master: Merge commit 'origin/pulsator'

[js at users.alioth.debian.org]

Merged with master
Merge branch 'master' into pulsator
Bypass should leave LFO alone
Pulsator process and GUI, slight changes in other GUI's
LFO module, Pulsator (GUI missing)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d6a3c1a63a147948535a50da009275278ad5e6a3
X-Git-Newrev: 34569260c452f0fa4c543155ebba174a42a343dc

The following commit has been merged in the master branch:
commit cb38a5b90b7afb936f8b4beac96f061b61a55782
Merge: 81fea749ff65aa1aa29a9e17739d05aa9c839609 609de4fc2cf68efc12b69f6f37cd020478752e45
Author: Krzysztof Foltman <wdev at foltman.com>
Date:   Wed Nov 18 18:39:31 2009 +0000

    Merge commit 'origin/pulsator'

diff --combined gui/calf.rc
index 7fa36b0,59c68bd..b227763
--- a/gui/calf.rc
+++ b/gui/calf.rc
@@@ -132,76 -132,8 +132,76 @@@ style "clearlooks-button
  {
  	GtkButton      ::child-displacement-x = 0
  	GtkButton      ::child-displacement-y = 0
 -#	GtkButton      ::default-border       = { 6, 24, 5, 5 }
 -	GtkButton      ::inner-border         = { 6, 25, 2, 2}
 +#	GtkButton      ::default-border       = { 8, 8, 6, 6 }
 +	GtkButton      ::inner-border         = { 8, 8, 3, 3}
 +	
 +    xthickness = 5
 +    ythickness = 2
 +    
 +    fg[NORMAL]			= "#000"
 +	fg[PRELIGHT]		= "#000"
 +	fg[SELECTED]		= "#000"
 +	fg[ACTIVE]			= "#000"
 +	fg[INSENSITIVE]		= "#666"
 +	
 +	text[NORMAL]		= "#000"
 +	text[PRELIGHT]		= "#000"
 +	text[SELECTED]		= "#000"
 +	text[ACTIVE]		= "#000"
 +	text[INSENSITIVE]	= "#666"
 +	
 +	engine "pixmap"
 +	{
 +		image
 +		{
 +			function		= BOX
 +			detail			= "buttondefault"
 +			recolorable		= FALSE
 +			file			= "button_default.png"
 +			border			= {6, 6, 6, 6}
 +			stretch			= TRUE
 +		}
 +		image
 +		{
 +			function		= BOX
 +			state			= PRELIGHT
 +			recolorable		= FALSE
 +			file			= "button_default_prelight.png"
 +			border			= {6, 6, 6, 6}
 +			stretch			= TRUE
 +		}
 +		image
 +		{
 +			function		= BOX
 +			state			= ACTIVE
 +			file			= "button_default_active.png"
 +			border			= {6, 6, 6, 6}
 +			stretch			= TRUE
 +		}
 +		image
 +		{
 +			function		= BOX
 +			state			= INSENSITIVE
 +			file			= "button_default.png"
 +			border			= {6, 6, 6, 6}
 +			stretch			= TRUE
 +		}
 +		image
 +		{
 +			function		= BOX
 +			file			= "button_default.png"
 +			border			= {6, 6, 6, 6}
 +			stretch			= TRUE
 +		}
 +		
 +	}
 +}
 +style "clearlooks-toggle"
 +{
 +	GtkButton      ::child-displacement-x = 0
 +	GtkButton      ::child-displacement-y = 0
 +#	GtkButton      ::default-border       = { 8, 26, 6, 6 }
 +	GtkButton      ::inner-border         = { 8, 26, 3, 3}
  	
      xthickness = 5
      ythickness = 2
@@@ -242,7 -174,7 +242,7 @@@
  		{
  			function		= BOX
  			state			= ACTIVE
 -			file			= "button_prelight.png"
 +			file			= "button_active.png"
  			border			= {6, 24, 6, 6}
  			stretch			= TRUE
  		}
@@@ -268,7 -200,7 +268,7 @@@ style "clearlooks-button-norm
  {
  	GtkButton      ::child-displacement-x = 0
  	GtkButton      ::child-displacement-y = 0
 -#	GtkButton      ::default-border       = { 6, 24, 5, 5 }
 +#	GtkButton      ::default-border       = { 6, 6, 5, 5 }
  	GtkButton      ::inner-border         = { 6, 6, 3, 3}
  	
      xthickness = 5
@@@ -297,22 -229,6 +297,22 @@@
  		}
  		image
  		{
 +			function		= BOX
 +			state			= PRELIGHT
 +			file			= "button_default_prelight.png"
 +			border			= {6, 6, 6, 6}
 +			stretch			= TRUE
 +		}
 +		image
 +		{
 +			function		= BOX
 +			state			= ACTIVE
 +			file			= "button_default_active.png"
 +			border			= {6, 6, 6, 6}
 +			stretch			= TRUE
 +		}
 +		image
 +		{
  			function		= VLINE
  			recolorable		= FALSE
  			file			= "vline.png"
@@@ -568,7 -484,7 +568,7 @@@ style "clearlooks-frame
  style "clearlooks-frame-title"
  {
  	fg[NORMAL] = "#fff"
- 	font_name = "Sans 10"
+ 	font_name = "Sans 8"
  }
  
  style "clearlooks-tooltips" = "clearlooks-wider"
@@@ -630,7 -546,7 +630,7 @@@ style "clearlooks-combobox
  			function		= BOX
  			recolorable		= FALSE
  			state			= PRELIGHT
 -			file			= "button_default.png"
 +			file			= "button_default_prelight.png"
  			border			= {8, 24, 6, 6}
  			stretch			= TRUE
  		}
@@@ -649,7 -565,7 +649,7 @@@
  			function		= BOX
  			recolorable		= FALSE
  			state			= ACTIVE
 -			file			= "button_default.png"
 +			file			= "button_default_active.png"
  			border			= {8, 24, 6, 6}
  			stretch			= TRUE
  		}
@@@ -1694,7 -1610,6 +1694,7 @@@ widget_class "*<GtkNotebook>*<GtkDrawin
  widget_class "*<GtkNotebook>*<GtkLayout>"       	style "clearlooks-notebook"
  
  widget_class "*<GtkButton>*"      			style "clearlooks-button"
 +widget_class "*<GtkToggleButton>*"      	style "clearlooks-toggle"
  widget_class "*<GtkNotebook>"    			style "clearlooks-notebook"
  widget_class "*<GtkStatusbar>*"  			style "clearlooks-statusbar"
  

-- 
calf audio plugins packaging