Changeset View
Changeset View
Standalone View
Standalone View
src/kcm/package/contents/ui/Advanced.qml
| Show First 20 Lines • Show All 73 Lines • ▼ Show 20 Line(s) | 36 | ColumnLayout { | |||
|---|---|---|---|---|---|
| 74 | CheckBox { | 74 | CheckBox { | ||
| 75 | Layout.fillWidth: true | 75 | Layout.fillWidth: true | ||
| 76 | Layout.topMargin: units.smallSpacing | 76 | Layout.topMargin: units.smallSpacing | ||
| 77 | Layout.leftMargin: units.gridUnit / 2 | 77 | Layout.leftMargin: units.gridUnit / 2 | ||
| 78 | Layout.rightMargin: units.gridUnit / 2 | 78 | Layout.rightMargin: units.gridUnit / 2 | ||
| 79 | text: i18nd("kcm_pulseaudio", "Add virtual output device for simultaneous output on all local sound cards") | 79 | text: i18nd("kcm_pulseaudio", "Add virtual output device for simultaneous output on all local sound cards") | ||
| 80 | checked: moduleManager.combineSinks | 80 | checked: moduleManager.combineSinks | ||
| 81 | onCheckedChanged: moduleManager.combineSinks = checked; | 81 | onCheckedChanged: moduleManager.combineSinks = checked; | ||
| 82 | enabled: moduleManager.loadedModules.indexOf("module-gconf") != -1 | 82 | enabled: moduleManager.configModuleLoaded | ||
drosca: This should still check for "module-gconf" or "module-gsettings" being loaded in pulseaudio. | |||||
| 83 | visible: moduleManager.settingsSupported | 83 | visible: moduleManager.settingsSupported | ||
| 84 | } | 84 | } | ||
| 85 | 85 | | |||
| 86 | CheckBox { | 86 | CheckBox { | ||
| 87 | Layout.fillWidth: true | 87 | Layout.fillWidth: true | ||
| 88 | Layout.leftMargin: units.gridUnit / 2 | 88 | Layout.leftMargin: units.gridUnit / 2 | ||
| 89 | Layout.rightMargin: units.gridUnit / 2 | 89 | Layout.rightMargin: units.gridUnit / 2 | ||
| 90 | text: i18nd("kcm_pulseaudio", "Automatically switch all running streams when a new output becomes available") | 90 | text: i18nd("kcm_pulseaudio", "Automatically switch all running streams when a new output becomes available") | ||
| 91 | checked: moduleManager.switchOnConnect | 91 | checked: moduleManager.switchOnConnect | ||
| 92 | onCheckedChanged: moduleManager.switchOnConnect = checked; | 92 | onCheckedChanged: moduleManager.switchOnConnect = checked; | ||
| 93 | enabled: moduleManager.loadedModules.indexOf("module-gconf") != -1 | 93 | enabled: moduleManager.configModuleLoaded | ||
| 94 | visible: moduleManager.settingsSupported | 94 | visible: moduleManager.settingsSupported | ||
| 95 | } | 95 | } | ||
| 96 | 96 | | |||
| 97 | Label { | 97 | Label { | ||
| 98 | Layout.alignment: Qt.AlignHCenter | 98 | Layout.alignment: Qt.AlignHCenter | ||
| 99 | enabled: false | 99 | enabled: false | ||
| 100 | font.italic: true | 100 | font.italic: true | ||
| 101 | text: i18nd("kcm_pulseaudio", "Requires 'module-gconf' PulseAudio module") | 101 | text: i18nd("kcm_pulseaudio", "Requires %1 PulseAudio module", moduleManager.configModuleName) | ||
| 102 | visible: moduleManager.settingsSupported && moduleManager.loadedModules.indexOf("module-gconf") == -1 | 102 | visible: moduleManager.settingsSupported && !moduleManager.configModuleLoaded | ||
| 103 | } | 103 | } | ||
| 104 | 104 | | |||
| 105 | Header { | 105 | Header { | ||
| 106 | Layout.fillWidth: true | 106 | Layout.fillWidth: true | ||
| 107 | text: i18nd("kcm_pulseaudio", "Speaker Placement and Testing") | 107 | text: i18nd("kcm_pulseaudio", "Speaker Placement and Testing") | ||
| 108 | } | 108 | } | ||
| 109 | 109 | | |||
| 110 | RowLayout { | 110 | RowLayout { | ||
| ▲ Show 20 Lines • Show All 141 Lines • Show Last 20 Lines | |||||
This should still check for "module-gconf" or "module-gsettings" being loaded in pulseaudio.
The way you changed it is that it will just completely hide those options if appropriate module is not loaded in pulseaudio without any indication to user what is wrong.