aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConor Curran <conor.curran@canonical.com>2011-06-10 16:39:31 +0200
committerConor Curran <conor.curran@canonical.com>2011-06-10 16:39:31 +0200
commitedd58e6f87bd80a4e37eac90b42b03528aba44ee (patch)
tree1410f90bd553248fb43be2c1b7d6054cbef0807a
parente0761ddf73f224b880adea3f226463eb7a996ec6 (diff)
downloadayatana-indicator-sound-edd58e6f87bd80a4e37eac90b42b03528aba44ee.tar.gz
ayatana-indicator-sound-edd58e6f87bd80a4e37eac90b42b03528aba44ee.tar.bz2
ayatana-indicator-sound-edd58e6f87bd80a4e37eac90b42b03528aba44ee.zip
arrow should be showing
-rw-r--r--src/metadata-menu-item.vala9
-rw-r--r--src/metadata-widget.c66
2 files changed, 44 insertions, 31 deletions
diff --git a/src/metadata-menu-item.vala b/src/metadata-menu-item.vala
index 5d32314..5f3ef8b 100644
--- a/src/metadata-menu-item.vala
+++ b/src/metadata-menu-item.vala
@@ -38,12 +38,13 @@ public class MetadataMenuitem : PlayerItem
construct{
MetadataMenuitem.clean_album_art_temp_dir();
- this.previous_temp_album_art_path = null;
+ this.previous_temp_album_art_path = null;
this.album_art_cache_dir = MetadataMenuitem.create_album_art_temp_dir();
debug ("JUST ABOUT TO ATTEMPT PLAYER NAME SETTING %s", this.owner.app_info.get_name());
- this.property_set (MENUITEM_PLAYER_NAME, this.owner.app_info.get_name());
- this.property_set (MENUITEM_PLAYER_ICON, this.owner.icon_name);
- this.property_set_bool (MENUITEM_PLAYER_RUNNING, false);
+ this.property_set (MENUITEM_PLAYER_NAME, this.owner.app_info.get_name());
+ this.property_set (MENUITEM_PLAYER_ICON, this.owner.icon_name);
+ this.property_set_bool (MENUITEM_PLAYER_RUNNING, false);
+ this.property_set_bool (MENUITEM_HIDE_TRACK_DETAILS, true);
}
private static void clean_album_art_temp_dir()
diff --git a/src/metadata-widget.c b/src/metadata-widget.c
index 135aab0..71120b0 100644
--- a/src/metadata-widget.c
+++ b/src/metadata-widget.c
@@ -74,9 +74,9 @@ static void metadata_widget_selection_received_event_callback( GtkWidget
GtkSelectionData *data,
guint time,
gpointer user_data);
-static gboolean metadata_widget_triangle_draw_cb (GtkWidget *widget,
- GdkEventExpose *event,
- gpointer data);
+static void metadata_widget_triangle_draw_cb (GtkWidget* widget,
+ MetadataWidget *meta);
+
static void metadata_widget_set_icon (MetadataWidget *self);
G_DEFINE_TYPE (MetadataWidget, metadata_widget, GTK_TYPE_IMAGE_MENU_ITEM);
@@ -170,7 +170,7 @@ metadata_widget_init (MetadataWidget *self)
// player label
GtkWidget* player_label;
- player_label = gtk_label_new("TEST LABEL");
+ player_label = gtk_label_new("");
gtk_misc_set_alignment(GTK_MISC(player_label), (gfloat)0, (gfloat)0);
gtk_misc_set_padding (GTK_MISC(player_label), (gfloat)0, (gfloat)0);
gtk_widget_set_size_request (player_label, 140, 20);
@@ -186,8 +186,7 @@ metadata_widget_init (MetadataWidget *self)
gtk_widget_hide (priv->piece_label);
gtk_widget_hide (priv->container_label);
gtk_widget_hide (priv->album_art);
- gtk_widget_hide (priv->meta_data_v_box);
-
+ gtk_widget_hide (priv->meta_data_v_box);
}
static void
@@ -212,12 +211,22 @@ metadata_image_expose (GtkWidget *metadata, GdkEventExpose *event, gpointer user
{
g_return_val_if_fail(IS_METADATA_WIDGET(user_data), FALSE);
MetadataWidget* widget = METADATA_WIDGET(user_data);
- MetadataWidgetPrivate * priv = METADATA_WIDGET_GET_PRIVATE(widget);
- draw_album_border(metadata, FALSE);
+ MetadataWidgetPrivate * priv = METADATA_WIDGET_GET_PRIVATE(widget);
+
+ metadata_widget_triangle_draw_cb (metadata, widget);
+
+ if ( TRUE == dbusmenu_menuitem_property_get_bool (DBUSMENU_MENUITEM(priv->twin_item),
+ DBUSMENU_METADATA_MENUITEM_HIDE_TRACK_DETAILS))
+ {
+ return TRUE;
+ }
+
+ draw_album_border(metadata, FALSE);
+
if(priv->image_path->len > 0){
if(g_string_equal(priv->image_path, priv->old_image_path) == FALSE ||
priv->theme_change_occured == TRUE){
- priv->theme_change_occured = FALSE;
+ priv->theme_change_occured = FALSE;
GdkPixbuf* pixbuf;
pixbuf = gdk_pixbuf_new_from_file_at_size(priv->image_path->str, 60, 60, NULL);
//g_debug("metadata_load_new_image -> pixbuf from %s",
@@ -457,6 +466,13 @@ metadata_widget_property_update(DbusmenuMenuitem* item, gchar* property,
gtk_widget_queue_draw(GTK_WIDGET(mitem));
}
}
+ else if (g_ascii_strcasecmp (DBUSMENU_METADATA_MENUITEM_PLAYER_NAME, property) == 0){
+ gtk_label_set_label (GTK_LABEL (priv->player_label),
+ g_variant_get_string(value, NULL));
+ }
+ else if (g_ascii_strcasecmp (DBUSMENU_METADATA_MENUITEM_PLAYER_ICON, property) == 0){
+ metadata_widget_set_icon (mitem);
+ }
else if(g_ascii_strcasecmp(DBUSMENU_METADATA_MENUITEM_HIDE_TRACK_DETAILS, property) == 0){
g_debug ("MetadataWidget::Prop update for DBUSMENU_METADATA_MENUITEM_HIDE_TRACK_DETAILS. Value = %i",
@@ -471,7 +487,6 @@ metadata_widget_property_update(DbusmenuMenuitem* item, gchar* property,
gtk_widget_hide (priv->album_art);
gtk_widget_hide (priv->meta_data_v_box);
gtk_widget_set_size_request(GTK_WIDGET(mitem), 200, 20);
-
}
else{
gtk_widget_show (priv->meta_data_h_box);
@@ -565,14 +580,14 @@ metadata_widget_set_twin_item (MetadataWidget* self,
const gchar *arturl = dbusmenu_menuitem_property_get( priv->twin_item,
DBUSMENU_METADATA_MENUITEM_ARTURL );
- g_signal_connect_after (G_OBJECT (self),
+ /*g_signal_connect_after (G_OBJECT (self),
"expose_event",
G_CALLBACK (metadata_widget_triangle_draw_cb),
- priv->twin_item);
+ priv->twin_item);*/
- gtk_menu_item_set_label (GTK_MENU_ITEM(self),
- dbusmenu_menuitem_property_get(priv->twin_item,
- DBUSMENU_METADATA_MENUITEM_PLAYER_NAME));
+ gtk_label_set_label (GTK_LABEL(priv->player_label),
+ dbusmenu_menuitem_property_get(priv->twin_item,
+ DBUSMENU_METADATA_MENUITEM_PLAYER_NAME));
metadata_widget_set_icon(self);
@@ -587,22 +602,23 @@ metadata_widget_set_twin_item (MetadataWidget* self,
}
}
-
// Title related ...
-static gboolean
-metadata_widget_triangle_draw_cb (GtkWidget *widget, GdkEventExpose *event, gpointer data)
+static void
+metadata_widget_triangle_draw_cb (GtkWidget* widget, MetadataWidget *meta)
{
GtkStyle *style;
cairo_t *cr;
int x, y, arrow_width, arrow_height;
- if (!GTK_IS_WIDGET (widget)) return FALSE;
- if (!DBUSMENU_IS_MENUITEM (data)) return FALSE;
-
+ g_return_if_fail (GTK_IS_WIDGET(widget));
+
+ //MetadataWidget* widg = METADATA_WIDGET(widget);
+ MetadataWidgetPrivate* priv = METADATA_WIDGET_GET_PRIVATE (meta);
+
/* render the triangle indicator only if the application is running */
- if (! dbusmenu_menuitem_property_get_bool (DBUSMENU_MENUITEM(data),
+ if (! dbusmenu_menuitem_property_get_bool (priv->twin_item,
DBUSMENU_METADATA_MENUITEM_PLAYER_RUNNING)){
- return FALSE;
+ return;
}
/* get style */
@@ -629,14 +645,10 @@ metadata_widget_triangle_draw_cb (GtkWidget *widget, GdkEventExpose *event, gpoi
style->fg[gtk_widget_get_state(widget)].green/65535.0,
style->fg[gtk_widget_get_state(widget)].blue/65535.0);
cairo_fill (cr);
-
/* remember to destroy cairo context to avoid leaks */
cairo_destroy (cr);
-
- return FALSE;
}
-
/**
* transport_new:
* @returns: a new #MetadataWidget.