Changeset 90965 in vbox for trunk/src/VBox

Timestamp:

Aug 27, 2021 7:30:44 PM (4 years ago)

Author:

vboxsync

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

146604

Message:

FE/Qt: bugref:10067: UICommon: A bit of rework for general, versioning and native stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

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

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

@@ -991 +991 @@
 }
 
+bool UICommon::brandingIsActive(bool fForce /* = false */)
+{
+    if (fForce)
+        return true;
+
+    if (m_strBrandingConfigFilePath.isEmpty())
+    {
+        m_strBrandingConfigFilePath = QDir(QApplication::applicationDirPath()).absolutePath();
+        m_strBrandingConfigFilePath += "/custom/custom.ini";
+    }
+
+    return QFile::exists(m_strBrandingConfigFilePath);
+}
+
+QString UICommon::brandingGetKey(QString strKey) const
+{
+    QSettings settings(m_strBrandingConfigFilePath, QSettings::IniFormat);
+    return settings.value(QString("%1").arg(strKey)).toString();
+}
+
 #ifdef VBOX_WS_MAC
 /* static */
@@ -1018 +1038 @@
 }
 #endif /* VBOX_WS_MAC */
-
-bool UICommon::brandingIsActive(bool fForce /* = false */)
-{
-    if (fForce)
-        return true;
-
-    if (m_strBrandingConfigFilePath.isEmpty())
-    {
-        m_strBrandingConfigFilePath = QDir(QApplication::applicationDirPath()).absolutePath();
-        m_strBrandingConfigFilePath += "/custom/custom.ini";
-    }
-
-    return QFile::exists(m_strBrandingConfigFilePath);
-}
-
-QString UICommon::brandingGetKey(QString strKey)
-{
-    QSettings settings(m_strBrandingConfigFilePath, QSettings::IniFormat);
-    return settings.value(QString("%1").arg(strKey)).toString();
-}
 
 bool UICommon::processArgs()

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.h

@@ -161 +161 @@
     static void destroy();
 
-    /** @name Common stuff.
+    /** @name General stuff.
+     * @{ */
+        /** Returns the UI type. */
+        UIType uiType() const { return m_enmType; }
+
+        /** Returns whether UICommon instance is properly initialized. */
+        bool isValid() const { return m_fValid; }
+        /** Returns whether UICommon instance cleanup is in progress. */
+        bool isCleaningUp() const { return m_fCleaningUp; }
+    /** @} */
+
+    /** @name Versioning stuff.
      * @{ */
         /** Returns Qt runtime version string. */
@@ -179 +190 @@
         static uint qtCTVersion();
 
-        /** Returns whether UICommon instance is properly initialized. */
-        bool isValid() const { return m_fValid; }
-        /** Returns whether UICommon instance cleanup is in progress. */
-        bool isCleaningUp() const { return m_fCleaningUp; }
-
-        /** Returns the UI type. */
-        UIType uiType() const { return m_enmType; }
-
         /** Returns VBox version string. */
         QString vboxVersionString() const;
@@ -194 +197 @@
         bool isBeta() const;
 
+        /** Returns whether branding is active. */
+        bool brandingIsActive(bool fForce = false);
+        /** Returns value for certain branding @a strKey from custom.ini file. */
+        QString brandingGetKey(QString strKey) const;
+    /** @} */
+
+    /** @name Host OS stuff.
+     * @{ */
 #ifdef VBOX_WS_MAC
         /** Mac OS X: Returns #MacOSXRelease determined by <i>uname</i> call. */
@@ -207 +218 @@
         X11WMType typeOfWindowManager() const { return m_enmWindowManagerType; }
 #endif
-
-        /** Returns whether branding is active. */
-        bool brandingIsActive(bool fForce = false);
-        /** Returns value for certain branding @a strKey from custom.ini file. */
-        QString brandingGetKey(QString strKey);
     /** @} */
 
@@ -826 +832 @@
     static UICommon *s_pInstance;
 
-    /** @name Common stuff.
+    /** @name General stuff.
      * @{ */
         /** Holds the tr("User Defined") port name. */
@@ -838 +844 @@
         /** Holds whether UICommon instance cleanup is in progress. */
         bool  m_fCleaningUp;
-
 #ifdef VBOX_WS_WIN
         /** Holds whether overall GUI data is committed. */
         bool  m_fDataCommitted;
 #endif
-
+    /** @} */
+
+    /** @name Versioning stuff.
+     * @{ */
+        /** Holds the VBox branding config file path. */
+        QString  m_strBrandingConfigFilePath;
+    /** @} */
+
+    /** @name Host OS stuff.
+     * @{ */
 #ifdef VBOX_WS_MAC
         /** Mac OS X: Holds the #MacOSXRelease determined using <i>uname</i> call. */
@@ -855 +869 @@
         bool       m_fCompositingManagerRunning;
 #endif
-
-        /** Holds the VBox branding config file path. */
-        QString  m_strBrandingConfigFilePath;
     /** @} */