archive/blender-package-manager-addon
Archived
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Adjust package state display

Browse Source
This commit is contained in:
Ellwood Zwovic
2017-07-24 19:03:10 -07:00
parent b3c8645c93
commit 9b424b52ce
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
package_manager/__init__.py
View File

@@ -794,15 +794,16 @@ class USERPREF_PT_packages(bpy.types.Panel):
leftcol = left.column(align=True) leftcol = left.column(align=True)
if pkg.installed: if pkg.installed:
if pkg.url: if pkg.url and pkg.user:
right.operator(PACKAGE_OT_uninstall.bl_idname, right.operator(PACKAGE_OT_uninstall.bl_idname,
text="Uninstall").package_name=pkg.name text="Uninstall").package_name=pkg.name
else: elif pkg.user:
right.scale_y = 2
if pkg.user:
right.label("Installed") right.label("Installed")
else: right.scale_y = 2
right.enabled = False
elif not pkg.user:
l = right.label("System package") l = right.label("System package")
right.scale_y = 2
right.enabled = False right.enabled = False
else: else:
if pkg.url: if pkg.url:
@@ -953,6 +954,7 @@ def build_composite_packagelist(installed: list, available: list) -> OrderedDict
if packages_are_equivilent(pkg, masterpkg): if packages_are_equivilent(pkg, masterpkg):
masterpkg.installed = True masterpkg.installed = True
masterpkg.installed_location = pkg.installed_location masterpkg.installed_location = pkg.installed_location
masterpkg.user = pkg.user
break break
else: else:
masterlist[pkg.name].add_version(pkg) masterlist[pkg.name].add_version(pkg)