Skip to content

Commit da8da5c

Browse files
committed
put about dialog to a more acceptable state
1 parent da17ac1 commit da8da5c

8 files changed

+48
-13
lines changed

data/credits/art

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Pascal Grochol <[email protected]>
2+
Richard Querin <[email protected]>
3+
Duncan Lock
4+
Nicu Buculei <[email protected]>
5+
Gregor Fröhlich <[email protected]>
6+
Lucas Romero Di Benedetto <[email protected]>
7+
8+
The Tango Desktop Project: http://tango.freedesktop.org
9+
The Inkscape Project: http://www.inkscape.org

data/credits/copyright

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Shutter - Featureful Screenshot Tool
2+
3+
Copyright © 2008-2013 Mario Kemper
4+
Copyright © 2020-2021 Google LLC

data/credits/dev

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Project Founder and Developer:
2+
Mario Kemper <[email protected]>
3+
4+
Patches and Bugfixing:
5+
Vadim Rutkovsky <[email protected]>
6+
Franco Zeoli
7+
José Borges Ferreira
8+
Alexey Sokolov <[email protected]>
9+
10+
Plugins:
11+
Edwood Ocasio <[email protected]>
12+
Mario Kemper <[email protected]>
13+
Martin Rabeneck (cornix) <[email protected]>
14+
Stephan Tetzel <[email protected]>
15+
TualatriX <[email protected]>
16+
Marco van Hilst <[email protected]>
17+

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<id>org.shutter-project.Shutter</id>
44
<name>Shutter</name>
55
<summary>The feature-rich screenshot tool</summary>
6-
<launchable type="desktop-id">shutter.desktop</launchable>
6+
<launchable type="desktop-id">org.shutter-project.Shutter.desktop</launchable>
77
<metadata_license>CC0-1.0</metadata_license>
88
<project_license>GPL-3.0+</project_license>
99
<description>

po/POTFILES

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
data/org.shutter-project.ShutterRust.desktop.in
2-
data/org.shutter-project.ShutterRust.metainfo.xml.in
3-
data/org.shutter-project.ShutterRust.gschema.xml
1+
data/org.shutter-project.Shutter.desktop.in
2+
data/org.shutter-project.Shutter.metainfo.xml.in
3+
data/org.shutter-project.Shutter.gschema.xml
44
src/window.blp
55
src/gtk/menus.blp
66
src/gtk/help-overlay.blp

src/application.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,16 +99,17 @@ impl ShutterApplication {
9999
fn show_about(&self) {
100100
let window = self.active_window().unwrap();
101101
let about = adw::AboutDialog::builder()
102-
//.modal(true)
103102
.application_icon("shutter")
104103
// TODO remove extra icons
105104
.application_icon("org.shutter-project.Shutter")
106105
.application_icon("shutter")
107106
.version(VERSION)
108-
.developers(vec!["Unknown"])
109-
.copyright("© 2025 Unknown")
110107
.website("https://shutter-project.org")
111108
.issue_url("https://github.com/shutter-project/shutter/issues")
109+
.license_type(gtk::License::Gpl30)
110+
.artists(String::from_utf8(gio::resources_lookup_data("/org/shutter-project/Shutter/credits/art", gio::ResourceLookupFlags::empty()).expect("no artist data").to_vec()).expect("can't convert artists to utf8").lines().collect::<Vec<_>>())
111+
.developers(String::from_utf8(gio::resources_lookup_data("/org/shutter-project/Shutter/credits/dev", gio::ResourceLookupFlags::empty()).expect("no dev data").to_vec()).expect("can't convert devs to utf8").lines().collect::<Vec<_>>())
112+
.copyright(String::from_utf8(gio::resources_lookup_data("/org/shutter-project/Shutter/credits/copyright", gio::ResourceLookupFlags::empty()).expect("no copyright data").to_vec()).expect("can't convert copyright to utf8"))
112113
.build();
113114

114115
about.present(Some(&window));

src/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ gnome.compile_resources('shutter',
1616
gresource_bundle: true,
1717
install: true,
1818
install_dir: pkgdatadir,
19-
dependencies: blueprints,
19+
dependencies: [blueprints],
2020
)
2121

2222
conf = configuration_data()

src/shutter.gresource.xml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<gresources>
3-
<gresource prefix="/org/shutter-project/Shutter">
4-
<file compressed="true" preprocess="xml-stripblanks">window.ui</file>
5-
<file compressed="true" preprocess="xml-stripblanks">gtk/help-overlay.ui</file>
6-
<file compressed="true" preprocess="xml-stripblanks">gtk/menus.ui</file>
7-
</gresource>
3+
<gresource prefix="/org/shutter-project/Shutter">
4+
<file compressed="true" preprocess="xml-stripblanks">window.ui</file>
5+
<file compressed="true" preprocess="xml-stripblanks">gtk/help-overlay.ui</file>
6+
<file compressed="true" preprocess="xml-stripblanks">gtk/menus.ui</file>
7+
<!-- for about dialog -->
8+
<file compressed="true" alias="credits/art">../data/credits/art</file>
9+
<file compressed="true" alias="credits/dev">../data/credits/dev</file>
10+
<file compressed="true" alias="credits/copyright">../data/credits/copyright</file>
11+
</gresource>
812
</gresources>

0 commit comments

Comments
 (0)