diff options
| author | andreas kainz <kainz.a@gmail.com> | 2019-04-08 06:18:58 +0200 |
|---|---|---|
| committer | andreas_kainz <kainz.a@gmail.com> | 2019-04-08 18:37:54 +0200 |
| commit | 08557a159bde7dab626f36488c88af94d7da0deb (patch) | |
| tree | 0e724a91b4d0fb035ec484ff6652f1b2efd348fc | |
| parent | 97af58093978d8e6b9d90eedcc59141304e7200e (diff) | |
tdf#124200 calc add icons for CellStyles
Change-Id: I6037c61e8bf4e58e37bd8f77b8ef284dedfc5b29
Reviewed-on: https://gerrit.libreoffice.org/70412
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
33 files changed, 304 insertions, 51 deletions
diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt index 6e5ae3fb5966..f5c6fa6716bf 100644 --- a/icon-themes/breeze/links.txt +++ b/icon-themes/breeze/links.txt @@ -1806,3 +1806,16 @@ cmd/lc_macrodialog.png cmd/lc_scriptorganizer.png cmd/lc_donation.png cmd/lc_currencyfield.png cmd/sc_donation.png cmd/sc_currencyfield.png + +# Calc Style +cmd/lc_defaultcellstyles.png cmd/lc_defaultcharstyle.png +cmd/sc_defaultcellstyles.png cmd/sc_defaultcharstyle.png +cmd/lc_heading1cellstyles.png cmd/lc_heading1parastyle.png +cmd/sc_heading1cellstyles.png cmd/sc_heading1parastyle.png +cmd/lc_heading2cellstyles.png cmd/lc_heading2parastyle.png +cmd/sc_heading2cellstyles.png cmd/sc_heading2parastyle.png +cmd/lc_footnotecellstyles.png cmd/lc_insertfootnote.png +cmd/sc_footnotecellstyles.png cmd/sc_insertfootnote.png +cmd/lc_notecellstyles.png cmd/lc_showannotations.png +cmd/sc_notecellstyles.png cmd/sc_showannotations.png + diff --git a/icon-themes/breeze/mapping b/icon-themes/breeze/mapping deleted file mode 100644 index 7f3184518744..000000000000 --- a/icon-themes/breeze/mapping +++ /dev/null @@ -1,4 +0,0 @@ -actions/toolbar/document-save.svg cmd/lc_save.png 26 -actions/toolbar/document-save.svg cmd/sc_save.png 16 -actions/toolbar/document-save-as.svg cmd/lc_saveas.png 26 -actions/toolbar/document-save-as.svg cmd/sc_saveas.png 16 diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt index ccacbf53bba8..c836629cf5da 100644 --- a/icon-themes/colibre/links.txt +++ b/icon-themes/colibre/links.txt @@ -1828,3 +1828,15 @@ cmd/sc_basicideappear.png cmd/sc_toolsmacroedit.png cmd/lc_donation.png cmd/lc_currencyfield.png cmd/sc_donation.png cmd/sc_currencyfield.png + +# Calc Style +cmd/lc_defaultcellstyles.png cmd/lc_defaultcharstyle.png +cmd/sc_defaultcellstyles.png cmd/sc_defaultcharstyle.png +cmd/lc_heading1cellstyles.png cmd/lc_heading1parastyle.png +cmd/sc_heading1cellstyles.png cmd/sc_heading1parastyle.png +cmd/lc_heading2cellstyles.png cmd/lc_heading2parastyle.png +cmd/sc_heading2cellstyles.png cmd/sc_heading2parastyle.png +cmd/lc_footnotecellstyles.png cmd/lc_insertfootnote.png +cmd/sc_footnotecellstyles.png cmd/sc_insertfootnote.png +cmd/lc_notecellstyles.png cmd/lc_showannotations.png +cmd/sc_notecellstyles.png cmd/sc_showannotations.png diff --git a/icon-themes/sifr/cmd/lc_accent1cellstyles.png b/icon-themes/sifr/cmd/lc_accent1cellstyles.png Binary files differnew file mode 100644 index 000000000000..f248ce1d0612 --- /dev/null +++ b/icon-themes/sifr/cmd/lc_accent1cellstyles.png diff --git a/icon-themes/sifr/cmd/lc_accent2cellstyles.png b/icon-themes/sifr/cmd/lc_accent2cellstyles.png Binary files differnew file mode 100644 index 000000000000..240bb06307b5 --- /dev/null +++ b/icon-themes/sifr/cmd/lc_accent2cellstyles.png diff --git a/icon-themes/sifr/cmd/lc_accent3cellstyles.png b/icon-themes/sifr/cmd/lc_accent3cellstyles.png Binary files differnew file mode 100644 index 000000000000..d1dd2cde3ca6 --- /dev/null +++ b/icon-themes/sifr/cmd/lc_accent3cellstyles.png diff --git a/icon-themes/sifr/cmd/sc_accent1cellstyles.png b/icon-themes/sifr/cmd/sc_accent1cellstyles.png Binary files differnew file mode 100644 index 000000000000..9a97e4f82e11 --- /dev/null +++ b/icon-themes/sifr/cmd/sc_accent1cellstyles.png diff --git a/icon-themes/sifr/cmd/sc_accent2cellstyles.png b/icon-themes/sifr/cmd/sc_accent2cellstyles.png Binary files differnew file mode 100644 index 000000000000..1c778aad280a --- /dev/null +++ b/icon-themes/sifr/cmd/sc_accent2cellstyles.png diff --git a/icon-themes/sifr/cmd/sc_accent3cellstyles.png b/icon-themes/sifr/cmd/sc_accent3cellstyles.png Binary files differnew file mode 100644 index 000000000000..9a09360bd6d2 --- /dev/null +++ b/icon-themes/sifr/cmd/sc_accent3cellstyles.png diff --git a/icon-themes/sifr/cmd/sc_defaultcharstyle.png b/icon-themes/sifr/cmd/sc_defaultcellstyle.png Binary files differindex 38081a23272b..38081a23272b 100644 --- a/icon-themes/sifr/cmd/sc_defaultcharstyle.png +++ b/icon-themes/sifr/cmd/sc_defaultcellstyle.png diff --git a/icon-themes/sifr/cmd/sc_errorcellstyle.png b/icon-themes/sifr/cmd/sc_errorcellstyle.png Binary files differnew file mode 100644 index 000000000000..276abb831034 --- /dev/null +++ b/icon-themes/sifr/cmd/sc_errorcellstyle.png diff --git a/icon-themes/sifr/cmd/sc_warningcellstyle.png b/icon-themes/sifr/cmd/sc_warningcellstyle.png Binary files differnew file mode 100644 index 000000000000..2f281ea79eb5 --- /dev/null +++ b/icon-themes/sifr/cmd/sc_warningcellstyle.png diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt index 8e549143b539..253f7cf673c7 100644 --- a/icon-themes/sifr/links.txt +++ b/icon-themes/sifr/links.txt @@ -607,3 +607,16 @@ cmd/lc_commonalignbottom.png cmd/lc_alignbottom.png # Grid cmd/sc_insertgridcontrol.png cmd/sc_gridvisible.png cmd/lc_insertgridcontrol.png cmd/lc_gridvisible.png + + +# Calc Style +cmd/lc_defaultcellstyles.png cmd/lc_defaultcharstyle.png +cmd/sc_defaultcellstyles.png cmd/sc_defaultcharstyle.png +cmd/lc_heading1cellstyles.png cmd/lc_heading1parastyle.png +cmd/sc_heading1cellstyles.png cmd/sc_heading1parastyle.png +cmd/lc_heading2cellstyles.png cmd/lc_heading2parastyle.png +cmd/sc_heading2cellstyles.png cmd/sc_heading2parastyle.png +cmd/lc_footnotecellstyles.png cmd/lc_insertfootnote.png +cmd/sc_footnotecellstyles.png cmd/sc_insertfootnote.png +cmd/lc_notecellstyles.png cmd/lc_showannotations.png +cmd/sc_notecellstyles.png cmd/sc_showannotations.png diff --git a/icon-themes/sifr_dark/cmd/lc_accent1cellstyles.png b/icon-themes/sifr_dark/cmd/lc_accent1cellstyles.png Binary files differnew file mode 100644 index 000000000000..fe53192e84be --- /dev/null +++ b/icon-themes/sifr_dark/cmd/lc_accent1cellstyles.png diff --git a/icon-themes/sifr_dark/cmd/lc_accent2cellstyles.png b/icon-themes/sifr_dark/cmd/lc_accent2cellstyles.png Binary files differnew file mode 100644 index 000000000000..7cfaecd593ec --- /dev/null +++ b/icon-themes/sifr_dark/cmd/lc_accent2cellstyles.png diff --git a/icon-themes/sifr_dark/cmd/lc_accent3cellstyles.png b/icon-themes/sifr_dark/cmd/lc_accent3cellstyles.png Binary files differnew file mode 100644 index 000000000000..03a20360e153 --- /dev/null +++ b/icon-themes/sifr_dark/cmd/lc_accent3cellstyles.png diff --git a/icon-themes/sifr_dark/cmd/sc_accent1cellstyles.png b/icon-themes/sifr_dark/cmd/sc_accent1cellstyles.png Binary files differnew file mode 100644 index 000000000000..d088140b181d --- /dev/null +++ b/icon-themes/sifr_dark/cmd/sc_accent1cellstyles.png diff --git a/icon-themes/sifr_dark/cmd/sc_accent2cellstyles.png b/icon-themes/sifr_dark/cmd/sc_accent2cellstyles.png Binary files differnew file mode 100644 index 000000000000..3c5f5a115fb4 --- /dev/null +++ b/icon-themes/sifr_dark/cmd/sc_accent2cellstyles.png diff --git a/icon-themes/sifr_dark/cmd/sc_accent3cellstyles.png b/icon-themes/sifr_dark/cmd/sc_accent3cellstyles.png Binary files differnew file mode 100644 index 000000000000..2ddf1d6c6a18 --- /dev/null +++ b/icon-themes/sifr_dark/cmd/sc_accent3cellstyles.png diff --git a/icon-themes/sifr_dark/cmd/sc_errorcellstyle.png b/icon-themes/sifr_dark/cmd/sc_errorcellstyle.png Binary files differnew file mode 100644 index 000000000000..ea51cd111661 --- /dev/null +++ b/icon-themes/sifr_dark/cmd/sc_errorcellstyle.png diff --git a/icon-themes/sifr_dark/cmd/sc_warningcellstyle.png b/icon-themes/sifr_dark/cmd/sc_warningcellstyle.png Binary files differnew file mode 100644 index 000000000000..01143238f007 --- /dev/null +++ b/icon-themes/sifr_dark/cmd/sc_warningcellstyle.png diff --git a/icon-themes/sifr_svg/cmd/lc_accent1cellstyles.svg b/icon-themes/sifr_svg/cmd/lc_accent1cellstyles.svg new file mode 100644 index 000000000000..0f802d157211 --- /dev/null +++ b/icon-themes/sifr_svg/cmd/lc_accent1cellstyles.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"> + <path + style="opacity:1;fill:#555753" + d="M 1 2 L 1 21 L 23 21 L 23 2 L 1 2 z M 7 4 L 15 4 C 17.761424 4 20 6.2385763 20 9 L 20 19 L 8.5 19 C 6.0147186 19 4 16.985281 4 14.5 C 4 12.014719 6.0147186 10 8.5 10 L 17 10 L 17 9 C 17 7.8954305 16.104569 7 15 7 L 7 7 L 7 4 z M 8.5 13 C 7.6715729 13 7 13.671573 7 14.5 C 7 15.328427 7.6715729 16 8.5 16 L 17 16 L 17 13 L 8.5 13 z " + /> +</svg> diff --git a/icon-themes/sifr_svg/cmd/lc_accent2cellstyles.svg b/icon-themes/sifr_svg/cmd/lc_accent2cellstyles.svg new file mode 100644 index 000000000000..3a913f6479b1 --- /dev/null +++ b/icon-themes/sifr_svg/cmd/lc_accent2cellstyles.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"> + <path + style="opacity:0.35;fill:#555753" + d="M 1 2 L 1 21 L 23 21 L 23 2 L 1 2 z M 7 4 L 15 4 C 17.761424 4 20 6.2385763 20 9 L 20 19 L 8.5 19 C 6.0147186 19 4 16.985281 4 14.5 C 4 12.014719 6.0147186 10 8.5 10 L 17 10 L 17 9 C 17 7.8954305 16.104569 7 15 7 L 7 7 L 7 4 z M 8.5 13 C 7.6715729 13 7 13.671573 7 14.5 C 7 15.328427 7.6715729 16 8.5 16 L 17 16 L 17 13 L 8.5 13 z " + /> +</svg> diff --git a/icon-themes/sifr_svg/cmd/lc_accent3cellstyles.svg b/icon-themes/sifr_svg/cmd/lc_accent3cellstyles.svg new file mode 100644 index 000000000000..39ecda3d043f --- /dev/null +++ b/icon-themes/sifr_svg/cmd/lc_accent3cellstyles.svg @@ -0,0 +1,12 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"> + <rect + style="opacity:0.35;fill:#555753" + width="22" + height="19" + x="1" + y="2" /> + <path + style="fill:#555753" + d="m 7,4 v 3 h 8 c 1.104569,0 2,0.8954305 2,2 v 1 H 8.5 C 6.0147186,10 4,12.014719 4,14.5 4,16.985281 6.0147186,19 8.5,19 H 20 V 9 C 20,6.2385763 17.761424,4 15,4 Z m 1.5,9 H 17 v 3 H 8.5 C 7.6715729,16 7,15.328427 7,14.5 7,13.671573 7.6715729,13 8.5,13 Z" + /> +</svg> diff --git a/icon-themes/sifr_svg/cmd/sc_accent1cellstyles.svg b/icon-themes/sifr_svg/cmd/sc_accent1cellstyles.svg new file mode 100644 index 000000000000..4c876e06463a --- /dev/null +++ b/icon-themes/sifr_svg/cmd/sc_accent1cellstyles.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"> + <path + style="opacity:1;fill:#555753" + d="M 1 1 L 1 15 L 15 15 L 15 1 L 1 1 z M 5 3 L 10 3 C 11.656854 3 13 4.3431458 13 6 L 13 13 L 6 13 C 4.3431458 13 3 11.656854 3 10 C 3 8.3431458 4.3431458 7 6 7 L 11 7 L 11 6 C 11 5.4477153 10.552285 5 10 5 L 5 5 L 5 3 z M 6 9 C 5.4477153 9 5 9.447715 5 10 C 5 10.552285 5.4477153 11 6 11 L 11 11 L 11 9 L 6 9 z " + /> +</svg> diff --git a/icon-themes/sifr_svg/cmd/sc_accent2cellstyles.svg b/icon-themes/sifr_svg/cmd/sc_accent2cellstyles.svg new file mode 100644 index 000000000000..aa80c2ae69f5 --- /dev/null +++ b/icon-themes/sifr_svg/cmd/sc_accent2cellstyles.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"> + <path + style="opacity:0.35;fill:#555753" + d="M 1 1 L 1 15 L 15 15 L 15 1 L 1 1 z M 5 3 L 10 3 C 11.656854 3 13 4.3431458 13 6 L 13 13 L 6 13 C 4.3431458 13 3 11.656854 3 10 C 3 8.3431458 4.3431458 7 6 7 L 11 7 L 11 6 C 11 5.4477153 10.552285 5 10 5 L 5 5 L 5 3 z M 6 9 C 5.4477153 9 5 9.447715 5 10 C 5 10.552285 5.4477153 11 6 11 L 11 11 L 11 9 L 6 9 z " + /> +</svg> diff --git a/icon-themes/sifr_svg/cmd/sc_accent3cellstyles.svg b/icon-themes/sifr_svg/cmd/sc_accent3cellstyles.svg new file mode 100644 index 000000000000..9f9c71b3495c --- /dev/null +++ b/icon-themes/sifr_svg/cmd/sc_accent3cellstyles.svg @@ -0,0 +1,12 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"> + <rect + style="opacity:0.35;fill:#555753" + width="14" + height="14" + x="1" + y="1" /> + <path + style="fill:#555753" + d="m 5,3 v 2 h 5 c 0.552285,0 1,0.4477153 1,1 V 7 H 6 c -1.6568542,0 -3,1.3431458 -3,3 0,1.656854 1.3431458,3 3,3 h 7 V 6 C 13,4.3431458 11.656854,3 10,3 Z m 1,6 h 5 v 2 H 6 C 5.4477153,11 5,10.552285 5,10 5,9.447715 5.4477153,9 6,9 Z" + /> +</svg> diff --git a/icon-themes/sifr_svg/cmd/sc_errorcellstyle.svg b/icon-themes/sifr_svg/cmd/sc_errorcellstyle.svg new file mode 100644 index 000000000000..26aec928c839 --- /dev/null +++ b/icon-themes/sifr_svg/cmd/sc_errorcellstyle.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"> + <path + style="fill:#555753" + d="M 5 1 L 1 5 L 1 11 L 5 15 L 11 15 L 15 11 L 15 5 L 11 1 L 5 1 z M 7 3 L 9 3 L 9 10 L 7 10 L 7 3 z M 7 11 L 9 11 L 9 13 L 7 13 L 7 11 z " + /> +</svg> diff --git a/icon-themes/sifr_svg/cmd/sc_warningcellstyle.svg b/icon-themes/sifr_svg/cmd/sc_warningcellstyle.svg new file mode 100644 index 000000000000..92d6b1efbdc2 --- /dev/null +++ b/icon-themes/sifr_svg/cmd/sc_warningcellstyle.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"> + <path + style="fill:#555753" + d="M 7,1 1,14 v 1 H 15 V 14 L 9,1 Z m 0,3 h 2 v 6 H 7 Z m 0,7 h 2 v 2 H 7 Z" + /> +</svg> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu index 92da99cdbf45..d3c89cec7a2b 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu @@ -2624,61 +2624,229 @@ <value xml:lang="en-US">Accent 1</value> </prop> </node> + <node oor:name=".uno:Accent1CellStyles" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Accent 1</value> + </prop> + <prop oor:name="TooltipLabel" oor:type="xs:string"> + <value xml:lang="en-US">Accent 1 Cell Style</value> + </prop> + <prop oor:name="TargetURL" oor:type="xs:string"> + <value>.uno:StyleApply?Style:string=Accent 1&FamilyName:string=CellStyles</value> + </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>9</value> + </prop> + </node> <node oor:name=".uno:StyleApply?Style:string=Accent 2&FamilyName:string=CellStyles" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Accent 2</value> </prop> </node> + <node oor:name=".uno:Accent2CellStyles" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Accent 2</value> + </prop> + <prop oor:name="TooltipLabel" oor:type="xs:string"> + <value xml:lang="en-US">Accent 2 Cell Style</value> + </prop> + <prop oor:name="TargetURL" oor:type="xs:string"> + <value>.uno:StyleApply?Style:string=Accent 2&FamilyName:string=CellStyles</value> + </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>9</value> + </prop> + </node> <node oor:name=".uno:StyleApply?Style:string=Accent 3&FamilyName:string=CellStyles" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Accent 3</value> </prop> </node> + <node oor:name=".uno:Accent3CellStyles" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Accent 3</value> + </prop> + <prop oor:name="TooltipLabel" oor:type="xs:string"> + <value xml:lang="en-US">Accent 3 Cell Style</value> + </prop> + <prop oor:name="TargetURL" oor:type="xs:string"> + <value>.uno:StyleApply?Style:string=Accent 3&FamilyName:string=CellStyles</value> + </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>9</value> + </prop> + </node> <node oor:name=".uno:StyleApply?Style:string=Heading 1&FamilyName:string=CellStyles" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Heading 1</value> </prop> </node> + <node oor:name=".uno:Heading1CellStyles" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Heading 1</value> + </prop> + <prop oor:name="TooltipLabel" oor:type="xs:string"> + <value xml:lang="en-US">Heading 1 Cell Style</value> + </prop> + <prop oor:name="TargetURL" oor:type="xs:string"> + <value>.uno:StyleApply?Style:string=Heading 1&FamilyName:string=CellStyles</value> + </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>9</value> + </prop> + </node> <node oor:name=".uno:StyleApply?Style:string=Heading 2&FamilyName:string=CellStyles" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Heading 2</value> </prop> </node> + <node oor:name=".uno:Heading2CellStyles" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Heading 2</value> + </prop> + <prop oor:name="TooltipLabel" oor:type="xs:string"> + <value xml:lang="en-US">Heading 2 Cell Style</value> + </prop> + <prop oor:name="TargetURL" oor:type="xs:string"> + <value>.uno:StyleApply?Style:string=Heading 2&FamilyName:string=CellStyles</value> + </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>9</value> + </prop> + </node> <node oor:name=".uno:StyleApply?Style:string=Bad&FamilyName:string=CellStyles" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Bad</value> </prop> </node> + <node oor:name=".uno:BadCellStyles" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Bad</value> + </prop> + <prop oor:name="TooltipLabel" oor:type="xs:string"> + <value xml:lang="en-US">Bad Cell Style</value> + </prop> + <prop oor:name="TargetURL" oor:type="xs:string"> + <value>.uno:StyleApply?Style:string=Bad&FamilyName:string=CellStyles</value> + </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>9</value> + </prop> + </node> <node oor:name=".uno:StyleApply?Style:string=Error&FamilyName:string=CellStyles" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Error</value> </prop> </node> + <node oor:name=".uno:ErrorCellStyles" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Error</value> + </prop> + <prop oor:name="TooltipLabel" oor:type="xs:string"> + <value xml:lang="en-US">Error Cell Style</value> + </prop> + <prop oor:name="TargetURL" oor:type="xs:string"> + <value>.uno:StyleApply?Style:string=Error&FamilyName:string=CellStyles</value> + </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>9</value> + </prop> + </node> <node oor:name=".uno:StyleApply?Style:string=Good&FamilyName:string=CellStyles" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Good</value> </prop> </node> + <node oor:name=".uno:GoodCellStyles" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Good</value> + </prop> + <prop oor:name="TooltipLabel" oor:type="xs:string"> + <value xml:lang="en-US">Good Cell Style</value> + </prop> + <prop oor:name="TargetURL" oor:type="xs:string"> + <value>.uno:StyleApply?Style:string=Good&FamilyName:string=CellStyles</value> + </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>9</value> + </prop> + </node> <node oor:name=".uno:StyleApply?Style:string=Neutral&FamilyName:string=CellStyles" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Neutral</value> </prop> </node> + <node oor:name=".uno:NeutralCellStyles" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Neutral</value> + </prop> + <prop oor:name="TooltipLabel" oor:type="xs:string"> + <value xml:lang="en-US">Neutral Cell Style</value> + </prop> + <prop oor:name="TargetURL" oor:type="xs:string"> + <value>.uno:StyleApply?Style:string=Neutral&FamilyName:string=CellStyles</value> + </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>9</value> + </prop> + </node> <node oor:name=".uno:StyleApply?Style:string=Warning&FamilyName:string=CellStyles" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Warning</value> </prop> </node> + <node oor:name=".uno:WarningCellStyles" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Warning</value> + </prop> + <prop oor:name="TooltipLabel" oor:type="xs:string"> + <value xml:lang="en-US">Warning Cell Style</value> + </prop> + <prop oor:name="TargetURL" oor:type="xs:string"> + <value>.uno:StyleApply?Style:string=Warning&FamilyName:string=CellStyles</value> + </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>9</value> + </prop> + </node> <node oor:name=".uno:StyleApply?Style:string=Footnote&FamilyName:string=CellStyles" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Footnote</value> </prop> </node> + <node oor:name=".uno:FootnoteCellStyles" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Footnote</value> + </prop> + <prop oor:name="TooltipLabel" oor:type="xs:string"> + <value xml:lang="en-US">Footnote Cell Style</value> + </prop> + <prop oor:name="TargetURL" oor:type="xs:string"> + <value>.uno:StyleApply?Style:string=Footnote&FamilyName:string=CellStyles</value> + </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>9</value> + </prop> + </node> <node oor:name=".uno:StyleApply?Style:string=Note&FamilyName:string=CellStyles" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Note</value> </prop> </node> + <node oor:name=".uno:NoteCellStyles" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="en-US">Note</value> + </prop> + <prop oor:name="TooltipLabel" oor:type="xs:string"> + <value xml:lang="en-US">Note Cell Style</value> + </prop> + <prop oor:name="TargetURL" oor:type="xs:string"> + <value>.uno:StyleApply?Style:string=Note&FamilyName:string=CellStyles</value> + </prop> + <prop oor:name="Properties" oor:type="xs:int"> + <value>9</value> + </prop> + </node> </node> </node> </oor:component-data> diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml index 2e19084115e6..00137689a6ae 100644 --- a/sc/uiconfig/scalc/menubar/menubar.xml +++ b/sc/uiconfig/scalc/menubar/menubar.xml @@ -493,18 +493,18 @@ <menu:menu menu:id=".uno:FormatStylesMenu"> <menu:menupopup> <menu:menuitem menu:id=".uno:DefaultCellStyles" menu:style="radio"/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Accent 1&FamilyName:string=CellStyles" menu:style="radio"/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Accent 2&FamilyName:string=CellStyles" menu:style="radio"/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Accent 3&FamilyName:string=CellStyles" menu:style="radio"/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 1&FamilyName:string=CellStyles" menu:style="radio"/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Heading 2&FamilyName:string=CellStyles" menu:style="radio"/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Bad&FamilyName:string=CellStyles" menu:style="radio"/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Error&FamilyName:string=CellStyles" menu:style="radio"/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Good&FamilyName:string=CellStyles" menu:style="radio"/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Neutral&FamilyName:string=CellStyles" menu:style="radio"/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Warning&FamilyName:string=CellStyles" menu:style="radio"/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Footnote&FamilyName:string=CellStyles" menu:style="radio"/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Note&FamilyName:string=CellStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:Accent1CellStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:Accent2CellStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:Accent3CellStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:Heading1CellStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:Heading2CellStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:BadCellStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:ErrorCellStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:GoodCellStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:NeutralCellStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:WarningCellStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:FootnoteCellStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:NoteCellStyles" menu:style="radio"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:StyleUpdateByExample"/> <menu:menuitem menu:id=".uno:StyleNewByExample"/> diff --git a/sc/uiconfig/scalc/popupmenu/cell.xml b/sc/uiconfig/scalc/popupmenu/cell.xml index c028957552fe..8b503e6c492e 100644 --- a/sc/uiconfig/scalc/popupmenu/cell.xml +++ b/sc/uiconfig/scalc/popupmenu/cell.xml @@ -39,15 +39,19 @@ <menu:menupopup> <menu:menuitem menu:id=".uno:EditStyle"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Default&FamilyName:string=CellStyles" menu:style="radio"/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Accent 1&FamilyName:string=CellStyles" menu:style="radio"/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Accent 2&FamilyName:string=CellStyles" menu:style="radio"/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Accent 3&FamilyName:string=CellStyles" menu:style="radio"/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Bad&FamilyName:string=CellStyles" menu:style="radio"/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Error&FamilyName:string=CellStyles" menu:style="radio"/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Good&FamilyName:string=CellStyles" menu:style="radio"/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Neutral&FamilyName:string=CellStyles" menu:style="radio"/> - <menu:menuitem menu:id=".uno:StyleApply?Style:string=Warning&FamilyName:string=CellStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:DefaultCellStylesmenu" menu:style="radio"/> + <menu:menuitem menu:id=".uno:Accent1CellStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:Accent2CellStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:Accent3CellStyles" menu:style="radio"/> + <menu:menuseparator/> + <menu:menuitem menu:id=".uno:BadCellStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:ErrorCellStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:GoodCellStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:NeutralCellStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:WarningCellStyles" menu:style="radio"/> + <menu:menuseparator/> + <menu:menuitem menu:id=".uno:FootnoteCellStyles" menu:style="radio"/> + <menu:menuitem menu:id=".uno:NoteCellStyles" menu:style="radio"/> </menu:menupopup> </menu:menu> <menu:menuseparator/> diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui index 5c85cab151b0..0ba84e295b23 100644 --- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui +++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui @@ -2524,8 +2524,7 @@ <object class="GtkMenuItem" id="MenuStyle-Default"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StyleApply?Style:string=Default&FamilyName:string=CellStyles</property> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|defaultD">Default</property> + <property name="action_name">.uno:DefaultCellStyles</property> </object> </child> <child> @@ -2538,24 +2537,21 @@ <object class="GtkMenuItem" id="MenuStyle-Accent1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StyleApply?Style:string=Accent 1&FamilyName:string=CellStyles</property> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|Accent1">Accent 1</property> + <property name="action_name">.uno:Accent1CellStyles</property> </object> </child> <child> <object class="GtkMenuItem" id="MenuStyle-Accent2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StyleApply?Style:string=Accent 2&FamilyName:string=CellStyles</property> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|Accent2">Accent 2</property> + <property name="action_name">.uno:Accent2CellStyles</property> </object> </child> <child> <object class="GtkMenuItem" id="MenuStyle-Accent3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StyleApply?Style:string=Accent 3&FamilyName:string=CellStyles</property> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|Accent3">Accent 3</property> + <property name="action_name">.uno:Accent3CellStyles</property> </object> </child> <child> @@ -2568,16 +2564,14 @@ <object class="GtkMenuItem" id="MenuStyle-Header1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StyleApply?Style:string=Heading 1&FamilyName:string=CellStyles</property> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|Header1">Header 1</property> + <property name="action_name">.uno:Heading1CellStyles</property> </object> </child> <child> <object class="GtkMenuItem" id="MenuStyle-Header2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StyleApply?Style:string=Heading 2&FamilyName:string=CellStyles</property> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|Header2">Header 2</property> + <property name="action_name">.uno:Heading2CellStyles</property> </object> </child> <child> @@ -2590,40 +2584,35 @@ <object class="GtkMenuItem" id="MenuStyle-Good"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StyleApply?Style:string=Good&FamilyName:string=CellStyles</property> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|good">Good</property> + <property name="action_name">.uno:GoodCellStyles</property> </object> </child> <child> <object class="GtkMenuItem" id="MenuStyle-Bad"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StyleApply?Style:string=Bad&FamilyName:string=CellStyles</property> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|bad">Bad</property> + <property name="action_name">.uno:BadCellStyles</property> </object> </child> <child> <object class="GtkMenuItem" id="MenuStyle-Neutral"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StyleApply?Style:string=Neutral&FamilyName:string=CellStyles</property> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|neutral">Neutral</property> + <property name="action_name">.uno:NeutralCellStyles</property> </object> </child> <child> <object class="GtkMenuItem" id="MenuStyle-Error"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StyleApply?Style:string=Error&FamilyName:string=CellStyles</property> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|error">Error</property> + <property name="action_name">.uno:ErrorCellStyles</property> </object> </child> <child> <object class="GtkMenuItem" id="MenuStyle-Warning"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StyleApply?Style:string=Warning&FamilyName:string=CellStyles</property> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|warning">Warning</property> + <property name="action_name">.uno:WarningCellStyles</property> </object> </child> <child> @@ -2636,16 +2625,14 @@ <object class="GtkMenuItem" id="MenuStyle-Footnote"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StyleApply?Style:string=Footnote&FamilyName:string=CellStyles</property> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|footnote">Footnote</property> + <property name="action_name">.uno:FootnoteCellStyles</property> </object> </child> <child> <object class="GtkMenuItem" id="MenuStyle-Note"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="action_name">.uno:StyleApply?Style:string=Note&FamilyName:string=CellStyles</property> - <property name="label" translatable="yes" context="notebookbar_groupedbar_compact|note">Note</property> + <property name="action_name">.uno:NoteCellStyles</property> </object> </child> <child> |
