Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp (revision 55718) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp (revision 55719) @@ -5,5 +5,5 @@ /* - * Copyright (C) 2008-2014 Oracle Corporation + * Copyright (C) 2008-2015 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as @@ -26,5 +26,5 @@ # include "QIWidgetValidator.h" # include "UIMachineSettingsDisplay.h" -# include "UIMessageCenter.h" +# include "UIExtraDataManager.h" # include "UIConverter.h" # include "VBoxGlobal.h" @@ -36,5 +36,4 @@ #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */ - UIMachineSettingsDisplay::UIMachineSettingsDisplay() @@ -101,7 +100,11 @@ UIDataSettingsMachineDisplay displayData; - /* Cache Video data: */ + /* Cache Screen data: */ displayData.m_iCurrentVRAM = m_machine.GetVRAMSize(); displayData.m_cGuestScreenCount = m_machine.GetMonitorCount(); + displayData.m_dScaleFactor = gEDataManager->scaleFactor(m_machine.GetId()); +#ifdef Q_WS_MAC + displayData.m_fUseUnscaledHiDPIOutput = gEDataManager->useUnscaledHiDPIOutput(m_machine.GetId()); +#endif /* Q_WS_MAC */ displayData.m_f3dAccelerationEnabled = m_machine.GetAccelerate3DEnabled(); #ifdef VBOX_WITH_VIDEOHWACCEL @@ -149,6 +152,10 @@ const UIDataSettingsMachineDisplay &displayData = m_cache.base(); - /* Load Video data to page: */ + /* Load Screen data to page: */ m_pEditorVideoScreenCount->setValue(displayData.m_cGuestScreenCount); + m_pEditorGuestScreenScale->setValue(displayData.m_dScaleFactor * 100); +#ifdef Q_WS_MAC + m_pCheckBoxUnscaledHiDPIOutput->setChecked(displayData.m_fUseUnscaledHiDPIOutput); +#endif /* Q_WS_MAC */ m_pCheckbox3D->setChecked(displayData.m_f3dAccelerationEnabled); #ifdef VBOX_WITH_VIDEOHWACCEL @@ -193,7 +200,11 @@ UIDataSettingsMachineDisplay displayData = m_cache.base(); - /* Gather Video data from page: */ + /* Gather Screen data from page: */ displayData.m_iCurrentVRAM = m_pEditorVideoMemorySize->value(); displayData.m_cGuestScreenCount = m_pEditorVideoScreenCount->value(); + displayData.m_dScaleFactor = (double)m_pEditorGuestScreenScale->value() / 100; +#ifdef Q_WS_MAC + displayData.m_fUseUnscaledHiDPIOutput = m_pCheckBoxUnscaledHiDPIOutput->isChecked(); +#endif /* Q_WS_MAC */ displayData.m_f3dAccelerationEnabled = m_pCheckbox3D->isChecked(); #ifdef VBOX_WITH_VIDEOHWACCEL @@ -238,8 +249,7 @@ const UIDataSettingsMachineDisplay &displayData = m_cache.data(); - /* Make sure machine is 'offline': */ + /* Store Screen data: */ if (isMachineOffline()) { - /* Store Video data: */ m_machine.SetVRAMSize(displayData.m_iCurrentVRAM); m_machine.SetMonitorCount(displayData.m_cGuestScreenCount); @@ -248,4 +258,11 @@ m_machine.SetAccelerate2DVideoEnabled(displayData.m_f2dAccelerationEnabled); #endif /* VBOX_WITH_VIDEOHWACCEL */ + } + if (isMachineInValidMode()) + { + gEDataManager->setScaleFactor(displayData.m_dScaleFactor, m_machine.GetId()); +#ifdef Q_WS_MAC + gEDataManager->setUseUnscaledHiDPIOutput(displayData.m_fUseUnscaledHiDPIOutput, m_machine.GetId()); +#endif /* Q_WS_MAC */ } @@ -316,5 +333,5 @@ bool fPass = true; - /* Video tab: */ + /* Screen tab: */ { /* Prepare message: */ @@ -434,5 +451,5 @@ void UIMachineSettingsDisplay::setOrderAfter(QWidget *pWidget) { - /* Video tab-order: */ + /* Screen tab-order: */ setTabOrder(pWidget, m_pTabWidget->focusProxy()); setTabOrder(m_pTabWidget->focusProxy(), m_pSliderVideoMemorySize); @@ -440,5 +457,8 @@ setTabOrder(m_pEditorVideoMemorySize, m_pSliderVideoScreenCount); setTabOrder(m_pSliderVideoScreenCount, m_pEditorVideoScreenCount); - setTabOrder(m_pEditorVideoScreenCount, m_pCheckbox3D); + setTabOrder(m_pEditorVideoScreenCount, m_pSliderGuestScreenScale); + setTabOrder(m_pSliderGuestScreenScale, m_pEditorGuestScreenScale); + setTabOrder(m_pEditorGuestScreenScale, m_pCheckBoxUnscaledHiDPIOutput); + setTabOrder(m_pCheckBoxUnscaledHiDPIOutput, m_pCheckbox3D); #ifdef VBOX_WITH_VIDEOHWACCEL setTabOrder(m_pCheckbox3D, m_pCheckbox2DVideo); @@ -471,5 +491,5 @@ Ui::UIMachineSettingsDisplay::retranslateUi(this); - /* Video stuff: */ + /* Screen stuff: */ CSystemProperties sys = vboxGlobal().virtualBox().GetSystemProperties(); m_pLabelVideoMemorySizeMin->setText(tr("%1 MB").arg(m_iMinVRAM)); @@ -501,9 +521,35 @@ const UIDataSettingsMachineDisplay &displayData = m_cache.base(); - /* Video tab: */ - m_pContainerVideo->setEnabled(isMachineOffline()); -#ifdef VBOX_WITH_VIDEOHWACCEL - m_pCheckbox2DVideo->setEnabled(VBoxGlobal::isAcceleration2DVideoAvailable()); -#endif /* VBOX_WITH_VIDEOHWACCEL */ + /* Screen tab: */ + m_pLabelVideoMemorySize->setEnabled(isMachineOffline()); + m_pSliderVideoMemorySize->setEnabled(isMachineOffline()); + m_pLabelVideoMemorySizeMin->setEnabled(isMachineOffline()); + m_pLabelVideoMemorySizeMax->setEnabled(isMachineOffline()); + m_pEditorVideoMemorySize->setEnabled(isMachineOffline()); + m_pLabelVideoMemoryUnit->setEnabled(isMachineOffline()); + m_pLabelVideoScreenCount->setEnabled(isMachineOffline()); + m_pSliderVideoScreenCount->setEnabled(isMachineOffline()); + m_pLabelVideoScreenCountMin->setEnabled(isMachineOffline()); + m_pLabelVideoScreenCountMax->setEnabled(isMachineOffline()); + m_pEditorVideoScreenCount->setEnabled(isMachineOffline()); + m_pLabelGuestScreenScale->setEnabled(isMachineInValidMode()); + m_pSliderGuestScreenScale->setEnabled(isMachineInValidMode()); + m_pLabelGuestScreenScaleMin->setEnabled(isMachineInValidMode()); + m_pLabelGuestScreenScaleMax->setEnabled(isMachineInValidMode()); + m_pEditorGuestScreenScale->setEnabled(isMachineInValidMode()); +#ifdef Q_WS_MAC + m_pLabelHiDPI->setEnabled(isMachineInValidMode()); + m_pCheckBoxUnscaledHiDPIOutput->setEnabled(isMachineInValidMode()); +#else /* !Q_WS_MAC */ + m_pLabelHiDPI->hide(); + m_pCheckBoxUnscaledHiDPIOutput->hide(); +#endif /* !Q_WS_MAC */ + m_pLabelVideoOptions->setEnabled(isMachineOffline()); + m_pCheckbox3D->setEnabled(isMachineOffline()); +#ifdef VBOX_WITH_VIDEOHWACCEL + m_pCheckbox2DVideo->setEnabled(isMachineOffline() && VBoxGlobal::isAcceleration2DVideoAvailable()); +#else /* !VBOX_WITH_VIDEOHWACCEL */ + m_pCheckbox2DVideo->hide(); +#endif /* !VBOX_WITH_VIDEOHWACCEL */ /* Remote Display tab: */ @@ -573,4 +619,20 @@ /* Revalidate: */ revalidate(); +} + +void UIMachineSettingsDisplay::sltHandleGuestScreenScaleSliderChange() +{ + /* Apply proposed scale-factor: */ + m_pEditorGuestScreenScale->blockSignals(true); + m_pEditorGuestScreenScale->setValue(m_pSliderGuestScreenScale->value()); + m_pEditorGuestScreenScale->blockSignals(false); +} + +void UIMachineSettingsDisplay::sltHandleGuestScreenScaleEditorChange() +{ + /* Apply proposed scale-factor: */ + m_pSliderGuestScreenScale->blockSignals(true); + m_pSliderGuestScreenScale->setValue(m_pEditorGuestScreenScale->value()); + m_pSliderGuestScreenScale->blockSignals(false); } @@ -691,5 +753,5 @@ /* Prepare tabs: */ - prepareVideoTab(); + prepareScreenTab(); prepareRemoteDisplayTab(); prepareVideoCaptureTab(); @@ -702,5 +764,5 @@ } -void UIMachineSettingsDisplay::prepareVideoTab() +void UIMachineSettingsDisplay::prepareScreenTab() { /* Prepare memory-size slider: */ @@ -744,8 +806,18 @@ connect(m_pEditorVideoScreenCount, SIGNAL(valueChanged(int)), this, SLOT(sltHandleVideoScreenCountEditorChange())); -#ifndef VBOX_WITH_VIDEOHWACCEL - /* Hide check-box if not supported: */ - m_pCheckbox2DVideo->setVisible(false); -#endif /* VBOX_WITH_VIDEOHWACCEL */ + /* Prepare scale-factor slider: */ + m_pSliderGuestScreenScale->setMinimum(100); + m_pSliderGuestScreenScale->setMaximum(200); + m_pSliderGuestScreenScale->setPageStep(10); + m_pSliderGuestScreenScale->setSingleStep(1); + m_pSliderGuestScreenScale->setTickInterval(10); + m_pSliderGuestScreenScale->setSnappingEnabled(true); + connect(m_pSliderGuestScreenScale, SIGNAL(valueChanged(int)), this, SLOT(sltHandleGuestScreenScaleSliderChange())); + + /* Prepare scale-factor editor: */ + m_pEditorGuestScreenScale->setMinimum(100); + m_pEditorGuestScreenScale->setMaximum(200); + vboxGlobal().setMinimumWidthAccordingSymbolCount(m_pEditorGuestScreenScale, 5); + connect(m_pEditorGuestScreenScale, SIGNAL(valueChanged(int)), this, SLOT(sltHandleGuestScreenScaleEditorChange())); } Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h (revision 55718) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h (revision 55719) @@ -36,4 +36,8 @@ : m_iCurrentVRAM(0) , m_cGuestScreenCount(0) + , m_dScaleFactor(1.0) +#ifdef Q_WS_MAC + , m_fUseUnscaledHiDPIOutput(false) +#endif /* Q_WS_MAC */ , m_f3dAccelerationEnabled(false) #ifdef VBOX_WITH_VIDEOHWACCEL @@ -60,4 +64,8 @@ return (m_iCurrentVRAM == other.m_iCurrentVRAM) && (m_cGuestScreenCount == other.m_cGuestScreenCount) && + (m_dScaleFactor == other.m_dScaleFactor) && +#ifdef Q_WS_MAC + (m_fUseUnscaledHiDPIOutput == other.m_fUseUnscaledHiDPIOutput) && +#endif /* Q_WS_MAC */ (m_f3dAccelerationEnabled == other.m_f3dAccelerationEnabled) && #ifdef VBOX_WITH_VIDEOHWACCEL @@ -86,4 +94,8 @@ int m_iCurrentVRAM; int m_cGuestScreenCount; + double m_dScaleFactor; +#ifdef Q_WS_MAC + bool m_fUseUnscaledHiDPIOutput; +#endif /* Q_WS_MAC */ bool m_f3dAccelerationEnabled; #ifdef VBOX_WITH_VIDEOHWACCEL @@ -161,9 +173,11 @@ private slots: - /* Handlers: Video stuff: */ + /* Handlers: Screen stuff: */ void sltHandleVideoMemorySizeSliderChange(); void sltHandleVideoMemorySizeEditorChange(); void sltHandleVideoScreenCountSliderChange(); void sltHandleVideoScreenCountEditorChange(); + void sltHandleGuestScreenScaleSliderChange(); + void sltHandleGuestScreenScaleEditorChange(); /* Handlers: Video Capture stuff: */ @@ -181,6 +195,6 @@ /** Prepare routine. */ void prepare(); - /** Prepare routine: Video tab. */ - void prepareVideoTab(); + /** Prepare routine: Screen tab. */ + void prepareScreenTab(); /** Prepare routine: Remote Display tab. */ void prepareRemoteDisplayTab(); Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.ui =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.ui (revision 55718) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.ui (revision 55719) @@ -28,5 +28,5 @@ - &Video + &Screen @@ -154,7 +154,7 @@ - - - Extended Features: + + + Scale Factor: @@ -163,5 +163,95 @@ - + + + + 0 + + + + + Controls the guest screen scale factor. + + + Qt::Horizontal + + + + + + + 100% + + + + + + + Qt::Horizontal + + + + 0 + 0 + + + + + + + + 200% + + + + + + + + + Controls the guest screen scale factor. + + + % + + + + + + + HiDPI: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + When checked, guest screen contents will not be scaled up to compensate for high host screen resolutions. + + + Use &Unscaled HiDPI Output + + + + + + + Acceleration: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + @@ -179,5 +269,5 @@ - + Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.cpp (revision 55718) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.cpp (revision 55719) @@ -24,8 +24,6 @@ # include "UIExtraDataManager.h" # include "UIActionPool.h" -# include "VBoxGlobal.h" #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */ - UIMachineSettingsInterface::UIMachineSettingsInterface(const QString strMachineID) @@ -57,8 +55,5 @@ /* Cache interface data: */ - interfaceData.m_dScaleFactor = gEDataManager->scaleFactor(m_machine.GetId()); -#ifdef Q_WS_MAC - interfaceData.m_fUseUnscaledHiDPIOutput = gEDataManager->useUnscaledHiDPIOutput(m_machine.GetId()); -#else /* !Q_WS_MAC */ +#ifndef Q_WS_MAC interfaceData.m_fShowMiniToolBar = gEDataManager->miniToolbarEnabled(m_machine.GetId()); interfaceData.m_fMiniToolBarAtTop = gEDataManager->miniToolbarAlignment(m_machine.GetId()) == Qt::AlignTop; @@ -80,11 +75,10 @@ /* Prepare interface data: */ - m_pEditorGuestScreenScale->setValue(interfaceData.m_dScaleFactor * 100); -#ifdef Q_WS_MAC - m_pCheckBoxUnscaledHiDPIOutput->setChecked(interfaceData.m_fUseUnscaledHiDPIOutput); -#else /* !Q_WS_MAC */ +#ifndef Q_WS_MAC m_pCheckBoxShowMiniToolBar->setChecked(interfaceData.m_fShowMiniToolBar); m_pComboToolBarAlignment->setChecked(interfaceData.m_fMiniToolBarAtTop); -#endif /* !Q_WS_MAC */ +#else /* Q_WS_MAC */ + Q_UNUSED(interfaceData); +#endif /* Q_WS_MAC */ /* Polish page finally: */ @@ -103,8 +97,5 @@ /* Gather interface data from page: */ - interfaceData.m_dScaleFactor = (double)m_pEditorGuestScreenScale->value() / 100; -#ifdef Q_WS_MAC - interfaceData.m_fUseUnscaledHiDPIOutput = m_pCheckBoxUnscaledHiDPIOutput->isChecked(); -#else /* !Q_WS_MAC */ +#ifndef Q_WS_MAC interfaceData.m_fShowMiniToolBar = m_pCheckBoxShowMiniToolBar->isChecked(); interfaceData.m_fMiniToolBarAtTop = m_pComboToolBarAlignment->isChecked(); @@ -131,11 +122,10 @@ if (isMachineInValidMode()) { - gEDataManager->setScaleFactor(interfaceData.m_dScaleFactor, m_machine.GetId()); -#ifdef Q_WS_MAC - gEDataManager->setUseUnscaledHiDPIOutput(interfaceData.m_fUseUnscaledHiDPIOutput, m_machine.GetId()); -#else /* !Q_WS_MAC */ +#ifndef Q_WS_MAC gEDataManager->setMiniToolbarEnabled(interfaceData.m_fShowMiniToolBar, m_machine.GetId()); gEDataManager->setMiniToolbarAlignment(interfaceData.m_fMiniToolBarAtTop ? Qt::AlignTop : Qt::AlignBottom, m_machine.GetId()); -#endif /* !Q_WS_MAC */ +#else /* Q_WS_MAC */ + Q_UNUSED(interfaceData); +#endif /* Q_WS_MAC */ } } @@ -148,8 +138,5 @@ { /* Tab-order: */ - setTabOrder(pWidget, m_pSliderGuestScreenScale); - setTabOrder(m_pSliderGuestScreenScale, m_pEditorGuestScreenScale); - setTabOrder(m_pEditorGuestScreenScale, m_pCheckBoxUnscaledHiDPIOutput); - setTabOrder(m_pCheckBoxUnscaledHiDPIOutput, m_pCheckBoxShowMiniToolBar); + setTabOrder(pWidget, m_pCheckBoxShowMiniToolBar); setTabOrder(m_pCheckBoxShowMiniToolBar, m_pComboToolBarAlignment); } @@ -165,18 +152,9 @@ /* Polish interface availability: */ m_pMenuBarEditor->setEnabled(isMachineInValidMode()); - m_pLabelGuestScreenScale->setEnabled(isMachineInValidMode()); - m_pSliderGuestScreenScale->setEnabled(isMachineInValidMode()); - m_pLabelGuestScreenScaleMin->setEnabled(isMachineInValidMode()); - m_pLabelGuestScreenScaleMax->setEnabled(isMachineInValidMode()); - m_pEditorGuestScreenScale->setEnabled(isMachineInValidMode()); #ifdef Q_WS_MAC - m_pLabelHiDPI->setEnabled(isMachineInValidMode()); - m_pCheckBoxUnscaledHiDPIOutput->setEnabled(isMachineInValidMode()); m_pLabelMiniToolBar->hide(); m_pCheckBoxShowMiniToolBar->hide(); m_pComboToolBarAlignment->hide(); #else /* !Q_WS_MAC */ - m_pLabelHiDPI->hide(); - m_pCheckBoxUnscaledHiDPIOutput->hide(); m_pLabelMiniToolBar->setEnabled(isMachineInValidMode()); m_pCheckBoxShowMiniToolBar->setEnabled(isMachineInValidMode()); @@ -184,20 +162,4 @@ #endif /* !Q_WS_MAC */ m_pStatusBarEditor->setEnabled(isMachineInValidMode()); -} - -void UIMachineSettingsInterface::sltHandleGuestScreenScaleSliderChange() -{ - /* Apply proposed scale-factor: */ - m_pEditorGuestScreenScale->blockSignals(true); - m_pEditorGuestScreenScale->setValue(m_pSliderGuestScreenScale->value()); - m_pEditorGuestScreenScale->blockSignals(false); -} - -void UIMachineSettingsInterface::sltHandleGuestScreenScaleEditorChange() -{ - /* Apply proposed scale-factor: */ - m_pSliderGuestScreenScale->blockSignals(true); - m_pSliderGuestScreenScale->setValue(m_pEditorGuestScreenScale->value()); - m_pSliderGuestScreenScale->blockSignals(false); } @@ -215,19 +177,4 @@ m_pStatusBarEditor->setMachineID(m_strMachineID); - /* Prepare scale-factor slider: */ - m_pSliderGuestScreenScale->setMinimum(100); - m_pSliderGuestScreenScale->setMaximum(200); - m_pSliderGuestScreenScale->setPageStep(10); - m_pSliderGuestScreenScale->setSingleStep(1); - m_pSliderGuestScreenScale->setTickInterval(10); - m_pSliderGuestScreenScale->setSnappingEnabled(true); - connect(m_pSliderGuestScreenScale, SIGNAL(valueChanged(int)), this, SLOT(sltHandleGuestScreenScaleSliderChange())); - - /* Prepare scale-factor editor: */ - m_pEditorGuestScreenScale->setMinimum(100); - m_pEditorGuestScreenScale->setMaximum(200); - vboxGlobal().setMinimumWidthAccordingSymbolCount(m_pEditorGuestScreenScale, 5); - connect(m_pEditorGuestScreenScale, SIGNAL(valueChanged(int)), this, SLOT(sltHandleGuestScreenScaleEditorChange())); - /* Translate finally: */ retranslateUi(); Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.h =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.h (revision 55718) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.h (revision 55719) @@ -31,9 +31,6 @@ /* Constructor: */ UIDataSettingsMachineInterface() - : m_dScaleFactor(1.0) -#ifdef Q_WS_MAC - , m_fUseUnscaledHiDPIOutput(false) -#else /* !Q_WS_MAC */ - , m_fShowMiniToolBar(false) +#ifndef Q_WS_MAC + : m_fShowMiniToolBar(false) , m_fMiniToolBarAtTop(false) #endif /* !Q_WS_MAC */ @@ -43,12 +40,11 @@ bool equal(const UIDataSettingsMachineInterface &other) const { - return (m_dScaleFactor == other.m_dScaleFactor) -#ifdef Q_WS_MAC - && (m_fUseUnscaledHiDPIOutput == other.m_fUseUnscaledHiDPIOutput) -#else /* !Q_WS_MAC */ - && (m_fShowMiniToolBar == other.m_fShowMiniToolBar) - && (m_fMiniToolBarAtTop == other.m_fMiniToolBarAtTop) -#endif /* !Q_WS_MAC */ - ; +#ifndef Q_WS_MAC + return (m_fShowMiniToolBar == other.m_fShowMiniToolBar) && + (m_fMiniToolBarAtTop == other.m_fMiniToolBarAtTop); +#else /* Q_WS_MAC */ + Q_UNUSED(other); + return true; +#endif /* Q_WS_MAC */ } @@ -58,8 +54,5 @@ /* Variables: */ - double m_dScaleFactor; -#ifdef Q_WS_MAC - bool m_fUseUnscaledHiDPIOutput; -#else /* !Q_WS_MAC */ +#ifndef Q_WS_MAC bool m_fShowMiniToolBar; bool m_fMiniToolBarAtTop; @@ -109,10 +102,4 @@ void polishPage(); -private slots: - - /* Handlers: Guest-screen scale-factor stuff: */ - void sltHandleGuestScreenScaleSliderChange(); - void sltHandleGuestScreenScaleEditorChange(); - private: Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.ui =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.ui (revision 55718) +++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.ui (revision 55719) @@ -38,94 +38,4 @@ - - - Screen Scale Factor: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - 0 - - - - - This setting determines the guest screen scale factor. - - - Qt::Horizontal - - - - - - - 100% - - - - - - - Qt::Horizontal - - - - 0 - 0 - - - - - - - - 200% - - - - - - - - - This setting determines the guest screen scale factor. - - - % - - - - - - - HiDPI: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - If checked, guest screen contents will not be scaled up to compensate for high host screen resolutions. - - - Use &Unscaled HiDPI Output - - - - @@ -137,5 +47,5 @@ - + @@ -156,5 +66,5 @@ - + @@ -175,5 +85,5 @@ - + @@ -188,5 +98,5 @@ - + @@ -204,9 +114,4 @@ - - QIAdvancedSlider - QSlider -
QIAdvancedSlider.h
- UIMenuBarEditorWidget