Changeset 39182 in vbox

Timestamp:

Nov 3, 2011 9:06:39 AM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: complement to r74659 to properly handle the edition attribute

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp

@@ -50 +50 @@
         setText(1, m_data.m_strName);
 
-        /* Version: */
-        setText(2, QString("%1r%2").arg(m_data.m_strVersion).arg(m_data.m_strRevision));
+        /* Version, Revision, Edition: */
+        QString strVersion(m_data.m_strVersion);
+        QString strEdition;
+
+        if (strVersion.endsWith("-ENTERPRISE"))
+        {
+            strEdition = "-ENTERPRISE";
+            strVersion.chop(strEdition.size());
+        }
+
+        setText(2, QString("%1r%2%3").arg(strVersion).arg(m_data.m_strRevision).arg(strEdition));
 
         /* Tool-tip: */
@@ -135 +144 @@
     QString strPackName = extPackFile.GetName();
     QString strPackDescription = extPackFile.GetDescription();
-    QString strPackVersion = QString("%1r%2").arg(extPackFile.GetVersion()).arg(extPackFile.GetRevision());
+    QString strVersion(extPackFile.GetVersion());
+    QString strEdition;
+    if (strVersion.endsWith("-ENTERPRISE"))
+    {
+        strEdition = "-ENTERPRISE";
+        strVersion.chop(strEdition.size());
+    }
+    QString strPackVersion = QString("%1r%2%3").arg(strVersion).arg(extPackFile.GetRevision()).arg(strEdition);
 
     /*
@@ -146 +162 @@
     if (fReplaceIt)
     {
-        QString strPackVersionCur = QString("%1r%2").arg(extPackCur.GetVersion()).arg(extPackCur.GetRevision());
+        QString strVersionCur(extPackCur.GetVersion());
+        QString strEditionCur;
+        if (strVersionCur.endsWith("-ENTERPRISE"))
+        {
+            strEditionCur = "-ENTERPRISE";
+            strVersionCur.chop(strEditionCur.size());
+        }
+        QString strPackVersionCur = QString("%1r%2%3").arg(strVersionCur).arg(extPackCur.GetRevision()).arg(strEditionCur);
         if (!msgCenter().confirmReplacePackage(strPackName, strPackVersion, strPackVersionCur, strPackDescription, pParent))
             return;