Changeset 57551 in vbox

Timestamp:

Aug 26, 2015 4:04:27 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: About-VirtualBox Dialog: Rework/Cleanup and coding style improvements.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxAboutDlg.cpp (modified) (4 diffs)
• VBoxAboutDlg.h (modified) (3 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -20 +20 @@
 #else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-/* Global includes */
+/* Qt includes: */
 # include <QDir>
 # include <QEvent>
+# include <QLabel>
 # include <QPainter>
-# include <QLabel>
+
+/* GUI includes: */
+# include "UIConverter.h"
+# include "UIExtraDataManager.h"
+# include "UIIconPool.h"
+# include "VBoxAboutDlg.h"
+# include "VBoxGlobal.h"
+
+/* Other VBox includes: */
 # include <iprt/path.h>
 # include <VBox/version.h> /* VBOX_VENDOR */
 
-/* Local includes */
-# include "VBoxAboutDlg.h"
-# include "VBoxGlobal.h"
-# include "UIConverter.h"
-# include "UIExtraDataManager.h"
-# include "UIIconPool.h"
-
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 
 VBoxAboutDlg::VBoxAboutDlg(QWidget *pParent, const QString &strVersion)
@@ -42 +43 @@
     , m_strVersion(strVersion)
 {
-    /* Delete dialog on close: */
-    setAttribute(Qt::WA_DeleteOnClose);
-
-    /* Choose default image: */
-    QString strPath(":/about.png");
-
-    /* Branding: Use a custom about splash picture if set: */
-    QString strSplash = vboxGlobal().brandingGetKey("UI/AboutSplash");
-    if (vboxGlobal().brandingIsActive() && !strSplash.isEmpty())
-    {
-        char szExecPath[1024];
-        RTPathExecDir(szExecPath, 1024);
-        QString strTmpPath = QString("%1/%2").arg(szExecPath).arg(strSplash);
-        if (QFile::exists(strTmpPath))
-            strPath = strTmpPath;
-    }
-
-    /* Load image: */
-    QIcon icon = UIIconPool::iconSet(strPath);
-    m_size = icon.availableSizes().first();
-    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();
+    /* Prepare: */
+    prepare();
 }
 
@@ -121 +79 @@
 }
 
+void VBoxAboutDlg::prepare()
+{
+    /* Delete dialog on close: */
+    setAttribute(Qt::WA_DeleteOnClose);
+
+    /* Choose default image: */
+    QString strPath(":/about.png");
+
+    /* Branding: Use a custom about splash picture if set: */
+    QString strSplash = vboxGlobal().brandingGetKey("UI/AboutSplash");
+    if (vboxGlobal().brandingIsActive() && !strSplash.isEmpty())
+    {
+        char szExecPath[1024];
+        RTPathExecDir(szExecPath, 1024);
+        QString strTmpPath = QString("%1/%2").arg(szExecPath).arg(strSplash);
+        if (QFile::exists(strTmpPath))
+            strPath = strTmpPath;
+    }
+
+    /* Load image: */
+    QIcon icon = UIIconPool::iconSet(strPath);
+    m_size = icon.availableSizes().first();
+    m_pixmap = icon.pixmap(m_size);
+
+    /* Prepare main-layout: */
+    prepareMainLayout();
+
+    /* Translate: */
+    retranslateUi();
+}
+
+void VBoxAboutDlg::prepareMainLayout()
+{
+    /* Create main-layout: */
+    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
+    AssertPtrReturnVoid(pMainLayout);
+    {
+        /* Create label for version text: */
+        m_pLabel = new QLabel;
+        AssertPtrReturnVoid(m_pLabel);
+        {
+            /* 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");
+            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());
+
+            /* Add label to the main-layout: */
+            pMainLayout->addWidget(m_pLabel);
+            pMainLayout->setAlignment(m_pLabel, Qt::AlignRight | Qt::AlignBottom);
+        }
+    }
+}
+

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -16 +16 @@
  */
 
-#ifndef __VBoxAboutDlg_h__
-#define __VBoxAboutDlg_h__
+#ifndef ___VBoxAboutDlg_h___
+#define ___VBoxAboutDlg_h___
 
-/* Global includes */
+/* Qt includes: */
 #include <QPixmap>
 
-/* Local includes */
+/* GUI includes: */
+#include "QIDialog.h"
 #include "QIWithRetranslateUI.h"
-#include "QIDialog.h"
 
-/* Forward declarations */
+/* Forward declarations: */
 class QEvent;
 class QLabel;
 
-/* VBox about dialog */
-class VBoxAboutDlg: public QIWithRetranslateUI2<QIDialog>
+/** QIDialog extension
+  * used to show the About-VirtualBox dialog. */
+class VBoxAboutDlg : public QIWithRetranslateUI2<QIDialog>
 {
     Q_OBJECT;
@@ -37 +38 @@
 public:
 
-    /* Constructor: */
+    /** 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);
 
 protected:
 
-    /* Event handlers: */
+    /** Handles Qt polish event. */
     bool event(QEvent *pEvent);
+
+    /** Handles Qt paint-event to draw About-VirtualBox image. */
     void paintEvent(QPaintEvent *pEvent);
 
-    /* Language stuff: */
+    /** Handles translation event. */
     void retranslateUi();
 
 private:
 
-    /* Variables: */
+    /** Prepare About-VirtualBox dialog. */
+    void prepare();
+
+    /** Prepare main-layout routine. */
+    void prepareMainLayout();
+
+    /** Holds the About-VirtualBox text. */
     QString m_strAboutText;
+
+    /** Holds the VirtualBox version number. */
     QString m_strVersion;
+
+    /** Holds the About-VirtualBox image. */
     QPixmap m_pixmap;
+
+    /** Holds the About-VirtualBox dialog size. */
     QSize   m_size;
+
+    /** Holds the instance of label we create for About-VirtualBox text. */
     QLabel *m_pLabel;
 };
 
-#endif /* __VBoxAboutDlg_h__ */
+#endif /* !___VBoxAboutDlg_h___ */