From 1d17bd33211003d99e3e46a89448cd43c0692e91 Mon Sep 17 00:00:00 2001 From: Nikolay Date: Wed, 17 Dec 2014 13:13:10 +0200 Subject: [PATCH] [Summary] Fix bug. Allow to add tracks on Enter press. Deleted unnecessary functions. [Reviewed] VKamyshniy --- gtk2_ardour/add_tracks_dialog.cc | 18 ++---------------- gtk2_ardour/add_tracks_dialog.h | 4 ---- gtk2_ardour/ardour_ui.cc | 2 +- 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/gtk2_ardour/add_tracks_dialog.cc b/gtk2_ardour/add_tracks_dialog.cc index 9a66cda6df..2b0240c263 100644 --- a/gtk2_ardour/add_tracks_dialog.cc +++ b/gtk2_ardour/add_tracks_dialog.cc @@ -79,7 +79,7 @@ void AddTracksDialog::on_ok_button (WavesButton*) { hide(); - response (Gtk::RESPONSE_YES); + response (WavesDialog::RESPONSE_DEFAULT); } void @@ -156,18 +156,4 @@ AddTracksDialog::setup () { set_track_count(1); _tracks_format_dropdown.set_text(TrackFormat::FormatMono); -} - -void -AddTracksDialog::on_enter_pressed () -{ - hide(); - response (Gtk::RESPONSE_YES); -} - -void -AddTracksDialog::on_esc_pressed () -{ - hide(); - response (Gtk::RESPONSE_CANCEL); -} +} \ No newline at end of file diff --git a/gtk2_ardour/add_tracks_dialog.h b/gtk2_ardour/add_tracks_dialog.h index 66ceb660f3..677caf2c2e 100644 --- a/gtk2_ardour/add_tracks_dialog.h +++ b/gtk2_ardour/add_tracks_dialog.h @@ -38,10 +38,6 @@ public: ARDOUR::ChanCount input_channels (); void on_show (); -protected: - void on_enter_pressed (); - void on_esc_pressed (); - private: WavesButton& _decrement_button; WavesButton& _increment_button; diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index c76f056d3d..cb697065bd 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -3451,7 +3451,7 @@ ARDOUR_UI::add_route (Gtk::Window* float_window) int r = _add_tracks_dialog->run(); switch (r) { - case Gtk::RESPONSE_YES: + case WavesDialog::RESPONSE_DEFAULT: break; default: return;