diff options
| author | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2016-03-11 12:03:28 +0200 |
|---|---|---|
| committer | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2016-03-16 13:44:46 +0000 |
| commit | d873745b783ed6a9c582055058ed8a1f1506bf20 (patch) | |
| tree | 248a075d5b14fd3f484e1ce842998a73bb92c53c | |
| parent | 7c9fe368de133a6b4e256392e0db0d6c3dc1cf9a (diff) | |
Use displaysettings plugin for display settings
Change-Id: If27603e46952324fb849e3b90b211d2da56b85c9
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
| -rw-r--r-- | src/displaysettings/displaysettings_p.cpp | 1 | ||||
| -rw-r--r-- | src/settingsui/display/Display.qml | 18 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/displaysettings/displaysettings_p.cpp b/src/displaysettings/displaysettings_p.cpp index 867531a..0aca580 100644 --- a/src/displaysettings/displaysettings_p.cpp +++ b/src/displaysettings/displaysettings_p.cpp @@ -114,6 +114,7 @@ void DisplaySettingsPrivate::setPhysicalScreenSizeInch(int inches) Q_Q(DisplaySettings); if (m_physScreenSize->size() != inches) { m_physScreenSize->setSize(inches); + emit q->physicalScreenSizeInchChanged(inches); } } diff --git a/src/settingsui/display/Display.qml b/src/settingsui/display/Display.qml index 68561f0..69be8f3 100644 --- a/src/settingsui/display/Display.qml +++ b/src/settingsui/display/Display.qml @@ -38,7 +38,7 @@ import QtQuick.Layouts 1.3 import Qt.labs.controls 1.0 import Qt.labs.controls.material 1.0 import Qt.labs.controls.universal 1.0 -import B2Qt.Utils 1.0 +import com.theqtcompany.settings.display 1.0 Item { id: root @@ -67,7 +67,7 @@ Item { } Slider { id: brightnessSlider - value: B2QtDevice.displayBrightness + value: DisplaySettings.displayBrightness Layout.alignment: Qt.AlignVCenter Layout.fillWidth: true from: 0 @@ -75,7 +75,7 @@ Item { } } Binding { - target: B2QtDevice + target: DisplaySettings property: "displayBrightness" value: brightnessSlider.position * brightnessSlider.to } @@ -93,18 +93,18 @@ Item { } RadioButton { text: qsTr("Default") - checked: !B2QtDevice.physicalScreenSizeOverride + checked: !DisplaySettings.physicalScreenSizeOverride } RadioButton { id: custom Layout.column: 1 Layout.row: 1 text: qsTr("Custom") - checked: B2QtDevice.physicalScreenSizeOverride - onCheckedChanged: B2QtDevice.physicalScreenSizeOverride = checked + checked: DisplaySettings.physicalScreenSizeOverride + onCheckedChanged: DisplaySettings.physicalScreenSizeOverride = checked } GroupBox { - title: qsTr("Size (in inches): %1").arg(B2QtDevice.physicalScreenSizeInch) + title: qsTr("Size (in inches): %1").arg(DisplaySettings.physicalScreenSizeInch) Layout.column: 1 Layout.row: 2 Layout.fillWidth: true @@ -120,12 +120,12 @@ Item { } Slider { id: sizeSlider - value: B2QtDevice.physicalScreenSizeInch + value: DisplaySettings.physicalScreenSizeInch Layout.fillWidth: true stepSize: 1 from: 4 to: 60 - onPositionChanged: B2QtDevice.physicalScreenSizeInch = sizeSlider.from + Math.floor(sizeSlider.position * (sizeSlider.to - sizeSlider.from)) + onPositionChanged: DisplaySettings.physicalScreenSizeInch = sizeSlider.from + Math.floor(sizeSlider.position * (sizeSlider.to - sizeSlider.from)) } Label { text: sizeSlider.to |