Changeset 23368 in vbox for trunk/src/VBox/Frontends

Timestamp:

Sep 28, 2009 12:39:04 PM (15 years ago)

Author:

vboxsync

Message:

Fe/Qt: Added first runtime branding support for version reporting and about dialog.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (1 diff)
• src/VBoxAboutDlg.cpp (modified) (2 diffs)
• src/VBoxGlobal.cpp (modified) (2 diffs)
• src/VBoxProblemReporter.cpp (modified) (1 diff)
• src/VBoxUpdateDlg.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxGlobal.h

@@ -297 +297 @@
     void setMainWindow (QWidget *aMainWindow) { mMainWindow = aMainWindow; }
     QWidget *mainWindow() const { return mMainWindow; }
+
+    /* branding */
+    bool brandingIsActive (bool aForce = false);
+    QString VBoxGlobal::brandingGetKey (QString aKey);
 
     bool isVMConsoleProcess() const { return !vmUuid.isNull(); }

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

@@ -22 +22 @@
 
 #include "VBoxAboutDlg.h"
+#include "VBoxGlobal.h"
 
 /* Qt includes */
+#include <QDir>
+#include <QEvent>
 #include <QPainter>
-#include <QEvent>
 
 VBoxAboutDlg::VBoxAboutDlg (QWidget* aParent, const QString &aVersion)
     : QIWithRetranslateUI2 <QIDialog> (aParent, Qt::CustomizeWindowHint |
                                        Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
-    mVersion (aVersion),
-    mBgImage (":/about.png")
+    mVersion (aVersion)
 {
     retranslateUi();
+
+    /* Branding: Use a custom about splash picture if set */
+    QString sSplash = vboxGlobal().brandingGetKey("UI/AboutSplash");
+    QDir pathImage(sSplash);
+    if (vboxGlobal().brandingIsActive() && !sSplash.isEmpty())
+        mBgImage.load(pathImage.absolutePath());
+    else /* ... or load the built-in picture */
+        mBgImage.load(":/about.png");
 }
 
@@ -66 +75 @@
     painter.drawPixmap (0, 0, mBgImage);
     painter.setFont (font());
-    painter.setPen (Qt::white);
+
+    /* Branding: Set a different text color (because splash also could be white), 
+                 otherwise use white as default color */
+    QColor colorText(vboxGlobal().brandingGetKey("UI/AboutTextColor"));
+    if (!colorText.name().isEmpty())
+        painter.setPen (colorText.name());
+    else
+        painter.setPen (Qt::white);
 #if VBOX_OSE
     painter.drawText (QRect (0, 400, 600, 32),

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

@@ -54 +54 @@
 #include <QThread>
 #include <QPainter>
+#include <QSettings>
 #include <QTimer>
 #include <QDir>
@@ -754 +755 @@
 
     return *mConsoleWnd;
+}
+
+bool VBoxGlobal::brandingIsActive (bool aForce /* = false*/)
+{
+    if (aForce)
+        return true;
+    return !VBoxGlobal::brandingGetKey("VerSuffix").isEmpty();
+}
+
+/**
+  * Gets a value from the global (platform-specific) application settings
+  * (e.g. on Windows using the registry) for branding stuff 
+  */
+QString VBoxGlobal::brandingGetKey (QString aKey)
+{
+    QSettings settings("Sun", "VirtualBox");
+    return settings.value(QString("Branding/%1").arg(aKey)).toString();
 }
 

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

@@ -2346 +2346 @@
 {
     CVirtualBox vbox = vboxGlobal().virtualBox();
-    QString fullVersion (QString ("%1 r%2").arg (vbox.GetVersion())
-                                          .arg (vbox.GetRevision()));
+    QString fullVersion ;
+    if (vboxGlobal().brandingIsActive())
+    {
+        fullVersion = (QString ("%1 r%2 - %3").arg (vbox.GetVersion())
+                                              .arg (vbox.GetRevision())
+                                              .arg (vboxGlobal().brandingGetKey("Name")));
+    }
+    else
+    {
+        fullVersion = (QString ("%1 r%2").arg (vbox.GetVersion())
+                                         .arg (vbox.GetRevision()));
+    }
     AssertWrapperOk (vbox);
 

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

@@ -353 +353 @@
     /* Compose query */
     QUrl url (mUrl);
-    url.addQueryItem ("platform", vboxGlobal().virtualBox().GetPackageType());
-    url.addQueryItem ("version", QString ("%1_%2").arg (vboxGlobal().virtualBox().GetVersion())
-                                                  .arg (vboxGlobal().virtualBox().GetRevision()));
+    url.addQueryItem ("platform", vboxGlobal().virtualBox().GetPackageType());   
+    /* Branding: Check whether we have a local branding file which tells us our version suffix "FOO"
+                     (e.g. 3.06.54321_FOO) to identify this installation */
+    if (vboxGlobal().brandingIsActive())
+    {        
+        url.addQueryItem ("version", QString ("%1_%2_%3").arg (vboxGlobal().virtualBox().GetVersion())
+                                                         .arg (vboxGlobal().virtualBox().GetRevision())
+                                                         .arg (vboxGlobal().brandingGetKey("VerSuffix")));
+    }
+    else
+    {
+        /* Use hard coded version set by VBOX_VERSION_STRING */
+        url.addQueryItem ("version", QString ("%1_%2").arg (vboxGlobal().virtualBox().GetVersion())
+                                                      .arg (vboxGlobal().virtualBox().GetRevision()));
+    }
     url.addQueryItem ("count", QString::number (count));
     url.addQueryItem ("branch", VBoxUpdateData (vboxGlobal().virtualBox().