Changeset 89700 in vbox for trunk/src/VBox

Timestamp:

Jun 15, 2021 10:21:35 AM (4 years ago)

Author:

vboxsync

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

145148

Message:

FE/Qt: bugref:3355. More infrastucture for host screen saver disabling

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (1 diff)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (2 diffs)
• runtime/UIMachineLogic.h (modified) (1 diff)
• settings/machine/UIMachineSettingsUSB.cpp (modified) (1 diff)

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

@@ -4743 +4743 @@
             else if (strKey == GUI_CloudConsoleManager_Restrictions)
                 emit sigCloudConsoleManagerRestrictionChange();
+            else if (strKey == GUI_DisableHostScreenSaver)
+                emit sigDisableHostScreenSaverStateChange(isFeatureAllowed(GUI_DisableHostScreenSaver));
             /* Details categories: */
             else if (strKey == GUI_Details_Elements)

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

@@ -115 +115 @@
     void sigDockIconOverlayAppearanceChange(bool fEnabled);
 #endif /* VBOX_WS_MAC */
+
+#ifdef VBOX_WS_X11
+    /* Is emitted when host screen saver inhibition state changes. */
+    void sigDisableHostScreenSaverStateChange(bool fDisable);
+#endif
 
 public:

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

@@ -708 +708 @@
 {
     m_fIsHidLedsSyncEnabled = fEnabled;
+}
+
+void UIMachineLogic::sltDisableHostScreenSaverStateChanged(bool fDisabled)
+{
+    Q_UNUSED(fDisabled);
 }
 
@@ -1487 +1492 @@
     /* HID LEDs sync initialization: */
     sltSwitchKeyboardLedsToGuestLeds();
+    /* */
+#if defined(VBOX_WS_X11)
+    connect(gEDataManager, &UIExtraDataManager::sigDisableHostScreenSaverStateChange,
+            this, &UIMachineLogic::sltDisableHostScreenSaverStateChanged);
+#endif
 }
 

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

@@ -351 +351 @@
     void sltSwitchKeyboardLedsToPreviousLeds();
 
+    /* Handle disabling/enabling host screen saver. */
+    void sltDisableHostScreenSaverStateChanged(bool fDisabled);
+
     /** Show Global Preferences. */
     void sltShowGlobalPreferences();

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp

@@ -195 +195 @@
 
         bool fIsUSBEmpty = host.GetUSBDevices().size() == 0;
+        printf("%d %d %d warning\n", host.lastRC(), host.isReallyOk(), host.isWarning());
+
         if (fIsUSBEmpty)
         {