From d21eae2447c227ad945d2b9df8cab895f792dd04 Mon Sep 17 00:00:00 2001
From: Yousuf Philips <philipz85@hotmail.com>
Date: Fri, 26 Dec 2014 17:45:53 +0400
Subject: fdo#87185 rearrange image context menu and add icons to a few entries

Change-Id: I7d28aea1059ec87cbc72ccea40dc000f51e6560b
Reviewed-on: https://gerrit.libreoffice.org/13662
Reviewed-by: Yousuf Philips <philipz85@hotmail.com>
Tested-by: Yousuf Philips <philipz85@hotmail.com>
---
 icon-themes/galaxy/links.txt                       | 11 +++++++++++
 .../org/openoffice/Office/UI/GenericCommands.xcu   |  6 ++++++
 .../org/openoffice/Office/UI/WriterCommands.xcu    | 22 ++++++++++++++++++++++
 sw/source/ui/app/mn.src                            | 10 ++++++----
 4 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/icon-themes/galaxy/links.txt b/icon-themes/galaxy/links.txt
index 0daf0aaba4bf..8ffb495a2dd6 100644
--- a/icon-themes/galaxy/links.txt
+++ b/icon-themes/galaxy/links.txt
@@ -32,3 +32,14 @@ cmd/sc_linespacing.png cmd/sc_spacepara15.png
 # flip in impress/draw
 cmd/sc_mirrorhorz.png cmd/sc_fliphorizontal.png
 cmd/sc_mirrorvert.png cmd/sc_flipvertical.png
+
+# image/object context menu entries
+cmd/sc_wrapmenu.png cmd/sc_wrapon.png
+cmd/sc_alignframemenu.png cmd/sc_objectalign.png
+cmd/sc_anchormenu.png cmd/sc_toggleanchortype.png
+cmd/sc_arrangeframemenu.png cmd/sc_bringtofront.png
+cmd/sc_savegraphic.png cmd/sc_save.png
+
+# menu submenu entries
+cmd/sc_arrangemenu.png cmd/sc_bringtofront.png
+
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 5a06527b1fd0..ef043e84f9bf 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5559,6 +5559,9 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">A~rrange</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:FlipMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
@@ -5574,6 +5577,9 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">A~nchor</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:AVMediaPlayer" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index fcb1314a7b9e..7ba3aee5d68a 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -2303,6 +2303,25 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">~Wrap</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:AlignFrameMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Alignment</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
+      </node>
+      <node oor:name=".uno:ArrangeFrameMenu" oor:op="replace">
+        <prop oor:name="Label" oor:type="xs:string">
+          <value xml:lang="en-US">Arrange</value>
+        </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+          <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:AutoFormatMenu" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
@@ -2323,6 +2342,9 @@
         <prop oor:name="Label" oor:type="xs:string">
           <value xml:lang="en-US">Save Images...</value>
         </prop>
+        <prop oor:name="Properties" oor:type="xs:int">
+            <value>1</value>
+        </prop>
       </node>
       <node oor:name=".uno:ContinueNumbering" oor:op="replace">
         <prop oor:name="Label" oor:type="xs:string">
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index 18319a6bc045..554d88f1bf73 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -1235,6 +1235,12 @@ Menu MN_GRF_POPUPMENU
         MenuItem { ITEM_CHANGE_PICTURE };
         MenuItem { ITEM_COMPRESS_GRAPHIC };
         MenuItem { ITEM_SAVE_GRAPHIC };
+        SEPARATOR ;
+
+        MN_ANCHOR
+        MN_MOUSE_FRAME_WITH_CONTOUR
+        MN_ALIGNMENT_FRAME
+        MN_ARRANGE_FRAME
         MN_ROTATE_IMAGE
         SEPARATOR ;
 
@@ -1245,10 +1251,6 @@ Menu MN_GRF_POPUPMENU
             HelpId = CMD_FN_FORMAT_GRAFIC_DLG ;
             Text [ en-US ] = "Format ~Image..." ;
         };
-        SEPARATOR ;
-
-        MN_ALIGN_FRAME
-        MN_MOUSE_FRAME_WITH_CONTOUR
     };
 };
 
-- 
cgit v1.2.3