Changeset 90933 in vbox

Timestamp:

Aug 27, 2021 7:43:58 AM (4 years ago)

Author:

vboxsync

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

146571

Message:

FE/Qt: bugref:10067: Moving Experimental/BETA build warnings from UIMessageCenter to UINotificationCenter.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (2 diffs)
• globals/UIMessageCenter.h (modified) (1 diff)
• globals/UIStarter.cpp (modified) (3 diffs)
• notificationcenter/UINotificationObjects.cpp (modified) (1 diff)
• notificationcenter/UINotificationObjects.h (modified) (1 diff)

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

@@ -407 +407 @@
 }
 
-void UIMessageCenter::warnAboutUnknownOptionType(const QString &strOption)
-{
-    alert(0, MessageType_Error,
-          tr("Unknown option <b>%1</b>.")
-             .arg(strOption));
-}
-
-void UIMessageCenter::warnAboutUnrelatedOptionType(const QString &strOption)
+void UIMessageCenter::warnAboutUnrelatedOptionType(const QString &strOption) const
 {
     alert(0, MessageType_Error,
@@ -457 +450 @@
     /* Show error: */
     alert(0, MessageType_Error, strError.arg(strTable.arg(strUsage)));
-}
-
-void UIMessageCenter::showBetaBuildWarning() const
-{
-    alert(0, MessageType_Warning,
-          tr("You are running a prerelease version of VirtualBox. "
-             "This version is not suitable for production use."));
-}
-
-void UIMessageCenter::showExperimentalBuildWarning() const
-{
-    alert(0, MessageType_Warning,
-          tr("You are running an EXPERIMENTAL build of VirtualBox. "
-             "This version is not suitable for production use."));
 }
 

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

@@ -242 +242 @@
                                  int cMinDuration = 2000);
 
-    /* API: Main (startup) warnings: */
-    void warnAboutUnknownOptionType(const QString &strOption);
-    void warnAboutUnrelatedOptionType(const QString &strOption);
+    /** @name General (startup) warnings.
+      * @{ */
+        void warnAboutUnrelatedOptionType(const QString &strOption) const;
 #ifdef RT_OS_LINUX
-    void warnAboutWrongUSBMounted() const;
-#endif /* RT_OS_LINUX */
-    void cannotStartSelector() const;
-    void cannotStartRuntime() const;
-    void showBetaBuildWarning() const;
-    void showExperimentalBuildWarning() const;
-
-    /* API: COM startup warnings: */
-    void cannotInitUserHome(const QString &strUserHome) const;
-    void cannotInitCOM(HRESULT rc) const;
-    void cannotCreateVirtualBoxClient(const CVirtualBoxClient &client) const;
-    void cannotAcquireVirtualBox(const CVirtualBoxClient &client) const;
+        void warnAboutWrongUSBMounted() const;
+#endif
+        void cannotStartSelector() const;
+        void cannotStartRuntime() const;
+    /** @} */
+
+    /** @name COM (startup) warnings.
+      * @{ */
+        void cannotInitUserHome(const QString &strUserHome) const;
+        void cannotInitCOM(HRESULT rc) const;
+        void cannotCreateVirtualBoxClient(const CVirtualBoxClient &client) const;
+        void cannotAcquireVirtualBox(const CVirtualBoxClient &client) const;
+    /** @} */
 
     /* API: Global warnings: */

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

@@ -23 +23 @@
 #include "UIExtraDataManager.h"
 #include "UIMessageCenter.h"
+#include "UINotificationCenter.h"
 #include "UIStarter.h"
 #ifndef VBOX_RUNTIME_UI
@@ -107 +108 @@
 # ifdef VBOX_BLEEDING_EDGE
     /* Show EXPERIMENTAL BUILD warning: */
-    msgCenter().showExperimentalBuildWarning();
+    UINotificationMessage::remindAboutExperimentalBuild();
 # else /* !VBOX_BLEEDING_EDGE */
 #  ifndef DEBUG
@@ -114 +115 @@
     if (   vboxVersion.contains("BETA")
         && gEDataManager->preventBetaBuildWarningForVersion() != vboxVersion)
-        msgCenter().showBetaBuildWarning();
+        UINotificationMessage::remindAboutBetaBuild();
 #  endif /* !DEBUG */
 # endif /* !VBOX_BLEEDING_EDGE */

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp

@@ -101 +101 @@
 
 /* static */
+void UINotificationMessage::remindAboutBetaBuild()
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "BETA build warning!"),
+        QApplication::translate("UIMessageCenter", "You are running a prerelease version of VirtualBox. "
+                                                   "This version is not suitable for production use."));
+}
+
+/* static */
+void UINotificationMessage::remindAboutExperimentalBuild()
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "Experimental build warning!"),
+        QApplication::translate("UIMessageCenter", "You are running an EXPERIMENTAL build of VirtualBox. "
+                                                   "This version is not suitable for production use."));
+}
+
+/* static */
 void UINotificationMessage::remindAboutMouseIntegration(bool fSupportsAbsolute)
 {

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.h

@@ -70 +70 @@
     /** Reminds about keyboard auto capturing. */
     static void remindAboutAutoCapture();
+    /** Reminds about BETA build. */
+    static void remindAboutBetaBuild();
+    /** Reminds about BETA build. */
+    static void remindAboutExperimentalBuild();
     /** Reminds about mouse integration.
       * @param  fSupportsAbsolute  Brings whether mouse supports absolute pointing. */