From 49120f48474fc8fdc2448c75d961bc238213cfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 14:34:32 +0200 Subject: New upstream version 0.28.2 --- src/Resources.vala | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'src/Resources.vala') diff --git a/src/Resources.vala b/src/Resources.vala index e26448a..ef86424 100644 --- a/src/Resources.vala +++ b/src/Resources.vala @@ -88,7 +88,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc., //public const string ICON_ABOUT_LOGO = "shotwell-street.jpg"; - public const string ICON_ABOUT_LOGO = "about-aachen.jpg"; + public const string ICON_ABOUT_LOGO = "about-braunschweig.jpg"; public const string ICON_GENERIC_PLUGIN = "generic-plugin.png"; public const string ICON_SLIDESHOW_EXTENSION_POINT = "slideshow-extension-point"; public const string ICON_RATING_REJECTED = "rejected.svg"; @@ -948,8 +948,13 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc., // Try looking for our 'index.page' in the build directory. // // TODO: Need to look for internationalized help before falling back on help/C + File dir = AppDirs.get_exec_dir(); - File help_dir = AppDirs.get_exec_dir().get_child("help").get_child("C"); + if (dir.get_path().has_suffix("src")) { + dir = dir.get_parent().get_parent(); + } + + File help_dir = dir.get_child("help").get_child("C"); File help_index = help_dir.get_child("index.page"); if (help_index.query_exists(null)) { @@ -1040,6 +1045,17 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc., providers.set(widget, styler); } + public static int use_header_bar() { + if (Environment.get_variable("SHOTWELL_USE_HEADERBARS") != null) { + return 0; + } + + bool use_header; + Gtk.Settings.get_default ().get ("gtk-dialogs-use-header", out use_header); + + return use_header ? 1 : 0; + } + public const string CUSTOM_CSS = """LibraryWindow .pane-separator { background-color: @borders; -- cgit v1.2.3