packaging tweaks for OS X

[ardour.git] / gtk2_ardour / startup.cc

diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index c1f5d3b6bb721a541978f9e27835ffdd972ae986..220f406287b11790fb833dfb4986b4891a603b09 100644 (file)
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -39,6 +39,7 @@
 #include "ardour/session_state_utils.h"
 #include "ardour/template_utils.h"
 
+#include "ardour_ui.h"
 #include "startup.h"
 #include "opts.h"
 #include "engine_dialog.h"
@@ -148,6 +149,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) {
@@ -334,7 +337,7 @@ ArdourStartup::setup_new_user_page ()
        foomatic->set_markup (string_compose (_("\
 <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 just experiment with new \
+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 \
@@ -366,6 +369,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 ();
 }
 
@@ -432,7 +437,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);
@@ -471,8 +477,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);
@@ -506,7 +511,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);
@@ -761,6 +767,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()));
                }
@@ -971,6 +984,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();
 }
@@ -1023,6 +1037,8 @@ 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));
+               cerr << "Set existing chooser to " << Config->get_default_session_parent_dir() << endl;
+               existing_session_chooser.set_current_folder(poor_mans_glob (Config->get_default_session_parent_dir()));
 
 #ifdef GTKOSX
                existing_session_chooser.add_shortcut_folder ("/Volumes");