Annotations was: Merge branch 'master' into text-annotations-ingwa

[Gopalakrishna Bhat]

On Wed, Jan 2, 2013 at 8:15 AM, Inge Wallin <inge at lysator.liu.se> wrote:

> On Monday, December 31, 2012 10:44:45 Inge Wallin wrote:
> > Git commit c766b2149928783ae435ea8dba0ab36a43cbd593 by Inge Wallin.
> > Committed on 31/12/2012 at 10:43.
> > Pushed by ingwa into branch 'text-annotations-ingwa'.
> >
> > Merge branch 'master' into text-annotations-ingwa
> >
> > Conflicts:
> >       libs/kotext/KoAnnotation.cpp
> >       libs/kotext/KoAnnotation.h
> >       libs/kotext/opendocument/KoTextLoader.cpp
> >       libs/widgets/KoAnnotationBalloon.cpp
> >       libs/widgets/KoAnnotationBalloon.h
> >       libs/widgets/KoAnnotationSideBar.cpp
> >       libs/widgets/KoAnnotationSideBar.h
> >       libs/widgets/KoBalloon.cpp
> >       libs/widgets/KoBalloon.h
> >
>
> This was the first time in a while that I touched this branch. The merge
> was
> somewhat tricky because master had changed so much in the mean time. I
> hope I
> didn't screw up things too badly.
>
> I think it's time to start the work on annotations for real. The people who
> have expressed interest before are me, moji and gopalk. I will start
> immediately and investigate why we don't have good round tripping with
> LO/AOO
> yet. I think there are some style attributes that we fail to bring over.
>
> I have talked with moji and he is ready to go. Gopalakrishna, are you still
> interested and have the time to work on this? If not, I think it would be
> good
> to know so. Otherwise let's go!  :)
>
Great to know that moji is raring to go on this one. Unfortunately I will
not be able
to contribute to this :(


>
> I think we may need some interaction and UI design for this too. Thomas,
> are
> you interested in helping out here?
>
> And of course anybody else who is interested in getting annotations to
> work in
> Calligra Words and Author for 2.7 is very welcome to work on it.
>
>         -Inge
> _______________________________________________
> calligra-devel mailing list
> calligra-devel at kde.org
> https://mail.kde.org/mailman/listinfo/calligra-devel
>



-- 
My blog http://gkbhat.blogspot.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/calligra-devel/attachments/20130104/c391e5ec/attachment.htm>