[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - icon-themes/colibre icon-themes/colibre_svg officecfg/registry sc/uiconfig sd/uiconfig sw/uiconfig
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Nov 29 03:43:12 UTC 2018
icon-themes/colibre/cmd/32/toolsmacroedit.png |binary
icon-themes/colibre/cmd/lc_scriptorganizer.png |binary
icon-themes/colibre/cmd/sc_scriptorganizer.png |binary
icon-themes/colibre/links.txt | 11 +++++
icon-themes/colibre/res/lx03252.png |binary
icon-themes/colibre_svg/cmd/32/toolsmacroedit.svg | 21 ++++++++++
icon-themes/colibre_svg/cmd/lc_scriptorganizer.svg | 14 ++++++
icon-themes/colibre_svg/cmd/sc_scriptorganizer.svg | 14 ++++++
icon-themes/colibre_svg/res/lx03252.svg | 2
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 3 +
sc/uiconfig/scalc/ui/notebookbar.ui | 4 -
sd/uiconfig/sdraw/ui/notebookbar.ui | 4 -
sd/uiconfig/simpress/ui/notebookbar.ui | 4 -
sw/uiconfig/swriter/ui/notebookbar.ui | 11 ++---
14 files changed, 75 insertions(+), 13 deletions(-)
New commits:
commit 19ed06f3e22a9f088a72633d6dc3b40116007f25
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Wed Nov 28 13:16:23 2018 +0100
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Thu Nov 29 04:42:44 2018 +0100
tdf#121581 change organize dialoogs to organize macro
add missing colibre icons
improve layout for large icons
Change-Id: Id9d003b945654f958ec43d530083e2070d4b580e
Reviewed-on: https://gerrit.libreoffice.org/64159
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
(cherry picked from commit 2c154667ff257a9aaec2baa386cec7b9e129132d)
Reviewed-on: https://gerrit.libreoffice.org/64193
diff --git a/icon-themes/colibre/cmd/32/toolsmacroedit.png b/icon-themes/colibre/cmd/32/toolsmacroedit.png
new file mode 100644
index 000000000000..3b3061988c22
Binary files /dev/null and b/icon-themes/colibre/cmd/32/toolsmacroedit.png differ
diff --git a/icon-themes/colibre/cmd/lc_scriptorganizer.png b/icon-themes/colibre/cmd/lc_scriptorganizer.png
new file mode 100644
index 000000000000..cd202cf2eed0
Binary files /dev/null and b/icon-themes/colibre/cmd/lc_scriptorganizer.png differ
diff --git a/icon-themes/colibre/cmd/sc_scriptorganizer.png b/icon-themes/colibre/cmd/sc_scriptorganizer.png
new file mode 100644
index 000000000000..734d8a401f6e
Binary files /dev/null and b/icon-themes/colibre/cmd/sc_scriptorganizer.png differ
diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index 7c12157267c1..7d498f287ab0 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -1801,3 +1801,14 @@ cmd/lc_tableevents.png cmd/lc_animationeffects.png
cmd/sc_sheetlefttoright.png cmd/sc_paralefttoright.png
cmd/sc_sheetrighttoleft.png cmd/sc_pararighttoleft.png
cmd/sc_tableevents.png cmd/sc_animationeffects.png
+
+
+# Macro
+cmd/32/macrosmenu.png cmd/32/choosemacro.png
+cmd/32/basicideappear.png cmd/32/toolsmacroedit.png
+
+cmd/lc_macrosmenu.png cmd/lc_choosemacro.png
+cmd/lc_basicideappear.png cmd/lc_toolsmacroedit.png
+
+cmd/sc_macrosmenu.png cmd/sc_choosemacro.png
+cmd/sc_basicideappear.png cmd/sc_toolsmacroedit.png
diff --git a/icon-themes/colibre/res/lx03252.png b/icon-themes/colibre/res/lx03252.png
index 007769c55c7d..edac6bc02f4a 100644
Binary files a/icon-themes/colibre/res/lx03252.png and b/icon-themes/colibre/res/lx03252.png differ
diff --git a/icon-themes/colibre_svg/cmd/32/toolsmacroedit.svg b/icon-themes/colibre_svg/cmd/32/toolsmacroedit.svg
new file mode 100644
index 000000000000..87054391316c
--- /dev/null
+++ b/icon-themes/colibre_svg/cmd/32/toolsmacroedit.svg
@@ -0,0 +1,21 @@
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+ <path
+ style="fill:#ffffff"
+ d="M 10.15625 3.5 C 8.4250311 3.5 6.5390625 4.4530874 6.5390625 6.625 L 6.5390625 9.75 L 6.5390625 22.525391 C 4.8131555 22.525391 3.5 23.649092 3.5 25.375 C 3.499999 27.100907 4.899094 28.5 6.625 28.5 L 8.1875 28.5 L 9.75 28.5 L 12.875 28.5 L 15.337891 28.5 L 16.205078 24.980469 C 19.311099 21.878098 22.407181 18.779534 25.513672 15.705078 L 25.5 9.5 C 27.225908 9.5 28.5 8.3509067 28.5 6.625 C 28.5 4.8990935 27.100907 3.5 25.375 3.5 L 23.8125 3.5 L 22.25 3.5 L 11.3125 3.5 L 10.15625 3.5 z M 25.529297 25.117188 L 22.1875 28.480469 C 23.837027 28.380711 25.529297 27.399404 25.529297 25.375 L 25.529297 25.117188 z "
+ />
+ <path
+ style="fill:#808080"
+ d="M 10.15625 3 C 9.1988498 3 8.1971447 3.2555392 7.4003906 3.8457031 C 6.6036365 4.4358671 6.0390625 5.3941649 6.0390625 6.625 L 6.0390625 9.75 L 6.0390625 22.115234 C 4.3398935 22.336389 3 23.575775 3 25.375 C 2.9999988 27.371232 4.6287695 29 6.625 29 L 8.1875 29 L 9.75 29 L 12.875 29 L 15.214844 29 L 15.460938 28 L 12.875 28 L 9.75 28 L 8.1875 28 L 6.625 28 C 5.1694185 28 3.9999992 26.830582 4 25.375 C 4 23.902677 5.0303222 23.025391 6.5390625 23.025391 A 0.50027449 0.50027449 0 0 0 7.0390625 22.525391 L 7.0390625 9.75 L 7.0390625 6.625 C 7.0390625 5.6839225 7.4164746 5.0797204 7.9960938 4.6503906 C 8.5757128 4.2210608 9.3824313 4 10.15625 4 L 11.3125 4 L 22.25 4 L 23.8125 4 L 25.375 4 C 26.830582 4 28 5.1694179 28 6.625 C 28 8.1047677 27.003911 9 25.5 9 A 0.50027449 0.50027449 0 0 0 25 9.5019531 L 25.013672 16.203125 C 25.233969 15.984833 25.453425 15.762963 25.673828 15.544922 C 25.77647 15.442411 25.89186 15.359173 26.011719 15.285156 L 26 9.9082031 C 27.695587 9.6816898
29 8.4169699 29 6.625 C 29 4.6287691 27.371232 3 25.375 3 L 23.8125 3 L 22.25 3 L 11.3125 3 L 10.15625 3 z M 26.029297 24.615234 L 25 25.650391 C 24.928792 26.412846 24.588573 26.950819 24.070312 27.337891 C 23.704995 27.610733 23.24649 27.791916 22.767578 27.896484 L 21.671875 29 L 21.910156 29 C 22.870821 29 23.872895 28.73444 24.667969 28.140625 C 25.463043 27.54681 26.029297 26.591183 26.029297 25.375 L 26.029297 24.615234 z "
+ />
+ <g
+ style="fill:#eac282"
+ transform="matrix(1.1667513,0,0,1.1666667,3.1657357,3.1666673)"
+ >
+ <path
+ d="M 17.480469,13.611328 11.951172,19.134766 11,23 l 3.806641,-1.011719 5.509765,-5.544922 z"
+ />
+ <path
+ d="m 20.419922,11 c -0.189562,0 -0.378184,0.07172 -0.523438,0.216797 l -1.673828,1.669922 2.847656,2.849609 1.710938,-1.638672 c 0.290506,-0.290127 0.290506,-0.756747 0,-1.046875 L 20.945312,11.216797 C 20.800058,11.071733 20.609484,11 20.419922,11 Z"
+ />
+ </g>
+</svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_scriptorganizer.svg b/icon-themes/colibre_svg/cmd/lc_scriptorganizer.svg
new file mode 100644
index 000000000000..4075bd463f20
--- /dev/null
+++ b/icon-themes/colibre_svg/cmd/lc_scriptorganizer.svg
@@ -0,0 +1,14 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path
+ style="fill:#eac282"
+ d="m 15,4 c -0.265199,5.11e-5 -0.519519,0.1054326 -0.707031,0.2929688 L 10.585938,7 H 2 C 1.4477381,7.0000552 1.0000552,7.4477381 1,8 v 13 h 1 18 1 L 23.702146,10.992847 C 24,10 24,10 22.957627,10 H 21 V 5 C 20.999945,4.4477381 20.552262,4.0000552 20,4 Z m 0,1 h 5 v 5 H 5.0211864 C 4,10 4,10 3.7415122,10.990786 L 2,17.666016 V 8 h 9 z"
+ />
+ <path
+ style="fill:#ffffff"
+ d="M 15,5 11,8 H 2 v 9.666016 L 3.7421875,10.990234 C 4.0006753,9.9994484 4.000298,10 5.0214844,10 H 20 V 5 Z"
+ />
+ <path
+ style="fill:#ffffff;stroke:#808080;stroke-width:1"
+ d="m 15.49635,20.627737 c 0,-0.483766 0.45054,-0.875912 0.934306,-0.875912 v -3.50365 -0.875913 c 0,-0.485259 0.332263,-0.875912 0.817518,-0.875912 h 4.321168 c 0.483767,0 0.934307,0.392146 0.934307,0.875912 0,0.483767 -0.45054,0.875913 -0.934307,0.875913 v 3.941605 0.437957 c 0,0.48526 -0.332263,0.875913 -0.817518,0.875913 h -4.321168 c -0.483766,0 -0.934306,-0.392147 -0.934306,-0.875913 z"
+ />
+</svg>
diff --git a/icon-themes/colibre_svg/cmd/sc_scriptorganizer.svg b/icon-themes/colibre_svg/cmd/sc_scriptorganizer.svg
new file mode 100644
index 000000000000..13ac6d6dc4cd
--- /dev/null
+++ b/icon-themes/colibre_svg/cmd/sc_scriptorganizer.svg
@@ -0,0 +1,14 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+ <path
+ style="fill:#eac282"
+ d="m 11,2.0000002 c -0.265199,5.11e-5 -0.519519,0.1054326 -0.707031,0.2929688 L 6.585938,4.0000002 1,4 C 0.4477381,4.0000552 5.52e-5,4.4477381 0,5.0000002 V 14 H 1 13 L 15.744519,6.992847 C 16.042373,6 16.042373,6 15,6 H 14 V 3 C 13.999945,2.4477381 13.552262,2.0000552 13,2 Z m 0,1 L 13,3 V 6 H 4.0211864 C 3,6 3,6 2.7415122,6.990786 L 1,11.666016 V 5.0000002 l 6,2e-7 z"
+ />
+ <path
+ style="fill:#ffffff"
+ d="m 11,3.0000002 -4,2.0000002 -6,-2e-7 V 11.666016 L 2.7421875,6.990234 C 3.0006753,5.999448 3.000298,6 4.0214844,6 H 13 V 3 Z"
+ />
+<path
+ style="fill:#ffffff;stroke:#808080;stroke-width:1"
+ d="m 8.4963505,14.627737 c 0,-0.483766 0.4505402,-0.875912 0.9343066,-0.875912 v -3.50365 -0.8759125 c 0,-0.4852599 0.3322628,-0.8759125 0.8175179,-0.8759125 h 4.321168 c 0.483767,0 0.934307,0.3921461 0.934307,0.8759125 0,0.4837662 -0.45054,0.8759125 -0.934307,0.8759125 v 3.941605 0.437957 c 0,0.48526 -0.332263,0.875913 -0.817518,0.875913 H 9.4306571 c -0.4837664,0 -0.9343066,-0.392147 -0.9343066,-0.875913 z"
+ />
+</svg>
diff --git a/icon-themes/colibre_svg/res/lx03252.svg b/icon-themes/colibre_svg/res/lx03252.svg
index a2ca91cfcfc8..6fae78de924e 100644
--- a/icon-themes/colibre_svg/res/lx03252.svg
+++ b/icon-themes/colibre_svg/res/lx03252.svg
@@ -1 +1 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m5 3v18h6.585938l7.414062-7.414062v-4.585938l-6-6z" fill="#fff" fill-opacity=".174863"/><g fill="#e78e46"><path d="m5 2c-.554 0-1 .446-1 1v18c0 .554.446 1 1 1h5.585938l1-1h-6.585938v-18h .4648438 4.5351562 2.292969l6.707031 6.7070312-.003906 3.8828128 1.003906-1.003906v-.585938h-.001953l.001953-2.5c-.000025-.1325994-.05272-.2597597-.146484-.3535156l-7-7c-.093756-.0937682-.220916-.146459-.353516-.1464844h-2.5-4.5z"/><path d="m15.411494 2.0075719c-.416024.1332524-.556031.766565-.235307 1.0643933l3.764927 3.7845094c.347817.331511 1.040564.047817 1.058886-.4336417v-3.7845094c-.000038-.3302491-.298947-.6307139-.627488-.6307516h-3.764929c-.06489-.010096-.131258-.010096-.196089 0z"/><path d="m9.7988281 9.1992188c-2.0925864 0-3.7988281 1.7081952-3.7988281 3.8007812s1.7062417 3.798828 3.7988281 3.798828c2.0925869 0 3.8007809-1.706242 3.8007809-3.798828s-1.708194-3.8007812-3.8007809-3.8007812zm0 .9980472c1.5530639 0 2.802733
9 1.24967 2.8027339 2.802734s-1.24967 2.800781-2.8027339 2.800781c-1.553064 0-2.8007812-1.247717-2.8007812-2.800781s1.2477172-2.802734 2.8007812-2.802734z"/><path d="m10.158203 11.400391a.49920091.49920091 0 0 0 -.4277342.255859l-3.6679688 6.601562a.49920091.49920091 0 0 0 .4375.742188h7.085938l1.148437-1.148438-4.152344-6.228515a.49920091.49920091 0 0 0 -.423828-.222656zm.048828 1.457031 3.427735 5.144531h-6.2871098z"/></g><path d="m23 11-12 12h12zm-2 5v5h-5z" fill="#808080" fill-rule="evenodd"/><path d="m10.207033 12.857422 3.427735 5.144531h-6.2871098z" fill="#fff"/><path d="m12.501953 11.001953c-.275563-.000442-.499363.222484-.5.498047l.001953 5.001953c.000637.275563.224437.498489.5.498047h3.082032l.998046-.998047h-3.582031l-.001953-4.001953h4l .001953 3.583984.998047-.998046-.001953-3.085938c-.000637-.275563-.224437-.498489-.5-.498047z" fill="#e78e46"/><path d="m13 12 .001953 4.001953h3.582031l.417969-.417969-.001953-3.583984z" fill="#fff"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m5 3v18h6.585938l7.414062-7.414062v-4.585938l-6-6z" fill="#fff"/><g fill="#e78e46"><path d="m5 2c-.554 0-1 .446-1 1v18c0 .554.446 1 1 1h5.585938l1-1h-6.585938v-18h .4648438 4.5351562 2.292969l6.707031 6.7070312-.003906 3.8828128 1.003906-1.003906v-.585938h-.001953l.001953-2.5c-.000025-.1325994-.05272-.2597597-.146484-.3535156l-7-7c-.093756-.0937682-.220916-.146459-.353516-.1464844h-2.5-4.5z"/><path d="m15.411494 2.0075719c-.416024.1332524-.556031.766565-.235307 1.0643933l3.764927 3.7845094c.347817.331511 1.040564.047817 1.058886-.4336417v-3.7845094c-.000038-.3302491-.298947-.6307139-.627488-.6307516h-3.764929c-.06489-.010096-.131258-.010096-.196089 0z"/><path d="m9.7988281 9.1992188c-2.0925864 0-3.7988281 1.7081952-3.7988281 3.8007812s1.7062417 3.798828 3.7988281 3.798828c2.0925869 0 3.8007809-1.706242 3.8007809-3.798828s-1.708194-3.8007812-3.8007809-3.8007812zm0 .9980472c1.5530639 0 2.8027339 1.24967 2.8027339 2.8
02734s-1.24967 2.800781-2.8027339 2.800781c-1.553064 0-2.8007812-1.247717-2.8007812-2.800781s1.2477172-2.802734 2.8007812-2.802734z"/><path d="m10.158203 11.400391a.49920091.49920091 0 0 0 -.4277342.255859l-3.6679688 6.601562a.49920091.49920091 0 0 0 .4375.742188h7.085938l1.148437-1.148438-4.152344-6.228515a.49920091.49920091 0 0 0 -.423828-.222656zm.048828 1.457031 3.427735 5.144531h-6.2871098z"/></g><path d="m23 11-12 12h12zm-2 5v5h-5z" fill="#808080" fill-rule="evenodd"/><path d="m10.207033 12.857422 3.427735 5.144531h-6.2871098z" fill="#fff"/><path d="m12.501953 11.001953c-.275563-.000442-.499363.222484-.5.498047l.001953 5.001953c.000637.275563.224437.498489.5.498047h3.082032l.998046-.998047h-3.582031l-.001953-4.001953h4l .001953 3.583984.998047-.998046-.001953-3.085938c-.000637-.275563-.224437-.498489-.5-.498047z" fill="#e78e46"/><path d="m13 12 .001953 4.001953h3.582031l.417969-.417969-.001953-3.583984z" fill="#fff"/></svg>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index b0387cfefee1..69856aa6362e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5194,6 +5194,9 @@
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Organize Macros</value>
</prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
</node>
<node oor:name=".uno:RunMacro" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index fad1a3d262a0..3a6e49c5eeaf 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -13318,10 +13318,10 @@
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Tools-MacroOrganizer">
+ <object class="GtkToolButton" id="Tools-ScriptOrganizer">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:MacroOrganizer?TabId:short=1</property>
+ <property name="action_name">.uno:ScriptOrganizer</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui b/sd/uiconfig/sdraw/ui/notebookbar.ui
index 4f315a0e39b6..e2d7495e975c 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -13307,10 +13307,10 @@
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Tools-MacroOrganizer">
+ <object class="GtkToolButton" id="Tools-ScriptOrganizer">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:MacroOrganizer?TabId:short=1</property>
+ <property name="action_name">.uno:ScriptOrganizer</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui b/sd/uiconfig/simpress/ui/notebookbar.ui
index 97c23ade6fa9..1d218b9e493c 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -13308,10 +13308,10 @@
<property name="toolbar_style">both-horiz</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Tools-MacroOrganizer">
+ <object class="GtkToolButton" id="Tools-ScriptOrganizer">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:MacroOrganizer?TabId:short=1</property>
+ <property name="action_name">.uno:ScriptOrganizer</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index 61e23b4748a7..b70e945f68a0 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -3060,10 +3060,12 @@
<object class="sfxlo-NotebookbarToolBox" id="font">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
<child>
- <object class="GtkToolButton" id="Home-CarFontName">
+ <object class="GtkToolButton" id="Home-CharFontName">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="action_name">.uno:CharFontName</property>
</object>
<packing>
@@ -3105,8 +3107,6 @@
<object class="sfxlo-NotebookbarToolBox" id="ExtTop6">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="halign">end</property>
- <property name="hexpand">True</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<child>
@@ -14588,12 +14588,11 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="toolbar_style">both-horiz</property>
- <property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton" id="Tools-MacroOrganizer">
+ <object class="GtkToolButton" id="Tools-ScriptOrganizer">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="action_name">.uno:MacroOrganizer?TabId:short=1</property>
+ <property name="action_name">.uno:ScriptOrganizer</property>
</object>
<packing>
<property name="expand">False</property>
More information about the Libreoffice-commits
mailing list