diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-03-22 06:40:44 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-03-22 06:40:44 +0100 |
| commit | 8e1c5a834469d804d28ee8ab2cbe2da8e600a789 (patch) | |
| tree | b9771456583eaead893cfd8f02e680b58a3da970 /src/AppWindow.vala | |
| parent | 80a5f2d8b095e895a5424f90b2ce4684d94c1a32 (diff) | |
| parent | 3253d99365813f2d2ffd05e10cbb8c11f53d746e (diff) | |
Merge tag 'upstream/0.26.0'
Upstream version 0.26.0
Diffstat (limited to 'src/AppWindow.vala')
| -rw-r--r-- | src/AppWindow.vala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/AppWindow.vala b/src/AppWindow.vala index 3b69156..a151c9a 100644 --- a/src/AppWindow.vala +++ b/src/AppWindow.vala @@ -477,8 +477,7 @@ public abstract class AppWindow : PageWindow { public static Gtk.Builder create_builder(string glade_filename = "shotwell.ui", void *user = null) { Gtk.Builder builder = new Gtk.Builder(); try { - builder.add_from_file(AppDirs.get_resources_dir().get_child("ui").get_child( - glade_filename).get_path()); + builder.add_from_resource(Resources.get_ui(glade_filename)); } catch(GLib.Error error) { warning("Unable to create Gtk.Builder: %s\n", error.message); } @@ -591,8 +590,9 @@ public abstract class AppWindow : PageWindow { public abstract string get_app_role(); protected void on_about() { + const string[] artists = { "Aachen logo under public domain license https://www.flickr.com/photos/30784528@N04/10860988196/", null }; Gtk.show_about_dialog(this, - "version", Resources.APP_VERSION, + "version", Resources.APP_VERSION + " \u2013 \"Aachen\"", "comments", get_app_role(), "copyright", Resources.COPYRIGHT, "website", Resources.HOME_URL, @@ -600,6 +600,7 @@ public abstract class AppWindow : PageWindow { "website-label", _("Visit the Shotwell web site"), "authors", Resources.AUTHORS, "logo", Resources.get_icon(Resources.ICON_ABOUT_LOGO, -1), + "artists", artists, "translator-credits", _("translator-credits"), null ); |