diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:35:32 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:35:32 +0200 |
| commit | e230b6f78546827521107be23797048482c8b193 (patch) | |
| tree | 948c1e77382c484819ea399bba4edcdc19cc6bf0 /src/AppWindow.vala | |
| parent | 211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff) | |
| parent | 49120f48474fc8fdc2448c75d961bc238213cfac (diff) | |
Update upstream source from tag 'upstream/0.28.2'
Update to upstream version '0.28.2'
with Debian dir 811236a8e9a1308bf427065dcb6270419ff4f965
Diffstat (limited to 'src/AppWindow.vala')
| -rw-r--r-- | src/AppWindow.vala | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/AppWindow.vala b/src/AppWindow.vala index bfdfcaf..aefe3c6 100644 --- a/src/AppWindow.vala +++ b/src/AppWindow.vala @@ -89,8 +89,15 @@ public class FullscreenWindow : PageWindow { // capture motion events to show the toolbar add_events(Gdk.EventMask.POINTER_MOTION_MASK); - // start off with toolbar invoked, as a clue for the user - invoke_toolbar(); + // If toolbar is enabled in "normal" ui OR was pinned in + // fullscreen, start off with toolbar invoked, as a clue for the + // user. Otherwise leave hidden unless activated by mouse over + if (Config.Facade.get_instance().get_display_toolbar() || + !is_toolbar_dismissal_enabled) { + invoke_toolbar(); + } else { + hide_toolbar(); + } // Toolbar steals keyboard focus from page, put it back again page.grab_focus (); @@ -590,10 +597,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 }; + const string[] artists = { "Braunschweiger Löwe created by Magnus Manske., CC BY-SA 3.0, https://commons.wikimedia.org/w/index.php?curid=109735", null }; Gtk.show_about_dialog(this, - // translators: %s will be replaced by application version - "version", _("%s \u2013 “Aachen”".printf(Resources.APP_VERSION)), + "version", Resources.APP_VERSION + " \u2013 \"Braunschweig\"", "comments", get_app_role(), "copyright", Resources.COPYRIGHT, "website", Resources.HOME_URL, |