[Libreoffice-commits] core.git: sd/source

[Yousuf Philips]

 sd/source/ui/app/menuids3_tmpl.src |   10 +++++
 sd/source/ui/app/menuids_tmpl.src  |   66 ++++++++++++++++++++++++++++---------
 2 files changed, 59 insertions(+), 17 deletions(-)

New commits:
commit 2b44c4ed4a70832d1e7c18396f486efd2e1c48a0
Author: Yousuf Philips <philipz85 at hotmail.com>
Date:   Mon Dec 22 18:10:01 2014 +0400

    fdo#84233 rearrange impress's slide context menu and minor fix bugs in draw's
    
    Change-Id: I02616b09be4f8f064964b1ce23f8937878d21744
    Reviewed-on: https://gerrit.libreoffice.org/13599
    Reviewed-by: Yousuf Philips <philipz85 at hotmail.com>
    Tested-by: Yousuf Philips <philipz85 at hotmail.com>

diff --git a/sd/source/ui/app/menuids3_tmpl.src b/sd/source/ui/app/menuids3_tmpl.src
index eef4bb9..2ad4d5f 100644
--- a/sd/source/ui/app/menuids3_tmpl.src
+++ b/sd/source/ui/app/menuids3_tmpl.src
@@ -104,7 +104,15 @@
     {\
         Identifier = SID_PRESENTATION_LAYOUT ; \
         HelpId = CMD_SID_PRESENTATION_LAYOUT ; \
-        Text [ en-US ] = "~Slide Design" ; \
+        Text [ en-US ] = "~Slide Design..." ; \
+    };
+
+#define MN_PAGE_DESIGN \
+    MenuItem\
+    {\
+        Identifier = SID_PRESENTATION_LAYOUT ; \
+        HelpId = CMD_SID_PRESENTATION_LAYOUT ; \
+        Text [ en-US ] = "~Page Design..." ; \
     };
 
 #define MN_DIA \
diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src
index 9fb6314..87e26e0e 100644
--- a/sd/source/ui/app/menuids_tmpl.src
+++ b/sd/source/ui/app/menuids_tmpl.src
@@ -65,6 +65,14 @@
     {\
         Identifier = SID_MODIFYPAGE ; \
         HelpId = CMD_SID_MODIFYPAGE ; \
+        Text [ en-US ] = "Page ~Layout" ; \
+    };
+
+#define MN_MODIFY_SLIDE \
+    MenuItem\
+    {\
+        Identifier = SID_MODIFYPAGE ; \
+        HelpId = CMD_SID_MODIFYPAGE ; \
         Text [ en-US ] = "Slide ~Layout" ; \
     };
 
@@ -76,6 +84,14 @@
         Text [ en-US ] = "~Page Setup..." ; \
     };
 
+#define MN_FORMAT_SLIDE \
+    MenuItem\
+    {\
+        Identifier = SID_PAGESETUP ; \
+        HelpId = CMD_SID_PAGESETUP ; \
+        Text [ en-US ] = "Format ~Slide..." ; \
+    };
+
 #define MN_INSERT_SLIDE \
     MenuItem\
     {\
@@ -112,7 +128,7 @@
     {\
         Identifier = SID_SELECT_BACKGROUND ; \
         HelpId = CMD_SID_SELECT_BACKGROUND ; \
-        Text [ en-US ] = "Set Background Image for Slide ..." ; \
+        Text [ en-US ] = "Set Background Image..." ; \
     };
 #define MN_DISPLAY_MASTER_BACKGROUND \
     MenuItem\
@@ -129,6 +145,22 @@
         Text [ en-US ] = "Display Objects from Master" ; \
     };
 
+#define MN_HIDE_SLIDE \
+    MenuItem\
+    {\
+        Identifier = SID_HIDE_SLIDE ; \
+        HelpId = CMD_SID_HIDE_SLIDE ; \
+        Text [ en-US ] = "~Hide Slide" ; \
+    };
+
+#define MN_SHOW_SLIDE \
+    MenuItem\
+    {\
+        Identifier = SID_SHOW_SLIDE ; \
+        HelpId = CMD_SID_SHOW_SLIDE ; \
+        Text [ en-US ] = "~Show Slide" ; \
+    };
+
 #define MN_PAGE_MENU \
     MenuItem\
     {\
@@ -138,41 +170,43 @@
         {\
             ItemList = \
             {\
-                MN_FORMAT_PAGE\
-                MN_PRESENTATION_LAYOUT\
-                MN_RENAME_PAGE\
-                SEPARATOR\
                 MN_INSERT_PAGE\
                 MN_DELETE_PAGE\
+                SEPARATOR\
+                MN_FORMAT_PAGE\
+                MN_SELECT_BACKGROUND\
+                MN_PAGE_DESIGN\
+                MN_RENAME_PAGE\
             };\
         };\
         Text [ en-US ] = "Pag~e" ; \
     };
 
 #define MN_SLIDE_MENU \
+    MN_SELECT_BACKGROUND\
+    MN_FORMAT_SLIDE\
     MenuItem\
     {\
         Identifier = DUMMY + 8 ; \
         Command = ".uno:PageMenu" ; \
+        Text [ en-US ] = "Slid~e" ; \
         SubMenu = Menu\
         {\
             ItemList = \
             {\
-                MN_FORMAT_PAGE\
-                MN_PRESENTATION_LAYOUT\
-                MN_MODIFY_PAGE\
-                MN_SELECT_BACKGROUND\
+                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\
-                SEPARATOR\
-                MN_INSERT_SLIDE\
-                MN_DUPLICATE_SLIDE\
-                MN_DELETE_SLIDE\
             };\
         };\
-        Text [ en-US ] = "Slid~e" ; \
     };
 
  // Layer
@@ -213,7 +247,7 @@
     {\
         Identifier = SID_RENAMEPAGE ; \
         HelpId = CMD_SID_RENAMEPAGE ; \
-        Text [ en-US ] = "~Rename Slide" ; \
+        Text [ en-US ] = "~Rename Slide..." ; \
     };
 
 #define MN_RENAME_MASTER \
@@ -229,7 +263,7 @@
     {\
         Identifier = SID_RENAMEPAGE ; \
         HelpId = CMD_SID_RENAMEPAGE ; \
-        Text [ en-US ] = "~Rename Page" ; \
+        Text [ en-US ] = "~Rename Page..." ; \
     };
 
  // graphic attributes