Merge lp:~tristang4/pantheon-photos/update-icons into lp:~pantheon-photos/pantheon-photos/trunk

[Tristan Petersen]

Changed custom zoom icons to theme icons

Changed custom icons to theme icons

[Danielle Foré (danrabbit)]

Hey Tristan, as of Gtk 3.10 Gtk.Stock is deprecated. Please switch those to image.from_icon_name

review: Needs Fixing

[Tristan Petersen (tristang4)]

Hello, I've changed the code to remove Gtk.stock and added Gtk.Image.from_icon_name. Is it ready now?

[Danielle Foré (danrabbit)]

Tristan, can we use Gtk.IconSize.MENU instead? After that, looks good to me :)

review: Needs Fixing

[Danielle Foré (danrabbit)]

Actually, I'm getting output about "Unable to load icon extension" as well. If it's not a trivial fix, let's save that for another merge so we can get these zoom icons handled.

[Tristan Petersen (tristang4)]

> Tristan, can we use Gtk.IconSize.MENU instead? After that, looks good to me :)

Sure, we can try that, but I believe I tried a few different sizes and it felt like the size was being limited somehow (maybe by the retaining box?). I'll take a 2nd look.

[Tristan Petersen (tristang4)]

> Actually, I'm getting output about "Unable to load icon extension" as well. If
> it's not a trivial fix, let's save that for another merge so we can get these
> zoom icons handled.

I'm not sure what that is or where it's being displayed, but I did test by compiling from scratch and it seemed to work for me - I saw a + and a - icon for them. Are you getting some debug output somewhere?

[Danielle Foré (danrabbit)]

Yep, the icon change works fine for the zoom icons. But the extension icon change is giving output in the terminal. It's because of this:

- public const string ICON_GENERIC_PLUGIN = "generic-plugin.png";
+ public const string ICON_GENERIC_PLUGIN = "extension";

[lp:~tristang4/pantheon-photos/update-icons]

2508. By Tristan Petersen on 2014-02-24

Changed icon size to Gtk.IconSize.MENU, reverted change on extensions

[Tristan Petersen (tristang4)]

Aha, gotcha.

I changed the icon size to Gtk.IconSize.MENU for the zoom icons and removed any changes to the extension icon code. It looks like that code is a little more involved, so best saved for a separate branch.

[Danielle Foré (danrabbit)]

review: Approve

[Danielle Foré (danrabbit)]

review: Approve

=== removed file 'icons/zoom-in.png'
Binary files icons/zoom-in.png	2010-08-12 21:43:53 +0000 and icons/zoom-in.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'icons/zoom-out.png'
Binary files icons/zoom-out.png	2010-08-12 21:43:53 +0000 and icons/zoom-out.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'src/MediaPage.vala'
--- src/MediaPage.vala	2013-02-21 22:31:41 +0000
+++ src/MediaPage.vala	2014-02-24 02:51:53 +0000
@@ -120,8 +120,7 @@
         public ZoomSliderAssembly() {
             Gtk.Box zoom_group = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
 
-            Gtk.Image zoom_out = new Gtk.Image.from_pixbuf(Resources.load_icon(
-                Resources.ICON_ZOOM_OUT, Resources.ICON_ZOOM_SCALE));
+            Gtk.Image zoom_out = new Gtk.Image.from_icon_name(Resources.ICON_ZOOM_OUT, Gtk.IconSize.MENU);
             Gtk.EventBox zoom_out_box = new Gtk.EventBox();
             zoom_out_box.set_above_child(true);
             zoom_out_box.set_visible_window(false);
@@ -144,8 +143,7 @@
 
             zoom_group.pack_start(slider, false, false, 0);
 
-            Gtk.Image zoom_in = new Gtk.Image.from_pixbuf(Resources.load_icon(
-                Resources.ICON_ZOOM_IN, Resources.ICON_ZOOM_SCALE));
+            Gtk.Image zoom_in = new Gtk.Image.from_icon_name(Resources.ICON_ZOOM_IN, Gtk.IconSize.MENU);
             Gtk.EventBox zoom_in_box = new Gtk.EventBox();
             zoom_in_box.set_above_child(true);
             zoom_in_box.set_visible_window(false);

=== modified file 'src/PhotoPage.vala'
--- src/PhotoPage.vala	2014-01-25 04:39:25 +0000
+++ src/PhotoPage.vala	2014-02-24 02:51:53 +0000
@@ -490,8 +490,7 @@
         
         Gtk.Box zoom_group = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
         
-        Gtk.Image zoom_out = new Gtk.Image.from_pixbuf(Resources.load_icon(Resources.ICON_ZOOM_OUT,
-            Resources.ICON_ZOOM_SCALE));
+        Gtk.Image zoom_out = new Gtk.Image.from_icon_name(Resources.ICON_ZOOM_OUT, Gtk.IconSize.MENU);
         Gtk.EventBox zoom_out_box = new Gtk.EventBox();
         zoom_out_box.set_above_child(true);
         zoom_out_box.set_visible_window(false);
@@ -512,8 +511,7 @@
 
         zoom_group.pack_start(zoom_slider, false, false, 0);
         
-        Gtk.Image zoom_in = new Gtk.Image.from_pixbuf(Resources.load_icon(Resources.ICON_ZOOM_IN,
-            Resources.ICON_ZOOM_SCALE));
+        Gtk.Image zoom_in = new Gtk.Image.from_icon_name(Resources.ICON_ZOOM_IN, Gtk.IconSize.MENU);
         Gtk.EventBox zoom_in_box = new Gtk.EventBox();
         zoom_in_box.set_above_child(true);
         zoom_in_box.set_visible_window(false);

=== modified file 'src/Resources.vala'
--- src/Resources.vala	2014-01-24 21:24:16 +0000
+++ src/Resources.vala	2014-02-24 02:51:53 +0000
@@ -109,8 +109,8 @@
     public const string ICON_FILTER_THREE_OR_BETTER = "three-star-filter-plus.svg";
     public const string ICON_FILTER_FOUR_OR_BETTER = "four-star-filter-plus.svg";
     public const string ICON_FILTER_FIVE = "five-star-filter.svg";
-    public const string ICON_ZOOM_IN = "zoom-in.png";
-    public const string ICON_ZOOM_OUT = "zoom-out.png";
+    public const string ICON_ZOOM_IN = "zoom-in-symbolic";
+    public const string ICON_ZOOM_OUT = "zoom-out-symbolic";
     public const int ICON_ZOOM_SCALE = 16;
 
     public const string ICON_CAMERAS = "camera-photo";
@@ -1141,4 +1141,4 @@
     
     public const string ONIMAGE_FONT_COLOR = "#000000";
     public const string ONIMAGE_FONT_BACKGROUND = "rgba(255,255,255,0.5)";
-}
\ No newline at end of file
+}