[sound-juicer] Use GtkImage’s rtl handling



commit f8c97450e1f76d5b642066d7f0e61fb6160a8478
Author: Phillip Wood <phillip wood dunelm org uk>
Date:   Fri Feb 5 16:00:12 2016 +0000

    Use GtkImage’s rtl handling
    
    Since version 3.14 Gtk automatically handles rtl icon variants so use
    that rather than doing it ourselves.

 src/egg-play-preview.c |   16 +++++-----------
 src/sj-main.c          |    6 +-----
 2 files changed, 6 insertions(+), 16 deletions(-)
---
diff --git a/src/egg-play-preview.c b/src/egg-play-preview.c
index e7d1a08..157cf95 100644
--- a/src/egg-play-preview.c
+++ b/src/egg-play-preview.c
@@ -68,8 +68,6 @@ struct _EggPlayPreviewPrivate {
        GstQuery   *query;
        GstState state;
 
-       gchar *play_icon_name;
-
        gchar *title;
        gchar *artist;
        gchar *album;
@@ -289,13 +287,9 @@ egg_play_preview_init (EggPlayPreview *play_preview)
        gtk_grid_attach (grid, priv->artist_album_label, 0, 1, 1, 1);
 
        /* play button */
-       priv->play_button = gtk_button_new ();
-       if (gtk_widget_get_direction (GTK_WIDGET (priv->play_button)) == GTK_TEXT_DIR_RTL)
-           priv->play_icon_name = "media-playback-start-rtl";
-       else
-           priv->play_icon_name = "media-playback-start";
-       priv->play_button_image = gtk_image_new_from_icon_name (priv->play_icon_name, GTK_ICON_SIZE_BUTTON);
-       gtk_container_add (GTK_CONTAINER (priv->play_button), priv->play_button_image);
+       priv->play_button = gtk_button_new_from_icon_name ("media-playback-start",
+                                                                                                          
GTK_ICON_SIZE_BUTTON);
+       priv->play_button_image = gtk_button_get_image (GTK_BUTTON (priv->play_button));
        g_object_set (priv->play_button,
                                  "valign", GTK_ALIGN_CENTER,
                                  NULL);
@@ -906,7 +900,7 @@ _pause (EggPlayPreview *play_preview)
        gst_element_set_state (priv->playbin, GST_STATE_PAUSED);
 
        gtk_image_set_from_icon_name (GTK_IMAGE (priv->play_button_image),
-                                     priv->play_icon_name,
+                                                                 "media-playback-start",
                                      GTK_ICON_SIZE_BUTTON);
 }
 
@@ -920,7 +914,7 @@ _stop (EggPlayPreview *play_preview)
        gst_element_set_state (priv->playbin, GST_STATE_READY);
 
        gtk_image_set_from_icon_name (GTK_IMAGE (priv->play_button_image),
-                                     priv->play_icon_name,
+                                                                 "media-playback-start",
                                      GTK_ICON_SIZE_BUTTON);
 }
 
diff --git a/src/sj-main.c b/src/sj-main.c
index 1f3faea..a4aa0ed 100644
--- a/src/sj-main.c
+++ b/src/sj-main.c
@@ -334,11 +334,7 @@ static void number_cell_icon_data_cb (GtkTreeViewColumn *tree_column,
     g_object_set (G_OBJECT (cell), "icon-name", NULL, NULL);
     break;
   case STATE_PLAYING:
-    {
-      gboolean rtl = gtk_widget_get_direction (track_listview) == GTK_TEXT_DIR_RTL;
-      gchar *name = rtl ? "media-playback-start-rtl" : "media-playback-start";
-      g_object_set (G_OBJECT (cell), "icon-name", name, NULL);
-    }
+    g_object_set (G_OBJECT (cell), "icon-name", "media-playback-start", NULL);
     break;
   case STATE_PAUSED:
     g_object_set (G_OBJECT (cell), "icon-name", "media-playback-pause", NULL);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]