New upstream version 0.25.2upstream/0.25.2

16 files changed, 134 insertions, 406 deletions

diff --git a/ui/Makefile.am b/ui/Makefile.am
index 6010b27..7bcf37d 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -15,15 +15,17 @@ dist_ui_DATA = \
 	savedsearch.ui \
 	search_bar.ui \
 	search_sidebar_context.ui \
-	set_background_dialog.ui \
-	set_background_slideshow_dialog.ui \
 	shotwell.ui \
-	shotwell.xml \
 	sidebar_default_context.ui \
 	tag_sidebar_context.ui \
 	tags.ui \
 	top.ui \
 	trash.ui
 
+dist_noinst_DATA = \
+	appmenu.ui \
+	set_background_dialog.ui \
+	set_background_slideshow_dialog.ui
+
 
 -include $(top_srcdir)/git.mk
diff --git a/ui/Makefile.in b/ui/Makefile.in
index 3ec2b7c..2e3b7c5 100644
--- a/ui/Makefile.in
+++ b/ui/Makefile.in
@@ -106,7 +106,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/appdata-xml.m4 \
 	$(top_srcdir)/m4/yelp.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(dist_ui_DATA) $(am__DIST_COMMON)
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_DATA) \
+	$(dist_ui_DATA) $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -158,7 +159,7 @@ am__uninstall_files_from_dir = { \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
 am__installdirs = "$(DESTDIR)$(uidir)"
-DATA = $(dist_ui_DATA)
+DATA = $(dist_noinst_DATA) $(dist_ui_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -354,16 +355,18 @@ dist_ui_DATA = \
 	savedsearch.ui \
 	search_bar.ui \
 	search_sidebar_context.ui \
-	set_background_dialog.ui \
-	set_background_slideshow_dialog.ui \
 	shotwell.ui \
-	shotwell.xml \
 	sidebar_default_context.ui \
 	tag_sidebar_context.ui \
 	tags.ui \
 	top.ui \
 	trash.ui
 
+dist_noinst_DATA = \
+	appmenu.ui \
+	set_background_dialog.ui \
+	set_background_slideshow_dialog.ui
+
 all: all-am
 
 .SUFFIXES:
diff --git a/ui/appmenu.ui b/ui/appmenu.ui
new file mode 100644
index 0000000..72e5424
--- /dev/null
+++ b/ui/appmenu.ui
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface domain="shotwell">
+  <requires lib="gtk+" version="3.14"/>
+  <menu id="appmenu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Preferences</attribute>
+        <attribute name="action">win.CommonPreferences</attribute>
+      </item>
+    </section>
+    <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>
+      <item>
+        <attribute name="label" translatable="yes">_About</attribute>
+        <attribute name="action">win.CommonAbout</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>
+  </menu>
+  <menu id="direct-appmenu">
+    <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>
+      <item>
+        <attribute name="label" translatable="yes">_About</attribute>
+        <attribute name="action">win.CommonAbout</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>
+  </menu>
+</interface>
diff --git a/ui/direct.ui b/ui/direct.ui
index 75acb0f..6053967 100644
--- a/ui/direct.ui
+++ b/ui/direct.ui
@@ -32,13 +32,6 @@
           <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>
@@ -169,29 +162,5 @@
         </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/event.ui b/ui/event.ui
index 11d9b74..c2bc6cb 100644
--- a/ui/event.ui
+++ b/ui/event.ui
@@ -88,12 +88,6 @@
           <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>
@@ -414,30 +408,6 @@
       </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>
diff --git a/ui/events_directory.ui b/ui/events_directory.ui
index 380da0a..ad4135e 100644
--- a/ui/events_directory.ui
+++ b/ui/events_directory.ui
@@ -20,13 +20,6 @@
           <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>
@@ -60,12 +53,6 @@
           <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>
@@ -146,30 +133,6 @@
         </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>
diff --git a/ui/import.ui b/ui/import.ui
index 522ca7b..af733bc 100644
--- a/ui/import.ui
+++ b/ui/import.ui
@@ -28,13 +28,6 @@
           <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>
@@ -63,12 +56,6 @@
           <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>
@@ -179,30 +166,6 @@
         </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>
diff --git a/ui/import_queue.ui b/ui/import_queue.ui
index 9b07d9c..a19c32b 100644
--- a/ui/import_queue.ui
+++ b/ui/import_queue.ui
@@ -26,13 +26,6 @@
           <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>
@@ -78,12 +71,6 @@
           <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 e3d8ba1..895855a 100644
--- a/ui/media.ui
+++ b/ui/media.ui
@@ -35,13 +35,6 @@
           <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>
@@ -88,12 +81,6 @@
           <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>
@@ -397,29 +384,5 @@
       </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 f886526..273ac73 100644
--- a/ui/offline.ui
+++ b/ui/offline.ui
@@ -20,13 +20,6 @@
           <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>
@@ -67,12 +60,6 @@
           <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>
@@ -176,30 +163,6 @@
         </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>
diff --git a/ui/photo.ui b/ui/photo.ui
index 6b662a5..cb39801 100644
--- a/ui/photo.ui
+++ b/ui/photo.ui
@@ -43,13 +43,6 @@
           <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>
@@ -84,12 +77,6 @@
           <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>
@@ -380,29 +367,5 @@
         </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/set_background_dialog.ui b/ui/set_background_dialog.ui
index ee7106f..e8930e1 100644
--- a/ui/set_background_dialog.ui
+++ b/ui/set_background_dialog.ui
@@ -2,13 +2,7 @@
 <!-- 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>
-    <property name="page_increment">10</property>
-    <property name="page_size">10</property>
-  </object>
-  <object class="GtkDialog" id="dialog1">
+  <template class="SetBackgroundPhotoDialog" parent="GtkDialog">
     <property name="width_request">400</property>
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -29,7 +23,6 @@
             <child>
               <object class="GtkButton" id="cancel_button">
                 <property name="label">_Cancel</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -45,7 +38,6 @@
             <child>
               <object class="GtkButton" id="ok_button">
                 <property name="label">_OK</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
@@ -79,7 +71,9 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="halign">start</property>
+                <property name="active">True</property>
                 <property name="draw_indicator">True</property>
+                <signal name="toggled" handler="on_checkbox_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -95,6 +89,7 @@
                 <property name="receives_default">False</property>
                 <property name="halign">start</property>
                 <property name="draw_indicator">True</property>
+                <signal name="toggled" handler="on_checkbox_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -115,5 +110,5 @@
       <action-widget response="-6">cancel_button</action-widget>
       <action-widget response="-5">ok_button</action-widget>
     </action-widgets>
-  </object>
+  </template>
 </interface>
diff --git a/ui/set_background_slideshow_dialog.ui b/ui/set_background_slideshow_dialog.ui
index 438e565..39e1b82 100644
--- a/ui/set_background_slideshow_dialog.ui
+++ b/ui/set_background_slideshow_dialog.ui
@@ -1,14 +1,15 @@
 <?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="value">50</property>
     <property name="step_increment">10</property>
     <property name="page_increment">10</property>
     <property name="page_size">10</property>
   </object>
-  <object class="GtkDialog" id="dialog1">
+  <template class="SetBackgroundSlideshowDialog" parent="GtkDialog">
     <property name="width_request">400</property>
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -21,35 +22,43 @@
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
-        <child>
-          <object class="GtkBox" id="hbox1">
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="spacing">5</property>
+            <property name="layout_style">end</property>
             <child>
-              <object class="GtkLabel" id="label1">
+              <object class="GtkButton" id="cancel_button">
+                <property name="label">_Cancel</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Show each photo for</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">True</property>
+                <property name="fill">False</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="delay_value_label">
+              <object class="GtkButton" id="ok_button">
+                <property name="label">_OK</property>
+                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">period of time</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="has_tooltip">True</property>
+                <property name="tooltip_text" translatable="yes">Generate desktop background slideshow</property>
+                <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">True</property>
+                <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -57,46 +66,39 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
+            <property name="pack_type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area2">
+        <child>
+          <object class="GtkBox" id="hbox1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
+            <property name="spacing">5</property>
             <child>
-              <object class="GtkButton" id="cancel_button">
-                <property name="label">_Cancel</property>
-                <property name="use_action_appearance">False</property>
+              <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Show each photo for</property>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="fill">True</property>
                 <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="ok_button">
-                <property name="label">_OK</property>
-                <property name="use_action_appearance">False</property>
+              <object class="GtkLabel" id="delay_value_label">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="has_tooltip">True</property>
-                <property name="tooltip_text" translatable="yes">Generate desktop background slideshow</property>
-                <property name="use_underline">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">period of time</property>
+                <attributes>
+                  <attribute name="weight" value="bold"/>
+                </attributes>
               </object>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -104,7 +106,6 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="pack_type">end</property>
             <property name="position">0</property>
           </packing>
         </child>
@@ -115,6 +116,7 @@
             <property name="tooltip_text" translatable="yes">How long each photo is shown on the desktop background</property>
             <property name="adjustment">adjustment1</property>
             <property name="draw_value">False</property>
+            <signal name="value-changed" handler="on_delay_scale_value_changed" swapped="no"/>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -133,9 +135,10 @@
                 <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="active">True</property>
                 <property name="draw_indicator">True</property>
+                <signal name="toggled" handler="on_checkbox_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -149,8 +152,9 @@
                 <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>
+                <signal name="toggled" handler="on_checkbox_clicked" swapped="no"/>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -171,5 +175,5 @@
       <action-widget response="-6">cancel_button</action-widget>
       <action-widget response="-5">ok_button</action-widget>
     </action-widgets>
-  </object>
+  </template>
 </interface>
diff --git a/ui/shotwell.xml b/ui/shotwell.xml
deleted file mode 100644
index 3a4a5cb..0000000
--- a/ui/shotwell.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<glade-catalog name="Shotwell" library="libshotwell.so" depends="gtk+">
-    <glade-widget-classes>
-        <glade-widget-class name="TextEntryDialog" generic-name="text_entry_dialog" title="TextEntryDialog" />
-    </glade-widget-classes>
-
-    <glade-widget-group name="ShotwellObjects" title="Shotwell Objects">
-        <glade-widget-class-ref name="TextEntryDialog"/>
-    </glade-widget-group>
-</glade-catalog>
diff --git a/ui/tags.ui b/ui/tags.ui
index c693e7f..e2cb3cf 100644
--- a/ui/tags.ui
+++ b/ui/tags.ui
@@ -35,13 +35,6 @@
           <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>
@@ -88,12 +81,6 @@
           <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>
@@ -416,30 +403,6 @@
       </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="TagsContextMenu">
diff --git a/ui/trash.ui b/ui/trash.ui
index 2e68df8..0bd7a20 100644
--- a/ui/trash.ui
+++ b/ui/trash.ui
@@ -25,13 +25,6 @@
           <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>
@@ -76,12 +69,6 @@
           <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>
@@ -185,30 +172,6 @@
         </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>