summaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/collection.ui276
-rw-r--r--ui/direct.ui267
-rw-r--r--ui/direct_context.ui41
-rw-r--r--ui/event.ui618
-rw-r--r--ui/events_directory.ui255
-rw-r--r--ui/import.ui285
-rw-r--r--ui/import_queue.ui123
-rw-r--r--ui/media.ui552
-rw-r--r--ui/offline.ui319
-rw-r--r--ui/photo.ui537
-rw-r--r--ui/photo_context.ui182
-rw-r--r--ui/savedsearch.ui29
-rw-r--r--ui/search_bar.ui67
-rw-r--r--ui/search_sidebar_context.ui18
-rw-r--r--ui/set_background_dialog.ui11
-rw-r--r--ui/shotwell.ui1589
-rw-r--r--ui/sidebar_default_context.ui22
-rw-r--r--ui/tag_sidebar_context.ui17
-rw-r--r--ui/tags.ui470
-rw-r--r--ui/top.ui57
-rw-r--r--ui/trash.ui405
21 files changed, 4417 insertions, 1723 deletions
diff --git a/ui/collection.ui b/ui/collection.ui
index d832ea6..162aea2 100644
--- a/ui/collection.ui
+++ b/ui/collection.ui
@@ -1,51 +1,225 @@
-<ui>
- <popup name="CollectionContextMenu">
- <menuitem name="ContextEnhance" action="Enhance" />
- <menuitem name="ContextRevert" action="Revert" />
- <separator />
- <menuitem name="ContextAddTags" action="AddTagsContextMenu" />
- <menuitem name="ContextModifyTags" action="ModifyTags" />
- <placeholder name="ContextTagsPlaceholder" />
- <separator />
- <placeholder name="ContextFacesPlaceholder" />
- <separator />
- <menuitem name="ContextFlag" 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>
- <menu name="RawDeveloper" action="RawDeveloper">
- <menuitem name="RawDeveloperShotwell" action="RawDeveloperShotwell" />
- <menuitem name="RawDeveloperCamera" action="RawDeveloperCamera" />
- </menu>
- <separator />
- <menuitem name="ContextEditTitle" action="EditTitle" />
- <menuitem name="ContextEditComment" action="EditComment" />
- <menuitem name="ContextExternalEdit" action="ExternalEdit" />
- <menuitem name="ContextExternalEditRAW" action="ExternalEditRAW" />
- <separator />
- <menuitem name="ContextJumpToEvent" action="CommonJumpToEvent" />
- <menuitem name="ContextJumpToFile" action="CommonJumpToFile" />
- <menuitem name="ContextSendTo" action="SendToContextMenu" />
- <separator />
- <menuitem name="ContextMoveToTrash" action="MoveToTrash" />
- </popup>
-
- <toolbar name="CollectionToolbar">
- <toolitem name="ToolRotate" action="RotateClockwise" />
- <toolitem name="ToolEnhance" action="Enhance" />
- <separator />
- <toolitem name="ToolPublish" action="Publish" />
- <separator />
- <toolitem name="ToolFind" action="CommonDisplaySearchbar" />
- </toolbar>
-</ui>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<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>
+ </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">Toggle _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>
+ <section>
+ <item>
+ <attribute name="label" translatable="no">★★★★★</attribute>
+ <attribute name="action">win.RateFive</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★★★</attribute>
+ <attribute name="action">win.RateFour</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★★</attribute>
+ <attribute name="action">win.RateThree</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★</attribute>
+ <attribute name="action">win.RateTwo</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★</attribute>
+ <attribute name="action">win.RateOne</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Unrated</attribute>
+ <attribute name="action">win.RateUnrated</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Rejected</attribute>
+ <attribute name="action">win.RateRejected</attribute>
+ </item>
+ </section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Increase</attribute>
+ <attribute name="action">win.IncreaseRating</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Decrease</attribute>
+ <attribute name="action">win.DecreaseRating</attribute>
+ </item>
+ </section>
+ </submenu>
+ <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>
+ <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;m</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>
+ <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>
+ <child>
+ <object class="GtkToolButton" id="ToolEnhance">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Automatically improve the photo’s appearance</property>
+ <property name="is_important">True</property>
+ <property name="action_name">win.Enhance</property>
+ <property name="label" translatable="yes">Enhance</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">shotwell-auto-enhance</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="ToolPublish">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Publish to various websites</property>
+ <property name="is_important">True</property>
+ <property name="action_name">win.Publish</property>
+ <property name="label" translatable="yes">Publish</property>
+ <property name="use_underline">True</property>
+ <property name="icon_name">applications-internet</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="GtkToggleToolButton" 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/direct.ui b/ui/direct.ui
index e3d4e34..75acb0f 100644
--- a/ui/direct.ui
+++ b/ui/direct.ui
@@ -1,70 +1,197 @@
-<ui>
-
- <menubar name="MenuBar">
- <menu name="FileMenu" action="FileMenu">
- <menuitem name="Save" action="Save" />
- <menuitem name="SaveAs" action="SaveAs" />
- <separator />
- <placeholder name="PrintPlaceholder"/>
- <separator />
- <menuitem name="SendTo" action="SendTo" />
- <placeholder name="SetBackgroundPlaceholder" />
- <separator />
- <menuitem name="JumpToFile" action="CommonJumpToFile" />
- <separator />
- <menuitem name="Quit" action="CommonQuit" />
- </menu>
-
- <menu name="EditMenu" action="EditMenu">
- <menuitem name="Undo" action="CommonUndo" />
- <menuitem name="Redo" action="CommonRedo" />
- </menu>
-
- <menu name="ViewMenu" action="ViewMenu">
- <menuitem name="Fullscreen" action="CommonFullscreen" />
- <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" />
- </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="AdjustDateTime" action="AdjustDateTime" />
- </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="DirectContextMenu">
- <placeholder name="ContextJumpPlaceholder">
- <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">_Save</attribute>
+ <attribute name="accel">&lt;Primary&gt;s</attribute>
+ <attribute name="action">win.Save</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">Save _As…</attribute>
+ <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;s</attribute>
+ <attribute name="action">win.SaveAs</attribute>
+ </item>
+ </section>
+ <section>
+ <attribute name="id">PrintPlaceholder</attribute>
+ </section>
+ <section>
+ <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;q</attribute>
+ <attribute name="action">win.CommonJumpToFile</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>
+ </submenu>
+ <submenu>
+ <attribute name="label" translatable="yes">_View</attribute>
+ <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">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>
+ </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">_Adjust Date and Time…</attribute>
+ <attribute name="action">win.AdjustDateTime</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>
diff --git a/ui/direct_context.ui b/ui/direct_context.ui
index 7b0d564..3349835 100644
--- a/ui/direct_context.ui
+++ b/ui/direct_context.ui
@@ -1,10 +1,31 @@
-<ui>
- <popup name="DirectContextMenu">
- <menuitem name="ContextEnhance" action="Enhance" />
- <menuitem name="ContextRevert" action="Revert" />
- <separator />
- <placeholder name="ContextJumpPlaceholder" />
- <menuitem name="ContextSendTo" action="SendTo" />
- </popup>
-</ui>
-
+<?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>
+ <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>
+ </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>
+ <item>
+ <attribute name="label" translatable="yes">Send _To…</attribute>
+ <attribute name="action">win.SendTo</attribute>
+ </item>
+ </section>
+ </submenu>
+ </menu>
+</interface>
diff --git a/ui/event.ui b/ui/event.ui
index dcb1d95..11d9b74 100644
--- a/ui/event.ui
+++ b/ui/event.ui
@@ -1,25 +1,593 @@
-<ui>
-
- <menubar name="MenuBar">
- <menu name="PhotosMenu" action="PhotosMenu">
- <separator />
- <menuitem name="MakePrimary" action="MakePrimary" />
- </menu>
- <menu name="EventsMenu" action="EventsMenu">
- <menuitem name="EventRename" action="Rename" />
- <menuitem name="EditComment" action="EditComment" />
- </menu>
- </menubar>
-
- <popup name="CollectionContextMenu">
- <separator />
- <menuitem name="ContextMakePrimary" action="MakePrimary" />
- </popup>
-
- <popup name="EventContextMenu">
- <menuitem name="ContextRename" action="Rename" />
- <menuitem name="EditEventComment" action="EditEventComment" />
- </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">FileExtrasPlaceholder</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">_Find</attribute>
+ <attribute name="action">win.CommonFind</attribute>
+ </item>
+ <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>
+ <attribute name="id">EditExtrasPlaceholder</attribute>
+ <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">Select _All</attribute>
+ <attribute name="accel">&lt;Primary&gt;a</attribute>
+ <attribute name="action">win.CommonSelectAll</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">_Search Bar</attribute>
+ <attribute name="accel">F8</attribute>
+ <attribute name="action">win.CommonDisplaySearchbar</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">_Titles</attribute>
+ <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;t</attribute>
+ <attribute name="action">win.ViewTitle</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Comments</attribute>
+ <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;c</attribute>
+ <attribute name="action">win.ViewComment</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">Ta_gs</attribute>
+ <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;g</attribute>
+ <attribute name="action">win.ViewTags</attribute>
+ </item>
+ <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">_Filter Photos</attribute>
+ <section>
+ <item>
+ <attribute name="label" translatable="no">★★★★★</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">7</attribute>
+ <attribute name="accel">&lt;Primary&gt;5</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★★★</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">6</attribute>
+ <attribute name="accel">&lt;Primary&gt;4</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★★</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">5</attribute>
+ <attribute name="accel">&lt;Primary&gt;3</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">4</attribute>
+ <attribute name="accel">&lt;Primary&gt;2</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">3</attribute>
+ <attribute name="accel">&lt;Primary&gt;1</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_All Photos</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">2</attribute>
+ <attribute name="accel">&lt;Primary&gt;0</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">All + _Rejected</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">1</attribute>
+ <attribute name="accel">&lt;Primary&gt;9</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">Rejected _Only</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">8</attribute>
+ <attribute name="accel">&lt;Primary&gt;8</attribute>
+ </item>
+ </section>
+ </submenu>
+ </section>
+ <section>
+ <submenu>
+ <attribute name="label" translatable="yes">Sort _Photos</attribute>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">By _Title</attribute>
+ <attribute name="action">win.SortBy</attribute>
+ <attribute name="target">1</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">By _Filename</attribute>
+ <attribute name="action">win.SortBy</attribute>
+ <attribute name="target">4</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">By Exposure _Date</attribute>
+ <attribute name="action">win.SortBy</attribute>
+ <attribute name="target">2</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">By _Rating</attribute>
+ <attribute name="action">win.SortBy</attribute>
+ <attribute name="target">3</attribute>
+ </item>
+ </section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Ascending</attribute>
+ <attribute name="action">win.Sort</attribute>
+ <attribute name="target">ascending</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">D_escending</attribute>
+ <attribute name="action">win.Sort</attribute>
+ <attribute name="target">descending</attribute>
+ </item>
+ </section>
+ </submenu>
+ <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>
+ <attribute name="id">ViewExtrasFullscreenSlideshowPlaceholder</attribute>
+ </section>
+ </submenu>
+ <submenu>
+ <attribute name="label" translatable="yes">_Photos</attribute>
+ <section>
+ <attribute name="id">PhotosExtrasEditsPlaceholder</attribute>
+ </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>
+ <attribute name="id">PhotosExtrasDateTimePlaceholder</attribute>
+ </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>
+ <attribute name="id">PhotosExtrasExternalsPlaceholder</attribute>
+ </section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">Make _Key Photo for Event</attribute>
+ <attribute name="action">win.MakePrimary</attribute>
+ </item>
+ </section>
+ </submenu>
+ <submenu>
+ <attribute name="label" translatable="yes">Even_ts</attribute>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_New Event</attribute>
+ <attribute name="accel">&lt;Primary&gt;n</attribute>
+ <attribute name="action">win.NewEvent</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">View Eve_nt for Photo</attribute>
+ <attribute name="action">win.CommonJumpToEvent</attribute>
+ </item>
+ </section>
+ <section>
+ <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>
+ </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>
+ <!-- Faces menu goes here FacesMenuPlaceholder -->
+ <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>
+ <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>
+ </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">Toggle _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>
+ <section>
+ <item>
+ <attribute name="label" translatable="no">★★★★★</attribute>
+ <attribute name="action">win.RateFive</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★★★</attribute>
+ <attribute name="action">win.RateFour</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★★</attribute>
+ <attribute name="action">win.RateThree</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★</attribute>
+ <attribute name="action">win.RateTwo</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★</attribute>
+ <attribute name="action">win.RateOne</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Unrated</attribute>
+ <attribute name="action">win.RateUnrated</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Rejected</attribute>
+ <attribute name="action">win.RateRejected</attribute>
+ </item>
+ </section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Increase</attribute>
+ <attribute name="action">win.IncreaseRating</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Decrease</attribute>
+ <attribute name="action">win.DecreaseRating</attribute>
+ </item>
+ </section>
+ </submenu>
+ <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>
+ <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;m</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>
+ <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 33ab5d7..380da0a 100644
--- a/ui/events_directory.ui
+++ b/ui/events_directory.ui
@@ -1,64 +1,191 @@
-<ui>
-
- <menubar name="MenuBar">
- <menu name="FileMenu" action="FileMenu">
- <menuitem name="Import" action="CommonFileImport" />
- <menuitem name="ImportExternal" action="ExternalLibraryImport" />
- <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="Find" action="CommonFind" />
- <menuitem name="NewSearch" action="CommonNewSearch" />
- <separator />
- <menuitem name="SelectAll" action="CommonSelectAll" />
- <separator />
- <menuitem name="Preferences" action="CommonPreferences" />
- </menu>
-
- <menu name="ViewMenu" action="ViewMenu">
- <menuitem name="DisplayBasicProperties" action="CommonDisplayBasicProperties" />
- <menuitem name="DisplayExtendedProperties" action="CommonDisplayExtendedProperties" />
- <menuitem name="DisplaySearchbar" action="CommonDisplaySearchbar" />
- <menuitem name="DisplaySidebar" action="CommonDisplaySidebar" />
- <menuitem name="DisplayToolbar" action="CommonDisplayToolbar" />
- <separator />
- <menuitem name="ViewComment" action="ViewComment" />
- <separator />
- <menu name="SortEvents" action="CommonSortEvents">
- <menuitem name="SortEventsAscending" action="CommonSortEventsAscending" />
- <menuitem name="SortEventsDescending" action="CommonSortEventsDescending" />
- </menu>
- <separator />
- <menuitem name="Fullscreen" action="CommonFullscreen" />
- </menu>
-
- <menu name="EventsMenu" action="EventsMenu">
- <menuitem name="EventMerge" action="Merge" />
- <menuitem name="EventRename" action="Rename" />
- <menuitem name="EditComment" action="EditComment" />
- </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="EventsDirectoryContextMenu">
- <menuitem name="ContextMerge" action="Merge" />
- <menuitem name="ContextRename" action="Rename" />
- <menuitem name="ContextEditComment" action="EditComment" />
- </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>
+ </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">_Find</attribute>
+ <attribute name="action">win.CommonFind</attribute>
+ </item>
+ <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">Select _All</attribute>
+ <attribute name="accel">&lt;Primary&gt;a</attribute>
+ <attribute name="action">win.CommonSelectAll</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">_Search Bar</attribute>
+ <attribute name="accel">F8</attribute>
+ <attribute name="action">win.CommonDisplaySearchbar</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">_Comments</attribute>
+ <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;c</attribute>
+ <attribute name="action">win.ViewComment</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">D_escending</attribute>
+ <attribute name="action">win.CommonSortEvents</attribute>
+ <attribute name="target">descending</attribute>
+ </item>
+ </section>
+ </submenu>
+ </section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">Fulls_creen</attribute>
+ <attribute name="accel">F11</attribute>
+ <attribute name="action">win.CommonFullscreen</attribute>
+ </item>
+ </section>
+ </submenu>
+ <submenu>
+ <attribute name="label" translatable="yes">Even_ts</attribute>
+ <section>
+ <item>
+ <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>
+ </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>
+ <menu id="EventsDirectoryContextMenu">
+ <section>
+ <item>
+ <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 3c3cac3..522ca7b 100644
--- a/ui/import.ui
+++ b/ui/import.ui
@@ -1,66 +1,219 @@
-<ui>
-
- <menubar name="MenuBar">
- <menu name="FileMenu" action="FileMenu">
- <menuitem name="Import" action="CommonFileImport" />
- <menuitem name="ImportSelected" action="ImportSelected" />
- <menuitem name="ImportAll" action="ImportAll" />
- <menuitem name="ImportExternal" action="ExternalLibraryImport" />
- <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="Find" action="CommonFind" />
- <separator />
- <menuitem name="SelectAll" action="CommonSelectAll" />
- <separator />
- <menuitem name="Preferences" action="CommonPreferences" />
- </menu>
-
- <menu name="ViewMenu" action="ViewMenu">
- <menuitem name="DisplayBasicProperties" action="CommonDisplayBasicProperties" />
- <menuitem name="DisplayExtendedProperties" action="CommonDisplayExtendedProperties" />
- <menuitem name="DisplaySearchbar" action="CommonDisplaySearchbar" />
- <menuitem name="DisplaySidebar" action="CommonDisplaySidebar" />
- <menuitem name="DisplayToolbar" action="CommonDisplayToolbar" />
- <separator />
- <menuitem name="ViewTitle" action="ViewTitle" />
- <separator />
- <menu name="FilterPhotos" action="CommonFilterPhotos">
- <menuitem name="DisplayFiveOrHigher" action="CommonDisplayFiveOrHigher" />
- <menuitem name="DisplayFourOrHigher" action="CommonDisplayFourOrHigher" />
- <menuitem name="DisplayThreeOrHigher" action="CommonDisplayThreeOrHigher" />
- <menuitem name="DisplayTwoOrHigher" action="CommonDisplayTwoOrHigher" />
- <menuitem name="DisplayOneOrHigher" action="CommonDisplayOneOrHigher" />
- <menuitem name="DisplayUnratedOrHigher" action="CommonDisplayUnratedOrHigher" />
- <menuitem name="DisplayRejectedOrHigher" action="CommonDisplayRejectedOrHigher" />
- <menuitem name="DisplayRejectedOnly" action="CommonDisplayRejectedOnly" />
- </menu>
- <separator />
- <menu name="SortEvents" action="CommonSortEvents">
- <menuitem name="SortEventsAscending" action="CommonSortEventsAscending" />
- <menuitem name="SortEventsDescending" action="CommonSortEventsDescending" />
- </menu>
- </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="ImportContextMenu">
- <menuitem name="ContextImportSelected" action="ImportSelected" />
- <menuitem name="ContextImportAll" action="ImportAll" />
- </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 _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>
+ <item>
+ <attribute name="label" translatable="yes">Import From _Application…</attribute>
+ <attribute name="action">win.ExternalLibraryImport</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">_Find</attribute>
+ <attribute name="action">win.CommonFind</attribute>
+ </item>
+ </section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">Select _All</attribute>
+ <attribute name="accel">&lt;Primary&gt;a</attribute>
+ <attribute name="action">win.CommonSelectAll</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">_Search Bar</attribute>
+ <attribute name="accel">F8</attribute>
+ <attribute name="action">win.CommonDisplaySearchbar</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">_Titles</attribute>
+ <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;t</attribute>
+ <attribute name="action">win.ViewTitle</attribute>
+ </item>
+ </section>
+ <section>
+ <submenu>
+ <attribute name="label" translatable="yes">_Filter Photos</attribute>
+ <section>
+ <item>
+ <attribute name="label" translatable="no">★★★★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">7</attribute>
+ <attribute name="accel">&lt;Primary&gt;5</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">6</attribute>
+ <attribute name="accel">&lt;Primary&gt;4</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">5</attribute>
+ <attribute name="accel">&lt;Primary&gt;3</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">4</attribute>
+ <attribute name="accel">&lt;Primary&gt;2</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">3</attribute>
+ <attribute name="accel">&lt;Primary&gt;1</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_All Photos</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">2</attribute>
+ <attribute name="accel">&lt;Primary&gt;0</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">All + _Rejected</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">1</attribute>
+ <attribute name="accel">&lt;Primary&gt;9</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">Rejected _Only</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">8</attribute>
+ <attribute name="accel">&lt;Primary&gt;8</attribute>
+ </item>
+ </section>
+ </submenu>
+ </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>
+ </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>
+ <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/import_queue.ui b/ui/import_queue.ui
index 88078b8..9b07d9c 100644
--- a/ui/import_queue.ui
+++ b/ui/import_queue.ui
@@ -1,34 +1,89 @@
-<ui>
-
- <menubar name="MenuBar">
- <menu name="FileMenu" action="FileMenu">
- <menuitem name="Stop" action="Stop" />
- <separator />
- <menuitem name="Import" action="CommonFileImport" />
- <menuitem name="ImportExternal" action="ExternalLibraryImport" />
- <separator />
- <menuitem name="EmptyTrash" action="CommonEmptyTrash" />
- <separator />
- <menuitem name="Quit" action="CommonQuit" />
- </menu>
-
- <menu name="ViewMenu" action="ViewMenu">
- <menuitem name="DisplayBasicProperties" action="CommonDisplayBasicProperties" />
- <separator />
- <menu name="SortEvents" action="CommonSortEvents">
- <menuitem name="SortEventsAscending" action="CommonSortEventsAscending" />
- <menuitem name="SortEventsDescending" action="CommonSortEventsDescending" />
- </menu>
- </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>
-
-</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">_Stop Import</attribute>
+ <attribute name="action">win.Stop</attribute>
+ </item>
+ </section>
+ <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>
+ </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">_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>
+ </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">D_escending</attribute>
+ <attribute name="action">win.CommonSortEvents</attribute>
+ <attribute name="target">descending</attribute>
+ </item>
+ </section>
+ </submenu>
+ </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>
diff --git a/ui/media.ui b/ui/media.ui
index f42c189..e3d8ba1 100644
--- a/ui/media.ui
+++ b/ui/media.ui
@@ -1,127 +1,425 @@
-<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="FileExtrasPlaceholder" />
- <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="Find" action="CommonFind" />
- <menuitem name="NewSearch" action="CommonNewSearch" />
- <separator />
- <placeholder name="EditExtrasPlaceholder" />
- <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
- <menuitem name="MoveToTrash" action="MoveToTrash" />
- <separator />
- <menuitem name="SelectAll" action="CommonSelectAll" />
- <separator />
- <menuitem name="Preferences" action="CommonPreferences" />
- </menu>
-
- <menu name="ViewMenu" action="ViewMenu">
- <menuitem name="DisplayBasicProperties" action="CommonDisplayBasicProperties" />
- <menuitem name="DisplayExtendedProperties" action="CommonDisplayExtendedProperties" />
- <menuitem name="DisplaySearchbar" action="CommonDisplaySearchbar" />
- <menuitem name="DisplaySidebar" action="CommonDisplaySidebar" />
- <menuitem name="DisplayToolbar" action="CommonDisplayToolbar" />
- <separator />
- <menuitem name="ViewTitle" action="ViewTitle" />
- <menuitem name="ViewComment" action="ViewComment" />
- <menuitem name="ViewTags" action="ViewTags" />
- <menuitem name="ViewRatings" action="ViewRatings" />
- <separator />
- <menu name="FilterPhotos" action="CommonFilterPhotos">
- <menuitem name="DisplayFiveOrHigher" action="CommonDisplayFiveOrHigher" />
- <menuitem name="DisplayFourOrHigher" action="CommonDisplayFourOrHigher" />
- <menuitem name="DisplayThreeOrHigher" action="CommonDisplayThreeOrHigher" />
- <menuitem name="DisplayTwoOrHigher" action="CommonDisplayTwoOrHigher" />
- <menuitem name="DisplayOneOrHigher" action="CommonDisplayOneOrHigher" />
- <menuitem name="DisplayUnratedOrHigher" action="CommonDisplayUnratedOrHigher" />
- <menuitem name="DisplayRejectedOrHigher" action="CommonDisplayRejectedOrHigher" />
- <menuitem name="DisplayRejectedOnly" action="CommonDisplayRejectedOnly" />
- </menu>
- <separator />
- <menu name="SortPhotos" action="SortPhotos">
- <menuitem name="SortByTitle" action="SortByTitle" />
- <menuitem name="SortByFilename" action="SortByFilename" />
- <menuitem name="SortByExposureDate" action="SortByExposureDate" />
- <menuitem name="SortByRating" action="SortByRating" />
- <separator />
- <menuitem name="SortAscending" action="SortAscending" />
- <menuitem name="SortDescending" action="SortDescending" />
- </menu>
- <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 />
- <placeholder name="ViewExtrasFullscreenSlideshowPlaceholder" />
- </menu>
-
- <menu name="PhotosMenu" action="PhotosMenu">
- <placeholder name="PhotosExtrasEditsPlaceholder" />
- <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" />
- <placeholder name="PhotosExtrasDateTimePlaceholder" />
- <separator />
- <menu name="RawDeveloper" action="RawDeveloper">
- <menuitem name="RawDeveloperShotwell" action="RawDeveloperShotwell" />
- <menuitem name="RawDeveloperCamera" action="RawDeveloperCamera" />
- </menu>
- <separator />
- <placeholder name="PhotosExtrasExternalsPlaceholder" />
- </menu>
-
- <menu name="EventsMenu" action="EventsMenu">
- <menuitem name="NewEvent" action="NewEvent" />
- <menuitem name="CommonJumpToEvent" action="CommonJumpToEvent" />
- </menu>
-
- <menu name="TagsMenu" action="TagsMenu">
- <menuitem name="AddTags" action="AddTags" />
- <menuitem name="ModifyTags" action="ModifyTags" />
- </menu>
-
- <placeholder name="FacesMenuPlaceholder" />
-
- <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>
-</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">FileExtrasPlaceholder</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">_Find</attribute>
+ <attribute name="action">win.CommonFind</attribute>
+ </item>
+ <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>
+ <attribute name="id">EditExtrasPlaceholder</attribute>
+ <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">Select _All</attribute>
+ <attribute name="accel">&lt;Primary&gt;a</attribute>
+ <attribute name="action">win.CommonSelectAll</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">_Search Bar</attribute>
+ <attribute name="accel">F8</attribute>
+ <attribute name="action">win.CommonDisplaySearchbar</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">_Titles</attribute>
+ <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;t</attribute>
+ <attribute name="action">win.ViewTitle</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Comments</attribute>
+ <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;c</attribute>
+ <attribute name="action">win.ViewComment</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">Ta_gs</attribute>
+ <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;g</attribute>
+ <attribute name="action">win.ViewTags</attribute>
+ </item>
+ <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">_Filter Photos</attribute>
+ <section>
+ <item>
+ <attribute name="label" translatable="no">★★★★★</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">7</attribute>
+ <attribute name="accel">&lt;Primary&gt;5</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★★★</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">6</attribute>
+ <attribute name="accel">&lt;Primary&gt;4</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★★</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">5</attribute>
+ <attribute name="accel">&lt;Primary&gt;3</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">4</attribute>
+ <attribute name="accel">&lt;Primary&gt;2</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">3</attribute>
+ <attribute name="accel">&lt;Primary&gt;1</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_All Photos</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">2</attribute>
+ <attribute name="accel">&lt;Primary&gt;0</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">All + _Rejected</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">1</attribute>
+ <attribute name="accel">&lt;Primary&gt;9</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">Rejected _Only</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">8</attribute>
+ <attribute name="accel">&lt;Primary&gt;8</attribute>
+ </item>
+ </section>
+ </submenu>
+ </section>
+ <section>
+ <submenu>
+ <attribute name="label" translatable="yes">Sort _Photos</attribute>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">By _Title</attribute>
+ <attribute name="action">win.SortBy</attribute>
+ <attribute name="target">1</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">By _Filename</attribute>
+ <attribute name="action">win.SortBy</attribute>
+ <attribute name="target">4</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">By Exposure _Date</attribute>
+ <attribute name="action">win.SortBy</attribute>
+ <attribute name="target">2</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">By _Rating</attribute>
+ <attribute name="action">win.SortBy</attribute>
+ <attribute name="target">3</attribute>
+ </item>
+ </section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Ascending</attribute>
+ <attribute name="action">win.Sort</attribute>
+ <attribute name="target">ascending</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">D_escending</attribute>
+ <attribute name="action">win.Sort</attribute>
+ <attribute name="target">descending</attribute>
+ </item>
+ </section>
+ </submenu>
+ <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>
+ <attribute name="id">ViewExtrasFullscreenSlideshowPlaceholder</attribute>
+ </section>
+ </submenu>
+ <submenu>
+ <attribute name="label" translatable="yes">_Photos</attribute>
+ <section>
+ <attribute name="id">PhotosExtrasEditsPlaceholder</attribute>
+ </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>
+ <attribute name="id">PhotosExtrasDateTimePlaceholder</attribute>
+ </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>
+ <attribute name="id">PhotosExtrasExternalsPlaceholder</attribute>
+ </section>
+ </submenu>
+ <submenu>
+ <attribute name="label" translatable="yes">Even_ts</attribute>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_New Event</attribute>
+ <attribute name="accel">&lt;Primary&gt;n</attribute>
+ <attribute name="action">win.NewEvent</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">View Eve_nt for Photo</attribute>
+ <attribute name="action">win.CommonJumpToEvent</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>
+ <!-- Faces menu goes here FacesMenuPlaceholder -->
+ <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>
diff --git a/ui/offline.ui b/ui/offline.ui
index ff56ae9..f886526 100644
--- a/ui/offline.ui
+++ b/ui/offline.ui
@@ -1,70 +1,249 @@
-<ui>
-
- <menubar name="MenuBar">
- <menu name="FileMenu" action="FileMenu">
- <menuitem name="Import" action="CommonFileImport" />
- <menuitem name="ImportExternal" action="ExternalLibraryImport" />
- <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="Find" action="CommonFind" />
- <menuitem name="NewSearch" action="CommonNewSearch" />
- <separator />
- <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
- <separator />
- <menuitem name="SelectAll" action="CommonSelectAll" />
- <separator />
- <menuitem name="Preferences" action="CommonPreferences" />
- </menu>
-
- <menu name="ViewMenu" action="ViewMenu">
- <menuitem name="DisplayBasicProperties" action="CommonDisplayBasicProperties" />
- <menuitem name="DisplayExtendedProperties" action="CommonDisplayExtendedProperties" />
- <menuitem name="DisplaySearchbar" action="CommonDisplaySearchbar" />
- <menuitem name="DisplaySidebar" action="CommonDisplaySidebar" />
- <menuitem name="DisplayToolbar" action="CommonDisplayToolbar" />
- <separator />
- <menu name="FilterPhotos" action="CommonFilterPhotos">
- <menuitem name="DisplayFiveOrHigher" action="CommonDisplayFiveOrHigher" />
- <menuitem name="DisplayFourOrHigher" action="CommonDisplayFourOrHigher" />
- <menuitem name="DisplayThreeOrHigher" action="CommonDisplayThreeOrHigher" />
- <menuitem name="DisplayTwoOrHigher" action="CommonDisplayTwoOrHigher" />
- <menuitem name="DisplayOneOrHigher" action="CommonDisplayOneOrHigher" />
- <menuitem name="DisplayUnratedOrHigher" action="CommonDisplayUnratedOrHigher" />
- <menuitem name="DisplayRejectedOrHigher" action="CommonDisplayRejectedOrHigher" />
- <menuitem name="DisplayRejectedOnly" action="CommonDisplayRejectedOnly" />
- </menu>
- <separator />
- <menu name="SortEvents" action="CommonSortEvents">
- <menuitem name="SortEventsAscending" action="CommonSortEventsAscending" />
- <menuitem name="SortEventsDescending" action="CommonSortEventsDescending" />
- </menu>
- </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="OfflineContextMenu">
- <menuitem name="RemoveFromLibrary" action="RemoveFromLibrary" />
- </popup>
-
- <toolbar name="OfflineToolbar">
- <toolitem name="ToolRemoveFromLibrary" action="RemoveFromLibrary" />
- <separator />
- <toolitem name="ToolFind" action="CommonDisplaySearchbar" />
- </toolbar>
-
-</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>
+ </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">_Find</attribute>
+ <attribute name="action">win.CommonFind</attribute>
+ </item>
+ <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">Delete</attribute>
+ <attribute name="action">win.RemoveFromLibrary</attribute>
+ </item>
+ </section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">Select _All</attribute>
+ <attribute name="accel">&lt;Primary&gt;a</attribute>
+ <attribute name="action">win.CommonSelectAll</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">_Search Bar</attribute>
+ <attribute name="accel">F8</attribute>
+ <attribute name="action">win.CommonDisplaySearchbar</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>
+ <submenu>
+ <attribute name="label" translatable="yes">_Filter Photos</attribute>
+ <section>
+ <item>
+ <attribute name="label" translatable="no">★★★★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">7</attribute>
+ <attribute name="accel">&lt;Primary&gt;5</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">6</attribute>
+ <attribute name="accel">&lt;Primary&gt;4</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">5</attribute>
+ <attribute name="accel">&lt;Primary&gt;3</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">4</attribute>
+ <attribute name="accel">&lt;Primary&gt;2</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">3</attribute>
+ <attribute name="accel">&lt;Primary&gt;1</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_All Photos</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">2</attribute>
+ <attribute name="accel">&lt;Primary&gt;0</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">All + _Rejected</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">1</attribute>
+ <attribute name="accel">&lt;Primary&gt;9</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">Rejected _Only</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">8</attribute>
+ <attribute name="accel">&lt;Primary&gt;8</attribute>
+ </item>
+ </section>
+ </submenu>
+ </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">D_escending</attribute>
+ <attribute name="action">win.CommonSortEvents</attribute>
+ <attribute name="target">descending</attribute>
+ </item>
+ </section>
+ </submenu>
+ </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>
+ <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="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="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 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>
diff --git a/ui/photo_context.ui b/ui/photo_context.ui
index f897022..10dcd3d 100644
--- a/ui/photo_context.ui
+++ b/ui/photo_context.ui
@@ -1,39 +1,145 @@
-<ui>
- <popup name="PhotoContextMenu">
- <menuitem name="ContextEnhance" action="Enhance" />
- <menuitem name="ContextRevert" action="Revert" />
- <separator />
- <menuitem name="ContextAddTags" action="AddTagsContextMenu" />
- <menuitem name="ContextModifyTags" action="ModifyTags" />
- <placeholder name="ContextTagsPlaceholder" />
- <separator />
- <menuitem name="ContextFlag" 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>
- <menu name="RawDeveloper" action="RawDeveloper">
- <menuitem name="RawDeveloperShotwell" action="RawDeveloperShotwell" />
- <menuitem name="RawDeveloperCamera" action="RawDeveloperCamera" />
- </menu>
- <separator />
- <menuitem name="ContextEditTitle" action="EditTitle" />
- <menuitem name="ContextEditComment" action="EditComment" />
- <menuitem name="ContextExternalEdit" action="ExternalEdit" />
- <menuitem name="ContextExternalEditRAW" action="ExternalEditRAW" />
- <separator />
- <placeholder name="ContextJumpPlaceholder" />
- <menuitem name="ContextSendTo" action="SendToContextMenu" />
- <separator />
- <menuitem name="ContextMoveToTrash" action="MoveToTrash" />
- </popup>
+<?xml version="1.0"?>
+<interface domain="shotwell">
+ <menu id="PhotoContextMenu">
+ <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>
+ </section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Add Tags…</attribute>
+ <attribute name="accel">&lt;Primary&gt;a</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>
+ <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>
-</ui>
+ <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">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;m</attribute>
+ <attribute name="action">win.CommonJumpToFile</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">Send T_o…</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>
+</interface>
diff --git a/ui/savedsearch.ui b/ui/savedsearch.ui
index 4217cbc..32a643d 100644
--- a/ui/savedsearch.ui
+++ b/ui/savedsearch.ui
@@ -1,8 +1,21 @@
-<ui>
- <popup name="SearchContextMenu">
- <menuitem name="ContextRenameSearch" action="RenameSearch" />
- <menuitem name="ContextEditSearch" action="EditSearch" />
- <menuitem name="ContextDeleteSearch" action="DeleteSearch" />
- </popup>
-
-</ui>
+<?xml version="1.0"?>
+<interface domain="shotwell">
+ <menu id="SearchContextMenu">
+ <submenu>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">Re_name…</attribute>
+ <attribute name="action">win.RenameSearch</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Edit…</attribute>
+ <attribute name="action">win.EditSearch</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Delete</attribute>
+ <attribute name="action">win.DeleteSearch</attribute>
+ </item>
+ </section>
+ </submenu>
+ </menu>
+</interface>
diff --git a/ui/search_bar.ui b/ui/search_bar.ui
index 957c8b3..9d56962 100644
--- a/ui/search_bar.ui
+++ b/ui/search_bar.ui
@@ -1,12 +1,55 @@
-<ui>
- <popup name="FilterPopupMenu" action="CommonFilterPhotos">
- <menuitem name="DisplayFiveOrHigher" action="CommonDisplayFiveOrHigher" />
- <menuitem name="DisplayFourOrHigher" action="CommonDisplayFourOrHigher" />
- <menuitem name="DisplayThreeOrHigher" action="CommonDisplayThreeOrHigher" />
- <menuitem name="DisplayTwoOrHigher" action="CommonDisplayTwoOrHigher" />
- <menuitem name="DisplayOneOrHigher" action="CommonDisplayOneOrHigher" />
- <menuitem name="DisplayUnratedOrHigher" action="CommonDisplayUnratedOrHigher" />
- <menuitem name="DisplayRejectedOrHigher" action="CommonDisplayRejectedOrHigher" />
- <menuitem name="DisplayRejectedOnly" action="CommonDisplayRejectedOnly" />
- </popup>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<interface domain="shotwell">
+ <menu id='popup-menu'>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">Rejected _Only</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">8</attribute>
+ <attribute name="accel">&lt;Primary&gt;8</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">All + _Rejected</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">1</attribute>
+ <attribute name="accel">&lt;Primary&gt;9</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_All Photos</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">2</attribute>
+ <attribute name="accel">&lt;Primary&gt;0</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">3</attribute>
+ <attribute name="accel">&lt;Primary&gt;1</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">4</attribute>
+ <attribute name="accel">&lt;Primary&gt;2</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★★</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">5</attribute>
+ <attribute name="accel">&lt;Primary&gt;3</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★★★</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">6</attribute>
+ <attribute name="accel">&lt;Primary&gt;4</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★★★★</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">7</attribute>
+ <attribute name="accel">&lt;Primary&gt;5</attribute>
+ </item>
+ </section>
+ </menu>
+</interface>
diff --git a/ui/search_sidebar_context.ui b/ui/search_sidebar_context.ui
index 9db976e..a925800 100644
--- a/ui/search_sidebar_context.ui
+++ b/ui/search_sidebar_context.ui
@@ -1,6 +1,12 @@
-<ui>
- <popup name="SidebarSearchContextMenu">
- <menuitem name="NewSearch" action="CommonNewSearch" />
- </popup>
-</ui>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<interface domain="shotwell">
+ <menu id='popup-menu'>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">Ne_w Saved Search…</attribute>
+ <attribute name="action">win.CommonNewSearch</attribute>
+ <attribute name="accel">&lt;Primary&gt;s</attribute>
+ </item>
+ </section>
+ </menu>
+</interface>
diff --git a/ui/set_background_dialog.ui b/ui/set_background_dialog.ui
index f857693..ee7106f 100644
--- a/ui/set_background_dialog.ui
+++ b/ui/set_background_dialog.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.2 -->
-<interface>
- <requires lib="gtk+" version="3.0"/>
+<!-- Generated with glade 3.20.0 -->
+<interface domain="shotwell">
+ <requires lib="gtk+" version="3.14"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">100</property>
<property name="step_increment">10</property>
@@ -78,8 +78,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5899999737739563</property>
+ <property name="halign">start</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -94,7 +93,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="draw_indicator">True</property>
</object>
<packing>
diff --git a/ui/shotwell.ui b/ui/shotwell.ui
index 01c4274..573c736 100644
--- a/ui/shotwell.ui
+++ b/ui/shotwell.ui
@@ -1,187 +1,575 @@
<?xml version="1.0" encoding="UTF-8"?>
-<interface>
- <!-- interface-requires gtk+ 3.12 -->
- <object class="GtkBox" id="criteria">
- <property name="visible">True</property>
+<!-- Generated with glade 3.20.0 -->
+<interface domain="shotwell">
+ <requires lib="gtk+" version="3.14"/>
+ <object class="GtkAdjustment" id="bg_color_adjustment">
+ <property name="upper">65535</property>
+ <property name="step_increment">1000</property>
+ <property name="page_increment">1000</property>
+ <property name="page_size">1000</property>
+ </object>
+ <object class="GtkDialog" id="preferences_dialog">
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">5</property>
- <property name="border_width">3</property>
- <child>
- <object class="GtkAlignment" id="title_aln">
+ <property name="destroy_with_parent">True</property>
+ <property name="type_hint">dialog</property>
+ <property name="skip_taskbar_hint">True</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox">
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <object class="GtkBox" id="hbox3">
+ <object class="GtkNotebook" id="preferences-notebook">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">3</property>
+ <property name="can_focus">True</property>
+ <property name="show_border">False</property>
<child>
- <object class="GtkLabel" id="Name of search:">
+ <object class="GtkGrid" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Name of search:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">Search title</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="border_width">6</property>
+ <property name="row_spacing">4</property>
+ <property name="column_spacing">8</property>
+ <child>
+ <object class="GtkFileChooserButton" id="library_dir_button">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action">select-folder</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="slider container">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">white</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScale" id="bg_color_slider">
+ <property name="width_request">150</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">bg_color_adjustment</property>
+ <property name="draw_value">False</property>
+ <property name="value_pos">left</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">black</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="default_raw_developer">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">13</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_bottom">3</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">Display</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="library location">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_top">14</property>
+ <property name="margin_bottom">3</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">Library Location</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="bg_color_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_left">10</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">_Background:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">bg_color_slider</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_left">10</property>
+ <property name="label" translatable="yes">_Import photos to:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">library_dir_button</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="autoimport">
+ <property name="label" translatable="yes">_Watch library directory for new files</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="margin_left">10</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="importing">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_top">14</property>
+ <property name="margin_bottom">3</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">Importing</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="dir_structure_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_left">10</property>
+ <property name="label" translatable="yes">_Directory structure:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="example">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_left">34</property>
+ <property name="label" translatable="yes">Example:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="lowercase">
+ <property name="label" translatable="yes">R_ename imported files to lowercase</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="margin_left">10</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">9</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_top">14</property>
+ <property name="margin_bottom">3</property>
+ <property name="label" translatable="yes">Metadata</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">10</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="write_metadata">
+ <property name="label" translatable="yes">Write tags, titles, and other _metadata to photo files</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="margin_left">10</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">11</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_top">14</property>
+ <property name="margin_bottom">3</property>
+ <property name="label" translatable="yes">RAW Developer</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">12</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_left">10</property>
+ <property name="label" translatable="yes">De_fault:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">default_raw_developer</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">13</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="dir choser">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="dir_pattern_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="dynamic example">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="patern">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_left">34</property>
+ <property name="label" translatable="yes">_Pattern:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="pattern_help">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <attributes>
+ <attribute name="underline" value="True"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="library-tab">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Library</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="tab_fill">False</property>
</packing>
</child>
<child>
- <object class="GtkEntry" id="Search title">
+ <object class="GtkBox" id="hbox4">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="width_chars">20</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
+ <property name="can_focus">False</property>
+ <property name="valign">start</property>
+ <property name="border_width">6</property>
+ <child>
+ <object class="GtkBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_left">4</property>
+ <property name="margin_right">4</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">E_xternal photo editor:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">external_photo_editor_combo</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin_left">4</property>
+ <property name="margin_right">4</property>
+ <property name="label" translatable="yes">External _RAW editor:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">external_raw_editor_combo</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="vbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkComboBox" id="external_photo_editor_combo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="external_raw_editor_combo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkHSeparator" id="hseparator1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkBox" id="hbox2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkLabel" id="Match">
+ <child type="tab">
+ <object class="GtkLabel" id="external-editors-tab">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_Match</property>
- <property name="use_underline">True</property>
- <property name="justify">right</property>
- <property name="mnemonic_widget">Type of search criteria</property>
+ <property name="label" translatable="yes">External Editors</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="position">1</property>
+ <property name="tab_fill">False</property>
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="Type of search criteria">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">1</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
- <child>
- <object class="GtkLabel" id="of the following:">
+ <child type="tab">
+ <object class="GtkLabel" id="plugins-tab">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">of the following:</property>
+ <property name="label" translatable="yes">Plugins</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">2</property>
+ <property name="tab_fill">False</property>
</packing>
</child>
<child>
<placeholder/>
</child>
- <child>
- <object class="GtkButton" id="Add search button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <style>
- <class name="image-button"/>
- </style>
- <child>
- <object class="GtkImage">
- <property name="visible">True</property>
- <property name="icon-name">list-add-symbolic</property>
- <property name="icon-size">1</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">4</property>
- </packing>
+ <child type="tab">
+ <placeholder/>
</child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
</child>
- <child>
- <object class="GtkHSeparator" id="hseparator2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="row_box">
+ <child type="titlebar">
+ <object class="GtkHeaderBar" id="headerbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">3</property>
- <child>
- <placeholder/>
- </child>
+ <property name="title">Shotwell Preferences</property>
+ <property name="show_close_button">True</property>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">5</property>
- </packing>
</child>
</object>
- <object class="GtkAdjustment" id="bg_color_adjustment">
- <property name="upper">65535</property>
- <property name="step_increment">1000</property>
- <property name="page_increment">1000</property>
- <property name="page_size">1000</property>
- </object>
<object class="GtkBox" id="box_ImgSettingsPane">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -190,8 +578,8 @@
<object class="GtkLabel" id="lbl_PrintedImageSize">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="margin_top">4</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">&lt;b&gt;Printed Image Size&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
@@ -213,8 +601,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">radio_UseCustomSize</property>
@@ -256,8 +644,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -279,7 +667,6 @@
<property name="margin_right">3</property>
<property name="invisible_char">●</property>
<property name="width_chars">10</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -306,7 +693,6 @@
<property name="margin_left">3</property>
<property name="invisible_char">●</property>
<property name="width_chars">10</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -346,9 +732,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="margin_left">210</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -370,8 +756,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">radio_UseCustomSize</property>
@@ -405,7 +791,7 @@
<object class="GtkLabel" id="lbl_Titles">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">&lt;b&gt;Titles&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
@@ -427,8 +813,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -443,10 +829,9 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="margin_left">49</property>
- <property name="font">Sans Bold 12</property>
+ <property name="font">Sans 12</property>
<property name="preview_text"/>
<property name="show_preview_entry">False</property>
- <property name="font_name">Sans Bold 12</property>
</object>
<packing>
<property name="expand">False</property>
@@ -465,8 +850,8 @@
<object class="GtkLabel" id="lbl_PixelResolution">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">start</property>
<property name="margin_top">12</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes">&lt;b&gt;Pixel Resolution&lt;/b&gt;</property>
<property name="use_markup">True</property>
</object>
@@ -486,7 +871,7 @@
<object class="GtkLabel" id="lbl_OutputPhotoAt">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">_Output photo at:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">entry_PixelsPerInch</property>
@@ -510,7 +895,6 @@
<property name="margin_right">8</property>
<property name="invisible_char">●</property>
<property name="width_chars">13</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -545,17 +929,185 @@
</packing>
</child>
</object>
- <object class="GtkBox" id="dialog-vbox2">
+ <object class="GtkBox" id="criteria">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="border_width">3</property>
<property name="orientation">vertical</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkLabel" id="Name of search:">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Name of search:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">Search title</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="Search title">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">•</property>
+ <property name="width_chars">20</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparator" id="hseparator1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkLabel" id="Match">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Match</property>
+ <property name="use_underline">True</property>
+ <property name="justify">right</property>
+ <property name="mnemonic_widget">Type of search criteria</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="Type of search criteria">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">1</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="of the following:">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">of the following:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkButton" id="Add search button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">list-add-symbolic</property>
+ <property name="icon_size">1</property>
+ </object>
+ </child>
+ <style>
+ <class name="image-button"/>
+ </style>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSeparator" id="hseparator2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="row_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">3</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ </object>
+ <object class="GtkBox" id="dialog-vbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">3</property>
+ <property name="orientation">vertical</property>
<property name="spacing">3</property>
<child>
<object class="GtkLabel" id="label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes">label</property>
</object>
<packing>
@@ -586,8 +1138,8 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="orientation">vertical</property>
<property name="border_width">3</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
@@ -620,29 +1172,25 @@
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
- <object class="GtkAlignment" id="plugin-list-alignment">
+ <object class="GtkScrolledWindow" id="plugin-list-scrolled-window">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="shadow_type">etched-in</property>
<child>
- <object class="GtkScrolledWindow" id="plugin-list-scrolled-window">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="shadow_type">etched-in</property>
- <child>
- <placeholder/>
- </child>
- </object>
+ <placeholder/>
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkHButtonBox" id="hbuttonbox1">
+ <object class="GtkButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -668,692 +1216,6 @@
</packing>
</child>
</object>
- <object class="GtkDialog" id="preferences_dialog">
- <property name="can_focus">False</property>
- <property name="destroy_with_parent">True</property>
- <property name="type_hint">dialog</property>
- <property name="skip_taskbar_hint">True</property>
- <child type="titlebar">
- <object class="GtkHeaderBar" id="headerbar">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="show-close-button">True</property>
- <property name="title" translatable="yes">Shotwell Preferences</property>
- </object>
- </child>
- <child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="border_width">0</property>
- <child>
- <object class="GtkNotebook" id="notebook1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="show_border">False</property>
- <child>
- <object class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">6</property>
- <child>
- <object class="GtkTable" id="table1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="n_rows">14</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">8</property>
- <property name="row_spacing">4</property>
- <child>
- <object class="GtkFileChooserButton" id="library_dir_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="action">select-folder</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="slider container">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">white</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHScale" id="bg_color_slider">
- <property name="width_request">150</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">bg_color_adjustment</property>
- <property name="draw_value">False</property>
- <property name="value_pos">left</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">black</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">14</property>
- <property name="bottom_padding">3</property>
- <child>
- <object class="GtkLabel" id="library location">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Library Location</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">2</property>
- <property name="left_padding">10</property>
- <child>
- <object class="GtkCheckButton" id="autoimport">
- <property name="label" translatable="yes">_Watch library directory for new files</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0.5</property>
- <property name="draw_indicator">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="right_attach">2</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="label: metadata">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">14</property>
- <property name="bottom_padding">3</property>
- <child>
- <object class="GtkLabel" id="label10">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Metadata</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="right_attach">2</property>
- <property name="top_attach">10</property>
- <property name="bottom_attach">11</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="label: metadate write">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">10</property>
- <child>
- <object class="GtkCheckButton" id="write_metadata">
- <property name="label" translatable="yes">Write tags, titles, and other _metadata to photo files</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0.5</property>
- <property name="draw_indicator">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="right_attach">2</property>
- <property name="top_attach">11</property>
- <property name="bottom_attach">12</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="label: display">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="bottom_padding">3</property>
- <child>
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Display</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="label: import to">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">10</property>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Import photos to:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">library_dir_button</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="label: background">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="bg_color_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="xpad">10</property>
- <property name="label" translatable="yes">_Background:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">bg_color_slider</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="label: importing">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">14</property>
- <property name="bottom_padding">3</property>
- <child>
- <object class="GtkLabel" id="importing">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Importing</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="right_attach">2</property>
- <property name="top_attach">5</property>
- <property name="bottom_attach">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="label: directory structure">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">10</property>
- <child>
- <object class="GtkLabel" id="dir_structure_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Directory structure:</property>
- <property name="use_underline">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="dir choser">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">6</property>
- <property name="bottom_attach">7</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="label: patern">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">34</property>
- <child>
- <object class="GtkBox" id="hbox1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="patern">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Pattern:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">dir_pattern_entry</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="pattern_help">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <attributes>
- <attribute name="underline" value="True"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="entry: pattern">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkEntry" id="dir_pattern_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">7</property>
- <property name="bottom_attach">8</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="label: dynamic example">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="dynamic example">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="label: example">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">34</property>
- <child>
- <object class="GtkLabel" id="example">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Example:</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="top_attach">8</property>
- <property name="bottom_attach">9</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="checkbox: lowercase">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">2</property>
- <property name="left_padding">10</property>
- <child>
- <object class="GtkCheckButton" id="lowercase">
- <property name="label" translatable="yes">R_ename imported files to lowercase</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0.5</property>
- <property name="draw_indicator">True</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="right_attach">2</property>
- <property name="top_attach">9</property>
- <property name="bottom_attach">10</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="label: developer">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">14</property>
- <property name="bottom_padding">3</property>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">RAW Developer</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="right_attach">2</property>
- <property name="top_attach">12</property>
- <property name="bottom_attach">13</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="default_raw_developer">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">13</property>
- <property name="bottom_attach">14</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">10</property>
- <child>
- <object class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">De_fault:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">default_raw_developer</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="top_attach">13</property>
- <property name="bottom_attach">14</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="library-tab">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Library</property>
- </object>
- <packing>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">6</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkBox" id="hbox4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkAlignment" id="labels: external editors">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">6</property>
- <child>
- <object class="GtkBox" id="vbox2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="xpad">4</property>
- <property name="label" translatable="yes">E_xternal photo editor:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">external_photo_editor_combo</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="xpad">4</property>
- <property name="label" translatable="yes">External _RAW editor:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">external_raw_editor_combo</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="vbox3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkComboBox" id="external_photo_editor_combo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="external_raw_editor_combo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="external-editors-tab">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">External Editors</property>
- </object>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="plugin-manifest-bin">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">12</property>
- <property name="bottom_padding">12</property>
- <property name="left_padding">12</property>
- <property name="right_padding">12</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">2</property>
- </packing>
- </child>
- <child type="tab">
- <object class="GtkLabel" id="plugins-tab">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Plugins</property>
- </object>
- <packing>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child type="tab">
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
<object class="GtkBox" id="progress_pane_widget">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1396,7 +1258,7 @@
<object class="GtkLabel" id="delay_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">_Delay:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">delay_hscale</property>
@@ -1404,15 +1266,13 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="transition_effect_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0.95999997854232788</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">_Transition effect:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">transition_effect_selector</property>
@@ -1420,23 +1280,19 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="transition_delay_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
+ <property name="halign">end</property>
<property name="label" translatable="yes">Transition d_elay:</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -1445,29 +1301,24 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">start</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
<property name="width">4</property>
- <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="transition_effect_selector">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="entry_text_column">0</property>
- <property name="id_column">1</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -1481,8 +1332,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -1494,8 +1343,6 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -1503,13 +1350,10 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -1517,14 +1361,11 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
<property name="digits">1</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -1536,8 +1377,6 @@
<packing>
<property name="left_attach">3</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
@@ -1549,8 +1388,6 @@
<packing>
<property name="left_attach">3</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
diff --git a/ui/sidebar_default_context.ui b/ui/sidebar_default_context.ui
index 2e5ed87..644d8c7 100644
--- a/ui/sidebar_default_context.ui
+++ b/ui/sidebar_default_context.ui
@@ -1,7 +1,17 @@
-<ui>
- <popup name="SidebarDefaultContextMenu">
- <menuitem name="NewSearch" action="CommonNewSearch" />
- <menuitem name="NewTag" action="CommonNewTag" />
- </popup>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<interface domain="shotwell">
+ <menu id='popup-menu'>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">Ne_w Saved Search…</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">win.CommonNewTag</attribute>
+ </item>
+ </section>
+ </menu>
+</interface>
diff --git a/ui/tag_sidebar_context.ui b/ui/tag_sidebar_context.ui
index 4a3d049..96b0f1e 100644
--- a/ui/tag_sidebar_context.ui
+++ b/ui/tag_sidebar_context.ui
@@ -1,6 +1,11 @@
-<ui>
- <popup name="SidebarTagContextMenu">
- <menuitem name="NewTag" action="CommonNewTag" />
- </popup>
-</ui>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<interface domain="shotwell">
+ <menu id='popup-menu'>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">New _Tag…</attribute>
+ <attribute name="action">win.CommonNewTag</attribute>
+ </item>
+ </section>
+ </menu>
+</interface>
diff --git a/ui/tags.ui b/ui/tags.ui
index d0373d6..c693e7f 100644
--- a/ui/tags.ui
+++ b/ui/tags.ui
@@ -1,25 +1,447 @@
-<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">FileExtrasPlaceholder</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">_Find</attribute>
+ <attribute name="action">win.CommonFind</attribute>
+ </item>
+ <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>
+ <attribute name="id">EditExtrasPlaceholder</attribute>
+ <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">Select _All</attribute>
+ <attribute name="accel">&lt;Primary&gt;a</attribute>
+ <attribute name="action">win.CommonSelectAll</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">_Search Bar</attribute>
+ <attribute name="accel">F8</attribute>
+ <attribute name="action">win.CommonDisplaySearchbar</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">_Titles</attribute>
+ <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;t</attribute>
+ <attribute name="action">win.ViewTitle</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Comments</attribute>
+ <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;c</attribute>
+ <attribute name="action">win.ViewComment</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">Ta_gs</attribute>
+ <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;g</attribute>
+ <attribute name="action">win.ViewTags</attribute>
+ </item>
+ <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">_Filter Photos</attribute>
+ <section>
+ <item>
+ <attribute name="label" translatable="no">★★★★★</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">7</attribute>
+ <attribute name="accel">&lt;Primary&gt;5</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★★★</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">6</attribute>
+ <attribute name="accel">&lt;Primary&gt;4</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★★</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">5</attribute>
+ <attribute name="accel">&lt;Primary&gt;3</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">4</attribute>
+ <attribute name="accel">&lt;Primary&gt;2</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">3</attribute>
+ <attribute name="accel">&lt;Primary&gt;1</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_All Photos</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">2</attribute>
+ <attribute name="accel">&lt;Primary&gt;0</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">All + _Rejected</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">1</attribute>
+ <attribute name="accel">&lt;Primary&gt;9</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">Rejected _Only</attribute>
+ <attribute name="action">win.display.rating</attribute>
+ <attribute name="target">8</attribute>
+ <attribute name="accel">&lt;Primary&gt;8</attribute>
+ </item>
+ </section>
+ </submenu>
+ </section>
+ <section>
+ <submenu>
+ <attribute name="label" translatable="yes">Sort _Photos</attribute>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">By _Title</attribute>
+ <attribute name="action">win.SortBy</attribute>
+ <attribute name="target">1</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">By _Filename</attribute>
+ <attribute name="action">win.SortBy</attribute>
+ <attribute name="target">4</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">By Exposure _Date</attribute>
+ <attribute name="action">win.SortBy</attribute>
+ <attribute name="target">2</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">By _Rating</attribute>
+ <attribute name="action">win.SortBy</attribute>
+ <attribute name="target">3</attribute>
+ </item>
+ </section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Ascending</attribute>
+ <attribute name="action">win.Sort</attribute>
+ <attribute name="target">ascending</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">D_escending</attribute>
+ <attribute name="action">win.Sort</attribute>
+ <attribute name="target">descending</attribute>
+ </item>
+ </section>
+ </submenu>
+ <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>
+ <attribute name="id">ViewExtrasFullscreenSlideshowPlaceholder</attribute>
+ </section>
+ </submenu>
+ <submenu>
+ <attribute name="label" translatable="yes">_Photos</attribute>
+ <section>
+ <attribute name="id">PhotosExtrasEditsPlaceholder</attribute>
+ </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>
+ <attribute name="id">PhotosExtrasDateTimePlaceholder</attribute>
+ </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="action">Camera</attribute>
+ </item>
+ </section>
+ </submenu>
+ </section>
+ <section>
+ <attribute name="id">PhotosExtrasExternalsPlaceholder</attribute>
+ </section>
+ </submenu>
+ <submenu>
+ <attribute name="label" translatable="yes">Even_ts</attribute>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_New Event</attribute>
+ <attribute name="accel">&lt;Primary&gt;n</attribute>
+ <attribute name="action">win.NewEvent</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">View Eve_nt for Photo</attribute>
+ <attribute name="action">win.CommonJumpToEvent</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>
+ <section>
+ <item>
+ <attribute name="id">RemoveTagFromPhotos</attribute>
+ <attribute name="label" translatable="yes"></attribute>
+ <attribute name="action">win.RemoveTagFromPhotos</attribute>
+ </item>
+ </section>
+ <section>
+ <item>
+ <attribute name="id">RenameTag</attribute>
+ <attribute name="label" translatable="yes"></attribute>
+ <attribute name="action">win.RenameTag</attribute>
+ </item>
+ <item>
+ <attribute name="id">DeleteTag</attribute>
+ <attribute name="label" translatable="yes"></attribute>
+ <attribute name="action">win.DeleteTag</attribute>
+ </item>
+ </section>
+ </submenu>
+ <!-- Faces menu goes here FacesMenuPlaceholder -->
+ <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>
- <menubar name="MenuBar">
- <menu name="TagsMenu" action="TagsMenu">
- <menuitem name="RemoveTagFromPhotos" action="RemoveTagFromPhotos" />
- <separator />
- <menuitem name="RenameTag" action="RenameTag" />
- <menuitem name="DeleteTag" action="DeleteTag" />
- </menu>
- </menubar>
-
- <popup name="CollectionContextMenu">
- <placeholder name="ContextTagsPlaceholder">
- <menuitem name="ContextRemoveTagFromPhotos" action="RemoveTagFromPhotos" />
- </placeholder>
- </popup>
-
- <popup name="TagsContextMenu">
- <menuitem name="ContextNewChildTag" action="NewChildTagSidebar" />
- <separator />
- <menuitem name="ContextDeleteTag" action="RenameTagSidebar" />
- <menuitem name="ContextRenameTag" action="DeleteTagSidebar" />
- </popup>
-
-</ui>
+ <menu id="TagsContextMenu">
+ </menu>
+</interface>
diff --git a/ui/top.ui b/ui/top.ui
index 81d1006..683a2fa 100644
--- a/ui/top.ui
+++ b/ui/top.ui
@@ -1,12 +1,45 @@
-<ui>
- <menubar name="MenuBar">
- <menu name="FileMenu" action="FileMenu" />
- <menu name="EditMenu" action="EditMenu" />
- <menu name="ViewMenu" action="ViewMenu" />
- <menu name="PhotoMenu" action="PhotoMenu" />
- <menu name="PhotosMenu" action="PhotosMenu" />
- <menu name="EventsMenu" action="EventsMenu" />
- <menu name="TagsMenu" action="TagsMenu" />
- <menu name="HelpMenu" action="HelpMenu" />
- </menubar>
-</ui>
+<?xml version="1.0"?>
+<interface domain="shotwell">
+ <menu id="MenuBar">
+ <submenu>
+ <attribute name="label" translatable="yes">_File</attribute>
+ <section>
+ </section>
+ </submenu>
+ <submenu>
+ <attribute name="label" translatable="yes">_Edit</attribute>
+ <section>
+ </section>
+ </submenu>
+ <submenu>
+ <attribute name="label" translatable="yes">_View</attribute>
+ <section>
+ </section>
+ </submenu>
+ <submenu>
+ <attribute name="label" translatable="yes">_Photo</attribute>
+ <section>
+ </section>
+ </submenu>
+ <submenu>
+ <attribute name="label" translatable="yes">_Photos</attribute>
+ <section>
+ </section>
+ </submenu>
+ <submenu>
+ <attribute name="label" translatable="yes">Even_ts</attribute>
+ <section>
+ </section>
+ </submenu>
+ <submenu>
+ <attribute name="label" translatable="yes">Ta_gs</attribute>
+ <section>
+ </section>
+ </submenu>
+ <submenu>
+ <attribute name="label" translatable="yes">_Help</attribute>
+ <section>
+ </section>
+ </submenu>
+ </menu>
+</interface>
diff --git a/ui/trash.ui b/ui/trash.ui
index 9a464bb..2e68df8 100644
--- a/ui/trash.ui
+++ b/ui/trash.ui
@@ -1,83 +1,322 @@
-<ui>
-
- <menubar name="MenuBar">
- <menu name="FileMenu" action="FileMenu">
- <menuitem name="Import" action="CommonFileImport" />
- <menuitem name="ImportExternal" action="ExternalLibraryImport" />
- <separator />
- <menuitem name="JumpToFile" action="CommonJumpToFile" />
- <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="Find" action="CommonFind" />
- <menuitem name="NewSearch" action="CommonNewSearch" />
- <separator />
- <menuitem name="Delete" action="Delete" />
- <menuitem name="Restore" action="Restore" />
- <separator />
- <menuitem name="SelectAll" action="CommonSelectAll" />
- <separator />
- <menuitem name="Preferences" action="CommonPreferences" />
- </menu>
-
- <menu name="ViewMenu" action="ViewMenu">
- <menuitem name="DisplayBasicProperties" action="CommonDisplayBasicProperties" />
- <menuitem name="DisplayExtendedProperties" action="CommonDisplayExtendedProperties" />
- <menuitem name="DisplaySearchbar" action="CommonDisplaySearchbar" />
- <menuitem name="DisplaySidebar" action="CommonDisplaySidebar" />
- <menuitem name="DisplayToolbar" action="CommonDisplayToolbar" />
- <separator />
- <menu name="FilterPhotos" action="CommonFilterPhotos">
- <menuitem name="DisplayFiveOrHigher" action="CommonDisplayFiveOrHigher" />
- <menuitem name="DisplayFourOrHigher" action="CommonDisplayFourOrHigher" />
- <menuitem name="DisplayThreeOrHigher" action="CommonDisplayThreeOrHigher" />
- <menuitem name="DisplayTwoOrHigher" action="CommonDisplayTwoOrHigher" />
- <menuitem name="DisplayOneOrHigher" action="CommonDisplayOneOrHigher" />
- <menuitem name="DisplayUnratedOrHigher" action="CommonDisplayUnratedOrHigher" />
- <menuitem name="DisplayRejectedOrHigher" action="CommonDisplayRejectedOrHigher" />
- <menuitem name="DisplayRejectedOnly" action="CommonDisplayRejectedOnly" />
- </menu>
- <separator />
- <menu name="SortEvents" action="CommonSortEvents">
- <menuitem name="SortEventsAscending" action="CommonSortEventsAscending" />
- <menuitem name="SortEventsDescending" action="CommonSortEventsDescending" />
- </menu>
- </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="TrashContextMenu">
- <menuitem name="ContextDelete" action="Delete" />
- <menuitem name="ContextRestore" action="Restore" />
- <separator />
- <menuitem name="ContextJumpToFile" action="CommonJumpToFile" />
- <separator />
- <menuitem name="ContextEmptyTrash" action="CommonEmptyTrash" />
- </popup>
-
- <popup name="TrashPageMenu">
- <menuitem name="ContextEmptyTrash" action="CommonEmptyTrash" />
- </popup>
-
- <toolbar name="TrashToolbar">
- <toolitem name="ToolDelete" action="Delete" />
- <toolitem name="ToolRestore" action="Restore" />
- <toolitem name="ToolEmptyTrash" action="CommonEmptyTrash" />
- <separator />
- <toolitem name="ToolFind" action="CommonDisplaySearchbar" />
- </toolbar>
-
-</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>
+ </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>
+ <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">_Find</attribute>
+ <attribute name="action">win.CommonFind</attribute>
+ </item>
+ <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">_Delete</attribute>
+ <attribute name="accel">Delete</attribute>
+ <attribute name="action">win.Delete</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Restore</attribute>
+ <attribute name="action">win.Restore</attribute>
+ </item>
+ </section>
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">Select _All</attribute>
+ <attribute name="accel">&lt;Primary&gt;a</attribute>
+ <attribute name="action">win.CommonSelectAll</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">_Search Bar</attribute>
+ <attribute name="accel">F8</attribute>
+ <attribute name="action">win.CommonDisplaySearchbar</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>
+ <submenu>
+ <attribute name="label" translatable="yes">_Filter Photos</attribute>
+ <section>
+ <item>
+ <attribute name="label" translatable="no">★★★★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">7</attribute>
+ <attribute name="accel">&lt;Primary&gt;5</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">6</attribute>
+ <attribute name="accel">&lt;Primary&gt;4</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">5</attribute>
+ <attribute name="accel">&lt;Primary&gt;3</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">4</attribute>
+ <attribute name="accel">&lt;Primary&gt;2</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="no">★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">3</attribute>
+ <attribute name="accel">&lt;Primary&gt;1</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_All Photos</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">2</attribute>
+ <attribute name="accel">&lt;Primary&gt;0</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">All + _Rejected</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">1</attribute>
+ <attribute name="accel">&lt;Primary&gt;9</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">Rejected _Only</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">8</attribute>
+ <attribute name="accel">&lt;Primary&gt;8</attribute>
+ </item>
+ </section>
+ </submenu>
+ </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">D_escending</attribute>
+ <attribute name="action">win.CommonSortEvents</attribute>
+ <attribute name="target">descending</attribute>
+ </item>
+ </section>
+ </submenu>
+ </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>
+ <menu id="TrashContextMenu">
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">_Delete</attribute>
+ <attribute name="accel">Delete</attribute>
+ <attribute name="action">win.Delete</attribute>
+ </item>
+ <item>
+ <attribute name="label" translatable="yes">_Restore</attribute>
+ <attribute name="action">win.Restore</attribute>
+ </item>
+ </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>
+ </menu>
+ <menu id="TrashPageMenu">
+ <section>
+ <item>
+ <attribute name="label" translatable="yes">Empty T_rash</attribute>
+ <attribute name="action">win.CommonEmptyTrash</attribute>
+ </item>
+ </section>
+ </menu>
+ <object class="GtkToolbar" id="TrashToolbar">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="toolbar_style">both-horiz</property>
+ <child>
+ <object class="GtkToolButton" id="ToolDelete">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Remove the selected photos from the trash</property>
+ <property name="is_important">True</property>
+ <property name="action_name">win.Delete</property>
+ <property name="label" translatable="yes">_Delete</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="ToolRestore">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Move the selected photos back into the library</property>
+ <property name="is_important">True</property>
+ <property name="action_name">win.Restore</property>
+ <property name="label" translatable="yes">_Restore</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="ToolEmptyTrash">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Delete all photos in the trash</property>
+ <property name="is_important">True</property>
+ <property name="action_name">win.CommonEmptyTrash</property>
+ <property name="label" translatable="yes">Empty Trash</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>