[Libreoffice-commits] core.git: sd/inc sd/source svx/inc
Yousuf Philips
philipz85 at hotmail.com
Tue Dec 22 00:45:38 PST 2015
sd/inc/sdcommands.h | 1
sd/source/ui/app/menuids_tmpl.src | 63 ++++++++++----------------------------
sd/source/ui/app/popup2_tmpl.src | 28 +++-------------
svx/inc/globlmn_tmpl.hrc | 36 +++++++++++++++++++++
4 files changed, 60 insertions(+), 68 deletions(-)
New commits:
commit 7edfee8e4f81c17ec95a03843c509b95b8e404b2
Author: Yousuf Philips <philipz85 at hotmail.com>
Date: Fri Dec 11 18:53:15 2015 +0400
Rearrangement of various context menus in Impress
Change-Id: I6674254898dc6d7351ec4450e2aa5ac3f177bdbf
Reviewed-on: https://gerrit.libreoffice.org/20640
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h
index 4642124..77d6531 100644
--- a/sd/inc/sdcommands.h
+++ b/sd/inc/sdcommands.h
@@ -93,6 +93,7 @@
#define CMD_SID_SAVE_BACKGROUND ".uno:SaveBackground"
#define CMD_SID_DISPLAY_MASTER_BACKGROUND ".uno:DisplayMasterBackground"
#define CMD_SID_DISPLAY_MASTER_OBJECTS ".uno:DisplayMasterObjects"
+#define CMD_SID_MASTER_LAYOUTS ".uno:MasterLayouts"
#define CMD_SID_TABLE_DISTRIBUTE_COLUMNS ".uno:DistributeColumns"
#define CMD_SID_TABLE_DISTRIBUTE_ROWS ".uno:DistributeRows"
#define CMD_SID_TP_APPLY_TO_ALL_SLIDES ".uno:TaskPaneApplyToAllSlides"
diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src
index c32cd2d..a41c102 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -89,7 +89,7 @@
{\
Identifier = SID_PAGESETUP ; \
HelpId = CMD_SID_PAGESETUP ; \
- Text [ en-US ] = "Format ~Slide..." ; \
+ Text [ en-US ] = "~Slide Properties..." ; \
};
#define MN_INSERT_SLIDE \
@@ -142,14 +142,21 @@
{\
Identifier = SID_DISPLAY_MASTER_BACKGROUND ; \
HelpId = CMD_SID_DISPLAY_MASTER_BACKGROUND ; \
- Text [ en-US ] = "Display Background of Master" ; \
+ Text [ en-US ] = "Display Master Background" ; \
};
#define MN_DISPLAY_MASTER_OBJECTS \
MenuItem\
{\
Identifier = SID_DISPLAY_MASTER_OBJECTS ; \
HelpId = CMD_SID_DISPLAY_MASTER_OBJECTS ; \
- Text [ en-US ] = "Display Objects from Master" ; \
+ Text [ en-US ] = "Display Master Objects" ; \
+ };
+#define MN_MASTER_ELEMENTS \
+ MenuItem\
+ {\
+ Identifier = SID_MASTER_LAYOUTS ; \
+ HelpId = CMD_SID_MASTER_LAYOUTS ; \
+ Text [ en-US ] = "Master Elements" ; \
};
#define MN_PAGE_MENU \
@@ -175,33 +182,29 @@
};
#define MN_SLIDE_MENU \
- MN_SELECT_BACKGROUND\
- MN_INSERT_GRAPHIC\
MN_FORMAT_SLIDE\
+ MN_SELECT_BACKGROUND\
+ MN_SAVE_BACKGROUND\
MenuItem\
{\
Identifier = DUMMY + 8 ; \
Command = ".uno:PageMenu" ; \
- Text [ en-US ] = "Slid~e" ; \
+ Text [ en-US ] = "Slid~e Features" ; \
SubMenu = Menu\
{\
ItemList = \
{\
- MN_INSERT_SLIDE\
- MN_DUPLICATE_SLIDE\
- MN_DELETE_SLIDE\
- SEPARATOR\
- MN_RENAME_SLIDE\
MN_HIDE_SLIDE\
MN_SHOW_SLIDE\
SEPARATOR\
- MN_PRESENTATION_LAYOUT\
MN_DISPLAY_MASTER_BACKGROUND\
MN_DISPLAY_MASTER_OBJECTS\
+ MN_MASTER_ELEMENTS\
+ SEPARATOR\
+ MN_PRESENTATION_LAYOUT\
};\
};\
- }; \
- MN_SAVE_BACKGROUND
+ };
// Layer
#define MN_RENAME_LAYER \
@@ -575,22 +578,6 @@
Text [ en-US ] = "~Ungroup" ; \
};
-#define MN_COMBINE \
- MenuItem\
- {\
- Identifier = SID_COMBINE ; \
- HelpId = CMD_SID_COMBINE ; \
- Text [ en-US ] = "Comb~ine" ; \
- };
-
-#define MN_DISMANTLE \
- MenuItem\
- {\
- Identifier = SID_DISMANTLE ; \
- HelpId = CMD_SID_DISMANTLE ; \
- Text [ en-US ] = "~Split" ; \
- };
-
#define MN_ENTER_GROUP \
MenuItem\
{\
@@ -917,22 +904,6 @@
};\
};
-#define MN_CONNECT \
- MenuItem\
- {\
- Identifier = SID_CONNECT ; \
- HelpId = CMD_SID_CONNECT ; \
- Text [ en-US ] = "C~onnect" ; \
- };
-
-#define MN_BREAK \
- MenuItem\
- {\
- Identifier = SID_BREAK ; \
- HelpId = CMD_SID_BREAK ; \
- Text [ en-US ] = "~Break" ; \
- };
-
#define MN_STYLEDT \
MenuItem\
{\
diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src
index 28c858f..9c0d9ca 100644
--- a/sd/source/ui/app/popup2_tmpl.src
+++ b/sd/source/ui/app/popup2_tmpl.src
@@ -103,11 +103,6 @@
MN_TRANSFORM
MN_LINE
MN_AREA
- MN_TEXTATTR
- SEPARATOR
- MN_EDIT_POINTS
- SEPARATOR
- MN_CHAR_PARAGRAPH
SEPARATOR
MN_OBJECT_ALIGN
MN_POSITION
@@ -265,10 +260,6 @@
MN_LINE
MN_AREA
SEPARATOR
- MN_EDIT_POINTS
- SEPARATOR
- MN_CHAR_PARAGRAPH
- SEPARATOR
MN_OBJECT_ALIGN
MN_POSITION
MN_DISTRIBUTE
@@ -296,6 +287,7 @@
{
MN_TRANSFORM
MN_LINE
+ MN_EDIT_POINTS
SEPARATOR
MN_OBJECT_ALIGN
MN_POSITION
@@ -399,8 +391,8 @@
{
ItemList =
{
- MN_LINE
MN_TRANSFORM
+ MN_LINE
MN_EDIT_POINTS
MN_CLOSE_OBJECT
SEPARATOR
@@ -464,13 +456,9 @@
{
ItemList =
{
- MN_SET_DEFAULT
- SEPARATOR
+ MN_TRANSFORM
MN_LINE
MN_AREA
- MN_TRANSFORM
- SEPARATOR
- MN_CHAR_PARAGRAPH
SEPARATOR
MN_POSITION
MN_OBJECT_ALIGN
@@ -481,11 +469,7 @@
MN_GROUP
MN_UNGROUP
MN_LEAVE_GROUP
- MN_COMBINE
MNSUB_FORMEN
- MN_DISMANTLE
- MN_CONNECT
- MN_BREAK
#if SD_POPUP == RID_DRAW_TEXTOBJ_POPUP
SEPARATOR
MN_ACTION
@@ -502,14 +486,14 @@
{
ItemList =
{
+ MN_CROP
+ MN_ORIGINAL_SIZE
+ SEPARATOR
MenuItem { ITEM_EXTERNAL_EDIT };
MenuItem { ITEM_CHANGE_PICTURE };
MenuItem { ITEM_COMPRESS_GRAPHIC };
MenuItem { ITEM_SAVE_GRAPHIC };
SEPARATOR
- MN_CROP
- MN_ORIGINAL_SIZE
- SEPARATOR
MN_TRANSFORM
MN_LINE
SEPARATOR
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index 17d201a..65f31cc 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -280,6 +280,34 @@
Text [ en-US ] = "~Bullets and Numbering..." ; \
};
+#define MN_COMBINE \
+ MenuItem\
+ {\
+ Identifier = SID_COMBINE ; \
+ HelpId = CMD_SID_COMBINE ; \
+ Text [ en-US ] = "Comb~ine" ; \
+ };
+#define MN_DISMANTLE \
+ MenuItem\
+ {\
+ Identifier = SID_DISMANTLE ; \
+ HelpId = CMD_SID_DISMANTLE ; \
+ Text [ en-US ] = "~Split" ; \
+ };
+#define MN_CONNECT \
+ MenuItem\
+ {\
+ Identifier = SID_CONNECT ; \
+ HelpId = CMD_SID_CONNECT ; \
+ Text [ en-US ] = "C~onnect" ; \
+ };
+#define MN_BREAK \
+ MenuItem\
+ {\
+ Identifier = SID_BREAK ; \
+ HelpId = CMD_SID_BREAK ; \
+ Text [ en-US ] = "~Break" ; \
+ };
#define ITEM_POLY_MERGE \
MenuItem\
{\
@@ -326,6 +354,14 @@
{\
ItemList = \
{\
+ MN_COMBINE \
+ MN_DISMANTLE \
+ MN_CONNECT \
+ MN_BREAK \
+ MenuItem \
+ { \
+ Separator = TRUE; \
+ }; \
ITEM_POLY_MERGE \
ITEM_POLY_SUBSTRACT \
ITEM_POLY_INTERSECT \
More information about the Libreoffice-commits
mailing list