summaryrefslogtreecommitdiff
path: root/gtk2_ardour/generic_pluginui.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2008-10-30 23:45:20 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2008-10-30 23:45:20 +0000
commit040d7fec2c23216be7533b727cde4407fb2f8036 (patch)
tree1e96338f73e9e526b928b30f6dfdda4bdb95bde6 /gtk2_ardour/generic_pluginui.cc
parent2fab8c2737c3d384cba668a81e7d439730da8232 (diff)
remove cruft from ArdourUI; improve keyboard icon(s); shrink other plugin GUI buttons; close all dialogs when quitting so that we actually quit
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@4036 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/generic_pluginui.cc')
-rw-r--r--gtk2_ardour/generic_pluginui.cc29
1 files changed, 11 insertions, 18 deletions
diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
index 7944fd0d28..4a4ea9cf1c 100644
--- a/gtk2_ardour/generic_pluginui.cc
+++ b/gtk2_ardour/generic_pluginui.cc
@@ -73,8 +73,6 @@ GenericPluginUI::GenericPluginUI (boost::shared_ptr<PluginInsert> pi, bool scrol
set_border_width (10);
set_homogeneous (false);
- settings_box.set_homogeneous (false);
-
HBox* constraint_hbox = manage (new HBox);
HBox* smaller_hbox = manage (new HBox);
Label* combo_label = manage (new Label (_("<span size=\"large\">Presets</span>")));
@@ -83,15 +81,21 @@ GenericPluginUI::GenericPluginUI (boost::shared_ptr<PluginInsert> pi, bool scrol
smaller_hbox->pack_start (*combo_label, false, false, 10);
smaller_hbox->pack_start (preset_combo, false, false);
smaller_hbox->pack_start (save_button, false, false);
+ smaller_hbox->pack_start (bypass_button, false, true);
constraint_hbox->set_spacing (5);
- constraint_hbox->pack_start (*smaller_hbox, true, false);
- constraint_hbox->pack_end (focus_button, false, false);
- constraint_hbox->pack_end (bypass_button, false, false);
+ constraint_hbox->set_homogeneous (false);
+
+ VBox* v1_box = manage (new VBox);
+ VBox* v2_box = manage (new VBox);
+
+ v1_box->pack_start (*smaller_hbox, false, true);
+ v2_box->pack_start (focus_button, false, true);
- settings_box.pack_end (*constraint_hbox, false, false);
+ constraint_hbox->pack_end (*v2_box, false, false);
+ constraint_hbox->pack_end (*v1_box, false, false);
- pack_start (settings_box, false, false);
+ pack_start (*constraint_hbox, false, false);
if ( is_scrollable ) {
scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
@@ -107,9 +111,6 @@ GenericPluginUI::GenericPluginUI (boost::shared_ptr<PluginInsert> pi, bool scrol
pack_start (hpacker, false, false);
}
- insert->active_changed.connect (mem_fun(*this, &GenericPluginUI::redirect_active_changed));
- bypass_button.set_active (!insert->active());
-
build ();
}
@@ -705,14 +706,6 @@ GenericPluginUI::control_combo_changed (ControlUI* cui)
}
-void
-GenericPluginUI::redirect_active_changed (Redirect* r, void* src)
-{
- ENSURE_GUI_THREAD(bind (mem_fun(*this, &GenericPluginUI::redirect_active_changed), r, src));
-
- bypass_button.set_active (!r->active());
-}
-
bool
GenericPluginUI::start_updating (GdkEventAny* ignored)
{