diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a787fdca..9d482fbd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,9 +9,9 @@ flatpak: - flatpak variables: BUNDLE: "fractal-nightly.flatpak" - MANIFEST_PATH: "build-aux/org.gnome.Fractal.Devel.json" + MANIFEST_PATH: "build-aux/org.gnome.FractalNext.Devel.json" FLATPAK_MODULE: "fractal" - APP_ID: "org.gnome.Fractal.Devel" + APP_ID: "org.gnome.FractalNext.Devel" RUNTIME_REPO: "https://nightly.gnome.org/gnome-nightly.flatpakrepo" script: - > diff --git a/README.md b/README.md index d36858f0..7f121a2f 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Fractal is a Matrix messaging app for GNOME written in Rust. Its interface is op Flatpak is the recommended installation method. You can get the official Fractal Flatpak on Flathub. - + @@ -45,7 +45,7 @@ flatpak install --user flathub org.freedesktop.Sdk.Extension.rust-stable//20.08 Then you go ahead and build Fractal. ``` -flatpak-builder --user --install fractal flatpak/org.gnome.Fractal.json +flatpak-builder --user --install fractal flatpak/org.gnome.FractalNext.json ``` ### Snap diff --git a/build-aux/org.gnome.Fractal.Devel.json b/build-aux/org.gnome.FractalNext.Devel.json similarity index 98% rename from build-aux/org.gnome.Fractal.Devel.json rename to build-aux/org.gnome.FractalNext.Devel.json index ad94a2f1..c5bcf485 100644 --- a/build-aux/org.gnome.Fractal.Devel.json +++ b/build-aux/org.gnome.FractalNext.Devel.json @@ -1,5 +1,5 @@ { - "app-id": "org.gnome.Fractal.Devel", + "app-id": "org.gnome.FractalNext.Devel", "runtime": "org.gnome.Platform", "runtime-version": "3.38", "sdk": "org.gnome.Sdk", diff --git a/data/icons/org.gnome.Fractal-symbolic.svg b/data/icons/org.gnome.FractalNext-symbolic.svg similarity index 100% rename from data/icons/org.gnome.Fractal-symbolic.svg rename to data/icons/org.gnome.FractalNext-symbolic.svg diff --git a/data/icons/org.gnome.Fractal.Devel.svg b/data/icons/org.gnome.FractalNext.Devel.svg similarity index 100% rename from data/icons/org.gnome.Fractal.Devel.svg rename to data/icons/org.gnome.FractalNext.Devel.svg diff --git a/data/icons/org.gnome.Fractal.svg b/data/icons/org.gnome.FractalNext.svg similarity index 100% rename from data/icons/org.gnome.Fractal.svg rename to data/icons/org.gnome.FractalNext.svg diff --git a/data/org.gnome.Fractal.desktop.in.in b/data/org.gnome.FractalNext.desktop.in.in similarity index 100% rename from data/org.gnome.Fractal.desktop.in.in rename to data/org.gnome.FractalNext.desktop.in.in diff --git a/data/org.gnome.Fractal.gschema.xml.in b/data/org.gnome.FractalNext.gschema.xml.in similarity index 87% rename from data/org.gnome.Fractal.gschema.xml.in rename to data/org.gnome.FractalNext.gschema.xml.in index 855f098d..4b0033f1 100644 --- a/data/org.gnome.Fractal.gschema.xml.in +++ b/data/org.gnome.FractalNext.gschema.xml.in @@ -1,6 +1,6 @@ - + -1 Default window width diff --git a/data/org.gnome.Fractal.metainfo.xml.in.in b/data/org.gnome.FractalNext.metainfo.xml.in.in similarity index 100% rename from data/org.gnome.Fractal.metainfo.xml.in.in rename to data/org.gnome.FractalNext.metainfo.xml.in.in diff --git a/data/resources.gresource.xml b/data/resources.gresource.xml index 8454571b..0299d06b 100644 --- a/data/resources.gresource.xml +++ b/data/resources.gresource.xml @@ -1,6 +1,6 @@ - + resources/ui/shortcuts.ui resources/ui/window.ui diff --git a/meson.build b/meson.build index 8bad7422..35b1cd27 100644 --- a/meson.build +++ b/meson.build @@ -7,7 +7,7 @@ project('fractal', i18n = import('i18n') gnome = import('gnome') -base_id = 'org.gnome.Fractal' +base_id = 'org.gnome.FractalNext' dependency('glib-2.0', version: '>= 2.66') dependency('gio-2.0', version: '>= 2.66') diff --git a/po/POTFILES.in b/po/POTFILES.in index 84eba3f8..79790255 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,5 @@ data/resources/ui/shortcuts.ui data/resources/ui/window.ui.in -data/org.gnome.Fractal.desktop.in.in -data/org.gnome.Fractal.gschema.xml.in -data/org.gnome.Fractal.metainfo.xml.in.in +data/org.gnome.FractalNext.desktop.in.in +data/org.gnome.FractalNext.gschema.xml.in +data/org.gnome.FractalNext.metainfo.xml.in.in diff --git a/src/application.rs b/src/application.rs index 8d2da56b..7f8a50ed 100644 --- a/src/application.rs +++ b/src/application.rs @@ -51,7 +51,7 @@ mod imp { return; } - app.set_resource_base_path(Some("/org/gnome/Fractal/")); + app.set_resource_base_path(Some("/org/gnome/FractalNext/")); app.setup_css(); let window = ExampleApplicationWindow::new(app); @@ -124,7 +124,7 @@ impl ExampleApplication { fn setup_css(&self) { let provider = gtk::CssProvider::new(); - provider.load_from_resource("/org/gnome/Fractal/style.css"); + provider.load_from_resource("/org/gnome/FractalNext/style.css"); if let Some(display) = gdk::Display::get_default() { gtk::StyleContext::add_provider_for_display( &display, diff --git a/src/window.rs b/src/window.rs index 62a22248..ed668918 100644 --- a/src/window.rs +++ b/src/window.rs @@ -11,7 +11,7 @@ mod imp { use glib::subclass; #[derive(Debug, CompositeTemplate)] - #[template(resource = "/org/gnome/Fractal/window.ui")] + #[template(resource = "/org/gnome/FractalNext/window.ui")] pub struct ExampleApplicationWindow { #[template_child] pub headerbar: TemplateChild, @@ -49,7 +49,7 @@ mod imp { fn constructed(&self, obj: &Self::Type) { self.parent_constructed(obj); - let builder = gtk::Builder::from_resource("/org/gnome/Fractal/shortcuts.ui"); + let builder = gtk::Builder::from_resource("/org/gnome/FractalNext/shortcuts.ui"); let shortcuts = builder.get_object("shortcuts").unwrap(); obj.set_help_overlay(Some(&shortcuts));