From 5a419e83132124e99b2112a6533ab018297bc19c Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Wed, 13 Oct 2010 16:05:51 +0100 Subject: basic border around album art instead of rounded corners - boo --- src/metadata-widget.c | 126 +++++++++++++------------------------------------- src/title-widget.c | 18 ++++---- 2 files changed, 39 insertions(+), 105 deletions(-) (limited to 'src') diff --git a/src/metadata-widget.c b/src/metadata-widget.c index cbbaeff..fd36c01 100644 --- a/src/metadata-widget.c +++ b/src/metadata-widget.c @@ -62,12 +62,10 @@ static void metadata_widget_property_update (DbusmenuMenuitem* item, gchar* property, GValue* value, gpointer userdata); -static void metadata_widget_style_labels(MetadataWidget* self, - GtkLabel* label); -static void image_set_from_pixbuf (GtkWidget *widget, - MetadataWidget* metadata, - GdkPixbuf *source); -static void draw_album_art_placeholder(GtkWidget *metadata); +static void metadata_widget_style_labels ( MetadataWidget* self, + GtkLabel* label); +static void draw_album_art_placeholder ( GtkWidget *metadata); +static void draw_album_border ( GtkWidget *metadata); G_DEFINE_TYPE (MetadataWidget, metadata_widget, GTK_TYPE_MENU_ITEM); @@ -183,7 +181,8 @@ 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); + MetadataWidgetPrivate * priv = METADATA_WIDGET_GET_PRIVATE(widget); + draw_album_border(metadata); if(priv->image_path->len > 0){ if(g_string_equal(priv->image_path, priv->old_image_path) == FALSE || priv->theme_change_occured == TRUE){ @@ -196,9 +195,9 @@ metadata_image_expose (GtkWidget *metadata, GdkEventExpose *event, gpointer user //g_debug("problem loading the downloaded image just use the placeholder instead"); draw_album_art_placeholder(metadata); return TRUE; - } + } pixbuf = gdk_pixbuf_scale_simple(pixbuf,60, 60, GDK_INTERP_BILINEAR); - image_set_from_pixbuf (metadata, widget, pixbuf); + gtk_image_set_from_pixbuf(GTK_IMAGE(priv->album_art), pixbuf); g_string_erase(priv->old_image_path, 0, -1); g_string_overwrite(priv->old_image_path, 0, priv->image_path->str); @@ -211,8 +210,8 @@ metadata_image_expose (GtkWidget *metadata, GdkEventExpose *event, gpointer user } static void -draw_album_art_placeholder(GtkWidget *metadata) -{ +draw_album_border(GtkWidget *metadata) +{ cairo_t *cr; cr = gdk_cairo_create (metadata->window); GtkStyle *style; @@ -220,7 +219,13 @@ draw_album_art_placeholder(GtkWidget *metadata) GtkAllocation alloc; gtk_widget_get_allocation (metadata, &alloc); - + gint offset = 2; + + alloc.width = alloc.width + (offset * 2); + alloc.height = alloc.height + (offset * 2); + alloc.x = alloc.x - offset; + alloc.y = alloc.y - offset; + cairo_rectangle (cr, alloc.x, alloc.y, alloc.width, alloc.height); @@ -234,6 +239,7 @@ draw_album_art_placeholder(GtkWidget *metadata) cairo_line_to(cr, alloc.x, alloc.y + alloc.height); cairo_line_to(cr, alloc.x, alloc.y); + cairo_close_path (cr); cairo_set_source_rgba (cr, @@ -243,8 +249,20 @@ draw_album_art_placeholder(GtkWidget *metadata) 0.6); cairo_set_line_width (cr, 2.0); - cairo_stroke (cr); + cairo_stroke (cr); +} +static void +draw_album_art_placeholder(GtkWidget *metadata) +{ + cairo_t *cr; + cr = gdk_cairo_create (metadata->window); + GtkStyle *style; + style = gtk_widget_get_style (metadata); + + GtkAllocation alloc; + gtk_widget_get_allocation (metadata, &alloc); + // Draw the eight note PangoLayout *layout; PangoFontDescription *desc; @@ -405,87 +423,6 @@ rounded_rectangle (cairo_t *cr, cairo_close_path (cr); } -static void -image_set_from_pixbuf (GtkWidget *widget, - MetadataWidget* metadata, - GdkPixbuf *source) -{ - cairo_t *cr; - cairo_t *cr_mask; - cairo_surface_t *surface; - GdkPixmap *pixmap; - GdkPixmap *bitmask; - int w; - int h; - int frame_width; - double radius; - GdkColor color; - double r; - double g; - double b; - - MetadataWidgetPrivate* priv = METADATA_WIDGET_GET_PRIVATE(metadata); - GtkImage* image = GTK_IMAGE(priv->album_art); - frame_width = 3; - - w = gdk_pixbuf_get_width (source) + frame_width * 2; - h = gdk_pixbuf_get_height (source) + frame_width * 2; - - radius = 10; - - pixmap = gdk_pixmap_new (gtk_widget_get_window (widget), w, h, -1); - bitmask = gdk_pixmap_new (gtk_widget_get_window (widget), w, h, 1); - - if (gtk_widget_get_window (widget) == NULL) - return; - - cr = gdk_cairo_create (pixmap); - cr_mask = gdk_cairo_create (bitmask); - - /* setup mask */ - cairo_rectangle (cr_mask, 0, 0, w, h); - cairo_set_operator (cr_mask, CAIRO_OPERATOR_CLEAR); - cairo_fill (cr_mask); - - rounded_rectangle (cr_mask, 1.0, 0.5, 0.5, radius, w - 1, h - 1); - cairo_set_operator (cr_mask, CAIRO_OPERATOR_OVER); - cairo_set_source_rgb (cr_mask, 1, 1, 1); - cairo_fill (cr_mask); - - color = gtk_widget_get_style (GTK_WIDGET (image))->bg [GTK_STATE_NORMAL]; - r = (float)color.red / 65535.0; - g = (float)color.green / 65535.0; - b = (float)color.blue / 65535.0; - - /* set up image */ - cairo_rectangle (cr, 0, 0, w, h); - cairo_set_source_rgb (cr, r, g, b); - cairo_fill (cr); - - rounded_rectangle (cr, - 1.0, - frame_width + 0.5, - frame_width + 0.5, - radius, - w - frame_width * 2 - 1, - h - frame_width * 2 - 1); - cairo_set_source_rgba (cr, 0.5, 0.5, 0.5, 0.3); - cairo_fill_preserve (cr); - - surface = surface_from_pixbuf (source); - cairo_set_source_surface (cr, surface, frame_width, frame_width); - cairo_fill (cr); - - gtk_image_set_from_pixmap (image, pixmap, bitmask); - - cairo_surface_destroy (surface); - - g_object_unref (bitmask); - g_object_unref (pixmap); - - cairo_destroy (cr_mask); - cairo_destroy (cr); -} static void metadata_widget_style_labels(MetadataWidget* self, GtkLabel* label) @@ -517,7 +454,6 @@ metadata_widget_set_twin_item(MetadataWidget* self, G_CALLBACK(metadata_widget_property_update), self); } - /** * transport_new: * @returns: a new #MetadataWidget. diff --git a/src/title-widget.c b/src/title-widget.c index 3003e10..5e86b4d 100644 --- a/src/title-widget.c +++ b/src/title-widget.c @@ -58,20 +58,18 @@ static gboolean title_widget_triangle_draw_cb (GtkWidget *widget, G_DEFINE_TYPE (TitleWidget, title_widget, GTK_TYPE_IMAGE_MENU_ITEM); - - static void title_widget_class_init (TitleWidgetClass *klass) { - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + GObjectClass *gobject_class = G_OBJECT_CLASS (klass); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - widget_class->button_press_event = title_widget_button_press_event; + widget_class->button_press_event = title_widget_button_press_event; - g_type_class_add_private (klass, sizeof (TitleWidgetPrivate)); + g_type_class_add_private (klass, sizeof (TitleWidgetPrivate)); - gobject_class->dispose = title_widget_dispose; - gobject_class->finalize = title_widget_finalize; + gobject_class->dispose = title_widget_dispose; + gobject_class->finalize = title_widget_finalize; } static void @@ -92,7 +90,7 @@ title_widget_init (TitleWidget *self) + 1 /* padding */, height); gtk_misc_set_alignment(GTK_MISC(icon), 0.5 /* right aligned */, 0); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(self), GTK_WIDGET(icon)); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(self), GTK_WIDGET(icon)); gtk_widget_show(icon); } @@ -217,7 +215,7 @@ title_widget_new(DbusmenuMenuitem *item) { GtkWidget* widget = g_object_new (TITLE_WIDGET_TYPE, NULL); - gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (widget), TRUE); + gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (widget), TRUE); title_widget_set_twin_item((TitleWidget*)widget, item); return widget; -- cgit v1.2.3 From 000862e2eae0d894e1f81df6b13c14d19f407d48 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Wed, 13 Oct 2010 17:06:45 +0100 Subject: space for icon path in config --- src/common-defs.h | 1 + src/transport-widget.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/common-defs.h b/src/common-defs.h index e268aaa..27dfd32 100644 --- a/src/common-defs.h +++ b/src/common-defs.h @@ -41,6 +41,7 @@ with this program. If not, see . #define DBUSMENU_TITLE_MENUITEM_TYPE "x-canonical-sound-menu-player-title-type" #define DBUSMENU_TITLE_MENUITEM_NAME "x-canonical-sound-menu-player-title-name" +#define DBUSMENU_TITLE_MENUITEM_ICON "x-canonical-sound-menu-player-title-icon" #define DBUSMENU_TITLE_MENUITEM_RUNNING "x-canonical-sound-menu-player-title-running" #define DBUSMENU_SCRUB_MENUITEM_TYPE "x-canonical-sound-menu-player-scrub-type" diff --git a/src/transport-widget.c b/src/transport-widget.c index e7f0b4d..1f023a9 100644 --- a/src/transport-widget.c +++ b/src/transport-widget.c @@ -135,12 +135,12 @@ transport_widget_class_init (TransportWidgetClass *klass) g_type_class_add_private (klass, sizeof (TransportWidgetPrivate)); - widget_class->button_press_event = transport_widget_button_press_event; - widget_class->button_release_event = transport_widget_button_release_event; + widget_class->button_press_event = transport_widget_button_press_event; + widget_class->button_release_event = transport_widget_button_release_event; widget_class->expose_event = transport_widget_expose; gobject_class->dispose = transport_widget_dispose; - gobject_class->finalize = transport_widget_finalize; + gobject_class->finalize = transport_widget_finalize; } static void @@ -158,7 +158,7 @@ transport_widget_init (TransportWidget *self) previous_list = g_list_insert(previous_list, GINT_TO_POINTER(5), 1); previous_list = g_list_insert(previous_list, GINT_TO_POINTER(60), 2); previous_list = g_list_insert(previous_list, GINT_TO_POINTER(34), 3); - g_hash_table_insert(priv->command_coordinates, + g_hash_table_insert(priv->command_coordinates, GINT_TO_POINTER(TRANSPORT_PREVIOUS), previous_list); @@ -182,11 +182,11 @@ transport_widget_init (TransportWidget *self) GINT_TO_POINTER(TRANSPORT_NEXT), next_list); - gtk_widget_set_size_request(GTK_WIDGET(self), 200, 50); - g_signal_connect (G_OBJECT(self), - "notify::parent", - G_CALLBACK (transport_widget_notify), - NULL); + gtk_widget_set_size_request(GTK_WIDGET(self), 200, 43); + g_signal_connect (G_OBJECT(self), + "notify::parent", + G_CALLBACK (transport_widget_notify), + NULL); } static void -- cgit v1.2.3 From e2792ab0a1dfd8ca0c96b59b675fa09e8cd0e5d7 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Thu, 14 Oct 2010 17:58:42 +0100 Subject: moving towards getting the icon across the divide --- src/Makefile.am | 2 ++ src/music-player-bridge.vala | 14 ++++++++++++-- src/player-controller.vala | 16 ++++++++++++++++ src/sound-service.c | 4 ++-- src/title-widget.c | 3 +++ src/title-widget.h | 2 ++ 6 files changed, 37 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index b23e9c1..563b755 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -76,6 +76,8 @@ music_bridge_VALAFLAGS = \ --pkg gee-1.0 \ --pkg Indicate-0.2 \ --pkg Dbusmenu-Glib-0.2 \ + --pkg DbusmenuGtk-0.2 \ + --pkg gtk+-2.0 \ --pkg common-defs \ --pkg dbus-glib-1 \ --pkg gio-unix-2.0 \ diff --git a/src/music-player-bridge.vala b/src/music-player-bridge.vala index 9ba4ef6..e109dec 100644 --- a/src/music-player-bridge.vala +++ b/src/music-player-bridge.vala @@ -24,7 +24,6 @@ using GLib; public class MusicPlayerBridge : GLib.Object { - private Listener listener; private Dbusmenu.Menuitem root_menu; private HashMap registered_clients; @@ -61,8 +60,12 @@ public class MusicPlayerBridge : GLib.Object calculate_menu_position(), PlayerController.state.OFFLINE); ctrl.app_info = app_info; - if(ctrl.app_info == null) + if(ctrl.app_info == null){ warning("for some reason the app info is null"); + } + else{ + ctrl.set_icon_path(); + } this.registered_clients.set(determine_key(app), ctrl); } } @@ -102,6 +105,13 @@ public class MusicPlayerBridge : GLib.Object bridge.calculate_menu_position(), PlayerController.state.READY); ctrl.set("app_info", app_info); + if(ctrl.app_info == null){ + warning("for some reason the app info is null"); + } + else{ + ctrl.set_icon_path(); + } + bridge.registered_clients.set(determine_key(path), ctrl); debug("successfully created appinfo and instance from path and set it on the respective instance"); } diff --git a/src/player-controller.vala b/src/player-controller.vala index d5b79e7..4b5144a 100644 --- a/src/player-controller.vala +++ b/src/player-controller.vala @@ -19,6 +19,7 @@ with this program. If not, see . */ using Dbusmenu; +using DbusmenuGtk; using Gee; public class PlayerController : GLib.Object @@ -62,6 +63,7 @@ public class PlayerController : GLib.Object construct_widgets(); establish_mpris_connection(); this.update_layout(); + } public void update_state(state new_state) @@ -167,6 +169,20 @@ public class PlayerController : GLib.Object return formatted; } + public void set_icon_path() + { + if(this.app_info != null){ + /*Gtk.IconTheme icon_t = Gtk.IconTheme.get_default(); + Gtk.IconInfo iconInfo = icon_t.lookup_icon(app_info.get_icon(), + getIconSize(), + Gtk.ICON_LOOKUP_USE_BUILTIN);*/ + //return iconInfo.load_icon(); + dbusmenu_menuitem_property_set_image(this.custom_items[widget_order.TITLE], + MENUITEM_PROP_ICON_DATA, + app_info.get_icon()); + } + } + // Temporarily we will need to handle to different mpris implemenations // Do it for now - a couple of weeks should see this messy carry on out of // the codebase. diff --git a/src/sound-service.c b/src/sound-service.c index f19379d..51f5f37 100644 --- a/src/sound-service.c +++ b/src/sound-service.c @@ -41,8 +41,8 @@ service_shutdown (IndicatorService *service, gpointer user_data) if (mainloop != NULL) { g_debug("Service shutdown !"); //TODO: uncomment for release !! - close_pulse_activites(); - g_main_loop_quit(mainloop); + //close_pulse_activites(); + //g_main_loop_quit(mainloop); } return; } diff --git a/src/title-widget.c b/src/title-widget.c index 5e86b4d..d9faa57 100644 --- a/src/title-widget.c +++ b/src/title-widget.c @@ -135,6 +135,9 @@ title_widget_property_update(DbusmenuMenuitem* item, gchar* property, gtk_menu_item_set_label (GTK_MENU_ITEM(mitem), g_value_get_string(value)); } + /*else(g_ascii_strcasecmp(DBUSMENU_MENUITEM_PROP_ICON_DATA, property) == 0){ + g_debug("changing the icon data on the title"); + }*/ } static void diff --git a/src/title-widget.h b/src/title-widget.h index 574a2b1..1e25775 100644 --- a/src/title-widget.h +++ b/src/title-widget.h @@ -21,6 +21,8 @@ with this program. If not, see . #include #include +#include + G_BEGIN_DECLS -- cgit v1.2.3 From 2d40c713f6d5fab70c952e757d0690c7dad63d2d Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Fri, 15 Oct 2010 13:59:45 +0100 Subject: updates done for now --- src/familiar-players-db.vala | 22 +++++++++++++++++++++- src/music-player-bridge.vala | 36 +++++------------------------------- src/player-controller.vala | 39 +++++++++++++++++++++------------------ src/title-menu-item.vala | 8 ++++++-- src/title-widget.c | 30 ++++++++++++++++++++++-------- src/title-widget.h | 1 - 6 files changed, 75 insertions(+), 61 deletions(-) (limited to 'src') diff --git a/src/familiar-players-db.vala b/src/familiar-players-db.vala index 894447c..76cc2f1 100644 --- a/src/familiar-players-db.vala +++ b/src/familiar-players-db.vala @@ -153,5 +153,25 @@ public class FamiliarPlayersDB : GLib.Object { return this.players_DB.keys; } - + + public static string? fetch_icon_name(string desktop_path) + { + KeyFile desktop_keyfile = new KeyFile (); + try{ + desktop_keyfile.load_from_file (desktop_path, KeyFileFlags.NONE); + } + catch(GLib.FileError error){ + warning("Error loading keyfile"); + return null; + } + try{ + return desktop_keyfile.get_string (KeyFileDesktop.GROUP, + KeyFileDesktop.KEY_ICON); + } + catch(GLib.KeyFileError error){ + warning("Error trying to fetch the icon name from the keyfile"); + return null; + } + } + } \ No newline at end of file diff --git a/src/music-player-bridge.vala b/src/music-player-bridge.vala index e109dec..9ab1b3c 100644 --- a/src/music-player-bridge.vala +++ b/src/music-player-bridge.vala @@ -56,17 +56,12 @@ public class MusicPlayerBridge : GLib.Object GLib.AppInfo app_info = info as GLib.AppInfo; PlayerController ctrl = new PlayerController(this.root_menu, - truncate_player_name(app_info.get_name()), + app_info, + playersDB.fetch_icon_name(app), calculate_menu_position(), PlayerController.state.OFFLINE); ctrl.app_info = app_info; - if(ctrl.app_info == null){ - warning("for some reason the app info is null"); - } - else{ - ctrl.set_icon_path(); - } - this.registered_clients.set(determine_key(app), ctrl); + this.registered_clients.set(determine_key(app), ctrl); } } @@ -96,22 +91,14 @@ public class MusicPlayerBridge : GLib.Object { MusicPlayerBridge bridge = data as MusicPlayerBridge; AppInfo? app_info = create_app_info(path); - var name = truncate_player_name(app_info.get_name()); if(path.contains("/") && bridge.playersDB.already_familiar(path) == false){ debug("About to store desktop file path: %s", path); bridge.playersDB.insert(path); PlayerController ctrl = new PlayerController(bridge.root_menu, - name, + app_info, + playersDB.fetch_icon_name(path), bridge.calculate_menu_position(), PlayerController.state.READY); - ctrl.set("app_info", app_info); - if(ctrl.app_info == null){ - warning("for some reason the app info is null"); - } - else{ - ctrl.set_icon_path(); - } - bridge.registered_clients.set(determine_key(path), ctrl); debug("successfully created appinfo and instance from path and set it on the respective instance"); } @@ -163,19 +150,6 @@ public class MusicPlayerBridge : GLib.Object return app_info; } - private static string truncate_player_name(owned string app_info_name) - { - string result = app_info_name.down().strip(); - - var tokens = result.split(" "); - - if(tokens.length > 1){ - result = tokens[0]; - } - debug("truncate player name %s", result); - return result; - } - private static string? determine_key(owned string path) { var tokens = path.split("/"); diff --git a/src/player-controller.vala b/src/player-controller.vala index 4b5144a..06a5b4e 100644 --- a/src/player-controller.vala +++ b/src/player-controller.vala @@ -49,21 +49,24 @@ public class PlayerController : GLib.Object public Mpris2Controller mpris_bridge; public AppInfo? app_info { get; set;} public int menu_offset { get; set;} + public string icon_name { get; set; } public PlayerController(Dbusmenu.Menuitem root, - string client_name, + AppInfo app_info, + string icon_name, int offset, state initial_state) { this.root_menu = root; - this.name = format_client_name(client_name.strip()); + this.app_info = app_info; + this.icon_name = icon_name; + this.name = format_client_name(truncate_player_name(app_info.get_name())); this.custom_items = new ArrayList(); this.current_state = initial_state; this.menu_offset = offset; construct_widgets(); establish_mpris_connection(); - this.update_layout(); - + this.update_layout(); } public void update_state(state new_state) @@ -168,20 +171,6 @@ public class PlayerController : GLib.Object } return formatted; } - - public void set_icon_path() - { - if(this.app_info != null){ - /*Gtk.IconTheme icon_t = Gtk.IconTheme.get_default(); - Gtk.IconInfo iconInfo = icon_t.lookup_icon(app_info.get_icon(), - getIconSize(), - Gtk.ICON_LOOKUP_USE_BUILTIN);*/ - //return iconInfo.load_icon(); - dbusmenu_menuitem_property_set_image(this.custom_items[widget_order.TITLE], - MENUITEM_PROP_ICON_DATA, - app_info.get_icon()); - } - } // Temporarily we will need to handle to different mpris implemenations // Do it for now - a couple of weeks should see this messy carry on out of @@ -199,4 +188,18 @@ public class PlayerController : GLib.Object this.update_state(state.DISCONNECTED); } } + + private static string truncate_player_name(owned string app_info_name) + { + string result = app_info_name.down().strip(); + + var tokens = result.split(" "); + + if(tokens.length > 1){ + result = tokens[0]; + } + debug("truncate player name %s", result); + return result; + } + } \ No newline at end of file diff --git a/src/title-menu-item.vala b/src/title-menu-item.vala index bb3d103..64ddebf 100644 --- a/src/title-menu-item.vala +++ b/src/title-menu-item.vala @@ -27,7 +27,9 @@ public class TitleMenuitem : PlayerItem { Object(item_type: MENUITEM_TYPE, owner: parent); this.property_set(MENUITEM_NAME, parent.name); - this.property_set_bool(MENUITEM_RUNNING, false); + debug("title init - icon name = %s", parent.icon_name); + this.property_set(MENUITEM_ICON, parent.icon_name); + this.property_set_bool(MENUITEM_RUNNING, false); } public override void handle_event(string name, GLib.Value input_value, uint timestamp) @@ -50,6 +52,8 @@ public class TitleMenuitem : PlayerItem { HashSet attrs = new HashSet(); attrs.add(MENUITEM_NAME); - return attrs; + attrs.add(MENUITEM_RUNNING); + attrs.add(MENUITEM_ICON); + return attrs; } } \ No newline at end of file diff --git a/src/title-widget.c b/src/title-widget.c index d9faa57..344d0a7 100644 --- a/src/title-widget.c +++ b/src/title-widget.c @@ -76,14 +76,23 @@ static void title_widget_init (TitleWidget *self) { //g_debug("TitleWidget::title_widget_init"); +} + +static void +title_widget_set_icon(TitleWidget *self) +{ + TitleWidgetPrivate *priv = TITLE_WIDGET_GET_PRIVATE(self); - gint padding = 0; + gchar* icon_name = dbusmenu_menuitem_property_get(priv->twin_item, + DBUSMENU_TITLE_MENUITEM_ICON); + gint padding = 0; gtk_widget_style_get(GTK_WIDGET(self), "horizontal-padding", &padding, NULL); gint width, height; gtk_icon_size_lookup(GTK_ICON_SIZE_MENU, &width, &height); - GtkWidget * icon = gtk_image_new_from_icon_name("sound-icon", GTK_ICON_SIZE_MENU); + GtkWidget * icon = gtk_image_new_from_icon_name(icon_name, + GTK_ICON_SIZE_MENU); gtk_widget_set_size_request(icon, width + 5 /* ref triangle is 5x9 pixels */ @@ -91,8 +100,7 @@ title_widget_init (TitleWidget *self) height); gtk_misc_set_alignment(GTK_MISC(icon), 0.5 /* right aligned */, 0); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(self), GTK_WIDGET(icon)); - gtk_widget_show(icon); - + gtk_widget_show(icon); } static void @@ -130,14 +138,19 @@ title_widget_property_update(DbusmenuMenuitem* item, gchar* property, { g_return_if_fail (IS_TITLE_WIDGET (userdata)); TitleWidget* mitem = TITLE_WIDGET(userdata); - + g_debug("PROPERTY UPDATE FOR THE TITLE"); if(g_ascii_strcasecmp(DBUSMENU_TITLE_MENUITEM_NAME, property) == 0){ gtk_menu_item_set_label (GTK_MENU_ITEM(mitem), g_value_get_string(value)); } - /*else(g_ascii_strcasecmp(DBUSMENU_MENUITEM_PROP_ICON_DATA, property) == 0){ - g_debug("changing the icon data on the title"); - }*/ + else if(g_ascii_strcasecmp(DBUSMENU_TITLE_MENUITEM_ICON, property) == 0){ + g_debug("changing the icon data on the title - %s", + g_value_get_string(value)); + GtkWidget * icon = gtk_image_new_from_icon_name(g_value_get_string(value), + GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mitem), GTK_WIDGET(icon)); + + } } static void @@ -160,6 +173,7 @@ title_widget_set_twin_item(TitleWidget* self, gtk_menu_item_set_label (GTK_MENU_ITEM(self), dbusmenu_menuitem_property_get(priv->twin_item, DBUSMENU_TITLE_MENUITEM_NAME)); + title_widget_set_icon(self); } static gboolean diff --git a/src/title-widget.h b/src/title-widget.h index 1e25775..029aba4 100644 --- a/src/title-widget.h +++ b/src/title-widget.h @@ -20,7 +20,6 @@ with this program. If not, see . #define __TITLE_WIDGET_H__ #include -#include #include -- cgit v1.2.3 From 65eeb5213f9c74b33595f085d20b5d14e7b8026b Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Fri, 22 Oct 2010 11:08:17 -0400 Subject: push new background work --- src/metadata-widget.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++---- src/transport-widget.c | 12 +------- src/transport-widget.h | 9 ++++++ 3 files changed, 88 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/metadata-widget.c b/src/metadata-widget.c index fd36c01..52716ae 100644 --- a/src/metadata-widget.c +++ b/src/metadata-widget.c @@ -3,6 +3,7 @@ Copyright 2010 Canonical Ltd. Authors: Conor Curran + Mirco Müller This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License version 3, as published @@ -26,7 +27,7 @@ with this program. If not, see . #include "common-defs.h" #include #include - +#include "transport-widget.h" typedef struct _MetadataWidgetPrivate MetadataWidgetPrivate; @@ -41,6 +42,7 @@ struct _MetadataWidgetPrivate GtkWidget* piece_label; GtkWidget* container_label; DbusmenuMenuitem* twin_item; + gint artwork_offset; }; #define METADATA_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), METADATA_WIDGET_TYPE, MetadataWidgetPrivate)) @@ -99,6 +101,7 @@ metadata_widget_init (MetadataWidget *self) priv->album_art = gtk_image_new(); priv->image_path = g_string_new(dbusmenu_menuitem_property_get(priv->twin_item, DBUSMENU_METADATA_MENUITEM_ARTURL)); priv->old_image_path = g_string_new(""); + priv->artwork_offset = 2; //g_debug("Metadata::At startup and image path = %s", priv->image_path->str); g_signal_connect(priv->album_art, "expose-event", @@ -106,7 +109,11 @@ metadata_widget_init (MetadataWidget *self) GTK_WIDGET(self)); gtk_widget_set_size_request(GTK_WIDGET(priv->album_art), 60, 60); - gtk_box_pack_start (GTK_BOX (priv->hbox), priv->album_art, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (priv->hbox), + priv->album_art, + FALSE, + FALSE, + priv->artwork_offset * 2); priv->theme_change_occured = FALSE; @@ -156,7 +163,7 @@ metadata_widget_init (MetadataWidget *self) g_signal_connect(self, "style-set", G_CALLBACK(metadata_widget_set_style), GTK_WIDGET(self)); gtk_widget_set_size_request(GTK_WIDGET(self), 200, 65); - gtk_container_add (GTK_CONTAINER (self), hbox); + gtk_container_add (GTK_CONTAINER (self), hbox); } static void @@ -209,6 +216,56 @@ metadata_image_expose (GtkWidget *metadata, GdkEventExpose *event, gpointer user return TRUE; } + +static void +draw_gradient (cairo_t* cr, + GtkAllocation alloc, + double* rgba_start, + double* rgba_end) +{ + cairo_pattern_t* pattern = NULL; + cairo_rectangle (cr, + alloc.x, alloc.y, + alloc.width, alloc.height); + + cairo_clip(cr); + + cairo_move_to (cr, alloc.x , alloc.y); + cairo_line_to(cr, alloc.x + alloc.width, + alloc.y); + cairo_line_to(cr, alloc.x + alloc.width, + alloc.y + alloc.height); + cairo_line_to(cr, alloc.x, alloc.y + alloc.height); + cairo_line_to(cr, alloc.x, alloc.y); + + cairo_close_path (cr); + + cairo_set_line_width (cr, 3.0); + CairoColorRGB darkened_top_color; + + _color_shade (&rgba_end, 0.8, &color_button[2]); + + pattern = cairo_pattern_create_linear (alloc.x, + alloc.y, + alloc.x, + alloc.y + alloc.height); + cairo_pattern_add_color_stop_rgba (pattern, + 0.0f, + rgba_start[0], + rgba_start[1], + rgba_start[2], + rgba_start[3]); + cairo_pattern_add_color_stop_rgba (pattern, + 1.0f, + rgba_end[0], + rgba_end[1], + rgba_end[2], + rgba_end[3]); + cairo_set_source (cr, pattern); + cairo_stroke (cr); + cairo_pattern_destroy (pattern); +} + static void draw_album_border(GtkWidget *metadata) { @@ -225,8 +282,23 @@ draw_album_border(GtkWidget *metadata) alloc.height = alloc.height + (offset * 2); alloc.x = alloc.x - offset; alloc.y = alloc.y - offset; - - cairo_rectangle (cr, + + double start_colour[] = { style->bg[0].red/65535.0, + style->bg[0].green/65535.0, + style->bg[0].blue/65535.0, + 1.0f }; + + double end_colour[] = { style->fg[0].red/65535.0, + style->fg[0].green/65535.0, + style->fg[0].blue/65535.0, + 1.0f}; + + draw_gradient(cr, + alloc, + start_colour, + end_colour); + + /*cairo_rectangle (cr, alloc.x, alloc.y, alloc.width, alloc.height); cairo_clip(cr); @@ -249,7 +321,7 @@ draw_album_border(GtkWidget *metadata) 0.6); cairo_set_line_width (cr, 2.0); - cairo_stroke (cr); + cairo_stroke (cr);*/ } static void diff --git a/src/transport-widget.c b/src/transport-widget.c index 1f023a9..ad044da 100644 --- a/src/transport-widget.c +++ b/src/transport-widget.c @@ -69,7 +69,6 @@ Uses code from ctk #define INNER_COMPRESSED_START_SHADE 0.95 #define INNER_COMPRESSED_END_SHADE 1.05 - typedef struct _TransportWidgetPrivate TransportWidgetPrivate; struct _TransportWidgetPrivate @@ -80,14 +79,6 @@ struct _TransportWidgetPrivate DbusmenuMenuitem* twin_item; }; -typedef struct -{ - double r; - double g; - double b; -} CairoColorRGB; - - #define TRANSPORT_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRANSPORT_WIDGET_TYPE, TransportWidgetPrivate)) /* Gobject boiler plate */ @@ -117,7 +108,6 @@ static void transport_widget_menu_hidden ( GtkWidget *menu, static void transport_widget_notify ( TransportWidget *item, GParamSpec *pspec, gpointer user_data ); - static TransportWidgetEvent transport_widget_determine_button_event ( TransportWidget* button, GdkEventButton* event); static void transport_widget_react_to_button_release ( TransportWidget* button, @@ -743,7 +733,7 @@ _color_hls_to_rgb (gdouble *h, } } -static void +void _color_shade (const CairoColorRGB *a, float k, CairoColorRGB *b) { double red; diff --git a/src/transport-widget.h b/src/transport-widget.h index 337ccdf..6ccce05 100644 --- a/src/transport-widget.h +++ b/src/transport-widget.h @@ -55,6 +55,15 @@ struct _TransportWidget { GtkMenuItem parent; }; +typedef struct +{ + double r; + double g; + double b; +} CairoColorRGB; + + +void _color_shade (const CairoColorRGB *a, float k, CairoColorRGB *b); GType transport_widget_get_type (void); GtkWidget* transport_widget_new ( DbusmenuMenuitem *item ); -- cgit v1.2.3 From 79ecf263348fa4da51d3ac014f8cf796a520de06 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Fri, 22 Oct 2010 16:09:55 -0400 Subject: metadata album art border done --- src/metadata-widget.c | 169 ++++++++++++-------------------------------------- 1 file changed, 40 insertions(+), 129 deletions(-) (limited to 'src') diff --git a/src/metadata-widget.c b/src/metadata-widget.c index 52716ae..911b35a 100644 --- a/src/metadata-widget.c +++ b/src/metadata-widget.c @@ -42,7 +42,6 @@ struct _MetadataWidgetPrivate GtkWidget* piece_label; GtkWidget* container_label; DbusmenuMenuitem* twin_item; - gint artwork_offset; }; #define METADATA_WIDGET_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), METADATA_WIDGET_TYPE, MetadataWidgetPrivate)) @@ -99,10 +98,9 @@ metadata_widget_init (MetadataWidget *self) // image priv->album_art = gtk_image_new(); - priv->image_path = g_string_new(dbusmenu_menuitem_property_get(priv->twin_item, DBUSMENU_METADATA_MENUITEM_ARTURL)); + priv->image_path = g_string_new(dbusmenu_menuitem_property_get(priv->twin_item, + DBUSMENU_METADATA_MENUITEM_ARTURL)); priv->old_image_path = g_string_new(""); - priv->artwork_offset = 2; - //g_debug("Metadata::At startup and image path = %s", priv->image_path->str); g_signal_connect(priv->album_art, "expose-event", G_CALLBACK(metadata_image_expose), @@ -113,10 +111,8 @@ metadata_widget_init (MetadataWidget *self) priv->album_art, FALSE, FALSE, - priv->artwork_offset * 2); - + 1); priv->theme_change_occured = FALSE; - GtkWidget* vbox = gtk_vbox_new(FALSE, 0); // artist @@ -135,7 +131,7 @@ metadata_widget_init (MetadataWidget *self) piece = gtk_label_new(dbusmenu_menuitem_property_get( priv->twin_item, DBUSMENU_METADATA_MENUITEM_TITLE) ); gtk_misc_set_alignment(GTK_MISC(piece), (gfloat)0, (gfloat)0); - gtk_misc_set_padding (GTK_MISC(piece), (gfloat)10, (gfloat)0); + gtk_misc_set_padding (GTK_MISC(piece), (gfloat)10, (gfloat)-5); gtk_widget_set_size_request (piece, 140, 15); gtk_label_set_ellipsize(GTK_LABEL(piece), PANGO_ELLIPSIZE_MIDDLE); metadata_widget_style_labels(self, GTK_LABEL(piece)); @@ -158,11 +154,9 @@ metadata_widget_init (MetadataWidget *self) gtk_box_pack_start (GTK_BOX (priv->hbox), vbox, FALSE, FALSE, 0); - gtk_widget_show_all (priv->hbox); - g_signal_connect(self, "style-set", G_CALLBACK(metadata_widget_set_style), GTK_WIDGET(self)); - gtk_widget_set_size_request(GTK_WIDGET(self), 200, 65); + gtk_widget_set_size_request(GTK_WIDGET(self), 200, 75); gtk_container_add (GTK_CONTAINER (self), hbox); } @@ -201,12 +195,12 @@ metadata_image_expose (GtkWidget *metadata, GdkEventExpose *event, gpointer user if(GDK_IS_PIXBUF(pixbuf) == FALSE){ //g_debug("problem loading the downloaded image just use the placeholder instead"); draw_album_art_placeholder(metadata); - return TRUE; - } + return TRUE; + } pixbuf = gdk_pixbuf_scale_simple(pixbuf,60, 60, GDK_INTERP_BILINEAR); gtk_image_set_from_pixbuf(GTK_IMAGE(priv->album_art), pixbuf); g_string_erase(priv->old_image_path, 0, -1); - g_string_overwrite(priv->old_image_path, 0, priv->image_path->str); + g_string_overwrite(priv->old_image_path, 0, priv->image_path->str); g_object_unref(pixbuf); } @@ -220,8 +214,8 @@ metadata_image_expose (GtkWidget *metadata, GdkEventExpose *event, gpointer user static void draw_gradient (cairo_t* cr, GtkAllocation alloc, - double* rgba_start, - double* rgba_end) + CairoColorRGB rgba_start, + CairoColorRGB rgba_end) { cairo_pattern_t* pattern = NULL; cairo_rectangle (cr, @@ -242,25 +236,28 @@ draw_gradient (cairo_t* cr, cairo_set_line_width (cr, 3.0); CairoColorRGB darkened_top_color; + CairoColorRGB light_bottom_color; - _color_shade (&rgba_end, 0.8, &color_button[2]); + _color_shade (&rgba_start, 0.6, &darkened_top_color); + _color_shade (&rgba_end, 0.7, &light_bottom_color); pattern = cairo_pattern_create_linear (alloc.x, alloc.y, alloc.x, alloc.y + alloc.height); + cairo_pattern_add_color_stop_rgba (pattern, - 0.0f, - rgba_start[0], - rgba_start[1], - rgba_start[2], - rgba_start[3]); + 0.4f, + darkened_top_color.r, + darkened_top_color.g, + darkened_top_color.b, + 1.0f); cairo_pattern_add_color_stop_rgba (pattern, 1.0f, - rgba_end[0], - rgba_end[1], - rgba_end[2], - rgba_end[3]); + light_bottom_color.r, + light_bottom_color.g, + light_bottom_color.b, + 1.0f); cairo_set_source (cr, pattern); cairo_stroke (cr); cairo_pattern_destroy (pattern); @@ -276,52 +273,28 @@ draw_album_border(GtkWidget *metadata) GtkAllocation alloc; gtk_widget_get_allocation (metadata, &alloc); - gint offset = 2; + gint offset = 1; alloc.width = alloc.width + (offset * 2); - alloc.height = alloc.height + (offset * 2); + alloc.height = alloc.height + (offset * 2) - 7; alloc.x = alloc.x - offset; - alloc.y = alloc.y - offset; - - double start_colour[] = { style->bg[0].red/65535.0, - style->bg[0].green/65535.0, - style->bg[0].blue/65535.0, - 1.0f }; + alloc.y = alloc.y - offset + 3; - double end_colour[] = { style->fg[0].red/65535.0, - style->fg[0].green/65535.0, - style->fg[0].blue/65535.0, - 1.0f}; - - draw_gradient(cr, - alloc, - start_colour, - end_colour); - - /*cairo_rectangle (cr, - alloc.x, alloc.y, - alloc.width, alloc.height); - cairo_clip(cr); + CairoColorRGB bg_normal, fg_normal; - cairo_move_to (cr, alloc.x , alloc.y); - cairo_line_to(cr, alloc.x + alloc.width, - alloc.y); - cairo_line_to(cr, alloc.x + alloc.width, - alloc.y + alloc.height); - cairo_line_to(cr, alloc.x, alloc.y + alloc.height); - cairo_line_to(cr, alloc.x, alloc.y); + bg_normal.r = style->bg[0].red/65535.0; + bg_normal.g = style->bg[0].green/65535.0; + bg_normal.b = style->bg[0].blue/65535.0; + fg_normal.r = style->fg[0].red/65535.0; + fg_normal.g = style->fg[0].green/65535.0; + fg_normal.b = style->fg[0].blue/65535.0; - cairo_close_path (cr); - cairo_set_source_rgba (cr, - style->fg[0].red/65535.0, - style->fg[0].green/65535.0, - style->fg[0].blue/65535.0, - 0.6); - cairo_set_line_width (cr, 2.0); - - cairo_stroke (cr);*/ + draw_gradient(cr, + alloc, + bg_normal, + fg_normal); } static void @@ -334,9 +307,8 @@ draw_album_art_placeholder(GtkWidget *metadata) GtkAllocation alloc; gtk_widget_get_allocation (metadata, &alloc); - - // Draw the eight note - PangoLayout *layout; + + PangoLayout *layout; PangoFontDescription *desc; layout = pango_cairo_create_layout(cr); PangoContext* pcontext = pango_cairo_create_context(cr); @@ -359,7 +331,7 @@ draw_album_art_placeholder(GtkWidget *metadata) 0.8); pango_cairo_update_layout(cr, layout); - cairo_move_to (cr, alloc.x + alloc.width/6, alloc.y); + cairo_move_to (cr, alloc.x + alloc.width/6, alloc.y + alloc.height/8); pango_cairo_show_layout(cr, layout); g_object_unref(layout); @@ -434,67 +406,6 @@ metadata_widget_property_update(DbusmenuMenuitem* item, gchar* property, } -static cairo_surface_t * -surface_from_pixbuf (GdkPixbuf *pixbuf) -{ - cairo_surface_t *surface; - cairo_t *cr; - - surface = cairo_image_surface_create (gdk_pixbuf_get_has_alpha (pixbuf) ? - CAIRO_FORMAT_ARGB32 : CAIRO_FORMAT_RGB24, - gdk_pixbuf_get_width (pixbuf), - gdk_pixbuf_get_height (pixbuf)); - cr = cairo_create (surface); - gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0); - cairo_paint (cr); - cairo_destroy (cr); - - return surface; -} - -static void -rounded_rectangle (cairo_t *cr, - gdouble aspect, - gdouble x, - gdouble y, - gdouble corner_radius, - gdouble width, - gdouble height) -{ - gdouble radius; - gdouble degrees; - - radius = corner_radius / aspect; - degrees = G_PI / 180.0; - cairo_new_sub_path (cr); - cairo_arc (cr, - x + width - radius, - y + radius, - radius, - -90 * degrees, - 0 * degrees); - cairo_arc (cr, - x + width - radius, - y + height - radius, - radius, - 0 * degrees, - 90 * degrees); - cairo_arc (cr, - x + radius, - y + height - radius, - radius, - 90 * degrees, - 180 * degrees); - cairo_arc (cr, - x + radius, - y + radius, - radius, - 180 * degrees, - 270 * degrees); - - cairo_close_path (cr); -} - static void metadata_widget_style_labels(MetadataWidget* self, GtkLabel* label) -- cgit v1.2.3 From 2f409b95c5c1c0c7107f4503c01687b3a913780f Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Wed, 27 Oct 2010 11:48:29 -0400 Subject: more tweaks --- src/metadata-widget.c | 45 ++++++++++++++++++++++++++++++++------------- src/pulse-manager.c | 4 ++-- src/sound-service.c | 4 ++-- 3 files changed, 36 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/src/metadata-widget.c b/src/metadata-widget.c index 911b35a..38f2c4c 100644 --- a/src/metadata-widget.c +++ b/src/metadata-widget.c @@ -66,8 +66,11 @@ static void metadata_widget_property_update (DbusmenuMenuitem* item, static void metadata_widget_style_labels ( MetadataWidget* self, GtkLabel* label); static void draw_album_art_placeholder ( GtkWidget *metadata); -static void draw_album_border ( GtkWidget *metadata); - +static void draw_album_border ( GtkWidget *metadata, gboolean selected); +static void metadata_widget_selection_received_event_callback( GtkWidget *widget, + GtkSelectionData *data, + guint time, + gpointer user_data); G_DEFINE_TYPE (MetadataWidget, metadata_widget, GTK_TYPE_MENU_ITEM); @@ -154,8 +157,11 @@ metadata_widget_init (MetadataWidget *self) gtk_box_pack_start (GTK_BOX (priv->hbox), vbox, FALSE, FALSE, 0); - g_signal_connect(self, "style-set", G_CALLBACK(metadata_widget_set_style), GTK_WIDGET(self)); - + g_signal_connect(self, "style-set", + G_CALLBACK(metadata_widget_set_style), GTK_WIDGET(self)); + g_signal_connect (self, "selection-received", + G_CALLBACK(metadata_widget_selection_received_event_callback), + GTK_WIDGET(self)); gtk_widget_set_size_request(GTK_WIDGET(self), 200, 75); gtk_container_add (GTK_CONTAINER (self), hbox); } @@ -183,7 +189,7 @@ 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); + 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){ @@ -211,6 +217,7 @@ metadata_image_expose (GtkWidget *metadata, GdkEventExpose *event, gpointer user } + static void draw_gradient (cairo_t* cr, GtkAllocation alloc, @@ -264,7 +271,7 @@ draw_gradient (cairo_t* cr, } static void -draw_album_border(GtkWidget *metadata) +draw_album_border(GtkWidget *metadata, gboolean selected) { cairo_t *cr; cr = gdk_cairo_create (metadata->window); @@ -286,10 +293,11 @@ draw_album_border(GtkWidget *metadata) bg_normal.g = style->bg[0].green/65535.0; bg_normal.b = style->bg[0].blue/65535.0; - fg_normal.r = style->fg[0].red/65535.0; - fg_normal.g = style->fg[0].green/65535.0; - fg_normal.b = style->fg[0].blue/65535.0; - + gint state = selected ? 5 : 0; + + fg_normal.r = style->fg[state].red/65535.0; + fg_normal.g = style->fg[state].green/65535.0; + fg_normal.b = style->fg[state].blue/65535.0; draw_gradient(cr, alloc, @@ -341,6 +349,20 @@ draw_album_art_placeholder(GtkWidget *metadata) } +static void +metadata_widget_selection_received_event_callback ( GtkWidget *widget, + GtkSelectionData *data, + guint time, + gpointer user_data ) + +{ + //g_return_val_if_fail(IS_METADATA_WIDGET(user_data), FALSE); + //MetadataWidget* widget = METADATA_WIDGET(user_data); + //MetadataWidgetPrivate * priv = METADATA_WIDGET_GET_PRIVATE(widget); + g_debug("metadata_widget_selection_request_event_callback"); + draw_album_border(widget, TRUE); +} + /* Suppress/consume keyevents */ static gboolean metadata_widget_button_press_event (GtkWidget *menuitem, @@ -357,7 +379,6 @@ metadata_widget_button_press_event (GtkWidget *menuitem, DBUSMENU_METADATA_MENUITEM_TITLE), dbusmenu_menuitem_property_get(priv->twin_item, DBUSMENU_METADATA_MENUITEM_ALBUM)); - //g_debug("contents to be copied will be : %s", contents); gtk_clipboard_set_text (board, contents, -1); gtk_clipboard_store (board); g_free(contents); @@ -405,8 +426,6 @@ metadata_widget_property_update(DbusmenuMenuitem* item, gchar* property, } } - - static void metadata_widget_style_labels(MetadataWidget* self, GtkLabel* label) { diff --git a/src/pulse-manager.c b/src/pulse-manager.c index 8779525..20238e7 100644 --- a/src/pulse-manager.c +++ b/src/pulse-manager.c @@ -490,10 +490,10 @@ static void context_state_callback(pa_context *c, void *userdata) { switch (pa_context_get_state(c)) { case PA_CONTEXT_UNCONNECTED: - /* g_debug("unconnected");*/ + g_debug("unconnected"); break; case PA_CONTEXT_CONNECTING: - /* g_debug("connecting - waiting for the server to become available");*/ + g_debug("connecting - waiting for the server to become available"); break; case PA_CONTEXT_AUTHORIZING: /* g_debug("authorizing");*/ diff --git a/src/sound-service.c b/src/sound-service.c index 51f5f37..f19379d 100644 --- a/src/sound-service.c +++ b/src/sound-service.c @@ -41,8 +41,8 @@ service_shutdown (IndicatorService *service, gpointer user_data) if (mainloop != NULL) { g_debug("Service shutdown !"); //TODO: uncomment for release !! - //close_pulse_activites(); - //g_main_loop_quit(mainloop); + close_pulse_activites(); + g_main_loop_quit(mainloop); } return; } -- cgit v1.2.3 From fa06a4441287f76de3033f15cf1346b4e91004c4 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Fri, 5 Nov 2010 17:39:06 +0000 Subject: tidy up unwanted deps --- src/Makefile.am | 1 - src/player-controller.vala | 1 - 2 files changed, 2 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 563b755..68091b3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -76,7 +76,6 @@ music_bridge_VALAFLAGS = \ --pkg gee-1.0 \ --pkg Indicate-0.2 \ --pkg Dbusmenu-Glib-0.2 \ - --pkg DbusmenuGtk-0.2 \ --pkg gtk+-2.0 \ --pkg common-defs \ --pkg dbus-glib-1 \ diff --git a/src/player-controller.vala b/src/player-controller.vala index 537eccc..7d3aad0 100644 --- a/src/player-controller.vala +++ b/src/player-controller.vala @@ -19,7 +19,6 @@ with this program. If not, see . */ using Dbusmenu; -using DbusmenuGtk; using Gee; public class PlayerController : GLib.Object -- cgit v1.2.3 From dd80c00e460cf1857eb8a76b62e2058b49f62d88 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Fri, 5 Nov 2010 17:43:57 +0000 Subject: tidy up unwanted deps --- src/Makefile.am | 1 - src/player-controller.vala | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 68091b3..b23e9c1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -76,7 +76,6 @@ music_bridge_VALAFLAGS = \ --pkg gee-1.0 \ --pkg Indicate-0.2 \ --pkg Dbusmenu-Glib-0.2 \ - --pkg gtk+-2.0 \ --pkg common-defs \ --pkg dbus-glib-1 \ --pkg gio-unix-2.0 \ diff --git a/src/player-controller.vala b/src/player-controller.vala index 7d3aad0..e2ae4d7 100644 --- a/src/player-controller.vala +++ b/src/player-controller.vala @@ -192,6 +192,5 @@ public class PlayerController : GLib.Object else{ this.update_state(state.DISCONNECTED); } - } - -} \ No newline at end of file + } +} -- cgit v1.2.3