data: Move the shortcut dialog UI to resource loading

We're using GTK+'s support for implicitly loading this from a well-known
name.

Author: kaiw

meld/meldwindow.py

@@ -219,10 +219,6 @@ def __init__(self):
         rmenu = self.ui.get_widget('/Menubar/FileMenu/Recent').get_submenu()
         rmenu.connect("map", self._on_recentmenu_map)
 
-        builder = meld.ui.util.get_builder("shortcuts.ui")
-        shortcut_window = builder.get_object("shortcuts-meld")
-        self.set_help_overlay(shortcut_window)
-
     def do_realize(self):
         Gtk.ApplicationWindow.do_realize(self)
 

data/ui/shortcuts.ui meld/resources/gtk/help-overlay.uidata/ui/shortcuts.ui renamed to meld/resources/gtk/help-overlay.ui

@@ -2,7 +2,7 @@
 <interface>
   <!-- interface-requires gtk+ 3.17 -->
 
-  <object class="GtkShortcutsWindow" id="shortcuts-meld">
+  <object class="GtkShortcutsWindow" id="help_overlay">
     <property name="modal">True</property>
     <child>
       <object class="GtkShortcutsSection">

meld/resources/meld.gresource.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/meld">
+    <file>gtk/help-overlay.ui</file>
     <file>icons/16x16/actions/meld-change-apply-left.png</file>
     <file>icons/16x16/actions/meld-change-apply-right.png</file>
     <file>icons/16x16/actions/meld-change-copy.png</file>