icon-themes/breeze/links.txt | 1 icon-themes/breeze_dark/links.txt | 1 icon-themes/breeze_svg/links.txt | 1 icon-themes/colibre/links.txt | 1 icon-themes/karasa_jaga/links.txt | 12 +++----- officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 8 ----- sw/uiconfig/sglobal/popupmenu/frame.xml | 14 +++++----- sw/uiconfig/sweb/popupmenu/frame.xml | 14 +++++----- sw/uiconfig/swform/popupmenu/frame.xml | 14 +++++----- sw/uiconfig/swreport/popupmenu/frame.xml | 14 +++++----- sw/uiconfig/swriter/popupmenu/frame.xml | 14 +++++----- sw/uiconfig/swxform/popupmenu/frame.xml | 14 +++++----- 12 files changed, 47 insertions(+), 61 deletions(-)
New commits: commit b0c6d587405af9e2263dc5073a9a965db46ff986 Author: andreas kainz <kain...@gmail.com> AuthorDate: Mon Oct 22 21:28:57 2018 +0200 Commit: andreas_kainz <kain...@gmail.com> CommitDate: Tue Oct 23 08:02:00 2018 +0200 Frame Contextmenu in Writer and other sw apps use ObjectAlign as a Frame is an Object Change-Id: I3afd1aa08e713ae919dde8b57811a5e8cbaa4b24 Reviewed-on: https://gerrit.libreoffice.org/62198 Tested-by: Jenkins Reviewed-by: andreas_kainz <kain...@gmail.com> diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt index d106c0fc36db..9d1b43f4b335 100644 --- a/icon-themes/breeze/links.txt +++ b/icon-themes/breeze/links.txt @@ -248,7 +248,6 @@ cmd/sc_objectalign.png cmd/sc_objectalignleft.png cmd/sc_alignvcenter.png cmd/sc_alignverticalcenter.png cmd/sc_sectionaligntop.png cmd/sc_alignup.png cmd/sc_sectionalignbottom.png cmd/sc_aligndown.png -cmd/sc_alignframemenu.png cmd/sc_alignleft.png cmd/sc_alignhorizontalceter.png cmd/sc_alignhorizontalcenter.png # Graphic diff --git a/icon-themes/breeze_dark/links.txt b/icon-themes/breeze_dark/links.txt index d106c0fc36db..9d1b43f4b335 100644 --- a/icon-themes/breeze_dark/links.txt +++ b/icon-themes/breeze_dark/links.txt @@ -248,7 +248,6 @@ cmd/sc_objectalign.png cmd/sc_objectalignleft.png cmd/sc_alignvcenter.png cmd/sc_alignverticalcenter.png cmd/sc_sectionaligntop.png cmd/sc_alignup.png cmd/sc_sectionalignbottom.png cmd/sc_aligndown.png -cmd/sc_alignframemenu.png cmd/sc_alignleft.png cmd/sc_alignhorizontalceter.png cmd/sc_alignhorizontalcenter.png # Graphic diff --git a/icon-themes/breeze_svg/links.txt b/icon-themes/breeze_svg/links.txt index d106c0fc36db..9d1b43f4b335 100644 --- a/icon-themes/breeze_svg/links.txt +++ b/icon-themes/breeze_svg/links.txt @@ -248,7 +248,6 @@ cmd/sc_objectalign.png cmd/sc_objectalignleft.png cmd/sc_alignvcenter.png cmd/sc_alignverticalcenter.png cmd/sc_sectionaligntop.png cmd/sc_alignup.png cmd/sc_sectionalignbottom.png cmd/sc_aligndown.png -cmd/sc_alignframemenu.png cmd/sc_alignleft.png cmd/sc_alignhorizontalceter.png cmd/sc_alignhorizontalcenter.png # Graphic diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt index 16b73f6eb2fb..f0f84b3ca6af 100644 --- a/icon-themes/colibre/links.txt +++ b/icon-themes/colibre/links.txt @@ -244,7 +244,6 @@ cmd/sc_objectalign.png cmd/sc_objectalignleft.png cmd/sc_alignvcenter.png cmd/sc_alignverticalcenter.png cmd/sc_sectionaligntop.png cmd/sc_alignup.png cmd/sc_sectionalignbottom.png cmd/sc_aligndown.png -cmd/sc_alignframemenu.png cmd/sc_alignleft.png cmd/sc_alignhorizontalceter.png cmd/sc_alignhorizontalcenter.png # Graphic diff --git a/icon-themes/karasa_jaga/links.txt b/icon-themes/karasa_jaga/links.txt index 68f8a3c417bc..199d6b9df969 100644 --- a/icon-themes/karasa_jaga/links.txt +++ b/icon-themes/karasa_jaga/links.txt @@ -2,7 +2,7 @@ avmedia/res/av02048.png cmd/sc_open.png avmedia/res/av02049.png cmd/sc_datastreamsplay.png avmedia/res/av02050.png cmd/sc_mediapause.png avmedia/res/av02051.png cmd/sc_datastreamsstop.png -avmedia/res/av02052.png cmd/sc_mediarepeat.png +avmedia/res/av02052.png cmd/sc_mediarepeat.png avmedia/res/av02053.png cmd/sc_ok.png avmedia/res/av02054.png cmd/sc_mediamute.png avmedia/res/avl02048.png cmd/lc_open.png @@ -13,7 +13,7 @@ avmedia/res/avl02052.png cmd/lc_mediarepeat.png avmedia/res/avl02053.png cmd/lc_ok.png avmedia/res/avl02054.png cmd/lc_mediamute.png cmd/32/acceptchanges.png cmd/32/accepttrackedchange.png -cmd/32/accepttracedchange.png cmd/32/accepttrackedchange.png +cmd/32/accepttracedchange.png cmd/32/accepttrackedchange.png cmd/32/adddatefield.png cmd/32/datefield.png cmd/32/adjust.png cmd/32/zoomoptimal.png cmd/32/advancedmode.png cmd/32/toggleobjectrotatemode.png @@ -338,11 +338,10 @@ cmd/sl/sc_underlinesimple.png cmd/sl/sc_underline.png cmd/tr/lc_underlinesimple.png cmd/tr/lc_underline.png cmd/tr/sc_underlinesimple.png cmd/tr/sc_underline.png cmd/lc_acceptchanges.png cmd/lc_accepttrackedchange.png -cmd/lc_accepttracedchange.png cmd/lc_accepttrackedchange.png +cmd/lc_accepttracedchange.png cmd/lc_accepttrackedchange.png cmd/lc_adddatefield.png cmd/lc_datefield.png cmd/lc_adjust.png cmd/lc_zoomoptimal.png cmd/lc_advancedmode.png cmd/lc_toggleobjectrotatemode.png -cmd/lc_alignframemenu.png cmd/lc_objectalign.png cmd/lc_alignvcenter.png cmd/lc_alignverticalcenter.png cmd/lc_anchormenu.png cmd/lc_toggleanchortype.png cmd/lc_arrangeframemenu.png cmd/lc_bringtofront.png @@ -611,11 +610,10 @@ cmd/lc_zoomtoolbox.png cmd/lc_zoom.png cmd/nl/lc_underlinesimple.png cmd/nl/lc_underline.png cmd/nl/sc_underlinesimple.png cmd/nl/sc_underline.png cmd/sc_acceptchanges.png cmd/sc_accepttrackedchange.png -cmd/sc_accepttracedchange.png cmd/sc_accepttrackedchange.png +cmd/sc_accepttracedchange.png cmd/sc_accepttrackedchange.png cmd/sc_adddatefield.png cmd/sc_datefield.png cmd/sc_adjust.png cmd/sc_zoomoptimal.png cmd/sc_advancedmode.png cmd/sc_toggleobjectrotatemode.png -cmd/sc_alignframemenu.png cmd/sc_objectalign.png cmd/sc_alignvcenter.png cmd/sc_alignverticalcenter.png cmd/sc_anchormenu.png cmd/sc_toggleanchortype.png cmd/sc_arrangeframemenu.png cmd/sc_bringtofront.png @@ -943,7 +941,7 @@ res/lx03163.png res/ott_32_8.png res/lx03165.png cmd/32/save.png res/lx03189.png cmd/32/open.png res/lx03218.png res/lx03217.png -res/lx03219.png res/lx03217.png +res/lx03219.png res/lx03217.png res/lx03220.png res/lx03217.png res/lx03221.png res/lx03217.png res/lx03222.png res/lx03217.png diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu index 6608a1871ec0..a6d57ae787c7 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu @@ -2780,14 +2780,6 @@ <value>1</value> </prop> </node> - <node oor:name=".uno:AlignFrameMenu" oor:op="replace"> - <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="en-US">Alignment</value> - </prop> - <prop oor:name="Properties" oor:type="xs:int"> - <value>1</value> - </prop> - </node> <node oor:name=".uno:ArrangeFrameMenu" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> <value xml:lang="en-US">Arrange</value> diff --git a/sw/uiconfig/sglobal/popupmenu/frame.xml b/sw/uiconfig/sglobal/popupmenu/frame.xml index 3820491d9333..959f8df4b173 100644 --- a/sw/uiconfig/sglobal/popupmenu/frame.xml +++ b/sw/uiconfig/sglobal/popupmenu/frame.xml @@ -29,15 +29,15 @@ <menu:menuitem menu:id=".uno:WrapAnchorOnly"/> </menu:menupopup> </menu:menu> - <menu:menu menu:id=".uno:AlignFrameMenu"> + <menu:menu menu:id=".uno:ObjectAlign"> <menu:menupopup> - <menu:menuitem menu:id=".uno:AlignLeft"/> - <menu:menuitem menu:id=".uno:AlignHorizontalCenter"/> - <menu:menuitem menu:id=".uno:AlignRight"/> + <menu:menuitem menu:id=".uno:ObjectAlignLeft"/> + <menu:menuitem menu:id=".uno:AlignCenter"/> + <menu:menuitem menu:id=".uno:ObjectAlignRight"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:AlignTop"/> - <menu:menuitem menu:id=".uno:AlignVerticalCenter"/> - <menu:menuitem menu:id=".uno:AlignBottom"/> + <menu:menuitem menu:id=".uno:AlignUp"/> + <menu:menuitem menu:id=".uno:AlignMiddle"/> + <menu:menuitem menu:id=".uno:AlignDown"/> </menu:menupopup> </menu:menu> <menu:menu menu:id=".uno:ArrangeFrameMenu"> diff --git a/sw/uiconfig/sweb/popupmenu/frame.xml b/sw/uiconfig/sweb/popupmenu/frame.xml index 3820491d9333..959f8df4b173 100644 --- a/sw/uiconfig/sweb/popupmenu/frame.xml +++ b/sw/uiconfig/sweb/popupmenu/frame.xml @@ -29,15 +29,15 @@ <menu:menuitem menu:id=".uno:WrapAnchorOnly"/> </menu:menupopup> </menu:menu> - <menu:menu menu:id=".uno:AlignFrameMenu"> + <menu:menu menu:id=".uno:ObjectAlign"> <menu:menupopup> - <menu:menuitem menu:id=".uno:AlignLeft"/> - <menu:menuitem menu:id=".uno:AlignHorizontalCenter"/> - <menu:menuitem menu:id=".uno:AlignRight"/> + <menu:menuitem menu:id=".uno:ObjectAlignLeft"/> + <menu:menuitem menu:id=".uno:AlignCenter"/> + <menu:menuitem menu:id=".uno:ObjectAlignRight"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:AlignTop"/> - <menu:menuitem menu:id=".uno:AlignVerticalCenter"/> - <menu:menuitem menu:id=".uno:AlignBottom"/> + <menu:menuitem menu:id=".uno:AlignUp"/> + <menu:menuitem menu:id=".uno:AlignMiddle"/> + <menu:menuitem menu:id=".uno:AlignDown"/> </menu:menupopup> </menu:menu> <menu:menu menu:id=".uno:ArrangeFrameMenu"> diff --git a/sw/uiconfig/swform/popupmenu/frame.xml b/sw/uiconfig/swform/popupmenu/frame.xml index 3820491d9333..959f8df4b173 100644 --- a/sw/uiconfig/swform/popupmenu/frame.xml +++ b/sw/uiconfig/swform/popupmenu/frame.xml @@ -29,15 +29,15 @@ <menu:menuitem menu:id=".uno:WrapAnchorOnly"/> </menu:menupopup> </menu:menu> - <menu:menu menu:id=".uno:AlignFrameMenu"> + <menu:menu menu:id=".uno:ObjectAlign"> <menu:menupopup> - <menu:menuitem menu:id=".uno:AlignLeft"/> - <menu:menuitem menu:id=".uno:AlignHorizontalCenter"/> - <menu:menuitem menu:id=".uno:AlignRight"/> + <menu:menuitem menu:id=".uno:ObjectAlignLeft"/> + <menu:menuitem menu:id=".uno:AlignCenter"/> + <menu:menuitem menu:id=".uno:ObjectAlignRight"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:AlignTop"/> - <menu:menuitem menu:id=".uno:AlignVerticalCenter"/> - <menu:menuitem menu:id=".uno:AlignBottom"/> + <menu:menuitem menu:id=".uno:AlignUp"/> + <menu:menuitem menu:id=".uno:AlignMiddle"/> + <menu:menuitem menu:id=".uno:AlignDown"/> </menu:menupopup> </menu:menu> <menu:menu menu:id=".uno:ArrangeFrameMenu"> diff --git a/sw/uiconfig/swreport/popupmenu/frame.xml b/sw/uiconfig/swreport/popupmenu/frame.xml index 3820491d9333..959f8df4b173 100644 --- a/sw/uiconfig/swreport/popupmenu/frame.xml +++ b/sw/uiconfig/swreport/popupmenu/frame.xml @@ -29,15 +29,15 @@ <menu:menuitem menu:id=".uno:WrapAnchorOnly"/> </menu:menupopup> </menu:menu> - <menu:menu menu:id=".uno:AlignFrameMenu"> + <menu:menu menu:id=".uno:ObjectAlign"> <menu:menupopup> - <menu:menuitem menu:id=".uno:AlignLeft"/> - <menu:menuitem menu:id=".uno:AlignHorizontalCenter"/> - <menu:menuitem menu:id=".uno:AlignRight"/> + <menu:menuitem menu:id=".uno:ObjectAlignLeft"/> + <menu:menuitem menu:id=".uno:AlignCenter"/> + <menu:menuitem menu:id=".uno:ObjectAlignRight"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:AlignTop"/> - <menu:menuitem menu:id=".uno:AlignVerticalCenter"/> - <menu:menuitem menu:id=".uno:AlignBottom"/> + <menu:menuitem menu:id=".uno:AlignUp"/> + <menu:menuitem menu:id=".uno:AlignMiddle"/> + <menu:menuitem menu:id=".uno:AlignDown"/> </menu:menupopup> </menu:menu> <menu:menu menu:id=".uno:ArrangeFrameMenu"> diff --git a/sw/uiconfig/swriter/popupmenu/frame.xml b/sw/uiconfig/swriter/popupmenu/frame.xml index 3820491d9333..959f8df4b173 100644 --- a/sw/uiconfig/swriter/popupmenu/frame.xml +++ b/sw/uiconfig/swriter/popupmenu/frame.xml @@ -29,15 +29,15 @@ <menu:menuitem menu:id=".uno:WrapAnchorOnly"/> </menu:menupopup> </menu:menu> - <menu:menu menu:id=".uno:AlignFrameMenu"> + <menu:menu menu:id=".uno:ObjectAlign"> <menu:menupopup> - <menu:menuitem menu:id=".uno:AlignLeft"/> - <menu:menuitem menu:id=".uno:AlignHorizontalCenter"/> - <menu:menuitem menu:id=".uno:AlignRight"/> + <menu:menuitem menu:id=".uno:ObjectAlignLeft"/> + <menu:menuitem menu:id=".uno:AlignCenter"/> + <menu:menuitem menu:id=".uno:ObjectAlignRight"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:AlignTop"/> - <menu:menuitem menu:id=".uno:AlignVerticalCenter"/> - <menu:menuitem menu:id=".uno:AlignBottom"/> + <menu:menuitem menu:id=".uno:AlignUp"/> + <menu:menuitem menu:id=".uno:AlignMiddle"/> + <menu:menuitem menu:id=".uno:AlignDown"/> </menu:menupopup> </menu:menu> <menu:menu menu:id=".uno:ArrangeFrameMenu"> diff --git a/sw/uiconfig/swxform/popupmenu/frame.xml b/sw/uiconfig/swxform/popupmenu/frame.xml index 3820491d9333..959f8df4b173 100644 --- a/sw/uiconfig/swxform/popupmenu/frame.xml +++ b/sw/uiconfig/swxform/popupmenu/frame.xml @@ -29,15 +29,15 @@ <menu:menuitem menu:id=".uno:WrapAnchorOnly"/> </menu:menupopup> </menu:menu> - <menu:menu menu:id=".uno:AlignFrameMenu"> + <menu:menu menu:id=".uno:ObjectAlign"> <menu:menupopup> - <menu:menuitem menu:id=".uno:AlignLeft"/> - <menu:menuitem menu:id=".uno:AlignHorizontalCenter"/> - <menu:menuitem menu:id=".uno:AlignRight"/> + <menu:menuitem menu:id=".uno:ObjectAlignLeft"/> + <menu:menuitem menu:id=".uno:AlignCenter"/> + <menu:menuitem menu:id=".uno:ObjectAlignRight"/> <menu:menuseparator/> - <menu:menuitem menu:id=".uno:AlignTop"/> - <menu:menuitem menu:id=".uno:AlignVerticalCenter"/> - <menu:menuitem menu:id=".uno:AlignBottom"/> + <menu:menuitem menu:id=".uno:AlignUp"/> + <menu:menuitem menu:id=".uno:AlignMiddle"/> + <menu:menuitem menu:id=".uno:AlignDown"/> </menu:menupopup> </menu:menu> <menu:menu menu:id=".uno:ArrangeFrameMenu"> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits