From b15ed28f79905ed976f39b080d47ce8d3000d335 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 6 May 2016 14:55:36 +0200 Subject: [PATCH] separate Preset + Favorite DnD Targets Sidebar is a source of "Favorites" and a destination for Presets. --- gtk2_ardour/mixer_ui.cc | 7 ++++++- gtk2_ardour/processor_box.cc | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index f27041b386..b037055b63 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -196,6 +196,10 @@ Mixer_UI::Mixer_UI () group_display_frame.set_shadow_type (Gtk::SHADOW_IN); group_display_frame.add (group_display_vbox); + + list target_list; + target_list.push_back (TargetEntry ("PluginPresetPtr")); + favorite_plugins_model = PluginTreeStore::create (favorite_plugins_columns); favorite_plugins_display.set_model (favorite_plugins_model); favorite_plugins_display.append_column (_("Favorite Plugins"), favorite_plugins_columns.name); @@ -205,8 +209,9 @@ Mixer_UI::Mixer_UI () favorite_plugins_display.set_headers_visible (true); favorite_plugins_display.set_rules_hint (true); favorite_plugins_display.set_can_focus (false); - favorite_plugins_display.add_object_drag (favorite_plugins_columns.plugin.index(), "PluginPresetPtr"); + favorite_plugins_display.add_object_drag (favorite_plugins_columns.plugin.index(), "PluginFavoritePtr"); favorite_plugins_display.set_drag_column (favorite_plugins_columns.name.index()); + favorite_plugins_display.add_drop_targets (target_list); favorite_plugins_display.signal_row_activated().connect (sigc::mem_fun (*this, &Mixer_UI::plugin_row_activated)); favorite_plugins_display.signal_button_press_event().connect (sigc::mem_fun (*this, &Mixer_UI::plugin_row_button_press), false); favorite_plugins_display.signal_drop.connect (sigc::mem_fun (*this, &Mixer_UI::plugin_drop)); diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index 51b8f3f885..472897daed 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -1698,7 +1698,7 @@ static std::list drop_targets() std::list tmp; tmp.push_back (Gtk::TargetEntry ("processor")); // from processor-box to processor-box tmp.push_back (Gtk::TargetEntry ("PluginInfoPtr")); // from plugin-manager - tmp.push_back (Gtk::TargetEntry ("PluginPresetPtr")); // from sidebar + tmp.push_back (Gtk::TargetEntry ("PluginFavoritePtr")); // from sidebar return tmp; } @@ -1910,7 +1910,7 @@ ProcessorBox::plugin_drop (Gtk::SelectionData const &data, ProcessorEntry* posit if (data.get_target() == "PluginInfoPtr") { _drop_plugin (data, pl); } - else if (data.get_target() == "PluginPresetPtr") { + else if (data.get_target() == "PluginFavoritePtr") { _drop_plugin_preset (data, pl); } else {