From a7d957d98edf6ea680f9ff086a1d0722f8d12408 Mon Sep 17 00:00:00 2001 From: andreas kainz Date: Wed, 3 Apr 2019 23:20:25 +0200 Subject: chart icon theme update sifr and colibre Change-Id: Ib72500f24cbca406d258794d4e8ab2cee7ef5ed6 Reviewed-on: https://gerrit.libreoffice.org/70223 Tested-by: Jenkins Reviewed-by: andreas_kainz --- chart2/uiconfig/menubar/menubar.xml | 21 +++++----- icon-themes/colibre/links.txt | 13 ++++++ icon-themes/sifr/cmd/lc_diagramaxisall.png | Bin 0 -> 275 bytes icon-themes/sifr/cmd/lc_formatselection.png | Bin 0 -> 336 bytes icon-themes/sifr/cmd/lc_insertmenutitles.png | Bin 0 -> 202 bytes icon-themes/sifr/cmd/lc_mediapause.png | Bin 179 -> 624 bytes icon-themes/sifr/cmd/lc_mediaplay.png | Bin 0 -> 713 bytes icon-themes/sifr/cmd/lc_ok.png | Bin 379 -> 241 bytes icon-themes/sifr/cmd/lc_togglelegend.png | Bin 204 -> 0 bytes icon-themes/sifr/cmd/sc_ok.png | Bin 295 -> 420 bytes icon-themes/sifr/cmd/sc_togglelegend.png | Bin 190 -> 0 bytes icon-themes/sifr/links.txt | 45 +++++++++++++++++++++ icon-themes/sifr_dark/cmd/lc_diagramaxisall.png | Bin 0 -> 275 bytes icon-themes/sifr_dark/cmd/lc_formatselection.png | Bin 0 -> 336 bytes icon-themes/sifr_dark/cmd/lc_insertmenutitles.png | Bin 0 -> 202 bytes icon-themes/sifr_dark/cmd/lc_mediapause.png | Bin 179 -> 624 bytes icon-themes/sifr_dark/cmd/lc_mediaplay.png | Bin 0 -> 713 bytes icon-themes/sifr_dark/cmd/lc_ok.png | Bin 379 -> 241 bytes icon-themes/sifr_dark/cmd/lc_togglelegend.png | Bin 204 -> 0 bytes icon-themes/sifr_dark/cmd/sc_ok.png | Bin 295 -> 420 bytes icon-themes/sifr_dark/cmd/sc_togglelegend.png | Bin 190 -> 0 bytes icon-themes/sifr_svg/cmd/lc_formatselection.svg | 6 +++ icon-themes/sifr_svg/cmd/lc_insertmenutitles.svg | 6 +++ icon-themes/sifr_svg/cmd/lc_mediapause.svg | 2 +- icon-themes/sifr_svg/cmd/lc_mediaplay.svg | 6 +++ icon-themes/sifr_svg/cmd/lc_ok.svg | 2 +- icon-themes/sifr_svg/cmd/lc_togglelegend.svg | 10 ----- icon-themes/sifr_svg/cmd/sc_diagramaxisall.svg | 6 --- icon-themes/sifr_svg/cmd/sc_ok.svg | 2 +- icon-themes/sifr_svg/cmd/sc_togglelegend.svg | 6 --- .../org/openoffice/Office/UI/ChartCommands.xcu | 18 +++++++++ 31 files changed, 106 insertions(+), 37 deletions(-) create mode 100644 icon-themes/sifr/cmd/lc_diagramaxisall.png create mode 100644 icon-themes/sifr/cmd/lc_formatselection.png create mode 100644 icon-themes/sifr/cmd/lc_insertmenutitles.png create mode 100644 icon-themes/sifr/cmd/lc_mediaplay.png delete mode 100644 icon-themes/sifr/cmd/lc_togglelegend.png delete mode 100644 icon-themes/sifr/cmd/sc_togglelegend.png create mode 100644 icon-themes/sifr_dark/cmd/lc_diagramaxisall.png create mode 100644 icon-themes/sifr_dark/cmd/lc_formatselection.png create mode 100644 icon-themes/sifr_dark/cmd/lc_insertmenutitles.png create mode 100644 icon-themes/sifr_dark/cmd/lc_mediaplay.png delete mode 100644 icon-themes/sifr_dark/cmd/lc_togglelegend.png delete mode 100644 icon-themes/sifr_dark/cmd/sc_togglelegend.png create mode 100644 icon-themes/sifr_svg/cmd/lc_formatselection.svg create mode 100644 icon-themes/sifr_svg/cmd/lc_insertmenutitles.svg create mode 100644 icon-themes/sifr_svg/cmd/lc_mediaplay.svg delete mode 100644 icon-themes/sifr_svg/cmd/lc_togglelegend.svg delete mode 100644 icon-themes/sifr_svg/cmd/sc_diagramaxisall.svg delete mode 100644 icon-themes/sifr_svg/cmd/sc_togglelegend.svg diff --git a/chart2/uiconfig/menubar/menubar.xml b/chart2/uiconfig/menubar/menubar.xml index e36968e975e7..7172dcf373f5 100644 --- a/chart2/uiconfig/menubar/menubar.xml +++ b/chart2/uiconfig/menubar/menubar.xml @@ -45,7 +45,6 @@ - @@ -69,15 +68,6 @@ - - - - - - - - - @@ -127,7 +117,15 @@ - + + + + + + + + + @@ -143,7 +141,6 @@ - diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt index 0a9199971b5c..48b53e2124f7 100644 --- a/icon-themes/colibre/links.txt +++ b/icon-themes/colibre/links.txt @@ -28,6 +28,19 @@ chart2/res/dataeditor_icon08.png cmd/sc_insertcolumns.png chart2/res/dataeditor_icon09.png cmd/sc_insertrowsbefore.png chart2/res/selectrange.png formula/res/refinp1.png +cmd/sc_insertmenulegend.png cmd/sc_legend.png +cmd/sc_insertmenuaxes.png cmd/sc_diagramaxis.png +cmd/sc_insertmenugrids.png cmd/sc_togglegridhorizontal.png +cmd/sc_diagramaxisall.png cmd/sc_diagramaxisxyz.png +cmd/lc_insertmenulegend.png cmd/lc_togglelegend.png +cmd/lc_insertmenuaxes.png cmd/lc_diagramaxis.png +cmd/lc_insertmenugrids.png cmd/lc_togglegridhorizontal.png +cmd/lc_diagramaxisall.png cmd/lc_diagramaxisxyz.png + +cmd/sc_charttitlemenu.png cmd/sc_toggletitle.png +cmd/sc_diagramaxismenu.png cmd/sc_diagramaxis.png +cmd/sc_diagramgridmenu.png cmd/sc_togglegridhorizontal.png + # cmd # ============================================== diff --git a/icon-themes/sifr/cmd/lc_diagramaxisall.png b/icon-themes/sifr/cmd/lc_diagramaxisall.png new file mode 100644 index 000000000000..25fc017ea3c6 Binary files /dev/null and b/icon-themes/sifr/cmd/lc_diagramaxisall.png differ diff --git a/icon-themes/sifr/cmd/lc_formatselection.png b/icon-themes/sifr/cmd/lc_formatselection.png new file mode 100644 index 000000000000..f572968c68de Binary files /dev/null and b/icon-themes/sifr/cmd/lc_formatselection.png differ diff --git a/icon-themes/sifr/cmd/lc_insertmenutitles.png b/icon-themes/sifr/cmd/lc_insertmenutitles.png new file mode 100644 index 000000000000..92973b1ecb65 Binary files /dev/null and b/icon-themes/sifr/cmd/lc_insertmenutitles.png differ diff --git a/icon-themes/sifr/cmd/lc_mediapause.png b/icon-themes/sifr/cmd/lc_mediapause.png index 4be9dc32542d..9e4868db04d6 100644 Binary files a/icon-themes/sifr/cmd/lc_mediapause.png and b/icon-themes/sifr/cmd/lc_mediapause.png differ diff --git a/icon-themes/sifr/cmd/lc_mediaplay.png b/icon-themes/sifr/cmd/lc_mediaplay.png new file mode 100644 index 000000000000..2895192d3bb2 Binary files /dev/null and b/icon-themes/sifr/cmd/lc_mediaplay.png differ diff --git a/icon-themes/sifr/cmd/lc_ok.png b/icon-themes/sifr/cmd/lc_ok.png index e492503b1180..734c058974d3 100644 Binary files a/icon-themes/sifr/cmd/lc_ok.png and b/icon-themes/sifr/cmd/lc_ok.png differ diff --git a/icon-themes/sifr/cmd/lc_togglelegend.png b/icon-themes/sifr/cmd/lc_togglelegend.png deleted file mode 100644 index a8981029fc69..000000000000 Binary files a/icon-themes/sifr/cmd/lc_togglelegend.png and /dev/null differ diff --git a/icon-themes/sifr/cmd/sc_ok.png b/icon-themes/sifr/cmd/sc_ok.png index afdf93411929..9059cc49b10b 100644 Binary files a/icon-themes/sifr/cmd/sc_ok.png and b/icon-themes/sifr/cmd/sc_ok.png differ diff --git a/icon-themes/sifr/cmd/sc_togglelegend.png b/icon-themes/sifr/cmd/sc_togglelegend.png deleted file mode 100644 index 110521621006..000000000000 Binary files a/icon-themes/sifr/cmd/sc_togglelegend.png and /dev/null differ diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt index a673b1dac018..fcf553fc4cf3 100644 --- a/icon-themes/sifr/links.txt +++ b/icon-themes/sifr/links.txt @@ -1,3 +1,48 @@ +# avmedia +# ============================================== +avmedia/res/av02048.png cmd/sc_open.png +avmedia/res/av02049.png cmd/sc_runbasic.png +avmedia/res/av02050.png cmd/sc_mediapause.png +avmedia/res/av02051.png cmd/sc_basicstop.png +avmedia/res/av02052.png cmd/sc_mediarepeat.png +avmedia/res/av02053.png cmd/sc_ok.png +avmedia/res/av02054.png cmd/sc_mediamute.png +avmedia/res/avl02048.png cmd/lc_open.png +avmedia/res/avl02049.png cmd/lc_mediaplay.png +avmedia/res/avl02050.png cmd/lc_mediapause.png +avmedia/res/avl02051.png cmd/lc_basicstop.png +avmedia/res/avl02052.png cmd/lc_mediarepeat.png +avmedia/res/avl02053.png cmd/lc_ok.png +avmedia/res/avl02054.png cmd/lc_mediamute.png + +# chart2 +# ============================================== +chart2/res/dataeditor_icon01.png cmd/sc_insertrowsafter.png +chart2/res/dataeditor_icon02.png cmd/sc_insertcolumnsafter.png +chart2/res/dataeditor_icon03.png cmd/sc_deleterows.png +chart2/res/dataeditor_icon04.png cmd/sc_deletecolumns.png +chart2/res/dataeditor_icon05.png cmd/sc_insertcellsright.png +chart2/res/dataeditor_icon06.png cmd/sc_insertcellsdown.png +chart2/res/dataeditor_icon07.png cmd/sc_insertcolumnsafter.png +chart2/res/dataeditor_icon08.png cmd/sc_insertcolumns.png +chart2/res/dataeditor_icon09.png cmd/sc_insertrowsbefore.png +chart2/res/selectrange.png formula/res/refinp1.png + +cmd/sc_insertmenulegend.png cmd/sc_legend.png +cmd/sc_togglelegend.png cmd/sc_legend.png +cmd/sc_insertmenuaxes.png cmd/sc_diagramaxis.png +cmd/sc_insertmenugrids.png cmd/sc_togglegridhorizontal.png +cmd/sc_diagramaxisall.png cmd/sc_diagramaxisxyz.png +cmd/lc_insertmenulegend.png cmd/lc_legend.png +cmd/lc_togglelegend.png cmd/lc_legend.png +cmd/lc_insertmenuaxes.png cmd/lc_diagramaxis.png +cmd/lc_insertmenugrids.png cmd/lc_togglegridhorizontal.png +cmd/lc_diagramaxisall.png cmd/lc_diagramaxisxyz.png + +cmd/sc_charttitlemenu.png cmd/sc_toggletitle.png +cmd/sc_diagramaxismenu.png cmd/sc_diagramaxis.png +cmd/sc_diagramgridmenu.png cmd/sc_togglegridhorizontal.png + # Navigator - Writer sw/res/all_left.png cmd/sc_firstpage.png sw/res/all_right.png cmd/sc_lastpage.png diff --git a/icon-themes/sifr_dark/cmd/lc_diagramaxisall.png b/icon-themes/sifr_dark/cmd/lc_diagramaxisall.png new file mode 100644 index 000000000000..8936a6a1e6c0 Binary files /dev/null and b/icon-themes/sifr_dark/cmd/lc_diagramaxisall.png differ diff --git a/icon-themes/sifr_dark/cmd/lc_formatselection.png b/icon-themes/sifr_dark/cmd/lc_formatselection.png new file mode 100644 index 000000000000..4fbb3c25c588 Binary files /dev/null and b/icon-themes/sifr_dark/cmd/lc_formatselection.png differ diff --git a/icon-themes/sifr_dark/cmd/lc_insertmenutitles.png b/icon-themes/sifr_dark/cmd/lc_insertmenutitles.png new file mode 100644 index 000000000000..f1c271d17bad Binary files /dev/null and b/icon-themes/sifr_dark/cmd/lc_insertmenutitles.png differ diff --git a/icon-themes/sifr_dark/cmd/lc_mediapause.png b/icon-themes/sifr_dark/cmd/lc_mediapause.png index ab7d410738d4..3ba75130bf30 100644 Binary files a/icon-themes/sifr_dark/cmd/lc_mediapause.png and b/icon-themes/sifr_dark/cmd/lc_mediapause.png differ diff --git a/icon-themes/sifr_dark/cmd/lc_mediaplay.png b/icon-themes/sifr_dark/cmd/lc_mediaplay.png new file mode 100644 index 000000000000..6d08085c1605 Binary files /dev/null and b/icon-themes/sifr_dark/cmd/lc_mediaplay.png differ diff --git a/icon-themes/sifr_dark/cmd/lc_ok.png b/icon-themes/sifr_dark/cmd/lc_ok.png index 719621ab24d0..58fa3a42b367 100644 Binary files a/icon-themes/sifr_dark/cmd/lc_ok.png and b/icon-themes/sifr_dark/cmd/lc_ok.png differ diff --git a/icon-themes/sifr_dark/cmd/lc_togglelegend.png b/icon-themes/sifr_dark/cmd/lc_togglelegend.png deleted file mode 100644 index 45c02cd833ec..000000000000 Binary files a/icon-themes/sifr_dark/cmd/lc_togglelegend.png and /dev/null differ diff --git a/icon-themes/sifr_dark/cmd/sc_ok.png b/icon-themes/sifr_dark/cmd/sc_ok.png index fb489b7dcfe4..eeae34a1423d 100644 Binary files a/icon-themes/sifr_dark/cmd/sc_ok.png and b/icon-themes/sifr_dark/cmd/sc_ok.png differ diff --git a/icon-themes/sifr_dark/cmd/sc_togglelegend.png b/icon-themes/sifr_dark/cmd/sc_togglelegend.png deleted file mode 100644 index b899a6d5a285..000000000000 Binary files a/icon-themes/sifr_dark/cmd/sc_togglelegend.png and /dev/null differ diff --git a/icon-themes/sifr_svg/cmd/lc_formatselection.svg b/icon-themes/sifr_svg/cmd/lc_formatselection.svg new file mode 100644 index 000000000000..67acec2dd49c --- /dev/null +++ b/icon-themes/sifr_svg/cmd/lc_formatselection.svg @@ -0,0 +1,6 @@ + + + diff --git a/icon-themes/sifr_svg/cmd/lc_insertmenutitles.svg b/icon-themes/sifr_svg/cmd/lc_insertmenutitles.svg new file mode 100644 index 000000000000..e911bcf57370 --- /dev/null +++ b/icon-themes/sifr_svg/cmd/lc_insertmenutitles.svg @@ -0,0 +1,6 @@ + + + diff --git a/icon-themes/sifr_svg/cmd/lc_mediapause.svg b/icon-themes/sifr_svg/cmd/lc_mediapause.svg index 6c2b638ece42..296be053f691 100644 --- a/icon-themes/sifr_svg/cmd/lc_mediapause.svg +++ b/icon-themes/sifr_svg/cmd/lc_mediapause.svg @@ -1,6 +1,6 @@ diff --git a/icon-themes/sifr_svg/cmd/lc_mediaplay.svg b/icon-themes/sifr_svg/cmd/lc_mediaplay.svg new file mode 100644 index 000000000000..3b52b9f3bc7d --- /dev/null +++ b/icon-themes/sifr_svg/cmd/lc_mediaplay.svg @@ -0,0 +1,6 @@ + + + diff --git a/icon-themes/sifr_svg/cmd/lc_ok.svg b/icon-themes/sifr_svg/cmd/lc_ok.svg index f34c9456f97b..64b09992cc07 100644 --- a/icon-themes/sifr_svg/cmd/lc_ok.svg +++ b/icon-themes/sifr_svg/cmd/lc_ok.svg @@ -1,6 +1,6 @@ diff --git a/icon-themes/sifr_svg/cmd/lc_togglelegend.svg b/icon-themes/sifr_svg/cmd/lc_togglelegend.svg deleted file mode 100644 index becf2fb58bdb..000000000000 --- a/icon-themes/sifr_svg/cmd/lc_togglelegend.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/icon-themes/sifr_svg/cmd/sc_diagramaxisall.svg b/icon-themes/sifr_svg/cmd/sc_diagramaxisall.svg deleted file mode 100644 index 34bc65a16149..000000000000 --- a/icon-themes/sifr_svg/cmd/sc_diagramaxisall.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/icon-themes/sifr_svg/cmd/sc_ok.svg b/icon-themes/sifr_svg/cmd/sc_ok.svg index 6ebb06780f8c..e0a26a8f790c 100644 --- a/icon-themes/sifr_svg/cmd/sc_ok.svg +++ b/icon-themes/sifr_svg/cmd/sc_ok.svg @@ -1,6 +1,6 @@ diff --git a/icon-themes/sifr_svg/cmd/sc_togglelegend.svg b/icon-themes/sifr_svg/cmd/sc_togglelegend.svg deleted file mode 100644 index 644e62633fc3..000000000000 --- a/icon-themes/sifr_svg/cmd/sc_togglelegend.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu index 6c2dd124ea4e..d3a54a052c8e 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/ChartCommands.xcu @@ -19,16 +19,25 @@ ~Legend... + + 1 + ~Axes... + + 1 + ~Grids... + + 1 + @@ -665,6 +674,9 @@ Arrange~ment + + 1 + @@ -675,11 +687,17 @@ A~xis + + 1 + ~Grid + + 1 + -- cgit