data: Move About dialog to resource loading

Author: kaiw

meld/meldapp.py

@@ -26,7 +26,6 @@
 
 import meld.conf
 import meld.preferences
-import meld.ui.util
 from meld.conf import _
 from meld.filediff import FileDiff
 from meld.meldwindow import MeldWindow
@@ -110,11 +109,13 @@ def help_callback(self, action, parameter):
             Gdk.Screen.get_default(), uri, Gtk.get_current_event_time())
 
     def about_callback(self, action, parameter):
-        about = meld.ui.util.get_widget("application.ui", "aboutdialog")
-        about.set_version(meld.conf.__version__)
-        about.set_transient_for(self.get_active_window())
-        about.run()
-        about.destroy()
+        builder = Gtk.Builder.new_from_resource(
+            '/org/gnome/meld/ui/about-dialog.ui')
+        dialog = builder.get_object('about-dialog')
+        dialog.set_version(meld.conf.__version__)
+        dialog.set_transient_for(self.get_active_window())
+        dialog.run()
+        dialog.destroy()
 
     def quit_callback(self, action, parameter):
         for window in self.get_windows():

meld/resources/meld.gresource.xml

@@ -7,6 +7,7 @@
     <file>icons/16x16/actions/meld-change-apply-right.png</file>
     <file>icons/16x16/actions/meld-change-copy.png</file>
     <file>icons/16x16/actions/meld-change-delete.png</file>
+    <file>ui/about-dialog.ui</file>
     <file>ui/appwindow.ui</file>
   </gresource>
 </gresources>

data/ui/application.ui meld/resources/ui/about-dialog.uidata/ui/application.ui renamed to meld/resources/ui/about-dialog.ui

@@ -2,7 +2,7 @@
 <!--*- mode: xml -*-->
 <interface>
   <!-- interface-requires gtk+ 3.6 -->
-  <object class="GtkAboutDialog" id="aboutdialog">
+  <object class="GtkAboutDialog" id="about-dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">About Meld</property>