[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27156] trunk/blender: rename extension to addon after discussion with meta-androcto & mindrones
Campbell Barton
ideasman42 at gmail.com
Fri Feb 26 15:28:31 CET 2010
Revision: 27156
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27156
Author: campbellbarton
Date: 2010-02-26 15:28:29 +0100 (Fri, 26 Feb 2010)
Log Message:
-----------
rename extension to addon after discussion with meta-androcto & mindrones
Modified Paths:
--------------
trunk/blender/release/scripts/modules/bpy/utils.py
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/source/blender/blenkernel/intern/blender.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/makesdna/DNA_userdef_types.h
trunk/blender/source/blender/makesrna/RNA_access.h
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
Added Paths:
-----------
trunk/blender/release/scripts/addons/
Removed Paths:
-------------
trunk/blender/release/scripts/extensions/
Copied: trunk/blender/release/scripts/addons (from rev 27155, trunk/blender/release/scripts/extensions)
Modified: trunk/blender/release/scripts/modules/bpy/utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/utils.py 2010-02-26 12:28:44 UTC (rev 27155)
+++ trunk/blender/release/scripts/modules/bpy/utils.py 2010-02-26 14:28:29 UTC (rev 27156)
@@ -187,9 +187,9 @@
for mod in modules_from_path(path, loaded_modules):
test_register(mod)
- # load extensions
- used_ext = {ext.module for ext in _bpy.context.user_preferences.extensions}
- paths = script_paths("extensions")
+ # load addons
+ used_ext = {ext.module for ext in _bpy.context.user_preferences.addons}
+ paths = script_paths("addons")
for path in paths:
sys_path_ensure(path)
Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py 2010-02-26 12:28:44 UTC (rev 27155)
+++ trunk/blender/release/scripts/ui/space_userpref.py 2010-02-26 14:28:29 UTC (rev 27156)
@@ -171,9 +171,9 @@
op.path = "keymap.py"
op = layout.operator("wm.keyconfig_import", "Import Key Configuration...")
op.path = "keymap.py"
- elif userpref.active_section == 'EXTENSIONS':
+ elif userpref.active_section == 'ADDONS':
layout.operator_context = 'INVOKE_DEFAULT'
- op = layout.operator("wm.extension_install", "Install Extension...")
+ op = layout.operator("wm.addon_install", "Install Add-On...")
op.path = "*.py"
@@ -1359,21 +1359,21 @@
#print("runtime", time.time() - start)
-class USERPREF_PT_extensions(bpy.types.Panel):
+class USERPREF_PT_addons(bpy.types.Panel):
bl_space_type = 'USER_PREFERENCES'
- bl_label = "Extensions"
+ bl_label = "Addons"
bl_region_type = 'WINDOW'
bl_show_header = False
def poll(self, context):
userpref = context.user_preferences
- return (userpref.active_section == 'EXTENSIONS')
+ return (userpref.active_section == 'ADDONS')
- def _extension_list(self):
+ def _addon_list(self):
import sys
modules = []
loaded_modules = set()
- paths = bpy.utils.script_paths("extensions")
+ paths = bpy.utils.script_paths("addons")
# sys.path.insert(0, None)
for path in paths:
# sys.path[0] = path
@@ -1386,11 +1386,11 @@
layout = self.layout
userpref = context.user_preferences
- used_ext = {ext.module for ext in userpref.extensions}
+ used_ext = {ext.module for ext in userpref.addons}
col = layout.column()
- for mod in self._extension_list():
+ for mod in self._addon_list():
box = col.box()
row = box.row()
text = mod.__doc__
@@ -1398,22 +1398,22 @@
text = mod.__name__
row.label(text=text)
module_name = mod.__name__
- row.operator("wm.extension_disable" if module_name in used_ext else "wm.extension_enable").module = module_name
+ row.operator("wm.addon_disable" if module_name in used_ext else "wm.addon_enable").module = module_name
from bpy.props import *
-class WM_OT_extension_enable(bpy.types.Operator):
- "Enable an extension"
- bl_idname = "wm.extension_enable"
- bl_label = "Enable Extension"
+class WM_OT_addon_enable(bpy.types.Operator):
+ "Enable an addon"
+ bl_idname = "wm.addon_enable"
+ bl_label = "Enable Add-On"
- module = StringProperty(name="Module", description="Module name of the extension to enable")
+ module = StringProperty(name="Module", description="Module name of the addon to enable")
def execute(self, context):
import traceback
- ext = context.user_preferences.extensions.new()
+ ext = context.user_preferences.addons.new()
module_name = self.properties.module
ext.module = module_name
@@ -1426,12 +1426,12 @@
return {'FINISHED'}
-class WM_OT_extension_disable(bpy.types.Operator):
- "Disable an extension"
- bl_idname = "wm.extension_disable"
- bl_label = "Disable Extension"
+class WM_OT_addon_disable(bpy.types.Operator):
+ "Disable an addon"
+ bl_idname = "wm.addon_disable"
+ bl_label = "Disable Add-On"
- module = StringProperty(name="Module", description="Module name of the extension to disable")
+ module = StringProperty(name="Module", description="Module name of the addon to disable")
def execute(self, context):
import traceback
@@ -1443,25 +1443,25 @@
except:
traceback.print_exc()
- extensions = context.user_preferences.extensions
+ addons = context.user_preferences.addons
ok = True
while ok: # incase its in more then once.
ok = False
- for ext in extensions:
+ for ext in addons:
if ext.module == module_name:
- extensions.remove(ext)
+ addons.remove(ext)
ok = True
break
return {'FINISHED'}
-class WM_OT_extension_install(bpy.types.Operator):
- "Install an extension"
- bl_idname = "wm.extension_install"
- bl_label = "Install Extension"
+class WM_OT_addon_install(bpy.types.Operator):
+ "Install an addon"
+ bl_idname = "wm.addon_install"
+ bl_label = "Install Add-On"
- module = StringProperty(name="Module", description="Module name of the extension to disable")
+ module = StringProperty(name="Module", description="Module name of the addon to disable")
path = StringProperty(name="File Path", description="File path to write file to")
filename = StringProperty(name="File Name", description="Name of the file")
@@ -1473,7 +1473,7 @@
import traceback
pyfile = self.properties.path
- paths = bpy.utils.script_paths("extensions")
+ paths = bpy.utils.script_paths("addons")
path_dest = os.path.join(paths[-1], os.path.basename(pyfile))
if os.path.exists(path_dest):
@@ -1495,9 +1495,9 @@
return {'FINISHED'}
def invoke(self, context, event):
- paths = bpy.utils.script_paths("extensions")
+ paths = bpy.utils.script_paths("addons")
if not paths:
- self.report({'ERROR'}, "No 'extensions' path could be found in " + str(bpy.utils.script_paths()))
+ self.report({'ERROR'}, "No 'addons' path could be found in " + str(bpy.utils.script_paths()))
return {'CANCELLED'}
wm = context.manager
@@ -1893,11 +1893,11 @@
USERPREF_PT_system,
USERPREF_PT_file,
USERPREF_PT_input,
- USERPREF_PT_extensions,
+ USERPREF_PT_addons,
- WM_OT_extension_enable,
- WM_OT_extension_disable,
- WM_OT_extension_install,
+ WM_OT_addon_enable,
+ WM_OT_addon_disable,
+ WM_OT_addon_install,
WM_OT_keyconfig_export,
WM_OT_keyconfig_import,
Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c 2010-02-26 12:28:44 UTC (rev 27155)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c 2010-02-26 14:28:29 UTC (rev 27156)
@@ -358,7 +358,7 @@
BLI_freelistN(&U.uifonts);
BLI_freelistN(&U.themes);
BLI_freelistN(&U.keymaps);
- BLI_freelistN(&U.extensions);
+ BLI_freelistN(&U.addons);
}
/* returns:
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2010-02-26 12:28:44 UTC (rev 27155)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2010-02-26 14:28:29 UTC (rev 27156)
@@ -10690,7 +10690,7 @@
link_list(fd, &user->themes);
link_list(fd, &user->keymaps);
- link_list(fd, &user->extensions);
+ link_list(fd, &user->addons);
for(keymap=user->keymaps.first; keymap; keymap=keymap->next) {
keymap->modal_items= NULL;
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2010-02-26 12:28:44 UTC (rev 27155)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2010-02-26 14:28:29 UTC (rev 27156)
@@ -542,7 +542,7 @@
bTheme *btheme;
wmKeyMap *keymap;
wmKeyMapItem *kmi;
- bExtension *bext;
+ bAddon *bext;
writestruct(wd, USER, "UserDef", 1, &U);
@@ -560,8 +560,8 @@
}
}
- for(bext= U.extensions.first; bext; bext=bext->next)
- writestruct(wd, DATA, "bExtension", 1, bext);
+ for(bext= U.addons.first; bext; bext=bext->next)
+ writestruct(wd, DATA, "bAddon", 1, bext);
}
static void write_boid_state(WriteData *wd, BoidState *state)
Modified: trunk/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_userdef_types.h 2010-02-26 12:28:44 UTC (rev 27155)
+++ trunk/blender/source/blender/makesdna/DNA_userdef_types.h 2010-02-26 14:28:29 UTC (rev 27156)
@@ -276,10 +276,10 @@
} bTheme;
/* for the moment only the name. may want to store options with this later */
-typedef struct bExtension {
- struct bExtension *next, *prev;
+typedef struct bAddon {
+ struct bAddon *next, *prev;
char module[64];
-} bExtension;
+} bAddon;
typedef struct SolidLight {
int flag, pad;
@@ -327,7 +327,7 @@
struct ListBase uifonts;
struct ListBase uistyles;
struct ListBase keymaps;
- struct ListBase extensions;
+ struct ListBase addons;
char keyconfigstr[64];
short undosteps;
@@ -378,7 +378,7 @@
#define USER_SECTION_SYSTEM 3
#define USER_SECTION_THEME 4
#define USER_SECTION_INPUT 5
-#define USER_SECTION_EXTENSIONS 6
+#define USER_SECTION_ADDONS 6
/* flag */
#define USER_AUTOSAVE (1 << 0)
Modified: trunk/blender/source/blender/makesrna/RNA_access.h
===================================================================
--- trunk/blender/source/blender/makesrna/RNA_access.h 2010-02-26 12:28:44 UTC (rev 27155)
+++ trunk/blender/source/blender/makesrna/RNA_access.h 2010-02-26 14:28:29 UTC (rev 27156)
@@ -49,6 +49,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list