(backport) Session Dialog is now 4 tabs
This commit is contained in:
parent
ae5d054188
commit
7434e04040
|
|
@ -150,7 +150,7 @@ ARDOUR_UI::start_session_load (bool create_new)
|
|||
}
|
||||
}
|
||||
|
||||
SessionDialog* session_dialog = new SessionDialog (create_new, string(), Config->get_default_session_parent_dir(), string(), true);
|
||||
SessionDialog* session_dialog = new SessionDialog (create_new ? SessionDialog::New : SessionDialog::Recent, string(), Config->get_default_session_parent_dir(), string(), true);
|
||||
session_dialog->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::session_dialog_response_handler), session_dialog));
|
||||
session_dialog->present ();
|
||||
}
|
||||
|
|
@ -1154,140 +1154,17 @@ ARDOUR_UI::open_session ()
|
|||
return;
|
||||
}
|
||||
|
||||
/* ardour sessions are folders */
|
||||
Gtk::FileChooserDialog open_session_selector(_("Open Session"), FILE_CHOOSER_ACTION_OPEN);
|
||||
open_session_selector.add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
|
||||
open_session_selector.add_button (Gtk::Stock::OPEN, Gtk::RESPONSE_ACCEPT);
|
||||
open_session_selector.set_default_response(Gtk::RESPONSE_ACCEPT);
|
||||
|
||||
if (_session) {
|
||||
string session_parent_dir = Glib::path_get_dirname(_session->path());
|
||||
open_session_selector.set_current_folder(session_parent_dir);
|
||||
} else {
|
||||
open_session_selector.set_current_folder(Config->get_default_session_parent_dir());
|
||||
}
|
||||
|
||||
Gtkmm2ext::add_volume_shortcuts (open_session_selector);
|
||||
try {
|
||||
/* add_shortcut_folder throws an exception if the folder being added already has a shortcut */
|
||||
string default_session_folder = Config->get_default_session_parent_dir();
|
||||
open_session_selector.add_shortcut_folder (default_session_folder);
|
||||
}
|
||||
catch (Glib::Error const& e) {
|
||||
std::cerr << "open_session_selector.add_shortcut_folder() threw Glib::Error " << e.what() << std::endl;
|
||||
}
|
||||
|
||||
FileFilter session_filter;
|
||||
session_filter.add_pattern (string_compose(X_("*%1"), ARDOUR::statefile_suffix));
|
||||
session_filter.set_name (string_compose (_("%1 sessions"), PROGRAM_NAME));
|
||||
open_session_selector.add_filter (session_filter);
|
||||
|
||||
FileFilter archive_filter;
|
||||
archive_filter.add_pattern (string_compose(X_("*%1"), ARDOUR::session_archive_suffix));
|
||||
archive_filter.set_name (_("Session Archives"));
|
||||
open_session_selector.add_filter (archive_filter);
|
||||
|
||||
FileFilter aaf_filter;
|
||||
aaf_filter.add_pattern (string_compose(X_("*%1"), ARDOUR::advanced_authoring_format_suffix));
|
||||
aaf_filter.set_name (_("Advanced Authoring Format (AAF)"));
|
||||
open_session_selector.add_filter (aaf_filter);
|
||||
|
||||
FileFilter all_filter;
|
||||
all_filter.add_pattern (string_compose(X_("*%1"), ARDOUR::statefile_suffix));
|
||||
all_filter.add_pattern (string_compose(X_("*%1"), ARDOUR::session_archive_suffix));
|
||||
all_filter.add_pattern (string_compose(X_("*%1"), ARDOUR::advanced_authoring_format_suffix));
|
||||
all_filter.set_name (_("All supported files"));
|
||||
open_session_selector.add_filter (all_filter);
|
||||
|
||||
open_session_selector.set_filter (session_filter);
|
||||
|
||||
int response = open_session_selector.run();
|
||||
open_session_selector.hide ();
|
||||
|
||||
switch (response) {
|
||||
case Gtk::RESPONSE_ACCEPT:
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
}
|
||||
|
||||
string session_path = open_session_selector.get_filename();
|
||||
string path, name;
|
||||
bool isnew;
|
||||
|
||||
if (session_path.empty()) {
|
||||
return;
|
||||
}
|
||||
int rv = ARDOUR::inflate_session (session_path, Config->get_default_session_parent_dir(), path, name);
|
||||
if (rv == 0) {
|
||||
_session_is_new = false;
|
||||
load_session (path, name);
|
||||
return;
|
||||
}
|
||||
else if (rv < 0) {
|
||||
ArdourMessageDialog msg (_main_window, string_compose (_("Extracting session-archive failed: %1"), inflate_error (rv)));
|
||||
msg.run ();
|
||||
return;
|
||||
}
|
||||
|
||||
rv = new_session_from_aaf (session_path, Config->get_default_session_parent_dir(), path, name);
|
||||
if (rv == 0) {
|
||||
_session_is_new = false;
|
||||
return;
|
||||
} else if (rv < 0) {
|
||||
ArdourMessageDialog msg (_main_window, _("Extracting AAF failed"));
|
||||
msg.run ();
|
||||
return;
|
||||
}
|
||||
|
||||
if (ARDOUR::find_session (session_path, path, name, isnew) == 0) {
|
||||
_session_is_new = isnew;
|
||||
load_session (path, name);
|
||||
}
|
||||
SessionDialog* session_dialog = new SessionDialog (SessionDialog::Open, string(), Config->get_default_session_parent_dir(), string(), true);
|
||||
session_dialog->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::session_dialog_response_handler), session_dialog));
|
||||
session_dialog->present ();
|
||||
}
|
||||
|
||||
void
|
||||
ARDOUR_UI::open_recent_session ()
|
||||
{
|
||||
bool can_return = (_session != 0);
|
||||
|
||||
SessionDialog recent_session_dialog;
|
||||
|
||||
while (true) {
|
||||
|
||||
ResponseType r = (ResponseType) recent_session_dialog.run ();
|
||||
|
||||
switch (r) {
|
||||
case RESPONSE_ACCEPT:
|
||||
break;
|
||||
default:
|
||||
if (can_return) {
|
||||
recent_session_dialog.hide();
|
||||
return;
|
||||
} else {
|
||||
exit (EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
|
||||
recent_session_dialog.hide();
|
||||
|
||||
bool should_be_new;
|
||||
|
||||
std::string path = recent_session_dialog.session_folder();
|
||||
std::string state = recent_session_dialog.session_name (should_be_new);
|
||||
|
||||
if (should_be_new == true) {
|
||||
continue;
|
||||
}
|
||||
|
||||
_session_is_new = false;
|
||||
|
||||
if (load_session (path, state) == 0) {
|
||||
break;
|
||||
}
|
||||
|
||||
can_return = false;
|
||||
}
|
||||
SessionDialog* session_dialog = new SessionDialog (SessionDialog::Recent, string(), Config->get_default_session_parent_dir(), string(), true);
|
||||
session_dialog->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::session_dialog_response_handler), session_dialog));
|
||||
session_dialog->present ();
|
||||
}
|
||||
|
||||
int
|
||||
|
|
|
|||
|
|
@ -76,53 +76,119 @@ using namespace ARDOUR;
|
|||
using namespace ArdourWidgets;
|
||||
using namespace ARDOUR_UI_UTILS;
|
||||
|
||||
SessionDialog::SessionDialog (bool require_new, const std::string& session_name, const std::string& session_path, const std::string& template_name, bool cancel_not_quit)
|
||||
: ArdourDialog (_("Session Setup"), true, true)
|
||||
, new_only (require_new)
|
||||
SessionDialog::SessionDialog (DialogTab initial_tab, const std::string& session_name, const std::string& session_path, const std::string& template_name, bool cancel_not_quit)
|
||||
: ArdourDialog (initial_tab==New ? _("Session Setup") : _("Recent Sessions"), true, true)
|
||||
, new_name_was_edited (false)
|
||||
, new_folder_chooser (FILE_CHOOSER_ACTION_SELECT_FOLDER)
|
||||
, _existing_session_chooser_used (false)
|
||||
{
|
||||
set_position (WIN_POS_CENTER);
|
||||
get_vbox()->set_spacing (6);
|
||||
get_vbox()->pack_start ( _open_table, false, false);
|
||||
|
||||
string image_path;
|
||||
Searchpath rc (ARDOUR::ardour_data_search_path());
|
||||
rc.add_subdirectory_to_paths ("icons");
|
||||
if (find_file (rc, "harrison.png", image_path)) {
|
||||
Gtk::Image* image;
|
||||
if ((image = manage (new Gtk::Image (image_path))) != 0) {
|
||||
_open_table.attach ( *image, 0,1, 0,1, FILL, FILL, 0, 6);
|
||||
}
|
||||
}
|
||||
|
||||
/* Possible update message */
|
||||
if (ARDOUR_UI::instance()->announce_string() != "" ) {
|
||||
_info_box.set_border_width (12);
|
||||
_info_box.set_spacing (6);
|
||||
|
||||
_info_box.pack_start (info_scroller_label, false, false);
|
||||
|
||||
info_scroller_count = 0;
|
||||
info_scroller_connection = Glib::signal_timeout().connect (mem_fun(*this, &SessionDialog::info_scroller_update), 50);
|
||||
|
||||
ArdourButton *updates_button = manage (new ArdourButton (_("Check the website for more...")));
|
||||
|
||||
updates_button->signal_clicked.connect (mem_fun(*this, &SessionDialog::updates_button_clicked) );
|
||||
set_tooltip (*updates_button, _("Click to open the program website in your web browser"));
|
||||
|
||||
_info_box.pack_start (*updates_button, false, false);
|
||||
|
||||
_info_box.show_all ();
|
||||
}
|
||||
_open_table.attach ( _info_box, 1,3, 0,1, FILL, FILL, 0, 6);
|
||||
|
||||
new_button.set_text("NEW");
|
||||
new_button.set_name ("transport option button");
|
||||
new_button.signal_button_press_event().connect (sigc::mem_fun (*this, &SessionDialog::new_button_pressed), false);
|
||||
|
||||
recent_button.set_text("RECENT");
|
||||
recent_button.set_name ("transport option button");
|
||||
recent_button.signal_button_press_event().connect (sigc::mem_fun (*this, &SessionDialog::recent_button_pressed), false);
|
||||
|
||||
existing_button.set_text("OPEN");
|
||||
existing_button.set_name ("transport option button");
|
||||
existing_button.signal_button_press_event().connect (sigc::mem_fun (*this, &SessionDialog::existing_button_pressed), false);
|
||||
|
||||
prefs_button.set_text("SETTINGS");
|
||||
prefs_button.set_name ("transport option button");
|
||||
prefs_button.signal_button_press_event().connect (sigc::mem_fun (*this, &SessionDialog::prefs_button_pressed), false);
|
||||
|
||||
Glib::RefPtr<SizeGroup> grp = SizeGroup::create (Gtk::SIZE_GROUP_HORIZONTAL);
|
||||
grp->add_widget(new_button);
|
||||
grp->add_widget(recent_button);
|
||||
grp->add_widget(existing_button);
|
||||
grp->add_widget(prefs_button);
|
||||
|
||||
ArdourHSpacer *spacer = manage (new ArdourHSpacer(1.0));
|
||||
spacer->set_size_request(-1, 12);
|
||||
_open_table.attach (*spacer, 0,3, 1,2, FILL|EXPAND, SHRINK, 0, 6);
|
||||
|
||||
_open_table.attach ( new_button, 0,1, 2,3, FILL, FILL);
|
||||
_open_table.attach ( recent_button, 0,1, 3,4, FILL, FILL);
|
||||
_open_table.attach ( existing_button, 0,1, 4,5, FILL, FILL);
|
||||
_open_table.attach ( prefs_button, 0,1, 5,6, FILL, FILL);
|
||||
|
||||
Label *vspacer = manage (new Label());
|
||||
vspacer->set_size_request(8, -1);
|
||||
_open_table.attach (*vspacer, 1,2, 1,6, FILL, FILL|EXPAND, 0, 0);
|
||||
|
||||
_open_table.attach (_tabs, 2,3, 2,6, FILL|EXPAND, FILL|EXPAND, 0, 0);
|
||||
|
||||
_tabs.set_show_tabs(false);
|
||||
_tabs.set_show_border(false);
|
||||
|
||||
_tabs.append_page(session_new_vbox);
|
||||
_tabs.append_page(recent_vbox);
|
||||
_tabs.append_page(existing_session_chooser);
|
||||
_tabs.append_page(*manage (new Label("This page intentionally left blank")));
|
||||
|
||||
session_new_vbox.show_all();
|
||||
recent_vbox.show_all();
|
||||
existing_session_chooser.show_all();
|
||||
|
||||
_tabs.show_all();
|
||||
_tabs.set_current_page(0);
|
||||
|
||||
cancel_button = add_button ((cancel_not_quit ? Stock::CANCEL : Stock::QUIT), RESPONSE_CANCEL);
|
||||
back_button = add_button (Stock::GO_BACK, RESPONSE_NO);
|
||||
|
||||
open_button = add_button (Stock::OPEN, RESPONSE_ACCEPT);
|
||||
|
||||
back_button->signal_button_press_event().connect (sigc::mem_fun (*this, &SessionDialog::back_button_pressed), false);
|
||||
open_button->signal_button_press_event().connect (sigc::mem_fun (*this, &SessionDialog::open_button_pressed), false);
|
||||
|
||||
open_button->set_sensitive (false);
|
||||
back_button->set_sensitive (false);
|
||||
|
||||
/* this is where announcements will be displayed, but it may be empty
|
||||
* and invisible most of the time.
|
||||
*/
|
||||
|
||||
info_frame.set_shadow_type(SHADOW_ETCHED_OUT);
|
||||
info_frame.set_no_show_all (true);
|
||||
info_frame.set_border_width (12);
|
||||
get_vbox()->pack_start (info_frame, false, false);
|
||||
|
||||
if (!template_name.empty()) {
|
||||
load_template_override = template_name;
|
||||
}
|
||||
|
||||
setup_new_session_page ();
|
||||
|
||||
if (!require_new) {
|
||||
setup_initial_choice_box ();
|
||||
get_vbox()->pack_start (ic_vbox, true, true);
|
||||
} else {
|
||||
get_vbox()->pack_start (session_new_vbox, true, true);
|
||||
}
|
||||
|
||||
get_vbox()->show_all ();
|
||||
|
||||
/* fill data models and show/hide accordingly */
|
||||
|
||||
setup_new_session_page ();
|
||||
setup_existing_box ();
|
||||
populate_session_templates ();
|
||||
setup_untitled_session ();
|
||||
setup_recent_sessions ();
|
||||
|
||||
recent_vbox.pack_start (recent_scroller, true, true);
|
||||
|
||||
get_vbox()->show_all ();
|
||||
|
||||
if (recent_session_model) {
|
||||
int cnt = redisplay_recent_sessions ();
|
||||
|
|
@ -130,49 +196,21 @@ SessionDialog::SessionDialog (bool require_new, const std::string& session_name,
|
|||
recent_scroller.show();
|
||||
recent_label.show ();
|
||||
|
||||
if (cnt > 4) {
|
||||
recent_scroller.set_size_request (-1, 300);
|
||||
} else {
|
||||
recent_scroller.set_size_request (-1, 80);
|
||||
}
|
||||
recent_scroller.set_size_request (-1, 300);
|
||||
} else {
|
||||
recent_scroller.hide();
|
||||
recent_label.hide ();
|
||||
}
|
||||
}
|
||||
inital_height = get_height();
|
||||
inital_width = get_width();
|
||||
|
||||
if (require_new) {
|
||||
setup_untitled_session ();
|
||||
}
|
||||
|
||||
disallow_idle ();
|
||||
}
|
||||
|
||||
SessionDialog::SessionDialog ()
|
||||
: ArdourDialog (_("Recent Sessions"), true, true)
|
||||
, new_only (false)
|
||||
, _existing_session_chooser_used (false) // caller must check should_be_new
|
||||
{
|
||||
get_vbox()->set_spacing (6);
|
||||
|
||||
cancel_button = add_button (Stock::CANCEL, RESPONSE_CANCEL);
|
||||
open_button = add_button (Stock::OPEN, RESPONSE_ACCEPT);
|
||||
open_button->set_sensitive (false);
|
||||
|
||||
setup_recent_sessions ();
|
||||
|
||||
get_vbox()->pack_start (recent_scroller, true, true);
|
||||
get_vbox()->show_all ();
|
||||
|
||||
recent_scroller.show();
|
||||
|
||||
int cnt = redisplay_recent_sessions ();
|
||||
if (cnt > 4) {
|
||||
recent_scroller.set_size_request (-1, 300);
|
||||
_tabs.signal_switch_page().connect (sigc::mem_fun (*this, &SessionDialog::tab_page_switched));
|
||||
if (initial_tab==New) {
|
||||
_tabs.set_current_page(0);
|
||||
new_button.set_active_state (Gtkmm2ext::ExplicitActive);
|
||||
} else if (initial_tab==Open) {
|
||||
_tabs.set_current_page(2);
|
||||
} else {
|
||||
recent_scroller.set_size_request (-1, 80);
|
||||
_tabs.set_current_page(1);
|
||||
}
|
||||
|
||||
disallow_idle ();
|
||||
|
|
@ -182,6 +220,15 @@ SessionDialog::~SessionDialog()
|
|||
{
|
||||
}
|
||||
|
||||
void
|
||||
SessionDialog::tab_page_switched(GtkNotebookPage*, guint page_number)
|
||||
{
|
||||
new_button.set_active_state ( page_number==0 ? Gtkmm2ext::ExplicitActive : Gtkmm2ext::Off );
|
||||
recent_button.set_active_state ( page_number==1 ? Gtkmm2ext::ExplicitActive : Gtkmm2ext::Off);
|
||||
existing_button.set_active_state (page_number==2 ? Gtkmm2ext::ExplicitActive : Gtkmm2ext::Off);
|
||||
prefs_button.set_active_state ( page_number==3 ? Gtkmm2ext::ExplicitActive : Gtkmm2ext::Off);
|
||||
}
|
||||
|
||||
uint32_t
|
||||
SessionDialog::meta_master_bus_profile (std::string script_path)
|
||||
{
|
||||
|
|
@ -253,10 +300,6 @@ SessionDialog::master_channel_count ()
|
|||
bool
|
||||
SessionDialog::use_session_template () const
|
||||
{
|
||||
if (!back_button->is_sensitive () && !new_only) {
|
||||
/* open session -- not create a new one */
|
||||
return false;
|
||||
}
|
||||
|
||||
if (template_chooser.get_selection()->count_selected_rows() > 0) {
|
||||
return true;
|
||||
|
|
@ -291,54 +334,60 @@ SessionDialog::clear_name ()
|
|||
std::string
|
||||
SessionDialog::session_name (bool& should_be_new)
|
||||
{
|
||||
/* Try recent session selection */
|
||||
|
||||
TreeIter iter = recent_session_display.get_selection()->get_selected();
|
||||
|
||||
if (iter) {
|
||||
should_be_new = false;
|
||||
string s = (*iter)[recent_session_columns.fullpath];
|
||||
if (Glib::file_test (s, Glib::FILE_TEST_IS_REGULAR)) {
|
||||
return PBD::basename_nosuffix (s);
|
||||
}
|
||||
return (*iter)[recent_session_columns.visible_name];
|
||||
}
|
||||
|
||||
if (_existing_session_chooser_used) {
|
||||
/* existing session chosen from file chooser */
|
||||
should_be_new = false;
|
||||
return existing_session_chooser.get_filename ();
|
||||
} else {
|
||||
switch (_tabs.get_current_page()) {
|
||||
case 0: {
|
||||
should_be_new = true;
|
||||
string val = new_name_entry.get_text ();
|
||||
strip_whitespace_edges (val);
|
||||
return val;
|
||||
} break;
|
||||
case 1: {
|
||||
/* Try recent session selection */
|
||||
TreeIter iter = recent_session_display.get_selection()->get_selected();
|
||||
if (iter) {
|
||||
should_be_new = false;
|
||||
string s = (*iter)[recent_session_columns.fullpath];
|
||||
if (Glib::file_test (s, Glib::FILE_TEST_IS_REGULAR)) {
|
||||
return PBD::basename_nosuffix (s);
|
||||
}
|
||||
return (*iter)[recent_session_columns.visible_name];
|
||||
}
|
||||
} break;
|
||||
case 2: {
|
||||
/* existing session chosen from file chooser */
|
||||
should_be_new = false;
|
||||
return existing_session_chooser.get_filename ();
|
||||
} break;
|
||||
}
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
std::string
|
||||
SessionDialog::session_folder ()
|
||||
{
|
||||
/* Try recent session selection */
|
||||
|
||||
TreeIter iter = recent_session_display.get_selection()->get_selected();
|
||||
|
||||
if (iter) {
|
||||
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 Glib::path_get_dirname (existing_session_chooser.get_current_folder ());
|
||||
} else {
|
||||
switch (_tabs.get_current_page()) {
|
||||
case 0: {
|
||||
std::string val = new_name_entry.get_text();
|
||||
strip_whitespace_edges (val);
|
||||
std::string legal_session_folder_name = legalize_for_path (val);
|
||||
return Glib::build_filename (new_folder_chooser.get_filename (), legal_session_folder_name);
|
||||
} break;
|
||||
case 1: {
|
||||
/* Try recent session selection */
|
||||
TreeIter iter = recent_session_display.get_selection()->get_selected();
|
||||
if (iter) {
|
||||
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;
|
||||
}
|
||||
} break;
|
||||
case 2: {
|
||||
/* existing session chosen from file chooser */
|
||||
return Glib::path_get_dirname (existing_session_chooser.get_current_folder ());
|
||||
} break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -378,84 +427,11 @@ SessionDialog::setup_recent_sessions ()
|
|||
}
|
||||
|
||||
void
|
||||
SessionDialog::setup_initial_choice_box ()
|
||||
SessionDialog::setup_existing_box ()
|
||||
{
|
||||
ic_vbox.set_spacing (6);
|
||||
|
||||
HBox* centering_hbox = manage (new HBox);
|
||||
VBox* centering_vbox = manage (new VBox);
|
||||
|
||||
centering_vbox->set_spacing (6);
|
||||
|
||||
Label* new_label = manage (new Label);
|
||||
new_label->set_markup (string_compose ("<span weight=\"bold\" size=\"large\">%1</span>", _("New Session")));
|
||||
new_label->set_justify (JUSTIFY_CENTER);
|
||||
|
||||
ic_new_session_button.add (*new_label);
|
||||
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;
|
||||
|
||||
Searchpath rc (ARDOUR::ardour_data_search_path());
|
||||
rc.add_subdirectory_to_paths ("resources");
|
||||
|
||||
if (find_file (rc, PROGRAM_NAME "-small-splash.png", image_path)) {
|
||||
Gtk::Image* image;
|
||||
if ((image = manage (new Gtk::Image (image_path))) != 0) {
|
||||
hbox->pack_start (*image, false, false);
|
||||
}
|
||||
}
|
||||
|
||||
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 */
|
||||
|
||||
if (ARDOUR_UI::instance()->announce_string() != "" ) {
|
||||
|
||||
Box *info_box = manage (new VBox);
|
||||
info_box->set_border_width (12);
|
||||
info_box->set_spacing (6);
|
||||
|
||||
info_box->pack_start (info_scroller_label, false, false);
|
||||
|
||||
info_scroller_count = 0;
|
||||
info_scroller_connection = Glib::signal_timeout().connect (mem_fun(*this, &SessionDialog::info_scroller_update), 50);
|
||||
|
||||
Gtk::Button *updates_button = manage (new Gtk::Button (_("Check the website for more...")));
|
||||
|
||||
updates_button->signal_clicked().connect (mem_fun(*this, &SessionDialog::updates_button_clicked) );
|
||||
set_tooltip (*updates_button, _("Click to open the program website in your web browser"));
|
||||
|
||||
info_box->pack_start (*updates_button, false, false);
|
||||
|
||||
info_frame.add (*info_box);
|
||||
info_box->show_all ();
|
||||
info_frame.show ();
|
||||
}
|
||||
|
||||
/* recent session scroller */
|
||||
setup_recent_sessions ();
|
||||
|
||||
recent_label.set_no_show_all (true);
|
||||
recent_scroller.set_no_show_all (true);
|
||||
|
||||
recent_label.set_markup (string_compose ("<span weight=\"bold\" size=\"large\">%1</span>", _("Recent Sessions")));
|
||||
|
||||
centering_vbox->pack_start (recent_label, false, false, 12);
|
||||
centering_vbox->pack_start (recent_scroller, true, true);
|
||||
|
||||
/* Browse button */
|
||||
|
||||
existing_session_chooser.set_title (_("Select session file"));
|
||||
existing_session_chooser.signal_file_set().connect (sigc::mem_fun (*this, &SessionDialog::existing_session_selected));
|
||||
existing_session_chooser.set_size_request (450, 300);
|
||||
existing_session_chooser.set_current_folder(poor_mans_glob (Config->get_default_session_parent_dir()));
|
||||
|
||||
FileFilter session_filter;
|
||||
|
|
@ -484,11 +460,8 @@ SessionDialog::setup_initial_choice_box ()
|
|||
|
||||
Gtkmm2ext::add_volume_shortcuts (existing_session_chooser);
|
||||
|
||||
Label* browse_label = manage (new Label);
|
||||
browse_label->set_markup (string_compose ("<span weight=\"bold\" size=\"large\">%1</span>", _("Other Sessions")));
|
||||
|
||||
centering_vbox->pack_start (*browse_label, false, false, 12);
|
||||
centering_vbox->pack_start (existing_session_chooser, false, false);
|
||||
existing_session_chooser.signal_selection_changed().connect (mem_fun (this, &SessionDialog::existing_file_selected));
|
||||
existing_session_chooser.signal_file_activated().connect (sigc::mem_fun (*this, &SessionDialog::existing_file_activated));
|
||||
|
||||
/* --disable plugins UI */
|
||||
|
||||
|
|
@ -502,12 +475,39 @@ SessionDialog::setup_initial_choice_box ()
|
|||
_disable_plugins.signal_clicked().connect (sigc::mem_fun (*this, &SessionDialog::disable_plugins_clicked));
|
||||
centering_vbox->pack_start (_disable_plugins, false, false);
|
||||
#endif
|
||||
}
|
||||
|
||||
/* pack it all up */
|
||||
void
|
||||
SessionDialog::existing_file_selected ()
|
||||
{
|
||||
open_button->set_sensitive(false);
|
||||
|
||||
centering_hbox->pack_start (*centering_vbox, true, true);
|
||||
ic_vbox.pack_start (*centering_hbox, true, true);
|
||||
ic_vbox.show_all ();
|
||||
float sr;
|
||||
SampleFormat sf;
|
||||
string pv;
|
||||
XMLNode engine_hints ("EngineHints");
|
||||
|
||||
std::string s = existing_session_chooser.get_filename ();
|
||||
if (Glib::file_test (s, Glib::FILE_TEST_IS_REGULAR)) {
|
||||
switch (Session::get_info_from_path (s, sr, sf, pv, &engine_hints)) {
|
||||
case 0: {
|
||||
//TODO: display the rate somewhere? check that our engine can open this rate?
|
||||
/* OK */
|
||||
} break;
|
||||
case -1:
|
||||
error << string_compose (_("Session file %1 does not exist"), s) << endmsg;
|
||||
return;
|
||||
break;
|
||||
case -3:
|
||||
error << string_compose (_("Session %1 is from a newer version of %2"), s, PROGRAM_NAME) << endmsg;
|
||||
return;
|
||||
break;
|
||||
default:
|
||||
error << string_compose (_("Cannot get existing session information from %1"), s) << endmsg;
|
||||
//fallthrough
|
||||
}
|
||||
open_button->set_sensitive(true); //still potentially openable; checks for session archives, .ptf, and .aaf will have to occur later
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -517,7 +517,7 @@ SessionDialog::session_selected ()
|
|||
to say "Open"
|
||||
*/
|
||||
|
||||
Gtk::Widget* tl = ic_vbox.get_toplevel();
|
||||
Gtk::Widget* tl = recent_vbox.get_toplevel();
|
||||
Gtk::Window* win;
|
||||
if ((win = dynamic_cast<Gtk::Window*>(tl)) != 0) {
|
||||
/* ::get_default_widget() is not wrapped in gtkmm */
|
||||
|
|
@ -529,26 +529,42 @@ SessionDialog::session_selected ()
|
|||
}
|
||||
}
|
||||
|
||||
void
|
||||
SessionDialog::new_session_button_clicked ()
|
||||
bool
|
||||
SessionDialog::new_button_pressed (GdkEventButton*)
|
||||
{
|
||||
_existing_session_chooser_used = false;
|
||||
recent_session_display.get_selection()->unselect_all ();
|
||||
_tabs.set_current_page(0);
|
||||
|
||||
get_vbox()->remove (ic_vbox);
|
||||
get_vbox()->pack_start (session_new_vbox, true, true);
|
||||
new_name_changed(); //checks for a valid name and (maybe) sensitizes the button
|
||||
|
||||
back_button->set_sensitive (true);
|
||||
setup_untitled_session ();
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
SessionDialog::back_button_pressed (GdkEventButton*)
|
||||
SessionDialog::recent_button_pressed (GdkEventButton*)
|
||||
{
|
||||
get_vbox()->remove (session_new_vbox);
|
||||
back_button->set_sensitive (false);
|
||||
get_vbox()->pack_start (ic_vbox);
|
||||
resize(inital_height, inital_width);
|
||||
_tabs.set_current_page(1);
|
||||
|
||||
recent_session_row_selected(); //checks for a selection and (maybe) sensitizes the open button
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
SessionDialog::existing_button_pressed (GdkEventButton*)
|
||||
{
|
||||
_tabs.set_current_page(2);
|
||||
|
||||
existing_file_selected(); //checks for a selection and (maybe) sensitizes the open button
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool
|
||||
SessionDialog::prefs_button_pressed (GdkEventButton*)
|
||||
{
|
||||
_tabs.set_current_page(3);
|
||||
|
||||
open_button->set_sensitive(false); //do not allow to open a session from this page
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
@ -570,7 +586,6 @@ SessionDialog::setup_untitled_session ()
|
|||
new_name_entry.select_region (0, -1);
|
||||
new_name_was_edited = false;
|
||||
|
||||
back_button->set_sensitive (true);
|
||||
new_name_entry.grab_focus ();
|
||||
}
|
||||
|
||||
|
|
@ -636,7 +651,6 @@ SessionDialog::populate_session_templates ()
|
|||
void
|
||||
SessionDialog::setup_new_session_page ()
|
||||
{
|
||||
session_new_vbox.set_border_width (8);
|
||||
session_new_vbox.set_spacing (8);
|
||||
|
||||
Label* name_label = manage (new Label);
|
||||
|
|
@ -724,7 +738,7 @@ SessionDialog::setup_new_session_page ()
|
|||
//template_desc is the textview that displays the currently selected template's description
|
||||
template_desc.set_editable (false);
|
||||
template_desc.set_wrap_mode (Gtk::WRAP_WORD);
|
||||
template_desc.set_size_request (300,400);
|
||||
template_desc.set_size_request (300,300);
|
||||
template_desc.set_name (X_("TextOnBackground"));
|
||||
template_desc.set_border_width (6);
|
||||
|
||||
|
|
@ -734,14 +748,17 @@ SessionDialog::setup_new_session_page ()
|
|||
template_chooser.append_column (_("Template"), session_template_columns.name);
|
||||
#ifdef MIXBUS
|
||||
template_chooser.append_column (_("Modified With"), session_template_columns.modified_with_short);
|
||||
#endif
|
||||
template_chooser.set_headers_visible (true);
|
||||
#else
|
||||
template_chooser.set_headers_visible (false); //there is only one column and its purpose should be obvious
|
||||
#endif
|
||||
template_chooser.get_selection()->set_mode (SELECTION_SINGLE);
|
||||
template_chooser.get_selection()->signal_changed().connect (sigc::mem_fun (*this, &SessionDialog::template_row_selected));
|
||||
template_chooser.set_sensitive (true);
|
||||
if (UIConfiguration::instance().get_use_tooltips()) {
|
||||
template_chooser.set_tooltip_column(4); // modified_with_long
|
||||
}
|
||||
template_chooser.set_size_request (150,300);
|
||||
|
||||
session_new_vbox.pack_start (*template_hbox, true, true);
|
||||
#ifndef LIVETRAX
|
||||
|
|
@ -1012,6 +1029,12 @@ SessionDialog::redisplay_recent_sessions ()
|
|||
}
|
||||
recent_session_model->set_sort_column (abs (sort) -1, sort < 0 ? Gtk::SORT_DESCENDING : Gtk::SORT_ASCENDING);
|
||||
|
||||
//auto-select the first item in the list
|
||||
Gtk::TreeModel::Row first = recent_session_model->children()[0];
|
||||
if(first) {
|
||||
recent_session_display.get_selection()->select(first);
|
||||
}
|
||||
|
||||
return session_snapshot_count;
|
||||
}
|
||||
|
||||
|
|
@ -1129,15 +1152,12 @@ SessionDialog::disable_plugins_clicked ()
|
|||
}
|
||||
|
||||
void
|
||||
SessionDialog::existing_session_selected ()
|
||||
SessionDialog::existing_file_activated ()
|
||||
{
|
||||
_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.
|
||||
*/
|
||||
open_button->set_sensitive (true);
|
||||
response (RESPONSE_ACCEPT);
|
||||
std::string s = existing_session_chooser.get_filename ();
|
||||
if (Glib::file_test (s, Glib::FILE_TEST_IS_REGULAR)) {
|
||||
response (RESPONSE_ACCEPT);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@
|
|||
#include <gtkmm/box.h>
|
||||
#include <gtkmm/radiobutton.h>
|
||||
#include <gtkmm/filechooserbutton.h>
|
||||
#include <gtkmm/filechooserwidget.h>
|
||||
#include <gtkmm/scrolledwindow.h>
|
||||
#include <gtkmm/textview.h>
|
||||
#include <gtkmm/treeview.h>
|
||||
|
|
@ -46,15 +47,23 @@
|
|||
#include "ardour/utils.h"
|
||||
|
||||
#include "ardour_dialog.h"
|
||||
#include "option_editor.h"
|
||||
|
||||
class EngineControl;
|
||||
|
||||
class SessionDialog : public ArdourDialog
|
||||
{
|
||||
public:
|
||||
SessionDialog (bool require_new, const std::string& session_name, const std::string& session_path,
|
||||
enum DialogTab
|
||||
{
|
||||
New = 0,
|
||||
Recent,
|
||||
Open,
|
||||
Prefs
|
||||
};
|
||||
|
||||
SessionDialog (DialogTab initial_tab, const std::string& session_name, const std::string& session_path,
|
||||
const std::string& template_name, bool cancel_not_quit);
|
||||
SessionDialog ();
|
||||
~SessionDialog ();
|
||||
|
||||
std::string session_name (bool& should_be_new);
|
||||
|
|
@ -72,29 +81,37 @@ public:
|
|||
bool was_new_name_edited() const { return new_name_was_edited; }
|
||||
|
||||
private:
|
||||
bool new_only;
|
||||
|
||||
bool on_delete_event (GdkEventAny*);
|
||||
|
||||
Gtk::Button* cancel_button;
|
||||
Gtk::Button* open_button;
|
||||
Gtk::Button* back_button;
|
||||
Gtk::Button* quit_button;
|
||||
|
||||
ArdourWidgets::ArdourButton new_button;
|
||||
ArdourWidgets::ArdourButton recent_button;
|
||||
ArdourWidgets::ArdourButton existing_button;
|
||||
ArdourWidgets::ArdourButton prefs_button;
|
||||
|
||||
Gtk::Notebook _tabs;
|
||||
|
||||
Gtk::ComboBoxText timebase_chooser;
|
||||
|
||||
bool back_button_pressed (GdkEventButton*);
|
||||
bool new_button_pressed (GdkEventButton*);
|
||||
bool recent_button_pressed (GdkEventButton*);
|
||||
bool existing_button_pressed (GdkEventButton*);
|
||||
bool prefs_button_pressed (GdkEventButton*);
|
||||
|
||||
bool open_button_pressed (GdkEventButton*);
|
||||
|
||||
Gtk::Frame info_frame;
|
||||
Gtk::HBox _info_box;
|
||||
|
||||
Gtk::Table _open_table;
|
||||
|
||||
/* initial choice page */
|
||||
|
||||
void setup_initial_choice_box ();
|
||||
void setup_existing_box ();
|
||||
void setup_recent_sessions ();
|
||||
Gtk::VBox ic_vbox;
|
||||
Gtk::Button ic_new_session_button;
|
||||
void new_session_button_clicked ();
|
||||
Gtk::VBox recent_vbox;
|
||||
|
||||
/* recent sessions */
|
||||
|
||||
|
|
@ -134,7 +151,7 @@ private:
|
|||
Glib::RefPtr<Gtk::TreeStore> recent_session_model;
|
||||
Gtk::ScrolledWindow recent_scroller;
|
||||
Gtk::Label recent_label;
|
||||
Gtk::FileChooserButton existing_session_chooser;
|
||||
Gtk::FileChooserWidget existing_session_chooser;
|
||||
int redisplay_recent_sessions ();
|
||||
void recent_session_row_selected ();
|
||||
void recent_session_sort_changed ();
|
||||
|
|
@ -143,9 +160,11 @@ private:
|
|||
void recent_context_mennu (GdkEventButton*);
|
||||
void recent_remove_selected ();
|
||||
|
||||
void existing_session_selected ();
|
||||
void session_selected ();
|
||||
|
||||
void existing_file_selected();
|
||||
void existing_file_activated ();
|
||||
|
||||
/* new sessions */
|
||||
|
||||
void setup_new_session_page ();
|
||||
|
|
@ -185,13 +204,14 @@ private:
|
|||
Gtk::Frame template_desc_frame;
|
||||
|
||||
Gtk::VBox session_new_vbox;
|
||||
Gtk::VBox session_existing_vbox;
|
||||
std::string load_template_override;
|
||||
|
||||
void new_name_changed ();
|
||||
void new_name_activated ();
|
||||
void populate_session_templates ();
|
||||
|
||||
void tab_page_switched(GtkNotebookPage*, guint page_number);
|
||||
|
||||
/* --disable plugins UI */
|
||||
Gtk::CheckButton _disable_plugins;
|
||||
void disable_plugins_clicked ();
|
||||
|
|
@ -203,16 +223,11 @@ private:
|
|||
|
||||
Glib::RefPtr<Pango::Layout> layout;
|
||||
|
||||
bool _existing_session_chooser_used; ///< set to true when the existing session chooser has been used
|
||||
|
||||
Gtk::Label info_scroller_label;
|
||||
std::string::size_type info_scroller_count;
|
||||
bool info_scroller_update();
|
||||
sigc::connection info_scroller_connection;
|
||||
void updates_button_clicked ();
|
||||
|
||||
int inital_height;
|
||||
int inital_width;
|
||||
};
|
||||
|
||||
#endif /* __gtk2_ardour_session_dialog_h__ */
|
||||
|
|
|
|||
|
|
@ -437,7 +437,7 @@ void
|
|||
StartupFSM::show_session_dialog (bool new_session_required)
|
||||
{
|
||||
set_state (WaitingForSessionPath);
|
||||
session_dialog = new SessionDialog (new_session_required, session_name, session_path, session_template, false);
|
||||
session_dialog = new SessionDialog (new_session_required ? SessionDialog::New : SessionDialog::Recent, session_name, session_path, session_template, false);
|
||||
current_dialog_connection = session_dialog->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &StartupFSM::dialog_response_handler), NewSessionDialog));
|
||||
session_dialog->set_position (WIN_POS_CENTER);
|
||||
session_dialog->present ();
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user