diff --git a/README.md b/README.md index ac40a52..cd0203b 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ See the current temperature and weather conditions for your location with this m You'll need the following dependencies to build: * libgeoclue-2-dev -* libgranite-7-dev +* libgranite-7-dev >= 7.3.0 * libgtk-4-dev * libgweather-4-dev * meson @@ -18,13 +18,14 @@ You'll need the following dependencies to build: You'll need the following dependencies to run: * geoclue-2.0 -Run `meson build` to configure the build environment and run `ninja test` to build +Run `flatpak-builder` to configure the build environment, download dependencies, build, and install - meson build --prefix=/usr - cd build - ninja +```bash +flatpak-builder build io.github.danirabbit.nimbus.json --user --install --force-clean --install-deps-from=appcenter +``` -To install, use `ninja install`, then execute with `io.github.danirabbit.nimbus` +Then execute with - ninja install - io.github.danirabbit.nimbus +```bash +flatpak run io.github.danirabbit.nimbus +``` diff --git a/meson.build b/meson.build index 9831af4..619f64c 100644 --- a/meson.build +++ b/meson.build @@ -32,7 +32,7 @@ executable( dependency('glib-2.0'), dependency('gobject-2.0'), dependency('gtk4'), - dependency('granite-7'), + dependency('granite-7', version: '>=7.3.0'), dependency('gweather4'), dependency('libgeoclue-2.0') ], diff --git a/src/Application.vala b/src/Application.vala index e6ed4d9..b59c4c8 100644 --- a/src/Application.vala +++ b/src/Application.vala @@ -12,6 +12,8 @@ public class Nimbus : Gtk.Application { } protected override void startup () { + Granite.init (); + Intl.setlocale (LocaleCategory.ALL, ""); Intl.bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); Intl.bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); @@ -29,10 +31,6 @@ public class Nimbus : Gtk.Application { protected override void activate () { if (active_window == null) { - var provider = new Gtk.CssProvider (); - provider.load_from_resource ("io/github/danirabbit/nimbus/Application.css"); - Gtk.StyleContext.add_provider_for_display (Gdk.Display.get_default (), provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); - add_window (new MainWindow ()); }