Merge pull request #106 from mortael/patch-1

Fixed getting path additional widget by number

Author: MikeSiLVO

resources/lib/skinshorcuts/gui.py

@@ -1677,11 +1677,13 @@ def onClick(self, control_id):  # pylint: disable=invalid-name
             log("Choose widget (312)")
             list_control = self.getControl(211)
             listitem = list_control.getSelectedItem()
+            widgetpath = listitem.getProperty("widgetPath")
 
             # If we're setting for an additional widget, get its number
             widget_id = ""
             if self.current_window.getProperty("widgetID"):
                 widget_id = ".%s" % self.current_window.getProperty("widgetID")
+                widgetpath = self._get_additionalproperty(listitem, "widgetPath%s" % widget_id)
                 self.current_window.clearProperty("widgetID")
 
             # Get the default widget for this item
@@ -1692,14 +1694,14 @@ def onClick(self, control_id):  # pylint: disable=invalid-name
             self.lib_func.load_library("widgets")
 
             # Let user choose widget
-            if listitem.getProperty("widgetPath") == "":
+            if widgetpath == "":
                 selected_shortcut = self.lib_func.select_shortcut(grouping="widget", show_none=True)
             else:
                 selected_shortcut = self.lib_func.select_shortcut(
                     grouping="widget",
                     show_none=True,
                     custom=True,
-                    current_action=listitem.getProperty("widgetPath")
+                    current_action=widgetpath
                 )
 
             if selected_shortcut is None:
@@ -2533,6 +2535,20 @@ def _add_additionalproperty(self, listitem, property_name, property_value):
 
         self._add_additional_properties(listitem)
 
+    def _get_additionalproperty(self, listitem, property_name):
+        # Retrieve the additional properties of a user item
+        properties = []
+        if listitem.getProperty("additionalListItemProperties"):
+            properties = ast.literal_eval(listitem.getProperty("additionalListItemProperties"))
+
+        # Search for the property
+        for prop in properties:
+            if prop[0] == property_name:
+                return prop[1]
+
+        # If the property was not found, return None
+        return None
+
     def _remove_additionalproperty(self, listitem, property_name):
         # Remove an item from the additional properties of a user item
         properties = []