[Digital clock plasmoid] Calendar settings page: port to QQC2 & Kirigami and improve layout

Summary:
BUG: 400663
FIXED-IN: 5.15.0

Test Plan:
Before: {F6455075}

After: {F6459462}

(label alignment being a bit off is unrelated to this patch)

Everything still works.

Reviewers: #plasma, #vdg, mart, davidedmundson

Reviewed By: #plasma, davidedmundson

Subscribers: alexde, mvourlakos, abetts, zzag, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D17354
wilder-broken-krunner
Nate Graham 7 years ago
parent 667386c64b
commit ad34212a8c
  1. 49
      applets/digital-clock/package/contents/ui/configCalendar.qml

@ -19,9 +19,10 @@
*/ */
import QtQuick 2.0 import QtQuick 2.0
import QtQuick.Controls 1.0 as QtControls import QtQuick.Controls 2.4 as QtControls
import QtQuick.Layouts 1.0 as QtLayouts import QtQuick.Layouts 1.0 as QtLayouts
import org.kde.plasma.calendar 2.0 as PlasmaCalendar import org.kde.plasma.calendar 2.0 as PlasmaCalendar
import org.kde.kirigami 2.5 as Kirigami
Item { Item {
id: calendarPage id: calendarPage
@ -37,31 +38,37 @@ Item {
plasmoid.configuration.enabledCalendarPlugins = PlasmaCalendar.EventPluginsManager.enabledPlugins; plasmoid.configuration.enabledCalendarPlugins = PlasmaCalendar.EventPluginsManager.enabledPlugins;
} }
QtLayouts.ColumnLayout { Kirigami.FormLayout {
anchors.left: parent.left anchors {
left: parent.left
right: parent.right
}
QtControls.CheckBox { QtControls.CheckBox {
id: showWeekNumbers id: showWeekNumbers
text: i18n("Show week numbers in Calendar") Kirigami.FormData.label: i18n("General:")
text: i18n("Show week numbers")
}
Item {
Kirigami.FormData.isSection: true
} }
QtControls.GroupBox { QtLayouts.ColumnLayout {
QtLayouts.Layout.fillWidth: true Kirigami.FormData.label: i18n("Available Plugins:")
title: i18n("Available Calendar Plugins") Kirigami.FormData.buddyFor: children[1] // 0 is the Repeater
flat: true
QtLayouts.ColumnLayout { Repeater {
Repeater { id: calendarPluginsRepeater
id: calendarPluginsRepeater model: PlasmaCalendar.EventPluginsManager.model
model: PlasmaCalendar.EventPluginsManager.model delegate: QtLayouts.RowLayout {
delegate: QtLayouts.RowLayout { QtControls.CheckBox {
QtControls.CheckBox { text: model.display
text: model.display checked: model.checked
checked: model.checked onClicked: {
onClicked: { //needed for model's setData to be called
//needed for model's setData to be called model.checked = checked;
model.checked = checked; calendarPage.configurationChanged();
calendarPage.configurationChanged();
}
} }
} }
} }

Loading…
Cancel
Save