[prev in list] [next in list] [prev in thread] [next in thread]
List: calligra-devel
Subject: Re: Review Request 109651: Refactor style manager
From: "Elvis Stansvik" <elvstone () gmail ! com>
Date: 2013-03-23 14:46:00
Message-ID: 20130323144600.26389.33345 () vidsolbach ! de
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/109651/#review29753
-----------------------------------------------------------
Just a couple of small stuff.
plugins/textshape/dialogs/StylesManagerModel.h
<http://git.reviewboard.kde.org/r/109651/#comment22143>
explicit?
plugins/textshape/dialogs/StylesManagerModel.cpp
<http://git.reviewboard.kde.org/r/109651/#comment22144>
perhaps better to break explicitly here instead of falling through to the \
default.
plugins/textshape/dialogs/StylesManagerModel.cpp
<http://git.reviewboard.kde.org/r/109651/#comment22145>
maybe just if (!m_styles.contains(style)), since the value of row isn't used \
here.
- Elvis Stansvik
On March 22, 2013, 4:38 a.m., Thorsten Zachmann wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/109651/
> -----------------------------------------------------------
>
> (Updated March 22, 2013, 4:38 a.m.)
>
>
> Review request for Calligra and Pierre Stirnweiss.
>
>
> Description
> -------
>
> This patch tries to fix the problems/crashes which happen in the style manager.
>
> To get the simple crash open the default document and click on the edit button of \
> the None (character style)
> The patch uses a different model for the style manager and temporary styles that \
> get modified to only apply the changes once the user applies them. The model \
> changes the internal pointer to the temporary files once they are selected and when \
> applied resets to the original ones. However the styles preview in the styles \
> manager list is updated immediately. The patch simplifies the handling quite a bit.
>
> I did not know that Pierre was also working on that so I publish it now so we have \
> something we can discuss.
> If you like this I would like to backport it to 2.6 as it fixes quite some grave \
> bugs compared to what we have now.
>
> Diffs
> -----
>
> libs/kotext/styles/KoCharacterStyle.h 2fdde12
> libs/textlayout/KoStyleThumbnailer.cpp 436b243
> plugins/textshape/CMakeLists.txt 084628c
> plugins/textshape/dialogs/CharacterGeneral.h e6d99db
> plugins/textshape/dialogs/CharacterGeneral.cpp d3eead6
> plugins/textshape/dialogs/ParagraphGeneral.h 1a78376
> plugins/textshape/dialogs/ParagraphGeneral.cpp ad30369
> plugins/textshape/dialogs/StyleManager.h dec3b6b
> plugins/textshape/dialogs/StyleManager.cpp 9c82c11
> plugins/textshape/dialogs/StylesManagerModel.h PRE-CREATION
> plugins/textshape/dialogs/StylesManagerModel.cpp PRE-CREATION
> plugins/textshape/dialogs/StylesSortFilterProxyModel.h PRE-CREATION
> plugins/textshape/dialogs/StylesSortFilterProxyModel.cpp PRE-CREATION
>
> Diff: http://git.reviewboard.kde.org/r/109651/diff/
>
>
> Testing
> -------
>
> Tested modification without saving.
> Tested applying.
> Tested Ok.
> Tested Canceling
>
>
> Thanks,
>
> Thorsten Zachmann
>
>
[Attachment #5 (text/html)]
<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/109651/">http://git.reviewboard.kde.org/r/109651/</a>
</td>
</tr>
</table>
<br />
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Just a couple of small \
stuff.</pre> <br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="http://git.reviewboard.kde.org/r/109651/diff/1/?file=120957#file120957line36" \
style="color: black; font-weight: bold; text-decoration: \
underline;">plugins/textshape/dialogs/StylesManagerModel.h</a> <span \
style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">36</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">StylesManagerModel</span><span class="p">(</span><span \
class="n">QObject</span> <span class="o">*</span><span class="n">parent</span> <span \
class="o">=</span> <span class="mi">0</span><span class="p">);</span></pre></td> \
</tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">explicit?</pre> </div>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="http://git.reviewboard.kde.org/r/109651/diff/1/?file=120958#file120958line62" \
style="color: black; font-weight: bold; text-decoration: \
underline;">plugins/textshape/dialogs/StylesManagerModel.cpp</a> <span \
style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">62</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="n">retval</span> <span class="o">=</span> <span class="n">QVariant</span><span \
class="p">(</span><span class="n">QSize</span><span class="p">(</span><span \
class="mi">250</span><span class="p">,</span> <span class="mi">48</span><span \
class="p">));</span></pre></td> </tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">perhaps \
better to break explicitly here instead of falling through to the default.</pre> \
</div> <br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="http://git.reviewboard.kde.org/r/109651/diff/1/?file=120958#file120958line90" \
style="color: black; font-weight: bold; text-decoration: \
underline;">plugins/textshape/dialogs/StylesManagerModel.cpp</a> <span \
style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">90</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="k">if</span> <span class="p">(</span><span class="n">row</span> <span \
class="o">==</span> <span class="o">-</span><span class="mi">1</span><span \
class="p">)</span> <span class="p">{</span></pre></td> </tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">maybe just \
if (!m_styles.contains(style)), since the value of row isn't used here.</pre> \
</div> <br />
<p>- Elvis</p>
<br />
<p>On March 22nd, 2013, 4:38 a.m. UTC, Thorsten Zachmann wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" \
style="background-image: \
url('http://git.reviewboard.kde.org/static/rb/images/review_request_box_top_bg.ab6f3b1072c9.png'); \
background-position: left top; background-repeat: repeat-x; border: 1px black \
solid;"> <tr>
<td>
<div>Review request for Calligra and Pierre Stirnweiss.</div>
<div>By Thorsten Zachmann.</div>
<p style="color: grey;"><i>Updated March 22, 2013, 4:38 a.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;">This patch tries to fix the problems/crashes which happen in the style \
manager.
To get the simple crash open the default document and click on the edit button of the \
None (character style)
The patch uses a different model for the style manager and temporary styles that get \
modified to only apply the changes once the user applies them. The model changes the \
internal pointer to the temporary files once they are selected and when applied \
resets to the original ones. However the styles preview in the styles manager list is \
updated immediately. The patch simplifies the handling quite a bit.
I did not know that Pierre was also working on that so I publish it now so we have \
something we can discuss.
If you like this I would like to backport it to 2.6 as it fixes quite some grave bugs \
compared to what we have now.</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;">Tested modification without saving. Tested applying.
Tested Ok.
Tested Canceling
</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/styles/KoCharacterStyle.h <span style="color: \
grey">(2fdde12)</span></li>
<li>libs/textlayout/KoStyleThumbnailer.cpp <span style="color: \
grey">(436b243)</span></li>
<li>plugins/textshape/CMakeLists.txt <span style="color: grey">(084628c)</span></li>
<li>plugins/textshape/dialogs/CharacterGeneral.h <span style="color: \
grey">(e6d99db)</span></li>
<li>plugins/textshape/dialogs/CharacterGeneral.cpp <span style="color: \
grey">(d3eead6)</span></li>
<li>plugins/textshape/dialogs/ParagraphGeneral.h <span style="color: \
grey">(1a78376)</span></li>
<li>plugins/textshape/dialogs/ParagraphGeneral.cpp <span style="color: \
grey">(ad30369)</span></li>
<li>plugins/textshape/dialogs/StyleManager.h <span style="color: \
grey">(dec3b6b)</span></li>
<li>plugins/textshape/dialogs/StyleManager.cpp <span style="color: \
grey">(9c82c11)</span></li>
<li>plugins/textshape/dialogs/StylesManagerModel.h <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>plugins/textshape/dialogs/StylesManagerModel.cpp <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>plugins/textshape/dialogs/StylesSortFilterProxyModel.h <span style="color: \
grey">(PRE-CREATION)</span></li>
<li>plugins/textshape/dialogs/StylesSortFilterProxyModel.cpp <span style="color: \
grey">(PRE-CREATION)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/109651/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
_______________________________________________
calligra-devel mailing list
calligra-devel@kde.org
https://mail.kde.org/mailman/listinfo/calligra-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic