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

Timestamp:

Sep 7, 2023 1:50:15 PM (18 months ago)

Author:

vboxsync

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

159012

Message:

FE/Qt: bugref:10513: Tiny cleanup for Preferences dialog / editors.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• editors/UILanguageSettingsEditor.h (modified) (1 diff)
• global/UIGlobalSettingsDisplay.cpp (modified) (5 diffs)
• global/UIGlobalSettingsDisplay.h (modified) (1 diff)
• global/UIGlobalSettingsInterface.h (modified) (1 diff)
• global/UIGlobalSettingsLanguage.h (modified) (1 diff)
• global/UIGlobalSettingsProxy.h (modified) (1 diff)
• global/UIGlobalSettingsUpdate.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UILanguageSettingsEditor.h

@@ -78 +78 @@
     /** Prepares all. */
     void prepare();
-    /** Cleanups all. */
-    void cleanup();
 
     /** Reloads language list, choosing item with @a strLanguageId as current. */

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

@@ -86 +86 @@
     , m_pEditorMaximumGuestScreenSize(0)
     , m_pEditorScaleFactor(0)
-    , m_pEditorGlobalDisplayFeatures(0)
+    , m_pEditorDisplayFeatures(0)
     , m_pFontScaleEditor(0)
 {
@@ -145 +145 @@
         m_pEditorScaleFactor->setMonitorCount(UIDesktopWidgetWatchdog::screenCount());
     }
-    if (m_pEditorGlobalDisplayFeatures)
-    {
-        m_pEditorGlobalDisplayFeatures->setActivateOnMouseHover(oldData.m_fActivateHoveredMachineWindow);
-        m_pEditorGlobalDisplayFeatures->setDisableHostScreenSaver(oldData.m_fDisableHostScreenSaver);
+    if (m_pEditorDisplayFeatures)
+    {
+        m_pEditorDisplayFeatures->setActivateOnMouseHover(oldData.m_fActivateHoveredMachineWindow);
+        m_pEditorDisplayFeatures->setDisableHostScreenSaver(oldData.m_fDisableHostScreenSaver);
     }
     if (m_pFontScaleEditor)
@@ -168 +168 @@
     if (m_pEditorScaleFactor)
         newData.m_scaleFactors = m_pEditorScaleFactor->scaleFactors();
-    if (m_pEditorGlobalDisplayFeatures)
-    {
-        newData.m_fActivateHoveredMachineWindow = m_pEditorGlobalDisplayFeatures->activateOnMouseHover();
-        newData.m_fDisableHostScreenSaver = m_pEditorGlobalDisplayFeatures->disableHostScreenSaver();
+    if (m_pEditorDisplayFeatures)
+    {
+        newData.m_fActivateHoveredMachineWindow = m_pEditorDisplayFeatures->activateOnMouseHover();
+        newData.m_fDisableHostScreenSaver = m_pEditorDisplayFeatures->disableHostScreenSaver();
     }
     if (m_pFontScaleEditor)
@@ -196 +196 @@
     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorMaximumGuestScreenSize->minimumLabelHorizontalHint());
     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorScaleFactor->minimumLabelHorizontalHint());
-    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorGlobalDisplayFeatures->minimumLabelHorizontalHint());
+    iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pEditorDisplayFeatures->minimumLabelHorizontalHint());
     iMinimumLayoutHint = qMax(iMinimumLayoutHint, m_pFontScaleEditor->minimumLabelHorizontalHint());
     m_pEditorMaximumGuestScreenSize->setMinimumLayoutIndent(iMinimumLayoutHint);
     m_pEditorScaleFactor->setMinimumLayoutIndent(iMinimumLayoutHint);
-    m_pEditorGlobalDisplayFeatures->setMinimumLayoutIndent(iMinimumLayoutHint);
+    m_pEditorDisplayFeatures->setMinimumLayoutIndent(iMinimumLayoutHint);
     m_pFontScaleEditor->setMinimumLayoutIndent(iMinimumLayoutHint);
 }
@@ -239 +239 @@
         }
 
-        /* Prepare 'global display features' editor: */
-        m_pEditorGlobalDisplayFeatures = new UIDisplayFeaturesEditor(this);
-        if (m_pEditorGlobalDisplayFeatures)
+        /* Prepare 'display features' editor: */
+        m_pEditorDisplayFeatures = new UIDisplayFeaturesEditor(this);
+        if (m_pEditorDisplayFeatures)
         {
-            m_editors << m_pEditorGlobalDisplayFeatures;
-            pLayout->addWidget(m_pEditorGlobalDisplayFeatures);
+            m_editors << m_pEditorDisplayFeatures;
+            pLayout->addWidget(m_pEditorDisplayFeatures);
         }
 

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

@@ -94 +94 @@
     /** @name Widgets
      * @{ */
-        /** Holds the maximum guest screen size editor instance. */
+        /** Holds the 'maximum guest screen size' editor instance. */
         UIMaximumGuestScreenSizeEditor *m_pEditorMaximumGuestScreenSize;
-        /** Holds the scale-factor editor instance. */
+        /** Holds the 'scale-factor' editor instance. */
         UIScaleFactorEditor            *m_pEditorScaleFactor;
-        /** Holds the global display features editor instance. */
-        UIDisplayFeaturesEditor        *m_pEditorGlobalDisplayFeatures;
-        /** Holds the font scale editor instance. */
+        /** Holds the 'display features' editor instance. */
+        UIDisplayFeaturesEditor        *m_pEditorDisplayFeatures;
+        /** Holds the 'font scale' editor instance. */
         UIFontScaleEditor              *m_pFontScaleEditor;
     /** @} */

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

@@ -91 +91 @@
     /** @name Widgets
      * @{ */
-        /** Holds the color theme label instance. */
+        /** Holds the 'color theme' editor instance. */
         UIColorThemeEditor *m_pEditorColorTheme;
     /** @} */

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

@@ -91 +91 @@
     /** @name Widgets
      * @{ */
-        /** Holds the language settings editor instance. */
+        /** Holds the 'language settings' editor instance. */
         UILanguageSettingsEditor *m_pEditorLanguageSettings;
     /** @} */

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

@@ -97 +97 @@
     /** @name Widgets
      * @{ */
-        /** Holds the proxy features editor instance. */
+        /** Holds the 'proxy features' editor instance. */
         UIProxyFeaturesEditor *m_pEditorProxyFeatures;
     /** @} */

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

@@ -92 +92 @@
     /** @name Widgets
      * @{ */
-        /** Holds the update settings editor instance. */
+        /** Holds the 'update settings' editor instance. */
         UIUpdateSettingsEditor *m_pEditorUpdateSettings;
     /** @} */