ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

triggerui: start adding more elements to launch settings dialog

This commit is contained in:
Paul Davis 2021-09-29 11:20:44 -06:00
parent 0e779fbec9
commit 55e7d70fca
2 changed files with 61 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
gtk2_ardour/trigger_ui.cc
View File

@ -50,9 +50,12 @@ using namespace ArdourCanvas;
using namespace ArdourWidgets;
using namespace Gtkmm2ext;
using namespace PBD;
using namespace Temporal;
static std::vector<std::string> follow_strings;
static std::string longest_follow;
static std::vector<std::string> quantize_strings;
static std::string longest_quantize;
TriggerUI::TriggerUI (Item* parent, Trigger& t)
: Table (parent)
@ -74,6 +77,21 @@ TriggerUI::TriggerUI (Item* parent, Trigger& t)
longest_follow = *i;
}
}
quantize_strings.push_back (_("Global"));
quantize_strings.push_back (quantize_length_to_string (Beats (1, 0)));
quantize_strings.push_back (quantize_length_to_string (Beats (2, 0)));
quantize_strings.push_back (quantize_length_to_string (Beats (4, 0)));
quantize_strings.push_back (quantize_length_to_string (Beats (0, Temporal::ticks_per_beat/2)));
quantize_strings.push_back (quantize_length_to_string (Beats (0, Temporal::ticks_per_beat/4)));
quantize_strings.push_back (quantize_length_to_string (Beats (0, Temporal::ticks_per_beat/8)));
quantize_strings.push_back (quantize_length_to_string (Beats (0, Temporal::ticks_per_beat/16)));
for (std::vector<std::string>::const_iterator i = quantize_strings.begin(); i != quantize_strings.end(); ++i) {
if (i->length() > longest_quantize.length()) {
longest_quantize = *i;
}
}
}
name = "TriggerUI-CP";
@ -105,6 +123,17 @@ TriggerUI::TriggerUI (Item* parent, Trigger& t)
follow_right = new Widget (canvas(), *_follow_right);
follow_right->name = "FollowRight";
_legato_button = new ArdourButton();
_legato_button->set_text (_("Legato"));
legato_button = new ArdourCanvas::Widget (canvas(), *_legato_button);
_quantize_button = new ArdourDropdown;
for (std::vector<std::string>::const_iterator s = quantize_strings.begin(); s != quantize_strings.end(); ++s) {
_quantize_button->append_text_item (*s);
}
quantize_button = new Widget (canvas(), *_quantize_button);
quantize_button->name = "quantize";
const double scale = UIConfiguration::instance().get_ui_scale();
const Distance spacing = 12. * scale;
@ -112,6 +141,9 @@ TriggerUI::TriggerUI (Item* parent, Trigger& t)
attach (follow_left, 0, 1, 1, 2, PackExpand, PackExpand, { 10 });
attach (follow_right, 1, 1, 2, 2, PackExpand, PackExpand, { 10 });
attach (quantize_button, 0, 2, 1, 3, PackExpand, PackExpand, { 10 });
attach (legato_button, 1, 2, 2, 3, PackExpand, PackExpand, { 10 });
set_fill_color (UIConfiguration::instance().color (X_("theme:bg")));
name = "triggerUI-table";
@ -144,6 +176,28 @@ TriggerUI::follow_action_button_event (GdkEvent* ev)
return false;
}
std::string
TriggerUI::quantize_length_to_string (Beats const & ql)
{
if (ql == Beats (1, 0)) {
return _("1/4");
} else if (ql == Beats (2, 0)) {
return _("1/2");
} else if (ql == Beats (4, 0)) {
return _("Whole");
} else if (ql == Beats (0,Temporal::ticks_per_beat/2)) {
return _("1/8");
} else if (ql == Beats (0,Temporal::ticks_per_beat/4)) {
return _("1/16");
} else if (ql == Beats (0,Temporal::ticks_per_beat/8)) {
return _("1/32");
} else if (ql == Beats (0,Temporal::ticks_per_beat/16)) {
return _("1/64");
} else {
return "???";
}
}
std::string
TriggerUI::follow_action_to_string (Trigger::FollowAction fa)
{

12
gtk2_ardour/trigger_ui.h
View File

@ -64,14 +64,14 @@ class TriggerUI : public ArdourCanvas::Table, public sigc::trackable
ArdourCanvas::Rectangle* follow_count;
ArdourCanvas::Text* follow_count_text;
ArdourCanvas::Rectangle* legato;
ArdourCanvas::Rectangle* legato_text;
ArdourWidgets::ArdourButton* _legato_button;
ArdourCanvas::Widget* legato_button;
ArdourCanvas::Rectangle* quantize;
ArdourCanvas::Rectangle* quantize_text;
ArdourWidgets::ArdourDropdown* _quantize_button;
ArdourCanvas::Widget* quantize_button;
ArdourCanvas::Rectangle* velocity;
ArdourCanvas::Rectangle* velocity_text;
ArdourCanvas::Text* velocity_text;
void trigger_changed (PBD::PropertyChange);
@ -81,6 +81,8 @@ class TriggerUI : public ArdourCanvas::Table, public sigc::trackable
static std::string follow_action_to_string (ARDOUR::Trigger::FollowAction);
static ARDOUR::Trigger::FollowAction string_to_follow_action (std::string const &);
static std::string quantize_length_to_string (Temporal::Beats const &);
};
class TriggerWidget : public ArdourCanvas::GtkCanvas