clean up use of open_file_dialog() modified API

This commit is contained in:
Paul Davis 2014-09-03 13:08:03 -04:00
parent 522a00ed52
commit e3872dd19f

View file

@ -296,59 +296,21 @@ SessionDialog::on_open_selected (WavesButton*)
void
SessionDialog::on_open_saved_session (WavesButton*)
{
#ifdef __APPLE__
set_keep_above(false);
string temp_session_full_file_name = ARDOUR::open_file_dialog(Config->get_default_session_parent_dir(), _("Select Saved Session"));
set_keep_above(true);
if(!temp_session_full_file_name.empty()) {
_selected_session_full_name = temp_session_full_file_name;
for (size_t i = 0; i < MAX_RECENT_SESSION_COUNTS; i++) {
_recent_session_button[i]->set_active (false);
}
_selection_type = SavedSession;
hide();
response (Gtk::RESPONSE_ACCEPT);
}
string temp_session_full_file_name = ARDOUR::open_file_dialog(Config->get_default_session_parent_dir(), _("Select Saved Session"));
set_keep_above(true);
if(!temp_session_full_file_name.empty()) {
_selected_session_full_name = temp_session_full_file_name;
for (size_t i = 0; i < MAX_RECENT_SESSION_COUNTS; i++) {
_recent_session_button[i]->set_active (false);
}
_selection_type = SavedSession;
hide ();
response (Gtk::RESPONSE_ACCEPT);
}
return;
#endif
#ifdef _WIN32
set_keep_above(false);
// Open the file save dialog, and choose the file name
string fileName;
if (open_file_dialog(fileName, Config->get_default_session_parent_dir(), _("Select Saved Session"))) {
set_keep_above(true);
_selected_session_full_name = fileName;
for (size_t i = 0; i < MAX_RECENT_SESSION_COUNTS; i++) {
_recent_session_button[i]->set_active(false);
}
_selection_type = SavedSession;
hide();
response (Gtk::RESPONSE_ACCEPT);
}
return;
#endif // _WIN32
Gtk::FileChooserDialog dialog(*this, _("Select Saved Session"));
dialog.add_button("CANCEL", Gtk::RESPONSE_CANCEL);
dialog.add_button("OK", Gtk::RESPONSE_OK);
set_keep_above(false);
int responce = dialog.run ();
set_keep_above(true);
if (responce == Gtk::RESPONSE_OK) {
_selected_session_full_name = dialog.get_filename();
for (size_t i = 0; i < MAX_RECENT_SESSION_COUNTS; i++) {
_recent_session_button[i]->set_active(false);
}
_selection_type = SavedSession;
hide();
response (Gtk::RESPONSE_ACCEPT);
}
}
void