Changeset 57511 in vbox for trunk/src/VBox

Timestamp:

Aug 24, 2015 1:57:15 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: 7918: About VirtualBox Dialog Improvements: 1. Version text copyable and Uniform. 2. Dialog not closed on focus/mouse event.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• images/OSE/about.png (modified) ( previous)
• images/OSE/about_hidpi.png (modified) ( previous)
• src/VBoxAboutDlg.cpp (modified) (7 diffs)
• src/VBoxAboutDlg.h (modified) (3 diffs)

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

@@ -24 +24 @@
 # include <QEvent>
 # include <QPainter>
+# include <QLabel>
 # include <iprt/path.h>
 # include <VBox/version.h> /* VBOX_VENDOR */
@@ -38 +39 @@
 
 VBoxAboutDlg::VBoxAboutDlg(QWidget *pParent, const QString &strVersion)
-    : QIWithRetranslateUI2<QIDialog>(pParent, Qt::CustomizeWindowHint | Qt::WindowTitleHint)
+    : QIWithRetranslateUI2<QIDialog>(pParent)
     , m_strVersion(strVersion)
 {
@@ -63 +64 @@
     m_pixmap = icon.pixmap(m_size);
 
+    /* Create main layout: */
+    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
+
+    /* Create label for version text: */
+    m_pLabel = new QLabel();
+    pMainLayout->addWidget(m_pLabel);
+
+    QPalette palette;
+    /* Branding: Set a different text color (because splash also could be white),
+     * otherwise use white as default color: */
+    QString strColor = vboxGlobal().brandingGetKey("UI/AboutTextColor");
+    if (!strColor.isEmpty())
+        palette.setColor(QPalette::WindowText, QColor(strColor).name());
+    else
+        palette.setColor(QPalette::WindowText, Qt::black);
+    m_pLabel->setPalette(palette);
+    m_pLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
+    m_pLabel->setFont(font());
+
+    pMainLayout->setAlignment(m_pLabel, Qt::AlignRight | Qt::AlignBottom);
+
     /* Translate: */
     retranslateUi();
@@ -71 +93 @@
     if (pEvent->type() == QEvent::Polish)
         setFixedSize(m_size);
-    if (pEvent->type() == QEvent::WindowDeactivate)
-        close();
     return QIDialog::event(pEvent);
 }
@@ -80 +100 @@
     QPainter painter(this);
     painter.drawPixmap(0, 0, m_pixmap);
-    painter.setFont(font());
-
-    /* Branding: Set a different text color (because splash also could be white),
-                 otherwise use white as default color: */
-    QString strColor = vboxGlobal().brandingGetKey("UI/AboutTextColor");
-    if (!strColor.isEmpty())
-        painter.setPen(QColor(strColor).name());
-    else
-        painter.setPen(Qt::black);
-#if VBOX_OSE
-    painter.drawText(QRect(0, 400, 600, 32),
-                     Qt::AlignCenter | Qt::AlignVCenter | Qt::TextWordWrap,
-                     m_strAboutText);
-#else /* VBOX_OSE */
-    painter.drawText(QRect(271, 370, 360, 72),
-                     Qt::AlignLeft | Qt::AlignBottom | Qt::TextWordWrap,
-                     m_strAboutText);
-#endif /* VBOX_OSE */
-}
-
-void VBoxAboutDlg::mouseReleaseEvent(QMouseEvent* /* pEvent */)
-{
-    /* Close the dialog on mouse button release: */
-    close();
 }
 
@@ -109 +105 @@
 {
     setWindowTitle(tr("VirtualBox - About"));
-    QString strAboutText =  tr("VirtualBox Graphical User Interface");
+    QString strAboutText = tr("VirtualBox Graphical User Interface");
 #ifdef VBOX_BLEEDING_EDGE
     QString strVersionText = "EXPERIMENTAL build %1 - " + QString(VBOX_BLEEDING_EDGE);
@@ -121 +117 @@
     m_strAboutText = strAboutText + "\n" + strVersionText.arg(m_strVersion);
 #endif /* VBOX_OSE */
+    m_strAboutText = m_strAboutText + "\n" + QString("Copyright %1 2015 Oracle and/or its affiliates. All rights reserved.").arg(QChar(0xa9));
+    m_pLabel->setText(m_strAboutText);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.h

@@ -28 +28 @@
 /* Forward declarations */
 class QEvent;
+class QLabel;
 
 /* VBox about dialog */
@@ -44 +45 @@
     bool event(QEvent *pEvent);
     void paintEvent(QPaintEvent *pEvent);
-    void mouseReleaseEvent(QMouseEvent *pEvent);
 
     /* Language stuff: */
@@ -56 +56 @@
     QPixmap m_pixmap;
     QSize   m_size;
+    QLabel *m_pLabel;
 };