Changeset 89688 in vbox

Timestamp:

Jun 14, 2021 5:10:09 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:3355. Adding GUI elements for the host screen saver disable

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (2 diffs)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• settings/global/UIGlobalSettingsDisplay.cpp (modified) (11 diffs)
• settings/global/UIGlobalSettingsDisplay.h (modified) (1 diff)

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

@@ -56 +56 @@
 const char *UIExtraDataDefs::GUI_MaxGuestResolution = "GUI/MaxGuestResolution";
 const char *UIExtraDataDefs::GUI_ActivateHoveredMachineWindow = "GUI/ActivateHoveredMachineWindow";
+const char *UIExtraDataDefs::GUI_DisableHostScreenSaver = "GUI/DisableHostScreenSaver";
 
 /* Settings: Keyboard: */

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

@@ -103 +103 @@
         /** Holds whether hovered machine-window should be activated. */
         SHARED_LIBRARY_STUFF extern const char *GUI_ActivateHoveredMachineWindow;
+        /** Holds whether the host scrrn saver is disabled when a vm is running. */
+        SHARED_LIBRARY_STUFF extern const char *GUI_DisableHostScreenSaver;
     /** @} */
 

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

@@ -1904 +1904 @@
            << GUI_LanguageID
            << GUI_ActivateHoveredMachineWindow
+           << GUI_DisableHostScreenSaver
            << GUI_Input_SelectorShortcuts << GUI_Input_MachineShortcuts
            << GUI_RecentFolderHD << GUI_RecentFolderCD << GUI_RecentFolderFD
@@ -2503 +2504 @@
 }
 
+bool UIExtraDataManager::disableHostScreenSaver()
+{
+    /* 'False' unless feature allowed: */
+    return isFeatureAllowed(GUI_DisableHostScreenSaver);
+}
+
+void UIExtraDataManager::setDisableHostScreenSaver(bool fActivate)
+{
+    /* 'True' if feature allowed, null-string otherwise: */
+    setExtraDataString(GUI_DisableHostScreenSaver, toFeatureAllowed(fActivate));
+}
+
 QString UIExtraDataManager::hostKeyCombination()
 {

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

@@ -243 +243 @@
         /** Defines whether hovered machine-window should be @a fActivated. */
         void setActivateHoveredMachineWindow(bool fActivate);
+        /* Return whether host screen saver is disabled when a vm is running. */
+        bool disableHostScreenSaver();
+        /* Sets whether host screen saver is disabled when a vm is running. */
+        void setDisableHostScreenSaver(bool fActivate);
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.cpp

@@ -36 +36 @@
     UIDataSettingsGlobalDisplay()
         : m_fActivateHoveredMachineWindow(false)
+        , m_fDisableHostScreenSaver(false)
     {}
 
@@ -44 +45 @@
                && (m_guiMaximumGuestScreenSizeValue == other.m_guiMaximumGuestScreenSizeValue)
                && (m_fActivateHoveredMachineWindow == other.m_fActivateHoveredMachineWindow)
+               && (m_fDisableHostScreenSaver == other.m_fDisableHostScreenSaver)
                && (m_scaleFactors == other.m_scaleFactors)
                   ;
@@ -57 +59 @@
     /** Holds whether we should automatically activate machine window under the mouse cursor. */
     bool                           m_fActivateHoveredMachineWindow;
+    /** Holds whether we should disable host sceen saver on a vm is running. */
+    bool                           m_fDisableHostScreenSaver;
+
     /** Holds the guest screen scale-factor. */
     QList<double>                  m_scaleFactors;
@@ -76 +81 @@
     , m_pLabelMachineWindows(0)
     , m_pCheckBoxActivateOnMouseHover(0)
+    , m_pCheckBoxDisableHostScreenSaver(0)
 {
     prepare();
@@ -98 +104 @@
                                                                              gEDataManager->maxGuestResolutionForPolicyFixed());
     oldData.m_fActivateHoveredMachineWindow = gEDataManager->activateHoveredMachineWindow();
+    oldData.m_fDisableHostScreenSaver = gEDataManager->disableHostScreenSaver();
     oldData.m_scaleFactors = gEDataManager->scaleFactors(UIExtraDataManager::GlobalID);
     m_pCache->cacheInitialData(oldData);
@@ -111 +118 @@
     m_pEditorMaximumGuestScreenSize->setValue(oldData.m_guiMaximumGuestScreenSizeValue);
     m_pCheckBoxActivateOnMouseHover->setChecked(oldData.m_fActivateHoveredMachineWindow);
+    m_pCheckBoxDisableHostScreenSaver->setChecked(oldData.m_fDisableHostScreenSaver);
     m_pEditorScaleFactor->setScaleFactors(oldData.m_scaleFactors);
     m_pEditorScaleFactor->setMonitorCount(gpDesktop->screenCount());
@@ -123 +131 @@
     newData.m_guiMaximumGuestScreenSizeValue = m_pEditorMaximumGuestScreenSize->value();
     newData.m_fActivateHoveredMachineWindow = m_pCheckBoxActivateOnMouseHover->isChecked();
+    newData.m_fDisableHostScreenSaver = m_pCheckBoxDisableHostScreenSaver->isChecked();
     newData.m_scaleFactors = m_pEditorScaleFactor->scaleFactors();
     m_pCache->cacheCurrentData(newData);
@@ -149 +158 @@
     m_pCheckBoxActivateOnMouseHover->setWhatsThis(tr("When checked, machine windows will be raised when the mouse pointer moves over them."));
     m_pCheckBoxActivateOnMouseHover->setText(tr("&Raise Window Under Mouse"));
+    m_pCheckBoxDisableHostScreenSaver->setWhatsThis(tr("When checked, screen saver of the host OS is disabled."));
+    m_pCheckBoxDisableHostScreenSaver->setText(tr("&Disable Host Screen Saver"));
 }
 
@@ -171 +182 @@
     {
         pLayoutMain->setColumnStretch(1, 1);
-        pLayoutMain->setRowStretch(6, 1);
+        pLayoutMain->setRowStretch(7, 1);
 
         /* Prepare maximum guest screen size label: */
@@ -234 +245 @@
         if (m_pCheckBoxActivateOnMouseHover)
             pLayoutMain->addWidget(m_pCheckBoxActivateOnMouseHover, 5, 1);
+
+        /* Prepare 'disable host screen saver' check-box: */
+        m_pCheckBoxDisableHostScreenSaver = new QCheckBox(this);
+        if (m_pCheckBoxDisableHostScreenSaver)
+            pLayoutMain->addWidget(m_pCheckBoxDisableHostScreenSaver, 6, 1);
     }
 }
@@ -266 +282 @@
             && newData.m_fActivateHoveredMachineWindow != oldData.m_fActivateHoveredMachineWindow)
             /* fSuccess = */ gEDataManager->setActivateHoveredMachineWindow(newData.m_fActivateHoveredMachineWindow);
+        /* Save whether the host screen saver is to be disable when a vm is running: */
+        if (   fSuccess
+            && newData.m_fDisableHostScreenSaver != oldData.m_fDisableHostScreenSaver)
+            /* fSuccess = */ gEDataManager->setDisableHostScreenSaver(newData.m_fDisableHostScreenSaver);
         /* Save guest-screen scale-factor: */
         if (   fSuccess

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.h

@@ -97 +97 @@
         /** Holds the 'activate on mouse hover' check-box instance. */
         QCheckBox                      *m_pCheckBoxActivateOnMouseHover;
+        /** Holds the 'disable host screen saver' check-box instance. */
+        QCheckBox                      *m_pCheckBoxDisableHostScreenSaver;
     /** @} */
 };