diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-12-29 03:44:19 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-12-29 03:44:19 +1100 |
| commit | 3c3cdd1cbe95835d0de7f80d76f7aee1359f5874 (patch) | |
| tree | 86bc8aca3d74e43a1ce0b0530aa55e5c5bc1e05a /gtk2_ardour/tempo_dialog.cc | |
| parent | 7805217b5fe77746e79f856efb82956d209b678d (diff) | |
tempo dialog shows note type on first row where applicable.
Diffstat (limited to 'gtk2_ardour/tempo_dialog.cc')
| -rw-r--r-- | gtk2_ardour/tempo_dialog.cc | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc index 6d073e12c7..9ec86e9071 100644 --- a/gtk2_ardour/tempo_dialog.cc +++ b/gtk2_ardour/tempo_dialog.cc @@ -42,7 +42,7 @@ TempoDialog::TempoDialog (TempoMap& map, framepos_t frame, const string&) , bpm_spinner (bpm_adjustment) , when_bar_label (_("bar:"), ALIGN_LEFT, ALIGN_CENTER) , when_beat_label (_("beat:"), ALIGN_LEFT, ALIGN_CENTER) - , pulse_selector_label (_("Pulse note"), ALIGN_LEFT, ALIGN_CENTER) + , pulse_selector_label (_("Pulse:"), ALIGN_LEFT, ALIGN_CENTER) , tap_tempo_button (_("Tap tempo")) { Tempo tempo (map.tempo_at_frame (frame)); @@ -59,7 +59,7 @@ TempoDialog::TempoDialog (TempoMap& map, TempoSection& section, const string&) , bpm_spinner (bpm_adjustment) , when_bar_label (_("bar:"), ALIGN_LEFT, ALIGN_CENTER) , when_beat_label (_("beat:"), ALIGN_LEFT, ALIGN_CENTER) - , pulse_selector_label (_("Pulse note"), ALIGN_LEFT, ALIGN_CENTER) + , pulse_selector_label (_("Pulse:"), ALIGN_LEFT, ALIGN_CENTER) , tap_tempo_button (_("Tap tempo")) { Timecode::BBT_Time when (map.bbt_at_frame (section.frame())); @@ -158,18 +158,21 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type, table->set_homogeneous (false); int row; - Label* bpm_label = manage (new Label(_("Beats per minute:"), ALIGN_LEFT, ALIGN_CENTER)); - table->attach (*bpm_label, 0, 1, 0, 1); - table->attach (bpm_spinner, 1, 5, 0, 1); if (UIConfiguration::instance().get_allow_non_quarter_pulse()) { - table->attach (pulse_selector_label, 0, 1, 1, 2); - table->attach (pulse_selector, 1, 5, 1, 2); - row = 2; - } else { + table->attach (pulse_selector_label, 0, 1, 0, 1); + table->attach (pulse_selector, 1, 5, 0, 1); + row = 1; + } else { + row = 0; } + Label* bpm_label = manage (new Label(_("Beats per Minute:"), ALIGN_LEFT, ALIGN_CENTER)); + table->attach (*bpm_label, 0, 1, row, row + 1); + table->attach (bpm_spinner, 1, 5, row, row + 1); + ++row; + char buf[64]; snprintf (buf, sizeof (buf), "%" PRIu32, when.bars); |