From 3876f55b4c9a1e31dc90b9534071631fc6f05ec5 Mon Sep 17 00:00:00 2001
From: Sophie Herold <sophie@hemio.de>
Date: Wed, 23 Nov 2022 21:13:51 +0100
Subject: [PATCH] about: Change app name to Loupe and update devs

- Rename to Loupe to avoid confusion during incubation
  and potentially allow for release on Flathub
- Replace GNOME as developer since it violates software policy
- Put a more useful copyright statement
- Add me as developer
---
 data/gtk/window.ui                 |  6 +++---
 data/org.gnome.Loupe.desktop.in.in |  4 ++--
 src/application.rs                 | 13 +++++++------
 src/window.rs                      |  2 +-
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/data/gtk/window.ui b/data/gtk/window.ui
index b63c13c..791a778 100644
--- a/data/gtk/window.ui
+++ b/data/gtk/window.ui
@@ -51,7 +51,7 @@
         <attribute name="action">win.show-help-overlay</attribute>
       </item>
       <item>
-        <attribute name="label" translatable="yes">_About Image Viewer</attribute>
+        <attribute name="label" translatable="yes">_About Loupe</attribute>
         <attribute name="action">app.about</attribute>
       </item>
     </section>
@@ -60,7 +60,7 @@
     <property name="default-width">600</property>
     <property name="default-height">498</property>
     <property name="width-request">360</property>
-    <property name="title" translatable="yes">Image Viewer</property>
+    <property name="title" translatable="yes">Loupe</property>
     <binding name="title">
       <closure type="gchararray" function="window_title">
         <lookup type="LpImageView" name="active-file">image_view</lookup>
@@ -144,7 +144,7 @@
                     <property name="vexpand">True</property>
                     <child>
                       <object class="AdwStatusPage" id="status_page">
-                        <property name="title" translatable="yes">Image Viewer</property>
+                        <property name="title" translatable="yes">Loupe</property>
                         <property name="description" translatable="yes">Click “Open File…” or drag an image here.</property>
                         <child>
                           <object class="GtkButton">
diff --git a/data/org.gnome.Loupe.desktop.in.in b/data/org.gnome.Loupe.desktop.in.in
index 118eb6a..6e65811 100644
--- a/data/org.gnome.Loupe.desktop.in.in
+++ b/data/org.gnome.Loupe.desktop.in.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=Image Viewer
+Name=Loupe
 Exec=loupe %U
 Icon=@APP_ID@
 DBusActivatable=true
@@ -7,5 +7,5 @@ Terminal=false
 Type=Application
 Categories=GNOME;GTK;Graphics;2DGraphics;RasterGraphics;Viewer;
 MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/pjpeg;image/png;image/tiff;image/x-bmp;image/x-gray;image/x-icb;image/x-ico;image/x-png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-xbitmap;image/x-xpixmap;image/x-pcx;image/svg+xml;image/svg+xml-compressed;image/vnd.wap.wbmp;image/x-icns;
-Keywords=Picture;Slideshow;Graphics;Loupe;
+Keywords=Picture;Slideshow;Graphics;Image Viewer;
 StartupNotify=true
diff --git a/src/application.rs b/src/application.rs
index 59ab14c..0cf0142 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -148,21 +148,22 @@ impl LpApplication {
         // an object and set all relevant properties very
         // easily in a way that's idiomatic to Rust.
         let about = adw::AboutWindow::builder()
-            .application_name(&i18n("Image Viewer"))
+            .application_name(&i18n("Loupe"))
             .application_icon(config::APP_ID)
             .version(config::VERSION)
-            .developer_name(&i18n("The GNOME Project"))
+            .developer_name(&i18n("Christopher Davis"))
             .website("https://gitlab.gnome.org/BrainBlasted/loupe")
             .issue_url("https://gitlab.gnome.org/BrainBlasted/loupe/-/issues/new")
-            .developers(vec![String::from(
-                "Christopher Davis <christopherdavis@gnome.org>",
-            )])
+            .developers(vec![
+                String::from("Christopher Davis <christopherdavis@gnome.org>"),
+                String::from("Sophie Herold <sophieherold@gnome.org>"),
+            ])
             .designers(vec![
                 String::from("Allan Day"),
                 String::from("Jakub Steiner"),
                 String::from("Tobias Bernard"),
             ])
-            .copyright(&i18n("© 2022 The GNOME Project"))
+            .copyright(&i18n("Copyright © 2020–2022 Christopher Davis et al."))
             .license_type(gtk::License::Gpl30)
             .build();
 
diff --git a/src/window.rs b/src/window.rs
index 44a9acb..9a6fe66 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -450,7 +450,7 @@ impl LpWindow {
     #[template_callback]
     fn window_title(&self, file: Option<gio::File>) -> String {
         file.and_then(|f| util::get_file_display_name(&f)) // If the file exists, get display name
-            .unwrap_or_else(|| i18n("Image Viewer")) // Return that or the default if there's nothing
+            .unwrap_or_else(|| i18n("Loupe")) // Return that or the default if there's nothing
     }
 
     // We also have a closure that returns `adw::FlapFoldPolicy`.