Changeset 23431 in vbox for trunk/src/VBox

Timestamp:

Sep 30, 2009 10:31:04 AM (15 years ago)

Author:

vboxsync

Message:

Branding: fix showing of the branding about image

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.cpp (modified) (3 diffs)

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

@@ -24 +24 @@
 #include "VBoxGlobal.h"
 
+#include <iprt/path.h>
+
 /* Qt includes */
 #include <QDir>
@@ -36 +38 @@
     retranslateUi();
 
+    QString sPath (":/about.png");
     /* Branding: Use a custom about splash picture if set */
-    QString sSplash = vboxGlobal().brandingGetKey("UI/AboutSplash");
-    QDir pathImage(sSplash);
+    QString sSplash = vboxGlobal().brandingGetKey ("UI/AboutSplash");
     if (vboxGlobal().brandingIsActive() && !sSplash.isEmpty())
-        mBgImage.load(pathImage.absolutePath());
-    else /* ... or load the built-in picture */
-        mBgImage.load(":/about.png");
+    {
+        char szExecPath[PATH_MAX];
+        RTPathExecDir (szExecPath, PATH_MAX);
+        QString tmpPath = QString ("%1/%2").arg (szExecPath).arg (sSplash);
+        if (QFile::exists (tmpPath))
+            sPath = tmpPath;
+    }
+
+    mBgImage.load (sPath);
 }
 
@@ -76 +84 @@
     painter.setFont (font());
 
-    /* Branding: Set a different text color (because splash also could be white), 
+    /* Branding: Set a different text color (because splash also could be white),
                  otherwise use white as default color */
     QString sColor = vboxGlobal().brandingGetKey("UI/AboutTextColor");