fdo#80651 - Add 'Single Page' button to Page Preview Toolbar

Only Oxygen and Crystal theme need another icon then the 'adddirect' one.
Both themes have a 'sum' sign in that icon. Other themes shows a nice single
page icon.

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

icon-themes/galaxy/links.txt

@@ -2,3 +2,5 @@ cmd/lc_datastreamsplay.png avmedia/res/avl02049.png
 cmd/sc_datastreamsplay.png avmedia/res/av02049.png
 cmd/lc_datastreamsstop.png avmedia/res/avl02051.png
 cmd/sc_datastreamsstop.png avmedia/res/av02051.png
+cmd/lc_showsinglepage.png cmd/lc_adddirect.png
+cmd/sc_showsinglepage.png cmd/sc_adddirect.png

icon-themes/tango/links.txt

@@ -285,6 +285,8 @@ cmd/lc_pie.png cmd/lc_basicshapes.circle-pie.png
 cmd/lc_circlepie.png cmd/lc_basicshapes.circle-pie.png
 cmd/sc_pie.png cmd/sc_basicshapes.circle-pie.png
 cmd/sc_circlepie.png cmd/sc_basicshapes.circle-pie.png
+cmd/lc_showsinglepage.png cmd/lc_adddirect.png
+cmd/sc_showsinglepage.png cmd/sc_adddirect.png
 sfx2/res/sortascending.png cmd/lc_sortascending.png
 svx/res/symphony/Line_color.png cmd/sc_xlinecolor.png
 svx/res/symphony/rotate_left.png cmd/sc_rotateleft.png

icon-themes/tango_testing/links.txt

@@ -15,6 +15,8 @@ cmd/lc_rightpara.png cmd/lc_alignright.png
 cmd/lc_leftpara.png cmd/lc_alignleft.png
 cmd/lc_justifypara.png cmd/lc_alignblock.png
 cmd/lc_centerpara.png cmd/lc_alignhorizontalcenter.png
+cmd/lc_showsinglepage.png cmd/lc_adddirect.png
+cmd/sc_showsinglepage.png cmd/sc_adddirect.png
 
 # Split button categories
 cmd/lc_arrowshapes.png cmd/lc_arrowshapes.left-right-arrow.png

officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu

@@ -927,7 +927,15 @@
       </node>
       <node oor:name=".uno:ShowTwoPages" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Page Preview: Two Pages</value>
+          <value xml:lang="en-US">Two Pages Preview</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ShowSinglePage" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Single Page Preview</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>
@@ -943,7 +951,7 @@
       </node>
       <node oor:name=".uno:ShowMultiplePages" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
-          <value xml:lang="en-US">Page Preview: Multiple Pages</value>
+          <value xml:lang="en-US">Multiple Pages Preview</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
           <value>1</value>

sw/inc/cmdid.h

@@ -812,6 +812,7 @@
 #define FN_PRINT_PAGEPREVIEW        (FN_PGPREVIEW + 3)
 #define FN_CLOSE_PAGEPREVIEW        (FN_PGPREVIEW + 4)
 #define FN_SHOW_BOOKVIEW            (FN_PGPREVIEW + 5)
+#define FN_SHOW_SINGLE_PAGE         (FN_PGPREVIEW + 6)
 
 // Region: Setting Attributes
 #define FN_OPAQUE                       (FN_FRAME + 1)

sw/sdi/swriter.sdi

@@ -7270,6 +7270,30 @@ SfxVoidItem ShowTwoPages FN_SHOW_TWO_PAGES
     GroupId = GID_VIEW;
 ]
 
+SfxVoidItem ShowSinglePage FN_SHOW_SINGLE_PAGE
+()
+[
+    /* flags: */
+    AutoUpdate = FALSE,
+    Cachable = Cachable,
+    FastCall = TRUE,
+    HasCoreId = FALSE,
+    HasDialog = FALSE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+    Synchron;
+
+    /* config: */
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    StatusBarConfig = FALSE,
+    ToolBoxConfig = TRUE,
+    GroupId = GID_VIEW;
+]
+
 SfxBoolItem ShowBookview FN_SHOW_BOOKVIEW
 
 [

sw/sdi/viewsh.sdi

@@ -203,6 +203,12 @@ interface TextPrintPreview
         ExecMethod = Execute ;
         StateMethod = GetState ;
     ]
+    FN_SHOW_SINGLE_PAGE // status(final|play)
+    [
+        ExecMethod = Execute ;
+        StateMethod = GetState ;
+    ]
+
     FN_SHOW_MULTIPLE_PAGES // status(final|play)
     [
         ExecMethod = Execute ;

sw/source/uibase/uiview/pview.cxx

@@ -739,6 +739,10 @@ void  SwPagePreview::Execute( SfxRequest &rReq )
             pViewWin->CalcWish( nRow, 2 );
             break;
 
+        case FN_SHOW_SINGLE_PAGE:
+            pViewWin->CalcWish( nRow, 1 );
+            break;
+
         case FN_PREVIEW_ZOOM:
         case SID_ATTR_ZOOM:
         {

sw/uiconfig/sglobal/toolbar/previewobjectbar.xml

@@ -24,6 +24,7 @@
  <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc" toolbar:helpid="20907"/>
  <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc" toolbar:helpid="20908"/>
  <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowSinglePage"/>
  <toolbar:toolbaritem xlink:href=".uno:ShowTwoPages" toolbar:helpid="21251"/>
  <toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages" toolbar:helpid="21252"/>
  <toolbar:toolbaritem xlink:href=".uno:ShowBookview"/>

sw/uiconfig/sweb/toolbar/previewobjectbar.xml

@@ -24,6 +24,7 @@
  <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc" toolbar:helpid="20907"/>
  <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc" toolbar:helpid="20908"/>
  <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowSinglePage"/>
  <toolbar:toolbaritem xlink:href=".uno:ShowTwoPages" toolbar:helpid="21251"/>
  <toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages" toolbar:helpid="21252"/>
  <toolbar:toolbaritem xlink:href=".uno:ShowBookview"/>

sw/uiconfig/swform/toolbar/previewobjectbar.xml

@@ -24,6 +24,7 @@
  <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc" toolbar:helpid="20907"/>
  <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc" toolbar:helpid="20908"/>
  <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowSinglePage"/>
  <toolbar:toolbaritem xlink:href=".uno:ShowTwoPages" toolbar:helpid="21251"/>
  <toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages" toolbar:helpid="21252"/>
  <toolbar:toolbaritem xlink:href=".uno:ShowBookview"/>

sw/uiconfig/swreport/toolbar/previewobjectbar.xml

@@ -24,6 +24,7 @@
  <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc" toolbar:helpid="20907"/>
  <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc" toolbar:helpid="20908"/>
  <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowSinglePage"/>
  <toolbar:toolbaritem xlink:href=".uno:ShowTwoPages" toolbar:helpid="21251"/>
  <toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages" toolbar:helpid="21252"/>
  <toolbar:toolbaritem xlink:href=".uno:ShowBookview"/>

sw/uiconfig/swriter/toolbar/previewobjectbar.xml

@@ -24,6 +24,7 @@
  <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc" toolbar:helpid="20907"/>
  <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc" toolbar:helpid="20908"/>
  <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowSinglePage"/>
  <toolbar:toolbaritem xlink:href=".uno:ShowTwoPages" toolbar:helpid="21251"/>
  <toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages" toolbar:helpid="21252"/>
  <toolbar:toolbaritem xlink:href=".uno:ShowBookview"/>

sw/uiconfig/swxform/toolbar/previewobjectbar.xml

@@ -24,6 +24,7 @@
  <toolbar:toolbaritem xlink:href=".uno:GoToStartOfDoc" toolbar:helpid="20907"/>
  <toolbar:toolbaritem xlink:href=".uno:GoToEndOfDoc" toolbar:helpid="20908"/>
  <toolbar:toolbarseparator/>
+ <toolbar:toolbaritem xlink:href=".uno:ShowSinglePage"/>
  <toolbar:toolbaritem xlink:href=".uno:ShowTwoPages" toolbar:helpid="21251"/>
  <toolbar:toolbaritem xlink:href=".uno:ShowMultiplePages" toolbar:helpid="21252"/>
  <toolbar:toolbaritem xlink:href=".uno:ShowBookview"/>