Changeset 57608 in vbox

Timestamp:

Sep 3, 2015 11:44:27 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

102475

Message:

FE/Qt: About-VirtualBox Dialog: Rework/Cleanup and review comments implementation.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxAboutDlg.cpp (modified) (7 diffs)
• VBoxAboutDlg.h (modified) (2 diffs)

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

@@ -42 +42 @@
     : QIWithRetranslateUI2<QIDialog>(pParent)
     , m_strVersion(strVersion)
+    , m_pLabel(0)
 {
     /* Prepare: */
@@ -49 +50 @@
 bool VBoxAboutDlg::event(QEvent *pEvent)
 {
+    /* Set fixed-size for dialog: */
     if (pEvent->type() == QEvent::Polish)
         setFixedSize(m_size);
+    /* Call to base-class: */
     return QIDialog::event(pEvent);
 }
@@ -57 +60 @@
 {
     QPainter painter(this);
+    /* Draw About-VirtualBox background image: */
     painter.drawPixmap(0, 0, m_pixmap);
 }
@@ -63 +67 @@
 {
     setWindowTitle(tr("VirtualBox - About"));
-    QString strAboutText = tr("VirtualBox Graphical User Interface");
+    const QString strAboutText = tr("VirtualBox Graphical User Interface");
 #ifdef VBOX_BLEEDING_EDGE
-    QString strVersionText = "EXPERIMENTAL build %1 - " + QString(VBOX_BLEEDING_EDGE);
-#else
-    QString strVersionText = tr("Version %1");
-#endif
+    const QString strVersionText = "EXPERIMENTAL build %1 - " + QString(VBOX_BLEEDING_EDGE);
+#else /* !VBOX_BLEEDING_EDGE */
+    const QString strVersionText = tr("Version %1");
+#endif /* !VBOX_BLEEDING_EDGE */
 #if VBOX_OSE
     m_strAboutText = strAboutText + " " + strVersionText.arg(m_strVersion) + "\n" +
                      QString("%1 2004-" VBOX_C_YEAR " " VBOX_VENDOR).arg(QChar(0xa9));
-#else /* VBOX_OSE */
+#else /* !VBOX_OSE */
     m_strAboutText = strAboutText + "\n" + strVersionText.arg(m_strVersion);
-#endif /* VBOX_OSE */
+#endif /* !VBOX_OSE */
     m_strAboutText = m_strAboutText + "\n" + QString("Copyright %1 2015 Oracle and/or its affiliates. All rights reserved.").arg(QChar(0xa9));
+    AssertPtrReturnVoid(m_pLabel);
     m_pLabel->setText(m_strAboutText);
 }
@@ -88 +93 @@
 
     /* Branding: Use a custom about splash picture if set: */
-    QString strSplash = vboxGlobal().brandingGetKey("UI/AboutSplash");
+    const QString strSplash = vboxGlobal().brandingGetKey("UI/AboutSplash");
     if (vboxGlobal().brandingIsActive() && !strSplash.isEmpty())
     {
@@ -99 +104 @@
 
     /* Load image: */
-    QIcon icon = UIIconPool::iconSet(strPath);
+    const QIcon icon = UIIconPool::iconSet(strPath);
     m_size = icon.availableSizes().first();
     m_pixmap = icon.pixmap(m_size);
 
-    /* Prepare main-layout: */
+    /* Prepares main-layout: */
     prepareMainLayout();
 
@@ -121 +126 @@
         {
             /* Prepare label for version text: */
-
             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");
+            const QString strColor = vboxGlobal().brandingGetKey("UI/AboutTextColor");
             if (!strColor.isEmpty())
                 palette.setColor(QPalette::WindowText, QColor(strColor).name());

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

@@ -40 +40 @@
     /** Constructs dialog passing @a pParent to the QWidget base-class constructor.
       * @param strVersion is used to specify the version number of VirtualBox. */
-    VBoxAboutDlg(QWidget* pParent, const QString &strVersion);
+    VBoxAboutDlg(QWidget *pParent, const QString &strVersion);
 
 protected:
 
-    /** Handles Qt polish event. */
+    /** Handles any Qt @a pEvent. */
     bool event(QEvent *pEvent);
 
-    /** Handles Qt paint-event to draw About-VirtualBox image. */
+    /** Handles Qt paint @a pEvent. */
     void paintEvent(QPaintEvent *pEvent);
 
@@ -55 +55 @@
 private:
 
-    /** Prepare About-VirtualBox dialog. */
+    /** Prepares About-VirtualBox dialog. */
     void prepare();
 
-    /** Prepare main-layout routine. */
+    /** Prepares main-layout. */
     void prepareMainLayout();