summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2020-04-14 17:37:06 +0200
committerRobin Gareus <robin@gareus.org>2020-04-14 17:37:06 +0200
commitab1bc6b7d7e663bbfae9b12bc535ee0f30a8ca08 (patch)
tree50ff2171d1e871bce032a23ae1023b086fcfed17 /gtk2_ardour
parente3e7d22c381ec502bfa0b8496bbf49de40b37826 (diff)
Make import-dialog independent of only-copy preference
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.
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/sfdb_ui.cc27
1 files changed, 4 insertions, 23 deletions
diff --git a/gtk2_ardour/sfdb_ui.cc b/gtk2_ardour/sfdb_ui.cc
index 70bcf7aabc..9fcdcc367e 100644
--- a/gtk2_ardour/sfdb_ui.cc
+++ b/gtk2_ardour/sfdb_ui.cc
@@ -1422,11 +1422,7 @@ SoundFileOmega::reset_options ()
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);
- } else {
- copy_files_btn.set_sensitive (false);
- }
+ copy_files_btn.set_sensitive (false);
}
bool same_size;
@@ -1601,29 +1597,14 @@ SoundFileOmega::reset_options ()
* or any file if we are under nsm control */
must_copy |= _session->get_nsm_state() || have_a_midi_file || notebook.get_current_page() == 2;
- if (UIConfiguration::instance().get_only_copy_imported_files()) {
-
- 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);
+ if (must_copy || !selection_can_be_embedded_with_links) {
+ copy_files_btn.set_active (true);
}
+ copy_files_btn.set_sensitive (!must_copy && selection_can_be_embedded_with_links);
return true;
}
-
bool
SoundFileOmega::bad_file_message()
{