ardour/livetrax
13
0
Fork 0
Code

make the startup -> session dialog flow more sensible for brand new users

Browse Source
This commit is contained in:
Paul Davis 2013-10-15 12:37:13 -04:00
parent fb1eefdd5e
commit fa03eee79e
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk2_ardour/ardour_ui.cc
View File

@ -718,6 +718,7 @@ ARDOUR_UI::starting ()
{
Application* app = Application::instance ();
char *nsm_url;
bool brand_new_user = ArdourStartup::required ();
app->ShouldQuit.connect (sigc::mem_fun (*this, &ARDOUR_UI::queue_finish));
app->ShouldLoad.connect (sigc::mem_fun (*this, &ARDOUR_UI::idle_load));
@ -778,17 +779,17 @@ ARDOUR_UI::starting ()
}
} else {
if (ArdourStartup::required()) {
if (brand_new_user) {
ArdourStartup s;
s.present ();
main().run();
s.hide ();
switch (s.response ()) {
case Gtk::RESPONSE_REJECT:
return -1;
default:
case Gtk::RESPONSE_OK:
break;
default:
return -1;
}
}
@ -804,7 +805,9 @@ ARDOUR_UI::starting ()
/* go get a session */
if (get_session_parameters (false, ARDOUR_COMMAND_LINE::new_session, ARDOUR_COMMAND_LINE::load_template)) {
const bool new_session_required = (ARDOUR_COMMAND_LINE::new_session || brand_new_user);
if (get_session_parameters (false, new_session_required, ARDOUR_COMMAND_LINE::load_template)) {
return -1;
}
}

1
gtk2_ardour/startup.cc
View File

@ -243,6 +243,7 @@ Where would you like new %1 sessions to be stored by default?\n\n\
vbox->pack_start (*txt, false, false);
vbox->pack_start (*hbox, false, true);
cerr << "set default folder to " << poor_mans_glob (Config->get_default_session_parent_dir()) << endl;
default_dir_chooser->set_current_folder (poor_mans_glob (Config->get_default_session_parent_dir()));
default_dir_chooser->signal_current_folder_changed().connect (sigc::mem_fun (*this, &ArdourStartup::default_dir_changed));
default_dir_chooser->show ();