From 9b424b52ce6b46e88ba2850fb97af7a3b89ddca3 Mon Sep 17 00:00:00 2001 From: Ellwood Zwovic Date: Mon, 24 Jul 2017 19:03:10 -0700 Subject: [PATCH] Adjust package state display --- package_manager/__init__.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/package_manager/__init__.py b/package_manager/__init__.py index b9b018e..13c8b98 100644 --- a/package_manager/__init__.py +++ b/package_manager/__init__.py @@ -794,16 +794,17 @@ class USERPREF_PT_packages(bpy.types.Panel): leftcol = left.column(align=True) if pkg.installed: - if pkg.url: - right.operator(PACKAGE_OT_uninstall.bl_idname, + if pkg.url and pkg.user: + right.operator(PACKAGE_OT_uninstall.bl_idname, text="Uninstall").package_name=pkg.name - else: + elif pkg.user: + right.label("Installed") right.scale_y = 2 - if pkg.user: - right.label("Installed") - else: - l = right.label("System package") - right.enabled = False + right.enabled = False + elif not pkg.user: + l = right.label("System package") + right.scale_y = 2 + right.enabled = False else: if pkg.url: right.operator(PACKAGE_OT_install.bl_idname, @@ -953,6 +954,7 @@ def build_composite_packagelist(installed: list, available: list) -> OrderedDict if packages_are_equivilent(pkg, masterpkg): masterpkg.installed = True masterpkg.installed_location = pkg.installed_location + masterpkg.user = pkg.user break else: masterlist[pkg.name].add_version(pkg)