Skip to content

C
core
Kaydet (Commit) 22beeb3e authored tarafından Maxim Monastirsky's avatar Maxim Monastirsky
Dosyalara gözat
Seçenekler

sd: Use the regular textbox popupmenu for outline text objects 

Having a separate menu for just one kind of a text box makes
no sense. It isn't good for developers that must remember to
sync changes between the two, and likewise for users which do
customization, and that have to make the same changes twice.

In fact both menus are identical, except that the outlinetext
menu has also .uno:TextAutoFitToSize. But this commands seems
to work also for other kinds of text boxes, and we actually
have a request in tdf#116898 to have it in the context menu.
So we can just move .uno:TextAutoFitToSize to textbox.xml, and
then remove the separate outlinetext.xml.

Fortunately there is no fear of losing existing user
customization for outlinetext.xml, as it wasn't exposed to the
customization dialog by error (no corresponding entries were
added to ImpressWindowState.xcu/DrawWindowState.xcu).

Change-Id: I3568cb95d862d4ab91bedfa691dcc6659a3bf86f
Reviewed-on: https://gerrit.libreoffice.org/61972
Tested-by: Jenkins
Reviewed-by: 's avatarandreas_kainz <kainz.a@gmail.com>
Reviewed-by: 's avatarHeiko Tietze <tietze.heiko@gmail.com>
üst 7da39475
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 137 deletions
sd/UIConfig_sdraw.mk
Dosyayı görüntüle @ 22beeb3e
......@@ -34,7 +34,6 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/sdraw,\
sd/uiconfig/sdraw/popupmenu/multiselect \
sd/uiconfig/sdraw/popupmenu/notebookbar \
sd/uiconfig/sdraw/popupmenu/oleobject \
sd/uiconfig/sdraw/popupmenu/outlinetext \
sd/uiconfig/sdraw/popupmenu/pagepanemaster \
sd/uiconfig/sdraw/popupmenu/pagepanenoselmaster \
sd/uiconfig/sdraw/popupmenu/pagepanenosel \
......
sd/UIConfig_simpress.mk
Dosyayı görüntüle @ 22beeb3e
......@@ -33,7 +33,6 @@ $(eval $(call gb_UIConfig_add_popupmenufiles,modules/simpress,\
sd/uiconfig/simpress/popupmenu/multiselect \
sd/uiconfig/simpress/popupmenu/notebookbar \
sd/uiconfig/simpress/popupmenu/oleobject \
sd/uiconfig/simpress/popupmenu/outlinetext \
sd/uiconfig/simpress/popupmenu/outline \
sd/uiconfig/simpress/popupmenu/pagepanemaster \
sd/uiconfig/simpress/popupmenu/pagepanenoselmaster \
......
sd/source/ui/view/drviews4.cxx
Dosyayı görüntüle @ 22beeb3e
......@@ -660,9 +660,6 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
switch ( nId )
{
case OBJ_OUTLINETEXT:
aPopupId = "outlinetext";
break;
case OBJ_CAPTION:
case OBJ_TITLETEXT:
case OBJ_TEXT:
......
sd/uiconfig/sdraw/popupmenu/outlinetext.xml deleted 100644 → 0
Dosyayı görüntüle @ 7da39475
<?xml version="1.0" encoding="UTF-8"?>
<!--
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
-->
<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
<menu:menuitem menu:id=".uno:Cut"/>
<menu:menuitem menu:id=".uno:Copy"/>
<menu:menuitem menu:id=".uno:Paste"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SetDefault"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:TransformDialog"/>
<menu:menuitem menu:id=".uno:FormatLine"/>
<menu:menuitem menu:id=".uno:FormatArea"/>
<menu:menuitem menu:id=".uno:TextAttributes"/>
<menu:menuitem menu:id=".uno:TextAutoFitToSize"/>
<menu:menuitem menu:id=".uno:FontWork"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FontDialog"/>
<menu:menuitem menu:id=".uno:ParagraphDialog"/>
<menu:menuseparator/>
<menu:menu menu:id=".uno:ObjectAlign">
<menu:menupopup>
<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:AlignUp"/>
<menu:menuitem menu:id=".uno:AlignMiddle"/>
<menu:menuitem menu:id=".uno:AlignDown"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:ArrangeMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:BringToFront"/>
<menu:menuitem menu:id=".uno:Forward"/>
<menu:menuitem menu:id=".uno:Backward"/>
<menu:menuitem menu:id=".uno:SendToBack"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:BeforeObject"/>
<menu:menuitem menu:id=".uno:BehindObject"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ReverseOrder"/>
</menu:menupopup>
</menu:menu>
<menu:menuitem menu:id=".uno:DistributeSelection"/>
<menu:menu menu:id=".uno:ConvertMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:ChangeBezier"/>
<menu:menuitem menu:id=".uno:ChangePolygon"/>
<menu:menuitem menu:id=".uno:convert_to_contour"/>
<menu:menuitem menu:id=".uno:ConvertInto3D"/>
<menu:menuitem menu:id=".uno:ConvertInto3DLatheFast"/>
<menu:menuitem menu:id=".uno:ConvertIntoBitmap"/>
<menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/>
</menu:menupopup>
</menu:menu>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:EditStyle"/>
</menu:menupopup>
sd/uiconfig/sdraw/popupmenu/textbox.xml
Dosyayı görüntüle @ 22beeb3e
......@@ -18,6 +18,7 @@
<menu:menuitem menu:id=".uno:FormatLine"/>
<menu:menuitem menu:id=".uno:FormatArea"/>
<menu:menuitem menu:id=".uno:TextAttributes"/>
<menu:menuitem menu:id=".uno:TextAutoFitToSize"/>
<menu:menuitem menu:id=".uno:FontWork"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FontDialog"/>
......
sd/uiconfig/simpress/popupmenu/outlinetext.xml deleted 100644 → 0
Dosyayı görüntüle @ 7da39475
<?xml version="1.0" encoding="UTF-8"?>
<!--
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
-->
<menu:menupopup xmlns:menu="http://openoffice.org/2001/menu">
<menu:menuitem menu:id=".uno:Cut"/>
<menu:menuitem menu:id=".uno:Copy"/>
<menu:menuitem menu:id=".uno:Paste"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:SetDefault"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:TransformDialog"/>
<menu:menuitem menu:id=".uno:FormatLine"/>
<menu:menuitem menu:id=".uno:FormatArea"/>
<menu:menuitem menu:id=".uno:TextAttributes"/>
<menu:menuitem menu:id=".uno:TextAutoFitToSize"/>
<menu:menuitem menu:id=".uno:FontWork"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FontDialog"/>
<menu:menuitem menu:id=".uno:ParagraphDialog"/>
<menu:menuseparator/>
<menu:menu menu:id=".uno:ObjectAlign">
<menu:menupopup>
<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:AlignUp"/>
<menu:menuitem menu:id=".uno:AlignMiddle"/>
<menu:menuitem menu:id=".uno:AlignDown"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:ArrangeMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:BringToFront"/>
<menu:menuitem menu:id=".uno:Forward"/>
<menu:menuitem menu:id=".uno:Backward"/>
<menu:menuitem menu:id=".uno:SendToBack"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:BeforeObject"/>
<menu:menuitem menu:id=".uno:BehindObject"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:ReverseOrder"/>
</menu:menupopup>
</menu:menu>
<menu:menuitem menu:id=".uno:DistributeSelection"/>
<menu:menu menu:id=".uno:ConvertMenu">
<menu:menupopup>
<menu:menuitem menu:id=".uno:ChangeBezier"/>
<menu:menuitem menu:id=".uno:ChangePolygon"/>
<menu:menuitem menu:id=".uno:convert_to_contour"/>
<menu:menuitem menu:id=".uno:ConvertInto3D"/>
<menu:menuitem menu:id=".uno:ConvertInto3DLatheFast"/>
<menu:menuitem menu:id=".uno:ConvertIntoBitmap"/>
<menu:menuitem menu:id=".uno:ConvertIntoMetaFile"/>
</menu:menupopup>
</menu:menu>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:AnimationEffects"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:EditStyle"/>
</menu:menupopup>
sd/uiconfig/simpress/popupmenu/textbox.xml
Dosyayı görüntüle @ 22beeb3e
......@@ -18,6 +18,7 @@
<menu:menuitem menu:id=".uno:FormatLine"/>
<menu:menuitem menu:id=".uno:FormatArea"/>
<menu:menuitem menu:id=".uno:TextAttributes"/>
<menu:menuitem menu:id=".uno:TextAutoFitToSize"/>
<menu:menuitem menu:id=".uno:FontWork"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FontDialog"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment