[shotwell/wip/dedeprecate] WIP

[Jens Georg <jensgeorg src gnome org>]

commit 4f1b48cfb156c5ed242a8f0c7494b1c1fd81ba06
Author: Jens Georg <mail jensge org>
Date:   Fri Nov 4 18:38:08 2016 +0100

    WIP

 ui/collection.ui       |   56 ++++++++++++++++++++++++++++++++++++++++++++++++
 ui/direct_context.ui   |    2 +-
 ui/events_directory.ui |    8 ++++++
 ui/media.ui            |    3 +-
 4 files changed, 66 insertions(+), 3 deletions(-)
---
diff --git a/ui/collection.ui b/ui/collection.ui
index 4395b2b..2d7b587 100644
--- a/ui/collection.ui
+++ b/ui/collection.ui
@@ -3,6 +3,21 @@
 <interface domain="shotwell">
   <requires lib="gtk+" version="3.14"/>
   <menu id="CollectionContextMenu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Enhance</attribute>
+        <attribute name="accel">&lt;Primary&gt;e</attribute>
+        <attribute name="action">win.Enhance</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Re_vert to Original</attribute>
+        <attribute name="action">win.Revert</attribute>
+      </item>
+      <attribute name="id">ContextTagsPlaceholder</attribute>
+    </section>
+    <section>
+      <attribute name="id">ContextFacesPlaceholder</attribute>
+    </section>
     <submenu>
       <attribute name="label" translatable="yes">_Set Rating</attribute>
       <section>
@@ -59,6 +74,47 @@
         </item>
       </section>
     </submenu>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Edit _Title…</attribute>
+        <attribute name="action">win.EditTitle</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Edit _Comment…</attribute>
+        <attribute name="action">win.EditComment</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Open with E_xternal Editor</attribute>
+        <attribute name="accel">&lt;Primary&gt;Return</attribute>
+        <attribute name="action">win.ExternalEdit</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Open With RA_W Editor</attribute>
+        <attribute name="action">win.ExternalEditRAW</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">View Eve_nt for Photo</attribute>
+        <attribute name="action">win.CommonJumpToEvent</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Show in File Mana_ger</attribute>
+        <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;q</attribute>
+        <attribute name="action">win.CommonJumpToFile</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Send _To…</attribute>
+        <attribute name="action">win.SendTo</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Move to Trash</attribute>
+        <attribute name="accel">Delete</attribute>
+        <attribute name="action">win.MoveToTrash</attribute>
+      </item>
+    </section>
   </menu>
   <object class="GtkToolbar" id="CollectionToolbar">
     <property name="visible">True</property>
diff --git a/ui/direct_context.ui b/ui/direct_context.ui
index 0b045a8..66e63f1 100644
--- a/ui/direct_context.ui
+++ b/ui/direct_context.ui
@@ -15,7 +15,7 @@
         </item>
       </section>
       <section>
-      <attribute name="id">ContextJumpPlaceholder</attribute>
+        <attribute name="id">ContextJumpPlaceholder</attribute>
         <item>
           <attribute name="label" translatable="yes">Send _To…</attribute>
           <attribute name="action">win.SendTo</attribute>
diff --git a/ui/events_directory.ui b/ui/events_directory.ui
index 3b32796..aa5de83 100644
--- a/ui/events_directory.ui
+++ b/ui/events_directory.ui
@@ -171,4 +171,12 @@
       </section>
     </submenu>
   </menu>
+  <menu id="">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes"></attribute>
+        <attribute name="action">win.Merge</attribute>
+      </item>
+    </section>
+  </menu>
 </interface>
diff --git a/ui/media.ui b/ui/media.ui
index 0c9fb39..81c6304 100644
--- a/ui/media.ui
+++ b/ui/media.ui
@@ -374,8 +374,7 @@
           <attribute name="action">win.NewEvent</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">Show in File Mana_ger</attribute>
-          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;q</attribute>
+          <attribute name="label" translatable="yes">View Eve_nt for Photo</attribute>
           <attribute name="action">win.CommonJumpToEvent</attribute>
         </item>
       </section>