Changeset 103068 in vbox

Timestamp:

Jan 25, 2024 3:59:38 PM (12 months ago)

Author:

vboxsync

Message:

FE/Qt: UIWelcomePane: Heavy rework; Replacing UIWrappableLabel with QIRichTextLabel, cleaning corresponding stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/manager/UIWelcomePane.cpp (modified) (7 diffs)
• src/manager/UIWelcomePane.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -1012 +1012 @@
         src/manager/UIVirtualBoxManager.cpp \
         src/manager/UIVirtualMachineItemCloud.cpp \
-        src/manager/UIWelcomePane.cpp \
         src/manager/chooser/UIChooserAbstractModel.cpp \
         src/activity/overview/UIVMActivityOverviewWidget.cpp \

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIWelcomePane.cpp

@@ -31 +31 @@
 #include <QStyle>
 #include <QVBoxLayout>
+#include <QUrl>
 
 /* GUI includes */
+#include "QIRichTextLabel.h"
 #include "QIWithRetranslateUI.h"
 #include "UICommon.h"
@@ -38 +40 @@
 #include "UIIconPool.h"
 #include "UIWelcomePane.h"
-
-
-/** Wrappable QLabel extension for tools pane of the desktop widget.
-  * The main idea behind this stuff is to allow dynamically calculate
-  * [minimum] size hint for changeable one-the-fly widget width.
-  * That's a "white unicorn" task for QLabel which never worked since
-  * the beginning, because out-of-the-box version just uses static
-  * hints calculation which is very stupid taking into account
-  * QLayout "eats it raw" and tries to be dynamical on it's basis. */
-class UIWrappableLabel : public QLabel
-{
-    Q_OBJECT;
-
-public:
-
-    /** Constructs wrappable label passing @a pParent to the base-class. */
-    UIWrappableLabel(QWidget *pParent = 0);
-
-protected:
-
-    /** Handles resize @a pEvent. */
-    virtual void resizeEvent(QResizeEvent *pEvent) RT_OVERRIDE;
-
-    /** Returns whether the widget's preferred height depends on its width. */
-    virtual bool hasHeightForWidth() const RT_OVERRIDE;
-
-    /** Holds the minimum widget size. */
-    virtual QSize minimumSizeHint() const RT_OVERRIDE;
-
-    /** Holds the preferred widget size. */
-    virtual QSize sizeHint() const RT_OVERRIDE;
-};
-
-
-/*********************************************************************************************************************************
-*   Class UIWrappableLabel implementation.                                                                                       *
-*********************************************************************************************************************************/
-
-UIWrappableLabel::UIWrappableLabel(QWidget *pParent /* = 0 */)
-    : QLabel(pParent)
-{
-}
-
-void UIWrappableLabel::resizeEvent(QResizeEvent *pEvent)
-{
-    /* Call to base-class: */
-    QLabel::resizeEvent(pEvent);
-
-    // WORKAROUND:
-    // That's not cheap procedure but we need it to
-    // make sure geometry is updated after width changed.
-    if (minimumWidth() > 0)
-        updateGeometry();
-}
-
-bool UIWrappableLabel::hasHeightForWidth() const
-{
-    // WORKAROUND:
-    // No need to panic, we do it ourselves in resizeEvent() and
-    // this 'false' here to prevent automatic layout fighting for it.
-    return   minimumWidth() > 0
-           ? false
-           : QLabel::hasHeightForWidth();
-}
-
-QSize UIWrappableLabel::minimumSizeHint() const
-{
-    // WORKAROUND:
-    // We should calculate hint height on the basis of width,
-    // keeping the hint width equal to minimum we have set.
-    return   minimumWidth() > 0
-           ? QSize(minimumWidth(), heightForWidth(width()))
-           : QLabel::minimumSizeHint();
-}
-
-QSize UIWrappableLabel::sizeHint() const
-{
-    // WORKAROUND:
-    // Keep widget always minimal.
-    return minimumSizeHint();
-}
 
 
@@ -142 +63 @@
         {
             /* Update pixmap: */
+            updateTextLabels();
             updatePixmap();
             break;
@@ -167 +89 @@
 }
 
-void UIWelcomePane::sltHandleLinkActivated(const QString &strLink)
+void UIWelcomePane::sltHandleLinkActivated(const QUrl &urlLink)
 {
-    uiCommon().openURL(strLink);
+    uiCommon().openURL(urlLink.toString());
 }
 
@@ -189 +111 @@
 
             /* Prepare greetings label: */
-            m_pLabelGreetings = new UIWrappableLabel(this);
+            m_pLabelGreetings = new QIRichTextLabel(this);
             if (m_pLabelGreetings)
             {
-                m_pLabelGreetings->setWordWrap(true);
-                m_pLabelGreetings->setMinimumWidth(160); /// @todo make dynamic
-                m_pLabelGreetings->setAlignment(Qt::AlignLeading | Qt::AlignTop);
                 m_pLabelGreetings->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
-                connect(m_pLabelGreetings, &QLabel::linkActivated, this, &UIWelcomePane::sltHandleLinkActivated);
-
-                /* Add into layout: */
+                connect(m_pLabelGreetings, &QIRichTextLabel::sigLinkClicked, this, &UIWelcomePane::sltHandleLinkActivated);
                 pLayoutWelcome->addWidget(m_pLabelGreetings);
             }
@@ -226 +143 @@
     /* Translate finally: */
     retranslateUi();
-    /* Update pixmap: */
+    /* Update stuff: */
+    updateTextLabels();
     updatePixmap();
+}
+
+void UIWelcomePane::updateTextLabels()
+{
+    /* For all the text-labels: */
+    QList<QIRichTextLabel*> labels = findChildren<QIRichTextLabel*>();
+    if (!labels.isEmpty())
+    {
+        /* Make sure their minimum width is around 20% of the screen width: */
+        const QSize screenGeometry = gpDesktop->screenGeometry(this).size();
+        foreach (QIRichTextLabel *pLabel, labels)
+            pLabel->setMinimumTextWidth(screenGeometry.width() * .2);
+    }
 }
 
@@ -243 +174 @@
     }
 }
-
-
-#include "UIWelcomePane.moc"

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIWelcomePane.h

@@ -41 +41 @@
 /* Forward declarations: */
 class QLabel;
+class QIRichTextLabel;
 
 /** QWidget subclass holding Welcome information about VirtualBox. */
@@ -62 +63 @@
 private slots:
 
-    /** Handles activated @a strLink. */
-    void sltHandleLinkActivated(const QString &strLink);
+    /** Handles activated @a urlLink. */
+    void sltHandleLinkActivated(const QUrl &urlLink);
 
 private:
@@ -70 +71 @@
     void prepare();
 
+    /** Updates text labels. */
+    void updateTextLabels();
     /** Updates pixmap. */
     void updatePixmap();
@@ -77 +80 @@
 
     /** Holds the greetings label instance. */
-    QLabel *m_pLabelGreetings;
+    QIRichTextLabel *m_pLabelGreetings;
     /** Holds the icon label instance. */
-    QLabel *m_pLabelIcon;
+    QLabel          *m_pLabelIcon;
 };