diff --git a/data/ui/sernatur.gresource.xml b/data/ui/main.gresource.xml similarity index 94% rename from data/ui/sernatur.gresource.xml rename to data/ui/main.gresource.xml index 3af2cda..5ad8c0e 100644 --- a/data/ui/sernatur.gresource.xml +++ b/data/ui/main.gresource.xml @@ -15,8 +15,7 @@ main.window.ui - tour.window.ui - splash.ui + main.splash.ui pixdata/logo-sernatur.svg pixdata/icon-sernatur.png diff --git a/data/ui/splash.ui b/data/ui/main.splash.ui similarity index 100% rename from data/ui/splash.ui rename to data/ui/main.splash.ui diff --git a/data/ui/meson.build b/data/ui/meson.build index 9f63950..60b72d6 100644 --- a/data/ui/meson.build +++ b/data/ui/meson.build @@ -1,7 +1,13 @@ gnome = import('gnome') -gresource = gnome.compile_resources(meson.project_name() + '_gresource_main', - 'sernatur.gresource.xml', +main_gresource = gnome.compile_resources('main_gresource', + 'main.gresource.xml', source_dir: '.', c_name: meson.project_name() + '_resource_main', export: true, install_header: true) +tour_gresource = gnome.compile_resources('tour_gresource', + 'tour.gresource.xml', + source_dir: '.', + c_name: meson.project_name() + '_resource_tour', + export: true, + install_header: true) diff --git a/data/ui/tour.gresource.xml b/data/ui/tour.gresource.xml new file mode 100644 index 0000000..efbb088 --- /dev/null +++ b/data/ui/tour.gresource.xml @@ -0,0 +1,19 @@ + + + + + tour.window.ui + + diff --git a/src/main-window.vala b/src/main-window.vala index 03d2845..ddc9492 100644 --- a/src/main-window.vala +++ b/src/main-window.vala @@ -97,7 +97,7 @@ namespace Sernatur { // Load logo var builder = new Gtk.Builder (); try { - builder.add_from_resource ("/cl/cromer/ubb/sernatur/splash.ui"); + builder.add_from_resource ("/cl/cromer/ubb/sernatur/main.splash.ui"); builder.connect_signals (null); content = builder.get_object ("content_grid") as Gtk.Grid; diff --git a/src/meson.build b/src/meson.build index d533ed5..c6cb35a 100644 --- a/src/meson.build +++ b/src/meson.build @@ -19,11 +19,13 @@ vala_sources = files( 'tour-window.vala') sources = vala_sources -sources += gresource +sources += main_gresource +sources += tour_gresource sources += config_data_file vala_args = ['--vapidir=' + join_paths(meson.source_root(), 'vapi')] -vala_args += ['--gresources=' + join_paths(meson.source_root(), 'data/ui/sernatur.gresource.xml')] +vala_args += ['--gresources=' + join_paths(meson.source_root(), 'data/ui/main.gresource.xml')] +vala_args += ['--gresources=' + join_paths(meson.source_root(), 'data/ui/tour.gresource.xml')] inc = include_directories('../lib', './')