[Bf-blender-cvs] [bbe98b18fb4] master: Cleanup: use preferences prefix for Python operators

Campbell Barton noreply at git.blender.org
Fri Mar 1 14:24:28 CET 2019


Commit: bbe98b18fb4c2b72c71367e61a066da62523f051
Author: Campbell Barton
Date:   Sat Mar 2 00:21:05 2019 +1100
Branches: master
https://developer.blender.org/rBbbe98b18fb4c2b72c71367e61a066da62523f051

Cleanup: use preferences prefix for Python operators

===================================================================

M	release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
M	release/scripts/modules/bl_i18n_utils/utils.py
M	release/scripts/modules/rna_keymap_ui.py
M	release/scripts/startup/bl_operators/presets.py
M	release/scripts/startup/bl_operators/userpref.py
M	release/scripts/startup/bl_operators/wm.py
M	release/scripts/startup/bl_ui/space_topbar.py
M	release/scripts/startup/bl_ui/space_userpref.py
M	release/scripts/startup/bl_ui/space_view3d.py

===================================================================

diff --git a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
index 0285a22a923..d552638850c 100644
--- a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
+++ b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
@@ -536,7 +536,7 @@ def dump_py_messages_from_files(msgs, reports, files, settings):
 
     def _op_to_ctxt(node):
         # Some smart coders like things like:
-        #    >>> row.operator("wm.addon_disable" if is_enabled else "wm.addon_enable", ...)
+        #    >>> row.operator("preferences.addon_disable" if is_enabled else "preferences.addon_enable", ...)
         # We only take first arg into account here!
         bag = extract_strings_split(node)
         opname, _ = bag[0]
diff --git a/release/scripts/modules/bl_i18n_utils/utils.py b/release/scripts/modules/bl_i18n_utils/utils.py
index 2116e39fd8e..fe27be9895b 100644
--- a/release/scripts/modules/bl_i18n_utils/utils.py
+++ b/release/scripts/modules/bl_i18n_utils/utils.py
@@ -199,12 +199,12 @@ def enable_addons(addons=None, support=None, disable=False, check_only=False):
                     if module_name not in used_ext:
                         continue
                     print("    Disabling module ", module_name)
-                    bpy.ops.wm.addon_disable(module=module_name)
+                    bpy.ops.preferences.addon_disable(module=module_name)
                 else:
                     if module_name in used_ext:
                         continue
                     print("    Enabling module ", module_name)
-                    bpy.ops.wm.addon_enable(module=module_name)
+                    bpy.ops.preferences.addon_enable(module=module_name)
             except Exception as e:  # XXX TEMP WORKAROUND
                 print(e)
 
diff --git a/release/scripts/modules/rna_keymap_ui.py b/release/scripts/modules/rna_keymap_ui.py
index a6826c1d13c..9ce52006d89 100644
--- a/release/scripts/modules/rna_keymap_ui.py
+++ b/release/scripts/modules/rna_keymap_ui.py
@@ -79,7 +79,7 @@ def draw_km(display_keymaps, kc, km, children, layout, level):
         subrow.alignment = 'RIGHT'
 
         if km.is_user_modified:
-            subrow.operator("wm.keymap_restore", text="Restore")
+            subrow.operator("preferences.keymap_restore", text="Restore")
         if km.is_modal:
             subrow.label(text="", icon='LINKED')
         del subrow
@@ -104,7 +104,7 @@ def draw_km(display_keymaps, kc, km, children, layout, level):
             # "Add New" at end of keymap item list
             subcol = _indented_layout(col, kmi_level)
             subcol = subcol.split(factor=0.2).column()
-            subcol.operator("wm.keyitem_add", text="Add New", text_ctxt=i18n_contexts.id_windowmanager,
+            subcol.operator("preferences.keyitem_add", text="Add New", text_ctxt=i18n_contexts.id_windowmanager,
                             icon='ADD')
 
             col.separator()
@@ -159,9 +159,9 @@ def draw_kmi(display_keymaps, kc, km, kmi, layout, level):
         row.label()
 
     if (not kmi.is_user_defined) and kmi.is_user_modified:
-        row.operator("wm.keyitem_restore", text="", icon='BACK').item_id = kmi.id
+        row.operator("preferences.keyitem_restore", text="", icon='BACK').item_id = kmi.id
     else:
-        row.operator("wm.keyitem_remove", text="", icon='X').item_id = kmi.id
+        row.operator("preferences.keyitem_remove", text="", icon='X').item_id = kmi.id
 
     # Expanded, additional event settings
     if kmi.show_expanded:
@@ -340,7 +340,7 @@ def draw_filtered(display_keymaps, filter_type, filter_text, layout):
             row.label()
 
             if km.is_user_modified:
-                row.operator("wm.keymap_restore", text="Restore")
+                row.operator("preferences.keymap_restore", text="Restore")
             else:
                 row.label()
 
@@ -350,7 +350,7 @@ def draw_filtered(display_keymaps, filter_type, filter_text, layout):
             # "Add New" at end of keymap item list
             col = _indented_layout(layout, 1)
             subcol = col.split(factor=0.2).column()
-            subcol.operator("wm.keyitem_add", text="Add New", icon='ADD')
+            subcol.operator("preferences.keyitem_add", text="Add New", icon='ADD')
     return True
 
 
@@ -384,14 +384,14 @@ def draw_keymaps(context, layout):
     rowsub.operator("wm.keyconfig_preset_add", text="", icon='REMOVE').remove_active = True
 
     rowsub = split.row(align=True)
-    rowsub.operator("wm.keyconfig_import", text="Import...", icon='IMPORT')
-    rowsub.operator("wm.keyconfig_export", text="Export...", icon='EXPORT')
+    rowsub.operator("preferences.keyconfig_import", text="Import...", icon='IMPORT')
+    rowsub.operator("preferences.keyconfig_export", text="Export...", icon='EXPORT')
 
     row = layout.row()
     col = layout.column()
 
     # layout.context_pointer_set("keyconfig", wm.keyconfigs.active)
-    # row.operator("wm.keyconfig_remove", text="", icon='X')
+    # row.operator("preferences.keyconfig_remove", text="", icon='X')
     rowsub = row.split(factor=0.3, align=True)
     # postpone drawing into rowsub, so we can set alert!
 
diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py
index 663de209c15..4df0d32f946 100644
--- a/release/scripts/startup/bl_operators/presets.py
+++ b/release/scripts/startup/bl_operators/presets.py
@@ -563,7 +563,7 @@ class AddPresetKeyconfig(AddPresetBase, Operator):
     preset_subdir = "keyconfig"
 
     def add(self, context, filepath):
-        bpy.ops.wm.keyconfig_export(filepath=filepath)
+        bpy.ops.preferences.keyconfig_export(filepath=filepath)
         bpy.utils.keyconfig_set(filepath)
 
     def pre_cb(self, context):
diff --git a/release/scripts/startup/bl_operators/userpref.py b/release/scripts/startup/bl_operators/userpref.py
index a43aac786ed..b63d5fa773d 100644
--- a/release/scripts/startup/bl_operators/userpref.py
+++ b/release/scripts/startup/bl_operators/userpref.py
@@ -50,8 +50,8 @@ def module_filesystem_remove(path_base, module_name):
                 os.remove(f_full)
 
 
-class WM_OT_keyconfig_activate(Operator):
-    bl_idname = "wm.keyconfig_activate"
+class PREFERENCES_OT_keyconfig_activate(Operator):
+    bl_idname = "preferences.keyconfig_activate"
     bl_label = "Activate Keyconfig"
 
     filepath: StringProperty(
@@ -65,9 +65,9 @@ class WM_OT_keyconfig_activate(Operator):
             return {'CANCELLED'}
 
 
-class WM_OT_copy_prev_settings(Operator):
+class PREFERENCES_OT_copy_prev(Operator):
     """Copy settings from previous version"""
-    bl_idname = "wm.copy_prev_settings"
+    bl_idname = "preferences.copy_prev"
     bl_label = "Copy Previous Settings"
 
     @staticmethod
@@ -126,9 +126,9 @@ class WM_OT_copy_prev_settings(Operator):
         return {'FINISHED'}
 
 
-class WM_OT_keyconfig_test(Operator):
+class PREFERENCES_OT_keyconfig_test(Operator):
     """Test key-config for conflicts"""
-    bl_idname = "wm.keyconfig_test"
+    bl_idname = "preferences.keyconfig_test"
     bl_label = "Test Key Configuration for Conflicts"
 
     def execute(self, context):
@@ -143,9 +143,9 @@ class WM_OT_keyconfig_test(Operator):
         return {'FINISHED'}
 
 
-class WM_OT_keyconfig_import(Operator):
+class PREFERENCES_OT_keyconfig_import(Operator):
     """Import key configuration from a python script"""
-    bl_idname = "wm.keyconfig_import"
+    bl_idname = "preferences.keyconfig_import"
     bl_label = "Import Key Configuration..."
 
     filepath: StringProperty(
@@ -210,9 +210,9 @@ class WM_OT_keyconfig_import(Operator):
 # This operator is also used by interaction presets saving - AddPresetBase
 
 
-class WM_OT_keyconfig_export(Operator):
+class PREFERENCES_OT_keyconfig_export(Operator):
     """Export key configuration to a python script"""
-    bl_idname = "wm.keyconfig_export"
+    bl_idname = "preferences.keyconfig_export"
     bl_label = "Export Key Configuration..."
 
     all: BoolProperty(
@@ -266,9 +266,9 @@ class WM_OT_keyconfig_export(Operator):
         return {'RUNNING_MODAL'}
 
 
-class WM_OT_keymap_restore(Operator):
+class PREFERENCES_OT_keymap_restore(Operator):
     """Restore key map(s)"""
-    bl_idname = "wm.keymap_restore"
+    bl_idname = "preferences.keymap_restore"
     bl_label = "Restore Key Map(s)"
 
     all: BoolProperty(
@@ -289,9 +289,9 @@ class WM_OT_keymap_restore(Operator):
         return {'FINISHED'}
 
 
-class WM_OT_keyitem_restore(Operator):
+class PREFERENCES_OT_keyitem_restore(Operator):
     """Restore key map item"""
-    bl_idname = "wm.keyitem_restore"
+    bl_idname = "preferences.keyitem_restore"
     bl_label = "Restore Key Map Item"
 
     item_id: IntProperty(
@@ -314,9 +314,9 @@ class WM_OT_keyitem_restore(Operator):
         return {'FINISHED'}
 
 
-class WM_OT_keyitem_add(Operator):
+class PREFERENCES_OT_keyitem_add(Operator):
     """Add key map item"""
-    bl_idname = "wm.keyitem_add"
+    bl_idname = "preferences.keyitem_add"
     bl_label = "Add Key Map Item"
 
     def execute(self, context):
@@ -336,9 +336,9 @@ class WM_OT_keyitem_add(Operator):
         return {'FINISHED'}
 
 
-class WM_OT_keyitem_remove(Operator):
+class PREFERENCES_OT_keyitem_remove(Operator):
     """Remove key map item"""
-    bl_idname = "wm.keyitem_remove"
+    bl_idname = "preferences.keyitem_remove"
     bl_label = "Remove Key Map Item"
 
     item_id: IntProperty(
@@ -357,9 +357,9 @@ class WM_OT_keyitem_remove(Operator):
         return {'FINISHED'}
 
 
-class WM_OT_keyconfig_remove(Operator):
+class PREFERENCES_OT_keyconfig_remove(Operator):
     """Remove key config"""
-    bl_idname = "wm.keyconfig_remove"
+    bl_idname = "preferences.keyconfig_remove"
     bl_label = "Remove Key Config"
 
     @classmethod
@@ -378,9 +378,9 @@ class WM_OT_keyconfig_remove(Operator):
 # -----------------------------------------------------------------------------
 # Add-on Operators
 
-class WM_OT_addon_enable(Operator):
+class PREFERENCES_OT_addon_enable(Operator):
     """Enable an add-on"""
-    bl_idname = "wm.addon_enable"
+    bl_idname = "preferences.addon_enable"
     bl_label = "Enable

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list