Mercurial > hg > svcore

changeset 1563:175ef02c7864

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Fri, 02 Nov 2018 14:41:00 +0000
parents 830972646ccd (diff) d3814e07b8aa (current diff)
children 5f9c9d8c3de6 f6e7d0e783e8
files
diffstat 1 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/plugin/PluginScan.cpp	Thu Nov 01 15:01:41 2018 +0000
+++ b/plugin/PluginScan.cpp	Fri Nov 02 14:41:00 2018 +0000
@@ -190,7 +190,7 @@
     
     os << "<ul>";
     for (auto f: failures) {
-        os << "<li>" + f.library;
+        os << "<li><code>" + f.library + "</code>";
 
         SVDEBUG << "PluginScan::formatFailureReport: tag is \"" << tag
                 << "\", failure code is " << int(f.code) << ", message is \""
@@ -225,6 +225,11 @@
                 ("Library cannot be loaded: %1").arg(userMessage);
             break;
 
+        case PluginCheckCode::FAIL_FORBIDDEN:
+            userMessage = QObject::tr
+                ("Permission to load library was refused");
+            break;
+
         case PluginCheckCode::FAIL_DESCRIPTOR_MISSING:
             userMessage = QObject::tr
                 ("Not a valid plugin library (no descriptor found)");
@@ -298,8 +303,7 @@
         return report;
     }
 
-    return QObject::tr("<b>Failed to load plugins</b>"
-                       "<p>Failed to load one or more plugin libraries:</p>")
+    return QObject::tr("<p>Failed to load one or more plugin libraries:</p>")
         + report
         + QObject::tr("<p>These plugins may be incompatible with the system, "
                       "and will be ignored during this run of %1.</p>")