ardour/livetrax
13
0
Fork 0
Code

remove (unimplemnted) Stretch MIDI checkbox

Browse Source
This commit is contained in:
Ben Loftis 2023-09-07 15:18:36 -05:00
parent e88a121ff8
commit 3f14b27ee3
3 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk2_ardour/editor.cc
View File

@ -3281,8 +3281,6 @@ Editor::setup_toolbar ()
mouse_mode_size_group->add_widget (visible_tracks_selector); mouse_mode_size_group->add_widget (visible_tracks_selector);
} }
mouse_mode_size_group->add_widget (stretch_midi_cb);
mouse_mode_size_group->add_widget (grid_type_selector); mouse_mode_size_group->add_widget (grid_type_selector);
mouse_mode_size_group->add_widget (draw_length_selector); mouse_mode_size_group->add_widget (draw_length_selector);
mouse_mode_size_group->add_widget (draw_velocity_selector); mouse_mode_size_group->add_widget (draw_velocity_selector);
@ -3400,8 +3398,6 @@ Editor::setup_toolbar ()
snap_box.set_spacing (2); snap_box.set_spacing (2);
snap_box.set_border_width (2); snap_box.set_border_width (2);
stretch_midi_cb.set_name ("mouse mode button");
grid_type_selector.set_name ("mouse mode button"); grid_type_selector.set_name ("mouse mode button");
draw_length_selector.set_name ("mouse mode button"); draw_length_selector.set_name ("mouse mode button");
draw_velocity_selector.set_name ("mouse mode button"); draw_velocity_selector.set_name ("mouse mode button");
@ -3433,13 +3429,6 @@ Editor::setup_toolbar ()
nudge_box->pack_start (nudge_forward_button, false, false); nudge_box->pack_start (nudge_forward_button, false, false);
nudge_box->pack_start (*nudge_clock, false, false); nudge_box->pack_start (*nudge_clock, false, false);
stretch_midi_cb.set_label(_("Stretch MIDI"));
/* Grid - these tools are only visible when in Grid mode */
grid_box.set_spacing (2);
grid_box.set_border_width (2);
grid_box.pack_start (stretch_midi_cb, false, false, 4);
/* Draw - these MIDI tools are only visible when in Draw mode */ /* Draw - these MIDI tools are only visible when in Draw mode */
draw_box.set_spacing (2); draw_box.set_spacing (2);
draw_box.set_border_width (2); draw_box.set_border_width (2);
@ -3478,8 +3467,6 @@ Editor::setup_toolbar ()
toolbar_hbox.pack_start (snap_box, false, false); toolbar_hbox.pack_start (snap_box, false, false);
toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3); toolbar_hbox.pack_start (*(manage (new ArdourVSpacer ())), false, false, 3);
toolbar_hbox.pack_start (*nudge_box, false, false); toolbar_hbox.pack_start (*nudge_box, false, false);
toolbar_hbox.pack_start (_grid_box_spacer, false, false, 3);
toolbar_hbox.pack_start (grid_box, false, false);
toolbar_hbox.pack_start (_draw_box_spacer, false, false, 3); toolbar_hbox.pack_start (_draw_box_spacer, false, false, 3);
toolbar_hbox.pack_start (draw_box, false, false); toolbar_hbox.pack_start (draw_box, false, false);
toolbar_hbox.pack_end (_zoom_box, false, false, 2); toolbar_hbox.pack_end (_zoom_box, false, false, 2);
@ -3655,7 +3642,6 @@ Editor::setup_tooltips ()
set_tooltip (tav_expand_button, _("Expand Tracks")); set_tooltip (tav_expand_button, _("Expand Tracks"));
set_tooltip (tav_shrink_button, _("Shrink Tracks")); set_tooltip (tav_shrink_button, _("Shrink Tracks"));
set_tooltip (visible_tracks_selector, _("Number of visible tracks")); set_tooltip (visible_tracks_selector, _("Number of visible tracks"));
set_tooltip (stretch_midi_cb, _("Enable to move MIDI events when stretching the Grid"));
set_tooltip (draw_length_selector, _("Note Length to Draw (AUTO uses the current Grid setting)")); set_tooltip (draw_length_selector, _("Note Length to Draw (AUTO uses the current Grid setting)"));
set_tooltip (draw_velocity_selector, _("Note Velocity to Draw (AUTO uses the nearest note's velocity)")); set_tooltip (draw_velocity_selector, _("Note Velocity to Draw (AUTO uses the nearest note's velocity)"));
set_tooltip (draw_channel_selector, _("Note Channel to Draw (AUTO uses the nearest note's channel)")); set_tooltip (draw_channel_selector, _("Note Channel to Draw (AUTO uses the nearest note's channel)"));

4
gtk2_ardour/editor.h
View File

@ -2000,16 +2000,12 @@ private:
ArdourWidgets::ArdourDropdown draw_channel_selector; ArdourWidgets::ArdourDropdown draw_channel_selector;
void build_draw_midi_menus (); void build_draw_midi_menus ();
Gtk::CheckButton stretch_midi_cb;
ArdourWidgets::ArdourButton snap_mode_button; ArdourWidgets::ArdourButton snap_mode_button;
bool snap_mode_button_clicked (GdkEventButton*); bool snap_mode_button_clicked (GdkEventButton*);
Gtk::HBox snap_box; Gtk::HBox snap_box;
Gtk::HBox grid_box;
Gtk::HBox draw_box; Gtk::HBox draw_box;
ArdourWidgets::ArdourVSpacer _grid_box_spacer;
ArdourWidgets::ArdourVSpacer _draw_box_spacer; ArdourWidgets::ArdourVSpacer _draw_box_spacer;
Gtk::HBox ebox_hpacker; Gtk::HBox ebox_hpacker;

8
gtk2_ardour/editor_mouse.cc
View File

@ -379,13 +379,9 @@ Editor::mouse_mode_toggled (MouseMode m)
} }
if (mouse_mode == MouseGrid) { if (mouse_mode == MouseGrid) {
grid_box.show(); _canvas_grid_zone->set_ignore_events (false);
_grid_box_spacer.show();
_canvas_grid_zone->set_ignore_events (false); // woohoo
} else { } else {
grid_box.hide(); _canvas_grid_zone->set_ignore_events (true);
_grid_box_spacer.hide();
_canvas_grid_zone->set_ignore_events (true); // important !!!
} }
if (internal_editing()) { if (internal_editing()) {