[niepce] gtk: Move glade UI files to GResource

[Hubert Figuière <hub src gnome org>]

commit 32bf738a48b02348d1f42b1ef48fa35e57eb1e27
Author: Hubert Figuière <hub figuiere net>
Date:   Thu Dec 26 20:55:45 2019 -0500

    gtk: Move glade UI files to GResource

 src/fwk/toolkit/frame.cpp                               | 2 +-
 src/niepce/gresource.xml                                | 6 ++++++
 src/niepce/modules/darkroom/Makefile.am                 | 1 -
 src/niepce/modules/map/Makefile.am                      | 1 -
 src/niepce/ui/Makefile.am                               | 4 ----
 src/niepce/ui/dialogs/editlabels.cpp                    | 2 +-
 src/niepce/ui/dialogs/importdialog.cpp                  | 2 +-
 src/niepce/ui/dialogs/importers/cameraimporterui.cpp    | 4 ++--
 src/niepce/ui/dialogs/importers/directoryimporterui.cpp | 4 ++--
 src/niepce/ui/dialogs/preferencesdialog.hpp             | 2 +-
 10 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/src/fwk/toolkit/frame.cpp b/src/fwk/toolkit/frame.cpp
index eb82bae..567f2c3 100644
--- a/src/fwk/toolkit/frame.cpp
+++ b/src/fwk/toolkit/frame.cpp
@@ -51,7 +51,7 @@ Frame::Frame(const std::string & gladeFile,
              const Glib::ustring & widgetName,
              const std::string & layout_cfg_key)
     : m_window(nullptr),
-      m_builder(Gtk::Builder::create_from_file(gladeFile)),
+      m_builder(Gtk::Builder::create_from_resource(gladeFile)),
       m_layout_cfg_key(layout_cfg_key)
 {
     if (m_builder) {
diff --git a/src/niepce/gresource.xml b/src/niepce/gresource.xml
index c6e1720..b7670f9 100644
--- a/src/niepce/gresource.xml
+++ b/src/niepce/gresource.xml
@@ -17,5 +17,11 @@
     <file alias="/pixmaps/niepce-unknown-fmt.png">data/icons/niepce-unknown-fmt.png</file>
     <file alias="/pixmaps/niepce-image-generic.png">data/icons/niepce-image-generic.png</file>
     <file alias="/pixmaps/niepce-image-missing.png">data/icons/niepce-image-missing.png</file>
+
+    <file alias="/ui/editlabels.ui">src/niepce/ui/dialogs/editlabels.ui</file>
+    <file alias="/ui/importdialog.ui">src/niepce/ui/dialogs/importdialog.ui</file>
+    <file alias="/ui/preferences.ui">src/niepce/ui/dialogs/preferences.ui</file>
+    <file alias="/ui/cameraimporterui.ui">src/niepce/ui/dialogs/importers/cameraimporterui.ui</file>
+    <file alias="/ui/directoryimporterui.ui">src/niepce/ui/dialogs/importers/directoryimporterui.ui</file>
   </gresource>
 </gresources>
diff --git a/src/niepce/modules/darkroom/Makefile.am b/src/niepce/modules/darkroom/Makefile.am
index cffe620..b76fa91 100644
--- a/src/niepce/modules/darkroom/Makefile.am
+++ b/src/niepce/modules/darkroom/Makefile.am
@@ -2,7 +2,6 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/niepce \
        -I$(top_srcdir)/src/ext \
-       -DGLADEDIR=\"$(gladedir)\" \
        -DDATADIR=\"$(datadir)\" \
        @FRAMEWORK_CFLAGS@ \
        @GEGL_CFLAGS@ @OPENRAW_CFLAGS@
diff --git a/src/niepce/modules/map/Makefile.am b/src/niepce/modules/map/Makefile.am
index 6dd3a98..80e99fd 100644
--- a/src/niepce/modules/map/Makefile.am
+++ b/src/niepce/modules/map/Makefile.am
@@ -2,7 +2,6 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/niepce \
        -I$(top_srcdir)/src/ext \
-       -DGLADEDIR=\"$(gladedir)\" \
        -DDATADIR=\"$(datadir)\" \
        @FRAMEWORK_CFLAGS@
 
diff --git a/src/niepce/ui/Makefile.am b/src/niepce/ui/Makefile.am
index 258a1ce..e4f8361 100644
--- a/src/niepce/ui/Makefile.am
+++ b/src/niepce/ui/Makefile.am
@@ -7,12 +7,8 @@ gladefiles = dialogs/preferences.ui \
        dialogs/importers/cameraimporterui.ui \
        $(NULL)
 
-gladedir = @datarootdir@/niepce/glade/
-glade_DATA = $(gladefiles)
-
 AM_CPPFLAGS = -I$(top_srcdir)/src/ -I$(srcdir)/.. \
        -I$(top_srcdir)/src/ext \
-       -DGLADEDIR=\"$(gladedir)\" \
        -DDATADIR=\"$(datadir)\" \
        @FRAMEWORK_CFLAGS@ @GPHOTO_CFLAGS@ \
        $(NULL)
diff --git a/src/niepce/ui/dialogs/editlabels.cpp b/src/niepce/ui/dialogs/editlabels.cpp
index aa5fb67..4a34515 100644
--- a/src/niepce/ui/dialogs/editlabels.cpp
+++ b/src/niepce/ui/dialogs/editlabels.cpp
@@ -40,7 +40,7 @@ using libraryclient::LibraryClientPtr;
 namespace ui {
 
 EditLabels::EditLabels(const LibraryClientPtr & libclient)
-    : fwk::Dialog(GLADEDIR"editlabels.ui", "editLabels")
+    : fwk::Dialog("/org/gnome/Niepce/ui/editlabels.ui", "editLabels")
     , m_labels(libclient->getDataProvider()->getLabels())
     , m_lib_client(libclient)
 {
diff --git a/src/niepce/ui/dialogs/importdialog.cpp b/src/niepce/ui/dialogs/importdialog.cpp
index 43a4e77..5ffbfb9 100644
--- a/src/niepce/ui/dialogs/importdialog.cpp
+++ b/src/niepce/ui/dialogs/importdialog.cpp
@@ -43,7 +43,7 @@
 namespace ui {
 
 ImportDialog::ImportDialog()
-  : fwk::Dialog(GLADEDIR"importdialog.ui", "importDialog")
+  : fwk::Dialog("/org/gnome/Niepce/ui/importdialog.ui", "importDialog")
   , m_current_importer(nullptr)
   , m_importer_ui_stack(nullptr)
   , m_date_tz_combo(nullptr)
diff --git a/src/niepce/ui/dialogs/importers/cameraimporterui.cpp 
b/src/niepce/ui/dialogs/importers/cameraimporterui.cpp
index 76e653e..fbaf50f 100644
--- a/src/niepce/ui/dialogs/importers/cameraimporterui.cpp
+++ b/src/niepce/ui/dialogs/importers/cameraimporterui.cpp
@@ -42,8 +42,8 @@ CameraImporterUI::CameraImporterUI()
 Gtk::Widget* CameraImporterUI::setup_widget(const fwk::Frame::Ptr&)
 {
     Gtk::Grid* main_widget;
-    m_builder = Gtk::Builder::create_from_file(GLADEDIR"cameraimporterui.ui",
-                                               "main_widget");
+    m_builder = Gtk::Builder::create_from_resource("/org/gnome/Niepce/ui/cameraimporterui.ui",
+                                                   "main_widget");
     m_builder->get_widget("main_widget", main_widget);
     m_builder->get_widget("select_camera_btn", m_select_camera_btn);
     m_select_camera_btn->signal_clicked()
diff --git a/src/niepce/ui/dialogs/importers/directoryimporterui.cpp 
b/src/niepce/ui/dialogs/importers/directoryimporterui.cpp
index b7b64f3..8ba6a3c 100644
--- a/src/niepce/ui/dialogs/importers/directoryimporterui.cpp
+++ b/src/niepce/ui/dialogs/importers/directoryimporterui.cpp
@@ -40,8 +40,8 @@ Gtk::Widget* DirectoryImporterUI::setup_widget(const fwk::Frame::Ptr& frame)
 {
     m_frame = frame;
     Gtk::Button* select_directories = nullptr;
-    m_builder = Gtk::Builder::create_from_file(GLADEDIR"directoryimporterui.ui",
-                                               "main_widget");
+    m_builder = Gtk::Builder::create_from_resource("/org/gnome/Niepce/ui/directoryimporterui.ui",
+                                                   "main_widget");
     Gtk::Box* main_widget = nullptr;
     m_builder->get_widget("main_widget", main_widget);
     m_builder->get_widget("select_directories", select_directories);
diff --git a/src/niepce/ui/dialogs/preferencesdialog.hpp b/src/niepce/ui/dialogs/preferencesdialog.hpp
index f563cbd..96cdba6 100644
--- a/src/niepce/ui/dialogs/preferencesdialog.hpp
+++ b/src/niepce/ui/dialogs/preferencesdialog.hpp
@@ -30,7 +30,7 @@ class PreferencesDialog
 {
 public:
     PreferencesDialog()
-        : fwk::Dialog(GLADEDIR"preferences.ui", "preferences", "")
+        : fwk::Dialog("/org/gnome/Niepce/ui/preferences.ui", "preferences", "")
         {
         }
     virtual void setup_widget() override;