Cleanup: Rename ViewPackage -> ConsolidatedPackage in preparation for restructure
This commit is contained in:
@@ -585,7 +585,7 @@ class USERPREF_PT_packages(bpy.types.Panel):
|
|||||||
|
|
||||||
return startswith + contains
|
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"""
|
"""Draws the given package"""
|
||||||
pkgbox = layout.box()
|
pkgbox = layout.box()
|
||||||
spl = pkgbox.split(.8)
|
spl = pkgbox.split(.8)
|
||||||
@@ -745,7 +745,7 @@ class USERPREF_PT_packages(bpy.types.Panel):
|
|||||||
row = pkgzone.row()
|
row = pkgzone.row()
|
||||||
draw_package(USERPREF_PT_packages.all_packages[pkgname], row)
|
draw_package(USERPREF_PT_packages.all_packages[pkgname], row)
|
||||||
|
|
||||||
class ViewPackage:
|
class ConsolidatedPackage:
|
||||||
"""
|
"""
|
||||||
Stores a grouping of different versions of the same packages,
|
Stores a grouping of different versions of the same packages,
|
||||||
and view-specific data used for drawing
|
and view-specific data used for drawing
|
||||||
@@ -838,7 +838,7 @@ def build_composite_packagelist(installed: list, available: list) -> OrderedDict
|
|||||||
if pkgname in masterlist:
|
if pkgname in masterlist:
|
||||||
masterlist[pkgname].add_version(pkg)
|
masterlist[pkgname].add_version(pkg)
|
||||||
else:
|
else:
|
||||||
masterlist[pkgname] = ViewPackage(pkg)
|
masterlist[pkgname] = ConsolidatedPackage(pkg)
|
||||||
|
|
||||||
for pkg in installed:
|
for pkg in installed:
|
||||||
pkg.installed = True
|
pkg.installed = True
|
||||||
@@ -852,7 +852,7 @@ def build_composite_packagelist(installed: list, available: list) -> OrderedDict
|
|||||||
else:
|
else:
|
||||||
masterlist[pkg.name].add_version(pkg)
|
masterlist[pkg.name].add_version(pkg)
|
||||||
else:
|
else:
|
||||||
masterlist[pkg.name] = ViewPackage(pkg)
|
masterlist[pkg.name] = ConsolidatedPackage(pkg)
|
||||||
|
|
||||||
return OrderedDict(sorted(masterlist.items()))
|
return OrderedDict(sorted(masterlist.items()))
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user