GNOME.org
 

[shotwell/wip/dedeprecate] WIP

commit e850b3ce4eeb3ae9a9d9f52bbbde20d90f125dd4
Author: Jens Georg <mail jensge org>
Date:   Sat Nov 5 01:13:12 2016 +0100

    WIP

 ui/collection.ui              |   21 ++++++++++-
 ui/direct_context.ui          |   10 ++++-
 ui/event.ui                   |   20 +++++++++++
 ui/events_directory.ui        |   13 ++++++-
 ui/import.ui                  |   12 ++++++
 ui/media.ui                   |    1 +
 ui/offline.ui                 |   76 ++++++++++++++++++++++++++++++++++++++++-
 ui/photo.ui                   |    2 +-
 ui/photo_context.ui           |   10 +++++-
 ui/search_sidebar_context.ui  |    2 +-
 ui/sidebar_default_context.ui |    4 +-
 ui/tag_sidebar_context.ui     |    2 +-
 12 files changed, 160 insertions(+), 13 deletions(-)
---
diff --git a/ui/collection.ui b/ui/collection.ui
index 2d7b587..b96ffe5 100644
--- a/ui/collection.ui
+++ b/ui/collection.ui
@@ -13,10 +13,27 @@
         <attribute name="label" translatable="yes">Re_vert to Original</attribute>
         <attribute name="action">win.Revert</attribute>
       </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Add _Tags…</attribute>
+        <attribute name="accel">&lt;Primary&gt;t</attribute>
+        <attribute name="action">win.AddTags</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Modif_y Tags…</attribute>
+        <attribute name="accel">&lt;Primary&gt;m</attribute>
+        <attribute name="action">win.ModifyTags</attribute>
+      </item>
       <attribute name="id">ContextTagsPlaceholder</attribute>
     </section>
     <section>
       <attribute name="id">ContextFacesPlaceholder</attribute>
+      <item>
+        <attribute name="label" translatable="yes">_Flag</attribute>
+        <attribute name="accel">&lt;Primary&gt;g</attribute>
+        <attribute name="action">win.Flag</attribute>
+      </item>
     </section>
     <submenu>
       <attribute name="label" translatable="yes">_Set Rating</attribute>
@@ -100,7 +117,7 @@
       </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="accel">&lt;Primary&gt;&lt;Shift&gt;m</attribute>
         <attribute name="action">win.CommonJumpToFile</attribute>
       </item>
       <item>
@@ -192,7 +209,7 @@
         <property name="can_focus">False</property>
         <property name="tooltip_text" translatable="yes">Find an image by typing text that appears in its 
name or tags</property>
         <property name="is_important">True</property>
-        <property name="action_name">win.Find</property>
+        <property name="action_name">win.CommonDisplaySearchbar</property>
         <property name="label" translatable="yes">Find</property>
         <property name="use_underline">True</property>
         <property name="icon_name">edit-find</property>
diff --git a/ui/direct_context.ui b/ui/direct_context.ui
index 66e63f1..de758c2 100644
--- a/ui/direct_context.ui
+++ b/ui/direct_context.ui
@@ -1,5 +1,7 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
 <interface domain="shotwell">
+  <requires lib="gtk+" version="3.14"/>
   <menu id="DirectContextMenu">
     <submenu>
       <attribute name="label" translatable="yes">DirectContextMenu</attribute>
@@ -15,7 +17,11 @@
         </item>
       </section>
       <section>
-        <attribute name="id">ContextJumpPlaceholder</attribute>
+        <item>
+          <attribute name="label" translatable="yes">Show in File Mana_ger</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;m</attribute>
+          <attribute name="action">win.CommonJumpToFile</attribute>
+        </item>
         <item>
           <attribute name="label" translatable="yes">Send _To…</attribute>
           <attribute name="action">win.SendTo</attribute>
diff --git a/ui/event.ui b/ui/event.ui
index 84ca32d..13353e5 100644
--- a/ui/event.ui
+++ b/ui/event.ui
@@ -27,4 +27,24 @@
       </section>
     </submenu>
   </menu>
+  <menu id="CollectionContextMenu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Make _Key Photo for Event</attribute>
+        <attribute name="action">win.MakePrimary</attribute>
+      </item>
+    </section>
+  </menu>
+  <menu id="EventContextMenu">
+    <section>
+        <item>
+          <attribute name="label" translatable="yes">Re_name Event…</attribute>
+          <attribute name="action">win.Rename</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Edit Event _Comment…</attribute>
+          <attribute name="action">win.EditEventComment</attribute>
+        </item>
+    </section>
+  </menu>
 </interface>
diff --git a/ui/events_directory.ui b/ui/events_directory.ui
index aa5de83..380da0a 100644
--- a/ui/events_directory.ui
+++ b/ui/events_directory.ui
@@ -171,12 +171,21 @@
       </section>
     </submenu>
   </menu>
-  <menu id="">
+  <menu id="EventsDirectoryContextMenu">
     <section>
       <item>
-        <attribute name="label" translatable="yes"></attribute>
+        <attribute name="label" translatable="yes">_Merge Events</attribute>
         <attribute name="action">win.Merge</attribute>
       </item>
+      <item>
+        <attribute name="label" translatable="yes">Re_name Event…</attribute>
+        <attribute name="accel">F2</attribute>
+        <attribute name="action">win.Rename</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Edit _Comment…</attribute>
+        <attribute name="action">win.EditComment</attribute>
+      </item>
     </section>
   </menu>
 </interface>
diff --git a/ui/import.ui b/ui/import.ui
index 5ded29e..522ca7b 100644
--- a/ui/import.ui
+++ b/ui/import.ui
@@ -204,4 +204,16 @@
       </section>
     </submenu>
   </menu>
+  <menu id="ImportContextMenu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">Import _Selected</attribute>
+        <attribute name="action">win.ImportSelected</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Import _All</attribute>
+        <attribute name="action">win.ImportAll</attribute>
+      </item>
+    </section>
+  </menu>
 </interface>
diff --git a/ui/media.ui b/ui/media.ui
index 81c6304..bece40b 100644
--- a/ui/media.ui
+++ b/ui/media.ui
@@ -394,6 +394,7 @@
         </item>
       </section>
     </submenu>
+    <!-- Faces menu goes here FacesMenuPlaceholder -->
     <submenu>
       <attribute name="label" translatable="yes">_Help</attribute>
       <section>
diff --git a/ui/offline.ui b/ui/offline.ui
index 3de3629..1e7d280 100644
--- a/ui/offline.ui
+++ b/ui/offline.ui
@@ -56,7 +56,7 @@
       <section>
         <item>
           <attribute name="label" translatable="yes">R_emove from Library</attribute>
-          <attribute name="accel">&lt;Shift&gt;Delete</attribute>
+          <attribute name="accel">Delete</attribute>
           <attribute name="action">win.RemoveFromLibrary</attribute>
         </item>
       </section>
@@ -201,4 +201,78 @@
       </section>
     </submenu>
   </menu>
+  <menu id="OfflineContextMenu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">R_emove from Library</attribute>
+        <attribute name="accel">Delete</attribute>
+        <attribute name="action">win.RemoveFromLibrary</attribute>
+      </item>
+    </section>
+  </menu>
+  <object class="GtkToolbar" id="OfflineToolbar">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="toolbar_style">both-horiz</property>
+    <child>
+      <object class="GtkToolButton" id="ToolRotate">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="tooltip_text" translatable="yes">Rotate the photos right (press Ctrl to rotate 
left)</property>
+        <property name="is_important">True</property>
+        <property name="action_name">win.RotateClockwise</property>
+        <property name="label" translatable="yes">Rotate</property>
+        <property name="use_underline">True</property>
+        <property name="icon_name">object-rotate-right</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="homogeneous">True</property>
+      </packing>
+    </child>
+   <object class="GtkToolbar" id="CollectionToolbar">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="toolbar_style">both-horiz</property>
+    <child>
+      <object class="GtkToolButton" id="ToolRemoveFromLibrary">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="tooltip_text" translatable="yes">Remove the selected photos from the 
library</property>
+        <property name="is_important">True</property>
+        <property name="action_name">win.RemoveFromLibrary</property>
+        <property name="label" translatable="yes">R_emove From Library</property>
+        <property name="use_underline">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="homogeneous">True</property>
+      </packing>
+    </child>
+     <child>
+      <object class="GtkSeparatorToolItem">
+        <property name="can_focus">False</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="homogeneous">False</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkToolButton" id="ToolFind">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="tooltip_text" translatable="yes">Find an image by typing text that appears in its 
name or tags</property>
+        <property name="is_important">True</property>
+        <property name="action_name">win.CommonDisplaySearchbar</property>
+        <property name="label" translatable="yes">Find</property>
+        <property name="use_underline">True</property>
+        <property name="icon_name">edit-find</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="homogeneous">True</property>
+      </packing>
+    </child>
+  </object>
 </interface>
diff --git a/ui/photo.ui b/ui/photo.ui
index a0d6e88..d7017d7 100644
--- a/ui/photo.ui
+++ b/ui/photo.ui
@@ -33,7 +33,7 @@
       <section>
         <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="accel">&lt;Primary&gt;&lt;Shift&gt;m</attribute>
           <attribute name="action">win.CommonJumpToFile</attribute>
         </item>
       </section>
diff --git a/ui/photo_context.ui b/ui/photo_context.ui
index a010df9..81950fe 100644
--- a/ui/photo_context.ui
+++ b/ui/photo_context.ui
@@ -120,7 +120,15 @@
         </item>
       </section>
       <section>
-      <attribute name="id">ContextJumpPlaceholder</attribute>
+        <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;m</attribute>
+          <attribute name="action">win.CommonJumpToFile</attribute>
+        </item>
         <item>
           <attribute name="label" translatable="yes">Send T_o…</attribute>
           <attribute name="action">win.SendToContextMenu</attribute>
diff --git a/ui/search_sidebar_context.ui b/ui/search_sidebar_context.ui
index 76963e1..a925800 100644
--- a/ui/search_sidebar_context.ui
+++ b/ui/search_sidebar_context.ui
@@ -4,7 +4,7 @@
     <section>
       <item>
         <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
-        <attribute name="action">sidebar.search.new</attribute>
+        <attribute name="action">win.CommonNewSearch</attribute>
         <attribute name="accel">&lt;Primary&gt;s</attribute>
       </item>
     </section>
diff --git a/ui/sidebar_default_context.ui b/ui/sidebar_default_context.ui
index bd3d63a..644d8c7 100644
--- a/ui/sidebar_default_context.ui
+++ b/ui/sidebar_default_context.ui
@@ -4,12 +4,12 @@
     <section>
       <item>
         <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
-        <attribute name="action">sidebar.search.new</attribute>
+        <attribute name="action">win.CommonNewSearch</attribute>
         <attribute name="accel">&lt;Primary&gt;s</attribute>
       </item>
       <item>
         <attribute name="label" translatable="yes">New _Tag…</attribute>
-        <attribute name="action">sidebar.tag.new</attribute>
+        <attribute name="action">win.CommonNewTag</attribute>
       </item>
     </section>
   </menu>
diff --git a/ui/tag_sidebar_context.ui b/ui/tag_sidebar_context.ui
index b810c28..96b0f1e 100644
--- a/ui/tag_sidebar_context.ui
+++ b/ui/tag_sidebar_context.ui
@@ -4,7 +4,7 @@
     <section>
       <item>
         <attribute name="label" translatable="yes">New _Tag…</attribute>
-        <attribute name="action">sidebar.tag.new</attribute>
+        <attribute name="action">win.CommonNewTag</attribute>
       </item>
     </section>
   </menu>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]