Misc fixes in QML.

work/plasma6
Lana Black 3 weeks ago
parent e4c02456c8
commit 45b34a824b

@ -11,6 +11,7 @@ import Qt5Compat.GraphicalEffects
import org.kde.plasma.plasmoid 2.0
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 3.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.latte.core 0.2 as LatteCore
import org.kde.latte.components 1.0 as LatteComponents
@ -383,7 +384,7 @@ Item{
}
}
sourceComponent: PlasmaComponents.Highlight {
sourceComponent: PlasmaExtras.Highlight {
id: visualIndicatorRectangle
opacity: 0

@ -8,6 +8,7 @@ import QtQuick 2.1
import QtQuick.Window 2.2
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 3.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.latte.core 0.2 as LatteCore
@ -20,14 +21,14 @@ Window{
property string space:" : "
PlasmaExtras.ScrollArea {
id: scrollArea
PlasmaComponents.ScrollView {
id: scrollView
anchors.fill: parent
verticalScrollBarPolicy: Qt.ScrollBarAsNeeded
horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
//verticalScrollBarPolicy: Qt.ScrollBarAsNeeded
//horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
flickableItem.flickableDirection: Flickable.VerticalFlick
//flickableItem.flickableDirection: Flickable.VerticalFlick
Grid{
id:mainGrid

@ -8,6 +8,7 @@ import QtQuick 2.7
import QtQuick.Layouts 1.0
import Qt5Compat.GraphicalEffects
import org.kde.kirigami 2.5 as Kirigami
import org.kde.plasma.plasmoid 2.0
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 3.0 as PlasmaComponents
@ -303,7 +304,7 @@ MouseArea {
opacity: 0.35
}
PlasmaCore.IconItem {
Kirigami.Icon {
source: "transform-move"
width: Math.min(144, root.metrics.iconSize)
height: width
@ -443,10 +444,11 @@ MouseArea {
PlasmaComponents.ToolButton {
id: configureButton
anchors.verticalCenter: parent.verticalCenter
iconSource: "configure"
tooltip: i18n("Configure applet")
icon.name: "configure"
// XXX: Tooltips are gone now? Investigate.
// tooltip: i18n("Configure applet")
onClicked: {
tooltip.visible = false;
// tooltip.visible = false;
currentApplet.applet.action("configure").trigger();
}
}
@ -465,8 +467,8 @@ MouseArea {
PlasmaComponents.ToolButton{
id: colorizingButton
checkable: true
iconSource: "color-picker"
tooltip: i18n("Enable painting for this applet")
icon.name: "color-picker"
// tooltip: i18n("Enable painting for this applet")
onClicked: {
fastLayoutManager.setOption(currentApplet.applet.id, "userBlocksColorizing", !checked);
@ -476,8 +478,8 @@ MouseArea {
PlasmaComponents.ToolButton{
id: lockButton
checkable: true
iconSource: checked ? "lock" : "unlock"
tooltip: i18n("Disable parabolic effect for this applet")
icon.name: checked ? "lock" : "unlock"
// tooltip: i18n("Disable parabolic effect for this applet")
onClicked: {
fastLayoutManager.setOption(currentApplet.applet.id, "lockZoom", checked);
@ -487,10 +489,10 @@ MouseArea {
PlasmaComponents.ToolButton {
id: closeButton
anchors.verticalCenter: parent.verticalCenter
iconSource: "delete"
tooltip: i18n("Remove applet")
icon.name: "delete"
// tooltip: i18n("Remove applet")
onClicked: {
tooltip.visible = false;
// tooltip.visible = false;
if(currentApplet && currentApplet.applet)
currentApplet.applet.action("remove").trigger();
}

@ -9,6 +9,7 @@ import QtQuick.Layouts 1.1
import QtQuick.Window 2.2
import Qt5Compat.GraphicalEffects
import org.kde.kirigami 2.20 as Kirigami
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 3.0 as PlasmaComponents
import org.kde.kquickcontrolsaddons 2.0
@ -29,7 +30,7 @@ import "layouts" as Layouts
import "./background" as Background
import "./debugger" as Debugger
Item {
ContainmentItem {
id: root
objectName: "containmentViewLayout"
@ -744,9 +745,9 @@ Item {
///////////////END components
PlasmaCore.ColorScope{
id: colorScopePalette
}
//Kirigami.ColorSet{
// id: colorScopePalette
//}
LatteContainment.LayoutManager{
id:fastLayoutManager

@ -6,6 +6,7 @@
import QtQuick 2.7
import QtQuick.Templates 2.0 as T
import org.kde.ksvg 1.0 as KSvg
import org.kde.kirigami 2.20 as Kirigami
import org.kde.plasma.core 2.0 as PlasmaCore
import "private" as Private
@ -33,7 +34,7 @@ T.Slider {
KSvg.Svg {
id: grooveSvg
imagePath: "widgets/slider"
colorGroup: PlasmaCore.ColorScope.colorGroup
colorGroup: Kirigami.Theme.colorSet
}
KSvg.FrameSvgItem {

@ -6,6 +6,7 @@
import QtQuick 2.2
import QtQuick.Controls.Styles 1.2 as QtQuickControlStyle
import QtQuick.Controls 1.2
import org.kde.kirigami 2.20 as Kirigami
import org.kde.plasma.core 2.0 as PlasmaCore
QtQuickControlStyle.SwitchStyle {
@ -15,7 +16,7 @@ QtQuickControlStyle.SwitchStyle {
PlasmaCore.Svg {
id: switchSvg
imagePath: "widgets/switch"
colorGroup: PlasmaCore.ColorScope.colorGroup
colorGroup: Kirigami.Theme.colorSet
}
property bool themeHasSwitch: false
@ -91,7 +92,7 @@ QtQuickControlStyle.SwitchStyle {
imagePath: "widgets/slider"
prefix: "groove"
opacity: control.checked ? 0 : 1
colorGroup: PlasmaCore.ColorScope.colorGroup
colorGroup: Kirigami.Theme.colorSet
visible: opacity > 0
Behavior on opacity {
@ -105,7 +106,7 @@ QtQuickControlStyle.SwitchStyle {
imagePath: "widgets/slider"
prefix: "groove-highlight"
opacity: control.checked ? 1 : 0
colorGroup: PlasmaCore.ColorScope.colorGroup
colorGroup: Kirigami.Theme.colorSet
visible: opacity > 0
Behavior on opacity {
@ -125,7 +126,7 @@ QtQuickControlStyle.SwitchStyle {
imagePath: "widgets/switch"
prefix: "groove"
opacity: control.checked ? 0 : 1
colorGroup: PlasmaCore.ColorScope.colorGroup
colorGroup: Kirigami.Theme.colorSet
visible: opacity > 0
Component.onCompleted: styleRoot.themeHasSwitch = fromCurrentTheme;
@ -142,7 +143,7 @@ QtQuickControlStyle.SwitchStyle {
imagePath: "widgets/switch"
prefix: "groove-highlight"
opacity: control.checked ? 1 : 0
colorGroup: PlasmaCore.ColorScope.colorGroup
colorGroup: Kirigami.Theme.colorSet
visible: opacity > 0
Behavior on opacity {

@ -276,9 +276,9 @@ PlasmoidItem {
}
/////
PlasmaCore.ColorScope{
id: colorScopePalette
}
//Kirigami.ColorSet {
// id: colorScopePalette
//}
///UPDATE
function updateListViewParent() {

@ -16,12 +16,11 @@ import org.kde.draganddrop 2.0
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 3.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
import org.kde.taskmanager 0.1 as TaskManager
PlasmaExtras.ScrollArea {
PlasmaComponents.ScrollView {
id: mainToolTip
property Item parentTask: null
property var rootIndex: []

@ -12,6 +12,7 @@ import QtQuick.Layouts 1.1
import Qt5Compat.GraphicalEffects
import QtQml.Models 2.2
import org.kde.kirigami 2.5 as Kirigami
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 3.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras
@ -89,7 +90,7 @@ Column {
anchors.horizontalCenter: parent.horizontalCenter
// launcher icon
PlasmaCore.IconItem {
Kirigami.Icon {
Layout.preferredWidth: units.iconSizes.medium
Layout.preferredHeight: units.iconSizes.medium
source: icon

@ -385,7 +385,7 @@ Loader {
border.color: dialog.borderColor
}
PlasmaExtras.ScrollArea {
PlasmaComponents.ScrollView {
id: scrollArea
anchors.fill: parent

Loading…
Cancel
Save