Differential D24161 Diff 66976 src/kcm/package/contents/ui/MuteButton.qml

Changeset View

Standalone View

View Options

src/kcm/package/contents/ui/MuteButton.qml

1/* 1​/*
2 Copyright 2014-2015 Harald Sitter <sitter@kde.org> 2​ Copyright 2014-2015 Harald Sitter <sitter@kde.org>
3​ Copyright 2019 Sefa Eyeoglu <contact@scrumplex.net>
3 4​
4 This program is free software; you can redistribute it and/or 5​ This program is free software; you can redistribute it and/or
5 modify it under the terms of the GNU General Public License as 6​ modify it under the terms of the GNU General Public License as
6 published by the Free Software Foundation; either version 2 of 7​ published by the Free Software Foundation; either version 2 of
7 the License or (at your option) version 3 or any later version 8​ the License or (at your option) version 3 or any later version
8 accepted by the membership of KDE e.V. (or its successor approved 9​ accepted by the membership of KDE e.V. (or its successor approved
9 by the membership of KDE e.V.), which shall act as a proxy 10​ by the membership of KDE e.V.), which shall act as a proxy
10 defined in Section 14 of version 3 of the license. 11​ defined in Section 14 of version 3 of the license.
11 12​
12 This program is distributed in the hope that it will be useful, 13​ This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14​ but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15​ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16​ GNU General Public License for more details.
16 17​
17 You should have received a copy of the GNU General Public License 18​ You should have received a copy of the GNU General Public License
18 along with this program. If not, see <http://www.gnu.org/licenses/>. 19​ along with this program. If not, see <http://www.gnu.org/licenses/>.
19*/ 20​*/
20 21​
21import QtQuick 2.0 22​import QtQuick 2.0
22import QtQuick.Controls 1.0 23​import QtQuick.Controls 2.5 as QQC2
24​import "../code/icon.js" as Icon
ngrahamUnsubmitted
Done

If you're going to change this (and +1 for it), make it say import QtQuick.Controls 2.5 as QQC2 and then add the QQC2.<whatever> namespace

ngraham: If you're going to change this (and +1 for it), make it say `import QtQuick.Controls 2.5 as…
23 25​
24Button { 26​QQC2.ToolButton {
ngrahamUnsubmitted
Done

Now that this thing is moved next to the volume slider, I feel like it should be a ToolButton, like in the applet.

ngraham: Now that this thing is moved next to the volume slider, I feel like it should be a ToolButton…
25 property bool muted: true 27​ property bool muted: true
26 28​
27 iconName: 'audio-volume-muted' 29​ icon.name: Icon.name(Volume, Muted, isPlayback ? "audio-volume" : "microphone-sensitivity")
28 tooltip: i18nd("kcm_pulseaudio", "Mute audio") ​
29 checkable: true 30​ checkable: true
30 checked: muted 31​ checked: muted
31 onMutedChanged: checked = muted 32​ onMutedChanged: checked = muted
sefaeyeogluAuthorUnsubmitted
Done

I actually think this is the wrong way of doing tooltips here. The applet does it with PlasmaComponents. How can I create a tooltip with QCC?

sefaeyeoglu: I actually think this is the wrong way of doing tooltips here. The applet does it with…
ngrahamUnsubmitted
Done

Using the attached ToolTip property is just fine here for QQC2 items.

ngraham: Using the attached `ToolTip` property is just fine here for QQC2 items.
sefaeyeogluAuthorUnsubmitted
Done

I feel like QQC2 tooltips look out of place. They don't have the same shadow as normal tooltips and do not fade in

sefaeyeoglu: I feel like QQC2 tooltips look out of place. They don't have the same shadow as //normal//…
GB_2Unsubmitted
Done

That is something that needs to be fixed in the QQC2 desktop style, so it is unrelated to this.

GB_2: That is something that needs to be fixed in the QQC2 desktop style, so it is unrelated to this.
33​
34​ QQC2.ToolTip {
35​ text: i18ndc("kcm_pulseaudio", "Mute audio stream", "Mute %1", inputText.text) // a little hacky
36​ }
32} 37​}