[Bf-extensions-cvs] [16baf4b9] master: archipack: 1.2.2
Stephen Leger
noreply at git.blender.org
Tue May 30 01:48:01 CEST 2017
Commit: 16baf4b96def5e53d1fe8152be44f7507e42a572
Author: Stephen Leger
Date: Tue May 30 01:45:55 2017 +0200
Branches: master
https://developer.blender.org/rBAC16baf4b96def5e53d1fe8152be44f7507e42a572
archipack: 1.2.2
===================================================================
M archipack/__init__.py
M archipack/archipack_2d.py
M archipack/archipack_autoboolean.py
M archipack/archipack_door.py
D archipack/archipack_door_panel.py
M archipack/archipack_fence.py
A archipack/archipack_gl.py
A archipack/archipack_keymaps.py
M archipack/archipack_manipulator.py
M archipack/archipack_polylib.py
M archipack/archipack_preset.py
M archipack/archipack_reference_point.py
A archipack/archipack_rendering.py
A archipack/archipack_slab.py
M archipack/archipack_snap.py
M archipack/archipack_stair.py
M archipack/archipack_wall.py
M archipack/archipack_wall2.py
M archipack/archipack_window.py
M archipack/icons/door.png
A archipack/icons/fence.png
M archipack/icons/stair.png
M archipack/icons/wall.png
M archipack/icons/window.png
M archipack/materialutils.py
===================================================================
diff --git a/archipack/__init__.py b/archipack/__init__.py
index 739ad61e..1f7f8f13 100644
--- a/archipack/__init__.py
+++ b/archipack/__init__.py
@@ -31,44 +31,56 @@ bl_info = {
'author': 's-leger',
'license': 'GPL',
'deps': 'shapely',
- 'version': (1, 2, 1),
+ 'version': (1, 2, 2),
'blender': (2, 7, 8),
'location': 'View3D > Tools > Create > Archipack',
'warning': '',
- 'wiki_url': 'https://github.com/s-leger/blenderPolygons/wiki',
- 'tracker_url': 'https://github.com/s-leger/blenderPolygons/issues',
- 'link': 'https://github.com/s-leger/blenderPolygons',
+ 'wiki_url': 'https://github.com/s-leger/archipack/wiki',
+ 'tracker_url': 'https://github.com/s-leger/archipack/issues',
+ 'link': 'https://github.com/s-leger/archipack',
'support': 'COMMUNITY',
- 'category': '3D View'
+ 'category': 'Add Mesh'
}
import os
if "bpy" in locals():
import importlib as imp
+ imp.reload(archipack_snap)
+ imp.reload(archipack_manipulator)
+ imp.reload(archipack_reference_point)
imp.reload(archipack_autoboolean)
imp.reload(archipack_door)
imp.reload(archipack_window)
imp.reload(archipack_stair)
+ imp.reload(archipack_wall)
imp.reload(archipack_wall2)
+ # imp.reload(archipack_roof2d)
+ imp.reload(archipack_slab)
imp.reload(archipack_fence)
- imp.reload(archipack_wall)
+ imp.reload(archipack_rendering)
try:
imp.reload(archipack_polylib)
HAS_POLYLIB = True
except:
HAS_POLYLIB = False
pass
-
+
print("archipack: reload ready")
else:
+ from . import archipack_snap
+ from . import archipack_manipulator
+ from . import archipack_reference_point
from . import archipack_autoboolean
from . import archipack_door
from . import archipack_window
from . import archipack_stair
from . import archipack_wall
from . import archipack_wall2
+ # from . import archipack_roof2d
+ from . import archipack_slab
from . import archipack_fence
+ from . import archipack_rendering
try:
"""
polylib depends on shapely
@@ -80,20 +92,80 @@ else:
print("archipack: Polylib failed to load, missing shapely ?")
HAS_POLYLIB = False
pass
-
+
+ # from . import archipack_polylib
+
print("archipack: ready")
# noinspection PyUnresolvedReferences
import bpy
# noinspection PyUnresolvedReferences
-from bpy.types import Panel
-from bpy.utils import previews as iconsLib
-icons_dict = {}
+from bpy.types import (
+ Panel, WindowManager, PropertyGroup,
+ AddonPreferences
+ )
+from bpy.props import (
+ EnumProperty,
+ PointerProperty,
+ StringProperty
+ )
+from bpy.utils import previews
+icons_coll = {}
+
+
+# ----------------------------------------------------
+# Addon preferences
+# ----------------------------------------------------
+
+def update_panel(self, context):
+ try:
+ bpy.utils.unregister_class(TOOLS_PT_Archipack_PolyLib)
+ bpy.utils.unregister_class(TOOLS_PT_Archipack_Tools)
+ bpy.utils.unregister_class(TOOLS_PT_Archipack_Create)
+ except:
+ pass
+ prefs = context.user_preferences.addons[__name__].preferences
+ TOOLS_PT_Archipack_PolyLib.bl_category = prefs.tools_category
+ bpy.utils.register_class(TOOLS_PT_Archipack_PolyLib)
+ TOOLS_PT_Archipack_Tools.bl_category = prefs.tools_category
+ bpy.utils.register_class(TOOLS_PT_Archipack_Tools)
+ TOOLS_PT_Archipack_Create.bl_category = prefs.create_category
+ bpy.utils.register_class(TOOLS_PT_Archipack_Create)
+
+class Archipack_Pref(AddonPreferences):
+ bl_idname = __name__
-class TOOLS_PT_PolyLib(Panel):
- bl_label = "Archipack 2d"
- bl_idname = "TOOLS_PT_PolyLib"
+ tools_category = StringProperty(
+ name="Tools",
+ description="Choose a name for the category of the Tools panel",
+ default="Tools",
+ update=update_panel
+ )
+ create_category = StringProperty(
+ name="Create",
+ description="Choose a name for the category of the Create panel",
+ default="Create",
+ update=update_panel
+ )
+
+ def draw(self, context):
+ layout = self.layout
+ row = layout.row()
+ col = row.column()
+ col.label(text="Tab Category:")
+ col.prop(self, "tools_category")
+ col.prop(self, "create_category")
+
+
+# ----------------------------------------------------
+# Archipack panels
+# ----------------------------------------------------
+
+
+class TOOLS_PT_Archipack_PolyLib(Panel):
+ bl_label = "Archipack 2d to 3d"
+ bl_idname = "TOOLS_PT_Archipack_PolyLib"
bl_space_type = "VIEW_3D"
bl_region_type = "TOOLS"
bl_category = "Tools"
@@ -111,95 +183,95 @@ class TOOLS_PT_PolyLib(Panel):
box = row.box()
row = box.row(align=True)
row.operator(
- "tools.poly_lib_detect",
- icon_value=icons_dict["detect"].icon_id,
+ "archipack.polylib_detect",
+ icon_value=icons_coll["detect"].icon_id,
text='Detect'
- ).extend = context.window_manager.poly_lib.extend
- row.prop(context.window_manager.poly_lib, "extend")
+ ).extend = context.window_manager.archipack_polylib.extend
+ row.prop(context.window_manager.archipack_polylib, "extend")
row = box.row(align=True)
- row.prop(context.window_manager.poly_lib, "resolution")
+ row.prop(context.window_manager.archipack_polylib, "resolution")
row = box.row(align=True)
row.label(text="Polygons")
row = box.row(align=True)
row.operator(
- "tools.poly_lib_pick_2d_polygons",
- icon_value=icons_dict["selection"].icon_id,
+ "archipack.polylib_pick_2d_polygons",
+ icon_value=icons_coll["selection"].icon_id,
text='Select'
).action = 'select'
row.operator(
- "tools.poly_lib_pick_2d_polygons",
- icon_value=icons_dict["union"].icon_id,
+ "archipack.polylib_pick_2d_polygons",
+ icon_value=icons_coll["union"].icon_id,
text='Union'
).action = 'union'
row.operator(
- "tools.poly_lib_output_polygons",
- icon_value=icons_dict["polygons"].icon_id,
+ "archipack.polylib_output_polygons",
+ icon_value=icons_coll["polygons"].icon_id,
text='All')
row = box.row(align=True)
row.operator(
- "tools.poly_lib_pick_2d_polygons",
+ "archipack.polylib_pick_2d_polygons",
text='Wall',
- icon_value=icons_dict["wall"].icon_id).action = 'wall'
- row.prop(context.window_manager.poly_lib, "solidify_thickness")
+ icon_value=icons_coll["wall"].icon_id).action = 'wall'
+ row.prop(context.window_manager.archipack_polylib, "solidify_thickness")
row = box.row(align=True)
- row.operator("tools.poly_lib_pick_2d_polygons",
+ row.operator("archipack.polylib_pick_2d_polygons",
text='Window',
- icon_value=icons_dict["window"].icon_id).action = 'window'
- row.operator("tools.poly_lib_pick_2d_polygons",
+ icon_value=icons_coll["window"].icon_id).action = 'window'
+ row.operator("archipack.polylib_pick_2d_polygons",
text='Door',
- icon_value=icons_dict["door"].icon_id).action = 'door'
- row.operator("tools.poly_lib_pick_2d_polygons", text='Rectangle').action = 'rectangle'
+ icon_value=icons_coll["door"].icon_id).action = 'door'
+ row.operator("archipack.polylib_pick_2d_polygons", text='Rectangle').action = 'rectangle'
row = box.row(align=True)
row.label(text="Lines")
row = box.row(align=True)
row.operator(
- "tools.poly_lib_pick_2d_lines",
- icon_value=icons_dict["selection"].icon_id,
+ "archipack.polylib_pick_2d_lines",
+ icon_value=icons_coll["selection"].icon_id,
text='Lines').action = 'select'
row.operator(
- "tools.poly_lib_pick_2d_lines",
- icon_value=icons_dict["union"].icon_id,
+ "archipack.polylib_pick_2d_lines",
+ icon_value=icons_coll["union"].icon_id,
text='Union').action = 'union'
row.operator(
- "tools.poly_lib_output_lines",
- icon_value=icons_dict["polygons"].icon_id,
+ "archipack.polylib_output_lines",
+ icon_value=icons_coll["polygons"].icon_id,
text='All')
# row = layout.row(align=True)
# box = row.box()
# row = box.row(align=True)
- # row.operator("tools.poly_lib_solidify")
+ # row.operator("archipack.polylib_solidify")
row = box.row(align=True)
row.label(text="Points")
row = box.row(align=True)
row.operator(
- "tools.poly_lib_pick_2d_points",
- icon_value=icons_dict["selection"].icon_id,
+ "archipack.polylib_pick_2d_points",
+ icon_value=icons_coll["selection"].icon_id,
text='Points').action = 'select'
row = layout.row(align=True)
box = row.box()
row = box.row(align=True)
- row.operator("tools.poly_lib_simplify")
- row.prop(context.window_manager.poly_lib, "simplify_tolerance")
+ row.operator("archipack.polylib_simplify")
+ row.prop(context.window_manager.archipack_polylib, "simplify_tolerance")
row = box.row(align=True)
- row.prop(context.window_manager.poly_lib, "simplify_preserve_topology")
+ row.prop(context.window_manager.archipack_polylib, "simplify_preserve_topology")
row = layout.row(align=True)
box = row.box()
row = box.row(align=True)
- row.operator("tools.poly_lib_offset")
+ row.operator("archipack.polylib_offset")
row = box.row(align=True)
- row.prop(context.window_manager.poly_lib, "offset_distance")
+ row.prop(context.window_manager.archipack_polylib, "offset_distance")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list