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

Friedrich W. H. Kossebau kossebau at kde.org
Tue Jun 19 00:25:12 BST 2012



> On June 18, 2012, 7:51 a.m., C. Boemann wrote:
> > fyi -calligra at the end of icon names are most foten ignored in the naming scheme. If the icon engine cannot find icons with -calligra it removes that part and finds a more general icon.
> > 
> > However what this allows us is to have specialized calligra icons if we wish to. So not saying you change is wron, (we may not want the possibility of a specialized icon), but it's not wrong to have -calligra either
> > 
> > And in reply to jaraslaw: rather than renaming the icon we request we should rename the icon file to follow the fdo standard.

yes, had the "-postfix"-stripping-until-found systematic of the icon theme in mind when doing this.

But not another thing I might have just found out:
icons from locations added to the icon dirs to use only with KIconLoader::global()->addAppDir("calligra") seem to be checked only after those in the default locations. So whatever is installed into ${DATA_INSTALL_DIR}/calligra/icons will only be loaded if there is nothing in the default location.

Just check what is currently (also without this patch) displayed for the arrow icons set for the arrow shapes: go to the "Add Shape" docker and select the "Arrows" section. You will see the diamond-like arrow icons of at least the 4.8 theme.

I will update the patch with the arrow icons being renamed to the pattern mimetype-x-shape-arrow-{up,down,left,right}, following the pattern of the other pathshape icons. That should be the proper fix here.


- Friedrich W. H.


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


On June 17, 2012, 8:54 p.m., Friedrich W. H. Kossebau wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/105284/
> -----------------------------------------------------------
> 
> (Updated June 17, 2012, 8:54 p.m.)
> 
> 
> Review request for Calligra.
> 
> 
> 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 renames ox22-action-arrow-right-calligra.png to hi22-action-arrow-right.png,
> because it is no oxygen one, and after change aligned with other arrow icons.
> 
> Okay to also commit to master as well?
> 
> 
> 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
> 
> There is hi-version without -calligra prefix
> Also renamed ox22-action-arrow-right-calligra.png to hi22-action-arrow-right.png,
> because it is no oxygen one, and after change aligned with other arrow icons.
> 
> 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 that, so for now just use no icon
> 
> 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
> -----
> 
>   libs/kopageapp/KoPADocumentModel.cpp 69feb88 
>   plugins/artistictextshape/ArtisticTextShapeFactory.cpp 2438b20 
>   plugins/pathshapes/enhancedpath/EnhancedPathShapeFactory.cpp d820c43 
>   plugins/pathshapes/pics/hi22-action-arrow-right.png PRE-CREATION 
>   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/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/20120618/98bb717f/attachment.htm>


More information about the calligra-devel mailing list