From c38b40c0101e2607deb53690205fa889f06f3440 Mon Sep 17 00:00:00 2001 From: Joren De Cuyper Date: Thu, 3 Jul 2014 14:01:10 +0200 Subject: fdo#80651 - Add 'Single Page' button to Page Preview Toolbar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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/10053 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- icon-themes/galaxy/links.txt | 2 ++ icon-themes/tango/links.txt | 2 ++ icon-themes/tango_testing/links.txt | 2 ++ .../org/openoffice/Office/UI/WriterCommands.xcu | 12 +++++++++-- sw/inc/cmdid.h | 1 + sw/sdi/swriter.sdi | 24 ++++++++++++++++++++++ sw/sdi/viewsh.sdi | 6 ++++++ sw/source/uibase/uiview/pview.cxx | 4 ++++ sw/uiconfig/sglobal/toolbar/previewobjectbar.xml | 1 + sw/uiconfig/sweb/toolbar/previewobjectbar.xml | 1 + sw/uiconfig/swform/toolbar/previewobjectbar.xml | 1 + sw/uiconfig/swreport/toolbar/previewobjectbar.xml | 1 + sw/uiconfig/swriter/toolbar/previewobjectbar.xml | 1 + sw/uiconfig/swxform/toolbar/previewobjectbar.xml | 1 + 14 files changed, 57 insertions(+), 2 deletions(-) diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt index 96ccd9b08b00..94b4da2d59f5 100644 --- a/icon-themes/galaxy/links.txt +++ b/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 diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt index 6ea6ddc70b96..eb2fd6c90ff3 100644 --- a/icon-themes/tango/links.txt +++ b/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 diff --git a/icon-themes/tango_testing/links.txt b/icon-themes/tango_testing/links.txt index 409b8b3247d9..86380653acce 100644 --- a/icon-themes/tango_testing/links.txt +++ b/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 diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 877f30d84ba6..b5e25a8dbb59 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -927,7 +927,15 @@ - Page Preview: Two Pages + Two Pages Preview + + + 1 + + + + + Single Page Preview 1 @@ -943,7 +951,7 @@ - Page Preview: Multiple Pages + Multiple Pages Preview 1 diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index 3c036ba8b0c5..9a656a692f41 100644 --- a/sw/inc/cmdid.h +++ b/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) diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index fc78e4ab0a15..2d60dff53a18 100644 --- a/sw/sdi/swriter.sdi +++ b/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 [ diff --git a/sw/sdi/viewsh.sdi b/sw/sdi/viewsh.sdi index 8f0735f9855d..db75fc1203e5 100644 --- a/sw/sdi/viewsh.sdi +++ b/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 ; diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 62f49adb813d..049c2e06a304 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/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: { diff --git a/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml b/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml index 36db7df7507a..9a1e05f383d4 100644 --- a/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/sglobal/toolbar/previewobjectbar.xml @@ -24,6 +24,7 @@ + diff --git a/sw/uiconfig/sweb/toolbar/previewobjectbar.xml b/sw/uiconfig/sweb/toolbar/previewobjectbar.xml index 1cd4f9b9f723..f0f67aae0b72 100644 --- a/sw/uiconfig/sweb/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/sweb/toolbar/previewobjectbar.xml @@ -24,6 +24,7 @@ + diff --git a/sw/uiconfig/swform/toolbar/previewobjectbar.xml b/sw/uiconfig/swform/toolbar/previewobjectbar.xml index 36db7df7507a..9a1e05f383d4 100644 --- a/sw/uiconfig/swform/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/swform/toolbar/previewobjectbar.xml @@ -24,6 +24,7 @@ + diff --git a/sw/uiconfig/swreport/toolbar/previewobjectbar.xml b/sw/uiconfig/swreport/toolbar/previewobjectbar.xml index 36db7df7507a..9a1e05f383d4 100644 --- a/sw/uiconfig/swreport/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/swreport/toolbar/previewobjectbar.xml @@ -24,6 +24,7 @@ + diff --git a/sw/uiconfig/swriter/toolbar/previewobjectbar.xml b/sw/uiconfig/swriter/toolbar/previewobjectbar.xml index 36db7df7507a..9a1e05f383d4 100644 --- a/sw/uiconfig/swriter/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/swriter/toolbar/previewobjectbar.xml @@ -24,6 +24,7 @@ + diff --git a/sw/uiconfig/swxform/toolbar/previewobjectbar.xml b/sw/uiconfig/swxform/toolbar/previewobjectbar.xml index 36db7df7507a..9a1e05f383d4 100644 --- a/sw/uiconfig/swxform/toolbar/previewobjectbar.xml +++ b/sw/uiconfig/swxform/toolbar/previewobjectbar.xml @@ -24,6 +24,7 @@ + -- cgit v1.2.3