Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improved descriptions and icons #15

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Improved descriptions and icons #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,7 @@ Makefile*
# QtCtreator CMake
CMakeLists.txt.user*

# KDevelop
*.kdev4
/.kdev4
/build
18 changes: 16 additions & 2 deletions package/contents/config/main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,26 @@
<kcfgfile name=""/>

<group name="General">
<entry name="showIconsOnly" type="Bool">
<default>false</default>
<entry name="labeling" type="Enum">
<choices>
<choice name="iconWithDescription">
<label>Icon with description</label>
</choice>
<choice name="descriptionOnly">
<label>Description only</label>
</choice>
<choice name="iconOnly">
<label>Icon only</label>
</choice>
<default>iconWithDescription</default>
</choices>
</entry>
<entry name="useVerticalLayout" type="Bool">
<default>false</default>
</entry>
<entry name="usePortDescription" type="Bool">
<default>false</default>
</entry>
</group>

</kcfg>
30 changes: 27 additions & 3 deletions package/contents/ui/ConfigGeneral.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,38 @@ import QtQuick.Layouts 1.0
import QtQuick.Controls 1.0

Item {
property alias cfg_showIconsOnly: showIconsOnly.checked
property int cfg_labeling: 0
property alias cfg_usePortDescription: usePortDescription.checked
property alias cfg_useVerticalLayout: useVerticalLayout.checked

ColumnLayout {
Layout.fillWidth: true

ColumnLayout {
id: labeling
ExclusiveGroup { id: labelingGroup }
Repeater {
id: buttonRepeater
model: [
i18n("Show icon with description"),
i18n("Show description only"),
i18n("Show icon only")
]
RadioButton {
text: modelData
checked: index === cfg_labeling
exclusiveGroup: labelingGroup
onClicked: {
cfg_labeling = index
}
}
}
}

CheckBox {
id: showIconsOnly
text: i18n("Show icons only")
id: usePortDescription
enabled: cfg_labeling != 2 // "Icon only"
text: i18n("Use the audio sink's port description rather than the sink description")
}
CheckBox {
id: useVerticalLayout
Expand Down
57 changes: 38 additions & 19 deletions package/contents/ui/main.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,30 +36,49 @@ Item {
Layout.minimumHeight: gridLayout.implicitHeight
Plasmoid.preferredRepresentation: Plasmoid.fullRepresentation

property bool showIconsOnly: plasmoid.configuration.showIconsOnly
property int labeling: plasmoid.configuration.labeling
property bool useVerticalLayout: plasmoid.configuration.useVerticalLayout
property bool usePortDescription: plasmoid.configuration.usePortDescription

// from plasma-volume-control applet
function iconNameFromPort(port, fallback) {
if (port) {
if (port.name.indexOf("speaker") !== -1) {
// see https://github.com/KDE/plasma-pa/blob/master/applet/contents/code/icon.js
function formFactorIcon(formFactor) {
switch(formFactor) {
case "internal":
return "audio-card";
case "speaker":
return "audio-speakers-symbolic";
} else if (port.name.indexOf("headphones") !== -1) {
return "audio-headphones";
} else if (port.name.indexOf("hdmi") !== -1) {
case "phone":
return "phone";
case "handset":
return "phone";
case "tv":
return "video-television";
} else if (port.name.indexOf("mic") !== -1) {
case "webcam":
return "camera-web";
case "microphone":
return "audio-input-microphone";
} else if (port.name.indexOf("phone") !== -1) {
return "phone";
}
case "headset":
return "audio-headset";
case "headphone":
return "audio-headphones";
case "hands-free":
return "hands-free";
case "car":
return "car";
case "hifi":
return "hifi";
case "computer":
return "computer";
case "portable":
return "portable";
}
return fallback;
return "audio-volume-high"; // fallback
}

GridLayout {
id: gridLayout
flow: useVerticalLayout == true ? GridLayout.TopToBottom : GridLayout.LeftToRight
flow: useVerticalLayout? GridLayout.TopToBottom : GridLayout.LeftToRight
anchors.fill: parent

QtControls.ExclusiveGroup {
Expand All @@ -74,20 +93,20 @@ Item {
id: tab
enabled: currentPort !== null

text: showIconsOnly ? "" : currentDescription
iconName: showIconsOnly ? iconNameFromPort(currentPort, IconName) : ""
text: labeling != 2 ? currentDescription : ""
iconName: labeling != 1 ? formFactorIcon(sink.formFactor) : ""

checkable: true
exclusiveGroup: buttonGroup
tooltip: currentDescription

Layout.fillWidth: true
Layout.preferredWidth: showIconsOnly ? -1 : units.gridUnit * 10
Layout.preferredWidth: -1

readonly property var sink: model.PulseObject
readonly property var currentPort: model.Ports[ActivePortIndex]
readonly property string currentDescription: currentPort ? currentPort.description : model.Description

readonly property string currentDescription: usePortDescription? currentPort ? currentPort.description : model.Description : model.Description
Binding {
target: tab
property: "checked"
Expand Down