Changeset 61195 in vbox for trunk

Timestamp:

May 25, 2016 2:56:15 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: ​​​​​​​​​​bugref:7420: Request GUI/SuppressMessages value from the machine extra-data first, then global one after that (no combining).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• globals/UIMessageCenter.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -2227 +2227 @@
 }
 
-QStringList UIExtraDataManager::suppressedMessages()
-{
-    return extraDataStringList(GUI_SuppressMessages);
+QStringList UIExtraDataManager::suppressedMessages(const QString &strID /* = GlobalID */)
+{
+    return extraDataStringList(GUI_SuppressMessages, strID);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -144 +144 @@
       * @{ */
         /** Returns the list of supressed messages for the Message/Popup center frameworks. */
-        QStringList suppressedMessages();
+        QStringList suppressedMessages(const QString &strID = GlobalID);
         /** Defines the @a list of supressed messages for the Message/Popup center frameworks. */
         void setSuppressedMessages(const QStringList &list);

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

@@ -2864 +2864 @@
 
     /* Check if message-box was auto-confirmed before: */
-    CVirtualBox vbox;
     QStringList confirmedMessageList;
     if (!strAutoConfirmId.isEmpty())
     {
-        vbox = vboxGlobal().virtualBox();
-        confirmedMessageList = gEDataManager->suppressedMessages();
+        const QString strID = vboxGlobal().isVMConsoleProcess() ? vboxGlobal().managedVMUuid() : UIExtraDataManager::GlobalID;
+        confirmedMessageList = gEDataManager->suppressedMessages(strID);
         if (   confirmedMessageList.contains(strAutoConfirmId)
             || confirmedMessageList.contains("allMessageBoxes")