From cced5982394f2f4c2f4c719873a517bd59582d3e Mon Sep 17 00:00:00 2001 From: Christopher Davis Date: Tue, 28 Sep 2021 17:44:26 -0700 Subject: [PATCH] general: Rename to Loupe Sets the codename, binary name, and app ID name to Loupe. The user-visible name is still Image Viewer. --- .gitlab-ci.yml | 8 ++-- Cargo.lock | 44 +++++++++---------- Cargo.toml | 2 +- README.md | 8 ++-- ....Devel.json => org.gnome.Loupe.Devel.json} | 10 ++--- ...er.Devel.svg => org.gnome.Loupe.Devel.svg} | 0 ...me.ImageViewer.svg => org.gnome.Loupe.svg} | 0 ...bolic.svg => org.gnome.Loupe-symbolic.svg} | 0 data/icons/meson.build | 6 +-- ...ewer.gresource.xml => loupe.gresource.xml} | 2 +- data/meson.build | 16 +++---- data/org.gnome.ImageViewer.gschema.xml | 5 --- data/org.gnome.ImageViewer.service.in | 3 -- ...n.in => org.gnome.Loupe.appdata.xml.in.in} | 2 +- ...op.in.in => org.gnome.Loupe.desktop.in.in} | 2 +- data/org.gnome.Loupe.gschema.xml | 5 +++ data/org.gnome.Loupe.service.in | 3 ++ help/C/index.page | 8 ++-- meson.build | 4 +- po/POTFILES | 6 +-- po/meson.build | 2 +- src/application.rs | 4 +- src/main.rs | 6 +-- src/widgets/image_view.rs | 2 +- src/window.rs | 4 +- 25 files changed, 76 insertions(+), 76 deletions(-) rename build-aux/flatpak/{org.gnome.ImageViewer.Devel.json => org.gnome.Loupe.Devel.json} (87%) rename data/icons/hicolor/scalable/apps/{org.gnome.ImageViewer.Devel.svg => org.gnome.Loupe.Devel.svg} (100%) rename data/icons/hicolor/scalable/apps/{org.gnome.ImageViewer.svg => org.gnome.Loupe.svg} (100%) rename data/icons/hicolor/symbolic/apps/{org.gnome.ImageViewer-symbolic.svg => org.gnome.Loupe-symbolic.svg} (100%) rename data/{gnome_image_viewer.gresource.xml => loupe.gresource.xml} (88%) delete mode 100644 data/org.gnome.ImageViewer.gschema.xml delete mode 100644 data/org.gnome.ImageViewer.service.in rename data/{org.gnome.ImageViewer.appdata.xml.in.in => org.gnome.Loupe.appdata.xml.in.in} (84%) rename data/{org.gnome.ImageViewer.desktop.in.in => org.gnome.Loupe.desktop.in.in} (95%) create mode 100644 data/org.gnome.Loupe.gschema.xml create mode 100644 data/org.gnome.Loupe.service.in diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7706774..e205844 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,9 +6,9 @@ stages: - deploy variables: - BUNDLE: "org.gnome.ImageViewer.Devel.flatpak" - MANIFEST_PATH: "build-aux/flatpak/org.gnome.ImageViewer.Devel.json" - FLATPAK_MODULE: "gnome-image-viewer" + BUNDLE: "org.gnome.Loupe.Devel.flatpak" + MANIFEST_PATH: "build-aux/flatpak/org.gnome.Loupe.Devel.json" + FLATPAK_MODULE: "loupe" FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:master" .flatpak_cache_template: &flatpak_cache @@ -34,7 +34,7 @@ flatpak: image: "$FLATPAK_IMAGE" variables: RUNTIME_REPO: 'https://nightly.gnome.org/gnome-nightly.flatpakrepo' - APP_ID: "org.gnome.ImageViewer.Devel" + APP_ID: "org.gnome.Loupe.Devel" # nightly: # extends: '.publish_nightly' diff --git a/Cargo.lock b/Cargo.lock index 33fae42..a0dac69 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -652,28 +652,6 @@ dependencies = [ "system-deps 3.2.0", ] -[[package]] -name = "gnome-image-viewer" -version = "0.1.0" -dependencies = [ - "anyhow", - "ashpd", - "cairo-rs", - "gdk-pixbuf", - "gdk4", - "gettext-rs", - "gio", - "glib", - "gtk-macros", - "gtk4", - "libadwaita", - "log", - "once_cell", - "pretty_env_logger", - "zbus 1.9.1", - "zvariant", -] - [[package]] name = "gobject-sys" version = "0.14.0" @@ -933,6 +911,28 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "loupe" +version = "0.1.0" +dependencies = [ + "anyhow", + "ashpd", + "cairo-rs", + "gdk-pixbuf", + "gdk4", + "gettext-rs", + "gio", + "glib", + "gtk-macros", + "gtk4", + "libadwaita", + "log", + "once_cell", + "pretty_env_logger", + "zbus 1.9.1", + "zvariant", +] + [[package]] name = "malloc_buf" version = "0.0.6" diff --git a/Cargo.toml b/Cargo.toml index 5061e81..56e93db 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "gnome-image-viewer" +name = "loupe" version = "0.1.0" edition = "2018" diff --git a/README.md b/README.md index a17d925..5a02927 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# GNOME Image Viewer +# Loupe A simple image viewer application written with GTK4 and Rust. @@ -16,8 +16,8 @@ GNOME Builder is the environment used for developing this application. It can us recommended you use it. 1. Download [GNOME Builder](https://flathub.org/apps/details/org.gnome.Builder). -2. In Builder, click the "Clone Repository" button at the bottom, using `git@gitlab.gnome.org/BrainBlasted/gnome-image-viewer.git` -or `https://gitlab.gnome.org/BrainBlasted/gnome-image-viewer.git` as the URL. +2. In Builder, click the "Clone Repository" button at the bottom, using `git@gitlab.gnome.org/BrainBlasted/loupe.git` +or `https://gitlab.gnome.org/BrainBlasted/loupe.git` as the URL. 3. Click the build button at the top once the project is loaded. @@ -30,5 +30,5 @@ which can be installed on any system that supports flatpak. ## Conduct -GNOME Image Viewer operates under the GNOME Code Of Conduct. See the full +Loupe operates under the GNOME Code Of Conduct. See the full text of the Code Of Conduct [here](CODE_OF_CONDUCT.md). diff --git a/build-aux/flatpak/org.gnome.ImageViewer.Devel.json b/build-aux/flatpak/org.gnome.Loupe.Devel.json similarity index 87% rename from build-aux/flatpak/org.gnome.ImageViewer.Devel.json rename to build-aux/flatpak/org.gnome.Loupe.Devel.json index 363843c..caa59f8 100644 --- a/build-aux/flatpak/org.gnome.ImageViewer.Devel.json +++ b/build-aux/flatpak/org.gnome.Loupe.Devel.json @@ -1,12 +1,12 @@ { - "app-id" : "org.gnome.ImageViewer.Devel", + "app-id" : "org.gnome.Loupe.Devel", "runtime" : "org.gnome.Platform", "runtime-version" : "master", "sdk" : "org.gnome.Sdk", "sdk-extensions" : [ "org.freedesktop.Sdk.Extension.rust-stable" ], - "command" : "gnome-image-viewer", + "command" : "loupe", "finish-args" : [ "--share=network", "--share=ipc", @@ -23,7 +23,7 @@ "--share=network" ], "env" : { - "CARGO_HOME" : "/run/build/gnome-image-viewer/cargo" + "CARGO_HOME" : "/run/build/loupe/cargo" } }, "cleanup" : [ @@ -50,7 +50,7 @@ ] }, { - "name" : "gnome-image-viewer", + "name" : "loupe", "builddir" : true, "buildsystem" : "meson", "config-opts": [ @@ -59,7 +59,7 @@ "sources" : [ { "type" : "git", - "url" : "https://gitlab.gnome.org/BrainBlasted/gnome-image-viewer.git" + "url" : "https://gitlab.gnome.org/BrainBlasted/loupe.git" } ] } diff --git a/data/icons/hicolor/scalable/apps/org.gnome.ImageViewer.Devel.svg b/data/icons/hicolor/scalable/apps/org.gnome.Loupe.Devel.svg similarity index 100% rename from data/icons/hicolor/scalable/apps/org.gnome.ImageViewer.Devel.svg rename to data/icons/hicolor/scalable/apps/org.gnome.Loupe.Devel.svg diff --git a/data/icons/hicolor/scalable/apps/org.gnome.ImageViewer.svg b/data/icons/hicolor/scalable/apps/org.gnome.Loupe.svg similarity index 100% rename from data/icons/hicolor/scalable/apps/org.gnome.ImageViewer.svg rename to data/icons/hicolor/scalable/apps/org.gnome.Loupe.svg diff --git a/data/icons/hicolor/symbolic/apps/org.gnome.ImageViewer-symbolic.svg b/data/icons/hicolor/symbolic/apps/org.gnome.Loupe-symbolic.svg similarity index 100% rename from data/icons/hicolor/symbolic/apps/org.gnome.ImageViewer-symbolic.svg rename to data/icons/hicolor/symbolic/apps/org.gnome.Loupe-symbolic.svg diff --git a/data/icons/meson.build b/data/icons/meson.build index aaa0ce7..76e55f0 100644 --- a/data/icons/meson.build +++ b/data/icons/meson.build @@ -1,19 +1,19 @@ scalable_dir = join_paths('hicolor', 'scalable', 'apps') install_data( - join_paths(scalable_dir, 'org.gnome.ImageViewer.svg'), + join_paths(scalable_dir, 'org.gnome.Loupe.svg'), install_dir: join_paths(iv_datadir, 'icons', scalable_dir), ) install_data( - join_paths(scalable_dir, 'org.gnome.ImageViewer.Devel.svg'), + join_paths(scalable_dir, 'org.gnome.Loupe.Devel.svg'), install_dir: join_paths(iv_datadir, 'icons', scalable_dir), ) symbolic_dir = join_paths('hicolor', 'symbolic', 'apps') install_data( - join_paths(symbolic_dir, 'org.gnome.ImageViewer-symbolic.svg'), + join_paths(symbolic_dir, 'org.gnome.Loupe-symbolic.svg'), install_dir: join_paths(iv_datadir, 'icons', symbolic_dir), rename: '@0@-symbolic.svg'.format(app_id) ) diff --git a/data/gnome_image_viewer.gresource.xml b/data/loupe.gresource.xml similarity index 88% rename from data/gnome_image_viewer.gresource.xml rename to data/loupe.gresource.xml index 7f49ff2..f4ab741 100644 --- a/data/gnome_image_viewer.gresource.xml +++ b/data/loupe.gresource.xml @@ -1,6 +1,6 @@ - + gtk/help_overlay.ui gtk/window.ui gtk/image_view.ui diff --git a/data/meson.build b/data/meson.build index 4179596..edf482b 100644 --- a/data/meson.build +++ b/data/meson.build @@ -1,7 +1,7 @@ desktop_file = i18n.merge_file( input: configure_file( - input: 'org.gnome.ImageViewer.desktop.in.in', - output: 'org.gnome.ImageViewer.desktop.in', + input: 'org.gnome.Loupe.desktop.in.in', + output: 'org.gnome.Loupe.desktop.in', configuration: conf, ), output: '@0@.desktop'.format(app_id), @@ -12,7 +12,7 @@ desktop_file = i18n.merge_file( ) configure_file( - input: 'org.gnome.ImageViewer.service.in', + input: 'org.gnome.Loupe.service.in', output: '@0@.service'.format(app_id), configuration: conf, install: true, @@ -28,8 +28,8 @@ endif appstream_file = i18n.merge_file( input: configure_file( - input: 'org.gnome.ImageViewer.appdata.xml.in.in', - output: 'org.gnome.ImageViewer.appdata.xml.in', + input: 'org.gnome.Loupe.appdata.xml.in.in', + output: 'org.gnome.Loupe.appdata.xml.in', configuration: conf, ), output: '@0@.appdata.xml'.format(app_id), @@ -45,7 +45,7 @@ appstream_file = i18n.merge_file( # ) # endif -install_data('org.gnome.ImageViewer.gschema.xml', +install_data('org.gnome.Loupe.gschema.xml', install_dir: join_paths(iv_datadir, 'glib-2.0', 'schemas') ) @@ -56,8 +56,8 @@ if compile_schemas.found() ) endif -gnome.compile_resources('gnome-image-viewer', - 'gnome_image_viewer.gresource.xml', +gnome.compile_resources('loupe', + 'loupe.gresource.xml', gresource_bundle: true, install: true, install_dir: iv_pkgdatadir, diff --git a/data/org.gnome.ImageViewer.gschema.xml b/data/org.gnome.ImageViewer.gschema.xml deleted file mode 100644 index ae0a77a..0000000 --- a/data/org.gnome.ImageViewer.gschema.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/data/org.gnome.ImageViewer.service.in b/data/org.gnome.ImageViewer.service.in deleted file mode 100644 index 0a8132f..0000000 --- a/data/org.gnome.ImageViewer.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=@APP_ID@ -Exec=@bindir@/gnome-image-viewer --gapplication-service diff --git a/data/org.gnome.ImageViewer.appdata.xml.in.in b/data/org.gnome.Loupe.appdata.xml.in.in similarity index 84% rename from data/org.gnome.ImageViewer.appdata.xml.in.in rename to data/org.gnome.Loupe.appdata.xml.in.in index 31ce77f..146aae8 100644 --- a/data/org.gnome.ImageViewer.appdata.xml.in.in +++ b/data/org.gnome.Loupe.appdata.xml.in.in @@ -4,6 +4,6 @@ CC0-1.0 GPL-3.0-or-later -

A simple Image Viewer for GNOME

+

A simple image viewer for GNOME

 diff --git a/data/org.gnome.ImageViewer.desktop.in.in b/data/org.gnome.Loupe.desktop.in.in similarity index 95% rename from data/org.gnome.ImageViewer.desktop.in.in rename to data/org.gnome.Loupe.desktop.in.in index da2a5d0..226e202 100644 --- a/data/org.gnome.ImageViewer.desktop.in.in +++ b/data/org.gnome.Loupe.desktop.in.in @@ -1,6 +1,6 @@ [Desktop Entry] Name=Image Viewer -Exec=gnome-image-viewer %U +Exec=loupe %U Icon=@APP_ID@ DBusActivatable=true Terminal=false diff --git a/data/org.gnome.Loupe.gschema.xml b/data/org.gnome.Loupe.gschema.xml new file mode 100644 index 0000000..b985dea --- /dev/null +++ b/data/org.gnome.Loupe.gschema.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/data/org.gnome.Loupe.service.in b/data/org.gnome.Loupe.service.in new file mode 100644 index 0000000..5d980b5 --- /dev/null +++ b/data/org.gnome.Loupe.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=@APP_ID@ +Exec=@bindir@/loupe --gapplication-service diff --git a/help/C/index.page b/help/C/index.page index 802b50b..fa1c4e3 100644 --- a/help/C/index.page +++ b/help/C/index.page @@ -4,10 +4,10 @@ id="index"> - Help for the GNOME Image Viewer. + Help for Loupe. <media its:translate="no" type="image" src="figures/org.gnome.eog-symbolic.svg"/> - GNOME Image Viewer - GNOME Image Viewer + Loupe + Loupe Christopher Davis christopherdavis@gnome.org @@ -15,5 +15,5 @@ -GNOME Image Viewer +Loupe diff --git a/meson.build b/meson.build index 0b04d7f..c86b463 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('gnome-image-viewer', +project('loupe', version: '42.alpha', meson_version: '>= 0.50.0', default_options: [ 'warning_level=2', @@ -32,7 +32,7 @@ if get_option('profile') == 'development' endif endif -app_id = 'org.gnome.ImageViewer@0@'.format(profile) +app_id = 'org.gnome.Loupe@0@'.format(profile) iv_version = meson.project_version() + version_suffix cargo_sources = files( diff --git a/po/POTFILES b/po/POTFILES index c4afad4..165de45 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -1,4 +1,4 @@ -data/org.gnome.ImageViewer.desktop.in -data/org.gnome.ImageViewer.appdata.xml.in -data/org.gnome.ImageViewer.gschema.xml +data/org.gnome.Loupe.desktop.in +data/org.gnome.Loupe.appdata.xml.in +data/org.gnome.Loupe.gschema.xml src/window.ui diff --git a/po/meson.build b/po/meson.build index 1f308d7..33d3b05 100644 --- a/po/meson.build +++ b/po/meson.build @@ -1 +1 @@ -i18n.gettext('gnome-image-viewer', preset: 'glib') +i18n.gettext('loupe', preset: 'glib') diff --git a/src/application.rs b/src/application.rs index e079e0c..9a1aa89 100644 --- a/src/application.rs +++ b/src/application.rs @@ -110,7 +110,7 @@ impl IvApplication { glib::Object::new(&[ ("application-id", &config::APP_ID.to_string()), ("flags", &gio::ApplicationFlags::HANDLES_OPEN), - ("resource-base-path", &"/org/gnome/ImageViewer/".to_string()), + ("resource-base-path", &"/org/gnome/Loupe/".to_string()), ]) .unwrap() } @@ -198,6 +198,6 @@ impl IvApplication { } pub fn show_help(&self) { - gtk::show_uri(self.active_window().as_ref(), "help:gnome-image-viewer", 0); + gtk::show_uri(self.active_window().as_ref(), "help:loupe", 0); } } diff --git a/src/main.rs b/src/main.rs index a98e7ed..db1ed1e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -34,10 +34,10 @@ fn main() { pretty_env_logger::init(); setlocale(LocaleCategory::LcAll, ""); - bindtextdomain("gnome-image-viewer", config::LOCALEDIR).unwrap(); - textdomain("gnome-image-viewer").unwrap(); + bindtextdomain("loupe", config::LOCALEDIR).unwrap(); + textdomain("loupe").unwrap(); - let res = gio::Resource::load(config::PKGDATADIR.to_owned() + "/gnome-image-viewer.gresource") + let res = gio::Resource::load(config::PKGDATADIR.to_owned() + "/loupe.gresource") .expect("Could not load resources"); gio::resources_register(&res); diff --git a/src/widgets/image_view.rs b/src/widgets/image_view.rs index 0ba50ea..e52e7f1 100644 --- a/src/widgets/image_view.rs +++ b/src/widgets/image_view.rs @@ -39,7 +39,7 @@ mod imp { use glib::subclass; #[derive(Debug, Default, CompositeTemplate)] - #[template(resource = "/org/gnome/ImageViewer/gtk/image_view.ui")] + #[template(resource = "/org/gnome/Loupe/gtk/image_view.ui")] pub struct IvImageView { #[template_child] pub picture: TemplateChild, diff --git a/src/window.rs b/src/window.rs index 7f4e8eb..3b350c2 100644 --- a/src/window.rs +++ b/src/window.rs @@ -46,7 +46,7 @@ mod imp { // we'd need to have a `new()` function in the // `impl ObjectSubclass for $TYPE` section. #[derive(Default, Debug, CompositeTemplate)] - #[template(resource = "/org/gnome/ImageViewer/gtk/window.ui")] + #[template(resource = "/org/gnome/Loupe/gtk/window.ui")] pub struct IvWindow { // Template children are used with the // TemplateChild wrapper, where T is the @@ -121,7 +121,7 @@ mod imp { .set_icon_name(Some(&format!("{}-symbolic", config::APP_ID))); // Set help overlay - let builder = gtk::Builder::from_resource("/org/gnome/ImageViewer/gtk/help_overlay.ui"); + let builder = gtk::Builder::from_resource("/org/gnome/Loupe/gtk/help_overlay.ui"); let help_overlay = builder.object("help_overlay").unwrap(); obj.set_help_overlay(Some(&help_overlay));