[SCM] calf/master: Improvements on first page of Monosynth
js at users.alioth.debian.org
js at users.alioth.debian.org
Tue May 7 15:40:40 UTC 2013
The following commit has been merged in the master branch:
commit f429004749122db4c9bc01fcd5d7a66dcd153966
Author: Markus Schmidt <schmidt at boomshop.net>
Date: Sun Nov 20 06:20:16 2011 +0100
Improvements on first page of Monosynth
diff --git a/gui/calf.rc.in b/gui/calf.rc.in
index 73a1261..b7e4fee 100644
--- a/gui/calf.rc.in
+++ b/gui/calf.rc.in
@@ -601,7 +601,7 @@ style "calf-combobox"
GtkButton ::inner-border = { 8, 29, 1, 1}
xthickness = 2
- ythickness = 0
+ ythickness = 1
engine "pixmap"
{
@@ -619,7 +619,7 @@ style "calf-combobox"
recolorable = FALSE
state = PRELIGHT
file = "combo_active.png"
- border = { 4, 4, 5, 4 }
+ border = { 6, 6, 6, 6 }
stretch = TRUE
}
image
@@ -636,7 +636,7 @@ style "calf-combobox"
recolorable = FALSE
state = NORMAL
file = "combo.png"
- border = { 4, 4, 5, 4 }
+ border = { 6, 6, 6, 6 }
stretch = TRUE
}
image
@@ -653,7 +653,7 @@ style "calf-combobox"
recolorable = FALSE
state = ACTIVE
file = "combo_active.png"
- border = { 4, 4, 5, 4 }
+ border = { 6, 6, 6, 6 }
stretch = TRUE
}
image
@@ -670,7 +670,7 @@ style "calf-combobox"
recolorable = FALSE
state = INSENSITIVE
file = "combo_inactive.png"
- border = { 4, 4, 5, 4 }
+ border = { 6, 6, 6, 6 }
stretch = TRUE
}
# image
@@ -760,7 +760,7 @@ style "calf-entry"
xthickness = 0
ythickness = 0
GtkEntry::shadow-type = GTK_SHADOW_NONE
- GtkEntry::inner-border = { 6, 6, 5, 4 }
+ GtkEntry::inner-border = { 7, 7, 6, 5 }
base[NORMAL] = "#000"
engine "pixmap"
{
@@ -779,7 +779,7 @@ style "calf-entry"
state = INSENSITIVE
detail = "entry_bg"
file = "entry_inactive.png"
- border = { 4, 4, 5, 4 }
+ border = { 6, 6, 6, 6 }
stretch = TRUE
}
image
@@ -788,7 +788,7 @@ style "calf-entry"
state = NORMAL
detail = "entry_bg"
file = "entry.png"
- border = { 4, 4, 5, 4 }
+ border = { 6, 6, 6, 6 }
stretch = TRUE
}
}
diff --git a/gui/combo.png b/gui/combo.png
index a90d7e3..b248f4b 100644
Binary files a/gui/combo.png and b/gui/combo.png differ
diff --git a/gui/combo_active.png b/gui/combo_active.png
index e8ac8de..ab43842 100644
Binary files a/gui/combo_active.png and b/gui/combo_active.png differ
diff --git a/gui/combo_inactive.png b/gui/combo_inactive.png
index 7933538..0d15173 100644
Binary files a/gui/combo_inactive.png and b/gui/combo_inactive.png differ
diff --git a/gui/entry.png b/gui/entry.png
index b7be6a3..e14e98c 100644
Binary files a/gui/entry.png and b/gui/entry.png differ
diff --git a/gui/entry_inactive.png b/gui/entry_inactive.png
index c09dc4a..ab011eb 100644
Binary files a/gui/entry_inactive.png and b/gui/entry_inactive.png differ
diff --git a/gui/gui-monosynth.xml b/gui/gui-monosynth.xml
index d0edc3e..4b23c09 100644
--- a/gui/gui-monosynth.xml
+++ b/gui/gui-monosynth.xml
@@ -28,118 +28,130 @@
</vbox>
</frame>
<notebook>
- <vbox page="Audio path" spacing="8">
- <hbox>
- <frame label="Oscillator 1">
- <hbox spacing="8">
+ <vbox page="Audio path" spacing="3">
+ <hbox spacing="3">
+ <vbox spacing="3">
+ <frame label="Oscillator 1">
+ <hbox spacing="3">
+ <vbox>
+ <label/>
+ <label param="o1_wave" text="Waveform"/>
+ <combo param="o1_wave" fill="0"/>
+ <label/>
+ <label/>
+ </vbox>
+ <vbox>
+ <label attach-x="1" attach-y="0" param="o1_pw" text="Pulse Width"/>
+ <knob attach-x="1" attach-y="1" param="o1_pw"/>
+ <value attach-x="1" attach-y="2" param="o1_pw"/>
+ </vbox>
+ <if cond="directlink">
+ <line-graph param="o1_wave" refresh="1" width="70" height="70" expand="0" fill="0"/>
+ </if>
+ <vbox>
+ <label param="o1_stretch" text="Stretch"/>
+ <knob param="o1_stretch"/>
+ <value param="o1_stretch"/>
+ </vbox>
+ <vbox>
+ <label param="o1_window" text="Window"/>
+ <knob param="o1_window"/>
+ <value param="o1_window"/>
+ </vbox>
+ </hbox>
+ </frame>
+ <frame label="Oscillator 2">
+ <hbox spacing="3">
+ <vbox>
+ <label/>
+ <label param="o2_wave" text="Waveform"/>
+ <combo param="o2_wave" fill="0"/>
+ <label/>
+ <label/>
+ </vbox>
+ <vbox>
+ <label attach-x="1" attach-y="0" param="o2_pw" text="Pulse Width"/>
+ <knob attach-x="1" attach-y="1" param="o2_pw"/>
+ <value attach-x="1" attach-y="2" param="o2_pw"/>
+ </vbox>
+ <if cond="directlink">
+ <line-graph param="o2_wave" refresh="1" width="70" height="70" expand="0" fill="0"/>
+ </if>
+ <vbox>
+ <label param="o2_xpose" text="Transpose"/>
+ <knob type="1" param="o2_xpose"/>
+ <value param="o2_xpose"/>
+ </vbox>
+ <label text=" " />
+ </hbox>
+ </frame>
+ </vbox>
+ <frame label="Oscillators - Common">
+ <vbox>
+ <label/>
+ <hbox>
+ <vbox>
+ <label param="o12_detune"/>
+ <knob param="o12_detune"/>
+ <value param="o12_detune"/>
+ </vbox>
+ <vbox>
+ <label param="scale_detune"/>
+ <knob param="scale_detune"/>
+ <value param="scale_detune"/>
+ </vbox>
+ </hbox>
+ <vbox >
+ <label param="o12_mix" expand="0" fill="0"/>
+ <hscale param="o12_mix" position="bottom" expand="1" fill="1"/>
+ </vbox>
<vbox>
- <label param="o1_wave" text="Waveform"/>
- <combo param="o1_wave" fill="0"/>
<label/>
+ <label param="phase_mode" />
+ <combo param="phase_mode" fill="0" expand="0"/>
+ <label/>
+ <label />
</vbox>
+ </vbox>
+ </frame>
+ </hbox>
+ <hbox>
+ <frame label="Filter">
+ <hbox spacing="3">
<vbox>
- <label attach-x="1" attach-y="0" param="o1_pw" text="Pulse Width"/>
- <knob attach-x="1" attach-y="1" param="o1_pw"/>
- <value attach-x="1" attach-y="2" param="o1_pw"/>
+ <label/>
+ <label param="filter" fill="0" expand="0"/>
+ <combo param="filter" fill="0" expand="0"/>
+ <label/>
+ <label/>
</vbox>
+ <label text=""/>
<if cond="directlink">
- <line-graph param="o1_wave" refresh="1" width="80" height="80" expand="0" fill="0"/>
+ <line-graph param="filter" refresh="1" width="70" height="70" expand="0" fill="0"/>
</if>
<vbox>
- <label param="o1_stretch" text="Stretch"/>
- <knob param="o1_stretch"/>
- <value param="o1_stretch"/>
+ <label param="cutoff"/>
+ <knob param="cutoff"/>
+ <value param="cutoff"/>
</vbox>
<vbox>
- <label param="o1_window" text="Window"/>
- <knob param="o1_window"/>
- <value param="o1_window"/>
+ <label param="res"/>
+ <knob param="res"/>
+ <value param="res"/>
</vbox>
- </hbox>
- </frame>
- <frame label="Oscillator 2">
- <hbox spacing="8">
<vbox>
- <label param="o2_wave" text="Waveform"/>
- <combo param="o2_wave" fill="0"/>
- <label/>
+ <label param="filter_sep"/>
+ <knob type="1" param="filter_sep"/>
+ <value param="filter_sep"/>
</vbox>
<vbox>
- <label attach-x="1" attach-y="0" param="o2_pw" text="Pulse Width"/>
- <knob attach-x="1" attach-y="1" param="o2_pw"/>
- <value attach-x="1" attach-y="2" param="o2_pw"/>
- </vbox>
- <if cond="directlink">
- <line-graph param="o2_wave" refresh="1" width="80" height="80" expand="0" fill="0"/>
- </if>
- <vbox>
- <label param="o2_xpose" text="Transpose"/>
- <knob type="1" param="o2_xpose"/>
- <value param="o2_xpose"/>
+ <label param="key_follow"/>
+ <knob param="key_follow"/>
+ <value param="key_follow"/>
</vbox>
</hbox>
</frame>
</hbox>
- <frame label="Oscillators - Common">
- <hbox>
- <vbox>
- <label param="o12_detune"/>
- <knob param="o12_detune"/>
- <value param="o12_detune"/>
- </vbox>
- <vbox>
- <label param="scale_detune"/>
- <knob param="scale_detune"/>
- <value param="scale_detune"/>
- </vbox>
- <vbox >
- <label param="o12_mix" expand="0" fill="0"/>
- <hscale param="o12_mix" position="bottom" expand="1" fill="1"/>
- </vbox>
- <vbox>
- <label param="phase_mode" />
- <combo param="phase_mode" fill="0" expand="0"/>
- <label />
- </vbox>
- </hbox>
- </frame>
- <hbox>
- <frame label="Filter">
- <vbox spacing="8">
- <align>
- <hbox fill="0" expand="0">
- <label param="filter" fill="0" expand="0"/>
- <combo param="filter" fill="0" expand="0"/>
- <if cond="directlink">
- <line-graph param="filter" refresh="1" width="80" height="80"/>
- </if>
- </hbox>
- </align>
- <hbox>
- <vbox>
- <label param="cutoff"/>
- <knob param="cutoff"/>
- <value param="cutoff"/>
- </vbox>
- <vbox>
- <label param="res"/>
- <knob param="res"/>
- <value param="res"/>
- </vbox>
- <vbox>
- <label param="filter_sep"/>
- <knob type="1" param="filter_sep"/>
- <value param="filter_sep"/>
- </vbox>
- <vbox>
- <label param="key_follow"/>
- <knob param="key_follow"/>
- <value param="key_follow"/>
- </vbox>
- </hbox>
- </vbox>
- </frame>
- </hbox>
</vbox>
<vbox page="Modulation" spacing="4">
@@ -161,12 +173,10 @@
</frame>
<frame label="LFO 1">
<vbox spacing="10">
- <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>
+ <label param="lfo1_trig" text="Mode " />
+ <combo param="lfo1_trig" />
+ </hbox>
<hbox>
<vbox>
<label text="Rate"/>
@@ -205,12 +215,10 @@
</frame>
<frame label="LFO 2">
<vbox spacing="10">
- <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>
+ <label param="lfo2_trig" text=" Mode" />
+ <combo param="lfo2_trig" />
+ </hbox>
<hbox>
<vbox>
<label text="Rate"/>
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list