TizenRefApp-8087 [MomentBar] Implement graphic components according to new GUI 61/116861/1 submit/tizen/20170306.062950
authorIgor Olshevskyi <i.olshevskyi@samsung.com>
Tue, 28 Feb 2017 12:59:11 +0000 (14:59 +0200)
committerIgor Olshevskyi <i.olshevskyi@samsung.com>
Tue, 28 Feb 2017 13:21:10 +0000 (15:21 +0200)
Change-Id: I72079f8613830ea76f7d9135b26256ff09344d39

85 files changed:
edc/images/4level/no_signal.png [new file with mode: 0644]
edc/images/4level/roaming_strength_00.png
edc/images/4level/roaming_strength_01.png
edc/images/4level/roaming_strength_02.png
edc/images/4level/roaming_strength_03.png
edc/images/4level/roaming_strength_04.png
edc/images/4level/signal_strength_00.png
edc/images/4level/signal_strength_01.png
edc/images/4level/signal_strength_02.png
edc/images/4level/signal_strength_03.png
edc/images/4level/signal_strength_04.png
edc/images/Battery/battery_05.png
edc/images/Battery/battery_10.png
edc/images/Battery/battery_100.png
edc/images/Battery/battery_15.png
edc/images/Battery/battery_20.png
edc/images/Battery/battery_25.png
edc/images/Battery/battery_30.png
edc/images/Battery/battery_35.png
edc/images/Battery/battery_40.png
edc/images/Battery/battery_45.png
edc/images/Battery/battery_50.png
edc/images/Battery/battery_55.png
edc/images/Battery/battery_60.png
edc/images/Battery/battery_65.png
edc/images/Battery/battery_70.png
edc/images/Battery/battery_75.png
edc/images/Battery/battery_80.png
edc/images/Battery/battery_85.png
edc/images/Battery/battery_90.png
edc/images/Battery/battery_95.png
edc/images/Battery/battery_bg.png
edc/images/Battery/battery_charge.png
edc/images/Battery/battery_no.png
edc/images/Battery/battery_not_charge.png
edc/images/Battery/battery_unknown.png
edc/images/Controls/b_moment_more_opt_ic_bg.png [deleted file]
edc/images/Controls/brightness.png
edc/images/Controls/call_forwarding.png
edc/images/Controls/donotdisturb.png
edc/images/Controls/esim.png
edc/images/Controls/flight_mode.png
edc/images/Controls/multimedia.png
edc/images/Controls/multimedia_off.png
edc/images/Controls/music.png
edc/images/Controls/powersaving.png [deleted file]
edc/images/Controls/ringtone.png [deleted file]
edc/images/Controls/speaker.png [deleted file]
edc/images/Controls/speaker_off.png [deleted file]
edc/images/Controls/vibrate.png
edc/images/Controls/vzw_donotdisturb.png [deleted file]
edc/images/b_moment_3g_more_opt_bluetooth_ic.png
edc/images/b_moment_3g_more_opt_remotely_ic.png
edc/images/b_moment_3g_more_opt_standalone_ic.png
edc/images/b_moment_more_opt_bar.png
edc/images/b_more_option_sub_btn_bg.png [new file with mode: 0644]
edc/windicator_action_btn_brightness.edc [new file with mode: 0644]
edc/windicator_action_btn_call_fwd.edc [new file with mode: 0644]
edc/windicator_action_btn_dnd.edc [new file with mode: 0644]
edc/windicator_action_btn_flight_mode.edc [new file with mode: 0644]
edc/windicator_action_btn_music.edc [new file with mode: 0644]
edc/windicator_action_btn_volume.edc [new file with mode: 0644]
edc/windicator_battery_icon.edc
edc/windicator_battery_layout.edc [deleted file]
edc/windicator_brightness.edc [deleted file]
edc/windicator_callfwd_layout.edc [deleted file]
edc/windicator_color_classes.edc
edc/windicator_common_defines.edc [new file with mode: 0644]
edc/windicator_dnd_layout.edc [deleted file]
edc/windicator_dynamic.edc
edc/windicator_flight_mode_layout.edc [deleted file]
edc/windicator_moment_bar.edc
edc/windicator_moment_view.edc
edc/windicator_music_layout.edc [deleted file]
edc/windicator_scs.edc
edc/windicator_volume.edc [deleted file]
res/edje/windicator.edc
src/windicator_battery.c
src/windicator_brightness.c
src/windicator_call_fwd_btn.c
src/windicator_dnd_btn.c
src/windicator_flight_mode.c
src/windicator_moment_bar.c
src/windicator_music_btn.c
src/windicator_volume.c

diff --git a/edc/images/4level/no_signal.png b/edc/images/4level/no_signal.png
new file mode 100644 (file)
index 0000000..c6e9b8f
Binary files /dev/null and b/edc/images/4level/no_signal.png differ
index baba9ec1e92ddc434380db5d129ee12124d7acd1..052a0b2d0a4ce409e69b8f8b90dcc06a510ae60a 100644 (file)
Binary files a/edc/images/4level/roaming_strength_00.png and b/edc/images/4level/roaming_strength_00.png differ
index 293a7ad323621c6befe78d91a517c0fd2351c4c5..fb621b9c2c2017bce08b769d9b54dfbe0e6d1c97 100644 (file)
Binary files a/edc/images/4level/roaming_strength_01.png and b/edc/images/4level/roaming_strength_01.png differ
index 58860f658d76b1aca08082b3fac651f3913b3e4e..ef0aa326b778f4b09bbfbe9d4e040200e372dd57 100644 (file)
Binary files a/edc/images/4level/roaming_strength_02.png and b/edc/images/4level/roaming_strength_02.png differ
index c7478b82c6d603483975442bd09a0eca82114441..fdc3da1d500ae57b06054438099c94487d8c30a4 100644 (file)
Binary files a/edc/images/4level/roaming_strength_03.png and b/edc/images/4level/roaming_strength_03.png differ
index 48d01349db45c3b76e457d526f22c52776e5d589..d591eb383812f71419ace716fc6404611b7538f5 100644 (file)
Binary files a/edc/images/4level/roaming_strength_04.png and b/edc/images/4level/roaming_strength_04.png differ
index 455e7a3082281defa5097a17cddb08e75974733a..ea36483590dd6f39a8eb0e83cbd9473b691485c5 100644 (file)
Binary files a/edc/images/4level/signal_strength_00.png and b/edc/images/4level/signal_strength_00.png differ
index dd5b16658f06afd274a95851ffa403d23ecd5960..06d47b97f095e4e9aa250fcc0fc799ead953bff6 100644 (file)
Binary files a/edc/images/4level/signal_strength_01.png and b/edc/images/4level/signal_strength_01.png differ
index c0927f138a15525803f96521d363a7c2608b4291..a518eed77e813a5a95e07790c9ef3fb1fc83eb54 100644 (file)
Binary files a/edc/images/4level/signal_strength_02.png and b/edc/images/4level/signal_strength_02.png differ
index 3c33b73faedd99a56e37b72efb70439f51443623..ae0314a409d41b37c3ee33579f72a56dd5daf725 100644 (file)
Binary files a/edc/images/4level/signal_strength_03.png and b/edc/images/4level/signal_strength_03.png differ
index f0278d772951717aba6e876cd7429dcc44db5b06..b567539ec66785caa3b29ad514cefa3253ecd711 100644 (file)
Binary files a/edc/images/4level/signal_strength_04.png and b/edc/images/4level/signal_strength_04.png differ
index 41f329e627caee44c1248183816cddd4c6b79d44..2620afec79d30a8886ef0282194a402165b561ec 100644 (file)
Binary files a/edc/images/Battery/battery_05.png and b/edc/images/Battery/battery_05.png differ
index ee3473bbdd30a771903fd3c67e74f14716117da5..b0732ae7f4280a0a3f11f4e6362f9d242772ca2b 100644 (file)
Binary files a/edc/images/Battery/battery_10.png and b/edc/images/Battery/battery_10.png differ
index 24ed24831acf90539c34d44b997cbdafe69f8804..41e28024dc270713f59439e1628987ce3f8564ca 100644 (file)
Binary files a/edc/images/Battery/battery_100.png and b/edc/images/Battery/battery_100.png differ
index c71fa68730ce7f0f3ea47a80e3f3988de79aac7e..5965b679f319911febafdefdca263f7efbb7a857 100644 (file)
Binary files a/edc/images/Battery/battery_15.png and b/edc/images/Battery/battery_15.png differ
index 6d134605833e576552842d77ac02d3a24a7854ab..ab55514f373893c24352ef0083d3f9f098334f18 100644 (file)
Binary files a/edc/images/Battery/battery_20.png and b/edc/images/Battery/battery_20.png differ
index b9e7f4f3395c3eccca56415645a1bff7c61745d8..203d14e8a70c1cdf802b7c5530d8dbd9e65935a5 100644 (file)
Binary files a/edc/images/Battery/battery_25.png and b/edc/images/Battery/battery_25.png differ
index 8644974257b58265ea224f97ff20a5fcc8a92906..294175941f3f19368e6190de84962d545caa2a2e 100644 (file)
Binary files a/edc/images/Battery/battery_30.png and b/edc/images/Battery/battery_30.png differ
index 6fcc329c2585c03bceba1e0096c9710ad641183b..9b38c9fcb0446bd5b91d76e5854f994a54bc31fa 100644 (file)
Binary files a/edc/images/Battery/battery_35.png and b/edc/images/Battery/battery_35.png differ
index 82c6d581352fde68bf5873d3a160d9553db381f8..93a5a8ec466230171f7a814e5f21e2140a2ed60b 100644 (file)
Binary files a/edc/images/Battery/battery_40.png and b/edc/images/Battery/battery_40.png differ
index 83c020b033c9b2292a85272064087aaa799d3e36..ee4927cd633ed54e2846b4f325175d5d4f7e36d5 100644 (file)
Binary files a/edc/images/Battery/battery_45.png and b/edc/images/Battery/battery_45.png differ
index 568714c1b9594807b0f1117ee7e5dea0f322f287..f1acf97b0ab2035830990d96a6875f8fe6693a10 100644 (file)
Binary files a/edc/images/Battery/battery_50.png and b/edc/images/Battery/battery_50.png differ
index 1a42def15755397fc6b95b8f2a803078c4c9c13e..cea04001a1d99106373f0c260dc66ab80003f2f0 100644 (file)
Binary files a/edc/images/Battery/battery_55.png and b/edc/images/Battery/battery_55.png differ
index bb9351d271da4b5abcdee192cbe116caf2f4e65c..b192c5188883257c7657d64e7276a98ca62b734a 100644 (file)
Binary files a/edc/images/Battery/battery_60.png and b/edc/images/Battery/battery_60.png differ
index e150e0679b6d685633c6713467903fd053527604..3f68d06e12308c74ba05f880fd27ade3b6a934c4 100644 (file)
Binary files a/edc/images/Battery/battery_65.png and b/edc/images/Battery/battery_65.png differ
index 20d0e57f562fbe88e60bfea07ae4c60c93d2913f..dd72025474ea0e63e55b3c0f59f2006407520abb 100644 (file)
Binary files a/edc/images/Battery/battery_70.png and b/edc/images/Battery/battery_70.png differ
index 0a40482682e9f5a2390273402c4a4bc200557ebf..00aa2872ba4121cc813c5b8cc230fee9a03c0406 100644 (file)
Binary files a/edc/images/Battery/battery_75.png and b/edc/images/Battery/battery_75.png differ
index 69ba923658c30d1e71df3af0e037619cf812f1e3..25c5f3b2016d5f41e2018e959e42e973c608f24e 100644 (file)
Binary files a/edc/images/Battery/battery_80.png and b/edc/images/Battery/battery_80.png differ
index 78c882d72b6154b8794f1010b269fc6a751d8530..d950c65228f16d65f608bceda9fd9bec07110b08 100644 (file)
Binary files a/edc/images/Battery/battery_85.png and b/edc/images/Battery/battery_85.png differ
index b62e02b7998e72ca8cd49f365e93b6070544a114..c553d097e03e9201aa253b1ca627192d72d5353e 100644 (file)
Binary files a/edc/images/Battery/battery_90.png and b/edc/images/Battery/battery_90.png differ
index faec49935baf5e13ddba37c393bc3029e4e3eece..9f721d6b753f2eae6f3ba9c213b568ddf9050a3a 100644 (file)
Binary files a/edc/images/Battery/battery_95.png and b/edc/images/Battery/battery_95.png differ
index b72b152a94ce7374a119f1d498dc99531de09e3f..4e4cb1245fe0c0651d3e210f748063166bcb3e8f 100644 (file)
Binary files a/edc/images/Battery/battery_bg.png and b/edc/images/Battery/battery_bg.png differ
index 0bd5c8f8e5c1aa44b425f046c0b8c2ada80cdd89..aa1ced510b3e9f5debb858212681d1f0ad94dba9 100644 (file)
Binary files a/edc/images/Battery/battery_charge.png and b/edc/images/Battery/battery_charge.png differ
index 04eb89a96ea00f109e316bfa6dbd84b93e8a823d..9472f8c09ff08941557246152d18a5a74b5a1ca7 100644 (file)
Binary files a/edc/images/Battery/battery_no.png and b/edc/images/Battery/battery_no.png differ
index ac70ab86489ad56e109c0a43bd8439c7e5294e4b..f413531ed52644d6b9eff4da0e665604749cb62b 100644 (file)
Binary files a/edc/images/Battery/battery_not_charge.png and b/edc/images/Battery/battery_not_charge.png differ
index 2a2899858e492439b11e18895e9d41583ea9840c..e94fbe6ff4d107eac3396796b6a9920c87eabb18 100644 (file)
Binary files a/edc/images/Battery/battery_unknown.png and b/edc/images/Battery/battery_unknown.png differ
diff --git a/edc/images/Controls/b_moment_more_opt_ic_bg.png b/edc/images/Controls/b_moment_more_opt_ic_bg.png
deleted file mode 100644 (file)
index 90123c7..0000000
Binary files a/edc/images/Controls/b_moment_more_opt_ic_bg.png and /dev/null differ
index ff6ed43f6acadbfbf865f4590bb4d7ca5687f984..dbc61d04e4e10732bae2c3ae03e9e4928d25abfe 100644 (file)
Binary files a/edc/images/Controls/brightness.png and b/edc/images/Controls/brightness.png differ
index 1ff956debb2fb0047608c6f2b07a9a6f314381f0..58bc5868572e12b9c2141b559307522894b30714 100644 (file)
Binary files a/edc/images/Controls/call_forwarding.png and b/edc/images/Controls/call_forwarding.png differ
index 614623eb5d6d1e47a4779e1c8d01d213589ac40c..26edffc3fa3acbdf0b3120c290908641d581a6e9 100644 (file)
Binary files a/edc/images/Controls/donotdisturb.png and b/edc/images/Controls/donotdisturb.png differ
index e47613cf464b4d6869c6fc5855f5e58488a45ecc..32ff32483810e6dd2c2fd705a6688ca14337fcb4 100644 (file)
Binary files a/edc/images/Controls/esim.png and b/edc/images/Controls/esim.png differ
index 1a3eebf045475a1e303552993a39269a069be1b1..c4486ac5088af4373b0afac710f7e91bbec389b4 100644 (file)
Binary files a/edc/images/Controls/flight_mode.png and b/edc/images/Controls/flight_mode.png differ
index 82b9fec07fe0c1d917c50b0c8c07395ab9400b81..087778bfebb9c9df529ffa74fb459703cc17cce7 100644 (file)
Binary files a/edc/images/Controls/multimedia.png and b/edc/images/Controls/multimedia.png differ
index 977b489b2778ec22df04f741adc3d4520c59df41..d124ec279aa62eeb9a71275d381f4707bac976ed 100644 (file)
Binary files a/edc/images/Controls/multimedia_off.png and b/edc/images/Controls/multimedia_off.png differ
index 64d690ebd3bfc6a387db335e0c3ed9693d96789f..e91e54b028db27065a030b85882b3b5a08bb1644 100644 (file)
Binary files a/edc/images/Controls/music.png and b/edc/images/Controls/music.png differ
diff --git a/edc/images/Controls/powersaving.png b/edc/images/Controls/powersaving.png
deleted file mode 100644 (file)
index 43b3fa7..0000000
Binary files a/edc/images/Controls/powersaving.png and /dev/null differ
diff --git a/edc/images/Controls/ringtone.png b/edc/images/Controls/ringtone.png
deleted file mode 100644 (file)
index fc840f9..0000000
Binary files a/edc/images/Controls/ringtone.png and /dev/null differ
diff --git a/edc/images/Controls/speaker.png b/edc/images/Controls/speaker.png
deleted file mode 100644 (file)
index 8d1d1de..0000000
Binary files a/edc/images/Controls/speaker.png and /dev/null differ
diff --git a/edc/images/Controls/speaker_off.png b/edc/images/Controls/speaker_off.png
deleted file mode 100644 (file)
index fc03879..0000000
Binary files a/edc/images/Controls/speaker_off.png and /dev/null differ
index 3c3fc06ffc30cd099800703e06b058511443a5f8..395818fc2af6c1154cd5b652ea0a30818dfc73eb 100644 (file)
Binary files a/edc/images/Controls/vibrate.png and b/edc/images/Controls/vibrate.png differ
diff --git a/edc/images/Controls/vzw_donotdisturb.png b/edc/images/Controls/vzw_donotdisturb.png
deleted file mode 100644 (file)
index df04594..0000000
Binary files a/edc/images/Controls/vzw_donotdisturb.png and /dev/null differ
index e196aa80942db1ae33e9410c5bcffd26df2efcc4..b3799dfc2ddbe29ef1fd3a40ec66b9ff06812aee 100644 (file)
Binary files a/edc/images/b_moment_3g_more_opt_bluetooth_ic.png and b/edc/images/b_moment_3g_more_opt_bluetooth_ic.png differ
index 0653e728db6dd1a318ffaf6ecf1c49812ce30388..58be511a57ff3c583aa856c3acafe51765cf2774 100644 (file)
Binary files a/edc/images/b_moment_3g_more_opt_remotely_ic.png and b/edc/images/b_moment_3g_more_opt_remotely_ic.png differ
index bf315c86da62b498605b8e51ddf8c0bad8d0d5a4..ba11b67fc2c8bc928836fbee0c8e8e64dbd450a2 100644 (file)
Binary files a/edc/images/b_moment_3g_more_opt_standalone_ic.png and b/edc/images/b_moment_3g_more_opt_standalone_ic.png differ
index 8d74454624c6f4d1c2ea0397e2759cd7e961a45d..60e0d152ceee7ca37aba8a3642149ac0db906b29 100644 (file)
Binary files a/edc/images/b_moment_more_opt_bar.png and b/edc/images/b_moment_more_opt_bar.png differ
diff --git a/edc/images/b_more_option_sub_btn_bg.png b/edc/images/b_more_option_sub_btn_bg.png
new file mode 100644 (file)
index 0000000..adeab65
Binary files /dev/null and b/edc/images/b_more_option_sub_btn_bg.png differ
diff --git a/edc/windicator_action_btn_brightness.edc b/edc/windicator_action_btn_brightness.edc
new file mode 100644 (file)
index 0000000..7d101d7
--- /dev/null
@@ -0,0 +1,71 @@
+/*
+ * Samsung API
+ * Copyright (c) 2013 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Flora License, Version 1.1 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+styles {
+       style {
+               name: "style_txt_brightness";
+               base: "font=Tizen font_weight=Bold font_width=Condensed font_size=20 align=center valign=center color=#ffffffff";
+               tag: "br" "\n";
+               tag: "hilight" "+ color=#ffff";
+               tag: "b" "+ color=#ffff";
+               tag: "tab" "\t";
+       }
+}
+
+group {
+       name : "windicator/action_btn/brightness";
+       images {
+               image : "Controls/brightness.png" COMP;
+       }
+       parts {
+               ACTION_BTN_PRESS_EFFECT_PART
+               part {
+                       name : "img.brightness.icon";
+                       type : IMAGE;
+                       scale : 1;
+                       description {
+                               state : "default" 0.0;
+                               min : ACTION_BTN_WIDTH ACTION_BTN_HEIGHT;
+                               max : ACTION_BTN_WIDTH ACTION_BTN_HEIGHT;
+                               fixed : 1 1;
+                               image.normal: "Controls/brightness.png";
+                               color_class : "AO012";
+                       }
+               }
+               part {
+                       name : "txt.brightness";
+                       type : TEXTBLOCK;
+                       scale : 1;
+                       description {
+                               state : "default" 0.0;
+                               max : ACTION_BTN_TEXT_WIDTH ACTION_BTN_TEXT_HEIGHT;
+                               min : ACTION_BTN_TEXT_WIDTH ACTION_BTN_TEXT_HEIGHT;
+                               fixed : 1 1;
+                               align : 0.5 0.0;
+                               rel1 { relative : 0.5 ACTION_BTN_TEXT_REL1_H; to : "img.brightness.icon"; }
+                               rel2 { relative : 0.5 1.0; to : "img.brightness.icon"; }
+                               text {
+                                       min : 0 1;
+                                       style : "style_txt_brightness";
+                               }
+                       }
+               }
+       }
+       programs {
+               ACTION_BTN_PRESS_EFFECT_PROGRAM
+       }
+}
diff --git a/edc/windicator_action_btn_call_fwd.edc b/edc/windicator_action_btn_call_fwd.edc
new file mode 100644 (file)
index 0000000..476cf4b
--- /dev/null
@@ -0,0 +1,90 @@
+/*
+ * Samsung API
+ * Copyright (c) 2013 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Flora License, Version 1.1 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+group {
+       name : "windicator/action_btn/call_fwd";
+       images {
+               image : "Controls/call_forwarding.png" COMP;
+               image : "Controls/esim.png" COMP;
+               image : "Indicator_business/call_forwarding_business.png" COMP;
+       }
+       parts {
+               ACTION_BTN_PRESS_EFFECT_PART
+               part {
+                       name : "img.callfwd.icon";
+                       type : IMAGE;
+                       scale : 1;
+                       description {
+                               state : "default" 0.0;
+                               min : ACTION_BTN_WIDTH ACTION_BTN_HEIGHT;
+                               max : ACTION_BTN_WIDTH ACTION_BTN_HEIGHT;
+                               fixed : 1 1;
+                               image.normal: "Controls/call_forwarding.png";
+                               color_class : "AO012";
+                       }
+                       description {
+                               state : "numbersync" 0.0;
+                               inherit : "default" 0.0;
+                               image.normal: "Indicator_business/call_forwarding_business.png";
+                       }
+                       description {
+                               state : "esim" 0.0;
+                               inherit : "default" 0.0;
+                               image.normal: "Controls/esim.png";
+                       }
+                       description {
+                               state : "disable" 0.0;
+                               inherit : "default" 0.0;
+                               color_class : "AO012D";
+                       }
+               }
+       }
+       programs {
+               program {
+                       name : "img.callfwd.enable";
+                       signal : "img.callfwd.enable";
+                       source : "img.callfwd.icon";
+                       action : STATE_SET "default" 0.0;
+                       target : "img.callfwd.icon";
+               }
+               program {
+                       name : "img.callfwd.disable";
+                       signal : "img.callfwd.disable";
+                       source : "img.callfwd.icon";
+                       action : STATE_SET "disable" 0.0;
+                       target : "img.callfwd.icon";
+               }
+               /* Number sync */
+               program {
+                       name : "img.callfwd.numbersync";
+                       signal : "img.callfwd.numbersync";
+                       source : "img.callfwd.icon";
+                       action : STATE_SET "numbersync" 0.0;
+                       target : "img.callfwd.icon";
+               }
+               /* eSim */
+               program {
+                       name : "img.esim.enable";
+                       signal : "img.esim.enable";
+                       source : "img.callfwd.icon";
+                       action : STATE_SET "esim" 0.0;
+                       target : "img.callfwd.icon";
+               }
+
+               ACTION_BTN_PRESS_EFFECT_PROGRAM
+       }
+}
diff --git a/edc/windicator_action_btn_dnd.edc b/edc/windicator_action_btn_dnd.edc
new file mode 100644 (file)
index 0000000..6077a3e
--- /dev/null
@@ -0,0 +1,79 @@
+/*
+ * Samsung API
+ * Copyright (c) 2013 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Flora License, Version 1.1 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+group {
+       name : "windicator/action_btn/dnd";
+       images {
+               image : "Controls/donotdisturb.png" COMP;
+               image : "b_moment_more_opt_bar.png" COMP;
+       }
+       parts {
+               ACTION_BTN_PRESS_EFFECT_PART
+               part {
+                       name : "img.disturb.icon";
+                       type : IMAGE;
+                       scale : 1;
+                       description {
+                               state : "default" 0.0;
+                               min : ACTION_BTN_WIDTH ACTION_BTN_HEIGHT;
+                               max : ACTION_BTN_WIDTH ACTION_BTN_HEIGHT;
+                               fixed : 1 1;
+                               image.normal: "Controls/donotdisturb.png";
+                               color_class : "AO012";
+                       }
+               }
+               part {
+                       name : "img.disturb.bar";
+                       type : IMAGE;
+                       scale : 1;
+                       description {
+                               state : "default" 0.0;
+                               min : ACTION_BTN_BAR_WIDTH ACTION_BTN_BAR_HEIGHT;
+                               max : ACTION_BTN_BAR_WIDTH ACTION_BTN_BAR_HEIGHT;
+                               fixed : 1 1;
+                               align : 0.5 0.0;
+                               image.normal: "b_moment_more_opt_bar.png";
+                               color_class : "AO0211";
+                               rel1 { relative : 0.5 ACTION_BTN_BAR_REL1_H; to : "img.disturb.icon"; }
+                               rel2 { relative : 0.5 1.0; to : "img.disturb.icon"; }
+                       }
+                       description {
+                               state: "off" 0.0;
+                               inherit: "default";
+                               color_class : "AO0212";
+                       }
+               }
+       }
+       programs {
+               program {
+                       name: "dnd.enable";
+                       signal: "dnd.enable";
+                       source: "dnd.bg.icon";
+                       action: STATE_SET "default" 0.0;
+                       target: "img.disturb.bar";
+               }
+               program {
+                       name: "dnd.disable";
+                       signal: "dnd.disable";
+                       source: "dnd.bg.icon";
+                       action: STATE_SET "off" 0.0;
+                       target: "img.disturb.bar";
+               }
+
+               ACTION_BTN_PRESS_EFFECT_PROGRAM
+       }
+}
\ No newline at end of file
diff --git a/edc/windicator_action_btn_flight_mode.edc b/edc/windicator_action_btn_flight_mode.edc
new file mode 100644 (file)
index 0000000..4774c37
--- /dev/null
@@ -0,0 +1,79 @@
+/*
+ * Samsung API
+ * Copyright (c) 2013 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Flora License, Version 1.1 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+group {
+       name : "windicator/action_btn/flight_mode";
+       images {
+               image : "Controls/flight_mode.png" COMP;
+               image : "b_moment_more_opt_bar" COMP;
+       }
+       parts {
+               ACTION_BTN_PRESS_EFFECT_PART
+               part {
+                       name : "img.flight.icon";
+                       type : IMAGE;
+                       scale : 1;
+                       description {
+                               state : "default" 0.0;
+                               min : ACTION_BTN_WIDTH ACTION_BTN_HEIGHT;
+                               max : ACTION_BTN_WIDTH ACTION_BTN_HEIGHT;
+                               fixed : 1 1;
+                               image.normal: "Controls/flight_mode.png";
+                               color_class : "AO012";
+                       }
+               }
+               part {
+                       name : "img.flight.bar";
+                       type : IMAGE;
+                       scale : 1;
+                       description {
+                               state : "default" 0.0;
+                               min : ACTION_BTN_BAR_WIDTH ACTION_BTN_BAR_HEIGHT;
+                               max : ACTION_BTN_BAR_WIDTH ACTION_BTN_BAR_HEIGHT;
+                               fixed : 1 1;
+                               align : 0.5 0.0;
+                               image.normal: "b_moment_more_opt_bar.png";
+                               color_class : "AO0211";
+                               rel1 { relative : 0.5 ACTION_BTN_BAR_REL1_H; to : "img.flight.icon"; }
+                               rel2 { relative : 0.5 1.0; to : "img.flight.icon"; }
+                       }
+                       description {
+                               state: "off" 0.0;
+                               inherit: "default";
+                               color_class : "AO0212";
+                       }
+               }
+       }
+       programs {
+               program {
+                       name: "flight.enable";
+                       signal: "flight.enable";
+                       source: "flight.bg.icon";
+                       action: STATE_SET "default" 0.0;
+                       target: "img.flight.bar";
+               }
+               program {
+                       name: "flight.disable";
+                       signal: "flight.disable";
+                       source: "flight.bg.icon";
+                       action: STATE_SET "off" 0.0;
+                       target: "img.flight.bar";
+               }
+
+               ACTION_BTN_PRESS_EFFECT_PROGRAM
+       }
+}
\ No newline at end of file
diff --git a/edc/windicator_action_btn_music.edc b/edc/windicator_action_btn_music.edc
new file mode 100644 (file)
index 0000000..38e4eb6
--- /dev/null
@@ -0,0 +1,62 @@
+/*
+ * Samsung API
+ * Copyright (c) 2013 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Flora License, Version 1.1 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+group {
+       name : "windicator/action_btn/music";
+       images {
+               image : "Controls/music.png" COMP;
+       }
+       parts {
+               ACTION_BTN_PRESS_EFFECT_PART
+               part {
+                       name : "img.music.icon";
+                       type : IMAGE;
+                       scale : 1;
+                       description {
+                               state : "default" 0.0;
+                               min : ACTION_BTN_WIDTH ACTION_BTN_HEIGHT;
+                               max : ACTION_BTN_WIDTH ACTION_BTN_HEIGHT;
+                               fixed : 1 1;
+                               image.normal: "Controls/music.png";
+                               color_class : "AO012";
+                       }
+                       description {
+                               state : "disable" 0.0;
+                               inherit : "default" 0.0;
+                               color_class : "AO012D";
+                       }
+               }
+       }
+       programs {
+               program {
+                       name : "img.music.enable";
+                       signal : "img.music.enable";
+                       source : "img.music.icon";
+                       action : STATE_SET "default" 0.0;
+                       target : "img.music.icon";
+               }
+               program {
+                       name : "img.music.disable";
+                       signal : "img.music.disable";
+                       source : "img.music.icon";
+                       action : STATE_SET "disable" 0.0;
+                       target : "img.music.icon";
+               }
+
+               ACTION_BTN_PRESS_EFFECT_PROGRAM
+       }
+}
\ No newline at end of file
diff --git a/edc/windicator_action_btn_volume.edc b/edc/windicator_action_btn_volume.edc
new file mode 100644 (file)
index 0000000..83dc7d4
--- /dev/null
@@ -0,0 +1,134 @@
+/*
+ * Samsung API
+ * Copyright (c) 2013 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Flora License, Version 1.1 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+styles {
+       style {
+               name: "style_txt_volume";
+               base: "font=Tizen font_weight=Bold font_width=Condensed font_size=20 align=center valign=center color=#ffffffff";
+               tag: "br" "\n";
+               tag: "hilight" "+ color=#ffff";
+               tag: "b" "+ color=#ffff";
+               tag: "tab" "\t";
+       }
+}
+
+group {
+       name : "windicator/action_btn/volume";
+       images {
+               image : "Controls/multimedia.png" COMP;
+               image : "Controls/multimedia_off.png" COMP;
+               image : "Controls/vibrate.png" COMP;
+       }
+       parts {
+               ACTION_BTN_PRESS_EFFECT_PART
+               part {
+                       name : "img.volume.icon";
+                       type : IMAGE;
+                       scale : 1;
+                       repeat_events : 1;
+                       description {
+                               state : "default" 0.0;
+                               min : ACTION_BTN_WIDTH ACTION_BTN_HEIGHT;
+                               max : ACTION_BTN_WIDTH ACTION_BTN_HEIGHT;
+                               fixed : 1 1;
+                               image.normal: "Controls/multimedia.png";
+                               color_class : "AO012";
+                       }
+                       description {
+                               state: "mute" 0.0;
+                               inherit: "default";
+                               image.normal: "Controls/multimedia_off.png";
+                       }
+                       description {
+                               state: "media" 0.0;
+                               inherit: "default";
+                               image.normal: "Controls/multimedia.png";
+                       }
+                       description {
+                               state: "vibrate" 0.0;
+                               inherit: "default";
+                               image.normal: "Controls/vibrate.png";
+                       }
+               }
+               part {
+                       name : "txt.volume";
+                       type : TEXTBLOCK;
+                       scale : 1;
+                       description {
+                               state : "default" 0.0;
+                               max : ACTION_BTN_TEXT_WIDTH ACTION_BTN_TEXT_HEIGHT;
+                               min : ACTION_BTN_TEXT_WIDTH ACTION_BTN_TEXT_HEIGHT;
+                               fixed : 1 1;
+                               align : 0.5 0.0;
+                               rel1 { relative : 0.5 ACTION_BTN_TEXT_REL1_H; to : "img.volume.icon"; }
+                               rel2 { relative : 0.5 1.0; to : "img.volume.icon"; }
+                               text {
+                                       min : 0 1;
+                                       style : "style_txt_volume";
+                                       text : "0";
+                               }
+                       }
+                       description {
+                               state: "mute" 0.0;
+                               inherit: "default";
+                               visible: 0;
+                       }
+                       description {
+                               state: "media" 0.0;
+                               inherit: "default";
+                               visible: 1;
+                       }
+                       description {
+                               state: "vibrate" 0.0;
+                               inherit: "default";
+                               visible: 0;
+                       }
+               }
+       }
+       programs {
+               program {
+                       name: "volume.icon.ringtone";
+                       signal: "volume.icon.ringtone";
+                       source: "img.volume.icon";
+                       action: STATE_SET "default" 0.0;
+                       target: "img.volume.icon";
+               }
+               program {
+                       name: "volume.icon.mute";
+                       signal: "volume.icon.mute";
+                       source: "img.volume.icon";
+                       action: STATE_SET "mute" 0.0;
+                       target: "img.volume.icon";
+               }
+               program {
+                       name: "volume.icon.media";
+                       signal: "volume.icon.media";
+                       source: "img.volume.icon";
+                       action: STATE_SET "media" 0.0;
+                       target: "img.volume.icon";
+               }
+               program {
+                       name: "volume.icon.vibrate";
+                       signal: "volume.icon.vibrate";
+                       source: "img.volume.icon";
+                       action: STATE_SET "vibrate" 0.0;
+                       target: "img.volume.icon";
+               }
+
+               ACTION_BTN_PRESS_EFFECT_PROGRAM
+       }
+}
index 0e373349756172ab41d783912f38d19b4590c21c..9695d0e1f510e975d3b625ee56786c378fc9b969 100644 (file)
                target : "img.battery";\
        }\
 
+styles {
+       style {
+               name: "style_txt_battery";
+               base: "font=Tizen font_weight=Normal font_width=Condensed font_size=17 align=center valign=center color=#ffffffff";
+               tag: "br" "\n";
+               tag: "hilight" "+ color=#ffff";
+               tag: "b" "+ color=#ffff";
+               tag: "tab" "\t";
+       }
+}
+
 group {
        name : "windicator/battery_icon";
-
        images {
                image: BATTERY_DIR_PREFIX"/battery_00.png" COMP;
                image: BATTERY_DIR_PREFIX"/battery_05.png" COMP;
@@ -129,7 +139,7 @@ group {
                        DESCRIPTION_BATTERY(90);
                        DESCRIPTION_BATTERY(95);
                        DESCRIPTION_BATTERY(100);
-                       
+
                        DESCRIPTION_CHARGING_BATTERY(00);
                        DESCRIPTION_CHARGING_BATTERY(05);
                        DESCRIPTION_CHARGING_BATTERY(10);
@@ -187,9 +197,7 @@ group {
                                rel2 { relative : 0.5 1.0; to : "img.battery.charge"; }
                                text {
                                        style : "style_txt_battery";
-                                       align : 0.5 0.5;
-                                       min : 1 1;
-                                       text : "30%";
+                                       min : 0 1;
                                }
                        }
                }
@@ -203,35 +211,6 @@ group {
                        action : STATE_SET "hide" 0.0;
                        target : "img.battery";
                }
-               /* Verizon, ATT */
-               program {
-                       name : "Red4";
-                       signal : "Red4";
-                       source : "img.battery";
-                       action : STATE_SET "Red4" 0.0;
-                       target : "img.battery";
-               }
-               program {
-                       name : "Red10";
-                       signal : "Red10";
-                       source : "img.battery";
-                       action : STATE_SET "Red10" 0.0;
-                       target : "img.battery";
-               }
-               program {
-                       name : "Yellow15";
-                       signal : "Yellow15";
-                       source : "img.battery";
-                       action : STATE_SET "Yellow15" 0.0;
-                       target : "img.battery";
-               }
-               program {
-                       name : "Yellow20";
-                       signal : "Yellow20";
-                       source : "img.battery";
-                       action : STATE_SET "Yellow20" 0.0;
-                       target : "img.battery";
-               }
 
                PROGRAM_BATTERY(05);
                PROGRAM_BATTERY(10);
@@ -253,7 +232,7 @@ group {
                PROGRAM_BATTERY(90);
                PROGRAM_BATTERY(95);
                PROGRAM_BATTERY(100);
-               
+
                PROGRAM_CHARGING_BATTERY(00);
                PROGRAM_CHARGING_BATTERY(05);
                PROGRAM_CHARGING_BATTERY(10);
@@ -275,6 +254,7 @@ group {
                PROGRAM_CHARGING_BATTERY(90);
                PROGRAM_CHARGING_BATTERY(95);
                PROGRAM_CHARGING_BATTERY(100);
+
                program {
                        name : "Show.Battery.Charge";
                        signal : "Show.Battery.Charge";
diff --git a/edc/windicator_battery_layout.edc b/edc/windicator_battery_layout.edc
deleted file mode 100644 (file)
index 92d703c..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Samsung API
- * Copyright (c) 2013 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Flora License, Version 1.1 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://floralicense.org/license/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#if 0
-styles {
-       style {
-               name: "style_txt_battery";
-               base: "font=Tizen:style=Regular font_size=32 align=center color=#ffffffff color_class=AT01111 wrap=mixed text_class=AT01111";
-               tag: "br" "\n";
-               tag: "hilight" "+ color=#ffff";
-               tag: "b" "+ color=#ffff";
-               tag: "tab" "\t";
-       }
-}
-
-group {
-       name : "windicator/battery/layout/bt";
-       parts {
-               part {
-                       name : "bg";
-                       type : SPACER;
-                       scale :1;
-                       description {
-                               state : "default";
-                               min : WIN_WIDTH WIN_HEIGHT;
-                               max : WIN_WIDTH WIN_HEIGHT;
-                       }
-               }
-               part {
-                       name : "padding.top";
-                       type : SPACER;
-                       scale : 1;
-                       description {
-                               state : "default";
-                               min : 360 140;
-                               max : 360 140;
-                               fixed: 1 1;
-                               align : 0.0 0.0;
-                       //      color :200 0 0 200;
-                               rel1 { relative : 0.0 0.0; to : "bg";}
-                               rel2 { relative : 0.0 0.0; to : "bg";}
-                       }
-               }
-               part {
-                       name : "txt.battery";
-                       type : TEXTBLOCK;
-                       scale : 1;
-                       description{
-                               state : "default" 0.0;
-                               visible : 1;
-                               min : 360 42;
-                               max : 360 42;
-                               fixed : 1 1;
-                               align : 0.5 0.0;
-                               rel1 { relative : 0.5 1.0; to : "padding.top"; }
-                               rel2 { relative : 0.5 1.0; to : "padding.top"; }
-                               text {
-                                       style : "style_txt_battery";
-                                       align : 0.5 0.5;
-                                       min : 1 1;
-                                       text : "50%";
-                               }
-                       }
-               }
-               part {
-                       name : "txt.battery.title";
-                       type : TEXT;
-                       scale : 1;
-                       description{
-                               state : "default" 0.0;
-                               fixed : 1 1;
-                               min : 360 32;
-                               max : 360 32;
-                               align : 0.5 0.0;
-                               color_class : "AT01112";
-                               rel1{ relative: 0.5 1.0; to : "txt.battery";}
-                               rel2{ relative: 0.5 1.0;to : "txt.battery";}
-                               text {
-                                       min : 1 1;
-                                       align: 0.5 0.5;
-                                       text : "Battery";
-                                       ellipsis : 0;
-                                       text_class : "AT01112";
-                               }
-                       }
-               }       
-       }
-
-       programs {
-         /*
-               program {
-                       name : "image.disturb.enable";
-                       signal : "image.disturb.enable";
-                       source : "txt.dnd.on.off";
-                       action : STATE_SET "default" 0.0;
-                       target : "txt.dnd.on.off";
-               }
-               program {
-                       name : "image.disturb.disable";
-                       signal : "image.disturb.disable";
-                       source : "txt.dnd.on.off";
-                       action : STATE_SET "disable" 0.0;
-                       target : "txt.dnd.on.off";
-               }
-               */
-       }
-
-}
-#endif
\ No newline at end of file
diff --git a/edc/windicator_brightness.edc b/edc/windicator_brightness.edc
deleted file mode 100644 (file)
index 610c4dd..0000000
+++ /dev/null
@@ -1,680 +0,0 @@
-/*
- * Samsung API
- * Copyright (c) 2013 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Flora License, Version 1.1 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://floralicense.org/license/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#define DESCRIPTION_BRIGHTNESS_ICON(num) \
-       description { \
-               state : "level_"num 0.0;\
-               inherit : "default" 0.0; \
-               image.normal: "Brightness/88x88/b_setting_brightness_"num".png"; \
-       } \
-
-#define DESCRIPTION_BRIGHTNESS_TEXT(num) \
-       description { \
-               state : "level_"num 0.0;\
-               inherit : "default" 0.0; \
-               text {\
-                    text : num;\
-               }\
-       } \
-
-#define PROGRAM_BRIGHTNESS_ICON(num)\
-       program { \
-               name : "brightness.icon."num; \
-               signal : "brightness.icon."num; \
-               source : "img.brightness.icon"; \
-               action : STATE_SET "level_"num 0.0; \
-               target : "img.brightness.icon"; \
-               target : "img.brightness.text"; \
-       } \
-
-#define DESCRIPTION_BRIGHTNESS_LARGE_ICON(num) \
-       description { \
-               state : "level_"num 0.0;\
-               inherit : "default" 0.0; \
-               image.normal: "Brightness/150x150/b_setting_brightness_"num".png"; \
-       } \
-
-#define DESCRIPTION_BRIGHTNESS_TEXT_FOR_LARGE_ICON(num) \
-       description { \
-               state : "level_"num 0.0;\
-               inherit : "default" 0.0; \
-               text {\
-                    text : num;\
-               }\
-       } \
-
-styles {
-      /* It also be used for volume */
-      style { name: "large_brightness_title_style";
-         base: "font=Tizen:style=Regular font_size="28" align=center color=""#FFFFFF"" color_class=T014 text_class=AT0112";
-         tag:  "br" "\n";
-         tag:  "hilight" "+ font_weight=Bold";
-         tag:  "b" "+ font_weight=Bold";
-         tag:  "tab" "\t";
-      }
-}
-
-styles {
-       style {
-               name: "style_txt_brightness";
-               base: "font=Tizen:style=Regular font_size=24 align=center color=#ffffffff color_class=AT016 wrap=mixed text_class=AT016";
-               tag: "br" "\n";
-               tag: "hilight" "+ color=#ffff";
-               tag: "b" "+ color=#ffff";
-               tag: "tab" "\t";
-       }
-}
-
-group {
-       name : "windicator/brightness/small_layout";
-       images {
-               image : "Controls/b_moment_more_opt_ic_bg.png" COMP;
-               image : "Controls/brightness.png" COMP;
-       }
-       parts {
-               part {
-                       name : "bg";
-                       type : SPACER;
-                       scale :1;
-                       description {
-                               state : "default";
-                               min : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               max : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                       }
-               }
-               part {  /* index 1 */
-                       name : "img.brightness.bg";
-                       type : IMAGE;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               max : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               fixed : 1 1;
-                               align : 0.0 0.0;
-                               image.normal: "Controls/b_moment_more_opt_ic_bg.png";
-                               color_class : "AO0122";
-                               rel1 { relative : 0.0 0.0; to : "bg"; }
-                               rel2 { relative : 0.0 0.0; to : "bg"; }
-                       }
-                       description {
-                               state : "selected" 0.0;
-                               inherit : "default" 0.0;
-                               color_class : "AO0122P";
-                       }
-               }
-               part {  /* index 1 */
-                       name : "img.brightness.icon";
-                       type : IMAGE;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               max : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               fixed : 1 1;
-                               align : 0.0 0.0;
-                               image.normal: "Controls/brightness.png";
-                               color_class : "AO012";
-                               rel1 { relative : 0.0 0.0; to : "bg"; }
-                               rel2 { relative : 0.0 0.0; to : "bg"; }
-                       }
-                       description {
-                               state : "selected" 0.0;
-                               inherit : "default" 0.0;
-                               color_class : "AO012P";
-                       }
-               }
-               part {
-                       name : "txt.brightness";
-                       type : TEXTBLOCK;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               max : 32 25;
-                               min : 32 25;
-                       //      fixed : 1 1;
-                               align : 0.5 0.0;
-                               color: 0 0 0 255;
-                               rel1 { relative : 0.5 0.0; to : "img.brightness.icon"; offset : 0 33;}
-                               rel2 { relative : 0.5 0.0; to : "img.brightness.icon";}
-                               text {
-                                       align : 0.5 0.5;
-                                       min : 0 1;
-                                       style : "style_txt_brightness";
-                                       text : "0";
-                               }
-                       }
-                       description {
-                               state : "hide";
-                               inherit: "default" 0.0;
-                               visible :0;
-                       }
-               }
-       }
-       programs {
-               program {
-                       name: "layout.pressed";
-                       signal: "layout.pressed";
-                       source: "";
-                       action: STATE_SET "selected" 0.0;
-                       target: "img.brightness.icon";
-                       target: "img.brightness.bg";
-               }
-               program {
-                       name: "layout.released";
-                       signal: "layout.released";
-                       source: "";
-                       action: STATE_SET "default" 0.0;
-                       target: "img.brightness.icon";
-                       target: "img.brightness.bg";
-               }
-       }
-}
-
-#if 0
-group {
-       name : "windicator/brightness/small_layout";
-       images {
-               image : "mb_center_bg.png" COMP;
-               image : "moment_bar_focus_bt_touch_2.png" COMP;
-               image : "Brightness/88x88/b_setting_brightness_1.png" COMP;
-               image : "Brightness/88x88/b_setting_brightness_2.png" COMP;
-               image : "Brightness/88x88/b_setting_brightness_3.png" COMP;
-               image : "Brightness/88x88/b_setting_brightness_4.png" COMP;
-               image : "Brightness/88x88/b_setting_brightness_5.png" COMP;
-               image : "Brightness/88x88/b_setting_brightness_6.png" COMP;
-               image : "Brightness/88x88/b_setting_brightness_7.png" COMP;
-               image : "Brightness/88x88/b_setting_brightness_8.png" COMP;
-               image : "Brightness/88x88/b_setting_brightness_9.png" COMP;
-               image : "Brightness/88x88/b_setting_brightness_10.png" COMP;
-       }
-       parts {
-               part {
-                       name : "bg";
-                       type : SPACER;
-                       scale :1;
-                       description {
-                               state : "default";
-                               min : WIN_WIDTH WIN_HEIGHT;
-                               max : WIN_WIDTH WIN_HEIGHT;
-                       }
-               }
-               part {
-                       name : "padding.top";
-                       type : SPACER;
-                       scale : 1;
-                       description {
-                               state : "default";
-                               min : 360 92;
-                               max : 360 92;
-                               fixed: 1 1;
-                               align : 0.0 0.0;
-                       //      color :200 0 0 200;
-                               rel1 { relative : 0.0 0.0; to : "bg";}
-                               rel2 { relative : 0.0 0.0; to : "bg";}
-                       }
-               }
-               part {
-                       name : "img.brightness.text";
-                       type : TEXT;
-                       clip_to : "clipper_brightness";
-                       scale : 1;
-                       repeat_events : 1;
-                       description{
-                               state : "default" 0.0;
-                               min : BRIGHTNESS_TEXT_WIDTH BRIGHTNESS_TEXT_HEIGHT;
-                               visible : 1;
-                               fixed : 1 1;
-                               align : 0.5 0.0;
-                               color_class : "AT0112";
-                               rel1 { relative : 0.5 1.0; to : "padding.top"; }
-                               rel2 { relative : 0.5 1.0; to : "padding.top"; }
-                               text {
-                                       min : 1 1;
-                                       align: 0.5 0.5;
-                                       text_class : "AT0112";
-                                       text : "00";
-                               }
-                       }
-                       DESCRIPTION_BRIGHTNESS_TEXT(0)
-                       DESCRIPTION_BRIGHTNESS_TEXT(1)
-                       DESCRIPTION_BRIGHTNESS_TEXT(2)
-                       DESCRIPTION_BRIGHTNESS_TEXT(3)
-                       DESCRIPTION_BRIGHTNESS_TEXT(4)
-                       DESCRIPTION_BRIGHTNESS_TEXT(5)
-                       DESCRIPTION_BRIGHTNESS_TEXT(6)
-                       DESCRIPTION_BRIGHTNESS_TEXT(7)
-                       DESCRIPTION_BRIGHTNESS_TEXT(8)
-                       DESCRIPTION_BRIGHTNESS_TEXT(9)
-                       DESCRIPTION_BRIGHTNESS_TEXT(10)
-               }
-               part {
-                       name : "padding.center.1";
-                       type : SPACER;
-                       scale : 1;
-                       description {
-                               state : "default";
-                               min : 360 6;
-                               max : 360 6;
-                               fixed: 1 1;
-                       //      color :0 0 200 200;
-                               align : 0.5 0.0;
-                               rel1 { relative : 0.5 1.0; to : "img.brightness.text";}
-                               rel2 { relative : 0.5 1.0; to : "img.brightness.text";}
-                       }
-               }
-               part {
-                       name : "img.brightness.bg";
-                       type : IMAGE;
-                       clip_to : "clipper_brightness";
-                       scale : 1;
-                       repeat_events : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : BRIGHTNESS_BG_WIDTH BRIGHTNESS_BG_HEIGHT;
-                               max : BRIGHTNESS_BG_WIDTH BRIGHTNESS_BG_HEIGHT;
-                               fixed : 1 1;
-                               image.normal: "mb_center_bg.png";
-                               color_class : "AO024";
-                               align : 0.5 0.0;
-                               rel1 { relative : 0.5 1.0; to : "padding.center.1";}
-                               rel2 { relative : 0.5 1.0; to : "padding.center.1";}
-                       }
-               }
-               part {
-                       name : "sw.brightness.btn";
-                       type : SWALLOW;
-                       scale : 1;
-                       repeat_events : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : 80 80;
-                               max : 80 80;
-                               fixed : 1 1;
-                               align : 0.5 0.5;
-                               rel1.to: "img.brightness.bg";
-                               rel2.to: "img.brightness.bg";
-                       }
-               }
-               part {
-                       name : "img.brightness.icon";
-                       type : IMAGE;
-                       clip_to : "clipper_brightness";
-                       scale : 1;
-                       repeat_events : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : BRIGHTNESS_ICON_WIDTH BRIGHTNESS_ICON_HEIGHT;
-                               max : BRIGHTNESS_ICON_WIDTH BRIGHTNESS_ICON_HEIGHT;
-                               fixed : 1 1;
-                               image.normal: "Brightness/88x88/b_setting_brightness_1.png";
-                               color_class : "AO025";
-                               align : 0.5 0.0;
-                               rel1 { relative : 0.5 1.0; to : "padding.center.1";}
-                               rel2 { relative : 0.5 1.0; to : "padding.center.1";}
-                       }
-                       DESCRIPTION_BRIGHTNESS_ICON(1)
-                       DESCRIPTION_BRIGHTNESS_ICON(2)
-                       DESCRIPTION_BRIGHTNESS_ICON(3)
-                       DESCRIPTION_BRIGHTNESS_ICON(4)
-                       DESCRIPTION_BRIGHTNESS_ICON(5)
-                       DESCRIPTION_BRIGHTNESS_ICON(6)
-                       DESCRIPTION_BRIGHTNESS_ICON(7)
-                       DESCRIPTION_BRIGHTNESS_ICON(8)
-                       DESCRIPTION_BRIGHTNESS_ICON(9)
-                       DESCRIPTION_BRIGHTNESS_ICON(10)
-               }
-               part {
-                       name : "padding.center.2";
-                       type : SPACER;
-                       scale : 1;
-                       description {
-                               state : "default";
-                               min : 360 PADDING_CENTER_2;
-                               max : 360 PADDING_CENTER_2;
-                               fixed: 1 1;
-                       //      color :0 0 200 200;
-                               align : 0.5 0.0;
-                               rel1 { relative : 0.5 1.0; to : "img.brightness.icon";}
-                               rel2 { relative : 0.5 1.0; to : "img.brightness.icon";}
-                       }
-               }
-               part {
-                       name : "txt.brightness";
-                       type : TEXT;
-                       clip_to : "clipper_brightness";
-                       scale : 1;
-                       description{
-                               state : "default" 0.0;
-                               min : BRIGHTNESS_TEXT_WIDTH BRIGHTNESS_TEXT_HEIGHT;
-                               fixed : 1 1;
-                               align : 0.5 0.0;
-                               color_class : "AT0113";
-                               rel1{ relative: 0.5 1.0; to : "padding.center.2";}
-                               rel2{ relative: 0.5 1.0;to : "padding.center.2";}
-                               text {
-                                       min : 1 1;
-                                       align: 0.5 0.5;
-                                       ellipsis : 0;
-                                       text_class : "AT0113";
-                               }
-                       }
-               }
-               part {
-                       name: "clipper_brightness";
-                       type: RECT;
-                       scale: 1;
-                       mouse_events: 0;
-                       description {
-                               state: "default" 0.0;
-                               color: 255 255 255 0;
-                               rel1.to: "bg";
-                               rel2.to: "bg";
-                       }
-                       description {
-                               state: "fade_in" 0.0;
-                               inherit: "default";
-                               color: 255 255 255 255;
-                       }
-               }
-               part {
-                       name : "brightness.touch.area";
-               //      type : RECT;
-                       type : IMAGE;
-                       precise_is_inside: 1;
-                       repeat_events: 1;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-               //              min : 232 232;
-               //              max : 232 232;
-               //              fixed : 1 1;
-                               color : 100 100 0 0;
-               //              align : 0.5 0.5;
-                               image.normal: "moment_bar_focus_bt_touch_1.png";
-//                             color_class : "AO0217";
-                               rel1.to: "bg";
-                               rel2.to: "bg";
-                       }
-               }
-       }
-       programs {
-               PROGRAM_BRIGHTNESS_ICON(1)
-               PROGRAM_BRIGHTNESS_ICON(2)
-               PROGRAM_BRIGHTNESS_ICON(3)
-               PROGRAM_BRIGHTNESS_ICON(4)
-               PROGRAM_BRIGHTNESS_ICON(5)
-               PROGRAM_BRIGHTNESS_ICON(6)
-               PROGRAM_BRIGHTNESS_ICON(7)
-               PROGRAM_BRIGHTNESS_ICON(8)
-               PROGRAM_BRIGHTNESS_ICON(9)
-               PROGRAM_BRIGHTNESS_ICON(10)
-       }
-       // Hide
-       program {
-               name: "brightness_hide";
-               signal: "brightness_hide";
-               source: "clipper_brightness";
-               action: STATE_SET "default" 0.0;
-               target: "clipper_brightness";
-               after: "brightness_fade_out_end";
-       }
-       // Fade Out effect
-       program {
-               name: "brightness_fade_out";
-               signal: "brightness_fade_out";
-               source: "clipper_brightness";
-               action: STATE_SET "default" 0.0;
-               target: "clipper_brightness";
-               transition: ACCEL_FAC 0.1 0.33;
-               after : "brightness_fade_out_end";
-       }
-       program {
-               name : "brightness_fade_out_end";
-               action : SIGNAL_EMIT "brightness_fade_out_end" "signal";
-       }
-
-       // Fade In effect
-       program {
-               name: "brightness_fade_in";     // Do nothing for 0.1 second.
-               signal: "brightness_fade_in";
-               source: "clipper_brightness";
-               action: STATE_SET "default" 0.0;
-               target: "clipper_brightness";
-               transition: ACCEL_FAC 0.1 0.33;
-               after: "brightness_fade_in_start";
-       }
-       program {
-               name: "brightness_fade_in_start";
-               signal: "brightness_fade_in";
-               source: "clipper_brightness";
-               action: STATE_SET "fade_in" 0.0;
-               target: "clipper_brightness";
-               transition: ACCEL_FAC 0.1 0.33;
-       }
-}
-
-group {
-       name : "windicator/brightness/large_layout";
-       images {
-               image : "b_brightness_slider_bg.png" COMP;
-               image : "view_over_back_bg.png" COMP;
-               image : "Brightness/150x150/b_setting_brightness_1.png" COMP;
-               image : "Brightness/150x150/b_setting_brightness_2.png" COMP;
-               image : "Brightness/150x150/b_setting_brightness_3.png" COMP;
-               image : "Brightness/150x150/b_setting_brightness_4.png" COMP;
-               image : "Brightness/150x150/b_setting_brightness_5.png" COMP;
-               image : "Brightness/150x150/b_setting_brightness_6.png" COMP;
-               image : "Brightness/150x150/b_setting_brightness_7.png" COMP;
-               image : "Brightness/150x150/b_setting_brightness_8.png" COMP;
-               image : "Brightness/150x150/b_setting_brightness_9.png" COMP;
-               image : "Brightness/150x150/b_setting_brightness_10.png" COMP;
-       }
-       parts {
-               part {
-                       name : "bg";
-                       type : RECT;
-                       clip_to: "clipper_large_brightness_icon";
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : WIN_WIDTH WIN_HEIGHT;
-                               max : WIN_WIDTH WIN_HEIGHT;
-                               color_class : "AO029L4";
-                       }
-               }
-               part {
-                       name : "over.back.bg";
-                       type : IMAGE;
-                       clip_to: "clipper_large_brightness_icon";
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : WIN_WIDTH WIN_HEIGHT;
-                               max : WIN_WIDTH WIN_HEIGHT;
-                               fixed :1 1;
-                               rel1 { relative : 0.5 0.5; to : "bg"; }
-                               rel2 { relative : 0.5 0.5; to : "bg"; }
-                               image.normal: "view_over_back_bg.png";
-                               color_class : "AO029L3";
-                       }
-               }
-               part {
-                       name : "padding.top";
-                       type : SPACER;
-                       scale :1;
-                       description {
-                               state : "default" 0.0;
-                               min : WIN_WIDTH 50;
-                               max : WIN_WIDTH 50;
-                       //      visible : 1;
-                               fixed : 1 1;
-                       //      color : 200 0 0 200;
-                               align : 0.0 0.0;
-                               rel1 { relative : 0.0 0.0; to : "bg"; }
-                               rel2 { relative : 0.0 0.0; to : "bg"; }
-                       }
-               }
-               part {
-                       name : "img.brightness.text";
-                       type : TEXTBLOCK;
-                       clip_to: "clipper_large_brightness_icon";
-                       scale : 1;
-                       description{
-                               state : "default" 0.0;
-                               min : BRIGHTNESS_TEXT_WIDTH BRIGHTNESS_TEXT_HEIGHT;
-                               max : BRIGHTNESS_TEXT_WIDTH BRIGHTNESS_TEXT_HEIGHT;
-                               visible : 1;
-                               fixed : 1 1;
-                               align : 0.5 0.0;
-                               rel1 { relative : 0.0 1.0; to : "padding.top"; }
-                               rel2 { relative : 1.0 1.0; to : "padding.top"; }
-                               text {
-                                       style : "large_brightness_title_style";
-                                       min : 1 1;
-                                       align: 0.5 0.5;
-                                       text : "0";
-                               }
-                       }
-                       DESCRIPTION_BRIGHTNESS_TEXT_FOR_LARGE_ICON(1)
-                       DESCRIPTION_BRIGHTNESS_TEXT_FOR_LARGE_ICON(2)
-                       DESCRIPTION_BRIGHTNESS_TEXT_FOR_LARGE_ICON(3)
-                       DESCRIPTION_BRIGHTNESS_TEXT_FOR_LARGE_ICON(4)
-                       DESCRIPTION_BRIGHTNESS_TEXT_FOR_LARGE_ICON(5)
-                       DESCRIPTION_BRIGHTNESS_TEXT_FOR_LARGE_ICON(6)
-                       DESCRIPTION_BRIGHTNESS_TEXT_FOR_LARGE_ICON(7)
-                       DESCRIPTION_BRIGHTNESS_TEXT_FOR_LARGE_ICON(8)
-                       DESCRIPTION_BRIGHTNESS_TEXT_FOR_LARGE_ICON(9)
-                       DESCRIPTION_BRIGHTNESS_TEXT_FOR_LARGE_ICON(10)
-               }
-               part {
-                       name : "img.brightness.bg";
-                       type : IMAGE;
-                       clip_to: "clipper_large_brightness_icon";
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : 150 150;
-                               max : 150 150;
-                               fixed : 1 1;
-                               align : 0.5 0.5;
-                               rel1 { relative : 0.5 0.5; to : "bg"; }
-                               rel2 { relative : 0.5 0.5; to : "bg"; }
-                               image.normal: "b_brightness_slider_bg.png";
-                               color_class : "B0554";
-                       }
-               }
-               part {
-                       name : "img.brightness.icon";
-                       type : IMAGE;
-                       clip_to: "clipper_large_brightness_icon";
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : BRIGHTNESS_LARGE_ICON_WIDTH BRIGHTNESS_LARGE_ICON_HEIGHT;
-                               max : BRIGHTNESS_LARGE_ICON_WIDTH BRIGHTNESS_LARGE_ICON_HEIGHT;
-                               fixed : 1 1;
-                               rel1 { relative : 0.5 0.5; to : "img.brightness.bg"; }
-                               rel2 { relative : 0.5 0.5; to : "img.brightness.bg"; }
-                               image.normal: "Brightness/150x150/b_setting_brightness_1.png";
-                               color_class : "B0556";
-                       }
-                       DESCRIPTION_BRIGHTNESS_LARGE_ICON(1)
-                       DESCRIPTION_BRIGHTNESS_LARGE_ICON(2)
-                       DESCRIPTION_BRIGHTNESS_LARGE_ICON(3)
-                       DESCRIPTION_BRIGHTNESS_LARGE_ICON(4)
-                       DESCRIPTION_BRIGHTNESS_LARGE_ICON(5)
-                       DESCRIPTION_BRIGHTNESS_LARGE_ICON(6)
-                       DESCRIPTION_BRIGHTNESS_LARGE_ICON(7)
-                       DESCRIPTION_BRIGHTNESS_LARGE_ICON(8)
-                       DESCRIPTION_BRIGHTNESS_LARGE_ICON(9)
-                       DESCRIPTION_BRIGHTNESS_LARGE_ICON(10)
-               }
-               part {
-                       name : "txt.brightness";
-                       type : TEXTBLOCK;
-                       clip_to: "clipper_large_brightness_icon";
-                       scale : 1;
-                       mouse_events: 1;
-                       description{
-                               state : "default" 0.0;
-                               fixed : 1 1;
-                               align : 0.5 0.0;
-                               rel1{ relative: 0.0 1.0; to : "img.brightness.icon"; offset : 0 10;}
-                               rel2{ relative: 1.0 1.0; to : "img.brightness.icon";}
-                               text {
-                                       style : "large_brightness_title_style";
-                                       min : 1 1;
-                                       align: 0.5 0.5;
-                                       text : "Brightness";
-                               }
-                       }
-               }
-               part {
-                       name: "clipper_large_brightness_icon";
-                       type: RECT;
-                       scale: 1;
-                       mouse_events: 0;
-                       description {
-                               state: "default" 0.0;
-                               color: 255 255 255 0;
-                               rel1.to: "bg";
-                               rel2.to: "bg";
-                       }
-                       description {
-                               state: "fade_in" 0.0;
-                               inherit: "default";
-                               color: 255 255 255 255;
-                       }
-               }
-       }
-       programs {
-               PROGRAM_BRIGHTNESS_ICON(0)
-               PROGRAM_BRIGHTNESS_ICON(1)
-               PROGRAM_BRIGHTNESS_ICON(2)
-               PROGRAM_BRIGHTNESS_ICON(3)
-               PROGRAM_BRIGHTNESS_ICON(4)
-               PROGRAM_BRIGHTNESS_ICON(5)
-               PROGRAM_BRIGHTNESS_ICON(6)
-               PROGRAM_BRIGHTNESS_ICON(7)
-               PROGRAM_BRIGHTNESS_ICON(8)
-               PROGRAM_BRIGHTNESS_ICON(9)
-               PROGRAM_BRIGHTNESS_ICON(10)
-               program {
-                       name: "large_brightness_icon_fade_in";
-                       signal: "large_brightness_icon_fade_in";
-                       source: "clipper_large_brightness_icon";
-                       action: STATE_SET "fade_in" 0.0;
-                       target: "clipper_large_brightness_icon";
-                       transition: LINEAR 0.3;
-               }
-               program {
-                       name: "large_brightness_icon_fade_out";
-                       signal: "large_brightness_icon_fade_out";
-                       source: "clipper_large_brightness_icon";
-                       action: STATE_SET "default" 0.0;
-                       target: "clipper_large_brightness_icon";
-                       transition: LINEAR 0.3;
-                       after: "large_brightness_fade_out_end";
-               }
-               program {
-                       name : "large_brightness_fade_out_end";
-                       action : SIGNAL_EMIT "large_brightness_fade_out_end" "signal";
-               }
-       }
-}
-#endif
diff --git a/edc/windicator_callfwd_layout.edc b/edc/windicator_callfwd_layout.edc
deleted file mode 100644 (file)
index 6c620b9..0000000
+++ /dev/null
@@ -1,401 +0,0 @@
-/*
- * Samsung API
- * Copyright (c) 2013 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Flora License, Version 1.1 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://floralicense.org/license/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-group {
-       name : "windicator/callfwd_btn";
-       images {
-               image : "Controls/b_moment_more_opt_ic_bg.png" COMP;
-               image : "Controls/call_forwarding.png" COMP;
-               image : "Controls/esim.png" COMP;
-               image : "Indicator_business/call_forwarding_business.png" COMP;
-       }
-       parts {
-               part {
-                       name : "bg";
-                       type : SPACER;
-                       scale :1;
-                       description {
-                               state : "default";
-                               min : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               max : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                       }
-               }
-               part {
-                       name : "img.callfwd.bg";
-                       type : IMAGE;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               max : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               fixed : 1 1;
-                               align : 0.0 0.0;
-                               image.normal: "Controls/b_moment_more_opt_ic_bg.png";
-                               color_class : "AO0122";
-                               rel1 { relative : 0.0 0.0; to : "bg"; }
-                               rel2 { relative : 0.0 0.0; to : "bg"; }
-                       }
-                       description {
-                               state : "numbersync" 0.0;
-                               inherit : "default" 0.0;
-                       }
-                       description {
-                               state : "esim" 0.0;
-                               inherit : "default" 0.0;
-                       }
-                       description {
-                               state : "disable" 0.0;
-                               inherit : "default" 0.0;
-                               color_class : "AO0122D";
-                       }
-                       description {
-                               state : "selected" 0.0;
-                               inherit : "default" 0.0;
-                               color_class : "AO0122P";
-                       }
-               }
-               part {
-                       name : "img.callfwd.icon";
-                       type : IMAGE;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               max : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               fixed : 1 1;
-                               align : 0.0 0.0;
-                               image.normal: "Controls/call_forwarding.png";
-                               color_class : "AO012";
-                               rel1 { relative : 0.0 0.0; to : "bg"; }
-                               rel2 { relative : 0.0 0.0; to : "bg"; }
-                       }
-                       description {
-                               state : "numbersync" 0.0;
-                               inherit : "default" 0.0;
-                               image.normal: "Indicator_business/call_forwarding_business.png";
-                       }
-                       description {
-                               state : "esim" 0.0;
-                               inherit : "default" 0.0;
-                               image.normal: "Controls/esim.png";
-                       }
-                       description {
-                               state : "disable" 0.0;
-                               inherit : "default" 0.0;
-                               color_class : "AO012D";
-                       }
-               }
-
-       }
-       programs {
-               program {
-                       name : "img.callfwd.enable";
-                       signal : "img.callfwd.enable";
-                       source : "img.callfwd.icon";
-                       action : STATE_SET "default" 0.0;
-                       target : "img.callfwd.icon";
-                       target : "img.callfwd.bg";
-//                     target : "txt.callfwd";
-               }
-               program {
-                       name : "img.callfwd.disable";
-                       signal : "img.callfwd.disable";
-                       source : "img.callfwd.icon";
-                       action : STATE_SET "disable" 0.0;
-                       target : "img.callfwd.icon";
-                       target : "img.callfwd.bg";
-//                     target : "txt.callfwd";
-               }
-               /* Number sync */
-               program {
-                       name : "img.callfwd.numbersync";
-                       signal : "img.callfwd.numbersync";
-                       source : "img.callfwd.icon";
-                       action : STATE_SET "numbersync" 0.0;
-                       target : "img.callfwd.icon";
-                       target : "img.callfwd.bg";
-               }
-               /* eSim */
-               program {
-                       name : "img.esim.enable";
-                       signal : "img.esim.enable";
-                       source : "img.callfwd.icon";
-                       action : STATE_SET "esim" 0.0;
-                       target : "img.callfwd.icon";
-                       target : "img.callfwd.bg";
-               }
-
-               /* Press effect */
-               program {
-                       name: "layout.pressed";
-                       signal: "layout.pressed";
-                       source: "";
-                       action: STATE_SET "selected" 0.0;
-                       target: "img.callfwd.bg";
-               }
-               program {
-                       name: "layout.released";
-                       signal: "layout.released";
-                       source: "";
-                       action: STATE_SET "default" 0.0;
-                       target: "img.callfwd.bg";
-               }
-       }
-}
-#if 0
-group {
-       name : "windicator/callfwd_btn";
-       images {
-               image : "mb_3g_indi_link_bg.png" COMP;
-               image : "moment_bar_focus_bt_touch_1.png" COMP;
-               image : "mb_3g_indi_link_icon_call.png" COMP;
-//             image : "mb_3g_indi_link_stroke.png" COMP;
-       }
-       parts {
-               part {
-                       name : "bg";
-                       type : SPACER;
-                       scale :1;
-                       description {
-                               state : "default";
-                               min : WIN_WIDTH WIN_HEIGHT;
-                               max : WIN_WIDTH WIN_HEIGHT;
-                       }
-               }
-               part {
-                       name : "padding.top";
-                       type : SPACER;
-                       scale : 1;
-                       description {
-                               state : "default";
-                               min : 360 135;
-                               max : 360 135;
-                               fixed: 1 1;
-                               align : 0.0 0.0;
-                       //      color :200 0 0 200;
-                               rel1 { relative : 0.0 0.0; to : "bg";}
-                               rel2 { relative : 0.0 0.0; to : "bg";}
-                       }
-               }
-               part {
-                       name : "img.callfwd.bg";
-                       type : IMAGE;
-                       clip_to : "clipper_callfwd";
-                       scale : 1;
-                       repeat_events : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : MUSIC_BTN_WIDTH MUSIC_BTN_HEIGHT;
-                               max : MUSIC_BTN_WIDTH MUSIC_BTN_HEIGHT;
-                               fixed : 1 1;
-                               image.normal: "mb_3g_indi_link_bg.png";
-                               color_class : "AO027";
-                               align : 0.5 0.0;
-                               rel1 { relative : 0.5 1.0; to : "padding.top";}
-                               rel2 { relative : 0.5 1.0; to : "padding.top";}
-                       }
-                       description {
-                               state: "disable" 0.0;
-                               inherit: "default";
-                               color_class : "AO0271";
-                       }
-               }
-               part {
-                       name : "sw.callfwd.btn";
-                       type : SWALLOW;
-               //      clip_to : "clipper_music";
-                       scale : 1;
-               //      mouse_events : 1;
-                       repeat_events : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : 80 80;
-                               max : 80 80;
-                               fixed : 1 1;
-                               align : 0.5 0.5;
-                               rel1.to: "img.callfwd.bg";
-                               rel2.to: "img.callfwd.bg";
-                       }
-               }
-               part {
-                       name : "img.callfwd.icon";
-                       type : IMAGE;
-                       clip_to : "clipper_callfwd";
-                       scale : 1;
-                       repeat_events : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : MUSIC_BTN_WIDTH MUSIC_BTN_HEIGHT;
-                               max : MUSIC_BTN_WIDTH MUSIC_BTN_HEIGHT;
-                               fixed : 1 1;
-                               image.normal: "mb_3g_indi_link_icon_call.png";
-                               color_class : "AO025";
-                               align : 0.5 0.0;
-                               rel1 { relative : 0.5 1.0; to : "padding.top";}
-                               rel2 { relative : 0.5 1.0; to : "padding.top";}
-                       }
-                       description {
-                               state: "disable" 0.0;
-                               inherit: "default";
-                               color_class : "AO025D";
-                       }
-               }
-               part {
-                       name : "padding.center.2";
-                       type : SPACER;
-                       scale : 1;
-                       description {
-                               state : "default";
-                               min : 360 PADDING_CENTER_2;
-                               max : 360 PADDING_CENTER_2;
-                               fixed: 1 1;
-                       //      color :0 0 200 200;
-                               align : 0.5 0.0;
-                               rel1 { relative : 0.5 1.0; to : "img.callfwd.icon";}
-                               rel2 { relative : 0.5 1.0; to : "img.callfwd.icon";}
-                       }
-               }
-               part {
-                       name : "txt.callfwd";
-                       type : TEXT;
-                       clip_to : "clipper_callfwd";
-                       scale : 1;
-                       description{
-                               state : "default" 0.0;
-                               min : DND_TEXT_WIDTH DND_TEXT_HEIGHT;
-                               fixed : 1 1;
-                               align : 0.5 0.0;
-                               color_class : "AT0114";
-                               rel1{ relative: 0.5 1.0; to : "padding.center.2";}
-                               rel2{ relative: 0.5 1.0;to : "padding.center.2";}
-                               text {
-                                       min : 1 1;
-                                       align: 0.5 0.5;
-                                       text : "Call forwadring";
-                                       ellipsis : 0;
-                                       text_class : "AT0114";
-                               }
-                       }
-                       description {
-                               state: "disable" 0.0;
-                               inherit: "default";
-                               color_class : "AO0271";
-                       }
-               }
-               part {
-                       name: "clipper_callfwd";
-                       type: RECT;
-                       scale: 1;
-                       mouse_events: 0;
-                       description {
-                               state: "default" 0.0;
-                               color: 255 255 255 0;
-                               rel1.to: "bg";
-                               rel2.to: "bg";
-                       }
-                       description {
-                               state: "fade_in" 0.0;
-                               inherit: "default";
-                               color: 255 255 255 255;
-                       }
-               }
-               part {
-                       name : "callfwd.touch.area";
-               //      type : RECT;
-                       type : IMAGE;
-                       precise_is_inside: 1;
-                       repeat_events: 1;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-               //              min : 232 232;
-               //              max : 232 232;
-               //              fixed : 1 1;
-                               color : 100 0 120 0;
-               //              align : 0.5 0.5;
-                               image.normal: "moment_bar_focus_bt_touch_1.png";
-//                             color_class : "AO0217";
-                               rel1.to: "bg";
-                               rel2.to: "bg";
-                       }
-               }
-       }
-       programs {
-               program {
-                       name : "img.callfwd.enable";
-                       signal : "img.callfwd.enable";
-                       source : "img.callfwd.icon";
-                       action : STATE_SET "default" 0.0;
-                       target : "img.callfwd.icon";
-                       target : "img.callfwd.bg";
-                       target : "txt.callfwd";
-               }
-               program {
-                       name : "img.callfwd.disable";
-                       signal : "img.callfwd.disable";
-                       source : "img.callfwd.icon";
-                       action : STATE_SET "disable" 0.0;
-                       target : "img.callfwd.icon";
-                       target : "img.callfwd.bg";
-                       target : "txt.callfwd";
-               }
-
-               // Hide
-               program {
-                       name: "callfwd_hide";
-                       signal: "callfwd_hide";
-                       source: "clipper_callfwd";
-                       action: STATE_SET "default" 0.0;
-                       target: "clipper_callfwd";
-                       after: "callfwd_fade_out_end";
-               }
-               // Fade Out effect
-               program {
-                       name: "callfwd_fade_out";
-                       signal: "callfwd_fade_out";
-                       source: "clipper_callfwd";
-                       action: STATE_SET "default" 0.0;
-                       target: "clipper_callfwd";
-                       transition: ACCEL_FAC 0.1 0.33;
-                       after: "callfwd_fade_out_end";
-               }
-               program {
-                       name : "callfwd_fade_out_end";
-                       action : SIGNAL_EMIT "callfwd_fade_out_end" "signal";
-               }
-
-               // Fade In effect
-               program {
-                       name: "callfwd_fade_in";
-                       signal: "callfwd_fade_in";
-                       source: "clipper_callfwd";
-                       action: STATE_SET "default" 0.0;
-                       target: "clipper_callfwd";
-                       transition: ACCEL_FAC 0.1 0.33;
-                       after: "callfwd_fade_in_start";
-               }
-               program {
-                       name: "callfwd_fade_in_start";
-                       signal: "callfwd_fade_in";
-                       source: "clipper_callfwd";
-                       action: STATE_SET "fade_in" 0.0;
-                       target: "clipper_callfwd";
-                       transition: ACCEL_FAC 0.1 0.33;
-               }
-       }
-}
-#endif
\ No newline at end of file
index 752df7f82e9fdd4a03208b691c52347ef0a115b0..bb6de19dba47fb30c5da9150bdaf4615b729d4e8 100644 (file)
@@ -30,7 +30,7 @@ color_classes {
        }
        color_class {
                name: "AO012";
-               color: 0 0 0 255;
+               color: 255 255 255 255;
        }
        color_class {
                name: "AO0121";
@@ -38,11 +38,11 @@ color_classes {
        }
        color_class {
                name: "AO012P";
-               color: 0 0 0 255;
+               color: 255 255 255 221;
        }
        color_class {
                name: "AO012D";
-               color: 0 0 0 76;
+               color: 255 255 255 76;
        }
        color_class {
                name: "AO0122";
@@ -54,7 +54,7 @@ color_classes {
        }
        color_class {
                name: "AO0122P";
-               color: 255 255 255 127;
+               color: 255 255 255 33;
        }
        color_class {
                name: "AO0122D";
@@ -126,11 +126,11 @@ color_classes {
        }
        color_class {
                name: "AO0211";
-               color: 115 191 15 255;
+               color: 76 207 255 255;
        }
        color_class {
                name: "AO0212";
-               color: 41 41 41 255;
+               color: 60 60 60 255;
        }
        color_class {
                name: "AT011";
diff --git a/edc/windicator_common_defines.edc b/edc/windicator_common_defines.edc
new file mode 100644 (file)
index 0000000..359ed49
--- /dev/null
@@ -0,0 +1,107 @@
+/*
+ * Samsung API
+ * Copyright (c) 2013 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Flora License, Version 1.1 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://floralicense.org/license/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define WIN_WIDTH 360
+#define WIN_HEIGHT 360
+
+#define REL_W(value) (value/WIN_WIDTH)
+#define REL_H(value) (value/WIN_HEIGHT)
+
+#define DYNAMIC_ICON_WIDTH 24
+#define DYNAMIC_ICON_HEIGHT 26
+
+#define BATTERY_ICON_WIDTH 22
+#define BATTERY_ICON_HEIGHT 33
+
+#define ACTION_BTN_WIDTH 64
+#define ACTION_BTN_HEIGHT 64
+
+#define ACTION_BTN_TEXT_WIDTH 24
+#define ACTION_BTN_TEXT_HEIGHT 26
+#define ACTION_BTN_TEXT_REL1_H ((ACTION_BTN_HEIGHT-ACTION_BTN_TEXT_HEIGHT)/ACTION_BTN_HEIGHT)
+
+#define ACTION_BTN_BAR_WIDTH 30
+#define ACTION_BTN_BAR_HEIGHT 16
+#define ACTION_BTN_BAR_REL1_H ((ACTION_BTN_HEIGHT-ACTION_BTN_BAR_HEIGHT)/ACTION_BTN_HEIGHT)
+
+#define ACTION_BTN_PRESS_EFFECT_BG_SIZE 90 90
+
+#define ACTION_BTN_PRESS_EFFECT_PART \
+       images { \
+               image : "b_more_option_sub_btn_bg.png" COMP; \
+       } \
+       part { \
+               name : "img.press.bg"; \
+               type : IMAGE; \
+               scale : 1; \
+               description { \
+                       state : "default" 0.0; \
+                       min : ACTION_BTN_PRESS_EFFECT_BG_SIZE; \
+                       max : ACTION_BTN_PRESS_EFFECT_BG_SIZE; \
+                       fixed : 1 1; \
+                       align : 0.5 0.5; \
+                       image.normal: "b_more_option_sub_btn_bg.png"; \
+                       color: 0 0 0 0; \
+                       rel1 { relative : 0.5 0.5; } \
+                       rel2 { relative : 0.5 0.5; } \
+                       map { \
+                               on: 1; \
+                               smooth: 1; \
+                               perspective_on: 1; \
+                       } \
+               } \
+               description { \
+                       state: "pressed" 0.0; \
+                       inherit: "default" 0.0; \
+                       color: 250 250 250 33; \
+                       map { \
+                               zoom.x: 1.0; \
+                               zoom.y: 1.0; \
+                       } \
+               } \
+               description { \
+                       state: "start_persp" 0.0; \
+                       inherit: "pressed" 0.0; \
+                       map { \
+                               zoom.x: 1.1; \
+                               zoom.y: 1.1; \
+                       } \
+               } \
+       }
+
+#define ACTION_BTN_PRESS_EFFECT_PROGRAM \
+       program { \
+               name: "layout.pressed"; \
+               signal: "layout.pressed"; \
+               source: ""; \
+               action: STATE_SET "pressed" 0.0; \
+               target: "img.press.bg"; \
+               after: "start_persp"; \
+       } \
+       program { \
+               name: "layout.released"; \
+               signal: "layout.released"; \
+               source: ""; \
+               action: STATE_SET "default" 0.0; \
+               transition: LINEAR 0.5; \
+               target: "img.press.bg"; \
+       } \
+       program { name: "start_persp"; \
+               action: STATE_SET "start_persp" 0.0; \
+               transition: CUBIC_BEZIER 0.5 0.45 0.03 0.41 1.0; \
+               target: "img.press.bg"; \
+       }
diff --git a/edc/windicator_dnd_layout.edc b/edc/windicator_dnd_layout.edc
deleted file mode 100644 (file)
index 5751ce9..0000000
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
- * Samsung API
- * Copyright (c) 2013 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Flora License, Version 1.1 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://floralicense.org/license/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-group {
-       name : "windicator/dnd_btn/bt";
-       images {
-               image : "Controls/b_moment_more_opt_ic_bg.png" COMP;
-               image : "Controls/donotdisturb.png" COMP;
-               image : "Controls/vzw_donotdisturb.png" COMP;
-               image : "b_moment_more_opt_bar.png" COMP;
-       }
-       parts {
-               part {
-                       name : "bg";
-                       type : SPACER;
-                       scale :1;
-                       description {
-                               state : "default";
-                               min : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               max : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                       }
-               }
-               part {
-                       name : "img.disturb.bg";
-                       type : IMAGE;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               max : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               fixed : 1 1;
-                               align : 0.0 0.0;
-                               image.normal: "Controls/b_moment_more_opt_ic_bg.png";
-                               color_class : "AO0122";
-                               rel1 { relative : 0.0 0.0; to : "bg"; }
-                               rel2 { relative : 0.0 0.0; to : "bg"; }
-                       }/*
-                       description {
-                               state: "off" 0.0;
-                               inherit: "default";
-                               color_class : "AO01221";
-                       }*/
-                       description {
-                               state : "selected" 0.0;
-                               inherit : "default" 0.0;
-                               color_class : "AO0122P";
-                       }
-               }
-               part {
-                       name : "img.disturb.icon";
-                       type : IMAGE;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               max : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               fixed : 1 1;
-                               align : 0.0 0.0;
-                               image.normal: "Controls/donotdisturb.png";
-                               color_class : "AO012";
-                               rel1 { relative : 0.0 0.0; to : "bg"; }
-                               rel2 { relative : 0.0 0.0; to : "bg"; }
-                       }
-                       description {
-                               state: "vzw" 0.0;
-                               inherit: "default";
-                               image.normal: "Controls/vzw_donotdisturb.png";
-                       }
-               }
-               part {
-                       name : "img.disturb.bar";
-                       type : IMAGE;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : 26 22;
-                               max : 26 22;
-                               fixed : 1 1;
-                               align : 0.0 0.0;
-                               image.normal: "b_moment_more_opt_bar.png";
-                               color_class : "AO0211";
-                               rel1 { relative : 0.0 0.0; to : "bg"; offset : 19 42;}
-                               rel2 { relative : 0.0 0.0; to : "bg"; }
-                       }
-                       description {
-                               state: "off" 0.0;
-                               inherit: "default";
-                               color_class : "AO0212";
-                       }
-               }
-#if 0
-               part {
-                       name : "padding.top";
-                       type : SPACER;
-                       scale : 1;
-                       description {
-                               state : "default";
-                               min : 360 92;
-                               max : 360 92;
-                               fixed: 1 1;
-                               align : 0.0 0.0;
-                       //      color :200 0 0 200;
-                               rel1 { relative : 0.0 0.0; to : "bg";}
-                               rel2 { relative : 0.0 0.0; to : "bg";}
-                       }
-               }
-               part {
-                       name : "txt.dnd.on.off";
-                       type : TEXT;
-                       clip_to : "clipper_dnd";
-                       scale : 1;
-//                     repeat_events : 1;
-                       description{
-                               state : "default" 0.0;
-                               min : DND_TEXT_WIDTH DND_TEXT_HEIGHT;
-                               visible : 1;
-                               fixed : 1 1;
-                               align : 0.5 0.0;
-                               rel1 { relative : 0.5 1.0; to : "padding.top"; }
-                               rel2 { relative : 0.5 1.0; to : "padding.top"; }
-                               text {
-                                       min : 1 1;
-                                       align: 0.5 0.5;
-                                       text_class : "AT0112";
-                                       text : "On";
-                               }
-                       }
-               }
-               part {
-                       name : "padding.center.1";
-                       type : SPACER;
-                       scale : 1;
-                       description {
-                               state : "default";
-                               min : 360 6;
-                               max : 360 6;
-                               fixed: 1 1;
-                       //      color :0 0 200 200;
-                               align : 0.5 0.0;
-                               rel1 { relative : 0.5 1.0; to : "txt.dnd.on.off";}
-                               rel2 { relative : 0.5 1.0; to : "txt.dnd.on.off";}
-                       }
-               }
-               part {
-                       name : "img.disturb.bg";
-                       type : IMAGE;
-                       clip_to : "clipper_dnd";
-                       scale : 1;
-                       repeat_events : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : DND_BTN_WIDTH DND_BTN_HEIGHT;
-                               max : DND_BTN_WIDTH DND_BTN_HEIGHT;
-                               fixed : 1 1;
-                               image.normal: "mb_center_bg.png";
-                               color_class : "AO027";
-                               align : 0.5 0.0;
-                               rel1 { relative : 0.5 1.0; to : "padding.center.1";}
-                               rel2 { relative : 0.5 1.0; to : "padding.center.1";}
-                       }
-                       description {
-                               state: "off" 0.0;
-                               inherit: "default";
-                               color_class : "AO0271";
-                       }
-               }
-               part {
-                       name : "sw.dnd.btn";
-                       type : SWALLOW;
-                       scale : 1;
-                       repeat_events : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : 80 80;
-                               max : 80 80;
-                               fixed : 1 1;
-                               align : 0.5 0.5;
-                               rel1.to: "img.disturb.bg";
-                               rel2.to: "img.disturb.bg";
-                       }
-               }
-               part {
-                       name : "img.disturb.icon";
-                       type : IMAGE;
-                       clip_to : "clipper_dnd";
-                       scale : 1;
-                       repeat_events : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : DND_BTN_HEIGHT DND_BTN_HEIGHT;
-                               max : DND_BTN_HEIGHT DND_BTN_HEIGHT;
-                               fixed : 1 1;
-//                             visible : 0;
-                               image.normal: "momment_bar_btn_icon_disturb.png";
-                               color_class : "AO025";
-                               align : 0.5 0.0;
-                               rel1 { relative : 0.5 1.0; to : "padding.center.1";}
-                               rel2 { relative : 0.5 1.0; to : "padding.center.1";}
-                       }
-                       description {
-                               state: "fade_in" 0.0;
-                               inherit: "default";
-                               visible : 1;
-                       }
-                       description {
-                               state: "off" 0.0;
-                               inherit: "default";
-                               color_class : "AO0251";
-                       }
-               }
-               
-               part {
-                       name : "padding.center.2";
-                       type : SPACER;
-                       scale : 1;
-                       description {
-                               state : "default";
-                               min : 360 PADDING_CENTER_2;
-                               max : 360 PADDING_CENTER_2;
-                               fixed: 1 1;
-                       //      color :0 0 200 200;
-                               align : 0.5 0.0;
-                               rel1 { relative : 0.5 1.0; to : "img.disturb.icon";}
-                               rel2 { relative : 0.5 1.0; to : "img.disturb.icon";}
-                       }
-               }
-               part {
-                       name : "txt.disturb";
-                       type : TEXT;
-                       clip_to : "clipper_dnd";
-                       scale : 1;
-                       description{
-                               state : "default" 0.0;
-                               min : DND_TEXT_WIDTH DND_TEXT_HEIGHT;
-                               fixed : 1 1;
-                               align : 0.5 0.0;
-                               color_class : "AT0113";
-                               rel1{ relative: 0.5 1.0; to : "padding.center.2";}
-                               rel2{ relative: 0.5 1.0;to : "padding.center.2";}
-                               text {
-                                       min : 1 1;
-                                       align: 0.5 0.5;
-                                       text : "Do not disturb";
-                                       ellipsis : 0;
-                                       text_class : "AT0113";
-                               }
-                       }
-               }
-               part {
-                       name: "clipper_dnd";
-                       type: RECT;
-                       scale: 1;
-                       mouse_events: 0;
-                       description {
-                               state: "default" 0.0;
-                               color: 255 255 255 0;
-                               rel1.to: "bg";
-                               rel2.to: "bg";
-                       }
-                       description {
-                               state: "fade_in" 0.0;
-                               inherit: "default";
-                               color: 255 255 255 255;
-                       }
-               }
-               part {
-                       name : "dnd.touch.area";
-               //      type : RECT;
-                       type : IMAGE;
-                       precise_is_inside: 1;
-                       repeat_events: 1;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-               //              min : 232 232;
-               //              max : 232 232;
-               //              fixed : 1 1;
-                               color : 0 100 100 0;
-               //              align : 0.5 0.5;
-                               image.normal: "moment_bar_focus_bt_touch_1.png";
-//                             color_class : "AO0217";
-                               rel1.to: "bg";
-                               rel2.to: "bg";
-                       }
-               }
-#endif
-       }
-
-       programs {
-               // Hide
-/*             program {
-                       name: "dnd_hide";
-                       signal: "dnd_hide";
-                       source: "clipper_dnd";
-                       action: STATE_SET "default" 0.0;
-                       target: "clipper_dnd";
-                       after: "dnd_fade_out_end";
-               }
-               // Fade Out effect
-               program {
-                       name: "dnd_fade_out";
-                       signal: "dnd_fade_out";
-                       source: "clipper_dnd";
-                       action: STATE_SET "default" 0.0;
-                       target: "clipper_dnd";
-                       transition: ACCEL_FAC 0.1 0.33;
-                       after : "dnd_fade_out_end";
-               }
-               program {
-                       name : "dnd_fade_out_end";
-                       action : SIGNAL_EMIT "dnd_fade_out_end" "signal";
-               }
-
-               // Fade In effect
-               program {
-                       name: "dnd_fade_in";
-                       signal: "dnd_fade_in";
-                       source: "clipper_dnd";
-                       action: STATE_SET "default" 0.0;
-                       target: "clipper_dnd";
-                       transition: ACCEL_FAC 0.1 0.33;
-                       after: "dnd_fade_in_start";
-               }
-               program {
-                       name: "dnd_fade_in_start";
-                       signal: "dnd_fade_in";
-                       source: "clipper_dnd";
-                       action: STATE_SET "fade_in" 0.0;
-                       target: "clipper_dnd";
-                       transition: ACCEL_FAC 0.1 0.33;
-               }*/
-
-               /* VZW */
-               program {
-                       name: "dnd.vzw";
-                       signal: "dnd.vzw";
-                       source: "img.disturb.icon";
-                       action: STATE_SET "vzw" 0.0;
-                       target: "img.disturb.icon";
-               }
-
-               // Enable
-               program {
-                       name: "dnd.enable";
-                       signal: "dnd.enable";
-                       source: "dnd.bg.icon";
-                       action: STATE_SET "default" 0.0;
-               //      target: "img.disturb.bg";
-               //      target: "img.disturb.icon";
-                       target: "img.disturb.bar";
-               }
-               // Disable
-               program {
-                       name: "dnd.disable";
-                       signal: "dnd.disable";
-                       source: "dnd.bg.icon";
-                       action: STATE_SET "off" 0.0;
-               //      target: "img.disturb.bg";
-               //      target: "img.disturb.icon";
-                       target: "img.disturb.bar";
-               }
-
-               /* Press effect */
-               program {
-                       name: "layout.pressed";
-                       signal: "layout.pressed";
-                       source: "";
-                       action: STATE_SET "selected" 0.0;
-                       target: "img.disturb.bg";
-               }
-               program {
-                       name: "layout.released";
-                       signal: "layout.released";
-                       source: "";
-                       action: STATE_SET "default" 0.0;
-                       target: "img.disturb.bg";
-               }
-       }
-}
\ No newline at end of file
index 2f7af0a2f6584c2fca8a8951956c20f5c74edd5d..a45c13f38312c734847579adb5638a421ed75628 100644 (file)
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-#define BATTERY_TEXT_MIN_MAX 360 20
-
 #define BATTERY_ICON_COORD_X 169
 #define BATTERY_ICON_COORD_Y 0
 
@@ -92,24 +90,6 @@ group { name : "windicator/layout/dynamic";
                                visible : 0;
                        }
                }
-               part { name : "txt.battery";
-                       type : TEXT;
-                       scale : 1;
-                       description { state : "default" 0.0;
-                               min : BATTERY_TEXT_MIN_MAX;
-                               max : BATTERY_TEXT_MIN_MAX;
-                               fixed : 1 1;
-                               align : 0.5 0.0;
-                               color_class : "AT015";
-                               rel1 { relative : 0.5 1.0; to : "sw.icon.battery"; }
-                               rel2 { relative : 0.5 1.0; to : "sw.icon.battery"; }
-                               text {
-                                       min : 1 1;
-                                       align : 0.5 0.0;
-                                       text_class : "AT015";
-                               }
-                       }
-               }
                part { name : "sw.icon_0";
                        type : SWALLOW;
                        scale : 1;
@@ -157,8 +137,8 @@ group { name : "windicator/layout/dynamic";
                        scale : 1;
                        description { state : "default" 0.0;
                                fixed : 1 1;
-                               rel1 { relative : DYNAMIC_ICON_6_REL1; to : "bg"; }
-                               rel2 { relative : DYNAMIC_ICON_6_REL2; to : "bg"; }
+                               rel1 { relative : DYNAMIC_ICON_4_REL1; to : "bg"; }
+                               rel2 { relative : DYNAMIC_ICON_4_REL2; to : "bg"; }
                        }
                        description { state : "3g_connected_with_dt" 0.0;
                                inherit : "default" 0.0;
@@ -179,13 +159,11 @@ group { name : "windicator/layout/dynamic";
                        scale : 1;
                        description { state : "default" 0.0;
                                fixed : 1 1;
-                               rel1 { relative : DYNAMIC_ICON_7_REL1; to : "bg"; }
-                               rel2 { relative : DYNAMIC_ICON_7_REL2; to : "bg"; }
+                               rel1 { relative : DYNAMIC_ICON_6_REL1; to : "bg"; }
+                               rel2 { relative : DYNAMIC_ICON_6_REL2; to : "bg"; }
                        }
                        description { state : "3g_connected_with_dt" 0.0;
                                inherit : "default" 0.0;
-                               rel1 { relative : DYNAMIC_ICON_6_REL1; to : "bg"; }
-                               rel2 { relative : DYNAMIC_ICON_6_REL2; to : "bg"; }
                        }
                        description { state : "3g_connected_without_dt" 0.0;
                                inherit : "default" 0.0;
@@ -201,13 +179,11 @@ group { name : "windicator/layout/dynamic";
                        scale : 1;
                        description { state : "default" 0.0;
                                fixed : 1 1;
-                               rel1 { relative : DYNAMIC_ICON_8_REL1; to : "bg"; }
-                               rel2 { relative : DYNAMIC_ICON_8_REL2; to : "bg"; }
+                               rel1 { relative : DYNAMIC_ICON_2_REL1; to : "bg"; }
+                               rel2 { relative : DYNAMIC_ICON_2_REL2; to : "bg"; }
                        }
                        description { state : "3g_connected_with_dt" 0.0;
                                inherit : "default" 0.0;
-                               rel1 { relative : DYNAMIC_ICON_7_REL1; to : "bg"; }
-                               rel2 { relative : DYNAMIC_ICON_7_REL2; to : "bg"; }
                        }
                        description { state : "3g_connected_without_dt" 0.0;
                                inherit : "default" 0.0;
@@ -223,13 +199,11 @@ group { name : "windicator/layout/dynamic";
                        scale : 1;
                        description { state : "default" 0.0;
                                fixed : 1 1;
-                               rel1 { relative : DYNAMIC_ICON_3_REL1; to : "bg"; }
-                               rel2 { relative : DYNAMIC_ICON_3_REL2; to : "bg"; }
+                               rel1 { relative : DYNAMIC_ICON_7_REL1; to : "bg"; }
+                               rel2 { relative : DYNAMIC_ICON_7_REL2; to : "bg"; }
                        }
                        description { state : "3g_connected_with_dt" 0.0;
                                inherit : "default" 0.0;
-                               rel1 { relative : DYNAMIC_ICON_8_REL1; to : "bg"; }
-                               rel2 { relative : DYNAMIC_ICON_8_REL2; to : "bg"; }
                        }
                        description { state : "3g_connected_without_dt" 0.0;
                                inherit : "default" 0.0;
@@ -245,13 +219,11 @@ group { name : "windicator/layout/dynamic";
                        scale : 1;
                        description { state : "default" 0.0;
                                fixed : 1 1;
-                               rel1 { relative : DYNAMIC_ICON_2_REL1; to : "bg"; }
-                               rel2 { relative : DYNAMIC_ICON_2_REL2; to : "bg"; }
+                               rel1 { relative : DYNAMIC_ICON_1_REL1; to : "bg"; }
+                               rel2 { relative : DYNAMIC_ICON_1_REL2; to : "bg"; }
                        }
                        description { state : "3g_connected_with_dt" 0.0;
                                inherit : "default" 0.0;
-                               rel1 { relative : DYNAMIC_ICON_2_REL1; to : "bg"; }
-                               rel2 { relative : DYNAMIC_ICON_2_REL2; to : "bg"; }
                        }
                        description { state : "3g_connected_without_dt" 0.0;
                                inherit : "default" 0.0;
@@ -267,13 +239,11 @@ group { name : "windicator/layout/dynamic";
                        scale : 1;
                        description { state : "default" 0.0;
                                fixed : 1 1;
-                               rel1 { relative : DYNAMIC_ICON_1_REL1; to : "bg"; }
-                               rel2 { relative : DYNAMIC_ICON_1_REL2; to : "bg"; }
+                               rel1 { relative : DYNAMIC_ICON_8_REL1; to : "bg"; }
+                               rel2 { relative : DYNAMIC_ICON_8_REL2; to : "bg"; }
                        }
                        description { state : "3g_connected_with_dt" 0.0;
                                inherit : "default" 0.0;
-                               rel1 { relative : DYNAMIC_ICON_1_REL1; to : "bg"; }
-                               rel2 { relative : DYNAMIC_ICON_1_REL2; to : "bg"; }
                        }
                        description { state : "3g_connected_without_dt" 0.0;
                                inherit : "default" 0.0;
diff --git a/edc/windicator_flight_mode_layout.edc b/edc/windicator_flight_mode_layout.edc
deleted file mode 100644 (file)
index bc451b3..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Samsung API
- * Copyright (c) 2013 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Flora License, Version 1.1 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://floralicense.org/license/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-group {
-       name : "windicator/flight_mode";
-       images {
-               image : "Controls/b_moment_more_opt_ic_bg.png" COMP;
-               image : "Controls/flight_mode.png" COMP;
-       }
-       parts {
-               part {
-                       name : "bg";
-                       type : SPACER;
-                       scale :1;
-                       description {
-                               state : "default";
-                               min : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               max : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                       }
-               }
-               part {
-                       name : "img.flight.bg";
-                       type : IMAGE;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               max : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               fixed : 1 1;
-                               align : 0.0 0.0;
-                               image.normal: "Controls/b_moment_more_opt_ic_bg.png";
-                               color_class : "AO0122";
-                               rel1 { relative : 0.0 0.0; to : "bg"; }
-                               rel2 { relative : 0.0 0.0; to : "bg"; }
-                       }/*
-                       description {
-                               state: "off" 0.0;
-                               inherit: "default";
-                               color_class : "AO01221";
-                       }*/
-                       description {
-                               state : "selected" 0.0;
-                               inherit : "default" 0.0;
-                               color_class : "AO0122P";
-                       }
-               }
-               part {
-                       name : "img.flight.icon";
-                       type : IMAGE;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               max : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               fixed : 1 1;
-                               align : 0.0 0.0;
-                               image.normal: "Controls/flight_mode.png";
-                               color_class : "AO012";
-                               rel1 { relative : 0.0 0.0; to : "bg"; }
-                               rel2 { relative : 0.0 0.0; to : "bg"; }
-                       }
-               }
-               part {
-                       name : "img.flight.bar";
-                       type : IMAGE;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : 26 22;
-                               max : 26 22;
-                               fixed : 1 1;
-                               align : 0.0 0.0;
-                               image.normal: "b_moment_more_opt_bar.png";
-                               color_class : "AO0211";
-                               rel1 { relative : 0.0 0.0; to : "bg"; offset : 19 42;}
-                               rel2 { relative : 0.0 0.0; to : "bg"; }
-                       }
-                       description {
-                               state: "off" 0.0;
-                               inherit: "default";
-                               color_class : "AO0212";
-                       }
-               }
-       }
-
-       programs {
-               // Enable
-               program {
-                       name: "flight.enable";
-                       signal: "flight.enable";
-                       source: "flight.bg.icon";
-                       action: STATE_SET "default" 0.0;
-                       target: "img.flight.bar";
-               }
-               // Disable
-               program {
-                       name: "flight.disable";
-                       signal: "flight.disable";
-                       source: "flight.bg.icon";
-                       action: STATE_SET "off" 0.0;
-                       target: "img.flight.bar";
-               }
-
-               /* Press effect */
-               program {
-                       name: "layout.pressed";
-                       signal: "layout.pressed";
-                       source: "";
-                       action: STATE_SET "selected" 0.0;
-                       target: "img.flight.bg";
-               }
-               program {
-                       name: "layout.released";
-                       signal: "layout.released";
-                       source: "";
-                       action: STATE_SET "default" 0.0;
-                       target: "img.flight.bg";
-               }
-       }
-}
\ No newline at end of file
index e8c6b1357e049af6291f352425f3772a52cf73cf..7e6bb2866b311f8ba373e54c8c5dcc38bbf72bf0 100644 (file)
 
 // 6 BUTTONS LAYOUT
 
-#define ACTION_ICON_6_1_COORD_X 11
-#define ACTION_ICON_6_1_COORD_Y 180
+#define ACTION_BTN_6_1_COORD_X 11
+#define ACTION_BTN_6_1_COORD_Y 180
 
-#define ACTION_ICON_6_2_COORD_X 45
-#define ACTION_ICON_6_2_COORD_Y 246
+#define ACTION_BTN_6_2_COORD_X 45
+#define ACTION_BTN_6_2_COORD_Y 246
 
-#define ACTION_ICON_6_3_COORD_X 110
-#define ACTION_ICON_6_3_COORD_Y 284
+#define ACTION_BTN_6_3_COORD_X 110
+#define ACTION_BTN_6_3_COORD_Y 284
 
-#define ACTION_ICON_6_4_COORD_X 186
-#define ACTION_ICON_6_4_COORD_Y 284
+#define ACTION_BTN_6_4_COORD_X 186
+#define ACTION_BTN_6_4_COORD_Y 284
 
-#define ACTION_ICON_6_5_COORD_X 251
-#define ACTION_ICON_6_5_COORD_Y 246
+#define ACTION_BTN_6_5_COORD_X 251
+#define ACTION_BTN_6_5_COORD_Y 246
 
-#define ACTION_ICON_6_6_COORD_X 285
-#define ACTION_ICON_6_6_COORD_Y 180
+#define ACTION_BTN_6_6_COORD_X 285
+#define ACTION_BTN_6_6_COORD_Y 180
 
-// RELATIVE
+#define ACTION_BTN_6_1_REL1 REL_W(ACTION_BTN_6_1_COORD_X) REL_H(ACTION_BTN_6_1_COORD_Y)
+#define ACTION_BTN_6_1_REL2 REL_W((ACTION_BTN_6_1_COORD_X+ACTION_BTN_WIDTH)) REL_H((ACTION_BTN_6_1_COORD_Y+ACTION_BTN_HEIGHT))
 
-#define ACTION_ICON_6_1_REL1 REL_W(ACTION_ICON_6_1_COORD_X) REL_H(ACTION_ICON_6_1_COORD_Y)
-#define ACTION_ICON_6_1_REL2 REL_W((ACTION_ICON_6_1_COORD_X+DEFAULT_ICON_WIDTH)) REL_H((ACTION_ICON_6_1_COORD_Y+DEFAULT_ICON_HEIGHT))
+#define ACTION_BTN_6_2_REL1 REL_W(ACTION_BTN_6_2_COORD_X) REL_H(ACTION_BTN_6_2_COORD_Y)
+#define ACTION_BTN_6_2_REL2 REL_W((ACTION_BTN_6_2_COORD_X+ACTION_BTN_WIDTH)) REL_H((ACTION_BTN_6_2_COORD_Y+ACTION_BTN_HEIGHT))
 
-#define ACTION_ICON_6_2_REL1 REL_W(ACTION_ICON_6_2_COORD_X) REL_H(ACTION_ICON_6_2_COORD_Y)
-#define ACTION_ICON_6_2_REL2 REL_W((ACTION_ICON_6_2_COORD_X+DEFAULT_ICON_WIDTH)) REL_H((ACTION_ICON_6_2_COORD_Y+DEFAULT_ICON_HEIGHT))
+#define ACTION_BTN_6_3_REL1 REL_W(ACTION_BTN_6_3_COORD_X) REL_H(ACTION_BTN_6_3_COORD_Y)
+#define ACTION_BTN_6_3_REL2 REL_W((ACTION_BTN_6_3_COORD_X+ACTION_BTN_WIDTH)) REL_H((ACTION_BTN_6_3_COORD_Y+ACTION_BTN_HEIGHT))
 
-#define ACTION_ICON_6_3_REL1 REL_W(ACTION_ICON_6_3_COORD_X) REL_H(ACTION_ICON_6_3_COORD_Y)
-#define ACTION_ICON_6_3_REL2 REL_W((ACTION_ICON_6_3_COORD_X+DEFAULT_ICON_WIDTH)) REL_H((ACTION_ICON_6_3_COORD_Y+DEFAULT_ICON_HEIGHT))
+#define ACTION_BTN_6_4_REL1 REL_W(ACTION_BTN_6_4_COORD_X) REL_H(ACTION_BTN_6_4_COORD_Y)
+#define ACTION_BTN_6_4_REL2 REL_W((ACTION_BTN_6_4_COORD_X+ACTION_BTN_WIDTH)) REL_H((ACTION_BTN_6_4_COORD_Y+ACTION_BTN_HEIGHT))
 
-#define ACTION_ICON_6_4_REL1 REL_W(ACTION_ICON_6_4_COORD_X) REL_H(ACTION_ICON_6_4_COORD_Y)
-#define ACTION_ICON_6_4_REL2 REL_W((ACTION_ICON_6_4_COORD_X+DEFAULT_ICON_WIDTH)) REL_H((ACTION_ICON_6_4_COORD_Y+DEFAULT_ICON_HEIGHT))
+#define ACTION_BTN_6_5_REL1 REL_W(ACTION_BTN_6_5_COORD_X) REL_H(ACTION_BTN_6_5_COORD_Y)
+#define ACTION_BTN_6_5_REL2 REL_W((ACTION_BTN_6_5_COORD_X+ACTION_BTN_WIDTH)) REL_H((ACTION_BTN_6_5_COORD_Y+ACTION_BTN_HEIGHT))
 
-#define ACTION_ICON_6_5_REL1 REL_W(ACTION_ICON_6_5_COORD_X) REL_H(ACTION_ICON_6_5_COORD_Y)
-#define ACTION_ICON_6_5_REL2 REL_W((ACTION_ICON_6_5_COORD_X+DEFAULT_ICON_WIDTH)) REL_H((ACTION_ICON_6_5_COORD_Y+DEFAULT_ICON_HEIGHT))
-
-#define ACTION_ICON_6_6_REL1 REL_W(ACTION_ICON_6_6_COORD_X) REL_H(ACTION_ICON_6_6_COORD_Y)
-#define ACTION_ICON_6_6_REL2 REL_W((ACTION_ICON_6_6_COORD_X+DEFAULT_ICON_WIDTH)) REL_H((ACTION_ICON_6_6_COORD_Y+DEFAULT_ICON_HEIGHT))
+#define ACTION_BTN_6_6_REL1 REL_W(ACTION_BTN_6_6_COORD_X) REL_H(ACTION_BTN_6_6_COORD_Y)
+#define ACTION_BTN_6_6_REL2 REL_W((ACTION_BTN_6_6_COORD_X+ACTION_BTN_WIDTH)) REL_H((ACTION_BTN_6_6_COORD_Y+ACTION_BTN_HEIGHT))
 
 // 5 BUTTONS LAYOUT
 
-#define ACTION_ICON_5_1_COORD_X 22
-#define ACTION_ICON_5_1_COORD_Y 211
-
-#define ACTION_ICON_5_2_COORD_X 73
-#define ACTION_ICON_5_2_COORD_Y 268
+#define ACTION_BTN_5_1_COORD_X 22
+#define ACTION_BTN_5_1_COORD_Y 211
 
-#define ACTION_ICON_5_3_COORD_X 148
-#define ACTION_ICON_5_3_COORD_Y 289
+#define ACTION_BTN_5_2_COORD_X 73
+#define ACTION_BTN_5_2_COORD_Y 268
 
-#define ACTION_ICON_5_4_COORD_X 223
-#define ACTION_ICON_5_4_COORD_Y 268
+#define ACTION_BTN_5_3_COORD_X 148
+#define ACTION_BTN_5_3_COORD_Y 289
 
-#define ACTION_ICON_5_5_COORD_X 274
-#define ACTION_ICON_5_5_COORD_Y 211
+#define ACTION_BTN_5_4_COORD_X 223
+#define ACTION_BTN_5_4_COORD_Y 268
 
-// RELATIVE
+#define ACTION_BTN_5_5_COORD_X 274
+#define ACTION_BTN_5_5_COORD_Y 211
 
-#define ACTION_ICON_5_1_REL1 REL_W(ACTION_ICON_5_1_COORD_X) REL_H(ACTION_ICON_5_1_COORD_Y)
-#define ACTION_ICON_5_1_REL2 REL_W((ACTION_ICON_5_1_COORD_X+DEFAULT_ICON_WIDTH)) REL_H((ACTION_ICON_5_1_COORD_Y+DEFAULT_ICON_HEIGHT))
+#define ACTION_BTN_5_1_REL1 REL_W(ACTION_BTN_5_1_COORD_X) REL_H(ACTION_BTN_5_1_COORD_Y)
+#define ACTION_BTN_5_1_REL2 REL_W((ACTION_BTN_5_1_COORD_X+ACTION_BTN_WIDTH)) REL_H((ACTION_BTN_5_1_COORD_Y+ACTION_BTN_HEIGHT))
 
-#define ACTION_ICON_5_2_REL1 REL_W(ACTION_ICON_5_2_COORD_X) REL_H(ACTION_ICON_5_2_COORD_Y)
-#define ACTION_ICON_5_2_REL2 REL_W((ACTION_ICON_5_2_COORD_X+DEFAULT_ICON_WIDTH)) REL_H((ACTION_ICON_5_2_COORD_Y+DEFAULT_ICON_HEIGHT))
+#define ACTION_BTN_5_2_REL1 REL_W(ACTION_BTN_5_2_COORD_X) REL_H(ACTION_BTN_5_2_COORD_Y)
+#define ACTION_BTN_5_2_REL2 REL_W((ACTION_BTN_5_2_COORD_X+ACTION_BTN_WIDTH)) REL_H((ACTION_BTN_5_2_COORD_Y+ACTION_BTN_HEIGHT))
 
-#define ACTION_ICON_5_3_REL1 REL_W(ACTION_ICON_5_3_COORD_X) REL_H(ACTION_ICON_5_3_COORD_Y)
-#define ACTION_ICON_5_3_REL2 REL_W((ACTION_ICON_5_3_COORD_X+DEFAULT_ICON_WIDTH)) REL_H((ACTION_ICON_5_3_COORD_Y+DEFAULT_ICON_HEIGHT))
+#define ACTION_BTN_5_3_REL1 REL_W(ACTION_BTN_5_3_COORD_X) REL_H(ACTION_BTN_5_3_COORD_Y)
+#define ACTION_BTN_5_3_REL2 REL_W((ACTION_BTN_5_3_COORD_X+ACTION_BTN_WIDTH)) REL_H((ACTION_BTN_5_3_COORD_Y+ACTION_BTN_HEIGHT))
 
-#define ACTION_ICON_5_4_REL1 REL_W(ACTION_ICON_5_4_COORD_X) REL_H(ACTION_ICON_5_4_COORD_Y)
-#define ACTION_ICON_5_4_REL2 REL_W((ACTION_ICON_5_4_COORD_X+DEFAULT_ICON_WIDTH)) REL_H((ACTION_ICON_5_4_COORD_Y+DEFAULT_ICON_HEIGHT))
+#define ACTION_BTN_5_4_REL1 REL_W(ACTION_BTN_5_4_COORD_X) REL_H(ACTION_BTN_5_4_COORD_Y)
+#define ACTION_BTN_5_4_REL2 REL_W((ACTION_BTN_5_4_COORD_X+ACTION_BTN_WIDTH)) REL_H((ACTION_BTN_5_4_COORD_Y+ACTION_BTN_HEIGHT))
 
-#define ACTION_ICON_5_5_REL1 REL_W(ACTION_ICON_5_5_COORD_X) REL_H(ACTION_ICON_5_5_COORD_Y)
-#define ACTION_ICON_5_5_REL2 REL_W((ACTION_ICON_5_5_COORD_X+DEFAULT_ICON_WIDTH)) REL_H((ACTION_ICON_5_5_COORD_Y+DEFAULT_ICON_HEIGHT))
+#define ACTION_BTN_5_5_REL1 REL_W(ACTION_BTN_5_5_COORD_X) REL_H(ACTION_BTN_5_5_COORD_Y)
+#define ACTION_BTN_5_5_REL2 REL_W((ACTION_BTN_5_5_COORD_X+ACTION_BTN_WIDTH)) REL_H((ACTION_BTN_5_5_COORD_Y+ACTION_BTN_HEIGHT))
 
 
 group { name : "windicator/moment_bar/first_page/main_ly";
@@ -129,16 +125,16 @@ group { name : "windicator/moment_bar/first_page/main_ly";
                        scale : 1;
                        description { state : "default" 0.0;
                                fixed : 1 1;
-                               rel1 { relative : ACTION_ICON_6_1_REL1; to : "rect.bg"; }
-                               rel2 { relative : ACTION_ICON_6_1_REL2; to : "rect.bg"; }
+                               rel1 { relative : ACTION_BTN_6_1_REL1; to : "rect.bg"; }
+                               rel2 { relative : ACTION_BTN_6_1_REL2; to : "rect.bg"; }
                        }
                        description { state : "6_action_btns" 0.0;
                                inherit : "default" 0.0;
                        }
                        description { state : "5_action_btns" 0.0;
                                inherit : "default" 0.0;
-                               rel1 { relative : ACTION_ICON_5_1_REL1; to : "rect.bg"; }
-                               rel2 { relative : ACTION_ICON_5_1_REL2; to : "rect.bg"; }
+                               rel1 { relative : ACTION_BTN_5_1_REL1; to : "rect.bg"; }
+                               rel2 { relative : ACTION_BTN_5_1_REL2; to : "rect.bg"; }
                        }
                }
                part { name : "action_btn_0.touch.area";
@@ -165,16 +161,16 @@ group { name : "windicator/moment_bar/first_page/main_ly";
                        scale : 1;
                        description { state : "default" 0.0;
                                fixed : 1 1;
-                               rel1 { relative : ACTION_ICON_6_2_REL1; to : "rect.bg"; }
-                               rel2 { relative : ACTION_ICON_6_2_REL2; to : "rect.bg"; }
+                               rel1 { relative : ACTION_BTN_6_2_REL1; to : "rect.bg"; }
+                               rel2 { relative : ACTION_BTN_6_2_REL2; to : "rect.bg"; }
                        }
                        description { state : "6_action_btns" 0.0;
                                inherit : "default" 0.0;
                        }
                        description { state : "5_action_btns" 0.0;
                                inherit : "default" 0.0;
-                               rel1 { relative : ACTION_ICON_5_2_REL1; to : "rect.bg"; }
-                               rel2 { relative : ACTION_ICON_5_2_REL2; to : "rect.bg"; }
+                               rel1 { relative : ACTION_BTN_5_2_REL1; to : "rect.bg"; }
+                               rel2 { relative : ACTION_BTN_5_2_REL2; to : "rect.bg"; }
                        }
                }
                part { name : "action_btn_1.touch.area";
@@ -201,16 +197,16 @@ group { name : "windicator/moment_bar/first_page/main_ly";
                        scale : 1;
                        description { state : "default" 0.0;
                                fixed : 1 1;
-                               rel1 { relative : ACTION_ICON_6_3_REL1; to : "rect.bg"; }
-                               rel2 { relative : ACTION_ICON_6_3_REL2; to : "rect.bg"; }
+                               rel1 { relative : ACTION_BTN_6_3_REL1; to : "rect.bg"; }
+                               rel2 { relative : ACTION_BTN_6_3_REL2; to : "rect.bg"; }
                        }
                        description { state : "6_action_btns" 0.0;
                                inherit : "default" 0.0;
                        }
                        description { state : "5_action_btns" 0.0;
                                inherit : "default" 0.0;
-                               rel1 { relative : ACTION_ICON_5_3_REL1; to : "rect.bg"; }
-                               rel2 { relative : ACTION_ICON_5_3_REL2; to : "rect.bg"; }
+                               rel1 { relative : ACTION_BTN_5_3_REL1; to : "rect.bg"; }
+                               rel2 { relative : ACTION_BTN_5_3_REL2; to : "rect.bg"; }
                        }
                }
                part { name : "action_btn_2.touch.area";
@@ -237,16 +233,16 @@ group { name : "windicator/moment_bar/first_page/main_ly";
                        scale : 1;
                        description { state : "default" 0.0;
                                fixed : 1 1;
-                               rel1 { relative : ACTION_ICON_6_4_REL1; to : "rect.bg"; }
-                               rel2 { relative : ACTION_ICON_6_4_REL2; to : "rect.bg"; }
+                               rel1 { relative : ACTION_BTN_6_4_REL1; to : "rect.bg"; }
+                               rel2 { relative : ACTION_BTN_6_4_REL2; to : "rect.bg"; }
                        }
                        description { state : "6_action_btns" 0.0;
                                inherit : "default" 0.0;
                        }
                        description { state : "5_action_btns" 0.0;
                                inherit : "default" 0.0;
-                               rel1 { relative : ACTION_ICON_5_4_REL1; to : "rect.bg"; }
-                               rel2 { relative : ACTION_ICON_5_4_REL2; to : "rect.bg"; }
+                               rel1 { relative : ACTION_BTN_5_4_REL1; to : "rect.bg"; }
+                               rel2 { relative : ACTION_BTN_5_4_REL2; to : "rect.bg"; }
                        }
                }
                part { name : "action_btn_3.touch.area";
@@ -273,16 +269,16 @@ group { name : "windicator/moment_bar/first_page/main_ly";
                        scale : 1;
                        description { state : "default" 0.0;
                                fixed : 1 1;
-                               rel1 { relative : ACTION_ICON_6_5_REL1; to : "rect.bg"; }
-                               rel2 { relative : ACTION_ICON_6_5_REL2; to : "rect.bg"; }
+                               rel1 { relative : ACTION_BTN_6_5_REL1; to : "rect.bg"; }
+                               rel2 { relative : ACTION_BTN_6_5_REL2; to : "rect.bg"; }
                        }
                        description { state : "6_action_btns" 0.0;
                                inherit : "default" 0.0;
                        }
                        description { state : "5_action_btns" 0.0;
                                inherit : "default" 0.0;
-                               rel1 { relative : ACTION_ICON_5_5_REL1; to : "rect.bg"; }
-                               rel2 { relative : ACTION_ICON_5_5_REL2; to : "rect.bg"; }
+                               rel1 { relative : ACTION_BTN_5_5_REL1; to : "rect.bg"; }
+                               rel2 { relative : ACTION_BTN_5_5_REL2; to : "rect.bg"; }
                        }
                }
                part { name : "action_btn_4.touch.area";
@@ -309,8 +305,8 @@ group { name : "windicator/moment_bar/first_page/main_ly";
                        scale : 1;
                        description { state : "default" 0.0;
                                fixed : 1 1;
-                               rel1 { relative : ACTION_ICON_6_6_REL1; to : "rect.bg"; }
-                               rel2 { relative : ACTION_ICON_6_6_REL2; to : "rect.bg"; }
+                               rel1 { relative : ACTION_BTN_6_6_REL1; to : "rect.bg"; }
+                               rel2 { relative : ACTION_BTN_6_6_REL2; to : "rect.bg"; }
                        }
                        description { state : "6_action_btns" 0.0;
                                inherit : "default" 0.0;
index b08282c4a61da00dece85ed2a80c339286a6fc30..66ccf1477e5a0fe04589af519f65bcc9168c722b 100644 (file)
  * limitations under the License.
  */
 
-styles {
-       style {
-               name: "style_txt_battery";
-               base: "font=Tizen:style=Regular font_size=22 align=center color=#ffffffff color_class=AT01111 wrap=mixed text_class=AT01111";
-               tag: "br" "\n";
-               tag: "hilight" "+ color=#ffff";
-               tag: "b" "+ color=#ffff";
-               tag: "tab" "\t";
-       }
-}
-
 group {
        name : "windicator/moment_view/full";
        images {
-               //image : "b_moment_bar_detail_bg.png" COMP;
-               //image : "b_moment_bar_detail_bg_cover.png" COMP;
+               image : "b_moment_bar_detail_bg.png" COMP;
+               image : "b_moment_bar_detail_bg_cover.png" COMP;
        }
        parts {
                part {
@@ -55,7 +44,7 @@ group {
                                min : WIN_WIDTH WIN_HEIGHT;
                                max : WIN_WIDTH WIN_HEIGHT;
                                fixed : 1 1;
-                               //image.normal: "b_moment_bar_detail_bg.png";
+                               image.normal: "b_moment_bar_detail_bg.png";
                                color_class : "AO013";
                                rel1 { relative : 0.0 -0.73; to : "bg";}
                                rel2 { relative : 1.0 1.0-0.73; to : "bg";}
@@ -70,7 +59,7 @@ group {
                                min : WIN_WIDTH WIN_HEIGHT;
                                max : WIN_WIDTH WIN_HEIGHT;
                                fixed : 1 1;
-                               //image.normal: "b_moment_bar_detail_bg_cover.png";
+                               image.normal: "b_moment_bar_detail_bg_cover.png";
                                color_class : "AO0131";
                                rel1 { relative : 0.0 -0.72; to : "bg"; }
                                rel2 { relative : 1.0 1.0-0.72; to : "bg"; }
@@ -151,7 +140,6 @@ group {
                part {
                        name : "txt.momentview.battery";
                        type : TEXTBLOCK;
-//                     type : SWALLOW;
                        scale : 1;
                        description{
                                state : "default" 0.0;
@@ -163,9 +151,7 @@ group {
                                rel2 { relative : 0.5 0.5; to : "bg"; offset: 0 12;}
                                text {
                                        style : "style_txt_battery";
-                                       min : 1 1;
-                                       align : 0.5 0.5;
-                                       text : "50%";
+                                       min : 0 1;
                                }
                        }
                }
diff --git a/edc/windicator_music_layout.edc b/edc/windicator_music_layout.edc
deleted file mode 100644 (file)
index 1c1c4a9..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Samsung API
- * Copyright (c) 2013 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Flora License, Version 1.1 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://floralicense.org/license/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-group {
-       name : "windicator/music_btn";
-       images {
-//             image : "mb_3g_indi_link_stroke.png" COMP;
-               image : "Controls/b_moment_more_opt_ic_bg.png" COMP;
-               image : "Controls/music.png" COMP;
-       }
-       parts {
-               part {
-                       name : "bg";
-                       type : SPACER;
-                       scale :1;
-                       description {
-                               state : "default";
-                               min : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               max : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                       }
-               }
-               part {
-                       name : "img.music.bg";
-                       type : IMAGE;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               max : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               fixed : 1 1;
-                               align : 0.0 0.0;
-                               image.normal: "Controls/b_moment_more_opt_ic_bg.png";
-                               color_class : "AO0122";
-                               rel1 { relative : 0.0 0.0; to : "bg"; }
-                               rel2 { relative : 0.0 0.0; to : "bg"; }
-                       }
-                       description {
-                               state : "disable" 0.0;
-                               inherit : "default" 0.0;
-                               color_class : "AO0122D";
-                       }
-                       description {
-                               state : "selected" 0.0;
-                               inherit : "default" 0.0;
-                               color_class : "AO0122P";
-                       }
-               }
-               part {
-                       name : "img.music.icon";
-                       type : IMAGE;
-                       scale : 1;
-                       repeat_events : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               max : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               fixed : 1 1;
-                               align : 0.0 0.0;
-                               image.normal: "Controls/music.png";
-                               color_class : "AO012";
-                               rel1 { relative : 0.0 0.0; to : "bg"; }
-                               rel2 { relative : 0.0 0.0; to : "bg"; }
-                       }
-                       description {
-                               state : "disable" 0.0;
-                               inherit : "default" 0.0;
-                               color_class : "AO012D";
-                       }
-               }
-       }
-       programs {
-               program {
-                       name : "img.music.enable";
-                       signal : "img.music.enable";
-                       source : "img.music.icon";
-                       action : STATE_SET "default" 0.0;
-                       target : "img.music.icon";
-                       target : "img.music.bg";
-               }
-               program {
-                       name : "img.music.disable";
-                       signal : "img.music.disable";
-                       source : "img.music.icon";
-                       action : STATE_SET "disable" 0.0;
-                       target : "img.music.icon";
-                       target : "img.music.bg";
-               }
-
-               /* Press effect */
-               program {
-                       name: "layout.pressed";
-                       signal: "layout.pressed";
-                       source: "";
-                       action: STATE_SET "selected" 0.0;
-                       target: "img.music.bg";
-               }
-               program {
-                       name: "layout.released";
-                       signal: "layout.released";
-                       source: "";
-                       action: STATE_SET "default" 0.0;
-                       target: "img.music.bg";
-               }
-
-               // Hide
-/*             program {
-                       name: "music_hide";
-                       signal: "music_hide";
-                       source: "clipper_music";
-                       action: STATE_SET "default" 0.0;
-                       target: "clipper_music";
-                       after: "music_fade_out_end";
-               }
-               // Fade Out effect
-               program {
-                       name: "music_fade_out";
-                       signal: "music_fade_out";
-                       source: "clipper_music";
-                       action: STATE_SET "default" 0.0;
-                       target: "clipper_music";
-                       transition: ACCEL_FAC 0.1 0.33;
-                       after: "music_fade_out_end";
-               }
-               program {
-                       name : "music_fade_out_end";
-                       action : SIGNAL_EMIT "music_fade_out_end" "signal";
-               }
-
-               // Fade In effect
-               program {
-                       name: "music_fade_in";
-                       signal: "music_fade_in";
-                       source: "clipper_music";
-                       action: STATE_SET "default" 0.0;
-                       target: "clipper_music";
-                       transition: ACCEL_FAC 0.1 0.33;
-                       after: "music_fade_in_start";
-               }
-               program {
-                       name: "music_fade_in_start";
-                       signal: "music_fade_in";
-                       source: "clipper_music";
-                       action: STATE_SET "fade_in" 0.0;
-                       target: "clipper_music";
-                       transition: ACCEL_FAC 0.1 0.33;
-               }*/
-       }
-}
\ No newline at end of file
index 738530d134d06ca6bc587e5e38ad881a06d56592..79418755ca3b84bd7ec429b478a5cf653fd596c9 100644 (file)
@@ -57,7 +57,7 @@ styles {
                tag : "tab" "\t";
        }
        style { name : "style_txt_sim_state";
-               base : "font=Tizen font_weight=Normal font_width=Condensed font_size=24 align=center valign=center color=#0092faff wrap=mixed ellipsis=1.0";
+               base : "font=Tizen font_weight=Normal font_width=Condensed font_size=24 align=center valign=center color=#ffffffff wrap=mixed ellipsis=1.0";
                tag : "br" "\n";
                tag : "hilight" "+ color=#ffff";
                tag : "b" "+ color=#ffff";
diff --git a/edc/windicator_volume.edc b/edc/windicator_volume.edc
deleted file mode 100644 (file)
index c7c074c..0000000
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Samsung API
- * Copyright (c) 2013 Samsung Electronics Co., Ltd.
- *
- * Licensed under the Flora License, Version 1.1 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://floralicense.org/license/
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-styles {
-       style {
-               name: "style_txt_volume";
-               base: "font=Tizen:style=Regular font_size=24 align=center color=#ffffffff color_class=AT016 wrap=mixed text_class=AT016";
-               tag: "br" "\n";
-               tag: "hilight" "+ color=#ffff";
-               tag: "b" "+ color=#ffff";
-               tag: "tab" "\t";
-       }
-}
-group {
-       name : "windicator/volume/small_icon";
-       images {
-               image : "Controls/b_moment_more_opt_ic_bg.png" COMP;
-               image : "Controls/ringtone.png" COMP;
-               image : "Controls/multimedia.png" COMP;
-               image : "Controls/multimedia_off.png" COMP;
-               image : "Controls/vibrate.png" COMP;
-       }
-       parts {
-               part {
-                       name : "bg";
-                       type : SPACER;
-                       scale :1;
-                       description {
-                               state : "default";
-                               min : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               max : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                       }
-               }
-               
-               part {
-                       name : "img.volume.bg";
-                       type : IMAGE;
-                       scale : 1;
-                       //repeat_events : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               max : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               fixed : 1 1;
-                               align : 0.0 0.0;
-                               image.normal: "Controls/b_moment_more_opt_ic_bg.png";
-                               color_class : "AO0122";
-                               rel1 { relative : 0.0 0.0; to : "bg"; }
-                               rel2 { relative : 0.0 0.0; to : "bg"; }
-                       }
-                       description {
-                               state : "selected" 0.0;
-                               inherit : "default" 0.0;
-                               color_class : "AO0122P";
-                       }
-               }
-               part {
-                       name : "img.volume.icon";
-                       type : IMAGE;
-                       scale : 1;
-                       repeat_events : 1;
-                       description {
-                               state : "default" 0.0;
-                               min : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               max : DEFAULT_ICON_WIDTH DEFAULT_ICON_HEIGHT;
-                               fixed : 1 1;
-                               align : 0.0 0.0;
-                               /* [P151109-00606] */
-                               image.normal: "Controls/multimedia.png";
-                               color_class : "AO012";
-                               rel1 { relative : 0.0 0.0; to : "bg"; }
-                               rel2 { relative : 0.0 0.0; to : "bg"; }
-                       }
-                       description {
-                               state: "mute" 0.0;
-                               inherit: "default";
-                               image.normal: "Controls/multimedia_off.png";
-                       }
-                       description {
-                               state: "media" 0.0;
-                               inherit: "default";
-                               image.normal: "Controls/multimedia.png";
-                       }
-                       description {
-                               state: "vibrate" 0.0;
-                               inherit: "default";
-                               image.normal: "Controls/vibrate.png";
-                       }
-               }
-               part {
-                       name : "txt.volume";
-                       type : TEXTBLOCK;
-                       scale : 1;
-                       description {
-                               state : "default" 0.0;
-                               max : 32 25;
-                               min : 32 25;
-                               fixed : 1 1;
-                               align : 0.5 0.0;
-                               color: 0 0 0 255;
-                               rel1 { relative : 0.5 0.0; to : "img.volume.icon"; offset : 0 33;}
-                               rel2 { relative : 0.5 0.0; to : "img.volume.icon";}
-                               text {
-                                       align : 0.5 0.5;
-                                       min : 0 1;
-                                       style : "style_txt_volume";
-                                       text : "0";
-                               }
-                       }
-                       description {
-                               state: "mute" 0.0;
-                               inherit: "default";
-                               visible: 0;
-                       }
-                       description {
-                               state: "media" 0.0;
-                               inherit: "default";
-                               visible: 1;
-                       }
-                       description {
-                               state: "vibrate" 0.0;
-                               inherit: "default";
-                               visible: 0;
-                       }
-               }
-       }
-       programs {
-               // Program to change volume icon
-               program {
-                       name: "volume.icon.ringtone";
-                       signal: "volume.icon.ringtone";
-                       source: "img.volume.icon";
-                       action: STATE_SET "default" 0.0;
-                       target: "img.volume.icon";
-               }
-               program {
-                       name: "volume.icon.mute";
-                       signal: "volume.icon.mute";
-                       source: "img.volume.icon";
-                       action: STATE_SET "mute" 0.0;
-                       target: "img.volume.icon";
-               }
-               program {
-                       name: "volume.icon.media";
-                       signal: "volume.icon.media";
-                       source: "img.volume.icon";
-                       action: STATE_SET "media" 0.0;
-                       target: "img.volume.icon";
-               }
-               program {
-                       name: "volume.icon.vibrate";
-                       signal: "volume.icon.vibrate";
-                       source: "img.volume.icon";
-                       action: STATE_SET "vibrate" 0.0;
-                       target: "img.volume.icon";
-               }
-
-               /* Press effect */
-               program {
-                       name: "layout.pressed";
-                       signal: "layout.pressed";
-                       source: "";
-                       action: STATE_SET "selected" 0.0;
-                       target: "img.volume.bg";
-               }
-               program {
-                       name: "layout.released";
-                       signal: "layout.released";
-                       source: "";
-                       action: STATE_SET "default" 0.0;
-                       target: "img.volume.bg";
-               }
-       }
-}
index 774fe908fc4b2250d2bb35a159f4208e03e28dc8..e15aabdbb7b8970e79d792f62d220298f5c39a74 100644 (file)
  * limitations under the License.
  */
 
-#define WIN_WIDTH 360
-#define WIN_HEIGHT 360
-#define MOMENT_VIEW_HEIGHT 125
-
-#define DYNAMIC_LAYOUT_HEIGHT 38
-#define DYNAMIC_ICON_WIDTH 24
-#define DYNAMIC_ICON_HEIGHT 26
-
-#define BATTERY_ICON_WIDTH 22
-#define BATTERY_ICON_HEIGHT 33
-
-#define BRIGHTNESS_BG_WIDTH 88
-#define BRIGHTNESS_BG_HEIGHT 88
-#define BRIGHTNESS_ICON_WIDTH 88
-#define BRIGHTNESS_ICON_HEIGHT 88
-
-#define BRIGHTNESS_TEXT_WIDTH 168
-#define BRIGHTNESS_TEXT_HEIGHT 37
-
-#define BRIGHTNESS_LARGE_ICON_WIDTH 150
-#define BRIGHTNESS_LARGE_ICON_HEIGHT 150
-
-#define TOGGLE_ICON_WIDTH 64
-#define TOGGLE_ICON_HEIGHT 64
-
-#define VOLUME_BG_WIDTH 120
-#define VOLUME_BG_HEIGHT 76
-#define VOLUME_ICON_WIDTH 72
-#define VOLUME_ICON_HEIGHT 72
-#define VOLUME_TEXT_WIDTH 50
-#define VOLUME_TEXT_HEIGHT 47
-#define VOLUME_LARGE_ICON_WIDTH 190
-#define VOLUME_LARGE_ICON_HEIGHT 190
-
-#define DEFAULT_ICON_WIDTH 64
-#define DEFAULT_ICON_HEIGHT 64
-#define DEFAULT_ICON_PADDING 4
-
-#define DND_BTN_WIDTH 88
-#define DND_BTN_HEIGHT 88
-#define DND_TEXT_WIDTH 168
-#define DND_TEXT_HEIGHT 37
-
-#define MUSIC_BTN_WIDTH 88
-#define MUSIC_BTN_HEIGHT 88
-
-#define CENTER_BG_SIZE 88
-
-#define PADDING_CENTER_2 2
-
-#define REL_W(value) (value/WIN_WIDTH)
-#define REL_H(value) (value/WIN_HEIGHT)
-
-#define FIXED_RECT_FROM_LEFT( rectName, rel_x, rel_y, MinWidth, colorValue, visibleValue) \
-                       part { \
-                               name: rectName; \
-                               type: RECT; \
-                               mouse_events: 0; \
-                               scale: 1; \
-                               description { \
-                                       state: "default" 0.0; \
-                                       min: MinWidth 0; \
-                                       fixed: 1 1; \
-                                       rel1 { relative: 1.0 0.0; to_x: rel_x; to_y: rel_y; } \
-                                       rel2 { relative: 1.0 1.0; to_x: rel_x; to_y: rel_y; } \
-                                       align: 0.0 0.5; \
-                                       color : colorValue; \
-                                       visible: visibleValue; \
-                               } \
-                               description { \
-                                       state: "hide" 0.0; \
-                                       inherit: "default" 0.0; \
-                                       min: 0 0; \
-                                       visible: 0; \
-                               } \
-                       } \
+#include "../../edc/windicator_common_defines.edc"
 
 collections {
        base_scale: 1.3;
@@ -99,16 +24,15 @@ collections {
        #include "../../edc/windicator_moment_bar.edc"
        #include "../../edc/windicator_moment_view.edc"
        #include "../../edc/windicator_dynamic.edc"
-       #include "../../edc/windicator_battery_layout.edc"
        #include "../../edc/windicator_battery_icon.edc"
-       #include "../../edc/windicator_brightness.edc"
-       #include "../../edc/windicator_volume.edc"
+       #include "../../edc/windicator_action_btn_brightness.edc"
+       #include "../../edc/windicator_action_btn_volume.edc"
+       #include "../../edc/windicator_action_btn_dnd.edc"
+       #include "../../edc/windicator_action_btn_flight_mode.edc"
+       #include "../../edc/windicator_action_btn_music.edc"
+       #include "../../edc/windicator_action_btn_call_fwd.edc"
+       #include "../../edc/windicator_scs.edc"
        #include "../../edc/windicator_connect_icons.edc"
        #include "../../edc/windicator_rssi_icons.edc"
-       #include "../../edc/windicator_scs.edc"
-       #include "../../edc/windicator_dnd_layout.edc"
-       #include "../../edc/windicator_flight_mode_layout.edc"
-       #include "../../edc/windicator_music_layout.edc"
-       #include "../../edc/windicator_callfwd_layout.edc"
        #include "../../edc/windicator_dynamic_icon.edc"
 }
index e906cb4b813f0699d772b25be7abe99853727a38..5248155ddf164949a94cf7306160338f423490b0 100755 (executable)
@@ -214,8 +214,6 @@ Evas_Object *windicator_battery_icon_create(Evas_Object *parent, void *data)
 
        elm_object_part_content_set(parent, "sw.icon.battery", icon);
 
-       elm_object_part_text_set(parent, "txt.battery", "50");
-
        evas_object_show(icon);
        _I("moment dynamic view battery initialize END");
 
index 5e1bd5f61b7e7563142ba70d702de6fadc8cfa0e..bffe5aa88eb39df4ea1a1514dafa262a25f6033c 100755 (executable)
@@ -61,7 +61,7 @@ Evas_Object *windicator_brightness_small_layout_create(Evas_Object *parent, void
        Evas_Object *layout = elm_layout_add(parent);
        retv_if(layout == NULL, NULL);
 
-       if (elm_layout_file_set(layout, WINDICATOR_THEME_PATH, "windicator/brightness/small_layout") != EINA_TRUE) {
+       if (elm_layout_file_set(layout, WINDICATOR_THEME_PATH, "windicator/action_btn/brightness") != EINA_TRUE) {
                _E("Failed to set brightness small layout");
                evas_object_del(layout);
                return NULL;
index 741c9508f412d37f04a785ffd805951ea73488d2..5e3c63d552580ca035db6a70c37575925b03126b 100755 (executable)
@@ -42,7 +42,7 @@ Evas_Object *windicator_callfwd_btn_layout_create(Evas_Object *parent, void *dat
        Evas_Object *layout = elm_layout_add(parent);
        retv_if(layout == NULL, NULL);
 
-       if (elm_layout_file_set(layout, WINDICATOR_THEME_PATH, "windicator/callfwd_btn") != EINA_TRUE) {
+       if (elm_layout_file_set(layout, WINDICATOR_THEME_PATH, "windicator/action_btn/call_fwd") != EINA_TRUE) {
                _E("Failed to set layout");
                evas_object_del(layout);
                return NULL;
index 8c706beeaf32688857a4fa02ac99954c5916b8a3..d33fc11abea9b244e4d4775578064233ffa7b20f 100755 (executable)
@@ -259,7 +259,7 @@ Evas_Object *windicator_dnd_btn_layout_create(Evas_Object *parent, void *data)
        Evas_Object *layout = elm_layout_add(parent);
        retv_if(layout == NULL, NULL);
 
-       if (elm_layout_file_set(layout, WINDICATOR_THEME_PATH, "windicator/dnd_btn/bt") != EINA_TRUE) {
+       if (elm_layout_file_set(layout, WINDICATOR_THEME_PATH, "windicator/action_btn/dnd") != EINA_TRUE) {
                _E("Failed to set layout");
                evas_object_del(layout);
                return NULL;
index 3ee15ba9f6b4151a22dccd1fc3d6f249b68861f8..40e39425d05f7d11c47c8de26cc2c788d8133e54 100755 (executable)
@@ -258,7 +258,7 @@ Evas_Object *windicator_flight_mode_layout_create(Evas_Object *parent, void *dat
        Evas_Object *layout = elm_layout_add(parent);
        retv_if(layout == NULL, NULL);
 
-       if (elm_layout_file_set(layout, WINDICATOR_THEME_PATH, "windicator/flight_mode") != EINA_TRUE) {
+       if (elm_layout_file_set(layout, WINDICATOR_THEME_PATH, "windicator/action_btn/flight_mode") != EINA_TRUE) {
                _E("Failed to set layout");
                evas_object_del(layout);
                return NULL;
index 1e3cc7d5e6c56fa2d65c70f34716cddcb68b32ac..7a089f5e7ad36b150f3c760241cdede09f8fe050 100755 (executable)
@@ -131,6 +131,7 @@ static void _action_btns_update_visibility_list(void *data)
                        return;
                }
        }
+
 done:
        _action_btns_available[WINDICATOR_AB_MUSIC] = false;
        --_action_btns_visible_count;
index 6eeca5a78acdbf5f2c0b6088a202df667a372437..13891a02660afabb2271f4f2a9b0cf72b4a1a8d3 100755 (executable)
@@ -60,7 +60,7 @@ Evas_Object *windicator_music_btn_layout_create(Evas_Object *parent, void *data)
        Evas_Object *layout = elm_layout_add(parent);
        retv_if(layout == NULL, NULL);
 
-       if (elm_layout_file_set(layout, WINDICATOR_THEME_PATH, "windicator/music_btn") != EINA_TRUE) {
+       if (elm_layout_file_set(layout, WINDICATOR_THEME_PATH, "windicator/action_btn/music") != EINA_TRUE) {
                _E("Failed to set layout");
                evas_object_del(layout);
                return NULL;
index 16b41ce26184380fd9f14591ed505c1e18addf0f..766800da3166dead14e2b0387c9525f2ff0c7608 100755 (executable)
@@ -62,7 +62,7 @@ Evas_Object *windicator_volume_small_icon_create(Evas_Object *parent, void *data
        Evas_Object *layout = elm_layout_add(parent);
        retv_if(layout == NULL, NULL);
 
-       if (elm_layout_file_set(layout, WINDICATOR_THEME_PATH, "windicator/volume/small_icon") != EINA_TRUE) {
+       if (elm_layout_file_set(layout, WINDICATOR_THEME_PATH, "windicator/action_btn/volume") != EINA_TRUE) {
                _E("Failed to set volume small layout");
                evas_object_del(layout);
                return NULL;