smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 08:36:32 +01:00
Code Issues Projects Releases Wiki Activity

Make import-dialog independent of only-copy preference

Browse source 
This also fixes a logic error when "get_only_copy_imported_files"
was unset.

The condition under which "copy" was mandatory was rather convoluted,
so this also provides a more consistent user-experience.
This commit is contained in:
Robin Gareus 2020-04-14 17:37:06 +02:00
parent e3e7d22c38
commit ab1bc6b7d7
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
1 changed files with 4 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

27
gtk2_ardour/sfdb_ui.cc
View file

@ -1422,11 +1422,7 @@ SoundFileOmega::reset_options ()
to do embedding (or if we are importing a MIDI file). to do embedding (or if we are importing a MIDI file).
*/ */
if (UIConfiguration::instance().get_only_copy_imported_files()) { copy_files_btn.set_sensitive (false);
copy_files_btn.set_sensitive (false);
} else {
copy_files_btn.set_sensitive (false);
}
} }
bool same_size; bool same_size;
@ -1601,29 +1597,14 @@ SoundFileOmega::reset_options ()
* or any file if we are under nsm control */ * or any file if we are under nsm control */
must_copy |= _session->get_nsm_state() || have_a_midi_file || notebook.get_current_page() == 2; must_copy |= _session->get_nsm_state() || have_a_midi_file || notebook.get_current_page() == 2;
if (UIConfiguration::instance().get_only_copy_imported_files()) { if (must_copy || !selection_can_be_embedded_with_links) {
copy_files_btn.set_active (true);
if (selection_can_be_embedded_with_links && !must_copy) {
copy_files_btn.set_sensitive (true);
} else {
if (must_copy) {
copy_files_btn.set_active (true);
}
copy_files_btn.set_sensitive (false);
}
} else {
if (must_copy) {
copy_files_btn.set_active (true);
}
copy_files_btn.set_sensitive (!must_copy);
} }
copy_files_btn.set_sensitive (!must_copy && selection_can_be_embedded_with_links);
return true; return true;
} }
bool bool
SoundFileOmega::bad_file_message() SoundFileOmega::bad_file_message()
{ {