X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftempo_dialog.cc;h=f74314d4bcead8dcc2ff5498f67c82e40879a8e5;hb=cc15fb071f3c327f17bbe1b0613974d5060b7f90;hp=9d5ba926c559c16569251eeb4ea5e631617313d7;hpb=2315c433e276110d8c1ac7cc5c8935c31b6f5879;p=ardour.git diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc index 9d5ba926c5..f74314d4bc 100644 --- a/gtk2_ardour/tempo_dialog.cc +++ b/gtk2_ardour/tempo_dialog.cc @@ -36,12 +36,11 @@ TempoDialog::TempoDialog (TempoMap& map, nframes_t frame, const string & action) : ArdourDialog (_("edit tempo")), bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0, 1.0), bpm_spinner (bpm_adjustment), - bpm_frame (_("Beats per minute")), - note_frame (_("BPM denominator")), + bpm_frame (_("Tempo")), ok_button (action), cancel_button (_("Cancel")), - when_bar_label (_("Bar")), - when_beat_label (_("Beat")), + when_bar_label (_("Bar"), ALIGN_LEFT, ALIGN_CENTER), + when_beat_label (_("Beat"), ALIGN_LEFT, ALIGN_CENTER), when_table (2, 2), when_frame (_("Location")) { @@ -56,11 +55,11 @@ TempoDialog::TempoDialog (TempoSection& section, const string & action) : ArdourDialog ("tempo dialog"), bpm_adjustment (60.0, 1.0, 999.9, 0.1, 1.0, 1.0), bpm_spinner (bpm_adjustment), - bpm_frame (_("Beats per minute")), + bpm_frame (_("Tempo")), ok_button (action), cancel_button (_("Cancel")), - when_bar_label (_("Bar")), - when_beat_label (_("Beat")), + when_bar_label (_("Bar"), ALIGN_LEFT, ALIGN_CENTER), + when_beat_label (_("Beat"), ALIGN_LEFT, ALIGN_CENTER), when_table (2, 2), when_frame (_("Location")) { @@ -83,13 +82,7 @@ TempoDialog::init (const BBT_Time& when, double bpm, double note_type, bool mova strings.push_back (_("sixteenth (16)")); strings.push_back (_("thirty-second (32)")); - /* the string here needs to be the longest one to display */ - const guint32 FUDGE = 20; // Combo's are stupid - they steal space from the entry for the button - // TRANSLATORS: this is not a mis-spelling of "thirty", we're including a vertical - // descender to make sure the height gets computed properly. - Gtkmm2ext::set_size_request_to_display_given_text (note_types, "thirtq-second (32)", 7+FUDGE, 15); - - set_popdown_strings (note_types, strings); + set_popdown_strings (note_types, strings, true); if (note_type==1.0f) note_types.set_active_text (_("whole (1)")); @@ -108,18 +101,18 @@ TempoDialog::init (const BBT_Time& when, double bpm, double note_type, bool mova else note_types.set_active_text (_("quarter (4)")); - hspacer1.set_border_width (5); - hspacer1.pack_start (bpm_spinner, false, false); - vspacer1.set_border_width (5); - vspacer1.pack_start (hspacer1, false, false); + Label* bpm_label = manage(new Label(_("Beats Per Minute:"), ALIGN_LEFT, ALIGN_CENTER)); + + hspacer1.set_border_width (6); + hspacer1.pack_end (bpm_spinner, PACK_EXPAND_PADDING); + hspacer1.pack_start (*bpm_label, PACK_EXPAND_PADDING); + vspacer1.set_border_width (6); + vspacer1.pack_start (hspacer1, PACK_EXPAND_PADDING); - hspacer2.set_border_width (5); - hspacer2.pack_start (note_types, false, false); - vspacer2.set_border_width (5); - vspacer2.pack_start (hspacer2, false, false); + hspacer2.set_border_width (6); + hspacer2.pack_start (note_types, PACK_EXPAND_PADDING); bpm_frame.add (vspacer1); - note_frame.add (vspacer2); if (movable) { snprintf (buf, sizeof (buf), "%" PRIu32, when.bars); @@ -139,41 +132,50 @@ TempoDialog::init (const BBT_Time& when, double bpm, double note_type, bool mova when_table.set_homogeneous (true); when_table.set_row_spacings (2); when_table.set_col_spacings (2); - when_table.set_border_width (5); + when_table.set_border_width (0); - when_table.attach (when_bar_label, 0, 1, 0, 1, Gtk::AttachOptions(0), Gtk::FILL|Gtk::EXPAND); - when_table.attach (when_bar_entry, 0, 1, 1, 2, Gtk::AttachOptions(0), Gtk::FILL|Gtk::EXPAND); + when_table.attach (when_bar_label, 0, 1, 0, 1, AttachOptions(0), FILL|EXPAND); + when_table.attach (when_bar_entry, 1, 2, 0, 1, AttachOptions(0), FILL|EXPAND); - when_table.attach (when_beat_label, 1, 2, 0, 1, Gtk::AttachOptions(0), Gtk::AttachOptions(0)); - when_table.attach (when_beat_entry, 1, 2, 1, 2, Gtk::AttachOptions(0), Gtk::AttachOptions(0)); + when_table.attach (when_beat_label, 0, 1, 1, 2, AttachOptions(0), AttachOptions(0)); + when_table.attach (when_beat_entry, 1, 2, 1, 2, AttachOptions(0), AttachOptions(0)); + HBox* when_hbox = manage (new HBox()); + Label* when_label = manage(new Label(_("Tempo Begins at:"), ALIGN_LEFT, ALIGN_TOP)); + when_hbox->pack_end(when_table, PACK_EXPAND_PADDING, 6); + when_hbox->pack_start(*when_label, PACK_EXPAND_PADDING, 6); + when_frame.set_name ("MetricDialogFrame"); - when_frame.add (when_table); + when_frame.add (*when_hbox); + + get_vbox()->pack_end (when_frame, false, false); + when_frame.show_all(); - get_vbox()->pack_start (when_frame, false, false); } bpm_frame.set_name ("MetricDialogFrame"); bpm_spinner.set_name ("MetricEntry"); - note_frame.set_name ("MetricDialogFrame"); get_vbox()->set_border_width (12); - get_vbox()->pack_start (bpm_frame, false, false); - get_vbox()->pack_start (note_frame, false, false); + get_vbox()->pack_end (bpm_frame, false, false); add_button (Stock::CANCEL, RESPONSE_CANCEL); add_button (Stock::APPLY, RESPONSE_ACCEPT); - set_response_sensitive (Gtk::RESPONSE_ACCEPT, false); + set_response_sensitive (RESPONSE_ACCEPT, false); set_default_response (RESPONSE_ACCEPT); - get_vbox()->show_all(); - bpm_spinner.show(); + bpm_frame.show_all (); + bpm_spinner.show (); set_name ("MetricDialog"); bpm_spinner.signal_activate().connect (bind (mem_fun (*this, &TempoDialog::response), RESPONSE_ACCEPT)); bpm_spinner.signal_button_press_event().connect (mem_fun (*this, &TempoDialog::bpm_button_press), false); bpm_spinner.signal_button_release_event().connect (mem_fun (*this, &TempoDialog::bpm_button_release), false); + when_bar_entry.signal_activate().connect (bind (mem_fun (*this, &TempoDialog::response), RESPONSE_ACCEPT)); + when_bar_entry.signal_key_release_event().connect (mem_fun (*this, &TempoDialog::entry_key_release), false); + when_beat_entry.signal_activate().connect (bind (mem_fun (*this, &TempoDialog::response), RESPONSE_ACCEPT)); + when_beat_entry.signal_key_release_event().connect (mem_fun (*this, &TempoDialog::entry_key_release), false); note_types.signal_changed().connect (mem_fun (*this, &TempoDialog::note_types_change)); } @@ -188,7 +190,18 @@ TempoDialog::bpm_button_release (GdkEventButton* ev) { /* the value has been modified, accept should work now */ - set_response_sensitive (Gtk::RESPONSE_ACCEPT, true); + set_response_sensitive (RESPONSE_ACCEPT, true); + return false; +} + +bool +TempoDialog::entry_key_release (GdkEventKey* ev) +{ + if (when_beat_entry.get_text() != "" && when_bar_entry.get_text() != "") { + set_response_sensitive (RESPONSE_ACCEPT, true); + } else { + set_response_sensitive (RESPONSE_ACCEPT, false); + } return false; } @@ -209,6 +222,8 @@ TempoDialog::get_bbt_time (BBT_Time& requested) return false; } + requested.ticks = 0; + return true; } @@ -237,25 +252,21 @@ TempoDialog::get_note_type () } } - cerr << "returning " << note_type << " based on " << text << endl; return note_type; } void TempoDialog::note_types_change () { - set_response_sensitive (Gtk::RESPONSE_ACCEPT, true); + set_response_sensitive (RESPONSE_ACCEPT, true); } MeterDialog::MeterDialog (TempoMap& map, nframes_t frame, const string & action) : ArdourDialog ("meter dialog"), - note_frame (_("Meter denominator")), - bpb_frame (_("Beats per bar")), + bpb_frame (_("Meter")), ok_button (action), cancel_button (_("Cancel")), - when_bar_label (_("Bar")), - when_beat_label (_("Beat")), when_frame (_("Location")) { BBT_Time when; @@ -268,12 +279,9 @@ MeterDialog::MeterDialog (TempoMap& map, nframes_t frame, const string & action) MeterDialog::MeterDialog (MeterSection& section, const string & action) : ArdourDialog ("meter dialog"), - note_frame (_("Meter denominator")), - bpb_frame (_("Beats per bar")), + bpb_frame (_("Meter")), ok_button (action), cancel_button (_("Cancel")), - when_bar_label (_("Bar")), - when_beat_label (_("Beat")), when_frame (_("Location")) { init (section.start(), section.beats_per_bar(), section.note_divisor(), section.movable()); @@ -295,14 +303,7 @@ MeterDialog::init (const BBT_Time& when, double bpb, double note_type, bool mova strings.push_back (_("sixteenth (16)")); strings.push_back (_("thirty-second (32)")); - /* the string here needs to be the longest one to display */ - const guint32 FUDGE = 20; // Combo's are stupid - they steal space from the entry for the button - - // TRANSLATORS: this is not a mis-spelling of "thirty", we're including a vertical - // descender to make sure the height gets computed properly. - Gtkmm2ext::set_size_request_to_display_given_text (note_types, _("thirtq-second (32)"), 7+FUDGE, 15); - - set_popdown_strings (note_types, strings); + set_popdown_strings (note_types, strings, true); if (note_type==1.0f) note_types.set_active_text (_("whole (1)")); @@ -320,58 +321,42 @@ MeterDialog::init (const BBT_Time& when, double bpb, double note_type, bool mova note_types.set_active_text (_("thirty-second (32)")); else note_types.set_active_text (_("quarter (4)")); - - hspacer1.set_border_width (5); - hspacer1.pack_start (note_types, false, false); - vspacer1.set_border_width (5); - vspacer1.pack_start (hspacer1, false, false); - hspacer2.set_border_width (5); - hspacer2.pack_start (bpb_entry, false, false); - vspacer2.set_border_width (5); - vspacer2.pack_start (hspacer2, false, false); + Label* note_label = manage(new Label(_("Note Value:"), ALIGN_LEFT, ALIGN_CENTER)); + Label* bpb_label = manage(new Label(_("Beats Per Bar:"), ALIGN_LEFT, ALIGN_CENTER)); + Table* bpb_table = manage (new Table(2, 2)); - note_frame.add (vspacer1); - bpb_frame.add (vspacer2); + bpb_table->attach (*bpb_label, 0, 1, 0, 1, FILL|EXPAND, FILL|EXPAND, 6, 6); + bpb_table->attach (bpb_entry, 1, 2, 0, 1, FILL|EXPAND, FILL|EXPAND, 6, 6); + bpb_table->attach (*note_label, 0, 1, 1, 2, FILL|EXPAND, FILL|EXPAND, 6, 6); + bpb_table->attach (note_types, 1, 2, 1, 2, FILL|EXPAND, SHRINK, 6, 6); + bpb_frame.add (*bpb_table); if (movable) { snprintf (buf, sizeof (buf), "%" PRIu32, when.bars); when_bar_entry.set_text (buf); - snprintf (buf, sizeof (buf), "%" PRIu32, when.beats); - when_beat_entry.set_text (buf); when_bar_entry.set_name ("MetricEntry"); - when_beat_entry.set_name ("MetricEntry"); - - when_bar_label.set_name ("MetricLabel"); - when_beat_label.set_name ("MetricLabel"); Gtkmm2ext::set_size_request_to_display_given_text (when_bar_entry, "999g", 5, 7); - Gtkmm2ext::set_size_request_to_display_given_text (when_beat_entry, "999g", 5, 7); - - when_table.set_homogeneous (true); - when_table.set_row_spacings (2); - when_table.set_col_spacings (2); - when_table.set_border_width (5); - - when_table.attach (when_bar_label, 0, 1, 0, 1, Gtk::AttachOptions(0), Gtk::FILL|Gtk::EXPAND); - when_table.attach (when_bar_entry, 0, 1, 1, 2, Gtk::AttachOptions(0), Gtk::FILL|Gtk::EXPAND); - - when_table.attach (when_beat_label, 1, 2, 0, 1, Gtk::AttachOptions(0), Gtk::AttachOptions(0)); - when_table.attach (when_beat_entry, 1, 2, 1, 2, Gtk::AttachOptions(0), Gtk::AttachOptions(0)); + HBox* when_hbox = manage (new HBox()); + Label* when_label = manage(new Label(_("Meter Begins at Bar:"), ALIGN_LEFT, ALIGN_TOP)); + when_hbox->pack_end(when_bar_entry, PACK_EXPAND_PADDING, 6); + when_hbox->pack_start(*when_label, PACK_EXPAND_PADDING, 6); + when_frame.set_name ("MetricDialogFrame"); - when_frame.add (when_table); + when_frame.add (*when_hbox); - get_vbox()->pack_start (when_frame, false, false); + get_vbox()->pack_end (when_frame, false, false); + } else { + when_bar_entry.set_text ("0"); } get_vbox()->set_border_width (12); get_vbox()->pack_start (bpb_frame, false, false); - get_vbox()->pack_start (note_frame, false, false); - + bpb_frame.set_name ("MetricDialogFrame"); - note_frame.set_name ("MetricDialogFrame"); bpb_entry.set_name ("MetricEntry"); add_button (Stock::CANCEL, RESPONSE_CANCEL); @@ -380,67 +365,70 @@ MeterDialog::init (const BBT_Time& when, double bpb, double note_type, bool mova set_default_response (RESPONSE_ACCEPT); get_vbox()->show_all (); - bpb_entry.show (); set_name ("MetricDialog"); bpb_entry.signal_activate().connect (bind (mem_fun (*this, &MeterDialog::response), RESPONSE_ACCEPT)); - bpb_entry.signal_key_press_event().connect (mem_fun (*this, &MeterDialog::bpb_key_press), false); - bpb_entry.signal_key_release_event().connect (mem_fun (*this, &MeterDialog::bpb_key_release)); + bpb_entry.signal_key_press_event().connect (mem_fun (*this, &MeterDialog::entry_key_press), false); + bpb_entry.signal_key_release_event().connect (mem_fun (*this, &MeterDialog::entry_key_release)); + when_bar_entry.signal_activate().connect (bind (mem_fun (*this, &MeterDialog::response), RESPONSE_ACCEPT)); + when_bar_entry.signal_key_press_event().connect (mem_fun (*this, &MeterDialog::entry_key_press), false); + when_bar_entry.signal_key_release_event().connect (mem_fun (*this, &MeterDialog::entry_key_release)); + note_types.signal_changed().connect (mem_fun (*this, &MeterDialog::note_types_change)); } bool -MeterDialog::bpb_key_press (GdkEventKey* ev) +MeterDialog::entry_key_press (GdkEventKey* ev) { -switch (ev->keyval) { - - case GDK_0: - case GDK_1: - case GDK_2: - case GDK_3: - case GDK_4: - case GDK_5: - case GDK_6: - case GDK_7: - case GDK_8: - case GDK_9: - case GDK_KP_0: - case GDK_KP_1: - case GDK_KP_2: - case GDK_KP_3: - case GDK_KP_4: - case GDK_KP_5: - case GDK_KP_6: - case GDK_KP_7: - case GDK_KP_8: - case GDK_KP_9: - case GDK_period: - case GDK_comma: - case GDK_KP_Delete: - case GDK_KP_Enter: - case GDK_Delete: - case GDK_BackSpace: - case GDK_Escape: - case GDK_Return: - case GDK_Home: - case GDK_End: - case GDK_Left: - case GDK_Right: - case GDK_Num_Lock: - case GDK_Tab: - return FALSE; - default: - break; - } - - return TRUE; + switch (ev->keyval) { + + case GDK_0: + case GDK_1: + case GDK_2: + case GDK_3: + case GDK_4: + case GDK_5: + case GDK_6: + case GDK_7: + case GDK_8: + case GDK_9: + case GDK_KP_0: + case GDK_KP_1: + case GDK_KP_2: + case GDK_KP_3: + case GDK_KP_4: + case GDK_KP_5: + case GDK_KP_6: + case GDK_KP_7: + case GDK_KP_8: + case GDK_KP_9: + case GDK_period: + case GDK_comma: + case GDK_KP_Delete: + case GDK_KP_Enter: + case GDK_Delete: + case GDK_BackSpace: + case GDK_Escape: + case GDK_Return: + case GDK_Home: + case GDK_End: + case GDK_Left: + case GDK_Right: + case GDK_Num_Lock: + case GDK_Tab: + return FALSE; + default: + break; + } + + return TRUE; } bool -MeterDialog::bpb_key_release (GdkEventKey* ev) +MeterDialog::entry_key_release (GdkEventKey* ev) { - if (bpb_entry.get_text() != "") { + if (when_bar_entry.get_text() != "" && bpb_entry.get_text() != "") { set_response_sensitive (RESPONSE_ACCEPT, true); } else { set_response_sensitive (RESPONSE_ACCEPT, false); @@ -451,7 +439,7 @@ MeterDialog::bpb_key_release (GdkEventKey* ev) void MeterDialog::note_types_change () { - set_response_sensitive (Gtk::RESPONSE_ACCEPT, true); + set_response_sensitive (RESPONSE_ACCEPT, true); } double @@ -497,15 +485,14 @@ MeterDialog::get_note_type () bool MeterDialog::get_bbt_time (BBT_Time& requested) { - requested.ticks = 0; if (sscanf (when_bar_entry.get_text().c_str(), "%" PRIu32, &requested.bars) != 1) { return false; } - if (sscanf (when_beat_entry.get_text().c_str(), "%" PRIu32, &requested.beats) != 1) { - return false; - } + requested.beats = 1; + + requested.ticks = 0; return true; }