minor edit (#4540)

[ardour.git] / gtk2_ardour / startup.cc

diff --git a/gtk2_ardour/startup.cc b/gtk2_ardour/startup.cc
index 37e62ca04f72d1272d9389c99f55bf639e9bbf14..891d2cf2decf395b97490226e08eae92628770b6 100644 (file)
--- a/gtk2_ardour/startup.cc
+++ b/gtk2_ardour/startup.cc
@@ -64,11 +64,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)
@@ -121,13 +121,11 @@ Ardour will play NO role in monitoring"))
                set_default_icon_list (window_icons);
        }
 
-       sys::path been_here_before = user_config_directory();
-       been_here_before /= ".a3"; // XXXX use more specific version so we can catch upgrades
-       new_user = !exists (been_here_before);
+       new_user = !exists (been_here_before_path ());
 
        bool need_audio_setup = !EngineControl::engine_running();
 
-        setup_alpha_page ();
+        setup_prerelease_page ();
 
        if (new_user) {
 
@@ -141,8 +139,6 @@ Ardour will play NO role in monitoring"))
                        error << "Could not create user configuration directory" << endmsg;
                }
                
-               /* "touch" the file */
-               ofstream fout (been_here_before.to_string().c_str());
                setup_new_user_page ();
                setup_first_time_config_page ();
                setup_monitoring_choice_page ();
@@ -176,12 +172,12 @@ ArdourStartup::~ArdourStartup ()
 }
 
 void
-ArdourStartup::setup_alpha_page ()
+ArdourStartup::setup_prerelease_page ()
 {
         VBox* vbox = manage (new VBox);
         Label* label = manage (new Label);
-        label->set_markup (_("<b>Welcome to this ALPHA release of Ardour 3.0</b>\n\n\
-There are still many issues and bugs to be worked on,\n\
+        label->set_markup (_("<b>Welcome to this BETA release of Ardour 3.0</b>\n\n\
+There are still several issues and bugs to be worked on,\n\
 as well as general workflow improvements, before this can be considered\n\
 release software. So, a few guidelines:\n\
 \n\
@@ -190,7 +186,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\
@@ -206,7 +202,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 ALPHA RELEASE"));
+        set_page_title (*vbox, _("This is a BETA RELEASE"));
        set_page_complete (*vbox, true);
 }
 
@@ -336,14 +332,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);
@@ -645,6 +643,9 @@ 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());
+               
                Config->save_state ();
        }
 
@@ -1378,3 +1379,12 @@ ArdourStartup::existing_session_selected ()
        set_page_complete (session_vbox, true);
        move_along_now ();
 }
+
+sys::path
+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;
+}
+