summaryrefslogtreecommitdiff
path: root/officecfg
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2016-10-31 13:28:26 +0100
committerTomaž Vajngerl <quikee@gmail.com>2016-10-31 14:49:57 +0000
commitc3043a3072465c489d3b20991b17d222771305eb (patch)
tree8981124cc9435802c72e1123d5e16a404e4d239f /officecfg
parent7de287ba422107f54018f2ba0f054d642c86c966 (diff)
tdf#103591 icon theme name resolving, ui fixes, prioritize png
- Prefer "png" over "svg" because for Tango theme we include both "png" and "svg" icon, but rendering of "svg" crashes - We save the choice of which icons to use into the profile. When 32px icons were added the values have shifted - "auto" had value 2 has became "32px" choice and "auto" has the new value 3. In the case of the default "auto", we now always showed 32px icons. This commit reverts the "auto" value 2 and puts "32px" choice to 3. - Name resolving now always removes the icon file extension and adds the ".png" and ".svg" extension before resolving. This makes it possible to define the name of the icon without the file extension. Change-Id: I05e3913aaee0037692609ced246954b14a13828a Reviewed-on: https://gerrit.libreoffice.org/30440 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'officecfg')
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Common.xcs4
1 files changed, 2 insertions, 2 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index c2dd5ca454ee..e8a9fae680a5 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -5707,10 +5707,10 @@
</enumeration>
<enumeration oor:value="1">
<info>
- <desc>larger icons</desc>
+ <desc>26x26 pixel icons</desc>
</info>
</enumeration>
- <enumeration oor:value="2">
+ <enumeration oor:value="3">
<info>
<desc>32x32 pixel icons</desc>
</info>