Details

Reviewers

dvratil
mlaurent

Commits

R76:1ec2e08a83c0: Event view can use the CollectionColorAttribute color

Summary

This introduces 3 changes in Helper:

3 Helper functions are now exported
resourceColor() checks if a color is set in the preferences files. If yes, it uses it. If not, it checks if there is a CollectionColorAttribute in the collection. If yes, it uses it else it call the resourceColor() from prefs (that can create a new color or return an invalid one)
setResourceColor() set a color in the preferences files ONLY IF it's not the same as the CollectionColor Attribute.

Diff Detail

Repository

R76 PIM: Event Views

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

ochurlaud created this revision.Aug 24 2017, 6:04 AM

Restricted Application added a project: KDE PIM. · View Herald TranscriptAug 24 2017, 6:04 AM

ochurlaud added a dependent revision: D7501: Korganizer can use CollectionColorAttributes for calendar colors.Aug 24 2017, 6:09 AM

dkurz added a subscriber: dkurz.Aug 24 2017, 6:52 AM

dkurz added inline comments.

src/helper.cpp
50	Should the color preference for this calendar be reset here? If preference == red, collection color == blue, and then the user decides to set preference = blue, this wouldn't have an effect and still display red, would it?
92	Lines 84-92 are the same as lines 65-73 (except for "coll" vs. "item.parentCollection()"), so it should probably be extracted to a method.

ochurlaud marked an inline comment as done.Aug 24 2017, 6:50 PM

ochurlaud added inline comments.

src/helper.cpp
92	I wouldn't do that as @dvratil said we might need to deprecate the "item" version...

Update to follow @dkurz comments

You exported/install Helper so you need to increase lib version => increase it in CMakeLists.txt top level.
Thanks

This revision now requires changes to proceed.Aug 25 2017, 4:36 AM

In D7500#139749, @mlaurent wrote:

You exported/install Helper so you need to increase lib version => increase it in CMakeLists.txt top level.

Only this lib? 5.8.41? 5.9?

only this lib "5.8.41"
thanks

5.6.41
not 5.8.41

Increase lib version

Update lib version and add CMakeLists.txt to the patch

dvratil requested changes to this revision.Aug 26 2017, 9:16 AM

dvratil added inline comments.

CMakeLists.txt
36	Change the value of `PIM_VERSION` at the top of the file, keep the variable used here.

This revision now requires changes to proceed.Aug 26 2017, 9:16 AM

Use the PIM_VERSION variable

ochurlaud marked an inline comment as done.Aug 26 2017, 9:25 AM

Thanks!

Seems ok for me.

This revision is now accepted and ready to land.Aug 26 2017, 11:40 AM

Closed by commit R76:1ec2e08a83c0: Event view can use the CollectionColorAttribute color (authored by ochurlaud). · Explain WhyAug 26 2017, 11:50 AM

This revision was automatically updated to reflect the committed changes.

dfaure mentioned this in D28937: EventViews::setResourceColor: modify the Akonadi::CollectionColorAttribute in the collection.Apr 18 2020, 9:16 AM

dfaure added a subscriber: dfaure.Apr 18 2020, 9:18 AM

dfaure added inline comments.

src/helper.cpp
51	For the record: this was broken, a `return;` was missing after this line, so we would anyway proceed to saving the color, 3 lines below. But no matter, D28937 removes all this logic. If we actually save into the attribute we don't need it anymore.

dfaure mentioned this in R76:89938bdce6d6: EventViews::setResourceColor: modify the Akonadi::CollectionColorAttribute in….Apr 18 2020, 12:12 PM

			Path	Packages
M			CMakeLists.txt (2 lines)
M			src/CMakeLists.txt (1 line)
M			src/helper.h (23 lines)
M			src/helper.cpp (44 lines)
M			src/prefs.cpp (7 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	18646			Aug 24 2017, 6:00 AM	★	★
Diff 2	18710			Aug 24 2017, 6:52 PM	★	★
Diff 3	18791			Aug 26 2017, 8:22 AM	★	★
Diff 4	18792			Aug 26 2017, 8:23 AM	★	★
Diff 5	18798			Aug 26 2017, 9:24 AM	★	★
Diff 6	18808	4684583	R76:1ec2e08a83c074ebf4dad554c32495e0bf6eb8ed	Aug 26 2017, 10:34 AM	★	★

	Status	Author	Revision
	Closed	ochurlaud	D7501 Korganizer can use CollectionColorAttributes for calendar colors
	Closed	ochurlaud	D7500 Event view can use the CollectionColorAttribute color

Event view can use the CollectionColorAttribute color
ClosedPublic
Actions

Details

Diff Detail

Revision Contents
Changeset List

Diff 18808

CMakeLists.txt

src/CMakeLists.txt

src/helper.h

src/helper.cpp

src/prefs.cpp

Event view can use the CollectionColorAttribute colorClosedPublicActions

Details

Diff Detail

Revision ContentsChangeset List

Diff 18808

CMakeLists.txt

src/CMakeLists.txt

src/helper.h

src/helper.cpp

src/prefs.cpp

Event view can use the CollectionColorAttribute color
ClosedPublic
Actions

Revision Contents
Changeset List