From 70e40452def51ee9a2e94002d3566a607b64529e Mon Sep 17 00:00:00 2001 From: Tae-Hwan Kim Date: Mon, 25 Mar 2013 21:35:54 +0900 Subject: [PATCH] [Genlst] Make email touch area sound Change-Id: Icec165ebebbb3b8fcb61f8751c7cadc2975dca1c --- themes/widgets/genlist/genlist_decorate.edc | 15 +--- themes/widgets/genlist/genlist_email.edc | 8 +- themes/widgets/genlist/genlist_macro.edc | 122 +++++++--------------------- 3 files changed, 38 insertions(+), 107 deletions(-) diff --git a/themes/widgets/genlist/genlist_decorate.edc b/themes/widgets/genlist/genlist_decorate.edc index 5239981..c520c58 100644 --- a/themes/widgets/genlist/genlist_decorate.edc +++ b/themes/widgets/genlist/genlist_decorate.edc @@ -52,16 +52,9 @@ ) } programs { - program { name: "play_sound_text"; - signal: "mouse,clicked,1"; - source: "elm.text"; - action: PLAY_SAMPLE "button-pressed" 1.0; - } - program { name: "play_sound_bg_color"; - signal: "mouse,clicked,1"; - source: "bg_color"; - action: PLAY_SAMPLE "button-pressed" 1.0; - } + GENLIST_PROGRAM_SOUND("elm.text") + GENLIST_PROGRAM_SOUND("bg_color") + GENLIST_PROGRAM_DISABLED( target: "elm.icon"; target: "elm.text"; ) } } @@ -148,7 +141,7 @@ target: "bottom_line"; target: "bottom_line2"; ) - GENLIST_PROGRAM_SELECT_NOSOUND( + GENLIST_PROGRAM_SELECT( target: "bg"; target: "bg_reorder"; target: "bottom_line"; diff --git a/themes/widgets/genlist/genlist_email.edc b/themes/widgets/genlist/genlist_email.edc index 10a9252..53fa4ff 100755 --- a/themes/widgets/genlist/genlist_email.edc +++ b/themes/widgets/genlist/genlist_email.edc @@ -261,7 +261,6 @@ rel2.offset: 10 10; ) ) - GENLIST_PART_ICON_EMAIL_CHECK_RADIO_L("elm.icon.1", "elm.padding.left") GENLIST_PART_PADDING_L("elm.padding.icon1.right", "elm.icon.1") @@ -352,10 +351,12 @@ GENLIST_PROGRAMS_READ_TEXT( target: "elm.text.1"; target: "elm.text.2"; target: "elm.text.3"; target: "elm.text.4"; target: "elm.text.5"; - target: "elm.swallow.colorbar"; target: "elm.icon.1"; + target: "elm.swallow.colorbar"; + target: "elm.icon.1"; target: "elm.icon.1.touch"; target: "elm.icon.2"; target: "elm.icon.3"; - target: "elm.icon.4"; + target: "elm.icon.4"; target: "elm.icon.4.touch"; ) + GENLIST_PROGRAM_SOUND("elm.icon.4.touch") } // email list with conversation text @@ -498,6 +499,7 @@ target: "elm.swallow.colorbar"; target: "elm.icon.1"; target: "elm.icon.2"; target: "elm.icon.3"; target: "elm.icon.4"; target: "elm.icon.5"; ) + GENLIST_PROGRAM_SOUND("elm.icon.4.touch") } // email outbox style with conversation diff --git a/themes/widgets/genlist/genlist_macro.edc b/themes/widgets/genlist/genlist_macro.edc index 5b28ace..8530da3 100755 --- a/themes/widgets/genlist/genlist_macro.edc +++ b/themes/widgets/genlist/genlist_macro.edc @@ -1691,41 +1691,23 @@ } \ } -#define GENLIST_PROGRAM_SELECT( TARGET ) \ - program { name: "selected"; \ - signal: "elm,state,selected"; \ - source: "elm"; \ - action: STATE_SET "selected" 0.0; \ - TARGET \ - } \ - program { name: "selected,nosound"; \ - signal: "elm,state,selected"; \ - source: "elm,nosound"; \ - action: STATE_SET "selected" 0.0; \ - TARGET \ - } \ - program { name: "unselected"; \ - signal: "elm,state,unselected"; \ - source: "elm"; \ - action: STATE_SET "default" 0.0; \ - TARGET \ - } \ - program { name: "play_sound_base"; \ +#define GENLIST_PROGRAM_SOUND( SRC ) \ + program { name: "play_sound"SRC; \ signal: "mouse,clicked,1"; \ - source: "base"; \ + source: SRC; \ script { \ new st[31]; \ new Float:vl; \ get_state(PART:"base", st, 30, vl); \ if (strcmp(st, "disabled")) \ - run_program(PROGRAM:"play_button_press"); \ + run_program(PROGRAM:"play_button_press"SRC); \ } \ } \ - program { name: "play_button_press"; \ + program { name: "play_button_press"SRC; \ action: PLAY_SAMPLE "button-pressed" 1.0; \ } -#define GENLIST_PROGRAM_SELECT_NOSOUND( TARGET ) \ +#define GENLIST_PROGRAM_SELECT( TARGET ) \ program { name: "selected"; \ signal: "elm,state,selected"; \ source: "elm"; \ @@ -1735,7 +1717,6 @@ program { name: "unselected"; \ signal: "elm,state,unselected"; \ source: "elm"; \ - transition: LINEAR 0.1; \ action: STATE_SET "default" 0.0; \ TARGET \ } @@ -1758,25 +1739,6 @@ set_state(PART:"bg_dialogue", "selected", 0.0); \ run_program(PROGRAM:"target_selected"); \ } \ - after: "play_button_press"; \ - } \ - program { name: "selected,nosound"; \ - signal: "elm,state,selected"; \ - source: "elm,nosound"; \ - script { \ - new st[31]; \ - new Float:vl; \ - get_state(PART:"bg_dialogue", st, 30, vl); \ - if (!strcmp(st, "top")) \ - set_state(PART:"bg_dialogue", "top_selected", 0.0); \ - else if (!strcmp(st, "center")) \ - set_state(PART:"bg_dialogue", "center_selected", 0.0); \ - else if (!strcmp(st, "bottom")) \ - set_state(PART:"bg_dialogue", "bottom_selected", 0.0); \ - else if (!strcmp(st, "default")) \ - set_state(PART:"bg_dialogue", "selected", 0.0); \ - run_program(PROGRAM:"target_selected"); \ - } \ } \ program { name: "unselected"; \ signal: "elm,state,unselected"; \ @@ -1800,9 +1762,6 @@ action: STATE_SET "selected" 0.0; \ TARGET \ }\ - program { name: "play_button_press"; \ - action: PLAY_SAMPLE "button-pressed" 1.0; \ - } \ program { name: "target_unselected"; \ action: STATE_SET "default" 0.0; \ TARGET \ @@ -2018,6 +1977,7 @@ target: "bottom_line2"; \ target: "bg_reorder"; \ ) \ + GENLIST_PROGRAM_SOUND("base") \ GENLIST_PROGRAM_EXPAND_FADE( TARGET \ target: "bg"; \ target: "bottom_line"; \ @@ -2059,6 +2019,7 @@ action: STATE_SET "2depth" 0.0; \ target: "bg_dialogue_clip"; \ } \ + GENLIST_PROGRAM_SOUND("base") \ GENLIST_PROGRAM_EXPAND_FADE( TARGET \ target: "bg_dialogue"; \ ) \ @@ -2090,53 +2051,14 @@ target: "bg_reorder"; \ TARGET \ ) \ - program { name: "selected"; \ - signal: "elm,state,selected"; \ - source: "elm"; \ - action: STATE_SET "selected" 0.0; \ - target: "bg"; \ - target: "bottom_line"; \ - target: "bottom_line2"; \ - target: "bg_reorder"; \ - TARGET \ - after: "play_button_press"; \ - } \ - program { name: "selected,nosound"; \ - signal: "elm,state,selected"; \ - source: "elm,nosound"; \ - action: STATE_SET "selected" 0.0; \ - target: "bg"; \ - target: "bottom_line"; \ - target: "bottom_line2"; \ - target: "bg_reorder"; \ - TARGET \ - } \ - program { name: "unselected"; \ - signal: "elm,state,unselected"; \ - source: "elm"; \ - action: STATE_SET "default" 0.0; \ + GENLIST_PROGRAM_SELECT( \ target: "bg"; \ target: "bottom_line"; \ target: "bottom_line2"; \ target: "bg_reorder"; \ - } \ - program { name: "unselected_target"; \ - action: STATE_SET "default" 0.0; \ TARGET \ - } \ - program { name: "unselected_read"; \ - signal: "elm,state,unselected"; \ - source: "elm"; \ - script { \ - if (get_int(readed) == 1) \ - run_program(PROGRAM:"go_read_target"); \ - else \ - run_program(PROGRAM:"unselected_target"); \ - } \ - } \ - program { name: "play_button_press"; \ - action: PLAY_SAMPLE "button-pressed" 1.0; \ - } \ + ) \ + GENLIST_PROGRAM_SOUND("base") \ GENLIST_PROGRAM_EXPAND_FADE( \ target: "bg"; \ target: "bottom_line"; \ @@ -2157,6 +2079,20 @@ target: "elm.padding.left"; \ target: "elm.padding.right"; \ ) \ + program { name: "unselected_target"; \ + action: STATE_SET "default" 0.0; \ + TARGET \ + } \ + program { name: "unselected_read"; \ + signal: "elm,state,unselected"; \ + source: "elm"; \ + script { \ + if (get_int(readed) == 1) \ + run_program(PROGRAM:"go_read_target"); \ + else \ + run_program(PROGRAM:"unselected_target"); \ + } \ + } \ program { name: "go_read"; \ signal: "elm,state,read"; \ source: "*"; \ @@ -2165,10 +2101,6 @@ run_program(PROGRAM:"go_read_target"); \ } \ } \ - program { name: "go_read_target"; \ - action: STATE_SET "read" 0.0; \ - TARGET \ - } \ program { name: "go_unread"; \ signal: "elm,state,unread"; \ source: "*"; \ @@ -2177,6 +2109,10 @@ run_program(PROGRAM:"go_unread_target"); \ } \ } \ + program { name: "go_read_target"; \ + action: STATE_SET "read" 0.0; \ + TARGET \ + } \ program { name: "go_unread_target"; \ action: STATE_SET "unread" 0.0; \ TARGET \ -- 2.7.4