update naming again

This will be harder later

Author: DarthGandalf

Cargo.lock

@@ -1,5 +1,5 @@
 [package]
-name = "shutter-rust"
+name = "shutter"
 version = "0.999.1"
 edition = "2024"
 

Cargo.toml

@@ -1,4 +1,4 @@
-application_id = 'org.shutter-project.ShutterRust'
+application_id = 'org.shutter-project.Shutter'
 
 scalable_dir = 'hicolor' / 'scalable' / 'apps'
 install_data(

data/icons/hicolor/scalable/apps/org.shutter-project.ShutterRust.svg renamed to data/icons/hicolor/scalable/apps/org.shutter-project.Shutter.svg

@@ -1,6 +1,6 @@
 desktop_file = i18n.merge_file(
-        input: 'org.shutter-project.ShutterRust.desktop.in',
-       output: 'org.shutter-project.ShutterRust.desktop',
+        input: 'org.shutter-project.Shutter.desktop.in',
+       output: 'org.shutter-project.Shutter.desktop',
          type: 'desktop',
        po_dir: '../po',
       install: true,
@@ -13,8 +13,8 @@ if desktop_utils.found()
 endif
 
 appstream_file = i18n.merge_file(
-        input: 'org.shutter-project.ShutterRust.metainfo.xml.in',
-       output: 'org.shutter-project.ShutterRust.metainfo.xml',
+        input: 'org.shutter-project.Shutter.metainfo.xml.in',
+       output: 'org.shutter-project.Shutter.metainfo.xml',
        po_dir: '../po',
       install: true,
   install_dir: get_option('datadir') / 'metainfo'
@@ -24,7 +24,7 @@ appstreamcli = find_program('appstreamcli', required: false, disabler: true)
 test('Validate appstream file', appstreamcli,
      args: ['validate', '--no-net', '--explain', appstream_file])
 
-install_data('org.shutter-project.ShutterRust.gschema.xml',
+install_data('org.shutter-project.Shutter.gschema.xml',
   install_dir: get_option('datadir') / 'glib-2.0' / 'schemas'
 )
 

data/icons/meson.build

@@ -1,7 +1,7 @@
 [Desktop Entry]
-Name=shutter-rust
-Exec=shutter-rust
-Icon=org.shutter-project.ShutterRust
+Name=shutter
+Exec=shutter
+Icon=org.shutter-project.Shutter
 Terminal=false
 Type=Application
 Categories=GTK;

data/meson.build

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist gettext-domain="shutter-rust">
-	<schema id="org.shutter-project.ShutterRust" path="/org/shutter-project/ShutterRust/">
+	<schema id="org.shutter-project.Shutter" path="/org/shutter-project/Shutter/">
 	</schema>
 </schemalist>

data/org.shutter-project.ShutterRust.desktop.in renamed to data/org.shutter-project.Shutter.desktop.in

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>org.shutter-project.Shutter</id>
+  <name>Shutter</name>
+  <summary>The feature-rich screenshot tool</summary>
+  <launchable type="desktop-id">shutter.desktop</launchable>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-3.0+</project_license>
+  <description>
+    <p>
+      Shutter is a feature-rich screenshot program. You can take a screenshot of a
+      specific area, window, your whole screen, or even of a website - apply different
+      effects to it, draw on it to highlight points, and then upload to an image
+      hosting site, all within one window.
+    </p>
+    <p>
+      Shutter allows you to capture nearly anything on your screen without losing
+      control over your screenshots (tabbed interface).
+      You don't need to open an external graphics editor like GIMP, because Shutter
+      ships with its own built-in editor.
+    </p>
+  </description>
+  <url type="homepage">https://shutter-project.org/</url>
+  <url type="bugtracker">https://github.com/shutter-project/shutter/issues</url>
+  <url type="contact">https://shutter-project.org/contact/</url>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://shutter-project.org/wp-content/uploads/key_feature_030.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://shutter-project.org/wp-content/uploads/key_feature_042.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://shutter-project.org/wp-content/uploads/key_feature_036.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://shutter-project.org/wp-content/uploads/key_feature_073.png</image>
+    </screenshot>
+  </screenshots>
+</component>

data/org.shutter-project.ShutterRust.gschema.xml renamed to data/org.shutter-project.Shutter.gschema.xml

@@ -1,4 +1,4 @@
-project('shutter-rust', 'rust', 
+project('shutter', 'rust', 
           version: '0.999.2',
     meson_version: '>= 0.62.0',
   default_options: [ 'warning_level=2', 'werror=false', ],

data/org.shutter-project.Shutter.metainfo.xml.in

@@ -1,5 +1,5 @@
 {
-    "id" : "org.shutter-project.ShutterRust",
+    "id" : "org.shutter-project.Shutter",
     "runtime" : "org.gnome.Platform",
     "runtime-version" : "master",
     "sdk" : "org.gnome.Sdk",
@@ -37,7 +37,7 @@
     ],
     "modules" : [
         {
-            "name" : "shutter-rust",
+            "name" : "shutter",
             "builddir" : true,
             "buildsystem" : "meson",
             "sources" : [

data/org.shutter-project.ShutterRust.metainfo.xml.in

@@ -18,27 +18,28 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
+use adw::prelude::AdwDialogExt;
 use gtk::prelude::*;
 use adw::subclass::prelude::*;
 use gtk::{gio, glib};
 
 use crate::config::VERSION;
-use crate::ShutterRustWindow;
+use crate::ShutterWindow;
 
 mod imp {
     use super::*;
 
     #[derive(Debug, Default)]
-    pub struct ShutterRustApplication {}
+    pub struct ShutterApplication {}
 
     #[glib::object_subclass]
-    impl ObjectSubclass for ShutterRustApplication {
-        const NAME: &'static str = "ShutterRustApplication";
-        type Type = super::ShutterRustApplication;
+    impl ObjectSubclass for ShutterApplication {
+        const NAME: &'static str = "ShutterApplication";
+        type Type = super::ShutterApplication;
         type ParentType = adw::Application;
     }
 
-    impl ObjectImpl for ShutterRustApplication {
+    impl ObjectImpl for ShutterApplication {
         fn constructed(&self) {
             self.parent_constructed();
             let obj = self.obj();
@@ -47,7 +48,7 @@ mod imp {
         }
     }
 
-    impl ApplicationImpl for ShutterRustApplication {
+    impl ApplicationImpl for ShutterApplication {
         // We connect to the activate callback to create a window when the application
         // has been launched. Additionally, this callback notifies us when the user
         // tries to launch a "second instance" of the application. When they try
@@ -58,7 +59,7 @@ mod imp {
             let window = if let Some(window) = application.active_window() {
                 window
             } else {
-                let window = ShutterRustWindow::new(&*application);
+                let window = ShutterWindow::new(&*application);
                 window.upcast()
             };
 
@@ -67,17 +68,17 @@ mod imp {
         }
     }
 
-    impl GtkApplicationImpl for ShutterRustApplication {}
-    impl AdwApplicationImpl for ShutterRustApplication {}
+    impl GtkApplicationImpl for ShutterApplication {}
+    impl AdwApplicationImpl for ShutterApplication {}
     }
 
 glib::wrapper! {
-    pub struct ShutterRustApplication(ObjectSubclass<imp::ShutterRustApplication>)
+    pub struct ShutterApplication(ObjectSubclass<imp::ShutterApplication>)
         @extends gio::Application, gtk::Application, adw::Application,
         @implements gio::ActionGroup, gio::ActionMap;
 }
 
-impl ShutterRustApplication {
+impl ShutterApplication {
     pub fn new(application_id: &str, flags: &gio::ApplicationFlags) -> Self {
         glib::Object::builder()
             .property("application-id", application_id)
@@ -97,18 +98,19 @@ impl ShutterRustApplication {
 
     fn show_about(&self) {
         let window = self.active_window().unwrap();
-        let about = adw::AboutWindow::builder()
-            .transient_for(&window)
+        let about = adw::AboutDialog::builder()
             //.modal(true)
-            .application_icon("shutter-rust")
-            // TODO remove extra icon
-            .application_icon("org.shutter-project.ShutterRust")
+            .application_icon("shutter")
+            // TODO remove extra icons
+            .application_icon("org.shutter-project.Shutter")
             .application_icon("shutter")
             .version(VERSION)
             .developers(vec!["Unknown"])
             .copyright("© 2025 Unknown")
+            .website("https://shutter-project.org")
+            .issue_url("https://github.com/shutter-project/shutter/issues")
             .build();
 
-        about.present();
+        about.present(Some(&window));
     }
 }

meson.build

@@ -22,7 +22,7 @@ mod imp {
     use gtk::{glib, gio, CompositeTemplate};
 
     #[derive(CompositeTemplate, Default)]
-    #[template(resource = "/org/shutter-project/Shutter/Rust/editorwindow.ui")]
+    #[template(resource = "/org/shutter-project/Shutter/editorwindow.ui")]
     pub struct EditorWindow {
         #[template_child]
         pub button: TemplateChild<gtk::Widget>,

org.shutter-project.ShutterRust.json renamed to org.shutter-project.Shutter.json

@@ -9,22 +9,22 @@ menu menubar {
       action: "app.preferences";
     }
 
-    item {
-      label: _("_Keyboard Shortcuts");
-      action: "win.show-help-overlay";
-    }
-
     item {
       label: _("_About Shutter-Rust");
       action: "app.about";
     }
   }
 
   submenu {
-    label: _("Bbb");
+    label: _("_Help");
+
+    item {
+      label: _("_Keyboard Shortcuts");
+      action: "win.show-help-overlay";
+    }
 
     item {
-      label: _("Foo");
+      label: _("_About");
       action: "app.about";
     }
   }

src/application.rs

@@ -23,8 +23,8 @@ mod config;
 mod settings;
 mod window;
 
-use self::application::ShutterRustApplication;
-use self::window::ShutterRustWindow;
+use self::application::ShutterApplication;
+use self::window::ShutterWindow;
 
 use config::{GETTEXT_PACKAGE, LOCALEDIR, PKGDATADIR};
 use gettextrs::{bind_textdomain_codeset, bindtextdomain, textdomain};
@@ -39,14 +39,14 @@ fn main() -> glib::ExitCode {
     textdomain(GETTEXT_PACKAGE).expect("Unable to switch to the text domain");
 
     // Load resources
-    let resources = gio::Resource::load(PKGDATADIR.to_owned() + "/shutter-rust.gresource")
+    let resources = gio::Resource::load(PKGDATADIR.to_owned() + "/shutter.gresource")
         .expect("Could not load resources");
     gio::resources_register(&resources);
 
     // Create a new GtkApplication. The application manages our main loop,
     // application windows, integration with the window manager/compositor, and
     // desktop features such as file opening and single-instance applications.
-    let app = ShutterRustApplication::new("org.shutter-project.ShutterRust", &gio::ApplicationFlags::empty());
+    let app = ShutterApplication::new("org.shutter-project.Shutter", &gio::ApplicationFlags::empty());
 
     // Run the application. This function will block until the application
     // exits. Upon return, we have our exit code to return to the shell. (This

src/editorwindow.rs

@@ -11,8 +11,8 @@ blueprints = custom_target('blueprints',
   command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],
 )
 
-gnome.compile_resources('shutter-rust',
-  'shutter-rust.gresource.xml',
+gnome.compile_resources('shutter',
+  'shutter.gresource.xml',
   gresource_bundle: true,
   install: true,
   install_dir: pkgdatadir,
@@ -21,7 +21,7 @@ gnome.compile_resources('shutter-rust',
 
 conf = configuration_data()
 conf.set_quoted('VERSION', meson.project_version())
-conf.set_quoted('GETTEXT_PACKAGE', 'shutter-rust')
+conf.set_quoted('GETTEXT_PACKAGE', 'shutter')
 conf.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir'))
 conf.set_quoted('PKGDATADIR', pkgdatadir)
 

src/gtk/menus.blp

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/org/shutter-project/ShutterRust">
+  <gresource prefix="/org/shutter-project/Shutter">
     <file compressed="true" preprocess="xml-stripblanks">window.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">gtk/help-overlay.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">gtk/menus.ui</file>

src/main.rs

@@ -1,6 +1,6 @@
 using Gtk 4.0;
 
-template $ShutterRustWindow: ApplicationWindow {
+template $ShutterWindow: ApplicationWindow {
   default-width: 600;
   default-height: 300;
 

src/meson.build

@@ -26,8 +26,8 @@ mod imp {
     use super::*;
 
     #[derive(Debug, Default, gtk::CompositeTemplate)]
-    #[template(resource = "/org/shutter-project/ShutterRust/window.ui")]
-    pub struct ShutterRustWindow {
+    #[template(resource = "/org/shutter-project/Shutter/window.ui")]
+    pub struct ShutterWindow {
         // Template widgets
         //#[template_child]
         //pub header_bar: TemplateChild<gtk::HeaderBar>,
@@ -36,9 +36,9 @@ mod imp {
     }
 
     #[glib::object_subclass]
-    impl ObjectSubclass for ShutterRustWindow {
-        const NAME: &'static str = "ShutterRustWindow";
-        type Type = super::ShutterRustWindow;
+    impl ObjectSubclass for ShutterWindow {
+        const NAME: &'static str = "ShutterWindow";
+        type Type = super::ShutterWindow;
         type ParentType = gtk::ApplicationWindow;
 
         fn class_init(klass: &mut Self::Class) {
@@ -50,19 +50,19 @@ mod imp {
         }
     }
 
-    impl ObjectImpl for ShutterRustWindow {}
-    impl WidgetImpl for ShutterRustWindow {}
-    impl WindowImpl for ShutterRustWindow {}
-    impl ApplicationWindowImpl for ShutterRustWindow {}
+    impl ObjectImpl for ShutterWindow {}
+    impl WidgetImpl for ShutterWindow {}
+    impl WindowImpl for ShutterWindow {}
+    impl ApplicationWindowImpl for ShutterWindow {}
 }
 
 glib::wrapper! {
-    pub struct ShutterRustWindow(ObjectSubclass<imp::ShutterRustWindow>)
+    pub struct ShutterWindow(ObjectSubclass<imp::ShutterWindow>)
         @extends gtk::Widget, gtk::Window, gtk::ApplicationWindow,
         @implements gio::ActionGroup, gio::ActionMap;
 }
 
-impl ShutterRustWindow {
+impl ShutterWindow {
     pub fn new<P: glib::object::IsA<gtk::Application>>(application: &P) -> Self {
         glib::Object::builder()
             .property("application", application)