Merge lp:~wingpanel-devs/wingpanel/icon-buttons into lp:~wingpanel-devs/wingpanel/trunk

[Djax]

Add methods to to set the image on the button with icon and not only pixbufs.
Also switch the constructor to it since it is recommended to get proper hidpi support.

Add methods to to set the image on the button with icon and not only pixbufs.
Also switch the constructor to it since it is recommended to get proper hidpi support.

[Marcus Wichelmann (l-admin-3)]

I've added two comments.

Needs testing if it works and breaks other indicators.

review: Needs Fixing (code)

[lp:~wingpanel-devs/wingpanel/icon-buttons]

100. By Djax on 2016-01-16

minor variable name change

[Djax (parnold-x)]

changed the minor things.
Afaik only the keyboard indicator used the pixbuf thing.
Did a branch for it. https://code.launchpad.net/~wingpanel-devs/wingpanel-indicator-keyboard/adapt_to_lib_change

[Marcus Wichelmann (l-admin-3)]

Nice work! :-)

review: Approve (code)

[Marcus Wichelmann (l-admin-3)]

works.

review: Approve

=== modified file 'lib/Widgets/Button.vala'
--- lib/Widgets/Button.vala	2015-10-20 14:07:07 +0000
+++ lib/Widgets/Button.vala	2016-01-16 10:47:51 +0000
@@ -22,28 +22,24 @@
 
     private Gtk.Image button_image;
 
-    public Button (string caption, Gdk.Pixbuf? pixbuf = null) {
+    public Button (string caption, string? icon_name = null) {
         var content_widget = this.get_content_widget ();
 
-        button_image = create_image_for_pixbuf (pixbuf);
+        button_image = create_image_for_icon_name (icon_name);
         button_label = create_label_for_caption (caption);
 
         content_widget.attach (button_image, 0, 0, 1, 1);
         content_widget.attach (button_label, 1, 0, 1, 1);
-
-        connect_signals ();
     }
 
-    public Button.with_mnemonic (string caption, Gdk.Pixbuf? pixbuf = null) {
+    public Button.with_mnemonic (string caption, string? icon_name = null) {
         var content_widget = this.get_content_widget ();
 
-        button_image = create_image_for_pixbuf (pixbuf);
+        button_image = create_image_for_icon_name (icon_name);
         button_label = create_label_for_caption (caption, true);
 
         content_widget.attach (button_image, 0, 0, 1, 1);
         content_widget.attach (button_label, 1, 0, 1, 1);
-
-        connect_signals ();
     }
 
     public void set_caption (string caption) {
@@ -54,8 +50,18 @@
         return button_label.get_label ();
     }
 
+    public void set_icon (string? icon_name) {
+        if (icon_name == null) {
+            button_image.visible = false;
+        } else {
+            button_image.set_from_icon_name (icon_name, Gtk.IconSize.BUTTON);
+            button_image.visible = true;
+        }
+    }
+
     public void set_pixbuf (Gdk.Pixbuf? pixbuf) {
         button_image.set_from_pixbuf (pixbuf);
+        button_image.visible = pixbuf != null;
     }
 
     public Gdk.Pixbuf? get_pixbuf () {
@@ -84,19 +90,17 @@
         return label_widget;
     }
 
-    private Gtk.Image create_image_for_pixbuf (Gdk.Pixbuf? pixbuf) {
+    private Gtk.Image create_image_for_icon_name (string? icon_name) {
         var image = new Gtk.Image ();
-        image.pixbuf = pixbuf;
         image.margin_start = 6;
         image.no_show_all = true;
-        image.visible = pixbuf != null;
+        if (icon_name != null) {
+            image.set_from_icon_name (icon_name, Gtk.IconSize.BUTTON);
+            image.visible = true;
+        } else {
+            image.visible = false;
+        }
 
         return image;
     }
-
-    private void connect_signals () {
-        button_image.notify["pixbuf"].connect (() => {
-            button_image.visible = button_image.get_pixbuf () != null;
-        });
-    }
 }
\ No newline at end of file