Update changed code
authorJunghyun Kim <jh1114.kim@samsung.com>
Tue, 21 Aug 2012 11:34:31 +0000 (20:34 +0900)
committerJunghyun Kim <jh1114.kim@samsung.com>
Tue, 21 Aug 2012 11:34:31 +0000 (20:34 +0900)
82 files changed:
CMakeLists.txt
INSTALL [deleted file]
LICENSE [changed mode: 0644->0755]
NOTICE [deleted file]
data/CMakeLists.txt [changed mode: 0644->0755]
data/images/private/00_volume_icon.png [deleted file]
data/images/private/00_volume_icon_Mute.png [deleted file]
data/images/private/00_volume_icon_Vibrat.png [deleted file]
data/images/private/14_fm_radio_frequency_knob.png [deleted file]
data/images/private/14_fm_radio_frequency_knob_01.png [deleted file]
data/images/private/14_fm_radio_frequency_knob_02_red.png [deleted file]
data/images/private/left.png [deleted file]
data/images/private/right.png [deleted file]
data/images/private/updown.png [deleted file]
data/images/public/00_volume_icon.png
data/images/public/00_volume_icon_Mute.png
data/images/public/00_volume_icon_Vibrat.png
data/volume.edc [deleted file]
data/volume_popup.edc [new file with mode: 0755]
debian/changelog [changed mode: 0644->0755]
debian/control
debian/copyright [deleted file]
debian/dirs [deleted file]
debian/docs [deleted file]
debian/org.tizen.volume.install.in
org.tizen.volume.xml [new file with mode: 0755]
packaging/org.tizen.volume.spec [changed mode: 0644->0755]
po/CMakeLists.txt
po/ar.po [new file with mode: 0644]
po/bg.po [new file with mode: 0644]
po/ca.po [new file with mode: 0644]
po/cs.po [new file with mode: 0644]
po/da.po [new file with mode: 0644]
po/de_DE.po
po/el_GR.po
po/en.po [new file with mode: 0644]
po/en_GB.po
po/en_US.po
po/es_ES.po
po/fi.po [new file with mode: 0644]
po/fr_FR.po
po/he.po [new file with mode: 0644]
po/hi.po [new file with mode: 0644]
po/hr.po [new file with mode: 0644]
po/hu.po [new file with mode: 0644]
po/id.po [new file with mode: 0644]
po/it_IT.po
po/ja_JP.po
po/ko_KR.po
po/lt.po [new file with mode: 0644]
po/lv.po [new file with mode: 0644]
po/ms.po [new file with mode: 0644]
po/nl_NL.po
po/no.po [new file with mode: 0644]
po/pl.po [new file with mode: 0644]
po/pt_PT.po
po/ro.po [new file with mode: 0644]
po/ru_RU.po
po/sk.po [new file with mode: 0644]
po/sl.po [new file with mode: 0644]
po/sr.po [new file with mode: 0644]
po/sv.po [new file with mode: 0644]
po/th.po [new file with mode: 0644]
po/tr_TR.po
po/uk.po [new file with mode: 0644]
po/update-po.sh
po/vi.po [new file with mode: 0644]
po/zh_CN.po
po/zh_HK.po
po/zh_TW.po
src/_button.c [new file with mode: 0755]
src/_button.h [new file with mode: 0755]
src/_logic.c [changed mode: 0644->0755]
src/_logic.h [changed mode: 0644->0755]
src/_sound.c [changed mode: 0644->0755]
src/_sound.h [changed mode: 0644->0755]
src/_util_efl.c [changed mode: 0644->0755]
src/_util_efl.h [changed mode: 0644->0755]
src/_util_log.h [changed mode: 0644->0755]
src/format [new file with mode: 0755]
src/volume.c [changed mode: 0644->0755]
src/volume.h [changed mode: 0644->0755]

index 12b6879..4f0f87f 100644 (file)
@@ -6,6 +6,7 @@ SET(SRCS
        src/_util_efl.c
        src/_logic.c
        src/_sound.c
+       src/_button.c
 )
 
 SET(VENDOR "tizen")
@@ -16,7 +17,7 @@ SET(BINDIR "${PREFIX}/bin")
 SET(RESDIR "${PREFIX}/res")
 SET(DATADIR "${PREFIX}/data")
 SET(LOCALEDIR "${RESDIR}/locale")
-SET(ICONDIR "${RESDIR}/icons/default/small")
+SET(ICONDIR "/opt/share/icons/default/small")
 SET(IMAGEDIR "${RESDIR}/images/${PACKAGE}")
 SET(EDJDIR "${RESDIR}/edje")
 
@@ -42,6 +43,7 @@ pkg_check_modules(pkgs REQUIRED
        bundle
        svi
        glib-2.0
+       ui-gadget-1
 )
 
 FOREACH(flag ${pkgs_CFLAGS})
@@ -79,8 +81,8 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} -lm)
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
 
 # install desktop file & icon
-CONFIGURE_FILE(${PKGNAME}.desktop.in ${CMAKE_BINARY_DIR}/${PKGNAME}.desktop)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/${PKGNAME}.desktop DESTINATION /opt/share/applications)
+#CONFIGURE_FILE(${PKGNAME}.desktop.in ${CMAKE_BINARY_DIR}/${PKGNAME}.desktop)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/${PKGNAME}.xml DESTINATION /opt/share/packages)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PKGNAME}.png DESTINATION ${ICONDIR})
 
 # data
diff --git a/INSTALL b/INSTALL
deleted file mode 100644 (file)
index 5daf2e2..0000000
--- a/INSTALL
+++ /dev/null
@@ -1,32 +0,0 @@
-1. make the build directory
-
-  ex) 
-
-   $ mkdir build
-
-
-2. change the working directory to the build directory
-
-  ex)
-
-   $ cd build
-
-
-3. run 'cmake'
-
-$ cmake ${SOURCE_DIR} -DCMAKE_INSTALL_PREFIX=/opt/apps/@@DEBPKGNAME@@
-
-  ex)
-
-   $ cmake .. -DCMAKE_INSTALL_PREFIX=/opt/apps/@@DEBPKGNAME@@
-
-   or
-
-   $ cmake ..
-
-4. make & make install
-
-  ex)
-
-   $ make -j 2 && make install
-
diff --git a/LICENSE b/LICENSE
old mode 100644 (file)
new mode 100755 (executable)
diff --git a/NOTICE b/NOTICE
deleted file mode 100644 (file)
index 48cdf8f..0000000
--- a/NOTICE
+++ /dev/null
@@ -1,2 +0,0 @@
-Copyright (c) 2000 - 2012 Samsung Electronics Co., Ltd. All rights reserved.
-
old mode 100644 (file)
new mode 100755 (executable)
index b987e25..7569bb7
@@ -1,14 +1,14 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
 # install edj
-ADD_CUSTOM_COMMAND(OUTPUT volume.edj
-               COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/images/private
-               ${CMAKE_CURRENT_SOURCE_DIR}/volume.edc ${CMAKE_BINARY_DIR}/volume.edj
-               DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/volume.edc
+ADD_CUSTOM_COMMAND(OUTPUT volume_popup.edj
+                COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/images/private
+                ${CMAKE_CURRENT_SOURCE_DIR}/volume_popup.edc ${CMAKE_BINARY_DIR}/volume_popup.edj
+                DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/volume_popup.edc
 )
-ADD_CUSTOM_TARGET(edj_build DEPENDS volume.edj)
+ADD_CUSTOM_TARGET(edj_build DEPENDS volume_popup.edj)
 ADD_DEPENDENCIES(${PROJECT_NAME} edj_build)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/volume.edj DESTINATION ${EDJDIR})
+INSTALL(FILES ${CMAKE_BINARY_DIR}/volume_popup.edj DESTINATION ${EDJDIR})
 
 # install images
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/images/public/ DESTINATION ${IMAGEDIR} FILES_MATCHING PATTERN "*.png")
diff --git a/data/images/private/00_volume_icon.png b/data/images/private/00_volume_icon.png
deleted file mode 100755 (executable)
index 1909685..0000000
Binary files a/data/images/private/00_volume_icon.png and /dev/null differ
diff --git a/data/images/private/00_volume_icon_Mute.png b/data/images/private/00_volume_icon_Mute.png
deleted file mode 100755 (executable)
index bc99150..0000000
Binary files a/data/images/private/00_volume_icon_Mute.png and /dev/null differ
diff --git a/data/images/private/00_volume_icon_Vibrat.png b/data/images/private/00_volume_icon_Vibrat.png
deleted file mode 100755 (executable)
index d40a47e..0000000
Binary files a/data/images/private/00_volume_icon_Vibrat.png and /dev/null differ
diff --git a/data/images/private/14_fm_radio_frequency_knob.png b/data/images/private/14_fm_radio_frequency_knob.png
deleted file mode 100755 (executable)
index eddb358..0000000
Binary files a/data/images/private/14_fm_radio_frequency_knob.png and /dev/null differ
diff --git a/data/images/private/14_fm_radio_frequency_knob_01.png b/data/images/private/14_fm_radio_frequency_knob_01.png
deleted file mode 100755 (executable)
index e22d795..0000000
Binary files a/data/images/private/14_fm_radio_frequency_knob_01.png and /dev/null differ
diff --git a/data/images/private/14_fm_radio_frequency_knob_02_red.png b/data/images/private/14_fm_radio_frequency_knob_02_red.png
deleted file mode 100755 (executable)
index 166b5b8..0000000
Binary files a/data/images/private/14_fm_radio_frequency_knob_02_red.png and /dev/null differ
diff --git a/data/images/private/left.png b/data/images/private/left.png
deleted file mode 100644 (file)
index 5972ed7..0000000
Binary files a/data/images/private/left.png and /dev/null differ
diff --git a/data/images/private/right.png b/data/images/private/right.png
deleted file mode 100755 (executable)
index 8104700..0000000
Binary files a/data/images/private/right.png and /dev/null differ
diff --git a/data/images/private/updown.png b/data/images/private/updown.png
deleted file mode 100644 (file)
index 881efe5..0000000
Binary files a/data/images/private/updown.png and /dev/null differ
index 4039b0d..ec84b75 100755 (executable)
Binary files a/data/images/public/00_volume_icon.png and b/data/images/public/00_volume_icon.png differ
index 6214599..e17ef34 100755 (executable)
Binary files a/data/images/public/00_volume_icon_Mute.png and b/data/images/public/00_volume_icon_Mute.png differ
index 8b56dd1..993ef9c 100755 (executable)
Binary files a/data/images/public/00_volume_icon_Vibrat.png and b/data/images/public/00_volume_icon_Vibrat.png differ
diff --git a/data/volume.edc b/data/volume.edc
deleted file mode 100644 (file)
index e157a5d..0000000
+++ /dev/null
@@ -1,607 +0,0 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.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 FONT_NAME "SLP:style=Medium";
-/* becasue of popup margin subtract
- * 20 from top
- * 10 from side
- * 15 from bottom
- */
-
-collections {
-       group {
-               name: "main";
-
-               parts {
-                       part { name, "bg";
-                               type, RECT;
-                               scale: 1;
-                               description {
-                                       state, "default" 0.0;
-                                       color, 0 0 0 0;
-                               }
-                       }
-                       part {
-                               name: "swallow/body";
-                               type: SWALLOW;
-                               scale: 1;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 {
-                                               relative: 0.5 0.5;
-                                               to: "bg";
-                                       }
-                                       rel2 {
-                                               relative: 0.5 0.5;
-                                               to: "bg";
-                                       }
-                                       color: 0 0 0 0;
-                               }
-                       }
-                       part {
-                               name: "rect/title";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 64;
-                                       rel1 {
-                                               relative: 0.0 0.0;
-                                               to: "bg";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 0.0;
-                                               to: "bg";
-                                       }
-                                       color: 255 0 0 250;
-                               }
-                       }
-               }
-       }
-
-       group {
-               name: "volume";
-
-               images {
-                       image: "updown.png" COMP;
-                       image: "00_volume_icon.png" COMP;
-                       image: "00_volume_icon_Mute.png" COMP;
-                       image: "00_volume_icon_Vibrat.png" COMP;
-               }
-
-               styles{
-                       style{
-                name: "_style35";
-                base: "font=SLP:style=Medium font_size=35 color=#6c6c6cff align=center wrap=word";
-                               tag:  "br" "\n";
-            }
-        }
-
-
-               parts {
-                       part { name, "bg";
-                               type, RECT;
-                               scale: 1;
-                               description {
-                                       state, "default" 0.0;
-                                       color, 0 0 0 0;
-                               }
-                       }
-
-                       part {
-                               name: "rect/body";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 624 126;
-                                       max: 624 126;
-                                       rel1 {
-                                               to: "bg";
-                                       }
-                                       rel2 {
-                                               to: "bg";
-                                       }
-                                       color: 0 0 0 0;
-                               }
-                       }
-                       part {
-                               name: "rect/padding/f";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       fixed: 1 1;
-                                       align: 0.0 0.0;
-                                       min: 30 11;
-                                       rel1 {
-                                               relative: 0.0 0.0;
-                                               to: "bg";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 0.0;
-                                               to: "bg";
-                                       }
-                                       color: 0 0 0 0;
-                               }
-                       }
-                       part {
-                               name: "rect/padding/b";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       fixed: 1 1;
-                                       align: 1.0 1.0;
-                                       min: 30 16;
-                                       rel1 {
-                                               relative: 1.0 1.0;
-                                               to: "bg";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 1.0;
-                                               to: "bg";
-                                       }
-                                       color: 0 0 0 0;
-                               }
-                       }
-                       part {
-                               name: "rect/icon";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       fixed: 1 0;
-                                       align: 0.0 0.0;
-                                       min: 64 64;
-                                       rel1 {
-                                               relative: 1.0 1.0;
-                                               to: "rect/padding/f";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 0.0;
-                                               to_x: "rect/padding/f";
-                                               to_y: "rect/padding/b";
-                                       }
-                                       color: 0 0 0 0;
-                               }
-                               description {
-                                       state: "pressed" 0.0;
-                                       inherit: "default" 0.0;
-                                       color: 136 78 255 255;
-                               }
-                       }
-                       part {
-                               name: "rect/padding/m";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       fixed: 1 0;
-                                       align: 0.0 0.0;
-                                       min: 26 0;
-                                       rel1 {
-                                               relative: 1.0 0.0;
-                                               to: "rect/icon";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 1.0;
-                                               to: "rect/icon";
-                                       }
-                                       color: 0 0 0 0;
-                               }
-                       }
-                       part {
-                               name: "rect/padding/t/popup";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 20;
-                                       align: 0.5 1.0;
-                                       fixed: 0 1;
-                                       rel1 {
-                                               relative: 0.0 0.0;
-                                               to: "bg";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 0.0;
-                                               to: "bg";
-                                       }
-                                       color: 0 0 0 0;
-                               }
-                       }
-
-                       part {
-                               name: "rect/slider";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 {
-                                               relative: 1.0 0.0;
-                                               to: "rect/padding/m";
-                                       }
-                                       rel2 {
-                                               relative: 0.0 0.0;
-                                               to: "rect/padding/b";
-                                       }
-                                       color: 0 0 0 0;
-                               }
-                       }
-                       part {
-                               name: "image/icon";
-                               type: IMAGE;
-                               scale: 1;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 64 64;
-                                       max: 64 64;
-                                       align: 0.5 0.5;
-                                       rel1 {
-                                               to: "rect/icon";
-                                       }
-                                       rel2 {
-                                               to: "rect/icon";
-                                       }
-                                       image {
-                                               normal: "00_volume_icon.png";
-                                       }
-                                       color: 255 255 255 255;
-                               }
-                               description {
-                                       state: "mute" 0.0;
-                                       inherit: "default" 0.0;
-                                       image {
-                                               normal: "00_volume_icon_Mute.png";
-                                       }
-                               }
-                               description {
-                                       state: "vib" 0.0;
-                                       inherit: "default" 0.0;
-                                       image {
-                                               normal: "00_volume_icon_Vibrat.png";
-                                       }
-                               }
-                       }
-                       part {
-                               name: "swallow/slider";
-                               type: SWALLOW;
-                               scale: 1;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 {
-                                               to: "rect/slider";
-                                       }
-                                       rel2 {
-                                               to: "rect/slider";
-                                       }
-                                       color: 0 0 0 0;
-                               }
-                       }
-/*
-                       part {
-                               name: "image/updown";
-                               type: IMAGE;
-                               scale: 1;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 1.0 0.5;
-                                       fixed: 1 0;
-                                       min: 35 0;
-                                       rel1 {
-                                               relative: 1.0 0.0;
-                                               to: "rect/title/0";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 1.0;
-                                               to: "rect/title/0";
-                                       }
-                                       image {
-                                               normal: "updown.png";
-                                       }
-                                       color: 255 255 255 255;
-                               }
-                       }
-*/
-                       part {
-                               name: "clip/warning";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 0.5 1.0;
-                                       fixed: 0 1;
-                                       min: 0 300;
-                                       rel1 {
-                                               relative: 0.0 0.0;
-                                               to: "rect/title/0";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 0.0;
-                                               to: "rect/title/0";
-                                       }
-                                       color: 255 255 255 255;
-                               }
-                       }
-
-                       part {
-                               name: "rect/warning";
-                               type: RECT;
-                               scale: 1;
-                               clip_to: "clip/warning";
-                               mouse_events: 0;
-                               description {
-                                       state: "default" 0.0;
-                                       visible: 0;
-                                       rel1 {
-                                               to: "textblock/warning";
-                                       }
-                                       rel2 {
-                                               to: "textblock/warning";
-                                       }
-                                       color: 255 255 255 160;
-                               }
-                               description {
-                                       state: "show" 0.0;
-                                       inherit: "default" 0.0;
-                                       visible: 1;
-                               }
-                       }
-                       part {
-                               name: "textblock/warning";
-                               type: TEXTBLOCK;
-                               scale: 1;
-                               clip_to: "clip/warning";
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       align: 0.5 0.0;
-                                       fixed: 0 1;
-                                       rel1 {
-                                               relative: 0.0 0.0;
-                                               to: "rect/title/0";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 0.0;
-                                               to: "rect/title/0";
-                                       }
-                                       text {
-                                               style: "_style35";
-                                               min: 0 1;
-                                       }
-                                       color: 0 0 0 0;
-                               }
-                               description {
-                                       state: "show" 0.0;
-                                       inherit: "default" 0.0;
-                                       align: 0.5 1.0;
-                                       color: 0 0 0 255;
-                               }
-                       }
-
-
-#define PART_TITLE_RECT(title, rely1, rely2) \
-                       part {\
-                               name: title;\
-                               type: RECT;\
-                               scale: 1;\
-                               mouse_events: 1;\
-                               description {\
-                                       state: "default" 0.0;\
-                                       visible: 0;\
-                                       rel1 {\
-                                               to: "rect/title/0";\
-                                       }\
-                                       rel2 {\
-                                               to: "rect/title/0";\
-                                       }\
-                                       color: 0 0 0 0;\
-                               }\
-                               description {\
-                                       state: "show" 0.0;\
-                                       inherit: "default" 0.0;\
-                                       visible: 1;\
-                                       rel1 {\
-                                               relative: 0.0 rely1;\
-                                               to: "rect/title/0";\
-                                       }\
-                                       rel2 {\
-                                               relative: 1.0 rely2;\
-                                               to: "rect/title/0";\
-                                       }\
-                                       color: 0 0 0 70;\
-                               }\
-                               description {\
-                                       state: "pressed" 0.0;\
-                                       inherit: "show" 0.0;\
-                                       color: 136 78 255 150;\
-                               }\
-                       }
-
-                       PART_TITLE_RECT("rect/title/4", -3.0, -2.0)
-                       PART_TITLE_RECT("rect/title/5", -2.0, -1.0)
-                       PART_TITLE_RECT("rect/title/6", -1.0, 0.0)
-                       PART_TITLE_RECT("rect/title/1", 1.0, 2.0)
-                       PART_TITLE_RECT("rect/title/2", 2.0, 3.0)
-                       PART_TITLE_RECT("rect/title/3", 3.0, 4.0)
-
-#define PART_TITLE_TEXT(title, where) \
-                       part {\
-                               name: title;\
-                               type: TEXT;\
-                               scale: 1;\
-                               mouse_events: 0;\
-                               description {\
-                                       state: "default" 0.0;\
-                                       rel1 {\
-                                               to: where;\
-                                       }\
-                                       rel2 {\
-                                               to: where;\
-                                       }\
-                                       text {\
-                                               font: FONT_NAME;\
-                                               size: 34;\
-                                               min: 0 0;\
-                                       }\
-                                       color, 0 0 0 0;\
-                               }\
-                               description {\
-                                       state: "show" 0.0;\
-                                       inherit: "default" 0.0;\
-                                       color, 255 255 255 255;\
-                               }\
-                       }
-
-                       PART_TITLE_TEXT("text/title/4", "rect/title/4")
-                       PART_TITLE_TEXT("text/title/5", "rect/title/5")
-                       PART_TITLE_TEXT("text/title/6", "rect/title/6")
-                       PART_TITLE_TEXT("text/title/1", "rect/title/1")
-                       PART_TITLE_TEXT("text/title/2", "rect/title/2")
-                       PART_TITLE_TEXT("text/title/3", "rect/title/3")
-
-                       part {
-                               name: "rect/title/0";
-                               type: RECT;
-                               scale: 1;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       min: 0 64;
-                                       align: 0.5 1.0;
-                                       fixed: 0 1;
-                                       rel1 {
-                                               relative: 0.0 0.0;
-                                               to: "rect/padding/t/popup";
-                                       }
-                                       rel2 {
-                                               relative: 1.0 0.0;
-                                               to: "rect/padding/t/popup";
-                                       }
-                                       color: 0 0 0 0;
-                               }
-                               description {
-                                       state: "pressed" 0.0;
-                                       inherit: "default" 0.0;
-                                       color: 136 78 255 150;
-                               }
-                       }
-
-               }
-
-               programs {
-#define PROG_TITLE_TOUCH(title, src) \
-                       program {\
-                               name: "down/title/"title;\
-                               source: src;\
-                               signal: "mouse,down,1";\
-                               action: STATE_SET "pressed" 0.0;\
-                               target: src;\
-                       }\
-                       program {\
-                               name: "up/title/"title;\
-                               source: src;\
-                               signal: "mouse,up,1";\
-                               action: STATE_SET "show" 0.0;\
-                               target: src;\
-                       }
-#define PROG_TITLE_UPDOWN(title, tar1, tar2, stime, htime) \
-                       program {\
-                               name: "show/title/"title;\
-                               source: "title";\
-                               signal: "show";\
-                               action: STATE_SET "show" 0.0;\
-                               target: "rect/title/"tar1;\
-                               target: "rect/title/"tar2;\
-                               target: "text/title/"tar1;\
-                               target: "text/title/"tar2;\
-                               transition: SINUSOIDAL stime;\
-                       }\
-                       program {\
-                               name: "hide/title/"title;\
-                               source: "title";\
-                               signal: "hide";\
-                               action: STATE_SET "default" 0.0;\
-                               target: "rect/title/"tar1;\
-                               target: "rect/title/"tar2;\
-                               target: "text/title/"tar1;\
-                               target: "text/title/"tar2;\
-                               transition: SINUSOIDAL htime;\
-                       }
-
-                       PROG_TITLE_UPDOWN("step1", "6", "1", 0.3, 0.5)
-                       PROG_TITLE_UPDOWN("step2", "5", "2", 0.4, 0.4)
-                       PROG_TITLE_UPDOWN("step3", "4", "3", 0.5, 0.3)
-
-                       program {
-                               name: "prog/default";
-                               source: "icon";
-                               signal: "default";
-                               action: STATE_SET "default" 0.0;
-                               target: "image/icon";
-                       }
-                       program {
-                               name: "prog/mute";
-                               source: "icon";
-                               signal: "mute";
-                               action: STATE_SET "mute" 0.0;
-                               target: "image/icon";
-                       }
-                       program {
-                               name: "prog/vib";
-                               source: "icon";
-                               signal: "vib";
-                               action: STATE_SET "vib" 0.0;
-                               target: "image/icon";
-                       }
-
-                       program {
-                               name: "show/warning";
-                               source: "warning";
-                               signal: "show";
-                               action: STATE_SET "show" 0.0;
-                               target: "rect/warning";
-                               target: "textblock/warning";
-                               transition: SINUSOIDAL 0.5;
-                       }
-                       program {
-                               name: "hide/warning";
-                               source: "warning";
-                               signal: "hide";
-                               action: STATE_SET "default" 0.0;
-                               target: "rect/warning";
-                               target: "textblock/warning";
-                               transition: SINUSOIDAL 0.5;
-                       }
-               }
-       }
-}
-
-
diff --git a/data/volume_popup.edc b/data/volume_popup.edc
new file mode 100755 (executable)
index 0000000..b3649e0
--- /dev/null
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2012  Samsung Electronics Co., Ltd
+ * 
+ * Licensed under the Flora License, Version 1.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.tizenopensource.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.
+ */
+collections {        \r
+       group { name: "popup_slider_text_style_with_warn_label";\r
+               parts{\r
+                       part { name: "pad_t";\r
+                        scale : 1;\r
+                        mouse_events: 0;\r
+                        repeat_events: 1;\r
+                        description { state: "default" 0.0;\r
+                           align: 0.0 0.0;\r
+                           min: 0 0;\r
+                           fixed: 0 1;\r
+                           rel1 {\r
+                              relative: 1.0 0.0;\r
+                              to_x: "pad_l";\r
+                           }\r
+                           rel2 {\r
+                              relative: 0.0 0.0;\r
+                              to_x: "pad_r";\r
+                           }\r
+                        }\r
+                     }\r
+                     part { name: "pad_l";\r
+                        scale: 1;\r
+                        description { state: "default" 0.0;\r
+                           min : 38 0;\r
+                           fixed: 1 0;\r
+                           rel1 {\r
+                              relative: 0.0 0.0;\r
+                           }\r
+                           rel2 {\r
+                              relative: 0.0 1.0;\r
+                           }\r
+                           align: 0.0 0.0;\r
+                        }\r
+                     }\r
+                     part { name: "pad_r";\r
+                        scale: 1;\r
+                        description { state: "default" 0.0;\r
+                           min : 38 0;\r
+                           fixed: 1 0;\r
+                           rel1 {\r
+                              relative: 1.0 0.0;\r
+                           }\r
+                           rel2 {\r
+                              relative: 1.0 1.0;\r
+                           }\r
+                           align: 1.0 0.0;\r
+                        }\r
+                     }\r
+                     part{ name:"elm.swallow.slider1";\r
+                        type: SWALLOW;\r
+                        scale : 1;\r
+                        description { state: "default" 0.0;\r
+                           min: 0 0;\r
+                           align: 0.0 0.5;\r
+                           fixed: 1 0;\r
+                           rel1 {\r
+                              relative: 0.0 1.0;\r
+                              to: "pad_t";\r
+                           }\r
+                           rel2 {\r
+                              relative: 1.0 0.0;\r
+                              to: "pad_b";\r
+                           }\r
+                        }\r
+                     }\r
+                     part { name: "pad_b";\r
+                        scale : 1;\r
+                        mouse_events: 0;\r
+                        repeat_events: 1;\r
+                        description { state: "default" 0.0;\r
+                           align: 0.0 1.0;\r
+                           min: 0 101;\r
+                           fixed: 0 1;\r
+                           rel1 {\r
+                              relative: 1.0 1.0;\r
+                              to_x: "pad_l";\r
+                           }\r
+                           rel2 {\r
+                              relative: 0.0 1.0;\r
+                              to_x: "pad_r";\r
+                           }\r
+                        }\r
+                        }\r
+\r
+                       part { name : "elm.swallow.warn_label";\r
+                               type: SWALLOW;\r
+                               scale : 1;\r
+                               mouse_events: 1;\r
+                               repeat_events: 1;\r
+                               description { state: "default" 0.0;\r
+                                       align : 0.0 0.5;\r
+                                       fixed : 0 1;\r
+                                       rel1{\r
+                                               relative: 0.0 0.5;\r
+                                               to: "pad_b";\r
+                                       }\r
+                                       rel2{\r
+                                               relative: 1.0 0.5;\r
+                                               to : "pad_b";\r
+                                       }                                       \r
+                               }\r
+                               \r
+                       }       \r
+                }\r
+       }               \r
+}\r
+\r
old mode 100644 (file)
new mode 100755 (executable)
index cc7f76e..6b53715
@@ -1,7 +1,24 @@
-volume (0.2.1-0) unstable; urgency=low
+volume (0.2.4-1) unstable; urgency=low
 
-  * released.
-  * Git: pkgs/v/volume-app
-  * Tag: volume_0.2.1-0
+  * Remove unused files
+  * Git: magnolia/apps/home/volume-app
+  * Tag: volume_0.2.4-1
+
+ -- Junghyun Kim <jh1114.kim@samsung.com>  Fri, 17 Aug 2012 16:51:10 +0900
+
+volume (0.2.3-1) unstable; urgency=low
+
+  * Fix an error not to read PO files
+  * Git: magnolia/apps/home/volume-app
+  * Tag: volume_0.2.3-1
+
+ -- Hong Kwon <hhh.kwon@samsung.com>  Thu, 16 Aug 2012 19:02:09 +0900
+
+volume (0.2.2-1) unstable; urgency=low
+
+  * Apply open source code
+  * Git: apps/home/volume-app
+  * Tag: volume_0.2.2-1
+
+ -- Hong Kwon <hhh.kwon@samsung.com>  Mon, 13 Aug 2012 19:36:09 +0900
 
- -- jeesun kim <iamjs.kim@samsung.com>  Fri, 17 Feb 2012 11:00:00 +0900
index 577fa7f..c692e15 100644 (file)
@@ -1,8 +1,8 @@
 Source: volume
 Section: devel
 Priority: extra
-Maintainer: Jeesun Kim <iamjs.kim@samsung.com>
-Build-Depends: debhelper (>= 5), libappcore-efl-dev, libelm-dev, libmm-sound-dev, dlog-dev, libsvi-dev, libvconf-dev, libslp-utilx-dev, syspopup-dev, libbundle-dev, libglib2.0-dev
+Maintainer: Junghyun Kim <jh1114.kim@samsung.com>, hhh.kwon<hhh.kwon@samsung.com>
+Build-Depends: debhelper (>= 5), libappcore-efl-dev, libelm-dev, libmm-sound-dev, dlog-dev, libsvi-dev, libvconf-dev, libslp-utilx-dev, syspopup-dev, libbundle-dev, libglib2.0-dev, libui-gadget-dev
 Standards-Version: 3.7.2
 
 Package: org.tizen.volume
@@ -10,7 +10,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: volume
 
-Package: org.tizen.volume-dbg
+Package: org-tizen.volume-dbg
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Volume Debug Symbols
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644 (file)
index ca882bb..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-usr/sbin
diff --git a/debian/docs b/debian/docs
deleted file mode 100644 (file)
index a0f0008..0000000
+++ /dev/null
@@ -1 +0,0 @@
-CMakeLists.txt
index 28ed160..776cc6a 100644 (file)
@@ -1,3 +1,3 @@
-@PREFIX@/bin/*
-@PREFIX@/res/*
-/opt/share/applications/*
+@PREFIX@/*
+/opt/share/applications/org.tizen.desktop
+/opt/share/icons/default/small/org.tizen.volume.png
diff --git a/org.tizen.volume.xml b/org.tizen.volume.xml
new file mode 100755 (executable)
index 0000000..1f8167d
--- /dev/null
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<manifest xmlns="http://tizen.org/ns/packages" package="org.tizen.volume" version="0.2.4" install-location="internal-only">\r
+       <label>Volume</label>\r
+       <author email="hhh.kwon@samsung.com" href="www.samsung.com">Hong Kwon</author>\r
+       <description>Volume Application</description>\r
+       <ui-application appid="org.tizen.volume" exec="/opt/apps/org.tizen.volume/bin/volume" nodisplay="true" multiple="false" type="capp" taskmanage="false">\r
+               <icon>org.tizen.volume.png</icon>\r
+               <label>Volume</label>\r
+       </ui-application>\r
+</manifest>\r
old mode 100644 (file)
new mode 100755 (executable)
index b33b347..06711f0
@@ -1,50 +1,45 @@
-Name:       org.tizen.volume
-Summary:    volume
-Version:       0.2.0
-Release:    3
-Group:      Applications
-License:    Flora Software License
-Source0:    %{name}-%{version}.tar.gz
-BuildRequires: pkgconfig(appcore-efl)
-BuildRequires: pkgconfig(bundle)
-BuildRequires: pkgconfig(ecore)
-BuildRequires: pkgconfig(ecore-input)
-BuildRequires: pkgconfig(ecore-x)
-BuildRequires: pkgconfig(edje)
-BuildRequires: pkgconfig(evas)
-BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(mm-sound)
-BuildRequires: pkgconfig(svi)
-BuildRequires: pkgconfig(syspopup)
-BuildRequires: pkgconfig(utilX)
-BuildRequires: pkgconfig(vconf)
+#sbs-git:slp/pkgs/v/volume-app volume-app 0.1.2 226202351de9fefb43756c36d215ca74f52431d0
+Name:  org.tizen.volume
+Summary:       Volume application (EFL)
+Version:       0.2.4
+Release:       1
+Group: TO_BE/FILLED_IN
+License:       Flora Software License
+Source0:       %{name}-%{version}.tar.gz
+BuildRequires:  pkgconfig(appcore-efl)
+BuildRequires:  pkgconfig(elementary)
+BuildRequires:  pkgconfig(utilX)
+BuildRequires:  pkgconfig(syspopup)
+BuildRequires:  pkgconfig(dlog)
+BuildRequires:  pkgconfig(svi)
+BuildRequires:  pkgconfig(ui-gadget-1)
 
 BuildRequires:  cmake
-BuildRequires:  edje-tools
+BuildRequires:  edje-bin
 BuildRequires:  embryo-bin
-BuildRequires:  gettext-tools
+BuildRequires:  gettext-devel
 
 %description
-Volume App
-
+volume.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
+%define PREFIX /opt/apps/org.tizen.volume
 
 %build
-RPM_OPT=`echo $CFLAGS|sed -n 's/-Wp,-D_FORTIFY_SOURCE=2//'`
+RPM_OPT=`echo $CFLAGS|sed 's/-Wp,-D_FORTIFY_SOURCE=2//'`
 export CFLAGS=$RPM_OPT
-cmake  -DCMAKE_INSTALL_PREFIX="/opt/apps/org.tizen.volume"
+cmake  -DCMAKE_INSTALL_PREFIX="%{PREFIX}"
 make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
 %make_install
 
-%find_lang volume
-
-%files -f volume.lang
-/opt/apps/org.tizen.volume/bin/*
-/opt/apps/org.tizen.volume/res/*
-/opt/share/applications/*
+%files
+%defattr(-,root,root,-)
+%{PREFIX}/bin/*
+%{PREFIX}/res/*
+/opt/share/packages/org.tizen.volume.xml
+/opt/share/icons/default/small/org.tizen.volume.png
index c3c6486..a717272 100644 (file)
@@ -1,6 +1,6 @@
 # for i18n
 
-SET(POFILES de_DE.po el_GR.po en_US.po en_GB.po es_ES.po fr_FR.po it_IT.po ja_JP.po ko_KR.po nl_NL.po pt_PT.po ru_RU.po tr_TR.po zh_CN.po zh_HK.po zh_TW.po)
+SET(POFILES ar.po bg.po ca.po cs.po da.po de_DE.po el_GR.po en.po en_GB.po en_US.po es_ES.po fi.po fr_FR.po he.po hi.po hr.po hu.po id.po it_IT.po ja_JP.po ko_KR.po lt.po lv.po ms.po nl_NL.po no.po pl.po pt_PT.po ro.po ru_RU.po sk.po sl.po sr.po sv.po th.po tr_TR.po uk.po vi.po zh_CN.po zh_HK.po zh_TW.po)
 
 SET(MSGFMT "/usr/bin/msgfmt")
 
diff --git a/po/ar.po b/po/ar.po
new file mode 100644 (file)
index 0000000..0b2bb3a
--- /dev/null
+++ b/po/ar.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "قد تضر مستويات الصوت العالية بسمعك إذا استمعت إليها لفترة طويلة"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "جافا"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "تحذير"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "وسائط"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "سماعات رأس"
+
diff --git a/po/bg.po b/po/bg.po
new file mode 100644 (file)
index 0000000..f3f42e3
--- /dev/null
+++ b/po/bg.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Голямата сила на звука може да увреди слуха ви, ако слушате дълго"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Предупреждение"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "Медии"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Слушалки"
+
diff --git a/po/ca.po b/po/ca.po
new file mode 100644 (file)
index 0000000..49cc43c
--- /dev/null
+++ b/po/ca.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Volums elevats poden malmetre la seva oïda si els escolta durant molt temps"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Advertiment"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "Multimèdia"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Auriculars"
+
diff --git a/po/cs.po b/po/cs.po
new file mode 100644 (file)
index 0000000..791cffd
--- /dev/null
+++ b/po/cs.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Dlouhodobý poslech velmi hlasité reprodukce může poškodit sluch"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Upozornění"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "Média"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Sluchátka"
+
diff --git a/po/da.po b/po/da.po
new file mode 100644 (file)
index 0000000..492564b
--- /dev/null
+++ b/po/da.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Høj musik kan skade din hørelse, hvis du lytter i for lang tid"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Advarsel"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "Medie"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Høretelefoner"
+
index 02cd7fd..609d635 100644 (file)
@@ -1,63 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 15:02+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Das Hören lauter Musik über einen längeren Zeitraum kann sich schädlich auf Ihr Gehör auswirken."
 
-#: volume.c:46
-msgid "Application template"
-msgstr ""
-
-#: volume.c:47
-msgid "Click to exit"
-msgstr ""
-
-#: _logic.c:516
-msgid "Unknown"
-msgstr ""
-
-#: _logic.c:520
-msgid "System"
-msgstr ""
-
-#: _logic.c:523
-msgid "IDS_COM_HEADER_NOTIFICATION"
-msgstr ""
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
 
-#: _logic.c:526
-msgid "IDS_COM_BODY_ALARM"
-msgstr ""
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
 
-#: _logic.c:529
-msgid "IDS_COM_BODY_RINGTONE"
-msgstr ""
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Warnung"
 
-#: _logic.c:532
 msgid "IDS_COM_BODY_MEDIA"
 msgstr "Medien"
 
-#: _logic.c:535
-msgid "Call"
-msgstr ""
-
-#. this enum is different from mm_sound.h and avsys-audio.h
-#: _logic.c:539
-msgid "IDS_COM_BODY_ANDROID"
-msgstr "Android"
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Kopfhörer"
 
-#: _logic.c:542
-msgid "IDS_COM_BODY_JAVA"
-msgstr "Java"
index 6b2f0dc..5b8e401 100644 (file)
@@ -1,63 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 15:02+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Η ακρόαση μουσικής σε υψηλή ένταση για μεγάλο χρονικό διάστημα μπορεί να βλάψει την ακοή σας"
 
-#: volume.c:46
-msgid "Application template"
-msgstr ""
-
-#: volume.c:47
-msgid "Click to exit"
-msgstr ""
-
-#: _logic.c:516
-msgid "Unknown"
-msgstr ""
-
-#: _logic.c:520
-msgid "System"
-msgstr ""
-
-#: _logic.c:523
-msgid "IDS_COM_HEADER_NOTIFICATION"
-msgstr ""
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
 
-#: _logic.c:526
-msgid "IDS_COM_BODY_ALARM"
-msgstr ""
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
 
-#: _logic.c:529
-msgid "IDS_COM_BODY_RINGTONE"
-msgstr ""
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Προειδοποίηση"
 
-#: _logic.c:532
 msgid "IDS_COM_BODY_MEDIA"
 msgstr "Μέσα"
 
-#: _logic.c:535
-msgid "Call"
-msgstr ""
-
-#. this enum is different from mm_sound.h and avsys-audio.h
-#: _logic.c:539
-msgid "IDS_COM_BODY_ANDROID"
-msgstr "Android"
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Ακουστικά"
 
-#: _logic.c:542
-msgid "IDS_COM_BODY_JAVA"
-msgstr "Java"
diff --git a/po/en.po b/po/en.po
new file mode 100644 (file)
index 0000000..7aaa29e
--- /dev/null
+++ b/po/en.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "High volumes may harm your hearing if you listen for a long time"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Warning"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "Media"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Headphones"
+
index a2a35e6..7aaa29e 100644 (file)
@@ -1,63 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 15:02+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "High volumes may harm your hearing if you listen for a long time"
 
-#: volume.c:46
-msgid "Application template"
-msgstr ""
-
-#: volume.c:47
-msgid "Click to exit"
-msgstr ""
-
-#: _logic.c:516
-msgid "Unknown"
-msgstr ""
-
-#: _logic.c:520
-msgid "System"
-msgstr ""
-
-#: _logic.c:523
-msgid "IDS_COM_HEADER_NOTIFICATION"
-msgstr ""
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
 
-#: _logic.c:526
-msgid "IDS_COM_BODY_ALARM"
-msgstr ""
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
 
-#: _logic.c:529
-msgid "IDS_COM_BODY_RINGTONE"
-msgstr ""
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Warning"
 
-#: _logic.c:532
 msgid "IDS_COM_BODY_MEDIA"
 msgstr "Media"
 
-#: _logic.c:535
-msgid "Call"
-msgstr ""
-
-#. this enum is different from mm_sound.h and avsys-audio.h
-#: _logic.c:539
-msgid "IDS_COM_BODY_ANDROID"
-msgstr "Android"
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Headphones"
 
-#: _logic.c:542
-msgid "IDS_COM_BODY_JAVA"
-msgstr "Java"
index a2a35e6..7aaa29e 100644 (file)
@@ -1,63 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 15:02+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "High volumes may harm your hearing if you listen for a long time"
 
-#: volume.c:46
-msgid "Application template"
-msgstr ""
-
-#: volume.c:47
-msgid "Click to exit"
-msgstr ""
-
-#: _logic.c:516
-msgid "Unknown"
-msgstr ""
-
-#: _logic.c:520
-msgid "System"
-msgstr ""
-
-#: _logic.c:523
-msgid "IDS_COM_HEADER_NOTIFICATION"
-msgstr ""
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
 
-#: _logic.c:526
-msgid "IDS_COM_BODY_ALARM"
-msgstr ""
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
 
-#: _logic.c:529
-msgid "IDS_COM_BODY_RINGTONE"
-msgstr ""
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Warning"
 
-#: _logic.c:532
 msgid "IDS_COM_BODY_MEDIA"
 msgstr "Media"
 
-#: _logic.c:535
-msgid "Call"
-msgstr ""
-
-#. this enum is different from mm_sound.h and avsys-audio.h
-#: _logic.c:539
-msgid "IDS_COM_BODY_ANDROID"
-msgstr "Android"
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Headphones"
 
-#: _logic.c:542
-msgid "IDS_COM_BODY_JAVA"
-msgstr "Java"
index 4312226..8293735 100644 (file)
@@ -1,63 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 15:02+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "El volumen alto durante un tiempo prolongado puede dañar sus oídos"
 
-#: volume.c:46
-msgid "Application template"
-msgstr ""
-
-#: volume.c:47
-msgid "Click to exit"
-msgstr ""
-
-#: _logic.c:516
-msgid "Unknown"
-msgstr ""
-
-#: _logic.c:520
-msgid "System"
-msgstr ""
-
-#: _logic.c:523
-msgid "IDS_COM_HEADER_NOTIFICATION"
-msgstr ""
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
 
-#: _logic.c:526
-msgid "IDS_COM_BODY_ALARM"
-msgstr ""
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
 
-#: _logic.c:529
-msgid "IDS_COM_BODY_RINGTONE"
-msgstr ""
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Aviso"
 
-#: _logic.c:532
 msgid "IDS_COM_BODY_MEDIA"
 msgstr "Multimedia"
 
-#: _logic.c:535
-msgid "Call"
-msgstr ""
-
-#. this enum is different from mm_sound.h and avsys-audio.h
-#: _logic.c:539
-msgid "IDS_COM_BODY_ANDROID"
-msgstr "Android"
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Auriculares"
 
-#: _logic.c:542
-msgid "IDS_COM_BODY_JAVA"
-msgstr "Java"
diff --git a/po/fi.po b/po/fi.po
new file mode 100644 (file)
index 0000000..c7178a2
--- /dev/null
+++ b/po/fi.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Suuri äänenvoimakkuus vaurioittaa kuuloasi pitkäaikaisen kuuntelun aikana"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Varoitus"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "Media"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Kuulokkeet"
+
index df58ac1..ece5be6 100644 (file)
@@ -1,63 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 15:02+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr " L'écoute prolongée de musique à un volume élevé risque d'endommager votre audition"
 
-#: volume.c:46
-msgid "Application template"
-msgstr ""
-
-#: volume.c:47
-msgid "Click to exit"
-msgstr ""
-
-#: _logic.c:516
-msgid "Unknown"
-msgstr ""
-
-#: _logic.c:520
-msgid "System"
-msgstr ""
-
-#: _logic.c:523
-msgid "IDS_COM_HEADER_NOTIFICATION"
-msgstr ""
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
 
-#: _logic.c:526
-msgid "IDS_COM_BODY_ALARM"
-msgstr ""
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
 
-#: _logic.c:529
-msgid "IDS_COM_BODY_RINGTONE"
-msgstr ""
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Avertissement"
 
-#: _logic.c:532
 msgid "IDS_COM_BODY_MEDIA"
 msgstr "Média"
 
-#: _logic.c:535
-msgid "Call"
-msgstr ""
-
-#. this enum is different from mm_sound.h and avsys-audio.h
-#: _logic.c:539
-msgid "IDS_COM_BODY_ANDROID"
-msgstr "Android"
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Ecouteurs"
 
-#: _logic.c:542
-msgid "IDS_COM_BODY_JAVA"
-msgstr "Java"
diff --git a/po/he.po b/po/he.po
new file mode 100644 (file)
index 0000000..d13bad1
--- /dev/null
+++ b/po/he.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "עוצמות קול גבוהות עלולות לפגוע בשמיעה אם מאזינים להן למשך זמן רב"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "אזהרה"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "מדיה"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "אוזניות"
+
diff --git a/po/hi.po b/po/hi.po
new file mode 100644 (file)
index 0000000..cce70e5
--- /dev/null
+++ b/po/hi.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "उच्च वॉल्यूम से आपके सुनने में नुकसान हो सकता है यदि आप लंबे समय तक उसे सुनते हैं"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "एंड्रोइड"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "चेतावनी"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "मीडिया"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "हेडफ़ोन्‍स"
+
diff --git a/po/hr.po b/po/hr.po
new file mode 100644 (file)
index 0000000..d78e735
--- /dev/null
+++ b/po/hr.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Velika glasnoća može oštetiti sluh pri dugom slušanju"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Upozorenje"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "Mediji"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Slušalice"
+
diff --git a/po/hu.po b/po/hu.po
new file mode 100644 (file)
index 0000000..696f86d
--- /dev/null
+++ b/po/hu.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Ha sokáig hallgat nagy hangerőn zenét vagy egyebet, akkor károsodhat a hallása"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Figyelmeztetés"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "Média"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Fejhallgató"
+
diff --git a/po/id.po b/po/id.po
new file mode 100644 (file)
index 0000000..fb7537c
--- /dev/null
+++ b/po/id.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Volume tinggi dapat membahayakan pendengaran Anda jika Anda mendengarkannya dalam waktu yang lama"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Peringatan"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "Media"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Headphone"
+
index 4312226..26f69ca 100644 (file)
@@ -1,63 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 15:02+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Volumi troppo alti possono danneggiare l'udito in caso di ascolto prolungato"
 
-#: volume.c:46
-msgid "Application template"
-msgstr ""
-
-#: volume.c:47
-msgid "Click to exit"
-msgstr ""
-
-#: _logic.c:516
-msgid "Unknown"
-msgstr ""
-
-#: _logic.c:520
-msgid "System"
-msgstr ""
-
-#: _logic.c:523
-msgid "IDS_COM_HEADER_NOTIFICATION"
-msgstr ""
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
 
-#: _logic.c:526
-msgid "IDS_COM_BODY_ALARM"
-msgstr ""
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
 
-#: _logic.c:529
-msgid "IDS_COM_BODY_RINGTONE"
-msgstr ""
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Avviso"
 
-#: _logic.c:532
 msgid "IDS_COM_BODY_MEDIA"
 msgstr "Multimedia"
 
-#: _logic.c:535
-msgid "Call"
-msgstr ""
-
-#. this enum is different from mm_sound.h and avsys-audio.h
-#: _logic.c:539
-msgid "IDS_COM_BODY_ANDROID"
-msgstr "Android"
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Cuffie"
 
-#: _logic.c:542
-msgid "IDS_COM_BODY_JAVA"
-msgstr "Java"
index 81fdd09..a35215f 100644 (file)
@@ -1,63 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 15:02+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr " ​長時間​​大音量​​で​​聴き​​続ける​​と、​​聴力​​を​​損傷​​する​​可能性​​が​​あります"
 
-#: volume.c:46
-msgid "Application template"
-msgstr ""
-
-#: volume.c:47
-msgid "Click to exit"
-msgstr ""
-
-#: _logic.c:516
-msgid "Unknown"
-msgstr ""
-
-#: _logic.c:520
-msgid "System"
-msgstr ""
-
-#: _logic.c:523
-msgid "IDS_COM_HEADER_NOTIFICATION"
-msgstr ""
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
 
-#: _logic.c:526
-msgid "IDS_COM_BODY_ALARM"
-msgstr ""
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
 
-#: _logic.c:529
-msgid "IDS_COM_BODY_RINGTONE"
-msgstr ""
+msgid "IDS_COM_BODY_WARNING"
+msgstr "警告"
 
-#: _logic.c:532
 msgid "IDS_COM_BODY_MEDIA"
 msgstr "メディア"
 
-#: _logic.c:535
-msgid "Call"
-msgstr ""
-
-#. this enum is different from mm_sound.h and avsys-audio.h
-#: _logic.c:539
-msgid "IDS_COM_BODY_ANDROID"
-msgstr "Android"
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "ヘッドホン"
 
-#: _logic.c:542
-msgid "IDS_COM_BODY_JAVA"
-msgstr "Java"
index ca39fa2..6f4d30e 100644 (file)
@@ -1,63 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 15:02+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "오랫동안 큰 소리로 음악을 들으면 청각이 손상될 수 있습니다"
 
-#: volume.c:46
-msgid "Application template"
-msgstr ""
-
-#: volume.c:47
-msgid "Click to exit"
-msgstr ""
-
-#: _logic.c:516
-msgid "Unknown"
-msgstr ""
-
-#: _logic.c:520
-msgid "System"
-msgstr "시스템"
-
-#: _logic.c:523
-msgid "IDS_COM_HEADER_NOTIFICATION"
-msgstr ""
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "안드로이드"
 
-#: _logic.c:526
-msgid "IDS_COM_BODY_ALARM"
-msgstr ""
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
 
-#: _logic.c:529
-msgid "IDS_COM_BODY_RINGTONE"
-msgstr ""
+msgid "IDS_COM_BODY_WARNING"
+msgstr "경고"
 
-#: _logic.c:532
 msgid "IDS_COM_BODY_MEDIA"
 msgstr "미디어"
 
-#: _logic.c:535
-msgid "Call"
-msgstr ""
-
-#. this enum is different from mm_sound.h and avsys-audio.h
-#: _logic.c:539
-msgid "IDS_COM_BODY_ANDROID"
-msgstr "안드로이드"
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "헤드폰"
 
-#: _logic.c:542
-msgid "IDS_COM_BODY_JAVA"
-msgstr "Java"
diff --git a/po/lt.po b/po/lt.po
new file mode 100644 (file)
index 0000000..a8b3357
--- /dev/null
+++ b/po/lt.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Jei klausysitės garsiai ilgą laiką, gali būti pažeista klausa"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "„Android“"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Perspėjimas"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "Daugialypė terpė"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Ausinės"
+
diff --git a/po/lv.po b/po/lv.po
new file mode 100644 (file)
index 0000000..7949db5
--- /dev/null
+++ b/po/lv.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Ilgstoša skaļas mūzikas klausīšanās var izraisīt dzirdes traucējumus"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Brīdinājums"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "Multivide"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Austiņas"
+
diff --git a/po/ms.po b/po/ms.po
new file mode 100644 (file)
index 0000000..6955d87
--- /dev/null
+++ b/po/ms.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Kelantangan tinggi mungkin merosakkan pendengaran anda jika anda mendengar untuk masa yang lama"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Amaran"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "Media"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Fon kepala"
+
index a2a35e6..038c6bf 100644 (file)
@@ -1,63 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 15:02+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Hoog volume kan uw gehoor beschadigen wanneer u er lang naar luistert"
 
-#: volume.c:46
-msgid "Application template"
-msgstr ""
-
-#: volume.c:47
-msgid "Click to exit"
-msgstr ""
-
-#: _logic.c:516
-msgid "Unknown"
-msgstr ""
-
-#: _logic.c:520
-msgid "System"
-msgstr ""
-
-#: _logic.c:523
-msgid "IDS_COM_HEADER_NOTIFICATION"
-msgstr ""
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
 
-#: _logic.c:526
-msgid "IDS_COM_BODY_ALARM"
-msgstr ""
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
 
-#: _logic.c:529
-msgid "IDS_COM_BODY_RINGTONE"
-msgstr ""
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Waarschuwing"
 
-#: _logic.c:532
 msgid "IDS_COM_BODY_MEDIA"
 msgstr "Media"
 
-#: _logic.c:535
-msgid "Call"
-msgstr ""
-
-#. this enum is different from mm_sound.h and avsys-audio.h
-#: _logic.c:539
-msgid "IDS_COM_BODY_ANDROID"
-msgstr "Android"
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Koptelefoons"
 
-#: _logic.c:542
-msgid "IDS_COM_BODY_JAVA"
-msgstr "Java"
diff --git a/po/no.po b/po/no.po
new file mode 100644 (file)
index 0000000..b14a452
--- /dev/null
+++ b/po/no.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Høy lydstyrke kan skade hørselen din hvis du lytter til det over lengre perioder"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Advarsel"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "Medier"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Hodetelefoner"
+
diff --git a/po/pl.po b/po/pl.po
new file mode 100644 (file)
index 0000000..700a5d4
--- /dev/null
+++ b/po/pl.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Słuchanie muzyki przy wysokim ustawieniu głośności przez długi czas może spowodować uszkodzenie słuchu"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Ostrzeżenie"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "Media"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Słuchawki"
+
index 1ef4a13..deeeae3 100644 (file)
@@ -1,63 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 15:02+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "O volume de som elevado pode prejudicar a sua audição se a expuser a este durante muito tempo"
 
-#: volume.c:46
-msgid "Application template"
-msgstr ""
-
-#: volume.c:47
-msgid "Click to exit"
-msgstr ""
-
-#: _logic.c:516
-msgid "Unknown"
-msgstr ""
-
-#: _logic.c:520
-msgid "System"
-msgstr ""
-
-#: _logic.c:523
-msgid "IDS_COM_HEADER_NOTIFICATION"
-msgstr ""
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
 
-#: _logic.c:526
-msgid "IDS_COM_BODY_ALARM"
-msgstr ""
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
 
-#: _logic.c:529
-msgid "IDS_COM_BODY_RINGTONE"
-msgstr ""
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Aviso"
 
-#: _logic.c:532
 msgid "IDS_COM_BODY_MEDIA"
 msgstr "Multimédia"
 
-#: _logic.c:535
-msgid "Call"
-msgstr ""
-
-#. this enum is different from mm_sound.h and avsys-audio.h
-#: _logic.c:539
-msgid "IDS_COM_BODY_ANDROID"
-msgstr "Android"
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Auscultadores"
 
-#: _logic.c:542
-msgid "IDS_COM_BODY_JAVA"
-msgstr "Java"
diff --git a/po/ro.po b/po/ro.po
new file mode 100644 (file)
index 0000000..57c032f
--- /dev/null
+++ b/po/ro.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Sunetele la volum ridicat pot afecta auzul, dacă le ascultaţi timp îndelungat"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Avertisment"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "Media"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Căşti"
+
index 141accb..9c14ef4 100644 (file)
@@ -1,63 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 15:02+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Прослушивание громкой музыки в течение продолжительного времени может привести к ухудшению слуха"
 
-#: volume.c:46
-msgid "Application template"
-msgstr ""
-
-#: volume.c:47
-msgid "Click to exit"
-msgstr ""
-
-#: _logic.c:516
-msgid "Unknown"
-msgstr ""
-
-#: _logic.c:520
-msgid "System"
-msgstr ""
-
-#: _logic.c:523
-msgid "IDS_COM_HEADER_NOTIFICATION"
-msgstr ""
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
 
-#: _logic.c:526
-msgid "IDS_COM_BODY_ALARM"
-msgstr ""
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
 
-#: _logic.c:529
-msgid "IDS_COM_BODY_RINGTONE"
-msgstr ""
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Предупреждение"
 
-#: _logic.c:532
 msgid "IDS_COM_BODY_MEDIA"
 msgstr "Медиа"
 
-#: _logic.c:535
-msgid "Call"
-msgstr ""
-
-#. this enum is different from mm_sound.h and avsys-audio.h
-#: _logic.c:539
-msgid "IDS_COM_BODY_ANDROID"
-msgstr "Android"
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Наушники"
 
-#: _logic.c:542
-msgid "IDS_COM_BODY_JAVA"
-msgstr "Java"
diff --git a/po/sk.po b/po/sk.po
new file mode 100644 (file)
index 0000000..e09ad1e
--- /dev/null
+++ b/po/sk.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Vysoká hlasitosť môže pri dlhodobom počúvaní poškodiť sluch"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Varovanie"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "Médium"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Slúchadlá"
+
diff --git a/po/sl.po b/po/sl.po
new file mode 100644 (file)
index 0000000..8d2d911
--- /dev/null
+++ b/po/sl.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Če glasno glasbo poslušate daljši čas, lahko to škoduje vašem sluhu"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Opozorilo"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "Medij"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Slušalke"
+
diff --git a/po/sr.po b/po/sr.po
new file mode 100644 (file)
index 0000000..29dd718
--- /dev/null
+++ b/po/sr.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Velika jačina zvuka može da ošteti sluh ukoliko tako slušate duže vreme"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Upozorenje"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "Mediji"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Slušalice"
+
diff --git a/po/sv.po b/po/sv.po
new file mode 100644 (file)
index 0000000..e837074
--- /dev/null
+++ b/po/sv.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Hög volym kan skada din hörsel om du lyssnar för länge"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Varning"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "Media"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Hörlurar"
+
diff --git a/po/th.po b/po/th.po
new file mode 100644 (file)
index 0000000..c69ee38
--- /dev/null
+++ b/po/th.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "ระดับ​เสียง​ที่​สูง​อาจ​เป็น​อันตราย​ต่อ​การ​ฟัง​ของ​คุณ​ได้ หาก​คุณ​ฟัง​เป็น​เวลา​นาน"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "เตือน"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "มี​เดีย"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "หู​ฟัง"
+
index 08a5d06..271e339 100644 (file)
@@ -1,63 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 15:02+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Yüksek ses düzeyi, uzun süre dinlemeniz durumunda işitme duyunuza zarar verebilir"
 
-#: volume.c:46
-msgid "Application template"
-msgstr ""
-
-#: volume.c:47
-msgid "Click to exit"
-msgstr ""
-
-#: _logic.c:516
-msgid "Unknown"
-msgstr ""
-
-#: _logic.c:520
-msgid "System"
-msgstr ""
-
-#: _logic.c:523
-msgid "IDS_COM_HEADER_NOTIFICATION"
-msgstr ""
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
 
-#: _logic.c:526
-msgid "IDS_COM_BODY_ALARM"
-msgstr ""
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
 
-#: _logic.c:529
-msgid "IDS_COM_BODY_RINGTONE"
-msgstr ""
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Uyarı"
 
-#: _logic.c:532
 msgid "IDS_COM_BODY_MEDIA"
 msgstr "Medya"
 
-#: _logic.c:535
-msgid "Call"
-msgstr ""
-
-#. this enum is different from mm_sound.h and avsys-audio.h
-#: _logic.c:539
-msgid "IDS_COM_BODY_ANDROID"
-msgstr "Android"
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Kulaklıklar"
 
-#: _logic.c:542
-msgid "IDS_COM_BODY_JAVA"
-msgstr "Java"
diff --git a/po/uk.po b/po/uk.po
new file mode 100644 (file)
index 0000000..08d2684
--- /dev/null
+++ b/po/uk.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Тривале прослуховування за високого рівня гучності може призвести до погіршення слуху"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Попередження"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "Медіадані"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Навушники"
+
index 22cdc3d..c84f1a7 100755 (executable)
@@ -4,8 +4,8 @@ PACKAGE=volume
 SRCROOT=../src
 POTFILES=POTFILES.in
 
-#ALL_LINGUAS= am az be ca cs da de el en_CA en_GB es et fi fr hr hu it ja ko lv mk ml ms nb ne nl pa pl pt pt_BR ru rw sk sl sr sr@Latn sv ta tr uk vi zh_CN zh_TW
-ALL_LINGUAS="de_DE el_GR en_US en_GB es_ES fr_FR it_IT ja_JP ko_KR nl_NL pt_PT ru_RU tr_TR zh_CN zh_HK zh_TW"
+#ALL_LINGUAS= ar bg ca cs da de_DE el_GR en en_GB en_US es_ES fi fr_FR he hi hr hu id it_IT ja_JP ko_KR lt lv ms nl_NL no pl pt_PT ro ru_RU sk sl sr sv th tr_TR uk vi zh_CN zh_HK zh_TW
+ALL_LINGUAS="ar bg ca cs da de_DE el_GR en en_GB en_US es_ES fi fr_FR he hi hr hu id it_IT ja_JP ko_KR lt lv ms nl_NL no pl pt_PT ro ru_RU sk sl sr sv th tr_TR uk vi zh_CN zh_HK zh_TW"
 
 XGETTEXT=/usr/bin/xgettext
 MSGMERGE=/usr/bin/msgmerge
diff --git a/po/vi.po b/po/vi.po
new file mode 100644 (file)
index 0000000..aa6c018
--- /dev/null
+++ b/po/vi.po
@@ -0,0 +1,18 @@
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "Nghe âm lượng to trong thời gian dài có thể làm hại thính giác của bạn"
+
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
+
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
+
+msgid "IDS_COM_BODY_WARNING"
+msgstr "Cảnh báo"
+
+msgid "IDS_COM_BODY_MEDIA"
+msgstr "Media"
+
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "Tai nghe"
+
index f5edffb..f1084c3 100644 (file)
@@ -1,63 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 15:02+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "如果长时间用高音量收听,可能会损坏听力"
 
-#: volume.c:46
-msgid "Application template"
-msgstr ""
-
-#: volume.c:47
-msgid "Click to exit"
-msgstr ""
-
-#: _logic.c:516
-msgid "Unknown"
-msgstr ""
-
-#: _logic.c:520
-msgid "System"
-msgstr ""
-
-#: _logic.c:523
-msgid "IDS_COM_HEADER_NOTIFICATION"
-msgstr ""
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
 
-#: _logic.c:526
-msgid "IDS_COM_BODY_ALARM"
-msgstr ""
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java程序"
 
-#: _logic.c:529
-msgid "IDS_COM_BODY_RINGTONE"
-msgstr ""
+msgid "IDS_COM_BODY_WARNING"
+msgstr "警告"
 
-#: _logic.c:532
 msgid "IDS_COM_BODY_MEDIA"
 msgstr "媒体"
 
-#: _logic.c:535
-msgid "Call"
-msgstr ""
-
-#. this enum is different from mm_sound.h and avsys-audio.h
-#: _logic.c:539
-msgid "IDS_COM_BODY_ANDROID"
-msgstr "Android"
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "耳机"
 
-#: _logic.c:542
-msgid "IDS_COM_BODY_JAVA"
-msgstr "Java程序"
index b62b836..3e1988c 100644 (file)
@@ -1,63 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 15:02+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "長期聆聽高音量會損害您的聽力"
 
-#: volume.c:46
-msgid "Application template"
-msgstr ""
-
-#: volume.c:47
-msgid "Click to exit"
-msgstr ""
-
-#: _logic.c:516
-msgid "Unknown"
-msgstr ""
-
-#: _logic.c:520
-msgid "System"
-msgstr ""
-
-#: _logic.c:523
-msgid "IDS_COM_HEADER_NOTIFICATION"
-msgstr ""
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
 
-#: _logic.c:526
-msgid "IDS_COM_BODY_ALARM"
-msgstr ""
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
 
-#: _logic.c:529
-msgid "IDS_COM_BODY_RINGTONE"
-msgstr ""
+msgid "IDS_COM_BODY_WARNING"
+msgstr "警告"
 
-#: _logic.c:532
 msgid "IDS_COM_BODY_MEDIA"
 msgstr "媒體"
 
-#: _logic.c:535
-msgid "Call"
-msgstr ""
-
-#. this enum is different from mm_sound.h and avsys-audio.h
-#: _logic.c:539
-msgid "IDS_COM_BODY_ANDROID"
-msgstr "Android"
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "耳機"
 
-#: _logic.c:542
-msgid "IDS_COM_BODY_JAVA"
-msgstr "Java"
index b62b836..7b90ac5 100644 (file)
@@ -1,63 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-10-07 15:02+0900\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+msgid "IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"
+msgstr "長期聆聽過大音量會損害您的聽力"
 
-#: volume.c:46
-msgid "Application template"
-msgstr ""
-
-#: volume.c:47
-msgid "Click to exit"
-msgstr ""
-
-#: _logic.c:516
-msgid "Unknown"
-msgstr ""
-
-#: _logic.c:520
-msgid "System"
-msgstr ""
-
-#: _logic.c:523
-msgid "IDS_COM_HEADER_NOTIFICATION"
-msgstr ""
+msgid "IDS_COM_BODY_ANDROID"
+msgstr "Android"
 
-#: _logic.c:526
-msgid "IDS_COM_BODY_ALARM"
-msgstr ""
+msgid "IDS_COM_BODY_JAVA"
+msgstr "Java"
 
-#: _logic.c:529
-msgid "IDS_COM_BODY_RINGTONE"
-msgstr ""
+msgid "IDS_COM_BODY_WARNING"
+msgstr "警告"
 
-#: _logic.c:532
 msgid "IDS_COM_BODY_MEDIA"
 msgstr "媒體"
 
-#: _logic.c:535
-msgid "Call"
-msgstr ""
-
-#. this enum is different from mm_sound.h and avsys-audio.h
-#: _logic.c:539
-msgid "IDS_COM_BODY_ANDROID"
-msgstr "Android"
+msgid "IDS_COM_OPT_HEADPHONES_ABB"
+msgstr "耳機"
 
-#: _logic.c:542
-msgid "IDS_COM_BODY_JAVA"
-msgstr "Java"
diff --git a/src/_button.c b/src/_button.c
new file mode 100755 (executable)
index 0000000..47853a9
--- /dev/null
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2012  Samsung Electronics Co., Ltd
+ * 
+ * Licensed under the Flora License, Version 1.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.tizenopensource.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.
+ */
+
+
+#include <ui-gadget.h>
+
+#include "_util_log.h"
+#include "volume.h"
+#include "_sound.h"
+#include "_logic.h"
+
+static void button_ug_layout_cb(ui_gadget_h ug,
+               enum ug_mode mode, void *priv)
+{
+       Evas_Object *base;
+       Evas_Object *win;
+
+       base = ug_get_layout(ug);
+       win = ug_get_window();
+
+       switch (mode) {
+               case UG_MODE_FULLVIEW:
+                       evas_object_size_hint_weight_set(base,
+                                       EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+                       elm_win_resize_object_add(win, base);
+                       evas_object_show(base);
+                       break;
+               default:
+                       break;
+       }
+}
+
+static void button_ug_destroy_cb(ui_gadget_h ug, void *priv)
+{
+       _D("%s\n", __func__);
+       struct appdata *ad = (struct appdata *)priv;
+
+       retm_if(ug == NULL, "Invalid argument: ug is NULL\n");
+
+       ug_destroy(ug);
+       ad->ug = NULL;
+
+       utilx_set_window_opaque_state(ecore_x_display_get(), elm_win_xwindow_get(ad->win), UTILX_OPAQUE_STATE_OFF);
+       _close_volume(ad);
+}
+
+ui_gadget_h create_button_ug(void *data)
+{
+       ui_gadget_h ug;
+       struct ug_cbs cbs = {0};
+       struct appdata *ad = (struct appdata *)data;
+       retvm_if(ad == NULL, 0, "Invalid argument:appdata is NULL\n");
+
+       cbs.layout_cb = button_ug_layout_cb;
+       cbs.destroy_cb = button_ug_destroy_cb;
+       cbs.priv = (void *)data;
+
+       utilx_set_window_opaque_state(ecore_x_display_get(), elm_win_xwindow_get(ad->win), UTILX_OPAQUE_STATE_ON);
+       ug = ug_create(NULL, "setting-profile-efl", UG_MODE_FULLVIEW, NULL, &cbs);
+
+       return ug;
+}
+
+int _open_ug(void *data)
+{
+       struct appdata *ad = (struct appdata *)data;
+       ui_gadget_h ug= NULL;
+
+       retvm_if(ad == NULL, -1, "Invalid argument: appdata is NULL\n");
+       retvm_if(ad->win == NULL, -1, "Invalid argument: window is NULL\n");
+
+       UG_INIT_EFL(ad->win, UG_OPT_INDICATOR_ENABLE);
+       elm_win_indicator_mode_set(ad->win, ELM_WIN_INDICATOR_SHOW);
+       ug = create_button_ug(ad);
+
+       retvm_if(ug == NULL, -1, "Failed to Create ug!\n");
+
+       ad->ug = ug;
+
+       return 0;
+}
diff --git a/src/_button.h b/src/_button.h
new file mode 100755 (executable)
index 0000000..ae3fd14
--- /dev/null
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2012  Samsung Electronics Co., Ltd
+ * 
+ * Licensed under the Flora License, Version 1.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.tizenopensource.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.
+ */
+
+
+int _open_ug(void *data);
old mode 100644 (file)
new mode 100755 (executable)
index 3a9cdcc..e8753fa
@@ -1,18 +1,19 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the License);
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.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.
-  */
+/*
+ * Copyright 2012  Samsung Electronics Co., Ltd
+ * 
+ * Licensed under the Flora License, Version 1.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.tizenopensource.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.
+ */
+
 
 #include <math.h>
 
 #include <Ecore_X.h>
 #include <utilX.h>
 #include <vconf.h>
-#include <bundle.h>
-#include <syspopup.h>
+#include <ui-gadget.h>
 
 #include "volume.h"
 #include "_util_log.h"
 #include "_util_efl.h"
 #include "_sound.h"
+#include "_button.h"
 
-#define _D_add_timer(x, time, _timer_cb, data) \
-       x = ecore_timer_add(time, _timer_cb, data);\
-
-#define _D_del_timer(x) \
-       if (x) {\
-               ecore_timer_del(x);\
-               x = NULL;\
-       }
+#define STRBUF_SIZE 128
 
 enum {
        IDLELOCK_OFF = 0x0,
@@ -56,81 +50,44 @@ static void _vibration_cb(keynode_t *node, void *data)
 int _init_vconf(struct appdata *ad)
 {
        int ret;
-
-       ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_SOUND_STATUS_BOOL,
-                                    _sound_cb, ad);
+       ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_SOUND_STATUS_BOOL, _sound_cb, ad);
        retvm_if(ret < 0, -1, "Failed to notify sound status\n");
-
-       ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_VIBRATION_STATUS_BOOL,
-                                    _vibration_cb, ad);
+       ret = vconf_notify_key_changed(VCONFKEY_SETAPPL_VIBRATION_STATUS_BOOL, _vibration_cb, ad);
        retvm_if(ret < 0, -1, "Failed to notifi vibration status\n");
-
-
        return 0;
 }
 
-volume_type_t _get_type(void)
-{
-       int r;
-       volume_type_t type = -1;
-
-       r = mm_sound_volume_get_current_playing_type(&type);
-       switch (r) {
-       case MM_ERROR_NONE:
-               break;
-
-       case MM_ERROR_SOUND_VOLUME_NO_INSTANCE:
-       case MM_ERROR_SOUND_VOLUME_CAPTURE_ONLY:
-               type = VOLUME_TYPE_SYSTEM;
-               break;
-
-       default:
-               fprintf(stderr, "Failed to get sound type(errno:%x)\n", r);
-               return -1;
-       }
-
-       return type;
-}
-
 int _close_volume(void *data)
 {
        struct appdata *ad = (struct appdata *)data;
-       retm_if(ad == NULL, -1, "Invalid argument: appdata is NULL\n");
-
-       if (ad->flag_deleting == EINA_TRUE) {
-               return -1;
-       }
+       retvm_if(ad == NULL, -1, "Invalid argument: appdata is NULL\n");
+       retvm_if(ad->flag_deleting == EINA_TRUE, -1, "Closing volume\n");
 
        _D("start closing volume\n");
        ad->flag_deleting = EINA_TRUE;
 
        _ungrab_key(ad);
 
-       _D_del_timer(ad->sutimer)
-       _D_del_timer(ad->lutimer)
-       _D_del_timer(ad->sdtimer)
-       _D("del long down timer\n");
-       _D_del_timer(ad->ldtimer)
-       _D_del_timer(ad->ptimer)
-
-       if (ad->pu) {
-               evas_object_del(ad->pu);
-               ad->pu = NULL;
-       }
+       DEL_TIMER(ad->sutimer)
+       DEL_TIMER(ad->lutimer)
+       DEL_TIMER(ad->sdtimer)
+       DEL_TIMER(ad->ldtimer)
+       DEL_TIMER(ad->ptimer)
 
-       if (ad->win) {
-               evas_object_del(ad->win);
-               ad->win = NULL;
-       }
+       if (ad->pu)
+               evas_object_hide(ad->pu);
+       if (ad->win)
+               evas_object_hide(ad->win);
        appcore_flush_memory();
 
        ad->flag_deleting = EINA_FALSE;
        _D("end closing volume\n");
+       return 0;
 }
 
-Eina_Bool _popup_timer_cb(void *data)
+Eina_Bool popup_timer_cb(void *data)
 {
-_D("func\n");
+       _D("%s\n", __func__);
        _close_volume(data);
        return ECORE_CALLBACK_CANCEL;
 }
@@ -140,16 +97,15 @@ Eina_Bool _lu_timer_cb(void *data)
        int val;
        struct appdata *ad = (struct appdata *)data;
        retvm_if(ad == NULL, 0, "Invalid argument: appdata is NULL\n");
-       if (ad->win == NULL{
-               _D("win is NULL, so long press pass\n");
+       if (ad->win == NULL || evas_object_visible_get(ad->win) == EINA_FALSE){
+               _D("win is NULL or hide state, so long press pass\n");
                return ECORE_CALLBACK_CANCEL;
        }
-       _D_del_timer(ad->stimer)
+       DEL_TIMER(ad->stimer)
 
        _get_sound_level(ad->type, &val);
        _set_sound_level(ad->type, val +1 > ad->step ? ad->step : val + 1);
        _D("down, type(%d), step(%d) val[%d]\n", ad->type, ad->step, val+1);
-
        return ECORE_CALLBACK_RENEW;
 }
 
@@ -157,7 +113,7 @@ Eina_Bool _su_timer_cb(void *data)
 {
        struct appdata *ad = (struct appdata *)data;
        retvm_if(ad == NULL, 0, "Invalid argument: appdata is NULL\n");
-       _D_add_timer(ad->lutimer, 0.0, _lu_timer_cb, ad)
+       ADD_TIMER(ad->lutimer, 0.0, _lu_timer_cb, ad)
        return ECORE_CALLBACK_CANCEL;
 }
 
@@ -166,16 +122,15 @@ Eina_Bool _ld_timer_cb(void *data)
        int val;
        struct appdata *ad = (struct appdata *)data;
        retvm_if(ad == NULL, 0, "Invalid argument: appdata is NULL\n");
-       if (ad->win == NULL{
-               _D("win is NULL, so long press pass\n");
+       if (ad->win == NULL || evas_object_visible_get(ad->win) == EINA_FALSE){
+               _D("win is NULL or hide state, so long press pass\n");
                return ECORE_CALLBACK_CANCEL;
        }
-       _D_del_timer(ad->stimer)
+       DEL_TIMER(ad->stimer)
 
        _get_sound_level(ad->type, &val);
        _set_sound_level(ad->type, val -1 <= 0 ? 0 : val - 1);
        _D("down, type(%d), step(%d) val[%d]\n", ad->type, ad->step, val+1);
-
        return ECORE_CALLBACK_RENEW;
 }
 
@@ -184,27 +139,30 @@ Eina_Bool _sd_timer_cb(void *data)
        struct appdata *ad = (struct appdata *)data;
        retvm_if(ad == NULL, 0, "Invalid argument: appdata is NULL\n");
        _D("add long down timer\n");
-       _D_add_timer(ad->ldtimer, 0.0, _ld_timer_cb, ad)
+       ADD_TIMER(ad->ldtimer, 0.0, _ld_timer_cb, ad)
        return ECORE_CALLBACK_CANCEL;
 }
 
-
 static Eina_Bool _key_press_cb(void *data, int type, void *event)
 {
-       int val;
+       _D("%s\n", __func__);
+       int val=0, snd=0;
        Ecore_Event_Key *ev = event;
        struct appdata *ad = (struct appdata *)data;
 
-       retvm_if(ev == NULL, 0, "Invalid arguemnt: event is NULL\n");
-       retvm_if(ad == NULL, 0, "Invalid argument: appdata is NULL\n");
+       retvm_if(ev == NULL, ECORE_CALLBACK_CANCEL, "Invalid arguemnt: event is NULL\n");
+       retvm_if(ad == NULL, ECORE_CALLBACK_CANCEL, "Invalid argument: appdata is NULL\n");
+       retvm_if(ad->win == NULL, ECORE_CALLBACK_CANCEL, "Invalid argument: window is NULL\n");
 
        if (ad->flag_touching == EINA_TRUE) {
                return ECORE_CALLBACK_CANCEL;
        }
 
+       vconf_get_bool(VCONFKEY_SETAPPL_SOUND_STATUS_BOOL, &snd);
+
        ad->flag_pressing = EINA_TRUE;
 
-       _D_del_timer(ad->ptimer)
+       DEL_TIMER(ad->ptimer)
 
        if (!strcmp(ev->keyname, KEY_VOLUMEUP)) {
                _get_sound_level(ad->type, &val);
@@ -213,14 +171,22 @@ static Eina_Bool _key_press_cb(void *data, int type, void *event)
                        _play_sound(ad->type, ad->sh);
                        return ECORE_CALLBACK_CANCEL;
                }
+               if(!snd){
+                       _D("mute and volume up key pressed\n");
+                       vconf_set_bool(VCONFKEY_SETAPPL_SOUND_STATUS_BOOL, EINA_TRUE);
+               }
                _set_sound_level(ad->type, val + 1);
                _play_sound(ad->type, ad->sh);
-               _D_del_timer(ad->sutimer)
-               _D_add_timer(ad->sutimer, 0.5, _su_timer_cb, ad)
+               DEL_TIMER(ad->sutimer)
+               ADD_TIMER(ad->sutimer, 0.5, _su_timer_cb, ad)
 
                _D("set volume %d -> [%d]\n", val, val+1);
 
        } else if (!strcmp(ev->keyname, KEY_VOLUMEDOWN)) {
+               if(!snd){
+                       /* Do nothing */
+                       return ECORE_CALLBACK_CANCEL;
+               }
                _get_sound_level(ad->type, &val);
                if (val == 0) {
                        _play_vib(ad->sh);
@@ -228,8 +194,8 @@ static Eina_Bool _key_press_cb(void *data, int type, void *event)
                }
                _set_sound_level(ad->type, val - 1);
                _play_sound(ad->type, ad->sh);
-               _D_del_timer(ad->sdtimer)
-               _D_add_timer(ad->sdtimer, 0.5, _sd_timer_cb, ad)
+               DEL_TIMER(ad->sdtimer)
+               ADD_TIMER(ad->sdtimer, 0.5, _sd_timer_cb, ad)
 
                _D("type (%d) set volume %d -> [%d]\n", ad->type, val, val-1);
 
@@ -242,11 +208,9 @@ static Eina_Bool _key_release_cb(void *data, int type, void *event)
        Ecore_Event_Key *ev = event;
        struct appdata *ad = (struct appdata *)data;
 
-       retvm_if(ev == NULL, 0, "Invalid arguemnt: event is NULL\n");
-       retvm_if(ad == NULL, 0, "Invalid argument:appdata is NULL\n");
-       if (ad->win == NULL) {
-               _D("There is no window in volume, so pass\n");
-       }
+       retvm_if(ev == NULL, ECORE_CALLBACK_CANCEL, "Invalid arguemnt: event is NULL\n");
+       retvm_if(ad == NULL, ECORE_CALLBACK_CANCEL, "Invalid argument:appdata is NULL\n");
+       retvm_if(ad->win == NULL, ECORE_CALLBACK_CANCEL, "Invalid argument: window is NULL\n");
 
        if (ad->flag_touching == EINA_TRUE) {
                return ECORE_CALLBACK_CANCEL;
@@ -254,20 +218,22 @@ static Eina_Bool _key_release_cb(void *data, int type, void *event)
 
        if (!strcmp(ev->keyname, KEY_VOLUMEUP)) {
                _D("up key released and del timer\n");
-               _D_del_timer(ad->sutimer)
-               _D_del_timer(ad->lutimer)
+               DEL_TIMER(ad->sutimer)
+               DEL_TIMER(ad->lutimer)
 
        } else if (!strcmp(ev->keyname, KEY_VOLUMEDOWN)) {
                _D("down key released and del timer\n");
-               _D_del_timer(ad->sdtimer)
-               _D("del long down timer\n");
-               _D_del_timer(ad->ldtimer)
+               DEL_TIMER(ad->sdtimer)
+               DEL_TIMER(ad->ldtimer)
        }
 
        ad->flag_pressing = EINA_FALSE;
 
-       _D_del_timer(ad->ptimer)
-       _D_add_timer(ad->ptimer, 3.0, _popup_timer_cb, ad)
+       DEL_TIMER(ad->ptimer)
+
+       /* In UG, This Callback should not be called. */
+       if ( ad->ug == NULL )
+               ADD_TIMER(ad->ptimer, 3.0, popup_timer_cb, ad)
 
        return ECORE_CALLBACK_CANCEL;
 }
@@ -341,17 +307,16 @@ volume_type_t _get_volume_type(void)
        switch (ret) {
                case MM_ERROR_NONE:
                        break;
-
                case MM_ERROR_SOUND_VOLUME_NO_INSTANCE:
                case MM_ERROR_SOUND_VOLUME_CAPTURE_ONLY:
                        type = VOLUME_TYPE_SYSTEM;
                        break;
-
                default:
                        fprintf(stderr, "Failed to get sound type(errno:%x)\n", ret);
                        return -1;
        }
-
+       if(type == VOLUME_TYPE_SYSTEM)
+               type = VOLUME_TYPE_RINGTONE;
        return type;
 }
 
@@ -374,31 +339,10 @@ int _check_status(int *lock, int *type)
        return 0;
 }
 
-Eina_Bool _test_timer_cb(void *data)
-{
-       _D("func\n");
-       Ecore_X_Display* disp = ecore_x_display_get();
-       Utilx_Key_Status upstat, downstat;
-       upstat = utilx_get_key_status(disp, KEY_VOLUMEUP);
-       downstat = utilx_get_key_status(disp, KEY_VOLUMEDOWN);
-       _D("disp(%x) up(%s) down(%s)\n", disp,
-                       upstat == UTILX_KEY_STATUS_PRESSED ? "press" : "release",
-                       downstat == UTILX_KEY_STATUS_PRESSED ? "press" : "release");
-       if (upstat == UTILX_KEY_STATUS_RELEASED) {
-
-       } else {
-
-       }
-               return ECORE_CALLBACK_RENEW;
-
-}
-
 int _app_create(struct appdata *ad)
 {
-
        _init_vconf(ad);
        _init_svi(ad);
-       _init_mm_sound(ad);
 
        return 0;
 }
@@ -418,7 +362,6 @@ syspopup_handler handler = {
        .def_timeout_fn = mytimeout
 };
 
-/* to set icon, slider etc. via mm sound callback */
 void _set_level(int type)
 {
        int val;
@@ -429,63 +372,7 @@ void _set_level(int type)
 
 static void _block_clicked_cb(void *data, Evas_Object *obj, void *event_info)
 {
-_D("func\n");
-
        _close_volume(data);
-       evas_object_del(obj);
-}
-
-static void _title_0_clicked_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
-{
-       char buf[64] = {0, };
-       char name[64] = {0, };
-       int i, type;
-       struct appdata *ad = (struct appdata *)data;
-
-       retm_if(ad == NULL, "Invalid argument: appdata is NULL\n");
-
-       _D_del_timer(ad->ptimer)
-
-       if (ad->flag_titleopen == EINA_TRUE) {
-               ad->flag_titleopen = EINA_FALSE;
-               edje_object_signal_emit(obj, "hide", "title");
-               _D_add_timer(ad->ptimer, 3.0, _popup_timer_cb, ad)
-
-       } else {
-               ad->flag_titleopen = EINA_TRUE;
-               edje_object_signal_emit(obj, "show", "title");
-
-               type = ad->type;
-               for (i = 1; i < 7; i++) {
-                       type = (type + 1) % 7;
-                       snprintf(name, sizeof(name), "text/title/%d", i);
-                       _get_title(type, buf, sizeof(buf));
-                       _D("name(%s) %d type(%s)\n", name, type, buf);
-                       edje_object_part_text_set(obj, name, buf);
-               }
-       }
-}
-
-void _set_title_text(Evas_Object *obj, Evas_Object *pu, int type)
-{
-       char buf[64] = {0, };
-
-       retm_if(obj == NULL, "Invalid argument: object is NULL\n");
-       _get_title(type, buf, sizeof(buf));
-       elm_object_part_text_set(pu, "title,text", buf);
-}
-
-void _title_func(Evas_Object *obj, void *data, int pivot)
-{
-       struct appdata *ad = (struct appdata *)data;
-       retm_if(ad == NULL, "Invalid argument: appdata is NULL\n");
-
-       edje_object_signal_emit(obj, "hide", "title");
-       ad->type = (ad->type + pivot) % 7;
-       ad->flag_titleopen = EINA_FALSE;
-       _set_title_text(obj, ad->pu, ad->type);
-       _set_level(ad->type);
-       _D_add_timer(ad->ptimer, 3.0, _popup_timer_cb, ad)
 }
 
 Eina_Bool _slider_timer_cb(void *data)
@@ -493,16 +380,12 @@ Eina_Bool _slider_timer_cb(void *data)
        double val;
        struct appdata *ad = (struct appdata *)data;
        retvm_if(ad == NULL, 0, "Invalid argument: appdata is NULL\n");
-
        if (ad->sl) {
                val = elm_slider_value_get(ad->sl);
                val += 0.5;
                if ((int)val != 0) {    /* 0 value could be dealed with in changed callback */
                        _set_sound_level(ad->type, (int)val);
-               } else {
-
                }
-
                return ECORE_CALLBACK_RENEW;
        }
        return ECORE_CALLBACK_CANCEL;
@@ -510,7 +393,8 @@ Eina_Bool _slider_timer_cb(void *data)
 
 static void _slider_start_cb(void *data, Evas_Object *obj, void *event_info)
 {
-       _D("func\n");
+       _D("%s\n", __func__);
+       int snd=0;
        struct appdata *ad = (struct appdata *)data;
        retm_if(ad == NULL, "Invalid argument: appdata is NULL\n");
 
@@ -519,14 +403,20 @@ static void _slider_start_cb(void *data, Evas_Object *obj, void *event_info)
        }
        ad->flag_touching = EINA_FALSE;
 
-       _D_del_timer(ad->ptimer)
+       DEL_TIMER(ad->ptimer)
+
+       vconf_get_bool(VCONFKEY_SETAPPL_SOUND_STATUS_BOOL, &snd);
+       if(!snd){
+               vconf_set_bool(VCONFKEY_SETAPPL_SOUND_STATUS_BOOL, EINA_TRUE);
+               _set_icon(data, -1);
+       }
 
        if (ad->lutimer || ad->ldtimer) {
                _D("return when long press is working\n");
                return;
        }
 
-       _D_add_timer(ad->stimer, 0.2, _slider_timer_cb, data)
+       ADD_TIMER(ad->stimer, 0.2, _slider_timer_cb, data)
 }
 
 static void _slider_changed_cb(void *data, Evas_Object *obj, void *event_info)
@@ -538,20 +428,16 @@ static void _slider_changed_cb(void *data, Evas_Object *obj, void *event_info)
        if (ad->flag_pressing == EINA_TRUE) {
                return;
        }
-
-
        if (ad->lutimer || ad->ldtimer) {
                _D("return when long press is working\n");
                return;
        }
-
        val = elm_slider_value_get(ad->sl);
        if (val <= 0.5) {
                elm_slider_value_set(ad->sl, 0);
                _set_sound_level(ad->type, 0);
 
        }
-
 }
 static void _slider_stop_cb(void *data, Evas_Object *obj, void *event_info)
 {
@@ -563,38 +449,35 @@ static void _slider_stop_cb(void *data, Evas_Object *obj, void *event_info)
        if (ad->flag_pressing == EINA_TRUE) {
                return;
        }
-
        if (ad->lutimer || ad->ldtimer) {
                _D("return when long press is working\n");
                return;
        }
-
-       _D_del_timer(ad->stimer)
+       DEL_TIMER(ad->stimer)
        if (ad->sl) {
                val = elm_slider_value_get(ad->sl);
                val += 0.5;
                _set_sound_level(ad->type, (int)val);
        }
        _play_sound(ad->type, ad->sh);
-
        ad->flag_touching = EINA_FALSE;
-       _D_add_timer(ad->ptimer, 3.0, _popup_timer_cb, ad)
+       ADD_TIMER(ad->ptimer, 3.0, popup_timer_cb, ad)
 }
 
 Eina_Bool _lu_warmup_timer_cb(void *data)
 {
        struct appdata *ad = (struct appdata *)data;
-       retm_if(ad == NULL, "Invalid argument: appdata is NULL\n");
-       _D_add_timer(ad->lutimer, 0.0, _lu_timer_cb, ad)
+       retvm_if(ad == NULL, ECORE_CALLBACK_CANCEL, "Invalid argument: appdata is NULL\n");
+       ADD_TIMER(ad->lutimer, 0.0, _lu_timer_cb, ad)
        return ECORE_CALLBACK_CANCEL;
 }
 
 Eina_Bool _ld_warmup_timer_cb(void *data)
 {
        struct appdata *ad = (struct appdata *)data;
-       retm_if(ad == NULL, "Invalid argument: appdata is NULL\n");
+       retvm_if(ad == NULL, ECORE_CALLBACK_CANCEL, "Invalid argument: appdata is NULL\n");
        _D("add long down timer\n");
-       _D_add_timer(ad->ldtimer, 0.0, _ld_timer_cb, ad)
+       ADD_TIMER(ad->ldtimer, 0.0, _ld_timer_cb, ad)
        return ECORE_CALLBACK_CANCEL;
 }
 
@@ -614,27 +497,61 @@ int _handle_bundle(bundle *b, struct appdata *ad)
                        upstat = utilx_get_key_status(disp, KEY_VOLUMEUP);
                        if (upstat == UTILX_KEY_STATUS_PRESSED ) {
                                _D("volume up long press\n");
-                               _D_del_timer(ad->ptimer)
+                               DEL_TIMER(ad->ptimer)
                                        ecore_timer_add(0.5, _lu_warmup_timer_cb, ad);
                        }
-
                } else if (!strncmp(bval, "VOLUME_DOWN", strlen("LONG_PRESS"))) {
                        downstat = utilx_get_key_status(disp, KEY_VOLUMEDOWN);
                        if (downstat == UTILX_KEY_STATUS_PRESSED ) {
                                _D("volume down long press\n");
-                               _D_del_timer(ad->ptimer)
-                                       ecore_timer_add(0.5, _ld_warmup_timer_cb, ad);
+                               DEL_TIMER(ad->ptimer)
+                               ecore_timer_add(0.5, _ld_warmup_timer_cb, ad);
                        }
-
                } else {
-                       _D_add_timer(ad->ptimer, 3.0, _popup_timer_cb, ad)
-
+                       ADD_TIMER(ad->ptimer, 3.0, popup_timer_cb, ad)
                }
-
        } else {
-               _D_add_timer(ad->ptimer, 3.0, _popup_timer_cb, ad)
+               ADD_TIMER(ad->ptimer, 3.0, popup_timer_cb, ad)
+       }
+       return 0;
+}
+
+static void _button_cb(void *data, Evas_Object *obj, void *event_info)
+{
+       _D("%s\n", __func__);
+       struct appdata *ad = (struct appdata *)data;
+       retm_if(ad == NULL, "Invalid argument: appdata is NULL\n");
+
+       DEL_TIMER(ad->ptimer)
+       _open_ug(ad);
+}
 
+Eina_Bool _unset_layout(void *data)
+{
+       struct appdata *ad = (struct appdata *)data;
+       retvm_if(ad == NULL, EINA_FALSE,"Invalid argument: appdata is NULL\n");
+
+       DEL_TIMER(ad->warntimer);
+       if(elm_object_content_get(ad->pu)==ad->warn_ly){
+               elm_object_content_unset(ad->pu);
+               elm_object_content_set(ad->pu, ad->sl);
+               evas_object_hide(ad->warn_ly);
        }
+       return ECORE_CALLBACK_CANCEL;
+}
+
+int _lang_changed(void *data){
+       _D("%s\n", __func__);
+       struct appdata *ad = (struct appdata *)data;
+       char buf[STRBUF_SIZE] = {0, };
+
+       retvm_if(ad == NULL, -1, "Invalid argument: appdata is NULL\n");
+       retvm_if(ad->win == NULL, -1, "Invalid argument: window is NULL\n");
+
+       elm_object_text_set(ad->bt, S_("IDS_COM_BODY_SETTINGS"));
+       snprintf(buf, sizeof(buf), "<font_size=32><b>%s</b></font_size>", 
+                       T_("IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"));
+       elm_object_text_set(ad->warn_lb, buf);
        return 0;
 }
 
@@ -642,68 +559,86 @@ int _app_reset(bundle *b, void *data)
 {
        int ret, status;
        int lock, type, val;
-       double scale;
-       Evas_Object *win, *pu, *ly, *ic, *sl;
-       char buf[256] = {0, };
+       Evas_Object *win, *pu, *ic, *sl, *bt;
+       Evas_Object *label, *warn_ly;
+       char buf[STRBUF_SIZE] = {0, };
        struct appdata *ad = (struct appdata *)data;
-
        retvm_if(ad == NULL, -1, "Invalid argument: appdata is NULL\n");
 
        ad->flag_touching = EINA_FALSE;
 
-       scale = elm_config_scale_get();
-       _D("scale(%lf)\n", scale);
+       _init_mm_sound(ad);
        status = _check_status(&lock, &type);
-       mm_sound_volume_get_value(type, &val);
+       mm_sound_volume_get_value(type, (unsigned int*)(&val));
        ad->type = type;
 
        if (status == 0) {
-               ad->step = _get_step(type);
-               _set_level(type);
-
-               if (win) {
+               if(ad->win){
+                       _grab_key(ad);
+                       _handle_bundle(b, ad);
+                       _unset_layout(data);
+                       evas_object_show(ad->pu);
+                       evas_object_show(ad->win);
+                       _mm_func(data);
                        return 0;
                }
+               ad->step = _get_step(type);
+
+               _set_level(type);
 
                win = _add_window(PACKAGE);
                elm_win_alpha_set(win, EINA_TRUE);
                retvm_if(win == NULL, -1, "Failed add window\n");
                ad->win = win;
-
                _grab_key(ad);
 
-               pu = _add_popup(win);
+               pu = _add_popup(win, "volumebarstyle");
                retvm_if(pu == NULL, -1, "Failed to add popup\n");
                evas_object_smart_callback_add(pu, "block,clicked", _block_clicked_cb, ad);
                _get_title(type, buf, sizeof(buf));
                elm_object_part_text_set(pu, "title,text", buf);
-               evas_object_color_set(pu, 0, 0, 0, 0);
                ad->pu = pu;
 
-               ly = _add_layout(pu, EDJ_FILE, "volume");
-               elm_object_content_set(pu, ly);
-               ad->ly = ly;
-
-               sl = elm_slider_add(pu);
-               elm_slider_indicator_show_set(sl, EINA_TRUE);
-               elm_slider_indicator_format_set(sl, "%.0f");
-               evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, 0.0);
-               evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
-               elm_slider_min_max_set(sl, 0, ad->step);
-               elm_object_part_content_set(ly, "swallow/slider", sl);
+               /* Make a Slider bar */
+               sl = _add_slider(ad->pu, 0, ad->step, val);
                evas_object_smart_callback_add(sl, "slider,drag,start", _slider_start_cb, ad);
                evas_object_smart_callback_add(sl, "changed", _slider_changed_cb, ad);
                evas_object_smart_callback_add(sl, "slider,drag,stop", _slider_stop_cb, ad);
-               elm_slider_min_max_set(sl, 0, ad->step);
-               elm_slider_value_set(sl, val);
                ad->sl = sl;
 
-               ret = syspopup_create(b, &handler, win, ad);
+               ic = elm_icon_add(ad->pu);
+               evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
+               elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE);
+               elm_object_part_content_set(ad->sl, "icon", ic);
+               ad->ic = ic;
+               _set_icon(ad, val);
+
+               elm_object_content_set(ad->pu, ad->sl);
+
+               /* Make a Layout for volume slider with warning text. */
+               snprintf(buf, sizeof(buf), "<font_size=32><b>%s</b></font_size>", 
+                       T_("IDS_COM_BODY_HIGH_VOLUMES_MAY_HARM_YOUR_HEARING_IF_YOU_LISTEN_FOR_A_LONG_TIME"));
+               label = _add_label(ad->pu, "popup/default", buf);
+               ad->warn_lb = label;
+               evas_object_hide(ad->warn_lb);
+
+               warn_ly = _add_layout(ad->pu, EDJ_THEME, GRP_VOLUME_SLIDER_WITH_WARNING);
+               elm_object_part_content_set(warn_ly, "elm.swallow.warn_label", ad->warn_lb);
+               ad->warn_ly = warn_ly;
+               evas_object_hide(ad->warn_ly);
+
+               /* Make a setting button */
+               bt = _add_button(ad->pu, "popup_button/default", S_("IDS_COM_BODY_SETTINGS"));
+               evas_object_smart_callback_add(bt, "clicked", _button_cb, ad);
+               elm_object_part_content_set(ad->pu, "button1", bt);
+               ad->bt = bt;
+
+               ret = syspopup_create(b, &handler, ad->win, ad);
                retvm_if(ret < 0, -1, "Failed to create syspopup\n");
 
                _handle_bundle(b, ad);
 
-               evas_object_show(win);
+               evas_object_show(ad->win);
        }
 
        return 0;
@@ -711,9 +646,12 @@ int _app_reset(bundle *b, void *data)
 
 int _app_pause(struct appdata *ad)
 {
-       _D("func\n");
-       _close_volume(ad);
+       _D("%s\n", __func__);
+       ug_destroy_all();
+       if(ad->ug){
+               ad->ug = NULL;
+               _close_volume(ad);
+               utilx_set_window_opaque_state(ecore_x_display_get(), elm_win_xwindow_get(ad->win), UTILX_OPAQUE_STATE_OFF);
+       }
        return 0;
 }
-
-
old mode 100644 (file)
new mode 100755 (executable)
index 0aee1c3..ca5732e
@@ -1,26 +1,33 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the License);
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.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.
-  */
+/*
+ * Copyright 2012  Samsung Electronics Co., Ltd
+ * 
+ * Licensed under the Flora License, Version 1.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.tizenopensource.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.
+ */
+
 
 #ifndef __VOLUME_LOGIC_H__
 #define __VOLUME_LOGIC_H__
 
 #include "volume.h"
+#include <bundle.h>
+
+int _close_volume(void *data);
 int _app_create(struct appdata *ad);
 int _app_pause(struct appdata *ad);
-int _rotate_knob(Evas_Object *kn, Evas_Coord cx, Evas_Coord cy, double angle);
+int _app_reset(bundle *b, void *data);
+Eina_Bool popup_timer_cb(void *data);
+Eina_Bool _unset_layout(void *data);
+int _lang_changed(void *data);
 
 #endif
 /* __VOLUME_LOGIC_H__ */
old mode 100644 (file)
new mode 100755 (executable)
index a3cf47d..323fa32
@@ -1,18 +1,19 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the License);
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.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.
-  */
+/*
+ * Copyright 2012  Samsung Electronics Co., Ltd
+ * 
+ * Licensed under the Flora License, Version 1.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.tizenopensource.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.
+ */
+
 
 #include <appcore-common.h>
 #include <mm_sound.h>
@@ -23,6 +24,8 @@
 #include "_util_log.h"
 #include "_logic.h"
 
+#define STRBUF_SIZE 64
+#define PATHBUF_SIZE 256
 
 void _play_vib(int handle)
 {
@@ -57,7 +60,6 @@ int _init_svi(void *data)
 
 int _set_slider_value(void *data, int val)
 {
-       double angle;
        struct appdata *ad = (struct appdata *)data;
        retvm_if(ad == NULL, -1, "Invalid argument: appdata is NULL\n");
 
@@ -74,8 +76,9 @@ int _set_slider_value(void *data, int val)
 
 int _set_icon(void *data, int val)
 {
-       int snd, vib;
-       double angle;
+       int snd=0, vib=0;
+       char buf[PATHBUF_SIZE] = {0, };
+       char *img;
        struct appdata *ad = (struct appdata *)data;
        retvm_if(ad == NULL, -1, "Invalid argument: appdata is NULL\n");
 
@@ -85,60 +88,90 @@ int _set_icon(void *data, int val)
        if (val == 0) {
                if (vib) {
                        if (ad->type == VOLUME_TYPE_MEDIA) {
-                               edje_object_signal_emit(elm_layout_edje_get(ad->ly), "mute", "icon");
+                               _D("media and mute\n");
+                               img = "00_volume_icon_Mute.png";
                        } else {
-                               edje_object_signal_emit(elm_layout_edje_get(ad->ly), "vib", "icon");
+                               _D("Not media and vib\n");
+                               img = "00_volume_icon_Vibrat.png";
                                _play_vib(ad->sh);
                        }
-
                } else {
-                       edje_object_signal_emit(elm_layout_edje_get(ad->ly), "mute", "icon");
-
+                       _D("vib\n");
+                       img = "00_volume_icon_Mute.png";
                }
-
        } else {
-               edje_object_signal_emit(elm_layout_edje_get(ad->ly), "default", "icon");
+               _D("default volume\n");
+               img = "00_volume_icon.png";
+       }
 
+       if(!snd){
+               if(ad->type != VOLUME_TYPE_MEDIA){
+                       _D("Not media and mute\n");
+                       img = "00_volume_icon_Mute.png";
+               }
        }
 
+
+       snprintf(buf, sizeof(buf), "%s/%s", IMAGEDIR, img);
+       if (ad->ic ) {
+               elm_icon_file_set(ad->ic, buf, NULL);
+       }
+       return 1;
 }
 
-void _set_popup_title(void *data, int type)
+void _set_device_warning(void *data, int val, int device)
 {
-       char buf[64] = {0, };
-       char name[64] = {0, };
        struct appdata *ad = (struct appdata *)data;
        retm_if(ad == NULL, "Invalid argument: appdata is NULL\n");
 
-       _get_title(type, buf, sizeof(buf));
-       elm_object_part_text_set(ad->pu, "title,text", buf);
-
+       switch (device) {
+               case SYSTEM_AUDIO_ROUTE_PLAYBACK_DEVICE_EARPHONE:
+                       if (val >= 13) {
+                               if(ad->flag_warning) return;
+                               ad->flag_warning = true;
+                               elm_object_content_unset(ad->pu);
+                               elm_object_part_content_set(ad->warn_ly, "elm.swallow.slider1", ad->sl);
+                               elm_object_content_set(ad->pu, ad->warn_ly);
+                               evas_object_show(ad->warn_ly);
+                               DEL_TIMER(ad->warntimer);
+                               ADD_TIMER(ad->warntimer, 3.0, _unset_layout, data);
+                       }
+                       else {
+                               ad->flag_warning = false;
+                               _unset_layout(data);
+                       }
+                       break;
+               default:
+                       ad->flag_warning = false;
+                       _unset_layout(data);
+                       break;
+       }
 }
 
 int _get_title(volume_type_t type, char *label, int size)
 {
        char *text = NULL;
 
-       text = D_("IDS_COM_BODY_UNKNOWN");
+       text = S_("IDS_COM_BODY_UNKNOWN");
 
        switch (type) {
        case VOLUME_TYPE_SYSTEM:
-               text = D_("IDS_COM_BODY_SYSTEM");
+               text = S_("IDS_COM_BODY_SYSTEM");
                break;
        case VOLUME_TYPE_NOTIFICATION:
-               text = D_("IDS_COM_HEADER_NOTIFICATION");
+               text = S_("IDS_COM_HEADER_NOTIFICATION");
                break;
        case VOLUME_TYPE_ALARM:
-               text = D_("IDS_COM_BODY_ALARM");
+               text = S_("IDS_COM_BODY_ALARM");
                break;
        case VOLUME_TYPE_RINGTONE:
-               text = D_("IDS_COM_BODY_RINGTONE");
+               text = S_("IDS_COM_BODY_RINGTONE");
                break;
        case VOLUME_TYPE_MEDIA:
                text = T_("IDS_COM_BODY_MEDIA");
                break;
        case VOLUME_TYPE_CALL:
-               text = D_("IDS_COM_BODY_CALL");
+               text = S_("IDS_COM_BODY_CALL");
                break;
        case VOLUME_TYPE_EXT_ANDROID:
                /* this enum is different from mm_sound.h and avsys-audio.h */
@@ -148,7 +181,7 @@ int _get_title(volume_type_t type, char *label, int size)
                text = T_("IDS_COM_BODY_JAVA");
                break;
        default:
-               text = D_("IDS_COM_BODY_SYSTEM");
+               text = S_("IDS_COM_BODY_SYSTEM");
                break;
        }
        snprintf(label, size, "%s", text);
@@ -157,34 +190,55 @@ int _get_title(volume_type_t type, char *label, int size)
        return 0;
 }
 
+void _set_popup_title(void *data, int type, int device)
+{
+       char buf[STRBUF_SIZE] = {0, };
+       char name[STRBUF_SIZE] = {0, };
+       struct appdata *ad = (struct appdata *)data;
+       retm_if(ad == NULL, "Invalid argument: appdata is NULL\n");
 
+       _get_title(type, buf, sizeof(buf));
 
-double _get_angle_with_value(int val, int step)
-{
-_D("func\n");
-       double angle;
+       switch (device) {
+               case SYSTEM_AUDIO_ROUTE_PLAYBACK_DEVICE_EARPHONE:
+                       snprintf(name, sizeof(name), "%s (%s)", buf, T_("IDS_COM_OPT_HEADPHONES_ABB"));
+                       elm_object_part_text_set(ad->pu, "title,text", name);
+                       break;
+               default:
+                       elm_object_part_text_set(ad->pu, "title,text", buf);
+                       break;
+       }
+}
 
-       angle = 360.0 * (val + 1) / step;
-       return angle;
+int _get_step(int type)
+{
+       int ret, step;
+       ret = mm_sound_volume_get_step(type, &step);
+       retvm_if(ret < 0, -1, "Failed to get step\n");
+       step -= 1;
+       return step;
 }
 
 void _mm_func(void *data)
 {
-       int type, val;
+       _D("%s\n", __func__);
+       int val;
+       system_audio_route_device_t device = 0;
        struct appdata *ad = (struct appdata *)data;
        retm_if(ad == NULL, "Invalid argument: appdata is NULL\n");
 
-       /* function could be activated when window exists */
-       if (ad->win) {
-               ad->step = _get_step(ad->type);
-               mm_sound_volume_get_value(ad->type, &val);
+       retm_if(ad->win == NULL, "Failed to get window\n");
 
-               _set_slider_value(ad, val);
-               _set_popup_title(ad, ad->type);
-               _set_icon(ad, val);
-               _D("type(%d) val(%d)\n", ad->type, val);
-
-       }
+       /* function could be activated when window exists */
+       ad->step = _get_step(ad->type);
+       mm_sound_volume_get_value(ad->type, (unsigned int*)(&val));
+       mm_sound_route_get_playing_device(&device);
+
+       _set_slider_value(ad, val);
+       _set_popup_title(ad, ad->type, device);
+       _set_device_warning(ad, val, device);
+       _set_icon(ad, val);
+       _D("type(%d) val(%d)\n", ad->type, val);
 }
 
 void _mm_system_cb(void *data)
@@ -234,7 +288,6 @@ int _get_volume_type_max(void)
 
 int _init_mm_sound(void *data)
 {
-       int i;
        struct appdata *ad = (struct appdata *)data;
        retvm_if(ad == NULL, -1, "Invalid argument: appdata is NULL\n");
 
@@ -260,7 +313,7 @@ int _init_mm_sound(void *data)
 
 int _get_sound_level(volume_type_t type, int *val)
 {
-       mm_sound_volume_get_value(type, val);
+       mm_sound_volume_get_value(type, (unsigned int*)val);
        return 0;
 }
 
@@ -269,15 +322,3 @@ int _set_sound_level(volume_type_t type, int val)
        mm_sound_volume_set_value(type, val);
        return 0;
 }
-
-int _get_step(int type)
-{
-       int ret, step;
-
-       ret = mm_sound_volume_get_step(type, &step);
-       retvm_if(ret < 0, -1, "Failed to get step\n");
-       step -= 1;
-       return step;
-}
-
-
old mode 100644 (file)
new mode 100755 (executable)
index af3b28d..2acde4e
@@ -1,18 +1,19 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the License);
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.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.
-  */
+/*
+ * Copyright 2012  Samsung Electronics Co., Ltd
+ * 
+ * Licensed under the Flora License, Version 1.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.tizenopensource.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.
+ */
+
 
 #ifndef __VOLUME_SOUND_H__
 #define __VOLUME_SOUND_H__
@@ -24,10 +25,12 @@ int _init_mm_sound(void *data);
 int _get_volume_type_max(void);
 int _get_title(volume_type_t type, char *label, int size);
 int _get_sound_level(volume_type_t type, int *val);
-double _get_angle_with_value(int val, int step);
 int _get_step(int type);
 void _play_vib(int handle);
 void _play_sound(int type, int handle);
+void _mm_func(void *data);
+int _set_icon(void * data, int val);
+int _set_sound_level(volume_type_t type, int val);
 
 #endif
 /* __VOLUME_SOUND_H__ */
old mode 100644 (file)
new mode 100755 (executable)
index e931d9a..5f49083
@@ -1,18 +1,22 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the License);
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.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.
-  */
+/*
+ * Copyright 2012  Samsung Electronics Co., Ltd
+ * 
+ * Licensed under the Flora License, Version 1.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.tizenopensource.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.
+ */
+
+
+#include <Ecore.h>
+#include <Ecore_X.h>
 
 #include "volume.h"
 #include "_util_log.h"
@@ -21,7 +25,6 @@ Evas_Object *_add_window(const char *name)
 {
        Evas_Object *eo;
        int w, h;
-
        eo = elm_win_add(NULL, name, ELM_WIN_NOTIFICATION);
        if (eo) {
                elm_win_title_set(eo, name);
@@ -32,62 +35,24 @@ Evas_Object *_add_window(const char *name)
                                &w, &h);
                evas_object_resize(eo, w, h);
        }
-
        return eo;
 }
 
-Evas_Object *_add_naviframe(Evas_Object *parent)
+Evas_Object *_add_slider(Evas_Object *parent, int min, int max, int val)
 {
-       Evas_Object *nv;
-
-       nv = elm_naviframe_add(parent);
-       if (nv == NULL) {
-               fprintf(stderr, "[Error] Failed to add naviframe\n");
-               return NULL;
-       }
-
-       elm_object_part_content_set(parent, "elm.swallow.content", nv);
-       evas_object_size_hint_weight_set(nv, EVAS_HINT_EXPAND,
-                                        EVAS_HINT_EXPAND);
-       evas_object_show(nv);
-       return nv;
+       Evas_Object *sl;
+       sl = elm_slider_add(parent);
+       retvm_if(sl == NULL, NULL, "Failed to add slider\n");
+       elm_slider_horizontal_set(sl, EINA_TRUE);
+       elm_slider_indicator_show_set(sl, EINA_TRUE);
+       elm_slider_indicator_format_set(sl, "%.0f");
+       evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, 0.0);
+       evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
+       elm_slider_min_max_set(sl, min, max);
+       elm_slider_value_set(sl, val);
+       return sl;
 }
 
-Evas_Object *_add_bg(Evas_Object *parent, char *style)
-{
-       Evas_Object *bg;
-
-       bg = elm_bg_add(parent);
-       retvm_if(bg == NULL, NULL, "Failed to add bg\n");
-       if (style)      elm_object_style_set(bg, style);
-       evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND,
-                                        EVAS_HINT_EXPAND);
-       evas_object_show(bg);
-       return bg;
-}
-
-Evas_Object *_add_layout_main(Evas_Object *parent,
-               Eina_Bool content, Eina_Bool transparent)
-{
-       Evas_Object *ly;
-
-       ly = elm_layout_add(parent);
-       retvm_if(ly == NULL, NULL, "Failed to add main layout\n");
-
-       elm_layout_theme_set(ly, "layout", "application", "default");
-       evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND,
-                                        EVAS_HINT_EXPAND);
-       elm_win_resize_object_add(parent, ly);
-       if (content)
-               elm_object_signal_emit(ly, "elm,state,show,content", "elm");
-       if (transparent)
-               elm_object_signal_emit(ly, "elm,bg,show,transparent", "elm");
-       evas_object_show(ly);
-
-       return ly;
-}
-
-
 Evas_Object *_add_layout(Evas_Object *parent, const char *file,
                             const char *group)
 {
@@ -114,109 +79,38 @@ Evas_Object *_add_layout(Evas_Object *parent, const char *file,
        return eo;
 }
 
-Evas_Object *_add_controlbar(Evas_Object *parent, const char *style)
-{
-       Evas_Object *cb;
-
-       cb = elm_toolbar_add(parent);
-       retvm_if(cb == NULL, NULL, "Failed to add toolbar\n");
-       elm_toolbar_shrink_mode_set(cb, ELM_TOOLBAR_SHRINK_EXPAND);
-       elm_toolbar_select_mode_set(cb, ELM_OBJECT_SELECT_MODE_ALWAYS);
-       elm_toolbar_homogeneous_set(cb, EINA_TRUE);
-       if (style) elm_object_style_set(cb, style);
-       evas_object_show(cb);
-
-       return cb;
-}
-
-Evas_Object *_add_scroller(Evas_Object *parent,
-               Eina_Bool h_bounce, Eina_Bool v_bounce)
-{
-       Evas_Object *sc;
-
-       sc = elm_scroller_add(parent);
-       evas_object_size_hint_weight_set(sc, EVAS_HINT_EXPAND,
-                                        EVAS_HINT_EXPAND);
-       evas_object_size_hint_align_set(sc, EVAS_HINT_FILL, EVAS_HINT_FILL);
-       elm_scroller_bounce_set(sc, h_bounce, v_bounce);
-       elm_scroller_policy_set(sc,
-                               h_bounce ? ELM_SCROLLER_POLICY_AUTO :
-                               ELM_SCROLLER_POLICY_OFF,
-                               v_bounce ? ELM_SCROLLER_POLICY_AUTO :
-                               ELM_SCROLLER_POLICY_OFF);
-       evas_object_show(sc);
-       return sc;
-}
-
-Evas_Object *_add_genlist(Evas_Object *parent)
-{
-       Evas_Object *eo;
-
-       eo = elm_genlist_add(parent);
-       elm_genlist_homogeneous_set(eo, EINA_TRUE);
-       if (eo == NULL) {
-               printf("[Error] Cannot add genlist\n");
-               return NULL;
-       }
-
-       evas_object_size_hint_weight_set(eo, EVAS_HINT_EXPAND,
-                                        EVAS_HINT_EXPAND);
-       evas_object_size_hint_align_set(eo, EVAS_HINT_FILL, EVAS_HINT_FILL);
-
-       return eo;
-}
-
-
-Evas_Object *_add_button(Evas_Object *parent, const char *style)
+Evas_Object *_add_button(Evas_Object *parent, const char *style, const char *text)
 {
        Evas_Object *bt;
        bt = elm_button_add(parent);
        retvm_if(bt == NULL, NULL, "Failed to add button\n");
-       elm_object_style_set(bt, style);
+       if (style) elm_object_style_set(bt, style);
        elm_object_focus_set(bt, EINA_FALSE);
+       elm_object_text_set(bt, text);
        evas_object_show(bt);
        return bt;
 }
 
-Evas_Object *_add_popup(Evas_Object *parent)
+Evas_Object *_add_popup(Evas_Object *parent, const char *style)
 {
        Evas_Object *pu;
-
        pu = elm_popup_add(parent);
-       if (pu == NULL) {
-               fprintf(stderr, "[Error] Failed to add popup\n");
-               return NULL;
-       }
-       evas_object_size_hint_weight_set(pu,
-                       EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       retvm_if(pu == NULL, NULL, "[Error] Failed to add popup\n");
+       evas_object_size_hint_weight_set(pu, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       if (style) elm_object_style_set(pu, style);
        evas_object_show(pu);
-
        return pu;
 }
-
-Evas_Object *_add_progressbar(Evas_Object *parent, const char *style)
-{
-       Evas_Object *pb;
-
-       pb = elm_progressbar_add(parent);
-       if(style)       elm_object_style_set(pb, style);
-       evas_object_size_hint_weight_set(pb,
-                       EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_show(pb);
-
-       return pb;
-}
-
-Evas_Object *_add_label(Evas_Object *parent, char *text)
+Evas_Object *_add_label(Evas_Object *parent, const char *style, const char *text)
 {
        Evas_Object *lb;
-
        lb = elm_label_add(parent);
        retvm_if(lb == NULL, NULL, "Failed to add label\n");
+       elm_object_style_set(lb, style);
+       evas_object_size_hint_weight_set(lb, EVAS_HINT_EXPAND, 0.0);
+       evas_object_size_hint_align_set(lb, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       elm_label_line_wrap_set(lb, ELM_WRAP_MIXED);
        elm_object_text_set(lb, text);
-       evas_object_size_hint_weight_set(lb,
-               EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_show(lb);
        return lb;
 }
 
old mode 100644 (file)
new mode 100755 (executable)
index 2736c64..0275a0d
@@ -1,18 +1,19 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the License);
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.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.
-  */
+/*
+ * Copyright 2012  Samsung Electronics Co., Ltd
+ * 
+ * Licensed under the Flora License, Version 1.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.tizenopensource.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.
+ */
+
 
 #ifndef __VOLUME_UTIL_EFL_H__
 #define __VOLUME_UTIL_EFL_H__
 #include <Elementary.h>
 
 Evas_Object *_add_window(const char *name);
-Evas_Object *_add_naviframe(Evas_Object *parent);
-Evas_Object *_add_bg(Evas_Object *parent, char *style);
-Evas_Object *_add_layout_main(Evas_Object *parent,
-               Eina_Bool content, Eina_Bool transparent);
-Evas_Object *_add_layout(Evas_Object *parent,
-               const char *file, const char *group);
-Evas_Object *_add_controlbar(Evas_Object *parent, const char *style);
-Evas_Object *_add_scroller(Evas_Object *parent,
-               Eina_Bool h_bounce, Eina_Bool v_bounce);
-Evas_Object *_add_genlist(Evas_Object *parent);
-Evas_Object *_add_button(Evas_Object *parent, const char *style);
-Evas_Object *_add_popup(Evas_Object *parent);
-Evas_Object *_add_progressbar(Evas_Object *parent, const char *style);
-Evas_Object *_add_label(Evas_Object *parent, char *text);
+Evas_Object *_add_slider(Evas_Object *parent, int min, int max, int val);
+Evas_Object *_add_layout(Evas_Object *parent, const char *file, const char *group);
+Evas_Object *_add_button(Evas_Object *parent, const char *style, const char *text);
+Evas_Object *_add_popup(Evas_Object *parent, const char *style);
+Evas_Object *_add_label(Evas_Object *parent, const char *style, const char *text);
 #endif
 /* __VOLUME_UTIL_EFL_H__ */
-
old mode 100644 (file)
new mode 100755 (executable)
index 121a3b8..3c9cacf
@@ -1,18 +1,19 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the License);
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.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.
-  */
+/*
+ * Copyright 2012  Samsung Electronics Co., Ltd
+ * 
+ * Licensed under the Flora License, Version 1.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.tizenopensource.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.
+ */
+
 
 #ifndef __VOLUME_UTIL_LOG_H__
 #define __VOLUME_UTIL_LOG_H__
@@ -55,5 +56,4 @@
        } \
 } while (0)
 
-
 #endif                         /* __VOLUME_UTIL_LOG_H__ */
diff --git a/src/format b/src/format
new file mode 100755 (executable)
index 0000000..6fa025a
--- /dev/null
@@ -0,0 +1,18 @@
+
+/*
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved 
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    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.
+ */
+
+
old mode 100644 (file)
new mode 100755 (executable)
index 44baa6a..5cf6787
@@ -1,22 +1,21 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the License);
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.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.
-  */
+/*
+ * Copyright 2012  Samsung Electronics Co., Ltd
+ * 
+ * Licensed under the Flora License, Version 1.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.tizenopensource.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.
+ */
+
 
 #include <stdio.h>
-#include <appcore-efl.h>
-#include <Ecore_X.h>
 
 #include "volume.h"
 #include "_util_log.h"
@@ -28,40 +27,9 @@ struct text_part {
        char *msgid;
 };
 
-static struct text_part main_txt[] = {
-       { "txt_title", N_("Application template"), },
-       { "txt_mesg", N_("Click to exit"), },
-};
-
-
-static void win_del(void *data, Evas_Object *obj, void *event)
-{
-       elm_exit();
-}
-
-static void main_quit_cb(void *data, Evas_Object *obj,
-               const char *emission, const char *source)
-{
-       elm_exit();
-}
-
-static void update_ts(Evas_Object *eo, struct text_part *tp, int size)
-{
-       int i;
-
-       if (eo == NULL || tp == NULL || size < 0)
-               return;
-
-       for (i = 0; i < size; i++) {
-               if (tp[i].part && tp[i].msgid)
-                       edje_object_part_text_set(eo,
-                                       tp[i].part, _(tp[i].msgid));
-       }
-}
-
 static int lang_changed(void *data)
 {
-       return 0;
+       return _lang_changed(data);
 }
 
 static int app_create(void *data)
@@ -98,15 +66,12 @@ static int app_terminate(void *data)
 
 static int app_pause(void *data)
 {
-       struct appdata *ad = data;
        _app_pause(data);
        return 0;
 }
 
 static int app_resume(void *data)
 {
-       struct appdata *ad = data;
-
        return 0;
 }
 
@@ -121,7 +86,7 @@ static int app_reset(bundle *b, void *data)
 
        if (syspopup_has_popup(b)) {
                _D("has popup\n");
-
+               _app_reset(b, data);
        } else {
                _D("has not popup\n");
                _app_reset(b, data);
old mode 100644 (file)
new mode 100755 (executable)
index 442f45a..dbdb578
@@ -1,24 +1,29 @@
- /*
-  * Copyright 2012  Samsung Electronics Co., Ltd
-  *
-  * Licensed under the Flora License, Version 1.0 (the License);
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *     http://www.tizenopensource.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.
-  */
+/*
+ * Copyright 2012  Samsung Electronics Co., Ltd
+ * 
+ * Licensed under the Flora License, Version 1.0 (the License);
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.tizenopensource.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.
+ */
+
 
 #ifndef __VOLUME_H__
 #define __VOLUME_H__
 
 #include <Elementary.h>
 #include <mm_sound.h>
+#include <ui-gadget.h>
+#include <syspopup.h>
+#include <appcore-efl.h>
+#include <Ecore_X.h>
 
 #if !defined(PACKAGE)
 #  define PACKAGE "volume"
 
 #define EDJ_FILE EDJDIR"/"PACKAGE".edj"
 #define GRP_MAIN "main"
+#define EDJ_THEME EDJDIR"/volume_popup.edj"
+#define GRP_VOLUME_SLIDER "popup_slider_style"
+#define GRP_VOLUME_SLIDER_WITH_WARNING "popup_slider_text_style_with_warn_label"
 
-#define D_(str) dgettext("sys_string", str)
+#define S_(str) dgettext("sys_string", str)
 #define T_(str) dgettext(PACKAGE, str)
 
+#define ADD_TIMER(x, time, _timer_cb, data) \
+       x = ecore_timer_add(time, _timer_cb, data);\
+
+#define DEL_TIMER(x) \
+       if (x) {\
+               ecore_timer_del(x);\
+               x = NULL;\
+       }
+
 struct appdata
 {
-       Evas_Object *win, *pu, *ly, *sl;
+       Evas_Object *win, *pu, *bt, *sl, *ic, *warn_lb, *warn_ly;
 
        Ecore_Timer *ptimer;
        Ecore_Timer *stimer;    /* slider timer */
        Ecore_Timer *sutimer, *sdtimer, *lutimer, *ldtimer;     /* long press */
+       Ecore_Timer *warntimer; /* warning message timer */
        volume_type_t type;
        int step;
        int before_mute[32];
 
+       /* ug handler */
+       ui_gadget_h ug;
+
        /* add more variables here */
        int sh; /* svi handle */
        int flag_pressing;      /* to set hard key press */
        int flag_touching;
        int flag_launching;     /* to block double launching by double click */
        int flag_deleting;
-       int flag_titleopen;
+       int flag_warning;       /* set device warning flag */
 };
 
 #endif /* __VOLUME_H__ */