summaryrefslogtreecommitdiff
path: root/src/Resources.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:43:08 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2018-05-01 14:43:08 +0200
commit2b3f22361da0c1d8e6ce70d71352821758186db7 (patch)
tree5d10633b47369b3aa52a05bf889ede0dbe5ee108 /src/Resources.vala
parent211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff)
parentdc6c76eb04dfe3d4262a1806808f0bc0bf523238 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/Resources.vala')
-rw-r--r--src/Resources.vala20
1 files changed, 18 insertions, 2 deletions
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;