Merge pull request #4231 from Ultimaker/CURA-5595_code_style_fixes

Code style fixes

cura/CuraApplication.py

@@ -1736,8 +1736,7 @@ class CuraApplication(QtApplication):
     def showMoreInformationDialogForAnonymousDataCollection(self):
         cast(SliceInfo, self._plugin_registry.getPluginObject("SliceInfoPlugin")).showMoreInfoDialog()
 
-
-    def addSidebarCustomMenuItem(self, menu_item: list) -> None:
+    def addSidebarCustomMenuItem(self, menu_item: dict) -> None:
         self._sidebar_custom_menu_items.append(menu_item)
 
     def getSidebarCustomMenuItems(self) -> list:

cura/Settings/SidebarCustomMenuItemsModel.py

@@ -8,17 +8,17 @@ from PyQt5.QtCore import pyqtSlot, Qt
 
 
 class SidebarCustomMenuItemsModel(ListModel):
-    NameRole = Qt.UserRole + 1
-    ActionsRole = Qt.UserRole + 2
-    MenuItemRole = Qt.UserRole + 3
-    MenuItemIconNameRole = Qt.UserRole + 5
+    name_role = Qt.UserRole + 1
+    actions_role = Qt.UserRole + 2
+    menu_item_role = Qt.UserRole + 3
+    menu_item_icon_name_role = Qt.UserRole + 5
 
     def __init__(self, parent=None):
         super().__init__(parent)
-        self.addRoleName(self.NameRole, "name")
-        self.addRoleName(self.ActionsRole, "actions")
-        self.addRoleName(self.MenuItemRole, "menu_item")
-        self.addRoleName(self.MenuItemIconNameRole, "iconName")
+        self.addRoleName(self.name_role, "name")
+        self.addRoleName(self.actions_role, "actions")
+        self.addRoleName(self.menu_item_role, "menu_item")
+        self.addRoleName(self.menu_item_icon_name_role, "iconName")
         self._updateExtensionList()
 
     def _updateExtensionList(self)-> None:
@@ -26,14 +26,14 @@ class SidebarCustomMenuItemsModel(ListModel):
         for menu_item in CuraApplication.getInstance().getSidebarCustomMenuItems():
 
             self.appendItem({
-                    "name": menu_item["name"],
-                    "iconName": menu_item["iconName"],
-                    "actions": menu_item["actions"],
-                    "menu_item": menu_item["menu_item"]
-                })
+                "name": menu_item["name"],
+                "icon_name": menu_item["icon_name"],
+                "actions": menu_item["actions"],
+                "menu_item": menu_item["menu_item"]
+            })
 
     @pyqtSlot(str, "QVariantList", "QVariantMap")
-    def callMenuItemMethod(self, menu_item_name: str, menu_item_actions: list, kwargs: Any)-> None:
+    def callMenuItemMethod(self, menu_item_name: str, menu_item_actions: list, kwargs: Any) -> None:
         for item in self._items:
             if menu_item_name == item["name"]:
                 for method in menu_item_actions:

resources/qml/Settings/SettingView.qml

@@ -568,7 +568,7 @@ Item
                     MenuItem
                     {
                         text: model.name
-                        iconName: model.iconName
+                        iconName: model.icon_name
                         onTriggered:
                         {
                             customMenuItems.model.callMenuItemMethod(name, model.actions, {"key": contextMenu.key})