From d30b901d8cff95010b261e8ee07d38220d95b7e8 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 23 Apr 2016 14:45:19 +0200 Subject: [PATCH] save-as/snapshot tweaks: * allow to take snapshots and save-as read-only session. * change ambiguous "Save as" window title for "Snapshot & Switch" * start save-as in configured session-dir --- gtk2_ardour/ardour_ui.cc | 2 +- gtk2_ardour/ardour_ui_ed.cc | 4 ---- gtk2_ardour/save_as_dialog.cc | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 3f7ca3bf5e..006f0616f3 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -2634,7 +2634,7 @@ ARDOUR_UI::snapshot_session (bool switch_to_it) prompter.set_name ("Prompter"); prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT); if (switch_to_it) { - prompter.set_title (_("Save as...")); + prompter.set_title (_("Snapshot and switch")); prompter.set_prompt (_("New session name")); } else { prompter.set_title (_("Take Snapshot")); diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 9accf78953..6af4c37f70 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -186,15 +186,12 @@ ARDOUR_UI::install_actions () act = global_actions.register_action (main_actions, X_("SnapshotStay"), _("Snapshot (& keep working on current version) ..."), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::snapshot_session), false)); ActionManager::session_sensitive_actions.push_back (act); - ActionManager::write_sensitive_actions.push_back (act); act = global_actions.register_action (main_actions, X_("SnapshotSwitch"), _("Snapshot (& switch to new version) ..."), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::snapshot_session), true)); ActionManager::session_sensitive_actions.push_back (act); - ActionManager::write_sensitive_actions.push_back (act); act = global_actions.register_action (main_actions, X_("QuickSnapshotStay"), _("Quick Snapshot(& keep working on current version) ..."), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::quick_snapshot_session), false)); ActionManager::session_sensitive_actions.push_back (act); - ActionManager::write_sensitive_actions.push_back (act); act = global_actions.register_action (main_actions, X_("QuickSnapshotSwitch"), _("Quick Snapshot (& switch to new version) ..."), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::quick_snapshot_session), true)); ActionManager::session_sensitive_actions.push_back (act); @@ -202,7 +199,6 @@ ARDOUR_UI::install_actions () act = global_actions.register_action (main_actions, X_("SaveAs"), _("Save As..."), sigc::mem_fun(*this, &ARDOUR_UI::save_session_as)); ActionManager::session_sensitive_actions.push_back (act); - ActionManager::write_sensitive_actions.push_back (act); act = global_actions.register_action (main_actions, X_("Rename"), _("Rename..."), sigc::mem_fun(*this, &ARDOUR_UI::rename_session)); ActionManager::session_sensitive_actions.push_back (act); diff --git a/gtk2_ardour/save_as_dialog.cc b/gtk2_ardour/save_as_dialog.cc index 9c8d3cb734..ee14e3a831 100644 --- a/gtk2_ardour/save_as_dialog.cc +++ b/gtk2_ardour/save_as_dialog.cc @@ -85,7 +85,7 @@ SaveAsDialog::SaveAsDialog () no_include_media_button.signal_toggled ().connect (sigc::mem_fun (*this, &SaveAsDialog::no_include_toggled)); new_parent_folder_selector.set_action (FILE_CHOOSER_ACTION_SELECT_FOLDER); - new_parent_folder_selector.set_current_folder (Glib::get_home_dir()); // Why $HOME and not poor_mans_glob (Config->get_default_session_parent_dir ()) ?? + new_parent_folder_selector.set_current_folder (Config->get_default_session_parent_dir ()); new_name_entry.signal_changed().connect (sigc::mem_fun (*this, &SaveAsDialog::name_entry_changed)); new_parent_folder_selector.signal_current_folder_changed().connect (sigc::mem_fun (*this, &SaveAsDialog::name_entry_changed)); new_parent_folder_selector.signal_selection_changed().connect (sigc::mem_fun (*this, &SaveAsDialog::name_entry_changed)); -- 2.30.2