Changeset 32100 in vbox

Timestamp:

Aug 30, 2010 2:21:58 PM (15 years ago)

Author:

vboxsync

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

65369

Message:

FE/Qt4: 3355: Add option to disable host's screen-saver when working with VM: Initial implementation for win-host.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxGlobalSettings.cpp (modified) (4 diffs)
• VBoxGlobalSettings.h (modified) (3 diffs)
• runtime/UISession.cpp (modified) (2 diffs)
• settings/global/VBoxGLSettingsGeneral.cpp (modified) (4 diffs)
• settings/global/VBoxGLSettingsGeneral.h (modified) (1 diff)
• settings/global/VBoxGLSettingsGeneral.ui (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp

@@ -65 +65 @@
     dockPreviewEnabled = true;
     presentationModeEnabled = false;
+    hostScreenSaverDisabled = false;
 }
 
@@ -78 +79 @@
     dockPreviewEnabled = that.dockPreviewEnabled;
     presentationModeEnabled = that.presentationModeEnabled;
+    hostScreenSaverDisabled = that.hostScreenSaverDisabled;
 }
 
@@ -95 +97 @@
          trayIconEnabled == that.trayIconEnabled &&
          dockPreviewEnabled == that.dockPreviewEnabled &&
-         presentationModeEnabled == that.presentationModeEnabled
+         presentationModeEnabled == that.presentationModeEnabled &&
+         hostScreenSaverDisabled == that.hostScreenSaverDisabled
         );
 }
@@ -126 +129 @@
 #ifdef Q_WS_MAC
     { VBoxDefs::GUI_RealtimeDockIconUpdateEnabled, "dockPreviewEnabled",      "true|false", true },
-    { VBoxDefs::GUI_PresentationModeEnabled,       "presentationModeEnabled", "true|false", true }
+    { VBoxDefs::GUI_PresentationModeEnabled,       "presentationModeEnabled", "true|false", true },
 #endif /* Q_WS_MAC */
+    { "GUI/HostScreenSaverDisabled",                "hostScreenSaverDisabled",     "true|false", true }
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.h

@@ -47 +47 @@
     bool dockPreviewEnabled;
     bool presentationModeEnabled;
+    bool hostScreenSaverDisabled;
 
     friend class VBoxGlobalSettings;
@@ -65 +66 @@
     Q_PROPERTY (bool dockPreviewEnabled READ dockPreviewEnabled WRITE setDockPreviewEnabled)
     Q_PROPERTY (bool presentationModeEnabled READ presentationModeEnabled WRITE setPresentationModeEnabled)
+    Q_PROPERTY (bool hostScreenSaverDisabled READ hostScreenSaverDisabled WRITE setHostScreenSaverDisabled)
 
 public:
@@ -133 +135 @@
     }
 
-
-    //
+    bool hostScreenSaverDisabled() const { return data()->hostScreenSaverDisabled; }
+    void setHostScreenSaverDisabled (bool disabled)
+    {
+        mData()->hostScreenSaverDisabled = disabled;
+    }
 
     void load (CVirtualBox &vbox);

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

@@ -603 +603 @@
         QAction *pGuestAutoresizeSwitch = uimachine()->actionsPool()->action(UIActionIndex_Toggle_GuestAutoresize);
         pGuestAutoresizeSwitch->setChecked(strSettings != "off");
+
+#ifdef Q_WS_WIN
+        /* Disable host screen-saver if requested: */
+        if (vboxGlobal().settings().hostScreenSaverDisabled())
+            SystemParametersInfo(SPI_SETSCREENSAVEACTIVE, false, 0, 0);
+#endif /* Q_WS_WIN */
     }
 }
@@ -620 +626 @@
                              uimachine()->actionsPool()->action(UIActionIndex_Toggle_GuestAutoresize)->isChecked() ?
                              QString() : "off");
+
+#ifdef Q_WS_WIN
+        /* Restore screen-saver activity to system default: */
+        SystemParametersInfo(SPI_SETSCREENSAVEACTIVE, true, 0, 0);
+#endif /* Q_WS_WIN */
     }
 }

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

@@ -18 +18 @@
  */
 
+/* Global includes */
+#include <QDir>
+
+/* Local includes */
 #include "VBoxGLSettingsGeneral.h"
 #include "VBoxGlobal.h"
-
-#include <QDir>
 
 VBoxGLSettingsGeneral::VBoxGLSettingsGeneral()
@@ -30 +32 @@
 #ifndef VBOX_GUI_WITH_SYSTRAY
     mCbCheckTrayIcon->hide();
-#endif /* VBOX_GUI_WITH_SYSTRAY */
-    if (   mCbCheckTrayIcon->isHidden()
-        && mCbCheckPresentationMode->isHidden())
+    mWtSpacer1->hide();
+#endif /* !VBOX_GUI_WITH_SYSTRAY */
+#ifndef Q_WS_MAC
+    mCbCheckPresentationMode->hide();
+    mWtSpacer2->hide();
+#endif /* !Q_WS_MAC */
+#ifndef Q_WS_WIN
+    mCbDisableHostScreenSaver->hide();
+    mWtSpacer3->hide();
+#endif /* !Q_WS_WIN */
+
+    if (mCbCheckTrayIcon->isHidden() &&
+        mCbCheckPresentationMode->isHidden() &&
+        mCbDisableHostScreenSaver->isHidden())
         mLnSeparator2->hide();
 
@@ -54 +67 @@
     mCbCheckPresentationMode->setChecked (aGs.presentationModeEnabled());
 #endif /* Q_WS_MAC */
+    mCbDisableHostScreenSaver->setChecked (aGs.hostScreenSaverDisabled());
 }
 
@@ -69 +83 @@
     aGs.setPresentationModeEnabled (mCbCheckPresentationMode->isChecked());
 #endif /* Q_WS_MAC */
-}
-
-void VBoxGLSettingsGeneral::setOrderAfter (QWidget *aWidget)
-{
-    setTabOrder (aWidget, mPsHardDisk);
-    setTabOrder (mPsHardDisk, mPsMach);
-    setTabOrder (mPsMach, mPsVRDP);
-    setTabOrder (mPsVRDP, mCbCheckTrayIcon);
+    aGs.setHostScreenSaverDisabled (mCbDisableHostScreenSaver->isChecked());
 }
 

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

@@ -39 +39 @@
                     VBoxGlobalSettings &aGs);
 
-    void setOrderAfter (QWidget *aWidget);
-
     void retranslateUi();
 };

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/VBoxGLSettingsGeneral.ui

@@ -111 +111 @@
     </widget>
    </item>
-   <item row="5" column="0" rowspan="2">
-    <widget class="QWidget" name="mWtSpacer">
+   <item row="5" column="0">
+    <widget class="QWidget" name="mWtSpacer1">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
@@ -137 +137 @@
     </widget>
    </item>
+   <item row="6" column="0">
+    <widget class="QWidget" name="mWtSpacer2">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumWidth">
+      <number>34</number>
+     </property>
+    </widget>
+   </item>
    <item row="6" column="1" colspan="2">
     <widget class="QCheckBox" name="mCbCheckPresentationMode">
      <property name="text">
       <string>&amp;Auto show Dock and Menubar in fullscreen</string>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="0">
+    <widget class="QWidget" name="mWtSpacer3">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumWidth">
+      <number>34</number>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="1" colspan="2">
+    <widget class="QCheckBox" name="mCbDisableHostScreenSaver">
+     <property name="whatsThis">
+      <string>When checked, the host screen saver will be disabled whenever a virtual machine is running.</string>
+     </property>
+     <property name="text">
+      <string>Disable Host &amp;ScreenSaver</string>
      </property>
     </widget>