sd/source/ui/app/popup2_tmpl.src | 47 ++++++-------------------------
sd/uiconfig/simpress/menubar/menubar.xml | 4 ++
2 files changed, 14 insertions(+), 37 deletions(-)
New commits:
commit f11863d43d96c4bcad9ae43ceb25c05d9a94307d
Author: Yousuf Philips <philip...@hotmail.com>
Date: Wed Dec 24 01:48:22 2014 +0400
fdo#86614 reorganize image, shape and line context menus
Change-Id: I87274670fd2c092bd6ea7f7dfb67f9db76865c96
Reviewed-on: https://gerrit.libreoffice.org/13632
Reviewed-by: Yousuf Philips <philip...@hotmail.com>
Tested-by: Yousuf Philips <philip...@hotmail.com>
diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src
index 65ad296..f9a2122 100644
--- a/sd/source/ui/app/popup2_tmpl.src
+++ b/sd/source/ui/app/popup2_tmpl.src
@@ -153,12 +153,9 @@
{
ItemList =
{
+ MN_TRANSFORM
MN_LINE
MN_AREA
- MN_TEXTATTR
- MN_TRANSFORM
- SEPARATOR
- MN_CHAR_PARAGRAPH
SEPARATOR
MN_POSITION
MN_OBJECT_ALIGN
@@ -170,19 +167,12 @@
MN_LEAVE_GROUP
MN_DISMANTLE
- // #i68101#
- SEPARATOR
- MN_OBJECT_TITLE_DESCRIPTION
- MN_NAME_GROUP
- // #i68101#
-
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
SEPARATOR
MN_ACTION
#endif
SEPARATOR
MN_STYLEDT
- SEPARATOR
};
};
@@ -343,12 +333,10 @@
{
ItemList =
{
- MN_LINE
MN_TRANSFORM
+ MN_LINE
MN_EDIT_POINTS
SEPARATOR
- MN_CHAR_PARAGRAPH
- SEPARATOR
MN_POSITION
MN_OBJECT_ALIGN
MN_DISTRIBUTE
@@ -358,12 +346,6 @@
MN_LEAVE_GROUP
MN_DISMANTLE
- // #i68101#
- SEPARATOR
- MN_OBJECT_TITLE_DESCRIPTION
- MN_NAME_GROUP
- // #i68101#
-
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
SEPARATOR
MN_ACTION
@@ -567,15 +549,17 @@
{
ItemList =
{
- MN_TRANSFORM
+ MenuItem { ITEM_CHANGE_PICTURE };
+ MenuItem { ITEM_SAVE_GRAPHIC };
+ MenuItem { ITEM_COMPRESS_GRAPHIC };
+ MenuItem { ITEM_EXTERNAL_EDIT };
+ SEPARATOR
+ MN_CROP
MN_ORIGINAL_SIZE
- MN_LINE
- MN_AREA
- MN_TEXTATTR
SEPARATOR
- MN_CHAR_PARAGRAPH
+ MN_TRANSFORM
+ MN_LINE
SEPARATOR
- MN_CROP
MN_OBJECT_ALIGN
MN_POSITION
MN_DISTRIBUTE
@@ -583,23 +567,12 @@
MNSUB_CONVERT
MN_BREAK
- // #i68101#
- SEPARATOR
- MN_OBJECT_TITLE_DESCRIPTION
- MN_NAME_GROUP
- // #i68101#
-
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
SEPARATOR
MN_ACTION
#endif
SEPARATOR
MN_STYLEDT
- SEPARATOR
- MenuItem { ITEM_CHANGE_PICTURE };
- MenuItem { ITEM_SAVE_GRAPHIC };
- MenuItem { ITEM_COMPRESS_GRAPHIC };
- MenuItem { ITEM_EXTERNAL_EDIT };
};
};
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml
b/sd/uiconfig/simpress/menubar/menubar.xml
index 2a7e878..7b4c9f6 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -260,8 +260,12 @@
<menu:menuitem menu:id=".uno:FormatLine"/>
<menu:menuitem menu:id=".uno:FormatArea"/>
<menu:menuitem menu:id=".uno:TextAttributes"/>
+ <menu:menuseparator/>
<menu:menuitem menu:id=".uno:GrafAttrCrop"/>
<menu:menuseparator/>
+ <menu:menuitem menu:id=".uno:NameGroup"/>
+ <menu:menuitem menu:id=".uno:ObjectTitleDescription"/>
+ <menu:menuseparator/>
<menu:menuitem menu:id=".uno:PresentationLayout"/>
<menu:menuitem menu:id=".uno:ModifyPage"/>
<menu:menuitem menu:id=".uno:DesignerDialog"/>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
