remove beta page from startup wizard; use dbl-click to activate "what would you like...

git-svn-id: svn://localhost/ardour2/branches/3.0@12587 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index 1c0ddfa6b4c11865cd53d08c4799029e7bbed54c..f341fceb912bef10d3edb6e39a920c80445dacba 100644 (file)
--- 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 59f29604f04b1139790f7913d904bc9df40ae4aa..be3972a298591cd0817c9c7f8f32130de0ec0704 100644 (file)
--- 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 */