X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstartup.cc;h=7f7dbe8f32df6f5b94788eee779a14cf9e9598d9;hb=611dcdd24932222d676da4d9a4dca643f79db4a4;hp=a7bce0a8479c3232165c63481534cebad65a18ad;hpb=5314311e78a3ce1c6fc41f64ed8a2ce55e33222e;p=ardour.git

diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index a7bce0a847..7f7dbe8f32 100644
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -29,7 +29,6 @@
 
 #include "pbd/failed_constructor.h"
 #include "pbd/file_utils.h"
-#include "pbd/filesystem.h"
 #include "pbd/replace_all.h"
 #include "pbd/whitespace.h"
 
@@ -38,7 +37,9 @@
 #include "ardour/session.h"
 #include "ardour/session_state_utils.h"
 #include "ardour/template_utils.h"
+#include "ardour/filename_extensions.h"
 
+#include "ardour_ui.h"
 #include "startup.h"
 #include "opts.h"
 #include "engine_dialog.h"
@@ -64,11 +65,11 @@ static string poor_mans_glob (string path)
 
 ArdourStartup::ArdourStartup ()
 	: _response (RESPONSE_OK)
-	, ic_new_session_button (_("Open a new session"))
+	, ic_new_session_button (_("Create a new session"))
 	, ic_existing_session_button (_("Open an existing session"))
 	, monitor_via_hardware_button (_("Use an external mixer or the hardware mixer of your audio interface.\n\
 Ardour will play NO role in monitoring"))
-	, monitor_via_ardour_button (string_compose (_("Ask %1 to playback material as it is being recorded"), PROGRAM_NAME))
+	, monitor_via_ardour_button (string_compose (_("Ask %1 to play back material as it is being recorded"), PROGRAM_NAME))
 	, new_folder_chooser (FILE_CHOOSER_ACTION_SELECT_FOLDER)
 	, more_new_session_options_button (_("I'd like more options for this session"))
 	, _output_limit_count_adj (1, 0, 100, 1, 10, 0)
@@ -94,7 +95,6 @@ Ardour will play NO role in monitoring"))
 	use_session_as_template_button.set_group (session_template_group);
 
 	set_keep_above (true);
-	set_resizable (false);
 	set_position (WIN_POS_CENTER);
 	set_border_width (12);
 
@@ -121,23 +121,13 @@ Ardour will play NO role in monitoring"))
 		set_default_icon_list (window_icons);
 	}
 
-	new_user = !exists (been_here_before_path ());
+	new_user = !Glib::file_test(been_here_before_path(), Glib::FILE_TEST_EXISTS);
 
 	bool need_audio_setup = !EngineControl::engine_running();
 
-        setup_prerelease_page ();
+        // setup_prerelease_page ();
 
 	if (new_user) {
-
-		/* Create the config directory so that we have somewhere to put the
-		   been_here_before file.
-		*/
-		try {
-			sys::create_directories (user_config_directory ());
-		}
-		catch (const sys::filesystem_error& ex) {
-			error << "Could not create user configuration directory" << endmsg;
-		}
 		
 		setup_new_user_page ();
 		setup_first_time_config_page ();
@@ -148,6 +138,8 @@ Ardour will play NO role in monitoring"))
 			setup_audio_page ();
 		}
 
+		ic_new_session_button.set_active (true); // always create new session on first run
+
 	} else {
 
 		if (need_audio_setup) {
@@ -186,7 +178,7 @@ release software. So, a few guidelines:\n\
 2) Please see http://ardour.org/a3_features for a guide to new features.\n\
 3) <b>Please do NOT use the forums at ardour.org to report issues</b>.\n\
 4) Please <b>DO</b> use the bugtracker at http://tracker.ardour.org/ to report issues\n\
-   making sure to note the product version number as 3.0-alpha.\n\
+   making sure to note the product version number as 3.0-beta.\n\
 5) Please <b>DO</b> use the ardour-users mailing list to discuss ideas and pass on comments.\n\
 6) Please <b>DO</b> join us on IRC for real time discussions about ardour3. You\n\
    can get there directly from Ardour via the Help->Chat menu option.\n\
@@ -202,7 +194,7 @@ Full information on all the above can be found on the support page at\n\
 
         append_page (*vbox);
         set_page_type (*vbox, ASSISTANT_PAGE_CONTENT);
-        set_page_title (*vbox, _("This is an BETA RELEASE"));
+        set_page_title (*vbox, _("This is a BETA RELEASE"));
 	set_page_complete (*vbox, true);
 }
 
@@ -243,8 +235,8 @@ std::string
 ArdourStartup::session_template_name ()
 {
 	if (!load_template_override.empty()) {
-		string the_path = (ARDOUR::user_template_directory()/ (load_template_override + ".template")).to_string();
-		return the_path;
+		string the_path(ARDOUR::user_template_directory());
+		return Glib::build_filename (the_path, load_template_override + ARDOUR::template_suffix);
 	}
 
 	if (ic_existing_session_button.get_active()) {
@@ -332,14 +324,16 @@ ArdourStartup::setup_new_user_page ()
 	Label* foomatic = manage (new Label);
 
 	foomatic->set_markup (string_compose (_("\
-<span size=\"larger\">%1 is a digital audio workstation. You can use it to\n\
-record, edit and mix multi-track audio. You can produce your\n\
-own CDs, mix video soundtracks, or just experiment with new\n\
-ideas about music and sound.\n\
-\n\
-There are a few things that need to configured before you start\n\
-using the program.</span>\
+<span size=\"larger\">%1 is a digital audio workstation. You can use it to \
+record, edit and mix multi-track audio. You can produce your \
+own CDs, mix video soundtracks, or experiment with new \
+ideas about music and sound. \
+\n\n\
+There are a few things that need to be configured before you start \
+using the program.</span> \
 "), PROGRAM_NAME));
+	foomatic->set_justify (JUSTIFY_FILL);
+	foomatic->set_line_wrap ();
 
 	HBox* hbox = manage (new HBox);
 	HBox* vbox = manage (new HBox);
@@ -364,6 +358,8 @@ void
 ArdourStartup::default_dir_changed ()
 {
 	Config->set_default_session_parent_dir (default_dir_chooser->get_filename());
+	// make new session folder chooser point to the new default
+	new_folder_chooser.set_current_folder (Config->get_default_session_parent_dir());	
 	config_changed ();
 }
 
@@ -430,7 +426,8 @@ signal as well as record it. This is called \"monitoring\". There are\n\
 different ways to do this depending on the equipment you have and the\n\
 configuration of that equipment. The two most common are presented here.\n\
 Please choose whichever one is right for your setup.\n\n\
-<i>(You can change this preference at any time, via the Preferences dialog)</i>"));
+<i>(You can change this preference at any time, via the Preferences dialog)</i>\n\n\
+<i>If you do not understand what this is about, just accept the default.</i>"));
 	monitor_label.set_alignment (0.0, 0.0);
 
 	vbox->set_spacing (6);
@@ -469,8 +466,7 @@ ArdourStartup::setup_monitor_section_choice_page ()
 
 	no_monitor_section_button.set_label (_("Use a Master bus directly"));
 	l->set_alignment (0.0, 1.0);
-	l->set_markup(_("Connect the Master bus directly to your hardware outputs.\n\
-<i>Preferable for simple use</i>."));
+	l->set_markup(_("Connect the Master bus directly to your hardware outputs. This is preferable for simple usage."));
 
 	vbox = manage (new VBox);
 	vbox->set_spacing (6);
@@ -504,7 +500,8 @@ greater control in monitoring without affecting the mix."));
 	use_monitor_section_button.signal_toggled().connect (sigc::mem_fun (*this, &ArdourStartup::config_changed));
 	no_monitor_section_button.signal_toggled().connect (sigc::mem_fun (*this, &ArdourStartup::config_changed));
 
-	monitor_section_label.set_markup(_("<i><small>(You can change this preference at any time, via the Preferences dialog)</small></i>"));
+	monitor_section_label.set_markup(_("<i>You can change this preference at any time via the Preferences dialog.\nYou can also add or remove the monitor section to/from any session.</i>\n\n\
+<i>If you do not understand what this is about, just accept the default.</i>"));
 	monitor_section_label.set_alignment (0.0, 0.0);
 
 	hbox->pack_start (*main_vbox, true, true, 8);
@@ -541,10 +538,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_button_press_event().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_press), false);
+	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_button_press_event().connect(sigc::mem_fun(*this, &ArdourStartup::initial_button_press), false);
+	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);
@@ -565,20 +562,21 @@ ArdourStartup::setup_initial_choice_page ()
 }
 
 bool
-ArdourStartup::initial_button_press (GdkEventButton *event)
+ArdourStartup::initial_button_clicked (GdkEventButton* ev)
 {
-	if (event && event->type == GDK_2BUTTON_PRESS && session_page_index != -1) {
+	if (ev->type == GDK_2BUTTON_PRESS && session_page_index != -1) {
 		set_current_page(session_page_index);
-		return true;
-	} else {
-		return false;
 	}
+
+	return false;
 }
 
 void
 ArdourStartup::initial_button_activated ()
 {
-	set_current_page(session_page_index);
+	if (session_page_index != -1) {
+		set_current_page(session_page_index);
+	}
 }
 
 void
@@ -624,7 +622,10 @@ void
 ArdourStartup::on_apply ()
 {
 	if (engine_dialog) {
-		engine_dialog->setup_engine ();
+		if (engine_dialog->setup_engine ()) {
+                        set_current_page (audio_page_index);
+                        return;
+                }
 	}
 
 	if (config_modified) {
@@ -642,7 +643,7 @@ ArdourStartup::on_apply ()
 		Config->set_use_monitor_bus (use_monitor_section_button.get_active());
 
 		/* "touch" the been-here-before path now that we're about to save Config */
-		ofstream fout (been_here_before_path().to_string().c_str());
+		ofstream fout (been_here_before_path().c_str());
 		
 		Config->save_state ();
 	}
@@ -708,7 +709,7 @@ ArdourStartup::populate_session_templates ()
 static bool
 lost_name_entry_focus (GdkEventFocus*)
 {
-	cerr << "lost focus\n";
+	// cerr << "lost focus\n";
 	return false;
 }
 
@@ -759,6 +760,13 @@ ArdourStartup::setup_new_session_page ()
 
 		if (!ARDOUR_COMMAND_LINE::session_name.empty()) {
 			new_folder_chooser.set_current_folder (poor_mans_glob (Glib::path_get_dirname (ARDOUR_COMMAND_LINE::session_name)));
+		} else if (ARDOUR_UI::instance()->session_loaded) {
+			// point the new session file chooser at the parent directory of the current session
+			string session_parent_dir = Glib::path_get_dirname(ARDOUR_UI::instance()->the_session()->path());
+			string::size_type last_dir_sep = session_parent_dir.rfind(G_DIR_SEPARATOR);
+			session_parent_dir = session_parent_dir.substr(0, last_dir_sep);
+			new_folder_chooser.set_current_folder (session_parent_dir);
+			new_folder_chooser.add_shortcut_folder (poor_mans_glob (Config->get_default_session_parent_dir()));
 		} else {
 			new_folder_chooser.set_current_folder (poor_mans_glob (Config->get_default_session_parent_dir()));
 		}
@@ -877,7 +885,7 @@ ArdourStartup::setup_new_session_page ()
 void
 ArdourStartup::new_name_mapped ()
 {
-	cerr << "Grab new name focus\n";
+	// cerr << "Grab new name focus\n";
 	new_name_entry.grab_focus ();
 }
 
@@ -894,7 +902,7 @@ ArdourStartup::new_name_changed ()
 int
 ArdourStartup::redisplay_recent_sessions ()
 {
-	std::vector<sys::path> session_directories;
+	std::vector<std::string> session_directories;
 	RecentSessionsSorter cmp;
 
 	recent_session_display.set_model (Glib::RefPtr<TreeModel>(0));
@@ -915,9 +923,9 @@ ArdourStartup::redisplay_recent_sessions ()
 		session_directories.push_back ((*i).second);
 	}
 
-	for (vector<sys::path>::const_iterator i = session_directories.begin(); i != session_directories.end(); ++i)
+	for (vector<std::string>::const_iterator i = session_directories.begin(); i != session_directories.end(); ++i)
 	{
-		std::vector<sys::path> state_file_paths;
+		std::vector<std::string> state_file_paths;
 
 		// now get available states for this session
 
@@ -925,7 +933,7 @@ ArdourStartup::redisplay_recent_sessions ()
 
 		vector<string*>* states;
 		vector<const gchar*> item;
-		string fullpath = (*i).to_string();
+		string fullpath = *i;
 
 		/* remove any trailing / */
 
@@ -969,6 +977,7 @@ ArdourStartup::redisplay_recent_sessions ()
 		}
 	}
 
+	recent_session_display.set_tooltip_column(1); // recent_session_columns.fullpath 
 	recent_session_display.set_model (recent_session_model);
 	return rs.size();
 }
@@ -1021,7 +1030,14 @@ ArdourStartup::setup_existing_session_page ()
 
 		existing_session_chooser.set_title (_("Select session file"));
 		existing_session_chooser.signal_file_set().connect (sigc::mem_fun (*this, &ArdourStartup::existing_session_selected));
+		existing_session_chooser.set_current_folder(poor_mans_glob (Config->get_default_session_parent_dir()));
 
+		FileFilter session_filter;
+		session_filter.add_pattern ("*.ardour");
+		session_filter.set_name (string_compose (_("%1 sessions"), PROGRAM_NAME));
+		existing_session_chooser.add_filter (session_filter);
+		existing_session_chooser.set_filter (session_filter);
+		
 #ifdef GTKOSX
 		existing_session_chooser.add_shortcut_folder ("/Volumes");
 #endif
@@ -1378,11 +1394,9 @@ ArdourStartup::existing_session_selected ()
 	move_along_now ();
 }
 
-sys::path
+std::string
 ArdourStartup::been_here_before_path () const
 {
-	sys::path b = user_config_directory();
-	b /= ".a3"; // XXXX use more specific version so we can catch upgrades
-	return b;
+	// XXXX use more specific version so we can catch upgrades
+	return Glib::build_filename (user_config_directory (), ".a3");
 }
-