Cleanup: Rename ViewPackage -> ConsolidatedPackage in preparation for restructure

This commit is contained in:
Ellwood Zwovic
2017-07-20 21:38:06 -07:00
parent 9740d3fce7
commit 55f11c028f

View File

@@ -585,7 +585,7 @@ class USERPREF_PT_packages(bpy.types.Panel):
return startswith + contains
def draw_package(pkg: ViewPackage, layout: bpy.types.UILayout):# {{{
def draw_package(pkg: ConsolidatedPackage, layout: bpy.types.UILayout):# {{{
"""Draws the given package"""
pkgbox = layout.box()
spl = pkgbox.split(.8)
@@ -745,7 +745,7 @@ class USERPREF_PT_packages(bpy.types.Panel):
row = pkgzone.row()
draw_package(USERPREF_PT_packages.all_packages[pkgname], row)
class ViewPackage:
class ConsolidatedPackage:
"""
Stores a grouping of different versions of the same packages,
and view-specific data used for drawing
@@ -838,7 +838,7 @@ def build_composite_packagelist(installed: list, available: list) -> OrderedDict
if pkgname in masterlist:
masterlist[pkgname].add_version(pkg)
else:
masterlist[pkgname] = ViewPackage(pkg)
masterlist[pkgname] = ConsolidatedPackage(pkg)
for pkg in installed:
pkg.installed = True
@@ -852,7 +852,7 @@ def build_composite_packagelist(installed: list, available: list) -> OrderedDict
else:
masterlist[pkg.name].add_version(pkg)
else:
masterlist[pkg.name] = ViewPackage(pkg)
masterlist[pkg.name] = ConsolidatedPackage(pkg)
return OrderedDict(sorted(masterlist.items()))