projects / profile / ivi / efl-theme-tizen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f56655a)
[Button] Multisense enabling for Button Widget.
authorAmit Kamboj <amit.kamboj@samsung.com>
Thu, 10 May 2012 06:45:06 +0000 (12:15 +0530)
committerAmit Kamboj <amit.kamboj@samsung.com>
Thu, 10 May 2012 11:07:46 +0000 (16:37 +0530)
Change-Id: I324a9eec82c208d6a850dcae98f32cd6cf842950

themes/Makefile patch | blob | history
themes/sounds/S_Touch_30ms.wav [new file with mode: 0644] patch | blob
themes/widgets/button.edc patch | blob | history

diff --git a/themes/Makefile b/themes/Makefile
index deb923a..1656309 100644 (file)
--- a/themes/Makefile
+++ b/themes/Makefile
@@ -11,8 +11,7 @@ all: tizen-hd tizen-black-hd
 .SUFFIXES: .edc .edj
 .edc.edj:
        cp ./inc/$(@:.edj=-inc.edc) ./inc/tmp-inc.edc
-       #edje_cc -v -id ./images/$(@:.edj=) -sd ./sounds -fd ../objects $(@:.edj=.edc) # commented -sd ./sounds
-       edje_cc $(EDJE_FLAGS_$(V)) -id ./images/$(@:.edj=) -fd ../objects $(@:.edj=.edc)
+       edje_cc $(EDJE_FLAGS_$(V)) -id ./images/$(@:.edj=) -sd ./sounds -fd ../objects $(@:.edj=.edc)
        rm ./inc/tmp-inc.edc
 
 tizen-hd: tizen-hd.edj
diff --git a/themes/sounds/S_Touch_30ms.wav b/themes/sounds/S_Touch_30ms.wav
new file mode 100644 (file)
index 0000000..99ba74d
Binary files /dev/null and b/themes/sounds/S_Touch_30ms.wav differ
diff --git a/themes/widgets/button.edc b/themes/widgets/button.edc
index fc7da13..730d56d 100644 (file)
--- a/themes/widgets/button.edc
+++ b/themes/widgets/button.edc
@@ -19,6 +19,13 @@
 #define BUTTON_STATE_ENABLED 0
 #define BUTTON_STATE_DISABLED 1
 
+   sounds {
+      sample {
+         name: "touch_sound" AS_IS;
+         source: "S_Touch_30ms.wav";
+      }
+   }
+
 ///////////////////////////////////////////////////////////////////////////////////////
    group { name: "elm/button/base/style1";
       alias: "elm/button/base/text_only/style1";
@@ -349,9 +356,13 @@
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "text_show";
@@ -811,9 +822,13 @@
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "text_show";
@@ -1278,9 +1293,13 @@
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "text_show";
@@ -1740,9 +1759,13 @@
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "text_show";
@@ -2207,9 +2230,13 @@ base: "font=SLP:style=Roman font_size="BUTTON_TEXT_STYLE2_MULTILINE_FONT_SIZE_IN
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "text_show";
@@ -2624,9 +2651,13 @@ base: "font=SLP:style=Roman font_size="BUTTON_TEXT_STYLE2_MULTILINE_FONT_SIZE_IN
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "text_show";
@@ -3037,9 +3068,13 @@ base: "font=SLP:style=Roman font_size="BUTTON_TEXT_STYLE2_MULTILINE_FONT_SIZE_IN
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "text_show";
@@ -3454,9 +3489,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "text_show";
@@ -3856,9 +3895,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "text_show";
@@ -4230,9 +4273,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "text_show";
@@ -4601,9 +4648,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "text_show";
@@ -4819,9 +4870,13 @@ group { name: "elm/button/base/searchbar/default";
             target: "button_image"; \
             target: "button_center_part"; \
          } \
-         program { name: "button_unclick2"; \
+         program { name: "touch_snd"; \
             signal: "mouse,clicked,1"; \
             source: "over1"; \
+            action: PLAY_SAMPLE "touch_sound" 1.0; \
+            after: button_unclick3; \
+         } \
+         program { name: "button_unclick3"; \
             action: SIGNAL_EMIT "elm,action,click" ""; \
          } \
          program { name: "disable"; \
@@ -5039,9 +5094,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over1";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "text_show";
@@ -5231,9 +5290,13 @@ group { name: "elm/button/base/searchbar/default";
             target: "button_image"; \
             target: "button_center_part"; \
          } \
-         program { name: "button_unclick2"; \
+         program { name: "touch_snd"; \
             signal: "mouse,clicked,1"; \
             source: "over1"; \
+            action: PLAY_SAMPLE "touch_sound" 1.0; \
+            after: button_unclick3; \
+         } \
+         program { name: "button_unclick3"; \
             action: SIGNAL_EMIT "elm,action,click" ""; \
          } \
          program { name: "disable"; \
@@ -5524,9 +5587,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "text_show";
@@ -5940,9 +6007,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "text_show";
@@ -6319,9 +6390,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "text_show";
@@ -6529,9 +6604,13 @@ group { name: "elm/button/base/searchbar/default";
             } \
             after: button_unpress; \
          } \
-         program { name: "button_unclick3"; \
+         program { name: "touch_snd"; \
             signal: "mouse,clicked,1"; \
             source: "over2"; \
+            action: PLAY_SAMPLE "touch_sound" 1.0; \
+            after: button_unclick3; \
+         } \
+         program { name: "button_unclick3"; \
             action: SIGNAL_EMIT "elm,action,click" ""; \
          } \
          program { name: "disable"; \
@@ -6841,9 +6920,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "text_show";
@@ -7248,9 +7331,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "text_show";
@@ -7657,9 +7744,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "text_show";
@@ -7964,9 +8055,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "text_show";
@@ -8147,9 +8242,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "disable";
@@ -8313,9 +8412,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "disable";
@@ -8489,9 +8592,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "disable";
@@ -8851,9 +8958,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "text_show";
@@ -9254,9 +9365,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "text_show";
@@ -9677,9 +9792,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "text_show";
@@ -9904,9 +10023,13 @@ group { name: "elm/button/base/searchbar/default";
             target: "button_image"; \
             target: "icon_part"; \
          } \
-         program { name: "button_unclick2"; \
+         program { name: "touch_snd"; \
             signal: "mouse,clicked,1"; \
             source: "over1"; \
+            action: PLAY_SAMPLE "touch_sound" 1.0; \
+            after: button_unclick3; \
+         } \
+         program { name: "button_unclick3"; \
             action: SIGNAL_EMIT "elm,action,click" ""; \
          } \
          program { name: "disable"; \
@@ -10030,9 +10153,13 @@ group { name: "elm/button/base/searchbar/default";
             target: "button_image";
             target: "more_image";
          }
-         program { name: "button_unclick2";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "disable";
@@ -10380,9 +10507,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "text_show";
@@ -10734,9 +10865,13 @@ group { name: "elm/button/base/searchbar/default";
             }
             after: button_unpress;
          }
-         program { name: "button_unclick3";
+         program { name: "touch_snd";
             signal: "mouse,clicked,1";
             source: "over2";
+            action: PLAY_SAMPLE "touch_sound" 1.0;
+            after: button_unclick3;
+         }
+         program { name: "button_unclick3";
             action: SIGNAL_EMIT "elm,action,click" "";
          }
          program { name: "text_show";
Domain: UI Framework / EFL;