Changeset 43128 in vbox

Timestamp:

Aug 30, 2012 7:30:59 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

80494

Message:

FE/Qt: VM settings stuff: More precise way to distinguish between offline/online settings dialog types.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

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

-              r36589
+              r43128
 /* Machine state => Settings dialog type converter: */
 SettingsDialogType UISettingsDefs::machineStateToSettingsDialogType(KMachineState machineState)
+SettingsDialogType UISettingsDefs::determineSettingsDialogType(KSessionState sessionState, KMachineState machineState)
+{
     SettingsDialogType result = SettingsDialogType_Wrong;
 …
         case KMachineState_Teleported:
         case KMachineState_Aborted:
+            result = SettingsDialogType_Offline;
+            result = sessionState == KSessionState_Unlocked ? SettingsDialogType_Offline :
+                                                              SettingsDialogType_Online;
             break;
         case KMachineState_Saved:

r41587	r43128
40	40
41	41	/* Machine state => Settings dialog type converter: */
42		SettingsDialogType ~~machineStateToSettingsDialogType(~~KMachineState machineState);
	42	SettingsDialogType determineSettingsDialogType(KSessionState sessionState, KMachineState machineState);
43	43	}
44	44

-              r42526
+              r43128
     AssertMsg(!m_machine.isNull(), ("Can't find corresponding machine!\n"));
     /* Assign current dialog type: */
     setDialogType(machineStateToSettingsDialogType(m_machine.GetState()));
+    setDialogType(determineSettingsDialogType(m_machine.GetSessionState(), m_machine.GetState()));
     /* Creating settings pages: */
 …
     /* Get new dialog type: */
     SettingsDialogType newDialogType = machineStateToSettingsDialogType(m_machineState);
+    SettingsDialogType newDialogType = determineSettingsDialogType(m_machine.GetSessionState(), m_machineState);
     /* Ignore if dialog type was NOT actually changed: */

Note: See TracChangeset for help on using the changeset viewer.