Changeset 68679 in vbox for trunk

Timestamp:

Sep 6, 2017 1:42:56 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: Moving some more messages to UIPopupCenter

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• globals/UIPopupCenter.cpp (modified) (1 diff)
• globals/UIPopupCenter.h (modified) (3 diffs)
• runtime/UISession.cpp (modified) (3 diffs)

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

@@ -2033 +2033 @@
              "least <b>%1</b> of video memory.</p>")
              .arg(VBoxGlobal::formatSize(uMinVRAM)));
-}
-
-void UIMessageCenter::cannotMountGuestAdditions(const QString &strMachineName) const
-{
-    alert(0, MessageType_Error,
-          tr("<p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, "
-             "as the machine has no optical drives. Please add a drive using the storage page of the "
-             "virtual machine settings window.</p>")
-             .arg(strMachineName));
 }
 

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

@@ -312 +312 @@
     bool cannotSwitchScreenInFullscreen(quint64 uMinVRAM) const;
     void cannotSwitchScreenInSeamless(quint64 uMinVRAM) const;
-    void cannotMountGuestAdditions(const QString &strMachineName) const;
     void cannotAddDiskEncryptionPassword(const CConsole &console);
 

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

@@ -629 +629 @@
 }
 
+void UIPopupCenter::cannotMountImage(QWidget *pParent, const QString &strMachineName, const QString &strMediumName)
+{
+    alert(pParent, "cannotMountImage",
+          QApplication::translate("UIMessageCenter",
+                                  "<p>Could not insert the <b>%1</b> disk image file into the virtual machine <b>%2</b>, "
+                                  "as the machine has no optical drives. Please add a drive using the storage page of the "
+                                  "virtual machine settings window.</p>")
+                                  .arg(strMediumName, strMachineName));
+}
+
+void UIPopupCenter::cannotOpenMedium(QWidget *pParent, const CVirtualBox &comVBox, UIMediumType /* enmType */, const QString &strLocation)
+{
+    alertWithDetails(pParent, "cannotOpenMedium",
+                     QApplication::translate("UIMessageCenter",
+                                             "Failed to open the disk image file <nobr><b>%1</b></nobr>.")
+                                             .arg(strLocation),
+                     UIErrorString::formatErrorInfo(comVBox));
+}
+
+void UIPopupCenter::cannotSaveMachineSettings(QWidget *pParent, const CMachine &comMachine)
+{
+    alertWithDetails(pParent, "cannotSaveMachineSettings",
+                     QApplication::translate("UIMessageCenter",
+                                             "Failed to save the settings of the virtual machine <b>%1</b> to <b><nobr>%2</nobr></b>.")
+                                             .arg(CMachine(comMachine).GetName(), CMachine(comMachine).GetSettingsFilePath()),
+                     UIErrorString::formatErrorInfo(comMachine));
+}
+

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

@@ -24 +24 @@
 #include <QPointer>
 
+/* GUI includes: */
+#include "UIMediumDefs.h"
+
 /* Forward declaration: */
 class QWidget;
@@ -32 +35 @@
 class CMachine;
 class CNetworkAdapter;
+class CVirtualBox;
 class CVirtualBoxErrorInfo;
 class CVRDEServer;
@@ -138 +142 @@
     void cannotToggleAudioInput(QWidget *pParent, const CAudioAdapter &comAdapter,
                                 const QString &strMachineName, bool fEnable);
+    void cannotMountImage(QWidget *pParent, const QString &strMachineName, const QString &strMediumName);
+    void cannotOpenMedium(QWidget *pParent, const CVirtualBox &comVBox, UIMediumType enmType, const QString &strLocation);
+    void cannotSaveMachineSettings(QWidget *pParent, const CMachine &comMachine);
 
 private slots:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -1892 +1892 @@
         if (!comVBox.isOk() || comMedium.isNull())
         {
-            msgCenter().cannotOpenMedium(comVBox, enmMediumType, strMediumName);
+            popupCenter().cannotOpenMedium(machineLogic()->activeMachineWindow(), comVBox, enmMediumType, strMediumName);
             return false;
         }
@@ -1935 +1935 @@
     if (sStorageSlots.isEmpty())
     {
-        msgCenter().cannotMountGuestAdditions(machineName());
+        popupCenter().cannotMountImage(machineLogic()->activeMachineWindow(), machineName(), strMediumName);
         return false;
     }
@@ -1961 +1961 @@
     if (!machine().isOk())
     {
-        msgCenter().cannotSaveMachineSettings(machine(), mainMachineWindow());
+        popupCenter().cannotSaveMachineSettings(machineLogic()->activeMachineWindow(), machine());
         return false;
     }