Changeset 41152 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

May 3, 2012 9:52:23 PM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: Network Manager stuff: Switching Network Manager error-pane from QTextEdit to QIRichTextLabel.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManager.cpp (modified) (10 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManager.cpp

@@ -23 +23 @@
 #include <QGridLayout>
 #include <QProgressBar>
-#include <QTextEdit>
 #include <QMainWindow>
 #include <QVBoxLayout>
@@ -42 +41 @@
 #include "UIPopupBox.h"
 #include "QIToolButton.h"
+#include "QIRichTextLabel.h"
 
 /* Network-request widget: */
@@ -58 +58 @@
 
     /* Constructor: */
-    UINetworkRequestWidget(QWidget *pParent, UINetworkRequest *pNetworkRequest)
+    UINetworkRequestWidget(QMainWindow *pParent, UINetworkRequest *pNetworkRequest)
         : QIWithRetranslateUI<UIPopupBox>(pParent)
         , m_pNetworkRequest(pNetworkRequest)
@@ -67 +67 @@
         , m_pRetryButton(new QIToolButton(m_pContentWidget))
         , m_pCancelButton(new QIToolButton(m_pContentWidget))
-        , m_pErrorPane(new QTextEdit(m_pContentWidget))
+        , m_pErrorPane(new QIRichTextLabel(m_pContentWidget))
     {
         /* Setup self: */
@@ -84 +84 @@
         m_pTimer->setInterval(5000);
         connect(m_pTimer, SIGNAL(timeout()), this, SLOT(sltTimeIsOut()));
+
+        /* Setup main-layout: */
+        m_pMainLayout->setContentsMargins(6, 6, 6, 6);
 
         /* Setup progress-bar: */
@@ -103 +106 @@
 
         /* Setup error-label: */
-        m_pErrorPane->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Ignored);
-        m_pErrorPane->viewport()->setAutoFillBackground(false);
-        m_pErrorPane->setFrameShape(QFrame::NoFrame);
-        m_pErrorPane->setReadOnly(true);
+        m_pErrorPane->setHidden(true);
+        m_pErrorPane->setWordWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
+        /* Calculate required width: */
+        int iMinimumWidth = pParent->minimumWidth();
+        int iLeft, iTop, iRight, iBottom;
+        /* Take into account content-widget layout margins: */
+        m_pMainLayout->getContentsMargins(&iLeft, &iTop, &iRight, &iBottom);
+        iMinimumWidth -= iLeft;
+        iMinimumWidth -= iRight;
+        /* Take into account this layout margins: */
+        layout()->getContentsMargins(&iLeft, &iTop, &iRight, &iBottom);
+        iMinimumWidth -= iLeft;
+        iMinimumWidth -= iRight;
+        /* Take into account parent layout margins: */
+        QLayout *pParentLayout = qobject_cast<QMainWindow*>(parent())->centralWidget()->layout();
+        pParentLayout->getContentsMargins(&iLeft, &iTop, &iRight, &iBottom);
+        iMinimumWidth -= iLeft;
+        iMinimumWidth -= iRight;
+        /* Set minimum text width: */
+        m_pErrorPane->setMinimumTextWidth(iMinimumWidth);
 
         /* Layout content: */
@@ -161 +180 @@
 
         /* Hide error label: */
-        m_pErrorPane->setPlainText(QString());
-        m_pErrorPane->setMinimumHeight(0);
+        m_pErrorPane->setHidden(true);
+        m_pErrorPane->setText(QString());
     }
 
@@ -205 +224 @@
 
         /* Show error label: */
+        m_pErrorPane->setHidden(false);
         m_pErrorPane->setText(UINetworkManager::tr("Error: %1.").arg(strErrorText));
-        m_pErrorPane->setMinimumHeight(m_pErrorPane->document()->size().toSize().height());
     }
 
@@ -231 +250 @@
     QIToolButton *m_pRetryButton;
     QIToolButton *m_pCancelButton;
-    QTextEdit *m_pErrorPane;
+    QIRichTextLabel *m_pErrorPane;
 };
 
@@ -277 +296 @@
         /* Create main-layout: */
         m_pMainLayout = new QVBoxLayout(centralWidget());
-        m_pMainLayout->setMargin(6);
+        m_pMainLayout->setContentsMargins(6, 6, 6, 6);
 
         /* Create description-label: */