Page MenuHomekolab.org

merge messagelist
Closed, ResolvedPublic4 Story Points

Details

Ticket Type
Task

Event Timeline

knauss updated the task description. (Show Details)
knauss raised the priority of this task from to 60.
knauss added a project: KDE PIM.
knauss changed Ticket Type from Task to Task.
knauss added a subscriber: knauss.
knauss edited a custom field.Apr 27 2015, 9:35 AM
knauss edited a custom field.Apr 27 2015, 9:40 AM

only notes on email...

commit cb3b340bc8f069795044e259a76404290c205997
Author: Sandro Knauß <knauss@kolabsys.com>
Date: Fri Jan 23 16:39:58 2015 +0100

A GENERIC relation is not only the connection between note and email

Make sure that also other relations are handled correctly and really
make sure, that the related object is a note.

messagelist/core/messageitem.cpp | 23 +++++++++++++++--------
messagelist/core/messageitem_p.h | 2 ++
messageviewer/job/createnotejob.cpp | 2 +-
messageviewer/viewer/viewer_p.cpp | 26 ++++++++++++++++----------
messageviewer/viewer/viewer_p.h | 2 ++
5 files changed, 36 insertions(+), 19 deletions(-)

commit caa4f47570de2500d497482face230db5aeb34bb
Author: Sandro Knauß <knauss@kolabsys.com>
Date: Thu Dec 11 11:32:24 2014 +0100

messagelist: show complete taglist in tag combobox

Instead of using configfile to store tags to display simply show all
tags. Otherwise we had to update the list, if we update the tags from
the kolab resource.

KOLAB: #4053

kmail/kmcommands.cpp | 10 ----------
messagelist/core/settings.kcfg | 1 -
messagelist/widget.cpp | 27 +++++++--------------------
3 files changed, 7 insertions(+), 31 deletions(-)

commit b73d31b20de81a00fae0664c330f089d26dcdb64
Author: Aaron Seigo <aseigo@kde.org>
Date: Fri Oct 10 16:52:37 2014 +0200

no longer consider this a FIXME either: the caller needs to load it

messagelist/core/messageitem.cpp | 1 -
1 file changed, 1 deletion(-)

commit 5c604c53b556c36d651d9d8d4e84c9cd3804672b
Author: Aaron Seigo <aseigo@kde.org>
Date: Fri Oct 10 16:50:50 2014 +0200

these are not fixmes at this point

messagelist/core/messageitem.cpp | 2 --
1 file changed, 2 deletions(-)

commit f1b0e422a2cbaccb6f3bcaeaf2fd8e512c8b4165
Author: Aaron Seigo <aseigo@kde.org>
Date: Fri Oct 10 16:50:04 2014 +0200

don't show the note in the tooltip

loading it requires roundtrips (async, less performance) and the
note may be arbitrarily large?

messagelist/core/view.cpp | 9 ---------
1 file changed, 9 deletions(-)

commit 9e977d5ebe20ae1dbe1451a8831243fc2892754f
Author: Aaron Seigo <aseigo@kde.org>
Date: Thu Oct 9 22:58:01 2014 +0200

small steps towards the messagelist parts of notes working

messagelist/CMakeLists.txt | 1 +
messagelist/core/messageitem.cpp | 3 +--
messagelist/core/view.cpp | 12 ++++++++----
3 files changed, 10 insertions(+), 6 deletions(-)

commit 2be02a261c4fab64bebed668f380758aaec1e8fc
Author: Aaron Seigo <aseigo@kde.org>
Date: Thu Oct 9 16:32:40 2014 +0200

update the implementation of the API to reflect that we are using realy notes

messagelist/core/messageitem.cpp | 27 ++++++++++++++++++---------
messagelist/core/messageitem.h | 11 ++++-------
2 files changed, 22 insertions(+), 16 deletions(-)

commit 62d25ce8596df6d2c96278e6b2cbf5efd0a51d91
Author: Aaron Seigo <aseigo@kde.org>
Date: Thu Oct 9 16:11:56 2014 +0200

don't defeat the optimization by creating new strings

messagelist/storagemodel.cpp | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)

commit 9095b4e8f08a1e422aeac2b15b5f42156c2601f9
Author: Aaron Seigo <aseigo@kde.org>
Date: Mon Oct 6 14:16:15 2014 +0200

before going further, remove the existing email annotation feature

this preserve the API for annotations, which will quietly change
in implementation to edit / fetch / etc notes for the email. this
will preserve code elsewhere such as for theming.

kmail/kmmainwidget.cpp | 3 +-
kmail/messageactions.cpp | 24 ------
kmail/messageactions.h | 4 +-
messagecore/CMakeLists.txt | 1 -
messagecore/widgets/annotationdialog.cpp | 136 -------------------------------
messagecore/widgets/annotationdialog.h | 71 ----------------
messagelist/core/messageitem.cpp | 28 ++-----
messagelist/core/messageitem_p.h | 2 -
messageviewer/widgets/noteedit.cpp | 4 +-
9 files changed, 11 insertions(+), 262 deletions(-)

mollekopf moved this task from Backlog to upstream on the KDE PIM board.May 12 2015, 3:56 PM
knauss closed this task as Resolved.May 28 2015, 2:00 PM

it is upstream now