Changeset 91007 in vbox

Timestamp:

Aug 30, 2021 5:50:44 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10067: Moving URL stuff related warnings from UIMessageCenter to UINotificationCenter; Cleanup UIMessageCenter a bit.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -3724 +3724 @@
     /* Acquire client result: */
     bool fResult = client.result();
-
     if (!fResult)
-        msgCenter().cannotOpenURL(strUrl);
+        UINotificationMessage::cannotOpenURL(strUrl);
 
     return fResult;

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

@@ -453 +453 @@
 }
 
+void UIMessageCenter::cannotFindLanguage(const QString &strLangId, const QString &strNlsPath) const
+{
+    alert(0, MessageType_Error,
+          tr("<p>Could not find a language file for the language <b>%1</b> in the directory <b><nobr>%2</nobr></b>.</p>"
+             "<p>The language will be temporarily reset to the system default language. "
+             "Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the "
+             "VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p>")
+             .arg(strLangId).arg(strNlsPath));
+}
+
+void UIMessageCenter::cannotLoadLanguage(const QString &strLangFile) const
+{
+    alert(0, MessageType_Error,
+          tr("<p>Could not load the language file <b><nobr>%1</nobr></b>. "
+             "<p>The language will be temporarily reset to English (built-in). "
+             "Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the "
+             "VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p>")
+             .arg(strLangFile));
+}
+
 void UIMessageCenter::cannotInitUserHome(const QString &strUserHome) const
 {
@@ -494 +514 @@
 }
 
-void UIMessageCenter::cannotFindLanguage(const QString &strLangId, const QString &strNlsPath) const
-{
-    alert(0, MessageType_Error,
-          tr("<p>Could not find a language file for the language <b>%1</b> in the directory <b><nobr>%2</nobr></b>.</p>"
-             "<p>The language will be temporarily reset to the system default language. "
-             "Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the "
-             "VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p>")
-             .arg(strLangId).arg(strNlsPath));
-}
-
-void UIMessageCenter::cannotLoadLanguage(const QString &strLangFile) const
-{
-    alert(0, MessageType_Error,
-          tr("<p>Could not load the language file <b><nobr>%1</nobr></b>. "
-             "<p>The language will be temporarily reset to English (built-in). "
-             "Please go to the <b>Preferences</b> window which you can open from the <b>File</b> menu of the "
-             "VirtualBox Manager window, and select one of the existing languages on the <b>Language</b> page.</p>")
-             .arg(strLangFile));
-}
-
 void UIMessageCenter::cannotFindMachineByName(const CVirtualBox &vbox, const QString &strName) const
 {
@@ -551 +551 @@
              .arg(strMachineName),
           UIErrorString::formatErrorInfo(progress));
-}
-
-void UIMessageCenter::cannotGetMediaAccessibility(const UIMedium &medium) const
-{
-    error(0, MessageType_Error,
-          tr("Failed to access the disk image file <nobr><b>%1</b></nobr>.")
-             .arg(medium.location()),
-          UIErrorString::formatErrorInfo(medium.result()));
-}
-
-void UIMessageCenter::cannotOpenURL(const QString &strUrl) const
-{
-    alert(0, MessageType_Error,
-          tr("Failed to open <tt>%1</tt>. "
-             "Make sure your desktop environment can properly handle URLs of this type.")
-             .arg(strUrl));
 }
 

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

@@ -250 +250 @@
         void cannotStartSelector() const;
         void cannotStartRuntime() const;
+
+        void cannotFindLanguage(const QString &strLangId, const QString &strNlsPath) const;
+        void cannotLoadLanguage(const QString &strLangFile) const;
     /** @} */
 
@@ -261 +264 @@
 
     /* API: Global warnings: */
-    void cannotFindLanguage(const QString &strLangId, const QString &strNlsPath) const;
-    void cannotLoadLanguage(const QString &strLangFile) const;
     void cannotFindMachineByName(const CVirtualBox &vbox, const QString &strName) const;
     void cannotFindMachineById(const CVirtualBox &vbox, const QUuid &uId) const;
@@ -268 +269 @@
     void cannotOpenSession(const CMachine &machine) const;
     void cannotOpenSession(const CProgress &progress, const QString &strMachineName) const;
-    void cannotGetMediaAccessibility(const UIMedium &medium) const;
-    void cannotOpenURL(const QString &strUrl) const;
     void cannotSetExtraData(const CVirtualBox &vbox, const QString &strKey, const QString &strValue);
     void cannotSetExtraData(const CMachine &machine, const QString &strKey, const QString &strValue);

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

@@ -56 +56 @@
 /* static */
 QMap<QString, QUuid> UINotificationMessage::m_messages = QMap<QString, QUuid>();
+
+/* static */
+void UINotificationMessage::cannotOpenURL(const QString &strUrl)
+{
+    createMessage(
+        QApplication::translate("UIMessageCenter", "Can't open URL ..."),
+        QApplication::translate("UIMessageCenter", "Failed to open <tt>%1</tt>. "
+                                                   "Make sure your desktop environment can properly handle URLs of this type.")
+                                                   .arg(strUrl));
+}
 
 /* static */

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

@@ -61 +61 @@
 public:
 
+    /** Notifies about inability to open @a strUrl. */
+    static void cannotOpenURL(const QString &strUrl);
     /** Notifies about inability to mount image.
       * @param  strMachineName  Brings the machine name.