From 8fad60e54069b021206c20bd38718104ef2b8958 Mon Sep 17 00:00:00 2001 From: rizmut Date: Wed, 26 Feb 2020 14:40:49 +0700 Subject: Breeze & Sifr: Fix for tdf#130939 Missing icons in Merge Cells dialog Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89498 Tested-by: Jenkins Reviewed-by: Rizal Muttaqin (cherry picked from commit 79d396a2a64bec4e6c9aa514af40fdd67a62d8ce) Change-Id: Ic3dbf4cc8748455fe8086cdaf4b154cdc9ee9272 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89515 Tested-by: Rizal Muttaqin Reviewed-by: Rizal Muttaqin --- icon-themes/breeze/links.txt | 6 +++--- icon-themes/breeze/vcl/res/MergeEmptyHidden.png | Bin 0 -> 744 bytes icon-themes/breeze/vcl/res/MergeFirstCell.png | Bin 0 -> 768 bytes icon-themes/breeze/vcl/res/MergeKeepHidden.png | Bin 0 -> 841 bytes icon-themes/breeze_dark/links.txt | 6 +++--- icon-themes/breeze_dark/vcl/res/MergeEmptyHidden.png | Bin 0 -> 779 bytes icon-themes/breeze_dark/vcl/res/MergeFirstCell.png | Bin 0 -> 802 bytes icon-themes/breeze_dark/vcl/res/MergeKeepHidden.png | Bin 0 -> 885 bytes icon-themes/breeze_dark_svg/vcl/res/MergeEmptyHidden.svg | 1 + icon-themes/breeze_dark_svg/vcl/res/MergeFirstCell.svg | 1 + icon-themes/breeze_dark_svg/vcl/res/MergeKeepHidden.svg | 1 + icon-themes/breeze_svg/vcl/res/MergeEmptyHidden.svg | 1 + icon-themes/breeze_svg/vcl/res/MergeFirstCell.svg | 1 + icon-themes/breeze_svg/vcl/res/MergeKeepHidden.svg | 1 + icon-themes/sifr/links.txt | 5 +++-- icon-themes/sifr/vcl/res/MergeEmptyHidden.png | Bin 0 -> 564 bytes icon-themes/sifr/vcl/res/MergeFirstCell.png | Bin 0 -> 604 bytes icon-themes/sifr/vcl/res/MergeKeepHidden.png | Bin 0 -> 690 bytes icon-themes/sifr_dark/links.txt | 5 +++-- icon-themes/sifr_dark/vcl/res/MergeEmptyHidden.png | Bin 0 -> 572 bytes icon-themes/sifr_dark/vcl/res/MergeFirstCell.png | Bin 0 -> 606 bytes icon-themes/sifr_dark/vcl/res/MergeKeepHidden.png | Bin 0 -> 720 bytes icon-themes/sifr_dark_svg/vcl/res/MergeEmptyHidden.svg | 1 + icon-themes/sifr_dark_svg/vcl/res/MergeFirstCell.svg | 1 + icon-themes/sifr_dark_svg/vcl/res/MergeKeepHidden.svg | 1 + icon-themes/sifr_svg/vcl/res/MergeEmptyHidden.svg | 1 + icon-themes/sifr_svg/vcl/res/MergeFirstCell.svg | 1 + icon-themes/sifr_svg/vcl/res/MergeKeepHidden.svg | 1 + 28 files changed, 24 insertions(+), 10 deletions(-) create mode 100644 icon-themes/breeze/vcl/res/MergeEmptyHidden.png create mode 100644 icon-themes/breeze/vcl/res/MergeFirstCell.png create mode 100644 icon-themes/breeze/vcl/res/MergeKeepHidden.png create mode 100644 icon-themes/breeze_dark/vcl/res/MergeEmptyHidden.png create mode 100644 icon-themes/breeze_dark/vcl/res/MergeFirstCell.png create mode 100644 icon-themes/breeze_dark/vcl/res/MergeKeepHidden.png create mode 100644 icon-themes/breeze_dark_svg/vcl/res/MergeEmptyHidden.svg create mode 100644 icon-themes/breeze_dark_svg/vcl/res/MergeFirstCell.svg create mode 100644 icon-themes/breeze_dark_svg/vcl/res/MergeKeepHidden.svg create mode 100644 icon-themes/breeze_svg/vcl/res/MergeEmptyHidden.svg create mode 100644 icon-themes/breeze_svg/vcl/res/MergeFirstCell.svg create mode 100644 icon-themes/breeze_svg/vcl/res/MergeKeepHidden.svg create mode 100644 icon-themes/sifr/vcl/res/MergeEmptyHidden.png create mode 100644 icon-themes/sifr/vcl/res/MergeFirstCell.png create mode 100644 icon-themes/sifr/vcl/res/MergeKeepHidden.png create mode 100644 icon-themes/sifr_dark/vcl/res/MergeEmptyHidden.png create mode 100644 icon-themes/sifr_dark/vcl/res/MergeFirstCell.png create mode 100644 icon-themes/sifr_dark/vcl/res/MergeKeepHidden.png create mode 100644 icon-themes/sifr_dark_svg/vcl/res/MergeEmptyHidden.svg create mode 100644 icon-themes/sifr_dark_svg/vcl/res/MergeFirstCell.svg create mode 100644 icon-themes/sifr_dark_svg/vcl/res/MergeKeepHidden.svg create mode 100644 icon-themes/sifr_svg/vcl/res/MergeEmptyHidden.svg create mode 100644 icon-themes/sifr_svg/vcl/res/MergeFirstCell.svg create mode 100644 icon-themes/sifr_svg/vcl/res/MergeKeepHidden.svg diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt index 37e973d56a3a..6c920fbc6a6f 100644 --- a/icon-themes/breeze/links.txt +++ b/icon-themes/breeze/links.txt @@ -1491,9 +1491,9 @@ cmd/lc_contourdialog.png cmd/lc_imagemapdialog.png cmd/sc_contourdialog.png cmd/sc_imagemapdialog.png # Config -cmd/32/formatselection.png cmd/32/formproperties.png -cmd/lc_formatselection.png cmd/lc_formproperties.png -cmd/sc_formatselection.png cmd/sc_formproperties.png +cmd/32/formatselection.png cmd/32/configuredialog.png +cmd/lc_formatselection.png cmd/lc_configuredialog.png +cmd/sc_formatselection.png cmd/sc_configuredialog.png # Hyphenation cmd/32/hyphenation.png cmd/32/hyphenate.png diff --git a/icon-themes/breeze/vcl/res/MergeEmptyHidden.png b/icon-themes/breeze/vcl/res/MergeEmptyHidden.png new file mode 100644 index 000000000000..304dc3ef2c6b Binary files /dev/null and b/icon-themes/breeze/vcl/res/MergeEmptyHidden.png differ diff --git a/icon-themes/breeze/vcl/res/MergeFirstCell.png b/icon-themes/breeze/vcl/res/MergeFirstCell.png new file mode 100644 index 000000000000..a17ae3d80652 Binary files /dev/null and b/icon-themes/breeze/vcl/res/MergeFirstCell.png differ diff --git a/icon-themes/breeze/vcl/res/MergeKeepHidden.png b/icon-themes/breeze/vcl/res/MergeKeepHidden.png new file mode 100644 index 000000000000..1c51acb09d0a Binary files /dev/null and b/icon-themes/breeze/vcl/res/MergeKeepHidden.png differ diff --git a/icon-themes/breeze_dark/links.txt b/icon-themes/breeze_dark/links.txt index 37e973d56a3a..6c920fbc6a6f 100644 --- a/icon-themes/breeze_dark/links.txt +++ b/icon-themes/breeze_dark/links.txt @@ -1491,9 +1491,9 @@ cmd/lc_contourdialog.png cmd/lc_imagemapdialog.png cmd/sc_contourdialog.png cmd/sc_imagemapdialog.png # Config -cmd/32/formatselection.png cmd/32/formproperties.png -cmd/lc_formatselection.png cmd/lc_formproperties.png -cmd/sc_formatselection.png cmd/sc_formproperties.png +cmd/32/formatselection.png cmd/32/configuredialog.png +cmd/lc_formatselection.png cmd/lc_configuredialog.png +cmd/sc_formatselection.png cmd/sc_configuredialog.png # Hyphenation cmd/32/hyphenation.png cmd/32/hyphenate.png diff --git a/icon-themes/breeze_dark/vcl/res/MergeEmptyHidden.png b/icon-themes/breeze_dark/vcl/res/MergeEmptyHidden.png new file mode 100644 index 000000000000..020104129662 Binary files /dev/null and b/icon-themes/breeze_dark/vcl/res/MergeEmptyHidden.png differ diff --git a/icon-themes/breeze_dark/vcl/res/MergeFirstCell.png b/icon-themes/breeze_dark/vcl/res/MergeFirstCell.png new file mode 100644 index 000000000000..2ba0e1383998 Binary files /dev/null and b/icon-themes/breeze_dark/vcl/res/MergeFirstCell.png differ diff --git a/icon-themes/breeze_dark/vcl/res/MergeKeepHidden.png b/icon-themes/breeze_dark/vcl/res/MergeKeepHidden.png new file mode 100644 index 000000000000..a14fa7223237 Binary files /dev/null and b/icon-themes/breeze_dark/vcl/res/MergeKeepHidden.png differ diff --git a/icon-themes/breeze_dark_svg/vcl/res/MergeEmptyHidden.svg b/icon-themes/breeze_dark_svg/vcl/res/MergeEmptyHidden.svg new file mode 100644 index 000000000000..476bef45ef04 --- /dev/null +++ b/icon-themes/breeze_dark_svg/vcl/res/MergeEmptyHidden.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icon-themes/breeze_dark_svg/vcl/res/MergeFirstCell.svg b/icon-themes/breeze_dark_svg/vcl/res/MergeFirstCell.svg new file mode 100644 index 000000000000..982d320395b2 --- /dev/null +++ b/icon-themes/breeze_dark_svg/vcl/res/MergeFirstCell.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icon-themes/breeze_dark_svg/vcl/res/MergeKeepHidden.svg b/icon-themes/breeze_dark_svg/vcl/res/MergeKeepHidden.svg new file mode 100644 index 000000000000..25844aaa9df1 --- /dev/null +++ b/icon-themes/breeze_dark_svg/vcl/res/MergeKeepHidden.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icon-themes/breeze_svg/vcl/res/MergeEmptyHidden.svg b/icon-themes/breeze_svg/vcl/res/MergeEmptyHidden.svg new file mode 100644 index 000000000000..caaf2cbd127f --- /dev/null +++ b/icon-themes/breeze_svg/vcl/res/MergeEmptyHidden.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icon-themes/breeze_svg/vcl/res/MergeFirstCell.svg b/icon-themes/breeze_svg/vcl/res/MergeFirstCell.svg new file mode 100644 index 000000000000..c8418c12e9cd --- /dev/null +++ b/icon-themes/breeze_svg/vcl/res/MergeFirstCell.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icon-themes/breeze_svg/vcl/res/MergeKeepHidden.svg b/icon-themes/breeze_svg/vcl/res/MergeKeepHidden.svg new file mode 100644 index 000000000000..98377c6d94b1 --- /dev/null +++ b/icon-themes/breeze_svg/vcl/res/MergeKeepHidden.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt index 14e1c4522c99..22b6e3225ea0 100644 --- a/icon-themes/sifr/links.txt +++ b/icon-themes/sifr/links.txt @@ -629,7 +629,8 @@ cmd/id/sc_numberformatdecdecimals.png cmd/de/sc_numberformatdecdecimals.png cmd/id/sc_numberformatdecimal.png cmd/de/sc_numberformatdecimal.png cmd/id/sc_numberformatincdecimals.png cmd/de/sc_numberformatincdecimals.png cmd/id/sc_numberformatthousands.png cmd/de/sc_numberformatthousands.png -cmd/id/sc_numberformatincdecimals.png cmd/de/sc_numberformatincdecimals.png +cmd/lc_underlinesimple.png cmd/lc_underline.png +cmd/sc_underlinesimple.png cmd/sc_underline.png cmd/ur/lc_alphaliststyle.png cmd/ar/lc_alphaliststyle.png cmd/ur/lc_alphalowliststyle.png cmd/ar/lc_alphalowliststyle.png cmd/ur/lc_bulletliststyle.png cmd/ar/lc_defaultbullet.png @@ -1574,7 +1575,7 @@ cmd/sc_setdefault.png cmd/sc_resetattributes.png # Impress sfx2/res/symphony/sidebar-transition-small.png cmd/sc_slidechangewindow.png -sfx2/res/symphony/sidebar-transition-large.png cmd/lc_slidechangew +sfx2/res/symphony/sidebar-transition-large.png cmd/lc_slidechangewindow.png # navigator cmd/32/dsbdocumentdatasource.png cmd/32/sbaexecutesql.png diff --git a/icon-themes/sifr/vcl/res/MergeEmptyHidden.png b/icon-themes/sifr/vcl/res/MergeEmptyHidden.png new file mode 100644 index 000000000000..980fcdb3959b Binary files /dev/null and b/icon-themes/sifr/vcl/res/MergeEmptyHidden.png differ diff --git a/icon-themes/sifr/vcl/res/MergeFirstCell.png b/icon-themes/sifr/vcl/res/MergeFirstCell.png new file mode 100644 index 000000000000..ed73da21a50b Binary files /dev/null and b/icon-themes/sifr/vcl/res/MergeFirstCell.png differ diff --git a/icon-themes/sifr/vcl/res/MergeKeepHidden.png b/icon-themes/sifr/vcl/res/MergeKeepHidden.png new file mode 100644 index 000000000000..cd082e259fd1 Binary files /dev/null and b/icon-themes/sifr/vcl/res/MergeKeepHidden.png differ diff --git a/icon-themes/sifr_dark/links.txt b/icon-themes/sifr_dark/links.txt index 14e1c4522c99..22b6e3225ea0 100644 --- a/icon-themes/sifr_dark/links.txt +++ b/icon-themes/sifr_dark/links.txt @@ -629,7 +629,8 @@ cmd/id/sc_numberformatdecdecimals.png cmd/de/sc_numberformatdecdecimals.png cmd/id/sc_numberformatdecimal.png cmd/de/sc_numberformatdecimal.png cmd/id/sc_numberformatincdecimals.png cmd/de/sc_numberformatincdecimals.png cmd/id/sc_numberformatthousands.png cmd/de/sc_numberformatthousands.png -cmd/id/sc_numberformatincdecimals.png cmd/de/sc_numberformatincdecimals.png +cmd/lc_underlinesimple.png cmd/lc_underline.png +cmd/sc_underlinesimple.png cmd/sc_underline.png cmd/ur/lc_alphaliststyle.png cmd/ar/lc_alphaliststyle.png cmd/ur/lc_alphalowliststyle.png cmd/ar/lc_alphalowliststyle.png cmd/ur/lc_bulletliststyle.png cmd/ar/lc_defaultbullet.png @@ -1574,7 +1575,7 @@ cmd/sc_setdefault.png cmd/sc_resetattributes.png # Impress sfx2/res/symphony/sidebar-transition-small.png cmd/sc_slidechangewindow.png -sfx2/res/symphony/sidebar-transition-large.png cmd/lc_slidechangew +sfx2/res/symphony/sidebar-transition-large.png cmd/lc_slidechangewindow.png # navigator cmd/32/dsbdocumentdatasource.png cmd/32/sbaexecutesql.png diff --git a/icon-themes/sifr_dark/vcl/res/MergeEmptyHidden.png b/icon-themes/sifr_dark/vcl/res/MergeEmptyHidden.png new file mode 100644 index 000000000000..f9c558fd2a0a Binary files /dev/null and b/icon-themes/sifr_dark/vcl/res/MergeEmptyHidden.png differ diff --git a/icon-themes/sifr_dark/vcl/res/MergeFirstCell.png b/icon-themes/sifr_dark/vcl/res/MergeFirstCell.png new file mode 100644 index 000000000000..bdda5ee7afa7 Binary files /dev/null and b/icon-themes/sifr_dark/vcl/res/MergeFirstCell.png differ diff --git a/icon-themes/sifr_dark/vcl/res/MergeKeepHidden.png b/icon-themes/sifr_dark/vcl/res/MergeKeepHidden.png new file mode 100644 index 000000000000..c7ba9a055847 Binary files /dev/null and b/icon-themes/sifr_dark/vcl/res/MergeKeepHidden.png differ diff --git a/icon-themes/sifr_dark_svg/vcl/res/MergeEmptyHidden.svg b/icon-themes/sifr_dark_svg/vcl/res/MergeEmptyHidden.svg new file mode 100644 index 000000000000..86177e26fd49 --- /dev/null +++ b/icon-themes/sifr_dark_svg/vcl/res/MergeEmptyHidden.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icon-themes/sifr_dark_svg/vcl/res/MergeFirstCell.svg b/icon-themes/sifr_dark_svg/vcl/res/MergeFirstCell.svg new file mode 100644 index 000000000000..1d04b09f77cc --- /dev/null +++ b/icon-themes/sifr_dark_svg/vcl/res/MergeFirstCell.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icon-themes/sifr_dark_svg/vcl/res/MergeKeepHidden.svg b/icon-themes/sifr_dark_svg/vcl/res/MergeKeepHidden.svg new file mode 100644 index 000000000000..2732be9cbe7a --- /dev/null +++ b/icon-themes/sifr_dark_svg/vcl/res/MergeKeepHidden.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icon-themes/sifr_svg/vcl/res/MergeEmptyHidden.svg b/icon-themes/sifr_svg/vcl/res/MergeEmptyHidden.svg new file mode 100644 index 000000000000..5f54fdef5b47 --- /dev/null +++ b/icon-themes/sifr_svg/vcl/res/MergeEmptyHidden.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icon-themes/sifr_svg/vcl/res/MergeFirstCell.svg b/icon-themes/sifr_svg/vcl/res/MergeFirstCell.svg new file mode 100644 index 000000000000..9b98426e65e6 --- /dev/null +++ b/icon-themes/sifr_svg/vcl/res/MergeFirstCell.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icon-themes/sifr_svg/vcl/res/MergeKeepHidden.svg b/icon-themes/sifr_svg/vcl/res/MergeKeepHidden.svg new file mode 100644 index 000000000000..5e86efcadbbc --- /dev/null +++ b/icon-themes/sifr_svg/vcl/res/MergeKeepHidden.svg @@ -0,0 +1 @@ + \ No newline at end of file -- cgit