Merge lp:~elementary-apps/pantheon-photos/pin-toolbar-from-icon-name into lp:~pantheon-photos/pantheon-photos/trunk

[Danielle Foré]

* Pin Toolbar Gtk.ToggleToolButton from icon name, not stock
* Remove now unnecessary method to make pin-toolbar a stock icon
* Remove now unnecessary Gtk.IconFactory

[lp:~elementary-apps/pantheon-photos/pin-toolbar-from-icon-name]

2793. By Danielle Foré on 2015-08-09

remove commented code

2794. By Danielle Foré on 2015-08-09

remove now unused gtk.iconfactory

2795. By Danielle Foré on 2015-08-09

install pin-toolbar to hicolor

[Felipe Escoto (philip.scott)]

review: Approve

=== modified file 'Makefile'
--- Makefile	2014-11-22 19:02:09 +0000
+++ Makefile	2015-08-09 22:03:19 +0000
@@ -171,7 +171,6 @@
 
 ICON_FILES = \
 	drag_nub.png \
-	image-adjust.svg \
 	noninterpretable-video.png \
 	pin-toolbar.svg \
 	sprocket.png
@@ -504,6 +503,8 @@
 	$(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(LIBEXECDIR)
 	mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/icons
 	$(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/shotwell/icons
+	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/actions/
+	$(INSTALL_DATA) icons/pin-toolbar.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/actions/
 	mkdir -p $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
 	$(INSTALL_DATA) misc/org.yorba.shotwell.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
 	$(INSTALL_DATA) misc/org.yorba.shotwell-extras.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
 
=== modified file 'src/AppWindow.vala'
--- src/AppWindow.vala	2015-02-13 14:19:32 +0000
+++ src/AppWindow.vala	2015-08-09 22:03:19 +0000
@@ -10,7 +10,7 @@
     public const int TOOLBAR_CHECK_DISMISSAL_MSEC = 500;
 
     private Gtk.Window toolbar_window = new Gtk.Window (Gtk.WindowType.POPUP);
-    private Gtk.ToggleToolButton pin_button = new Gtk.ToggleToolButton.from_stock (Resources.PIN_TOOLBAR);
+    private Gtk.ToggleToolButton pin_button = new Gtk.ToggleToolButton ();
     private bool is_toolbar_shown = false;
     private bool waiting_for_invoke = false;
     private time_t left_toolbar_time = 0;
@@ -46,6 +46,7 @@
         set_border_width (0);
 
         pin_button.set_label (_ ("Pin Toolbar"));
+        pin_button.set_icon_widget (new Gtk.Image.from_icon_name ("pin-toolbar", Gtk.IconSize.LARGE_TOOLBAR));
         pin_button.set_tooltip_text (_ ("Pin the toolbar open"));
         pin_button.clicked.connect (update_toolbar_dismissal);
 
 
=== modified file 'src/Resources.vala'
--- src/Resources.vala	2015-08-08 22:40:36 +0000
+++ src/Resources.vala	2015-08-09 22:03:19 +0000
@@ -79,7 +79,6 @@
 public const string STRAIGHTEN = "object-straighten";
 public const string REDEYE = "image-red-eye";
 public const string ADJUST = "image-adjust";
-public const string PIN_TOOLBAR = "shotwell-pin-toolbar";
 public const string IMPORT = "shotwell-import";
 public const string IMPORT_ALL = "shotwell-import-all";
 public const string ENHANCE = "image-auto-adjust";
@@ -782,7 +781,6 @@
 public const string SELECT_ALL_MENU = _("Select _All");
 public const string SELECT_ALL_TOOLTIP = _("Select all items");
 
-private Gtk.IconFactory factory = null;
 private Gee.HashMap<string, Gdk.Pixbuf> icon_cache = null;
 Gee.HashMap<string, Gdk.Pixbuf> scaled_icon_cache = null;
 
@@ -794,13 +792,6 @@
 private string START_MULTIMONTH_DATE_FORMAT_STRING = null;
 
 public void init () {
-    // load application-wide stock icons as IconSets
-    factory = new Gtk.IconFactory ();
-
-    File icons_dir = AppDirs.get_resources_dir ().get_child ("icons");
-    add_stock_icon (icons_dir.get_child ("pin-toolbar.svg"), PIN_TOOLBAR);
-
-    factory.add_default ();
 
     generate_rating_strings ();
 
@@ -1012,18 +1003,6 @@
     return (scale > 0) ? scale_pixbuf (pixbuf, scale, Gdk.InterpType.BILINEAR, false) : pixbuf;
 }
 
-private void add_stock_icon (File file, string stock_id) {
-    Gdk.Pixbuf pixbuf = null;
-    try {
-        pixbuf = new Gdk.Pixbuf.from_file (file.get_path ());
-    } catch (Error err) {
-        critical ("Unable to load stock icon %s: %s", stock_id, err.message);
-    }
-
-    Gtk.IconSet icon_set = new Gtk.IconSet.from_pixbuf (pixbuf);
-    factory.add (stock_id, icon_set);
-}
-
 public delegate void AddStockIconModify (Gdk.Pixbuf pixbuf);
 
 // Get the directory where our help files live.  Returns a string