Changeset 51021 in vbox

Timestamp:

Apr 9, 2014 4:48:49 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: New GUI/GuruMeditationHandler per-VM extra-data flag allowing to predefine Guru Meditation handling behavior.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackend.h (modified) (2 diffs)
• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• globals/UIDefs.cpp (modified) (1 diff)
• globals/UIDefs.h (modified) (2 diffs)
• globals/VBoxGlobal.cpp (modified) (1 diff)
• globals/VBoxGlobal.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (1 diff)
• runtime/UISession.cpp (modified) (2 diffs)
• runtime/UISession.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h

@@ -77 +77 @@
 template<> bool canConvert<IndicatorType>();
 template<> bool canConvert<MachineCloseAction>();
+template<> bool canConvert<GuruMeditationHandlerType>();
 
 /* Declare COM canConvert specializations: */
@@ -140 +141 @@
 template<> QString toInternalString(const MachineCloseAction &machineCloseAction);
 template<> MachineCloseAction fromInternalString<MachineCloseAction>(const QString &strMachineCloseAction);
+template<> QString toInternalString(const GuruMeditationHandlerType &guruMeditationHandlerType);
+template<> GuruMeditationHandlerType fromInternalString<GuruMeditationHandlerType>(const QString &strGuruMeditationHandlerType);
 
 /* Declare COM conversion specializations: */

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -50 +50 @@
 template<> bool canConvert<IndicatorType>() { return true; }
 template<> bool canConvert<MachineCloseAction>() { return true; }
+template<> bool canConvert<GuruMeditationHandlerType>() { return true; }
 
 /* QString <= SizeSuffix: */
@@ -1045 +1046 @@
 }
 
+/* QString <= GuruMeditationHandlerType: */
+template<> QString toInternalString(const GuruMeditationHandlerType &guruMeditationHandlerType)
+{
+    QString strResult;
+    switch (guruMeditationHandlerType)
+    {
+        case GuruMeditationHandlerType_Default:  strResult = "Default"; break;
+        case GuruMeditationHandlerType_PowerOff: strResult = "PowerOff"; break;
+        case GuruMeditationHandlerType_Ignore:   strResult = "Ignore"; break;
+        default:
+        {
+            AssertMsgFailed(("No text for indicator type=%d", guruMeditationHandlerType));
+            break;
+        }
+    }
+    return strResult;
+}
+
+/* GuruMeditationHandlerType <= QString: */
+template<> GuruMeditationHandlerType fromInternalString<GuruMeditationHandlerType>(const QString &strGuruMeditationHandlerType)
+{
+    /* Here we have some fancy stuff allowing us
+     * to search through the keys using 'case-insensitive' rule: */
+    QStringList keys;   QList<GuruMeditationHandlerType> values;
+    keys << "Default";  values << GuruMeditationHandlerType_Default;
+    keys << "PowerOff"; values << GuruMeditationHandlerType_PowerOff;
+    keys << "Ignore";   values << GuruMeditationHandlerType_Ignore;
+    /* Default type for unknown words: */
+    if (!keys.contains(strGuruMeditationHandlerType, Qt::CaseInsensitive))
+        return GuruMeditationHandlerType_Default;
+    /* Corresponding type for known words: */
+    return values.at(keys.indexOf(QRegExp(strGuruMeditationHandlerType, Qt::CaseInsensitive)));
+}
+

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

@@ -83 +83 @@
 const char* UIDefs::GUI_RestrictedStatusBarIndicators = "GUI/RestrictedStatusBarIndicators";
 const char* UIDefs::GUI_HidLedsSync = "GUI/HidLedsSync";
+const char* UIDefs::GUI_GuruMeditationHandler = "GUI/GuruMeditationHandler";
 
 /* Settings dialogs stuff: */

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

@@ -152 +152 @@
     extern const char* GUI_RestrictedStatusBarIndicators;
     extern const char* GUI_HidLedsSync;
+    extern const char* GUI_GuruMeditationHandler;
 
     /* Settings dialogs stuff: */
@@ -473 +474 @@
 Q_DECLARE_METATYPE(MachineCloseAction);
 
+/** Guru Meditation handler types. */
+enum GuruMeditationHandlerType
+{
+    GuruMeditationHandlerType_Default,
+    GuruMeditationHandlerType_PowerOff,
+    GuruMeditationHandlerType_Ignore
+};
+
 #endif /* !___UIDefs_h___ */
 

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

@@ -4093 +4093 @@
 #endif /* !Q_WS_MAC */
 
+/* static */
+GuruMeditationHandlerType VBoxGlobal::guruMeditationHandlerType(CMachine &machine)
+{
+    /* Return result: */
+    return gpConverter->fromInternalString<GuruMeditationHandlerType>(machine.GetExtraData(GUI_GuruMeditationHandler));
+}
+
 #ifdef RT_OS_LINUX
 /* static */

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

@@ -401 +401 @@
     static QStringList machineWindowIconNames(CMachine &machine);
 #endif /* !Q_WS_MAC */
+    /** Loads redefined guru-meditation handler type. */
+    static GuruMeditationHandlerType guruMeditationHandlerType(CMachine &machine);
 
 #ifdef RT_OS_LINUX

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

@@ -414 +414 @@
             /* Take the screenshot for debugging purposes: */
             takeScreenshot(strLogFolder + "/VBox.png", "png");
-            /* Warn the user about GURU meditation: */
-            if (msgCenter().remindAboutGuruMeditation(QDir::toNativeSeparators(strLogFolder)))
-                powerOff(false /* do NOT restore current snapshot */);
+            /* How should we handle Guru Meditation? */
+            switch (uisession()->guruMeditationHandlerType())
+            {
+                /* Ask how to proceed; Power off VM if proposal accepted: */
+                case GuruMeditationHandlerType_Default:
+                {
+                    if (msgCenter().remindAboutGuruMeditation(QDir::toNativeSeparators(strLogFolder)))
+                        powerOff(false /* do NOT restore current snapshot */);
+                    break;
+                }
+                /* Power off VM silently: */
+                case GuruMeditationHandlerType_PowerOff:
+                {
+                    powerOff(false /* do NOT restore current snapshot */);
+                    break;
+                }
+                /* Just ignore it: */
+                case GuruMeditationHandlerType_Ignore:
+                default:
+                    break;
+            }
             break;
         }

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

@@ -133 +133 @@
     , m_pMachineWindowIcon(0)
 #endif /* !Q_WS_MAC */
+    , m_guruMeditationHandlerType(GuruMeditationHandlerType_Default)
     , m_fIsExtensionPackUsable(false)
     , m_requestedVisualStateType(UIVisualStateType_Invalid)
@@ -1130 +1131 @@
 #endif /* !Q_WS_MAC */
 
+        /* Determine Guru Meditation handler type: */
+        m_guruMeditationHandlerType = VBoxGlobal::guruMeditationHandlerType(machine);
+
         /* Is there should be First RUN Wizard? */
         strSettings = machine.GetExtraData(GUI_FirstRun);

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

@@ -105 +105 @@
 #endif /* !Q_WS_MAC */
 
+    /** @name Runtime workflow stuff.
+     ** @{ */
+    /** Returns Guru Meditation handler type. */
+    GuruMeditationHandlerType guruMeditationHandlerType() const { return m_guruMeditationHandlerType; }
+    /** @} */
+
     /** @name Extension Pack stuff.
      ** @{ */
@@ -349 +355 @@
 #endif /* !Q_WS_MAC */
 
+    /** @name Runtime workflow variables.
+     ** @{ */
+    /** Holds Guru Meditation handler type. */
+    GuruMeditationHandlerType m_guruMeditationHandlerType;
+    /** @} */
+
     /** @name Extension Pack variables.
      ** @{ */