[Bf-extensions-cvs] [b8ff5a81] master: release version 1.2.6 for 2.79 official, remove addon-updater
Stephen Leger
noreply at git.blender.org
Wed Jul 19 14:15:36 CEST 2017
Commit: b8ff5a8147a8be02dba2b9418bc48835d658614d
Author: Stephen Leger
Date: Wed Jul 19 14:12:16 2017 +0200
Branches: master
https://developer.blender.org/rBACb8ff5a8147a8be02dba2b9418bc48835d658614d
release version 1.2.6 for 2.79 official, remove addon-updater
===================================================================
M archipack/__init__.py
D archipack/addon_updater.py
D archipack/addon_updater_ops.py
D archipack/archipack_roof2d.py
===================================================================
diff --git a/archipack/__init__.py b/archipack/__init__.py
index 433c6b0d..7e783bcf 100644
--- a/archipack/__init__.py
+++ b/archipack/__init__.py
@@ -31,7 +31,7 @@ bl_info = {
'author': 's-leger',
'license': 'GPL',
'deps': 'shapely',
- 'version': (1, 2, 5),
+ 'version': (1, 2, 6),
'blender': (2, 7, 8),
'location': 'View3D > Tools > Create > Archipack',
'warning': '',
@@ -55,14 +55,11 @@ if "bpy" in locals():
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_truss)
- # imp.reload(archipack_toolkit)
imp.reload(archipack_floor)
imp.reload(archipack_rendering)
- imp.reload(addon_updater_ops)
try:
imp.reload(archipack_polylib)
HAS_POLYLIB = True
@@ -81,14 +78,11 @@ else:
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_truss
- # from . import archipack_toolkit
from . import archipack_floor
from . import archipack_rendering
- from . import addon_updater_ops
try:
"""
polylib depends on shapely
@@ -97,7 +91,7 @@ else:
from . import archipack_polylib
HAS_POLYLIB = True
except:
- print("archipack: Polylib failed to load, missing shapely ?")
+ print("archipack: shapely not found, using built in modules only")
HAS_POLYLIB = False
pass
@@ -174,10 +168,6 @@ class Archipack_Pref(AddonPreferences):
default=10
)
# Font sizes and basic colour scheme
- # kept outside of addon prefs until now
- # as for a generic toolkit it is not appropriate
- # we could provide a template for addon prefs
- # matching those one
feedback_size_main = IntProperty(
name="Main",
description="Main title font size (pixels)",
@@ -237,41 +227,6 @@ class Archipack_Pref(AddonPreferences):
min=0, max=1
)
- # addon updater preferences
-
- auto_check_update = BoolProperty(
- name="Auto-check for Update",
- description="If enabled, auto-check for updates using an interval",
- default=False,
- )
-
- updater_intrval_months = IntProperty(
- name='Months',
- description="Number of months between checking for updates",
- default=0,
- min=0
- )
- updater_intrval_days = IntProperty(
- name='Days',
- description="Number of days between checking for updates",
- default=7,
- min=0,
- )
- updater_intrval_hours = IntProperty(
- name='Hours',
- description="Number of hours between checking for updates",
- default=0,
- min=0,
- max=23
- )
- updater_intrval_minutes = IntProperty(
- name='Minutes',
- description="Number of minutes between checking for updates",
- default=0,
- min=0,
- max=59
- )
-
def draw(self, context):
layout = self.layout
box = layout.box()
@@ -304,7 +259,6 @@ class Archipack_Pref(AddonPreferences):
col.label(text="Manipulators:")
col.prop(self, "arrow_size")
col.prop(self, "handle_size")
- addon_updater_ops.update_settings_ui(self, context)
# ----------------------------------------------------
@@ -387,10 +341,6 @@ class TOOLS_PT_Archipack_PolyLib(Panel):
"archipack.polylib_output_lines",
icon_value=icons["polygons"].icon_id,
text='All')
- # row = layout.row(align=True)
- # box = row.box()
- # row = box.row(align=True)
- # row.operator("archipack.polylib_solidify")
row = box.row(align=True)
row.label(text="Points")
row = box.row(align=True)
@@ -439,8 +389,6 @@ class TOOLS_PT_Archipack_Tools(Panel):
box = row.box()
box.label("Auto boolean")
row = box.row(align=True)
- # row.operator("archipack.auto_boolean", text="Robust", icon='HAND').mode = 'ROBUST'
- # row.operator("archipack.auto_boolean", text="Interactive", icon='AUTO').mode = 'INTERACTIVE'
row.operator("archipack.auto_boolean", text="AutoBoolean", icon='AUTO').mode = 'HYBRID'
row = layout.row(align=True)
box = row.box()
@@ -464,17 +412,12 @@ class TOOLS_PT_Archipack_Create(Panel):
def draw(self, context):
global icons_collection
-
- addon_updater_ops.check_for_update_background(context)
-
icons = icons_collection["main"]
layout = self.layout
row = layout.row(align=True)
box = row.box()
box.label("Objects")
row = box.row(align=True)
- # col = row.column()
- # subrow = col.row(align=True)
row.operator("archipack.window_preset_menu",
text="Window",
icon_value=icons["window"].icon_id
@@ -483,8 +426,6 @@ class TOOLS_PT_Archipack_Create(Panel):
text="",
icon='GREASEPENCIL'
).preset_operator = "archipack.window_draw"
- # col = row.column()
- # subrow = col.row(align=True)
row = box.row(align=True)
row.operator("archipack.door_preset_menu",
text="Door",
@@ -520,7 +461,6 @@ class TOOLS_PT_Archipack_Create(Panel):
row.operator("archipack.slab_from_curve",
icon_value=icons["slab"].icon_id
)
-
row = box.row(align=True)
row.operator("archipack.wall2_from_slab",
icon_value=icons["wall"].icon_id)
@@ -531,22 +471,13 @@ class TOOLS_PT_Archipack_Create(Panel):
text="->Ceiling",
icon_value=icons["slab"].icon_id
).ceiling = True
-
- addon_updater_ops.update_notice_box_ui(self, context)
-
- # row = box.row(align=True)
- # row.operator("archipack.roof", icon='CURVE_DATA')
-
- # toolkit
- # row = box.row(align=True)
- # row.operator("archipack.myobject")
-
row = box.row(align=True)
row.operator("archipack.floor_preset_menu",
text="Floor",
icon_value=icons["floor"].icon_id
).preset_operator = "archipack.floor"
+
# ----------------------------------------------------
# ALT + A menu
# ----------------------------------------------------
@@ -647,11 +578,9 @@ def register():
archipack_stair.register()
archipack_wall.register()
archipack_wall2.register()
- # archipack_roof2d.register()
archipack_slab.register()
archipack_fence.register()
archipack_truss.register()
- # archipack_toolkit.register()
archipack_floor.register()
archipack_rendering.register()
@@ -665,9 +594,6 @@ def register():
bpy.utils.register_class(ARCHIPACK_create_menu)
bpy.types.INFO_MT_mesh_add.append(menu_func)
- addon_updater_ops.register(bl_info)
- # bpy.utils.register_module(__name__)
-
def unregister():
global icons_collection
@@ -678,6 +604,7 @@ def unregister():
bpy.utils.unregister_class(TOOLS_PT_Archipack_Tools)
bpy.utils.unregister_class(TOOLS_PT_Archipack_Create)
bpy.utils.unregister_class(Archipack_Pref)
+
# unregister subs
archipack_snap.unregister()
archipack_manipulator.unregister()
@@ -688,11 +615,9 @@ def unregister():
archipack_stair.unregister()
archipack_wall.unregister()
archipack_wall2.unregister()
- # archipack_roof2d.unregister()
archipack_slab.unregister()
archipack_fence.unregister()
archipack_truss.unregister()
- # archipack_toolkit.unregister()
archipack_floor.unregister()
archipack_rendering.unregister()
@@ -706,11 +631,6 @@ def unregister():
previews.remove(icons)
icons_collection.clear()
- addon_updater_ops.unregister()
-
- # bpy.utils.unregister_module(__name__)
-
if __name__ == "__main__":
register()
-
diff --git a/archipack/addon_updater.py b/archipack/addon_updater.py
deleted file mode 100644
index 1e953d8a..00000000
--- a/archipack/addon_updater.py
+++ /dev/null
@@ -1,1133 +0,0 @@
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-
-"""
-See documentation for usage
-https://github.com/CGCookie/blender-addon-updater
-
-"""
-
-import urllib.request
-import urllib
-import os
-import json
-import zipfile
-import shutil
-import asyncio # for async processing
-import threading
-import time
-from datetime import datetime,timedelta
-
-# blender imports, used in limited cases
-import bpy
-import addon_utils
-
-# -----------------------------------------------------------------------------
-# Define error messages/notices & hard coded globals
-# -----------------------------------------------------------------------------
-
-DEFAULT_API_URL = "https://api.github.com" # plausibly could be some other system
-DEFAULT_TIMEOUT = 10
-DEFAULT_PER_PAGE = 30
-
-
-# -----------------------------------------------------------------------------
-# The main class
-# -----------------------------------------------------------------------------
-
-class Singleton_updater(object):
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list