Merge branch 'feature/upstream' into develop

1 files changed, 39 insertions, 6 deletions

diff --git a/src/Resources.vala b/src/Resources.vala
index b65ec52..d03a214 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -24,6 +24,7 @@ namespace Resources {
     private const string LIBEXECDIR = _LIBEXECDIR;
 
     public const string PREFIX = _PREFIX;
+    public const string PIXBUF_LOADER_PATH = _PIXBUF_LOADER_PATH;
 
     public const double TRANSIENT_WINDOW_OPACITY = 0.90;
     
@@ -69,12 +70,20 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string GO_NEXT = "go-next-symbolic";
     public const string GO_PREVIOUS = "go-previous-symbolic";
 
-    public const string ICON_ABOUT_LOGO = "about-celle.jpg";
+    public const string ICON_ABOUT_LOGO = "Delmenhorst_Rathaus.jpg";
     public const string ICON_GENERIC_PLUGIN = "application-x-addon-symbolic";
     public const string ICON_SLIDESHOW_EXTENSION_POINT = "slideshow-extension-point";
     public const int ICON_FILTER_REJECTED_OR_BETTER_FIXED_SIZE = 32;
     public const int ICON_FILTER_UNRATED_OR_BETTER_FIXED_SIZE = 16;
     public const int ICON_ZOOM_SCALE = 16;
+    public const string ICON_GPS_MARKER = "gps-marker";
+    public const string ICON_GPS_MARKER_HIGHLIGHTED = "gps-marker-highlighted";
+    public const string ICON_GPS_MARKER_SELECTED = "gps-marker-selected";
+    public const string ICON_GPS_GROUP_MARKER = "gps-markers-many";
+    public const string ICON_GPS_GROUP_MARKER_HIGHLIGHTED = "gps-markers-many-highlighted";
+    public const string ICON_GPS_GROUP_MARKER_SELECTED = "gps-markers-many-selected";
+    public const string ICON_MAP_EDIT_LOCKED = "map-edit-locked";
+    public const string ICON_MAP_EDIT_UNLOCKED = "map-edit-unlocked";
 
     public const string ICON_CAMERAS = "camera-photo-symbolic";
     public const string ICON_EVENTS = "multiple-events-symbolic";
@@ -403,6 +412,20 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
         return ngettext ("Remove Face “%s” From Photo",
                          "Remove Face “%s” From Photos", count).printf(name);
     }
+
+    public string set_face_from_photo_menu(string name) {
+        /* Translators: This means to teach the face to the face recognition system */
+        return _("_Train Face “%s” From Photo").printf(name);
+    }
+    
+    public string set_face_from_photo_label(string name) {
+        /* Translators: This means to teach the face to the face recognition system */
+        return _("_Train Face “%s” From Photo").printf(name);
+    }
+
+    public static string set_face_from_photo_error() {
+        return "Unable to set face as reference";
+    }
     
     public string rename_face_menu(string name) {
         return _("Re_name Face “%s”…").printf(name);
@@ -777,7 +800,8 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     private string END_MULTIMONTH_DATE_FORMAT_STRING = null;
 
     public void init () {
-        get_icon_theme_engine();
+        init_icon_theme_engine();
+        init_css_provider();
         // load application-wide stock icons as IconSets
         generate_rating_strings();
     }
@@ -969,12 +993,21 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
         
         return noninterpretable_badge_pixbuf;
     }
+
+    private void init_css_provider() {
+        Gtk.CssProvider provider = new Gtk.CssProvider();
+        provider.load_from_resource("/org/gnome/Shotwell/themes/org.gnome.Shotwell.css");
+        Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+    }
     
-    public Gtk.IconTheme get_icon_theme_engine() {
+    private void init_icon_theme_engine() {
         Gtk.IconTheme icon_theme = Gtk.IconTheme.get_default();
         icon_theme.add_resource_path("/org/gnome/Shotwell/icons");
-        
-        return icon_theme;
+        icon_theme.add_resource_path("/org/gnome/Shotwell/icons/hicolor");
+        icon_theme.add_resource_path("/org/gnome/Shotwell/Publishing/icons");
+        icon_theme.add_resource_path("/org/gnome/Shotwell/Publishing/icons/hicolor");
+        icon_theme.add_resource_path("/org/gnome/Shotwell/Transitions/icons");
+        icon_theme.add_resource_path("/org/gnome/Shotwell/Transitions/icons/hicolor");
     }
     
     // This method returns a reference to a cached pixbuf that may be shared throughout the system.
@@ -1038,7 +1071,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
 
         return (scale > 0) ? scale_pixbuf(pixbuf, scale, Gdk.InterpType.BILINEAR, false) : pixbuf;
     }
-    
+
     // Get the directory where our help files live.  Returns a string
     // describing the help path we want, or, if we're installed system
     // -wide already, returns null.