From 15b56e0c818a3689af067a9a63da9016cc489746 Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Sat, 18 Feb 2023 21:42:38 -0500 Subject: [PATCH] Remove the glade template and create rusty widgets --- hex-grid/resources/main.glade | 99 ----------------- hex-grid/resources/resources.gresources.xml | 1 - hex-grid/src/main.rs | 116 +++++++++++++++----- 3 files changed, 91 insertions(+), 125 deletions(-) delete mode 100644 hex-grid/resources/main.glade diff --git a/hex-grid/resources/main.glade b/hex-grid/resources/main.glade deleted file mode 100644 index 1b7442b..0000000 --- a/hex-grid/resources/main.glade +++ /dev/null @@ -1,99 +0,0 @@ - - - - diff --git a/hex-grid/resources/resources.gresources.xml b/hex-grid/resources/resources.gresources.xml index 30f14bd..cb89341 100644 --- a/hex-grid/resources/resources.gresources.xml +++ b/hex-grid/resources/resources.gresources.xml @@ -1,7 +1,6 @@ - main.glade terrain.ppm map.txt diff --git a/hex-grid/src/main.rs b/hex-grid/src/main.rs index 7d62cc2..5a55e5a 100644 --- a/hex-grid/src/main.rs +++ b/hex-grid/src/main.rs @@ -110,15 +110,13 @@ fn main() { app.run(); } -#[derive(CompositeTemplate, Default)] -#[template(resource = "/com/luminescent-dreams/hex-grid/main.glade")] +#[derive(Default)] pub struct HexGridWindowPrivate { - #[template_child] - pub drawing_area: TemplateChild, - #[template_child] - pub hex_address: TemplateChild