From 153fae44c9c87ef5141418e3aff24aad9533b332 Mon Sep 17 00:00:00 2001 From: anxdpanic Date: Fri, 3 Sep 2021 12:18:15 -0400 Subject: [PATCH 1/2] fixup instance variable naming --- resources/lib/skinshorcuts/gui.py | 12 ++++++------ resources/lib/skinshorcuts/xmlfunctions.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/lib/skinshorcuts/gui.py b/resources/lib/skinshorcuts/gui.py index 09adf07a..051b2a8d 100644 --- a/resources/lib/skinshorcuts/gui.py +++ b/resources/lib/skinshorcuts/gui.py @@ -1469,23 +1469,23 @@ def onClick(self, control_id): # pylint: disable=invalid-name restore_items = [] # Save the labelID list from DATA - original_label_id_list = self.data_func.labelIDList - self.data_func.labelIDList = [] + original_label_id_list = self.data_func.label_id_list + self.data_func.label_id_list = [] # Get a list of all shortcuts that were originally in the menu and - # restore labelIDList + # restore label_id_list self.data_func.clear_label_id() shortcuts = self.data_func.get_shortcuts(self.group, default_group=self.default_group, defaults_only=True) - self.data_func.labelIDList = original_label_id_list + self.data_func.label_id_list = original_label_id_list for shortcut in shortcuts.getroot().findall("shortcut"): # Parse the shortcut item = self._parse_shortcut(shortcut) # Check if a shortcuts labelID is already in the list - if item[1].getProperty("labelID") not in self.data_func.labelIDList: + if item[1].getProperty("labelID") not in self.data_func.label_id_list: restore_pretty.append(self.lib_func.create( ["", item[1].getLabel(), item[1].getLabel2(), { "icon": item[1].getProperty("icon") @@ -1510,7 +1510,7 @@ def onClick(self, control_id): # pylint: disable=invalid-name # We now have our shortcut to return. Add it to self.all_list_items and labelID list self.all_list_items.append(restore_items[restore_shortcut]) - self.data_func.labelIDList.append( + self.data_func.label_id_list.append( restore_items[restore_shortcut].getProperty("labelID") ) diff --git a/resources/lib/skinshorcuts/xmlfunctions.py b/resources/lib/skinshorcuts/xmlfunctions.py index 06a0ec33..ac72326f 100644 --- a/resources/lib/skinshorcuts/xmlfunctions.py +++ b/resources/lib/skinshorcuts/xmlfunctions.py @@ -379,7 +379,7 @@ def writexml(self, profilelist, mainmenu_id, groups, num_levels, build_mode, self.data_func.clear_label_id() # Clear any additional properties, which may be for a different profile - self.data_func.currentProperties = None + self.data_func.current_properties = None # Create objects to hold the items menuitems = [] From c89d7cdea2d9456eefe0413b28dc9f4df5934aa4 Mon Sep 17 00:00:00 2001 From: anxdpanic Date: Fri, 3 Sep 2021 12:18:21 -0400 Subject: [PATCH 2/2] 2.0.0~alpha8 --- addon.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon.xml b/addon.xml index a757509a..9c32a32e 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - +