From b6901d5d18730e5620ca4ea89f36a2774f8497dd Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 6 Jun 2012 15:56:45 +0000 Subject: [PATCH] remove beta page from startup wizard; use dbl-click to activate "what would you like to do?" radio buttons, rather than click git-svn-id: svn://localhost/ardour2/branches/3.0@12587 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/startup.cc | 14 ++++++++------ gtk2_ardour/startup.h | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc index 1c0ddfa6b4..f341fceb91 100644 --- a/gtk2_ardour/startup.cc +++ b/gtk2_ardour/startup.cc @@ -126,7 +126,7 @@ Ardour will play NO role in monitoring")) bool need_audio_setup = !EngineControl::engine_running(); - setup_prerelease_page (); + // setup_prerelease_page (); if (new_user) { @@ -549,10 +549,10 @@ ArdourStartup::setup_initial_choice_page () centering_vbox->pack_start (ic_new_session_button, false, true); centering_vbox->pack_start (ic_existing_session_button, false, true); - ic_new_session_button.signal_clicked().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_clicked)); + ic_new_session_button.signal_button_press_event().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_clicked), false); ic_new_session_button.signal_activate().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_activated), false); - ic_existing_session_button.signal_clicked().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_clicked)); + ic_existing_session_button.signal_button_press_event().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_clicked), false); ic_existing_session_button.signal_activate().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_activated), false); centering_hbox->pack_start (*centering_vbox, true, true); @@ -572,12 +572,14 @@ ArdourStartup::setup_initial_choice_page () set_page_complete (ic_vbox, true); } -void -ArdourStartup::initial_button_clicked () +bool +ArdourStartup::initial_button_clicked (GdkEventButton* ev) { - if (session_page_index != -1) { + if (ev->type == GDK_2BUTTON_PRESS && session_page_index != -1) { set_current_page(session_page_index); } + + return false; } void diff --git a/gtk2_ardour/startup.h b/gtk2_ardour/startup.h index 59f29604f0..be3972a298 100644 --- a/gtk2_ardour/startup.h +++ b/gtk2_ardour/startup.h @@ -117,7 +117,7 @@ class ArdourStartup : public Gtk::Assistant { Gtk::VBox ic_vbox; Gtk::RadioButton ic_new_session_button; Gtk::RadioButton ic_existing_session_button; - void initial_button_clicked(); + bool initial_button_clicked(GdkEventButton*); void initial_button_activated(); /* monitoring choices */ -- 2.30.2