Merge pull request #2899 from markotoplak/addons-trusted

[ENH] Add-ons: Option to list only trusted add-ons

Author: lanzagar

Orange/canvas/application/addons.py

@@ -26,7 +26,7 @@
     QWidget, QDialog, QLabel, QLineEdit, QTreeView, QHeaderView,
     QTextBrowser, QDialogButtonBox, QProgressDialog,
     QVBoxLayout, QStyle, QStyledItemDelegate, QStyleOptionViewItem,
-    QApplication, QHBoxLayout
+    QApplication, QHBoxLayout, QCheckBox
 )
 
 from AnyQt.QtGui import (
@@ -48,11 +48,16 @@
 
 OFFICIAL_ADDONS = [
     "Orange-Bioinformatics",
-    "Orange3-DataFusion",
     "Orange3-Prototypes",
     "Orange3-Text",
     "Orange3-Network",
     "Orange3-Associate",
+    "Orange-Spectroscopy",
+    "Orange3-Textable",
+    "Orange3-Educational",
+    "Orange3-Geo",
+    "Orange3-ImageAnalytics",
+    "Orange3-Timeseries",
 ]
 
 Installable = namedtuple(
@@ -190,6 +195,23 @@ def cleanup(name, sep="-"):
     return " ".join(re.findall("[A-Z][a-z]*", name[0].upper() + name[1:]))
 
 
+class SortFilterProxyTrusted(QSortFilterProxyModel):
+
+    show_only_trusted = True
+
+    def set_show_only_trusted(self, s):
+        self.show_only_trusted = s
+        self.invalidateFilter()
+
+    def filterAcceptsRow(self, source_row, source_parent):
+        if self.show_only_trusted:
+            model = self.sourceModel()
+            item = self.sourceModel().data(model.index(source_row, 1), Qt.UserRole)
+            if isinstance(item, Available) and item.installable.name not in OFFICIAL_ADDONS:
+                return False
+        return super().filterAcceptsRow(source_row, source_parent)
+
+
 class AddonManagerWidget(QWidget):
 
     statechanged = Signal()
@@ -206,8 +228,18 @@ def __init__(self, parent=None, **kwargs):
         self.__search = QLineEdit(
             placeholderText=self.tr("Filter")
         )
+        self.__only_trusted = QCheckBox(
+            self.tr("Show only trusted add-ons"),
+        )
+
+        topline = QHBoxLayout()
+        topline.addWidget(self.__search)
+        topline.addWidget(self.__only_trusted)
+        self.layout().addLayout(topline)
 
-        self.layout().addWidget(self.__search)
+        self.__only_trusted.setChecked(True)
+        self.show_only_trusted = True
+        self.__only_trusted.stateChanged.connect(self._show_only_trusted_changed)
 
         self.__view = view = QTreeView(
             rootIsDecorated=False,
@@ -221,7 +253,7 @@ def __init__(self, parent=None, **kwargs):
         self.__model = model = QStandardItemModel()
         model.setHorizontalHeaderLabels(["", "Name", "Version", "Action"])
         model.dataChanged.connect(self.__data_changed)
-        proxy = QSortFilterProxyModel(
+        self.__proxy = proxy = SortFilterProxyTrusted(
             filterKeyColumn=1,
             filterCaseSensitivity=Qt.CaseInsensitive
         )
@@ -249,6 +281,9 @@ def __init__(self, parent=None, **kwargs):
         self.__details.setPalette(palette)
         self.layout().addWidget(self.__details)
 
+    def _show_only_trusted_changed(self):
+        self.__proxy.set_show_only_trusted(self.__only_trusted.isChecked())
+
     def set_items(self, items):
         self.__items = items
         model = self.__model
@@ -372,16 +407,6 @@ def __update_details(self):
             item = self.__model.item(index, 1)
             item = item.data(Qt.UserRole)
             assert isinstance(item, (Installed, Available))
-#             if isinstance(item, Available):
-#                 self.__installed_label.setText("")
-#                 self.__available_label.setText(str(item.available.version))
-#             elif item.installable is not None:
-#                 self.__installed_label.setText(str(item.local.version))
-#                 self.__available_label.setText(str(item.available.version))
-#             else:
-#                 self.__installed_label.setText(str(item.local.version))
-#                 self.__available_label.setText("")
-
             text = self._detailed_text(item)
             self.__details.setText(text)