Merge branch 'master' into dev_0.6

2020-05-14 18:57:55 +02:00
parent 8d78be357b b6fe4bf83b
commit 82c24d75ef
106 changed files with 5060 additions and 274 deletions
@@ -148,6 +148,7 @@ class GuiMainMenu(QMenuBar):
            credits   = "<br/>".join(["%s%s" % (listPrefix, x) for x in nw.__credits__]),
        )
        theTheme = self.theParent.theTheme
+        theIcons = self.theParent.theTheme.theIcons
        if theTheme.themeCredit != "" or theTheme.syntaxCredit != "":
            aboutMsg += "<h4>GUI Theme and Syntax Highlighting</h4>"
            aboutMsg += "<p>"
@@ -155,6 +156,10 @@ class GuiMainMenu(QMenuBar):
                aboutMsg += "%s\"%s\" by %s<br/>" % (
                    listPrefix, theTheme.themeName, theTheme.themeCredit
                )
+            if theIcons.themeCredit != "":
+                aboutMsg += "%s\"%s\" by %s<br/>" % (
+                    listPrefix, theIcons.themeName, theIcons.themeCredit
+                )
            if theTheme.syntaxCredit != "":
                aboutMsg += "%s\"%s\" by %s<br/>" % (
                    listPrefix, theTheme.syntaxName, theTheme.syntaxCredit