From 0f3984295bef6013cb8cfd82fd6620d782b88f18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Wed, 2 Jan 2013 13:21:46 +0000 Subject: [PATCH] e/music-control: Add name of selected playing music and allow to raise player MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch by: José Roberto de Souza SVN revision: 81993 --- .../music-control/e-module-music-control.edc | 44 ++++++++++++++---- .../music-control/e-module-music-control.edj | Bin 54031 -> 55619 bytes src/modules/music-control/ui.c | 22 +++++++++ 3 files changed, 58 insertions(+), 8 deletions(-) diff --git a/src/modules/music-control/e-module-music-control.edc b/src/modules/music-control/e-module-music-control.edc index c548107aa..8a40d5483 100644 --- a/src/modules/music-control/e-module-music-control.edc +++ b/src/modules/music-control/e-module-music-control.edc @@ -43,8 +43,21 @@ collections { } group { name: "modules/music-control/popup"; - min: 150 30; + min: 150 50; parts { + part { + name: "player_name"; + type: TEXT; + description { + state: "default" 0; + text.size: 12; + text.text: "Music player"; + text.font: "Sans"; + rel1.relative: 0.0 0.0; + rel2.relative: 1.0 0.0; + rel2.offset: 0 16; + } + } part { type: IMAGE; name: "previous_btn"; @@ -52,7 +65,8 @@ collections { state: "default" 0; aspect: 1.0 1.0; aspect_preference: BOTH; - rel1.relative: 0.0 0.0; + rel1.to: "player_name"; + rel1.relative: 0.0 1.0; rel2.relative: 0.33 1.0; image.normal: "images/previous.png"; } @@ -64,9 +78,10 @@ collections { state: "default" 0; aspect: 1.0 1.0; aspect_preference: BOTH; - rel1.relative: 0.33 0.0; - rel2.relative: 0.66 1.0; - image.normal: "images/pause.png"; + rel1.to: "player_name"; + rel1.relative: 0.33 1.0; + rel2.relative: 0.66 1.0; + image.normal: "images/pause.png"; } description { state: "play" 0.0; @@ -81,9 +96,10 @@ collections { state: "default" 0; aspect: 1.0 1.0; aspect_preference: BOTH; - rel1.relative: 0.66 0.0; - rel2.relative: 1.0 1.0; - image.normal: "images/next.png"; + rel1.to: "player_name"; + rel1.relative: 0.66 1.0; + rel2.relative: 1.0 1.0; + image.normal: "images/next.png"; } } } @@ -117,6 +133,18 @@ collections { transition: LINEAR 0.1; target: "play_btn"; } + program { + signal: "mouse,clicked,*"; + source: "player_name"; + action: SIGNAL_EMIT "label,clicked" "player_name"; + } + } + script { + public message(Msg_Type:type, id, ...) { + new txt[128]; + getsarg (2, txt, 128); + set_text(PART:"player_name", txt); + } } } } \ No newline at end of file diff --git a/src/modules/music-control/e-module-music-control.edj b/src/modules/music-control/e-module-music-control.edj index 3712858beb995b373ec155f7f679fd5f3ec3c5c0..65822790625f534400b286aaf1f23eabee76c346 100644 GIT binary patch delta 7309 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 delta 5715 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 diff --git a/src/modules/music-control/ui.c b/src/modules/music-control/ui.c index 8624c43fe..6454d8f6f 100644 --- a/src/modules/music-control/ui.c +++ b/src/modules/music-control/ui.c @@ -34,6 +34,22 @@ _btn_clicked(void *data, Evas_Object *obj, const char *emission, const char *sou media_player2_player_previous_call(inst->ctxt->mpris2_player); } +static void +_label_clicked(void *data, Evas_Object *obj, const char *emission, const char *source) +{ + E_Music_Control_Instance *inst = data; + music_control_popup_del(inst); + mpris_media_player2_raise_call(inst->ctxt->mrpis2); +} + +static void +_player_name_update(E_Music_Control_Instance *inst) +{ + Edje_Message_String msg; + msg.str = (char *)music_player_players[inst->ctxt->config->player_selected].name; + edje_object_message_send(inst->content_popup, EDJE_MESSAGE_STRING, 0, &msg); +} + static void _popup_new(E_Music_Control_Instance *inst) { @@ -44,10 +60,13 @@ _popup_new(E_Music_Control_Instance *inst) edje_object_file_set(o, music_control_edj_path_get(), "modules/music-control/popup"); edje_object_signal_callback_add(o, "btn,clicked", "*", _btn_clicked, inst); + edje_object_signal_callback_add(o, "label,clicked", "player_name", _label_clicked, inst); e_gadcon_popup_content_set(inst->popup, o); e_gadcon_popup_show(inst->popup); inst->content_popup = o; + + _player_name_update(inst); _play_state_update(inst); } @@ -157,6 +176,9 @@ music_control_mouse_down_cb(void *data, Evas *evas, Evas_Object *obj, void *even E_Zone *zone = e_util_zone_current_get(e_manager_current_get()); int x, y; + if (inst->popup) + music_control_popup_del(inst); + m = e_menu_new(); mi = e_menu_item_new(m); e_menu_item_label_set(mi, "Settings");