draw vs impress printer option pages

disambiguate contexts for impress vs draw printer options pages

Change-Id: I1bb52c49b95beab3d9acceec73370e0be8da6f59
Reviewed-on: https://gerrit.libreoffice.org/40747Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

sd/UIConfig_sdraw.mk

@@ -104,6 +104,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
 	sd/uiconfig/sdraw/ui/dlgsnap \
 	sd/uiconfig/sdraw/ui/copydlg \
 	sd/uiconfig/sdraw/ui/drawchardialog \
+	sd/uiconfig/sdraw/ui/drawprinteroptions \
 	sd/uiconfig/sdraw/ui/drawparadialog \
 	sd/uiconfig/sdraw/ui/drawpagedialog \
 	sd/uiconfig/sdraw/ui/drawprtldialog \
@@ -111,7 +112,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
 	sd/uiconfig/sdraw/ui/insertslidesdialog \
 	sd/uiconfig/sdraw/ui/namedesign \
 	sd/uiconfig/sdraw/ui/paranumberingtab \
-	sd/uiconfig/sdraw/ui/printeroptions \
 	sd/uiconfig/sdraw/ui/queryunlinkimagedialog \
 	sd/uiconfig/sdraw/ui/tabledesigndialog \
 	sd/uiconfig/sdraw/ui/vectorize \

sd/UIConfig_simpress.mk

@@ -124,6 +124,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
 	sd/uiconfig/simpress/ui/fontstylemenu \
 	sd/uiconfig/simpress/ui/headerfooterdialog \
 	sd/uiconfig/simpress/ui/headerfootertab \
+	sd/uiconfig/simpress/ui/impressprinteroptions \
 	sd/uiconfig/simpress/ui/insertslides \
 	sd/uiconfig/simpress/ui/interactiondialog \
 	sd/uiconfig/simpress/ui/interactionpage \
@@ -136,7 +137,6 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
 	sd/uiconfig/simpress/ui/optimpressgeneralpage \
 	sd/uiconfig/simpress/ui/photoalbum \
 	sd/uiconfig/simpress/ui/presentationdialog \
-	sd/uiconfig/simpress/ui/printeroptions \
 	sd/uiconfig/simpress/ui/prntopts \
 	sd/uiconfig/simpress/ui/publishingdialog \
 	sd/uiconfig/simpress/ui/remotedialog \

sd/source/ui/view/DocumentRenderer.cxx

@@ -367,9 +367,9 @@ namespace {
             beans::PropertyValue aOptionsUIFile;
             aOptionsUIFile.Name = "OptionsUIFile";
             if( mbImpress )
-                aOptionsUIFile.Value <<= OUString("modules/simpress/ui/printeroptions.ui");
+                aOptionsUIFile.Value <<= OUString("modules/simpress/ui/impressprinteroptions.ui");
             else
-                aOptionsUIFile.Value <<= OUString("modules/sdraw/ui/printeroptions.ui");
+                aOptionsUIFile.Value <<= OUString("modules/sdraw/ui/drawprinteroptions.ui");
             maProperties.push_back(aOptionsUIFile);
 
             SvtModuleOptions aOpt;

sd/uiconfig/sdraw/ui/printeroptions.ui → sd/uiconfig/sdraw/ui/drawprinteroptions.ui

@@ -29,7 +29,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="printname">
-                    <property name="label" translatable="yes" context="printeroptions|printname">Page name</property>
+                    <property name="label" translatable="yes" context="drawprinteroptions|printname">Page name</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -45,7 +45,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="printdatetime">
-                    <property name="label" translatable="yes" context="printeroptions|printdatetime">Date and time</property>
+                    <property name="label" translatable="yes" context="drawprinteroptions|printdatetime">Date and time</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -67,7 +67,7 @@
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes" context="printeroptions|label4">Contents</property>
+            <property name="label" translatable="yes" context="drawprinteroptions|label4">Contents</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -100,7 +100,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="originalcolors">
-                    <property name="label" translatable="yes" context="printeroptions|originalcolors">Original size</property>
+                    <property name="label" translatable="yes" context="drawprinteroptions|originalcolors">Original size</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -118,7 +118,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="grayscale">
-                    <property name="label" translatable="yes" context="printeroptions|grayscale">Grayscale</property>
+                    <property name="label" translatable="yes" context="drawprinteroptions|grayscale">Grayscale</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -136,7 +136,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="blackandwhite">
-                    <property name="label" translatable="yes" context="printeroptions|blackandwhite">Black &amp; white</property>
+                    <property name="label" translatable="yes" context="drawprinteroptions|blackandwhite">Black &amp; white</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -160,7 +160,7 @@
           <object class="GtkLabel" id="label5">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes" context="printeroptions|label5">Color</property>
+            <property name="label" translatable="yes" context="drawprinteroptions|label5">Color</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -193,7 +193,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="originalsize">
-                    <property name="label" translatable="yes" context="printeroptions|originalsize">Original size</property>
+                    <property name="label" translatable="yes" context="drawprinteroptions|originalsize">Original size</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -211,7 +211,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="fittoprintable">
-                    <property name="label" translatable="yes" context="printeroptions|fittoprintable">Fit to printable page</property>
+                    <property name="label" translatable="yes" context="drawprinteroptions|fittoprintable">Fit to printable page</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -229,7 +229,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="distributeonmultiple">
-                    <property name="label" translatable="yes" context="printeroptions|distributeonmultiple">Distribute on multiple sheets of paper</property>
+                    <property name="label" translatable="yes" context="drawprinteroptions|distributeonmultiple">Distribute on multiple sheets of paper</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -247,7 +247,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="tilesheet">
-                    <property name="label" translatable="yes" context="printeroptions|tilesheet">Tile sheet of paper with repeated pages</property>
+                    <property name="label" translatable="yes" context="drawprinteroptions|tilesheet">Tile sheet of paper with repeated pages</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -271,7 +271,7 @@
           <object class="GtkLabel" id="label6">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes" context="printeroptions|label6">Size</property>
+            <property name="label" translatable="yes" context="drawprinteroptions|label6">Size</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>

sd/uiconfig/simpress/ui/printeroptions.ui → sd/uiconfig/simpress/ui/impressprinteroptions.ui

@@ -29,7 +29,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCheckButton" id="printname">
-                    <property name="label" translatable="yes" context="printeroptions|printname">Slide name</property>
+                    <property name="label" translatable="yes" context="impressprinteroptions|printname">Slide name</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -45,7 +45,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="printdatetime">
-                    <property name="label" translatable="yes" context="printeroptions|printdatetime">Date and time</property>
+                    <property name="label" translatable="yes" context="impressprinteroptions|printdatetime">Date and time</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -61,7 +61,7 @@
                 </child>
                 <child>
                   <object class="GtkCheckButton" id="printhidden">
-                    <property name="label" translatable="yes" context="printeroptions|printhidden">Hidden pages</property>
+                    <property name="label" translatable="yes" context="impressprinteroptions|printhidden">Hidden pages</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -83,7 +83,7 @@
           <object class="GtkLabel" id="label4">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes" context="printeroptions|label4">Contents</property>
+            <property name="label" translatable="yes" context="impressprinteroptions|label4">Contents</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -116,7 +116,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="originalcolors">
-                    <property name="label" translatable="yes" context="printeroptions|originalcolors">Original size</property>
+                    <property name="label" translatable="yes" context="impressprinteroptions|originalcolors">Original size</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -134,7 +134,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="grayscale">
-                    <property name="label" translatable="yes" context="printeroptions|grayscale">Grayscale</property>
+                    <property name="label" translatable="yes" context="impressprinteroptions|grayscale">Grayscale</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -152,7 +152,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="blackandwhite">
-                    <property name="label" translatable="yes" context="printeroptions|blackandwhite">Black &amp; white</property>
+                    <property name="label" translatable="yes" context="impressprinteroptions|blackandwhite">Black &amp; white</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -176,7 +176,7 @@
           <object class="GtkLabel" id="label5">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes" context="printeroptions|label5">Color</property>
+            <property name="label" translatable="yes" context="impressprinteroptions|label5">Color</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -209,7 +209,7 @@
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkRadioButton" id="originalsize">
-                    <property name="label" translatable="yes" context="printeroptions|originalsize">Original size</property>
+                    <property name="label" translatable="yes" context="impressprinteroptions|originalsize">Original size</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -227,7 +227,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="fittoprintable">
-                    <property name="label" translatable="yes" context="printeroptions|fittoprintable">Fit to printable page</property>
+                    <property name="label" translatable="yes" context="impressprinteroptions|fittoprintable">Fit to printable page</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -245,7 +245,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="distributeonmultiple">
-                    <property name="label" translatable="yes" context="printeroptions|distributeonmultiple">Distribute on multiple sheets of paper</property>
+                    <property name="label" translatable="yes" context="impressprinteroptions|distributeonmultiple">Distribute on multiple sheets of paper</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -263,7 +263,7 @@
                 </child>
                 <child>
                   <object class="GtkRadioButton" id="tilesheet">
-                    <property name="label" translatable="yes" context="printeroptions|tilesheet">Tile sheet of paper with repeated slides</property>
+                    <property name="label" translatable="yes" context="impressprinteroptions|tilesheet">Tile sheet of paper with repeated slides</property>
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -287,7 +287,7 @@
           <object class="GtkLabel" id="label6">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes" context="printeroptions|label6">Size</property>
+            <property name="label" translatable="yes" context="impressprinteroptions|label6">Size</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>