Handle option menu toggles update with new settings_changed signal

Author: phw

picard/ui/mainwindow/__init__.py

@@ -7,7 +7,7 @@
 # Copyright (C) 2008 Gary van der Merwe
 # Copyright (C) 2008 Robert Kaye
 # Copyright (C) 2008 Will
-# Copyright (C) 2008-2010, 2015, 2018-2023 Philipp Wolfer
+# Copyright (C) 2008-2010, 2015, 2018-2024 Philipp Wolfer
 # Copyright (C) 2009 Carlin Mangar
 # Copyright (C) 2009 David Hilton
 # Copyright (C) 2011-2012 Chad Wilson
@@ -255,6 +255,20 @@ def setupUi(self):
         for function in ext_point_ui_init:
             function(self)
 
+        get_config().setting.setting_changed.connect(self.handle_settings_changed)
+
+    def handle_settings_changed(self, name, old_value, new_value):
+        if name == 'rename_files':
+            self.actions[MainAction.ENABLE_RENAMING].setChecked(new_value)
+        elif name == 'move_files':
+            self.actions[MainAction.ENABLE_MOVING].setChecked(new_value)
+        elif name == 'dont_write_tags':
+            self.actions[MainAction.ENABLE_TAG_SAVING].setChecked(not new_value)
+        elif name == 'clear_existing_tags':
+            self.metadata_box.update()
+        elif name in {'file_renaming_scripts', 'selected_file_naming_script_id'}:
+            self._make_script_selector_menu()
+
     def set_processing(self, processing=True):
         self.panel.set_processing(processing)
 
@@ -613,7 +627,7 @@ def add_menu(menu_title, *args):
 
         self.script_quick_selector_menu = QtWidgets.QMenu(_("&Select file naming script"))
         self.script_quick_selector_menu.setIcon(icontheme.lookup('document-open'))
-        self.make_script_selector_menu()
+        self._make_script_selector_menu()
 
         self.profile_quick_selector_menu = QtWidgets.QMenu(_("&Enable/disable profiles"))
         self._make_profile_selector_menu()
@@ -915,7 +929,7 @@ def _options_closed(self):
         else:
             self.enable_action(MainAction.SHOW_SCRIPT_EDITOR, True)
         self._make_profile_selector_menu()
-        self.make_script_selector_menu()
+        self._make_script_selector_menu()
 
     def show_help(self):
         webbrowser2.open('documentation')
@@ -1441,7 +1455,7 @@ def _check_and_repair_profiles(self):
                     profile_settings[p_id][script_id_key] = None
         config.profiles[SettingConfigSection.SETTINGS_KEY] = profile_settings
 
-    def make_script_selector_menu(self):
+    def _make_script_selector_menu(self):
         """Update the sub-menu of available file naming scripts.
         """
         if self.script_editor_dialog is None or not isinstance(self.script_editor_dialog, ScriptEditorDialog):
@@ -1477,7 +1491,6 @@ def _select_new_naming_script(self, id):
         config = get_config()
         log.debug("Setting naming script to: %s", id)
         config.setting['selected_file_naming_script_id'] = id
-        self.make_script_selector_menu()
         if self.script_editor_dialog:
             self.script_editor_dialog.set_selected_script_id(id)
 
@@ -1503,14 +1516,13 @@ def open_file_naming_script_editor(self):
     def _script_editor_save(self):
         """Process "signal_save" signal from the script editor.
         """
-        self.make_script_selector_menu()
+        self._make_script_selector_menu()
 
     def _script_editor_closed(self):
         """Process "finished" signal from the script editor.
         """
         self.enable_action(MainAction.SHOW_SCRIPT_EDITOR, True)
         self.script_editor_dialog = None
-        self.make_script_selector_menu()
 
     def _update_script_editor_example_files(self):
         """Update the list of example files for the file naming script editor.
@@ -1579,7 +1591,7 @@ def _update_profile_selection(self, profile_id):
         for profile in option_profiles:
             if profile['id'] == profile_id:
                 profile['enabled'] = not profile['enabled']
-                self.make_script_selector_menu()
+                self._make_script_selector_menu()
                 return
 
     def show_new_user_dialog(self):

picard/ui/options/renaming.py

@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2006-2008, 2011 Lukáš Lalinský
 # Copyright (C) 2008-2009 Nikolai Prokoschenko
-# Copyright (C) 2009-2010, 2014-2015, 2018-2022 Philipp Wolfer
+# Copyright (C) 2009-2010, 2014-2015, 2018-2022, 2024 Philipp Wolfer
 # Copyright (C) 2011-2013 Michael Wiencek
 # Copyright (C) 2011-2013 Wieland Hoffmann
 # Copyright (C) 2013 Calvin Walton
@@ -45,7 +45,6 @@
 )
 from picard.script import ScriptParser
 
-from picard.ui.enums import MainAction
 from picard.ui.forms.ui_options_renaming import Ui_RenamingOptionsPage
 from picard.ui.options import (
     OptionsCheckError,
@@ -270,9 +269,6 @@ def save(self):
         config.setting['move_additional_files_pattern'] = self.ui.move_additional_files_pattern.text()
         config.setting['delete_empty_dirs'] = self.ui.delete_empty_dirs.isChecked()
         config.setting['selected_file_naming_script_id'] = self.selected_naming_script_id
-        self.tagger.window.actions[MainAction.ENABLE_RENAMING].setChecked(config.setting['rename_files'])
-        self.tagger.window.actions[MainAction.ENABLE_MOVING].setChecked(config.setting['move_files'])
-        self.tagger.window.make_script_selector_menu()
 
     def display_error(self, error):
         # Ignore scripting errors, those are handled inline

picard/ui/options/tags.py

@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2006-2007, 2011 Lukáš Lalinský
 # Copyright (C) 2009 Nikolai Prokoschenko
-# Copyright (C) 2009-2010, 2018-2021 Philipp Wolfer
+# Copyright (C) 2009-2010, 2018-2021, 2024 Philipp Wolfer
 # Copyright (C) 2012 Erik Wasser
 # Copyright (C) 2012 Johannes Weißl
 # Copyright (C) 2012-2013 Michael Wiencek
@@ -32,7 +32,6 @@
 from picard.extension_points.options_pages import register_options_page
 from picard.i18n import N_
 
-from picard.ui.enums import MainAction
 from picard.ui.forms.ui_options_tags import Ui_TagsOptionsPage
 from picard.ui.options import OptionsPage
 
@@ -76,16 +75,12 @@ def save(self):
         config = get_config()
         config.setting['dont_write_tags'] = not self.ui.write_tags.isChecked()
         config.setting['preserve_timestamps'] = self.ui.preserve_timestamps.isChecked()
-        clear_existing_tags = self.ui.clear_existing_tags.isChecked()
-        if clear_existing_tags != config.setting['clear_existing_tags']:
-            config.setting['clear_existing_tags'] = clear_existing_tags
-            self.tagger.window.metadata_box.update()
+        config.setting['clear_existing_tags'] = self.ui.clear_existing_tags.isChecked()
         config.setting['preserve_images'] = self.ui.preserve_images.isChecked()
         config.setting['remove_ape_from_mp3'] = self.ui.remove_ape_from_mp3.isChecked()
         config.setting['remove_id3_from_flac'] = self.ui.remove_id3_from_flac.isChecked()
         config.setting['fix_missing_seekpoints_flac'] = self.ui.fix_missing_seekpoints_flac.isChecked()
         config.setting['preserved_tags'] = list(self.ui.preserved_tags.tags)
-        self.tagger.window.actions[MainAction.ENABLE_TAG_SAVING].setChecked(not config.setting['dont_write_tags'])
 
 
 register_options_page(TagsOptionsPage)