[Xfce4-commits] [xfce/xfce4-appfinder] 02/13: Fix label and icon

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

a   n   d   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/xfce4-appfinder.

commit 8f8887858ceb68098b8ca5386f105452a2406ed7
Author: Eduard Roccatello <eduard at xfce.org>
Date:   Mon Sep 28 20:59:07 2015 +0200

    Fix label and icon
---
 src/appfinder-window.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/appfinder-window.c b/src/appfinder-window.c
index 4a55f10..630e5cb 100644
--- a/src/appfinder-window.c
+++ b/src/appfinder-window.c
@@ -222,7 +222,8 @@ xfce_appfinder_window_init (XfceAppfinderWindow *window)
   gtk_window_set_default_size (GTK_WINDOW (window), integer, -1);
   gtk_window_set_icon_name (GTK_WINDOW (window), XFCE_APPFINDER_STOCK_EXECUTE);
 
-  if (xfconf_channel_get_bool (window->channel, "/always-center", FALSE)) {
+  if (xfconf_channel_get_bool (window->channel, "/always-center", FALSE))
+  {
     gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
   }
 
@@ -340,10 +341,14 @@ xfce_appfinder_window_init (XfceAppfinderWindow *window)
   window->bbox = hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_widget_show (hbox);
 
-  window->button_preferences = button = gtk_button_new_with_label (XFCE_APPFINDER_STOCK_PREFERENCES);
+  window->button_preferences = button = gtk_button_new_with_mnemonic (_("_Preferences"));
   gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
   g_signal_connect (G_OBJECT (button), "clicked",
       G_CALLBACK (xfce_appfinder_window_preferences), window);
+  gtk_button_set_always_show_image(GTK_BUTTON(button), TRUE);
+
+  image = gtk_image_new_from_icon_name (XFCE_APPFINDER_STOCK_PREFERENCES, GTK_ICON_SIZE_BUTTON);
+  gtk_button_set_image (GTK_BUTTON (button), image);
 
   bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_box_set_spacing (GTK_BOX (bbox), 6);
@@ -352,12 +357,16 @@ xfce_appfinder_window_init (XfceAppfinderWindow *window)
   gtk_box_pack_start (GTK_BOX (hbox), bbox, TRUE, TRUE, 0);
   gtk_widget_show (bbox);
 
-  button = gtk_button_new_with_label (XFCE_APPFINDER_STOCK_CLOSE);
+  button = gtk_button_new_with_mnemonic (_("Close"));
   gtk_container_add (GTK_CONTAINER (bbox), button);
   g_signal_connect_swapped (G_OBJECT (button), "clicked",
       G_CALLBACK (gtk_widget_destroy), window);
+  gtk_button_set_always_show_image(GTK_BUTTON(button), TRUE);
   gtk_widget_show (button);
 
+  image = gtk_image_new_from_icon_name (XFCE_APPFINDER_STOCK_CLOSE, GTK_ICON_SIZE_BUTTON);
+  gtk_button_set_image (GTK_BUTTON (button), image);
+
   window->button_launch = button = gtk_button_new_with_mnemonic (_("La_unch"));
   gtk_container_add (GTK_CONTAINER (bbox), button);
   g_signal_connect_swapped (G_OBJECT (button), "clicked",

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.