[SCM] calf/master: Styles for Ardour, button-labels in rack, 0dB labels in MBC, Ardour crash
js at users.alioth.debian.org
js at users.alioth.debian.org
Tue May 7 15:39:53 UTC 2013
The following commit has been merged in the master branch:
commit 2f633ff27909dabc3c541a126f947b3a036c686f
Author: Markus Schmidt <schmidt at boomshop.net>
Date: Tue Dec 8 21:08:24 2009 +0100
Styles for Ardour, button-labels in rack, 0dB labels in MBC, Ardour crash
diff --git a/gui/background_fur_white.png b/gui/background_fur_white.png
index 945ba86..f6a802d 100644
Binary files a/gui/background_fur_white.png and b/gui/background_fur_white.png differ
diff --git a/gui/calf.rc b/gui/calf.rc
index f11e6f2..16bded8 100644
--- a/gui/calf.rc
+++ b/gui/calf.rc
@@ -209,8 +209,8 @@ style "calf-default"
{
function = SHADOW_GAP
recolorable = TRUE
- file = "frame_top.png"
- border = { 12, 12, 2, 12 }
+ file = "frame.png"
+ border = { 12, 12, 12, 12 }
stretch = TRUE
gap_start_file = "frame_top_start.png"
gap_start_border = { 12, 2, 12, 2 }
@@ -222,8 +222,8 @@ style "calf-default"
{
function = SHADOW_GAP
recolorable = TRUE
- file = "frame_left.png"
- border = { 2, 12, 12, 12 }
+ file = "frame.png"
+ border = { 12, 12, 12, 12 }
stretch = TRUE
gap_start_file = "frame_left_start.png"
gap_start_border = { 12, 2, 12, 2 }
@@ -235,8 +235,8 @@ style "calf-default"
{
function = SHADOW_GAP
recolorable = TRUE
- file = "frame_right.png"
- border = { 12, 2, 12, 12 }
+ file = "frame.png"
+ border = { 12, 12, 12, 12 }
stretch = TRUE
gap_start_file = "frame_right_start.png"
gap_start_border = { 2, 12, 12, 2 }
@@ -248,8 +248,8 @@ style "calf-default"
{
function = SHADOW_GAP
recolorable = TRUE
- file = "frame_bottom.png"
- border = { 12, 12, 12, 2 }
+ file = "frame.png"
+ border = { 12, 12, 12, 12 }
stretch = TRUE
gap_start_file = "frame_bottom_start.png"
gap_start_border = { 12, 2, 2, 12 }
@@ -1641,10 +1641,6 @@ style "calf-frame"
xthickness = 8
ythickness = 8
bg[NORMAL] = "#ddd"
- engine "clearlooks"
- {
- radius = 7.0
- }
}
style "calf-frame-title"
@@ -1701,66 +1697,67 @@ style "calf-tooltips" = "calf-wider"
################################################################################
# Theme default style is applied to every widget
-widget "*Calf*" style : theme "calf-default"
+widget "*Calf*" style : highest "calf-default"
# Rack
-widget "*Calf-Rack*" style : theme "calf-rack"
+widget "*Calf-Rack*" style : highest "calf-rack"
# Labels
-widget "*Calf-Label" style : theme "calf-label"
+widget "*Calf-Label" style : highest "calf-label"
# Values
-widget "*Calf-Value" style : theme "calf-label"
+widget "*Calf-Value" style : highest "calf-label"
# Menus
-widget_class "*Calf*<GtkMenuBar>*" style : rc "calf-menubar"
-widget "*Calf-Menu*" style : rc "calf-menu"
-widget_class "*Calf*<GtkMenuShell>*" style : rc "calf-menu"
-widget "*Calf*SeparatorMenuItem*" style : rc "calf-menu-separator"
-widget_class "*Calf*<GtkMenuItem>*" style : rc "calf-menu-item"
+widget_class "*Calf*<GtkMenuBar>*" style : highest "calf-menubar"
+widget "*Calf-Menu*" style : highest "calf-menu"
+widget_class "*Calf*<GtkMenuShell>*" style : highest "calf-menu"
+widget "*Calf*SeparatorMenuItem*" style : highest "calf-menu-separator"
+widget_class "*Calf*<GtkMenuItem>*" style : highest "calf-menu-item"
# Notebook
-widget_class "*<GtkNotebook>" style : highest "calf-notebook"
+widget "*Calf*Notebook" style : highest "calf-notebook"
+widget_class "*Calf*Notebook.<GtkWidget>" style : highest "calf-notebook"
# Frame
-widget "*Calf*Frame" style : rc "calf-frame"
-widget "*Calf*Frame.GtkLabel" style : rc "calf-frame-title"
+widget "*Calf*Frame" style : highest "calf-frame"
+widget "*Calf*Frame.GtkLabel" style : highest "calf-frame-title"
# Scrolled window
widget "*Calf-Container" style : highest "calf-container"
# Treeview
-widget_class "*Calf*.<GtkTreeView>*" style : theme "calf-treeview"
-widget_class "*Calf*.<GtkTreeView>.<GtkButton>*" style : rc "calf-treeview-header"
-widget_class "*Calf*.<GtkCTree>.<GtkButton>*" style : rc "calf-treeview-header"
-widget_class "*Calf*.<GtkList>.<GtkButton>*" style : rc "calf-treeview-header"
-widget_class "*Calf*.<GtkCList>.<GtkButton>*" style : rc "calf-treeview-header"
+widget_class "*Calf*.<GtkTreeView>*" style : highest "calf-treeview"
+widget_class "*Calf*.<GtkTreeView>.<GtkButton>*" style : highest "calf-treeview-header"
+widget_class "*Calf*.<GtkCTree>.<GtkButton>*" style : highest "calf-treeview-header"
+widget_class "*Calf*.<GtkList>.<GtkButton>*" style : highest "calf-treeview-header"
+widget_class "*Calf*.<GtkCList>.<GtkButton>*" style : highest "calf-treeview-header"
# Buttons
-widget "*Calf*Button*" style : theme "calf-button"
-widget "*Calf*Toggle*" style : rc "calf-toggle"
+widget "*Calf*Button*" style : highest "calf-button"
+widget "*Calf*Toggle*" style : highest "calf-toggle"
widget "*Calf-Button" style : highest "calf-button"
widget "*Calf-Toggle" style : highest "calf-toggle"
widget "*Calf*CheckButton" style : highest "calf-toggle"
widget "*Calf*RadioButton" style : highest "calf-toggle"
-widget "*Calf*GtkLinkButton*" style : rc "calf-button"
-widget "*Calf*GtkScaleButton*" style : rc "calf-button"
-widget "*Calf*GtkColorButton*" style : rc "calf-button"
-widget "*Calf*FileChooserButton*" style : rc "calf-button"
-widget "*Calf*GtkFontButton*" style : rc "calf-button"
+widget "*Calf*GtkLinkButton*" style : highest "calf-button"
+widget "*Calf*GtkScaleButton*" style : highest "calf-button"
+widget "*Calf*GtkColorButton*" style : highest "calf-button"
+widget "*Calf*FileChooserButton*" style : highest "calf-button"
+widget "*Calf*GtkFontButton*" style : highest "calf-button"
-widget "*Calf-Combobox*" style : theme "calf-combobox"
-widget "*Calf*Combo*" style : rc "calf-combobox"
-widget_class "*Calf-Combobox*<GtkComboBoxEntry>*" style : theme "calf-comboboxentry"
-widget "*Calf*GtkOptionMenu*" style : theme "calf-combobox"
+widget "*Calf-Combobox*" style : highest "calf-combobox"
+widget "*Calf*Combo*" style : highest "calf-combobox"
+widget_class "*Calf-Combobox*<GtkComboBoxEntry>*" style : highest "calf-comboboxentry"
+widget "*Calf*GtkOptionMenu*" style : highest "calf-combobox"
# Entries
-widget "*Calf*Entry*" style : rc "calf-entry"
+widget "*Calf*Entry*" style : highest "calf-entry"
widget "*Calf*SpinButton*" style : highest "calf-spinbutton"
# Miscellaneous
-widget_class "*Calf*<GtkStatusbar>" style "calf-statusbar"
-widget_class "*Calf*<GtkProgressBar>" style "calf-progressbar"
+widget_class "*Calf*<GtkStatusbar>" style : highest "calf-statusbar"
+widget_class "*Calf*<GtkProgressBar>" style : highest "calf-progressbar"
# Scrollbars/Scales
widget "*Calf*Range" style : highest "calf-scale-small"
diff --git a/gui/frame_bottom.png b/gui/frame_bottom.png
deleted file mode 100644
index 2fc2900..0000000
Binary files a/gui/frame_bottom.png and /dev/null differ
diff --git a/gui/frame_left.png b/gui/frame_left.png
deleted file mode 100644
index 35e2d9f..0000000
Binary files a/gui/frame_left.png and /dev/null differ
diff --git a/gui/frame_right.png b/gui/frame_right.png
deleted file mode 100644
index faa7076..0000000
Binary files a/gui/frame_right.png and /dev/null differ
diff --git a/gui/frame_top.png b/gui/frame_top.png
deleted file mode 100644
index 0e3a893..0000000
Binary files a/gui/frame_top.png and /dev/null differ
diff --git a/gui/gui-monosynth.xml b/gui/gui-monosynth.xml
index 2aaa211..481073a 100644
--- a/gui/gui-monosynth.xml
+++ b/gui/gui-monosynth.xml
@@ -176,27 +176,27 @@
<table cols="5" rows="1" homogeneous="1" fill-x="0" expand-x="0">
<vbox attach-x="0" attach-y="0">
<label param="adsr_a"/>
- <vscale param="adsr_a" inverted="1" size="1"/>
+ <vscale param="adsr_a" inverted="1" size="2"/>
<value param="adsr_a" width="4"/>
</vbox>
<vbox attach-x="1" attach-y="0">
<label param="adsr_d"/>
- <vscale param="adsr_d" inverted="1" size="1"/>
+ <vscale param="adsr_d" inverted="1" size="2"/>
<value param="adsr_d" width="4"/>
</vbox>
<vbox attach-x="2" attach-y="0">
<label param="adsr_s"/>
- <vscale param="adsr_s" inverted="1" size="1"/>
+ <vscale param="adsr_s" inverted="1" size="2"/>
<value param="adsr_s"/>
</vbox>
<vbox attach-x="3" attach-y="0">
<label param="adsr_f"/>
- <vscale param="adsr_f" inverted="1" size="1"/>
+ <vscale param="adsr_f" inverted="1" size="2"/>
<value param="adsr_f" width="4"/>
</vbox>
<vbox attach-x="4" attach-y="0">
<label param="adsr_r"/>
- <vscale param="adsr_r" inverted="1" size="1"/>
+ <vscale param="adsr_r" inverted="1" size="2"/>
<value param="adsr_r" width="4"/>
</vbox>
</table>
diff --git a/gui/gui-multibandcompressor.xml b/gui/gui-multibandcompressor.xml
index e515c50..ec0f1c3 100644
--- a/gui/gui-multibandcompressor.xml
+++ b/gui/gui-multibandcompressor.xml
@@ -12,10 +12,10 @@
<label param="meter_inR" />
</vbox>
<vbox shrink-x="1" expand-x="0" fill-x="0" expand="0" fill="0" attach-x="2" attach-y="0" pad-y="24">
- <label param="clip_inL" expand="0" fill="0" />
+ <label text="0dB" expand="0" fill="0" />
<led param="clip_inL" expand="0" fill="0" />
<led param="clip_inR" expand="0" fill="0" />
- <label param="clip_inR" expand="0" fill="0" />
+ <label text="0dB" expand="0" fill="0" />
</vbox>z
<table rows="3" cols="2" attach-x="4" attach-y="0" spacing="0" border="0" expand-y="0" fill-y="0" expand-x="0" fill-x="0">
<knob param="freq0" attach-x="0" attach-y="0" border="0" expand="0" fill="0" expand-x="0" fill-x="0" />
@@ -75,10 +75,10 @@
<label param="meter_outR" />
</vbox>
<vbox shrink-x="1" expand-x="0" fill-x="0" expand="0" fill="0" attach-x="8" attach-y="0" pad-y="24">
- <label param="clip_outL" expand="0" fill="0" />
+ <label text="0dB" expand="0" fill="0" />
<led param="clip_outL" expand="0" mode="1" fill="0" />
<led param="clip_outR" expand="0" mode="1" fill="0" />
- <label param="clip_outR" expand="0" fill="0" />
+ <label text="0dB" expand="0" fill="0" />
</vbox>
<vbox shrink-x="1" expand-x="0" fill-x="0" expand="0" fill="0" attach-x="9" attach-y="0">
<label param="level_out" />
diff --git a/src/main_win.cpp b/src/main_win.cpp
index 6541612..5fb97e5 100644
--- a/src/main_win.cpp
+++ b/src/main_win.cpp
@@ -140,12 +140,7 @@ void main_window::set_window(plugin_ctl_iface *plugin, plugin_gui_window *gui_wi
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(strip->button), gui_win != NULL);
GtkToggleButton *tb = GTK_TOGGLE_BUTTON(strip->button);
- if (strip->gui_win) {
- gtk_button_set_label(GTK_BUTTON(tb), "Hide");
- } else {
- gtk_button_set_label(GTK_BUTTON(tb), "Show");
- }
-
+ gtk_button_set_label(GTK_BUTTON(tb), "Edit");
}
void main_window::refresh_all_presets(bool builtin_too)
@@ -169,10 +164,8 @@ gui_button_pressed(GtkWidget *button, main_window::plugin_strip *strip)
if (strip->gui_win) {
strip->gui_win->close();
strip->gui_win = NULL;
- gtk_button_set_label(GTK_BUTTON(tb), "Show");
} else {
strip->main_win->open_gui(strip->plugin);
- gtk_button_set_label(GTK_BUTTON(tb), "Hide");
}
return TRUE;
}
@@ -244,7 +237,7 @@ main_window::plugin_strip *main_window::create_strip(plugin_ctl_iface *plugin)
gtk_widget_show(title);
// open button
- GtkWidget *label = gtk_toggle_button_new_with_label("Show");
+ GtkWidget *label = gtk_toggle_button_new_with_label("Edit");
strip->button = label;
gtk_widget_set_size_request(GTK_WIDGET(label), 110, -1);
gtk_signal_connect(GTK_OBJECT(label), "toggled", G_CALLBACK(gui_button_pressed),
--
calf audio plugins packaging
More information about the pkg-multimedia-commits
mailing list