[meld/deprecation-cleanup: 39/48] data: Move About dialog to resource loading

[Kai Willadsen <kaiw src gnome org>]

commit c56dfe8873049f8fa96ded8e86e598bd85ad3589
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Dec 2 09:30:47 2018 +1000

    data: Move About dialog to resource loading

 meld/meldapp.py                                             | 13 +++++++------
 meld/resources/meld.gresource.xml                           |  1 +
 data/ui/application.ui => meld/resources/ui/about-dialog.ui |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/meld/meldapp.py b/meld/meldapp.py
index 2a85147a..451615f0 100644
--- a/meld/meldapp.py
+++ b/meld/meldapp.py
@@ -26,7 +26,6 @@ from gi.repository import Gtk
 
 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 @@ class MeldApp(Gtk.Application):
             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():
diff --git a/meld/resources/meld.gresource.xml b/meld/resources/meld.gresource.xml
index 1ecc635c..6ae43221 100644
--- a/meld/resources/meld.gresource.xml
+++ b/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>
diff --git a/data/ui/application.ui b/meld/resources/ui/about-dialog.ui
similarity index 97%
rename from data/ui/application.ui
rename to meld/resources/ui/about-dialog.ui
index bb972d99..26a7b1c0 100644
--- a/data/ui/application.ui
+++ b/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>