8350c0f2ce
Summary:
* Wrote new KCM based on KQuickAddons::ConfigModule.
* Remade QMLs for Buttons and Themes tabs.
* Updated bridge model code for new plugin lookup API (fixes warnings).
* Fixed decoration shadow changing messing with the previews sizes.
* Fixed button drag and drop issues (see D18104).
* Fixed default settings button behavior and detection of settings changes.
* Updated Get Hot New Stuff.
* Removed apply button in previewbridge.cpp: After applying changes, a theme's KCModule is invalidated.
BUG: 389431
BUG: 350122
BUG: 346222
BUG: 342816
BUG: 397595
{F6574963} | {F6574962} | {F6574961} | {F6574960}
Test Plan:
* Verified saving and loading for every setting
* Checked shadows of Breeze and Oxygen
* Tested all possible drag&drop operations on both sides of the fake titlebar
* Changed color schemes (with `kcmshell5 colors`) while showing the Themes tab to see if all previews update correctly their palettes
* Tested on a fresh Neon-developer account, via kcmshell and systemsettings
Reviewers: #vdg, abetts, ngraham, #kwin, davidedmundson
Reviewed By: #vdg, #kwin, davidedmundson
Subscribers: zzag, GB_2, ngraham, broulik, kwin
Tags: #kwin
Differential Revision: https://phabricator.kde.org/D18458
255 lines
11 KiB
QML
255 lines
11 KiB
QML
/*
|
|
* Copyright 2014 Martin Gräßlin <mgraesslin@kde.org>
|
|
* Copyright (c) 2019 Valerio Pilo <vpilo@coldshock.net>
|
|
*
|
|
* 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) version 3 or any later version
|
|
* accepted by the membership of KDE e.V. (or its successor approved
|
|
* by the membership of KDE e.V.), which shall act as a proxy
|
|
* defined in Section 14 of version 3 of the license.
|
|
*
|
|
* 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.7
|
|
import QtQuick.Layouts 1.3
|
|
import QtQuick.Controls 2.4 as Controls
|
|
import org.kde.plasma.core 2.0 as PlasmaCore
|
|
import org.kde.kwin.private.kdecoration 1.0 as KDecoration
|
|
|
|
ColumnLayout {
|
|
Layout.fillWidth: true
|
|
Layout.fillHeight: true
|
|
property int buttonIconSize: units.iconSizes.medium
|
|
property int titleBarSpacing: units.iconSizes.smallMedium
|
|
|
|
KDecoration.Bridge {
|
|
id: bridgeItem
|
|
plugin: "org.kde.breeze"
|
|
}
|
|
KDecoration.Settings {
|
|
id: settingsItem
|
|
bridge: bridgeItem.bridge
|
|
}
|
|
|
|
Rectangle {
|
|
Layout.fillWidth: true
|
|
color: palette.base
|
|
radius: units.smallSpacing
|
|
height: fakeWindow.height
|
|
Layout.margins: units.smallSpacing
|
|
|
|
ColumnLayout {
|
|
id: fakeWindow
|
|
width: parent.width
|
|
|
|
Rectangle {
|
|
id: titleBar
|
|
Layout.fillWidth: true
|
|
height: buttonPreviewRow.height + 2 * titleBarSpacing
|
|
radius: units.smallSpacing
|
|
gradient: Gradient {
|
|
GradientStop { position: 0.0; color: palette.midlight }
|
|
GradientStop { position: 1.0; color: palette.window }
|
|
}
|
|
|
|
RowLayout {
|
|
id: buttonPreviewRow
|
|
anchors {
|
|
margins: titleBarSpacing
|
|
left: parent.left
|
|
right: parent.right
|
|
top: parent.top
|
|
}
|
|
|
|
ButtonGroup {
|
|
id: leftButtonsView
|
|
iconSize: buttonIconSize
|
|
model: kcm.leftButtonsModel
|
|
key: "decoButtonLeft"
|
|
}
|
|
Controls.Label {
|
|
id: titleBarLabel
|
|
Layout.fillWidth: true
|
|
horizontalAlignment: Text.AlignHCenter
|
|
font.bold: true
|
|
text: i18n("Titlebar")
|
|
}
|
|
ButtonGroup {
|
|
id: rightButtonsView
|
|
iconSize: buttonIconSize
|
|
model: kcm.rightButtonsModel
|
|
key: "decoButtonRight"
|
|
}
|
|
}
|
|
DropArea {
|
|
id: titleBarDropArea
|
|
anchors {
|
|
fill: parent
|
|
margins: -titleBarSpacing
|
|
}
|
|
keys: [ "decoButtonAdd", "decoButtonRight", "decoButtonLeft" ]
|
|
onEntered: {
|
|
drag.accept();
|
|
}
|
|
onDropped: {
|
|
var view = undefined;
|
|
var left = drag.x - (leftButtonsView.x + leftButtonsView.width);
|
|
var right = drag.x - rightButtonsView.x;
|
|
if (Math.abs(left) <= Math.abs(right)) {
|
|
view = leftButtonsView;
|
|
} else {
|
|
view = rightButtonsView;
|
|
}
|
|
if (!view) {
|
|
return;
|
|
}
|
|
var point = mapToItem(view, drag.x, drag.y);
|
|
var index = 0
|
|
for(var childIndex = 0 ; childIndex < (view.count - 1) ; childIndex++) {
|
|
var child = view.contentItem.children[childIndex]
|
|
if (child.x > point.x) {
|
|
break
|
|
}
|
|
index = childIndex + 1
|
|
}
|
|
if (drop.keys.indexOf("decoButtonAdd") != -1) {
|
|
view.model.add(index, drag.source.type);
|
|
} else if (drop.keys.indexOf("decoButtonLeft") != -1) {
|
|
if (view == leftButtonsView) {
|
|
// move in same view
|
|
if (index != drag.source.itemIndex) {
|
|
drag.source.buttonsModel.move(drag.source.itemIndex, index);
|
|
}
|
|
} else {
|
|
// move to right view
|
|
view.model.add(index, drag.source.type);
|
|
drag.source.buttonsModel.remove(drag.source.itemIndex);
|
|
}
|
|
} else if (drop.keys.indexOf("decoButtonRight") != -1) {
|
|
if (view == rightButtonsView) {
|
|
// move in same view
|
|
if (index != drag.source.itemIndex) {
|
|
drag.source.buttonsModel.move(drag.source.itemIndex, index);
|
|
}
|
|
} else {
|
|
// move to left view
|
|
view.model.add(index, drag.source.type);
|
|
drag.source.buttonsModel.remove(drag.source.itemIndex);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
GridView {
|
|
id: availableButtonsGrid
|
|
Layout.fillWidth: true
|
|
Layout.minimumHeight: availableButtonsGrid.cellHeight * 2
|
|
Layout.margins: units.largeSpacing
|
|
model: kcm.availableButtonsModel
|
|
interactive: false
|
|
delegate: Item {
|
|
id: availableDelegate
|
|
Layout.margins: units.largeSpacing
|
|
width: availableButtonsGrid.cellWidth
|
|
height: availableButtonsGrid.cellHeight
|
|
opacity: (leftButtonsView.dragging || rightButtonsView.dragging) ? 0.25 : 1.0
|
|
Rectangle {
|
|
id: availableButtonFrame
|
|
anchors.horizontalCenter: parent.horizontalCenter
|
|
color: palette.window
|
|
radius: units.smallSpacing
|
|
width: buttonIconSize + units.largeSpacing
|
|
height: buttonIconSize + units.largeSpacing
|
|
|
|
KDecoration.Button {
|
|
id: availableButton
|
|
anchors.centerIn: Drag.active ? undefined : availableButtonFrame
|
|
bridge: bridgeItem.bridge
|
|
settings: settingsItem
|
|
type: model["button"]
|
|
width: buttonIconSize
|
|
height: buttonIconSize
|
|
Drag.keys: [ "decoButtonAdd" ]
|
|
Drag.active: dragArea.drag.active
|
|
color: palette.windowText
|
|
}
|
|
MouseArea {
|
|
id: dragArea
|
|
anchors.fill: availableButton
|
|
drag.target: availableButton
|
|
cursorShape: Qt.SizeAllCursor
|
|
onReleased: {
|
|
if (availableButton.Drag.target) {
|
|
availableButton.Drag.drop();
|
|
} else {
|
|
availableButton.Drag.cancel();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
Controls.Label {
|
|
id: iconLabel
|
|
text: model["display"]
|
|
horizontalAlignment: Text.AlignHCenter
|
|
verticalAlignment: Text.AlignTop
|
|
anchors.top: availableButtonFrame.bottom
|
|
anchors.topMargin: units.smallSpacing
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
elide: Text.ElideRight
|
|
wrapMode: Text.Wrap
|
|
height: 2 * implicitHeight + lineHeight
|
|
}
|
|
}
|
|
DropArea {
|
|
anchors.fill: parent
|
|
keys: [ "decoButtonRemove" ]
|
|
onEntered: {
|
|
drag.accept();
|
|
}
|
|
onDropped: {
|
|
drag.source.buttonsModel.remove(drag.source.itemIndex);
|
|
}
|
|
ColumnLayout {
|
|
anchors.centerIn: parent
|
|
opacity: (leftButtonsView.dragging || rightButtonsView.dragging) ? 1.0 : 0.0
|
|
Controls.Label {
|
|
text: i18n("Drop here to remove button")
|
|
font.weight: Font.Bold
|
|
Layout.bottomMargin: units.smallSpacing
|
|
}
|
|
PlasmaCore.IconItem {
|
|
id: icon
|
|
width: units.iconSizes.smallMedium
|
|
height: units.iconSizes.smallMedium
|
|
Layout.alignment: Qt.AlignHCenter
|
|
source: "emblem-remove"
|
|
}
|
|
Item {
|
|
Layout.fillHeight: true
|
|
}
|
|
}
|
|
}
|
|
}
|
|
Text {
|
|
id: dragHint
|
|
color: palette.windowText
|
|
opacity: (leftButtonsView.dragging || rightButtonsView.dragging || availableButtonsGrid.dragging) ? 0.0 : 1.0
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: titleBarSpacing
|
|
Layout.bottomMargin: titleBarSpacing
|
|
horizontalAlignment: Text.AlignHCenter
|
|
wrapMode: Text.NoWrap
|
|
text: i18n("Drag buttons between here and the titlebar")
|
|
}
|
|
}
|
|
}
|
|
}
|