Skip to content

Commit

Permalink
Merge branch 'release-2.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
ekaj2 committed Jan 3, 2017
2 parents 77036cd + 3c46526 commit 1d56092
Show file tree
Hide file tree
Showing 4 changed files with 1,980 additions and 1 deletion.
57 changes: 56 additions & 1 deletion __init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,20 @@
from .logging_setup import setup_logger
from . import ascii_logo
from .addon_name import save_addon_name, get_addon_name
from . import addon_updater_ops
from . import bug_reporter

bl_info = {
"name": "UltiMaze [PRO]",
"author": "Jake Dube",
"version": (2, 2),
"version": (2, 3),
"blender": (2, 76, 0),
"location": "3D View > Tools > Maze Gen",
"description": "Generates 3-dimensional mazes.",
"warning": "May take a long time to generate maze: "
"see quick help below.",
"wiki_url": "",
"tracker_url": "https://github.com/ekaj2/UltiMaze/issues",
"category": "3D View",
"support": "COMMUNITY",
}
Expand Down Expand Up @@ -147,6 +150,8 @@ class MazeGeneratorPanelMG(Panel):
bl_category = 'Maze Gen'

def draw(self, context):
addon_updater_ops.check_for_update_background(context)

scene = context.scene
mg = scene.mg
layout = self.layout
Expand Down Expand Up @@ -193,6 +198,8 @@ def draw(self, context):
box = layout.box()
box.prop(mg, 'write_list_maze', text="Write Maze List")

addon_updater_ops.update_notice_box_ui(self, context)


class ImageConverterPanelMG(Panel):
bl_label = "Image Converter [PRO]"
Expand Down Expand Up @@ -361,6 +368,10 @@ def draw(self, context):
col = box.column()
col.operator("maze_gen.estimate_time_mg", icon="QUESTION")

box = layout.box()
box.scale_y = 2
box.operator('maze_gen.report_bug', icon="HELP")


class HelpPanelMG(Panel):
bl_label = "Help"
Expand Down Expand Up @@ -554,9 +565,49 @@ class MazeAddonPrefsMg(AddonPreferences):

preview_samples = IntProperty(name="Samples", default=50, min=1, max=1000)

# addon updater preferences
auto_check_update = bpy.props.BoolProperty(
name="Auto-check for Update",
description="If enabled, auto-check for updates using an interval",
default=False,
)

updater_intrval_months = bpy.props.IntProperty(
name='Months',
description="Number of months between checking for updates",
default=0,
min=0
)
updater_intrval_days = bpy.props.IntProperty(
name='Days',
description="Number of days between checking for updates",
default=7,
min=0,
)
updater_intrval_hours = bpy.props.IntProperty(
name='Hours',
description="Number of hours between checking for updates",
default=0,
min=0,
max=23
)
updater_intrval_minutes = bpy.props.IntProperty(
name='Minutes',
description="Number of minutes between checking for updates",
default=0,
min=0,
max=59
)

def draw(self, context):
layout = self.layout

row = layout.row()
row.scale_y = 2
row.operator('maze_gen.report_bug', icon="HELP")

addon_updater_ops.update_settings_ui(self, context)

layout.prop(self, 'open_help_outbldr')
layout.separator()

Expand Down Expand Up @@ -1120,6 +1171,7 @@ class MazeGenPropertyGroup(PropertyGroup):
EnableLayerMG,
RescanTilesPath,
LoadOriginalTilesPath,
bug_reporter.ReportABug,
# Menus
menus.TileRenderMenu,
menus.EnableLayerMenu]
Expand All @@ -1128,6 +1180,9 @@ class MazeGenPropertyGroup(PropertyGroup):


def register():
# third-party add-on updater
addon_updater_ops.register(bl_info)

save_addon_name(basename(dirname(__file__)))

ascii_logo.display_ascii_logo()
Expand Down
Loading

0 comments on commit 1d56092

Please sign in to comment.