Merge branch 'master' into alpha-kung

2019-03-03 00:27:35 +09:00
parent 53d5431da7 38a2765b10
commit 3792488372
53 changed files with 978 additions and 764 deletions
@@ -362,39 +362,6 @@ MyStackViewPage {
                               AudioTabController.pttEnabled = checked
                           }
                       }
-                       RowLayout {
-                           spacing: 18
-
-                           MyComboBox {
-                               Layout.leftMargin: 78
-                               id: summaryPttProfileComboBox
-                               Layout.maximumWidth: 378
-                               Layout.minimumWidth: 378
-                               Layout.preferredWidth: 378
-                               Layout.fillWidth: true
-                               model: [""]
-                               onCurrentIndexChanged: {
-                                   if (currentIndex > 0) {
-                                       summaryPttProfileApplyButton.enabled = true
-                                   } else {
-                                       summaryPttProfileApplyButton.enabled = false
-                                   }
-                               }
-                           }
-
-                           MyPushButton {
-                               id: summaryPttProfileApplyButton
-                               enabled: false
-                               Layout.preferredWidth: 150
-                               text: "Apply"
-                               onClicked: {
-                                   if (summaryPttProfileComboBox.currentIndex > 0) {
-                                       AudioTabController.applyPttProfile(summaryPttProfileComboBox.currentIndex - 1)
-                                       summaryPttProfileComboBox.currentIndex = 0
-                                   }
-                               }
-                           }
-                       }
                   }

                   Item {
@@ -417,7 +384,6 @@ MyStackViewPage {
   Component.onCompleted: {
       reloadChaperoneProfiles()
       reloadSteamVRProfiles()
-       reloadPttProfiles()

       summaryVersionText.text = applicationVersion

@@ -454,9 +420,6 @@ MyStackViewPage {

   Connections {
       target: AudioTabController
-       onPttProfilesUpdated: {
-           reloadPttProfiles()
-       }
       onMicVolumeChanged: {
           summaryMicVolumeSlider.value = AudioTabController.micVolume
       }
@@ -540,14 +503,4 @@ MyStackViewPage {
       summarySteamVRProfileComboBox.currentIndex = 0
       summarySteamVRProfileComboBox.model = profiles
    }
-
-    function reloadPttProfiles() {
-        var profiles = [""]
-        var profileCount = AudioTabController.getPttProfileCount()
-        for (var i = 0; i < profileCount; i++) {
-            profiles.push(AudioTabController.getPttProfileName(i))
-        }
-        summaryPttProfileComboBox.currentIndex = 0
-        summaryPttProfileComboBox.model = profiles
-    }
 }