[Libreoffice-commits] core.git: icon-themes/colibre officecfg/registry sd/uiconfig

[Muhammet Kara (via logerrit)]

 icon-themes/colibre/links.txt                                            |    5 +++
 officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu |   15 ++++++++--
 sd/uiconfig/sdraw/menubar/menubar.xml                                    |    2 -
 sd/uiconfig/sdraw/toolbar/redactionbar.xml                               |    2 -
 4 files changed, 20 insertions(+), 4 deletions(-)

New commits:
commit 3748535a5739f3cb1471516b2e7ae2601575b639
Author:     Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Sun Aug 22 03:24:25 2021 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Sun Aug 22 03:45:34 2021 +0200

    tdf#126915: Redaction: Clarify 'Export Directly as PDF'
    
    * Add new uno command alias '.uno:RedactionPreviewExport' with the
      desired label.
    * Add a link to the icon of the '.uno:ExportDirectToPDF' command so that
      the new alias is displayed correctly on the Redaction Toolbar
    * Replace '.uno:ExportDirectToPDF' with '.uno:RedactionPreviewExport' on
      the Redaction toolbar and the Redaction menu
    
    Change-Id: I72d17cac7d570341d89d1e59776e1af25f8d8b87
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120835
    Tested-by: Jenkins
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index 8814a92445a7..226ba61f52e6 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -2745,3 +2745,8 @@ cmd/sc_librelogo-goforward.png cmd/sc_arrowshapes.up-arrow.png
 cmd/sc_librelogo-run.png cmd/sc_runbasic.png
 cmd/sc_librelogo-stop.png cmd/sc_basicstop.png
 cmd/sc_librelogo-translate.png cmd/sc_editglossary.png
+
+# Draw/Redaction Toolbar
+cmd/32/redactionpreviewexport.png cmd/32/exportdirecttopdf.png
+cmd/lc_redactionpreviewexport.png cmd/lc_exportdirecttopdf.png
+cmd/sc_redactionpreviewexport.png cmd/sc_exportdirecttopdf.png
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index 189037b67a57..7dbef3ceb655 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -2501,7 +2501,7 @@
       </node>
       <node oor:name=".uno:RedactedExportBlack" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Redacted Export (Black)</value>
+          <value xml:lang="en-US">Export Redacted PDF (Black)</value>
         </prop>
         <prop oor:name="TargetURL" oor:type="xs:string">
           <value>.uno:ExportDirectToPDF?IsRedactMode:bool=true&RedactionStyle:string=Black</value>
@@ -2512,7 +2512,7 @@
       </node>
       <node oor:name=".uno:RedactedExportWhite" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Redacted Export (White)</value>
+          <value xml:lang="en-US">Export Redacted PDF (White)</value>
         </prop>
         <prop oor:name="TargetURL" oor:type="xs:string">
           <value>.uno:ExportDirectToPDF?IsRedactMode:bool=true&RedactionStyle:string=White</value>
@@ -2521,6 +2521,17 @@
           <value>1</value>
         </prop>
       </node>
+      <node oor:name=".uno:RedactionPreviewExport" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Export Preview PDF</value>
+        </prop>
+        <prop oor:name="TargetURL" oor:type="xs:string">
+          <value>.uno:ExportDirectToPDF</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
       <node oor:name=".uno:SidebarDeck.ShapesDeck" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">ShapesDeck</value>
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml
index 544155d33f04..fd327d6bc91b 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -620,7 +620,7 @@
           <menu:menuseparator/>
           <menu:menuitem menu:id=".uno:RedactedExportWhite"/>
           <menu:menuitem menu:id=".uno:RedactedExportBlack"/>
-          <menu:menuitem menu:id=".uno:ExportDirectToPDF"/>
+          <menu:menuitem menu:id=".uno:RedactionPreviewExport"/>
         </menu:menupopup>
       </menu:menu>
       <menu:menuseparator/>
diff --git a/sd/uiconfig/sdraw/toolbar/redactionbar.xml b/sd/uiconfig/sdraw/toolbar/redactionbar.xml
index 55cc492fdeee..2e4734e205ba 100644
--- a/sd/uiconfig/sdraw/toolbar/redactionbar.xml
+++ b/sd/uiconfig/sdraw/toolbar/redactionbar.xml
@@ -23,5 +23,5 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:RedactedExportWhite"/>
  <toolbar:toolbaritem xlink:href=".uno:RedactedExportBlack"/>
- <toolbar:toolbaritem xlink:href=".uno:ExportDirectToPDF"/>
+ <toolbar:toolbaritem xlink:href=".uno:RedactionPreviewExport"/>
 </toolbar:toolbar>