Changeset 51664 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jun 19, 2014 11:28:05 AM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 6660: Advanced extra-data management framework: Integrate GUI_CloseActionHook.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• runtime/UIMachineWindow.cpp (modified) (2 diffs)

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

@@ -1011 +1011 @@
 }
 
+QString UIExtraDataManager::machineCloseHookScript(const QString &strID) const
+{
+    return extraDataString(GUI_CloseActionHook, strID);
+}
+
 void UIExtraDataManager::sltExtraDataChange(QString strMachineID, QString strKey, QString strValue)
 {

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

@@ -297 +297 @@
     void setLastMachineCloseAction(MachineCloseAction machineCloseAction, const QString &strID);
 
+    /** Returns machine close hook script name as simple string. */
+    QString machineCloseHookScript(const QString &strID) const;
+
 private slots:
 

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

@@ -39 +39 @@
 #include "UIConverter.h"
 #include "UIModalWindowManager.h"
+#include "UIExtraDataManager.h"
 
 /* COM includes: */
@@ -262 +263 @@
 
     /* If there is a close hook script defined: */
-    QString strScript = m.GetExtraData(GUI_CloseActionHook);
+    const QString strScript = gEDataManager->machineCloseHookScript(vboxGlobal().managedVMUuid());
     if (!strScript.isEmpty())
     {