Skip to content
GitLab
Commit b32a10d3 authored by Claudio Cambra's avatar Claudio Cambra
Browse files

Make the collection sidebar view more generic and reusable 



Signed-off-by: Claudio Cambra's avatarClaudio Cambra <claudio.cambra@gmail.com>
parent 3c92ef7f
Pipeline #238058 passed with stage
in 3 minutes and 23 seconds
Hide whitespace changes
Inline Side-by-side
src/contents/ui/Controls/CalendarAddressbookSidebar.qml → src/contents/ui/Controls/CheckableCollectionNavigationView.qml
View file @ b32a10d3
......@@ -16,9 +16,9 @@ import org.kde.kitemmodels 1.0
QQC2.ScrollView {
id: root
signal calendarCheckChanged
signal collectionCheckChanged
signal closeParentDrawer
signal deleteCalendar(int collectionId, var collectionDetails)
signal deleteCollection(int collectionId, var collectionDetails)
readonly property AgentConfiguration agentConfiguration: AgentConfiguration {}
readonly property var activeTags: Filter.tags
......@@ -106,8 +106,9 @@ QQC2.ScrollView {
}
Kirigami.BasicListItem {
id: calendarHeadingItem
property bool expanded: Config.calendarsSectionExpanded
id: collectionHeadingItem
readonly property bool expanded: Config.collectionsSectionExpanded
separatorVisible: false
hoverEnabled: false
......@@ -116,9 +117,13 @@ QQC2.ScrollView {
leading: Kirigami.Icon {
implicitWidth: Kirigami.Units.iconSizes.smallMedium
implicitHeight: Kirigami.Units.iconSizes.smallMedium
source: "view-calendar"
source: if (mode === KalendarApplication.Contact) {
return "view-pim-contacts";
} else {
return "view-calendar";
}
isMask: true
color: calendarHeadingItem.labelItem.color
color: collectionHeadingItem.labelItem.color
}
text: if (mode === KalendarApplication.Contact) {
return i18n("Contacts");
......@@ -131,20 +136,20 @@ QQC2.ScrollView {
trailing: Kirigami.Icon {
implicitWidth: Kirigami.Units.iconSizes.small
implicitHeight: Kirigami.Units.iconSizes.small
source: calendarHeadingItem.expanded ? 'arrow-up' : 'arrow-down'
source: collectionHeadingItem.expanded ? 'arrow-up' : 'arrow-down'
isMask: true
color: calendarHeadingItem.labelItem.color
color: collectionHeadingItem.labelItem.color
}
onClicked: {
Config.calendarsSectionExpanded = !Config.calendarsSectionExpanded;
Config.collectionsSectionExpanded = !Config.collectionsSectionExpanded;
Config.save();
}
}
Repeater {
id: calendarList
id: collectionList
property var calendarModel: KDescendantsProxyModel {
property var collectionModel: KDescendantsProxyModel {
model: switch(root.mode) {
case KalendarApplication.Todo:
return CalendarManager.todoCollections;
......@@ -155,7 +160,7 @@ QQC2.ScrollView {
}
}
model: calendarHeadingItem.expanded ? calendarModel : []
model: collectionHeadingItem.expanded ? collectionModel : []
delegate: DelegateChooser {
role: 'kDescendantExpandable'
......@@ -163,7 +168,7 @@ QQC2.ScrollView {
roleValue: true
Kirigami.BasicListItem {
id: calendarSourceItem
id: collectionSourceItem
label: display
highlighted: visualFocus || incidenceDropArea.containsDrag
labelItem.color: visualFocus ? Kirigami.Theme.textColor : Kirigami.Theme.disabledTextColor
......@@ -180,7 +185,7 @@ QQC2.ScrollView {
leading: Kirigami.Icon {
implicitWidth: Kirigami.Units.iconSizes.smallMedium
implicitHeight: Kirigami.Units.iconSizes.smallMedium
color: calendarSourceItem.labelItem.color
color: collectionSourceItem.labelItem.color
isMask: true
source: model.decoration
}
......@@ -214,25 +219,25 @@ QQC2.ScrollView {
implicitWidth: Kirigami.Units.iconSizes.small
implicitHeight: Kirigami.Units.iconSizes.small
source: model.kDescendantExpanded ? 'arrow-up' : 'arrow-down'
color: calendarSourceItem.labelItem.color
color: collectionSourceItem.labelItem.color
isMask: true
}
ColoredCheckbox {
id: calendarCheckbox
id: collectionCheckbox
Layout.fillHeight: true
visible: model.checkState != null
color: model.collectionColor ?? Kirigami.Theme.highlightedTextColor
checked: model.checkState === 2
onCheckedChanged: root.calendarCheckChanged()
onCheckedChanged: root.collectionCheckChanged()
onClicked: {
model.checkState = model.checkState === 0 ? 2 : 0
calendarCheckChanged()
root.collectionCheckChanged()
}
}
}
onClicked: calendarList.model.toggleChildren(index)
onClicked: collectionList.model.toggleChildren(index)
CalendarItemTapHandler {
collectionId: model.collectionId
......@@ -244,12 +249,12 @@ QQC2.ScrollView {
DropArea {
id: incidenceDropArea
property var collectionDetails: CalendarManager.getCollectionDetails(model.collectionId)
parent: calendarSourceItem.contentItem // Otherwise label elide breaks
parent: collectionSourceItem.contentItem // Otherwise label elide breaks
anchors.fill: parent
z: 9999
enabled: collectionDetails.canCreate
onDropped: if(drop.source.objectName === "taskDelegate") {
CalendarManager.changeIncidenceCollection(drop.source.incidencePtr, calendarSourceItemMouseArea.collectionId);
CalendarManager.changeIncidenceCollection(drop.source.incidencePtr, model.collectionId);
const pos = mapToItem(applicationWindow().contentItem, x, y);
drop.source.caughtX = pos.x;
......@@ -263,7 +268,7 @@ QQC2.ScrollView {
DelegateChoice {
roleValue: false
Kirigami.BasicListItem {
id: calendarItem
id: collectionItem
label: display
labelItem.color: Kirigami.Theme.textColor
leftPadding: Kirigami.Settings.isMobile ?
......@@ -281,15 +286,15 @@ QQC2.ScrollView {
leadingPadding: Kirigami.Settings.isMobile ? Kirigami.Units.largeSpacing * 2 : Kirigami.Units.largeSpacing
trailing: ColoredCheckbox {
id: calendarCheckbox
id: collectionCheckbox
visible: model.checkState != null
color: model.collectionColor
checked: model.checkState === 2
onCheckedChanged: root.calendarCheckChanged()
onCheckedChanged: root.collectionCheckChanged()
onClicked: {
model.checkState = model.checkState === 0 ? 2 : 0
calendarCheckChanged()
root.collectionCheckChanged()
}
}
......@@ -305,18 +310,18 @@ QQC2.ScrollView {
collectionDetails: CalendarManager.getCollectionDetails(collectionId)
agentConfiguration: root.agentConfiguration
enabled: mode !== KalendarApplication.Contact
onDeleteCalendar: root.deleteCalendar(collectionId, collectionDetails)
onDeleteCalendar: root.deleteCollection(collectionId, collectionDetails)
}
DropArea {
id: incidenceDropArea
property var collectionDetails: CalendarManager.getCollectionDetails(model.collectionId)
parent: calendarItem.contentItem // Otherwise label elide breaks
parent: collectionItem.contentItem // Otherwise label elide breaks
anchors.fill: parent
z: 9999
enabled: collectionDetails.canCreate
onDropped: if(drop.source.objectName === "taskDelegate") {
CalendarManager.changeIncidenceCollection(drop.source.incidencePtr, calendarItemMouseArea.collectionId);
CalendarManager.changeIncidenceCollection(drop.source.incidencePtr, model.collectionId);
const pos = mapToItem(applicationWindow().contentItem, x, y);
drop.source.caughtX = pos.x;
......
src/contents/ui/Drawers/MainDrawer.qml
View file @ b32a10d3
......@@ -353,10 +353,10 @@ Kirigami.OverlayDrawer {
Component {
id: calendarAddressBookComponent
CalendarAddressbookSidebar {
onCalendarCheckChanged: mainDrawer.calendarCheckChanged()
CheckableCollectionNavigationView {
onCollectionCheckChanged: mainDrawer.collectionCheckChanged()
onCloseParentDrawer: mainDrawer.close()
onDeleteCalendar: mainDrawer.deleteCalendar(collectionId, collectionDetails)
onDeleteCollection: mainDrawer.deleteCollection(collectionId, collectionDetails)
mode: mainDrawer.mode
parentDrawerModal: mainDrawer.modal
......@@ -394,7 +394,7 @@ Kirigami.OverlayDrawer {
}
}
function calendarCheckChanged() {
function collectionCheckChanged() {
if (mode & (KalendarApplication.Event | KalendarApplication.Todo)) {
CalendarManager.save();
}
......
src/kalendarconfig.kcfg
View file @ b32a10d3
......@@ -61,11 +61,11 @@ SPDX-License-Identifier: LGPL-2.0-or-later
<group name="MainDrawer">
<entry name="tagsSectionExpanded" type="Bool">
<label>Whether the "Tags" section of the mainDrawer.is expanded.</label>
<label>Whether the "Tags" section of the mainDrawer is expanded.</label>
<default>true</default>
</entry>
<entry name="calendarsSectionExpanded" type="Bool">
<label>Whether the "Tags" section of the mainDrawer.is expanded.</label>
<entry name="collectionsSectionExpanded" type="Bool">
<label>Whether the "Calendar" or "Contacts" section of the mainDrawer is expanded.</label>
<default>true</default>
</entry>
</group>
......
src/resources.qrc
View file @ b32a10d3
......@@ -56,7 +56,7 @@ SPDX-License-Identifier: CC0-1.0
<file alias="TodoCheckBox.qml">contents/ui/Controls/TodoCheckBox.qml</file>
<file alias="IncidenceInfoContents.qml">contents/ui/Controls/IncidenceInfoContents.qml</file>
<file alias="IncidenceInfoPopup.qml">contents/ui/Controls/IncidenceInfoPopup.qml</file>
<file alias="CalendarAddressbookSidebar.qml">contents/ui/Controls/CalendarAddressbookSidebar.qml</file>
<file alias="CheckableCollectionNavigationView.qml">contents/ui/Controls/CheckableCollectionNavigationView.qml</file>
<file alias="LocationMap.qml">contents/ui/Location/LocationMap.qml</file>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment