[Xfce4-commits] <parole:master> Make audiobox easier to understand.
Sean Davis
noreply at xfce.org
Thu Nov 29 11:20:07 CET 2012
Updating branch refs/heads/master
to 025b386dfea3400555d7aaa2881060e6aa63b006 (commit)
from 8c20b1c36f45b528653ed5b90a8ec2dc435d951b (commit)
commit 025b386dfea3400555d7aaa2881060e6aa63b006
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Wed Nov 28 18:48:00 2012 -0500
Make audiobox easier to understand.
data/interfaces/parole.ui | 18 ++++++++++--------
src/parole-player.c | 16 +++++++++++++---
2 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 5664825..301addb 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -463,9 +463,9 @@
<property name="use_underline">True</property>
<property name="image">image11</property>
<property name="use_stock">False</property>
- <accelerator key="KP_Add" signal="activate"/>
- <accelerator key="equal" signal="activate"/>
<accelerator key="plus" signal="activate"/>
+ <accelerator key="equal" signal="activate"/>
+ <accelerator key="KP_Add" signal="activate"/>
<signal name="activate" handler="parole_player_volume_up" swapped="no"/>
</object>
</child>
@@ -478,8 +478,8 @@
<property name="use_underline">True</property>
<property name="image">image10</property>
<property name="use_stock">False</property>
- <accelerator key="minus" signal="activate"/>
<accelerator key="KP_Subtract" signal="activate"/>
+ <accelerator key="minus" signal="activate"/>
<signal name="activate" handler="parole_player_volume_down" swapped="no"/>
</object>
</child>
@@ -751,11 +751,12 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
+ <property name="yalign">1</property>
<property name="label" translatable="yes"><b><big>Song Title</big></b></property>
<property name="use_markup">True</property>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
@@ -765,7 +766,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><big>Song Album</big></property>
+ <property name="label" translatable="yes"><big>on Song Album (2012)</big></property>
<property name="use_markup">True</property>
</object>
<packing>
@@ -779,18 +780,19 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><big>Song Artist</big></property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes"><big>by Song Artist</big></property>
<property name="use_markup">True</property>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
diff --git a/src/parole-player.c b/src/parole-player.c
index ba15f4f..a17707f 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1567,6 +1567,7 @@ parole_player_media_tag_cb (ParoleGst *gst, const ParoleStream *stream, ParolePl
gchar *title;
gchar *album;
gchar *artist;
+ gchar *year;
GdkPixbuf *image = NULL;
if ( player->priv->row )
@@ -1575,6 +1576,7 @@ parole_player_media_tag_cb (ParoleGst *gst, const ParoleStream *stream, ParolePl
"title", &title,
"album", &album,
"artist", &artist,
+ "year", &year,
NULL);
if ( title )
@@ -1590,22 +1592,30 @@ parole_player_media_tag_cb (ParoleGst *gst, const ParoleStream *stream, ParolePl
if ( album )
{
- gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_album), g_strdup_printf("<span color=\"white\"><big>%s</big></span>", album));
+ if (year)
+ gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_album), g_strdup_printf("<span color=\"white\"><big>%s %s (%s)</big></span>", _("on"), album, year));
+
+ else
+ gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_album), g_strdup_printf("<span color=\"white\"><big>%s %s</big></span>", _("on"), album));
+
g_free (album);
}
else
{
gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_album), g_strdup_printf("<span color=\"white\"><big>%s</big></span>", _("Unknown")));
}
+
+ if (year)
+ g_free (year);
if ( artist )
{
- gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_artist), g_strdup_printf("<span color=\"white\"><big>%s</big></span>", artist));
+ gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_artist), g_strdup_printf("<span color=\"white\"><big>%s %s</big></span>", _("by"), artist));
g_free (artist);
}
else
{
- gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_artist), g_strdup_printf("<span color=\"white\"><big>%s</big></span>", _("Unknown")));
+ gtk_label_set_markup(GTK_LABEL(player->priv->audiobox_artist), g_strdup_printf("<span color=\"white\"><big>%s %s</big></span>", _("by"), _("Unknown")));
}
image = parole_stream_get_image(G_OBJECT(stream));
More information about the Xfce4-commits
mailing list