From bcfcbe68e8ba8824bcd5bd8152709bd27aa9b990 Mon Sep 17 00:00:00 2001 From: Wieland Hoffmann Date: Tue, 4 Apr 2017 19:18:33 +0200 Subject: [PATCH 1/2] PICARD-1052: Only enable search for similar tracks if the selection contains objects --- picard/ui/mainwindow.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/picard/ui/mainwindow.py b/picard/ui/mainwindow.py index 8246b5c7b..58d661323 100644 --- a/picard/ui/mainwindow.py +++ b/picard/ui/mainwindow.py @@ -873,6 +873,7 @@ class MainWindow(QtWidgets.QMainWindow): can_view_info = bool(single and single.can_view_info()) can_browser_lookup = bool(single and single.can_browser_lookup()) have_files = len(self.tagger.get_files_from_objects(self.selected_objects)) > 0 + have_objects = len(self.selected_objects) > 0 for obj in self.selected_objects: if obj is None: continue @@ -901,6 +902,7 @@ class MainWindow(QtWidgets.QMainWindow): self.cut_action.setEnabled(bool(self.selected_objects)) files = self.get_selected_or_unmatched_files() self.tags_from_filenames_action.setEnabled(bool(files)) + self.track_search_action.setEnabled(have_objects) def update_selection(self, objects=None): if self.ignore_selection_changes: From 9e0204964444fdb494bc032e03939541c6ea07dd Mon Sep 17 00:00:00 2001 From: Wieland Hoffmann Date: Fri, 21 Apr 2017 19:20:44 +0200 Subject: [PATCH 2/2] update_actions: Use bool(sequence) for testing emptyness --- picard/ui/mainwindow.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/picard/ui/mainwindow.py b/picard/ui/mainwindow.py index 58d661323..fa38c98bb 100644 --- a/picard/ui/mainwindow.py +++ b/picard/ui/mainwindow.py @@ -872,8 +872,8 @@ class MainWindow(QtWidgets.QMainWindow): single = self.selected_objects[0] if len(self.selected_objects) == 1 else None can_view_info = bool(single and single.can_view_info()) can_browser_lookup = bool(single and single.can_browser_lookup()) - have_files = len(self.tagger.get_files_from_objects(self.selected_objects)) > 0 - have_objects = len(self.selected_objects) > 0 + have_files = bool(self.tagger.get_files_from_objects(self.selected_objects)) + have_objects = bool(self.selected_objects) for obj in self.selected_objects: if obj is None: continue @@ -899,7 +899,7 @@ class MainWindow(QtWidgets.QMainWindow): self.browser_lookup_action.setEnabled(can_browser_lookup) self.play_file_action.setEnabled(have_files) self.open_folder_action.setEnabled(have_files) - self.cut_action.setEnabled(bool(self.selected_objects)) + self.cut_action.setEnabled(have_objects) files = self.get_selected_or_unmatched_files() self.tags_from_filenames_action.setEnabled(bool(files)) self.track_search_action.setEnabled(have_objects)