<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/105284/">http://git.reviewboard.kde.org/r/105284/</a>
     </td>
    </tr>
   </table>
   <br />


<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 Friedrich W. H. Kossebau.</div>


<p style="color: grey;"><i>Updated June 25, 2012, 12:59 a.m.</i></p>



<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Changes</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;">include fix for "relations" to "relation", as okay'ed by Jaroslaw

Also add icons missing in Oxygen icons 4.3:
libs/widgets/pics/ox22-actions-zoom-draw.png
libs/widgets/pics/ox22-actions-zoom-select.png
plugins/textshape/pics/ox22-actions-edit-table-cell-split.png
plugins/textshape/pics/ox22-actions-edit-table-cell-merge.png

These icons are installed to ${DATA_INSTALL_DIR}/calligra/icons like the other icons in the dirs where they are added.
So using the "-calligra" postfix is not needed, for two reasons:
there are no icons in that dir which could be overwritten. And as the Calligra icon dir is only added to the icon search paths after the global icon dir that "-calligra" postfix trick does not work anyway. There are also no icons "edit", "edit-table", and "edit-table-cell" in the Oxygen iconset 4.3.5 

With these additions all icon fixes which have been mentioned and are not yet in should be covered and ready for commit.</pre>
  </td>
 </tr>
</table>




<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;">Fixes all those icon names referencing to non-existing icons for which there is a proper icon in Oxygen 4.3.5 or coming with Calligra itself (IMHO :))

Also removes all arrow icons from plugins/pathshapes/pics, because they are either not used or can be replaced by draw-arrow-* icons from Oxygen icons.

Okay to commit both to master and 2.5?


Dealt entries from the report of the koIcon script, commented how I propose to solve it:

arrow-down-calligra
    plugins/pathshapes/enhancedpath/EnhancedPathShapeFactory.cpp:298
arrow-up-calligra
    plugins/pathshapes/enhancedpath/EnhancedPathShapeFactory.cpp:265
arrow-left-calligra
    plugins/pathshapes/enhancedpath/EnhancedPathShapeFactory.cpp:232

Use the draw-arrow-* icons from Oxygen.

star
    plugins/pathshapes/star/StarShapeFactory.cpp:40

14_layer_novisible
    libs/kopageapp/KoPADocumentModel.cpp:314
14_layer_visible
    libs/kopageapp/KoPADocumentModel.cpp:314

Oxygen from 4.3.5 has layer-visible-on and layer-visible-off icons, so use them.

fontsizeup
    sheets/ui/CellToolBase.cpp:415
fontsizedown
    sheets/ui/CellToolBase.cpp:421

There is also no icon in Kate/KWrite for these setting all text to lower/upper-case, so for now just use no icon here as well.

text
    plugins/artistictextshape/ArtisticTextShapeFactory.cpp:33

Solved by reusing x-shape-text

open
    plugins/pictureshape/PictureTool.cpp:110
    plugins/staging/templateshape/TemplateTool.cpp:90
    plugins/vectorshape/VectorTool.cpp:75

Solved by changing to document-open</pre>
  </td>
 </tr>
</table>





<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> (updated)</h1>
<ul style="margin-left: 3em; padding-left: 0;">

 <li>kexi/plugins/relations/kexirelationhandler.desktop <span style="color: grey">(b0c9c0d)</span></li>

 <li>libs/kopageapp/KoPADocumentModel.cpp <span style="color: grey">(69feb88)</span></li>

 <li>libs/widgets/pics/ox22-actions-zoom-draw.png <span style="color: grey">(PRE-CREATION)</span></li>

 <li>libs/widgets/pics/ox22-actions-zoom-select.png <span style="color: grey">(PRE-CREATION)</span></li>

 <li>plugins/artistictextshape/ArtisticTextShapeFactory.cpp <span style="color: grey">(2438b20)</span></li>

 <li>plugins/pathshapes/enhancedpath/EnhancedPathShapeFactory.cpp <span style="color: grey">(d820c43)</span></li>

 <li>plugins/pathshapes/pics/hi22-action-arrow-down.png <span style="color: grey">(c7e4dec)</span></li>

 <li>plugins/pathshapes/pics/hi22-action-arrow-left-down.png <span style="color: grey">(d2443c8)</span></li>

 <li>plugins/pathshapes/pics/hi22-action-arrow-left-up.png <span style="color: grey">(20afbd4)</span></li>

 <li>plugins/pathshapes/pics/hi22-action-arrow-left.png <span style="color: grey">(2aff72f)</span></li>

 <li>plugins/pathshapes/pics/hi22-action-arrow-right-down.png <span style="color: grey">(f165711)</span></li>

 <li>plugins/pathshapes/pics/hi22-action-arrow-right-up.png <span style="color: grey">(f095b9a)</span></li>

 <li>plugins/pathshapes/pics/hi22-action-arrow-up.png <span style="color: grey">(a1f66da)</span></li>

 <li>plugins/pathshapes/pics/ox22-action-arrow-right-calligra.png <span style="color: grey">(dbb9e5a)</span></li>

 <li>plugins/pathshapes/star/StarShapeFactory.cpp <span style="color: grey">(e6a9c6d)</span></li>

 <li>plugins/pictureshape/PictureTool.cpp <span style="color: grey">(bf15751)</span></li>

 <li>plugins/staging/templateshape/TemplateTool.cpp <span style="color: grey">(6373aa2)</span></li>

 <li>plugins/textshape/pics/ox22-actions-edit-table-cell-merge.png <span style="color: grey">(PRE-CREATION)</span></li>

 <li>plugins/textshape/pics/ox22-actions-edit-table-cell-split.png <span style="color: grey">(PRE-CREATION)</span></li>

 <li>plugins/vectorshape/VectorTool.cpp <span style="color: grey">(79742fd)</span></li>

 <li>sheets/ui/CellToolBase.cpp <span style="color: grey">(89b79f9)</span></li>

</ul>

<p><a href="http://git.reviewboard.kde.org/r/105284/diff/" style="margin-left: 3em;">View Diff</a></p>




  </td>
 </tr>
</table>




  </div>
 </body>
</html>