smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 14:54:56 +01:00
Code Issues Projects Releases Wiki Activity

trigger_ui: reorganize some tempo and FA controls

Browse source
This commit is contained in:
Ben Loftis 2022-01-14 12:55:51 -06:00
parent d04743c813
commit cce260b67a
4 changed files with 45 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

43
gtk2_ardour/audio_trigger_properties_box.cc
View file

@ -58,22 +58,23 @@ AudioTriggerPropertiesBox::AudioTriggerPropertiesBox ()
, _stretch_toggle (ArdourButton::led_default_elements)
, _abpm_label (ArdourButton::Text)
{
_header_label.set_text (_("AUDIO Trigger Properties:"));
Gtk::Label* label;
int row = 0;
_header_label.set_alignment (0.0, 0.5);
pack_start (_header_label, false, false, 6);
/* ------- Stretching and Tempo stuff ----------------------------- */
Gtk::Table* bpm_table = manage (new Gtk::Table ());
bpm_table->set_homogeneous (false);
bpm_table->set_spacings (4);
bpm_table->set_border_width (2);
bpm_table->set_border_width (8);
_stretch_toggle.set_text (_("Stretch"));
bpm_table->attach (_stretch_toggle, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK);
bpm_table->attach (_stretch_selector, 1, 2, row, row + 1, Gtk::SHRINK, Gtk::SHRINK); row++;
label = manage (new Gtk::Label (_("BPM:")));
label->set_alignment (1.0, 0.5);
bpm_table->attach (*label, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK);
bpm_table->attach (_abpm_label, 1, 2, row, row + 1, Gtk::SHRINK, Gtk::SHRINK);
bpm_table->attach (*label, 0, 1, row, row + 1, Gtk::FILL, Gtk::SHRINK);
bpm_table->attach (_abpm_label, 1, 2, row, row + 1, Gtk::FILL, Gtk::SHRINK);
ArdourButton *half = manage (new ArdourButton (_("/2")));
half->signal_clicked.connect(sigc::bind (sigc::mem_fun(*this, &AudioTriggerPropertiesBox::MultiplyTempo), 0.5));
@ -84,27 +85,18 @@ AudioTriggerPropertiesBox::AudioTriggerPropertiesBox ()
row++;
pack_start (*bpm_table, false, false);
Gtk::Table* metrum_table = manage (new Gtk::Table ());
metrum_table->set_homogeneous (false);
metrum_table->set_spacings (4);
metrum_table->set_border_width (2);
label = manage (new Gtk::Label (_("Time Sig:")));
label->set_alignment (1.0, 0.5);
bpm_table->attach (*label, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK);
bpm_table->attach (_metrum_button, 1, 2, row, row + 1, Gtk::SHRINK, Gtk::SHRINK);
row++;
bpm_table->attach (*label, 0, 1, row, row + 1, Gtk::FILL, Gtk::SHRINK);
bpm_table->attach (_metrum_button, 1, 2, row, row + 1, Gtk::FILL, Gtk::SHRINK);
pack_start (*metrum_table, false, false);
Gtk::EventBox* eTempoBox = manage (new Gtk::EventBox); // a themeable box
eTempoBox->set_name("EditorDark");
eTempoBox->add (*bpm_table);
/* -------------- Clip start&length (redundant with the trimmer gui handles?) ----------*/
row = 0;
_stretch_toggle.set_text (_("Stretch"));
_table.attach (_stretch_toggle, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK);
_table.attach (_stretch_selector, 1, 2, row, row + 1, Gtk::SHRINK, Gtk::SHRINK);
row++;
label = manage (new Gtk::Label (_("Start:")));
label->set_alignment (1.0, 0.5);
_table.attach (*label, 0, 1, row, row + 1, Gtk::SHRINK, Gtk::SHRINK);
@ -120,7 +112,6 @@ AudioTriggerPropertiesBox::AudioTriggerPropertiesBox ()
_table.set_homogeneous (false);
_table.set_spacings (4);
_table.set_border_width (2);
pack_start (_table, false, false);
Gtk::Table* audio_t = manage (new Gtk::Table ());
audio_t->set_homogeneous (true);
@ -138,7 +129,9 @@ AudioTriggerPropertiesBox::AudioTriggerPropertiesBox ()
row++;
pack_start (*audio_t);
attach (*eTempoBox, 0,1, 0,1, Gtk::FILL, Gtk::SHRINK);
attach (_table, 0,1, 1,2, Gtk::FILL, Gtk::SHRINK);
attach (*audio_t, 0,1, 2,3, Gtk::FILL, Gtk::SHRINK);
using namespace Menu_Helpers;