From c45ea26cd65b7910667075bb58b589b5b756257c Mon Sep 17 00:00:00 2001 From: Glutanimate Date: Sun, 24 Feb 2019 14:51:19 +0100 Subject: [PATCH] Move annotatedName to AddonManager to allow outside access --- aqt/addons.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/aqt/addons.py b/aqt/addons.py index 6fd94990b..05b2d769b 100644 --- a/aqt/addons.py +++ b/aqt/addons.py @@ -115,6 +115,12 @@ When loading '%(name)s': def addonName(self, dir): return self.addonMeta(dir).get("name", dir) + def annotatedName(self, dir): + buf = self.addonName(dir) + if not self.isEnabled(dir): + buf += _(" (disabled)") + return buf + # Conflict resolution ###################################################################### @@ -456,7 +462,7 @@ class AddonsDialog(QDialog): addonList = self.form.addonList mgr = self.mgr - self.addons = [(self.annotatedName(d), d) for d in mgr.allAddons()] + self.addons = [(mgr.annotatedName(d), d) for d in mgr.allAddons()] self.addons.sort() selected = set(self.selectedAddons()) @@ -477,12 +483,6 @@ class AddonsDialog(QDialog): addon = '' self.form.viewPage.setEnabled(bool (re.match(r"^\d+$", addon))) - def annotatedName(self, dir): - buf = self.mgr.addonName(dir) - if not self.mgr.isEnabled(dir): - buf += _(" (disabled)") - return buf - def selectedAddons(self): idxs = [x.row() for x in self.form.addonList.selectedIndexes()] return [self.addons[idx][1] for idx in idxs]