[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_svg icon-themes/colibre icon-themes/colibre_svg icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_svg sc/uiconfig sw/uiconfig

andreas kainz (via logerrit) logerrit at kemper.freedesktop.org
Wed Aug 28 13:07:04 UTC 2019


 icon-themes/breeze/cmd/lc_redactdoc.png      |binary
 icon-themes/breeze/cmd/sc_redactdoc.png      |binary
 icon-themes/breeze_dark/cmd/lc_redactdoc.png |binary
 icon-themes/breeze_dark/cmd/sc_redactdoc.png |binary
 icon-themes/breeze_svg/cmd/lc_redactdoc.svg  |    6 ++++++
 icon-themes/breeze_svg/cmd/sc_redactdoc.svg  |    6 ++++++
 icon-themes/colibre/cmd/lc_redactdoc.png     |binary
 icon-themes/colibre/cmd/sc_redactdoc.png     |binary
 icon-themes/colibre_svg/cmd/lc_redactdoc.svg |   18 ++++++++++++++++++
 icon-themes/colibre_svg/cmd/sc_redactdoc.svg |   13 +++++++++++++
 icon-themes/sifr/cmd/lc_redactdoc.png        |binary
 icon-themes/sifr/cmd/sc_redactdoc.png        |binary
 icon-themes/sifr_dark/cmd/lc_redactdoc.png   |binary
 icon-themes/sifr_dark/cmd/sc_redactdoc.png   |binary
 icon-themes/sifr_svg/cmd/lc_redactdoc.svg    |    6 ++++++
 icon-themes/sifr_svg/cmd/sc_redactdoc.svg    |    6 ++++++
 sc/uiconfig/scalc/menubar/menubar.xml        |    1 +
 sw/uiconfig/swriter/menubar/menubar.xml      |    1 +
 18 files changed, 57 insertions(+)

New commits:
commit 257fab2c6532e4366f83f04641993bac8943ea19
Author:     andreas kainz <kainz.a at gmail.com>
AuthorDate: Wed Mar 27 11:32:57 2019 +0100
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Wed Aug 28 15:05:32 2019 +0200

    tdf#124293 add RedactDoc to writer, calc menubar in tools
    
    Change-Id: I8276506aaeaaee2bef5dad832d488450688081ee
    Reviewed-on: https://gerrit.libreoffice.org/69810
    Tested-by: Jenkins
    Reviewed-by: andreas_kainz <kainz.a at gmail.com>
    (cherry picked from commit 1f7a2cee590ff5902d52630688b4e02745ed6c7b)
    Reviewed-on: https://gerrit.libreoffice.org/78124
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/icon-themes/breeze/cmd/lc_redactdoc.png b/icon-themes/breeze/cmd/lc_redactdoc.png
new file mode 100644
index 000000000000..612f698f7732
Binary files /dev/null and b/icon-themes/breeze/cmd/lc_redactdoc.png differ
diff --git a/icon-themes/breeze/cmd/sc_redactdoc.png b/icon-themes/breeze/cmd/sc_redactdoc.png
new file mode 100644
index 000000000000..b15bffbebc50
Binary files /dev/null and b/icon-themes/breeze/cmd/sc_redactdoc.png differ
diff --git a/icon-themes/breeze_dark/cmd/lc_redactdoc.png b/icon-themes/breeze_dark/cmd/lc_redactdoc.png
new file mode 100644
index 000000000000..d1b07a792df2
Binary files /dev/null and b/icon-themes/breeze_dark/cmd/lc_redactdoc.png differ
diff --git a/icon-themes/breeze_dark/cmd/sc_redactdoc.png b/icon-themes/breeze_dark/cmd/sc_redactdoc.png
new file mode 100644
index 000000000000..ccb75e7f9f15
Binary files /dev/null and b/icon-themes/breeze_dark/cmd/sc_redactdoc.png differ
diff --git a/icon-themes/breeze_svg/cmd/lc_redactdoc.svg b/icon-themes/breeze_svg/cmd/lc_redactdoc.svg
new file mode 100644
index 000000000000..e3389fc7bc33
--- /dev/null
+++ b/icon-themes/breeze_svg/cmd/lc_redactdoc.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <path
+     style="fill:#4d4d4d"
+     d="M 5 4 L 5 20 L 6 20 L 14 20 L 15 20 L 15 19.990234 L 15.007812 20 L 19 16.007812 L 19 16 L 19 14.59375 L 19 4 L 5 4 z M 6 5 L 18 5 L 18 15 L 14 15 L 14 16 L 14 19 L 6 19 L 6 5 z M 8 9 L 8 10 L 11 10 L 11 9 L 8 9 z M 12 9 L 12 10 L 16 10 L 16 9 L 12 9 z M 8 12 L 8 13 L 13 13 L 13 12 L 8 12 z M 14 12 L 14 13 L 16 13 L 16 12 L 14 12 z M 8 15 L 8 16 L 11 16 L 11 15 L 8 15 z "
+     />
+</svg>
diff --git a/icon-themes/breeze_svg/cmd/sc_redactdoc.svg b/icon-themes/breeze_svg/cmd/sc_redactdoc.svg
new file mode 100644
index 000000000000..da2be3369999
--- /dev/null
+++ b/icon-themes/breeze_svg/cmd/sc_redactdoc.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <path
+     style="fill:#4d4d4d"
+     d="M 3 2 L 3 14 L 10 14 L 13 11 L 13 2 L 3 2 z M 4 3 L 12 3 L 12 10 L 9 10 L 9 13 L 4 13 L 4 3 z M 5 5 L 5 6 L 10 6 L 10 5 L 5 5 z M 5 7 L 5 8 L 7 8 L 7 7 L 5 7 z M 8 7 L 8 8 L 11 8 L 11 7 L 8 7 z M 5 9 L 5 10 L 8 10 L 8 9 L 5 9 z "
+     />
+</svg>
diff --git a/icon-themes/colibre/cmd/lc_redactdoc.png b/icon-themes/colibre/cmd/lc_redactdoc.png
new file mode 100644
index 000000000000..3cdc2ffc2918
Binary files /dev/null and b/icon-themes/colibre/cmd/lc_redactdoc.png differ
diff --git a/icon-themes/colibre/cmd/sc_redactdoc.png b/icon-themes/colibre/cmd/sc_redactdoc.png
new file mode 100644
index 000000000000..013684ba7470
Binary files /dev/null and b/icon-themes/colibre/cmd/sc_redactdoc.png differ
diff --git a/icon-themes/colibre_svg/cmd/lc_redactdoc.svg b/icon-themes/colibre_svg/cmd/lc_redactdoc.svg
new file mode 100644
index 000000000000..385d9bab4a36
--- /dev/null
+++ b/icon-themes/colibre_svg/cmd/lc_redactdoc.svg
@@ -0,0 +1,18 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <path
+     d="M 5 4 L 5 9 L 5 21 L 10.976562 21 L 15.818359 21 L 19 21 L 19 20.121094 L 19 16.623047 L 19 9 L 19 7.7285156 L 15 4 L 5 4 z "
+     style="fill:#ffffff" />
+  <path
+     style="fill:#808080"
+     d="M 5 3 C 4.446 3 4 3.446 4 4 L 4 21 C 4 21.554 4.446 22 5 22 L 20 22 L 20 8.25 L 20 8.0410156 C 20 7.5903357 20.098038 7.6156035 19.394531 6.9746094 L 16.087891 3.7363281 C 15.378366 2.9994706 15.377722 3 14.994141 3 L 5 3 z M 5 4 L 14 4 L 14 8 C 14 8.554 14.446 9 15 9 L 19 9 L 19 21 L 5 21 L 5 4 z "
+     />
+  <path
+     d="m15 8h4l-4-4z"
+     fill="#fff"
+     fill-rule="evenodd"
+     />
+  <path
+     style="fill:#808080"
+     d="M 7 6 C 6.446 6 6 6.446 6 7 C 6 7.554 6.446 8 7 8 L 12 8 C 12.554 8 13 7.554 13 7 C 13 6.446 12.554 6 12 6 L 7 6 z M 7 10 C 6.446 10 6 10.446 6 11 C 6 11.554 6.446 12 7 12 L 13 12 C 13.554 12 14 11.554 14 11 C 14 10.446 13.554 10 13 10 L 7 10 z M 10 13 C 8.8954305 13 8 13.895431 8 15 C 8 16.104569 8.8954305 17 10 17 C 11.104569 17 12 16.104569 12 15 C 12 13.895431 11.104569 13 10 13 z M 10 14 C 10.552285 14 11 14.447715 11 15 C 11 15.552285 10.552285 16 10 16 C 9.4477153 16 9 15.552285 9 15 C 9 14.447715 9.4477153 14 10 14 z M 14 16 C 13.446 16 13 16.446 13 17 L 13 19 C 13 19.554 13.446 20 14 20 L 17 20 C 17.554 20 18 19.554 18 19 L 18 17 C 18 16.446 17.554 16 17 16 L 14 16 z M 14 17 L 17 17 L 17 19 L 14 19 L 14 17 z M 7 18 C 6.446 18 6 18.446 6 19 C 6 19.554 6.446 20 7 20 L 9 20 C 9.554 20 10 19.554 10 19 C 10 18.446 9.554 18 9 18 L 7 18 z "
+     />
+</svg>
diff --git a/icon-themes/colibre_svg/cmd/sc_redactdoc.svg b/icon-themes/colibre_svg/cmd/sc_redactdoc.svg
new file mode 100644
index 000000000000..34420f64e67d
--- /dev/null
+++ b/icon-themes/colibre_svg/cmd/sc_redactdoc.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <path
+     d="M 3 1 L 3 5 L 3 15 L 6.2011719 15 L 10.259766 15 L 13 15 L 13 14.091797 L 13 10.890625 L 13 5 L 13 3.7050781 L 10.304688 1 L 3 1 z "
+     style="fill:#ffffff" />
+  <path
+     style="fill:#808080"
+     d="M 3 0 C 2.446 0 2 0.446 2 1 L 2 15 C 2 15.554 2.446 16 3 16 L 13 16 C 13.554 16 14 15.554 14 15 L 14 4.5 L 14 3.6367188 L 10.363281 0 L 9.5 0 L 3 0 z M 3 1 L 9 1 L 9 4.5 C 9 4.777 9.223 5 9.5 5 L 13 5 L 13 15 L 3 15 L 3 1 z M 10 1 L 13 4 L 10 4 L 10 1 z "
+     />
+  <path
+     style="fill:#808080"
+     d="M 5 2 C 4.446 2 4 2.446 4 3 C 4 3.554 4.446 4 5 4 L 7 4 C 7.554 4 8 3.554 8 3 C 8 2.446 7.554 2 7 2 L 5 2 z M 4.4824219 6 C 4.2148117 6 4 6.2148117 4 6.4824219 L 4 6.5175781 C 4 6.7851883 4.2148117 7 4.4824219 7 L 8.5175781 7 C 8.7851883 7 9 6.7851883 9 6.5175781 L 9 6.4824219 C 9 6.2148117 8.7851883 6 8.5175781 6 L 4.4824219 6 z M 7 8 A 2 2 0 0 0 5 10 A 2 2 0 0 0 7 12 A 2 2 0 0 0 9 10 A 2 2 0 0 0 7 8 z M 7 9 A 1 1 0 0 1 8 10 A 1 1 0 0 1 7 11 A 1 1 0 0 1 6 10 A 1 1 0 0 1 7 9 z M 4.5 13 C 4.223 13 4 13.223 4 13.5 C 4 13.777 4.223 14 4.5 14 L 5.5 14 C 5.777 14 6 13.777 6 13.5 C 6 13.223 5.777 13 5.5 13 L 4.5 13 z M 8.5 13 C 8.223 13 8 13.223 8 13.5 C 8 13.777 8.223 14 8.5 14 L 11.5 14 C 11.777 14 12 13.777 12 13.5 C 12 13.223 11.777 13 11.5 13 L 8.5 13 z "
+     />
+</svg>
diff --git a/icon-themes/sifr/cmd/lc_redactdoc.png b/icon-themes/sifr/cmd/lc_redactdoc.png
new file mode 100644
index 000000000000..dcd2e4e11189
Binary files /dev/null and b/icon-themes/sifr/cmd/lc_redactdoc.png differ
diff --git a/icon-themes/sifr/cmd/sc_redactdoc.png b/icon-themes/sifr/cmd/sc_redactdoc.png
new file mode 100644
index 000000000000..ab33ed998565
Binary files /dev/null and b/icon-themes/sifr/cmd/sc_redactdoc.png differ
diff --git a/icon-themes/sifr_dark/cmd/lc_redactdoc.png b/icon-themes/sifr_dark/cmd/lc_redactdoc.png
new file mode 100644
index 000000000000..86d5dc3c4b25
Binary files /dev/null and b/icon-themes/sifr_dark/cmd/lc_redactdoc.png differ
diff --git a/icon-themes/sifr_dark/cmd/sc_redactdoc.png b/icon-themes/sifr_dark/cmd/sc_redactdoc.png
new file mode 100644
index 000000000000..9d67ba17c6f1
Binary files /dev/null and b/icon-themes/sifr_dark/cmd/sc_redactdoc.png differ
diff --git a/icon-themes/sifr_svg/cmd/lc_redactdoc.svg b/icon-themes/sifr_svg/cmd/lc_redactdoc.svg
new file mode 100644
index 000000000000..a68cfcfb572b
--- /dev/null
+++ b/icon-themes/sifr_svg/cmd/lc_redactdoc.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <path
+     style="fill:#555753"
+     d="M 4,2 V 23 H 20 V 21 9 8 L 14,2 Z m 2,2 h 7 v 5 h 5 V 21 H 6 Z m 1,2 v 2 h 5 V 6 Z m 2,4 c -1.1045695,0 -2,0.895431 -2,2 0,1.104569 0.8954305,2 2,2 1.10457,0 2,-0.895431 2,-2 0,-1.104569 -0.89543,-2 -2,-2 z m 3,1 v 2 h 5 v -2 z m -5,6 v 2 h 4 v -2 z"
+     />
+</svg>
diff --git a/icon-themes/sifr_svg/cmd/sc_redactdoc.svg b/icon-themes/sifr_svg/cmd/sc_redactdoc.svg
new file mode 100644
index 000000000000..1d3ab0496af5
--- /dev/null
+++ b/icon-themes/sifr_svg/cmd/sc_redactdoc.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <path
+     style="fill:#555753"
+     d="M 2,1 V 15 H 14 V 6 5 L 10,1 Z m 2,2 h 5 v 3 h 3 v 7 H 4 Z M 5,4 V 6 H 8 V 4 Z m 3,3 v 2 h 3 V 7 Z M 6.5,9 C 5.6715729,9 5,9.6715729 5,10.5 5,11.328427 5.6715729,12 6.5,12 7.3284271,12 8,11.328427 8,10.5 8,9.6715729 7.3284271,9 6.5,9 Z"
+     />
+</svg>
diff --git a/sc/uiconfig/scalc/menubar/menubar.xml b/sc/uiconfig/scalc/menubar/menubar.xml
index 86883553a691..1dce81bd7fac 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -699,6 +699,7 @@
             </menu:menu>
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:AutoCorrectDlg"/>
+            <menu:menuitem menu:id=".uno:RedactDoc"/>
             <menu:menuseparator/>
             <menu:menuitem menu:id=".uno:GoalSeekDialog"/>
             <menu:menuitem menu:id=".uno:SolverDialog"/>
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 7c6ac205475b..d3f9f15e02d1 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -728,6 +728,7 @@
         </menu:menupopup>
       </menu:menu>
       <menu:menuitem menu:id=".uno:EditGlossary"/>
+      <menu:menuitem menu:id=".uno:RedactDoc"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:ChapterNumberingDialog"/>
       <menu:menuitem menu:id=".uno:LineNumberingDialog"/>


More information about the Libreoffice-commits mailing list