lazzexus/Loupe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

general: Rename to Loupe

Browse source 
Sets the codename, binary name, and app ID name to Loupe.
The user-visible name is still Image Viewer.
This commit is contained in:
Christopher Davis 2021-09-28 17:44:26 -07:00
parent 9833c1edc0
commit cced598239
25 changed files with 76 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci.yml
View file

@ -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'

44
Cargo.lock generated
View file

@ -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"

2
Cargo.toml
View file

@ -1,5 +1,5 @@
[package]
name = "gnome-image-viewer"
name = "loupe"
version = "0.1.0"
edition = "2018"

8
README.md
View file

@ -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).

10
build-aux/flatpak/org.gnome.ImageViewer.Devel.json → build-aux/flatpak/org.gnome.Loupe.Devel.json
View file

@ -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"
}
]
}

0
data/icons/hicolor/scalable/apps/org.gnome.ImageViewer.Devel.svg → data/icons/hicolor/scalable/apps/org.gnome.Loupe.Devel.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

Before After
Before After

0
data/icons/hicolor/scalable/apps/org.gnome.ImageViewer.svg → data/icons/hicolor/scalable/apps/org.gnome.Loupe.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

Before After
Before After

0
data/icons/hicolor/symbolic/apps/org.gnome.ImageViewer-symbolic.svg → data/icons/hicolor/symbolic/apps/org.gnome.Loupe-symbolic.svg
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 695 B

After

Width:  |  Height:  |  Size: 695 B

Before After
Before After

6
data/icons/meson.build
View file

@ -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)
)

2
data/gnome_image_viewer.gresource.xml → data/loupe.gresource.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gnome/ImageViewer">
<gresource prefix="/org/gnome/Loupe">
<file compressed="true" preprocess="xml-stripblanks">gtk/help_overlay.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtk/window.ui</file>
<file compressed="true" preprocess="xml-stripblanks">gtk/image_view.ui</file>

16
data/meson.build
View file

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

5
data/org.gnome.ImageViewer.gschema.xml
View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<schemalist gettext-domain="gnome-image-viewer">
<schema id="org.gnome.ImageViewer" path="/org/gnome/ImageViewer/">
</schema>
</schemalist>

3
data/org.gnome.ImageViewer.service.in
View file

@ -1,3 +0,0 @@
[D-BUS Service]
Name=@APP_ID@
Exec=@bindir@/gnome-image-viewer --gapplication-service

2
data/org.gnome.ImageViewer.appdata.xml.in.in → data/org.gnome.Loupe.appdata.xml.in.in
View file

@ -4,6 +4,6 @@
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0-or-later</project_license>
<description>
<p>A simple Image Viewer for GNOME</p>
<p>A simple image viewer for GNOME</p>
</description>
</component>

2
data/org.gnome.ImageViewer.desktop.in.in → data/org.gnome.Loupe.desktop.in.in
View file

@ -1,6 +1,6 @@
[Desktop Entry]
Name=Image Viewer
Exec=gnome-image-viewer %U
Exec=loupe %U
Icon=@APP_ID@
DBusActivatable=true
Terminal=false

5
data/org.gnome.Loupe.gschema.xml Normal file
View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<schemalist gettext-domain="loupe">
<schema id="org.gnome.Loupe" path="/org/gnome/Loupe/">
</schema>
</schemalist>

3
data/org.gnome.Loupe.service.in Normal file
View file

@ -0,0 +1,3 @@
[D-BUS Service]
Name=@APP_ID@
Exec=@bindir@/loupe --gapplication-service

8
help/C/index.page
View file

@ -4,10 +4,10 @@
id="index">
<info>
<desc>Help for the GNOME Image Viewer.</desc>
<desc>Help for Loupe.</desc>
<title type='link' role="trail"><media its:translate="no" type="image" src="figures/org.gnome.eog-symbolic.svg"/></title>
<title type='link'>GNOME Image Viewer</title>
<title type='text'>GNOME Image Viewer</title>
<title type='link'>Loupe</title>
<title type='text'>Loupe</title>
<credit type="author copyright">
<name>Christopher Davis</name>
<email>christopherdavis@gnome.org</email>
@ -15,5 +15,5 @@
</credit>
</info>
<title>GNOME Image Viewer</title>
<title>Loupe</title>
</page>

4
meson.build
View file

@ -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(

6
po/POTFILES
View file

@ -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

2
po/meson.build
View file

@ -1 +1 @@
i18n.gettext('gnome-image-viewer', preset: 'glib')
i18n.gettext('loupe', preset: 'glib')

4
src/application.rs
View file

@ -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);
}
}

6
src/main.rs
View file

@ -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);

2
src/widgets/image_view.rs
View file

@ -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<gtk::Picture>,

4
src/window.rs
View file

@ -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<T> 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));