diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2018-07-09 12:10:38 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2018-07-09 12:10:38 +0200 |
| commit | 709e2d6f5652ec90c194a4ec2b530bebc6f952cb (patch) | |
| tree | 496b2f3899e1d5728ee9ae76095cc5056c317447 /src/AppWindow.vala | |
| parent | f1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (diff) | |
| parent | 5c8be07095cc04a6d8a95204b0504fd7ab030154 (diff) | |
Merge branch 'release/0.28.3-1'0.28.3-1
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, |