Changeset 45270 in vbox

Timestamp:

Apr 1, 2013 11:33:42 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Message-center cleanup (part 10).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (4 diffs)
• globals/UIMessageCenter.h (modified) (2 diffs)
• selector/UISelectorWindow.cpp (modified) (7 diffs)
• settings/UISettingsDialogSpecific.cpp (modified) (2 diffs)

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

@@ -346 +346 @@
 {
     message(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> "
-            "dialog which you can open from the <b>File</b> menu of the "
-            "main VirtualBox window, and select one of the existing "
-            "languages on the <b>Language</b> page.</p>")
-             .arg(strLangId).arg(strNlsPath));
+            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> dialog which you can open from the <b>File</b> menu "
+               "of the main VirtualBox window, and select one of the existing languages on the <b>Language</b> page.</p>")
+               .arg(strLangId).arg(strNlsPath));
 }
 
@@ -359 +356 @@
 {
     message(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> "
-            "dialog which you can open from the <b>File</b> menu of the "
-            "main VirtualBox window, and select one of the existing "
-            "languages on the <b>Language</b> page.</p>")
-             .arg(strLangFile));
+            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> dialog which you can open from the <b>File</b> menu "
+               "of the main VirtualBox window, and select one of the existing languages on the <b>Language</b> page.</p>")
+               .arg(strLangFile));
 }
 
 void UIMessageCenter::cannotLoadGlobalConfig(const CVirtualBox &vbox, const QString &strError)
 {
-    /* preserve the current error info before calling the object again */
+    /* Preserve error-info: */
     COMResult res(vbox);
-
-    message(mainWindowShown(), MessageType_Critical,
-        tr("<p>Failed to load the global GUI configuration from "
-            "<b><nobr>%1</nobr></b>.</p>"
-            "<p>The application will now terminate.</p>")
-             .arg(vbox.GetSettingsFilePath()),
-        !res.isOk() ? formatErrorInfo(res)
-                    : QString("<!--EOM--><p>%1</p>").arg(vboxGlobal().emphasize(strError)));
+    /* Show the message: */
+    message(0, MessageType_Critical,
+            tr("<p>Failed to load the global GUI configuration from <b><nobr>%1</nobr></b>.</p>"
+               "<p>The application will now terminate.</p>").arg(vbox.GetSettingsFilePath()),
+            !res.isOk() ? formatErrorInfo(res)
+                        : QString("<!--EOM--><p>%1</p>").arg(vboxGlobal().emphasize(strError)));
 }
 
 void UIMessageCenter::cannotSaveGlobalConfig(const CVirtualBox &vbox)
 {
-    /* preserve the current error info before calling the object again */
+    /* Preserve error-info: */
     COMResult res(vbox);
-
-    message(mainWindowShown(), MessageType_Critical,
-        tr("<p>Failed to save the global GUI configuration to "
-            "<b><nobr>%1</nobr></b>.</p>"
-            "<p>The application will now terminate.</p>")
-             .arg(vbox.GetSettingsFilePath()),
-        formatErrorInfo(res));
-}
-
-void UIMessageCenter::cannotSetSystemProperties(const CSystemProperties &props)
-{
-    message(mainWindowShown(), MessageType_Critical,
-        tr("Failed to set global VirtualBox properties."),
-        formatErrorInfo(props));
-}
-
-void UIMessageCenter::cannotFindMachineByName(const CVirtualBox &vbox,
-                                              const QString &name)
-{
-    message(
-        QApplication::desktop()->screen(QApplication::desktop()->primaryScreen()),
-        MessageType_Error,
-        tr("There is no virtual machine named <b>%1</b>.")
-            .arg(name),
-        formatErrorInfo(vbox)
-    );
+    /* Show the message: */
+    message(0, MessageType_Critical,
+            tr("<p>Failed to save the global GUI configuration to <b><nobr>%1</nobr></b>.</p>"
+               "<p>The application will now terminate.</p>").arg(vbox.GetSettingsFilePath()),
+            formatErrorInfo(res));
+}
+
+void UIMessageCenter::cannotFindMachineByName(const CVirtualBox &vbox, const QString &name)
+{
+    message(0, MessageType_Error,
+            tr("There is no virtual machine named <b>%1</b>.").arg(name),
+            formatErrorInfo(vbox));
 }
 
@@ -417 +396 @@
 {
     Assert(session.isNull());
-
-    message(
-        mainWindowShown(),
-        MessageType_Error,
-        tr("Failed to create a new session."),
-        formatErrorInfo(session)
-    );
-}
-
-void UIMessageCenter::cannotOpenSession(const CVirtualBox &vbox,
-                                        const CMachine &machine,
-                                        const CProgress &progress)
+    /* Show the message: */
+    message(mainWindowShown(), MessageType_Error,
+            tr("Failed to create a new session."),
+            formatErrorInfo(session));
+}
+
+void UIMessageCenter::cannotOpenSession(const CVirtualBox &vbox, const CMachine &machine,
+                                        const CProgress &progress /* = CProgress() */)
 {
     Assert(!vbox.isOk() || progress.isOk());
-
-    QString name = machine.GetName();
-    if (name.isEmpty())
-        name = QFileInfo(machine.GetSettingsFilePath()).baseName();
-
-    message(
-        mainWindowShown(),
-        MessageType_Error,
-        tr("Failed to open a session for the virtual machine <b>%1</b>.")
-            .arg(name),
-        !vbox.isOk() ? formatErrorInfo(vbox) :
-                       formatErrorInfo(progress.GetErrorInfo())
-    );
+    /* Compose machine name: */
+    QString strName = machine.GetName();
+    if (strName.isEmpty())
+        strName = QFileInfo(machine.GetSettingsFilePath()).baseName();
+    /* Show the message: */
+    message(mainWindowShown(), MessageType_Error,
+            tr("Failed to open a session for the virtual machine <b>%1</b>.").arg(strName),
+            !vbox.isOk() ? formatErrorInfo(vbox) : formatErrorInfo(progress.GetErrorInfo()));
 }
 
 void UIMessageCenter::cannotOpenSession(const CMachine &machine)
 {
+    /* Preserve error-info: */
     COMResult res(machine);
-    QString name = machine.GetName();
-    if (name.isEmpty())
-        name = QFileInfo(machine.GetSettingsFilePath()).baseName();
-
+    /* Compose machine name: */
+    QString strName = machine.GetName();
+    if (strName.isEmpty())
+        strName = QFileInfo(machine.GetSettingsFilePath()).baseName();
+    /* Show the message: */
     message(mainWindowShown(), MessageType_Error,
-            tr("Failed to open a session for the virtual machine <b>%1</b>.").arg(name),
+            tr("Failed to open a session for the virtual machine <b>%1</b>.").arg(strName),
             formatErrorInfo(res));
 }
 
-void UIMessageCenter::cannotGetMediaAccessibility(const UIMedium &aMedium)
-{
-    message(qApp->activeWindow(), MessageType_Error,
-        tr("Failed to determine the accessibility state of the medium "
-            "<nobr><b>%1</b></nobr>.")
-            .arg(aMedium.location()),
-        formatErrorInfo(aMedium.result()));
+void UIMessageCenter::cannotGetMediaAccessibility(const UIMedium &medium)
+{
+    message(mainWindowShown(), MessageType_Error,
+            tr("Failed to determine the accessibility state of the medium <nobr><b>%1</b></nobr>.")
+               .arg(medium.location()),
+            formatErrorInfo(medium.result()));
 }
 
 void UIMessageCenter::cannotOpenURL(const QString &strUrl)
 {
-    message
-        (mainWindowShown(), MessageType_Error,
-         tr("Failed to open <tt>%1</tt>. Make sure your desktop environment "
-             "can properly handle URLs of this type.")
-         .arg(strUrl));
+    message(mainWindowShown(), MessageType_Error,
+            tr("Failed to open <tt>%1</tt>. "
+               "Make sure your desktop environment can properly handle URLs of this type.")
+               .arg(strUrl));
 }
 
@@ -836 +806 @@
              formatErrorInfo(machine)
     );
+}
+
+void UIMessageCenter::cannotSetSystemProperties(const CSystemProperties &properties)
+{
+    message(mainWindowShown(), MessageType_Critical,
+            tr("Failed to set global VirtualBox properties."),
+            formatErrorInfo(properties));
 }
 

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

@@ -202 +202 @@
     void cannotLoadGlobalConfig(const CVirtualBox &vbox, const QString &strError);
     void cannotSaveGlobalConfig(const CVirtualBox &vbox);
-    void cannotSetSystemProperties(const CSystemProperties &props);
     void cannotFindMachineByName(const CVirtualBox &vbox, const QString &name);
     void cannotOpenSession(const CSession &session);
     void cannotOpenSession(const CVirtualBox &vbox, const CMachine &machine, const CProgress &progress = CProgress());
     void cannotOpenSession(const CMachine &machine);
-    void cannotGetMediaAccessibility(const UIMedium &aMedium);
+    void cannotGetMediaAccessibility(const UIMedium &medium);
     void cannotOpenURL(const QString &strUrl);
 
@@ -241 +240 @@
 
     /* API: Settings warnings: */
+    void cannotSetSystemProperties(const CSystemProperties &properties);
     void cannotAccessUSB(const COMBaseWithEI &object);
     void cannotLoadMachineSettings(const CMachine &machine, bool fStrict = true, QWidget *pParent = 0);

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -475 +475 @@
         CSession session = vboxGlobal().openSession(pItem->id());
         if (session.isNull())
-        {
-            msgCenter().cannotOpenSession(session);
             return;
-        }
 
         /* Get session console: */
@@ -523 +520 @@
         CSession session = vboxGlobal().openExistingSession(pItem->id());
         if (session.isNull())
-        {
-            msgCenter().cannotOpenSession(session);
             return;
-        }
 
         /* Get session console: */
@@ -576 +570 @@
         CSession session = vboxGlobal().openExistingSession(pItem->id());
         if (session.isNull())
-        {
-            msgCenter().cannotOpenSession(session);
             return;
-        }
 
         /* Get session console: */
@@ -607 +598 @@
         CSession session = vboxGlobal().openExistingSession(pItem->id());
         if (session.isNull())
-        {
-            msgCenter().cannotOpenSession(session);
             return;
-        }
 
         /* Get session console: */
@@ -659 +647 @@
         CSession session = vboxGlobal().openExistingSession(pItem->id());
         if (session.isNull())
-        {
-            msgCenter().cannotOpenSession(session);
             return;
-        }
 
         /* Get session console: */
@@ -701 +686 @@
         CSession session = vboxGlobal().openExistingSession(pItem->id());
         if (session.isNull())
-        {
-            msgCenter().cannotOpenSession(session);
             return;
-        }
 
         /* Get session console: */
@@ -1795 +1777 @@
         CSession session = vboxGlobal().openExistingSession(pItem->id());
         if (session.isNull())
-        {
-            msgCenter().cannotOpenSession(session);
             return false;
-        }
         CConsole console = session.GetConsole();
         if (console.isNull())

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

@@ -521 +521 @@
 bool UISettingsDialogGlobal::isPageAvailable(int iPageId)
 {
-    /* Show the host error message for particular group if present.
-     * We don't use the generic cannotLoadGlobalConfig()
-     * call here because we want this message to be suppressible: */
     switch (iPageId)
     {
@@ -539 +536 @@
             if (host.lastRC() == E_NOTIMPL)
                 return false;
-#else
+#else /* ENABLE_GLOBAL_USB */
             return false;
-#endif
+#endif /* !ENABLE_GLOBAL_USB */
             break;
         }