Changeset 17125 in vbox for trunk

Timestamp:

Feb 25, 2009 1:02:54 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: 3627: Shorten error dialogs: 1 - human readable part of API error moved to GUI warning text into the last paragraph, 2 - message dialog made non fixed in height only when details are shown.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• QIMessageBox.cpp (modified) (3 diffs)
• VBoxProblemReporter.cpp (modified) (1 diff)

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

@@ -217 +217 @@
     /* Now resize window to minimum possible size */
     window()->resize (window()->minimumSizeHint());
+
+    /* Check if we have to make dialog fixed in height */
+    bool makeFixedHeight = true;
+    foreach (QIArrowButton *button, mButtonsList)
+    {
+        if (button->isExpanded())
+        {
+            makeFixedHeight = false;
+            break;
+        }
+    }
+    if (makeFixedHeight)
+        window()->setMaximumHeight (window()->minimumSizeHint().height());
+    else
+        window()->setMaximumHeight (QWIDGETSIZE_MAX);
 }
 
@@ -345 +360 @@
     mDetailsText = new QTextEdit();
     {
-        /* calculate the minimum size dynamically, approx. for 40 chars and
-         * 6 lines */
+        /* Calculate the minimum size dynamically, approx.
+         * for 40 chars, 4 lines & 2 <table> margins */
         QFontMetrics fm = mDetailsText->fontMetrics();
-        mDetailsText->setMinimumSize (40 * fm.width ('m'), fm.lineSpacing() * 6);
+        mDetailsText->setMinimumSize (fm.width ('m') * 40,
+                                      fm.lineSpacing() * 4 + 4 * 2);
     }
     mDetailsText->setReadOnly (true);
@@ -513 +529 @@
 void QIMessageBox::setDetailsText (const QString &aText)
 {
-    mDetailsText->setText (aText);
+    QStringList parts (aText.split ("<!--EOM-->"));
+    mTextLabel->setText (mTextLabel->text() + parts [0]);
+    mDetailsText->setText (parts [1]);
 }
 

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

@@ -2316 +2316 @@
                                                 HRESULT aWrapperRC /* = S_OK */)
 {
+    /* Compose complex details string with internal <!--EOM--> delimiter to
+     * make it possible to split string into info & details parts which will
+     * be used separately in QIMessageBox */
     QString formatted;
 
     if (!aInfo.text().isEmpty())
-        formatted += QString ("<table bgcolor=#FFFFFF border=0 cellspacing=0 "
-                              "cellpadding=0 width=100%>"
-                              "<tr><td><p>%1.</p></td></tr>"
-                              "</table><p></p>")
-                              .arg (VBoxGlobal::highlight (aInfo.text()));
+        formatted += QString ("<p>%1</p><!--EOM-->").arg (aInfo.text());
 
     formatted += "<table bgcolor=#EEEEEE border=0 cellspacing=0 "