*/
#include <gtkmm/stock.h>
+#include <gtkmm/colorselection.h>
#include "pbd/convert.h"
#include "mixer_ui.h"
#include "tooltips.h"
#include "ui_config.h"
+#include "utils.h"
#include "vca_master_strip.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace ARDOUR;
using namespace ARDOUR_UI_UTILS;
VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr<VCA> v)
: SessionHandlePtr (s)
, _vca (v)
- , gain_meter (s, 254)
+ , gain_meter (s, 254) /* magic number, don't adjust blindly */
, context_menu (0)
, delete_dialog (0)
, control_slave_ui (s)
{
+ /* set color for the VCA, if not already done. */
+
+ if (!_vca->presentation_info().color_set()) {
+ _vca->presentation_info().set_color (gdk_color_to_rgba (unique_random_color()));
+ }
+
control_slave_ui.set_stripable (boost::dynamic_pointer_cast<Stripable> (v));
gain_meter.set_controls (boost::shared_ptr<Route>(),
number_label.set_alignment (.5, .5);
number_label.set_fallthrough_to_parent (true);
- bottom_padding.set_size_request (-1, 32); /* this one is a hack. there's no trivial way to compute it */
+ bottom_padding.set_size_request (-1, 55); /* this one is a hack. there's no trivial way to compute it */
//Glib::RefPtr<Pango::Layout> layout = vertical_button.get_layout ();
// layout->set_justify (JUSTIFY_CENTER);
vertical_button.set_layout_font (UIConfiguration::instance().get_NormalBoldFont());
vertical_button.signal_button_release_event().connect (sigc::mem_fun (*this, &VCAMasterStrip::vertical_button_press));
vertical_button.set_fallthrough_to_parent (true);
+ vertical_button.set_active_color (_vca->presentation_info().color ());
set_tooltip (vertical_button, _("Click to show slaves only")); /* tooltip updated dynamically */
- drop_button.set_text(_("drop"));
- drop_button.signal_clicked.connect (sigc::mem_fun (*this, &VCAMasterStrip::drop_button_press));
- set_tooltip (drop_button, _("Unassign all slaves from this control master"));
-
global_vpacker.set_border_width (1);
global_vpacker.set_spacing (0);
global_vpacker.pack_start (solo_mute_box, false, false);
global_vpacker.pack_start (gain_meter, false, false, 2);
global_vpacker.pack_start (control_slave_ui, false, false);
- global_vpacker.pack_start (drop_button, false, false);
global_vpacker.pack_start (bottom_padding, false, false);
global_frame.add (global_vpacker);
gain_meter.show ();
solo_mute_box.show_all ();
control_slave_ui.show ();
- drop_button.show ();
/* force setting of visible selected status */
Mixer_UI::instance()->show_vca_change.connect (sigc::mem_fun (*this, &VCAMasterStrip::spill_change));
_vca->PropertyChanged.connect (vca_connections, invalidator (*this), boost::bind (&VCAMasterStrip::vca_property_changed, this, _1), gui_context());
+ _vca->presentation_info().PropertyChanged.connect (vca_connections, invalidator (*this), boost::bind (&VCAMasterStrip::vca_property_changed, this, _1), gui_context());
_vca->DropReferences.connect (vca_connections, invalidator (*this), boost::bind (&VCAMasterStrip::self_delete, this), gui_context());
_vca->solo_control()->Changed.connect (vca_connections, invalidator (*this), boost::bind (&VCAMasterStrip::solo_changed, this), gui_context());
void
VCAMasterStrip::hide_clicked ()
{
- if (!delete_dialog) {
- delete_dialog = new MessageDialog (_("Removing a Master will deassign all slaves. Remove it anyway?"),
- true, MESSAGE_WARNING, BUTTONS_YES_NO, true);
- delete_dialog->signal_response().connect (sigc::mem_fun (*this, &VCAMasterStrip::hide_confirmation));
- }
-
- delete_dialog->set_position (Gtk::WIN_POS_MOUSE);
- delete_dialog->present ();
+ _vca->presentation_info().set_hidden (true);
}
void
if (what_changed.contains (ARDOUR::Properties::name)) {
update_vca_name ();
}
+
+ if (what_changed.contains (ARDOUR::Properties::color)) {
+ vertical_button.set_active_color (_vca->presentation_info().color ());
+ }
+
+ if (what_changed.contains (ARDOUR::Properties::hidden)) {
+
+ }
}
void
context_menu = new Menu;
MenuList& items = context_menu->items();
items.push_back (MenuElem (_("Rename"), sigc::mem_fun (*this, &VCAMasterStrip::start_name_edit)));
+ items.push_back (MenuElem (_("Color..."), sigc::mem_fun (*this, &VCAMasterStrip::start_color_edit)));
items.push_back (SeparatorElem());
items.push_back (MenuElem (_("Drop All Slaves"), sigc::mem_fun (*this, &VCAMasterStrip::drop_all_slaves)));
items.push_back (SeparatorElem());
}
}
-void
-VCAMasterStrip::drop_button_press ()
-{
- drop_all_slaves ();
-}
-
Gdk::Color
VCAMasterStrip::color () const
{
- return gdk_color_from_rgb (_vca->presentation_info().color ());
+ return gdk_color_from_rgba (_vca->presentation_info().color ());
}
string
{
return string_compose (X_("vms-%1"), _vca->number());
}
+
+void
+VCAMasterStrip::start_color_edit ()
+{
+ Gtk::ColorSelectionDialog* color_dialog = new Gtk::ColorSelectionDialog;
+
+ color_dialog->get_colorsel()->set_has_opacity_control (false);
+ color_dialog->get_colorsel()->set_has_palette (true);
+
+ Gdk::Color c = gdk_color_from_rgba (_vca->presentation_info().color ());
+
+ color_dialog->get_colorsel()->set_previous_color (c);
+ color_dialog->get_colorsel()->set_current_color (c);
+
+ color_dialog->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &VCAMasterStrip::finish_color_edit), color_dialog));
+ color_dialog->present ();
+}
+
+void
+VCAMasterStrip::finish_color_edit (int response, Gtk::ColorSelectionDialog* dialog)
+{
+ switch (response) {
+ case RESPONSE_OK:
+ _vca->presentation_info().set_color (gdk_color_to_rgba (dialog->get_colorsel()->get_current_color()));
+ break;
+ }
+
+ delete_when_idle (dialog);
+}
+
+bool
+VCAMasterStrip::marked_for_display () const
+{
+ return !_vca->presentation_info().hidden();
+}
+
+bool
+VCAMasterStrip::set_marked_for_display (bool yn)
+{
+ if (yn == _vca->presentation_info().hidden()) {
+ _vca->presentation_info().set_hidden (!yn);
+ return true; // things changed
+ }
+ return false;
+}
+
+PresentationInfo const &
+VCAMasterStrip::presentation_info () const
+{
+ return _vca->presentation_info();
+}
+
+boost::shared_ptr<Stripable>
+VCAMasterStrip::stripable () const
+{
+ return _vca;
+}
projects / ardour.git / blobdiff