From fc06c46144a6586ce57dd995a9efc23d0b59e3fa Mon Sep 17 00:00:00 2001 From: Vasily Date: Fri, 1 Feb 2019 19:08:26 +0100 Subject: [PATCH] Refactor audio proximity enable button into separate file --- src/res/qml/audio_page/AudioPage.qml | 21 ++------------ .../audio_page/proximity/ProximityToggle.qml | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 src/res/qml/audio_page/proximity/ProximityToggle.qml diff --git a/src/res/qml/audio_page/AudioPage.qml b/src/res/qml/audio_page/AudioPage.qml index e120358..9c965c3 100644 --- a/src/res/qml/audio_page/AudioPage.qml +++ b/src/res/qml/audio_page/AudioPage.qml @@ -5,6 +5,7 @@ import matzman666.advsettings 1.0 import ".." //common imports import "dialog_boxes" import "device_selector" +import "proximity" MyStackViewPage { width: 1200 @@ -46,13 +47,7 @@ MyStackViewPage { } ColumnLayout { spacing: 18 - MyToggleButton { - id: audioMuteProximitySensorToggle - Layout.preferredWidth: 600 - text: "Proximity Sensor Mutes/Unmutes Microphone" - onClicked: { - AudioTabController.setMicProximitySensorCanMute(checked, false) - } + ProximityToggle { } RowLayout { MyToggleButton { @@ -228,12 +223,6 @@ MyStackViewPage { } Component.onCompleted: { - if (AudioTabController.micDeviceIndex < 0) { - audioMuteProximitySensorToggle.enabled = false - } else { - audioMuteProximitySensorToggle.enabled = true - audioMuteProximitySensorToggle.checked = AudioTabController.micProximitySensorCanMute - } reloadPttProfiles() reloadAudioProfiles() audioPttEnabledToggle.checked = AudioTabController.pttEnabled @@ -245,17 +234,11 @@ MyStackViewPage { Connections { target: AudioTabController - onMicProximitySensorCanMuteChanged: { - audioMuteProximitySensorToggle.checked = AudioTabController.micProximitySensorCanMute - } onMicReversePttChanged: { audioPttReverseToggle.checked = AudioTabController.micReversePtt } onPttEnabledChanged: { audioPttEnabledToggle.checked = AudioTabController.pttEnabled - } - onPttActiveChanged: { - } onPttShowNotificationChanged: { audioPttShowNotificationToggle.checked = AudioTabController.pttShowNotification diff --git a/src/res/qml/audio_page/proximity/ProximityToggle.qml b/src/res/qml/audio_page/proximity/ProximityToggle.qml new file mode 100644 index 0000000..1ce982f --- /dev/null +++ b/src/res/qml/audio_page/proximity/ProximityToggle.qml @@ -0,0 +1,28 @@ +import QtQuick 2.7 +import QtQuick.Controls 2.0 +import QtQuick.Layouts 1.3 +import matzman666.advsettings 1.0 +import "../.." //common imports + +MyToggleButton { + id: audioMuteProximitySensorToggle + Layout.preferredWidth: 600 + text: "Proximity Sensor Mutes/Unmutes Microphone" + onClicked: { + AudioTabController.setMicProximitySensorCanMute(checked, false) + } + Component.onCompleted: { + if (AudioTabController.micDeviceIndex < 0) { + audioMuteProximitySensorToggle.enabled = false + } else { + audioMuteProximitySensorToggle.enabled = true + audioMuteProximitySensorToggle.checked = AudioTabController.micProximitySensorCanMute + } + } + Connections { + target: AudioTabController + onMicProximitySensorCanMuteChanged: { + audioMuteProximitySensorToggle.checked = AudioTabController.micProximitySensorCanMute + } + } +}