<div dir="ltr"><br><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Jan 2, 2013 at 8:15 AM, Inge Wallin <span dir="ltr"><<a href="mailto:inge@lysator.liu.se" target="_blank">inge@lysator.liu.se</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Monday, December 31, <a href="tel:2012" value="+9722012">2012</a> 10:44:45 Inge Wallin wrote:<br>
> Git commit c766b2149928783ae435ea8dba0ab36a43cbd593 by Inge Wallin.<br>
> Committed on 31/12/2012 at 10:43.<br>
> Pushed by ingwa into branch 'text-annotations-ingwa'.<br>
><br>
> Merge branch 'master' into text-annotations-ingwa<br>
><br>
> Conflicts:<br>
> libs/kotext/KoAnnotation.cpp<br>
> libs/kotext/KoAnnotation.h<br>
> libs/kotext/opendocument/KoTextLoader.cpp<br>
> libs/widgets/KoAnnotationBalloon.cpp<br>
> libs/widgets/KoAnnotationBalloon.h<br>
> libs/widgets/KoAnnotationSideBar.cpp<br>
> libs/widgets/KoAnnotationSideBar.h<br>
> libs/widgets/KoBalloon.cpp<br>
> libs/widgets/KoBalloon.h<br>
><br>
<br>
This was the first time in a while that I touched this branch. The merge was<br>
somewhat tricky because master had changed so much in the mean time. I hope I<br>
didn't screw up things too badly.<br>
<br>
I think it's time to start the work on annotations for real. The people who<br>
have expressed interest before are me, moji and gopalk. I will start<br>
immediately and investigate why we don't have good round tripping with LO/AOO<br>
yet. I think there are some style attributes that we fail to bring over.<br>
<br>
I have talked with moji and he is ready to go. Gopalakrishna, are you still<br>
interested and have the time to work on this? If not, I think it would be good<br>
to know so. Otherwise let's go! :)<br></blockquote><div>Great to know that moji is raring to go on this one. Unfortunately I will not be able <br></div><div>to contribute to this :(<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
I think we may need some interaction and UI design for this too. Thomas, are<br>
you interested in helping out here?<br>
<br>
And of course anybody else who is interested in getting annotations to work in<br>
Calligra Words and Author for 2.7 is very welcome to work on it.<br>
<br>
-Inge<br>
_______________________________________________<br>
calligra-devel mailing list<br>
<a href="mailto:calligra-devel@kde.org">calligra-devel@kde.org</a><br>
<a href="https://mail.kde.org/mailman/listinfo/calligra-devel" target="_blank">https://mail.kde.org/mailman/listinfo/calligra-devel</a><br>
</blockquote></div><br><br clear="all"><br>-- <br>My blog <a href="http://gkbhat.blogspot.com">http://gkbhat.blogspot.com</a>
</div></div>