Merge pull request #5952 from borysiasty/plugin-notification

[Plugin installer][needs-docs] Display notifications as an icon rather than a text
qgis · Dec 28, 2017 · 4783af6 · 4783af6
2 parents a650a03 + 671b772
commit 4783af6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -458,6 +458,8 @@
         <file>themes/default/pin.svg</file>
         <file>themes/default/pluginExperimental.png</file>
         <file>themes/default/pluginDeprecated.png</file>
+        <file>themes/default/pluginNew.svg</file>
+        <file>themes/default/pluginUpgrade.svg</file>
         <file>themes/default/propertyicons/action.svg</file>
         <file>themes/default/propertyicons/attributes.png</file>
         <file>themes/default/propertyicons/CRS.svg</file>

diff --git a/images/themes/default/pluginNew.svg b/images/themes/default/pluginNew.svg
diff --git a/images/themes/default/pluginUpgrade.svg b/images/themes/default/pluginUpgrade.svg
diff --git a/python/pyplugin_installer/installer.py b/python/pyplugin_installer/installer.py
@@ -71,8 +71,8 @@ def __init__(self):
 
         if repositories.checkingOnStart() and repositories.timeForChecking() and repositories.allEnabled():
             # start fetching repositories
-            self.statusLabel = QLabel(self.tr("Looking for new plugins...") + " ", iface.mainWindow().statusBar())
-            iface.mainWindow().statusBar().insertPermanentWidget(0, self.statusLabel)
+            self.statusLabel = QLabel(iface.mainWindow().statusBar())
+            iface.mainWindow().statusBar().addPermanentWidget(self.statusLabel)
             self.statusLabel.linkActivated.connect(self.showPluginManagerWhenReady)
             repositories.checkingDone.connect(self.checkingDone)
             for key in repositories.allEnabled():
@@ -150,19 +150,23 @@ def checkingDone(self):
         # look for news in the repositories
         plugins.markNews()
         status = ""
+        icon = ""
         # first check for news
         for key in plugins.all():
             if plugins.all()[key]["status"] == "new":
                 status = self.tr("There is a new plugin available")
+                icon = "pluginNew.svg"
                 tabIndex = 4  # PLUGMAN_TAB_NEW
         # then check for updates (and eventually overwrite status)
         for key in plugins.all():
             if plugins.all()[key]["status"] == "upgradeable":
                 status = self.tr("There is a plugin update available")
+                icon = "pluginUpgrade.svg"
                 tabIndex = 3  # PLUGMAN_TAB_UPGRADEABLE
         # finally set the notify label
         if status:
-            self.statusLabel.setText(u' <a href="%d">%s</a>  ' % (tabIndex, status))
+            self.statusLabel.setText(u'<a href="%d"><img src="qrc:/images/themes/default/%s"></a>' % (tabIndex, icon))
+            self.statusLabel.setToolTip(status)
         else:
             iface.mainWindow().statusBar().removeWidget(self.statusLabel)
             self.statusLabel = None