<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 solid;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="http://git.reviewboard.kde.org/r/103677/">http://git.reviewboard.kde.org/r/103677/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<p style="margin-top: 0;">On January 16th, 2012, 6:36 a.m., <b>C. Boemann</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">I've committed three fixes.
I also note that:
-paragraph combo always has + sign
-default paragraph style should have a name (Default? None?)
-launching stylemanager doesn't launch it with selected style
-the combo should popup nomatter where you click in it (imho)
However I think we have come to the point where this code is better suited to live in master. There are so many other style issues in master and being able to work on it all in one place increases productivity. Besides it's a HUGE improvement already
I would prefer if we don't merge the branch but rather take the entire and make 2-3 new commits out of it. What do you think.
</pre>
</blockquote>
<p>On January 16th, 2012, 8:04 a.m., <b>Pierre Stirnweiss</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">- Where are the fixes? I don't seem to find them as a new revision of the diff.
- paragraph shows +: In which file is the paragraph always showing a + sign. It doesn't here.
- default should have a name: Well, there are both a "Standard" and a "Default" paragraph style. There is also a "" one which is selected at the begining. When you had your "non-visible" char patch applied, "Standard" was selected in the comboBox, as it is the style the template specifies for the blank document. I think this problem is outside the scope of the combo. Also when the "Special button" was used, nothing was selected ti start with.
- launching style manager: Indeed it doesn't, but in order to do that some changes are needed in the styleManager. I didn't want to start with this one on top of the comboBox. I was planning on working on the styleManager soon. There is also a StylesWidget in it, that needs replacing with a QListView, so we can get rid of the StylesWidget altogether.
- combo popup: i wondered about that one too. shouldn't be too hard i guess. (like emit the signal in the StylesComboPreview, and connect it in the StylesCombo).
About the merging, what would 3 commits bring? I actually doubt we would be able to cut this branch in 2-3 self contained (ie compilable and runnable) commits without quite a tiresome "git add --interactive" exercise. Everything is intertwined. I have made sure the branch compiles and run without major problems. I think a complete merge is the safest thing to do.
</pre>
</blockquote>
</blockquote>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">the fixes are committed to the branch, and ye s i agree some are outside the scope, but i wanted to list them anyway.
ok complete merge it is then</pre>
<br />
<p>- C.</p>
<br />
<p>On January 15th, 2012, 7:41 p.m., Pierre Stirnweiss wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('http://git.reviewboard.kde.org/media/rb/images/review_request_box_top_bg.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for Calligra.</div>
<div>By Pierre Stirnweiss.</div>
<p style="color: grey;"><i>Updated Jan. 15, 2012, 7:41 p.m.</i></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Merge request.
Merge branch textshape_stylesWidget_pierreSt into master.
The branch provides a replacement for the style selection widgets. The new provided widgets are a subclass of QComboBox.
They provide a style preview both in the main area and in the dropdown menu.
The dropdown menu provides a "show style manager" button, which call the whole style management dialog.
The dropdown also provides a "delete style" button, although this is for the moment disabled/commented out, because deleting a style is not currently really supported.
The combo also allows to create a style based on the current text format if it does not correspond to the original style (ie. the user changed a property).</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">The functionality exclusively linked to the comboBox seems to be working properly. Some defects have been identified (like no paragraph style is selected at startup), but these are actually outside the scope of this widget and affecting the current widget also.</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>libs/kotext/KoTextEditor.h <span style="color: grey">(0fc4ff4)</span></li>
<li>libs/kotext/KoTextEditor.cpp <span style="color: grey">(3ef31d6)</span></li>
<li>libs/kotext/styles/KoCharacterStyle.h <span style="color: grey">(898ba43)</span></li>
<li>libs/kotext/styles/KoCharacterStyle.cpp <span style="color: grey">(e575b0d)</span></li>
<li>libs/kotext/styles/KoParagraphStyle.h <span style="color: grey">(12ab672)</span></li>
<li>libs/textlayout/CMakeLists.txt <span style="color: grey">(af6d64a)</span></li>
<li>libs/textlayout/FrameIterator.h <span style="color: grey">(c73d580)</span></li>
<li>libs/textlayout/KoStyleThumbnailer.h <span style="color: grey">(8645089)</span></li>
<li>libs/textlayout/KoStyleThumbnailer.cpp <span style="color: grey">(3529bbb)</span></li>
<li>plugins/textshape/CMakeLists.txt <span style="color: grey">(fad7c04)</span></li>
<li>plugins/textshape/TextTool.h <span style="color: grey">(17a687b)</span></li>
<li>plugins/textshape/TextTool.cpp <span style="color: grey">(3ba9d33)</span></li>
<li>plugins/textshape/dialogs/SimpleCharacterWidget.h <span style="color: grey">(ad944a5)</span></li>
<li>plugins/textshape/dialogs/SimpleCharacterWidget.cpp <span style="color: grey">(6b2bb66)</span></li>
<li>plugins/textshape/dialogs/SimpleCharacterWidget.ui <span style="color: grey">(e4f6d3b)</span></li>
<li>plugins/textshape/dialogs/SimpleParagraphWidget.h <span style="color: grey">(bc167b4)</span></li>
<li>plugins/textshape/dialogs/SimpleParagraphWidget.cpp <span style="color: grey">(cbfacfe)</span></li>
<li>plugins/textshape/dialogs/SimpleParagraphWidget.ui <span style="color: grey">(b2e9adf)</span></li>
<li>plugins/textshape/dialogs/StylesCombo.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>plugins/textshape/dialogs/StylesCombo.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>plugins/textshape/dialogs/StylesComboPreview.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>plugins/textshape/dialogs/StylesComboPreview.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>plugins/textshape/dialogs/StylesDelegate.h <span style="color: grey">(f5d216f)</span></li>
<li>plugins/textshape/dialogs/StylesDelegate.cpp <span style="color: grey">(d1021f5)</span></li>
<li>plugins/textshape/dialogs/StylesModel.h <span style="color: grey">(dbd17b4)</span></li>
<li>plugins/textshape/dialogs/StylesModel.cpp <span style="color: grey">(94deb24)</span></li>
<li>plugins/textshape/dialogs/StylesWidget.cpp <span style="color: grey">(4f31a01)</span></li>
<li>plugins/textshape/dialogs/TableOfContentsStyleModel.cpp <span style="color: grey">(48ee7c3)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/103677/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>