Changeset 51588 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 10, 2014 11:54:07 AM (11 years ago)

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• runtime/UISession.cpp (modified) (3 diffs)

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

@@ -821 +821 @@
 }
 
+bool UIExtraDataManager::guestScreenAutoResize(const QString &strID) const
+{
+    /* 'True' unless feature restricted: */
+    return !isFeatureRestricted(GUI_AutoresizeGuest, strID);
+}
+
+void UIExtraDataManager::setGuestScreenAutoResize(bool fEnabled, const QString &strID)
+{
+    /* 'False' if feature restricted, null-string otherwise: */
+    setExtraDataString(GUI_AutoresizeGuest, toFeatureRestricted(!fEnabled), strID);
+}
+
 MachineCloseAction UIExtraDataManager::defaultMachineCloseAction(const QString &strID) const
 {

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

@@ -240 +240 @@
     void setHostScreenForPassedGuestScreen(int iGuestScreenIndex, int iHostScreenIndex, const QString &strID);
 
+    /** Returns whether guest-screen should auto-resize according machine-window size. */
+    bool guestScreenAutoResize(const QString &strID) const;
+    /** Defines whether guest-screen auto-resize according machine-window size is @a fEnabled. */
+    void setGuestScreenAutoResize(bool fEnabled, const QString &strID);
+
     /** Returns default machine close action. */
     MachineCloseAction defaultMachineCloseAction(const QString &strID) const;

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

@@ -1141 +1141 @@
 
         /* Should guest autoresize? */
-        strSettings = machine.GetExtraData(GUI_AutoresizeGuest);
         QAction *pGuestAutoresizeSwitch = gActionPool->action(UIActionIndexRuntime_Toggle_GuestAutoresize);
-        pGuestAutoresizeSwitch->setChecked(strSettings != "off");
+        pGuestAutoresizeSwitch->setChecked(gEDataManager->guestScreenAutoResize(vboxGlobal().managedVMUuid()));
 
         /* Should we allow reconfiguration? */
@@ -1174 +1173 @@
 void UISession::saveSessionSettings()
 {
-    /* Get uisession machine: */
-    CMachine machine = session().GetConsole().GetMachine();
-
     /* Save extra-data settings: */
     {
@@ -1183 +1179 @@
 
         /* Remember if guest should autoresize: */
-        machine.SetExtraData(GUI_AutoresizeGuest,
-                             gActionPool->action(UIActionIndexRuntime_Toggle_GuestAutoresize)->isChecked() ?
-                             QString() : "off");
+        gEDataManager->setGuestScreenAutoResize(gActionPool->action(UIActionIndexRuntime_Toggle_GuestAutoresize)->isChecked(), vboxGlobal().managedVMUuid());
 
 #if 0 /* Disabled for now! */