more new fade icons from Chris Goddard

[ardour.git] / gtk2_ardour / session_dialog.cc

diff --git a/gtk2_ardour/session_dialog.cc b/gtk2_ardour/session_dialog.cc
index 51c7e24f80b43370f5769875910b963e62fd50b4..90779c53704aa76149d1d28875fe48aa41f18c35 100644 (file)
--- a/gtk2_ardour/session_dialog.cc
+++ b/gtk2_ardour/session_dialog.cc
@@ -74,11 +74,6 @@ SessionDialog::SessionDialog (bool require_new, const std::string& session_name,
        , _master_bus_channel_count_adj (2, 0, 100, 1, 10, 0)
        , _existing_session_chooser_used (false)
 {
-       if (!session_name.empty() && !require_new) {
-               response (RESPONSE_OK);
-               return;
-       }
-
        set_keep_above (true);
        set_position (WIN_POS_CENTER);
        get_vbox()->set_spacing (6);
@@ -143,12 +138,32 @@ SessionDialog::SessionDialog (bool require_new, const std::string& session_name,
                        recent_label.hide ();
                }
        }
+
+       /* possibly get out of here immediately if everything is ready to go.
+          We still need to set up the whole dialog because of the way
+          ARDOUR_UI::get_session_parameters() might skip it on a first
+          pass then require it for a second pass (e.g. when there
+          is an error with session loading and we have to ask the user
+          what to do next).
+        */
+
+       if (!session_name.empty() && !require_new) {
+               response (RESPONSE_OK);
+               return;
+       }
 }
 
 SessionDialog::~SessionDialog()
 {
 }
 
+void
+SessionDialog::clear_given ()
+{
+       _provided_session_path = "";
+       _provided_session_name = "";
+}
+
 bool
 SessionDialog::use_session_template ()
 {
@@ -185,6 +200,7 @@ std::string
 SessionDialog::session_name (bool& should_be_new)
 {
        if (!_provided_session_name.empty() && !new_only) {
+               should_be_new = false;
                return _provided_session_name;
        }
 
@@ -221,12 +237,16 @@ SessionDialog::session_folder ()
        TreeIter iter = recent_session_display.get_selection()->get_selected();
        
        if (iter) {
-               return (*iter)[recent_session_columns.fullpath];
+               string s = (*iter)[recent_session_columns.fullpath];
+               if (Glib::file_test (s, Glib::FILE_TEST_IS_REGULAR)) {
+                       return Glib::path_get_dirname (s);
+               }
+               return s;
        }
 
        if (_existing_session_chooser_used) {
                /* existing session chosen from file chooser */
-               return existing_session_chooser.get_current_folder ();
+               return Glib::path_get_dirname (existing_session_chooser.get_current_folder ());
        } else {
                std::string legal_session_folder_name = legalize_for_path (new_name_entry.get_text());
                return Glib::build_filename (new_folder_chooser.get_current_folder(), legal_session_folder_name);
@@ -251,7 +271,9 @@ SessionDialog::setup_initial_choice_box ()
        ic_new_session_button.signal_clicked().connect (sigc::mem_fun (*this, &SessionDialog::new_session_button_clicked));
 
        Gtk::HBox* hbox = manage (new HBox);
+       Gtk::VBox* vbox = manage (new VBox);
        hbox->set_spacing (12);
+       vbox->set_spacing (12);
 
        string image_path;
 
@@ -261,9 +283,10 @@ SessionDialog::setup_initial_choice_box ()
                        hbox->pack_start (*image, false, false);
                }
        }
-
-       hbox->pack_start (ic_new_session_button, true, true);
-
+       
+       vbox->pack_start (ic_new_session_button, true, true, 20);
+       hbox->pack_start (*vbox, true, true, 20);
+       
        centering_vbox->pack_start (*hbox, false, false);
 
        /* Possible update message */
@@ -276,8 +299,6 @@ SessionDialog::setup_initial_choice_box ()
 
                info_box->pack_start (info_scroller_label, false, false);
 
-               cerr << "Frame should be visible\n";
-
                info_scroller_count = 0;
                info_scroller_connection = Glib::signal_timeout().connect (mem_fun(*this, &SessionDialog::info_scroller_update), 50);
 
@@ -1013,6 +1034,7 @@ void
 SessionDialog::existing_session_selected ()
 {
        _existing_session_chooser_used = true;
+       recent_session_display.get_selection()->unselect_all();
        /* mark this sensitive in case we come back here after a failed open
         * attempt and the user has hacked up the fix. sigh.
         */