summaryrefslogtreecommitdiff
path: root/src/AppWindow.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:34:32 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:34:32 +0200
commit49120f48474fc8fdc2448c75d961bc238213cfac (patch)
tree05bcdb95d65a807cf0f1ffffd066c09074b5cf56 /src/AppWindow.vala
parent2492891f112caac6076ce49721d9d5d78a152c3a (diff)
New upstream version 0.28.2upstream/0.28.2
Diffstat (limited to 'src/AppWindow.vala')
-rw-r--r--src/AppWindow.vala16
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,