Review Request: Fix some icon names to reference existing icons (2.5 branch)

Friedrich W. H. Kossebau kossebau at kde.org
Mon Jun 25 01:59:35 BST 2012


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/105284/
-----------------------------------------------------------

(Updated June 25, 2012, 12:59 a.m.)


Review request for Calligra.


Changes
-------

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.


Description
-------

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


Diffs (updated)
-----

  kexi/plugins/relations/kexirelationhandler.desktop b0c9c0d 
  libs/kopageapp/KoPADocumentModel.cpp 69feb88 
  libs/widgets/pics/ox22-actions-zoom-draw.png PRE-CREATION 
  libs/widgets/pics/ox22-actions-zoom-select.png PRE-CREATION 
  plugins/artistictextshape/ArtisticTextShapeFactory.cpp 2438b20 
  plugins/pathshapes/enhancedpath/EnhancedPathShapeFactory.cpp d820c43 
  plugins/pathshapes/pics/hi22-action-arrow-down.png c7e4dec 
  plugins/pathshapes/pics/hi22-action-arrow-left-down.png d2443c8 
  plugins/pathshapes/pics/hi22-action-arrow-left-up.png 20afbd4 
  plugins/pathshapes/pics/hi22-action-arrow-left.png 2aff72f 
  plugins/pathshapes/pics/hi22-action-arrow-right-down.png f165711 
  plugins/pathshapes/pics/hi22-action-arrow-right-up.png f095b9a 
  plugins/pathshapes/pics/hi22-action-arrow-up.png a1f66da 
  plugins/pathshapes/pics/ox22-action-arrow-right-calligra.png dbb9e5a 
  plugins/pathshapes/star/StarShapeFactory.cpp e6a9c6d 
  plugins/pictureshape/PictureTool.cpp bf15751 
  plugins/staging/templateshape/TemplateTool.cpp 6373aa2 
  plugins/textshape/pics/ox22-actions-edit-table-cell-merge.png PRE-CREATION 
  plugins/textshape/pics/ox22-actions-edit-table-cell-split.png PRE-CREATION 
  plugins/vectorshape/VectorTool.cpp 79742fd 
  sheets/ui/CellToolBase.cpp 89b79f9 

Diff: http://git.reviewboard.kde.org/r/105284/diff/


Testing
-------


Thanks,

Friedrich W. H. Kossebau

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/calligra-devel/attachments/20120625/9edfdefe/attachment.htm>


More information about the calligra-devel mailing list