[meld/deprecation-cleanup: 37/48] data: Move MeldWindow UI to resource loading



commit d71e3b9738e098b8246fbbd36c545e3cab234adc
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Dec 2 07:58:59 2018 +1000

    data: Move MeldWindow UI to resource loading

 meld/meldwindow.py                                   | 2 +-
 meld/resources/meld.gresource.xml                    | 1 +
 data/ui/meldapp.ui => meld/resources/ui/appwindow.ui | 0
 3 files changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index cc9c28b5..36bbf575 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -37,7 +37,7 @@ from meld.vcview import VcView
 from meld.windowstate import SavedWindowState
 
 
-@Template(filename=ui_file('meldapp.ui'))
+@Template(resource_path='/org/gnome/meld/ui/appwindow.ui')
 class MeldWindow(Gtk.ApplicationWindow):
 
     __gtype_name__ = 'MeldWindow'
diff --git a/meld/resources/meld.gresource.xml b/meld/resources/meld.gresource.xml
index 79e8dd07..138b0de4 100644
--- a/meld/resources/meld.gresource.xml
+++ b/meld/resources/meld.gresource.xml
@@ -6,5 +6,6 @@
     <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/appwindow.ui</file>
   </gresource>
 </gresources>
diff --git a/data/ui/meldapp.ui b/meld/resources/ui/appwindow.ui
similarity index 100%
rename from data/ui/meldapp.ui
rename to meld/resources/ui/appwindow.ui


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]