Changeset 17408 in vbox for trunk/src/VBox/Frontends

Timestamp:

Mar 5, 2009 3:11:21 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: 3627: Shorten error dialogs - emphasize quoted strings with bold style & bracket uuids with italic style. Adding dot to the end of API part of error/warning message.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (3 diffs)
• src/VBoxProblemReporter.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

@@ -680 +680 @@
     static QString highlight (const QString &aStr, bool aToolTip = false);
 
+    static QString emphasize (const QString &aStr);
+
     static QString systemLanguageId();
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -3853 +3853 @@
     rx.setMinimal (true);
     text.replace (rx,
-        QString ("\\1%1<nobr>'\\2'</nobr>%2")
-                 .arg (strFont). arg (endFont));
+        QString ("\\1%1<nobr>'\\2'</nobr>%2").arg (strFont).arg (endFont));
 
     /* mark UUIDs with color */
@@ -3861 +3860 @@
         "(\\{[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}\\})"
         "(?=[:.-!);]?(?:\\s|$))"),
-        QString ("\\1%1<nobr>\\2</nobr>%2")
-                 .arg (uuidFont). arg (endFont));
+        QString ("\\1%1<nobr>\\2</nobr>%2").arg (uuidFont).arg (endFont));
 
     /* split to paragraphs at \n chars */
@@ -3869 +3867 @@
     else
         text.replace ('\n', "<br>");
+
+    return text;
+}
+
+/**
+ *  Reformats the input string @a aStr so that:
+ *  - strings in single quotes will be put inside <nobr> and marked
+ *    with bold style;
+ *  - UUIDs be put inside <nobr> and marked
+ *    with italic style;
+ *  - replaces new line chars with </p><p> constructs to form paragraphs
+ *    (note that <p> and </p> are not appended to the beginnign and to the
+ *     end of the string respectively, to allow the result be appended
+ *     or prepended to the existing paragraph).
+ */
+/* static */
+QString VBoxGlobal::emphasize (const QString &aStr)
+{
+    QString strEmphStart ("<b>");
+    QString strEmphEnd ("</b>");
+    QString uuidEmphStart ("<i>");
+    QString uuidEmphEnd ("</i>");
+
+    QString text = aStr;
+
+    /* replace special entities, '&' -- first! */
+    text.replace ('&', "&amp;");
+    text.replace ('<', "&lt;");
+    text.replace ('>', "&gt;");
+    text.replace ('\"', "&quot;");
+
+    /* mark strings in single quotes with bold style */
+    QRegExp rx = QRegExp ("((?:^|\\s)[(]?)'([^']*)'(?=[:.-!);]?(?:\\s|$))");
+    rx.setMinimal (true);
+    text.replace (rx,
+        QString ("\\1%1<nobr>'\\2'</nobr>%2").arg (strEmphStart).arg (strEmphEnd));
+
+    /* mark UUIDs with italic style */
+    text.replace (QRegExp (
+        "((?:^|\\s)[(]?)"
+        "(\\{[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}\\})"
+        "(?=[:.-!);]?(?:\\s|$))"),
+        QString ("\\1%1<nobr>\\2</nobr>%2").arg (uuidEmphStart).arg (uuidEmphEnd));
+
+    /* split to paragraphs at \n chars */
+    text.replace ('\n', "</p><p>");
 
     return text;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxProblemReporter.cpp

@@ -666 +666 @@
              .arg (vbox.GetSettingsFilePath()),
         !res.isOk() ? formatErrorInfo (res)
-                    : QString ("<p>%1</p>").arg (error));
+                    : QString ("<p>%1.</p>").arg (vboxGlobal().emphasize (error)));
 }
 
@@ -2190 +2190 @@
 
     if (!errorMsg.isEmpty())
-        formatted += QString ("<p>%1</p><!--EOM-->")
-                              .arg (errorMsg);
+        formatted += QString ("<p>%1.</p><!--EOM-->")
+                              .arg (vboxGlobal().emphasize (errorMsg));
 
     if (!errorID.isEmpty())
@@ -2328 +2328 @@
 
     if (!aInfo.text().isEmpty())
-        formatted += QString ("<p>%1</p><!--EOM-->").arg (aInfo.text());
+        formatted += QString ("<p>%1.</p><!--EOM-->").arg (vboxGlobal().emphasize (aInfo.text()));
 
     formatted += "<table bgcolor=#EEEEEE border=0 cellspacing=0 "