Changeset 89908 in vbox for trunk/src/VBox

Timestamp:

Jun 25, 2021 9:45:38 AM (4 years ago)

Author:

vboxsync

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

145366

Message:

FE/Qt: bugref:3355. Hiding screen ssaver inhibition option on MacOS

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• platform/x11/VBoxX11Helper.cpp (modified) (2 diffs)
• platform/x11/VBoxX11Helper.h (modified) (2 diffs)
• settings/global/UIGlobalSettingsDisplay.cpp (modified) (4 diffs)
• settings/global/UIGlobalSettingsDisplay.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp

@@ -154 +154 @@
 }
 
-SHARED_LIBRARY_STUFF bool X11CheckExtension(const char *extensionName)
+bool X11CheckExtension(const char *extensionName)
 {
     Display *pDisplay = QX11Info::display();
@@ -163 +163 @@
 }
 
-static QStringList X11FindDBusScreenSaverServices(const QDBusConnection &connection)
+QStringList X11FindDBusScreenSaverServices(const QDBusConnection &connection)
 {
     QStringList serviceNames;

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h

@@ -29 +29 @@
 #include "UILibraryDefs.h"
 
+/* Forward declarations: */
+class QDBusConnection;
 
 /** X11: Known Window Manager types. */
@@ -65 +67 @@
 SHARED_LIBRARY_STUFF bool X11CheckExtension(const char *extensionName);
 
+/** Returns the list of DBus services whose name contains the substring 'screensaver'. */
+QStringList X11FindDBusScreenSaverServices(const QDBusConnection &connection);
+
 /** Returns the list of Inhibit methods found by introspecting DBus services. */
 SHARED_LIBRARY_STUFF QVector<X11ScreenSaverInhibitMethod*> X11FindDBusScrenSaverInhibitMethods();

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

@@ -118 +118 @@
     m_pEditorMaximumGuestScreenSize->setValue(oldData.m_guiMaximumGuestScreenSizeValue);
     m_pCheckBoxActivateOnMouseHover->setChecked(oldData.m_fActivateHoveredMachineWindow);
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     m_pCheckBoxDisableHostScreenSaver->setChecked(oldData.m_fDisableHostScreenSaver);
+#endif
     m_pEditorScaleFactor->setScaleFactors(oldData.m_scaleFactors);
     m_pEditorScaleFactor->setMonitorCount(gpDesktop->screenCount());
@@ -131 +133 @@
     newData.m_guiMaximumGuestScreenSizeValue = m_pEditorMaximumGuestScreenSize->value();
     newData.m_fActivateHoveredMachineWindow = m_pCheckBoxActivateOnMouseHover->isChecked();
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     newData.m_fDisableHostScreenSaver = m_pCheckBoxDisableHostScreenSaver->isChecked();
+#endif
     newData.m_scaleFactors = m_pEditorScaleFactor->scaleFactors();
     m_pCache->cacheCurrentData(newData);
@@ -158 +162 @@
     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"));
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
     m_pCheckBoxDisableHostScreenSaver->setWhatsThis(tr("When checked, screen saver of the host OS is disabled."));
     m_pCheckBoxDisableHostScreenSaver->setText(tr("&Disable Host Screen Saver"));
+#endif
 }
 
@@ -246 +252 @@
             pLayoutMain->addWidget(m_pCheckBoxActivateOnMouseHover, 5, 1);
 
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
         /* Prepare 'disable host screen saver' check-box: */
         m_pCheckBoxDisableHostScreenSaver = new QCheckBox(this);
         if (m_pCheckBoxDisableHostScreenSaver)
             pLayoutMain->addWidget(m_pCheckBoxDisableHostScreenSaver, 6, 1);
+#endif
     }
 }

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

@@ -97 +97 @@
         /** Holds the 'activate on mouse hover' check-box instance. */
         QCheckBox                      *m_pCheckBoxActivateOnMouseHover;
+#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
         /** Holds the 'disable host screen saver' check-box instance. */
         QCheckBox                      *m_pCheckBoxDisableHostScreenSaver;
+#endif
     /** @} */
 };