fdo#85945 reorganize the file menu and set global shortcut for .uno:CloseDoc

Change-Id: Idca217184719eb7c5679af65f9ab1536d615c284
Reviewed-on: https://gerrit.libreoffice.org/13571
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>

4 files changed, 12 insertions, 8 deletions

diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt
index 71562cbdbec6..360c22ca5822 100644
--- a/icon-themes/galaxy/links.txt
+++ b/icon-themes/galaxy/links.txt
@@ -23,6 +23,7 @@ cmd/sc_insertrowdialog.png cmd/sc_insertrows.png
 cmd/sc_insertcolumndialog.png cmd/sc_insertcolumns.png
 
 cmd/sc_graphicdialog.png cmd/sc_insertgraphic.png
+cmd/sc_templatemenu.png cmd/sc_newdoc.png
 
 # paragraph line spacing
 cmd/lc_linespacing.png cmd/lc_spacepara15.png
diff --git a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
index e66bd64cef8d..2070eee8f1f9 100644
--- a/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Accelerators.xcu
@@ -6929,7 +6929,7 @@
       <node oor:name="F4_MOD1" oor:op="replace">
         <prop oor:name="Command">
           <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
-          <value xml:lang="en-US">.uno:CloseWin</value>
+          <value xml:lang="en-US">.uno:CloseDoc</value>
         </prop>
       </node>
       <node oor:name="INSERT_MOD1" oor:op="replace">
@@ -6980,7 +6980,7 @@
         <node oor:name="F4_MOD1" oor:op="replace">
           <prop oor:name="Command">
             <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
-            <value xml:lang="en-US">.uno:CloseWin</value>
+            <value xml:lang="en-US">.uno:CloseDoc</value>
           </prop>
         </node>
         <node oor:name="INSERT_MOD1" oor:op="replace">
@@ -7062,7 +7062,7 @@
         <node oor:name="F4_MOD1" oor:op="replace">
           <prop oor:name="Command">
             <value xml:lang="x-no-translate">I10N SHORTCUTS - NO TRANSLATE</value>
-            <value xml:lang="en-US">.uno:CloseWin</value>
+            <value xml:lang="en-US">.uno:CloseDoc</value>
           </prop>
         </node>
         <node oor:name="F4_MOD2" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 18b359c86395..e4f2ba85adfe 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1912,6 +1912,9 @@
       </node>
       <node oor:name=".uno:NewDoc" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Manage Templates</value>
+        </prop>
+        <prop oor:name="ContextLabel" oor:type="xs:string">
           <value xml:lang="en-US">Manage</value>
         </prop>
         <prop oor:name="Properties" oor:type="xs:int">
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml b/sw/uiconfig/swriter/menubar/menubar.xml
index 97527f552b5a..ec6a85250b0c 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -22,17 +22,17 @@
       <menu:menuitem menu:id=".uno:AddDirect"/>
       <menu:menuitem menu:id=".uno:OpenFromWriter"/>
       <menu:menuitem menu:id=".uno:RecentFileList"/>
+      <menu:menuitem menu:id=".uno:CloseDoc"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:AutoPilotMenu"/>
       <menu:menuseparator/>
       <menu:menu menu:id=".uno:TemplateMenu">
           <menu:menupopup>
-              <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
               <menu:menuitem menu:id=".uno:NewDoc"/>
+              <menu:menuitem menu:id=".uno:SaveAsTemplate"/>
           </menu:menupopup>
       </menu:menu>
       <menu:menuseparator/>
-      <menu:menuitem menu:id=".uno:CloseDoc"/>
       <menu:menuitem menu:id=".uno:Save"/>
       <menu:menuitem menu:id=".uno:SaveAs"/>
       <menu:menuitem menu:id=".uno:SaveACopy"/>
@@ -65,15 +65,15 @@
         </menu:menupopup>
       </menu:menu>
       <menu:menuseparator/>
-      <menu:menuitem menu:id=".uno:SetDocumentProperties"/>
-      <menu:menuitem menu:id=".uno:Signature"/>
-      <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:WebHtml"/>
       <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:PrintPreview"/>
       <menu:menuitem menu:id=".uno:Print"/>
       <menu:menuitem menu:id=".uno:PrinterSetup"/>
       <menu:menuseparator/>
+      <menu:menuitem menu:id=".uno:SetDocumentProperties"/>
+      <menu:menuitem menu:id=".uno:Signature"/>
+      <menu:menuseparator/>
       <menu:menuitem menu:id=".uno:Quit"/>
     </menu:menupopup>
   </menu:menu>