Merge branch 'feature/upstream' into develop

1 files changed, 0 insertions, 191 deletions

diff --git a/ui/events_directory.ui b/ui/events_directory.ui
deleted file mode 100644
index 6d0e939..0000000
--- a/ui/events_directory.ui
+++ /dev/null
@@ -1,191 +0,0 @@
-<?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>