Browse Source

Change ID to org.gnome.FractalNext

merge-requests/1327/merge
Alejandro Domínguez 5 years ago
parent
commit
bd24d2f660
  1. 4
      .gitlab-ci.yml
  2. 4
      README.md
  3. 2
      build-aux/org.gnome.FractalNext.Devel.json
  4. 0
      data/icons/org.gnome.FractalNext-symbolic.svg
  5. 0
      data/icons/org.gnome.FractalNext.Devel.svg
  6. 0
      data/icons/org.gnome.FractalNext.svg
  7. 0
      data/org.gnome.FractalNext.desktop.in.in
  8. 2
      data/org.gnome.FractalNext.gschema.xml.in
  9. 0
      data/org.gnome.FractalNext.metainfo.xml.in.in
  10. 2
      data/resources.gresource.xml
  11. 2
      meson.build
  12. 6
      po/POTFILES.in
  13. 4
      src/application.rs
  14. 4
      src/window.rs

4
.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:
- >

4
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.
<a href="https://flathub.org/apps/details/org.gnome.Fractal">
<a href="https://flathub.org/apps/details/org.gnome.FractalNext">
<img src="https://flathub.org/assets/badges/flathub-badge-i-en.png" width="190px" />
</a>
@ -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

2
build-aux/org.gnome.Fractal.Devel.json → 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",

0
data/icons/org.gnome.Fractal-symbolic.svg → data/icons/org.gnome.FractalNext-symbolic.svg

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

0
data/icons/org.gnome.Fractal.Devel.svg → data/icons/org.gnome.FractalNext.Devel.svg

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

0
data/icons/org.gnome.Fractal.svg → data/icons/org.gnome.FractalNext.svg

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

0
data/org.gnome.Fractal.desktop.in.in → data/org.gnome.FractalNext.desktop.in.in

2
data/org.gnome.Fractal.gschema.xml.in → data/org.gnome.FractalNext.gschema.xml.in

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<schemalist>
<schema path="/org/gnome/Fractal/" id="@app-id@" gettext-domain="@gettext-package@">
<schema path="/org/gnome/FractalNext/" id="@app-id@" gettext-domain="@gettext-package@">
<key name="window-width" type="i">
<default>-1</default>
<summary>Default window width</summary>

0
data/org.gnome.Fractal.metainfo.xml.in.in → data/org.gnome.FractalNext.metainfo.xml.in.in

2
data/resources.gresource.xml

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gnome/Fractal/">
<gresource prefix="/org/gnome/FractalNext/">
<file compressed="true" preprocess="xml-stripblanks" alias="shortcuts.ui">resources/ui/shortcuts.ui</file>
<file compressed="true" preprocess="xml-stripblanks" alias="window.ui">resources/ui/window.ui</file>

2
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')

6
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

4
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,

4
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<gtk::HeaderBar>,
@ -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));

Loading…
Cancel
Save