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
This commit is contained in:
Paul Davis 2012-06-06 15:56:45 +00:00
parent 0692e766f8
commit b6901d5d18
2 changed files with 9 additions and 7 deletions

View file

@ -126,7 +126,7 @@ Ardour will play NO role in monitoring"))
bool need_audio_setup = !EngineControl::engine_running(); bool need_audio_setup = !EngineControl::engine_running();
setup_prerelease_page (); // setup_prerelease_page ();
if (new_user) { 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_new_session_button, false, true);
centering_vbox->pack_start (ic_existing_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_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); ic_existing_session_button.signal_activate().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_activated), false);
centering_hbox->pack_start (*centering_vbox, true, true); centering_hbox->pack_start (*centering_vbox, true, true);
@ -572,12 +572,14 @@ ArdourStartup::setup_initial_choice_page ()
set_page_complete (ic_vbox, true); set_page_complete (ic_vbox, true);
} }
void bool
ArdourStartup::initial_button_clicked () 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); set_current_page(session_page_index);
} }
return false;
} }
void void

View file

@ -117,7 +117,7 @@ class ArdourStartup : public Gtk::Assistant {
Gtk::VBox ic_vbox; Gtk::VBox ic_vbox;
Gtk::RadioButton ic_new_session_button; Gtk::RadioButton ic_new_session_button;
Gtk::RadioButton ic_existing_session_button; Gtk::RadioButton ic_existing_session_button;
void initial_button_clicked(); bool initial_button_clicked(GdkEventButton*);
void initial_button_activated(); void initial_button_activated();
/* monitoring choices */ /* monitoring choices */