[simple-scan] Updates 'About' dialog to match with other GNOME apps



commit 0f2eca913736d9aec9492d1c0d6b00db8d3716a5
Author: Bruno Lopes <brunolopesdsilv outlook com>
Date:   Sat Jan 1 19:23:15 2022 -0300

    Updates 'About' dialog to match with other GNOME apps
    
    meson.buid: raises GTK dep. to 3.24 in order too...(see below)
    app-window.vala: introduces 'Gtk.License' and removes old tab

 meson.build         |  2 +-
 src/app-window.vala | 30 ++++++++++++------------------
 2 files changed, 13 insertions(+), 19 deletions(-)
---
diff --git a/meson.build b/meson.build
index ed0de6c5..c4a3bac2 100644
--- a/meson.build
+++ b/meson.build
@@ -26,7 +26,7 @@ icondir = join_paths (datadir, 'simple-scan', 'icons')
 
 # Dependencies
 glib_dep = dependency ('glib-2.0', version: '>= 2.38')
-gtk_dep = dependency ('gtk+-3.0', version: '>=3.22')
+gtk_dep = dependency ('gtk+-3.0', version: '>=3.24')
 gmodule_dep = dependency ('gmodule-export-2.0')
 gthread_dep = dependency ('gthread-2.0')
 libhandy_dep = dependency ('libhandy-1', version: '>= 1.1.90', required: false)
diff --git a/src/app-window.vala b/src/app-window.vala
index 41491da8..f7a45bd2 100644
--- a/src/app-window.vala
+++ b/src/app-window.vala
@@ -1570,29 +1570,23 @@ public class AppWindow : Hdy.ApplicationWindow
     {
         string[] authors = { "Robert Ancell <robert ancell canonical com>" };
 
-        /* The license this software is under (GPL3+) */
-        string license = _("This program is free software: you can redistribute it and/or modify\nit under 
the terms of the GNU General Public License as published by\nthe Free Software Foundation, either version 3 
of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it 
will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS 
FOR A PARTICULAR PURPOSE.  See the\nGNU General Public License for more details.\n\nYou should have received 
a copy of the GNU General Public License\nalong with this program.  If not, see 
<http://www.gnu.org/licenses/>.");
-
-        /* Title of about dialog */
         string title = _("About Document Scanner");
 
-        /* Description of program */
         string description = _("Simple document scanning tool");
 
         Gtk.show_about_dialog (this,
-                               "title", title,
-                               "program-name", _("Document Scanner"),
-                               "version", VERSION,
-                               "comments", description,
-                               "logo-icon-name", "org.gnome.SimpleScan",
-                               "authors", authors,
-                               "translator-credits", _("translator-credits"),
-                               "website", "https://gitlab.gnome.org/GNOME/simple-scan";,
-                               "copyright", "Copyright © 2009-2018 Canonical Ltd.",
-                               "license", license,
-                               "wrap-license", true,
-                               null);
-    }
+                                "title", title,
+                                "authors", authors,
+                                "translator-credits", _("translator-credits"),
+                                "comments", description,
+                                "copyright", "Copyright © 2009-2018 Canonical Ltd.",
+                                "license-type", Gtk.License.GPL_3_0,
+                                "program-name", _("Document Scanner"),
+                                "logo-icon-name", "org.gnome.SimpleScan",
+                                "version", VERSION,
+                                "website", "https://gitlab.gnome.org/GNOME/simple-scan";,
+                                "wrap-license", true);
+        }
 
     private void about_cb ()
     {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]