Merge tag 'upstream/0.25.1'

Upstream version 0.25.1

1 files changed, 408 insertions, 129 deletions

diff --git a/ui/photo.ui b/ui/photo.ui
index a4c587e..6b662a5 100644
--- a/ui/photo.ui
+++ b/ui/photo.ui
@@ -1,129 +1,408 @@
-<ui>
-
-    <menubar name="MenuBar">
-        <menu name="FileMenu" action="FileMenu">
-            <menuitem name="Import" action="CommonFileImport" />
-            <menuitem name="ImportExternal" action="ExternalLibraryImport" />
-            <menuitem name="Export" action="Export" />
-            <separator />
-            <placeholder name="PrintPlaceholder" />
-            <separator />
-            <placeholder name="PublishPlaceholder" />
-            <menuitem name="SendTo" action="SendTo" />
-            <placeholder name="SetBackgroundPlaceholder" />
-            <separator />
-            <menuitem name="JumpToFile" action="CommonJumpToFile" />
-            <separator />
-            <menuitem name="EmptyTrash" action="CommonEmptyTrash" />
-            <separator />
-            <menuitem name="Quit" action="CommonQuit" />
-        </menu>
-        
-        <menu name="EditMenu" action="EditMenu">
-            <menuitem name="Undo" action="CommonUndo" />
-            <menuitem name="Redo" action="CommonRedo" />
-            <separator />
-            <menuitem name="NewSearch" action="CommonNewSearch" />
-            <separator />
-            <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
-            <menuitem name="MoveToTrash" action="MoveToTrash" />
-            <separator />
-            <menuitem name="Preferences" action="CommonPreferences" />
-        </menu>
-        
-        <menu name="ViewMenu" action="ViewMenu">
-            <menuitem name="DisplayBasicProperties" action="CommonDisplayBasicProperties" />
-            <menuitem name="DisplayExtendedProperties" action="CommonDisplayExtendedProperties" />
-            <menuitem name="DisplaySidebar" action="CommonDisplaySidebar" />
-            <menuitem name="DisplayToolbar" action="CommonDisplayToolbar" />
-            <separator />
-            <menuitem name="ViewRatings" action="ViewRatings" />
-            <separator />
-            <menu name="SortEvents" action="CommonSortEvents">
-                <menuitem name="SortEventsAscending" action="CommonSortEventsAscending" />
-                <menuitem name="SortEventsDescending" action="CommonSortEventsDescending" />
-            </menu>
-            <separator />
-            <menuitem name="IncreaseSize" action="IncreaseSize" />
-            <menuitem name="DecreaseSize" action="DecreaseSize" />
-            <separator />
-            <menuitem name="ZoomFit" action="ZoomFit" />
-            <menuitem name="Zoom100" action="Zoom100" />
-            <menuitem name="Zoom200" action="Zoom200" />
-            <separator />
-            <menuitem name="Fullscreen" action="CommonFullscreen" />
-            <separator />
-            <menuitem name="Slideshow" action="Slideshow" />
-        </menu>
-        
-        <menu name="PhotoMenu" action="PhotoMenu">
-            <menuitem name="PrevPhoto" action="PrevPhoto" />
-            <menuitem name="NextPhoto" action="NextPhoto" />
-            <separator />
-            <menuitem name="RotateClockwise" action="RotateClockwise" />
-            <menuitem name="RotateCounterclockwise" action="RotateCounterclockwise" />
-            <menuitem name="FlipHorizontally" action="FlipHorizontally" />
-            <menuitem name="FlipVertically" action="FlipVertically" />
-            <separator />
-            <menu name="Tools" action="Tools">
-                <menuitem name="Enhance" action="Enhance" />
-                <menuitem name="Crop" action="Crop" />
-                <menuitem name="Straighten" action="Straighten" />
-                <menuitem name="RedEye" action="RedEye" />
-                <menuitem name="Adjust" action="Adjust" />
-            </menu>
-            <menuitem name="Revert" action="Revert" />
-            <separator />
-            <menuitem name="CopyColorAdjustments" action="CopyColorAdjustments" />
-            <menuitem name="PasteColorAdjustments" action="PasteColorAdjustments" />
-            <separator/>
-            <menuitem name="Flag" action="Flag" />
-            <menu name="Rate" action="Rate">
-                <menuitem name="RateFive" action="RateFive" />
-                <menuitem name="RateFour" action="RateFour" />
-                <menuitem name="RateThree" action="RateThree" />
-                <menuitem name="RateTwo" action="RateTwo" />
-                <menuitem name="RateOne" action="RateOne" />
-                <menuitem name="RateUnrated" action="RateUnrated" />
-                <menuitem name="RateRejected" action="RateRejected" />
-                <separator />
-                <menuitem name="IncreaseRating" action="IncreaseRating" />
-                <menuitem name="DecreaseRating" action="DecreaseRating" />
-            </menu>
-            <separator />
-            <menuitem name="EditTitle" action="EditTitle" />
-            <menuitem name="EditComment" action="EditComment" />
-            <menuitem name="AdjustDateTime" action="AdjustDateTime" />
-            <separator />
-            <menu name="RawDeveloper" action="RawDeveloper">
-                <menuitem name="RawDeveloperShotwell" action="RawDeveloperShotwell" />
-                <menuitem name="RawDeveloperCamera" action="RawDeveloperCamera" />
-            </menu>
-            <separator />
-            <menuitem name="ExternalEdit" action="ExternalEdit" />
-            <menuitem name="ExternalEditRAW" action="ExternalEditRAW" />
-        </menu>
-
-        <menu name="TagsMenu" action="TagsMenu">
-            <menuitem name="AddTags" action="AddTags" />
-            <menuitem name="ModifyTags" action="ModifyTags" />
-        </menu>
-        
-        <menu name="HelpMenu" action="HelpMenu">
-            <menuitem name="Contents" action="CommonHelpContents" />
-            <menuitem name="Frequently Asked Questions" action="CommonHelpFAQ" />
-            <menuitem name="Report a Problem…" action="CommonHelpReportProblem" />
-            <separator />
-            <menuitem name="About" action="CommonAbout" />
-        </menu>
-    </menubar>
-
-    <popup name="PhotoContextMenu">
-        <placeholder name="ContextJumpPlaceholder">
-            <menuitem name="ContextJumpToEvent" action="CommonJumpToEvent" />
-            <menuitem name="ContextJumpToFile" action="CommonJumpToFile" />
-        </placeholder>
-    </popup>
-    
-</ui>
-
+<?xml version="1.0"?>
+<interface domain="shotwell">
+  <menu id="MenuBar">
+    <submenu>
+      <attribute name="label" translatable="yes">_File</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Import from Folder…</attribute>
+          <attribute name="accel">&lt;Primary&gt;i</attribute>
+          <attribute name="action">win.CommonFileImport</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Import From _Application…</attribute>
+          <attribute name="action">win.ExternalLibraryImport</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Save _As…</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;e</attribute>
+          <attribute name="action">win.Export</attribute>
+        </item>
+      </section>
+      <section>
+      <attribute name="id">PrintPlaceholder</attribute>
+      </section>
+      <section>
+      <attribute name="id">PublishPlaceholder</attribute>
+        <item>
+          <attribute name="label" translatable="yes">Send _To…</attribute>
+          <attribute name="action">win.SendTo</attribute>
+        </item>
+      <attribute name="id">SetBackgroundPlaceholder</attribute>
+      </section>
+      <section>
+        <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>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Empty T_rash</attribute>
+          <attribute name="action">win.CommonEmptyTrash</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Quit</attribute>
+          <attribute name="accel">&lt;Primary&gt;q</attribute>
+          <attribute name="action">win.CommonQuit</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Edit</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Undo</attribute>
+          <attribute name="accel">&lt;Primary&gt;z</attribute>
+          <attribute name="action">win.CommonUndo</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Redo</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;z</attribute>
+          <attribute name="action">win.CommonRedo</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
+          <attribute name="accel">&lt;Primary&gt;s</attribute>
+          <attribute name="action">win.CommonNewSearch</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">R_emove from Library</attribute>
+          <attribute name="accel">&lt;Shift&gt;Delete</attribute>
+          <attribute name="action">win.RemoveFromLibrary</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Move to Trash</attribute>
+          <attribute name="accel">Delete</attribute>
+          <attribute name="action">win.MoveToTrash</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Preferences</attribute>
+          <attribute name="action">win.CommonPreferences</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_View</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Basic Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;i</attribute>
+          <attribute name="action">win.CommonDisplayBasicProperties</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">E_xtended Information</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;x</attribute>
+          <attribute name="action">win.CommonDisplayExtendedProperties</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">S_idebar</attribute>
+          <attribute name="accel">F9</attribute>
+          <attribute name="action">win.CommonDisplaySidebar</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">T_oolbar</attribute>
+          <attribute name="accel">&lt;Primary&gt;F9</attribute>
+          <attribute name="action">win.CommonDisplayToolbar</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Ratings</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;n</attribute>
+          <attribute name="action">win.ViewRatings</attribute>
+        </item>
+      </section>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">Sort _Events</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">_Ascending</attribute>
+              <attribute name="action">win.CommonSortEvents</attribute>
+              <attribute name="target">ascending</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Descending</attribute>
+              <attribute name="action">win.CommonSortEvents</attribute>
+              <attribute name="target">descending</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Zoom _In</attribute>
+          <attribute name="accel">&lt;Primary&gt;plus</attribute>
+          <attribute name="action">win.IncreaseSize</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Zoom _Out</attribute>
+          <attribute name="accel">&lt;Primary&gt;minus</attribute>
+          <attribute name="action">win.DecreaseSize</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Fit to _Page</attribute>
+          <attribute name="accel">&lt;Primary&gt;0</attribute>
+          <attribute name="action">win.ZoomFit</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Zoom _100%</attribute>
+          <attribute name="accel">&lt;Primary&gt;1</attribute>
+          <attribute name="action">win.Zoom100</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Zoom _200%</attribute>
+          <attribute name="accel">&lt;Primary&gt;2</attribute>
+          <attribute name="action">win.Zoom200</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Fulls_creen</attribute>
+          <attribute name="accel">F11</attribute>
+          <attribute name="action">win.CommonFullscreen</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">S_lideshow</attribute>
+          <attribute name="accel">F5</attribute>
+          <attribute name="action">win.Slideshow</attribute>
+        </item>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Photo</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Previous Photo</attribute>
+          <attribute name="action">win.PrevPhoto</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Next Photo</attribute>
+          <attribute name="action">win.NextPhoto</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Rotate _Right</attribute>
+          <attribute name="accel">&lt;Primary&gt;r</attribute>
+          <attribute name="action">win.RotateClockwise</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Rotate _Left</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;r</attribute>
+          <attribute name="action">win.RotateCounterclockwise</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Flip Hori_zontally</attribute>
+          <attribute name="action">win.FlipHorizontally</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">Flip Verti_cally</attribute>
+          <attribute name="action">win.FlipVertically</attribute>
+        </item>
+      </section>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">T_ools</attribute>
+          <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">_Crop</attribute>
+              <attribute name="accel">&lt;Primary&gt;o</attribute>
+              <attribute name="action">win.Crop</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Straighten</attribute>
+              <attribute name="accel">&lt;Primary&gt;a</attribute>
+              <attribute name="action">win.Straighten</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Red-eye</attribute>
+              <attribute name="accel">&lt;Primary&gt;y</attribute>
+              <attribute name="action">win.RedEye</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Adjust</attribute>
+              <attribute name="accel">&lt;Primary&gt;d</attribute>
+              <attribute name="action">win.Adjust</attribute>
+            </item>
+          </section>
+        </submenu>
+        <item>
+          <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">_Copy Color Adjustments</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;c</attribute>
+          <attribute name="action">win.CopyColorAdjustments</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Paste Color Adjustments</attribute>
+          <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;v</attribute>
+          <attribute name="action">win.PasteColorAdjustments</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">Toggle _Flag</attribute>
+          <attribute name="accel">&lt;Primary&gt;g</attribute>
+          <attribute name="action">win.Flag</attribute>
+        </item>
+        <submenu>
+          <attribute name="label" translatable="yes">_Set Rating</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="no">★★★★★</attribute>
+              <attribute name="accel">5</attribute>
+              <attribute name="action">win.RateFive</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★★★</attribute>
+              <attribute name="accel">4</attribute>
+              <attribute name="action">win.RateFour</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★★</attribute>
+              <attribute name="accel">3</attribute>
+              <attribute name="action">win.RateThree</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★★</attribute>
+              <attribute name="accel">2</attribute>
+              <attribute name="action">win.RateTwo</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="no">★</attribute>
+              <attribute name="accel">1</attribute>
+              <attribute name="action">win.RateOne</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Unrated</attribute>
+              <attribute name="accel">0</attribute>
+              <attribute name="action">win.RateUnrated</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Rejected</attribute>
+              <attribute name="accel">9</attribute>
+              <attribute name="action">win.RateRejected</attribute>
+            </item>
+          </section>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">_Increase</attribute>
+              <attribute name="accel">greater</attribute>
+              <attribute name="action">win.IncreaseRating</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">_Decrease</attribute>
+              <attribute name="accel">less</attribute>
+              <attribute name="action">win.DecreaseRating</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+      <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">_Adjust Date and Time…</attribute>
+          <attribute name="action">win.AdjustDateTime</attribute>
+        </item>
+      </section>
+      <section>
+        <submenu>
+          <attribute name="label" translatable="yes">_Developer</attribute>
+          <section>
+            <item>
+              <attribute name="label" translatable="yes">Shotwell</attribute>
+              <attribute name="action">win.RawDeveloper</attribute>
+              <attribute name="target">Shotwell</attribute>
+            </item>
+            <item>
+              <attribute name="label" translatable="yes">Camera</attribute>
+              <attribute name="action">win.RawDeveloper</attribute>
+              <attribute name="target">Camera</attribute>
+            </item>
+          </section>
+        </submenu>
+      </section>
+      <section>
+        <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>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">Ta_gs</attribute>
+      <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>
+      </section>
+    </submenu>
+    <submenu>
+      <attribute name="label" translatable="yes">_Help</attribute>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_Help</attribute>
+          <attribute name="accel">F1</attribute>
+          <attribute name="action">win.CommonHelpContents</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Frequently Asked Questions</attribute>
+          <attribute name="action">win.CommonHelpFAQ</attribute>
+        </item>
+        <item>
+          <attribute name="label" translatable="yes">_Report a Problem…</attribute>
+          <attribute name="action">win.CommonHelpReportProblem</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name="label" translatable="yes">_About</attribute>
+          <attribute name="action">win.CommonAbout</attribute>
+        </item>
+      </section>
+    </submenu>
+  </menu>
+</interface>