kwin/kcmkwin/kwincompositing/qml/EffectView.qml
Nate Graham d288276269 [kcmkwin/compositing] Port Effects KCM to QQC2
Summary:
This patch ports the Effects KCM to QQC2, which yields the following benefits:
1. General performance enhancements of only using QQC2 rather than a mix of 1 and 2
2. Some code simplification is possible
3. Improves the appearance of the checkable menu items in the dropdown menu, fixing https://bugs.kde.org/show_bug.cgi?id=402701
4. Improves the appearance when using a fractional scale factor, fixing https://bugs.kde.org/show_bug.cgi?id=396725
5. Fixes the incorrect size when opened from `kcmshell5`

Along the way, two visual changes are introduced as a by-product of porting:
1. The scrollbar is inline, so it overlaps some of the buttons in the content. This is somewhat undesirable, but adopting a Kirigami scrollview would fix this.
2. The button that displays a dropdown menu no longer has a downward-pointing arrow to indicate as such. This is not my preference, but there's a benefit to being consistent, and eventually we could can change this in one place to impeove the appearance of buttons that display dropdown menus everywhere in one fell swoop.

BUG: 396725
BUG: 402701
BUG: 396076
FIXED-IN: 5.15.0

Test Plan:
All functionality still works

In System Settings, showing improved checkable menu item appearance:
{F6523385}

In `kcmshell` at 1x scale:
{F6523386}

In `kcmshell` at 1.5x scale:
{F6523387}

Reviewers: #kwin, #plasma, davidedmundson

Reviewed By: #kwin, #plasma, davidedmundson

Subscribers: davidedmundson, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D17928
2019-01-06 16:09:07 -07:00

179 lines
6.8 KiB
QML

/**************************************************************************
* KWin - the KDE window manager *
* This file is part of the KDE project. *
* *
* Copyright (C) 2013 Antonis Tsiapaliokas <kok3rs@gmail.com> *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
**************************************************************************/
import QtQuick 2.1
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.0
import org.kde.kwin.kwincompositing 1.0
Rectangle {
signal changed
implicitHeight: 500
implicitWidth: 400
EffectConfig {
id: effectConfig
onEffectListChanged: {
searchModel.load()
}
}
ColumnLayout {
id: col
anchors.fill: parent
Label {
id: hint
Layout.fillWidth: true
Layout.alignment: Qt.AlignLeft
text: i18n("Hint: To find out or configure how to activate an effect, look at the effect's settings.")
elide: Text.ElideRight
}
RowLayout {
TextField {
// TODO: needs clear button, missing in Qt
id: searchField
placeholderText: i18n("Search...")
Layout.fillWidth: true
focus: true
}
Button {
id: configureButton
icon.name: "configure"
ToolTip.visible: hovered
ToolTip.text: i18n("Configure filter")
onClicked: menu.opened ? menu.close() : menu.open()
}
Menu {
id: menu
y: configureButton.height
x: parent.width - width
MenuItem {
text: i18n("Exclude Desktop Effects not supported by the Compositor")
checkable: true
checked: searchModel.filterOutUnsupported
onToggled: {
searchModel.filterOutUnsupported = !searchModel.filterOutUnsupported;
}
}
MenuItem {
text: i18n("Exclude internal Desktop Effects")
checkable: true
checked: searchModel.filterOutInternal
onToggled: {
searchModel.filterOutInternal = !searchModel.filterOutInternal
}
}
}
}
ScrollView {
Layout.fillWidth: true
Layout.fillHeight: true
clip: true
// Draw a frame around the scrollview
Component.onCompleted: background.visible = true;
ListView {
function exclusiveGroupForCategory(category) {
for (var i = 0; i < effectView.exclusiveGroups.length; ++i) {
var item = effectView.exclusiveGroups[i];
if (item.category == category) {
return item.group;
}
}
var newGroup = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.1; ExclusiveGroup {}',
effectView,
"dynamicExclusiveGroup" + effectView.exclusiveGroups.length);
effectView.exclusiveGroups[effectView.exclusiveGroups.length] = {
'category': category,
'group': newGroup
};
return newGroup;
}
id: effectView
property var exclusiveGroups: []
property color backgroundNormalColor: searchModel.backgroundNormalColor
property color backgroundAlternateColor: searchModel.backgroundAlternateColor
anchors.fill: parent
model: EffectFilterModel {
id: searchModel
objectName: "filterModel"
filter: searchField.text
}
delegate: Effect{
id: effectDelegate
Connections {
id: effectStateConnection
target: null
onChanged: {
searchModel.updateEffectStatus(index, checkedState);
}
}
Component.onCompleted: {
effectStateConnection.target = effectDelegate
}
}
section.property: "CategoryRole"
section.delegate: Rectangle {
width: parent.width
implicitHeight: sectionText.implicitHeight + 2 * col.spacing
color: searchModel.backgroundNormalColor
Label {
id: sectionText
anchors.fill: parent
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
text: section
font.weight: Font.Bold
color: searchModel.sectionColor
}
}
spacing: col.spacing
focus: true
}
}
RowLayout {
Layout.fillWidth: true
Item {
Layout.fillWidth: true
}
Button {
id: ghnsButton
text: i18n("Get New Desktop Effects...")
icon.name: "get-hot-new-stuff"
onClicked: effectConfig.openGHNS()
}
}
}//End ColumnLayout
Connections {
target: searchModel
onDataChanged: changed()
}
}//End Rectangle