From 5a905cd53f38b979a6de65493c2c93abccae9ab6 Mon Sep 17 00:00:00 2001
From: Sophie Herold <sophie@hemio.de>
Date: Tue, 28 Nov 2023 21:50:51 +0100
Subject: [PATCH] ui: Move .ui-files to src/

Closes #46
---
 po/POTFILES.in                               | 10 +++++-----
 src/widgets/image_page.rs                    |  2 +-
 {data/gtk => src/widgets}/image_page.ui      |  0
 src/widgets/image_view.rs                    |  2 +-
 {data/gtk => src/widgets}/image_view.ui      |  0
 src/widgets/print.rs                         |  2 +-
 {data/gtk => src/widgets}/print.ui           |  0
 src/widgets/properties_view.rs               |  2 +-
 {data/gtk => src/widgets}/properties_view.ui |  0
 src/window.rs                                |  2 +-
 {data/gtk => src}/window.ui                  |  0
 11 files changed, 10 insertions(+), 10 deletions(-)
 rename {data/gtk => src/widgets}/image_page.ui (100%)
 rename {data/gtk => src/widgets}/image_view.ui (100%)
 rename {data/gtk => src/widgets}/print.ui (100%)
 rename {data/gtk => src/widgets}/properties_view.ui (100%)
 rename {data/gtk => src}/window.ui (100%)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 57f53c3..aa80bef 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,8 +1,3 @@
-data/gtk/image_page.ui
-data/gtk/image_view.ui
-data/gtk/print.ui
-data/gtk/properties_view.ui
-data/gtk/window.ui
 data/org.gnome.Loupe.desktop.in.in
 data/org.gnome.Loupe.metainfo.xml.in.in
 data/resources/gtk/help-overlay.ui
@@ -23,10 +18,15 @@ src/util/mod.rs
 src/widgets/drag_overlay.rs
 src/widgets/image.rs
 src/widgets/image_page.rs
+src/widgets/image_page.ui
 src/widgets/image_view.rs
+src/widgets/image_view.ui
 src/widgets/mod.rs
 src/widgets/print.rs
+src/widgets/print.ui
 src/widgets/print_preview.rs
 src/widgets/properties_view.rs
+src/widgets/properties_view.ui
 src/widgets/sliding_view.rs
 src/window.rs
+src/window.ui
diff --git a/src/widgets/image_page.rs b/src/widgets/image_page.rs
index b66967c..394e204 100644
--- a/src/widgets/image_page.rs
+++ b/src/widgets/image_page.rs
@@ -33,7 +33,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, CompositeTemplate)]
-    #[template(file = "../../data/gtk/image_page.ui")]
+    #[template(file = "image_page.ui")]
     pub struct LpImagePage {
         #[template_child]
         pub(super) stack: TemplateChild<gtk::Stack>,
diff --git a/data/gtk/image_page.ui b/src/widgets/image_page.ui
similarity index 100%
rename from data/gtk/image_page.ui
rename to src/widgets/image_page.ui
diff --git a/src/widgets/image_view.rs b/src/widgets/image_view.rs
index 40aa72f..489f317 100644
--- a/src/widgets/image_view.rs
+++ b/src/widgets/image_view.rs
@@ -58,7 +58,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, CompositeTemplate)]
-    #[template(file = "../../data/gtk/image_view.ui")]
+    #[template(file = "image_view.ui")]
     pub struct LpImageView {
         /// Direct child of this Adw::Bin
         #[template_child]
diff --git a/data/gtk/image_view.ui b/src/widgets/image_view.ui
similarity index 100%
rename from data/gtk/image_view.ui
rename to src/widgets/image_view.ui
diff --git a/src/widgets/print.rs b/src/widgets/print.rs
index f39178d..9979640 100644
--- a/src/widgets/print.rs
+++ b/src/widgets/print.rs
@@ -211,7 +211,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, CompositeTemplate, Properties)]
-    #[template(file = "../../data/gtk/print.ui")]
+    #[template(file = "print.ui")]
     #[properties(wrapper_type = super::LpPrint)]
     pub struct LpPrint {
         #[template_child]
diff --git a/data/gtk/print.ui b/src/widgets/print.ui
similarity index 100%
rename from data/gtk/print.ui
rename to src/widgets/print.ui
diff --git a/src/widgets/properties_view.rs b/src/widgets/properties_view.rs
index 19c7884..ba0c95f 100644
--- a/src/widgets/properties_view.rs
+++ b/src/widgets/properties_view.rs
@@ -38,7 +38,7 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, CompositeTemplate)]
-    #[template(file = "../../data/gtk/properties_view.ui")]
+    #[template(file = "properties_view.ui")]
     pub struct LpPropertiesView {
         pub(super) file: RefCell<Option<glib::WeakRef<gio::File>>>,
         pub(super) image: RefCell<Option<glib::WeakRef<LpImage>>>,
diff --git a/data/gtk/properties_view.ui b/src/widgets/properties_view.ui
similarity index 100%
rename from data/gtk/properties_view.ui
rename to src/widgets/properties_view.ui
diff --git a/src/window.rs b/src/window.rs
index 2fc5774..9e02540 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -66,7 +66,7 @@ mod imp {
     // we'd need to have a `new()` function in the
     // `impl ObjectSubclass for $TYPE` section.
     #[derive(Default, Debug, CompositeTemplate)]
-    #[template(file = "../data/gtk/window.ui")]
+    #[template(file = "window.ui")]
     pub struct LpWindow {
         // Template children are used with the
         // TemplateChild<T> wrapper, where T is the
diff --git a/data/gtk/window.ui b/src/window.ui
similarity index 100%
rename from data/gtk/window.ui
rename to src/window.ui