From 58627767fbd151587a843fd2397f1c293533664a Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Thu, 9 Jun 2011 12:15:39 +0200 Subject: merged the title and metadata at the backend, now for the tricky UI work@ --- src/mpris2-controller.vala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/mpris2-controller.vala') diff --git a/src/mpris2-controller.vala b/src/mpris2-controller.vala index 04ceb88..e0d13cf 100644 --- a/src/mpris2-controller.vala +++ b/src/mpris2-controller.vala @@ -109,8 +109,8 @@ public class Mpris2Controller : GLib.Object } Variant? identity_v = changed_properties.lookup("Identity"); if (identity_v != null){ - TitleMenuitem title = this.owner.custom_items[PlayerController.widget_order.TITLE] as TitleMenuitem; - title.alter_label (this.mpris2_root.Identity); + MetadataMenuitem md = this.owner.custom_items[PlayerController.widget_order.METADATA] as MetadataMenuitem; + md.alter_label (this.mpris2_root.Identity); } } @@ -162,8 +162,8 @@ public class Mpris2Controller : GLib.Object update = determine_play_state (this.player.PlaybackStatus); } if (this.mpris2_root.Identity != null){ - TitleMenuitem title = this.owner.custom_items[PlayerController.widget_order.TITLE] as TitleMenuitem; - title.alter_label (this.mpris2_root.Identity); + MetadataMenuitem md = this.owner.custom_items[PlayerController.widget_order.METADATA] as MetadataMenuitem; + md.alter_label (this.mpris2_root.Identity); } (this.owner.custom_items[PlayerController.widget_order.TRANSPORT] as TransportMenuitem).change_play_state (update); GLib.HashTable? cleaned_metadata = this.clean_metadata(); -- cgit v1.2.3 From ec14b8310dd5b02ed749c2cfade5c1a45ef00bac Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Mon, 13 Jun 2011 12:04:15 +0200 Subject: number of bugs fixed, more to come --- src/mpris2-controller.vala | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/mpris2-controller.vala') diff --git a/src/mpris2-controller.vala b/src/mpris2-controller.vala index e0d13cf..7e128dd 100644 --- a/src/mpris2-controller.vala +++ b/src/mpris2-controller.vala @@ -84,12 +84,17 @@ public class Mpris2Controller : GLib.Object Variant? meta_v = changed_properties.lookup("Metadata"); if(meta_v != null){ GLib.HashTable changed_updates = clean_metadata(); + //MetadataMenuitem md = this.owner.custom_items[PlayerController.widget_order.METADATA] as MetadataMenuitem; + //md.reset_track_details (); + PlayerItem metadata = this.owner.custom_items[PlayerController.widget_order.METADATA]; - metadata.reset ( MetadataMenuitem.attributes_format()); + metadata.reset (MetadataMenuitem.relevant_attributes_for_ui()); metadata.update ( changed_updates, MetadataMenuitem.attributes_format()); - metadata.property_set_bool ( MENUITEM_PROP_VISIBLE, - metadata.populated(MetadataMenuitem.attributes_format())); + /*metadata.property_set_bool ( MENUITEM_PROP_VISIBLE, + metadata.populated(MetadataMenuitem.relevant_attributes_for_ui()));*/ + debug ("metadata visibility = %s", + metadata.populated (MetadataMenuitem.relevant_attributes_for_ui()).to_string()); } Variant? playlist_v = changed_properties.lookup("ActivePlaylist"); if ( playlist_v != null && this.owner.use_playlists == true ){ -- cgit v1.2.3 From ed942a6e5eb61a366a87b7346999ef5c146fc7fb Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Mon, 13 Jun 2011 17:02:41 +0200 Subject: arrow drawing properly --- src/mpris2-controller.vala | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/mpris2-controller.vala') diff --git a/src/mpris2-controller.vala b/src/mpris2-controller.vala index 7e128dd..74e9823 100644 --- a/src/mpris2-controller.vala +++ b/src/mpris2-controller.vala @@ -83,18 +83,16 @@ public class Mpris2Controller : GLib.Object } Variant? meta_v = changed_properties.lookup("Metadata"); if(meta_v != null){ - GLib.HashTable changed_updates = clean_metadata(); - //MetadataMenuitem md = this.owner.custom_items[PlayerController.widget_order.METADATA] as MetadataMenuitem; - //md.reset_track_details (); - + GLib.HashTable changed_updates = clean_metadata(); PlayerItem metadata = this.owner.custom_items[PlayerController.widget_order.METADATA]; metadata.reset (MetadataMenuitem.relevant_attributes_for_ui()); metadata.update ( changed_updates, MetadataMenuitem.attributes_format()); - /*metadata.property_set_bool ( MENUITEM_PROP_VISIBLE, - metadata.populated(MetadataMenuitem.relevant_attributes_for_ui()));*/ - debug ("metadata visibility = %s", - metadata.populated (MetadataMenuitem.relevant_attributes_for_ui()).to_string()); + MetadataMenuitem md = this.owner.custom_items[PlayerController.widget_order.METADATA] as MetadataMenuitem; + bool collapsing = !metadata.populated(MetadataMenuitem.relevant_attributes_for_ui()); + md.should_collapse(collapsing); + + debug ("metadata should collapse = %s", collapsing.to_string()); } Variant? playlist_v = changed_properties.lookup("ActivePlaylist"); if ( playlist_v != null && this.owner.use_playlists == true ){ -- cgit v1.2.3 From 2e0dd336905735dc75d3ab7e676ef60af76ae746 Mon Sep 17 00:00:00 2001 From: Conor Curran Date: Tue, 14 Jun 2011 18:24:46 +0200 Subject: caught most of the little bugs I could find@ --- src/mpris2-controller.vala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mpris2-controller.vala') diff --git a/src/mpris2-controller.vala b/src/mpris2-controller.vala index 74e9823..2975066 100644 --- a/src/mpris2-controller.vala +++ b/src/mpris2-controller.vala @@ -87,12 +87,12 @@ public class Mpris2Controller : GLib.Object PlayerItem metadata = this.owner.custom_items[PlayerController.widget_order.METADATA]; metadata.reset (MetadataMenuitem.relevant_attributes_for_ui()); metadata.update ( changed_updates, - MetadataMenuitem.attributes_format()); + MetadataMenuitem.relevant_attributes_for_ui()); MetadataMenuitem md = this.owner.custom_items[PlayerController.widget_order.METADATA] as MetadataMenuitem; bool collapsing = !metadata.populated(MetadataMenuitem.relevant_attributes_for_ui()); md.should_collapse(collapsing); - debug ("metadata should collapse = %s", collapsing.to_string()); + debug ("Should metadata collapse %s", collapsing.to_string()); } Variant? playlist_v = changed_properties.lookup("ActivePlaylist"); if ( playlist_v != null && this.owner.use_playlists == true ){ -- cgit v1.2.3