From 8016fdfffc0b33e8957d0f052793b0e59e50ba89 Mon Sep 17 00:00:00 2001 From: "jk7744.park" Date: Sun, 1 Feb 2015 13:04:19 +0900 Subject: [PATCH] tizen 2.3 release --- CMakeLists.txt | 65 +- LICENSE | 206 +++ LICENSE.Flora | 206 --- NOTICE | 4 +- com.samsung.my-account_ChangeableColorInfo.xml | 15 + com.samsung.my-account_ChangeableFontInfo.xml | 4 + data/edc/CMakeLists.txt | 14 +- data/edc/inc.Addaccount.edc | 61 - data/edc/inc.add-sns-account.edc | 49 - data/edc/inc.myaccount_contact_sync.edc | 208 --- data/edc/inc.myaccount_email_datarange.edc | 32 - data/edc/inc.myaccount_peak_time.edc | 721 -------- data/edc/inc.myaccount_sns_sync_interval.edc | 31 - .../edc/inc.myaccount_sync_settings_with_seven.edc | 549 ------- data/edc/inc.myaccount_view_priority.edc | 32 - data/edc/inc.myaccount_without_seven.edc | 510 ------ data/edc/inc.pre-set.edc | 455 ----- data/edc/inc.preset_email.edc | 105 -- data/edc/inc.sns-account.edc | 117 -- data/edc/myaccount.edc | 5 + data/edc/myaccount_button.edc | 779 --------- data/edc/myaccount_edc_images.edc | 25 +- data/edc/myaccount_nocontent.edc | 20 + data/myaccount_photo/00_list_bar_press_1x80.png | Bin 371 -> 0 bytes data/myaccount_photo/01_samsungaccount.png | Bin 8095 -> 0 bytes .../66_myaccount_icon_facebook_50x50.png | Bin 16550 -> 0 bytes .../66_myaccount_icon_google_50x50.png | Bin 7631 -> 0 bytes .../66_myaccount_icon_msn_50x50.png | Bin 6726 -> 0 bytes data/myaccount_photo/66_myaccount_icon_push.png | Bin 5423 -> 0 bytes .../66_myaccount_icon_push_deactivated.png | Bin 3890 -> 0 bytes .../66_myaccount_icon_push_press.png | Bin 3907 -> 0 bytes .../66_myaccount_icon_twitter_50x50.png | Bin 3063 -> 0 bytes .../66_myaccount_icon_windows_live_50x50.png | Bin 9239 -> 0 bytes .../66_myaccount_icon_yahoo_50x50.png | Bin 6727 -> 0 bytes data/myaccount_photo/99_email.png | Bin 7539 -> 0 bytes data/myaccount_photo/A01_2_Icon_default.png | Bin 14937 -> 13422 bytes data/myaccount_photo/A01_2_Icon_others.png | Bin 12723 -> 0 bytes data/myaccount_photo/account_icon_syncing.png | Bin 0 -> 1414 bytes data/myaccount_photo/cancel_sync.png | Bin 8047 -> 0 bytes data/myaccount_photo/exchange.png | Bin 5883 -> 0 bytes data/myaccount_photo/facebook.png | Bin 1762 -> 0 bytes data/myaccount_photo/flickr.png | Bin 4972 -> 0 bytes data/myaccount_photo/gmail.png | Bin 4392 -> 0 bytes data/myaccount_photo/icq.png | Bin 8253 -> 0 bytes data/myaccount_photo/myaccount_bg.png | Bin 2579 -> 0 bytes data/myaccount_photo/myspace.png | Bin 2470 -> 0 bytes data/myaccount_photo/picasa.png | Bin 1752 -> 0 bytes data/myaccount_photo/refresh.png | Bin 5949 -> 0 bytes data/myaccount_photo/tw3_list_select.png | Bin 6082 -> 0 bytes data/myaccount_photo/twitter.png | Bin 3530 -> 0 bytes data/myaccount_photo/youtube.png | Bin 7531 -> 0 bytes icon_myaccount.png | Bin 5532 -> 0 bytes include/myaccount_ug.h | 315 ++-- include/myaccount_ug_account_list.h | 101 +- include/myaccount_ug_addaccount.h | 97 +- include/myaccount_ug_common.h | 246 +-- include/myaccount_ug_main.h | 51 +- packaging/my-account.spec | 32 +- po/CMakeLists.txt | 56 +- po/GT-I7800_Accounts_Strings.csv | 6 - po/POTFILES.in | 5 - po/ar.po | 159 +- po/az.po | 159 +- po/bg.po | 161 +- po/ca.po | 161 +- po/cs.po | 161 +- po/csv2po_v2 | Bin 7585 -> 0 bytes po/csv_to_po.py | 177 -- po/da.po | 161 +- po/de.po | 81 + po/de_DE.po | 150 -- po/el_GR.po | 161 +- po/en.po | 159 +- po/en_PH.po | 159 +- po/en_US.csv | 86 - po/en_US.po | 159 +- po/es_ES.po | 159 +- po/es_MX.po | 150 -- po/es_US.po | 81 + po/et.po | 161 +- po/eu.po | 161 +- po/fi.po | 161 +- po/fr.po | 81 + po/fr_CA.po | 161 +- po/fr_FR.po | 150 -- po/ga.po | 161 +- po/gl.po | 159 +- po/he.po | 135 -- po/hi.po | 161 +- po/hr.po | 159 +- po/hu.po | 161 +- po/hy.po | 159 +- po/id.po | 135 -- po/is.po | 161 +- po/it_IT.po | 159 +- po/ja_JP.po | 161 +- po/ka.po | 159 +- po/kk.po | 161 +- po/ko_KR.csv | 86 - po/ko_KR.po | 159 +- po/lt.po | 159 +- po/lv.po | 159 +- po/mk.po | 159 +- po/ms.po | 135 -- po/myaccount_ui.pot | 42 - po/nb.po | 161 +- po/nl.po | 81 + po/nl_NL.po | 150 -- po/no.po | 135 -- po/pl.po | 159 +- po/po_to_csv.py | 72 - po/pt_BR.po | 161 +- po/pt_PT.po | 159 +- po/ro.po | 161 +- po/ru_RU.po | 161 +- po/sk.po | 161 +- po/sl.po | 161 +- po/sr.po | 161 +- po/sv.po | 159 +- po/th.po | 135 -- po/tr_TR.po | 159 +- po/uk.po | 161 +- po/update-po.sh | 58 - po/uz.po | 161 +- po/vi.po | 135 -- po/zh_CN.po | 161 +- po/zh_HK.po | 159 +- po/zh_SG.po | 150 -- po/zh_TW.po | 161 +- setting-myaccount-efl.xml | 52 +- src/myaccount_ug_account_list.c | 847 ++++++---- src/myaccount_ug_addaccount.c | 694 ++++---- src/myaccount_ug_common.c | 1731 +++++++++++++------- src/myaccount_ug_main.c | 909 ++++++---- ug.setting-myaccount-efl.include | 12 - 135 files changed, 5888 insertions(+), 13250 deletions(-) create mode 100755 LICENSE delete mode 100755 LICENSE.Flora create mode 100644 com.samsung.my-account_ChangeableColorInfo.xml create mode 100644 com.samsung.my-account_ChangeableFontInfo.xml delete mode 100755 data/edc/inc.Addaccount.edc delete mode 100755 data/edc/inc.add-sns-account.edc delete mode 100755 data/edc/inc.myaccount_contact_sync.edc delete mode 100755 data/edc/inc.myaccount_email_datarange.edc delete mode 100755 data/edc/inc.myaccount_peak_time.edc delete mode 100755 data/edc/inc.myaccount_sns_sync_interval.edc delete mode 100755 data/edc/inc.myaccount_sync_settings_with_seven.edc delete mode 100755 data/edc/inc.myaccount_view_priority.edc delete mode 100755 data/edc/inc.myaccount_without_seven.edc delete mode 100755 data/edc/inc.pre-set.edc delete mode 100755 data/edc/inc.preset_email.edc delete mode 100755 data/edc/inc.sns-account.edc delete mode 100755 data/edc/myaccount_button.edc create mode 100755 data/edc/myaccount_nocontent.edc delete mode 100755 data/myaccount_photo/00_list_bar_press_1x80.png delete mode 100755 data/myaccount_photo/01_samsungaccount.png delete mode 100755 data/myaccount_photo/66_myaccount_icon_facebook_50x50.png delete mode 100755 data/myaccount_photo/66_myaccount_icon_google_50x50.png delete mode 100755 data/myaccount_photo/66_myaccount_icon_msn_50x50.png delete mode 100755 data/myaccount_photo/66_myaccount_icon_push.png delete mode 100755 data/myaccount_photo/66_myaccount_icon_push_deactivated.png delete mode 100755 data/myaccount_photo/66_myaccount_icon_push_press.png delete mode 100755 data/myaccount_photo/66_myaccount_icon_twitter_50x50.png delete mode 100755 data/myaccount_photo/66_myaccount_icon_windows_live_50x50.png delete mode 100755 data/myaccount_photo/66_myaccount_icon_yahoo_50x50.png delete mode 100755 data/myaccount_photo/99_email.png delete mode 100755 data/myaccount_photo/A01_2_Icon_others.png create mode 100644 data/myaccount_photo/account_icon_syncing.png delete mode 100755 data/myaccount_photo/cancel_sync.png delete mode 100755 data/myaccount_photo/exchange.png delete mode 100755 data/myaccount_photo/facebook.png delete mode 100755 data/myaccount_photo/flickr.png delete mode 100755 data/myaccount_photo/gmail.png delete mode 100755 data/myaccount_photo/icq.png delete mode 100755 data/myaccount_photo/myaccount_bg.png delete mode 100755 data/myaccount_photo/myspace.png delete mode 100755 data/myaccount_photo/picasa.png delete mode 100755 data/myaccount_photo/refresh.png delete mode 100755 data/myaccount_photo/tw3_list_select.png delete mode 100755 data/myaccount_photo/twitter.png delete mode 100755 data/myaccount_photo/youtube.png delete mode 100644 icon_myaccount.png mode change 100755 => 100644 include/myaccount_ug_account_list.h delete mode 100644 po/GT-I7800_Accounts_Strings.csv delete mode 100755 po/POTFILES.in mode change 100755 => 100644 po/ar.po mode change 100755 => 100644 po/az.po mode change 100755 => 100644 po/bg.po mode change 100755 => 100644 po/ca.po mode change 100755 => 100644 po/cs.po delete mode 100755 po/csv2po_v2 delete mode 100755 po/csv_to_po.py mode change 100755 => 100644 po/da.po create mode 100644 po/de.po delete mode 100755 po/de_DE.po mode change 100755 => 100644 po/el_GR.po mode change 100755 => 100644 po/en.po mode change 100755 => 100644 po/en_PH.po delete mode 100755 po/en_US.csv mode change 100755 => 100644 po/en_US.po mode change 100755 => 100644 po/es_ES.po delete mode 100755 po/es_MX.po create mode 100644 po/es_US.po mode change 100755 => 100644 po/et.po mode change 100755 => 100644 po/eu.po mode change 100755 => 100644 po/fi.po create mode 100644 po/fr.po mode change 100755 => 100644 po/fr_CA.po delete mode 100755 po/fr_FR.po mode change 100755 => 100644 po/ga.po mode change 100755 => 100644 po/gl.po delete mode 100755 po/he.po mode change 100755 => 100644 po/hi.po mode change 100755 => 100644 po/hr.po mode change 100755 => 100644 po/hu.po mode change 100755 => 100644 po/hy.po delete mode 100755 po/id.po mode change 100755 => 100644 po/is.po mode change 100755 => 100644 po/it_IT.po mode change 100755 => 100644 po/ja_JP.po mode change 100755 => 100644 po/ka.po mode change 100755 => 100644 po/kk.po delete mode 100755 po/ko_KR.csv mode change 100755 => 100644 po/ko_KR.po mode change 100755 => 100644 po/lt.po mode change 100755 => 100644 po/lv.po mode change 100755 => 100644 po/mk.po delete mode 100755 po/ms.po delete mode 100644 po/myaccount_ui.pot mode change 100755 => 100644 po/nb.po create mode 100644 po/nl.po delete mode 100755 po/nl_NL.po delete mode 100755 po/no.po mode change 100755 => 100644 po/pl.po delete mode 100755 po/po_to_csv.py mode change 100755 => 100644 po/pt_BR.po mode change 100755 => 100644 po/pt_PT.po mode change 100755 => 100644 po/ro.po mode change 100755 => 100644 po/ru_RU.po mode change 100755 => 100644 po/sk.po mode change 100755 => 100644 po/sl.po mode change 100755 => 100644 po/sr.po mode change 100755 => 100644 po/sv.po delete mode 100755 po/th.po mode change 100755 => 100644 po/tr_TR.po mode change 100755 => 100644 po/uk.po delete mode 100755 po/update-po.sh mode change 100755 => 100644 po/uz.po delete mode 100755 po/vi.po mode change 100755 => 100644 po/zh_CN.po mode change 100755 => 100644 po/zh_HK.po delete mode 100755 po/zh_SG.po mode change 100755 => 100644 po/zh_TW.po delete mode 100755 ug.setting-myaccount-efl.include diff --git a/CMakeLists.txt b/CMakeLists.txt index f8c2d53..4f697a6 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,13 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -PROJECT(ug-setting-myaccount-efl C) +PROJECT(setting-myaccount-efl C) + +SET(APPDIR /usr/apps/setting-myaccount-efl) +SET(LIBDIR ${APPDIR}/lib/ug) +SET(BINDIR ${APPDIR}/bin) +SET(RESDIR ${APPDIR}/res) +SET(DATADIR ${APPDIR}/shared/trusted) + + SET(ACCOUNT_LIST_UG_SRCS src/myaccount_ug_main.c @@ -17,16 +25,37 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) INCLUDE_DIRECTORIES(/usr/include) INCLUDE(FindPkgConfig) -pkg_check_modules(pkgs REQUIRED elementary appcore-efl ui-gadget-1 accounts-svc evas capi-appfw-application capi-appfw-app-manager vconf pkgmgr capi-system-system-settings iniparser) +pkg_check_modules(pkgs REQUIRED + elementary + appcore-efl + ui-gadget-1 + accounts-svc + evas + capi-appfw-application + capi-appfw-app-manager + vconf + pkgmgr + capi-system-system-settings + iniparser + efl-assist +# notification +) FOREACH(flag ${pkgs_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Werror -fpie") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -Werror -fpie") SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") SET(CMAKE_C_FLAGS_RELEASE "-O2") +#Build time feature +IF( _MULTI_WINDOW_ENABLE_ ) + ADD_DEFINITIONS("-D_MULTI_WINDOW_ENABLE_") + SET(EDJE_CC_DEFINES "-D_MULTI_WINDOW_ENABLE_") +ENDIF() + + FIND_PROGRAM(UNAME NAMES uname) EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH") IF("${ARCH}" STREQUAL "arm") @@ -37,6 +66,10 @@ ENDIF("${ARCH}" STREQUAL "arm") ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") ADD_DEFINITIONS("-D_A_PROJECT_") +IF(_FEATURE_SMEMO_ENABLE) +ADD_DEFINITIONS(-D_FEATURE_SMEMO_ENABLE) +ENDIF(_FEATURE_SMEMO_ENABLE) + ADD_LIBRARY(${PROJECT_NAME} SHARED ${ACCOUNT_LIST_UG_SRCS}) SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION 0.0.1) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} accounts-svc) @@ -48,12 +81,7 @@ ADD_CUSTOM_TARGET(myaccount.edj ) ADD_DEPENDENCIES(${PROJECT_NAME} myaccount.edj) -ADD_CUSTOM_TARGET(myaccount_button.edj - COMMAND edje_cc -id ${CMAKE_SOURCE_DIR}/data/myaccount_photo - ${CMAKE_SOURCE_DIR}/data/edc/myaccount_button.edc ${CMAKE_BINARY_DIR}/myaccount_button.edj - DEPENDS ${CMAKE_SOURCE_DIR}/data/edc/myaccount_button.edc -) -ADD_DEPENDENCIES(${PROJECT_NAME} myaccount_button.edj) +SET(COLORTABLEDIR "${CMAKE_BINARY_DIR}/") ADD_CUSTOM_TARGET(myaccount_edc_images.edj COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/data/myaccount_photo @@ -64,19 +92,12 @@ ADD_DEPENDENCIES(${PROJECT_NAME} myaccount_edc_images.edj) INSTALL(FILES ${CMAKE_BINARY_DIR}/setting-myaccount-efl.xml DESTINATION /usr/share/packages) -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/ug/lib) -INSTALL(FILES ${CMAKE_BINARY_DIR}/myaccount.edj DESTINATION /usr/ug/res/edje/${PROJECT_NAME}) -INSTALL(FILES ${CMAKE_BINARY_DIR}/myaccount_edc_images.edj DESTINATION /usr/ug/res/edje/${PROJECT_NAME}) -INSTALL(FILES ${CMAKE_BINARY_DIR}/myaccount_button.edj DESTINATION /usr/ug/res/edje/${PROJECT_NAME}) -INSTALL(FILES ${CMAKE_BINARY_DIR}/ug.setting-myaccount-efl.include DESTINATION /etc/smack/accesses2.d) - -#installing images - -#INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/data/myaccount_photo/ DESTINATION /usr/ug/res/images/${PROJECT_NAME} PATTERN -#"*.png" PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE -#WORLD_EXECUTE) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIBDIR}) +INSTALL(FILES ${CMAKE_BINARY_DIR}/myaccount.edj DESTINATION ${RESDIR}/edje/${PROJECT_NAME}) +INSTALL(FILES ${CMAKE_BINARY_DIR}/myaccount_edc_images.edj DESTINATION ${RESDIR}/edje/${PROJECT_NAME}) +INSTALL(FILES +${CMAKE_SOURCE_DIR}/com.samsung.my-account_ChangeableColorInfo.xml DESTINATION ${RESDIR}/ug-setting-cloud/shared/res/tables) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/com.samsung.my-account_ChangeableFontInfo.xml DESTINATION ${RESDIR}/ug-setting-cloud/setting-cloud/shared/res/tables) # i18n ADD_SUBDIRECTORY(po) - - diff --git a/LICENSE b/LICENSE new file mode 100755 index 0000000..bbe9d02 --- /dev/null +++ b/LICENSE @@ -0,0 +1,206 @@ +Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. + + + diff --git a/LICENSE.Flora b/LICENSE.Flora deleted file mode 100755 index 571fe79..0000000 --- a/LICENSE.Flora +++ /dev/null @@ -1,206 +0,0 @@ -Flora License - -Version 1.1, April, 2013 - -http://floralicense.org/license/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - -"License" shall mean the terms and conditions for use, reproduction, -and distribution as defined by Sections 1 through 9 of this document. - -"Licensor" shall mean the copyright owner or entity authorized by -the copyright owner that is granting the License. - -"Legal Entity" shall mean the union of the acting entity and -all other entities that control, are controlled by, or are -under common control with that entity. For the purposes of -this definition, "control" means (i) the power, direct or indirect, -to cause the direction or management of such entity, -whether by contract or otherwise, or (ii) ownership of fifty percent (50%) -or more of the outstanding shares, or (iii) beneficial ownership of -such entity. - -"You" (or "Your") shall mean an individual or Legal Entity -exercising permissions granted by this License. - -"Source" form shall mean the preferred form for making modifications, -including but not limited to software source code, documentation source, -and configuration files. - -"Object" form shall mean any form resulting from mechanical -transformation or translation of a Source form, including but -not limited to compiled object code, generated documentation, -and conversions to other media types. - -"Work" shall mean the work of authorship, whether in Source or Object form, -made available under the License, as indicated by a copyright notice -that is included in or attached to the work (an example is provided -in the Appendix below). - -"Derivative Works" shall mean any work, whether in Source or Object form, -that is based on (or derived from) the Work and for which the editorial -revisions, annotations, elaborations, or other modifications represent, -as a whole, an original work of authorship. For the purposes of this License, -Derivative Works shall not include works that remain separable from, -or merely link (or bind by name) to the interfaces of, the Work and -Derivative Works thereof. - -"Contribution" shall mean any work of authorship, including the original -version of the Work and any modifications or additions to that Work or -Derivative Works thereof, that is intentionally submitted to Licensor -for inclusion in the Work by the copyright owner or by an individual or -Legal Entity authorized to submit on behalf of the copyright owner. -For the purposes of this definition, "submitted" means any form of -electronic, verbal, or written communication sent to the Licensor or -its representatives, including but not limited to communication on -electronic mailing lists, source code control systems, and issue -tracking systems that are managed by, or on behalf of, the Licensor -for the purpose of discussing and improving the Work, but excluding -communication that is conspicuously marked or otherwise designated -in writing by the copyright owner as "Not a Contribution." - -"Contributor" shall mean Licensor and any individual or Legal Entity -on behalf of whom a Contribution has been received by Licensor and -subsequently incorporated within the Work. - -"Tizen Certified Platform" shall mean a software platform that complies -with the standards set forth in the Tizen Compliance Specification -and passes the Tizen Compliance Tests as defined from time to time -by the Tizen Technical Steering Group and certified by the Tizen -Association or its designated agent. - -2. Grant of Copyright License. Subject to the terms and conditions of -this License, each Contributor hereby grants to You a perpetual, -worldwide, non-exclusive, no-charge, royalty-free, irrevocable -copyright license to reproduce, prepare Derivative Works of, -publicly display, publicly perform, sublicense, and distribute the -Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of -this License, each Contributor hereby grants to You a perpetual, -worldwide, non-exclusive, no-charge, royalty-free, irrevocable -(except as stated in this section) patent license to make, have made, -use, offer to sell, sell, import, and otherwise transfer the Work -solely as incorporated into a Tizen Certified Platform, where such -license applies only to those patent claims licensable by such -Contributor that are necessarily infringed by their Contribution(s) -alone or by combination of their Contribution(s) with the Work solely -as incorporated into a Tizen Certified Platform to which such -Contribution(s) was submitted. If You institute patent litigation -against any entity (including a cross-claim or counterclaim -in a lawsuit) alleging that the Work or a Contribution incorporated -within the Work constitutes direct or contributory patent infringement, -then any patent licenses granted to You under this License for that -Work shall terminate as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the -Work or Derivative Works thereof pursuant to the copyright license -above, in any medium, with or without modifications, and in Source or -Object form, provided that You meet the following conditions: - - 1. You must give any other recipients of the Work or Derivative Works - a copy of this License; and - 2. You must cause any modified files to carry prominent notices stating - that You changed the files; and - 3. You must retain, in the Source form of any Derivative Works that - You distribute, all copyright, patent, trademark, and attribution - notices from the Source form of the Work, excluding those notices - that do not pertain to any part of the Derivative Works; and - 4. If the Work includes a "NOTICE" text file as part of its distribution, - then any Derivative Works that You distribute must include a readable - copy of the attribution notices contained within such NOTICE file, - excluding those notices that do not pertain to any part of - the Derivative Works, in at least one of the following places: - within a NOTICE text file distributed as part of the Derivative Works; - within the Source form or documentation, if provided along with the - Derivative Works; or, within a display generated by the Derivative Works, - if and wherever such third-party notices normally appear. - The contents of the NOTICE file are for informational purposes only - and do not modify the License. You may add Your own attribution notices - within Derivative Works that You distribute, alongside or as an addendum - to the NOTICE text from the Work, provided that such additional attribution - notices cannot be construed as modifying the License. You may add Your own - copyright statement to Your modifications and may provide additional or - different license terms and conditions for use, reproduction, or - distribution of Your modifications, or for any such Derivative Works - as a whole, provided Your use, reproduction, and distribution of - the Work otherwise complies with the conditions stated in this License - and your own copyright statement or terms and conditions do not conflict - the conditions stated in the License including section 3. - -5. Submission of Contributions. Unless You explicitly state otherwise, -any Contribution intentionally submitted for inclusion in the Work -by You to the Licensor shall be under the terms and conditions of -this License, without any additional terms or conditions. -Notwithstanding the above, nothing herein shall supersede or modify -the terms of any separate license agreement you may have executed -with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade -names, trademarks, service marks, or product names of the Licensor, -except as required for reasonable and customary use in describing the -origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or -agreed to in writing, Licensor provides the Work (and each -Contributor provides its Contributions) on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -implied, including, without limitation, any warranties or conditions -of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A -PARTICULAR PURPOSE. You are solely responsible for determining the -appropriateness of using or redistributing the Work and assume any -risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, -whether in tort (including negligence), contract, or otherwise, -unless required by applicable law (such as deliberate and grossly -negligent acts) or agreed to in writing, shall any Contributor be -liable to You for damages, including any direct, indirect, special, -incidental, or consequential damages of any character arising as a -result of this License or out of the use or inability to use the -Work (including but not limited to damages for loss of goodwill, -work stoppage, computer failure or malfunction, or any and all -other commercial damages or losses), even if such Contributor -has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing -the Work or Derivative Works thereof, You may choose to offer, -and charge a fee for, acceptance of support, warranty, indemnity, -or other liability obligations and/or rights consistent with this -License. However, in accepting such obligations, You may act only -on Your own behalf and on Your sole responsibility, not on behalf -of any other Contributor, and only if You agree to indemnify, -defend, and hold each Contributor harmless for any liability -incurred by, or claims asserted against, such Contributor by reason -of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Flora License to your work - -To apply the Flora License to your work, attach the following -boilerplate notice, with the fields enclosed by brackets "[]" -replaced with your own identifying information. (Don't include -the brackets!) The text should be enclosed in the appropriate -comment syntax for the file format. We also recommend that a -file or class name and description of purpose be included on the -same "printed page" as the copyright notice for easier -identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Flora License, Version 1.1 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://floralicense.org/license/ - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - diff --git a/NOTICE b/NOTICE index 94d56df..ded3804 100755 --- a/NOTICE +++ b/NOTICE @@ -1,3 +1 @@ -Copyright (c) 2012 Samsung Electronics Co., Ltd. All rights reserved. -Except as noted, this software is licensed under Flora License, Version 1.1 -Please, see the LICENSE.Flora file for Flora License, Version 1.1 terms and conditions. +Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. \ No newline at end of file diff --git a/com.samsung.my-account_ChangeableColorInfo.xml b/com.samsung.my-account_ChangeableColorInfo.xml new file mode 100644 index 0000000..6c08f15 --- /dev/null +++ b/com.samsung.my-account_ChangeableColorInfo.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/com.samsung.my-account_ChangeableFontInfo.xml b/com.samsung.my-account_ChangeableFontInfo.xml new file mode 100644 index 0000000..8e2e636 --- /dev/null +++ b/com.samsung.my-account_ChangeableFontInfo.xml @@ -0,0 +1,4 @@ + + + + diff --git a/data/edc/CMakeLists.txt b/data/edc/CMakeLists.txt index fd2bc4f..5091783 100755 --- a/data/edc/CMakeLists.txt +++ b/data/edc/CMakeLists.txt @@ -4,19 +4,19 @@ ADD_CUSTOM_TARGET(myaccount.edj DEPENDS ${CMAKE_SOURCE_DIR}/data/edc/myaccount.edc ) -ADD_CUSTOM_TARGET(myaccount_button.edj - COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/data/edc - ${CMAKE_SOURCE_DIR}/data/edc/myaccount_button.edc ${CMAKE_BINARY_DIR}/data/edc/myaccount_button.edj - DEPENDS ${CMAKE_SOURCE_DIR}/data/edc/myaccount_button.edc -) - ADD_CUSTOM_TARGET(myaccount_edc_images.edj COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/data/edc ${CMAKE_SOURCE_DIR}/data/edc/myaccount_edc_images.edc ${CMAKE_BINARY_DIR}/data/edc/myaccount_edc_images.edj DEPENDS ${CMAKE_SOURCE_DIR}/data/edc/myaccount_edc_images.edc ) +ADD_CUSTOM_TARGET(myaccount_nocontent.edj + COMMAND edje_cc -id ${CMAKE_CURRENT_SOURCE_DIR}/data/edc + ${CMAKE_SOURCE_DIR}/data/edc/myaccount_edc_images.edc ${CMAKE_BINARY_DIR}/data/edc/myaccount_nocontent.edj + DEPENDS ${CMAKE_SOURCE_DIR}/data/edc/myaccount_nocontent.edc +) + INSTALL(FILES ${CMAKE_BINARY_DIR}/data/edc/myaccount.edj DESTINATION share/edje/myaccount) -INSTALL(FILES ${CMAKE_BINARY_DIR}/data/edc/myaccount_button.edj DESTINATION share/edje/myaccount) INSTALL(FILES ${CMAKE_BINARY_DIR}/data/edc/myaccount_edc_images.edj DESTINATION share/edje/myaccount) +INSTALL(FILES ${CMAKE_BINARY_DIR}/data/edc/myaccount_nocontent.edj DESTINATION share/edje/myaccount) diff --git a/data/edc/inc.Addaccount.edc b/data/edc/inc.Addaccount.edc deleted file mode 100755 index da72f81..0000000 --- a/data/edc/inc.Addaccount.edc +++ /dev/null @@ -1,61 +0,0 @@ -group -{ - name: "Addaccount_ui"; - min: MAIN_W MAIN_H; - - parts { - part { name: "rect"; - type: RECT; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 0; } - rel2 { relative: 1.0 1.0; offset: -1 -1; } - //color: 74 74 74 255; - color: 0 0 0 255; - } - } - - part - { - - name, "titlebar"; - type, SWALLOW; - mouse_events, 0; - description - { - state, "default" 0.0; - rel1 { relative, 0.0 0.0; to, "rect";} - //rel2 { relative, 1.0 82/800; to, "rect";} - rel2 { relative, 1.0 92/800; to, "rect";} - } - } - part { - name: "body"; - type: SWALLOW; - mouse_events: 1; - description - { - state: "default" 0.0; - //rel1 { relative: 0.0 82/800; to, "rect"; } - rel1 { relative: 0.0 100/800; to, "rect"; } - rel2 { relative: 1.0 1.0; to, "rect"; } - } - } - - part - { - name: "softkey"; - type: SWALLOW; - mouse_events: 1; - - description - { - state: "default" 0.0; - color: 0 0 0 128; - rel1 { relative: 0.0 0.9; to: "rect"; } - rel2 { relative: 1.0 1.0; to: "rect"; } - } - } - } -} diff --git a/data/edc/inc.add-sns-account.edc b/data/edc/inc.add-sns-account.edc deleted file mode 100755 index d1274a6..0000000 --- a/data/edc/inc.add-sns-account.edc +++ /dev/null @@ -1,49 +0,0 @@ -group { - name: "add-sns-account"; - min: MAIN_W MAIN_H; - - parts { - part { name: "background"; - type: RECT; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 0; } - rel2 { relative: 1.0 1.0; offset: -1 -1; } - //color: 74 74 74 255; - color: 0 0 0 0; - } - } - - part - { - name: "softkey"; - type: SWALLOW; - mouse_events: 1; - - description - { - state: "default" 0.0; - rel1 { relative: 0.0 0.9; to: "background"; } - rel2 { relative: 1.0 1.0; to: "background"; } - - } - } - part - { - name: "titlebar"; - type: SWALLOW; - mouse_events: 0; - - description - { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; to: "background"; } - rel2 { relative: 1.0 TITLE_BAR_H; to: "background"; } - - } - } - } - } - - diff --git a/data/edc/inc.myaccount_contact_sync.edc b/data/edc/inc.myaccount_contact_sync.edc deleted file mode 100755 index 899976a..0000000 --- a/data/edc/inc.myaccount_contact_sync.edc +++ /dev/null @@ -1,208 +0,0 @@ -//#include ../../include/myaccount_layout.h -#define COLOR_DEFAULT 0 0 0 0 -#define ENTRY_H 80 -#define RLIST_ITEM_H 80 -#define OVERLAY_OFFSET 11 -#define COLOR_DARK_GRAY 33 33 33 -#define RLIST_ITEM_NUM_T 10 -#define IST_ITEM_NUM_R -5 -#define RLIST_ITEM_NUM_B -5 -#define RLIST_ITEM_OFFSET_T 12 //18 -#define EDIT_AREA_OFFSET_B 0 //-15 -#define SEARCH_ITEM_NUM_B -6 -#define COLOR_WHITE 255 255 255 - -#define TITLEBAR_H 50 -#define TITLE_SHADOW_H 8 -#define HEADER_H 70 - -#define TAB_W 480 -#define TAB_H 87 -#define TAB_SHADOW_H 7 -#define TAB_BOX_W 116 -#define TAB_BOX_H 80 - -#define SOFTKEY_H 78 -#define INDICATOR_H 48 /* excluding its shadow (height 4) */ -#define BLUR_H 120 - -#define BTN_TRANSPARENCY_FIFTY 128 -#define BTN_TRANSPARENCY_THIRTY 77 -#define BTN_FONT_2LINE_SIZE 24 - -#define SEARCH_SHADOW_H 8 - -group -{ - name: "contact_sync"; - min: MAIN_W MAIN_H; - - parts { - part { name: "rect"; - type: RECT; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 0; } - rel2 { relative: 1.0 1.0; offset: -1 -1; } - //color: 74 74 74 255; - color: 0 0 0 255; - } - } - - part { - name: "body"; - type: SWALLOW; - mouse_events: 1; - description - { - state: "default" 0.0; - //rel1 { relative: 0.0 88/800; to, "rect"; } - rel1 { relative: 0.0 100/800; to, "rect"; } - rel2 { relative: 1.0 1.0; to, "rect"; } - } - } - } -} - - -group { - name: "contact_sync_with_search"; -// min: MAIN_W MAIN_H; - parts { - part { name: "Background"; - type: RECT; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 0; } - rel2 { relative: 1.0 1.0; offset: 0 0; } - //color: COLOR_DEFAULT; - //color: 255 255 255 255; - color: 0 0 0 255; - } - } - part { name: "rlist_body"; - type: SWALLOW; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { to: "Background"; relative: 0.0 0.0; offset: 0 -10); } - rel2 { to: "Background"; relative: 1.0 0.0; offset: 0 (ENTRY_H+10); } - } - } - part { name: "sw_body"; - type: SWALLOW; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 (ENTRY_H+10); } - rel2 { relative: 1.0 1.0; offset: 0 0; } - } - } - } - } - - - group { - images { - image: "09_search_button_normal_bg.png" COMP; - image: "09_search_button_normal_bg_press.png" COMP; - image: "09_search_softkey_icon_zoom.png" COMP; - image: "09_search_text_input_03.png" COMP; - image: "09_search_input_bg.png" COMP; - } - name: "rlist_item"; - parts { - part { name: "erect"; - type: RECT; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 0;} - rel2 { relative: 1.0 0.0; offset: 0 (RLIST_ITEM_H+OVERLAY_OFFSET); } - color: 77 77 77 255; - } - } - part { name: "rect_line"; - type: RECT; - description { - state: "default" 0.0; - rel1 { to: "erect"; relative: 0.0 1.0; offset: 0 3; } - rel2 { to: "erect"; relative: 1.0 1.0; offset: -1 3; } - color: COLOR_DARK_GRAY 255; - } - } - part { name: "rect_guide"; - type: IMAGE; - description { - visible:1; - state: "default" 0.0; - rel1 { to: "erect"; relative: 0.0 0.0; offset: 10 (RLIST_ITEM_NUM_T+OVERLAY_OFFSET); } - rel2 { to: "erect"; relative: 1.0 1.0; offset: (IST_ITEM_NUM_R-73) (RLIST_ITEM_NUM_B-5); } - - image { - //normal: "09_search_text_input_03.png"; //white background - normal: "09_search_input_bg.png"; - border: 10 10 10 10; - } - } - } - - part { name: "btn_text"; - mouse_events: 1; - type: SWALLOW; - repeat_events: 1; - description { - state: "default" 0.0; - rel1 { to: "rect_guide"; relative: 0.0 0.0; offset: 10 RLIST_ITEM_OFFSET_T; } - rel2 { to: "rect_guide"; relative: 1.0 1.0; offset: -5 EDIT_AREA_OFFSET_B; } - } - description { - state: "down" 0.0; - inherit: "default" 0.0; - } - } - part {name: "button"; - type: IMAGE; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { to: "erect"; relative: 1.0 0.0; offset: -70 (10+OVERLAY_OFFSET); }; - rel2 { to: "erect"; relative: 1.0 1.0; offset: -10 (SEARCH_ITEM_NUM_B-4); }; - image { - normal: "09_search_button_normal_bg.png"; - border: 9 9 0 0; - } - } - description { - state: "selected" 0.0; - inherit: "default" 0.0; - image { - normal: "09_search_button_normal_bg_press.png"; - border: 9 9 0 0; - } - } - } - part { name: "button_icon"; - type: IMAGE; - repeat_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 8 0; to: "button"; } - rel2 { relative: 1.0 1.0; offset: -8 0; to: "button"; } - color: COLOR_WHITE 255; //color: 0 0 0 255; - image { - normal: "09_search_softkey_icon_zoom.png"; - border: 9 9 0 0; - } - } - } - } - programs { - program { name: "bt_clicked"; - source: "button"; - signal: "mouse,clicked,1"; - action: SIGNAL_EMIT "SEARCHIT" "SEARCHITEM"; - } - } - } // group : diff --git a/data/edc/inc.myaccount_email_datarange.edc b/data/edc/inc.myaccount_email_datarange.edc deleted file mode 100755 index 4c83fc4..0000000 --- a/data/edc/inc.myaccount_email_datarange.edc +++ /dev/null @@ -1,32 +0,0 @@ -group -{ - name: "email_datarange"; - min: MAIN_W MAIN_H; - - parts { - part { name: "rect"; - type: RECT; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 0; } - rel2 { relative: 1.0 1.0; offset: -1 -1; } - //color: 74 74 74 255; - color: 0 0 0 255; - } - } - - part { - name: "body"; - type: SWALLOW; - mouse_events: 1; - description - { - state: "default" 0.0; - //rel1 { relative: 0.0 88/800; to, "rect"; } - rel1 { relative: 0.0 100/800; to, "rect"; } - rel2 { relative: 1.0 1.0; to, "rect"; } - } - } - } -} diff --git a/data/edc/inc.myaccount_peak_time.edc b/data/edc/inc.myaccount_peak_time.edc deleted file mode 100755 index cb28084..0000000 --- a/data/edc/inc.myaccount_peak_time.edc +++ /dev/null @@ -1,721 +0,0 @@ -//#define TITLEBAR_H 100 -//#define TITLE_SHADOW_H 8 - -//#define ALARM_LIST_H 101 - - -#define COLOR_1 255 255 255 255 -#define COLOR_2 0 0 0 255 - -group -{ - images { - image: "01_hybrid_spinner_bg.png" COMP; - image: "08_textinput_panel_bg.png" COMP; - image: "01_list_bottom_blur.png" COMP; - } - - name: "peak_time"; - min: MAIN_W MAIN_H; - - parts { - part { name: "ui.rect.bg"; - type: RECT; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 0; } - rel2 { relative: 1.0 1.0; offset: -1 -1; } - //color: 74 74 74 255; - color: 0 0 0 255; - } - } - - part { - name: "indicator"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - min: 0 INDICATOR_H; - fixed: 0 1; - rel1 { relative: 0.0 0.0; } - rel2 { relative: 1.0 0.0; } - align: 0.5 0.0; - color: 0 0 0 0; - } - } - -/* - part { - name: "titlebar_top_padding"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - min: 0 10; - fixed: 0 1; - rel1 { relative: 0.0 0.0; } - rel2 { relative: 1.0 0.0; } - align: 0.5 0.0; - color: 255 0 0 255; - } - } -*/ - part { - name: "title_shadow"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - min: 0 TITLE_SHADOW_H; - fixed: 0 1; - rel1 { relative: 0.0 1.0; to: "elm.swallow.title"; } - rel2 { relative: 1.0 1.0; to: "elm.swallow.title"; } - align: 0.5 1.0; - color: 0 0 0 0; - } - } - part { - name: "elm.swallow.content"; - type: SWALLOW; - description { - state: "default" 0.0; - //rel1 { relative: 0.0 0.0; to_y: "title_shadow"; } - rel1 { relative: 0.0 0.0; to_y: "elm.swallow.title"; } - rel2 { relative: 1.0 1.0; } - } - } -/* part { - name: "elm.image.blur"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - min: 0 BLUR_H; - fixed: 0 1; - rel1 { relative: 0.0 1.0; } - rel2 { relative: 1.0 1.0; } - align: 0.5 1.0; - image.normal: "01_list_bottom_blur.png"; - } - } */ - part { - name: "elm.swallow.title"; - type: SWALLOW; - scale: 1; - description { - state: "default" 0.0; - min: 0 TITLEBAR_H; - fixed: 0 1; - //rel1 { relative: 0.0 1.0; to_y: "titlebar_top_padding"; } - //rel2 { relative: 1.0 1.0; to_y: "titlebar_top_padding"; } - rel1 { relative: 0.0 1.0; to_y: "indicator"; } - rel2 { relative: 1.0 1.0; to_y: "indicator"; } - align: 0.5 0; - } - } - - part { - name: "ui.swl.sk1"; - type: SWALLOW; - scale: 1; - description { - state: "default" 0.0; - min: SK1_W SK_H; - fixed: 1 1; - rel1.to_x: "ui.rect.bg"; - rel1.relative: 0.0 1.0; - rel2.to: "ui.rect.bg"; - rel2.relative: 0.0 1.0; - align: 0.0 1.0; - } - } - part { - name: "ui.swl.sk2"; - type: SWALLOW; - scale: 1; - description { - state: "default" 0.0; - min: 0 SK_H; - fixed: 0 1; - rel1.to_x: "ui.swl.sk1"; - rel1.to_y: "ui.rect.bg"; - rel1.relative: 1.0 1.0; - rel2.to_x: "ui.swl.sk3"; - rel2.to_y: "ui.rect.bg"; - rel2.relative: 0.0 1.0; - align: 0.5 1.0; - } - description { - state: "landscape" 0.0; - inherit: "default" 0.0; - rel1.to: "ui.swl.sk3"; - rel1.relative: 0.0 0.0; - rel2.to: "ui.swl.sk3"; - rel2.relative: 1.0 0.0; - } - } - part { - name: "ui.swl.sk3"; - type: SWALLOW; - scale: 1; - description { - state: "default" 0.0; - min: SK3_W SK_H; - fixed: 1 1; - rel1.to_x: "ui.rect.bg"; - rel1.relative: 1.0 1.0; - rel2.to: "ui.rect.bg"; - rel2.relative: 1.0 1.0; - align: 1.0 1.0; - } - } - } -} -group { - name: "peak_time_tofrom"; - - parts { - part { - name: "bg"; - type: RECT; - mouse_events: 1; - description { - min: 460 101; - //max: 460 101; - //fixed: 1 1; - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 0; } - rel2 { relative: 1.0 1.0; offset: 0 0; } - color: 0 0 0 255; - } - } - part { - name: "img/bg/top"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 0; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: 0 5; to: "bg"; } - image.normal: "01_dialog_field_input_top.png"; - } - } - part { - name: "img/bg/bottom"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 1.0; offset: 0 -5; to: "bg"; } - rel2 { relative: 1.0 1.0; offset: 0 0; to: "bg"; } - image.normal: "01_dialog_field_input_bottom.png"; - } - } - part { - name: "img/bg/middle"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 1.0; offset: 0 0; to: "img/bg/top"; } - rel2 { relative: 1.0 0.0; offset: 1 0; to: "img/bg/bottom"; } - image.normal: "01_dialog_field_input_middle.png"; - } - } - part { - name: "part/img/bg"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { to: "bg"; } - rel2 { to: "bg"; } - image.normal: "01_dialog_field_lighting.png"; - } - description { - state: "pressed" 0.0; - inherit: "default" 0.0; - image.normal: "tw3_list_select.png"; - } - } - part { - name: "part/text/from"; - type: TEXT; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 18 56; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: 0 40; to: "bg"; } - text { text_class: "tc_from"; align: 0.0 0.5; } - color: COLOR_1; - color2: COLOR_2; - } - } - part { - name: "part/text/hour"; - type: TEXT; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 170 55; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: 0 40; to: "bg"; } - text { text_class: "tc_hour"; align: 0.0 0.5; } - color: COLOR_1; - color2: COLOR_2; - } - } - part { - name: "part/text/colon"; - type: TEXT; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 195 55; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: 0 40; to: "bg"; } - text { text_class: "tc_colon"; align: 0.0 0.5; } - color: COLOR_1; - color2: COLOR_2; - } - } - part { - name: "part/text/minute"; - type: TEXT; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 200 55; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: 0 40; to: "bg"; } - text { text_class: "tc_minute"; align: 0.0 0.5; } - color: 80 80 80 255; - color2: COLOR_2; - } - } - part { - name: "part/text/ampm"; - type: TEXT; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 230 55; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: 0 40; to: "bg"; } - text { text_class: "tc_ampm"; align: 0.0 0.5; } - color: COLOR_1; - color2: COLOR_2; - } - } - } - programs { - program { - name: "prog/down/list"; - signal: "mouse,down,*"; - source: "bg"; - script { - set_state(PART:"part/img/bg", "pressed", 0.0); - } - } - program { - name: "prog/up/list"; - signal: "mouse,up,1"; - source: "bg"; - script { - set_state(PART:"part/img/bg", "default", 0.0); - } - } - } - } - - group { - name: "peak_time_timepicker"; - parts { - part { - name: "bg"; - type: RECT; - mouse_events: 1; - description { - min: 460 250; - max: 460 250; - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 0; } - rel2 { relative: 1.0 1.0; offset: 0 0; } - color: 0 0 0 255; - } - } - part { - name: "part/swallow/timepicker"; - type: SWALLOW; - mouse_events: 1; - description - { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; to, "bg"; } - rel2 { relative: 1 1; to, "bg"; } - } - } - - } - } - - group { - images { - image: "08_textinput_panel_bg.png" COMP; - image: "08_textinput_btn_bg_1.png" COMP; - image: "08_textinput_btn_bg_2.png" COMP; - image: "08_textinput_btn_clear.png" COMP; - image: "08_textinput_btn_enter.png" COMP; - } - - name: "ui/picker/keypad"; - - parts { - part { - name: "ui.rect.bg"; - type: RECT; - description { - state: "default" 0.0; - color: 0 0 0 0; - } - } - -#define PART_KEY(key_num, l, r, t, b, img, txt1, txt2, font_color) \ - part { \ - name: "ui.img.key"key_num; \ - description { \ - state: "default" 0.0; \ - rel1.relative: l t; \ - rel1.to: "ui.rect.bg"; \ - rel2.relative: r b; \ - rel2.to: "ui.rect.bg"; \ - image.normal: img; \ - image.border: 3 3 3 3; \ - color: 255 255 255 255; \ - } \ - description { \ - state: "dim" 0.0; \ - inherit: "default" 0.0; \ - color: 255 255 255 127; \ - } \ - } \ - part { \ - name: "ui.txt.key"key_num; \ - mouse_events: 0; \ - type: TEXT; \ - scale: 1; \ - description { \ - state: "default" 0.0; \ - fixed: 1 1; \ - rel1.to: "ui.img.key"key_num; \ - rel2.to: "ui.img.key"key_num; \ - color: font_color; \ - color2: 0 0 0 255; \ - visible: 1; \ - text { \ - font: "GP_Latin"; \ - size: 34; \ - min: 1 1; \ - align: 0.5 0.5; \ - text: txt1; \ - } \ - } \ - } - - - PART_KEY("0", KEY0_REL_L, KEY0_REL_R, KEY0_REL_T, KEY0_REL_B, - "08_textinput_btn_bg_2.png", "1", "1", 0 0 0 255) - PART_KEY("1", KEY1_REL_L, KEY1_REL_R, KEY1_REL_T, KEY1_REL_B, - "08_textinput_btn_bg_2.png", "2", "2", 0 0 0 255) - PART_KEY("2", KEY2_REL_L, KEY2_REL_R, KEY2_REL_T, KEY2_REL_B, - "08_textinput_btn_bg_2.png", "3", "3", 0 0 0 255) - PART_KEY("clr", KEY3_REL_L, KEY3_REL_R, KEY3_REL_T, KEY3_REL_B, - "08_textinput_btn_clear.png", "", "", 255 255 255 255) - - PART_KEY("3", KEY4_REL_L, KEY4_REL_R, KEY4_REL_T, KEY4_REL_B, - "08_textinput_btn_bg_2.png", "4", "4", 0 0 0 255) - PART_KEY("4", KEY5_REL_L, KEY5_REL_R, KEY5_REL_T, KEY5_REL_B, - "08_textinput_btn_bg_2.png", "5", "5", 0 0 0 255) - PART_KEY("5", KEY6_REL_L, KEY6_REL_R, KEY6_REL_T, KEY6_REL_B, - "08_textinput_btn_bg_2.png", "6", "6", 0 0 0 255) - PART_KEY("ret", KEY7_REL_L, KEY7_REL_R, KEY7_REL_T, KEY7_REL_B, - "08_textinput_btn_enter.png", "", "", 255 255 255 255) - - PART_KEY("6", KEY8_REL_L, KEY8_REL_R, KEY8_REL_T, KEY8_REL_B, - "08_textinput_btn_bg_2.png", "7", "7", 0 0 0 255) - PART_KEY("7", KEY9_REL_L, KEY9_REL_R, KEY9_REL_T, KEY9_REL_B, - "08_textinput_btn_bg_2.png", "8", "8", 0 0 0 255) - PART_KEY("8", KEY10_REL_L, KEY10_REL_R, KEY10_REL_T, KEY10_REL_B, - "08_textinput_btn_bg_2.png", "9", "9", 0 0 0 255) - PART_KEY("abc", KEY11_REL_L, KEY11_REL_R, KEY11_REL_T, KEY11_REL_B, - "08_textinput_btn_bg_1.png", "abc", "abc", 255 255 255 90) - - PART_KEY("9", KEY12_REL_L, KEY12_REL_R, KEY12_REL_T, KEY12_REL_B, - "08_textinput_btn_bg_2.png", "*", "10", 0 0 0 255) - PART_KEY("10", KEY13_REL_L, KEY13_REL_R, KEY13_REL_T, KEY13_REL_B, - "08_textinput_btn_bg_2.png", "0", "11", 0 0 0 255) - PART_KEY("11", KEY14_REL_L, KEY14_REL_R, KEY14_REL_T, KEY14_REL_B, - "08_textinput_btn_bg_2.png", "#", "12", 0 0 0 255) - PART_KEY("lang", KEY15_REL_L, KEY15_REL_R, KEY15_REL_T, KEY15_REL_B, - "08_textinput_btn_bg_1.png", "lang", "lang", 255 255 255 90) - } - - programs { - program { - name: "numpad"; - signal: "numpad"; - source: "prog"; - action: STATE_SET "default" 0.0; - target: "ui.txt.key0"; - target: "ui.txt.key1"; - target: "ui.txt.key2"; - target: "ui.txt.key3"; - target: "ui.txt.key4"; - target: "ui.txt.key5"; - target: "ui.txt.key6"; - target: "ui.txt.key7"; - target: "ui.txt.key8"; - target: "ui.txt.key9"; - target: "ui.txt.key10"; - target: "ui.txt.key11"; - } - -#define PRG_KEY_CLICKED(key_num) \ - program { \ - name: "key"key_num"_down"; \ - signal: "mouse,down,1"; \ - source: "ui.img.key"key_num; \ - action: STATE_SET "dim" 0.0; \ - target: "ui.img.key"key_num; \ - } \ - program { \ - name: "key"key_num"_up"; \ - signal: "mouse,up,1"; \ - source: "ui.img.key"key_num; \ - action: STATE_SET "default" 0.0; \ - target: "ui.img.key"key_num; \ - after: "key"key_num"_clicked"; \ - } \ - program { \ - name: "key"key_num"_clicked"; \ - signal: "mouse,clicked,1"; \ - source: "ui.img.key"key_num; \ - action: SIGNAL_EMIT "clicked" key_num; \ - } \ - - PRG_KEY_CLICKED("0"); - PRG_KEY_CLICKED("1"); - PRG_KEY_CLICKED("2"); - PRG_KEY_CLICKED("3"); - PRG_KEY_CLICKED("4"); - PRG_KEY_CLICKED("5"); - PRG_KEY_CLICKED("6"); - PRG_KEY_CLICKED("7"); - PRG_KEY_CLICKED("8"); - PRG_KEY_CLICKED("9"); - PRG_KEY_CLICKED("10"); - PRG_KEY_CLICKED("11"); - PRG_KEY_CLICKED("clr"); - PRG_KEY_CLICKED("ret"); - } - } - - group { - name: "peak_time_tofrom_digital"; - parts { - part { - name: "bg"; - type: RECT; - mouse_events: 1; - description { - min: 460 101; - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 0; } - rel2 { relative: 1.0 1.0; offset: 0 0; } - color: 0 0 0 255; - } - } - part { - name: "img/bg/top"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 0; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: 0 5; to: "bg"; } - image.normal: "01_dialog_field_input_top.png"; - } - } - part { - name: "img/bg/bottom"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 1.0; offset: 0 -5; to: "bg"; } - rel2 { relative: 1.0 1.0; offset: 0 0; to: "bg"; } - image.normal: "01_dialog_field_input_bottom.png"; - } - } - part { - name: "img/bg/middle"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 1.0; offset: 0 0; to: "img/bg/top"; } - rel2 { relative: 1.0 0.0; offset: 1 0; to: "img/bg/bottom"; } - image.normal: "01_dialog_field_input_middle.png"; - } - } - part { - name: "part/img/bg"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { to: "bg"; } - rel2 { to: "bg"; } - image.normal: "01_dialog_field_lighting.png"; - } - } - part { - name: "part/text/from"; - type: TEXT; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 18 56; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: 0 40; to: "bg"; } - text { text_class: "tc_from"; align: 0.0 0.5; } - color: COLOR_1; - color2: COLOR_2; - } - } - part { - name: "part/button/hour"; - type: SWALLOW; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 120 10 ; to: "bg"; } - rel2 { relative: 0.0 0.0; offset: 200 90; to: "bg"; } - } - } - part { - name: "part/text/colon"; - type: TEXT; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 205 55; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: 0 40; to: "bg"; } - text { text_class: "tc_colon"; align: 0.0 0.5; } - color: COLOR_1; - color2: COLOR_2; - } - } - part { - name: "part/button/minute"; - type: SWALLOW; - mouse_events: 1; - description { - state: "default" 0.0; - //rel1 { relative: 290/460 10/101; to: "bg"; } - //rel2 { relative: 370/460 90/101; to: "bg"; } - rel1 { relative: 0.0 0.0; offset: 215 10 ; to: "bg"; } - rel2 { relative: 0.0 0.0; offset: 295 90; to: "bg"; } - } - } - part { - name: "part/button/ampm"; - type: SWALLOW; - mouse_events: 1; - description { - state: "default" 0.0; - //rel1 { relative: 390/460 10/101; to: "bg"; } - //rel2 { relative: 470/460 90/110; to: "bg"; } - rel1 { relative: 0.0 0.0; offset: 305 10 ; to: "bg"; } - rel2 { relative: 0.0 0.0; offset: 385 90; to: "bg"; } - } - } - } - } - - - group { - images { - image: "01_dialogue_field_bg.png" COMP; - image: "01_picker_input_bg.png" COMP; - image: "01_hybrid_spinner_bg.png" COMP; - // image: "01_picker_time_colon_bg.png" COMP; - } - name: "ui/picker/base"; - parts { - part { - name: "ui.rect.bg"; - type: RECT; - description { - state: "default" 0.0; - rel1.relative: 0.0 0.0; - rel2.relative: 1.0 1.0; - color: 0 0 0 0; - } - } - part { - name: "ui.rect.cover"; - type: RECT; - description { - state: "default" 0.0; - rel1.to: "ui.rect.bg"; - rel1.relative: 0.0 COVER_REL_T; - rel2.to: "ui.rect.bg"; - color: 0 0 0 0; - } - } - - part { - name: "ui.img.bg.disp"; - scale: 1; - mouse_events: 1; - description { - min: 0 DISP_BG_H; - fixed: 1 1; - state: "default" 0.0; - rel1.relative: DISP_BG_REL_L DISP_BG_REL_T; - rel1.to: "ui.rect.bg"; - rel2.relative: DISP_BG_REL_R DISP_BG_REL_B; - rel2.to: "ui.rect.bg"; - image.normal: "01_dialogue_field_bg.png"; - image.border: 4 4 4 4; - align: 0.5 0.0; - } - } - /*part { - name: "ui.img.bg.disp2"; - scale: 1; - mouse_events: 1; - description { - min: 0 DISP_BG_H; - fixed: 1 1; - state: "default" 0.0; - rel1.to: "ui.img.bg.disp"; - rel2.to: "ui.img.bg.disp"; - image.normal: "01_dialogue_field_bg.png"; - visible: 0; - image.border: 4 4 4 4; - align: 0.5 0.0; - } - description { - min: 0 DISP_BG_H; - fixed: 1 1; - state: "hybrid" 0.0; - inherit: "default" 0.0; - rel1.to: "ui.img.bg.disp"; - rel1.relative: 0.0 1.0; - rel2.to: "ui.img.bg.disp"; - rel2.relative: 1.0 1.0; - visible: 1; - } - }*/ - } -} - diff --git a/data/edc/inc.myaccount_sns_sync_interval.edc b/data/edc/inc.myaccount_sns_sync_interval.edc deleted file mode 100755 index 88d79ba..0000000 --- a/data/edc/inc.myaccount_sns_sync_interval.edc +++ /dev/null @@ -1,31 +0,0 @@ -group -{ - name: "sns_sync_interval"; - min: MAIN_W MAIN_H; - - parts { - part { name: "rect"; - type: RECT; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 0; } - rel2 { relative: 1.0 1.0; offset: -1 -1; } - //color: 74 74 74 255; - color: 0 0 0 255; - } - } - part { - name: "body"; - type: SWALLOW; - mouse_events: 1; - description - { - state: "default" 0.0; - //rel1 { relative: 0.0 88/800; to, "rect"; } - rel1 { relative: 0.0 100/800; to, "rect"; } - rel2 { relative: 1.0 1.0; to, "rect"; } - } - } - } -} diff --git a/data/edc/inc.myaccount_sync_settings_with_seven.edc b/data/edc/inc.myaccount_sync_settings_with_seven.edc deleted file mode 100755 index 3f056a5..0000000 --- a/data/edc/inc.myaccount_sync_settings_with_seven.edc +++ /dev/null @@ -1,549 +0,0 @@ -#define POSX_SUN (24/480) -#define POSX_MON (88/480) -#define POSX_TUE (152/480) -#define POSX_WED (216/480) -#define POSX_THU (280/480) -#define POSX_FRI (344/480) -#define POSX_SAT (408/480) -#define POSY_DAY (43/99) -#define ALARM_LIST_H 90 - -#define COLOR_1 255 255 255 255 -#define COLOR_2 0 0 0 255 - -#define WEEKLY_UP_H (90/151) -#define WEEKLY_DOWN_H (61/151) - - -group { - name: "sync-settings-with-seven"; - min: MAIN_W MAIN_H; - - parts { - part { name: "background"; - type: RECT; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 0; } - rel2 { relative: 1.0 1.0; offset: -1 -1; } - //color: 74 74 74 255; - color: 0 0 0 255; - } - } - - part - { - name: "softkey"; - type: SWALLOW; - mouse_events: 1; - - description - { - state: "default" 0.0; - rel1 { relative: 0.0 0.9; to: "background"; } - rel2 { relative: 1.0 1.0; to: "background"; } - - } - } - part - { - name: "titlebar"; - type: SWALLOW; - mouse_events: 0; - - description - { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; to: "background"; } - rel2 { relative: 1.0 TITLE_BAR_H; to: "background"; } - - } - } - } - } - - group { - name: "repeat"; - - parts { - part { - name: "bg"; - type: RECT; - mouse_events: 1; - description { - min: 0 ALARM_LIST_H; - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 0; } - rel2 { relative: 1.0 1.0; offset: 0 0; } - color: 0 0 0 0; - } - } - part { - name: "img/bg/top"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 0; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: 0 5; to: "bg"; } - image.normal: "01_dialog_field_input_top.png"; - } - } - part { - name: "img/bg/bottom"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 1.0; offset: 0 -5; to: "bg"; } - rel2 { relative: 1.0 1.0; offset: 0 0; to: "bg"; } - image.normal: "01_dialog_field_input_bottom.png"; - } - } - part { - name: "img/bg/middle"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 1.0; offset: 0 0; to: "img/bg/top"; } - rel2 { relative: 1.0 0.0; offset: 1 0; to: "img/bg/bottom"; } - image.normal: "01_dialog_field_input_middle.png"; - } - } - part { - name: "part/img/bg"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { to: "bg"; } - rel2 { to: "bg"; } - image.normal: "01_dialog_field_lighting.png"; - } - description { - state: "pressed" 0.0; - inherit: "default" 0.0; - image.normal: "tw3_list_select.png"; - } - } - part { - name: "part/text/top"; - type: TEXT; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 18 10; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: 0 40; to: "bg"; } - text { text_class: "tc_top"; align: 0.0 0.5; } - color: COLOR_1; - color2: COLOR_2; - } - } -#define PART_DAY(title, pass, rel1x, rely, where) \ - part { \ - name: "part/rect/"title; \ - type: RECT; \ - mouse_events: pass; \ - description { \ - state: "default" 0.0; \ - rel1 { relative: rel1x rely; offset: 0 0; to: where; } \ - rel2 { relative: rel1x rely; offset: 50 50; to: where; } \ - color: 0 0 0 0; \ - } \ - } \ - part { \ - name: "part/img/"title; \ - type: IMAGE; \ - mouse_events: 0; \ - description { \ - state: "default" 0.0; \ - rel1 { to: "part/rect/"title; } \ - rel2 { to: "part/rect/"title; } \ - image.normal: "50_repeat_btn.png"; \ - } \ - description { \ - state: "pressed" 0.0; \ - inherit: "default" 0.0; \ - image.normal: "50_repeat_btn_Press.png"; \ - } \ - } \ - part { \ - name: "part/text/"title; \ - type: TEXT; \ - mouse_events: 0; \ - description { \ - state: "default" 0.0; \ - rel1 { to: "part/rect/"title; }; \ - rel2 { to: "part/rect/"title; }; \ - text { text_class: "tc_day"; align: 0.5 0.5; } \ - color: COLOR_1; \ - } \ - description { \ - state: "pressed" 0.0; \ - inherit: "default" 0.0; \ - color: COLOR_2; \ - } \ - } - - PART_DAY("sun", 0, POSX_SUN, POSY_DAY, "bg") - PART_DAY("mon", 0, POSX_MON, POSY_DAY, "bg") - PART_DAY("tue", 0, POSX_TUE, POSY_DAY, "bg") - PART_DAY("wed", 0, POSX_WED, POSY_DAY, "bg") - PART_DAY("thu", 0, POSX_THU, POSY_DAY, "bg") - PART_DAY("fri", 0, POSX_FRI, POSY_DAY, "bg") - PART_DAY("sat", 0, POSX_SAT, POSY_DAY, "bg") - } - programs { - program { - name: "prog/down/list"; - signal: "mouse,down,*"; - source: "bg"; - script { - set_state(PART:"part/img/bg", "pressed", 0.0); - } - } - program { - name: "prog/up/list"; - signal: "mouse,up,1"; - source: "bg"; - script { - set_state(PART:"part/img/bg", "default", 0.0); - } - } -/* program { - name: "prog/move/list"; - signal: "mouse,move"; - source: "bg"; - script { - set_state(PART:"part/img/bg", "default", 0.0); - } - } -*/ program { - name: "prog/clicked/list"; - signal: "mouse,clicked,1"; - source: "bg"; - script { - emit("clicked", "repeat"); - } - } - program - { - name: "peakday_pressed"; - signal: "mouse,clicked,1"; - source: "bg"; - action: SIGNAL_EMIT "peakday_pressed" "repeat" ; - } - -#define PROG_DAY(title, sig) \ - program { \ - name: "prog/down/"title; \ - signal: "mouse,down,*"; \ - source: "part/rect/"title; \ - script { \ - set_state(PART:"part/img/"title, "pressed", 0.0); \ - set_state(PART:"part/text/"title, "pressed", 0.0); \ - } \ - } \ - program { \ - name: "prog/up/"title; \ - signal: "mouse,up,1"; \ - source: "part/rect/"title; \ - script { \ - set_state(PART:"part/img/"title, "default", 0.0); \ - set_state(PART:"part/text/"title, "default", 0.0); \ - } \ - } \ - program { \ - name: "prog/clicked/"title; \ - signal: "mouse,clicked,1"; \ - source: "part/rect/"title; \ - script { \ - emit("clicked", sig); \ - } \ - } - PROG_DAY("sun", "0") - PROG_DAY("mon", "1") - PROG_DAY("tue", "2") - PROG_DAY("wed", "3") - PROG_DAY("thu", "4") - PROG_DAY("fri", "5") - PROG_DAY("sat", "6") - } - } - group { - name: "page/repeat"; - - parts { - part { - name: "background"; - type: RECT; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 0; } - rel2 { relative: 1.0 1.0; offset: -1 -1; } - color: 0 0 0 255; - } - } - } - } - - - group { - name: "list/repeat"; - - parts { - part { - name: "bg"; - type: RECT; - mouse_events: 1; - description { - min: 0 ALARM_LIST_H; - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 10 0; } - rel2 { relative: 1.0 1.0; offset: -9 -1; } - color: 0 0 0 0; - } - } - part { - name: "img/bg/top"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 0; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: 0 5; to: "bg"; } - image.normal: "01_dialog_field_input_top.png"; - } - } - part { - name: "img/bg/bottom"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 1.0; offset: 0 -5; to: "bg"; } - rel2 { relative: 1.0 1.0; offset: 0 0; to: "bg"; } - image.normal: "01_dialog_field_input_bottom.png"; - } - } - part { - name: "img/bg/middle"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 1.0; offset: 0 0; to: "img/bg/top"; } - rel2 { relative: 1.0 0.0; offset: 1 0; to: "img/bg/bottom"; } - image.normal: "01_dialog_field_input_middle.png"; - } - } - part { - name: "part/img/bg"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { to: "bg"; } - rel2 { to: "bg"; } - image.normal: "01_dialog_field_lighting.png"; - } - description { - state: "pressed" 0.0; - inherit: "default" 0.0; - image.normal: "tw3_list_select.png"; - } - } - part { - name: "part/swl/button"; - type: SWALLOW; - mouse_events: 1; - description { - state: "default" 0.0; - color: 0 0 0 0; - rel1 { relative: 1.0 0.5; offset: -79 -25; to: "bg"; } - rel2 { relative: 1.0 0.5; offset: -29 24; to: "bg"; } - } - } - part { - name: "part/text/middle"; - type: TEXT; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 24 0; to: "bg"; } - rel2 { relative: 0.0 1.0; offset: 0 0 ; to_x: "part/swl/button"; } - text { text_class: "tc_middle"; align: 0.0 0.5; } - color: COLOR_1; - color2: COLOR_2; - } - } - } - } - group { - name: "list/repeat/weekly"; - - parts { - part { - name: "bg"; - type: RECT; - mouse_events: 1; - description { - min: 0 152; - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 10 0; } - rel2 { relative: 1.0 1.0; offset: -9 -1; } - color: 0 0 0 0; - } - } - part { - name: "img/bg/top"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 0; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: 0 5; to: "bg"; } - image.normal: "01_dialog_field_input_top.png"; - } - } - part { - name: "img/bg/bottom"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 1.0; offset: 0 -5; to: "bg"; } - rel2 { relative: 1.0 1.0; offset: 0 0; to: "bg"; } - image.normal: "01_dialog_field_input_bottom.png"; - } - } - part { - name: "img/bg/middle"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 1.0; offset: 0 0; to: "img/bg/top"; } - rel2 { relative: 1.0 0.0; offset: 1 0; to: "img/bg/bottom"; } - image.normal: "01_dialog_field_input_middle.png"; - } - } - part { - name: "part/img/bg"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { to: "bg"; } - rel2 { to: "bg"; } - image.normal: "01_dialog_field_lighting.png"; - } - description { - state: "pressed" 0.0; - inherit: "default" 0.0; - image.normal: "tw3_list_select.png"; - } - } - part { - name: "part/rect/up"; - type: RECT; - mouse_events: 0; - description { - state: "default" 0.0; - color: 0 0 0 0; - rel1 { relative: 0.0 0.0; to: "bg"; } - rel2 { relative: 1.0 WEEKLY_UP_H; to: "bg"; } - } - } - part { - name: "part/rect/down"; - type: RECT; - mouse_events: 0; - description { - state: "default" 0.0; - color: 0 0 0 0; - rel1 { relative: 0.0 1.0; to: "part/rect/up"; } - rel2 { relative: 1.0 1.0; to: "bg"; } - } - } - part { - name: "part/swl/button"; - type: SWALLOW; - mouse_events: 1; - description { - state: "default" 0.0; - color: 0 0 0 0; - rel1 { relative: 1.0 0.0; offset: -79 25; to: "part/rect/up"; } - rel2 { relative: 1.0 0.0; offset: -29 75; to: "part/rect/up"; } - } - } - part { - name: "part/text/middle"; - type: TEXT; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 24 0; to: "part/rect/up"; } - rel2 { relative: 0.0 1.0; offset: 0 0 ; to_x: "part/swl/button"; to_y: "part/rect/up"; } - text { text_class: "tc_middle"; align: 0.0 0.5; } - color: COLOR_1; - color2: COLOR_2; - } - } - - PART_DAY("sun", 1, POSX_SUN, 0.0, "part/rect/down") - PART_DAY("mon", 1, POSX_MON, 0.0, "part/rect/down") - PART_DAY("tue", 1, POSX_TUE, 0.0, "part/rect/down") - PART_DAY("wed", 1, POSX_WED, 0.0, "part/rect/down") - PART_DAY("thu", 1, POSX_THU, 0.0, "part/rect/down") - PART_DAY("fri", 1, POSX_FRI, 0.0, "part/rect/down") - PART_DAY("sat", 1, POSX_SAT, 0.0, "part/rect/down") - - part { - name: "part/rect/mask"; - type: RECT; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { to: "bg"; } - rel2 { to: "bg"; } - color: 0 0 0 0; - } - description { - state: "on/mask" 0.0; - inherit: "default" 0.0; - color: 0 0 0 150; - } - } - } - programs { - PROG_DAY("sun", "0") - PROG_DAY("mon", "1") - PROG_DAY("tue", "2") - PROG_DAY("wed", "3") - PROG_DAY("thu", "4") - PROG_DAY("fri", "5") - PROG_DAY("sat", "6") - - program { - name: "prog/on/mask"; - signal: "on"; - source: "part/rect/mask"; - script { - set_state(PART:"part/rect/mask", "on/mask", 0.0); - } - } - program { - name: "prog/off/mask"; - signal: "off"; - source: "part/rect/mask"; - script { - set_state(PART:"part/rect/mask", "off/mask", 0.0); - } - } - } - } - \ No newline at end of file diff --git a/data/edc/inc.myaccount_view_priority.edc b/data/edc/inc.myaccount_view_priority.edc deleted file mode 100755 index dfb2be4..0000000 --- a/data/edc/inc.myaccount_view_priority.edc +++ /dev/null @@ -1,32 +0,0 @@ -group -{ - name: "view_priority"; - min: MAIN_W MAIN_H; - - parts { - part { name: "rect"; - type: RECT; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 0; } - rel2 { relative: 1.0 1.0; offset: -1 -1; } - //color: 74 74 74 255; - color: 0 0 0 255; - } - } - - part { - name: "body"; - type: SWALLOW; - mouse_events: 1; - description - { - state: "default" 0.0; - //rel1 { relative: 0.0 88/800; to, "rect"; } - rel1 { relative: 0.0 100/800; to, "rect"; } - rel2 { relative: 1.0 1.0; to, "rect"; } - } - } - } -} \ No newline at end of file diff --git a/data/edc/inc.myaccount_without_seven.edc b/data/edc/inc.myaccount_without_seven.edc deleted file mode 100755 index f23ddc3..0000000 --- a/data/edc/inc.myaccount_without_seven.edc +++ /dev/null @@ -1,510 +0,0 @@ - - group { - name: "addaccount_without_seven_ui"; - min: MAIN_W MAIN_H; - - parts { - part { name: "background"; - type: RECT; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 0; } - rel2 { relative: 1.0 1.0; offset: -1 -1; } - //color: 74 74 74 255; - color: 0 0 0 255; - } - } - - part - { - name: "softkey"; - type: SWALLOW; - mouse_events: 1; - - description - { - state: "default" 0.0; - rel1 { relative: 0.0 0.9; to: "background"; } - rel2 { relative: 1.0 1.0; to: "background"; } - - } - } - part - { - name: "titlebar"; - type: SWALLOW; - mouse_events: 0; - - description - { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; to: "background"; } - rel2 { relative: 1.0 0.1; to: "background"; } - - } - } - - part - { - name: "body"; - type: SWALLOW; - mouse_events: 1; - description - { - state: "default" 0.0; - rel1 { relative: 0.0 85/MAIN_H; to, "background"; } - rel2 { relative: 1.0 1.0; to, "background"; } - } - } - } - } - -group { - name: "without-seven-account-entries1"; - min: 470 25+52+27; - max: 470 25+52+27; - parts { - part { - name: "bg"; - type: RECT; - mouse_events: 1; - description { - state: "default" 0.0; - color: 74 74 74 255; - rel1 { relative: 0.0 0.0; offset: 0 0; } - rel2 { relative: 1.0 1.0; offset: 0 0; } - } - } - - part { - name: "background-strip"; - type: IMAGE; - mouse_events: 1; - description - { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 10 0; to: bg; } - rel2 { relative: 1.0 1.0; offset: -10 0; to: bg; } - image { normal: "myaccount_bg.png";} - } - } - - part { - name: "bada"; - type: IMAGE; - mouse_events: 1; - scale: 1; - description - { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 14 25; to: "background-strip"; } - rel2 { relative: 0.0 0.0; offset: 14+52 25+52; to: "background-strip"; } - image { normal: "bada.png";} - } - - } - - part { - name: "name"; - type: TEXT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 14+52+10 0; to: "background-strip"; } - text { text: "bada"; font: "GP_Latin"; size: 24; align: 0.0 0.5;} - color: 255 255 255 255; - } - } - } - } - - - group { - name: "without-seven-account-entries2"; - min: 470 110; - max: 470 110; - parts { - part { - name: "bg"; - type: RECT; - mouse_events: 1; - description { - state: "default" 0.0; - color: 74 74 74 255; - rel1 { relative: 0.0 0.0; offset: 0 0; } - rel2 { relative: 1.0 1.0; offset: 0 0; } - } - } - - part { - name: "Web Accounts"; - type: TEXT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 10 0.0; to: "bg"; } - text { text: "Web Accounts"; font: "GP_Latin"; size: 24; align: 0.0 0.5;} - color: 255 255 255 255; - } - } - - part - { - name: "Web-Sync-schedule"; - type: SWALLOW; - mouse_events: 1; - description - { - min: 106 50; - max: 106 50; - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 364 10; to: "bg"; } - rel2 { relative: 0.0 0.0; offset: 470 60; to: "bg"; } - } - } - - part { - name: "background-strip1"; - type: IMAGE; - mouse_events: 1; - description - { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 10 70; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: -10 170; to: "bg"; } - image { normal: "myaccount_bg.png";} - } - } - - - part { - name: "without-seven-user-name1"; - type: TEXT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 14 35; to: "background-strip1"; } - text { text: "Joe"; font: "GP_Latin"; size: 24; align: 0.0 0.5;} - color: 255 255 255 255; - } - } - - part { - name: "without-seven-email-id1"; - type: TEXT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 14 90; to: "background-strip1"; } - text { text: "Joe@hotmail.com"; font: "GP_Latin"; size: 20; align: 0.0 0.5;} - color: 255 255 0 255; - } - } - - part { - name: "background-strip2"; - type: IMAGE; - mouse_events: 1; - description - { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 10 170; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: -10 270; to: "bg"; } - image { normal: "myaccount_bg.png";} - } - } - - - part { - name: "user-name2"; - type: TEXT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 14 135; to: "background-strip2"; } - text { text: "Brin"; font: "GP_Latin"; size: 24; align: 0.0 0.5;} - color: 255 255 255 255; - } - } - - part { - name: "email-id2"; - type: TEXT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 14 190; to: "background-strip2"; } - text { text: "brin@yahoo.com"; font: "GP_Latin"; size: 20; align: 0.0 0.5;} - color: 255 255 0 255; - } - } - - - - part { - name: "Exchange ActiveSync"; - type: TEXT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 10 268+146+5+38+78; to: "bg"; } - text { text: "Exchange ActiveSync"; font: "GP_Latin"; size: 24; align: 0.0 0.5;} - color: 255 255 255 255; - } - } - - part - { - name: "Sync schedule"; - //type: TEXT; - type: SWALLOW; - mouse_events: 1; - description - { - min: 106 50; - max: 106 50; - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 354 268+146+5+38+52; to: "bg"; } - } - } - - - part { - name: "background-strip4"; - type: IMAGE; - mouse_events: 1; - description - { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 10 270+50+10+10; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: -10 370+50+10; to: "bg"; } - image { normal: "myaccount_bg.png";} - } - } - - - - - part { - name: "Exchange ActiveSync-name1"; - type: TEXT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 14 300; to: "background-strip4"; } - text { text: "Joe"; font: "GP_Latin"; size: 24; align: 0.0 0.5;} - color: 255 255 255 255; - } - } - - part { - name: "Exchange ActiveSync-userid1"; - type: TEXT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 14 295+55; to: "background-strip4"; } - text { text: "joe@hotmail.com"; font: "GP_Latin"; size: 20; align: 0.0 0.5;} - color: 255 255 0 255; - } - } - - - - part { - name: "background-strip5"; - type: IMAGE; - mouse_events: 1; - description - { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 10 370+50+10; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: -10 370+50+10+100; to: "bg"; } - image { normal: "myaccount_bg.png";} - } - } - - - - part { - name: "Exchange ActiveSync-name2"; - type: TEXT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 14 328+100-33; to: "background-strip5"; } - text { text: "Brin"; font: "GP_Latin"; size: 24; align: 0.0 0.5;} - color: 255 255 255 255; - } - } - - part { - name: "Exchange ActiveSync-userid2"; - type: TEXT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 14 328+100-33+55; to: "background-strip5"; } - text { text: "brin@yahoo.com"; font: "GP_Latin"; size: 20; align: 0.0 0.5;} - color: 255 255 0 255; - } - } - - - - part { - name: "Social Networks"; - type: TEXT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 10 268+146+5+38+90+510; to: "bg"; } - text { text: "Social Networks"; font: "GP_Latin"; size: 24; align: 0.0 0.5;} - color: 255 255 255 255; - } - } - - part - { - name: "Social-networks-Sync-schedule"; - //type: TEXT; - type: SWALLOW; - mouse_events: 1; - description - { - min: 106 50; - max: 106 50; - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 354 268+146+5+38+78+495; to: "bg"; } - } - } - - - part { - name: "background-strip6"; - type: IMAGE; - mouse_events: 1; - description - { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 10 268+146+5+38+144; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: -10 368+146+5+38+144; to: "bg"; } - image { normal: "myaccount_bg.png";} - } - } - - - - - part { - name: "social-network-img1"; - type: IMAGE; - mouse_events: 1; - scale: 1; - description - { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 14 22; to: "background-strip6"; } - rel2 { relative: 0.0 0.0; offset: 14+52 25+52; to: "background-strip6"; } - image { normal: "twitter.png";} - } - } - - part { - name: "social-network-name1"; - type: TEXT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 14+52+10 540; to: "background-strip6"; } - text { text: "Twitter"; font: "GP_Latin"; size: 24; align: 0.0 0.5;} - color: 255 255 255 255; - } - } - - part { - name: "social-network-userid1"; - type: TEXT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 14+52+10 540+65; to: "background-strip6"; } - text { text: "terry.joo"; font: "GP_Latin"; size: 20; align: 0.0 0.5;} - color: 255 255 0 255; - } - } - - - - part { - name: "background-strip7"; - type: IMAGE; - mouse_events: 1; - description - { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 10 368+146+5+38+134; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: -10 468+146+5+38+134; to: "bg"; } - image { normal: "myaccount_bg.png";} - } - } - - - part { - name: "bada4"; - type: IMAGE; - mouse_events: 1; - scale: 1; - description - { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 14 22; to: "background-strip7"; } - rel2 { relative: 0.0 0.0; offset: 14+52 25+52; to: "background-strip7"; } - image { normal: "facebook.png";} - } - } - - part { - name: "social-network-name2"; - type: TEXT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 14+52+10 640; to: "background-strip7"; } - text { text: "Facebook"; font: "GP_Latin"; size: 24; align: 0.0 0.5;} - color: 255 255 255 255; - } - } - - part { - name: "social-network-userid2"; - type: TEXT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 14+52+10 640+65; to: "background-strip7"; } - text { text: "rohit.sahay"; font: "GP_Latin"; size: 20; align: 0.0 0.5;} - color: 255 255 0 255; - } - } - } - } - - diff --git a/data/edc/inc.pre-set.edc b/data/edc/inc.pre-set.edc deleted file mode 100755 index e525d56..0000000 --- a/data/edc/inc.pre-set.edc +++ /dev/null @@ -1,455 +0,0 @@ -#define MAIN_W 480 -#define MAIN_H 800 -#define TITLE_BAR_H (100/800) - -images -{ - image: "bg.png" LOSSY 99; - image: "gmail.png" LOSSY 99; - image: "01_button_on_lighting.png" LOSSY 99; - image: "01_on_off_button_on.png" LOSSY 99; - image: "01_on_off_button.png" LOSSY 99; -} - - - group { - name: "preset-web"; - min: MAIN_W MAIN_H; - - parts { - part { name: "background"; - type: RECT; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 0; } - rel2 { relative: 1.0 1.0; offset: -1 -1; } - //color: 74 74 74 255; - color: 0 0 0 255; - } - } - part { name: "body"; - type: SWALLOW; - mouse_events: 1; - description { - state: "default" 0.0; - //rel1 { relative: 0.0 80/MAIN_H; offset: 0 0; } - rel1 { relative: 0.0 TITLE_BAR_H/MAIN_H; offset: 0 0; } - rel2 { relative: 1.0 1.0; offset: -1 -1; } - } - } - part - { - name: "softkey"; - type: SWALLOW; - mouse_events: 1; - - description - { - state: "default" 0.0; - rel1 { relative: 0.0 0.9; to: "background"; } - rel2 { relative: 1.0 1.0; to: "background"; } - - } - } - part - { - name: "titlebar"; - type: SWALLOW; - mouse_events: 0; - - description - { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; to: "background"; } - rel2 { relative: 1.0 TITLE_BAR_H; to: "background"; } - - } - } - } - } - -#if 0 - - group { - name: "account-information"; - min: 480 102; - //max: 480 800-88; - parts { - part { - name: "bg"; - type: RECT; - mouse_events: 1; - description { - state: "default" 0.0; - color: 74 74 74 255; - rel1 { relative: 0.0 0.0; offset: 0 0; } - rel2 { relative: 1.0 1.0; offset: 0 0; } - } - } - - part { - name: "background-account-info1"; - type: IMAGE; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 10 0; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: -10 102; to: "bg"; } - image { normal: "myaccount_bg.png";} - } - } - part { - name: "gmail-icon"; - type: IMAGE; - mouse_events: 1; - scale: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 14 25; to: "background-account-info1"; } - rel2 { relative: 0.0 0.0; offset: 14+52 25+52; to: "background-account-info1"; } - image { normal: "gmail.png";} - } - - } - - part { - name: "gmail-name"; - type: TEXT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 14+52+10 0; to: "background-account-info1"; } - text { text: "sean"; font: "GP_Latin"; size: 24; align: 0.0 0.5;} - //text { text: ""; font: "GP_Latin"; size: 24; align: 0.0 0.5;} - color: 255 255 255 255; - } - } - - part { - name: "gmail-id"; - type: TEXT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 14+52+10 65; to: "background-account-info1"; } - text { text: "sean@gmail.com"; font: "GP_Latin"; size: 24; align: 0.0 0.5;} - color: 255 255 0 255; - } - } - - part { - name: "background-account-info2"; - type: IMAGE; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 10 103; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: -10 205; to: "bg"; } - image { normal: "myaccount_bg.png";} - } - } - part { - name: "gmail-id"; - type: TEXT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 28 103; to: "background-account-info2"; } - //text { text: "sean@gmail.com"; font: "GP_Latin"; size: 24; align: 0.0 0.5;} - text { text: ""; font: "GP_Latin"; size: 24; align: 0.0 0.5;} - color: 255 255 255 255; - } - } - - part { - name: "background-account-info3"; - type: IMAGE; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 10 205+8-102; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: -10 205+8+99-102; to: "bg"; } - image { normal: "bg.png";} - } - } - part { - name: "email-button-on-lighting"; - type: IMAGE; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 365 205+8-102; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: -10 205+8+99-102; to: "bg"; } - image { normal: "01_button_on_lighting.png";} - } - } - part { - name: "email-on-off"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 28 24; to: "email-button-on-lighting"; } - rel2 { relative: 0.0 0.0; offset: 78 74; to: "email-button-on-lighting"; } - image { normal: "01_on_off_button_on.png";} - } - description { - state: "off" 0.0; - rel1 { relative: 0.0 0.0; offset: 28 24; to: "email-button-on-lighting"; } - rel2 { relative: 0.0 0.0; offset: 78 74; to: "email-button-on-lighting"; } - image { normal: "01_on_off_button.png";} - } - - } - - - part { - name: "email"; - type: TEXT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 28 213-102; to: "background-account-info3"; } - text { text: "Email"; font: "GP_Latin"; size: 24; align: 0.0 0.5;} - color: 255 255 255 255; - } - } - - part { - name: "background-account-info4"; - type: IMAGE; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 10 312+2-102; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: -10 312+2+99-102; to: "bg"; } - image { normal: "myaccount_bg.png";} - } - } - part { - name: "im-button-on-lighting"; - type: IMAGE; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 365 312+2-102; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: -10 312+2+99-102; to: "bg"; } - image { normal: "01_button_on_lighting.png";} - } - } - part { - name: "im-on-off"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 28 24; to: "im-button-on-lighting"; } - rel2 { relative: 0.0 0.0; offset: 78 74; to: "im-button-on-lighting"; } - image { normal: "01_on_off_button_on.png";} - } - description { - state: "off" 0.0; - rel1 { relative: 0.0 0.0; offset: 28 24; to: "im-button-on-lighting"; } - rel2 { relative: 0.0 0.0; offset: 78 74; to: "im-button-on-lighting"; } - image { normal: "01_on_off_button.png";} - } - - } - part { - name: "Instant-messenger"; - type: TEXT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 28 314-102; to: "background-account-info4"; } - text { text: "Instant messenger"; font: "GP_Latin"; size: 24; align: 0.0 0.5;} - color: 255 255 255 255; - } - } - - part { - name: "background-account-info5"; - type: IMAGE; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 10 413+2-102; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: -10 413+2+99-102; to: "bg"; } - image { normal: "myaccount_bg.png";} - } - } - part { - name: "contact-sync-button-on-lighting"; - type: IMAGE; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 365 413+2-102; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: -10 413+2+99-102; to: "bg"; } - image { normal: "01_button_on_lighting.png";} - } - } - part { - name: "contact-sync-on-off"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 28 24; to: "contact-sync-button-on-lighting"; } - rel2 { relative: 0.0 0.0; offset: 78 74; to: "contact-sync-button-on-lighting"; } - image { normal: "01_on_off_button.png";} - } - description { - state: "on" 0.0; - rel1 { relative: 0.0 0.0; offset: 28 24; to: "contact-sync-button-on-lighting"; } - rel2 { relative: 0.0 0.0; offset: 78 74; to: "contact-sync-button-on-lighting"; } - image { normal: "01_on_off_button_on.png";} - } - - } - - - part { - name: "contact-sync"; - type: TEXT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 28 415-102; to: "background-account-info5"; } - text { text: "Contact sync"; font: "GP_Latin"; size: 24; align: 0.0 0.5;} - color: 255 255 255 255; - } - } - - part { - name: "background-account-info6"; - type: IMAGE; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 10 514+2-102; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: -10 514+2+99-102; to: "bg"; } - image { normal: "myaccount_bg.png";} - } - } - part { - name: "calendar-sync-button-on-lighting"; - type: IMAGE; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 365 514+2-102; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: -10 514+2+99-102; to: "bg"; } - image { normal: "01_button_on_lighting.png";} - } - } - part { - name: "calendar-sync-on-off"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 28 24; to: "calendar-sync-button-on-lighting"; } - rel2 { relative: 0.0 0.0; offset: 78 74; to: "calendar-sync-button-on-lighting"; } - image { normal: "01_on_off_button.png";} - } - description { - state: "on" 0.0; - rel1 { relative: 0.0 0.0; offset: 28 24; to: "calendar-sync-button-on-lighting"; } - rel2 { relative: 0.0 0.0; offset: 78 74; to: "calendar-sync-button-on-lighting"; } - image { normal: "01_on_off_button_on.png";} - } - - } - part { - name: "calendar-sync"; - type: TEXT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 28 516-102; to: "background-account-info6";} - text { text: "Calendar sync"; font: "GP_Latin"; size: 24; align: 0.0 0.5;} - color: 255 255 255 255; - } - } - part { - name: "background-account-info7"; - type: IMAGE; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 10 623-102; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: -10 623+104-102; to: "bg"; } - image { normal: "myaccount_bg.png";} - } - } - - part { - name: "sync-schedule-button-on-lighting"; - type: IMAGE; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 365 623-102; to: "bg"; } - rel2 { relative: 1.0 0.0; offset: -10 623+104-102; to: "bg"; } - image { normal: "01_button_on_lighting.png";} - } - } - part { - name: "sync-schedule-on-off"; - type: IMAGE; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 28 24; to: "sync-schedule-button-on-lighting"; } - rel2 { relative: 0.0 0.0; offset: 78 74; to: "sync-schedule-button-on-lighting"; } - image { normal: "01_on_off_button_on.png";} - } - description { - state: "off" 0.0; - rel1 { relative: 0.0 0.0; offset: 28 24; to: "sync-schedule-button-on-lighting"; } - rel2 { relative: 0.0 0.0; offset: 78 74; to: "sync-schedule-button-on-lighting"; } - image { normal: "01_on_off_button.png";} - } - } - part { - name: "sync-schedule"; - type: TEXT; - scale: 1; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 28 623-102; to: "background-account-info7";} - text { text: "Sync schedule"; font: "GP_Latin"; size: 24; align: 0.0 0.5;} - color: 255 255 255 255; - } - } - - } - programs { - program { - /* - name: "on-off-email"; - source: "email-button-on-lighting"; - signal: "mouse,clicked,1"; - action: SIGNAL_EMIT "email-on-off-clicked" "email-button-on-lighting"; - */ - - name: "on-off-email"; - source: "email-button-on-lighting"; - signal: "mouse,clicked,1"; - action: SIGNAL_EMIT "on-off-email" ""; - } - } -} - - -#endif \ No newline at end of file diff --git a/data/edc/inc.preset_email.edc b/data/edc/inc.preset_email.edc deleted file mode 100755 index d640d8b..0000000 --- a/data/edc/inc.preset_email.edc +++ /dev/null @@ -1,105 +0,0 @@ - - group { - name: "pre-set-email"; - min: MAIN_W MAIN_H; - - parts { - part { name: "background"; - type: RECT; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 0; } - rel2 { relative: 1.0 1.0; offset: -1 -1; } - //color: 74 74 74 255; - color: 0 0 0 0; - } - } - - part - { - name: "softkey"; - type: SWALLOW; - mouse_events: 1; - - description - { - state: "default" 0.0; - rel1 { relative: 0.0 0.9; to: "background"; } - rel2 { relative: 1.0 1.0; to: "background"; } - - } - } - part - { - name: "titlebar"; - type: SWALLOW; - mouse_events: 0; - - description - { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; to: "background"; } - rel2 { relative: 1.0 TITLE_BAR_H; to: "background"; } - - } - } - } - } - - group { - name: "preset_email_setting_entries"; - - parts { - - part { name: "bg"; - type: RECT; - mouse_events: 1; - description { - state: "default" 0.0; - min: 480 112; - max: 480 112; - color:255 255 255 0; - visible: 0; - } - } - - part { name: "img"; - type: IMAGE; - mouse_events: 1; - scale: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 10 0; to: bg; } - rel2 { relative: 1.0 1.0; offset: -10 -8; to: bg; } - image { normal: "myaccount_bg.png";} - } - } - - part { name: "name"; - type: TEXT; - mouse_events: 1; - scale: 1; - description { - state: "default" 0.0; - rel1 { relative: 14/480 0.05; offset: 18 0; to: bg; } - rel2 { relative: 0.8 0.30; to: bg; } - // text { text: "Account name"; font: "GP_Latin"; size: 24; align: 0.0 0.5;} - text { font: "GP_Latin"; size: 24; align: 0.0 0.5;} - color: 146 146 146 255; - } - } - - part { name: "entry"; - type: SWALLOW; - mouse_events: 1; - scale: 1; - description { - state: default 0.0; - rel1 { relative: 14/480 0.35; offset: 18 0; to: bg; } - rel2 { relative: 0.9 0.7; to: bg; } - } - } - } - } - diff --git a/data/edc/inc.sns-account.edc b/data/edc/inc.sns-account.edc deleted file mode 100755 index 4b0a3ef..0000000 --- a/data/edc/inc.sns-account.edc +++ /dev/null @@ -1,117 +0,0 @@ -group -{ - name: "snsaccount_ui"; - min: MAIN_W MAIN_H; - - parts { - part { name: "rect"; - type: RECT; - mouse_events: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 0 0; } - rel2 { relative: 1.0 1.0; offset: -1 -1; } - //color: 74 74 74 255; - color: 0 0 0 255; - } - } - - part - { - - name, "titlebar"; - type, SWALLOW; - mouse_events, 0; - description - { - state, "default" 0.0; - rel1 { relative, 0.0 0.0; to, "rect";} - rel2 { relative, 1.0 82/800; to, "rect";} - } - } - - part - { - name: "softkey"; - type: SWALLOW; - mouse_events: 1; - - description - { - state: "default" 0.0; - color: 0 0 0 128; - rel1 { relative: 0.0 0.9; to: "rect"; } - rel2 { relative: 1.0 1.0; to: "rect"; } - } - } - } -} - group { - name: "sns_account_entries"; - parts { - part { name: "bg"; - type: RECT; - mouse_events: 1; - description { - state: "default" 0.0; - min: 480 104; - max: 480 104; - color:255 255 255 0; - visible: 0; - } - } - - part { name: "img"; - type: IMAGE; - mouse_events: 1; - scale: 1; - description { - state: "default" 0.0; - rel1 { relative: 0.0 0.0; offset: 10 0; to: bg; } - rel2 { relative: 1.0 1.0; offset: -10 0; to: bg; } - image { normal: "myaccount_bg.png";} - } - } - - part { name: "name"; - type: TEXT; - mouse_events: 1; - scale: 1; - description { - state: "default" 0.0; - rel1 { relative: 14/480 0.05; to: bg; } - rel2 { relative: 0.8 0.30; to: bg; } - // text { text: "Account name"; font: "GP_Latin"; size: 24; align: 0.0 0.5;} - text { font: "GP_Latin"; size: 24; align: 0.0 0.5;} - color: 146 146 146 255; - } - } - - part { - name: "entry"; - type: SWALLOW; - mouse_events: 1; - scale: 1; - description { - state: default 0.0; - rel1 { relative: 14/480 0.35; to: bg; } - rel2 { relative: 0.9 0.7; to: bg; } - } - } - - /*part { - name: "button"; - type: SWALLOW; - mouse_events: 1; - scale: 1; - description { - state: default 0.0; - min: 470 50; - max: 470 50; - rel1 { relative: 14/480 0.70; to: bg; } - } - }*/ - } - } - - diff --git a/data/edc/myaccount.edc b/data/edc/myaccount.edc index 7604d35..986d8eb 100755 --- a/data/edc/myaccount.edc +++ b/data/edc/myaccount.edc @@ -5,8 +5,13 @@ collections { #define MAIN_H 800 #endif +#ifdef TIZEN_REDWOOD #define MAIN_W 720 #define MAIN_H 1280 +#else +#define MAIN_W 320 +#define MAIN_H 480 +#endif #define INDICATOR_H 27 #define NAVI_H 67 diff --git a/data/edc/myaccount_button.edc b/data/edc/myaccount_button.edc deleted file mode 100755 index d0f27cc..0000000 --- a/data/edc/myaccount_button.edc +++ /dev/null @@ -1,779 +0,0 @@ -collections { - -#if 0 -#define MAIN_W 480 -#define MAIN_H 800 -#endif -#define MAIN_W 720 -#define MAIN_H 1280 - -#define INDICATOR_H 27 -#define NAVI_H 67 - -#define ACCOUNT_GENLIST_PART_BG_COLOR_INC 246 245 237 255 -#define ACCOUNT_GENLIST_PART_BOTTOM_LINE_INC 212 212 212 255 -#define ACCOUNT_GENLIST_PART_TEXT_COLOR_INC 0 0 0 255 -#define ACCOUNT_GENLIST_PART_TEXT_SELECTED_COLOR_INC 225 225 225 255 -#define ACCOUNT_GENLIST_PART_SUB_TEXT_COLOR_INC 0 0 0 255 - - styles { - style { name: "textblock_style_variable_height"; - base: "font=SLP:style=Roman font_size=32 align=left color=#000000 wrap=word"; - tag: "br" "\n"; - tag: "hilight" "+ font=SLP:style=Bold"; - tag: "b" "+ font=SLP:style=Bold"; - tag: "tab" "\t"; - } - - style { name: "subtextblock_style_variable_height"; - base: "font=SLP:style=Roman font_size=22 align=left color=#696565 wrap=word"; - tag: "br" "\n"; - tag: "hilight" "+ font=SLP:style=Bold"; - tag: "b" "+ font=SLP:style=Bold"; - tag: "tab" "\t"; - } - } - -#define BEAT_GENLIST_PART_BASE( param_item_height ) \ - part { name: "base"; \ - type: RECT; \ - repeat_events: 1; \ - scale: 1; \ - description { state: "default" 0.0; \ - min: 0 param_item_height; \ - color: ACCOUNT_GENLIST_PART_BG_COLOR_INC; \ - } \ - } - -#define BEAT_GENLIST_PART_BG \ - part { name: "bg"; \ - type: RECT; \ - clip_to: "disclip"; \ - mouse_events: 0; \ - description { state: "default" 0.0; \ - color: ACCOUNT_GENLIST_PART_BG_COLOR_INC; \ - } \ - description { state: "hide" 0.0; \ - inherit: "default" 0.0; \ - rel1 { relative: 0.025 0.0; } \ - rel2 { relative: 1.025 1.0; } \ - } \ - description { state: "hide" 0.1; \ - inherit: "default" 0.0; \ - rel1 { relative: 0.13 0.0; } \ - rel2 { relative: 1.13 1.0; } \ - } \ - description { state: "hide" 0.2; \ - inherit: "default" 0.0; \ - rel1 { relative: 0.5 0.0; } \ - rel2 { relative: 1.5 1.0; } \ - } \ - description { state: "hide" 0.3; \ - inherit: "default" 0.0; \ - rel1 { relative: 1.0 0.0; } \ - rel2 { relative: 2.0 1.0; } \ - } \ - } - -#define BEAT_GENLIST_PART_BG_IMAGE \ - part { name: "bg_image"; \ - clip_to: "disclip"; \ - mouse_events: 0; \ - description { state: "default" 0.0; \ - visible: 0; \ - image.normal: "00_list_bar_press_1x80.png"; \ - } \ - description { state: "selected" 0.0; \ - inherit: "default" 0.0; \ - visible: 1; \ - } \ - } - -#define BEAT_GENLIST_PART_BOTTOM_LINE \ - part { name: "bottom_line"; \ - type: RECT; \ - clip_to: "disclip"; \ - mouse_events: 0; \ - description { state: "default" 0.0; \ - min: 0 1; \ - fixed: 0 1; \ - visible: 1; \ - color: ACCOUNT_GENLIST_PART_BOTTOM_LINE_INC; \ - rel1 { \ - relative: 0.0 1.0; \ - offset: 0 -1; \ - } \ - } \ - } - -#define BEAT_GENLIST_PART_PADDING_TOP( param_padding_size ) \ - part { name: "elm.padding.top"; \ - type: RECT; \ - scale: 1; \ - description { \ - state: "default" 0.0; \ - min: 0 param_padding_size; \ - fixed: 0 1; \ - visible: 0; \ - rel2.relative: 1.0 0.0; \ - align: 0.0 0.0; \ - } \ - } - -#define BEAT_GENLIST_PART_PADDING_TEXT_TOP( param_padding_size ) \ - part { name: "elm.padding.text.top"; \ - type: RECT; \ - scale: 1; \ - description { \ - state: "default" 0.0; \ - min: 0 param_padding_size; \ - fixed: 0 1; \ - visible: 0; \ - rel2.relative: 1.0 0.0; \ - align: 0.0 0.0; \ - } \ - } - -#define BEAT_GENLIST_PART_PADDING_BOTTOM( param_padding_size ) \ - part { name: "elm.padding.bottom"; \ - type: RECT; \ - scale: 1; \ - description { state: "default" 0.0; \ - min: 0 param_padding_size; \ - fixed: 0 1; \ - visible: 0; \ - rel1.relative: 0.0 1.0; \ - align: 0.0 1.0; \ - } \ - } - -#define BEAT_GENLIST_PART_PADDING_LEFT( param_padding_size ) \ - part { name: "elm.padding.left"; \ - type: RECT; \ - scale: 1; \ - description { state: "default" 0.0; \ - min: param_padding_size 0; \ - fixed: 1 0; \ - visible: 0; \ - rel2.relative: 0.0 1.0; \ - align: 0.0 0.0; \ - } \ - } - -#define BEAT_GENLIST_PART_PADDING_RIGHT( param_padding_size ) \ - part { name: "elm.padding.right"; \ - type: RECT; \ - scale: 1; \ - description { state: "default" 0.0; \ - min: param_padding_size 0; \ - fixed: 1 0; \ - visible: 0; \ - rel1.relative: 1.0 0.0; \ - align: 1.0 0.0; \ - } \ - } - -#define BEAT_GENLIST_PART_SWALLOW_END( param_padding_size ) \ - part { name: "elm.padding.left.swallow.end"; \ - clip_to: "disclip"; \ - type: RECT; \ - scale: 1; \ - description { state: "default" 0.0; \ - min: param_padding_size 0; \ - fixed: 1 0; \ - visible: 0; \ - rel1.to_x: "elm.swallow.end"; \ - rel2 { \ - relative: 0.0 1.0; \ - to_x: "elm.swallow.end"; \ - } \ - align: 1.0 0.5; \ - } \ - } \ - part { name: "elm.swallow.end"; \ - clip_to: "disclip"; \ - type: SWALLOW; \ - scale: 1; \ - description { state: "default" 0.0; \ - fixed: 1 0; \ - align: 1.0 0.5; \ - rel1.to_x: "elm.padding.right"; \ - rel2 { \ - relative: 0.0 1.0; \ - to_x: "elm.padding.right"; \ - } \ - } \ - } - -#define BEAT_GENLIST_PART_DISCLIP \ - part { name: "disclip"; \ - type: RECT; \ - description { state: "default" 0.0; \ - } \ - description { state: "disabled" 0.0; \ - inherit: "default" 0.0; \ - color: 255 255 255 64; \ - } \ - } - -#define BEAT_GENLIST_PART_LIST_PICKER_BASE( param_item_height ) \ - part { name: "base"; \ - type: RECT; \ - repeat_events: 1; \ - scale: 1; \ - description { state: "default" 0.0; \ - min: 0 param_item_height; \ - color: 71 61 53 255; \ - } \ - } - -#define BEAT_GENLIST_PART_LIST_PICKER_BOTTOM_LINE \ - part { name: "bottom_line"; \ - type: RECT; \ - clip_to: "disclip"; \ - mouse_events: 0; \ - description { state: "default" 0.0; \ - min: 0 1; \ - fixed: 0 1; \ - visible: 1; \ - color: 104 97 92 255; \ - rel1 { \ - relative: 0.0 1.0; \ - offset: 0 -1; \ - } \ - } \ - } - - -group { - name: "elm/genlist/item/msp_more/default"; - alias: "elm/genlist/tree/msp_more/default"; - alias: "elm/genlist/item_odd/msp_more/default"; - alias: "elm/genlist/tree_odd/msp_more/default"; - data.item: "stacking" "above"; - data.item: "selectraise" "on"; - data.item: "contents" "elm.swl.btn.r"; - data.item: "treesize" "20"; - - parts - { - part { name: "elm.rect.padding.topleft"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - min: 10 0; - fixed: 1 1; - rel2 { relative: 0.0 0.0; } - color: 0 0 0 0; - align: 0.0 0.0; - } - } - - part { name: "elm.rect.padding.bottom"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - min: 0 0; - fixed: 0 1; - rel1 { - relative: 0.0 1.0; - } - rel2 { - relative: 1.0 1.0; - } - color: 0 0 0 0; - align: 0.0 1.0; - } - } -#if 0 - part { name: "elm.rect.padding.bottom.line"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - min: 0 1; - fixed: 0 1; - visible: 1; - color: ACCOUNT_GENLIST_PART_BOTTOM_LINE_INC; - rel1 { - relative: 0.0 1.0; - offset: 0 -1; - } - } - } -#endif - part { name: "elm.rect.padding.topright"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - min: 10 0; - fixed: 1 1; - rel1 { relative: 1.0 0.0; } - rel2 { relative: 1.0 0.0; } - color: 0 0 0 0; - align: 1.0 0.0; - } - } - - part { name: "elm.swl.btn.r"; - scale: 1; - mouse_events: 1; - type: SWALLOW; - description { - state: "default" 0.0; - min: 0 74; - rel1 { - to: "elm.rect.padding.topleft"; - relative: 1.0 1.0; - } - rel2 { - to: "elm.rect.padding.topright"; - to_y: "elm.rect.padding.bottom"; - relative: 0.0 0.0; - } - align: 0.5 0.0; - } - } - - - } - } - -group { - name: "elm/genlist/item/help_text/default"; - alias: "elm/genlist/tree/help_text/default"; - alias: "elm/genlist/item_odd/help_text/default"; - alias: "elm/genlist/tree_odd/help_text/default"; - data.item: "stacking" "above"; - data.item: "selectraise" "on"; - data.item: "contents" "elm.swl.help.text"; - data.item: "treesize" "20"; - - parts - { - - part { name: "elm.rect.padding.topleft"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - min: 10 8; - fixed: 1 1; - rel2 { relative: 0.0 0.0; } - color: 0 0 0 0; - align: 0.0 0.0; - } - } - - part { name: "elm.rect.padding.bottom"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - min: 0 20; - fixed: 0 1; - rel1 { - relative: 0.0 1.0; - } - rel2 { - relative: 1.0 1.0; - } - color: 0 0 0 0; - align: 0.0 1.0; - } - } - - part { name: "elm.rect.padding.topright"; - type: RECT; - scale: 1; - description { - state: "default" 0.0; - min: 10 8; - fixed: 1 1; - rel1 { relative: 1.0 0.0; } - rel2 { relative: 1.0 0.0; } - color: 0 0 0 0; - align: 1.0 0.0; - } - } - - part { name: "elm.swl.help.text"; - scale: 1; - mouse_events: 1; - type: SWALLOW; - description { - state: "default" 0.0; - min: 0 46; - rel1 { - to: "elm.rect.padding.topleft"; - relative: 1.0 1.0; - } - rel2 { - to: "elm.rect.padding.topright"; - to_y: "elm.rect.padding.bottom"; - relative: 0.0 0.0; - } - align: 0.5 0.0; - } - } - - - } - } - - group { - name: "ug_effect_sample"; - parts { - part { - name: "clip"; - type: RECT; - description { - state: "default" 0.0; - rel1 { relative: 1 0; } - rel2 { relative: 2 1; } - color: 255 255 255 0; - } - description { - state: "show" 0.0; - rel1 { relative: 0 0; } - rel2 { relative: 1 1; } - color: 255 255 255 255; - } - } - part { - name: "elm.swallow.content"; - type: SWALLOW; - clip_to: "clip"; - description { - rel1.to: "clip"; - rel2.to: "clip"; - } - } - part { - name: "event_blocker"; - description { - state: "default" 0.0; - visible: 1; - } - description { - state: "show" 0.0; - inherit: "default" 0.0; - } - description { - state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - } - programs { - program { - name: "show"; - signal: "elm,state,show"; - action: STATE_SET "show" 0.0; - target: "clip"; - target: "event_blocker"; - transition: "DECELERATE" 0.5; - after: "show_end"; - } - program { - name: "hide"; - signal: "elm,state,hide"; - action: STATE_SET "default" 0.0; - target: "clip"; - target: "event_blocker"; - transition: "DECELERATE" 0.5; - after: "hide_end"; - } - program { - name: "disable_event_blocker"; - signal: "elm,state,blocker,disabled"; - action: STATE_SET "disabled" 0.0; - target: "event_blocker"; - } - program { - name: "disable_blocker"; - action: SIGNAL_EMIT "elm,state,blocker,disabled" ""; - } - program { - name: "show_end"; - action: SIGNAL_EMIT "elm,action,show,finished" ""; - after: "disable_blocker"; - } - program { - name: "hide_end"; - action: SIGNAL_EMIT "elm,action,hide,finished" ""; - after: "disable_blocker"; - } - } -} - -group { name: "elm/genlist/item/2line_textonly_color/default"; - alias: "elm/genlist/item_odd/2line_textonly_color/default"; - - data.item: "stacking" "above"; - data.item: "selectraise" "on"; -// data.item: "texts" "elm.text elm.text.sub elm.text.push"; - data.item: "texts" "elm.text elm.text.sub"; - data.item: "contents" "elm.icon elm.icon.push"; -// data.item: "contents" "elm.icon"; - images { - image: "00_list_bar_press_1x80.png" COMP; - } - - parts { - BEAT_GENLIST_PART_BASE( 90 ) - BEAT_GENLIST_PART_BG_IMAGE - BEAT_GENLIST_PART_BOTTOM_LINE - BEAT_GENLIST_PART_PADDING_TOP( 10 ) - BEAT_GENLIST_PART_PADDING_BOTTOM( 10 ) - BEAT_GENLIST_PART_PADDING_LEFT( 15 ) - BEAT_GENLIST_PART_PADDING_RIGHT( 15 ) - - part { name: "elm.icon"; - clip_to: "disclip"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; - min: 50 50; - max: 50 50; - fixed: 1 1; - align: 0.0 0.5; - rel1 { - relative: 1.0 0.0; - to_x: "elm.padding.left"; - } - rel2 { - offset: 0 0; - to_x: "elm.padding.left"; - } - } - } - part { name: "elm.padding.icon.right"; - type: RECT; - scale: 1; - description { state: "default" 0.0; - min: 15 0; - fixed: 1 0; - visible: 0; - rel1 { - relative: 1.0 0.0; - to_x: "elm.icon"; - } - rel2.to_x: "elm.icon"; - align: 0.0 0.0; - } - } - part { name: "elm.text"; - clip_to: "disclip"; - type: TEXT; - //changes the type from TEXTBLOCK to TEXT, to fix the H0100115592 issue; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - min: 0 40; - max: 350 350; - fixed: 0 1; - align: 0 0; - color: ACCOUNT_GENLIST_PART_TEXT_COLOR_INC; - rel1 { - relative: 1.0 1.0; - to_x: "elm.padding.icon.right"; - to_y: "elm.padding.top"; - } - rel2 { - relative: 0.0 1.0; - offset: 0 0; - to_x: "elm.padding.right"; - to_y: "elm.padding.top"; - } - text { - font: "Roman"; - size: 32; - min: 0 1; - align: 0 0.5; - text_class: "list_item"; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - color: ACCOUNT_GENLIST_PART_TEXT_SELECTED_COLOR_INC; - } - } - part { name: "elm.text.sub"; - clip_to: "disclip"; - type: TEXT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - min: 0 30; - // TO position push icon max set - max: 350 350; - fixed: 0 1; - color: 219 156 26 255; - align: 0.0 0.0; - rel1 { - relative: 1.0 1.0; - to_x: "elm.padding.icon.right"; - to_y: "elm.text"; - } - rel2 { - relative: 0.0 1.0; - offset: 0 0; - to_x: "elm.padding.right"; - to_y: "elm.text"; - } - - text { - font: "Roman"; - size: 22; - min: 0 1; - align: 0 0.5; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - color: ACCOUNT_GENLIST_PART_TEXT_SELECTED_COLOR_INC; - } - } -// to enable push icon - part { name: "elm.icon.push"; - clip_to: "disclip"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; - min: 50 50; - max: 50 50; - fixed: 1 1; - align: 0.0 0.5; - rel1 { - relative: 1.0 0.0; - to_x: "elm.text"; - to_y: "elm.text"; - } - rel2 { - offset: 0 0; - to_x: "elm.text"; - to_y: "elm.text"; - } - } - } - -// part { name: "elm.text.push"; -// clip_to: "disclip"; -// type: TEXT; -// mouse_events: 0; -// scale: 1; -// description { state: "default" 0.0; -// min: 50 50; -// max: 50 50; -// fixed: 1 1; -// // color: ACCOUNT_GENLIST_PART_TEXT_SELECTED_COLOR_INC; -// color: 219 156 26 255; -// align: 0.0 0.5; -// rel1 { -// relative: 1.0 0.0; -// to_x: "elm.text.sub"; -// to_y: "elm.text.sub"; -// } -// rel2 { -// offset: 0 0; -// to_x: "elm.text.sub"; -// to_y: "elm.text.sub"; -// } -// text { -// font: "Roman"; -// size: 20; -// min: 0 1; -// align: 0 0.5; -// text_class: "list_item"; -// } -// -// } -// description { state: "selected" 0.0; -// inherit: "default" 0.0; -// color: ACCOUNT_GENLIST_PART_TEXT_SELECTED_COLOR_INC; -// } -// } - BEAT_GENLIST_PART_DISCLIP - } - programs { - program { name: "go_active"; - signal: "elm,state,selected"; - source: "elm"; - action: STATE_SET "selected" 0.0; - target: "bg_image"; - target: "elm.text"; - target: "elm.text.sub"; - //target: "elm.text.push"; - } - program { name: "go_passive"; - signal: "elm,state,unselected"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "bg_image"; - target: "elm.text"; - target: "elm.text.sub"; - //target: "elm.text.push"; - transition: LINEAR 0.1; - } - program { name: "go_disabled"; - signal: "elm,state,disabled"; - source: "elm"; - action: STATE_SET "disabled" 0.0; - target: "disclip"; - } - program { name: "go_enabled"; - signal: "elm,state,enabled"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "disclip"; - } - program { - name: "show"; - signal: "elm,state,show"; - action: STATE_SET "show" 0.0; - target: "bg_image"; - target: "elm.text"; - target: "elm.text.sub"; - transition: "DECELERATE" 0.5; - after: "show_end"; - } - program { - name: "hide"; - signal: "elm,state,hide"; - action: STATE_SET "default" 0.0; - target: "bg_image"; - target: "elm.text"; - target: "elm.text.sub"; - transition: "DECELERATE" 0.5; - after: "hide_end"; - } - program { - name: "disable_event_blocker"; - signal: "elm,state,blocker,disabled"; - action: STATE_SET "disabled" 0.0; - target: "bg_image"; - } - program { - name: "disable_blocker"; - action: SIGNAL_EMIT "elm,state,blocker,disabled" ""; - } - program { - name: "show_end"; - action: SIGNAL_EMIT "elm,action,show,finished" ""; - after: "disable_blocker"; - } - program { - name: "hide_end"; - action: SIGNAL_EMIT "elm,action,hide,finished" ""; - after: "disable_blocker"; - } - } - } - -} - diff --git a/data/edc/myaccount_edc_images.edc b/data/edc/myaccount_edc_images.edc index f84a4c4..660da19 100755 --- a/data/edc/myaccount_edc_images.edc +++ b/data/edc/myaccount_edc_images.edc @@ -1,29 +1,6 @@ #include "myaccount_edc_image_macro.edc" collections { -RESOURCE_IMAGE("00_list_bar_press_1x80.png"); -RESOURCE_IMAGE("01_samsungaccount.png"); -RESOURCE_IMAGE("66_myaccount_icon_facebook_50x50.png"); -RESOURCE_IMAGE("66_myaccount_icon_google_50x50.png"); -RESOURCE_IMAGE("66_myaccount_icon_msn_50x50.png"); -RESOURCE_IMAGE("66_myaccount_icon_push_deactivated.png"); -RESOURCE_IMAGE("66_myaccount_icon_push.png"); -RESOURCE_IMAGE("66_myaccount_icon_push_press.png"); -RESOURCE_IMAGE("66_myaccount_icon_twitter_50x50.png"); -RESOURCE_IMAGE("66_myaccount_icon_windows_live_50x50.png"); -RESOURCE_IMAGE("66_myaccount_icon_yahoo_50x50.png"); -RESOURCE_IMAGE("99_email.png"); -RESOURCE_IMAGE("cancel_sync.png"); -RESOURCE_IMAGE("exchange.png"); -RESOURCE_IMAGE("facebook.png"); -RESOURCE_IMAGE("flickr.png"); -RESOURCE_IMAGE("gmail.png"); -RESOURCE_IMAGE("icq.png"); -RESOURCE_IMAGE("myspace.png"); -RESOURCE_IMAGE("picasa.png"); -RESOURCE_IMAGE("refresh.png"); -RESOURCE_IMAGE("twitter.png"); -RESOURCE_IMAGE("youtube.png"); RESOURCE_IMAGE("A01_2_Icon_default.png"); -RESOURCE_IMAGE("A01_2_Icon_others.png"); +RESOURCE_IMAGE("account_icon_syncing.png"); } diff --git a/data/edc/myaccount_nocontent.edc b/data/edc/myaccount_nocontent.edc new file mode 100755 index 0000000..971b471 --- /dev/null +++ b/data/edc/myaccount_nocontent.edc @@ -0,0 +1,20 @@ +collections { + group { name: "nocontents_layout"; + parts { + part { name: "contents"; + type: SWALLOW; + description { state: "default" 0.0; + } + } + part { name: "access"; + type: RECT; + repeat_events: 1; + description { state: "default" 0.0; + rel1.to: "contents"; + rel2.to: "contents"; + color: 0 0 0 0; + } + } + } +} +} diff --git a/data/myaccount_photo/00_list_bar_press_1x80.png b/data/myaccount_photo/00_list_bar_press_1x80.png deleted file mode 100755 index 0e0becbc7df8f4dc07b18c78337fc77dba69d9c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 371 zcmeAS@N?(olHy`uVBq!ia0vp^j6fW~!3-qdOTK>zq)rC-gt%U*;=fug@S<1zRlmfw z8iBtH<)3wn{ad8)VXD-h1@dnuO5Us!yj3rFy;k66z2J>nAVctOv+zA2Y7u_9r~N^z z$b&YKhixK{+C?9Ah(7KRebOmb{Z{K10I*Apb}w}`x*B>8SK z5J|nCB6Xuq@Z&V;Pe3$X`tuCwFEeDm%#`^GM6+bR&6fQRL~~?+0MT68pL6AY&XfBE zMDyi-1JMHcC!JzXyTtx3l7HSK{%^6u|HTTn3%1_`dMee^#WAEJj`tw*BxVKyh7DJ? z<$lk3{J;N|-xgg)PDiVdD_3QvgiP)A^*MXS)MV?L(vq)VczJqjeoo`vKPgdBG^{Hz zIXhinzR&O6x|rRCug~pe@1JK={qfb=-Td>p6ou=a9Gd^1+u$U}ou}6KrUETw@O1Ta JS?83{1OSkQt3dz& diff --git a/data/myaccount_photo/01_samsungaccount.png b/data/myaccount_photo/01_samsungaccount.png deleted file mode 100755 index 15fd9262a181a479b132bedb2c216f30bdaf6070..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8095 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 diff --git a/data/myaccount_photo/66_myaccount_icon_facebook_50x50.png b/data/myaccount_photo/66_myaccount_icon_facebook_50x50.png deleted file mode 100755 index ec022ce1dc04bead47c752c9eb4403f1e4ba74c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16550 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 diff --git a/data/myaccount_photo/66_myaccount_icon_google_50x50.png b/data/myaccount_photo/66_myaccount_icon_google_50x50.png deleted file mode 100755 index 151e3f5ed1fd4f2e20b1df31601ff72aa3f411ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7631 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 diff --git a/data/myaccount_photo/66_myaccount_icon_push.png b/data/myaccount_photo/66_myaccount_icon_push.png deleted file mode 100755 index 66e9e5d785fd7560b44fa4a318c30575e02596da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5423 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 S-dJKs3g~MaYt?Hw#r_|Sk0CJt diff --git a/data/myaccount_photo/66_myaccount_icon_push_deactivated.png b/data/myaccount_photo/66_myaccount_icon_push_deactivated.png deleted file mode 100755 index 34d0a95af52742cc5a08bc0c7361f8f4f4295ca0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3890 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 AApigX diff --git a/data/myaccount_photo/66_myaccount_icon_push_press.png b/data/myaccount_photo/66_myaccount_icon_push_press.png deleted file mode 100755 index cbad5867dfe2cc06748225263e3d7ee7ff42961f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3907 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 RqSOEY002ovPDHLkV1h^RLm&VE diff --git a/data/myaccount_photo/66_myaccount_icon_twitter_50x50.png b/data/myaccount_photo/66_myaccount_icon_twitter_50x50.png deleted file mode 100755 index d660adef64a088d5a88570de997142d951c4fb89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3063 zcmVU*@qwwtbvGD0BpYE>YZB;96H>6*`6zVH*Dyr z)oSKkq*%&1jC9N9a(w>W)bxe7PQEnq?6G5Gr{BD=;y%n4q?Psd59IfM>+ZX@9R9+$ zJK8(i+ogib3Rx*)hy*vK1KGi+(=h{HsNe~SrSMC*;`Z+hPdxgodyfC|zF*H?m|rU* z);4b5TKMdJzj>s6?3($i&&TLAp9iIDF5~ev-TV<43llg7tX^%b~*PQiugFL_;Oh zf+&6bNit65VK(>85TP?8urV(&kQK;zbqpQ&{M`rdxG?nSy>~u1yHH*oWdE&S{$y_7 zb>Hac8hUdM=DiT7%f5z@L?B8IO)(HCK*5+Gz>UtMH3rYC(r|p=nqpLz73LZtcDB3d z$q7_A#Q6RrN3T8f>=S?d-NWZws@BHdZfrVu%hz0D(Vv&728=fsz2;s)Y5)c^z|gMK zi~#KFaB=;Hy!PGAW03wk4acqA!dPd9*^+^j`d$iel|3wa3Vja4?O38)%_(ZSa*D`9<3;<1UUhFMdgk_a&%TUZS<-%zLo3OOMVI+=|< zJ-t}~jTNcY+uQ5-K_Fa#ix+5^WD2kbyrw&sfT${9!e{MOWr1$q)P{XsS)FDHh81o% zW$MF1*n~raS%bKOz|4-DaWgGzWO;cRLcpMi@+9!K+$os z0fqql7DXGSQEWGCC}2-11BVFKtb|W22Y7w4p=CZNsYNZtW+TZd5g}0WCbreC2tT5_ zP|0w^Oa7|GAcMRh&{3Fc{+t`XC@QIRi1>e0Hy>R z0)F4?16_M}?CL~O5}uk~MqW^&L6V)F!&4zDey|1zfYEXleM?nj2$-$=C}kXEq=W;4 zAO^LN(GbSS?sdU0Dg#8(hs1gxM^*v)zUv(=7TUft*n!byA8%KDT{mFXwb=+mEHr$y zi2&^Qn5ov#OSF1w2_u!7c)STTD+RKSL{3VOkf?{5)OCj-Xov*`WC_RsaD;(k)-@E% zbqK~(0PN0^RzF7&4)+&v^xv}xS)m>TO%L^yzR~oJIYQoXKtiO~h#&&=6k33xyS(;V z=wYUAK>{|)l`*G-5PJ;RFmA)f$@)_;s`q-GvA;lY2-se9P;NA^6oimuP9!qpktFo^ z1R({45IJcVg5oCWu!7J>R-Nh!@HIsGl7!b-l6cV!p(KIMj6`?NLA9#1(lMF(C5md- zY-u3&Bw?T;dIFJ1EQgiOU#t6!-Pz@Xm6m2(aD=Obo#mfZ_+rYs;_xV|3p_nElGsvK$GJfRS!dY7SL=JTX{ER@-<<|~431Kg$G6a%l>n7dulCZx!ul@L34fmcpkBT4l4=WcSHUL&p(`v+Q zR)(P=Vn9hrMY0h|f-HrMa?{f+Lx^X)2YT}O;octH*{l;bMIP6JfQg1x-}KIIEG{ey zAxLX}Y&ik~#Sj7sBL<#X2=Uxvh%}QR>@5o1&?$94x_Vs>w+yu7;qfx^B3UCu96eYA z$SDz7wMHC*&gFnvhrY)p$fzk2lE$3gLnuxC^>{pc?aDYi8(Kf zp1y&xV-xwx&|Qt*LONNJ?Z~fFIza80arsbL4b@P-4JmR zga`@@L}FuwGqu>wPpc5ghM19rKTj>=NPnAN&0Ss)IMgNa_*?*op#A+A8M)Sx=!`C| z1ghx_DG0=oLV?ZRwudwjn@h1`+vp%G2&1(C4~{P3o7+1y_KjT*+9l!G`2aJ%DGu=- zfmAf}J=Eo(Afauj8ekz%$V3HA979`x^wcr{A_0)p@S-E|hsmn`&gyf01tXm$iL2TK zPF567FDos*Dg}ZWC`fbd-lB}*9-msa^$L!&B<^FBvL1=R$ybb$Bj5^JvDiY?V=@x> z>2Mk4fN|SE0S=K)wf!Zj{Zj3ri7H;2Z|FwJR(!$CkVJY$ysTI!+Nv)@3)zg%VNkDz z3hk~yrz@diu}i9$qhSOd7_Z>_Z!F-%yoZKjT&gYl3ippz@L&@p=ZJV!YMk^q+8u#) zuGE4D)9CTc;8=0M3 zI~;{Q9T^?!k!3SG70|hAbJs*Go}W1aRv?5;%E;^*Lvb`vK$)j*paAO(tz0|W9qcGN zT9!{W2wi9X@rrw4`q`n8QM3d(J2{21k#|n*SohZ-ohp`oe1bOQKc>RwO)jR3i&;;h z8Y)vaBp__6MaQt8kyW~Phs1u{&oKZq%pR;E2}aR+GZJ|LOf?i4&Cv}#+|(rA)_xN(4KWrN_Kk-B9anK5N2=F z%f3$2FdV_aKtuo*5C~XdHej5q6K0m`XgmG#$iT^`e^FnqKKA_a7d&PwE@XePbNp@F zw&BKupI%pNZ@+1-f9Ds=oAz88lzKYJb)^%}gsIiu94F7QP1XWH#nFI`OmeSh*4(K3 z?uE(orFUL?wR3L#_f^k(;@Fc<&5n$W*!LzaLF{WdTzBoY?$-Xk9YV^hJd!&CpiK}F zulZg*{lz;t?E`bMV#N-tr3{DfgpAk5Ca2CkfBbl3dU_fF(m|}5=nM`H(w5DebES@s zOto4C2>%l+77AD_FZtsW6Sd*tVb)PF)*9sh!36$K>_6nL^o9I-;^_bY002ovPDHLk FV1ladsS5xA diff --git a/data/myaccount_photo/66_myaccount_icon_windows_live_50x50.png b/data/myaccount_photo/66_myaccount_icon_windows_live_50x50.png deleted file mode 100755 index 644a1c3bd10b25dbe4e629bf06ddbcfa8edbac2b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9239 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 diff --git a/data/myaccount_photo/66_myaccount_icon_yahoo_50x50.png b/data/myaccount_photo/66_myaccount_icon_yahoo_50x50.png deleted file mode 100755 index d74444bbecd37c11e90ca4b90dd04cb6556dc3b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6727 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 diff --git a/data/myaccount_photo/99_email.png b/data/myaccount_photo/99_email.png deleted file mode 100755 index 5170b348c799969ccbb1a66d4eb2760d493bd5fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7539 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 Vu-5(lJs9{>l2?~2$B;1%{2y`LjIRIy delta 12289 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 diff --git a/data/myaccount_photo/account_icon_syncing.png b/data/myaccount_photo/account_icon_syncing.png new file mode 100644 index 0000000000000000000000000000000000000000..62e1adcf11027df4ebb3e5918ef17ce036c689d1 GIT binary patch literal 1414 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`f(~1RD^r68eAMwS&*t9 zlvv ztM~P_^2{qPNz6-5^>ndS0-B(gnVDi`YHVz2U~FLM=Hl#RXy|I}WMOG&;cQ@L;c9Gd zWZ`B6)9aF-T$-DjR|3CooP|VDdY#T+_IEr^yUf|5ar<+wvQ4{baX0j%>0_%Rk&{Ps!Kem}D7tw&UgI zud@X*1;w8wtX}MqbNy6ItzS(^5qT3+zzV6u^nC@I7P^?m*Z?i+L0d44`~}7o|ovj$+;{pKksH@KJSl%TYJrK z^PW4XV!uDqE>-U1R~e>4?ngTDyXQu!2Om8)y`_D=g|q{YOtYiFv!9m7)^jcvUjFGn e=jZ5;ss|XJD|udN?6T_um5iRQelF{r5}E+rx&M3s literal 0 HcmV?d00001 diff --git a/data/myaccount_photo/cancel_sync.png b/data/myaccount_photo/cancel_sync.png deleted file mode 100755 index 39a6cfca1b192132fac158313f0c1c895a217854..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8047 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 R2=)K~002ovPDHLkV1isH8X^Dy diff --git a/data/myaccount_photo/facebook.png b/data/myaccount_photo/facebook.png deleted file mode 100755 index 3a45a7ebc8559a1d5879faa4a2267b82640a9b78..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1762 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 ij`P=f_St>F*Z&u033i26nRZVA0000$& diff --git a/data/myaccount_photo/icq.png b/data/myaccount_photo/icq.png deleted file mode 100755 index ac3372c9698ad89bcccc8179bc752d3ad15cff9b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8253 zcmWkyWmFu^5}n1}-7P>MEbi_QEV#Qvut0Fg;_ksc1b6swclY4#7TgK)_MOu`{by#n z`c`$-y%q6ASr#3I1O)&9ba^=`HRvk$|A~YEeQKW7%R(1qXE|M006@k4{{#UUSwsMU zqGBs4`Q?j^lbe&PjgvE#yrd+R^EW3e+pm@Y;JK2mZmpqyOd$NQaVwz^4*99zq=t_~ zr6v&t!AqcLqDIF098R6TjIY{*EiDa4I-C~{8ygFW##jA>7KyTixJUgfHmD#xa`fM} zPl5eH`@_M+Tf?HrVZ}{${S;z15?YEJrz$rDtyF>ndn;(De{g#bEEa%5=L}#W)mu=z zzS4q#M}Hw9W}0rqP5|UNhl&JrD`j@Gk%hfuo=Bt{fFQx3Znp$J1tbU_Am$w_Q3Qy| zfFRjv^y)w!9AGkLZng`2VF64SejLmJknG2F9}uAblNukCmjF=VT82vjHiAIKlvboP zpu+~>St<1M14}Fbo4mG_98l8)bWdWT)&WRp0Gn!f$VULq2QV3?rS$}Y(*Zo0Yi*$` z<|?d1CMZ(rbwVw4{L%sXNGvXh+S*_W#z}cXW;`BK7}E?faIaT7F-HIw=GM(P0OTd$ zLr;72>N$x~H95%>+lXPza?*wHPGe@a`?fz-?kolX+iw0dZ=YD}Ng#p<5Qn#4AI{-y zj8OBwKSWv8VTv^XdB-c-H_rdZMmj&fWqEmjZ*S>yzl6T&sJ7pmb+2)^_UqRtf1#I$ zyRFV0x&RKt09m-lt={ol#X_>FMC4$zwSzd>mnPKr7xFopetEMN9VWb8RUDUCsf_3w zjzXFUiNucsA7_(>0+?#VNpE|IK6N9I^}w(7puU*! z1WVBM_ex+%pjbf2zL|Wi2$Wz9ov0yaGGYBAM$Xl(Y7?5|i~;V|Y{n3F#(XwK%IRTj z4?uhdfgE$id-6(NT?rOQyO%NOgI09cn+hy5*2Gpqv|3PbzY$@R-36}YVI&I;`o)JfompT3IKN8_+p8Uh< zavRK*I1$Mqw(cV$M9%)NY~aB@iCVr-$Vuj7wKNrI<%1+OS{1Nu5qIWOwH|Od0n**b zJa8ToRHhW-ayp7S%1d%3RAh8q*el4q$gshxy$m!-B?|x1w_-o_6PaLh;Mtl6JG?Pn?gf?kp#lpT0k^ko>D(2yk zz3jcdJ%`DrDJxSQtknB}I7e8^awdgC9tfp_t7=ObwmmtqUMrGb4}N@|Kuxm>ww zx$J2NPt{p*c2S3Po9@2=4Dq4Q3g&ZQ#RN*i0(Vv5GW$Z({5C0% zF2~~Yw46>ONRFaY@rGB&;WL>Z>#N4A!*lVSESe5NJsKUtD%vEG&;YlKlMp%U(CU?{ zq+y?!WT9!YY3g=xLd%R$!Mse23}&?LpusNPuEU_iU;#Y>JvF_8(uvY}hMH1K(Z?b| zMM1@(iSdbF6AS6wnZoRg9EX{QnTwg5O(uGtdY>9g8k;TU>-O}Dbk7^x9Ygf^bqjSg z^$hD}Dzhs;EVNa&6=N5-C?_eG=PX$F)m$}>G?q3I*X%DLtX4HTH2RrZn-N+!4OI1= zCv_zGwfe=p3L~P2En}3E>yi7r{`U<}KucgFV>0Vp)NkN6<(So4X9{a-iF3CRckE-o zZMJ&moUApWb&G4zO?Xs{S&c$%sd-g6nvp%!;tYo$Noafy3 zJZvp@oGbTZjxML`bl?-`#ET6fVM9RQ+LMyzj zT&<#mU@P76d7W$>`L7CO{9vXk9>=epn=fZKVLRD7sJlLdX{^JB&R+SGy|*F71f^h{ zPXZ}ois8z9KQG0xm`VtuKV0K_e27Ky>Lu^BreU4onF(K#G+?4ozLsNB@=pAl(9Z2e zH^5o=X}=|yp)|f-5nXXTQy_;R!=1{3Ls+1LJt#3D-bJE}S}Cc~`o#Lc%6+WDGNkTp zz%i`W%`~DuN#oS%tSsn2P^niE+(ypES&A zv@3n>=YOT;{Vf(#RETw7St%& zQqU#T+-_MsGC3hAs_|RnR^wTN=X`d(!F2J_aps)Vr~RJm@BFHM`@^fqNaw01NK zFFaV#dC)auvIci(ou$0?jvtUWA1KfTR@|d~Dz*{lDBa1e$yx0rGOjaZGSxHw>6_`d zs*H=wESzk3zsRmqVrFp(>3V&>(HOB^IS!mlvc8^*&Q8wu^9MhznXLY5^f@%2+_b}V zx@g66+n$wvk2(}=7o0S>Zg#t_TiwUiZr0AI7BF@=aXS%uOPW&|YRhWNsA@5=Z#nnw zXz;OmI3~^Eom{`|@VX*+UzpF~7hdnU@pgI`c(~gnSoiQxZNdJ#H)%J@hn(PlTU;NA%n4 z@k_Dfl*JT%4&mFcx3MZh0#^UW`P0S8nY5Yw)a%rwE(hPj*OTs3;_B7G-a(4a5l>Eb zqg$L`6iXQoSG5< zcz*x@NDu%#y+hYy0Qk-Z04F8@Adm(CgieXZ12O=BZzC@yuHm`z*TB|IL$mSiypmtD zDX}cRR4q9k8Ae568cdAV!D{GpHyZ5MPT0-~{y&Pqzc750C5 z%>VfDV*z92=bf7;Jf%50X;oxj5o0qpqB5Y_Q;1@HWkqjeW5d6`tgP(YW~bjg@D=zA zkbQD~z+($EP4meYH~Inx-OR%0{%<-3C8g*`CMLUfiF`Ty2q`2~)F3%J7oa)sNVui}?23_a zV3@~ojnDD#QZ1?`)4aK=swy@|IvSod^`}qKuv?BI)B3!DR9nt`(=#)mq!BpisMPW) zs;j%MzdK!gCx#$HlDVZ1a{Q^oS?gL=#@__3MoV)u~CssLmc`qJzc6Mek7z0l_z?5kE zw!;P2sD=y!F(WfGf9}}%_4%$T<&&-&&^`Rj{2+=$MFFXijv^?W$`SUF^!9%Cjgf(k z{3SNWbxs&^3A67eFtfB2PRi?OP*GJSQsaKMG6kf8_#|hF-T*1jhJ)?^SbLdhqFP!W z9)g*fnOC0tHyG(eIz@V15)zUxy1HIAJ%R9$uu@+Kw(X<<;p{AEp z!^2)e6mA0KC#R<_Z!b^n4fcx^2qwqOay>9o0M_Bb0Y|N8UGl6#2xO<*y}W zWxa(8sX0?)V}ji{iqDQfg829{UKl3jMrL~Y6DvFhFwKRYAQ!y1XAw=pUFJMjq=c)h zEq+_L?bjmnHX}>fk&%#arQz!4b104 z9BgdtFXi*YV`GwrhK6z%?rrN|n39R0;6;nR9;^5OQfo@`=X*g&Kq54#29}qXFEGgk zxJ+8HzK%>y4Ygf#q9%>>llvT`TgT_-#$8@IpX=!A5?hU@L4)*uvO6gGN!IKc1q)fsf2%uSGmexOtWv2JCX}_fxVYPcNO^lp25-@c2VbibJgY)t z!g$rLU8%MEr&K+S+n!)_YzzdvU%9~bTAjdT1F+5hWWg8KN6r8I-<}TRM=Y$Z878v@ zwK<$N+Pwh1<&W~YGVDD&15sh<#2j=gg=#%#?qPpjJ72C9&hyo~G^u>Qb4n?kvfq;; zj3`J0kikKj3Zsq;SnFGRyx*=m&O}{um>?tyyS}4M^))|Z|0heiyI-~>YNdFkrKP(M zXRA%IG5XkkF0*uit+Mju$GbsU)@j1_SxzViAP$s^%xR1 z^1{8_F11XnaUo z4#v~#X#@mXH@Dc(aJQu3m0g+!KU1*ZZ&B);9n*Fl$4zs^q@@wraAjBnUn)B9QLt1> zHDrDl6@k?m@nB)%^(qf29A7ir^#1KQC5+wMc3dRT zkJ1$Bbxt8=cR0V#8=ig9Ai*Oj8iecjcNt1+r-F7r7(yE+K>%C2Vw%8rJ6?Yt(_T0{ z0s@JGncJ3gXv&6KI~R&cDRQ*ZU@vnKe^D*o9vvMmURzrmCs#O|=iP0?wKKwy+u!bW z+19Ot^ZWP+TuF++yK^)aTfBvLm zU_g{9V7Fn>Yjr!W)=gZS=zqL9oci(eS4o~{9AQ>sA`TWDs547!2M3$}B0~1wK8R}U zXk+?>Mo{maHw(6pV2;Gu=w1Cm4pc23khmWTG5-VG-4}*vdLQCB-iZ}=Y;B&GzB?mQ zzZ~tb+6X^C1C2sxCBUrZe08L!*C^H4ZC{yNyuKb|Er4D&fbFqMN^Z(}D@6~)C5C3w z>k4=&MW~~q)hs-nx4rx#PD;d&7pe+Vuz?lL3XUS5CQ`_gx%x}vE4VS7jR=`}!uyrW z8JMqca@WT5N}IQf4D-wh*ZFjinYTidAV-xtCJT#I4-UIpq@tEqr5!MH$;Dngz2p0~ zhXhb<%d^jJGzO;Bl7-%5OVCS(ebkncGXkTOOvl~C)c6+ya$+L0i&$+F6rSq^${1w+ zd~Eyr@V^#`_-BzlwrFmLrR^qV;S0otC@?wFKYw@h@xxNSE$jCUf3Y@QYQmemajqGTf|Rg3-Tsl zOCLV$G%Xs$AHITo1D6~QIn~^jVWcgp;H4Qwngl9AL7(4?t?l$O7M7OM;ZiixY-2nV z6B8ncgNHo_yuz0Z-f*ZmK(KKBkoo?%tc;Bw?)H5fs^i)P*dbg2Ea51zG1WL8RoZ|N zQKaoXQoac(%-}k^Y`E6B9G?^xeF8T)2|65V4i1i(fx+{6Dh@$GL2)W9IBATwSRpbJ zVQ0c#C-6QRujyY>l=Is@%q!JzJm|@bb1r9gOj;H3h(Kz)K`^qlZ8Kb>*q@H0EkBM|aY9rK=p^#sUX%kj2 zY+dMaWDy8;`pq{xtEyCIG)Js0;yRBdk7d|kSQ94NEe@E72s)I9#5`MP2`oS!hSS>3 zYygG-{)}^*v_*TSLAaY-XE2U3ZfD1gFMBc`#`o_@#h-u9lZeP65+B8}#Dz7$spju* zuR1j*AOo4Lz5g1)f688C(Vyq5EiNxioD_3Rg%aENNdDcY2ilp)%OmIbKimG@=peni zy2_U!ZP688&edgCnj0P;@9*^cC#I?~jZZA1h>>xBV+<-MhG=*nPA1X;qw;7B8#7nE zA*j%5j2bELVN1B4%*df!Ja=L_-GkS(8Y4^Thi5&R)ssLgTjOzI1TOk(OwUQ9h!H2% zDun_JJ9GxXB4%D@7S>Tnl5(N@K6DIii`2-+{)W%_w-$-9^wE6kR2_lXKg&UUhxP&IKbskJ{Vp&yLLx> zYAtJoGg)^-z>fAeTTS0OE+>i00U7>Q38~`<`&q3!QB02g5q<5U3}N?Uz10uXIBYbw zTTKMtg&k&Q<{-PUx#QpoEBiBq>00xllfUjh!+^s^J2Aip1Jl0w5n<{af{Mn##ccdB zn8>m$FhLWxAfe~>IEILSB|5$SQ`(C&qD-`nm~Ogt?+FKJQ-!1H-VOmPDpCRFcl#mtya>%mg2 z;f-V~c+aDxt_A+i*216znlIZy-1>Cu6Jy3psd}Uld57j)N(J@xxD3i!C6`tIAppM@ zPg%WOe+DJwONM>R+QlrQw@9euBl<8%{hiNU7HgPJ|0+e2aJoF*r*}J=2jb%M5-GL? zD`A6%IPsj>vsyVlelJaA|86rhFeHCjVRpVz6^H`=6}@MuqEd?)4MEb@&#z-dFcKcn z(A50CVpbcBH|KYl?ZF5B1MnJstsW3KWA$AB6C4U2+n{Y6rSjIHG@*E-#hs(Me)~X_&5J_<(&z_zV<*m>u0$@%aB{+@oSXj+vy!a)n&W3x+{fk0xIJxbNQ?}me)3>Z_m!Mg-IXJ2_eEI9(L?&;SCFmq&T^xuf z#KUVBasRtynUIh`Jz)+91A?kZ$Msfts5FCC&$TrJ0K!F1^j?aDku%?9H>zw@7{iq1 zInKEqoi%Fms2^?pIv$tO&`B5@*)-u-Hs(4d9EQ)Vb<009w(XqP-u|*sKP8fho<|I6 zJ6#ci?RLM~8R&b>JAy{t(cizpYNb+YYB(sUs4axif{Ycu;Kn4oU`E489>{hvp06JJ%Z$<*qtzaF)+$-yoRyHD;oGy(n-RD4M* zFjcj(CoT53-oiXzmmo@+Jn$AdE$fba*~)xmv3VzUY(&mbh8VXsGHLA%8;&ros;=(J z2nIX;Cq;9t{cNDFj{ERqg@*qx*nXu)Rpk{o|8B7S0K!`@_-H3ug=c5 z@&ehow^?rZqT)SxAAkS1?V_Th(J!Gd8#J-LiHkAgE`jF(jn8I+YpKZ~x_CxXJgg{^ z@MPmq)4aLkFGfcGdF5Vr2=SzltA$E^%BF?}bRw}(4v!18G=#^4^X){}cL&H@JegW0 z%EIpFEW?6bE%BjfVos_pA~b|Q3k&`oKi=QEYLT-&lzx~3OGaM%$*=SC^TmON0#~W* z=7VDNNg$w#unBHbxK(cc!Y{o(BqU_bZ*k+Oo0rpRcUB8_Ek_K{sy14`uuyaI|DvFP z3hgu8!yX-dRHw>{ zEiElgclsmvoVNg|G;P)VI$x#^j;>Y&>@Nls>{RTCqHA}XE_de)>ZFk`1_o$_YRHLn z)OaXR5rytZLq*tyCW?TwgIQ2e*gZRk%h%j{mYk2YN1t} zv>c#Szo-KjQq|aa{|c2hAE8FlBrqPKTs`@ciTDx?#gg}VZ2E`yy)>ePsjvEd}TrPR{ z=4lH$t~^0N^Sa~Y@y6+|c{^22&Aa6&Xjg^|@YCMFt%!KS{cQK|{!D*vc6Py@i{$d@ z!F=qsJLTZON<%~A#d0i##eRvqRM2rA&Ap3=67n*yZM@FydAZg8W;6Q=h6gG&nAUcd zfDh+vg0gPm+^npZwxc7PV1d^4(;a8NJgA}C+8#Ei3zeigxw~SN9%2vHi=3DcxBby% zeq>~1FX%z%pe}xH$hFUlnz50B#upTkYmf7_Cjp5iij7Ub8#8oSaCx4aS_xH+-VzeM95FICmwDnr zR0L5M%xq96dUsGD1c9I*!MC}edE@3(v%+;4`%{6gdHJz{r@O0+KYBOq}09~Xa-z!+b@hOD=HfN(qLlvT&Ol| z!2uOZpeuE)a(rmqS=AF;)wgs)RMnyz;$wc67WBLDd(fsNb`ju#i6E+23I|l}<-zQQ$S>3=gqe22b@?(z(KC2(xWtY$F?sC?8|Xw9_ZQQxZ~v= ZILGOcU$h~?hxTUyd1+;-DhZRo{{b7Yk=XzM diff --git a/data/myaccount_photo/myaccount_bg.png b/data/myaccount_photo/myaccount_bg.png deleted file mode 100755 index 7f21fd909c49f9e44fff53e51975abf69f618d60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2579 zcmV+u3hecXP)|+|B|H4cx;CnD!kau3P0aDjstD+3H0;dEt=!a(F$%;m5Cc=_32L|2|9^N`BrHL&;oNz^xDcMP>IN^U zQhAd{?ddURh`)H zr{17&K_1ALA2&tPW3Ik?`zGxqS>d1i$-#YtNMwIYZ|eoJ7DDT59YaVSbM@WZH)$_G zKs$#1z|npCJF(qQy#X%pnI0VJoOj0BH~%2*?H~IS=l6Z~`>Ah!?9D+6z#t4n(eUpu z_wfFwD{UyVD2;+E#RsCqBomUF1d_NZ3#sLkrvv}KMGubgyf=7%onKfzzvY?D_pk#9 zl6)6bmijc;Q9JqKE6@Yq1^6j3qO-l%L1F29o67gFUl45V2)1@y)RaLE!ypUDb&aQ2Oh5wV}uh?thp( zH3877a+@(7V}kt4?C;ms^LQmSIb%h4arn;lx~TaJc~dB*WSS2Civ9hcF8P<^`?kH< z8)FmzKo|zP8~=Y|BPW?7_gX1|1vBb)sY{Wo-PJjgtK?L-C8;ZSpH?ZcD<10G z>h5RLv*J8QaGOB{q@gBSFb4gMUx|H_tv=7lAJ%7A5@~s>B6&-WDk$l8m6-0iGW;xw z)F=36+PWU&%z4;L5sCqbp`KWVG3ZzPq!NF;Wak<9<9du+OUMKmrbTiuQ!+(O>5%Z? z%t7{v2m^Q_K!bk8rvc1--hn@?j}a|7dgHw5@zCYP*~srqQBwwo2j@9(89>zB2-~0^ z@kxR3xjgcR^~PXnee8`%3cxT70|RB^_Sw8E)ppLND4`XT5FAh0xOF70%b^`am1GO&Y=1CtI7aKEI6DC z!`V3y!ab)*g;W+|#)oX%O+m<8E6&KzFYSFSs2g5i^3B`fi%nj0zTRVu1Sm{Q#begv z!xYWxu(TqwSSYaZi_kea>T7J-P2nGwU+3*q(mvm7k6(V-4|{Zs0x$?e0W_2Fmn<0~ ziFC0yunxWd#adeF>>?EL4Ix9|2R^ZB^#}=5T4=lFoS9A4Jpv*Vl)VT9fG7GqRquRS zs&CJsQ|Ue|M_bw)?*I8CKDnqXW8H{BAc(q(v<=M`tN_tKmo9M}<^O*y13of>;!aVb zD1NeUfgA5gjIdS3eDo| z%bQR>lq@S0veyOtsd?0y1u=A5Cc6Lw36Z4`T&V>)=Ca)didqr02dh&Hbud3b zG3zv=aNLA)DjTaST43C2d+~~KG}Xk$!POl(eJtEJd!pP10!6N z+o&z-oT#3am-R}?8nIE^(D8s#CN?p}sq*jrMGk7_o#bxX*wMD}Z>b+wSNR_PH44r& z4|Q|-@IJM?VSb3pfnU+D%YZO`##33fZdlNjpp|CMUdtfzbyHg8eRf{|i;O(%P!(uW&W*8izXpm3SQa zOY_+aPOIqdS4&z4^?EL#>R~pw&F*SI)fo?(71SeAwF7wd)j}Adfk@yv3m9mkN`w_) zwsPVn=8MpUp-kH$)!8A_@VBcVo@tCZW&zt~U|oZV2CP&3+~yP6`sL> zeHbx;0qQ=Vzuqg@VlRq{F(C$*scmn+i{Ls@$VpN|p7L+-wHy@S5DTK+nNL6kI446{ zL`I{A5&QG8KAn%w{8iZa5#ah9$!h;+pAJ$WgkdOv_5>cl#ozpYf^6sh_nM>$q%hKr zi-8%R%1?__A?^5CV4d!~CQ!%L*>SBJn`OVfcXpL-e18U=R681un8yFYsya?NfNHe~ zzDpvtAULC-SlnalVFm)`uwsaSqbMXwlyuxeQn@7MFsp_||C)`v9_C(kzQYVwlT%KT zxi)0000000000000000002I9XOx? p001B$Xx~5|{d4JI4i7t&X;(l3bk^N#*~$O_002ovPDHLkV1jpFw1NNt diff --git a/data/myaccount_photo/myspace.png b/data/myaccount_photo/myspace.png deleted file mode 100755 index e7676ed2cb0ec7253d2cba86692cb7758f31b32c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2470 zcmV;X30d}uP)ufUrD8MFgKH2`EvBVvSJH3%wEl*aWhXFhz-OCL@M#JZ00w_C&U}X zkltX(K>Urm`?1JU-oq(g;+^s6MKl4h_{F}MEGC!o^@Hgdatl%(-CZVzXZR{ zJ&vVo_hV&xfpE6!rbhld8N?{uhwi7bK1HmMKaGSyG!e&$O5zn!bOc|xd*|TgRy#PEXEA?18J+A zmgWa(C{9kH@m1g6#)+~z01Qu#3c!dVJ~jY0bDK@SyPy)E{p}2{eP@OwG5&HP!Je2t zDHN~Fjf5Zw_;gn}(sPQ@)@Fl7qar`JLz3h`o5hY7rwzrrUp$Te{)Q`Z#J_k@hBU-B zV$PwzUqasYQd}TYB!u+$z{_)j6dk{eSKr=;hTH9M)2RV;j=G1z1$h~X7#A6c zX~};=&DCZel^>E_l;Cgxze=4*&yR$hwyEfXRB$5MY%GmzMD6uve4Jl~gC!T?X>N$FmMjvhUV zg9i_K*45Rv0x*xE7oQd%ir@eb_?rxfjp~mP;XWWCCNc=A3u7>nO!lLZ_4edoM3@hf zXGY-JxDb%=T5>c(2lj&~N)RQ-_vTK!MdYqtm>P~rPYnd=d~0iKDY`1gm@|w-Hes)C zXk{5&N?6$B9M&&#BlC^g%z|RxWyz~{vC{IZjKr)~krjVc!&asrWb;?;W+}fuz`odb zj@_-jMOAFptDm#5_#Eaxb~6hYm&N?(v;X+_SY+ad?2QeFSanS!zqhos^xdgbr@D0Y zofUAd>BL0p3#v^Yp1^w_e?{}e&ie}W8eXyX6kfpk>=MvAjQZ0poV$3Fr_-&*c3ABa zs;Ot4Jbe|nnk@gVfQc04&1;^)0!qW5j1NK7D1XF^2}0teA$aG_$w+@a9)p8DK#|$M zb?erT3JMB300=#9tTdUoP|bgF-;pZ6^c;HW+9v2+)py;)xVb=Icie9704;s!9u3q= z0U}+KLM;06Q6&176sId%PXnCkTH6B=v}oKLe+B4^TUxeIShV2?({sNT;4Ms=y8N3 zNh($9>RB9$oYQ6Hj|~@AZOdxFt<`^cTrQcWiy>6n@8BEpAJ{9HRJ89 zBh(5iK^h@%{z7}*j#aBs@ziuC#=z%lUA-AwK0Sq!Q&&J5$r$??07YLtBq38O&}I(> z#TR*iX+9?ai0ZS3m;7(*n()u^>md1($+$jkNS;%? z-;o50kh0r`DC8;t3Y%TxCAYQh4tQUpYdkd`x`fWk+igQCm8t?j^OOmLkhOLya?=x# zvwk{l# zUS2bA-n=!LnHyIY6%~H6d-tyVzwX$vBQH01+lhZ1FQY{&Z-fl!8xbN{eSLk^#*LYc z27|$ucCb3L*^JoOSbbdFgrxwU02qWmWJn?u4Gj&qi6%Lsb{`)fzY!xxw%H}f>O&FY zrZ}DQ^z>{86rvk7o<(u^27{cQ!X4W>$zqY1i>|u1i40W(V7DF5faa0u*71xP80B(e~v#-J7>+5S+ zwrtrtfJFo7^@bQB$_5x=mJuKuqGgjUC@9b(N({ZKDz#b*QFOr4LEi4)96u4#sFnPaB#@LpmLVRQB}Lv(4fJu)hNBMWlkSIC$xu37M8%QFhviV0d6dD?e#fukX=gys=k?hcFwM7XD39Du& zjuf7q7zPOUe}Lp*fI?c6t}Jif*0D^?2iEG#cFxA3ps4zyZN=TCK)a zk|YJYPfrR#U=$T}SZ%krY{|`Cw{Bgwvq-D(5Y^n=Y>A19d6^2tNR!DlyuH2Mjrx@a zT^G}6G$Qr1rhk)Ya4O~YV0|Qp2nQKZWQGWlkmOMn k9zc6waH7Zmqp`Q^KkAHgnEXp8T>t<807*qoM6N<$f*yX5mjD0& diff --git a/data/myaccount_photo/picasa.png b/data/myaccount_photo/picasa.png deleted file mode 100755 index 6a5e39fac140dee0b6dd0283c6106fb2d345a169..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1752 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 diff --git a/data/myaccount_photo/tw3_list_select.png b/data/myaccount_photo/tw3_list_select.png deleted file mode 100755 index d283e8a20afa59a11251649c91c9f67ed2a426a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6082 zcmW+)WmuDM7nc$Q{z#3G-aw^Gkx)t|3=nYA-KB(#k^#~%KpI8~(rm=&mK=?OAYIZW zEso|L@0aI#K0Noi&M(e+&V3MC8p{8XKOnzz=gxl+6(#7MI|RS+?^i~S1|O4#}TK&5vPk4 zZLvh%L`_uEe$YdM(|$;yY@!8In1ZH;*a@OfjnUI=BJeK_O&cT4&2Ge}pTgINi=O~A zi*YzZ{;a&?cT!f-SBVunB9vYFhJxHZSkuh{j9Z$EoNrq%pgj#2YGv}^uDMLg>CDh|2bE5XPkk&^ zYP`PhU&!ubS%Ba1{hJ(mq+tfGA&ycgC6P$+QqUlS~G=N#QpG9>=l@HQlOBU zH2xWq`e(rhMqs7CYA3$o>X2ri3+|CgYr4Pb>3S2}f17?0m3)auMoqjkBW#z$pk~!B z96L#Vx-!08OT$xT)2doefeg%BnF;BN#+;r0#Ge?6;y57|2`#C`K*tE6Q<8u6g*JeH z^HyR(0;Gc1ey9jJQxFIXfAXqE2fGK9K$N=RK22%@XZIh^;vseXeDmcQiQ|+y=YY?( zs;55Cte3S;aDmZOaqjO+Vd?`t!b;$eJa7OOw6Y4)$`m*{C~nr-{p=232xShlVA3v# zI#tT)PJN={wb_SCu6TK3?e2N+#kvz?4s221OtU?PBgSOShd9#wP4R`UxUGBg(HH&t z$JWv!-Y*I6cZoy?bf^=XG;Y|$i06{o7^7?_c~lK#MyDb{96Sh$^^<%I=kJUA^WqJ5 z1@F)^#Q;HC2`Bn#=X`Z4lOE=LWs2N)W>cMbIjzjX35V!Ig;TidS<%2ZOHVvyNXmu~ z5lKRVK@7>>kMltcDL`lDn>Y1eainqag3f}01tAXU)_S6}$X^9G2}}d+ttlA635tWy zU3KfC8F!!+LQU@RF6@0(>a`{3fSh^$tWVqo)m`re{!rSE?C2|!a zJGhnU7RxV6*(LH=nhN7WItGD>Z#@_$pIA;$rEeT{{g34^EY0it%ZbRMk>Q)Y$>*fL zVaIRPbTi%#|7b8F$y{Q6#_QDq++u(9DxBVY`^zo4AT@Q{u1pnRNq4nbeaT5gL0tc& zRg9o>U5?Z|SYs0~Ou!P~6yYjpZ09U_(atKhH(s%Ylx%$BF;}>diP!e90%tI2pvKj_ z#utI8rAH_~7e6k4;>Y2KJON*v`xuR=OctINR3nAP-6RTvc=i}HG1bKZ`2eal%B?oJ(`m`|z8YUE%`5@nJ~le~QX?4q*~_Sb;G40jbZa ziGQVvlZOYuZmGLlrN!bDKNr6xADrzIyxoF+^D#M`F=?or4U3Wf6!*E=dp;7Pgur(FL8h z!W5E}$)ZSuK`ueid})%`pOLSZK)cw-h&g(&yz2j=WuNJ^o;ZM@(~PRr+1AyJw7!#ly<#C zp^BGKBABOat9vxh3vM6m&S0@iq@`tATQ-Mco7||&HsFBc$^a8Ezen`8AE>u()Xk#c zOjp{qCt8<{DxD;xs%X~#DV-X#9E7(#3k39 z2RQnJr!ziO3TmYLvYjryt+wNSXg%O>*tcQT`$sw^C+zdT4i ztz56JpD6pmF{a44AJ6$r4bd~ZR%&F)`bgIwc^4rbSU=$0 zPL%g;V~?a5Qp)!~wDF-~DXK}X(p9Y=nA9GTI@v5~nU1VtzE_g^Ceyc-#CPjqWhA`4 z?J}x`)R^iu;Kp_ir6?Zj{x2)7DCB$8(^6#(PJP(o zGw#d8ld`JVyeZd0|H6m1kRLk2s4F_Ty%;_$+?lJ$7%^S=*ml}-=cDla_DB*Y!~8Y0 zr{mq>1FuAt`X$Y`2YAEEgUR|Z*)0j5MNGh~Vy)CJy;UCt`sN<2f8Z`*yCd#d@ZGnn zDmn0b9;zTS2T^{ z0bBRRZC{n#`>CRk()7l=a6TLG?$D7vK(SMKjtgPbNv@$F{Kp(&skOR!z%}`sT?CU) z$-6;i9sW|gy|TS#t((;o&6Hm8!H!w%n~dPMV*77y<-?}!9man|c1doz{^j);p*ytl zQofG*PAqv^rT_~7X!dJ`och|uG?9s)wTYkmc=_|cuk@Ve%E9SKakD79fQt@3%Uvzq zI6@<*^yj$Ho~~rSKj*i#pdV$6m}c8kqy}l(!`aF$G%P1|223V> zyyIT#^i1gMVOf_O7exx`7vcbgzrLdzTf(46R;9^J)!+dfnOdylRHL9@^a?}oX)s}$ zi8-;VK!mVAN9xIRo=3H5qwMSeAfw{-;Byp@hVpKSU;MzWm)n`lx54kBz+b7>k5|@O zD;jb#2R7U2E>9z(Rw%xr1+P)0&Gbx9ll(rBi{Yu{A|z~Cv4FZ^9)ag#cw^t z%zfPQ$Th#x>a@-bEmGccRVrzmx3*e*qtevBh8(f$w(=h9QnZorMf_%^xdjKW>3b8K zqWQNs#&rQLZSz@;k}20V;e1Hw6;s^4&SJz4%WdCmCjG8dPdMDW(G~S zBLq=RwjElxW5zV7RSaSe)vgP8v$b6L>QkWd`q7_CmzK0(yHLR4CmN0x!cj8GS@`EO zcIA>#0IsOMic5pt!b5p%#^SCYd%OPy+6#}kPjH#aw7bui#V657^!P*3Cr%jJU>b%! zFY-r-3kwK=JhO;oNi~};wG`pp2-)1V4__bt<_<0QyzkYe>1cP`0Z05V74mb zAar%@WKR*xmANNma{kOM_Mh%sYd1N?VHS!r;KIx+j&Pbv(5k-`Q)W(_xT1Q;Q@Yx> zqlP67;TW4^JpZBsD(W5;0a7%(RiB201ayiOSG5Bl3+GmdU}9ovTqS+6O0_KHjpt0e zhhL!N-gvDzt2Ik43+*VwUD&*`c5Q+}JO>OEIKeRi$>XpJ7A=|II$kV^^cXvQn%JG@ zy!P02uLGLnEkGp?TlwT54^Y2 zrjul;rSxB;F69Ft<#zvY)6}&?@_3iX&`%rQtj+?>5Fx6%5IUuVXJ8~u;KPeU<4RZM z_=-6{i?II^20P!%>h37`1)KE6@JvC>oGE8l4_(+UkyJ9vt*<-&qY8DRQZ1vhzZb7UK7B%5KyTqA4@Aajmxwyg?4hTLySP!KE#p&<&rsB%LWOYtjTXEh9v795 zbs3dQ{cM`-oQeJ#f=g>s${LcW32FFN76eErnf*sw=;EeBmUuTyFmHJZ{4(&@}GTnsdTWRyP-AbC^^LFtWHe?lY*hIO&!!O zFxS+I@LkGuhKk3;i84o#^r=0pJk!plPQG|p}E2Yx=1|-?4k`jwt=l>=# z0$0CQ+2dpW)b>9$3F~8(_X*W*v=L)j>w3S!o-W1=<_h}`Mtddt(Rqm8m}iFLz_38%hG)2|b$-rwLy9b~u<2Se9q!?S@nk#-Z&O@0d)5P4@D(AK7=p~;U!*?_|kjrCRZv+SRDIlo;6;R}6i`-n>B!T|Y{KH-636w?o#P3!m$GJo_ zu)|Ulyn(y*_m1MJ0A*NK>N^dXQmu$~ zA-6Gp!N^7@6Bikvpc7_GsKX4FMv~DC%;i0O7gu|{vVu+lX-PjQ8y8`WcZ>FK>{OjI zkM-J+Sn^or$kdp@l!dMX_-GojP%V z;33dn_C?CqKc+N9gwC?#M-!;xAfuChOUP?qW$xqXkm~*4{=$pcdt28~jrz74=uzaF zjO_Of#oIYy`S=$|C0aA<*oK`~uYX;{3QOaDGFEl|+4L$)uiY9#p8-KBM^R5F{7Btx zdivS5Ujk6I3G%FViYv-`y*A5d8RSc<)z4pkds*OYGO3b}#_FEX-ru{CI4hJKx9rnJ zkBeFXeoo}+uf`FWv~O#`KCV6%wUY4PNhNPkl~ma3o6bF=LR(}GdP$lKuHbGV61UJ* zqOD-^A~5@YE}_b@==O^%i?SZ9_PQa7FQ0jlY~U2bA13q$K6Jec#G zT>}O<7n1P5i1y^Wl68?{|#lb~Bxjf<~h!!~UD9mN7q20q`{8((V`f z{O&lAbB%qt!DKdTPmWVmqgv|I3S^0PlnKX2GWZ9T3&LA&p#nKTlF}Z_bRoSN`9du9 zL$UP-0}M;hvm->tf$$<-Qupw^)DlTWfBpSE*DO#gxX+=8rv0Ia4BTcpN z0Zj^~r2P+fkwE4(Ub`4}zbCwC(+^yv)TEOHHxIe?zY=iyS^5qG@LV(1#1Sk3=kT_t zb#q!SnE#Tb;RUpIi+2%r?k<9?ee4>}ohi>kv1Wr90^GyfzlpV+NUWh(oInc+V5t z&L+*k*k>OI<(#)F{M_S3V9GO~M`DjyC8Q$ao(H|ZpTV?i)!EC@mw8wJIOUeeKF?;7 zGRuu_iQ{t`o_y8OqeE`U1=8zpuwff2pzX@rG2GlkwUN!!Ey6!U8@p-senJjyT;7rF zt;PUwJ);^Ym!_~fo=>~hxDA%82JktefYh{o@di=5GEs#WgQ4%Dz{(tDKMBE=A(rMU4uoJlg*}F*ZyBG9eyB zZK#`TG?w?{NC@|mMS=uKF%2~8p^;&g@91f&SD8GS!|AJ#!}K`vwEPw_&Mk^tqEwov zuG_~N-PLC6GK|LIRcpriN74kraqs6)KGO+>4|+b6CAdvJm!Z7kVdblHDyr@ma9C9+ zZ=}Yf2=?lnAFPYjA@&n8#orIPcCU9J=%a6kuahxeWILIjzatL=9ln%}CHSkSaeaI| zZp=seL`pb_8E%BnJ}ilo2sCsZInY|jnuT^5RV-iic%w&vv-8akf2nUqR7V__MZGTS zQvF%LI4xI4sE^~foypZSX%l6O&ku-&6uGW(>TRh|=|?e41BpYXZ1}ircKz9SYvP2f zbTj97{7xADW*MScnz!v)>joSILW2Xu4mrck7&;JwK{?9hDq_bZV~w}VE}|nNim42` zk^0tXBJB*m#)bXe+3$gw7rra7`mY2-60Wm8R5L*EdfhNVhO>Poz^MoRr{VtuxNqAD z@>!COqa}t3=mzq46$B?XwVN2HgBJ9#Hk+eCM9bXDSmX|1cZ4L$1Ho8;HMd&|;^)dvoV;(ndL z@`u|(Ta(AThyXJ|D{BYCWiqL7`S+rQJN0w^_$5`UlYK2;ng$1s6}66L8}Tu1np_N8 z7`y2xWLZygKXklnt++7XZUnT839vpu^sXic9LM z;uJREcjvZ!H6^27F`K)Sc%m)*W3+1IRYvRFCI|A=FPk{?`o` z!@J37ET@)J{s|*k?qb&L#zW~61-cdiUOxi1<~jb|ko}RD2=9xQDLnSPEdn?qi-L(2 q1NJE_zMPLZ^#fn(DP11l5Ru-zT)tW>NyYEx??AvBO67{?LH`5kDcJ=8 diff --git a/data/myaccount_photo/twitter.png b/data/myaccount_photo/twitter.png deleted file mode 100755 index 2e5c6d8a6f6f67564c4d84b8f06e36c37a022d7d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3530 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 EfaqZ$-q_`GJaV_pF#i2lPcPqs{tU$4U|96ti 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 diff --git a/icon_myaccount.png b/icon_myaccount.png deleted file mode 100644 index 5e2ccbbe42dcd3de384b49ac4eb4a85d00cb0193..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5532 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 -#include -#include -#include -#include -#include -#include -#include -#include "Eina.h" - -#ifndef LOG_TAG -#define LOG_TAG "MYACCOUNT" -#endif - -#include - - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - - -#ifndef PREFIX -# define PREFIX "/usr" -#endif - -#define MYACCOUNT_VERBOSE(fmt, arg...) \ - LOGI(": [%s (%d)]" fmt "\n", __FUNCTION__, __LINE__, ##arg); -#define MYACCOUNT_DBUG(fmt, arg...) \ - LOGD(": [%s (%d)]" fmt "\n", __FUNCTION__, __LINE__, ##arg); -#define MYACCOUNT_INFO(fmt, arg...) \ - LOGI(": [%s (%d)]" fmt "\n", __FUNCTION__, __LINE__, ##arg); -#define MYACCOUNT_WARNING(fmt, arg...) \ - LOGW(": [%s (%d)]" fmt "\n", __FUNCTION__, __LINE__, ##arg); -#define MYACCOUNT_ERROR(fmt, arg...) \ - LOGE(": [%s (%d)]" fmt "\n", __FUNCTION__, __LINE__, ##arg); -#define MYACCOUNT_FATAL(fmt, arg...) \ - LOGF(": [%s (%d)]" fmt "\n", __FUNCTION__, __LINE__, ##arg); - -#define _EDJ(obj) elm_layout_edje_get(obj) -/*#define dgettext_noop(s) (s) */ -/*#define N_(s) dgettext_noop(s)*/ - -#define PACKAGE "myaccount" -#define LOCALEDIR PREFIX"/usr/ug/res/locale" - -#define IMAGE_PATH "/usr/ug/res/images/ug-setting-myaccount-efl" - -/*#define MYACCOUNT_EDJ_PATH PREFIX"/share/edje/"*/ -#define MYACCOUNT_EDJ_PATH PREFIX"/usr/ug/res/edje/myaccount" -#define MYACCOUNT_EDJ_NAME MYACCOUNT_EDJ_PATH"/myaccount.edj" -#define MYACCOUNT_GRP_MAIN "main" - -typedef enum { - eMYACCOUNT_ACCOUNT_LIST, - eMYACCOUNT_ADD_ACCOUNT, -} myaccount_mode_e; - - -typedef struct appdata { - Evas_Object *base; - ui_gadget_h ug; - - Evas_Object *navi_bar; - Evas_Object *win_main; - Elm_Object_Item *navi_it; - myaccount_mode_e eMode; - - /* For accounts list*/ - Evas_Object *layout_main; - Evas_Object *account_genlist; - Evas_Object *help_label; - Evas_Object *r_title_sk; - Evas_Object *l_title_sk; - Evas_Object *modal_popup; - Ecore_Timer *progress_timer; - Evas_Object *auto_sync_check; - Evas_Object *refresh_btn; - Evas_Object *refresh_icon; - Evas_Object *cancel_sync_icon; - - Evas_Object *bg; - - /* For addaccount view*/ - Evas_Object *layout_addaccount; - Evas_Object *ly; - Evas_Object *add_genlist; - bool item_selected_state; - GList* sp_info_list; - GList* sorted_sp_list; - - /* to hold info about key lock*/ - int lock_priv_state; - int lock_curr_state; - ui_gadget_h ug_called; - Ecore_X_Window win_id; - - /*package manager client handle */ - pkgmgr_client *pc; - - /* extra data from ug caller */ - char *capability_filter; - char *caller_userdata; - char *called_from; - account_subscribe_h account_subscribe; -}myaccount_appdata; - -int myaccount_account_info_update(struct appdata *ad); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - - -#endif /* _MYACCOUNT_H_ */ - +/* + * my-account + * + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Wonyoung Lee , Tarun Kumar + * + * 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. + * + */ + +#ifndef _MYACCOUNT_H_ +#define _MYACCOUNT_H_ + + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "Eina.h" + + +#ifndef LOG_TAG +#define LOG_TAG "MYACCOUNT" +#endif + +#include + + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + + +#ifndef PREFIX +# define PREFIX "/usr" +#endif + +#define MYACCOUNT_VERBOSE(fmt, arg...) \ + LOGD(": [%s (%d)]" fmt , __FUNCTION__, __LINE__, ##arg); +#define MYACCOUNT_DBUG(fmt, arg...) \ + LOGD(": [%s (%d)]" fmt , __FUNCTION__, __LINE__, ##arg); +#define MYACCOUNT_WARNING(fmt, arg...) \ + LOGW(": [%s (%d)]" fmt , __FUNCTION__, __LINE__, ##arg); +#define MYACCOUNT_ERROR(fmt, arg...) \ + LOGE(": [%s (%d)]" fmt , __FUNCTION__, __LINE__, ##arg); +#define MYACCOUNT_FATAL(fmt, arg...) \ + LOGF(": [%s (%d)]" fmt , __FUNCTION__, __LINE__, ##arg); + +#define MYACCOUNT_SLOGD(fmt, arg...) \ + SECURE_LOGD(": [%s (%d)]" fmt , __FUNCTION__, __LINE__, ##arg); +#define MYACCOUNT_SLOGI(fmt, arg...) \ + SECURE_LOGD(": [%s (%d)]" fmt , __FUNCTION__, __LINE__, ##arg); +#define MYACCOUNT_SLOGE(fmt, arg...) \ + SECURE_LOGD(": [%s (%d)]" fmt , __FUNCTION__, __LINE__, ##arg); + +#define _EDJ(obj) elm_layout_edje_get(obj) +/*#define dgettext_noop(s) (s) */ +/*#define N_(s) dgettext_noop(s)*/ + +#define PACKAGE "myaccount" +//#define LOCALEDIR PREFIX"/usr/ug/res/locale" + +//#define IMAGE_PATH "/usr/ug/res/images/ug-setting-myaccount-efl" + +#define TIZEN_EMAIL_CSC_FILE_PATH "/opt/system/csc-default/data/csc-default-data-email-account.ini" +#define TIZEN_EMAIL_CSC_SP_COUNT_KEY "email_account:count" +#define TIZEN_EMAIL_CSC_SP_NAME_PREFIX "email_account:name_" + +/*#define MYACCOUNT_EDJ_PATH PREFIX"/share/edje/"*/ +//#define MYACCOUNT_EDJ_PATH PREFIX"/usr/ug/res/edje/myaccount" +//#define MYACCOUNT_EDJ_NAME MYACCOUNT_EDJ_PATH"/myaccount.edj" +#define MYACCOUNT_GRP_MAIN "main" +#define SAMSUNG_ACCOUNT_APPID "gr47by21a5.SamsungAccount" +#define TIZEN_ACCOUNT_APPID "t5ek35st3l.TizenAccount" +#define TIZEN_EMAIL_APPID "email-setting-efl" +#define EXCHANGE_UI_APPID "activesync-ui" +#define GOOGLE_ACCOUNT_APPID "com.samsung.google-service-account" +#define DROPBOX_APPID "com.samsung.dropbox" + +typedef enum { + eMYACCOUNT_ACCOUNT_LIST, + eMYACCOUNT_ADD_ACCOUNT, +} myaccount_mode_e; + + +typedef struct appdata { + Evas_Object *base; + ui_gadget_h ug; + + Evas_Object *navi_bar; + Evas_Object *win_main; + Evas_Object *conformant; + Elm_Object_Item *navi_it; + myaccount_mode_e eMode; + Elm_Win_Indicator_Mode indi_mode; + Elm_Win_Indicator_Opacity_Mode indi_o_mode; + bool overlap_mode; + + /* For accounts list*/ + Evas_Object *layout_main; + Evas_Object *account_genlist; + Evas_Object *help_label; + Evas_Object *r_title_sk; + Evas_Object *modal_popup; + Ecore_Timer *progress_timer; + Evas_Object *auto_sync_check; + Evas_Object *refresh_btn; + Evas_Object *refresh_icon; + Evas_Object *cancel_sync_icon; + Elm_Object_Item *nf_it; + GList* account_info_list; + GList* sorted_account_list; + + Evas_Object *bg; + Elm_Theme* theme; + /* For addaccount view*/ + Evas_Object *layout_addaccount; + Evas_Object *ly; + Evas_Object *add_genlist; + bool item_selected_state; + GList* sorted_sp_list; + Elm_Object_Item *add_nf_it; + int prev_app_cnt; + + /* to hold info about key lock*/ + int lock_priv_state; + int lock_curr_state; + ui_gadget_h ug_called; + Ecore_X_Window win_id; + + /* For application launch */ + Ecore_Timer *relaunch_timer; + app_control_h appsvc_handle; + + /* to block fast double-click */ + Ecore_Timer *clickblock_timer; + + /* languuage state */ + char* current_language; + + /*package manager client handle */ + pkgmgr_client *pc; + + /* extra data from ug caller */ + char *capability_filter; + char *caller_userdata; + char *called_from; + account_subscribe_h account_subscribe; + + Ea_Theme_Color_Table *color_table; + Eina_List *font_table; + Evas_Object *popup; +}myaccount_appdata; + +int myaccount_account_info_update(struct appdata *ad); +void myaccount_destroy_data(); +#ifdef __cplusplus +} +#endif /* __cplusplus */ + + +#endif /* _MYACCOUNT_H_ */ + diff --git a/include/myaccount_ug_account_list.h b/include/myaccount_ug_account_list.h old mode 100755 new mode 100644 index 3a31833..e238a52 --- a/include/myaccount_ug_account_list.h +++ b/include/myaccount_ug_account_list.h @@ -1,37 +1,64 @@ -/* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.1 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://floralicense.org/license/ - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an AS IS BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef _MYACCOUNT_UG_ACCOUNT_LIST_H_ -#define _MYACCOUNT_UG_ACCOUNT_LIST_H_ - -#include "myaccount_ug.h" - -void myaccount_list_view_create(myaccount_appdata *priv); - -void *myaccount_init_appdata(); - -void *myaccount_get_appdata(); - -void myaccount_list_refresh_item_list(myaccount_appdata *ad); - -void myaccount_ug_account_list_create(void *data); - -void myaccount_account_list_quit_cb( void *data, - Evas_Object *obj, void *event_info ); - - -#endif /* _MYACCOUNT_UG_ACCOUNT_LIST_H_ */ - +/* + * my-account + * + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Wonyoung Lee , Tarun Kumar + * + * 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. + * + */ + +#ifndef _MYACCOUNT_UG_ACCOUNT_LIST_H_ +#define _MYACCOUNT_UG_ACCOUNT_LIST_H_ + +#include "myaccount_ug.h" + +typedef struct __capability_data { + char* type; + int state; +}myaccount_capability_data; + +typedef struct __account_list_priv { + int account_id; + char username[256]; + char display_name[256]; + char email_address[256]; + char package_name[256]; + char domain_name[60]; + char icon_path[PATH_MAX]; + char capability[128]; + int secret; + int list_index; + int sync_status; + GSList *capablity_list; + bool b_tizen_email; + char service_sname[256]; +}myaccount_list_priv; + +void myaccount_list_view_create(myaccount_appdata *priv); +void myaccount_list_navi_create(myaccount_appdata *priv); + +void *myaccount_init_appdata(); + +void *myaccount_get_appdata(); + +void myaccount_list_refresh_item_list(myaccount_appdata *ad); + +void myaccount_ug_account_list_create(void *data); + +Eina_Bool myaccount_account_list_quit_cb(void *data, Elm_Object_Item *it); + + +#endif /* _MYACCOUNT_UG_ACCOUNT_LIST_H_ */ + diff --git a/include/myaccount_ug_addaccount.h b/include/myaccount_ug_addaccount.h index 16a9d8c..9a6b087 100755 --- a/include/myaccount_ug_addaccount.h +++ b/include/myaccount_ug_addaccount.h @@ -1,45 +1,52 @@ -/* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.1 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://floralicense.org/license/ - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an AS IS BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef _MYACCOUNT_UG_ADD_ACCOUNT_H_ -#define _MYACCOUNT_UG_ADD_ACCOUNT_H_ - -#include "myaccount_ug.h" -#include "myaccount_ug_common.h" - -typedef struct __addaccount_list_priv { - char service_name[256]; - char service_sname[256]; - char package_name[256]; - char icon_path[1024]; - MyAccountProviderType sp_type; - bool b_tizen_email; - bool multiple_account_support; -}addaccount_list_priv; - -void *myaccount_addaccount_create(ui_gadget_h ug, - enum ug_mode mode, service_h data, void *priv); - -void myaccount_addaccount_create_view(myaccount_appdata *ad); - -void myaccount_addaccount_free_priv_data(myaccount_appdata *appdata); - -void *myaccount_init_appdata(); - -void *myaccount_get_appdata(); - -#endif /* _MYACCOUNT_UG_ADD_ACCOUNT_H_ */ - +/* + * my-account + * + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Wonyoung Lee , Tarun Kumar + * + * 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. + * + */ + +#ifndef _MYACCOUNT_UG_ADD_ACCOUNT_H_ +#define _MYACCOUNT_UG_ADD_ACCOUNT_H_ + +#include "myaccount_ug.h" +#include "myaccount_ug_common.h" + +typedef struct __addaccount_list_priv { + char service_name[256]; + char service_sname[256]; + char package_name[256]; + char icon_path[1024]; + MyAccountProviderType sp_type; + bool b_tizen_email; + bool multiple_account_support; +}addaccount_list_priv; + +void *myaccount_addaccount_create(ui_gadget_h ug, + enum ug_mode mode, app_control_h data, void *priv); + +void myaccount_addaccount_create_view(myaccount_appdata *ad); + +void myaccount_addaccount_refresh_item_list(myaccount_appdata *ad); + +void myaccount_addaccount_free_priv_data(myaccount_appdata *appdata); + +void *myaccount_init_appdata(); + +void *myaccount_get_appdata(); + +#endif /* _MYACCOUNT_UG_ADD_ACCOUNT_H_ */ + diff --git a/include/myaccount_ug_common.h b/include/myaccount_ug_common.h index e33fd1b..7d28f0c 100755 --- a/include/myaccount_ug_common.h +++ b/include/myaccount_ug_common.h @@ -1,108 +1,138 @@ -/* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.1 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://floralicense.org/license/ - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an AS IS BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef _MYACCOUNT_UG_COMMON_H_ -#define _MYACCOUNT_UG_COMMON_H_ - -#include -#include -#include -#include -#include -#include -#include - -#define ENABLE_NOTI - -typedef enum { - MYACCOUNT_TYPE_ANONYMOUS, - MYACCOUNT_TYPE_CSC, - MYACCOUNT_TYPE_TIZEN, - MYACCOUNT_TYPE_OTHER -}MyAccountProviderType; - -typedef enum { - MYACCOUNT_REQUEST_SIGNIN = 0, - MYACCOUNT_REQUEST_VIEW -}MyAccountRequestViewType; - -void *myaccount_init_appdata(); - -void myaccount_destroy_appdata(); - -void *myaccount_get_appdata(); - -void myaccount_common_get_icon_by_name(char *account_name, - char *icon_path); - -void myaccount_common_lowercase(char* src, char* dest); - -Evas_Object *myaccount_common_progress_add(Evas_Object *parent); - -Evas_Object *myaccount_common_create_modal_popup(Evas_Object *parent); - -void myaccount_common_delete_modal_popup(Evas_Object *popup); - -Eina_Bool myaccount_common_modal_popup_timer_cb(gpointer data); - -bool myaccount_samsung_callback(char* result_code, char* user_id, void *user_data); - - -int myaccount_common_launch_application(MyAccountRequestViewType - request_type, - char *package_name, - char *username, - char *email_sp, - int account_id, - MyAccountProviderType sp_type, - void *data ); - -int myaccount_common_get_all_account_cnt(int *count); - -void myaccount_common_handle_notification(const char* event_type); - -void myaccount_common_listen_pkgmgr_for_pkg_uninstall(); - -#define MA_UG_NAME "ug-setting-myaccount-efl" - -#define MA_IMAGE_EDJ_NAME "/usr/ug/res/edje/ug-setting-myaccount-efl/myaccount_edc_images.edj" - -#define BUFSIZE 1024 - -#define MA_SNPRINTF(dest,size,format,arg...) \ - do { \ - snprintf(dest,size-1,format,##arg); \ - }while(0) - /* If the same pointer is passed to free twice, known as a double free. To avoid this, set pointers to -NULL after passing them to free: free(NULL) is safe (it does nothing). - */ - -#define MA_STRNCPY(dest,src,size) \ - do { \ - if(src != NULL && dest != NULL && size > 0) \ - { \ - strncpy(dest,src,size-1); \ - } \ - }while(0); - -#define MA_MEMFREE(ptr) \ - if (ptr != NULL) { \ - free(ptr); \ - ptr = NULL; \ - } \ - -#endif /* _MYACCOUNT_UG_COMMON_H_ */ - +/* + * my-account + * + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Wonyoung Lee , Tarun Kumar + * + * 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. + * + */ + +#ifndef _MYACCOUNT_UG_COMMON_H_ +#define _MYACCOUNT_UG_COMMON_H_ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define ENABLE_NOTI + +typedef enum { + MYACCOUNT_TYPE_EXCHANGE = 0, + MYACCOUNT_TYPE_GOOGLE, +// MYACCOUNT_TYPE_MSN, +// MYACCOUNT_TYPE_FACEBOOK, + MYACCOUNT_TYPE_PICASA, + MYACCOUNT_TYPE_YOUTUBE, + MYACCOUNT_TYPE_OTHER, + MYACCOUNT_TYPE_SAMSUNG, + MYACCOUNT_TYPE_CSC, + MYACCOUNT_TYPE_TIZEN, + MYACCOUNT_TYPE_UNKNOWN +}MyAccountProviderType; + +typedef enum { + MYACCOUNT_REQUEST_SIGNIN = 0, + MYACCOUNT_REQUEST_VIEW +}MyAccountRequestViewType; + +void *myaccount_init_appdata(); + +void myaccount_destroy_appdata(); + +void *myaccount_get_appdata(); + +void myaccount_common_set_item_selected_state(bool val); + +bool myaccount_common_get_item_selected_state(); + +void myaccount_common_get_icon_by_name(char *account_name, + char *icon_path); + +MyAccountProviderType myaccount_common_get_provider_type( + char *package_name); + +void myaccount_common_lowercase(char* src, char* dest); + +Evas_Object *myaccount_common_progress_add(Evas_Object *parent); + +void myaccount_common_delete_modal_popup(Evas_Object *popup); + +Eina_Bool myaccount_common_modal_popup_timer_cb(gpointer data); + +bool myaccount_samsung_callback(char* result_code, char* user_id, void *user_data); + + +int myaccount_common_launch_application(MyAccountRequestViewType + request_type, + char *package_name, + char *username, + char *email_sp, + int account_id, + MyAccountProviderType sp_type, + void *data ); + +int myaccount_common_get_all_account_cnt(int *count); + +int myaccount_common_get_account_cnt_by_capability(const char* capability_type, int *count); + +int myaccount_common_get_account_cnt_by_appid(const char* appid, int *count); + +void myaccount_common_handle_notification(const char* event_type); + +void myaccount_common_listen_pkgmgr_for_pkg_uninstall(); + +int myaccount_common_get_csc_sp_count(const char* capability_filter); + +int myaccount_common_get_account_type_count(const char* capability_filter); + + +#define MA_UG_NAME "setting-myaccount-efl" + +#define MA_IMAGE_EDJ_NAME "/usr/apps/setting-myaccount-efl/res/edje/setting-myaccount-efl/myaccount_edc_images.edj" + +#define MA_NO_ACCOUNT_EDJ_NAME "/usr/apps/setting-myaccount-efl/res/edje/setting-myaccount-efl/myaccount_nocontent.edj" + +#define BUFSIZE 1024 + +#define MA_SNPRINTF(dest,size,format,arg...) \ + do { \ + snprintf(dest,size-1,format,##arg); \ + }while(0) + /* If the same pointer is passed to free twice, known as a double free. To avoid this, set pointers to +NULL after passing them to free: free(NULL) is safe (it does nothing). + */ + +#define MA_STRNCPY(dest,src,size) \ + do { \ + if(src != NULL && dest != NULL && size > 0) \ + { \ + strncpy(dest,src,size-1); \ + } \ + }while(0); + +#define MA_MEMFREE(ptr) \ + if (ptr != NULL) { \ + free(ptr); \ + ptr = NULL; \ + } \ + +#endif /* _MYACCOUNT_UG_COMMON_H_ */ + diff --git a/include/myaccount_ug_main.h b/include/myaccount_ug_main.h index 7e43936..269d66d 100755 --- a/include/myaccount_ug_main.h +++ b/include/myaccount_ug_main.h @@ -1,23 +1,28 @@ -/* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.1 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://floralicense.org/license/ - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an AS IS BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef _MYACCOUNT_UG_MAIN_H_ -#define _MYACCOUNT_UG_MAIN_H_ - -#include - -#endif /* _MYACCOUNT_UG_MAIN_H_ */ - +/* + * my-account + * + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Wonyoung Lee , Tarun Kumar + * + * 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. + * + */ + +#ifndef _MYACCOUNT_UG_MAIN_H_ +#define _MYACCOUNT_UG_MAIN_H_ + +#include + +#endif /* _MYACCOUNT_UG_MAIN_H_ */ + diff --git a/packaging/my-account.spec b/packaging/my-account.spec index 3e7765c..c13a72b 100755 --- a/packaging/my-account.spec +++ b/packaging/my-account.spec @@ -1,12 +1,12 @@ -#sbs-git:slp/apps/m/my-account my-account 1.5.38 c12e7805519b99951f91c33cc96745c7f36166af Name: my-account Summary: My account application -Version: 1.8.36 +Version: 1.9.101 Release: 1 Group: main/devel -License: Flora-1.1 +License: TO_BE_FILL Source0: %{name}-%{version}.tar.gz BuildRequires: pkgconfig(elementary) +BuildRequires: pkgconfig(efl-assist) BuildRequires: pkgconfig(appcore-efl) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(dlog) @@ -24,39 +24,39 @@ BuildRequires: cmake BuildRequires: gettext-devel BuildRequires: edje-bin - %description My account application. %prep %setup -q +%define APPDIR /usr/apps/setting-myaccount-efl +%define BINDIR %{APPDIR}/bin +%define LIBDIR %{APPDIR}/lib/ug +%define RESDIR %{APPDIR}/res +%define DATADIR %{APPDIR}/shared/trusted + %build export CFLAGS="${CFLAGS} -fPIC -fvisibility=hidden" %define PREFIX "/usr" -cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} +cmake . -DCMAKE_INSTALL_PREFIX=%{PREFIX} \ + make %{?jobs:-j%jobs} %install rm -rf %{buildroot} %make_install -mkdir -p %{buildroot}/usr/share/license -cp %{_builddir}/%{name}-%{version}/LICENSE.Flora %{buildroot}/usr/share/license/%{name} %files %manifest my-account.manifest %defattr(-,root,root,-) -/usr/ug/lib/* -/usr/ug/res/* +%{LIBDIR}/* +%{RESDIR}/* /usr/share/packages/*.xml -/etc/smack/accesses2.d/* -/usr/share/license/%{name} +%{RESDIR}/ug-setting-cloud/shared/res/tables/* %post /sbin/ldconfig -vconftool set -f -t int db/account/auto_sync 1 -g 6514 -vconftool set -t int db/account/sync_all 0 -g 6514 -mkdir -p /usr/ug/bin/ -ln -sf /usr/bin/ug-client /usr/ug/bin/setting-myaccount-efl - +vconftool set -f -t int db/account/auto_sync 1 -s system::vconf_inhouse -g 6514 +vconftool set -t int db/account/sync_all 0 -s system::vconf_inhouse -g 6514 diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index 28aa5b7..3f36237 100755 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -1,7 +1,57 @@ # for i18n -SET(POFILES de_DE.po el_GR.po en.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 ar.po bg.po ca.po cs.po da.po en_US.po fi.po he.po hi.po hr.po hu.po id.po lt.po lv.po ms.po no.po pl.po ro.po sk.po sl.po sr.po sv.po th.po uk.po vi.po az.po en_PH.po es_MX.po et.po eu.po fr_CA.po ga.po gl.po hy.po is.po ka.po kk.po mk.po nb.po pt_BR.po uz.po zh_SG.po) - +SET(POFILES +ar.po +da.po +es_ES.po +fr.po +hy.po +ko_KR.po +pl.po +sl.po +zh_CN.po +az.po +de.po +es_US.po +ga.po +is.po +lt.po +pt_BR.po +sr.po +zh_HK.po +bg.po +el_GR.po +et.po +gl.po +it_IT.po +lv.po +pt_PT.po +sv.po +zh_TW.po +ca.po +en_PH.po +eu.po +hi.po +ja_JP.po +mk.po +ro.po +tr_TR.po +en.po +fi.po +hr.po +ka.po +nb.po +ru_RU.po +uk.po +cs.po +en_US.po +fr_CA.po +hu.po +kk.po +nl.po +sk.po +uz.po +) SET(MSGFMT "/usr/bin/msgfmt") @@ -17,7 +67,7 @@ FOREACH(pofile ${POFILES}) DEPENDS ${absPofile} ) INSTALL(FILES ${moFile} - DESTINATION /usr/ug/res/locale/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo) + DESTINATION ${RESDIR}/locale/${lang}/LC_MESSAGES RENAME ${PROJECT_NAME}.mo) SET(moFiles ${moFiles} ${moFile}) ENDFOREACH(pofile) diff --git a/po/GT-I7800_Accounts_Strings.csv b/po/GT-I7800_Accounts_Strings.csv deleted file mode 100644 index 6690446..0000000 --- a/po/GT-I7800_Accounts_Strings.csv +++ /dev/null @@ -1,6 +0,0 @@ -Design ID English Dutch German Chinese Traditional_HongKong Chinese Simplified Russian Korean Chinese Traditional_Taiwan Japanese Spanish Greek Italian Turkish Portuguese French -IDS_MA_BODY_FACEBOOK Facebook Facebook Facebook Facebook Facebook Facebook Facebook Facebook Facebook Facebook Facebook Facebook Facebook Facebook Facebook -IDS_MA_BODY_GOOGLE Google Google Google Google Google Google Google Google Google Google Google Google Google Google Google -IDS_MA_BODY_MSN MSN MSN MSN MSN MSN MSN MSN MSN MSN MSN MSN MSN MSN MSN MSN -IDS_MA_BODY_TWITTER Twitter Twitter Twitter Twitter Twitter Twitter Twitter Twitter Twitter Twitter Twitter Twitter Twitter Twitter Twitter -IDS_MA_HEADER_ADD_ACCOUNT Add account Account toevoegen Konto hinzufügen 加入帳戶 添加帐户 Добавить уч. запись 계정 추가 加入帳戶 ​アカウント​追加 Añadir cuenta Προσθήκη λογαριασμού Aggiungi account Hesap ekle Adicionar conta Ajouter compte diff --git a/po/POTFILES.in b/po/POTFILES.in deleted file mode 100755 index fc41798..0000000 --- a/po/POTFILES.in +++ /dev/null @@ -1,5 +0,0 @@ -# List of source files containing translatable strings. -src/myaccount_ug_account_list.c -src/myaccount_ug_addaccount.c -src/myaccount_ug_common.c -src/myaccount_ug_main.c diff --git a/po/ar.po b/po/ar.po old mode 100755 new mode 100644 index 776871a..9a6e4cf --- a/po/ar.po +++ b/po/ar.po @@ -1,150 +1,81 @@ -msgid "IDS_MA_BODY_OTHERS" -msgstr "أخرى" +msgid "IDS_COM_BODY_GALLERY" +msgstr "استوديو" -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "مزامنة تلقائية" - -msgid "IDS_MA_BODY_AOL" -msgstr "AOL" - -msgid "IDS_MA_BUTTON_OK" -msgstr "موافق" +msgid "IDS_COM_OPT_S_MEMO" +msgstr "مذكرة S" -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "إضافة حساب" - -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_COM_BODY_TASK" -msgstr "المهمة" - -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "تزامن جهات الاتصال" +msgid "IDS_COM_BODY_VOIP_CALL" +msgstr "اتصال VoIP" -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "أيام الذروة" +msgid "IDS_COM_BODY_S_PLANNER" +msgstr "مخطط S" -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "وقت إنتهاء الذروة" +msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" +msgstr "Samsung Apps" -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "وقت بدء الذروة" +msgid "IDS_COM_BODY_MUSIC" +msgstr "الموسيقى" -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "كل البيانات" +msgid "IDS_COM_BODY_MESSAGES" +msgstr "الرسائل" -msgid "IDS_SYNCML_BODY_SYNC_SERVER" -msgstr "خادم المزامنة" +msgid "IDS_COM_BODY_INTERNET" +msgstr "الإنترنت" msgid "IDS_COM_BODY_EMAIL" msgstr "بريد إلكتروني" -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "Exchange" +msgid "IDS_TW_BODY_POST_TWITTER" +msgstr "Post" msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" msgstr "Microsoft Exchange ActiveSync" -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "يمكنك إدارة جهات الاتصال والتقاويم والبريد الإلكتروني وحسابات المراسلة الفورية" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "عرض كلمة المرور" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "مجلدات البريد المطلوب دفعها" - -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "مزامنة المهمة" - -msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "تقويم" - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "اتصال VoIP" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "غير معروف" +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "تم الوصول إلى الحد المسموح به لحسابات البريد الإلكتروني." -msgid "IDS_COM_SK_ADD_LITE" -msgstr "إضافة" +msgid "IDS_MA_MBODY_AUTO_SYNC" +msgstr "مزامنة تلقائية" -msgid "IDS_MA_BODY_CONTACT" -msgstr "الاسم" +msgid "IDS_MA_HEADER_ADD_ACCOUNT" +msgstr "إضافة حساب" msgid "IDS_MA_HEADER_ACCOUNTS" msgstr "حسابات" -msgid "IDS_PB_BODY_PHOTO" -msgstr "صورة شخصية" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "غير فعالة" +msgid "IDS_MA_BUTTON_OK" +msgstr "موافق" -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "Post" +msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" +msgstr "يمكنك إدارة جهات الاتصال والتقاويم والبريد الإلكتروني وحسابات المراسلة الفورية." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "ابقاء الاتصال على البطارية الضعيفة" +msgid "IDS_MA_BODY_SIGNED_IN" +msgstr "تم تسجيل الدخول." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "أبق الاتصال أثناء التجوال" +msgid "IDS_PB_TAB_CONTACTS" +msgstr "الأسماء" -msgid "IDS_MA_BODY_MSN" -msgstr "MSN" +msgid "IDS_PB_BODY_ADD_ACCOUNT" +msgstr "إضافة حساب" -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "التزامن تلقائيا" +msgid "IDS_ST_BODY_VIDEOS" +msgstr "الفيديو" msgid "IDS_ST_BODY_MOBILE_TRACKER" msgstr "متعقب الهاتف" -msgid "IDS_EMAIL_SK3_ACCOUNT_LIST" +msgid "IDS_ST_BODY_ACCOUNT_LIST" msgstr "قائمة الحسابات" -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "سيتم حذف جميع البيانات المتعلقة بهذا الحساب. متابعة؟" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "اسم مستخدم أو بريد إلكتروني غير صحيح" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "يتعذر الحذف. هل تريد إعادة المحاولة؟" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "Samsung" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "إعداد يدوي" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "يمكن حذف الأحداث الحالية أو الإبقاء عليها في حالة إيقاف المزامنة" - -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "يمكن حذف جهات الاتصال الحالية أو الاحتفاظ بها في حالة إيقاف المزامنة" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "حذفها من الهاتف" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "الاحتفاظ بها في الهاتف" +msgid "IDS_SYNCML_BODY_SYNC_SERVER" +msgstr "خادم المزامنة" -msgid "IDS_ST_BODY_VIDEOS" -msgstr "الفيديو" +msgid "IDS_TASK_BODY_TASK" +msgstr "المهمة" -msgid "IDS_PB_BODY_OTHER_EMAILS" -msgstr "رسائل البريد الإلكتروني الأخرى" +msgid "IDS_HELP_POP_TUTORIAL_COMPLETE" +msgstr "استكمال المادة التعليمية." -msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC" -msgstr "الحسابات والمزامنة" +msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY" +msgstr "حدد إحدى خدمات السحابة لمزامنتها، ثم حدد إعداد حساب. وبمجرد إعداد حساب Samsung account، ستتم مزامنة المذكرات تلقائيا." diff --git a/po/az.po b/po/az.po old mode 100755 new mode 100644 index 6c7e171..433a6a1 --- a/po/az.po +++ b/po/az.po @@ -1,150 +1,81 @@ -msgid "IDS_MA_BODY_OTHERS" -msgstr "Digərləri" +msgid "IDS_COM_BODY_GALLERY" +msgstr "Qalereya" -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "Avto-sinxronlaşma" - -msgid "IDS_MA_BODY_AOL" -msgstr "AOL" - -msgid "IDS_MA_BUTTON_OK" -msgstr "OK" +msgid "IDS_COM_OPT_S_MEMO" +msgstr "S Memo" -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "Hesab əlavə edin" - -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_COM_BODY_TASK" -msgstr "Tapşırıq" - -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "Kontakt sinxronlaşdırması" +msgid "IDS_COM_BODY_VOIP_CALL" +msgstr "VoIP zəngi" -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "Pik günlər" +msgid "IDS_COM_BODY_S_PLANNER" +msgstr "S Planner" -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "Pikin sona çatma vaxtı" +msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" +msgstr "Samsung Apps" -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "Günün başlanğıcında pik vaxt" +msgid "IDS_COM_BODY_MUSIC" +msgstr "Musiqi" -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "Bütün verilənlər" +msgid "IDS_COM_BODY_MESSAGES" +msgstr "Mesajlar" -msgid "IDS_SYNCML_BODY_SYNC_SERVER" -msgstr "Sinxronlaşdırma serveri" +msgid "IDS_COM_BODY_INTERNET" +msgstr "İnternet" msgid "IDS_COM_BODY_EMAIL" msgstr "Elektron poçtlar" -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "Exchange" +msgid "IDS_TW_BODY_POST_TWITTER" +msgstr "Dərc et" msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" msgstr "Microsoft Exchange ActiveSync" -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "Siz kontaktlarınızı, təqvimlərinizi, e-poçt və IM hesablarınızı idarə edə bilərsiniz" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "Parolu göstərin" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "Push üçün poçt qovluqları" - -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "Tapşırıq sinxronlaşdırılması" - -msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "Təqvim" - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "VoIP zəngi" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "Naməlum" +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "E-poçt hesablarının sayı maksimuma çatmışdır." -msgid "IDS_COM_SK_ADD_LITE" -msgstr "Əlv et" +msgid "IDS_MA_MBODY_AUTO_SYNC" +msgstr "Avto-sinxronlaşma" -msgid "IDS_MA_BODY_CONTACT" -msgstr "Ad" +msgid "IDS_MA_HEADER_ADD_ACCOUNT" +msgstr "Hesab əlavə edin" msgid "IDS_MA_HEADER_ACCOUNTS" msgstr "Hesablar" -msgid "IDS_PB_BODY_PHOTO" -msgstr "Foto" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "Qeyri-aktivdir" +msgid "IDS_MA_BUTTON_OK" +msgstr "OK" -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "Dərc et" +msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" +msgstr "Siz kontaktlarınızı, təqvimlərinizi, e-poçt və IM hesablarınızı idarə edə bilərsiniz." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "Bağlantını zəif batareyada davam etdir" +msgid "IDS_MA_BODY_SIGNED_IN" +msgstr "Daxil olundu." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "Bağlantı rouminqdə qalsın" +msgid "IDS_PB_TAB_CONTACTS" +msgstr "Adlar" -msgid "IDS_MA_BODY_MSN" -msgstr "MSN" +msgid "IDS_PB_BODY_ADD_ACCOUNT" +msgstr "Hesab əlavə edin" -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "Avtomatik sinxronizasiya" +msgid "IDS_ST_BODY_VIDEOS" +msgstr "Video" msgid "IDS_ST_BODY_MOBILE_TRACKER" msgstr "Mobil izləmə sistemi" -msgid "IDS_EMAIL_SK3_ACCOUNT_LIST" +msgid "IDS_ST_BODY_ACCOUNT_LIST" msgstr "Hesab siyahısı" -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "Bu hesabla bağlı bütün məlumatlar silinəcək. Davam edilsin?" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "İstifadəçi adı və ya e-poçt səhvdir" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "Silmək mümkün deyil. Yenidən cəhd edilsin?" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "Samsung" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "Əl ilə qurşdırma" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Sinxronlaşdırılma söndürülübsə, mövcud hadisələr silinə və ya saxlana bilər" - -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Sinxronlaşdırılma söndürülübsə, mövcud kontaktlar silinə və ya saxlana bilər" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "Telefondan sil" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "Telefonda saxla" +msgid "IDS_SYNCML_BODY_SYNC_SERVER" +msgstr "Sinxronlaşdırma serveri" -msgid "IDS_ST_BODY_VIDEOS" -msgstr "Video" +msgid "IDS_TASK_BODY_TASK" +msgstr "Tapşırıq" -msgid "IDS_PB_BODY_OTHER_EMAILS" -msgstr "Digər epoçtlar" +msgid "IDS_HELP_POP_TUTORIAL_COMPLETE" +msgstr "Təlimatlar tamamlandı." -msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC" -msgstr "Hesablar və sinxronlaşdırma" +msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY" +msgstr "Hesabdan istifadə etmək və onu tənzimləmək üçün bulud xidmətini seçin. Siz bir dəfə Samsung hesabını köklədikdən sonra saxlanmış qeydlər avtomatik sinxronlaşdırılacaq." diff --git a/po/bg.po b/po/bg.po old mode 100755 new mode 100644 index 7ced6f1..84a104f --- a/po/bg.po +++ b/po/bg.po @@ -1,150 +1,81 @@ -msgid "IDS_MA_BODY_OTHERS" -msgstr "Други" +msgid "IDS_COM_BODY_GALLERY" +msgstr "Галерия" -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "Автоматично синхр." - -msgid "IDS_MA_BODY_AOL" -msgstr "AOL" - -msgid "IDS_MA_BUTTON_OK" -msgstr "OK" +msgid "IDS_COM_OPT_S_MEMO" +msgstr "S Memo" -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "Добавяне на акаунт" - -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_COM_BODY_TASK" -msgstr "Задача" - -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "Синхр. на записи" +msgid "IDS_COM_BODY_VOIP_CALL" +msgstr "VoIP повикване" -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "Натоварени дни" +msgid "IDS_COM_BODY_S_PLANNER" +msgstr "S Planner" -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "Край на натоварените часове" +msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" +msgstr "Samsung Apps" -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "Начало на натоварените часове" +msgid "IDS_COM_BODY_MUSIC" +msgstr "Музика" -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "Всички данни" +msgid "IDS_COM_BODY_MESSAGES" +msgstr "Съобщения" -msgid "IDS_SYNCML_BODY_SYNC_SERVER" -msgstr "Сървър за синхр." +msgid "IDS_COM_BODY_INTERNET" +msgstr "Интернет" msgid "IDS_COM_BODY_EMAIL" msgstr "Email" -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "Обмяна" +msgid "IDS_TW_BODY_POST_TWITTER" +msgstr "Публикуване" msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" msgstr "Microsoft Exchange ActiveSync" -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "Можете да управлявате своите записи, календари, имейл и IM акаунти" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "Показване на паролата" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "Папки с поща за push" - -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "Синхронизиране на задача" - -msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "Календар" - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "VoIP повикване" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "Няма информация" +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Достигнат е максималният брой акаунти за имейл." -msgid "IDS_COM_SK_ADD_LITE" -msgstr "Добави" +msgid "IDS_MA_MBODY_AUTO_SYNC" +msgstr "Автоматично синхр." -msgid "IDS_MA_BODY_CONTACT" -msgstr "Запис" +msgid "IDS_MA_HEADER_ADD_ACCOUNT" +msgstr "Добавяне на акаунт" msgid "IDS_MA_HEADER_ACCOUNTS" msgstr "Акаунти" -msgid "IDS_PB_BODY_PHOTO" -msgstr "Снимки" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "Неактивна" +msgid "IDS_MA_BUTTON_OK" +msgstr "OK" -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "Публикуване" +msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" +msgstr "Можете да управлявате своите записи, календари, имейл и IM акаунти." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "Запазвай връзката при слаба батерия" +msgid "IDS_MA_BODY_SIGNED_IN" +msgstr "Вие влязохте." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "Запазвай връзката в роуминг" +msgid "IDS_PB_TAB_CONTACTS" +msgstr "Телефонен указател" -msgid "IDS_MA_BODY_MSN" -msgstr "MSN" +msgid "IDS_PB_BODY_ADD_ACCOUNT" +msgstr "Добавяне на акаунт" -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "Автоматично синхронизиране" +msgid "IDS_ST_BODY_VIDEOS" +msgstr "Видеоклипове" msgid "IDS_ST_BODY_MOBILE_TRACKER" msgstr "Мобилно проследяване" -msgid "IDS_EMAIL_SK3_ACCOUNT_LIST" -msgstr "Списък\nакаунти" - -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "Ще бъдат изтрити всички данни, свързани с този акаунт. Продължаване?" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "Неправилно потребителско име или email" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "Не може да се изтрие. Нов опит?" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "Samsung" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "Ръчна настройка" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Съществуващите събития може да бъдат изтрити или запазени, ако като се изключи синхронизирането" +msgid "IDS_ST_BODY_ACCOUNT_LIST" +msgstr "Списък с акаунти" -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Съществуващите записи може да бъдат изтрити или запазени, ако като се изключи синхронизирането" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "Изтриване от телефона" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "Запазване в телефона" +msgid "IDS_SYNCML_BODY_SYNC_SERVER" +msgstr "Сървър за синхр." -msgid "IDS_ST_BODY_VIDEOS" -msgstr "Видеоклипове" +msgid "IDS_TASK_BODY_TASK" +msgstr "Задача" -msgid "IDS_PB_BODY_OTHER_EMAILS" -msgstr "Други email-и" +msgid "IDS_HELP_POP_TUTORIAL_COMPLETE" +msgstr "Самоучителят завърши." -msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC" -msgstr "Акаунти и синхронизиране" +msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY" +msgstr "Изберете услуга за облак, която да използвате, след което настройте акаунт. След като настроите Samsung акаунт, записаните бележки ще бъдат синхронизирани автоматично." diff --git a/po/ca.po b/po/ca.po old mode 100755 new mode 100644 index ca8ad97..4c665fc --- a/po/ca.po +++ b/po/ca.po @@ -1,150 +1,81 @@ -msgid "IDS_MA_BODY_OTHERS" -msgstr "Altres" +msgid "IDS_COM_BODY_GALLERY" +msgstr "Galeria" -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "Sincronització auto" - -msgid "IDS_MA_BODY_AOL" -msgstr "AOL" - -msgid "IDS_MA_BUTTON_OK" -msgstr "Acceptar" - -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "Afegir compte" - -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_COM_BODY_TASK" -msgstr "Tasca" +msgid "IDS_COM_OPT_S_MEMO" +msgstr "S Memo" -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "Sincronització de contactes" +msgid "IDS_COM_BODY_VOIP_CALL" +msgstr "Trucada VoIP" -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "Dies cim" +msgid "IDS_COM_BODY_S_PLANNER" +msgstr "Calendari" -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "Fi de l'hora cim" +msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" +msgstr "Samsung Apps" -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "Inici d'hora cim" +msgid "IDS_COM_BODY_MUSIC" +msgstr "Música" -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "Totes les dades" +msgid "IDS_COM_BODY_MESSAGES" +msgstr "Missatges" -msgid "IDS_SYNCML_BODY_SYNC_SERVER" -msgstr "Servidor de sincronització" +msgid "IDS_COM_BODY_INTERNET" +msgstr "Internet" msgid "IDS_COM_BODY_EMAIL" msgstr "Correu electrònic" -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "Exchange" +msgid "IDS_TW_BODY_POST_TWITTER" +msgstr "Publicar" msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" msgstr "Microsoft Exchange ActiveSync" -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "Pot administrar els contactes, calendaris, correu electrònic i comptes de MI" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "Mostrar contrasenya" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "Carpetes de correu per push" - -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "Sincronització de tasques" - -msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "Calend" - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "Trucada VoIP" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "Desconegut" +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "S'ha assolit el nombre màxim de comptes de correu electrònic" -msgid "IDS_COM_SK_ADD_LITE" -msgstr "Afegir" +msgid "IDS_MA_MBODY_AUTO_SYNC" +msgstr "Sincronització auto" -msgid "IDS_MA_BODY_CONTACT" -msgstr "Contacte" +msgid "IDS_MA_HEADER_ADD_ACCOUNT" +msgstr "Afegir compte" msgid "IDS_MA_HEADER_ACCOUNTS" msgstr "Comptes" -msgid "IDS_PB_BODY_PHOTO" -msgstr "Foto" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "Desactivada" +msgid "IDS_MA_BUTTON_OK" +msgstr "Acceptar" -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "Publicar" +msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" +msgstr "Pot administrar els contactes, calendaris, correu electrònic i comptes de MI" -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "Mantenir la connexió amb bateria baixa" +msgid "IDS_MA_BODY_SIGNED_IN" +msgstr "S'ha iniciat la sessió" -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "Mantingui la connexió en itinerància" +msgid "IDS_PB_TAB_CONTACTS" +msgstr "Contactes" -msgid "IDS_MA_BODY_MSN" -msgstr "MSN" +msgid "IDS_PB_BODY_ADD_ACCOUNT" +msgstr "Afegir compte" -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "Sincronitzar automàticament" +msgid "IDS_ST_BODY_VIDEOS" +msgstr "Vídeos" msgid "IDS_ST_BODY_MOBILE_TRACKER" msgstr "Rastrejador mòbil" -msgid "IDS_EMAIL_SK3_ACCOUNT_LIST" -msgstr "Llista comptes" - -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "S'esborraran totes les dades relacionades amb aquest compte. Continuar?" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "Nom d'usuari o correu electrònic incorrecte" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "No es pot esborrar. Tornar-ho a intentar?" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "Samsung" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "Configuració manual" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Els esdeveniments existents es poden esborrar o mantenir si es desactiva la sincronització" +msgid "IDS_ST_BODY_ACCOUNT_LIST" +msgstr "Llista de comptes" -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "els contactes existents es poden esborrar o mantenir si es desactiva la sincronització" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "Esborrar del telèfon" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "Mantenir al telèfon" +msgid "IDS_SYNCML_BODY_SYNC_SERVER" +msgstr "Servidor de sincronització" -msgid "IDS_ST_BODY_VIDEOS" -msgstr "Vídeos" +msgid "IDS_TASK_BODY_TASK" +msgstr "Tasca" -msgid "IDS_PB_BODY_OTHER_EMAILS" -msgstr "Altres correus electrònics" +msgid "IDS_HELP_POP_TUTORIAL_COMPLETE" +msgstr "Programa d'aprenentatge complet" -msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC" -msgstr "Comptes i sincronització" +msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY" +msgstr "Seleccioni un servei al núvol per utilitzar i, a continuació, configuri un compte. Quan hagi configurat un Samsung account, les notes desades se sincronitzaran automàticament." diff --git a/po/cs.po b/po/cs.po old mode 100755 new mode 100644 index 23fc48b..7259656 --- a/po/cs.po +++ b/po/cs.po @@ -1,150 +1,81 @@ -msgid "IDS_MA_BODY_OTHERS" -msgstr "Jiné" +msgid "IDS_COM_BODY_GALLERY" +msgstr "Galerie" -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "Automaticky synch." - -msgid "IDS_MA_BODY_AOL" -msgstr "AOL" - -msgid "IDS_MA_BUTTON_OK" -msgstr "OK" +msgid "IDS_COM_OPT_S_MEMO" +msgstr "S Poznámka" -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "Přidat účet" - -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_COM_BODY_TASK" -msgstr "Úkol" - -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "Synchronizace kontaktů" +msgid "IDS_COM_BODY_VOIP_CALL" +msgstr "Hovor VoIP" -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "Dny špičky" +msgid "IDS_COM_BODY_S_PLANNER" +msgstr "S Plánovač" -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "Konec špičky" +msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" +msgstr "Samsung Apps" -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "Začátek špičky" +msgid "IDS_COM_BODY_MUSIC" +msgstr "Hudba" -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "Všechna data" +msgid "IDS_COM_BODY_MESSAGES" +msgstr "Zprávy" -msgid "IDS_SYNCML_BODY_SYNC_SERVER" -msgstr "Synchronizační server" +msgid "IDS_COM_BODY_INTERNET" +msgstr "Internet" msgid "IDS_COM_BODY_EMAIL" msgstr "E-mail" -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "Exchange" +msgid "IDS_TW_BODY_POST_TWITTER" +msgstr "Vystavit" msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" msgstr "Microsoft Exchange ActiveSync" -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "Můžete spravovat své kontakty, kalendáře, e-maily a chatové účty" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "Zobrazit heslo" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "Poštovní složky k nabízení" - -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "Synchronizace úkolů" - -msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "Kalendář" - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "Hovor VoIP" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "Neznámé" +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Bylo dosaženo maximálního počtu e-mailových účtů." -msgid "IDS_COM_SK_ADD_LITE" -msgstr "Přid." +msgid "IDS_MA_MBODY_AUTO_SYNC" +msgstr "Automaticky synch." -msgid "IDS_MA_BODY_CONTACT" -msgstr "Kontakt" +msgid "IDS_MA_HEADER_ADD_ACCOUNT" +msgstr "Přidat účet" msgid "IDS_MA_HEADER_ACCOUNTS" msgstr "Účty" -msgid "IDS_PB_BODY_PHOTO" -msgstr "Fotografie" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "Neaktivní" +msgid "IDS_MA_BUTTON_OK" +msgstr "OK" -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "Vystavit" +msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" +msgstr "Můžete spravovat své kontakty, kalendáře, e-maily a chatové účty." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "Zachovat připojení při vybité baterii" +msgid "IDS_MA_BODY_SIGNED_IN" +msgstr "Jste přihlášeni." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "Zachovat připojení během roamingu" +msgid "IDS_PB_TAB_CONTACTS" +msgstr "Kontakty" -msgid "IDS_MA_BODY_MSN" -msgstr "MSN" +msgid "IDS_PB_BODY_ADD_ACCOUNT" +msgstr "Přidat účet" -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "Synchronizovat automaticky" +msgid "IDS_ST_BODY_VIDEOS" +msgstr "Videa" msgid "IDS_ST_BODY_MOBILE_TRACKER" msgstr "Mobilní stopař" -msgid "IDS_EMAIL_SK3_ACCOUNT_LIST" -msgstr "Seznam\núčtů" - -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "Všechna data související s tímto účtem budou odstraněna. Chcete pokračovat?" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "Chybné uživatelské jméno nebo e-mail" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "Nelze odstranit. Opakovat akci?" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "Samsung" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "Ruční nastavení" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Po vypnutí synchronizace bude možné stávající události odstranit nebo zachovat" +msgid "IDS_ST_BODY_ACCOUNT_LIST" +msgstr "Seznam účtů" -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Po vypnutí synchronizace bude možné stávající kontakty odstranit nebo zachovat" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "Odstranit z telefonu" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "Zachovat v telefonu" +msgid "IDS_SYNCML_BODY_SYNC_SERVER" +msgstr "Synchronizační server" -msgid "IDS_ST_BODY_VIDEOS" -msgstr "Videa" +msgid "IDS_TASK_BODY_TASK" +msgstr "Úkol" -msgid "IDS_PB_BODY_OTHER_EMAILS" -msgstr "Další e-maily" +msgid "IDS_HELP_POP_TUTORIAL_COMPLETE" +msgstr "Kurz byl dokončen." -msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC" -msgstr "Účty a synchronizace" +msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY" +msgstr "Vyberte službu cloud, kterou chcete použít, a nastavte účet. Jakmile nastavíte Samsung účet, uložené poznámky budou automaticky synchronizovány." diff --git a/po/csv2po_v2 b/po/csv2po_v2 deleted file mode 100755 index 85b9c6137e81011a7f6546771c3cb19c982b3d1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7585 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 diff --git a/po/csv_to_po.py b/po/csv_to_po.py deleted file mode 100755 index cd9af13..0000000 --- a/po/csv_to_po.py +++ /dev/null @@ -1,177 +0,0 @@ -#!/usr/bin/env python - -import os -import re -import sys -import csv - -re_strip = re.compile(r'"(.*)"') - -def usage(): - print 'usage: %s input.csv output.po' % sys.argv[0] - -def make_dic(input, outputname): - code, ext = outputname.split('.') - strtbl = {} - - try: - for r in input: - idx_msgid = r.index('msgid') - idx_msgstr = r.index(code) - break - - print 'Language code: %s' % code - - for r in input: - strtbl[r[idx_msgid]] = unicode(r[idx_msgstr], 'euc-kr').encode('utf-8') - - except ValueError, e: - print 'Error: check the language code' - - return strtbl - -def next_newline(lines, i): - while lines[i] <> '': - i = i + 1 - return i - -def next_item(lines, i): - while lines[i][:1] == '"': - i = i + 1 - return i - -def find_msgid(strtbl, lines, i, n): - msgid = '' - mlines = '' - - while i < n: - mlines = mlines + lines[i] + '\n' - i = i + 1 -# print 'mlines: ----------\n%s\n==========' % mlines - - res = re_strip.findall(mlines) - for i in range(len(res)): -# print '[%s]' % res[i] - if res[i] <> '': - if msgid <> '': - msgid = msgid + '\n' - msgid = msgid + res[i] - -# print 'msgid: -----------\n%s\n==========' % msgid - return msgid - - -def to_msgstr(lines): - ret = '' - l_line = lines.split('\n') - if len(l_line) == 1: - ret = 'msgstr "' + l_line[0] + '"\n' - else: - r_line = 'msgstr ""\n' - for i in range(len(l_line)): - r_line = r_line + '"' + l_line[i] + '"\n' - ret = r_line - return ret - -def to_msgid(lines, i, n): - ret = '' - - while i, YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-10-07 19:35+0900\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: src/myaccount_ug_account_list.c:538 -msgid "" -"You can manage your accounts
of email, contacts, calendar and
Instant " -"messenger." -msgstr "" - -#. elm_button_label_set(l_button, (const char*)_("Settings")); -#: src/myaccount_ug_account_list.c:553 -msgid "IDS_COM_BODY_SETTINGS" -msgstr "" - -#. elm_button_label_set(r1_button, (const char*)_("Add")); -#: src/myaccount_ug_account_list.c:558 -msgid "IDS_MA_SK_ADD" -msgstr "" - -#. elm_navigationbar_push(ad->navi_bar, _("Account"), l_button, r1_button, NULL, genlist); -#: src/myaccount_ug_account_list.c:563 -msgid "Accounts" -msgstr "" - -#: src/myaccount_ug_addaccount.c:400 -msgid "Add account" -msgstr "" diff --git a/po/nb.po b/po/nb.po old mode 100755 new mode 100644 index a0cdef7..ad0684e --- a/po/nb.po +++ b/po/nb.po @@ -1,150 +1,81 @@ -msgid "IDS_MA_BODY_OTHERS" -msgstr "Andre" +msgid "IDS_COM_BODY_GALLERY" +msgstr "Galleri" -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "Autosynkronisering" - -msgid "IDS_MA_BODY_AOL" -msgstr "AOL" - -msgid "IDS_MA_BUTTON_OK" -msgstr "OK" - -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "Legg til konto" +msgid "IDS_COM_OPT_S_MEMO" +msgstr "S Memo" -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_COM_BODY_TASK" -msgstr "Oppgave" - -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "Kontaktsynkronisering" +msgid "IDS_COM_BODY_VOIP_CALL" +msgstr "VoIP-anrop" -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "Trafikkdager" +msgid "IDS_COM_BODY_S_PLANNER" +msgstr "S Planner" -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "Trafikkperiode slutter" +msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" +msgstr "Samsung Apps" -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "Trafikkperiode starter" +msgid "IDS_COM_BODY_MUSIC" +msgstr "Musikk" -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "Alle data" +msgid "IDS_COM_BODY_MESSAGES" +msgstr "Meldinger" -msgid "IDS_SYNCML_BODY_SYNC_SERVER" -msgstr "Synk-server" +msgid "IDS_COM_BODY_INTERNET" +msgstr "Internett" msgid "IDS_COM_BODY_EMAIL" msgstr "E-post" -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "Exchange" +msgid "IDS_TW_BODY_POST_TWITTER" +msgstr "Publiser" msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" msgstr "Microsoft Exchange ActiveSync" -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "Du kan administrere kontakter, kalendere, e-post og direktemeldingskontoer" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "Vis passord" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "E-postmapper som skal pushes" - -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "Oppgavesynkronisering" - -msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "Kalender" - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "VoIP-anrop" +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Maksimalt antall e-postkontoer er nådd." -msgid "IDS_COM_POP_UNKNOWN" -msgstr "Ukjent" - -msgid "IDS_COM_SK_ADD_LITE" -msgstr "Tilføy" +msgid "IDS_MA_MBODY_AUTO_SYNC" +msgstr "Autosynkronisering" -msgid "IDS_MA_BODY_CONTACT" -msgstr "Kontakt" +msgid "IDS_MA_HEADER_ADD_ACCOUNT" +msgstr "Legg til konto" msgid "IDS_MA_HEADER_ACCOUNTS" msgstr "Kontoer" -msgid "IDS_PB_BODY_PHOTO" -msgstr "Foto" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "Inaktiv" +msgid "IDS_MA_BUTTON_OK" +msgstr "OK" -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "Publiser" +msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" +msgstr "Du kan administrere kontakter, kalendere, e-post og direktemeldingskontoer." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "Behold tilkoblingen ved lavt batteri" +msgid "IDS_MA_BODY_SIGNED_IN" +msgstr "Pålogget." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "Behold tilkobling ved roaming" +msgid "IDS_PB_TAB_CONTACTS" +msgstr "Kontakter" -msgid "IDS_MA_BODY_MSN" -msgstr "MSN" +msgid "IDS_PB_BODY_ADD_ACCOUNT" +msgstr "Legg til konto" -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "Synkroniser automatisk" +msgid "IDS_ST_BODY_VIDEOS" +msgstr "Video" msgid "IDS_ST_BODY_MOBILE_TRACKER" msgstr "Tyverisporing" -msgid "IDS_EMAIL_SK3_ACCOUNT_LIST" -msgstr "Konto liste" - -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "Alle data forbundet med denne kontoen slettes. Fortsette?" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "Feil brukernavn eller e-post" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "Kan ikke slette. Prøve på nytt?" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "Samsung" +msgid "IDS_ST_BODY_ACCOUNT_LIST" +msgstr "Kontoliste" -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "Manuelt oppsett" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Eksisterende hendelser kan slettes eller beholdes dersom synkronisering slås av" - -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Eksisterende kontakter kan slettes eller beholdes dersom synkroniseringen slås av" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "Slett fra telefon" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "Behold i telefon" +msgid "IDS_SYNCML_BODY_SYNC_SERVER" +msgstr "Synroniser tjener" -msgid "IDS_ST_BODY_VIDEOS" -msgstr "Videoklipp" +msgid "IDS_TASK_BODY_TASK" +msgstr "Oppgave" -msgid "IDS_PB_BODY_OTHER_EMAILS" -msgstr "Annen e-post" +msgid "IDS_HELP_POP_TUTORIAL_COMPLETE" +msgstr "Læreprogram fullført." -msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC" -msgstr "Kontoer og synkronisering" +msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY" +msgstr "Velg en nettskytjeneste du vil synkronisere med, og konfigurer deretter en konto. Når du har konfigurert en Samsung-konto, vil lagrede notater bli synkronisert automatisk." diff --git a/po/nl.po b/po/nl.po new file mode 100644 index 0000000..6e763d2 --- /dev/null +++ b/po/nl.po @@ -0,0 +1,81 @@ +msgid "IDS_COM_BODY_GALLERY" +msgstr "Galerij" + +msgid "IDS_COM_OPT_S_MEMO" +msgstr "S Memo" + +msgid "IDS_COM_BODY_VOIP_CALL" +msgstr "VoIP-oproep" + +msgid "IDS_COM_BODY_S_PLANNER" +msgstr "S Planner" + +msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" +msgstr "Samsung Apps" + +msgid "IDS_COM_BODY_MUSIC" +msgstr "Muziek" + +msgid "IDS_COM_BODY_MESSAGES" +msgstr "Berichten" + +msgid "IDS_COM_BODY_INTERNET" +msgstr "Internet" + +msgid "IDS_COM_BODY_EMAIL" +msgstr "E-mail" + +msgid "IDS_TW_BODY_POST_TWITTER" +msgstr "Plaatsen" + +msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" +msgstr "Microsoft Exchange ActiveSync" + +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Maximumaantal e-mailaccounts bereikt." + +msgid "IDS_MA_MBODY_AUTO_SYNC" +msgstr "Automatisch synchroniseren" + +msgid "IDS_MA_HEADER_ADD_ACCOUNT" +msgstr "Account toevoegen" + +msgid "IDS_MA_HEADER_ACCOUNTS" +msgstr "Accounts" + +msgid "IDS_MA_BUTTON_OK" +msgstr "OK" + +msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" +msgstr "U kunt contacten, agenda's, e-mail- en IM-accounts beheren." + +msgid "IDS_MA_BODY_SIGNED_IN" +msgstr "Ingelogd." + +msgid "IDS_PB_TAB_CONTACTS" +msgstr "Contacten" + +msgid "IDS_PB_BODY_ADD_ACCOUNT" +msgstr "Account toevoegen" + +msgid "IDS_ST_BODY_VIDEOS" +msgstr "Video's" + +msgid "IDS_ST_BODY_MOBILE_TRACKER" +msgstr "Mobiel opsporen" + +msgid "IDS_ST_BODY_ACCOUNT_LIST" +msgstr "Accountlijst" + +msgid "IDS_SYNCML_BODY_SYNC_SERVER" +msgstr "Synchronisatieserver" + +msgid "IDS_TASK_BODY_TASK" +msgstr "Taak" + +msgid "IDS_HELP_POP_TUTORIAL_COMPLETE" +msgstr "Zelfstudie voltooid." + +msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY" +msgstr "Selecteer de cloudservice die u wilt gebruiken en stel daarna een account in. Nadat u een Samsung account hebt ingesteld, worden opgeslagen memo's automatisch gesynchroniseerd." + diff --git a/po/nl_NL.po b/po/nl_NL.po deleted file mode 100755 index 4e59e91..0000000 --- a/po/nl_NL.po +++ /dev/null @@ -1,150 +0,0 @@ -msgid "IDS_MA_BODY_OTHERS" -msgstr "Overige" - -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "Automatisch synchroniseren" - -msgid "IDS_MA_BODY_AOL" -msgstr "AOL" - -msgid "IDS_MA_BUTTON_OK" -msgstr "OK" - -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "Account toevoegen" - -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_COM_BODY_TASK" -msgstr "Taak" - -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "Contacten synchroniseren" - -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "Piekdagen" - -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "Einde piektijd" - -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "Begin piektijd" - -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "Alle gegevens" - -msgid "IDS_SYNCML_BODY_SYNC_SERVER" -msgstr "Synchronisatieserver" - -msgid "IDS_COM_BODY_EMAIL" -msgstr "E-mail" - -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "Exchange" - -msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" -msgstr "Microsoft Exchange ActiveSync" - -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "U kunt contacten, agenda´s, e-mail- en IM-accounts beheren" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "Wachtwoord tonen" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "E-mailmappen voor push" - -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "Taak synchroniseren" - -msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "Agenda" - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "VoIP-oproep" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "Onbekend" - -msgid "IDS_COM_SK_ADD_LITE" -msgstr "Voeg toe" - -msgid "IDS_MA_BODY_CONTACT" -msgstr "Contact" - -msgid "IDS_MA_HEADER_ACCOUNTS" -msgstr "Accounts" - -msgid "IDS_PB_BODY_PHOTO" -msgstr "Foto" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "Uit" - -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "Plaatsen" - -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "Verbinding behouden bij weinig batterijvoeding" - -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "Verbinding behouden bij roaming" - -msgid "IDS_MA_BODY_MSN" -msgstr "MSN" - -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "Automatisch synchroniseren" - -msgid "IDS_ST_BODY_MOBILE_TRACKER" -msgstr "Mobiel opsporen" - -msgid "IDS_EMAIL_SK3_ACCOUNT_LIST" -msgstr "Account-lijst" - -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "Alle gegevens die met dit account samenhangen, worden verwijderd. Doorgaan?" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "Gebruikersnaam of e-mail onjuist" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "Kan niet verwijderen. Opnieuw proberen?" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "Samsung" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "Handmatige instelling" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Bestaande agenda-items kunnen worden verwijderd of behouden als synchronisatie wordt uitgeschakeld" - -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Bestaande contacten kunnen worden verwijderd of behouden als synchronisatie wordt uitgeschakeld" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "Verwijderen uit telefoon" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "Behouden op telefoon" - -msgid "IDS_ST_BODY_VIDEOS" -msgstr "Video's" - -msgid "IDS_PB_BODY_OTHER_EMAILS" -msgstr "Overige e-mails" - -msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC" -msgstr "Account- en synchronisatie-instellingen" - diff --git a/po/no.po b/po/no.po deleted file mode 100755 index 7e4f61f..0000000 --- a/po/no.po +++ /dev/null @@ -1,135 +0,0 @@ -msgid "IDS_COM_BODY_TASK" -msgstr "Oppgave" - -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" - -msgid "IDS_MA_BODY_OTHERS" -msgstr "Andre" - -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "Autosynkronisering" - -msgid "IDS_MA_BODY_ACCOUNT_LIST" -msgstr "Account list" - -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "Du kan administrere kontakter, kalendere, e-post og direktemeldingskontoer" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "Kalender" - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "VoIP-anrop" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "Ukjent" - -msgid "IDS_COM_SK_ADD_LITE" -msgstr "Tilføy" - -msgid "IDS_FB_BUTTON_VIDEO" -msgstr "Videoklipp" - -msgid "IDS_MA_BODY_CONTACT" -msgstr "Kontakt" - -msgid "IDS_MA_BUTTON_OK" -msgstr "OK" - -msgid "IDS_MA_HEADER_ACCOUNTS" -msgstr "Kontoer" - -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "Legg til konto" - -msgid "IDS_PB_BODY_PHOTO" -msgstr "Foto" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "Inaktiv" - -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "Publiser" - -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "Kontaktsynkronisering" - -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "Behold tilkoblingen ved lavt batteri" - -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "Behold tilkobling ved roaming" - -msgid "IDS_MA_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "Trafikkdager" - -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "Trafikkperiode slutter" - -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "Trafikkperiode starter" - -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "Synkroniser automatisk" - -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "Alle data" - -msgid "IDS_ST_BODY_MOBILE_TRACKER" -msgstr "Tyverisporing" - -msgid "IDS_COM_BODY_EMAIL" -msgstr "E-post" - -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "Exchange" - -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "Alle data forbundet med denne kontoen slettes. Fortsette?" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "Feil brukernavn eller e-post" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "Kan ikke slette. Prøve på nytt?" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "Samsung" - -msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" -msgstr "Microsoft Exchange ActiveSync" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "Vis passord" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "E-postmapper som skal pushes" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "Manuelt oppsett" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Eksisterende hendelser kan slettes eller beholdes dersom synkronisering slås av" - -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Eksisterende kontakter kan slettes eller beholdes dersom synkroniseringen slås av" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "Slett fra telefon" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "Behold i telefon" - -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "Oppgavesynkronisering" - diff --git a/po/pl.po b/po/pl.po old mode 100755 new mode 100644 index 866a33c..891a786 --- a/po/pl.po +++ b/po/pl.po @@ -1,150 +1,81 @@ -msgid "IDS_MA_BODY_OTHERS" -msgstr "Inne" +msgid "IDS_COM_BODY_GALLERY" +msgstr "Galeria" -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "Autom. synchr." - -msgid "IDS_MA_BODY_AOL" -msgstr "AOL" - -msgid "IDS_MA_BUTTON_OK" -msgstr "OK" +msgid "IDS_COM_OPT_S_MEMO" +msgstr "S Notatka" -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "Dodaj konto" - -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_COM_BODY_TASK" -msgstr "Zadanie" - -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "Synchr. kontaktów" +msgid "IDS_COM_BODY_VOIP_CALL" +msgstr "Połączenie VoIP" -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "Dni szczytu" +msgid "IDS_COM_BODY_S_PLANNER" +msgstr "S Terminarz" -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "Koniec szczytu" +msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" +msgstr "Samsung Apps" -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "Początek szczytu" +msgid "IDS_COM_BODY_MUSIC" +msgstr "Muzyka" -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "Wszystkie dane" +msgid "IDS_COM_BODY_MESSAGES" +msgstr "Wiadomości" -msgid "IDS_SYNCML_BODY_SYNC_SERVER" -msgstr "Serwer synch." +msgid "IDS_COM_BODY_INTERNET" +msgstr "Internet" msgid "IDS_COM_BODY_EMAIL" msgstr "E-mail" -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "Exchange" +msgid "IDS_TW_BODY_POST_TWITTER" +msgstr "Publikuj" msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" msgstr "Microsoft Exchange ActiveSync" -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "Możesz zarządzać kontaktami, kalendarzami, e-mailami i kontami komunikatora" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "Wyświetl hasło" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "Synchronizowane katalogi" - -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "Synchr. zadań" - -msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "Kalend." - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "Połączenie VoIP" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "Nieznana" +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Osiągnięto maksymalną liczbę kont e-mail." -msgid "IDS_COM_SK_ADD_LITE" -msgstr "Dodaj" +msgid "IDS_MA_MBODY_AUTO_SYNC" +msgstr "Autom. synchr." -msgid "IDS_MA_BODY_CONTACT" -msgstr "Kontakt" +msgid "IDS_MA_HEADER_ADD_ACCOUNT" +msgstr "Dodaj konto" msgid "IDS_MA_HEADER_ACCOUNTS" msgstr "Konta" -msgid "IDS_PB_BODY_PHOTO" -msgstr "Zdjęcie" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "Nieaktywne" +msgid "IDS_MA_BUTTON_OK" +msgstr "OK" -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "Publikuj" +msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" +msgstr "Możesz zarządzać kontaktami, kalendarzami, e-mailami i kontami komunikatora." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "Utrzymuj połączenie przy rozładowanej baterii" +msgid "IDS_MA_BODY_SIGNED_IN" +msgstr "Zalogowano." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "Utrzymuj połączenie w roamingu" +msgid "IDS_PB_TAB_CONTACTS" +msgstr "Kontakty" -msgid "IDS_MA_BODY_MSN" -msgstr "MSN" +msgid "IDS_PB_BODY_ADD_ACCOUNT" +msgstr "Dodaj konto" -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "Synchronizuj automatycznie" +msgid "IDS_ST_BODY_VIDEOS" +msgstr "Filmy" msgid "IDS_ST_BODY_MOBILE_TRACKER" msgstr "Mobile Tracker" -msgid "IDS_EMAIL_SK3_ACCOUNT_LIST" +msgid "IDS_ST_BODY_ACCOUNT_LIST" msgstr "Lista kont" -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "Wszystkie dane powiązane z tym kontem zostaną usunięte. Kontynuować?" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "Nieprawidłowa nazwa użytkownika lub adres e-mail" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "Nie można usunąć. Spróbować ponownie?" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "Samsung" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "Konfiguracja ręczna" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Po wyłączeniu synchronizacji istniejące wydarzenia mogą zostać usunięte lub zachowane" - -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Po wyłączeniu synchronizacji istniejące kontakty mogą zostać usunięte lub zachowane" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "Usuń z telefonu" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "Zachowaj w telefonie" +msgid "IDS_SYNCML_BODY_SYNC_SERVER" +msgstr "Serwer synch." -msgid "IDS_ST_BODY_VIDEOS" -msgstr "Filmy" +msgid "IDS_TASK_BODY_TASK" +msgstr "Zadanie" -msgid "IDS_PB_BODY_OTHER_EMAILS" -msgstr "Inne adresy e-mail" +msgid "IDS_HELP_POP_TUTORIAL_COMPLETE" +msgstr "Samouczek ukończono." -msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC" -msgstr "Konta i synchronizacja" +msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY" +msgstr "Wybierz usługę chmurową, której chcesz użyć, a następnie skonfiguruj konto. Po skonfigurowaniu konta Samsung zapisane zapiski będą synchronizowane automatycznie." diff --git a/po/po_to_csv.py b/po/po_to_csv.py deleted file mode 100755 index 4a23e94..0000000 --- a/po/po_to_csv.py +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/env python - -import os -import re -import sys -import csv - -OUTPUT = '' -INPUT = '' - -def usage(): - print 'usage: %s input.po output.csv' % sys.argv[0] - -def write_header(inputname, out): - code, ext = inputname.split('.') - out.writerow(['msgid', code]) - -def to_string(l): - str = '' - for i in range(len(l)): - if str <> '' and l[i] <> '': - str += '\n' - str += l[i] - return str - -def _extract(outf, po): - arg_re = r'"[^\\\"]*(?:\\.[^\\\"]*)*"' - arg_re = '%s(?:\s+%s)*' % (arg_re, arg_re) - re_get = re.compile(r'^msgid\s+(' + arg_re + ')\s*\nmsgstr\s+(' + arg_re + ')\s*\n', re.M) - - re_strip = re.compile(r'"(.*)"') - - res = re_get.findall(po) - - for i in range(len(res)): - l_id = re_strip.findall(res[i][0]) - s_id = to_string(l_id) - if s_id == '': - continue - l_str = re_strip.findall(res[i][1]) - s_str = to_string(l_str) - outf.writerow([s_id, unicode(s_str, 'utf-8').encode('euc-kr')]) - -def extract(): - if len(sys.argv) < 3: - usage() - return - - INPUT = sys.argv[1] - OUTPUT = sys.argv[2] - - print 'Input filename: %s' % INPUT - print 'Output filename: %s' % OUTPUT - - try: - outf = csv.writer(open(OUTPUT, 'wb')) - write_header(INPUT, outf) - - inf = open(INPUT, 'r') - po = inf.read() - - _extract(outf, po) - - inf.close() - - except Exception, e: - print e - - -if __name__ == "__main__": - extract() - diff --git a/po/pt_BR.po b/po/pt_BR.po old mode 100755 new mode 100644 index fabf13e..591a9f7 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,150 +1,81 @@ -msgid "IDS_MA_BODY_OTHERS" -msgstr "Outros" +msgid "IDS_COM_BODY_GALLERY" +msgstr "Galeria" -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "Sincronização automática" - -msgid "IDS_MA_BODY_AOL" -msgstr "AOL" - -msgid "IDS_MA_BUTTON_OK" -msgstr "OK" +msgid "IDS_COM_OPT_S_MEMO" +msgstr "S Memo" -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "Adicionar conta" - -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_COM_BODY_TASK" -msgstr "Tarefas" - -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "Sincronização de contatos" +msgid "IDS_COM_BODY_VOIP_CALL" +msgstr "Chamadas VoIP" -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "Dias de pico" +msgid "IDS_COM_BODY_S_PLANNER" +msgstr "S Planner" -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "Fim do horário de pico" +msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" +msgstr "Samsung Apps" -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "Início do horário de pico" +msgid "IDS_COM_BODY_MUSIC" +msgstr "Músicas" -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "Todos os dados" +msgid "IDS_COM_BODY_MESSAGES" +msgstr "Mensagem" -msgid "IDS_SYNCML_BODY_SYNC_SERVER" -msgstr "Servidor de sincronização" +msgid "IDS_COM_BODY_INTERNET" +msgstr "Internet" msgid "IDS_COM_BODY_EMAIL" msgstr "E-mail" -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "Exchange" +msgid "IDS_TW_BODY_POST_TWITTER" +msgstr "Publicar" msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" msgstr "Microsoft Exchange ActiveSync" -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "Você pode gerenciar seus contatos, calendários, e-mails e contas de IM" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "Exibir senha" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "Pastas de e-mail para receber" - -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "Sincronização de tarefa" - -msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "Calendário" - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "Chamadas VoIP" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "Desconhecido" +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Número máximo de contas de e-mails atingido." -msgid "IDS_COM_SK_ADD_LITE" -msgstr "Adicionar" +msgid "IDS_MA_MBODY_AUTO_SYNC" +msgstr "Sincronização automática" -msgid "IDS_MA_BODY_CONTACT" -msgstr "Contato" +msgid "IDS_MA_HEADER_ADD_ACCOUNT" +msgstr "Adicionar conta" msgid "IDS_MA_HEADER_ACCOUNTS" msgstr "Contas" -msgid "IDS_PB_BODY_PHOTO" -msgstr "Foto" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "Inativo" +msgid "IDS_MA_BUTTON_OK" +msgstr "OK" -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "Publicar" +msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" +msgstr "Você pode gerenciar seus contatos, calendários, e-mails e contas de IM." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "Manter a conexão em caso de bateria fraca" +msgid "IDS_MA_BODY_SIGNED_IN" +msgstr "Sessão iniciada." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "Manter conexão durante o roaming" +msgid "IDS_PB_TAB_CONTACTS" +msgstr "Contatos" -msgid "IDS_MA_BODY_MSN" -msgstr "MSN" +msgid "IDS_PB_BODY_ADD_ACCOUNT" +msgstr "Adicionar conta" -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "Sincronizar automaticamente" +msgid "IDS_ST_BODY_VIDEOS" +msgstr "Vídeos" msgid "IDS_ST_BODY_MOBILE_TRACKER" msgstr "Mobile Tracker" -msgid "IDS_EMAIL_SK3_ACCOUNT_LIST" -msgstr "Lista de contas" - -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "Todos os dados relacionados a esta conta serão apagados. Continuar?" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "Nome de usuário ou e-mail incorretos" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "Impossível apagar. Tentar novamente?" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "Samsung" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "Configuração manual" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Os eventos existentes podem ser excluídos ou salvos se a sincronização for desativada" +msgid "IDS_ST_BODY_ACCOUNT_LIST" +msgstr "Lista de conta" -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Os contatos existentes podem ser excluídos ou salvos se a sincronização for desativada" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "Excluir do telefone" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "Salvar no telefone" +msgid "IDS_SYNCML_BODY_SYNC_SERVER" +msgstr "Servidor de sincronização" -msgid "IDS_ST_BODY_VIDEOS" -msgstr "Vídeos" +msgid "IDS_TASK_BODY_TASK" +msgstr "Tarefas" -msgid "IDS_PB_BODY_OTHER_EMAILS" -msgstr "Outros e-mails" +msgid "IDS_HELP_POP_TUTORIAL_COMPLETE" +msgstr "Tutorial concluído" -msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC" -msgstr "Contas e sincronização" +msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY" +msgstr "Selecione um serviço em nuvem para usar e configurar uma conta. Após você ter configurado uma Conta Samsung, os lembretes salvos serão sincronizados automaticamente." diff --git a/po/pt_PT.po b/po/pt_PT.po old mode 100755 new mode 100644 index a12d24b..4c0f69e --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -1,150 +1,81 @@ -msgid "IDS_MA_BODY_OTHERS" -msgstr "Outros" +msgid "IDS_COM_BODY_GALLERY" +msgstr "Galeria" -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "Sincronização automática" - -msgid "IDS_MA_BODY_AOL" -msgstr "AOL" - -msgid "IDS_MA_BUTTON_OK" -msgstr "OK" +msgid "IDS_COM_OPT_S_MEMO" +msgstr "S Memo" -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "Adicionar conta" - -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_COM_BODY_TASK" -msgstr "Tarefa" - -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "Sincronizar contactos" +msgid "IDS_COM_BODY_VOIP_CALL" +msgstr "Chamada VoIP" -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "Dias de ponta" +msgid "IDS_COM_BODY_S_PLANNER" +msgstr "S Planner" -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "Fim de hora de ponta" +msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" +msgstr "Samsung Apps" -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "Início de hora de ponta" +msgid "IDS_COM_BODY_MUSIC" +msgstr "Música" -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "Todos os dados" +msgid "IDS_COM_BODY_MESSAGES" +msgstr "Mensagem" -msgid "IDS_SYNCML_BODY_SYNC_SERVER" -msgstr "Servidor de sincronização" +msgid "IDS_COM_BODY_INTERNET" +msgstr "Internet" msgid "IDS_COM_BODY_EMAIL" msgstr "E-mail" -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "Exchange" +msgid "IDS_TW_BODY_POST_TWITTER" +msgstr "Publicar" msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" msgstr "Microsoft Exchange ActiveSync" -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "Pode gerir os seus contactos, agendas, e-mail e contas de MI" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "Mostrar palavra-passe" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "Pastas de correio para difundir" - -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "Sincronização de tarefa" - -msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "Agenda" - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "Chamada VoIP" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "Desconhecido" +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Número máximo de contas de e-mails atingido." -msgid "IDS_COM_SK_ADD_LITE" -msgstr "Adicion." +msgid "IDS_MA_MBODY_AUTO_SYNC" +msgstr "Sincronização automática" -msgid "IDS_MA_BODY_CONTACT" -msgstr "Contacto" +msgid "IDS_MA_HEADER_ADD_ACCOUNT" +msgstr "Adicionar conta" msgid "IDS_MA_HEADER_ACCOUNTS" msgstr "Contas" -msgid "IDS_PB_BODY_PHOTO" -msgstr "Foto" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "Inactivo" +msgid "IDS_MA_BUTTON_OK" +msgstr "OK" -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "Publicar" +msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" +msgstr "Pode gerir os seus contactos, agendas, e-mail e contas de MI." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "Manter a ligação no caso de bateria fraca" +msgid "IDS_MA_BODY_SIGNED_IN" +msgstr "Sessão iniciada." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "Manter ligação durante o roaming" +msgid "IDS_PB_TAB_CONTACTS" +msgstr "Contactos" -msgid "IDS_MA_BODY_MSN" -msgstr "MSN" +msgid "IDS_PB_BODY_ADD_ACCOUNT" +msgstr "Adicionar conta" -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "Sincronizar automaticamente" +msgid "IDS_ST_BODY_VIDEOS" +msgstr "Vídeos" msgid "IDS_ST_BODY_MOBILE_TRACKER" msgstr "Mobile tracker" -msgid "IDS_EMAIL_SK3_ACCOUNT_LIST" +msgid "IDS_ST_BODY_ACCOUNT_LIST" msgstr "Lista contas" -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "Todos os dados relacionados com esta conta serão eliminados. Continuar?" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "Nome de utilizador ou e-mail incorrectos" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "Impossível eliminar. Tentar novamente?" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "Samsung" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "Configuração manual" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Os eventos existentes podem ser eliminados ou guardados se a sincronização for desligada" - -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Os contactos existentes podem ser eliminados ou guardados se a sincronização for desligada" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "Eliminar do telefone" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "Guardar no telefone" +msgid "IDS_SYNCML_BODY_SYNC_SERVER" +msgstr "Servidor de sincronização" -msgid "IDS_ST_BODY_VIDEOS" -msgstr "Vídeos" +msgid "IDS_TASK_BODY_TASK" +msgstr "Tarefa" -msgid "IDS_PB_BODY_OTHER_EMAILS" -msgstr "Outros e-mails" +msgid "IDS_HELP_POP_TUTORIAL_COMPLETE" +msgstr "Tutorial concluído." -msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC" -msgstr "Contas e sincronização" +msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY" +msgstr "Seleccione um serviço de nuvem para utilizar e configure uma conta. Depois de ter configurado uma conta Samsung, os memorandos guardados serão sincronizados automaticamente." diff --git a/po/ro.po b/po/ro.po old mode 100755 new mode 100644 index fa2a10a..0fd1c06 --- a/po/ro.po +++ b/po/ro.po @@ -1,150 +1,81 @@ -msgid "IDS_MA_BODY_OTHERS" -msgstr "Altele" +msgid "IDS_COM_BODY_GALLERY" +msgstr "Galerie" -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "Sincron. automată" - -msgid "IDS_MA_BODY_AOL" -msgstr "AOL" - -msgid "IDS_MA_BUTTON_OK" -msgstr "OK" +msgid "IDS_COM_OPT_S_MEMO" +msgstr "S Memo" -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "Adăugare cont" - -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_COM_BODY_TASK" -msgstr "Activitate" - -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "Sincronizare contact" +msgid "IDS_COM_BODY_VOIP_CALL" +msgstr "Apel VoIP" -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "Zile de vârf" +msgid "IDS_COM_BODY_S_PLANNER" +msgstr "Planificator S" -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "Final perioadă de vârf" +msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" +msgstr "Samsung Apps" -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "Început perioadă de vârf" +msgid "IDS_COM_BODY_MUSIC" +msgstr "Muzică" -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "Toate datele" +msgid "IDS_COM_BODY_MESSAGES" +msgstr "Mesaje" -msgid "IDS_SYNCML_BODY_SYNC_SERVER" -msgstr "Sincronizare server" +msgid "IDS_COM_BODY_INTERNET" +msgstr "Internet" msgid "IDS_COM_BODY_EMAIL" msgstr "Email" -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "Exchange" +msgid "IDS_TW_BODY_POST_TWITTER" +msgstr "Postare" msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" msgstr "Microsoft Exchange ActiveSync" -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "Vă puteţi gestiona contactele, calendarele, e-mailul şi conturile IM" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "Afişare parolă" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "Directoare de poştă electronică pentru push" - -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "Sincronizare activitate" - -msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "Calendar" - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "Apel VoIP" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "Necunoscut" +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "S-a atins numărul maxim de conturi de email." -msgid "IDS_COM_SK_ADD_LITE" -msgstr "Adăug." +msgid "IDS_MA_MBODY_AUTO_SYNC" +msgstr "Sincron. automată" -msgid "IDS_MA_BODY_CONTACT" -msgstr "Contact" +msgid "IDS_MA_HEADER_ADD_ACCOUNT" +msgstr "Adăugare cont" msgid "IDS_MA_HEADER_ACCOUNTS" msgstr "Conturi" -msgid "IDS_PB_BODY_PHOTO" -msgstr "Fotografie" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "Inactiv" +msgid "IDS_MA_BUTTON_OK" +msgstr "OK" -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "Postare" +msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" +msgstr "Vă puteţi gestiona contactele, calendarele, e-mailul şi conturile IM." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "Conexiune continuă cu bateria descărcată" +msgid "IDS_MA_BODY_SIGNED_IN" +msgstr "Conectarea a reuşit." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "Menţinere conexiune în roaming" +msgid "IDS_PB_TAB_CONTACTS" +msgstr "Contacte" -msgid "IDS_MA_BODY_MSN" -msgstr "MSN" +msgid "IDS_PB_BODY_ADD_ACCOUNT" +msgstr "Adăugare cont" -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "Sincronizare automată" +msgid "IDS_ST_BODY_VIDEOS" +msgstr "Videoclipuri" msgid "IDS_ST_BODY_MOBILE_TRACKER" msgstr "Mobile Tracker" -msgid "IDS_EMAIL_SK3_ACCOUNT_LIST" -msgstr "Listă\nde cont." - -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "Toate datele asociate acestui cont vor fi şterse. Continuaţi?" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "Nume de utilizator sau adresă de e-mail incorecte" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "Imposibil de şters. Încercaţi din nou?" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "Samsung" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "Configurare manuală" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Evenimentele existente pot fi şterse sau păstrate dacă sincronizarea este dezactivată" +msgid "IDS_ST_BODY_ACCOUNT_LIST" +msgstr "Listă de conturi" -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Contactele existente pot fi şterse sau păstrate dacă sincronizarea este dezactivată" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "Ştergere din telefon" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "Păstrare în telefon" +msgid "IDS_SYNCML_BODY_SYNC_SERVER" +msgstr "Sincronizare server" -msgid "IDS_ST_BODY_VIDEOS" -msgstr "Videoclipuri" +msgid "IDS_TASK_BODY_TASK" +msgstr "Activitate" -msgid "IDS_PB_BODY_OTHER_EMAILS" -msgstr "Alte e-mailuri" +msgid "IDS_HELP_POP_TUTORIAL_COMPLETE" +msgstr "Tutorial finalizat." -msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC" -msgstr "Conturi şi sincronizare" +msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY" +msgstr "Selectaţi un serviciu cloud pe care doriţi să-l utilizaţi, apoi configuraţi un cont. După configurarea unui cont Samsung, notiţele salvate vor fi sincronizate automat." diff --git a/po/ru_RU.po b/po/ru_RU.po old mode 100755 new mode 100644 index 34aa1a1..ab2a6a9 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -1,150 +1,81 @@ -msgid "IDS_MA_BODY_OTHERS" -msgstr "Прочее" +msgid "IDS_COM_BODY_GALLERY" +msgstr "Галерея" -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "Автосинхронизация" - -msgid "IDS_MA_BODY_AOL" -msgstr "AOL" - -msgid "IDS_MA_BUTTON_OK" -msgstr "ОК" - -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "Добавить уч. запись" +msgid "IDS_COM_OPT_S_MEMO" +msgstr "S Memo" -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_COM_BODY_TASK" -msgstr "Задача" - -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "Синхронизация контактов" +msgid "IDS_COM_BODY_VOIP_CALL" +msgstr "Вызов VoIP" -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "Пиковые дни" +msgid "IDS_COM_BODY_S_PLANNER" +msgstr "S Planner" -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "Время окончания пикового периода" +msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" +msgstr "Samsung Apps" -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "Время начала пикового периода" +msgid "IDS_COM_BODY_MUSIC" +msgstr "Музыка" -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "Все данные" +msgid "IDS_COM_BODY_MESSAGES" +msgstr "Сообщения" -msgid "IDS_SYNCML_BODY_SYNC_SERVER" -msgstr "Сервер синхронизации" +msgid "IDS_COM_BODY_INTERNET" +msgstr "Интернет" msgid "IDS_COM_BODY_EMAIL" msgstr "E-mail" -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "Exchange" +msgid "IDS_TW_BODY_POST_TWITTER" +msgstr "Опубликовать" msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" msgstr "Microsoft Exchange ActiveSync" -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "Вы можете управлять своими контактами, календарями, электронной почтой и учетными записями IM" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "Показать пароль" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "Папки почты для push-синхронизации" - -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "Синхронизация задач" - -msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "Календ." - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "Вызов VoIP" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "Неизвестно" +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Достигнуто максимальное число учетных записей электронной почты." -msgid "IDS_COM_SK_ADD_LITE" -msgstr "Добав." +msgid "IDS_MA_MBODY_AUTO_SYNC" +msgstr "Автосинхронизация" -msgid "IDS_MA_BODY_CONTACT" -msgstr "Контакт" +msgid "IDS_MA_HEADER_ADD_ACCOUNT" +msgstr "Добавить учетную запись" msgid "IDS_MA_HEADER_ACCOUNTS" msgstr "Учетные записи" -msgid "IDS_PB_BODY_PHOTO" -msgstr "Фото" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "Неактивно" +msgid "IDS_MA_BUTTON_OK" +msgstr "ОК" -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "Опубликовать" +msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" +msgstr "Вы можете управлять своими контактами, календарями, электронной почтой и учетными записями IM." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "Не разрывать подключение при низком заряде батареи" +msgid "IDS_MA_BODY_SIGNED_IN" +msgstr "Вход выполнен." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "Не разрывать подключение в роуминге" +msgid "IDS_PB_TAB_CONTACTS" +msgstr "Контакты" -msgid "IDS_MA_BODY_MSN" -msgstr "MSN" +msgid "IDS_PB_BODY_ADD_ACCOUNT" +msgstr "Добавить учетную запись" -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "Синхронизировать автоматически" +msgid "IDS_ST_BODY_VIDEOS" +msgstr "Видео" msgid "IDS_ST_BODY_MOBILE_TRACKER" msgstr "Оповещение о смене SIM-карты" -msgid "IDS_EMAIL_SK3_ACCOUNT_LIST" -msgstr "Учетные записи" - -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "Все данные, относящиеся к этой учетной записи, будут удалены. Продолжить?" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "Неправильное имя пользователя или адрес электронной почты" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "Невозможно удалить. Повторить попытку?" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "Samsung" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "Настройка вручную" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "После отключения синхронизации можно либо удалить, либо сохранить существующие события" +msgid "IDS_ST_BODY_ACCOUNT_LIST" +msgstr "Список учетных записей" -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "После отключения синхронизации можно либо удалить, либо сохранить существующие контакты" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "Удалить с телефона" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "Сохранить на телефоне" +msgid "IDS_SYNCML_BODY_SYNC_SERVER" +msgstr "Сервер синхронизации" -msgid "IDS_ST_BODY_VIDEOS" -msgstr "Видео" +msgid "IDS_TASK_BODY_TASK" +msgstr "Задача" -msgid "IDS_PB_BODY_OTHER_EMAILS" -msgstr "Другие сообщения электронной почты" +msgid "IDS_HELP_POP_TUTORIAL_COMPLETE" +msgstr "Обучение завершено." -msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC" -msgstr "Учетные записи и синхронизация" +msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY" +msgstr "Выберите облачную службу для использования и настройте учетную запись. После настройки учетной записи Samsung сохраненные записки будут синхронизированы автоматически." diff --git a/po/sk.po b/po/sk.po old mode 100755 new mode 100644 index 8443fab..751ea5f --- a/po/sk.po +++ b/po/sk.po @@ -1,150 +1,81 @@ -msgid "IDS_MA_BODY_OTHERS" -msgstr "Ostatné" +msgid "IDS_COM_BODY_GALLERY" +msgstr "Galéria" -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "Automat. synchronizácia" - -msgid "IDS_MA_BODY_AOL" -msgstr "AOL" - -msgid "IDS_MA_BUTTON_OK" -msgstr "OK" +msgid "IDS_COM_OPT_S_MEMO" +msgstr "Poznámka S" -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "Pridať konto" - -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_COM_BODY_TASK" -msgstr "Úloha" - -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "Synchronizácia kontaktov" +msgid "IDS_COM_BODY_VOIP_CALL" +msgstr "Hovor VoIP" -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "Dni silnej prevádzky" +msgid "IDS_COM_BODY_S_PLANNER" +msgstr "Plánovač S" -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "Konečný čas silnej prevádzky" +msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" +msgstr "Samsung Apps" -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "Počiatočný čas silnej prevádzky" +msgid "IDS_COM_BODY_MUSIC" +msgstr "Hudba" -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "Všetky údaje" +msgid "IDS_COM_BODY_MESSAGES" +msgstr "Správy" -msgid "IDS_SYNCML_BODY_SYNC_SERVER" -msgstr "Synchronizačný server" +msgid "IDS_COM_BODY_INTERNET" +msgstr "Internet" msgid "IDS_COM_BODY_EMAIL" msgstr "E-mail" -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "Exchange" +msgid "IDS_TW_BODY_POST_TWITTER" +msgstr "Príspevok" msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" msgstr "Microsoft Exchange ActiveSync" -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "Môžete spravovať kontakty, kalendáre, e-maily a kontá okamžitých správ" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "Zobraziť heslo" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "Poštové priečinky na automatickú synchronizáciu" - -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "Synchronizácia úloh" - -msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "Kalendár" - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "Hovor VoIP" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "Neznáme" +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Dosiahol sa maximálny počet e-mailových kont." -msgid "IDS_COM_SK_ADD_LITE" -msgstr "Pridať" +msgid "IDS_MA_MBODY_AUTO_SYNC" +msgstr "Automat. synchronizácia" -msgid "IDS_MA_BODY_CONTACT" -msgstr "Kontakt" +msgid "IDS_MA_HEADER_ADD_ACCOUNT" +msgstr "Pridať konto" msgid "IDS_MA_HEADER_ACCOUNTS" msgstr "Kontá" -msgid "IDS_PB_BODY_PHOTO" -msgstr "Fotografia" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "Neaktívne" +msgid "IDS_MA_BUTTON_OK" +msgstr "OK" -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "Príspevok" +msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" +msgstr "Môžete spravovať kontakty, kalendáre, e-maily a kontá okamžitých správ." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "Zachovať spojenie pri slabej batérii" +msgid "IDS_MA_BODY_SIGNED_IN" +msgstr "Prihlásený." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "Zachovať spojenie pri roamingu" +msgid "IDS_PB_TAB_CONTACTS" +msgstr "Kontakty" -msgid "IDS_MA_BODY_MSN" -msgstr "MSN" +msgid "IDS_PB_BODY_ADD_ACCOUNT" +msgstr "Pridať konto" -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "Synchronizovať automaticky" +msgid "IDS_ST_BODY_VIDEOS" +msgstr "Videá" msgid "IDS_ST_BODY_MOBILE_TRACKER" msgstr "Mobilný stopár" -msgid "IDS_EMAIL_SK3_ACCOUNT_LIST" -msgstr "Zoznam\nkont" - -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "Všetky údaje týkajúce sa tohto konta sa vymažú. Pokračovať?" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "Nesprávne meno používateľa alebo e-mail" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "Nedá sa vymazať. Skúsiť znova?" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "Samsung" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "Manuálne nastavenie" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Existujúce udalosti môžete buď odstrániť, alebo ponechať, ak je synchronizácia vypnutá" +msgid "IDS_ST_BODY_ACCOUNT_LIST" +msgstr "Zoznam kont" -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Existujúce kontakty môžete buď odstrániť, alebo ponechať, ak je synchronizácia vypnutá" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "Odstrániť z telefónu" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "Ponechať v telefóne" +msgid "IDS_SYNCML_BODY_SYNC_SERVER" +msgstr "Synchronizačný server" -msgid "IDS_ST_BODY_VIDEOS" -msgstr "Videá" +msgid "IDS_TASK_BODY_TASK" +msgstr "Úloha" -msgid "IDS_PB_BODY_OTHER_EMAILS" -msgstr "Ďalšie e-maily" +msgid "IDS_HELP_POP_TUTORIAL_COMPLETE" +msgstr "Kurz je dokončený." -msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC" -msgstr "Kontá a synchronizácia" +msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY" +msgstr "Vyberte službu cloud, ktorú chcete použiť, a potom nastavte konto. Po nastavení konta Samsung sa automaticky synchronizujú uložené pripomienky." diff --git a/po/sl.po b/po/sl.po old mode 100755 new mode 100644 index 14d4fce..f1fdeb5 --- a/po/sl.po +++ b/po/sl.po @@ -1,150 +1,81 @@ -msgid "IDS_MA_BODY_OTHERS" -msgstr "Drugo" +msgid "IDS_COM_BODY_GALLERY" +msgstr "Galerija" -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "Samodejna sinhronizacija" - -msgid "IDS_MA_BODY_AOL" -msgstr "AOL" - -msgid "IDS_MA_BUTTON_OK" -msgstr "V redu" +msgid "IDS_COM_OPT_S_MEMO" +msgstr "S Memo" -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "Dodaj račun" - -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_COM_BODY_TASK" -msgstr "Opravila" - -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "Sinhronizacija stikov" +msgid "IDS_COM_BODY_VOIP_CALL" +msgstr "Klic VoIP" -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "Zasedeni dnevi" +msgid "IDS_COM_BODY_S_PLANNER" +msgstr "S Planner" -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "Konec bolj zasedenega časa" +msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" +msgstr "Samsung Apps" -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "Začetek bolj zasedenega časa" +msgid "IDS_COM_BODY_MUSIC" +msgstr "Glasba" -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "Vsi podatki" +msgid "IDS_COM_BODY_MESSAGES" +msgstr "Sporočila" -msgid "IDS_SYNCML_BODY_SYNC_SERVER" -msgstr "Strežnik za sinhronizacijo" +msgid "IDS_COM_BODY_INTERNET" +msgstr "Internet" msgid "IDS_COM_BODY_EMAIL" msgstr "E-pošta" -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "Exchange" +msgid "IDS_TW_BODY_POST_TWITTER" +msgstr "Objavi" msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" msgstr "Microsoft Exchange ActiveSync" -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "Upravljate lahko stike, koledarje, e-pošto in račune za NS" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "Prikaži geslo" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "Poštne mape za potisk" - -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "Sinhronizacija opravila" - -msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "Koledar" - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "Klic VoIP" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "Neznano" +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Doseženo je največje dovoljeno število računov za e-pošto." -msgid "IDS_COM_SK_ADD_LITE" -msgstr "Dodaj" +msgid "IDS_MA_MBODY_AUTO_SYNC" +msgstr "Samodejna sinhronizacija" -msgid "IDS_MA_BODY_CONTACT" -msgstr "Stik" +msgid "IDS_MA_HEADER_ADD_ACCOUNT" +msgstr "Dodaj račun" msgid "IDS_MA_HEADER_ACCOUNTS" msgstr "Računi" -msgid "IDS_PB_BODY_PHOTO" -msgstr "Fotografija" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "Neaktivno" +msgid "IDS_MA_BUTTON_OK" +msgstr "V redu" -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "Objavi" +msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" +msgstr "Upravljate lahko stike, koledarje, e-pošto in račune za NS." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "Ohrani povezavo pri skoraj prazni bateriji" +msgid "IDS_MA_BODY_SIGNED_IN" +msgstr "Prijava je uspela." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "Ohrani povezavo med gostovanjem" +msgid "IDS_PB_TAB_CONTACTS" +msgstr "Imenik" -msgid "IDS_MA_BODY_MSN" -msgstr "MSN" +msgid "IDS_PB_BODY_ADD_ACCOUNT" +msgstr "Dodaj račun" -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "Sinhroniziraj samodejno" +msgid "IDS_ST_BODY_VIDEOS" +msgstr "Videoposnetki" msgid "IDS_ST_BODY_MOBILE_TRACKER" msgstr "Mobilni sledilnik" -msgid "IDS_EMAIL_SK3_ACCOUNT_LIST" -msgstr "Seznam\nračunov" - -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "Vsi podatki, povezani s tem računom, bodo izbrisani. Nadaljujem?" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "Napačno uporabniško ime ali e-pošta" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "Ni mogoče izbrisati. Poskusim znova?" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "Samsung" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "Ročna nastavitev" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Obstoječe dogodke lahko izbrišete ali ohranite, če je sinhronizacija izključena" +msgid "IDS_ST_BODY_ACCOUNT_LIST" +msgstr "Seznam računov" -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Obstoječe stike lahko izbrišete ali ohranite, če je sinhronizacija izključena" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "Izbriši iz telefona" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "Ohrani v telefonu" +msgid "IDS_SYNCML_BODY_SYNC_SERVER" +msgstr "Strežnik za sinhronizacijo" -msgid "IDS_ST_BODY_VIDEOS" -msgstr "Videoposnetki" +msgid "IDS_TASK_BODY_TASK" +msgstr "Opravila" -msgid "IDS_PB_BODY_OTHER_EMAILS" -msgstr "Druge e-pošte" +msgid "IDS_HELP_POP_TUTORIAL_COMPLETE" +msgstr "Vadnica je končana." -msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC" -msgstr "Računi in sinhronizacija" +msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY" +msgstr "Izberite storitev v oblaku, ki jo želite uporabiti, nato pa nastavite račun. Ko nastavite Samsung račun, se bodo shranjene beležke samodejno sinhronizirale." diff --git a/po/sr.po b/po/sr.po old mode 100755 new mode 100644 index c82106e..13f6a6c --- a/po/sr.po +++ b/po/sr.po @@ -1,150 +1,81 @@ -msgid "IDS_MA_BODY_OTHERS" -msgstr "Ostalo" +msgid "IDS_COM_BODY_GALLERY" +msgstr "Galerija" -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "Automatska sinhronizacija" - -msgid "IDS_MA_BODY_AOL" -msgstr "AOL" - -msgid "IDS_MA_BUTTON_OK" -msgstr "OK" +msgid "IDS_COM_OPT_S_MEMO" +msgstr "S Memo" -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "Dodaj nalog" - -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_COM_BODY_TASK" -msgstr "Zadatak" - -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "Sinhronizacija kontakata" +msgid "IDS_COM_BODY_VOIP_CALL" +msgstr "VoIP poziv" -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "Udarni dani" +msgid "IDS_COM_BODY_S_PLANNER" +msgstr "S planer" -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "Kraj udarnog vremena" +msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" +msgstr "Samsung Apps" -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "Početak udarnog vremena" +msgid "IDS_COM_BODY_MUSIC" +msgstr "Muzika" -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "Svi podaci" +msgid "IDS_COM_BODY_MESSAGES" +msgstr "Poruke" -msgid "IDS_SYNCML_BODY_SYNC_SERVER" -msgstr "Server za sinhronizaciju" +msgid "IDS_COM_BODY_INTERNET" +msgstr "Internet" msgid "IDS_COM_BODY_EMAIL" msgstr "E-pošta" -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "Exchange" +msgid "IDS_TW_BODY_POST_TWITTER" +msgstr "Objavi" msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" msgstr "Microsoft Exchange ActiveSync" -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "Možeš da upravljaš svojim kontaktima, kalendarom, e-poštom i nalozima za trenutne poruke" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "Prikaži šifru" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "Folderi za pritisne poruke" - -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "Sinhronizacija zadataka" - -msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "Kalendar" - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "VoIP poziv" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "Nepoznato" +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Dostignut maksimalan broj naloga e-pošte." -msgid "IDS_COM_SK_ADD_LITE" -msgstr "Dodaj" +msgid "IDS_MA_MBODY_AUTO_SYNC" +msgstr "Automatska sinhronizacija" -msgid "IDS_MA_BODY_CONTACT" -msgstr "Kontakt" +msgid "IDS_MA_HEADER_ADD_ACCOUNT" +msgstr "Dodaj nalog" msgid "IDS_MA_HEADER_ACCOUNTS" msgstr "Nalozi" -msgid "IDS_PB_BODY_PHOTO" -msgstr "Fotografija" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "Neaktivno" +msgid "IDS_MA_BUTTON_OK" +msgstr "OK" -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "Objavi" +msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" +msgstr "Možeš da upravljaš svojim kontaktima, kalendarom, e-poštom i nalozima za trenutne poruke." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "Održavaj vezu pri slaboj bateriji" +msgid "IDS_MA_BODY_SIGNED_IN" +msgstr "Prijavljen." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "Održavaj vezu u romingu" +msgid "IDS_PB_TAB_CONTACTS" +msgstr "Kontakti" -msgid "IDS_MA_BODY_MSN" -msgstr "MSN" +msgid "IDS_PB_BODY_ADD_ACCOUNT" +msgstr "Dodaj nalog" -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "Sinhronizuj automatski" +msgid "IDS_ST_BODY_VIDEOS" +msgstr "Video zapisi" msgid "IDS_ST_BODY_MOBILE_TRACKER" msgstr "Mobile tracker" -msgid "IDS_EMAIL_SK3_ACCOUNT_LIST" -msgstr "Lista\nnaloga" - -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "Biće obrisani svi podaci povezani sa ovim nalogom. Nastavak?" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "Neispravno korisničko ime ili adresa e-pošte" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "Nemoguće obrisati. Ponoviti?" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "Samsung" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "Ručno konfigurisanje" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Ako je sinhronizacija isključena, postojeći događaji se mogu izbrisati ili sačuvati" +msgid "IDS_ST_BODY_ACCOUNT_LIST" +msgstr "Lista naloga" -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Ako je sinhronizacija isključena, postojeći kontakti se mogu izbrisati ili sačuvati" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "Izbriši iz telefona" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "Sačuvaj na telefonu" +msgid "IDS_SYNCML_BODY_SYNC_SERVER" +msgstr "Server za sinhronizaciju" -msgid "IDS_ST_BODY_VIDEOS" -msgstr "Video zapisi" +msgid "IDS_TASK_BODY_TASK" +msgstr "Zadatak" -msgid "IDS_PB_BODY_OTHER_EMAILS" -msgstr "Druge adrese e-pošte" +msgid "IDS_HELP_POP_TUTORIAL_COMPLETE" +msgstr "Vodič dovršen." -msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC" -msgstr "Nalozi i sinhronizacija" +msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY" +msgstr "Izaberi uslugu na oblaku koju želiš da koristiš, a zatim podesi account. Kada podesiš Samsung account, sačuvane beleške će se automatski sinhronizovati." diff --git a/po/sv.po b/po/sv.po old mode 100755 new mode 100644 index 70b63ba..6f91ce8 --- a/po/sv.po +++ b/po/sv.po @@ -1,150 +1,81 @@ -msgid "IDS_MA_BODY_OTHERS" -msgstr "Annat" +msgid "IDS_COM_BODY_GALLERY" +msgstr "Galleri" -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "Autosynkning" - -msgid "IDS_MA_BODY_AOL" -msgstr "AOL" - -msgid "IDS_MA_BUTTON_OK" -msgstr "OK" +msgid "IDS_COM_OPT_S_MEMO" +msgstr "S Memo" -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "Lägg till konto" - -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_COM_BODY_TASK" -msgstr "Uppgift" - -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "Synkronisera kontakter" +msgid "IDS_COM_BODY_VOIP_CALL" +msgstr "VoIP-samtal" -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "Dagar med hög belastning" +msgid "IDS_COM_BODY_S_PLANNER" +msgstr "S Kalender" -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "Sluttid för hög belastning" +msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" +msgstr "Samsung Apps" -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "Starttid för hög belastning" +msgid "IDS_COM_BODY_MUSIC" +msgstr "Musik" -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "Alla data" +msgid "IDS_COM_BODY_MESSAGES" +msgstr "Meddelanden" -msgid "IDS_SYNCML_BODY_SYNC_SERVER" -msgstr "Synkroniseringsserver" +msgid "IDS_COM_BODY_INTERNET" +msgstr "Internet" msgid "IDS_COM_BODY_EMAIL" msgstr "E-post" -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "Exchange" +msgid "IDS_TW_BODY_POST_TWITTER" +msgstr "Posta" msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" msgstr "Microsoft Exchange ActiveSync" -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "Du kan hantera kontakter, kalender, e-post och IM-konton" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "Visa lösenord" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "Mappar som ska pushas" - -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "Synkronisera uppgifter" - -msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "Kalender" - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "VoIP-samtal" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "Okänd" +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Högsta antal e-postkonton har uppnåtts." -msgid "IDS_COM_SK_ADD_LITE" -msgstr "Lägg till" +msgid "IDS_MA_MBODY_AUTO_SYNC" +msgstr "Autosynkning" -msgid "IDS_MA_BODY_CONTACT" -msgstr "Kontakt" +msgid "IDS_MA_HEADER_ADD_ACCOUNT" +msgstr "Lägg till konto" msgid "IDS_MA_HEADER_ACCOUNTS" msgstr "Konton" -msgid "IDS_PB_BODY_PHOTO" -msgstr "Foto" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "Inaktiv" +msgid "IDS_MA_BUTTON_OK" +msgstr "OK" -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "Posta" +msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" +msgstr "Du kan hantera kontakter, kalender, e-post och IM-konton." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "Behåll anslutning vid låg batterinivå" +msgid "IDS_MA_BODY_SIGNED_IN" +msgstr "Inloggad." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "Behåll anslutning vid roaming" +msgid "IDS_PB_TAB_CONTACTS" +msgstr "Kontakter" -msgid "IDS_MA_BODY_MSN" -msgstr "MSN" +msgid "IDS_PB_BODY_ADD_ACCOUNT" +msgstr "Lägg till konto" -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "Synka automatiskt" +msgid "IDS_ST_BODY_VIDEOS" +msgstr "Videoklipp" msgid "IDS_ST_BODY_MOBILE_TRACKER" msgstr "Stöldspårning" -msgid "IDS_EMAIL_SK3_ACCOUNT_LIST" +msgid "IDS_ST_BODY_ACCOUNT_LIST" msgstr "Kontolista" -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "Alla data som hänför sig till det här kontot raderas. Fortsätta?" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "Fel användarnamn eller e-post" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "Kan inte radera. Försöka igen?" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "Samsung" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "Manuell inställning" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Befintliga händelser kan antingen raderas eller behållas om synkroniseringen stängs av" - -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Befintliga kontakter kan antingen raderas eller behållas om synkroniseringen stängs av" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "Ta bort från telefonbok" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "Behåll i telefon" +msgid "IDS_SYNCML_BODY_SYNC_SERVER" +msgstr "Synkroniseringsserver" -msgid "IDS_ST_BODY_VIDEOS" -msgstr "Videoklipp" +msgid "IDS_TASK_BODY_TASK" +msgstr "Uppgift" -msgid "IDS_PB_BODY_OTHER_EMAILS" -msgstr "Övrig e-post" +msgid "IDS_HELP_POP_TUTORIAL_COMPLETE" +msgstr "Introduktionen är slutförd." -msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC" -msgstr "Konton och synkning" +msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY" +msgstr "Välj en molntjänst som du vill använda och skapa sedan ett konto. När du har skapat ett Samsung account kommer sparade memon att synkroniseras automatiskt." diff --git a/po/th.po b/po/th.po deleted file mode 100755 index e054006..0000000 --- a/po/th.po +++ /dev/null @@ -1,135 +0,0 @@ -msgid "IDS_COM_BODY_TASK" -msgstr "สิ่งที่ต้องทำ" - -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" - -msgid "IDS_MA_BODY_OTHERS" -msgstr "อื่นๆ" - -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "ซิงค์​อัตโนมัติ" - -msgid "IDS_MA_BODY_ACCOUNT_LIST" -msgstr "Account list" - -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "คุณ​สามารถ​จัดการ​ราย​ชื่อ, ​ปฏิทิน, ​อี​เมล์ และ​บัญชี​ผู้​ใช้ IM ​ได้" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "ปฏิทิน" - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "บริการ VoIP" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "ไม่​รู้จัก" - -msgid "IDS_COM_SK_ADD_LITE" -msgstr "เพิ่ม" - -msgid "IDS_FB_BUTTON_VIDEO" -msgstr "วี​ดี​โอ" - -msgid "IDS_MA_BODY_CONTACT" -msgstr "ราย​ชื่อ" - -msgid "IDS_MA_BUTTON_OK" -msgstr "ตกลง" - -msgid "IDS_MA_HEADER_ACCOUNTS" -msgstr "แอคเคาท์" - -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "เพิ่ม​แอคเคาท์" - -msgid "IDS_PB_BODY_PHOTO" -msgstr "รูปถ่าย" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "ไม่​ทำ​งาน" - -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "Post" - -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "ซิงค์​ราย​ชื่อ" - -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "เชื่อม​ต่อ​ต่อ​ไป​ขณะ​แบตเตอรี่​ต่ำ" - -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "เชื่อม​ต่อ​ต่อ​ไป​ขณะ​โรม​มิ่ง" - -msgid "IDS_MA_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "วัน​ใน​ช่วง​เร่ง​ด่วน" - -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "เวลา​สิ้น​สุด​ช่วง​เร่ง​ด่วน" - -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "เวลา​เริ่ม​ต้น​ช่วง​เร่ง​ด่วน" - -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "ทำ​ข้อมูล​ให้​ตรง​กัน​โดย​อัตโนมัติ" - -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "ข้อมูล​ทั้ง​หมด" - -msgid "IDS_ST_BODY_MOBILE_TRACKER" -msgstr "โม​บายล์​แทร็กเกอร์" - -msgid "IDS_COM_BODY_EMAIL" -msgstr "อีเมล์" - -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "ผู้​ใช้ Exchange" - -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "ข้อมูล​ทั้ง​หมด​ที่​เกี่ยว​ข้อง​\nกับ​แอคเคาท์​นี้​จะ​\nถูกลบ​ออก ดำเนินการ?" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "ชื่อ​ผู้​ใช้​หรือ​อี​เมล์​ไม่​ถูก​ต้อง" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "ลบ​ไม่​ได้ ลอง​อีก​ครั้ง?" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "Samsung" - -msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" -msgstr "Microsoft Exchange ActiveSync" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "แสดง​รหัส​ผ่าน" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "โฟลเดอร์​เมล์​ที่​จะ Push" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "การ​ตั้ง​ค่า​เอง" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "เหตุการณ์​ที่​มี​อยู่​สามารถ​ลบ​หรือ​เก็บ​ไว้​ได้ หาก​ปิด​การ​ซิ​งโค​รไน​ซ์" - -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "ราย​ชื่อ​ที่​มี​อยู่​สามารถ​ลบ​หรือ​เก็บ​ไว้​ได้ หาก​ปิด​การ​ซิ​งโค​รไน​ซ์" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "ลบ​ออก​จาก​โทรศัพท์" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "เก็บ​ใน​โทรศัพท์" - -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "ซิงค์​รายการ" - diff --git a/po/tr_TR.po b/po/tr_TR.po old mode 100755 new mode 100644 index 7a7420d..c197abb --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -1,150 +1,81 @@ -msgid "IDS_MA_BODY_OTHERS" -msgstr "Diğerleri" +msgid "IDS_COM_BODY_GALLERY" +msgstr "Galeri" -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "Oto eşitleme" - -msgid "IDS_MA_BODY_AOL" -msgstr "AOL" - -msgid "IDS_MA_BUTTON_OK" -msgstr "Tamam" +msgid "IDS_COM_OPT_S_MEMO" +msgstr "S Memo" -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "Hesap ekle" - -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_COM_BODY_TASK" -msgstr "Görevler" - -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "Kişi senkr" +msgid "IDS_COM_BODY_VOIP_CALL" +msgstr "VoIP araması" -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "En yoğun günler" +msgid "IDS_COM_BODY_S_PLANNER" +msgstr "S Planlayıcı" -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "Yoğun dönem bitiş zamanı" +msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" +msgstr "Samsung Apps" -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "Yoğun dönem başlangıç zamanı" +msgid "IDS_COM_BODY_MUSIC" +msgstr "Müzik" -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "Tüm veriler" +msgid "IDS_COM_BODY_MESSAGES" +msgstr "Mesajlar" -msgid "IDS_SYNCML_BODY_SYNC_SERVER" -msgstr "Senkr. sunucusu" +msgid "IDS_COM_BODY_INTERNET" +msgstr "İnternet" msgid "IDS_COM_BODY_EMAIL" msgstr "E-posta" -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "Değişim" +msgid "IDS_TW_BODY_POST_TWITTER" +msgstr "Gönder" msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" msgstr "Microsoft Exchange ActiveSync" -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "Kişileri, takvimleri, e-postayı ve IM hesaplarını yönetebilirsiniz" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "Parolayı göster" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "Klasörleri push'a postala" - -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "Görev senkr" - -msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "Takvim" - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "VoIP araması" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "Bilinmeyen" +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Maksimum e-posta hesabı sayısına ulaşıldı." -msgid "IDS_COM_SK_ADD_LITE" -msgstr "Ekle" +msgid "IDS_MA_MBODY_AUTO_SYNC" +msgstr "Oto eşitleme" -msgid "IDS_MA_BODY_CONTACT" -msgstr "Kişi" +msgid "IDS_MA_HEADER_ADD_ACCOUNT" +msgstr "Hesap ekle" msgid "IDS_MA_HEADER_ACCOUNTS" msgstr "Hesaplar" -msgid "IDS_PB_BODY_PHOTO" -msgstr "Fotoğraf" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "Devre dışı" +msgid "IDS_MA_BUTTON_OK" +msgstr "Tamam" -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "Gönder" +msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" +msgstr "Kişileri, takvimleri, e-postayı ve IM hesaplarını yönetebilirsiniz." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "Düşük pilde bağlantınızı koruyun" +msgid "IDS_MA_BODY_SIGNED_IN" +msgstr "Oturum açıldı." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "Roaming sırasında bağlantınızı koruyun" +msgid "IDS_PB_TAB_CONTACTS" +msgstr "Rehber" -msgid "IDS_MA_BODY_MSN" -msgstr "MSN" +msgid "IDS_PB_BODY_ADD_ACCOUNT" +msgstr "Hesap ekle" -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "Otomatik olarak senkronize et" +msgid "IDS_ST_BODY_VIDEOS" +msgstr "Videolar" msgid "IDS_ST_BODY_MOBILE_TRACKER" msgstr "Mobil izleyici" -msgid "IDS_EMAIL_SK3_ACCOUNT_LIST" +msgid "IDS_ST_BODY_ACCOUNT_LIST" msgstr "Hesap listesi" -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "Bu hesapla ilgili tüm veriler silinecek. Devam edilsin mi?" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "Hatalı kullanıcı adı veya e-posta" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "Silinemiyor. Yeniden denensin mi?" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "Samsung" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "Manuel kurulum" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Eşitleme kapatılırsa, mevcut etkinlikler silinebilir veya saklanabilir" - -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Eşitleme kapatılırsa, mevcut kişiler silinebilir veya saklanabilir" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "Telefondan sil" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "Telefonda sakla" +msgid "IDS_SYNCML_BODY_SYNC_SERVER" +msgstr "Senkr. sunucusu" -msgid "IDS_ST_BODY_VIDEOS" -msgstr "Videolar" +msgid "IDS_TASK_BODY_TASK" +msgstr "Görevler" -msgid "IDS_PB_BODY_OTHER_EMAILS" -msgstr "Diğer e-postalar" +msgid "IDS_HELP_POP_TUTORIAL_COMPLETE" +msgstr "Eğitsel bitti." -msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC" -msgstr "Hesaplar ve senkr" +msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY" +msgstr "Kullanmak için bir bulut servisi seçin ve sonra bir hesap yapılandırın. Bir Samsung hesabı kurduktan sonra, kayıtlı notlar otomatik olarak eşitlenecektir." diff --git a/po/uk.po b/po/uk.po old mode 100755 new mode 100644 index 00dbc73..0beec9a --- a/po/uk.po +++ b/po/uk.po @@ -1,150 +1,81 @@ -msgid "IDS_MA_BODY_OTHERS" -msgstr "Інші" +msgid "IDS_COM_BODY_GALLERY" +msgstr "Галерея" -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "Автосинхронізація" - -msgid "IDS_MA_BODY_AOL" -msgstr "AOL" - -msgid "IDS_MA_BUTTON_OK" -msgstr "OK" - -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "Додати облiковий запис" +msgid "IDS_COM_OPT_S_MEMO" +msgstr "S Memo" -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_COM_BODY_TASK" -msgstr "Завдання" - -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "Синхронізація контактів" +msgid "IDS_COM_BODY_VOIP_CALL" +msgstr "Виклик VoIP" -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "Дні максимального навантаження" +msgid "IDS_COM_BODY_S_PLANNER" +msgstr "S Planner" -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "Час завершення максимального навантаження" +msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" +msgstr "Samsung Apps" -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "Час початку максимального навантаження" +msgid "IDS_COM_BODY_MUSIC" +msgstr "Музика" -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "Всі дані" +msgid "IDS_COM_BODY_MESSAGES" +msgstr "Повідомлення" -msgid "IDS_SYNCML_BODY_SYNC_SERVER" -msgstr "Сервер синхронізації" +msgid "IDS_COM_BODY_INTERNET" +msgstr "Інтернет" msgid "IDS_COM_BODY_EMAIL" msgstr "Email" -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "Exchange" +msgid "IDS_TW_BODY_POST_TWITTER" +msgstr "Post" msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" msgstr "Microsoft Exchange ActiveSync" -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "Можна керувати контактами, календарями, повідомленнями Email та обліковими записами служби миттєвих повідомлень" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "Показати пароль" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "Поштові папки для Push-повідомлень" - -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "Синхронізація завдань" - -msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "Календар" - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "Досягнуто максимальної кількості облікових записів Email." -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "Виклик VoIP" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "Невідомо" - -msgid "IDS_COM_SK_ADD_LITE" -msgstr "Додати" +msgid "IDS_MA_MBODY_AUTO_SYNC" +msgstr "Автосинхронізація" -msgid "IDS_MA_BODY_CONTACT" -msgstr "Контакт" +msgid "IDS_MA_HEADER_ADD_ACCOUNT" +msgstr "Додати обліковий запис" msgid "IDS_MA_HEADER_ACCOUNTS" msgstr "Облікові записи" -msgid "IDS_PB_BODY_PHOTO" -msgstr "Фото" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "Неактивно" +msgid "IDS_MA_BUTTON_OK" +msgstr "OK" -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "Post" +msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" +msgstr "Можна керувати контактами, календарями, повідомленнями Email та обліковими записами служби миттєвих повідомлень." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "Зберегти підключення за розрядженої батареї" +msgid "IDS_MA_BODY_SIGNED_IN" +msgstr "Зареєстровано." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "Зберегти підключення в роумінгу" +msgid "IDS_PB_TAB_CONTACTS" +msgstr "Контакти" -msgid "IDS_MA_BODY_MSN" -msgstr "MSN" +msgid "IDS_PB_BODY_ADD_ACCOUNT" +msgstr "Додати обліковий запис" -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "Синхронізувати автоматично" +msgid "IDS_ST_BODY_VIDEOS" +msgstr "Відео" msgid "IDS_ST_BODY_MOBILE_TRACKER" msgstr "Мобільна сигналізація" -msgid "IDS_EMAIL_SK3_ACCOUNT_LIST" -msgstr "Спис.обл. запис." - -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "Усі дані, пов'язані з цим обліковим записом, буде видалено. Продовжити?" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "Хибне ім’я користувача або адреса Email" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "Неможливо видалити. Спробувати ще раз?" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "Samsung" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "Настроювання вручну" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Поточні події можуть бути видалені або збережені, якщо синхронізацію вимкнено" +msgid "IDS_ST_BODY_ACCOUNT_LIST" +msgstr "Список облікових записів" -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Поточні контакти можуть бути видалені або збережені, якщо синхронізацію вимкнено" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "Видалити з телефону" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "Залишити на телефоні" +msgid "IDS_SYNCML_BODY_SYNC_SERVER" +msgstr "Сервер синхронізації" -msgid "IDS_ST_BODY_VIDEOS" -msgstr "Відео" +msgid "IDS_TASK_BODY_TASK" +msgstr "Завдання" -msgid "IDS_PB_BODY_OTHER_EMAILS" -msgstr "Інші адреси Email" +msgid "IDS_HELP_POP_TUTORIAL_COMPLETE" +msgstr "Посібник завершено." -msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC" -msgstr "Облікові записи та синхронізація" +msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY" +msgstr "Виберіть потрібну хмарну службу, а потім настройте обліковий запис. Після настроювання облікового запису Samsung збережені нагадування буде автоматично синхронізовано." diff --git a/po/update-po.sh b/po/update-po.sh deleted file mode 100755 index bb23093..0000000 --- a/po/update-po.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh - -PACKAGE=myaccount_ui -SRCROOT=.. -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="en_US en_GB ja ko_KR zh_CN" -ALL_LINGUAS="en_US nl de zh_HK zh_CN ru ko zh_TW ja es el it tk pt fr" - -XGETTEXT=/usr/bin/xgettext -MSGMERGE=/usr/bin/msgmerge - -echo -n "Make ${PACKAGE}.pot " -if [ ! -e $POTFILES ] ; then - echo "$POTFILES not found" - exit 1 -fi - -$XGETTEXT --default-domain=${PACKAGE} --directory=${SRCROOT} \ - --add-comments --keyword=_ --keyword=N_ --files-from=$POTFILES \ -&& test ! -f ${PACKAGE}.po \ - || (rm -f ${PACKAGE}.pot && mv ${PACKAGE}.po ${PACKAGE}.pot) - -if [ $? -ne 0 ]; then - echo "error" - exit 1 -else - echo "done" -fi - -for LANG in $ALL_LINGUAS; do - echo "$LANG : " - - if [ ! -e $LANG.po ] ; then - sed 's/CHARSET/UTF-8/g' ${PACKAGE}.pot > ${LANG}.po - echo "${LANG}.po created" - else - if $MSGMERGE ${LANG}.po ${PACKAGE}.pot -o ${LANG}.new.po ; then - if cmp ${LANG}.po ${LANG}.new.po > /dev/null 2>&1; then - rm -f ${LANG}.new.po - else - if mv -f ${LANG}.new.po ${LANG}.po; then - echo "" - else - echo "msgmerge for $LANG.po failed: cannot move $LANG.new.po to $LANG.po" 1>&2 - rm -f ${LANG}.new.po - exit 1 - fi - fi - else - echo "msgmerge for $LANG failed!" - rm -f ${LANG}.new.po - fi - fi - echo "" -done - diff --git a/po/uz.po b/po/uz.po old mode 100755 new mode 100644 index 70f7db3..16339f0 --- a/po/uz.po +++ b/po/uz.po @@ -1,150 +1,81 @@ -msgid "IDS_MA_BODY_OTHERS" -msgstr "Boshqalar" +msgid "IDS_COM_BODY_GALLERY" +msgstr "Galereya" -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "Avto-sinxronlash" - -msgid "IDS_MA_BODY_AOL" -msgstr "AOL" - -msgid "IDS_MA_BUTTON_OK" -msgstr "OK" +msgid "IDS_COM_OPT_S_MEMO" +msgstr "S Memo" -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "Hisob qaydnoma qo‘shish" - -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_COM_BODY_TASK" -msgstr "Topshiriq" - -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "Kontakt sinxronlanishi" +msgid "IDS_COM_BODY_VOIP_CALL" +msgstr "VoIP qo‘ng‘irog‘i" -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "Pik kunlar" +msgid "IDS_COM_BODY_S_PLANNER" +msgstr "S Planner" -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "Pik tugatish vaqti" +msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" +msgstr "Samsung Apps" -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "Pik boshlash vaqti" +msgid "IDS_COM_BODY_MUSIC" +msgstr "Musiqa" -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "Barcha ma’lumot" +msgid "IDS_COM_BODY_MESSAGES" +msgstr "Xabarlar" -msgid "IDS_SYNCML_BODY_SYNC_SERVER" -msgstr "Sinx. serveri" +msgid "IDS_COM_BODY_INTERNET" +msgstr "Internet" msgid "IDS_COM_BODY_EMAIL" msgstr "E-pochta" -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "Exchange" +msgid "IDS_TW_BODY_POST_TWITTER" +msgstr "Xabar yuborish" msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" msgstr "Microsoft Exchange ActiveSync" -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "Kontaktlar, kalendarlar, e-pochtalar va IM hisob qaydnomalarini boshqarishingiz mumkin" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "Parol ko‘rsatilsin" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "Push uchun pochta jildlari" - -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "Vazifa sinxronlash" - -msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "Kalendar" - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "VoIP qo‘ng‘irog‘i" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "Noma’lum" +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "E-pochta hisob qaydnomalari soni ruxsat etilgan maksimal miqdorga yetdi." -msgid "IDS_COM_SK_ADD_LITE" -msgstr "Qo‘shish" +msgid "IDS_MA_MBODY_AUTO_SYNC" +msgstr "Avto-sinxronlash" -msgid "IDS_MA_BODY_CONTACT" -msgstr "Kontakt" +msgid "IDS_MA_HEADER_ADD_ACCOUNT" +msgstr "Hisob qaydnoma qo‘shish" msgid "IDS_MA_HEADER_ACCOUNTS" msgstr "Hisob qaydnomalari" -msgid "IDS_PB_BODY_PHOTO" -msgstr "Fotosurat" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "Nofaol" +msgid "IDS_MA_BUTTON_OK" +msgstr "OK" -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "Xabar yuborish" +msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" +msgstr "Kontaktlar, kalendarlar, e-pochtalar va IM hisob qaydnomalarini boshqarishingiz mumkin." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "Ulanishni past batareya zaryadida davom ettiring" +msgid "IDS_MA_BODY_SIGNED_IN" +msgstr "Kirildi." -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "Ulanishni roumingda davom ettiring" +msgid "IDS_PB_TAB_CONTACTS" +msgstr "Kontaktlar" -msgid "IDS_MA_BODY_MSN" -msgstr "MSN" +msgid "IDS_PB_BODY_ADD_ACCOUNT" +msgstr "Hisob qaydnoma qo‘shish" -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "Avtomatik ravishda sinxronlashtiring" +msgid "IDS_ST_BODY_VIDEOS" +msgstr "Videolar" msgid "IDS_ST_BODY_MOBILE_TRACKER" msgstr "Mobil telefonni topish xizmati" -msgid "IDS_EMAIL_SK3_ACCOUNT_LIST" -msgstr "His/qayd. ro‘yx." - -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "Ushbu hisob qaydnomasiga tegishli barcha ma’lumotlar o'chirib tashlanadi. Davom ettirilsinmi?" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "Foydalanuvchi nomi yoki e-pochta noto‘g‘ri" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "O'chirib bo‘lmaydi. Qayta urinib ko‘rilsinmi?" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "Samsung" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "Qo‘lda o‘rnatish" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Sinxronlash o‘chirilganda mavjud hodisalar yo‘q qilinishi yoki saqlanishi mumkin" +msgid "IDS_ST_BODY_ACCOUNT_LIST" +msgstr "Hisob qaydnomalar ro‘yxati" -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Sinxronlashtirish o‘chirilgandan so‘ng kontakt ma’lumoti yo‘q qilinishi yoki saqlanishi mumkin" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "Telefondan o‘chirish" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "Telefonda saqlash" +msgid "IDS_SYNCML_BODY_SYNC_SERVER" +msgstr "Sinx. serveri" -msgid "IDS_ST_BODY_VIDEOS" -msgstr "Videolar" +msgid "IDS_TASK_BODY_TASK" +msgstr "Topshiriq" -msgid "IDS_PB_BODY_OTHER_EMAILS" -msgstr "Boshqa e-pochtalar" +msgid "IDS_HELP_POP_TUTORIAL_COMPLETE" +msgstr "Ko‘rsatma yakunlandi." -msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC" -msgstr "Hisob qaydnomalari va sinxronlash" +msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY" +msgstr "Foydalanish uchun bulut xizmatini tanlang va undan so‘ng hisob qaydnomasini o‘rnating. Samsung accountni o‘rnatganingizdan so‘ng, saqlangan yozuvlar avtomatik ravishda sinxronlanadi." diff --git a/po/vi.po b/po/vi.po deleted file mode 100755 index 5a3bb60..0000000 --- a/po/vi.po +++ /dev/null @@ -1,135 +0,0 @@ -msgid "IDS_COM_BODY_TASK" -msgstr "Nhiệm vụ" - -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" - -msgid "IDS_MA_BODY_OTHERS" -msgstr "Khác" - -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "Tự động đồng bộ" - -msgid "IDS_MA_BODY_ACCOUNT_LIST" -msgstr "Account list" - -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "Bạn có thể quản lý các danh bạ, lịch, thư điện tử và tài khoản IM của bạn" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "Lịch" - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "Cuộg gọi VoIP" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "Không rõ" - -msgid "IDS_COM_SK_ADD_LITE" -msgstr "Thêm" - -msgid "IDS_FB_BUTTON_VIDEO" -msgstr "Video" - -msgid "IDS_MA_BODY_CONTACT" -msgstr "Danh bạ" - -msgid "IDS_MA_BUTTON_OK" -msgstr "OK" - -msgid "IDS_MA_HEADER_ACCOUNTS" -msgstr "Tài khoản" - -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "Thêm tài khoản" - -msgid "IDS_PB_BODY_PHOTO" -msgstr "Ảnh" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "Không kích hoạt" - -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "Post" - -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "Đồng bộ danh bạ" - -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "Giữ kết nối khi pin yếu" - -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "Giữ kết nối khi chuyển vùng" - -msgid "IDS_MA_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "Ngày cao điểm" - -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "Giờ cao điểm kết thúc" - -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "Giờ cao điểm bắt đầu" - -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "Đồng bộ hoá tự động" - -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "Tất cả dữ liệu" - -msgid "IDS_ST_BODY_MOBILE_TRACKER" -msgstr "Theo dõi điện thoại" - -msgid "IDS_COM_BODY_EMAIL" -msgstr "Email" - -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "Exchange" - -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "Mọi dữ liệu liên quan đến tài khoản này sẽ bị xóa. Tiếp tục?" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "Tên người dùng hoặc email không đúng" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "Không thể xóa. Thử lại?" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "Samsung" - -msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" -msgstr "Microsoft Exchange ActiveSync" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "Hiện mật mã" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "Thư mục để push mail" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "Cài đặt thủ công" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Các sự kiện hiện tại có thể bị xóa hoặc giữ lại nếu đồng bộ bị tắt" - -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "Các danh bạ hiện tại có thể bị xóa hoặc giữ lại nếu đồng bộ bị tắt" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "Xóa khỏi điện thoại" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "Giữ trên điện thoại" - -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "Đồng bộ nhiệm vụ" - diff --git a/po/zh_CN.po b/po/zh_CN.po old mode 100755 new mode 100644 index e6b2158..32cdb6f --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,150 +1,81 @@ -msgid "IDS_MA_BODY_OTHERS" -msgstr "其它" +msgid "IDS_COM_BODY_GALLERY" +msgstr "相册" -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "自动同步" - -msgid "IDS_MA_BODY_AOL" -msgstr "AOL" - -msgid "IDS_MA_BUTTON_OK" -msgstr "确认" - -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "添加账户" +msgid "IDS_COM_OPT_S_MEMO" +msgstr "S 备忘录" -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_COM_BODY_TASK" -msgstr "任务" - -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" +msgid "IDS_COM_BODY_VOIP_CALL" +msgstr "VoIP 电话" -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "联系人同步" +msgid "IDS_COM_BODY_S_PLANNER" +msgstr "S 日历" -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "高峰日" +msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" +msgstr "Samsung Apps" -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "高峰结束时间" +msgid "IDS_COM_BODY_MUSIC" +msgstr "音乐" -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "高峰开始时间" +msgid "IDS_COM_BODY_MESSAGES" +msgstr "信息" -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "所有数据" - -msgid "IDS_SYNCML_BODY_SYNC_SERVER" -msgstr "同步服务器" +msgid "IDS_COM_BODY_INTERNET" +msgstr "互联网" msgid "IDS_COM_BODY_EMAIL" msgstr "电子邮件" -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "更换" +msgid "IDS_TW_BODY_POST_TWITTER" +msgstr "发贴" msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" msgstr "微软Exchange ActiveSync 账户" -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "您可管理您的联系人、日历、电子邮件和 IM 账户" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "显示密码" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "邮件文件夹推送" - -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "任务同步" +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "已达到电子邮件帐户的数量上限。" -msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "日历" - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "VoIP 电话" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "未知" - -msgid "IDS_COM_SK_ADD_LITE" -msgstr "添加" +msgid "IDS_MA_MBODY_AUTO_SYNC" +msgstr "自动同步" -msgid "IDS_MA_BODY_CONTACT" -msgstr "联系人" +msgid "IDS_MA_HEADER_ADD_ACCOUNT" +msgstr "添加账户" msgid "IDS_MA_HEADER_ACCOUNTS" msgstr "账户" -msgid "IDS_PB_BODY_PHOTO" -msgstr "照片" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "未启动" +msgid "IDS_MA_BUTTON_OK" +msgstr "确定" -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "发贴" +msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" +msgstr "您可管理您的联系人、日历、电子邮件和 IM 账户。" -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "电池电量低时保持连接" +msgid "IDS_MA_BODY_SIGNED_IN" +msgstr "已登录" -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "漫游时保持连接" +msgid "IDS_PB_TAB_CONTACTS" +msgstr "联系人" -msgid "IDS_MA_BODY_MSN" -msgstr "MSN" +msgid "IDS_PB_BODY_ADD_ACCOUNT" +msgstr "添加账户" -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "自动同步" +msgid "IDS_ST_BODY_VIDEOS" +msgstr "视频" msgid "IDS_ST_BODY_MOBILE_TRACKER" msgstr "手机追踪" -msgid "IDS_EMAIL_SK3_ACCOUNT_LIST" -msgstr "帐户列表" - -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "与此帐户相关的全部数据将被删除。继续？" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "用户名或电子邮件不正确" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "无法删除。重试？" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "三星" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "手动设置" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "如果同步关闭，可删除或保留现存事件" +msgid "IDS_ST_BODY_ACCOUNT_LIST" +msgstr "账户列表" -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "如果同步关闭，可删除或保留现存联系人" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "从手机删除" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "保留在手机" +msgid "IDS_SYNCML_BODY_SYNC_SERVER" +msgstr "同步服务器" -msgid "IDS_ST_BODY_VIDEOS" -msgstr "视频" +msgid "IDS_TASK_BODY_TASK" +msgstr "任务" -msgid "IDS_PB_BODY_OTHER_EMAILS" -msgstr "其他电子邮件" +msgid "IDS_HELP_POP_TUTORIAL_COMPLETE" +msgstr "教程完成" -msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC" -msgstr "账户和同步" +msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY" +msgstr "选择要使用的云服务，然后设置账户。一旦您设置了三星账户，已保存的备忘录将自动同步。" diff --git a/po/zh_HK.po b/po/zh_HK.po old mode 100755 new mode 100644 index 52cf4db..fc83e84 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -1,150 +1,81 @@ -msgid "IDS_MA_BODY_OTHERS" -msgstr "其他" +msgid "IDS_COM_BODY_GALLERY" +msgstr "媒體瀏覽器" -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "自動同步" - -msgid "IDS_MA_BODY_AOL" -msgstr "AOL" - -msgid "IDS_MA_BUTTON_OK" -msgstr "確定" - -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "加入帳戶" - -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_COM_BODY_TASK" -msgstr "工作" +msgid "IDS_COM_OPT_S_MEMO" +msgstr "S Memo" -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "聯絡人同步" +msgid "IDS_COM_BODY_VOIP_CALL" +msgstr "VoIP 通話" -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "繁忙日子" +msgid "IDS_COM_BODY_S_PLANNER" +msgstr "S Planner" -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "繁忙結束時間" +msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" +msgstr "Samsung Apps" -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "繁忙開始時間" +msgid "IDS_COM_BODY_MUSIC" +msgstr "音樂" -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "全部數據" +msgid "IDS_COM_BODY_MESSAGES" +msgstr "訊息" -msgid "IDS_SYNCML_BODY_SYNC_SERVER" -msgstr "同步伺服器" +msgid "IDS_COM_BODY_INTERNET" +msgstr "瀏覽器" msgid "IDS_COM_BODY_EMAIL" msgstr "電子郵件" -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "Exchange" +msgid "IDS_TW_BODY_POST_TWITTER" +msgstr "張貼" msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" msgstr "Microsoft Exchange ActiveSync" -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "您可管理您的聯絡人、日曆、電子郵件、以及 IM 帳戶" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "顯示密碼" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "要推送的電子郵件資料夾" +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "已達電子郵件帳戶的數量上限。" -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "工作同步" - -msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "日曆" - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "VoIP 通話" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "未知" - -msgid "IDS_COM_SK_ADD_LITE" -msgstr "新增" +msgid "IDS_MA_MBODY_AUTO_SYNC" +msgstr "自動同步" -msgid "IDS_MA_BODY_CONTACT" -msgstr "聯絡人" +msgid "IDS_MA_HEADER_ADD_ACCOUNT" +msgstr "加入帳戶" msgid "IDS_MA_HEADER_ACCOUNTS" msgstr "帳戶" -msgid "IDS_PB_BODY_PHOTO" -msgstr "相片" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "無效" +msgid "IDS_MA_BUTTON_OK" +msgstr "確定" -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "張貼" +msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" +msgstr "您可管理您的聯絡人、日曆、電子郵件、以及 IM 帳戶。" -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "電量不足時保持連接" +msgid "IDS_MA_BODY_SIGNED_IN" +msgstr "已登入。" -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "漫遊時保持連接" +msgid "IDS_PB_TAB_CONTACTS" +msgstr "聯絡人" -msgid "IDS_MA_BODY_MSN" -msgstr "MSN" +msgid "IDS_PB_BODY_ADD_ACCOUNT" +msgstr "加入帳戶" -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "自動同步" +msgid "IDS_ST_BODY_VIDEOS" +msgstr "影片" msgid "IDS_ST_BODY_MOBILE_TRACKER" msgstr "手機追蹤器" -msgid "IDS_EMAIL_SK3_ACCOUNT_LIST" +msgid "IDS_ST_BODY_ACCOUNT_LIST" msgstr "帳戶清單" -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "所有關於此帳戶的數據將被刪除。繼續嗎?" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "用戶名稱或電子郵件不正確" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "無法刪除。重試嗎？" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "Samsung" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "手動設定" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "如果關閉同步，可刪除或保留現有的事件" - -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "如果關閉同步，可刪除或保留現有的聯絡人" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "從手機刪除" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "保留於手機中" +msgid "IDS_SYNCML_BODY_SYNC_SERVER" +msgstr "同步伺服器" -msgid "IDS_ST_BODY_VIDEOS" -msgstr "影片" +msgid "IDS_TASK_BODY_TASK" +msgstr "工作" -msgid "IDS_PB_BODY_OTHER_EMAILS" -msgstr "其他電子郵件" +msgid "IDS_HELP_POP_TUTORIAL_COMPLETE" +msgstr "教學完成。" -msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC" -msgstr "帳戶與同步" +msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY" +msgstr "選擇要使用的雲端服務然後建立帳戶。一旦您建立三星帳戶後，已儲存的備忘錄將自動同步。" diff --git a/po/zh_SG.po b/po/zh_SG.po deleted file mode 100755 index afe2925..0000000 --- a/po/zh_SG.po +++ /dev/null @@ -1,150 +0,0 @@ -msgid "IDS_MA_BODY_OTHERS" -msgstr "其它" - -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "自动同步" - -msgid "IDS_MA_BODY_AOL" -msgstr "AOL" - -msgid "IDS_MA_BUTTON_OK" -msgstr "确认" - -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "添加帐户" - -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_COM_BODY_TASK" -msgstr "任务" - -msgid "IDS_MA_BODY_GOOGLE" -msgstr "谷歌" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "联系人同步" - -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "最高日" - -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "最高结束时间" - -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "最高开始时间" - -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "全部数据" - -msgid "IDS_SYNCML_BODY_SYNC_SERVER" -msgstr "同步化服务器" - -msgid "IDS_COM_BODY_EMAIL" -msgstr "电邮" - -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "更换" - -msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" -msgstr "Microsoft Exchange ActiveSync" - -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "您可管理您的联系人、日历、电子邮件和 IM 账户" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "显示密码" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "邮件文件夹推送" - -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "任务同步" - -msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "日历" - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "三星应用程序" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "VoIP 电话" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "未知" - -msgid "IDS_COM_SK_ADD_LITE" -msgstr "添加" - -msgid "IDS_MA_BODY_CONTACT" -msgstr "联系人" - -msgid "IDS_MA_HEADER_ACCOUNTS" -msgstr "帐户" - -msgid "IDS_PB_BODY_PHOTO" -msgstr "照片" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "未启动" - -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "发贴" - -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "电池电量低时保持连接" - -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "漫游时保持连接" - -msgid "IDS_MA_BODY_MSN" -msgstr "MSN" - -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "自动同步" - -msgid "IDS_ST_BODY_MOBILE_TRACKER" -msgstr "手机追踪器" - -msgid "IDS_EMAIL_SK3_ACCOUNT_LIST" -msgstr "帐户列表" - -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "与此帐户相关的全部数据将被删除。继续？" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "用户名或电子邮件不正确" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "无法删除。重试？" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "Samsung" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "手动设置" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "如果同步关闭，可删除或保留现存事件" - -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "如果同步关闭，可删除或保留现存联系人" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "从手机删除" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "保留在手机" - -msgid "IDS_ST_BODY_VIDEOS" -msgstr "录像" - -msgid "IDS_PB_BODY_OTHER_EMAILS" -msgstr "其他电子邮件" - -msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC" -msgstr "帐户和同步" - diff --git a/po/zh_TW.po b/po/zh_TW.po old mode 100755 new mode 100644 index 0798f20..b20c60d --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1,150 +1,81 @@ -msgid "IDS_MA_BODY_OTHERS" -msgstr "其他" +msgid "IDS_COM_BODY_GALLERY" +msgstr "媒體瀏覽器" -msgid "IDS_MA_MBODY_AUTO_SYNC" -msgstr "自動同步" - -msgid "IDS_MA_BODY_AOL" -msgstr "AOL" - -msgid "IDS_MA_BUTTON_OK" -msgstr "確認" - -msgid "IDS_MA_HEADER_ADD_ACCOUNT" -msgstr "新增帳號" - -msgid "IDS_FB_HEADER_FACEBOOK" -msgstr "Facebook" - -msgid "IDS_COM_BODY_TASK" -msgstr "工作" +msgid "IDS_COM_OPT_S_MEMO" +msgstr "S Memo" -msgid "IDS_MA_BODY_GOOGLE" -msgstr "Google" - -msgid "IDS_MA_BODY_CONTACT_SYNC" -msgstr "聯絡人同步" +msgid "IDS_COM_BODY_VOIP_CALL" +msgstr "VoIP 通話" -msgid "IDS_MA_BODY_PEAK_DAYS" -msgstr "尖峰天數" +msgid "IDS_COM_BODY_S_PLANNER" +msgstr "S Planner" -msgid "IDS_MA_BODY_PEAK_END_TIME" -msgstr "尖峰結束時間" +msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" +msgstr "Samsung Apps" -msgid "IDS_MA_BODY_PEAK_START_TIME" -msgstr "尖峰開始時間" +msgid "IDS_COM_BODY_MUSIC" +msgstr "音樂" -msgid "IDS_MA_OPT_ALL_DATA" -msgstr "所有資料" +msgid "IDS_COM_BODY_MESSAGES" +msgstr "訊息" -msgid "IDS_SYNCML_BODY_SYNC_SERVER" -msgstr "同步伺服器" +msgid "IDS_COM_BODY_INTERNET" +msgstr "網際網路" msgid "IDS_COM_BODY_EMAIL" msgstr "電子郵件" -msgid "IDS_MA_BODY_EXCHANGE" -msgstr "交換" +msgid "IDS_TW_BODY_POST_TWITTER" +msgstr "Post" msgid "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC" msgstr "Microsoft Exchange ActiveSync" -msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" -msgstr "可管理您的聯絡人、日曆、電子郵件、以及 IM 帳號" - -msgid "IDS_MA_BODY_SHOW_PASSWORD" -msgstr "顯示密碼" - -msgid "IDS_MA_HEADER_MAIL_FOLDERS_TO_PUSH" -msgstr "Push郵件檔案" +msgid "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED" +msgstr "電子郵件帳號已達道最大數量。" -msgid "IDS_MA_BODY_TASK_SYNC" -msgstr "任務同步" - -msgid "IDS_EMAIL_BODY_WINDOWS_LIVE_HOTMAIL" -msgstr "Windows Live Hotmail" - -msgid "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2" -msgstr "日曆" - -msgid "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU" -msgstr "Samsung Apps" - -msgid "IDS_COM_BODY_VOIP_CALL" -msgstr "VoIP 通話" - -msgid "IDS_COM_POP_UNKNOWN" -msgstr "未知" - -msgid "IDS_COM_SK_ADD_LITE" -msgstr "新增" +msgid "IDS_MA_MBODY_AUTO_SYNC" +msgstr "自動同步" -msgid "IDS_MA_BODY_CONTACT" -msgstr "聯絡人" +msgid "IDS_MA_HEADER_ADD_ACCOUNT" +msgstr "新增帳號" msgid "IDS_MA_HEADER_ACCOUNTS" msgstr "帳號" -msgid "IDS_PB_BODY_PHOTO" -msgstr "相片" - -msgid "IDS_ST_BODY_INACTIVE" -msgstr "停用" +msgid "IDS_MA_BUTTON_OK" +msgstr "確認" -msgid "IDS_TW_BODY_POST_TWITTER" -msgstr "Post" +msgid "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS" +msgstr "可管理您的聯絡人、日曆、電子郵件、以及 IM 帳號。" -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_LOW_BATTERY" -msgstr "保持連線於低電量" +msgid "IDS_MA_BODY_SIGNED_IN" +msgstr "已登入。" -msgid "IDS_MA_BODY_KEEP_CONNECTION_ON_ROAMING" -msgstr "漫遊時保持連接" +msgid "IDS_PB_TAB_CONTACTS" +msgstr "聯絡人" -msgid "IDS_MA_BODY_MSN" -msgstr "MSN" +msgid "IDS_PB_BODY_ADD_ACCOUNT" +msgstr "新增帳號" -msgid "IDS_MA_BODY_SYNC_AUTOMATICALLY" -msgstr "自動同步" +msgid "IDS_ST_BODY_VIDEOS" +msgstr "影片" msgid "IDS_ST_BODY_MOBILE_TRACKER" msgstr "手機追蹤系統" -msgid "IDS_EMAIL_SK3_ACCOUNT_LIST" -msgstr "帳戶列表" - -msgid "IDS_MA_POP_ALL_DATA_RELATED_TO_THIS_ACCOUNT_WILL_BE_DELETED_CONTINUE_Q" -msgstr "所有此帳戶的相關資料將被刪除。要繼續嗎？" - -msgid "IDS_MA_POP_INCORRECT_USER_NAME_OR_EMAIL" -msgstr "不正確的用戶名或電子郵件" - -msgid "IDS_MA_BODY_UNABLE_TO_DELETE_TRY_AGAIN_Q" -msgstr "無法刪除。再試一次？" - -msgid "IDS_ST_BODY_SAMSUNG" -msgstr "三星" - -msgid "IDS_MA_BODY_MANUAL_SETUP" -msgstr "手動設定" - -msgid "IDS_MA_POP_EXISTING_EVENTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "如果關閉同步，可刪除或保留現有的活動" +msgid "IDS_ST_BODY_ACCOUNT_LIST" +msgstr "帳號清單" -msgid "IDS_MA_POP_EXISTING_CONTACTS_CAN_BE_EITHER_DELETED_OR_KEPT_IF_SYNCHRONISATION_IS_TURNED_OFF" -msgstr "如果關閉同步，可刪除或保留現有的聯絡人" - -msgid "IDS_MA_BUTTON_DELETE_FROM_PHONE" -msgstr "從手機刪除" - -msgid "IDS_MA_BUTTON_KEEP_ON_PHONE" -msgstr "保留於手機中" +msgid "IDS_SYNCML_BODY_SYNC_SERVER" +msgstr "同步伺服器" -msgid "IDS_ST_BODY_VIDEOS" -msgstr "影片" +msgid "IDS_TASK_BODY_TASK" +msgstr "工作" -msgid "IDS_PB_BODY_OTHER_EMAILS" -msgstr "其他電子郵件" +msgid "IDS_HELP_POP_TUTORIAL_COMPLETE" +msgstr "教學完成。" -msgid "IDS_ST_HEADER_ACCOUNTS_AND_SYNC" -msgstr "帳號與同步處理" +msgid "IDS_HELP_BODY_SELECT_A_CLOUD_SERVICE_TO_USE_AND_THEN_SET_UP_AN_ACCOUNT_ONCE_YOU_HAVE_SET_UP_A_SAMSUNG_ACCOUNT_SAVED_MEMOS_WILL_BE_SYNCED_AUTOMATICALLY" +msgstr "選擇要使用的雲端服務然後建立帳號。建立三星帳號後，將自動同步儲存的備忘錄。" diff --git a/setting-myaccount-efl.xml b/setting-myaccount-efl.xml index 480b949..33af557 100755 --- a/setting-myaccount-efl.xml +++ b/setting-myaccount-efl.xml @@ -1,27 +1,25 @@ - - - - Wonyoung Lee - My Account Application - - - - - - - - - - - - - - - - - - - - - - + + + + Wonyoung Lee + My Account Application + + /usr/apps/com.samsung.setting/res/icons/settings_account.png + + + + + + + + + + + + + + + + + + diff --git a/src/myaccount_ug_account_list.c b/src/myaccount_ug_account_list.c index 96349da..c757570 100755 --- a/src/myaccount_ug_account_list.c +++ b/src/myaccount_ug_account_list.c @@ -1,17 +1,22 @@ /* - * Copyright 2012 Samsung Electronics Co., Ltd + * my-account * - * Licensed under the Flora License, Version 1.1 (the License); + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Wonyoung Lee , Tarun Kumar + * + * 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://floralicense.org/license/ + * 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, + * 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 @@ -20,74 +25,84 @@ #include "myaccount_ug_addaccount.h" #include "myaccount_ug_common.h" -typedef struct __capability_data { - char* type; - int state; -}myaccount_capability_data; - -typedef struct __account_list_priv { - int account_id; - char username[256]; - char display_name[256]; - char email_address[256]; - char package_name[256]; - char domain_name[60]; - char icon_path[PATH_MAX]; - char capability[128]; - int secret; - int list_index; - int sync_status; - GSList *capablity_list; -}myaccount_list_priv; +#define SORT_PRIOR_1 "1_" +#define SORT_PRIOR_2 "2_" +#define SORT_PRIOR_3 "3_" static Elm_Genlist_Item_Class account_list_itc; -static Elm_Genlist_Item_Class account_list_title_itc; -static Elm_Genlist_Item_Class account_list_itc_sep; -static Elm_Genlist_Item_Class account_list_itc_sep_end; -static myaccount_list_priv *account_info; + static int account_index = 0; +#define TOOLBAR_HEIGHT 0 + +//static void _myaccount_account_list_free_capdata(gpointer data, gpointer user_data); static void __myaccount_account_list_addaccount_cb( void *data, Evas_Object *obj, void* event_info ); static void _myaccount_ug_account_list_layout_cb(ui_gadget_h ug, enum ug_mode mode, void *priv); static void _myaccount_ug_account_list_result_cb(ui_gadget_h ug, - service_h service, void *priv); + app_control_h app_control, void *priv); static void _myaccount_ug_account_list_destroy_cb(ui_gadget_h ug, void *priv); static void __myaccount_account_list_append_genlist(myaccount_appdata *ad, int count); +static void __rotate_more_ctxpopup_cb(void *data, Evas_Object *obj, void *event_info); static char *__myaccount_account_list_get_capablity_string_value(const char* capability_type) { - if (!strcmp(capability_type, ACCOUNT_SUPPORTS_CAPABILITY_CONTACT)) - return dgettext(MA_UG_NAME, "IDS_MA_BODY_CONTACT"); - else if (!strcmp(capability_type, ACCOUNT_SUPPORTS_CAPABILITY_CALENDAR)) + if (!strcmp(capability_type, "http://tizen.org/account/capability/contact")) + return dgettext(MA_UG_NAME, "IDS_PB_TAB_CONTACTS"); + else if (!strcmp(capability_type, "http://tizen.org/account/capability/calendar")) return dgettext("sys_string", "IDS_COM_BODY_S_PLANNER"); - else if (!strcmp(capability_type ,ACCOUNT_SUPPORTS_CAPABILITY_PHOTO)) - return dgettext(MA_UG_NAME, "IDS_PB_BODY_PHOTO"); - else if (!strcmp(capability_type ,ACCOUNT_SUPPORTS_CAPABILITY_VIDEO)) + else if (!strcmp(capability_type ,"http://tizen.org/account/capability/photo")) + return dgettext(MA_UG_NAME, "IDS_COM_BODY_GALLERY"); + else if (!strcmp(capability_type ,"http://tizen.org/account/capability/video")) return dgettext(MA_UG_NAME, "IDS_ST_BODY_VIDEOS"); - else if (!strcmp(capability_type ,ACCOUNT_SUPPORTS_CAPABILITY_EMAIL)) + else if (!strcmp(capability_type ,"http://tizen.org/account/capability/email")) return dgettext(MA_UG_NAME, "IDS_COM_BODY_EMAIL"); - else if (!strcmp(capability_type ,ACCOUNT_SUPPORTS_CAPABILITY_POST)) + else if (!strcmp(capability_type ,"http://tizen.org/account/capability/post")) return dgettext(MA_UG_NAME, "IDS_TW_BODY_POST_TWITTER"); - else if (!strcmp(capability_type ,ACCOUNT_SUPPORTS_CAPABILITY_VOIP)) + else if (!strcmp(capability_type ,"http://tizen.org/account/capability/voip")) return dgettext(MA_UG_NAME, "IDS_COM_BODY_VOIP_CALL"); - else if (!strcmp(capability_type ,ACCOUNT_SUPPORTS_CAPABILITY_SAMSUNG_APPS)) + else if (!strcmp(capability_type ,"http://tizen.org/account/capability/samsungapps")) return dgettext(MA_UG_NAME, "IDS_COM_BODY_SAMSUNG_APPS_T_MAINMENU"); - else if (!strcmp(capability_type ,ACCOUNT_SUPPORTS_CAPABILITY_MOBILE_TRACKER)) + else if (!strcmp(capability_type ,"http://tizen.org/account/capability/mobiletracker")) return dgettext(MA_UG_NAME, "IDS_ST_BODY_MOBILE_TRACKER"); - else if (!strcmp(capability_type ,ACCOUNT_SUPPORTS_CAPABILITY_TASK)) + else if (!strcmp(capability_type ,"http://tizen.org/account/capability/task")) return dgettext(MA_UG_NAME, "IDS_COM_BODY_TASK"); - else if (!strcmp(capability_type ,ACCOUNT_SUPPORTS_CAPABILITY_MEMO)) - return dgettext("sys_string", "IDS_COM_BODY_S_NOTE"); - else if (!strcmp(capability_type ,ACCOUNT_SUPPORTS_CAPABILITY_MUSIC)) +#ifdef _FEATURE_SMEMO_ENABLE + else if (!strcmp(capability_type ,"http://tizen.org/account/capability/memo")) + return dgettext(MA_UG_NAME, "IDS_COM_OPT_S_MEMO"); +#else + else if (!strcmp(capability_type ,"http://tizen.org/account/capability/memo")) + return NULL; +#endif + else if (!strcmp(capability_type ,"http://tizen.org/account/capability/synchronise")) + return dgettext(MA_UG_NAME, "IDS_SYNCML_BODY_SYNC_SERVER"); + else if (!strcmp(capability_type ,"http://tizen.org/account/capability/docomo")) + return dgettext(MA_UG_NAME, "IDS_COM_BODY_CALENDAR_T_MAINMENU_ABB2"); + else if (!strcmp(capability_type ,"http://tizen.org/account/capability/music")) return dgettext("sys_string", "IDS_COM_BODY_MUSIC"); + else if (!strcmp(capability_type ,"http://tizen.org/account/capability/internet")) + return dgettext(MA_UG_NAME, "IDS_COM_BODY_INTERNET"); + else if (!strcmp(capability_type ,"http://tizen.org/account/capability/message")) + return dgettext(MA_UG_NAME, "IDS_COM_BODY_MESSAGES"); else return NULL;//return dgettext(MA_UG_NAME, "IDS_COM_POP_UNKNOWN"); } +/* +static void _myaccount_account_list_free_capdata(gpointer data, gpointer user_data) +{ + if(data == NULL) + return; + myaccount_capability_data * cap_data= (myaccount_capability_data*)data; + + MA_MEMFREE(cap_data->type); + MA_MEMFREE(cap_data); +} +*/ + bool _myaccount_account_list_get_capablity_text(const char* capability_type, account_capability_state_e capability_state, void *user_data) @@ -97,9 +112,13 @@ bool _myaccount_account_list_get_capablity_text(const char* capability_type, myaccount_list_priv *account_info = (myaccount_list_priv*)user_data; char *capability_textbuf = account_info->capability; + if(!account_info) { + return false; + } + myaccount_capability_data *cap_data = (myaccount_capability_data*)malloc(sizeof(myaccount_capability_data)); if (!cap_data) { - MYACCOUNT_FATAL("malloc failed\n"); + MYACCOUNT_ERROR("malloc failed\n"); return true; } memset(cap_data, 0, sizeof(myaccount_capability_data)); @@ -113,37 +132,80 @@ bool _myaccount_account_list_get_capablity_text(const char* capability_type, capability_string = __myaccount_account_list_get_capablity_string_value( capability_type); - if (capability_string != NULL) { - MYACCOUNT_VERBOSE("capability_string = %s\n", capability_string); - if(strlen(capability_textbuf) > 0) { - char *temp2 = strdup(capability_textbuf); - if (!temp2) { - MYACCOUNT_FATAL("strdup returns NULL\n"); - return false; + /* Synchronise capability string exception, wylee */ + if(!strcmp(account_info->package_name, "setting-synchronise-efl")){ + MA_SNPRINTF(capability_textbuf, 127, "%s", dgettext(MA_UG_NAME, "IDS_SYNCML_BODY_SYNC_SERVER")); + } else { + if (capability_string != NULL) { + if(strlen(capability_textbuf) > 0) { + char *temp2 = strdup(capability_textbuf); + if (!temp2) { + MYACCOUNT_ERROR("strdup returns NULL\n"); + return false; + } + MA_SNPRINTF(capability_textbuf, 127, "%s, %s", temp2, capability_string); + MA_MEMFREE(temp2); + } else { + MA_SNPRINTF(capability_textbuf, 127, "%s%s", capability_textbuf, + capability_string); } - MA_SNPRINTF(capability_textbuf, 127, "%s, %s", temp2, capability_string); - MA_MEMFREE(temp2); - } else { - MA_SNPRINTF(capability_textbuf, 127, "%s%s", capability_textbuf, - capability_string); } } } - MYACCOUNT_VERBOSE("capability_textbuf = %s \n", capability_textbuf); return true; } +void myaccount_account_list_free_priv_data(myaccount_appdata *appdata) +{ + GList* it = NULL; + myaccount_appdata *ad = (myaccount_appdata *)appdata; + + if(!ad) { + MYACCOUNT_ERROR("No appdata!!\n"); + return; + } + + for(it=ad->sorted_account_list;it!=NULL;it=g_list_next(it)) { + myaccount_list_priv* tmp = (myaccount_list_priv*)it->data; + MA_MEMFREE(tmp); + } + + if(ad->account_info_list) { + g_list_free(ad->account_info_list); + ad->account_info_list = NULL; + } + + ad->sorted_account_list = NULL; + +} + +static myaccount_list_priv* +_myaccount_account_list_create_priv_item() +{ + myaccount_list_priv* account_info = NULL; + account_info = (myaccount_list_priv*)calloc(1,sizeof(myaccount_list_priv)); + if(!account_info) { + MYACCOUNT_ERROR("memory allocation fail\n"); + } + return account_info; +} + + bool _myaccount_account_list_account_info_cb(account_h account, void *user_data) { + GList **account_info_list = (GList **)user_data; int error_code = -1; - int j = account_index; + myaccount_list_priv* account_info = NULL; if (!account) { MYACCOUNT_ERROR("_myaccount_account_list_account_info_cb:account handle is NULL\n"); return false; } else { + + account_info = _myaccount_account_list_create_priv_item(); + char *temptxt = NULL; int id = -1; account_secrecy_state_e secret; @@ -152,100 +214,145 @@ bool _myaccount_account_list_account_info_cb(account_h account, if (error_code != ACCOUNT_ERROR_NONE) { MYACCOUNT_ERROR("account_get_user_name: Failed \n"); } else if (temptxt && strlen(temptxt)) { - MA_STRNCPY(account_info[j].username, temptxt, - sizeof(account_info[j].username)); - } else { - MYACCOUNT_DBUG("account_get_user_name: returned NULL \n"); + MA_STRNCPY(account_info->username, temptxt, + sizeof(account_info->username)); } MA_MEMFREE(temptxt); error_code = account_get_display_name(account, &temptxt); if (error_code != ACCOUNT_ERROR_NONE) { MYACCOUNT_ERROR("account_get_display_name: Failed \n"); } else if (temptxt && strlen(temptxt)) { - MA_STRNCPY(account_info[j].display_name, temptxt, - sizeof(account_info[j].display_name)); - } else { - MYACCOUNT_DBUG("account_get_display_name: returned NULL \n"); + MA_STRNCPY(account_info->display_name, temptxt, + sizeof(account_info->display_name)); } MA_MEMFREE(temptxt); error_code = account_get_email_address(account, &temptxt); if (error_code != ACCOUNT_ERROR_NONE) { MYACCOUNT_ERROR("account_get_email_address: Failed \n"); } else if (temptxt && strlen(temptxt)) { - MA_STRNCPY(account_info[j].email_address, temptxt, - sizeof(account_info[j].email_address)); - } else { - MYACCOUNT_DBUG("account_get_email_address: returned NULL \n"); + MA_STRNCPY(account_info->email_address, temptxt, + sizeof(account_info->email_address)); } + MA_MEMFREE(temptxt); error_code = account_get_package_name(account, &temptxt); if (error_code != ACCOUNT_ERROR_NONE) { MYACCOUNT_ERROR("account_get_package_name: Failed \n"); } else if (temptxt && strlen(temptxt)) { - MA_STRNCPY(account_info[j].package_name, temptxt, - sizeof(account_info[j].package_name)); - } else { - MYACCOUNT_DBUG("account_get_package_name: returned NULL \n"); - } + MA_STRNCPY(account_info->package_name, temptxt, + sizeof(account_info->package_name)); + if(!strcmp(temptxt, TIZEN_EMAIL_APPID) || !strcmp(temptxt, EXCHANGE_UI_APPID) ||!strcmp(temptxt, GOOGLE_ACCOUNT_APPID)){ + account_info->b_tizen_email = TRUE; + } else { + account_info->b_tizen_email = FALSE; + } + + } MA_MEMFREE(temptxt); error_code = account_get_account_id(account, &id); if (error_code != ACCOUNT_ERROR_NONE) { MYACCOUNT_ERROR("account_get_account_id: Failed \n"); } else if (id > 0) { - account_info[j].account_id = id; - } else { - MYACCOUNT_DBUG("account_get_account_id: returned 0 or -ve \n"); + account_info->account_id = id; } error_code = account_get_secret(account, &secret); if (error_code != ACCOUNT_ERROR_NONE) { MYACCOUNT_ERROR("account_get_secret: Failed \n"); } else { - account_info[j].secret = secret; + account_info->secret = secret; } error_code = account_get_domain_name(account, &temptxt); if (error_code != ACCOUNT_ERROR_NONE) { MYACCOUNT_ERROR("account_get_domain_name: Failed \n"); } else if (temptxt && strlen(temptxt)) { - MA_STRNCPY(account_info[j].domain_name, temptxt, - sizeof(account_info[j].domain_name)); - } else { - MYACCOUNT_DBUG("account_get_domain_name: returned NULL \n"); + MA_STRNCPY(account_info->domain_name, temptxt, + sizeof(account_info->domain_name)); } + MA_MEMFREE(temptxt); error_code = account_get_icon_path(account, &temptxt); if (error_code != ACCOUNT_ERROR_NONE) { MYACCOUNT_ERROR("account_get_icon_path: Failed \n"); } else if (temptxt && strlen(temptxt)) { - MA_STRNCPY(account_info[j].icon_path, temptxt, - sizeof(account_info[j].icon_path)); - } else { - MYACCOUNT_DBUG("account_get_icon_path: returned NULL \n"); - } + MA_STRNCPY(account_info->icon_path, temptxt, sizeof(account_info->icon_path)); + } else { + + account_type_h account_type = NULL; + + error_code = account_type_create(&account_type); + + if(error_code == ACCOUNT_ERROR_NONE){ + + error_code = account_type_query_by_app_id((const char*)account_info->package_name, &account_type); + + if(error_code == ACCOUNT_ERROR_NONE){ + char* provider_icon = NULL; + error_code = account_type_get_icon_path(account_type, &provider_icon); + + if(error_code != ACCOUNT_ERROR_NONE){ + MYACCOUNT_ERROR("account provider icon get Failed \n"); + } else if (provider_icon && strlen(provider_icon)) { + MA_STRNCPY(account_info->icon_path, provider_icon, sizeof(account_info->icon_path)); + } else { + MYACCOUNT_DBUG("account provider icon is not set \n"); + } + MA_MEMFREE(provider_icon); + } + + error_code = account_type_destroy(account_type); + if(error_code != ACCOUNT_ERROR_NONE){ + MYACCOUNT_ERROR("type_destroy destroy Failed \n"); + } + } + } + MA_MEMFREE(temptxt); - if(!strlen(account_info[j].icon_path)) - myaccount_common_get_icon_by_name(account_info[j].domain_name , - account_info[j].icon_path); + if(!strlen(account_info->icon_path)) + myaccount_common_get_icon_by_name(account_info->domain_name , + account_info->icon_path); error_code = account_get_sync_support(account, - (account_sync_state_e *)&(account_info[j].sync_status)); + (account_sync_state_e *)&(account_info->sync_status)); if (error_code != ACCOUNT_ERROR_NONE) { MYACCOUNT_ERROR("account_get_sync_support: Failed \n"); } error_code = account_get_capability_all(account, _myaccount_account_list_get_capablity_text, - (void *)&account_info[j]); + (void *)account_info); if (error_code != ACCOUNT_ERROR_NONE) MYACCOUNT_ERROR("account_get_capability: Failed \n"); + /* for SA(01), TA(02) sorting */ + MYACCOUNT_DBUG("(%s)\n", strchr(account_info->package_name, '.')); + if(!strcmp(account_info->package_name, SAMSUNG_ACCOUNT_APPID)) { + MA_SNPRINTF(account_info->service_sname, + sizeof(account_info->service_sname), "%s%s", SORT_PRIOR_1, strchr(account_info->package_name, '.')); + } else if(!strcmp(account_info->package_name, TIZEN_ACCOUNT_APPID)){ + MA_SNPRINTF(account_info->service_sname, + sizeof(account_info->service_sname), "%s%s", SORT_PRIOR_1, strchr(account_info->package_name, '.')); + } else { + /* No need to sort, sort as the order user register */ + MA_SNPRINTF(account_info->service_sname, + sizeof(account_info->service_sname), "%s", SORT_PRIOR_3); + } + + *account_info_list = g_list_append(*account_info_list, (void*)account_info); account_index++; } return true; } -static int __myaccount_account_list_populate_account_info() +static int _myaccount_ug_account_list_compare(gconstpointer a, gconstpointer b) +{ + myaccount_list_priv* account_info_a = (myaccount_list_priv*)a; + myaccount_list_priv* account_info_b = (myaccount_list_priv*)b; + + return g_ascii_strcasecmp(account_info_a->service_sname, account_info_b->service_sname); +} + +static int __myaccount_account_list_populate_account_info(myaccount_appdata *ad) { - MYACCOUNT_VERBOSE("\n Inside __myaccount_account_list_populate_account_info !! \n"); int error_code = -1; int count=0; @@ -253,49 +360,53 @@ static int __myaccount_account_list_populate_account_info() if (error_code != ACCOUNT_ERROR_NONE) MYACCOUNT_ERROR("account_connect: Failed \n"); - error_code = account_get_total_count_from_db(&count); - if (error_code != ACCOUNT_ERROR_NONE) - MYACCOUNT_ERROR("account_get_total_count_from_db: Failed \n"); - - MYACCOUNT_DBUG("CURRENT account count is %d\n", count); - account_info = calloc(count, sizeof(myaccount_list_priv)); account_foreach_account_from_db(_myaccount_account_list_account_info_cb, - NULL); + &ad->account_info_list); error_code = account_disconnect(); if (error_code != ACCOUNT_ERROR_NONE) MYACCOUNT_ERROR("account_disconnect: Failed \n"); - MYACCOUNT_VERBOSE("populate myacconut data END\n"); + ad->sorted_account_list = g_list_sort(ad->account_info_list, (GCompareFunc)_myaccount_ug_account_list_compare); + count = g_list_length(ad->sorted_account_list); + return count; } -void myaccount_account_list_quit_cb( void *data, - Evas_Object *obj, void *event_info ) +Eina_Bool myaccount_account_list_quit_cb(void *data, Elm_Object_Item *it) { int error_code=0; myaccount_appdata *priv = (myaccount_appdata*)data; - MYACCOUNT_VERBOSE("myaccount_account_list_quit_cb START\n"); + MYACCOUNT_DBUG("account list view quit\n"); if (!priv) { MYACCOUNT_ERROR("myaccount_account_list_quit_cb callback user data is null!!!\n"); - return; + return EINA_TRUE; } - if(account_info){ - if (account_info->capablity_list) { - g_slist_free(account_info->capablity_list); - account_info->capablity_list = NULL; - } + if(priv->popup != NULL) + { + evas_object_del(priv->popup); + priv->popup = NULL; } - MA_MEMFREE(account_info); + + myaccount_account_list_free_priv_data(priv); + account_index = 0; + if (priv->ug) { - error_code = ug_destroy_me(priv->ug); - MYACCOUNT_INFO("myaccount_account_list_quit_cb callback : return = %d!!!\n", + ui_gadget_h ug = priv->ug; + error_code = ug_destroy_me(ug); + MYACCOUNT_SLOGD("myaccount_account_list_quit_cb callback : return = %d!!!\n", error_code); + return EINA_FALSE; } - MYACCOUNT_VERBOSE("myaccount_account_list_quit_cb END\n"); + return EINA_TRUE; +} + +void myaccount_account_list_back_key_cb(void *data, Evas_Object *obj, void *event_info) +{ + elm_naviframe_item_pop(obj); } static void __myaccount_account_list_addaccount_cb( void *data, @@ -303,6 +414,11 @@ static void __myaccount_account_list_addaccount_cb( void *data, { myaccount_appdata *priv = (myaccount_appdata*)data; myaccount_addaccount_create_view(priv); + if(priv->popup != NULL) + { + evas_object_del(priv->popup); + priv->popup = NULL; + } } static char *__myaccount_account_list_gl_label_get(void *data, @@ -310,15 +426,13 @@ static char *__myaccount_account_list_gl_label_get(void *data, { myaccount_list_priv *account_info_item = (myaccount_list_priv*)data; char domain_name_lower[128] = {0,}; - MYACCOUNT_VERBOSE("__myaccount_account_list_gl_label_get START data=%p, part=%s\n", - data, part); if (!account_info_item) { MYACCOUNT_ERROR(" __myaccount_account_list_gl_label_get: Data is NULL\n"); return NULL; } - if (!strcmp(part, "elm.text") || !strcmp(part, "elm.text.1")) { + if (!strcmp(part, "elm.text.main.left.top")) { myaccount_common_lowercase(account_info_item->domain_name, domain_name_lower); @@ -330,89 +444,83 @@ static char *__myaccount_account_list_gl_label_get(void *data, return strdup(account_info_item->username); else return strdup("Unknown"); - } else if (!strcmp(part, "elm.text.sub") || !strcmp(part, "elm.text.2")) { + } else if (!strcmp(part, "elm.text.sub.left.bottom")) { if (strlen(account_info_item->capability) <=0 ) - return strdup("Signed In"); + return strdup(dgettext(MA_UG_NAME, "IDS_MA_BODY_SIGNED_IN")); else return strdup(account_info_item->capability); - } else { - MYACCOUNT_DBUG("__myaccount_account_list_gl_label_get : UNKNOWN part name"); - return strdup(account_info_item->domain_name); } - MYACCOUNT_VERBOSE("END of __myaccount_account_list_gl_label_get \n"); return NULL; } -static char *__myaccount_account_list_title_get(void *data, - Evas_Object *obj, const char *part) -{ - if (!strcmp(part, "elm.text")) - return (strdup(dgettext(MA_UG_NAME, "IDS_EMAIL_SK3_ACCOUNT_LIST"))); - - return NULL; -} static Evas_Object *__myaccount_account_list_gl_icon_get(void *data, Evas_Object *obj, const char *part) { char tempbuf[PATH_MAX]; Evas_Object *icon = NULL; + int auto_sync_status = -1; myaccount_list_priv *account_info_item = (myaccount_list_priv*)data; - - MYACCOUNT_VERBOSE("__myaccount_account_list_gl_icon_get START data=%p, obj = %p, part=%s\n", - data, obj, part); + char *color = NULL; + Evas_Object *ic = NULL; if (!account_info_item) { MYACCOUNT_ERROR("__myaccount_account_list_gl_icon_get: Data is NULL\n"); return NULL; } memset(tempbuf, 0, sizeof(char)*PATH_MAX); + if (!strcmp(part, "elm.icon.1")) { - MYACCOUNT_VERBOSE("__myaccount_account_list_gl_icon_get : current path %s\n", - account_info_item->icon_path); if (strlen(account_info_item->icon_path) > 0) { MA_SNPRINTF(tempbuf, sizeof(tempbuf), "%s", account_info_item->icon_path); } else { - MA_SNPRINTF(tempbuf, sizeof(tempbuf), "%s", "99_email.png"); + MA_SNPRINTF(tempbuf, sizeof(tempbuf), "%s", "A01_2_Icon_default.png"); } - icon = elm_icon_add(obj); + ic = elm_layout_add(obj); + elm_layout_theme_set(ic, "layout", "list/B/type.2", "default"); + + icon = elm_image_add(obj); if (strstr(tempbuf, "/")) elm_image_file_set(icon, tempbuf, NULL); else elm_image_file_set(icon, MA_IMAGE_EDJ_NAME, tempbuf); - evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_NONE, 1, 1); + elm_layout_content_set(ic, "elm.swallow.content", icon); } + if (!strcmp(part, "elm.icon.2")) { if (account_info_item->sync_status == ACCOUNT_SYNC_NOT_SUPPORT) return NULL; - - if (account_info_item->sync_status == ACCOUNT_SYNC_STATUS_IDLE - || account_info_item->sync_status == ACCOUNT_SYNC_STATUS_OFF ) { - MA_SNPRINTF(tempbuf, sizeof(tempbuf), "%s", - "66_myaccount_icon_push_deactivated.png"); - } else if (account_info_item->sync_status == ACCOUNT_SYNC_STATUS_RUNNING){ - MA_SNPRINTF(tempbuf, sizeof(tempbuf), "%s", - "66_myaccount_icon_push_press.png"); + if (vconf_get_int(VCONFKEY_ACCOUNT_AUTO_SYNC_STATUS_INT, + &auto_sync_status) < 0) { + MYACCOUNT_ERROR("Fail to getVCONFKEY_ACCOUNT_AUTO_SYNC_STATUS_INT\n"); } + MA_SNPRINTF(tempbuf, sizeof(tempbuf), "%s", "account_icon_syncing.png"); + color = "AO001"; - MYACCOUNT_DBUG("## icon path (%s)\n", tempbuf); - + MYACCOUNT_DBUG("color:[%s]",color); if(strlen(tempbuf) > 0) { - icon = elm_icon_add(obj); - if (strstr(tempbuf, "/")) - elm_image_file_set(icon, tempbuf, NULL); - else - elm_image_file_set(icon, MA_IMAGE_EDJ_NAME, tempbuf); + ic = elm_layout_add(obj); + elm_layout_theme_set(ic, "layout", "list/C/type.3", "default"); - evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_NONE, 1, 1); - } + icon = elm_image_add(obj); + if (strstr(tempbuf, "/")) + elm_image_file_set(icon, tempbuf, NULL); + else + elm_image_file_set(icon, MA_IMAGE_EDJ_NAME, tempbuf); + + int ret = 0; + if (color) { + ret = ea_theme_object_color_set(icon, color); + MYACCOUNT_DBUG("ret[%d]", ret); + } + elm_layout_content_set(ic, "elm.swallow.content", icon); + } } - MYACCOUNT_VERBOSE("__myaccount_account_list_gl_icon_get :: END :: icon = %p\n", - icon); - return icon; + + return ic; } static void _myaccount_ug_account_list_layout_cb(ui_gadget_h ug, @@ -422,13 +530,13 @@ static void _myaccount_ug_account_list_layout_cb(ui_gadget_h ug, myaccount_appdata *ad; if (!ug||!priv) { - MYACCOUNT_FATAL("layout cb error ug=%p, priv=%p\n", ug, priv); + MYACCOUNT_ERROR("layout cb error ug=%p, priv=%p\n", ug, priv); return; } ad = (myaccount_appdata*)priv; base = ug_get_layout(ug); if (!base) - MYACCOUNT_FATAL("layout cb base is null\n"); + MYACCOUNT_ERROR("layout cb base is null\n"); switch (mode) { case UG_MODE_FRAMEVIEW: @@ -437,7 +545,7 @@ static void _myaccount_ug_account_list_layout_cb(ui_gadget_h ug, case UG_MODE_FULLVIEW: evas_object_size_hint_weight_set(base, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(ad->win_main, base); + //elm_win_resize_object_add(ad->win_main, base); evas_object_show(base); break; default: @@ -446,165 +554,209 @@ static void _myaccount_ug_account_list_layout_cb(ui_gadget_h ug, } static void _myaccount_ug_account_list_result_cb(ui_gadget_h ug, - service_h service, void *priv) + app_control_h app_control, void *priv) { - MYACCOUNT_VERBOSE("_myaccount_ug_account_list_result_cb\n"); + //MYACCOUNT_VERBOSE("_myaccount_ug_account_list_result_cb\n"); } static void _myaccount_ug_account_list_destroy_cb(ui_gadget_h ug, void *priv) { - MYACCOUNT_VERBOSE("_myaccount_ug_account_list_destroy_cb\n"); myaccount_appdata *mydata = (myaccount_appdata*)priv; if (!ug||!mydata) { MYACCOUNT_ERROR("destroy cb error ug=%p, priv=%p\n", ug, mydata); return; } - mydata->item_selected_state = false; + myaccount_common_set_item_selected_state(false); ug_destroy(ug); - MYACCOUNT_VERBOSE("_myaccount_ug_account_list_destroy_cb : ug callee request kill layout_addaccount=%p\n", - mydata->layout_addaccount); + MYACCOUNT_SLOGD("_myaccount_ug_account_list_destroy_cb"); #ifndef ENABLE_NOTI myaccount_common_handle_notification(NULL); #endif } -static void __myaccount_ug_launch_signin_view(void *data, myaccount_list_priv *account) +static void __myaccount_accountlist_set_ug_cbs(struct ug_cbs *cbs, + myaccount_appdata *priv) +{ + if (!cbs || !priv) { + MYACCOUNT_ERROR("__myaccount_addaccount_ug_create_email: Invalid param cbs=%p, priv=%p\n", + cbs, priv); + return; + } + cbs->layout_cb = _myaccount_ug_account_list_layout_cb; + cbs->result_cb = _myaccount_ug_account_list_result_cb; + cbs->destroy_cb = _myaccount_ug_account_list_destroy_cb; + cbs->priv = (void *)priv; +} + +static void __myaccount_ug_list_call_ug(void *data, myaccount_list_priv *account) { myaccount_appdata *ad = (myaccount_appdata*)data; - service_h service; - int ret; + MyAccountProviderType sp_type; + ui_gadget_h ug = NULL; + struct ug_cbs cbs = {0,}; + app_control_h app_control; + __attribute__((__unused__)) int ret = APP_CONTROL_ERROR_NONE; - if(!account) { - MYACCOUNT_ERROR("__myaccount_ug_launch_signin_view : account info NULL\n"); + if (!account) { + MYACCOUNT_ERROR("__myaccount_ug_list_call_ug : account info NULL\n"); return; } - ret = service_create(&service); - MYACCOUNT_INFO("myaccount_ug_launch_signin_view : service_create return = %d!!!\n", ret); - - ret = myaccount_common_launch_application(MYACCOUNT_REQUEST_VIEW, - strdup(account->package_name), - strdup(account->username), - "", - account->account_id, - 0, - ad); + __myaccount_accountlist_set_ug_cbs(&cbs, ad); + + sp_type = myaccount_common_get_provider_type(account->package_name); + ret = app_control_create(&app_control); + + switch (sp_type) { +// case MYACCOUNT_TYPE_MSN : + case MYACCOUNT_TYPE_GOOGLE : + case MYACCOUNT_TYPE_OTHER : +// case MYACCOUNT_TYPE_FACEBOOK : + ret = myaccount_common_launch_application(MYACCOUNT_REQUEST_VIEW, + strdup(account->package_name), + strdup(account->username), + "", + account->account_id, + sp_type, + ad); + break; + case MYACCOUNT_TYPE_EXCHANGE : + ret = myaccount_common_launch_application(MYACCOUNT_REQUEST_VIEW, + strdup("activesync-ui"), + strdup(account->username), + "", + account->account_id, + sp_type, + ad); + break; + case MYACCOUNT_TYPE_SAMSUNG : + ret = myaccount_common_launch_application(MYACCOUNT_REQUEST_VIEW, + strdup("com.samsung.samsung-account-front"), + strdup(account->username), + "", + account->account_id, + sp_type, + ad); + break; + case MYACCOUNT_TYPE_PICASA : + case MYACCOUNT_TYPE_YOUTUBE : + default : + ret = myaccount_common_launch_application(MYACCOUNT_REQUEST_VIEW, + strdup(account->package_name), + strdup(account->username), + "", + account->account_id, + sp_type, + ad); + break; + } - MYACCOUNT_INFO("myaccount_ug_launch_signin_view : myaccount_common_launch_signin_view return = %d!!!\n", ret); + ad->ug_called = ug; + app_control_destroy(app_control); - service_destroy(service); } static void __myaccount_account_list_gl_sel(void *data, Evas_Object *obj, void *event_info) { myaccount_appdata *ad = myaccount_get_appdata(); - if(ad->item_selected_state) { + if( myaccount_common_get_item_selected_state() ) { elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE); return; } - ad->item_selected_state = true; + myaccount_common_set_item_selected_state(true); Elm_Object_Item *item = (Elm_Object_Item *) event_info; - MYACCOUNT_VERBOSE("__myaccount_account_list_gl_sel data=%p, obj=%p, event_info=%p\n", + MYACCOUNT_SLOGD("__myaccount_account_list_gl_sel data=%p, obj=%p, event_info=%p\n", data, obj, event_info); myaccount_list_priv *account = (myaccount_list_priv*)data; - MYACCOUNT_DBUG("__myaccount_account_list_gl_sel : account name : %s\n", + MYACCOUNT_SLOGD("__myaccount_account_list_gl_sel : account name : %s\n", account->domain_name); if (item != NULL) elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE); - __myaccount_ug_launch_signin_view((myaccount_appdata*)ad, account); - - MYACCOUNT_VERBOSE("END of __myaccount_account_list_gl_sel\n"); - + __myaccount_ug_list_call_ug((myaccount_appdata*)ad, account); return; } static void __myaccount_account_list_item_selected(void *data, Evas_Object *obj, void *event_info) { - MYACCOUNT_VERBOSE("__myaccount_account_list_item_selected \n"); + //MYACCOUNT_VERBOSE("__myaccount_account_list_item_selected \n"); } static void __myaccount_account_list_append_genlist(myaccount_appdata *ad, int count) { - MYACCOUNT_DBUG ("\n count received in __myaccount_account_list_append_genlist = %d \n", + MYACCOUNT_SLOGD ("\n count received in __myaccount_account_list_append_genlist = %d \n", count); - int index = 0; - Elm_Object_Item *it; bool supported = false; if (count > 0) { - it = elm_genlist_item_append(ad->account_genlist, - &account_list_itc_sep, NULL, NULL, - ELM_GENLIST_ITEM_NONE, NULL, NULL); - elm_genlist_item_select_mode_set(it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); - it = elm_genlist_item_append(ad->account_genlist, - &account_list_title_itc, NULL, NULL, - ELM_GENLIST_ITEM_NONE, NULL, NULL); - elm_genlist_item_select_mode_set(it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); - - for (index = 0; index < count; index++) { + GList* iter; + for(iter=ad->sorted_account_list;iter!=NULL;iter=g_list_next(iter)) { + myaccount_list_priv* tmp = (myaccount_list_priv*)iter->data; supported = false; - if (account_info[index].secret == ACCOUNT_SECRECY_VISIBLE) { + if (tmp->secret == ACCOUNT_SECRECY_VISIBLE) { if (ad->capability_filter) { - GSList* iter; + GSList* siter; myaccount_list_priv *acc_info = NULL; - acc_info = &account_info[index]; - for (iter = acc_info->capablity_list; iter != NULL; iter = g_slist_next(iter)) { - myaccount_capability_data *cap_data = (myaccount_capability_data*)iter->data; - if (!strcmp(cap_data->type, ad->capability_filter)) { + acc_info = tmp; + + /* Tizen email exception */ + if(!strcmp("http://tizen.org/account/capability/tizen_email", ad->capability_filter)){ + if(tmp->b_tizen_email) { supported = true; - break; + } + } else { + for (siter = acc_info->capablity_list; siter != NULL; siter = g_slist_next(siter)) { + myaccount_capability_data *cap_data = (myaccount_capability_data*)siter->data; + + if (!strcmp(cap_data->type, ad->capability_filter)) { + supported = true; + break; + } } } + if (supported) { - it = elm_genlist_item_append(ad->account_genlist, + elm_genlist_item_append(ad->account_genlist, &account_list_itc, - (void *)&account_info[index], NULL, + (void *)tmp, NULL, ELM_GENLIST_ITEM_NONE, __myaccount_account_list_gl_sel, - (void *)&account_info[index]); + (void *)tmp); - MYACCOUNT_VERBOSE("genlist item(%p)\n", it); } } else { - it = elm_genlist_item_append(ad->account_genlist, + elm_genlist_item_append(ad->account_genlist, &account_list_itc, - (void *)&account_info[index], NULL, + (void *)tmp, NULL, ELM_GENLIST_ITEM_NONE, __myaccount_account_list_gl_sel, - (void *)&account_info[index]); - MYACCOUNT_VERBOSE("genlist item(%p)\n", it); + (void *)tmp); } } } - it = elm_genlist_item_append(ad->account_genlist, - &account_list_itc_sep_end, NULL, NULL, - ELM_GENLIST_ITEM_NONE, NULL, NULL); - elm_genlist_item_select_mode_set(it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); } else { myaccount_addaccount_create_view(ad); } return; } - static void _myaccount_ug_account_gl_realized(void *data, Evas_Object *obj, void *ei) { Elm_Object_Item *it = NULL; int total_count = 0; int index = 0; - Evas_Object *ao; - char buf[2048]={0,}; - char bufdomain[2048]={0,}; +// Evas_Object *ao; +// char buf[2048]={0,}; +// char bufdomain[2048]={0,}; if(!ei) { MYACCOUNT_ERROR("Realized event info is NULL!!! \n"); @@ -616,10 +768,10 @@ static void _myaccount_ug_account_gl_realized(void *data, Evas_Object *obj, void total_count = elm_genlist_items_count(obj); index = elm_genlist_item_index_get(it); - MYACCOUNT_VERBOSE("Total genlist item count(%d)!!! \n", total_count); if(index > 2 && index < total_count) { /*Add account items. index 1 and last are the seperators*/ + /* myaccount_list_priv *account_info_item = (myaccount_list_priv*)elm_object_item_data_get(it); if(account_info_item){ @@ -642,26 +794,30 @@ static void _myaccount_ug_account_gl_realized(void *data, Evas_Object *obj, void ao = elm_object_item_access_object_get(it); elm_access_info_set(ao, ELM_ACCESS_INFO, buf); + } - }else { + */ + } else if (index == 2) { + //ao = elm_object_item_access_object_get(it); + //elm_access_info_set(ao, ELM_ACCESS_CONTEXT_INFO, "Turn Auto Sync on or off"); + } else if (index == 3) { + //ao = elm_object_item_access_object_get(it); + //elm_access_info_set(ao, ELM_ACCESS_CONTEXT_INFO, "Below is the list of all logged in accounts"); + } else { /*Remove access for seperators*/ - elm_object_item_access_unregister(ei); + //elm_object_item_access_unregister(ei); } if(total_count <= 4) { - MYACCOUNT_INFO("DO NOTHING only one account exist, total_count(%d) index(%d) !!! \n", total_count, index); + //MYACCOUNT_INFO("DO NOTHING only one account exist, total_count(%d) index(%d) !!! \n", total_count, index); } else { if (index == 1) { - MYACCOUNT_VERBOSE("DO NOTHING realized (%d) !!! \n", index); } else if (index == 2) { - MYACCOUNT_VERBOSE("TOP realized (%d) !!! \n", index); elm_object_item_signal_emit(ei, "elm,state,top", ""); } else if (index == (total_count-2)) { - MYACCOUNT_VERBOSE("BOTTOM realized (%d) item count (%d) !!! \n", index, total_count); elm_object_item_signal_emit(ei, "elm,state,bottom", ""); } else { - MYACCOUNT_VERBOSE("CENTER realized (%d) !!! \n", index); elm_object_item_signal_emit(ei, "elm,state,center", ""); } } @@ -678,34 +834,14 @@ static Evas_Object *__myaccount_account_list_create_genlist( } int account_count = 0; - account_count = __myaccount_account_list_populate_account_info(); + account_count = __myaccount_account_list_populate_account_info(ad); - account_list_itc.item_style = "dialogue/2text.2icon.3"; + account_list_itc.item_style = "2line.top"; account_list_itc.func.text_get = __myaccount_account_list_gl_label_get; account_list_itc.func.content_get = __myaccount_account_list_gl_icon_get; account_list_itc.func.state_get = NULL; account_list_itc.func.del = NULL; - account_list_title_itc.item_style = "dialogue/title"; - account_list_title_itc.func.text_get = __myaccount_account_list_title_get; - account_list_title_itc.func.content_get = NULL; - account_list_title_itc.func.state_get = NULL; - account_list_title_itc.func.del = NULL; - - /*to add 40 pixel separator*/ - account_list_itc_sep.item_style = "dialogue/separator"; - account_list_itc_sep.func.text_get = NULL; - account_list_itc_sep.func.content_get = NULL; - account_list_itc_sep.func.state_get = NULL; - account_list_itc_sep.func.del = NULL; - - /*to add 40 pixel list end separator*/ - account_list_itc_sep_end.item_style = "dialogue/separator/end"; - account_list_itc_sep_end.func.text_get = NULL; - account_list_itc_sep_end.func.content_get = NULL; - account_list_itc_sep_end.func.state_get = NULL; - account_list_itc_sep_end.func.del = NULL; - ad->account_genlist = genlist = elm_genlist_add(ad->navi_bar); evas_object_smart_callback_add(genlist, "realized", _myaccount_ug_account_gl_realized, NULL); evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -716,22 +852,110 @@ static Evas_Object *__myaccount_account_list_create_genlist( __myaccount_account_list_item_selected, (myaccount_appdata*) ad); - MYACCOUNT_VERBOSE("\n account count = %d\n", account_count); - __myaccount_account_list_append_genlist(ad, account_count); - MYACCOUNT_VERBOSE("END of __myaccount_account_list_create_genlist\n"); return genlist; } +static void __move_more_ctxpopup(myaccount_appdata *ad) +{ + MYACCOUNT_DBUG("__move_more_ctxpopup"); + + Evas_Coord w = 0; + Evas_Coord h = 0; + + elm_win_screen_size_get(ad->win_main, NULL, NULL, &w, &h); + int pos = elm_win_rotation_get(ad->win_main); + + switch (pos) { + case 0: + case 180: + evas_object_move(ad->popup, (w / 2), h); + break; + case 90: + evas_object_move(ad->popup, (h / 2), w); + break; + case 270: + evas_object_move(ad->popup, (h / 2), w); + break; + } + + +} + +static void __rotate_more_ctxpopup_cb(void *data, Evas_Object *obj, void *event_info) +{ + MYACCOUNT_DBUG("__rotate_more_ctxpopup_cb"); + myaccount_appdata *ad = data; + + __move_more_ctxpopup(ad); +} +static void _delete_ctxpopup_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) +{ + MYACCOUNT_DBUG("_delete_toolbar_ctxpopup_cb"); + myaccount_appdata *ad = data; + if (elm_win_wm_rotation_supported_get(ad->win_main)) { + if (ad->popup) { + evas_object_smart_callback_del(elm_object_top_widget_get(ad->popup), "wm,rotation,changed", __rotate_more_ctxpopup_cb); + } + } + if (ad->popup) { + ea_object_event_callback_del(ad->popup, EA_CALLBACK_BACK, ea_ctxpopup_back_cb); + ea_object_event_callback_del(ad->popup, EA_CALLBACK_MORE, ea_ctxpopup_back_cb); + evas_object_event_callback_del(ad->popup, EVAS_CALLBACK_DEL, _delete_ctxpopup_cb); + } +} + +static void __create_more_ctxpopup(myaccount_appdata *ad) +{ + MYACCOUNT_DBUG("__create_more_ctxpopup"); + + Evas_Object *popup = elm_ctxpopup_add(ad->navi_bar); + ad->popup = popup; + + elm_object_style_set(popup, "more/default"); + elm_ctxpopup_auto_hide_disabled_set(popup, EINA_TRUE); + if (elm_win_wm_rotation_supported_get(ad->win_main)) { + evas_object_smart_callback_add(elm_object_top_widget_get(popup), "wm,rotation,changed", __rotate_more_ctxpopup_cb, ad); + } + evas_object_event_callback_add(popup, EVAS_CALLBACK_DEL, _delete_ctxpopup_cb, ad); + ea_object_event_callback_add(popup, EA_CALLBACK_BACK, ea_ctxpopup_back_cb, popup); + ea_object_event_callback_add(popup, EA_CALLBACK_MORE, ea_ctxpopup_back_cb, popup); + + elm_ctxpopup_item_append(popup, dgettext(MA_UG_NAME,"IDS_PB_BODY_ADD_ACCOUNT"), NULL, __myaccount_account_list_addaccount_cb, ad); + + elm_ctxpopup_direction_priority_set(popup, ELM_CTXPOPUP_DIRECTION_UP, + ELM_CTXPOPUP_DIRECTION_LEFT, + ELM_CTXPOPUP_DIRECTION_RIGHT, + ELM_CTXPOPUP_DIRECTION_DOWN); + + __move_more_ctxpopup(ad); + evas_object_show(popup); +} + +static void __delete_more_cb(void *data) +{ + MYACCOUNT_DBUG("__delete_more_cb"); + myaccount_appdata *ad = data; + if (ad->popup) { + evas_object_del(ad->popup); + ad->popup = NULL; + } +} + +static void __more_cb(void *data, Elm_Object_Item *it, const char *emission, const char *source) +{ + MYACCOUNT_DBUG("__more_cb"); + myaccount_appdata *ad = data; + __delete_more_cb(data); + __create_more_ctxpopup(ad); +} + void myaccount_ug_account_list_create(void *data) { - MYACCOUNT_VERBOSE("\n myaccount_ug_account_list_create called !!\n"); myaccount_appdata *ad = data; Evas_Object *genlist = NULL; Evas_Object *layout; - Evas_Object *l_button; - Evas_Object *btn; if (ad == NULL) { MYACCOUNT_ERROR("myaccount_ug_account_list_create myaccount_appdata is null\n"); @@ -740,52 +964,41 @@ void myaccount_ug_account_list_create(void *data) layout = elm_layout_add(ad->navi_bar); elm_layout_file_set(layout, - "/usr/ug/res/edje/ug-setting-myaccount-efl/myaccount.edj", + "/usr/apps/setting-myaccount-efl/res/edje/setting-myaccount-efl/myaccount.edj", "account_list"); evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set( layout, EVAS_HINT_FILL, EVAS_HINT_FILL); edje_object_signal_emit(_EDJ(layout), "elm,state,show,content", "elm"); - //edje_object_signal_emit(_EDJ(layout), "elm,bg,show,group_list", "elm"); elm_object_style_set(ad->bg, "group_list"); + evas_object_show(layout); genlist = __myaccount_account_list_create_genlist(ad); elm_object_part_content_set (layout, "accountlist.genlist", genlist); - ad->l_title_sk = l_button = elm_button_add(ad->navi_bar); - evas_object_smart_callback_add(l_button, "clicked", - myaccount_account_list_quit_cb, - ad); - elm_object_style_set(l_button , "naviframe/back_btn/default"); - ad->navi_it = elm_naviframe_item_push(ad->navi_bar, + + ad->nf_it = elm_naviframe_item_push(ad->navi_bar, dgettext(MA_UG_NAME, - "IDS_ST_HEADER_ACCOUNTS_AND_SYNC"), - l_button, NULL, layout, NULL); - btn = elm_button_add(ad->navi_bar); - if (!btn) { - MYACCOUNT_ERROR("myaccount_ug_account_list_create elm_button_add FAIL\n"); - return; - } - elm_object_style_set(btn, "naviframe/toolbar/default"); - elm_object_text_set(btn, dgettext(MA_UG_NAME, - "IDS_COM_SK_ADD_LITE")); - evas_object_smart_callback_add(btn, "clicked", - __myaccount_account_list_addaccount_cb, - ad); + "IDS_ST_BODY_ACCOUNT_LIST"), + NULL, NULL, layout, NULL); + elm_naviframe_item_pop_cb_set(ad->nf_it, myaccount_account_list_quit_cb, (void*)ad); - elm_object_item_part_content_set(ad->navi_it, "toolbar_button1", btn); + int count = 0; + count = myaccount_common_get_account_type_count(ad->capability_filter); + + MYACCOUNT_DBUG("TOTAL avaiable sp count %d\n", count); + + ea_object_event_callback_add(ad->navi_bar, EA_CALLBACK_MORE, ea_naviframe_more_cb, NULL); + elm_object_item_signal_callback_add(ad->nf_it, "elm,action,more_event", "", __more_cb, ad); - MYACCOUNT_VERBOSE("END of myaccount_ug_account_list_create\n"); } static Evas_Object *__myaccount_account_list_create_bg(Evas_Object *parent) { - MYACCOUNT_VERBOSE("START of __myaccount_account_list_create_bg "); Evas_Object *bg = elm_bg_add(parent); evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_win_resize_object_add(parent, bg); + //elm_win_resize_object_add(parent, bg); evas_object_show(bg); - MYACCOUNT_VERBOSE("END of __myaccount_account_list_create_bg "); return bg; } @@ -794,7 +1007,6 @@ static Evas_Object *__myaccount_account_list_create_main_layout( Evas_Object *bg) { Evas_Object *layout; - MYACCOUNT_VERBOSE("START of __myaccount_account_list_create_main_layout "); layout = elm_layout_add(parent); elm_layout_theme_set(layout, "layout", "application", "default"); @@ -802,8 +1014,8 @@ static Evas_Object *__myaccount_account_list_create_main_layout( edje_object_signal_emit(_EDJ(layout), "elm,state,show,indicator", "elm"); edje_object_signal_emit(_EDJ(layout), "elm,state,show,content", "elm"); elm_object_part_content_set ( layout, "elm.swallow.bg", bg); + evas_object_show( layout ); - MYACCOUNT_VERBOSE("END of __myaccount_account_list_create_main_layout "); return layout; } @@ -812,27 +1024,30 @@ static Evas_Object *__myaccount_account_list_create_navi_layout( Evas_Object *parent) { Evas_Object *navi_bar; - MYACCOUNT_VERBOSE("START of __myaccount_account_list_create_navi_layout "); navi_bar = elm_naviframe_add(parent); elm_object_part_content_set ( parent, "elm.swallow.content", navi_bar ); evas_object_show(navi_bar); - MYACCOUNT_VERBOSE("END of __myaccount_account_list_create_navi_layout "); return navi_bar; } static void __myaccount_account_list_init_main_view(myaccount_appdata *ad) { - elm_win_indicator_mode_set(ad->win_main, ELM_WIN_INDICATOR_SHOW); + //elm_win_indicator_mode_set(ad->win_main, ELM_WIN_INDICATOR_SHOW); ad->bg = __myaccount_account_list_create_bg(ad->win_main); - ad->layout_main = __myaccount_account_list_create_main_layout(ad->win_main, - ad->bg); + ad->layout_main = __myaccount_account_list_create_main_layout(ad->win_main, ad->bg); +// ea_theme_object_style_set(ad->layout_main, EA_THEME_STYLE_DARK); +// ea_theme_object_style_set(ad->layout_main, EA_THEME_STYLE_LIGHT); + ad->base = ad->layout_main; +} + +void myaccount_list_navi_create(myaccount_appdata *ad) +{ ad->navi_bar = __myaccount_account_list_create_navi_layout(ad->layout_main); - MYACCOUNT_VERBOSE("END of __myaccount_account_list_init_main_view : %p\n", - ad->navi_bar); + ea_object_event_callback_add(ad->navi_bar, EA_CALLBACK_BACK, myaccount_account_list_back_key_cb, (void*)ad); } void myaccount_list_view_create(myaccount_appdata *priv) @@ -844,8 +1059,7 @@ void myaccount_list_view_create(myaccount_appdata *priv) cbs.destroy_cb = _myaccount_ug_account_list_destroy_cb; cbs.priv = (void *)priv; - MYACCOUNT_VERBOSE("\n !!!!! myaccount_list_view_create !!!!! \n"); - + MYACCOUNT_DBUG("Account list start\n"); __myaccount_account_list_init_main_view(priv); } @@ -853,25 +1067,24 @@ void myaccount_list_refresh_item_list(myaccount_appdata *ad) { int count = 0; - MYACCOUNT_DBUG("START\n"); - if(!ad) { - MYACCOUNT_FATAL("no appdata!\n"); + MYACCOUNT_ERROR("no appdata!\n"); return; } + if(!ad->account_genlist) { + MYACCOUNT_ERROR("no genlist!\n"); + return; + } + + MYACCOUNT_DBUG("Account list start\n"); + elm_genlist_clear(ad->account_genlist); - MYACCOUNT_DBUG("Account list removed completely!\n"); - if(account_info) { - if (account_info->capablity_list) { - g_slist_free(account_info->capablity_list); - account_info->capablity_list = NULL; - } - } - MA_MEMFREE(account_info); + myaccount_account_list_free_priv_data(ad); + account_index = 0; - count = __myaccount_account_list_populate_account_info(); + count = __myaccount_account_list_populate_account_info(ad); __myaccount_account_list_append_genlist(ad, count); diff --git a/src/myaccount_ug_addaccount.c b/src/myaccount_ug_addaccount.c index 57b903c..da90765 100755 --- a/src/myaccount_ug_addaccount.c +++ b/src/myaccount_ug_addaccount.c @@ -1,17 +1,22 @@ /* - * Copyright 2012 Samsung Electronics Co., Ltd + * my-account * - * Licensed under the Flora License, Version 1.1 (the License); + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Wonyoung Lee , Tarun Kumar + * + * 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://floralicense.org/license/ + * 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, + * 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 UG_MODULE_API @@ -22,7 +27,6 @@ #include "myaccount_ug_addaccount.h" #include "myaccount_ug_account_list.h" #include -#include #include #include #include @@ -30,82 +34,35 @@ #define SORT_PRIOR_1 "1_" #define SORT_PRIOR_2 "2_" #define SORT_PRIOR_3 "3_" -#define TIZEN_EMAIL_APPID "email-setting-efl" - -#define TIZEN_EMAIL_CSC_FILE_PATH "/opt/system/csc-default/data/csc-default-data-email-account.ini" -#define TIZEN_EMAIL_CSC_SP_COUNT_KEY "email_account:count" -#define TIZEN_EMAIL_CSC_SP_NAME_PREFIX "email_account:name_" static Elm_Genlist_Item_Class addacc_list_itc; -#ifndef ENABLE_HELP -static Elm_Genlist_Item_Class addacc_list_itc_sep; -#endif -static Elm_Genlist_Item_Class addacc_list_itc_sep_end; static bool _myaccount_addaccount_get_account_type_info_cb(account_type_h account_type, void *user_data); - -#ifdef ENABLE_HELP -static char *__myaccount_add_account_help_label_get(void *data, - Evas_Object *obj, const char *part) -{ - return NULL; -} - -static Evas_Object *__myaccount_add_account_help_icon_get(void *data, - Evas_Object *obj, const char *part) -{ - Evas_Object *eohelp = NULL; - MYACCOUNT_VERBOSE("myaccount_ug_account_list : help_get data=%p, obj=%p, part=%s \n", - data, obj, part); - eohelp = elm_label_add(obj); - evas_object_size_hint_weight_set(eohelp, EVAS_HINT_EXPAND, 0.0); - evas_object_size_hint_align_set(eohelp, EVAS_HINT_FILL, EVAS_HINT_FILL); - elm_label_line_wrap_set(eohelp, ELM_WRAP_WORD); - char buf[512]; - memset(buf, 0, 512); - MA_SNPRINTF(buf, 511, "%s%s%s", "", - dgettext(MA_UG_NAME, - "IDS_MA_BODY_YOU_CAN_MANAGE_YOUR_CONTACTS_CALENDARS_EMAIL_AND_IM_ACCOUNTS"), - ""); - elm_object_text_set(eohelp, buf); - return eohelp; -} - -static Eina_Bool __myaccount_add_account_help_state_get(void *data, - Evas_Object *obj, const char *part) -{ - return EINA_FALSE; -} - -static Elm_Genlist_Item_Class help_itc = { ELM_GENGRID_ITEM_CLASS_VERSION, 0, 0, - "1icon", NULL, NULL, - { __myaccount_add_account_help_label_get, - __myaccount_add_account_help_icon_get, - __myaccount_add_account_help_state_get, - NULL } -}; -#endif - static char *__myaccount_addaccount_gl_label_get(void *data, Evas_Object *obj, const char *part) { addaccount_list_priv *service = (addaccount_list_priv*)data; char buf[2048]={0,}; - if (!strcmp(part, "elm.text") || !strcmp(part, "elm.text.2")) { - + if (!strcmp(part, "elm.text.main.left")) { int value = -1; + char *tmp_sp_name = NULL; + system_settings_get_value_int(SYSTEM_SETTINGS_KEY_FONT_SIZE, &value); + tmp_sp_name = elm_entry_utf8_to_markup(service->service_name); + if(!strcmp(service->service_name, dgettext(MA_UG_NAME, "IDS_EMAIL_BODY_MICROSOFT_EXCHANGE_ACTIVESYNC")) && value == SYSTEM_SETTINGS_FONT_SIZE_NORMAL) { - sprintf(buf, "%s", 39, service->service_name); + if(tmp_sp_name){ + sprintf(buf, "%s", 37, tmp_sp_name); + MA_MEMFREE(tmp_sp_name); + } return strdup(buf); - } else { - return strdup(service->service_name); + return tmp_sp_name; } } @@ -115,7 +72,6 @@ static char *__myaccount_addaccount_gl_label_get(void *data, bool myaccount_add_account_by_package_name_cb(account_h account, void *user_data) { - MYACCOUNT_VERBOSE("myaccount_add_account_already_exist_account_cb"); return false; } @@ -128,27 +84,58 @@ static void __myaccount_addaccount_gl_sel(void *data, char email_sp[64] = {0,}; if(!ad) { - MYACCOUNT_FATAL("__myaccount_account_list_gl_sel appdata is NULL\n"); + MYACCOUNT_ERROR("__myaccount_account_list_gl_sel appdata is NULL\n"); return; } -#if 0 - if(ad->item_selected_state) { + MYACCOUNT_DBUG("ad->item_selected_state=%d\n", myaccount_common_get_item_selected_state()); + + if( myaccount_common_get_item_selected_state() ) { elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE); return; } -#endif - ad->item_selected_state = true; - MYACCOUNT_VERBOSE("__myaccount_account_list_gl_sel START\n"); + myaccount_common_set_item_selected_state(true); if (item != NULL) { elm_genlist_item_selected_set((Elm_Object_Item *)event_info, EINA_FALSE); - MYACCOUNT_VERBOSE("service->package_name = %s \n ", - service->package_name); - switch(service->sp_type) { + case MYACCOUNT_TYPE_PICASA : + case MYACCOUNT_TYPE_YOUTUBE : +// case MYACCOUNT_TYPE_FACEBOOK : + case MYACCOUNT_TYPE_EXCHANGE : + myaccount_common_launch_application( + MYACCOUNT_REQUEST_SIGNIN, + strdup(service->package_name), + NULL, + email_sp, + -1, + service->sp_type, + ad); + break; + case MYACCOUNT_TYPE_GOOGLE : + MA_SNPRINTF(email_sp, sizeof(email_sp), "%s", "gmail"); + myaccount_common_launch_application( + MYACCOUNT_REQUEST_SIGNIN, + strdup(service->package_name), + NULL, + email_sp, + -1, + service->sp_type, + ad); + break; +// case MYACCOUNT_TYPE_MSN : +// MA_SNPRINTF(email_sp, sizeof(email_sp), "%s", "msn"); +// myaccount_common_launch_application( +// MYACCOUNT_REQUEST_SIGNIN, +// strdup(service->package_name), +// NULL, +// email_sp, +// service->sp_type, +// -1, +// ad); +// break; case MYACCOUNT_TYPE_OTHER: MA_SNPRINTF(email_sp, sizeof(email_sp), "%s", "others"); myaccount_common_launch_application( @@ -162,7 +149,6 @@ static void __myaccount_addaccount_gl_sel(void *data, break; case MYACCOUNT_TYPE_CSC: MA_SNPRINTF(email_sp, sizeof(email_sp), "%s", service->service_name); - MYACCOUNT_ERROR("CSC sp name (%s)\n", email_sp); myaccount_common_launch_application( MYACCOUNT_REQUEST_SIGNIN, strdup(service->package_name), @@ -180,14 +166,13 @@ static void __myaccount_addaccount_gl_sel(void *data, "", -1, service->sp_type, - ad) != SERVICE_ERROR_NONE ) { + ad) != APP_CONTROL_ERROR_NONE ) { MYACCOUNT_ERROR("__myaccount_addaccount_gl_sel : Failed to launch application\n"); - ad->item_selected_state = false; + myaccount_common_set_item_selected_state(false); } break; } - } return; } @@ -199,26 +184,32 @@ static Evas_Object *__myaccount_addaccount_icon_get( void *data, char tempbuf[PATH_MAX]; Evas_Object *icon = NULL; addaccount_list_priv *service_item = (addaccount_list_priv*)data; + Evas_Object *ic = NULL; - if (!service_item) { + if (!service_item) { MYACCOUNT_ERROR(" __myaccount_addaccount_icon_get: Data is NULL\n"); return NULL; } memset(tempbuf, 0, sizeof(char)*PATH_MAX); - if (!strcmp(part, "elm.photo") || !strcmp(part, "elm.icon")) { + + if (!strcmp(part, "elm.icon.1")) { if (strlen(service_item->icon_path) > 0) { MA_STRNCPY(tempbuf, service_item->icon_path, sizeof(tempbuf)); } else { - MA_STRNCPY(tempbuf, "99_email.png", sizeof(tempbuf)); + MA_STRNCPY(tempbuf, "A01_2_Icon_default.png", sizeof(tempbuf)); } + ic = elm_layout_add(obj); + elm_layout_theme_set(ic, "layout", "list/B/type.2", "default"); + + icon = elm_image_add(obj); + if (strstr(tempbuf, "/")) + elm_image_file_set(icon, tempbuf, NULL); + else + elm_image_file_set(icon, MA_IMAGE_EDJ_NAME, tempbuf); + + elm_layout_content_set(ic, "elm.swallow.content", icon); } - icon = elm_icon_add(obj); - if (strstr(tempbuf, "/")) - elm_image_file_set(icon, tempbuf, NULL); - else - elm_image_file_set(icon, MA_IMAGE_EDJ_NAME, tempbuf); - evas_object_size_hint_aspect_set(icon, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1); - return icon; + return ic; } void myaccount_addaccount_free_priv_data(myaccount_appdata *appdata) @@ -226,30 +217,17 @@ void myaccount_addaccount_free_priv_data(myaccount_appdata *appdata) GList* it = NULL; myaccount_appdata *ad = (myaccount_appdata *)appdata; - MYACCOUNT_INFO("addaccount priv data free START\n"); - if(!ad) { MYACCOUNT_ERROR("No appdata!!\n"); return; } - MYACCOUNT_INFO("ad->sorted_sp_list(%p)\n", ad->sorted_sp_list); - MYACCOUNT_INFO("ad->sp_info_list(%p)\n", ad->sp_info_list); - for(it=ad->sorted_sp_list;it!=NULL;it=g_list_next(it)) { addaccount_list_priv* tmp = (addaccount_list_priv*)it->data; MA_MEMFREE(tmp); } - if(ad->sp_info_list) { - g_list_free(ad->sp_info_list); - ad->sp_info_list = NULL; - } - ad->sorted_sp_list = NULL; - - MYACCOUNT_INFO("addaccount priv data free END\n"); - } static addaccount_list_priv* @@ -258,41 +236,13 @@ _myaccount_addaccount_create_priv_item() addaccount_list_priv* sp_info = NULL; sp_info = (addaccount_list_priv*)calloc(1,sizeof(addaccount_list_priv)); if(!sp_info) { - MYACCOUNT_FATAL("memory allocation fail\n"); + MYACCOUNT_ERROR("memory allocation fail\n"); + return NULL; } + memset(sp_info, 0x00, sizeof(addaccount_list_priv)); return sp_info; } -static bool _myaccount_addaccount_get_service_label_cb(char* app_id, char* label, char* locale, void *user_data) -{ - addaccount_list_priv** sp_info = (addaccount_list_priv**)user_data; - - if(!app_id) { - MYACCOUNT_ERROR(" account type label app_id is null app_id=%p\n", app_id); - return FALSE; - } - - if(!label) { - MYACCOUNT_ERROR(" account type label label is null label=%p\n", label); - return FALSE; - } - - //TODO. consider system laungage setting considering between slp and osp - - if(*sp_info) { - MA_STRNCPY((*sp_info)->service_name, label, - sizeof((*sp_info)->service_name)); - MA_SNPRINTF((*sp_info)->service_sname, - sizeof((*sp_info)->service_sname), "%s%s", SORT_PRIOR_3, (*sp_info)->service_name); - } else { - MYACCOUNT_INFO("(*sp_info) is null (%p)\n", (*sp_info)); - } - - MYACCOUNT_INFO("account type label:: appid(%s), label(%s), name(%s)\n", app_id, label, (*sp_info)->service_name); - - return TRUE; -} - static bool _myaccount_addaccount_get_account_type_info_cb(account_type_h account_type, void *user_data) { GList **service_info_list = (GList **)user_data; @@ -307,6 +257,11 @@ static bool _myaccount_addaccount_get_account_type_info_cb(account_type_h accoun sp_info = _myaccount_addaccount_create_priv_item(); + if(sp_info == NULL) { + MYACCOUNT_ERROR(" sp_info is NULL \n"); + return FALSE; + } + ret = account_type_get_app_id(account_type, &type_buf); if(ret == ACCOUNT_ERROR_NONE ) { if(type_buf) { @@ -320,24 +275,64 @@ static bool _myaccount_addaccount_get_account_type_info_cb(account_type_h accoun } MA_MEMFREE(type_buf); + myaccount_appdata* ad = NULL; + ad = myaccount_get_appdata(); + + if(ad) { + if(ad->called_from && !strcmp(ad->called_from, "setup_wizard")){ + MYACCOUNT_ERROR("FROM SETUP WIZARD\n"); + if(!strcmp(sp_info->package_name, SAMSUNG_ACCOUNT_APPID)) { + MA_MEMFREE(sp_info); + return TRUE; + } else if(!strcmp(sp_info->package_name, TIZEN_ACCOUNT_APPID)) { + MA_MEMFREE(sp_info); + return TRUE; + } + } + } else { + MYACCOUNT_ERROR("app data is null\n"); + } + if(!strcmp(sp_info->package_name, "email-setting-efl")) { - //MYACCOUNT_INFO("Samsung account exception\n"); MA_MEMFREE(sp_info); - /* Other email */ + /* SLP email */ sp_info = _myaccount_addaccount_create_priv_item(); MA_STRNCPY(sp_info->service_name, - dgettext(MA_UG_NAME, "IDS_PB_BODY_OTHER_EMAILS"), + dgettext(MA_UG_NAME, "IDS_COM_BODY_EMAIL"), sizeof(sp_info->service_name)); MA_SNPRINTF(sp_info->service_sname, sizeof(sp_info->service_sname), "%s%s", SORT_PRIOR_3, sp_info->service_name); MA_STRNCPY(sp_info->package_name, "email-setting-efl", sizeof(sp_info->package_name)); - myaccount_common_get_icon_by_name("others", - sp_info->icon_path); + //myaccount_common_get_icon_by_name("email", + // sp_info->icon_path); + + ret = account_type_get_icon_path(account_type, &type_buf); + if(ret == ACCOUNT_ERROR_NONE ) { + if(type_buf) { + MA_STRNCPY(sp_info->icon_path, type_buf, + sizeof(sp_info->icon_path)); + } else { + MYACCOUNT_ERROR("No icon path available\n"); + } + } else { + MYACCOUNT_ERROR("account_type_get_app_id return(%x)\n", ret); + } + MA_MEMFREE(type_buf); + sp_info->sp_type = MYACCOUNT_TYPE_OTHER; sp_info->b_tizen_email = TRUE; *service_info_list = g_list_append(*service_info_list, (void*)sp_info); return TRUE; + + } else if(!strcmp(sp_info->package_name, "activesync-ui")) { + sp_info->b_tizen_email = TRUE; + } else if(!strcmp(sp_info->package_name, "com.samsung.rcs-im") + || !strcmp(sp_info->package_name, "ims-service")) { + MA_MEMFREE(sp_info); + return TRUE; + } else if(!strcmp(sp_info->package_name, GOOGLE_ACCOUNT_APPID)) { + sp_info->b_tizen_email = TRUE; } ret = account_type_get_icon_path(account_type, &type_buf); @@ -353,15 +348,48 @@ static bool _myaccount_addaccount_get_account_type_info_cb(account_type_h accoun } MA_MEMFREE(type_buf); - account_type_get_label(account_type,_myaccount_addaccount_get_service_label_cb, &sp_info); + char* provider_name = NULL; + + if(ad && ad->current_language){ + + if(!strcmp(ad->current_language, "en_US")){ + ret = account_type_get_label_by_locale(account_type, "en_GB", &provider_name); + }else{ + ret = account_type_get_label_by_locale(account_type, ad->current_language, &provider_name); + } + } + + if(ret != ACCOUNT_ERROR_NONE){ + /* fallback scenario */ + ret = account_type_get_label_by_locale(account_type, "default", &provider_name); + if(ret != ACCOUNT_ERROR_NONE){ + MYACCOUNT_SLOGE("No service name(%s)\n", sp_info->package_name); + MA_MEMFREE(sp_info); + return TRUE; + } + } + + MA_STRNCPY(sp_info->service_name, provider_name, + sizeof(sp_info->service_name)); + + MA_MEMFREE(provider_name); + + if(!strcmp(sp_info->package_name, SAMSUNG_ACCOUNT_APPID)) { + MA_SNPRINTF(sp_info->service_sname, + sizeof(sp_info->service_sname), "%s%s", SORT_PRIOR_1, sp_info->service_name); + } else if(!strcmp(sp_info->package_name, TIZEN_ACCOUNT_APPID)){ + MA_SNPRINTF(sp_info->service_sname, + sizeof(sp_info->service_sname), "%s%s", SORT_PRIOR_1, sp_info->service_name); + } else { + MA_SNPRINTF(sp_info->service_sname, + sizeof(sp_info->service_sname), "%s%s", SORT_PRIOR_3, sp_info->service_name); + } account_type_get_multiple_account_support(account_type, &type_int); sp_info->multiple_account_support = type_int; - MYACCOUNT_INFO(" account type multiple account support (%d) \n", type_int); if(type_int == FALSE && account_query_account_by_package_name(myaccount_add_account_by_package_name_cb, sp_info->package_name, NULL) == ACCOUNT_ERROR_NONE) { - MYACCOUNT_ERROR("Multiple account not support (%s)\n", sp_info->package_name); MA_MEMFREE(sp_info); return TRUE; } @@ -373,77 +401,33 @@ static bool _myaccount_addaccount_get_account_type_info_cb(account_type_h accoun static void _myaccount_addaccount_get_account_type_info(const char* capability_filter, GList** sp_info_list) { + int ret = -1; if(!sp_info_list) { MYACCOUNT_ERROR("sp_info_list is null\n"); return; } - account_connect(); + ret = account_connect(); + if(ret != ACCOUNT_ERROR_NONE){ + MYACCOUNT_ERROR("account database cannot be connected\n"); + return; + } + if(capability_filter) { - MYACCOUNT_DBUG("capability filter requested (%s)\n", capability_filter); - if(!strcmp(capability_filter, ACCOUNT_SUPPORTS_CAPABILITY_TIZEN_EMAIL)){ - account_type_query_by_provider_feature(_myaccount_addaccount_get_account_type_info_cb, ACCOUNT_SUPPORTS_CAPABILITY_EMAIL, (void*)sp_info_list); + if(!strcmp(capability_filter, "http://tizen.org/account/capability/tizen_email")){ + account_type_query_by_provider_feature(_myaccount_addaccount_get_account_type_info_cb, "http://tizen.org/account/capability/email", (void*)sp_info_list); }else { - account_type_query_by_provider_feature(_myaccount_addaccount_get_account_type_info_cb, capability_filter, (void*)sp_info_list); - } + account_type_query_by_provider_feature(_myaccount_addaccount_get_account_type_info_cb, capability_filter, (void*)sp_info_list); + } } else { - MYACCOUNT_DBUG("get all account type requested \n"); account_type_foreach_account_type_from_db(_myaccount_addaccount_get_account_type_info_cb, (void*)sp_info_list); } - account_disconnect(); -} - -static bool _myaccount_addaccount_get_csc_sp_list(GList** sp_info_list) -{ - addaccount_list_priv* sp_info = NULL; - dictionary* dic = NULL; - int i = 0; - int sp_count = -1; - char* sp_name = NULL; - - MYACCOUNT_DBUG("START csc splist\n"); - // check ini file /opt/system/csc-default/data/csc-default-data-email-account.ini - dic = iniparser_load(TIZEN_EMAIL_CSC_FILE_PATH); - if(!dic){ - MYACCOUNT_ERROR("email csc file is not exist\n"); - return FALSE; - } - - sp_count = iniparser_getint(dic, TIZEN_EMAIL_CSC_SP_COUNT_KEY, 0); - MYACCOUNT_DBUG("key (%s), sp count (%d)\n", TIZEN_EMAIL_CSC_SP_COUNT_KEY, sp_count); - - if(sp_count <= 0) { - iniparser_freedict(dic); - MYACCOUNT_ERROR("email sp count 0\n"); - return FALSE; - } - - //email ini key index is started from 1 - for(i=1;i<=sp_count;i++) { - char buf[256] = {0,}; - sp_info = _myaccount_addaccount_create_priv_item(); - MA_SNPRINTF(buf,sizeof(buf),"%s%d", TIZEN_EMAIL_CSC_SP_NAME_PREFIX, i); - sp_name = iniparser_getstr(dic, buf); - MYACCOUNT_DBUG("key (%s), sp_name (%s)\n", buf, sp_name); - MA_STRNCPY(sp_info->service_name, sp_name, - sizeof(sp_info->service_name)); - MA_SNPRINTF(sp_info->service_sname, sizeof(sp_info->service_sname), "%s%s", SORT_PRIOR_3, sp_info->service_name); - MA_STRNCPY(sp_info->package_name, "email-setting-efl", - sizeof(sp_info->package_name)); - - sp_info->sp_type = MYACCOUNT_TYPE_CSC; - sp_info->b_tizen_email = TRUE; - sp_info->multiple_account_support = TRUE; - - *sp_info_list = g_list_append(*sp_info_list, (void*)sp_info); + ret = account_disconnect(); + if(ret != ACCOUNT_ERROR_NONE){ + MYACCOUNT_ERROR("account database cannot be connected\n"); + return; } - - iniparser_freedict(dic); - - MYACCOUNT_DBUG("END csc splist\n"); - - return TRUE; } static int _myaccount_ug_addaccount_compare(gconstpointer a, gconstpointer b) @@ -451,8 +435,6 @@ static int _myaccount_ug_addaccount_compare(gconstpointer a, gconstpointer b) addaccount_list_priv* sp_info_a = (addaccount_list_priv*)a; addaccount_list_priv* sp_info_b = (addaccount_list_priv*)b; - MYACCOUNT_DBUG("sp_info_a->service_sname a(%s) b(%s)\n", sp_info_a->service_sname, sp_info_b->service_sname); - return g_ascii_strcasecmp(sp_info_a->service_sname, sp_info_b->service_sname); } @@ -460,10 +442,10 @@ static int __myaccount_addaccount_populate_service_info(myaccount_appdata *ad) { int pkg_count = 0; - _myaccount_addaccount_get_csc_sp_list(&ad->sp_info_list); - _myaccount_addaccount_get_account_type_info(ad->capability_filter, &ad->sp_info_list); + //_myaccount_addaccount_get_csc_sp_list(ad->capability_filter, &ad->sp_info_list); + _myaccount_addaccount_get_account_type_info(ad->capability_filter, &ad->sorted_sp_list); - ad->sorted_sp_list = g_list_sort(ad->sp_info_list, (GCompareFunc)_myaccount_ug_addaccount_compare); + ad->sorted_sp_list = g_list_sort(ad->sorted_sp_list, (GCompareFunc)_myaccount_ug_addaccount_compare); pkg_count = g_list_length(ad->sorted_sp_list); return pkg_count; @@ -474,8 +456,6 @@ static void _myaccount_ug_addaccount_gl_realized(void *data, Evas_Object *obj, v Elm_Object_Item *it = NULL; int total_count = 0; int index = 0; - Evas_Object *ao; - char buf[2048]={0,}; if(!ei) { MYACCOUNT_ERROR("Realized event info is NULL!!! \n"); @@ -487,99 +467,76 @@ static void _myaccount_ug_addaccount_gl_realized(void *data, Evas_Object *obj, v total_count = elm_genlist_items_count(obj); index = elm_genlist_item_index_get(it); - if(index != 1 && index != total_count) { + if(index != 0 && index != total_count) { /*Add account items. index 1 and last are the seperators*/ - addaccount_list_priv *service = (addaccount_list_priv*)elm_object_item_data_get(it); - if(service) { - memset(buf, 0, 2048); - g_snprintf(buf, 100, "Allows you to add your %s Account", service->service_name); - ao = elm_object_item_access_object_get(it); - elm_access_info_set(ao, ELM_ACCESS_CONTEXT_INFO, buf); - } + /* but you don't need to do something. winset support accessibility for default item */ } else { /*Remove access for seperators*/ elm_object_item_access_unregister(ei); } - MYACCOUNT_VERBOSE("Total add account item (%d) !!! \n", total_count); - if(total_count <= 3) { - MYACCOUNT_VERBOSE("DO NOTHING only one add account item, total_count(%d) index(%d) !!! \n", total_count, index); - } else { + //MYACCOUNT_VERBOSE("DO NOTHING only one add account item, total_count(%d) index(%d) !!! \n", total_count, index); + } else { if (index == 1) { - MYACCOUNT_VERBOSE("TOP realized (%d) !!! \n", index); elm_object_item_signal_emit(ei, "elm,state,top", ""); } else if (index == (total_count-2)) { - MYACCOUNT_VERBOSE("BOTTOM realized (%d) item count (%d) !!! \n", index, total_count); elm_object_item_signal_emit(ei, "elm,state,bottom", ""); } else { - MYACCOUNT_VERBOSE("CENTER realized (%d) !!! \n", index); elm_object_item_signal_emit(ei, "elm,state,center", ""); } } } +static void _myaccount_ug_addaccount_gl_deleted(void *data, Evas_Object *obj, void *ei) +{ + MYACCOUNT_ERROR("# _myaccount_ug_addaccount_gl_deleted\n"); + myaccount_appdata *ad = myaccount_get_appdata(); + myaccount_addaccount_free_priv_data(ad); +} -static Evas_Object *__myaccount_addaccount_create_genlist( - myaccount_appdata *ad, int count) +static Evas_Object * __myaccount_addaccount_create_genlist_layout( + Evas_Object *navi_bar) { - MYACCOUNT_VERBOSE("\n __myaccount_addaccount_create_genlist called !!! \n"); Evas_Object *genlist; - Elm_Object_Item *it; -#ifdef ENABLE_HELP - Elm_Object_Item *help; -#endif - if (ad == NULL) { - MYACCOUNT_FATAL("__myaccount_addaccount_create_genlist returns NULL\n"); - return NULL; - } - - addacc_list_itc.item_style = "dialogue/1text.1icon.2.tb"; + addacc_list_itc.item_style = "1line"; addacc_list_itc.func.text_get = __myaccount_addaccount_gl_label_get; addacc_list_itc.func.content_get = __myaccount_addaccount_icon_get; addacc_list_itc.func.state_get = NULL; addacc_list_itc.func.del = NULL; -#ifndef ENABLE_HELP - /*to add 40 pixel separator*/ - addacc_list_itc_sep.item_style = "dialogue/separator"; - addacc_list_itc_sep.func.text_get = NULL; - addacc_list_itc_sep.func.content_get = NULL; - addacc_list_itc_sep.func.state_get = NULL; - addacc_list_itc_sep.func.del = NULL; -#endif - /*to add 40 pixel list end separator*/ - addacc_list_itc_sep_end.item_style = "dialogue/separator/end"; - addacc_list_itc_sep_end.func.text_get = NULL; - addacc_list_itc_sep_end.func.content_get = NULL; - addacc_list_itc_sep_end.func.state_get = NULL; - addacc_list_itc_sep_end.func.del = NULL; - - genlist = elm_genlist_add(ad->navi_bar); + genlist = elm_genlist_add(navi_bar); evas_object_smart_callback_add(genlist, "realized", _myaccount_ug_addaccount_gl_realized, NULL); + evas_object_smart_callback_add(genlist, "delete", _myaccount_ug_addaccount_gl_deleted, NULL); + return genlist; +} - MYACCOUNT_VERBOSE("############################# ADD SERVICE COUNT = %d\n", - count); -#ifdef ENABLE_HELP - help = elm_genlist_item_append(genlist, &help_itc, (void*)ad, NULL, - ELM_GENLIST_ITEM_NONE, NULL, NULL); -#else - it = elm_genlist_item_append(genlist, - &addacc_list_itc_sep, NULL, NULL, - ELM_GENLIST_ITEM_NONE, NULL, NULL); - elm_genlist_item_select_mode_set(it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); -#endif +static Evas_Object *__myaccount_addaccount_append_genlist_item( + myaccount_appdata *ad, Evas_Object *genlist, int count) +{ + if (ad == NULL) { + MYACCOUNT_ERROR("__myaccount_addaccount_create_genlist returns NULL\n"); + return NULL; + } GList* iter; - MYACCOUNT_INFO("Append genlist START \n"); - for(iter=ad->sorted_sp_list;iter!=NULL;iter=g_list_next(iter)) { addaccount_list_priv* tmp = (addaccount_list_priv*)iter->data; if(ad->capability_filter) { - if( !strcmp(ad->capability_filter, ACCOUNT_SUPPORTS_CAPABILITY_TIZEN_EMAIL)) { /* Tizen email exception */ + /* Samsung account exception */ + if(tmp->sp_type == MYACCOUNT_TYPE_SAMSUNG + && (!strcmp(ad->capability_filter, "http://tizen.org/account/capability/memo") + || !strcmp(ad->capability_filter, "http://tizen.org/account/capability/contact") + || !strcmp(ad->capability_filter, "http://tizen.org/account/capability/calendar"))) { + elm_genlist_item_append(genlist, &addacc_list_itc, + (void *)tmp, NULL, + ELM_GENLIST_ITEM_NONE, + __myaccount_addaccount_gl_sel, + (void *)tmp); + } else if( !strcmp(ad->capability_filter, "http://tizen.org/account/capability/tizen_email")) { /* Tizen email exception */ if(tmp->b_tizen_email) { elm_genlist_item_append(genlist, &addacc_list_itc, (void *)tmp, NULL, @@ -588,12 +545,12 @@ static Evas_Object *__myaccount_addaccount_create_genlist( (void *)tmp); } } else { - elm_genlist_item_append(genlist, &addacc_list_itc, - (void *)tmp, NULL, - ELM_GENLIST_ITEM_NONE, - __myaccount_addaccount_gl_sel, - (void *)tmp); - } + elm_genlist_item_append(genlist, &addacc_list_itc, + (void *)tmp, NULL, + ELM_GENLIST_ITEM_NONE, + __myaccount_addaccount_gl_sel, + (void *)tmp); + } } else { elm_genlist_item_append(genlist, &addacc_list_itc, (void *)tmp, NULL, @@ -604,88 +561,215 @@ static Evas_Object *__myaccount_addaccount_create_genlist( } - MYACCOUNT_INFO("Append genlist COMPLETE \n"); - - it = elm_genlist_item_append(genlist, - &addacc_list_itc_sep_end, NULL, NULL, - ELM_GENLIST_ITEM_NONE, NULL, NULL); - elm_genlist_item_select_mode_set(it, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY); - elm_genlist_block_count_set(genlist, count); - MYACCOUNT_VERBOSE("END of __myaccount_addaccount_create_genlist\n"); + return genlist; } -void __myaccount_addaccount_quit_cb( void *data, - Evas_Object *obj, void *event_info ) +static Evas_Object *__myaccount_addaccount_create_genlist( + myaccount_appdata *ad, int count) +{ + Evas_Object *genlist; + + if (ad == NULL) { + MYACCOUNT_ERROR("__myaccount_addaccount_create_genlist returns NULL\n"); + return NULL; + } + + genlist = __myaccount_addaccount_create_genlist_layout(ad->navi_bar); + + return __myaccount_addaccount_append_genlist_item(ad, genlist, count); +} + +static Evas_Object *__myaccount_addaccount_no_account(myaccount_appdata *ad, int count) +{ + Evas_Object *no_account; + + if (ad == NULL) { + MYACCOUNT_ERROR("__myaccount_addaccount_no_account returns NULL\n"); + return NULL; + } + no_account = elm_layout_add(ad->navi_bar); + elm_layout_file_set(no_account, MA_NO_ACCOUNT_EDJ_NAME, "nocontents_layout"); + + elm_layout_theme_set(no_account, "layout", "nocontents", "default"); + evas_object_size_hint_weight_set(no_account, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(no_account, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_object_part_text_set(no_account, "elm.text", "No Account Providers"); + /* left below line to future use */ + //elm_object_part_text_set(no_account, "elm.help.text", "Please install account app to add account"); + elm_layout_signal_emit(no_account, "text,disabled", ""); + elm_layout_signal_emit(no_account, "align.center", "elm"); + + return no_account; +} + +Eina_Bool __myaccount_addaccount_quit_cb( void *data, + Elm_Object_Item *it ) { int error_code = 0; myaccount_appdata *priv = (myaccount_appdata*)data; int count = -1; - MYACCOUNT_INFO("myaccount_account_list_quit_cb START\n"); + MYACCOUNT_DBUG("Add account list quit\n"); - error_code = myaccount_common_get_all_account_cnt(&count); - if (error_code != ACCOUNT_ERROR_NONE) { - MYACCOUNT_ERROR("__myaccount_addaccount_quit_cb: myaccount_common_get_all_account_cnt fail(%d) \n", - error_code); + if (!priv) { + MYACCOUNT_ERROR("__myaccount_addaccount_quit_cb callback user data is null!!!\n"); + return EINA_TRUE; } - if (!priv) { - MYACCOUNT_ERROR("myaccount_account_list_quit_cb callback user data is null!!!\n"); - return; + if(priv->capability_filter && strlen(priv->capability_filter)){ + + if(!strcmp(priv->capability_filter, "http://tizen.org/account/capability/tizen_email")){ + int cnt1 = 0; + int cnt2 = 0; + int cnt3 = 0; + error_code = myaccount_common_get_account_cnt_by_appid(TIZEN_EMAIL_APPID, &cnt1); + error_code = myaccount_common_get_account_cnt_by_appid(EXCHANGE_UI_APPID, &cnt2); + error_code = myaccount_common_get_account_cnt_by_appid(GOOGLE_ACCOUNT_APPID, &cnt3); + count = cnt1+cnt2+cnt3; + } else { + error_code = myaccount_common_get_account_cnt_by_capability(priv->capability_filter, &count); + } + + if (error_code != ACCOUNT_ERROR_NONE) { + MYACCOUNT_ERROR("__myaccount_addaccount_quit_cb: myaccount_common_get_all_account_cnt fail(%d) \n", + error_code); + } + } else { + error_code = myaccount_common_get_all_account_cnt(&count); + if (error_code != ACCOUNT_ERROR_NONE) { + MYACCOUNT_ERROR("__myaccount_addaccount_quit_cb: myaccount_common_get_all_account_cnt fail(%d) \n", + error_code); + } } + /*destroy add genlist before pop it*/ + if ((count > 0) && (priv->eMode == eMYACCOUNT_ACCOUNT_LIST)) { + MYACCOUNT_DBUG("# count > 0, elm_naviframe_item_pop return EINA_TRUE\n"); if (priv->add_genlist) { evas_object_del(priv->add_genlist); priv->add_genlist = NULL; } - myaccount_addaccount_free_priv_data(priv); - elm_naviframe_item_pop(priv->navi_bar); - MYACCOUNT_INFO("eMYACCOUNT_ACCOUNT_LIST mode END\n"); - return; + priv->prev_app_cnt = 0; + + return EINA_TRUE; } if (priv->ug) { - error_code = ug_destroy_me(priv->ug); - MYACCOUNT_DBUG("myaccount_account_list_quit_cb callback : return = %d!!!\n", - error_code); + ui_gadget_h ug = priv->ug; + ug_destroy_me(ug); + return EINA_FALSE; + } + + if (priv->add_genlist) { + evas_object_del(priv->add_genlist); + priv->add_genlist = NULL; } + priv->prev_app_cnt = 0; + MYACCOUNT_DBUG("Add account list quit end\n"); - MYACCOUNT_INFO("myaccount_account_list_quit_cb END\n"); + return EINA_TRUE; } void myaccount_addaccount_genlist_create(void *data) { - MYACCOUNT_VERBOSE("\n myaccount_addaccount_genlist_create called !!! \n"); myaccount_appdata *ad = data; Evas_Object *genlist; Evas_Object *l_button; int service_cnt=0; if (ad == NULL) { - MYACCOUNT_FATAL("myaccount_addaccount_genlist_create myaccount_appdata is null\n"); + MYACCOUNT_ERROR("myaccount_addaccount_genlist_create myaccount_appdata is null\n"); return; } service_cnt = __myaccount_addaccount_populate_service_info(ad); - ad->add_genlist = genlist = __myaccount_addaccount_create_genlist(ad, service_cnt); + ad->prev_app_cnt = service_cnt; + if(service_cnt > 0){ + ad->add_genlist = genlist = __myaccount_addaccount_create_genlist(ad, service_cnt); + }else{ + /* If there's no account provider, display no account view */ + ad->add_genlist = genlist = __myaccount_addaccount_no_account(ad, service_cnt); + } + l_button = elm_button_add(ad->navi_bar); - evas_object_smart_callback_add(l_button, - "clicked", - __myaccount_addaccount_quit_cb, - ad); elm_object_style_set(l_button , "naviframe/back_btn/default"); - elm_naviframe_item_push(ad->navi_bar, + + ad->add_nf_it = elm_naviframe_item_push(ad->navi_bar, dgettext(MA_UG_NAME, "IDS_MA_HEADER_ADD_ACCOUNT"), l_button, NULL, genlist, NULL); - MYACCOUNT_VERBOSE("END of myaccount_Addaccount_genlist_create\n"); + MYACCOUNT_DBUG("#elm_naviframe_item_pushed.."); + elm_naviframe_item_pop_cb_set(ad->add_nf_it, __myaccount_addaccount_quit_cb, (void*)ad); } void myaccount_addaccount_create_view(myaccount_appdata *ad) { - MYACCOUNT_VERBOSE("\n myaccount_addaccount_create_view called !!! \n"); + MYACCOUNT_DBUG("myaccount_addaccount_create_view start\n"); + if (ad->add_genlist == NULL) { + MYACCOUNT_DBUG("Add account list start\n"); + myaccount_addaccount_free_priv_data(ad); + myaccount_addaccount_genlist_create(ad); + } +} + +void myaccount_addaccount_refresh_item_list(myaccount_appdata *ad) +{ + int count = 0; + + if(!ad) { + MYACCOUNT_ERROR("no appdata!\n"); + return; + } + + if(!ad->add_genlist) { + MYACCOUNT_ERROR("no genlist!\n"); + return; + } + + /*check if app count changed or not, if not changed, then do not refresh current view*/ + int curr_cnt = 0; + GList *sp_list = NULL; + _myaccount_addaccount_get_account_type_info(ad->capability_filter, &sp_list); + curr_cnt = g_list_length(sp_list); + int valid_cnt = 0; + if (ad->prev_app_cnt == curr_cnt) { + int i = 0; + for (i = 0; i < curr_cnt; i++) { + addaccount_list_priv *info = g_list_nth_data(sp_list, i); + if (!info) + continue; + int j = 0; + for (j = 0; j < curr_cnt; j++) { + addaccount_list_priv *prev_info = g_list_nth_data(ad->sorted_sp_list, j); + if (!prev_info) + continue; + if (!g_strcmp0(prev_info->service_name, info->service_name)) { + valid_cnt++; + //MYACCOUNT_DBUG("info->service_name[%s]", info->service_name); + } + } + } + } + /*free temp data*/ + GList* it = NULL; + for(it=sp_list;it!=NULL;it=g_list_next(it)) { + addaccount_list_priv* tmp = (addaccount_list_priv*)it->data; + MA_MEMFREE(tmp); + } + MYACCOUNT_DBUG("ad->prev_app_cnt[%d], valid_cnt[%d]", ad->prev_app_cnt, valid_cnt); + if (ad->prev_app_cnt == valid_cnt) { + MYACCOUNT_DBUG("no change, no need to refresh genlist items!\n"); + return; + } + + elm_genlist_clear(ad->add_genlist); myaccount_addaccount_free_priv_data(ad); - myaccount_addaccount_genlist_create(ad); + count = __myaccount_addaccount_populate_service_info(ad); + ad->prev_app_cnt = count; + __myaccount_addaccount_append_genlist_item(ad, ad->add_genlist, count); + + return; } + diff --git a/src/myaccount_ug_common.c b/src/myaccount_ug_common.c index 1a6d85a..6cc8856 100755 --- a/src/myaccount_ug_common.c +++ b/src/myaccount_ug_common.c @@ -1,599 +1,1132 @@ -/* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.1 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://floralicense.org/license/ - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an AS IS BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "myaccount_ug.h" -#include "myaccount_ug_common.h" -#include "myaccount_ug_addaccount.h" -#include "myaccount_ug_account_list.h" - -static myaccount_appdata *g_myaccount_appdata = NULL; - -void *myaccount_init_appdata() -{ - if (g_myaccount_appdata == NULL) { - g_myaccount_appdata = calloc(1, sizeof(myaccount_appdata)); - g_myaccount_appdata->item_selected_state = false; - } - return g_myaccount_appdata; -} - -void myaccount_destroy_appdata() -{ - MYACCOUNT_INFO("myaccount_destroy_appdata START \n"); - - if (g_myaccount_appdata == NULL) { - MYACCOUNT_WARNING("myaccount_destroy_appdata: appdata NULL \n"); - return; - } - - -/* fix by sungchan,kim. - sudden crash on account list view destroyed. - tempolarily blocked below codes. */ - if (g_myaccount_appdata->base) { - evas_object_del(g_myaccount_appdata->base); - g_myaccount_appdata->base = NULL; - } - MA_MEMFREE(g_myaccount_appdata->capability_filter) - - /* For accounts list */ - if (g_myaccount_appdata->ug_called) { - ug_destroy(g_myaccount_appdata->ug_called); - g_myaccount_appdata->ug_called = NULL; - } - if (g_myaccount_appdata->layout_main) { - evas_object_del(g_myaccount_appdata->layout_main); - g_myaccount_appdata->layout_main = NULL; - } - if (g_myaccount_appdata->layout_addaccount) { - evas_object_del(g_myaccount_appdata->layout_addaccount); - g_myaccount_appdata->layout_addaccount = NULL; - } - if (g_myaccount_appdata->navi_bar) { - evas_object_del(g_myaccount_appdata->navi_bar); - g_myaccount_appdata->navi_bar = NULL; - } - if (g_myaccount_appdata->account_genlist) { - evas_object_del(g_myaccount_appdata->account_genlist); - g_myaccount_appdata->account_genlist = NULL; - } - if (g_myaccount_appdata->help_label) { - evas_object_del(g_myaccount_appdata->help_label); - g_myaccount_appdata->help_label = NULL; - } - if (g_myaccount_appdata->refresh_btn) { - evas_object_del(g_myaccount_appdata->refresh_btn); - g_myaccount_appdata->refresh_btn = NULL; - } - if (g_myaccount_appdata->refresh_icon) { - evas_object_del(g_myaccount_appdata->refresh_icon); - g_myaccount_appdata->refresh_icon = NULL; - } - if (g_myaccount_appdata->cancel_sync_icon) { - evas_object_del(g_myaccount_appdata->cancel_sync_icon); - g_myaccount_appdata->cancel_sync_icon = NULL; - } - if (g_myaccount_appdata->auto_sync_check) { - evas_object_del(g_myaccount_appdata->auto_sync_check); - g_myaccount_appdata->auto_sync_check = NULL; - } - if (g_myaccount_appdata->bg) { - evas_object_del(g_myaccount_appdata->bg); - g_myaccount_appdata->bg = NULL; - } - if (g_myaccount_appdata->ly) { - elm_object_part_content_unset(g_myaccount_appdata->ly, "elm.swallow.content"); - evas_object_del(g_myaccount_appdata->ly); - g_myaccount_appdata->ly = NULL; - } - if (g_myaccount_appdata->modal_popup) { - evas_object_del(g_myaccount_appdata->modal_popup); - g_myaccount_appdata->modal_popup = NULL; - } - if (g_myaccount_appdata->r_title_sk) { - evas_object_del(g_myaccount_appdata->r_title_sk); - g_myaccount_appdata->r_title_sk = NULL; - } - if (g_myaccount_appdata->l_title_sk) { - evas_object_del(g_myaccount_appdata->l_title_sk); - g_myaccount_appdata->l_title_sk = NULL; - } - if (g_myaccount_appdata->progress_timer) { - ecore_timer_del(g_myaccount_appdata->progress_timer); - g_myaccount_appdata->progress_timer = NULL; - } - if (g_myaccount_appdata->add_genlist) { - evas_object_del(g_myaccount_appdata->add_genlist); - g_myaccount_appdata->add_genlist = NULL; - } - if (g_myaccount_appdata->pc) { - pkgmgr_client_free(g_myaccount_appdata->pc); - g_myaccount_appdata->pc = NULL; - } - - if(g_myaccount_appdata->sp_info_list) { - g_list_free(g_myaccount_appdata->sp_info_list); - g_myaccount_appdata->sp_info_list = NULL; - } - - g_myaccount_appdata->sorted_sp_list= NULL; - - MA_MEMFREE(g_myaccount_appdata->caller_userdata); - MA_MEMFREE(g_myaccount_appdata->called_from); - MA_MEMFREE(g_myaccount_appdata); - - MYACCOUNT_VERBOSE("myaccount_destroy_appdata END \n"); -} - -void * myaccount_get_appdata() -{ - return g_myaccount_appdata; -} - -void myaccount_common_get_icon_by_name(char *domain_name, - char *icon_path) -{ - if (!domain_name) { - MYACCOUNT_ERROR("\n !!! domain_name is NULL \n"); - return; - } - char tmp_domain_name[64] = {0,}; - myaccount_common_lowercase(domain_name, tmp_domain_name); - MYACCOUNT_VERBOSE("\n !!! myaccount_common_get_icon_by_name = %s \n", - domain_name); - - if (!icon_path) { - MYACCOUNT_ERROR("\n !!! icon_path is NULL \n"); - return; - } - if (!strcmp(tmp_domain_name, "google") || !strcmp(tmp_domain_name, "gmail")) { - MA_SNPRINTF(icon_path, BUFSIZE, "%s", - "66_myaccount_icon_google_50x50.png"); - } else if (!strcmp(tmp_domain_name, "yahoo") - || !strcmp(tmp_domain_name, "ymail")) { - MA_SNPRINTF(icon_path, BUFSIZE, "%s", - "66_myaccount_icon_yahoo_50x50.png"); - } else if (!strcmp(tmp_domain_name, "hotmail")) { - MA_SNPRINTF(icon_path, BUFSIZE, "%s", - "66_myaccount_icon_msn_50x50.png"); - } else if (!strcmp(tmp_domain_name, "msn")) { - MA_SNPRINTF(icon_path, BUFSIZE, "%s", - "66_myaccount_icon_windows_live_50x50.png"); - } else if (!strcmp(tmp_domain_name, "exchange")) { - MA_SNPRINTF(icon_path, BUFSIZE, "%s", - "exchange.png"); - } else if (!strcmp(tmp_domain_name, "icq")) { - MA_SNPRINTF(icon_path, BUFSIZE, "%s", "icq.png"); - } else if (!strcmp(tmp_domain_name, "facebook")) { - MA_SNPRINTF(icon_path, BUFSIZE, "%s", - "66_myaccount_icon_facebook_50x50.png"); - } else if (!strcmp(tmp_domain_name, "twitter")) { - MA_SNPRINTF(icon_path, BUFSIZE, "%s", - "66_myaccount_icon_twitter_50x50.png"); - } else if (!strcmp(tmp_domain_name, "myspace")) { - MA_SNPRINTF(icon_path, BUFSIZE, "%s", - "myspace.png"); - } else if(!strcmp(tmp_domain_name, "picasa")) { - MA_SNPRINTF(icon_path, BUFSIZE, "%s", "picasa.png"); - } else if(!strcmp(tmp_domain_name, "flickr")) { - MA_SNPRINTF(icon_path, BUFSIZE, "%s", "flickr.png"); - } else if (!strcmp(tmp_domain_name, "samsung")) { - MA_SNPRINTF(icon_path, BUFSIZE, "%s", - "01_samsungaccount.png"); - } else if (!strcmp(tmp_domain_name, "youtube")) { - MA_SNPRINTF(icon_path, BUFSIZE, "%s", "youtube.png"); - } else if (!strcmp(tmp_domain_name, "others")) { - MA_SNPRINTF(icon_path, BUFSIZE, "%s", "A01_2_Icon_others.png"); - }else { - MYACCOUNT_VERBOSE("Default icon\n"); - MA_SNPRINTF(icon_path, BUFSIZE, "%s", "A01_2_Icon_default.png"); - } -} - -void myaccount_common_lowercase(char *src, char *dest) -{ - int i; - int src_len=0; - - if (!src || !dest) { - MYACCOUNT_ERROR("myaccount_common_lowercase src=%p, dest=%p\n", - src, dest); - return; - } - src_len = strlen(src); - for(i=0;iitem_selected_state = false; - - noti_name = vconf_get_str(VCONFKEY_ACCOUNT_MSG_STR); - if (!noti_name) { - MYACCOUNT_FATAL("myaccount_common_handle_notification: vconf_get_str() Failed!\n"); - return; - } else { - MYACCOUNT_VERBOSE("myaccount_common_handle_notification: noti_name = %s\n", - noti_name); - } - error_code = myaccount_common_get_all_account_cnt(&count); - if (error_code != ACCOUNT_ERROR_NONE) { - MYACCOUNT_ERROR("myaccount_common_handle_notification: myaccount_common_get_all_account_cnt fail(%d) \n", - error_code); - } - - MYACCOUNT_VERBOSE("myaccount_common_handle_notification account count =%d\n", - count); - - if (appdata->eMode == eMYACCOUNT_ACCOUNT_LIST) { - if (count > 0) { - if (appdata->add_genlist && strcmp(noti_name, ACCOUNT_NOTI_NAME_SYNC_UPDATE)) { - evas_object_del(appdata->add_genlist); - appdata->add_genlist = NULL; - elm_naviframe_item_pop(appdata->navi_bar); - } - if (appdata->account_genlist) { - myaccount_list_refresh_item_list(appdata); - } else { - myaccount_ug_account_list_create((void*)appdata); - } - } else { - if (appdata->add_genlist) { - evas_object_show(appdata->add_genlist); - } else { - myaccount_addaccount_create_view(appdata); - } - } - } else if (appdata->eMode == eMYACCOUNT_ADD_ACCOUNT) { - if(event_type){ - if (!strcmp(event_type, ACCOUNT_NOTI_NAME_INSERT) && appdata->ug) { - service_h service = NULL; - int ret = -1; - - ret = service_create(&service); - MYACCOUNT_VERBOSE("service_create ret (%x)\n", ret); - ret = service_add_extra_data(service, "account_noti", noti_name); - MYACCOUNT_VERBOSE("service_add_extra_data ret (%x)\n", ret); - error_code = ug_send_result(appdata->ug, service); - MYACCOUNT_VERBOSE("ug_send_result ret (%x)\n", error_code); - error_code = ug_destroy_me(appdata->ug); - MYACCOUNT_VERBOSE("myaccount_common_handle_notification callback : return = %d!!!\n", - error_code); - } - } - } else { - MYACCOUNT_WARNING("Unknown mode !!!"); - } -} - -bool myaccount_samsung_callback(char* result_code, char* user_id, void *user_data) -{ - MYACCOUNT_VERBOSE("Result Code = %s\n", result_code); - MYACCOUNT_VERBOSE("User Id = %s\n", user_id); - - if(user_data) { - int* test = (int*)user_data; - - MYACCOUNT_VERBOSE("TEST user data int = %d\n", *test); - MA_MEMFREE(test); - } - - return TRUE; -} - -static void _myaccount_common_popup_cb(void *data, Evas_Object *obj, void *event_info) -{ - MYACCOUNT_VERBOSE("delete popup\n"); - - if(obj) - evas_object_del(obj); -} - -Evas_Object* _myaccount_common_add_popup(Evas_Object* parent, const char* text, const char* title) -{ - Evas_Object *popup = elm_popup_add(parent); - - evas_object_size_hint_weight_set(popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - - elm_object_text_set(popup, text); - elm_object_part_text_set(popup, "title,text", title); - evas_object_smart_callback_add(popup, "block,clicked", _myaccount_common_popup_cb, NULL); - elm_popup_timeout_set(popup, 3); - evas_object_smart_callback_add(popup, "timeout", _myaccount_common_popup_cb, NULL); - evas_object_show(popup); - return popup; -} - -int myaccount_common_launch_application(MyAccountRequestViewType - request_type, - char *package_name, - char *username, - char *email_sp, - int account_id, - MyAccountProviderType sp_type, - void *data ) -{ - int ret = SERVICE_ERROR_NONE; - service_h service; - myaccount_appdata *ad = (myaccount_appdata *) data; - char win_id_buf[64]={0,}; - char id_buf[64] = {0,}; - - if (!ad || !package_name) { - MYACCOUNT_ERROR("myaccount_common_launch_application: App data=%p, package_name=%p\n", - ad, package_name); - return 0; - } - - MYACCOUNT_DBUG("trying to launch (%s)\n", package_name); - - ad->win_id = elm_win_xwindow_get(ad->win_main); - MA_SNPRINTF(win_id_buf, sizeof(win_id_buf)-1, "%d", ad->win_id); - - ret = service_create(&service); - ret = service_set_app_id(service, package_name); - ret = service_set_window(service, ad->win_id); - if(ad->caller_userdata) { - MYACCOUNT_DBUG("myaccount_common_launch_application: caller userdata exist!\n"); - ret = service_add_extra_data(service, "myaccount_userdata", ad->caller_userdata); - } - - switch (request_type) { - case MYACCOUNT_REQUEST_SIGNIN : - service_set_operation(service, ACCOUNT_OPERATION_SIGNIN); - if(email_sp && strlen(email_sp) > 0) { - MYACCOUNT_DBUG("Tizen email_sp (%s)\n", email_sp); - service_add_extra_data(service, ACCOUNT_DATA_SERVICE_PROVIDER, email_sp); - } - break; - case MYACCOUNT_REQUEST_VIEW : - if(!username) { - MYACCOUNT_ERROR("myaccount_common_launch_application: username=%p !!!\n", - username); - MA_MEMFREE(package_name); - service_destroy(service); - return 0; - } - - MA_SNPRINTF(id_buf, sizeof(id_buf), "%d", account_id); - ret = service_add_extra_data(service, ACCOUNT_DATA_ID, id_buf); - ret = service_set_operation(service, ACCOUNT_OPERATION_VIEW); - MYACCOUNT_DBUG("###### USERNAME = %s\n", username); - ret = service_add_extra_data(service, ACCOUNT_DATA_USERNAME,username); - break; - default : - MYACCOUNT_DBUG("myaccount_common_launch_application: Invalid request type=%d\n", - request_type); - MA_MEMFREE(username); - MA_MEMFREE(package_name); - service_destroy(service); - return 0; - } - MYACCOUNT_VERBOSE("myaccount_common_launch_application request type=%d, package name = %s\n", - request_type, package_name); - - ret = service_add_extra_data(service, "XWINDOW_ID", win_id_buf); - ret = service_send_launch_request(service, NULL, NULL); - - MA_MEMFREE(username); - MA_MEMFREE(package_name); - service_destroy(service); - - if(ret != SERVICE_ERROR_NONE) { - MYACCOUNT_ERROR("(%s) launch fail. ret(%x)\n", package_name, ret); - char buf[64]={0,}; - MA_SNPRINTF(buf, sizeof(buf), "Launch fail (%x)", ret); - _myaccount_common_add_popup(ad->win_main, buf, "Error"); - ad->item_selected_state = FALSE; - } - - return ret; -} - - -Evas_Object *myaccount_common_progress_add(Evas_Object *parent) -{ - if (!parent) { - MYACCOUNT_ERROR("myaccount_common_progress_add: parent is NULL \n"); - return NULL; - } - Evas_Object *progressbar = NULL; - progressbar = elm_progressbar_add(parent); - elm_object_style_set(progressbar, "list_process"); - evas_object_size_hint_align_set(progressbar, EVAS_HINT_FILL, 0.5); - evas_object_size_hint_weight_set(progressbar, - EVAS_HINT_EXPAND, - EVAS_HINT_EXPAND); - evas_object_show(progressbar); - elm_progressbar_pulse(progressbar, EINA_TRUE); - return progressbar; -} - -Evas_Object *myaccount_common_create_modal_popup(Evas_Object *parent) -{ - if (!parent) { - MYACCOUNT_ERROR("myaccount_common_create_modal_popup: parent is NULL \n"); - return NULL; - } - Evas_Object *popup = NULL; - Evas_Object *progressbar = NULL; - popup = elm_popup_add(parent); - progressbar = myaccount_common_progress_add(popup); - elm_object_content_set(popup, progressbar); - evas_object_show(popup); - return popup; -} - -void myaccount_common_delete_modal_popup(Evas_Object *popup) -{ - if (!popup){ - MYACCOUNT_ERROR("myaccount_common_delete_modal_popup: popup is NULL \n"); - return; - } - evas_object_del(popup); -} - -Eina_Bool myaccount_common_modal_popup_timer_cb(gpointer data) -{ - if (!data) { - MYACCOUNT_ERROR("myaccount_common_modal_popup_timer_cb: data is NULL \n"); - return false; - } - myaccount_appdata *global_data = NULL; - global_data = (myaccount_appdata*)data; - if (global_data->modal_popup) { - myaccount_common_delete_modal_popup(global_data->modal_popup); - global_data->modal_popup = NULL; - } - if (global_data->progress_timer) { - ecore_timer_del(global_data->progress_timer); - global_data->progress_timer = NULL; - } - return false; -} - -int myaccount_common_get_all_account_cnt(int *count) -{ - int error_code = -1; - int account_cnt = 0; - if (!count) { - MYACCOUNT_ERROR("myaccount_common_get_all_account_cnt: count ptr is NULL \n"); - return error_code; - } - error_code = account_connect(); - if (error_code != ACCOUNT_ERROR_NONE) { - MYACCOUNT_ERROR("myaccount_common_get_all_account_cnt: fail to connect account DB \n"); - return error_code; - } - error_code = account_get_total_count_from_db(&account_cnt); - if (error_code != ACCOUNT_ERROR_NONE) { - int ret = ACCOUNT_ERROR_NONE; - MYACCOUNT_VERBOSE("myaccount_common_get_all_account_cnt: account_svc_get_count fail(%d) \n", - error_code); - ret = account_disconnect(); - if (ret != ACCOUNT_ERROR_NONE) { - MYACCOUNT_ERROR("myaccount_common_get_all_account_cnt: account_svc_disconnect fail(%d) \n", - ret); - } - return error_code; - } - *count = account_cnt; - error_code = account_disconnect(); - if (error_code != ACCOUNT_ERROR_NONE) { - MYACCOUNT_ERROR("myaccount_common_get_all_account_cnt: account_svc_get_count fail(%d) \n", - error_code); - return error_code; - } - return ACCOUNT_ERROR_NONE; -} - -static int _myaccount_common_pkmgr_return_cb(int req_id, const char *pkg_type, - const char *pkg_name, - const char *key, - const char *val, - const void *pmsg, - void *data) -{ - MYACCOUNT_VERBOSE(" _myaccount_common_pkmgr_return_cb: pkg_type = %s, pkg_name = %s, key = %s, val = %s\n", pkg_type, pkg_name,key,val); - - int error_code = -1; - int count = -1; - if( strcmp(key, "end") == 0 && strcmp(val, "ok") == 0) { - myaccount_appdata *appdata = (myaccount_appdata*)myaccount_get_appdata(); - - if (!appdata) { - MYACCOUNT_FATAL("App data NULL!!! \n"); - return -1; - } - error_code = myaccount_common_get_all_account_cnt(&count); - if (error_code != ACCOUNT_ERROR_NONE) { - MYACCOUNT_ERROR("_myaccount_common_pkmgr_return_cb: myaccount_common_get_all_account_cnt fail(%d) \n", - error_code); - } - - MYACCOUNT_VERBOSE("_myaccount_common_pkmgr_return_cb account count =%d\n", - count); - if (appdata->eMode == eMYACCOUNT_ACCOUNT_LIST) { - if (count > 0) { - if (appdata->add_genlist) { - evas_object_del(appdata->add_genlist); - appdata->add_genlist = NULL; - elm_naviframe_item_pop(appdata->navi_bar); - } - if (appdata->account_genlist) { - myaccount_list_refresh_item_list(appdata); - } else { - myaccount_ug_account_list_create((void*)appdata); - } - } else { - if (appdata->add_genlist) { - evas_object_show(appdata->add_genlist); - } else { - myaccount_addaccount_create_view(appdata); - } - } - } else if (appdata->eMode == eMYACCOUNT_ADD_ACCOUNT) { - if (appdata->ug) { - error_code = ug_destroy_me(appdata->ug); - MYACCOUNT_VERBOSE("myaccount_common_handle_notification callback : return = %d!!!\n", - error_code); - } - } else { - MYACCOUNT_WARNING("Unknown mode !!!"); - } - return 0; - } - return 0; -} - -void myaccount_common_listen_pkgmgr_for_pkg_uninstall() -{ - myaccount_appdata *appdata = (myaccount_appdata*)myaccount_get_appdata(); - - if (!appdata) { - MYACCOUNT_FATAL("App data NULL!!! \n"); - return; - } - - int result = 0; - pkgmgr_client *pc = NULL; - pc = pkgmgr_client_new(PC_LISTENING); - if(pc == NULL) { - MYACCOUNT_ERROR("pc is NULL\n"); - return; - } - appdata->pc = pc; - result = pkgmgr_client_listen_status(pc, _myaccount_common_pkmgr_return_cb, pc); - if(result < 0) - { - MYACCOUNT_ERROR("status listen failed!\n"); - return; - } -} +/* + * my-account + * + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Wonyoung Lee , Tarun Kumar + * + * 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. + * + */ + +#include "myaccount_ug.h" +#include "myaccount_ug_common.h" +#include "myaccount_ug_addaccount.h" +#include "myaccount_ug_account_list.h" +#include + +static myaccount_appdata *g_myaccount_appdata = NULL; + +#define MYACCOUNT_MAX_EMAIL_COUNT 10 +#define MYACCOUNT_LAUNCH_TIME_OUT 0.7 +#define MYACCOUNT_RELAUNCH_INTERVAL 0.3 +#define MYACCOUNT_MAX_TOUCH_BLOCK_INTERVAL 2.5 + + +void *myaccount_init_appdata() +{ + if (g_myaccount_appdata == NULL) { + g_myaccount_appdata = calloc(1, sizeof(myaccount_appdata)); + g_myaccount_appdata->item_selected_state = false; + } + return g_myaccount_appdata; +} + +void myaccount_destroy_appdata() +{ + if (g_myaccount_appdata == NULL) { + MYACCOUNT_ERROR("myaccount_destroy_appdata: appdata NULL \n"); + return; + } + + if (g_myaccount_appdata->base) { + evas_object_del(g_myaccount_appdata->base); + g_myaccount_appdata->base = NULL; + } + + MA_MEMFREE(g_myaccount_appdata->capability_filter) + + /* For accounts list */ + if (g_myaccount_appdata->ug_called) { + ug_destroy(g_myaccount_appdata->ug_called); + g_myaccount_appdata->ug_called = NULL; + } + if (g_myaccount_appdata->layout_main) { + evas_object_del(g_myaccount_appdata->layout_main); + g_myaccount_appdata->layout_main = NULL; + } + if (g_myaccount_appdata->layout_addaccount) { + evas_object_del(g_myaccount_appdata->layout_addaccount); + g_myaccount_appdata->layout_addaccount = NULL; + } + if (g_myaccount_appdata->navi_bar) { + evas_object_del(g_myaccount_appdata->navi_bar); + g_myaccount_appdata->navi_bar = NULL; + } + if (g_myaccount_appdata->help_label) { + evas_object_del(g_myaccount_appdata->help_label); + g_myaccount_appdata->help_label = NULL; + } + if (g_myaccount_appdata->refresh_btn) { + evas_object_del(g_myaccount_appdata->refresh_btn); + g_myaccount_appdata->refresh_btn = NULL; + } + if (g_myaccount_appdata->refresh_icon) { + evas_object_del(g_myaccount_appdata->refresh_icon); + g_myaccount_appdata->refresh_icon = NULL; + } + if (g_myaccount_appdata->cancel_sync_icon) { + evas_object_del(g_myaccount_appdata->cancel_sync_icon); + g_myaccount_appdata->cancel_sync_icon = NULL; + } + if (g_myaccount_appdata->auto_sync_check) { + evas_object_del(g_myaccount_appdata->auto_sync_check); + g_myaccount_appdata->auto_sync_check = NULL; + } + if (g_myaccount_appdata->bg) { + evas_object_del(g_myaccount_appdata->bg); + g_myaccount_appdata->bg = NULL; + } + if (g_myaccount_appdata->ly) { + elm_object_part_content_unset(g_myaccount_appdata->ly, "elm.swallow.content"); + evas_object_del(g_myaccount_appdata->ly); + g_myaccount_appdata->ly = NULL; + } + if (g_myaccount_appdata->modal_popup) { + evas_object_del(g_myaccount_appdata->modal_popup); + g_myaccount_appdata->modal_popup = NULL; + } + if (g_myaccount_appdata->r_title_sk) { + evas_object_del(g_myaccount_appdata->r_title_sk); + g_myaccount_appdata->r_title_sk = NULL; + } + + if (g_myaccount_appdata->progress_timer) { + ecore_timer_del(g_myaccount_appdata->progress_timer); + g_myaccount_appdata->progress_timer = NULL; + } + if (g_myaccount_appdata->relaunch_timer) { + ecore_timer_del(g_myaccount_appdata->relaunch_timer); + g_myaccount_appdata->relaunch_timer = NULL; + } + if (g_myaccount_appdata->pc) { + pkgmgr_client_free(g_myaccount_appdata->pc); + g_myaccount_appdata->pc = NULL; + } + + if(g_myaccount_appdata->theme) { + elm_theme_free(g_myaccount_appdata->theme); + g_myaccount_appdata->theme = NULL; + } + + if(g_myaccount_appdata->clickblock_timer){ + ecore_timer_del(g_myaccount_appdata->clickblock_timer); + g_myaccount_appdata->clickblock_timer = NULL; + } + + g_myaccount_appdata->sorted_sp_list= NULL; + g_myaccount_appdata->sorted_account_list= NULL; + + MA_MEMFREE(g_myaccount_appdata->caller_userdata); + MA_MEMFREE(g_myaccount_appdata->called_from); + MA_MEMFREE(g_myaccount_appdata); + +} + +void * myaccount_get_appdata() +{ + return g_myaccount_appdata; +} + +static Eina_Bool _myaccount_common_click_block_timer_cb(void *data) +{ + myaccount_appdata *ad = (myaccount_appdata *)data; + + if(!ad){ + return ECORE_CALLBACK_CANCEL; + } + + if(ad->clickblock_timer){ + ecore_timer_del(ad->clickblock_timer); + ad->clickblock_timer = NULL; + } + + MYACCOUNT_DBUG("_myaccount_common_click_block_timer_cb: ad->item_selected_state=%d\n", myaccount_common_get_item_selected_state()); + myaccount_common_set_item_selected_state(FALSE); + + return ECORE_CALLBACK_CANCEL; +} + + +void myaccount_common_set_item_selected_state(bool val) +{ + myaccount_appdata *appdata = (myaccount_appdata*)myaccount_get_appdata(); + + MYACCOUNT_DBUG("myaccount_common_set_item_selected_state[%s]", val ? "true":"false"); + if (!appdata) { + MYACCOUNT_ERROR("appdata is NULL"); + return; + } + + appdata->item_selected_state = val; + + if(appdata->clickblock_timer){ + ecore_timer_del(appdata->clickblock_timer); + appdata->clickblock_timer = NULL; + } + + if( val == true ) { + appdata->clickblock_timer = ecore_timer_add(MYACCOUNT_MAX_TOUCH_BLOCK_INTERVAL, _myaccount_common_click_block_timer_cb, appdata); + } +} + +bool myaccount_common_get_item_selected_state() +{ + myaccount_appdata *appdata = (myaccount_appdata*)myaccount_get_appdata(); + + return (appdata->item_selected_state); +} + +void myaccount_common_get_icon_by_name(char *domain_name, + char *icon_path) +{ + if (!domain_name) { + MYACCOUNT_ERROR("\n !!! domain_name is NULL \n"); + return; + } + char tmp_domain_name[64] = {0,}; + myaccount_common_lowercase(domain_name, tmp_domain_name); + + if (!icon_path) { + MYACCOUNT_ERROR("\n !!! icon_path is NULL \n"); + return; + } + + MA_SNPRINTF(icon_path, BUFSIZE, "%s", "A01_2_Icon_default.png"); +} + +MyAccountProviderType myaccount_common_get_provider_type( + char *package_name) +{ + MyAccountProviderType sp_type = MYACCOUNT_TYPE_UNKNOWN; + + if (!package_name) { + MYACCOUNT_ERROR("myaccount_common_get_provider_type : package name is NULL\n"); + return sp_type; + } + + if (!strcmp(package_name, "com.samsung.picasa")) + sp_type = MYACCOUNT_TYPE_PICASA; + else if (!strcmp(package_name, "com.samsung.youtube")) + sp_type = MYACCOUNT_TYPE_YOUTUBE; + else if (!strcmp(package_name, "email-setting-efl")) + sp_type = MYACCOUNT_TYPE_GOOGLE; + else if (!strcmp(package_name, "activesync-ui") || !strcmp(package_name, "activesync-efl")) + sp_type = MYACCOUNT_TYPE_EXCHANGE; +// else if (!strcmp(package_name, "com.samsung.facebook")) +// sp_type = MYACCOUNT_TYPE_FACEBOOK; + else if (!strcmp(package_name, SAMSUNG_ACCOUNT_APPID)) + sp_type = MYACCOUNT_TYPE_SAMSUNG; + else + sp_type = MYACCOUNT_TYPE_UNKNOWN; + + return sp_type; +} + +void myaccount_common_lowercase(char *src, char *dest) +{ + int i; + int src_len=0; + + if (!src || !dest) { + MYACCOUNT_ERROR("myaccount_common_lowercase src=%p, dest=%p\n", + src, dest); + return; + } + src_len = strlen(src); + for(i=0;icalled_from, appdata->eMode,event_type, appdata->capability_filter); + if(appdata->capability_filter && strlen(appdata->capability_filter)) { + if(!strcmp(appdata->capability_filter, "http://tizen.org/account/capability/tizen_email")){ + int cnt1 = 0; + int cnt2 = 0; + int cnt3 = 0; + error_code = myaccount_common_get_account_cnt_by_appid(TIZEN_EMAIL_APPID, &cnt1); + if (error_code != ACCOUNT_ERROR_NONE) { + MYACCOUNT_DBUG(": myaccount_common_get_account_cnt_by_appid(TIZEN_EMAIL_APPID) code(%d)cnt1(%d) \n", error_code, cnt1); + } + + error_code = myaccount_common_get_account_cnt_by_appid(EXCHANGE_UI_APPID, &cnt2); + if (error_code != ACCOUNT_ERROR_NONE) { + MYACCOUNT_DBUG(": myaccount_common_get_account_cnt_by_appid(EXCHANGE_UI_APPID) code(%d)cnt2(%d) \n", error_code, cnt2); + } + + error_code = myaccount_common_get_account_cnt_by_appid(GOOGLE_ACCOUNT_APPID, &cnt3); + if (error_code != ACCOUNT_ERROR_NONE) { + MYACCOUNT_DBUG(": myaccount_common_get_account_cnt_by_appid(GOOGLE_ACCOUNT_APPID) code(%d)cnt3(%d) \n", error_code, cnt3); + } + count = cnt1+cnt2+cnt3; + + } else { + error_code = myaccount_common_get_account_cnt_by_capability(appdata->capability_filter, &count); + if (error_code != ACCOUNT_ERROR_NONE) { + MYACCOUNT_DBUG(": myaccount_common_get_account_cnt_by_capability code(%d)count(%d) \n", error_code, count); + } + } + + + } else { + error_code = myaccount_common_get_all_account_cnt(&count); + if (error_code != ACCOUNT_ERROR_NONE) { + MYACCOUNT_ERROR("myaccount_common_handle_notification: myaccount_common_get_all_account_cnt code(%d) \n", + error_code); + } + } + MYACCOUNT_DBUG("count[%d],appdata->add_genlist[%p],appdata->account_genlist[%p]", count,appdata->add_genlist,appdata->account_genlist); + + if (appdata->eMode == eMYACCOUNT_ACCOUNT_LIST) { + if (count > 0) { + if (appdata->add_genlist) { + if( strcmp(event_type, ACCOUNT_NOTI_NAME_SYNC_UPDATE)){ // not sync update -> insert, update, delete + MYACCOUNT_DBUG("# recved noti-event(%s) -> elm_naviframe_item_pop / quit_cb should be called.", (event_type != NULL) ? event_type : "null"); + elm_naviframe_item_pop(appdata->navi_bar); + appdata->add_genlist = NULL; + MYACCOUNT_DBUG("elm_naviframe_item_pop func finished.\n"); + } else { + // if sync update received, do nothing. + MYACCOUNT_DBUG("recved noti-event(%s) -> do nothing.", (event_type != NULL) ? event_type : "null"); + } + } + + if (appdata->account_genlist) { + myaccount_list_refresh_item_list(appdata); + } else { + myaccount_ug_account_list_create((void*)appdata); + } + } else { + if (appdata->add_genlist) { + evas_object_show(appdata->add_genlist); + } else { + MYACCOUNT_DBUG("eMYACCOUNT_ACCOUNT_LIST mode, count=0, add_genlist=NULL, event_type must be delete."); + myaccount_addaccount_create_view(appdata); // event_type=delete, fix duplicate elm_naviframe_item_push happening. + } + } + } else if (appdata->eMode == eMYACCOUNT_ADD_ACCOUNT) { + MYACCOUNT_SLOGD("myaccount_common_handle_notification: ADD_ACCOUNT, event_type = %s\n", event_type); + if(event_type){ + if (appdata->ug && count > 0) { + if (!g_strcmp0(event_type, ACCOUNT_NOTI_NAME_INSERT) || !g_strcmp0(event_type, ACCOUNT_NOTI_NAME_SYNC_UPDATE)) { + app_control_h app_control = NULL; + app_control_create(&app_control); + app_control_add_extra_data(app_control, "account_noti", event_type); + error_code = ug_send_result(appdata->ug, app_control); + ui_gadget_h ug = appdata->ug; + error_code = ug_destroy_me(ug); + app_control_destroy(app_control); + } + } + } + } +} + +bool myaccount_samsung_callback(char* result_code, char* user_id, void *user_data) +{ + MYACCOUNT_SLOGD("Result Code = %s\n", result_code); + MYACCOUNT_SLOGD("User Id = %s\n", user_id); + + if(user_data) { + int* test = (int*)user_data; + + MA_MEMFREE(test); + } + + return TRUE; +} + +static void _myaccount_common_popup_cb(void *data, Evas_Object *obj, void *event_info) +{ + myaccount_appdata *ad = (myaccount_appdata *)data; + + if(ad->modal_popup) + evas_object_del(ad->modal_popup); + ad->modal_popup = NULL; +} + +Evas_Object* _myaccount_common_add_popup(Evas_Object* parent, const char* text, const char* title) +{ + myaccount_appdata *ad = (myaccount_appdata*)myaccount_get_appdata(); + + /* multi window >>> */ +#ifdef _MULTI_WINDOW_ENABLE_ + MYACCOUNT_DBUG("multi window enabled.\n"); + ad->modal_popup = ea_center_popup_add(parent); +#else + MYACCOUNT_DBUG("multi window not enabled.\n"); + ad->modal_popup = elm_popup_add(parent); +#endif + evas_object_size_hint_weight_set(ad->modal_popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + + elm_object_text_set(ad->modal_popup, text); + if(!title) + elm_object_part_text_set(ad->modal_popup, "title,text", title); + evas_object_smart_callback_add(ad->modal_popup, "block,clicked", _myaccount_common_popup_cb, (void*)ad); +// elm_popup_timeout_set(ad->modal_popup, 3); +// evas_object_smart_callback_add(ad->modal_popup, "timeout", _myaccount_common_popup_cb, NULL); + + Evas_Object *ok_btn = elm_button_add(ad->modal_popup); + elm_object_text_set(ok_btn, dgettext(MA_UG_NAME, "IDS_MA_BUTTON_OK")); + elm_object_part_content_set(ad->modal_popup, "button1", ok_btn); + evas_object_smart_callback_add(ok_btn, "clicked", _myaccount_common_popup_cb, (void*)ad); + elm_object_style_set(ok_btn, "popup_button/default"); + + evas_object_show(ad->modal_popup); + return ad->modal_popup; +} + +static bool _myaccount_common_synchronise_query_cb(account_h account, void *user_data) +{ + int ret = ACCOUNT_ERROR_NONE; + char** tmp_count = (char**)user_data; + + if(!account) { + MYACCOUNT_ERROR("account handle is NULL\n"); + return FALSE; + } + + ret = account_get_custom(account, "profile_count", tmp_count); + if(ret != ACCOUNT_ERROR_NONE) { + MYACCOUNT_ERROR("account_get_custom fail(%x)\n", ret); + return FALSE; + } + + return TRUE; +} + +static Eina_Bool _myaccount_common_relaunch_application_timer_cb(void *data) +{ + myaccount_appdata *ad = (myaccount_appdata *)data; + + if(!ad){ + return ECORE_CALLBACK_CANCEL; + } + + if(ad->relaunch_timer){ + ecore_timer_del(ad->relaunch_timer); + ad->relaunch_timer = NULL; + } + + app_control_send_launch_request(ad->appsvc_handle, NULL, NULL); + + MYACCOUNT_DBUG("ad->item_selected_state=%d\n", myaccount_common_get_item_selected_state()); + myaccount_common_set_item_selected_state(FALSE); + + app_control_destroy(ad->appsvc_handle); + ad->appsvc_handle = NULL; + + return ECORE_CALLBACK_CANCEL; +} + +static void _myaccount_common_try_relaunch(myaccount_appdata* ad, app_control_h app_control) +{ + if(ad->relaunch_timer){ + ecore_timer_del(ad->relaunch_timer); + ad->relaunch_timer = NULL; + } + + ad->appsvc_handle = app_control; + + ad->relaunch_timer = ecore_timer_add(MYACCOUNT_RELAUNCH_INTERVAL, _myaccount_common_relaunch_application_timer_cb, ad); +} + + +static int _myaccount_common_launch_samsung_account(myaccount_appdata *ad) +{ + int ret = -1; + app_control_h app_control = NULL; + + ret = app_control_create(&app_control); + + ret = app_control_set_app_id(app_control,SAMSUNG_ACCOUNT_APPID); + ret = app_control_set_operation(app_control,ACCOUNT_OPERATION_SIGNIN); + + Ecore_X_Window win_id = elm_win_xwindow_get(ad->win_main); + ret = app_control_set_window(app_control, win_id); + + ret = app_control_add_extra_data (app_control, "service_category", "from_myaccounts"); + ret = app_control_add_extra_data (app_control, "client_id", "gr47by21a5"); + ret = app_control_add_extra_data (app_control, "client_secret", "BD1F21218D46C1C082651EA0B8026721"); + ret = app_control_send_launch_request(app_control, NULL, NULL); + + if(ret != APP_CONTROL_ERROR_NONE) { + MYACCOUNT_SLOGE("(%s) launch fail. ret(%x)\n", SAMSUNG_ACCOUNT_APPID, ret); + _myaccount_common_try_relaunch(ad, app_control); + return 0; + } + + ret = app_control_destroy(app_control); + + + return ret; +} + +static int _myaccount_common_launch_tizen_account(myaccount_appdata *ad) +{ + int ret = -1; + app_control_h app_control = NULL; + + ret = app_control_create(&app_control); + + ret = app_control_set_app_id(app_control,TIZEN_ACCOUNT_APPID); + ret = app_control_set_operation(app_control,ACCOUNT_OPERATION_SIGNIN); + + Ecore_X_Window win_id = elm_win_xwindow_get(ad->win_main); + ret = app_control_set_window(app_control, win_id); + + ret = app_control_add_extra_data (app_control, "client_id", "j5p7llxxxx"); + ret = app_control_add_extra_data (app_control, "client_secret", "5113D0052DC14XXXXX751F753384E9XX"); + ret = app_control_add_extra_data (app_control, "service_category", "from_myaccounts"); + ret = app_control_send_launch_request(app_control, NULL, NULL); + + if(ret != APP_CONTROL_ERROR_NONE) { + MYACCOUNT_SLOGE("(%s) launch fail. ret(%x)\n", TIZEN_ACCOUNT_APPID, ret); + _myaccount_common_try_relaunch(ad, app_control); + return 0; + } + + ret = app_control_destroy(app_control); + + return ret; +} + +static Eina_Bool _myaccount_common_launch_application_timer_cb(void *data) +{ + myaccount_appdata *ad = (myaccount_appdata *)data; + + if(!ad){ + return ECORE_CALLBACK_CANCEL; + } + + if(ad->progress_timer){ + ecore_timer_del(ad->progress_timer); + ad->progress_timer = NULL; + } + + MYACCOUNT_DBUG("ad->item_selected_state=%d\n", myaccount_common_get_item_selected_state()); + + return ECORE_CALLBACK_CANCEL; +} + +static void _myaccount_common_launch_timer_start(myaccount_appdata *ad) +{ + if(ad->progress_timer){ + ecore_timer_del(ad->progress_timer); + ad->progress_timer = NULL; + } + + ad->progress_timer = ecore_timer_add(MYACCOUNT_LAUNCH_TIME_OUT, _myaccount_common_launch_application_timer_cb, ad); +} + +static bool _myaccount_common_is_email_count_max() +{ + int cnt1 = 0, cnt2 = 0, cnt3 = 0, count = 0; + + myaccount_common_get_account_cnt_by_appid("email-setting-efl", &cnt1); + myaccount_common_get_account_cnt_by_appid("com.samsung.google-service-account", &cnt2); + myaccount_common_get_account_cnt_by_appid("activesync-ui", &cnt3); + count = cnt1 + cnt2 + cnt3; + + MYACCOUNT_DBUG("count(%d)cnt1(%d)cnt2(%d)cnt3(%d)", count, cnt1, cnt2, cnt3); + if(count >= MYACCOUNT_MAX_EMAIL_COUNT){ + return TRUE; + } + return FALSE; +} + +int myaccount_common_launch_application(MyAccountRequestViewType + request_type, + char *package_name, + char *username, + char *email_sp, + int account_id, + MyAccountProviderType sp_type, + void *data ) +{ + int ret = APP_CONTROL_ERROR_NONE; + app_control_h app_control = NULL; + myaccount_appdata *ad = (myaccount_appdata *) data; + char win_id_buf[64]={0,}; + char id_buf[64] = {0,}; + + if (!ad || !package_name) { + MYACCOUNT_SLOGE("myaccount_common_launch_application: App data=%p, package_name=%p\n", + ad, package_name); + return 0; + } + + MYACCOUNT_SLOGD("trying to launch (%s)\n", package_name); + + ad->win_id = elm_win_xwindow_get(ad->win_main); + MA_SNPRINTF(win_id_buf, sizeof(win_id_buf)-1, "%d", ad->win_id); + + if(!strcmp(package_name,SAMSUNG_ACCOUNT_APPID)){ + + _myaccount_common_launch_samsung_account(ad); + _myaccount_common_launch_timer_start(ad); + + MA_MEMFREE(package_name); + return ret; + } else { + ret = app_control_create(&app_control); + ret = app_control_set_window(app_control, ad->win_id); + ret = app_control_set_app_id(app_control, package_name); + if(ad->caller_userdata) { + ret = app_control_add_extra_data(app_control, "myaccount_userdata", ad->caller_userdata); + } + } + + if (ret != APP_CONTROL_ERROR_NONE) + MYACCOUNT_ERROR("myaccount_common_launch_application: service_set_package failed\n"); + + switch (request_type) { + case MYACCOUNT_REQUEST_SIGNIN : + //Check MAX synchronise count + if(strcmp(package_name,"setting-synchronise-efl") == 0){ + int ret = -1, sync_cnt = 0; + char* synchronise_count = NULL; + ret = account_connect(); + if(ret != ACCOUNT_ERROR_NONE) { + MYACCOUNT_ERROR("Account connect fail (%x)\n", ret); + } + ret = account_query_account_by_package_name(_myaccount_common_synchronise_query_cb, "setting-synchronise-efl", (void*)&synchronise_count); + if(ret != ACCOUNT_ERROR_NONE) { + MYACCOUNT_ERROR("account_query_account_by_package_name fail (%x)\n", ret); + } + + if(synchronise_count) + sync_cnt = atoi(synchronise_count); + + if(sync_cnt >= 5) { + // draw popup and return + char buf[256]={0,}; + + MA_SNPRINTF(buf, sizeof(buf), "Synchronise profile is full"); + _myaccount_common_add_popup(ad->layout_main, buf, "Error"); + myaccount_common_set_item_selected_state(FALSE); + MA_MEMFREE(synchronise_count); + if(app_control) + app_control_destroy(app_control); + return -1; + } + }else if(!strcmp(package_name,TIZEN_ACCOUNT_APPID)){ + + _myaccount_common_launch_tizen_account(ad); + if(app_control) + app_control_destroy(app_control); + _myaccount_common_launch_timer_start(ad); + + MA_MEMFREE(package_name); + return ret; + } else if(strcmp(package_name,"email-setting-efl") == 0 || + strcmp(package_name,"com.samsung.google-service-account") == 0 || + strcmp(package_name,"activesync-ui") == 0){ + char buf[256]={0,}; + + MYACCOUNT_DBUG("package_name[%s] check max count\n"); + if( _myaccount_common_is_email_count_max(ad) == TRUE ){ + MA_SNPRINTF(buf, sizeof(buf), dgettext(MA_UG_NAME, "IDS_EMAIL_BODY_MAXIMUM_NUMBER_OF_EMAIL_ACCOUNTS_REACHED")); + _myaccount_common_add_popup(ad->layout_main, buf, NULL); + myaccount_common_set_item_selected_state(FALSE); + if(app_control) + app_control_destroy(app_control); + return -1; + } + +#ifdef _MULTI_WINDOW_ENABLE_ + unsigned int layout = 0; + if( ecore_x_window_prop_card32_get( elm_win_xwindow_get( (Evas_Object*)ad->win_main ), + ECORE_X_ATOM_E_WINDOW_DESKTOP_LAYOUT, &layout, 1 ) != -1 ) + { + if( layout == 0 || layout == 1) + { + app_control_add_extra_data( app_control, "window_startup_type", "2"); + char temp[10] = {0,}; + snprintf( temp, sizeof(temp), "%d", (int)layout ); + app_control_add_extra_data( app_control, "window_layout_id", temp); + } + } + MYACCOUNT_SLOGD("### MULTI WINDOW: call with multi win params"); +#endif + + + } + + app_control_set_operation(app_control, ACCOUNT_OPERATION_SIGNIN); + if(email_sp && strlen(email_sp) > 0) { + app_control_add_extra_data(app_control, "http://tizen.org/account/data/service_provider", email_sp); + } + + if(sp_type == MYACCOUNT_TYPE_CSC) { + app_control_add_extra_data(app_control, "http://tizen.org/account/data/csc", email_sp); + } + + break; + case MYACCOUNT_REQUEST_VIEW : + if(!username) { + MYACCOUNT_ERROR("myaccount_common_launch_application: username=%p !!!\n", + username); + MA_MEMFREE(package_name); + if(app_control) + app_control_destroy(app_control); + return 0; + } + + MA_SNPRINTF(id_buf, sizeof(id_buf), "%d", account_id); + ret = app_control_add_extra_data(app_control, ACCOUNT_DATA_ID, id_buf); + ret = app_control_set_operation(app_control, ACCOUNT_OPERATION_VIEW); + ret = app_control_add_extra_data(app_control, ACCOUNT_DATA_USERNAME,username); + break; + default : + MA_MEMFREE(username); + MA_MEMFREE(package_name); + app_control_destroy(app_control); + return 0; + } + MYACCOUNT_SLOGD("myaccount_common_launch_application request type=%d, package name = %s\n", + request_type, package_name); + + ret = app_control_add_extra_data(app_control, "XWINDOW_ID", win_id_buf); + ret = app_control_send_launch_request(app_control, NULL, NULL); + + MA_MEMFREE(username); + MA_MEMFREE(package_name); + + if(ret != APP_CONTROL_ERROR_NONE) { + MYACCOUNT_SLOGE("(%s) launch fail. ret(%x)\n", package_name, ret); +// char buf[64]={0,}; +// MA_SNPRINTF(buf, sizeof(buf), "Launch fail (%x)", ret); +// _myaccount_common_add_popup(ad->win_main, buf, "Error"); +// ad->item_selected_state = FALSE; + _myaccount_common_try_relaunch(ad, app_control); + return 0; + } + + app_control_destroy(app_control); + _myaccount_common_launch_timer_start(ad); + + return ret; +} + + +Evas_Object *myaccount_common_progress_add(Evas_Object *parent) +{ + if (!parent) { + MYACCOUNT_ERROR("myaccount_common_progress_add: parent is NULL \n"); + return NULL; + } + Evas_Object *progressbar = NULL; + progressbar = elm_progressbar_add(parent); + elm_object_style_set(progressbar, "list_process"); + evas_object_size_hint_align_set(progressbar, EVAS_HINT_FILL, 0.5); + evas_object_size_hint_weight_set(progressbar, + EVAS_HINT_EXPAND, + EVAS_HINT_EXPAND); + evas_object_show(progressbar); + elm_progressbar_pulse(progressbar, EINA_TRUE); + return progressbar; +} + +void myaccount_common_delete_modal_popup(Evas_Object *popup) +{ + if (!popup){ + MYACCOUNT_ERROR("myaccount_common_delete_modal_popup: popup is NULL \n"); + return; + } + evas_object_del(popup); +} + +Eina_Bool myaccount_common_modal_popup_timer_cb(gpointer data) +{ + if (!data) { + MYACCOUNT_ERROR("myaccount_common_modal_popup_timer_cb: data is NULL \n"); + return false; + } + myaccount_appdata *global_data = NULL; + global_data = (myaccount_appdata*)data; + if (global_data->modal_popup) { + myaccount_common_delete_modal_popup(global_data->modal_popup); + global_data->modal_popup = NULL; + } + if (global_data->progress_timer) { + ecore_timer_del(global_data->progress_timer); + global_data->progress_timer = NULL; + } + return false; +} + +int myaccount_common_get_all_account_cnt(int *count) +{ + int error_code = -1; + int account_cnt = 0; + if (!count) { + MYACCOUNT_ERROR("myaccount_common_get_all_account_cnt: count ptr is NULL \n"); + return error_code; + } + error_code = account_connect(); + if (error_code != ACCOUNT_ERROR_NONE) { + MYACCOUNT_ERROR("myaccount_common_get_all_account_cnt: fail to connect account DB \n"); + return error_code; + } + error_code = account_get_total_count_from_db(&account_cnt); + if (error_code != ACCOUNT_ERROR_NONE) { + int ret = ACCOUNT_ERROR_NONE; + ret = account_disconnect(); + if (ret != ACCOUNT_ERROR_NONE) { + MYACCOUNT_ERROR("myaccount_common_get_all_account_cnt: account_svc_disconnect fail(%d) \n", + ret); + } + return error_code; + } + *count = account_cnt; + error_code = account_disconnect(); + if (error_code != ACCOUNT_ERROR_NONE) { + MYACCOUNT_ERROR("myaccount_common_get_all_account_cnt: account_svc_get_count fail(%d) \n", + error_code); + return error_code; + } + return ACCOUNT_ERROR_NONE; +} + +static bool _myaccount_common_query_cb(account_h account, void *user_data) +{ + int* tmp_count = (int*)user_data; + + *tmp_count = *tmp_count + 1; + + return TRUE; +} + +int myaccount_common_get_account_cnt_by_capability(const char* capability_type, int *count) +{ + int error_code = -1; + int account_cnt = 0; + if (!count) { + MYACCOUNT_ERROR("myaccount_common_get_account_cnt_by_capability: count ptr is NULL \n"); + return error_code; + } + error_code = account_connect(); + if (error_code != ACCOUNT_ERROR_NONE) { + MYACCOUNT_ERROR("myaccount_common_get_account_cnt_by_capability: fail to connect account DB \n"); + return error_code; + } + + error_code = account_query_account_by_capability_type(_myaccount_common_query_cb, capability_type, &account_cnt); + if (error_code != ACCOUNT_ERROR_NONE) { + + *count = 0; + + int ret = ACCOUNT_ERROR_NONE; + ret = account_disconnect(); + if (ret != ACCOUNT_ERROR_NONE) { + MYACCOUNT_ERROR("myaccount_common_get_account_cnt_by_capability: account_svc_disconnect fail(%d) \n", + ret); + } + return error_code; + } + *count = account_cnt; + error_code = account_disconnect(); + if (error_code != ACCOUNT_ERROR_NONE) { + MYACCOUNT_ERROR("myaccount_common_get_all_account_cnt: account_svc_get_count fail(%d) \n", + error_code); + return error_code; + } + return ACCOUNT_ERROR_NONE; +} + +int myaccount_common_get_account_cnt_by_appid(const char* appid, int *count) +{ + int error_code = -1; + int account_cnt = 0; + if (!count) { + MYACCOUNT_ERROR("myaccount_common_get_account_cnt_by_appid: count ptr is NULL \n"); + return error_code; + } + error_code = account_connect(); + if (error_code != ACCOUNT_ERROR_NONE) { + MYACCOUNT_ERROR("myaccount_common_get_account_cnt_by_appid: fail to connect account DB \n"); + return error_code; + } + + error_code = account_query_account_by_package_name(_myaccount_common_query_cb, appid, &account_cnt); + + if (error_code != ACCOUNT_ERROR_NONE) { + + *count = 0; + + int ret = ACCOUNT_ERROR_NONE; + ret = account_disconnect(); + if (ret != ACCOUNT_ERROR_NONE) { + MYACCOUNT_ERROR("myaccount_common_get_account_cnt_by_appid: account_svc_disconnect fail(%d) \n", + ret); + } + return error_code; + } + *count = account_cnt; + error_code = account_disconnect(); + if (error_code != ACCOUNT_ERROR_NONE) { + MYACCOUNT_ERROR("myaccount_common_get_account_cnt_by_appid: account_svc_get_count fail(%d) \n", + error_code); + return error_code; + } + return ACCOUNT_ERROR_NONE; +} + +static int _myaccount_common_pkmgr_return_cb(int req_id, const char *pkg_type, + const char *pkg_name, + const char *key, + const char *val, + const void *pmsg, + void *data) +{ + MYACCOUNT_SLOGD(" _myaccount_common_pkmgr_return_cb: pkg_type = %s, pkg_name = %s, key = %s, val = %s\n", pkg_type, pkg_name,key,val); + + int error_code = -1; + int count = -1; + if( strcmp(key, "end") == 0 && strcmp(val, "ok") == 0) { + + myaccount_appdata *appdata = (myaccount_appdata*)myaccount_get_appdata(); + + if (!appdata) { + MYACCOUNT_ERROR("App data NULL!!! \n"); + return -1; + } + if(appdata->capability_filter && strlen(appdata->capability_filter)){ + if(!strcmp(appdata->capability_filter, "http://tizen.org/account/capability/tizen_email")){ + int cnt1 = 0; + int cnt2 = 0; + int cnt3 = 0; + error_code = myaccount_common_get_account_cnt_by_appid(TIZEN_EMAIL_APPID, &cnt1); + error_code = myaccount_common_get_account_cnt_by_appid(EXCHANGE_UI_APPID, &cnt2); + error_code = myaccount_common_get_account_cnt_by_appid(EXCHANGE_UI_APPID, &cnt3); + count = cnt1+cnt2+cnt3; + } else { + error_code = myaccount_common_get_account_cnt_by_capability(appdata->capability_filter, &count); + } + + if (error_code != ACCOUNT_ERROR_NONE) { + MYACCOUNT_ERROR("__myaccount_addaccount_quit_cb: myaccount_common_get_all_account_cnt fail(%d) \n", + error_code); + } + } else { + error_code = myaccount_common_get_all_account_cnt(&count); + if (error_code != ACCOUNT_ERROR_NONE) { + MYACCOUNT_ERROR("__myaccount_addaccount_quit_cb: myaccount_common_get_all_account_cnt fail(%d) \n", + error_code); + } + } + + if (appdata->eMode == eMYACCOUNT_ACCOUNT_LIST) { + if (count > 0) { + if (appdata->add_genlist) { + evas_object_del(appdata->add_genlist); + appdata->add_genlist = NULL; + elm_naviframe_item_pop(appdata->navi_bar); + } + if (appdata->account_genlist) { + myaccount_list_refresh_item_list(appdata); + } else { + myaccount_ug_account_list_create((void*)appdata); + } + } else { + if (appdata->add_genlist) { + evas_object_show(appdata->add_genlist); + } else { + myaccount_addaccount_create_view(appdata); + } + } + } else if (appdata->eMode == eMYACCOUNT_ADD_ACCOUNT) { + if (appdata->ug) { + ui_gadget_h ug = appdata->ug; + error_code = ug_destroy_me(ug); + } + } else { + //MYACCOUNT_WARNING("Unknown mode !!!"); + } + return 0; + } + return 0; +} + +void myaccount_common_listen_pkgmgr_for_pkg_uninstall() +{ + myaccount_appdata *appdata = (myaccount_appdata*)myaccount_get_appdata(); + + if (!appdata) { + MYACCOUNT_ERROR("App data NULL!!! \n"); + return; + } + + int result = 0; + pkgmgr_client *pc = NULL; + pc = pkgmgr_client_new(PC_LISTENING); + if(pc == NULL) { + MYACCOUNT_ERROR("pc is NULL\n"); + return; + } + appdata->pc = pc; + result = pkgmgr_client_listen_status(pc, _myaccount_common_pkmgr_return_cb, pc); + if(result < 0) + { + MYACCOUNT_ERROR("status listen failed!\n"); + return; + } +} + + +int myaccount_common_get_csc_sp_count(const char* capability_filter) +{ + dictionary* dic = NULL; + int sp_count = -1; + + if(capability_filter) { + // tizen email, email, none case, read csc email provider + // otherwise ignore csc list + if(strcmp(capability_filter, "http://tizen.org/account/capability/tizen_email") + && strcmp(capability_filter, "http://tizen.org/account/capability/email")) + return 0; + } + + // check ini file /opt/system/csc-default/data/csc-default-data-email-account.ini + dic = iniparser_load(TIZEN_EMAIL_CSC_FILE_PATH); + if(!dic){ + MYACCOUNT_ERROR("email csc file is not exist\n"); + return FALSE; + } + + sp_count = iniparser_getint(dic, TIZEN_EMAIL_CSC_SP_COUNT_KEY, 0); + + if(sp_count <= 0) { + iniparser_freedict(dic); + MYACCOUNT_ERROR("email sp count 0\n"); + return 0; + } + + iniparser_freedict(dic); + + return sp_count; +} + +bool myaccount_common_account_by_package_name_cb(account_h account, + void *user_data) +{ + return false; +} + + +static bool _myaccount_common_get_account_type_count_cb(account_type_h account_type, void *user_data) +{ + int *count = (int*)user_data; + char* type_buf = NULL; + int type_int = -1; + + if(account_type == NULL) { + MYACCOUNT_ERROR(" account type handle is NULL \n"); + return FALSE; + } + + account_type_get_app_id(account_type, &type_buf); + + if(!type_buf) return FALSE; + + if(!strcmp(type_buf, "email-setting-efl")) { + *count = *count+3; // predefined email count + MA_MEMFREE(type_buf); + return TRUE; + }else if(!strcmp(type_buf, "activesync-ui")) { + *count = *count+1; + MA_MEMFREE(type_buf); + return TRUE; + } else if(!strcmp(type_buf, "com.samsung.rcs-im") + || !strcmp(type_buf, "ims-service")) { + MA_MEMFREE(type_buf); + return TRUE; + } + + account_type_get_multiple_account_support(account_type, &type_int); + + if(type_int == FALSE + && account_query_account_by_package_name(myaccount_common_account_by_package_name_cb, type_buf, NULL) == ACCOUNT_ERROR_NONE) { + MYACCOUNT_SLOGD("Multiple account not support (%s)\n", type_buf); + MA_MEMFREE(type_buf); + return TRUE; + } + + *count = *count+1; + + MA_MEMFREE(type_buf); + + return TRUE; +} + + +int myaccount_common_get_account_type_count(const char* capability_filter) +{ + int ret = -1; + int count = 0; + + ret = account_connect(); + if(ret != ACCOUNT_ERROR_NONE){ + MYACCOUNT_ERROR("account database cannot be connected\n"); + return 0; + } + + if(capability_filter) { + if(!strcmp(capability_filter, "http://tizen.org/account/capability/tizen_email")){ + account_type_query_by_provider_feature(_myaccount_common_get_account_type_count_cb, "http://tizen.org/account/capability/email", (void*)&count); + }else { + account_type_query_by_provider_feature(_myaccount_common_get_account_type_count_cb, capability_filter, (void*)&count); + } + } + else { + account_type_foreach_account_type_from_db(_myaccount_common_get_account_type_count_cb, (void*)&count); + } + + MYACCOUNT_DBUG("count %d\n", count); + + ret = account_disconnect(); + if(ret != ACCOUNT_ERROR_NONE){ + MYACCOUNT_ERROR("account database cannot be connected\n"); + return 0; + } + + return count; +} + diff --git a/src/myaccount_ug_main.c b/src/myaccount_ug_main.c index 079c903..0994543 100755 --- a/src/myaccount_ug_main.c +++ b/src/myaccount_ug_main.c @@ -1,350 +1,559 @@ -/* - * Copyright 2012 Samsung Electronics Co., Ltd - * - * Licensed under the Flora License, Version 1.1 (the License); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://floralicense.org/license/ - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an AS IS BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "myaccount_ug_account_list.h" -#include "myaccount_ug_addaccount.h" -#include "myaccount_ug_common.h" -#include -#include - -#ifndef UG_MODULE_API -#define UG_MODULE_API __attribute__ ((visibility("default"))) -#endif - -static int g_handle_noti = 0; - -int myaccount_subscribe_to_account_notification_vconfkey(); - -static gboolean __myaccount_account_list_parse_param(myaccount_mode_e - *mode, - service_h data, - myaccount_appdata *ad) -{ - if (!data || !ad) { - MYACCOUNT_DBUG("Service/App data is null!\n"); - return FALSE; - } else { - char *extracted = NULL; - ad->capability_filter = NULL; - service_get_extra_data(data, "mode", &extracted); - service_get_extra_data(data, "capability_filter", &ad->capability_filter); - service_get_extra_data(data, "myaccount_userdata", &ad->caller_userdata); - service_get_extra_data(data, "from", &ad->called_from); - - if (ad->capability_filter) - MYACCOUNT_DBUG("capability_filter = %s\n", ad->capability_filter); - - if (extracted) { - MYACCOUNT_DBUG("view_account_list = %s\n", extracted); - - if (!strcmp(extracted, "account_list")) - *mode = eMYACCOUNT_ACCOUNT_LIST; - else if (!strcmp(extracted, "add_account")) - *mode = eMYACCOUNT_ADD_ACCOUNT; - else - *mode = eMYACCOUNT_ACCOUNT_LIST; - } else { - *mode = eMYACCOUNT_ACCOUNT_LIST; - MYACCOUNT_DBUG("param is not view_account_list!\n"); - } - - MA_MEMFREE(extracted); - } - return TRUE; -} - -void *myaccount_account_list_create(ui_gadget_h ug, - enum ug_mode mode, - service_h data, void *priv) -{ - MYACCOUNT_DBUG("\n myaccount_account_list_create called !!\n"); - Evas_Object *parent; - myaccount_appdata *ugd; - int count = -1; - int error_code = -1; - - if (!ug || !priv) { - MYACCOUNT_DBUG("myaccount_account_list_create: ug or priv is NULL \n"); - return NULL; - } - - bindtextdomain("ug-setting-myaccount-efl", "/usr/ug/res/locale"); - ugd = (myaccount_appdata*)priv; - ugd->ug = ug; - MYACCOUNT_DBUG("ugd->ug = %p\n", ugd->ug); - ugd->eMode = 0; - parent = ug_get_parent_layout(ug); - if (!parent) { - MYACCOUNT_DBUG("myaccount_account_list_create: parent is NULL \n"); - return NULL; - } - ugd->win_main = parent; - /*sbscribe to vconf noti key which will recevie notification about account update, delete and insert*/ -#ifdef ENABLE_NOTI - myaccount_subscribe_to_account_notification_vconfkey(); -#endif - /*listen to pkgmgr for uninstall of pkg*/ - myaccount_common_listen_pkgmgr_for_pkg_uninstall(); - - __myaccount_account_list_parse_param(&ugd->eMode, data, ugd); - error_code = myaccount_common_get_all_account_cnt(&count); - if (error_code != ACCOUNT_ERROR_NONE) { - MYACCOUNT_DBUG("myaccount_account_list_create: myaccount_common_get_all_account_cnt fail(%d) \n", - error_code); - } - - MYACCOUNT_DBUG("\nmyaccount_account_list_create Account count = %d \n", count); - if (ugd->eMode == eMYACCOUNT_ACCOUNT_LIST) { - MYACCOUNT_DBUG("\n eMode is eMYACCOUNT_ACCOUNT_LIST \n"); - if (count > 0) { - myaccount_list_view_create(ugd); - myaccount_ug_account_list_create((void*)priv); - } else if (count == 0) { - myaccount_list_view_create(ugd); - myaccount_addaccount_create_view(ugd); - } else { - MYACCOUNT_DBUG("myaccount_account_list_create : invalid mode %d\n", - ugd->eMode); - myaccount_list_view_create(ugd); - } - } else if (ugd->eMode == eMYACCOUNT_ADD_ACCOUNT) { - MYACCOUNT_DBUG("\n !! eMode is eMYACCOUNT_ADD_ACCOUNT !! \n"); - myaccount_list_view_create(ugd); - myaccount_addaccount_create_view(ugd); - } else { - MYACCOUNT_DBUG("myaccount_account_list_create : invalid mode %d\n", - ugd->eMode); - } - - return ugd->base; - } - -bool myaccount_subscribe_callback(const char* event_type, int account_id, void* user_data) -{ - MYACCOUNT_DBUG("event_type (%s)\n", event_type); - MYACCOUNT_DBUG("account id (%d)\n", account_id); - - myaccount_common_handle_notification(event_type); - - return TRUE; -} - -int myaccount_subscribe_to_account_notification_vconfkey() -{ - MYACCOUNT_DBUG("myaccount_subscribe_to_account_notification_vconfkey\n"); - - myaccount_appdata* ad = (myaccount_appdata*)myaccount_get_appdata(); - - account_subscribe_create(&ad->account_subscribe); - account_subscribe_notification(ad->account_subscribe, myaccount_subscribe_callback, NULL); - return 1; -} - - static void myaccount_account_list_start(ui_gadget_h ug, - service_h data, void *priv) - { - MYACCOUNT_DBUG("ug start\n"); - } - - static void myaccount_account_list_pause(ui_gadget_h ug, - service_h data, void *priv) - { - __attribute__((__unused__)) myaccount_appdata *ugd; - ugd = (myaccount_appdata*)priv; - - MYACCOUNT_DBUG("My account ug goes to pause state\n"); - } - - static void myaccount_account_list_resume(ui_gadget_h ug, - service_h data, void *priv) - { - myaccount_appdata *ugd; - ugd = (myaccount_appdata*)priv; - MYACCOUNT_DBUG("Myaccount ug resume\n"); - ugd->item_selected_state = false; -#ifndef ENABLE_NOTI - myaccount_common_handle_notification(NULL); -#endif -} - - static void myaccount_account_list_destroy(ui_gadget_h ug, - service_h data, void *priv) -{ - MYACCOUNT_DBUG("myaccount_ug_destroy START[%s]", __func__); - - if (!ug || !priv) { - MYACCOUNT_DBUG("myaccount_account_ug_destroy ### ug=%p, priv=%p\n", - ug, priv); - return; - } - - myaccount_appdata *ugd; - ugd = (myaccount_appdata*)priv; - - account_unsubscribe_notification(ugd->account_subscribe); - - myaccount_destroy_appdata(); - - if (g_handle_noti > 0) { - g_source_remove(g_handle_noti); - g_handle_noti = 0; - } - - MYACCOUNT_DBUG("Terminate Myaccount_ug_main[%s]", __func__); -} - - static void myaccount_account_list_message(ui_gadget_h ug, - service_h msg, - service_h data, - void *priv) - { - - } - - static void myaccount_account_list_event(ui_gadget_h ug, - enum ug_event event, - service_h data, - void *priv) - { - switch (event) { - case UG_EVENT_LOW_MEMORY: - MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_LOW_MEMORY \n"); - break; - case UG_EVENT_LOW_BATTERY: - MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_LOW_BATTERY \n"); - break; - case UG_EVENT_LANG_CHANGE: /* old : SG_BINDTEXTDOMAIN_NOTIFY*/ - MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_LANG_CHANGE \n"); - break; - case UG_EVENT_ROTATE_PORTRAIT: - MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_ROTATE_PORTRAIT \n"); - break; - case UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN: - MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN \n"); - break; - case UG_EVENT_ROTATE_LANDSCAPE: - MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_ROTATE_LANDSCAPE \n"); - break; - case UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN: - MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN \n"); - break; - default: - MYACCOUNT_DBUG("myaccount_account_list_event: default !!! \n"); - break; - } - } - -static void myaccount_on_key_event(ui_gadget_h ug, - enum ug_key_event event , - service_h data, - void * priv) -{ - MYACCOUNT_DBUG("myaccount_on_key_event START[%s]", __func__); - if(!ug) { - MYACCOUNT_DBUG("myaccount_on_key_event ug is NULL !!!"); - return; - } - switch (event) { - case UG_KEY_EVENT_END: - ug_destroy_me(ug); - MYACCOUNT_DBUG("myaccount_on_key_event: UG_KEY_EVENT_END \n"); - break; - default: - MYACCOUNT_DBUG("myaccount_on_key_event: default !!! \n"); - break; - } - MYACCOUNT_DBUG("myaccount_on_key_event END[%s]", __func__); -} - -UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops) -{ - MYACCOUNT_DBUG ("\n UG_MODULE_INIT is called !!! \n"); - myaccount_appdata *ugd; - if (!ops) { - MYACCOUNT_DBUG("UG_MODULE_INIT ops is NULL !!!"); - return -1; - } - MYACCOUNT_DBUG("myaccount UG_MODULE_INIT!\n"); - ugd = (myaccount_appdata*)myaccount_init_appdata(); - if (!ugd) { - MYACCOUNT_DBUG("myaccount_init_appdata failed!\n"); - return -1; - } - ops->create = myaccount_account_list_create; - ops->start = myaccount_account_list_start; - ops->pause = myaccount_account_list_pause; - ops->resume = myaccount_account_list_resume; - ops->destroy = myaccount_account_list_destroy; - ops->message = myaccount_account_list_message; - ops->event = myaccount_account_list_event; - ops->key_event= myaccount_on_key_event;/*to handle BACK(END)key Event recently added in UG*/ - ops->priv = ugd; - ops->opt = UG_OPT_INDICATOR_ENABLE;/*UG_OPT_INDICATOR_ENABLE;*/ - - return 0; -} - -UG_MODULE_API void UG_MODULE_EXIT(struct ug_module_ops *ops) -{ - MYACCOUNT_DBUG("myaccount UG_MODULE_EXIT!\n"); -} - -typedef enum { - MYACCOUNT_RESET_FAILED = -1, - MYACCOUNT_UNDEFINED_LIB_SYMBOL = -2, - MYACCOUNT_OPERATE_LIB_SUCCESS = 0 -}MyAccountResetErrorCode_e; - -static MyAccountResetErrorCode_e -__myaccount_account_exchange_reset(service_h data, void *priv) -{ - int (*reset) (service_h pair, void *ptr); - MyAccountResetErrorCode_e ret = MYACCOUNT_OPERATE_LIB_SUCCESS; - - void *handle = dlopen("/usr/ug/lib/libug-activesync-efl.so", RTLD_LAZY); - if (!handle) { - MYACCOUNT_DBUG("Exchange library dlopen failed %s", dlerror()); - return MYACCOUNT_RESET_FAILED; - } - char *error = NULL; - reset = dlsym(handle, "setting_plugin_reset"); - if ((error = dlerror()) != NULL){ - MYACCOUNT_DBUG(" >>>>>>>>>>> %s", error); - dlclose(handle); - return MYACCOUNT_UNDEFINED_LIB_SYMBOL; - } - if (reset) - ret = (*reset) (data, priv); - - if (ret < 0) ret = MYACCOUNT_RESET_FAILED; - - dlclose(handle); - return ret; -} - -UG_MODULE_API int setting_plugin_reset(service_h data, void *priv) -{ - /*reset exchange account information first*/ - MyAccountResetErrorCode_e ret = MYACCOUNT_OPERATE_LIB_SUCCESS; - - ret = __myaccount_account_exchange_reset(data, priv); - if(ret != MYACCOUNT_OPERATE_LIB_SUCCESS) { - MYACCOUNT_DBUG("__myaccount_account_exchange_reset returns %d\n", - ret); - return (int)ret; - } - return (int)MYACCOUNT_OPERATE_LIB_SUCCESS; -} +/* + * my-account + * + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Wonyoung Lee , Tarun Kumar + * + * 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. + * + */ + +#include "myaccount_ug_account_list.h" +#include "myaccount_ug_addaccount.h" +#include "myaccount_ug_common.h" +#include +#include + +#ifndef UG_MODULE_API +#define UG_MODULE_API __attribute__ ((visibility("default"))) +#endif + +static myaccount_appdata *g_appdata = NULL; +static int g_handle_noti = 0; + +int myaccount_subscribe_to_account_notification_vconfkey(); +static void __reset_indicator(myaccount_appdata *ugd); + +static void __change_ui_theme_changed_cb(keynode_t *pNode, void *pUserData) +{ + MYACCOUNT_DBUG("__change_ui_theme_changed_cb"); + if(!pUserData) { + MYACCOUNT_ERROR("pUserDate is NULL:__vp_play_view_change_ui_theme_changed_cb."); + return; + } + int value = vconf_keynode_get_int(pNode); + MYACCOUNT_DBUG("value[%d]", value); + + myaccount_appdata *ad = (myaccount_appdata*)pUserData; + +// ea_theme_object_style_set(ad->layout_main, EA_THEME_STYLE_DARK); +// // Color Table +// if (ad->color_table) { +// ea_theme_object_colors_set(ad->layout_main, ad->color_table, EA_THEME_STYLE_DARK); +// } + ea_theme_object_style_set(ad->layout_main, EA_THEME_STYLE_LIGHT); + // Color Table + if (ad->color_table) { + ea_theme_object_colors_set(ad->layout_main, ad->color_table, EA_THEME_STYLE_LIGHT); + } + // Font Table + if (ad->font_table) { + ea_theme_object_fonts_set(ad->layout_main, ad->font_table); + } + + return; +} + +static void __init_changeable_resource(myaccount_appdata *ugd) +{ + if (!ugd) { + MYACCOUNT_ERROR("app data is NULL"); + return; + } + // Color Table + ugd->color_table = ea_theme_color_table_new("/usr/apps/setting-myaccount-efl/res/ug-setting-cloud/shared/res/tables/com.samsung.my-account_ChangeableColorInfo.xml"); + if (ugd->color_table) { +// ea_theme_object_colors_set(ugd->layout_main, ugd->color_table, EA_THEME_STYLE_DARK); + ea_theme_object_colors_set(ugd->layout_main, ugd->color_table, EA_THEME_STYLE_LIGHT); + MYACCOUNT_DBUG("color table create SUCCESS"); + } else { + MYACCOUNT_ERROR("color table create fail"); + } + + // Font Table + ugd->font_table = ea_theme_font_table_new("/usr/apps/setting-myaccount-efl/res/ug-setting-cloud/shared/res/tables/com.samsung.my-account_ChangeableFontInfo.xml"); + if (ugd->font_table) { + ea_theme_object_fonts_set(ugd->layout_main, ugd->font_table); + MYACCOUNT_DBUG("font table create SUCCESS"); + } else { + MYACCOUNT_ERROR("font table create fail"); + } + + // regist UI theme + int err = 0; + err = vconf_notify_key_changed(VCONFKEY_SETAPPL_CHANGE_UI_THEME_INT, __change_ui_theme_changed_cb, ugd); + if (err != 0) { + MYACCOUNT_ERROR("vconf_notify_key_changed is fail [0x%x]", err); + } + MYACCOUNT_DBUG("VCONFKEY_SETAPPL_CHANGE_UI_THEME_INT[%s]", VCONFKEY_SETAPPL_CHANGE_UI_THEME_INT); + +} + +static void __free_changeable_resource(myaccount_appdata *ad) +{ + if (!ad) { + MYACCOUNT_ERROR("app data is NULL"); + return; + } + vconf_ignore_key_changed( VCONFKEY_SETAPPL_CHANGE_UI_THEME_INT, __change_ui_theme_changed_cb ); + if (ad->color_table != NULL) { +// ea_theme_colors_unset(ad->color_table, EA_THEME_STYLE_DARK); + ea_theme_colors_unset(ad->color_table, EA_THEME_STYLE_LIGHT); + ea_theme_color_table_free(ad->color_table); + ad->color_table = NULL; + } + if (ad->font_table != NULL) { + ea_theme_font_table_free(ad->font_table); + ad->font_table = NULL; + } +} + +static void lang_changed(void * priv) +{ + if (!priv) { + MYACCOUNT_SLOGE("lang_changed ### priv=%p\n", priv); + return ; + } + + myaccount_appdata *ugd; + ugd = (myaccount_appdata*)priv; + + char* language = NULL; + language = vconf_get_str(VCONFKEY_LANGSET); + + if(language) { + char tmp_buf[6]={0,}; + MA_STRNCPY(tmp_buf, language, 6); + ugd->current_language = strdup(tmp_buf); + } + + elm_object_item_text_set (ugd->nf_it, dgettext(MA_UG_NAME, "IDS_MA_HEADER_ACCOUNTS")); + myaccount_list_refresh_item_list(ugd); + + if( ugd->add_genlist ) { + // title text update + elm_object_item_text_set (ugd->add_nf_it, dgettext(MA_UG_NAME, "IDS_MA_HEADER_ADD_ACCOUNT")); + myaccount_addaccount_refresh_item_list(ugd); + } else { + MYACCOUNT_SLOGE("lang_changed ### ugd->add_genlist is NULL\n"); + } +} + + +static gboolean __myaccount_account_list_parse_param(myaccount_mode_e + *mode, + app_control_h data, + myaccount_appdata *ad) +{ + if (!data || !ad) { + return FALSE; + } else { + char *extracted = NULL; + ad->capability_filter = NULL; + app_control_get_extra_data(data, "mode", &extracted); + app_control_get_extra_data(data, "capability_filter", &ad->capability_filter); + app_control_get_extra_data(data, "myaccount_userdata", &ad->caller_userdata); + app_control_get_extra_data(data, "from", &ad->called_from); + if (extracted) { + MYACCOUNT_SLOGD("view_account_list = %s\n", extracted); + + if (!strcmp(extracted, "account_list")) + *mode = eMYACCOUNT_ACCOUNT_LIST; + else if (!strcmp(extracted, "add_account")) + *mode = eMYACCOUNT_ADD_ACCOUNT; + else + *mode = eMYACCOUNT_ACCOUNT_LIST; + } else { + *mode = eMYACCOUNT_ACCOUNT_LIST; + } + + MA_MEMFREE(extracted); + } + return TRUE; +} + +static void __save_indicator_state(myaccount_appdata *ugd) +{ + /* Save old view's indicator values */ + ugd->indi_mode = elm_win_indicator_mode_get(ugd->win_main); + ugd->indi_o_mode = elm_win_indicator_opacity_get(ugd->win_main); + /* Save old view's overlap mode */ + ugd->overlap_mode = (int)evas_object_data_get(ugd->conformant, "overlap"); + MYACCOUNT_DBUG("indi_o_mode: %d, indi_mode: %d", ugd->indi_o_mode, ugd->indi_mode); + MYACCOUNT_DBUG("overlap_mode: %d", ugd->overlap_mode); +} + +void *myaccount_account_list_create(ui_gadget_h ug, + enum ug_mode mode, + app_control_h data, void *priv) +{ + Evas_Object *parent; + myaccount_appdata *ugd; + int count = -1; + int error_code = -1; + + if (!ug || !priv) { + return NULL; + } + + + bindtextdomain("setting-myaccount-efl", "/usr/apps/setting-myaccount-efl/res/locale"); + ugd = (myaccount_appdata*)priv; + ugd->ug = ug; + ugd->eMode = 0; + parent = (Evas_Object *)ug_get_window(); + if (!parent) { + return NULL; + } + g_appdata = ugd; + + ugd->win_main = parent; + Evas_Object *conformant = (Evas_Object *)ug_get_conformant(); + __save_indicator_state(ugd); + + Evas_Object *indi_bg = elm_bg_add(conformant); + elm_object_style_set(indi_bg, "indicator/headerbg"); + elm_object_part_content_set(conformant, "elm.swallow.indicator_bg", indi_bg); + evas_object_show(indi_bg); + ugd->conformant = conformant; + __reset_indicator(ugd); + + /*sbscribe to vconf noti key which will recevie notification about account update, delete and insert*/ +#ifdef ENABLE_NOTI + myaccount_subscribe_to_account_notification_vconfkey(); +#endif + /*listen to pkgmgr for uninstall of pkg*/ + myaccount_common_listen_pkgmgr_for_pkg_uninstall(); + + __myaccount_account_list_parse_param(&ugd->eMode, data, ugd); + + if( ugd->capability_filter + && strlen(ugd->capability_filter) > 0 ) { + + if(!strcmp(ugd->capability_filter, "http://tizen.org/account/capability/tizen_email")){ + int cnt1 = 0; + int cnt2 = 0; + int cnt3 = 0; + error_code = myaccount_common_get_account_cnt_by_appid(TIZEN_EMAIL_APPID, &cnt1); + error_code = myaccount_common_get_account_cnt_by_appid(EXCHANGE_UI_APPID, &cnt2); + error_code = myaccount_common_get_account_cnt_by_appid(GOOGLE_ACCOUNT_APPID, &cnt3); + count = cnt1+cnt2+cnt3; + } else { + error_code = myaccount_common_get_account_cnt_by_capability(ugd->capability_filter, &count); + } + + if (error_code != ACCOUNT_ERROR_NONE) { + MYACCOUNT_SLOGE("myaccount_account_list_create: myaccount_common_get_all_account_cnt fail(%d) \n", + error_code); + } + + } else { + error_code = myaccount_common_get_all_account_cnt(&count); + if (error_code != ACCOUNT_ERROR_NONE) { + MYACCOUNT_SLOGE("myaccount_account_list_create: myaccount_common_get_all_account_cnt fail(%d) \n", + error_code); + } + } + + char* language = NULL; + language = vconf_get_str(VCONFKEY_LANGSET); + + if(language) { + char tmp_buf[6]={0,}; + + MA_STRNCPY(tmp_buf, language, 6); + + ugd->current_language = strdup(tmp_buf); + } + + myaccount_list_view_create(ugd); + + __init_changeable_resource(ugd); + + myaccount_list_navi_create(ugd); + + if (ugd->eMode == eMYACCOUNT_ACCOUNT_LIST) { + if (count > 0) { + myaccount_ug_account_list_create((void*)priv); + } else if (count == 0) { + myaccount_addaccount_create_view(ugd); + } else { + MYACCOUNT_ERROR("add list count(%d)", count); + } + } else if (ugd->eMode == eMYACCOUNT_ADD_ACCOUNT) { + myaccount_addaccount_create_view(ugd); + } + + return ugd->base; + } + +bool myaccount_subscribe_callback(const char* event_type, int account_id, void* user_data) +{ + myaccount_common_handle_notification(event_type); + + return TRUE; +} + +int myaccount_subscribe_to_account_notification_vconfkey() +{ + myaccount_appdata* ad = (myaccount_appdata*)myaccount_get_appdata(); + int ret = -1; + + if(!ad) return 0; + + ret = account_subscribe_create(&ad->account_subscribe); + if(ret != ACCOUNT_ERROR_NONE){ + MYACCOUNT_ERROR("account_subscribe_create fail"); + return 0; + } + ret = account_subscribe_notification(ad->account_subscribe, myaccount_subscribe_callback, NULL); + if(ret != ACCOUNT_ERROR_NONE){ + MYACCOUNT_ERROR("account_subscribe_notification fail"); + return 0; + } + + return 1; +} + + static void myaccount_account_list_start(ui_gadget_h ug, app_control_h data, void *priv) + { + //MYACCOUNT_DBUG("ug start\n"); + } + + static void myaccount_account_list_pause(ui_gadget_h ug, app_control_h data, void *priv) + { + __attribute__((__unused__)) myaccount_appdata *ugd; + ugd = (myaccount_appdata*)priv; + + MYACCOUNT_DBUG("My account ug goes to pause state\n"); + } + + static void myaccount_account_list_resume(ui_gadget_h ug, app_control_h data, void *priv) + { + myaccount_appdata *ugd; + ugd = (myaccount_appdata*)priv; + MYACCOUNT_DBUG("Myaccount ug resume\n"); + myaccount_common_set_item_selected_state(false); +#ifndef ENABLE_NOTI + myaccount_common_handle_notification(NULL); +#endif + + char* language = NULL; + language = vconf_get_str(VCONFKEY_LANGSET); + + if(language && (strcmp(language, ugd->current_language) == 0)) { + lang_changed(priv); + } else { + /* refresh item to update font size */ + myaccount_list_refresh_item_list(ugd); + if( ugd->add_genlist ) { + myaccount_addaccount_refresh_item_list(ugd); + } + } +} + + static void __reset_indicator(myaccount_appdata *ugd) + { + if (!ugd) { + MYACCOUNT_SLOGE("__reset_indicator ### ugd=%p\n",ugd); + return; + } + MYACCOUNT_DBUG("indi_o_mode: %d, indi_mode: %d", ugd->indi_o_mode, ugd->indi_mode); + MYACCOUNT_DBUG("overlap_mode: %d", ugd->overlap_mode); + /* Set old view's indicator */ + elm_win_indicator_mode_set(ugd->win_main, ugd->indi_mode); + elm_win_indicator_opacity_set(ugd->win_main, ugd->indi_o_mode); + /* set old view's conformant overlap mode + if layout is different with new view and needs starts from (0,60) */ + if (!ugd->overlap_mode) { + elm_object_signal_emit(ugd->conformant, + "elm,state,indicator,nooverlap", ""); + evas_object_data_set(ugd->conformant, "overlap", NULL); + } else { + elm_object_signal_emit(ugd->conformant, "elm,state,indicator,overlap", ""); + evas_object_data_set(ugd->conformant, "overlap", (void *)EINA_TRUE); + } + MYACCOUNT_DBUG("__reset_indicator\n"); + } + +void myaccount_destroy_data() +{ + if (!g_appdata) { + MYACCOUNT_SLOGE("myaccount_account_ug_destroy ### g_appdata=%p\n", g_appdata); + return; + } + + myaccount_appdata *ugd = g_appdata; + account_unsubscribe_notification(ugd->account_subscribe); + ugd->account_subscribe = NULL; + + __free_changeable_resource(ugd); + myaccount_destroy_appdata(); + + if (g_handle_noti > 0) { + g_source_remove(g_handle_noti); + g_handle_noti = 0; + } + + MYACCOUNT_DBUG("Terminate Myaccount_ug_main[%s]", __func__); + g_appdata = NULL; +} + +static void myaccount_account_list_destroy(ui_gadget_h ug, app_control_h data, void *priv) +{ + myaccount_destroy_data(); +} + + static void myaccount_account_list_message(ui_gadget_h ug, + app_control_h msg, + app_control_h data, + void *priv) + { + + } + + static void myaccount_account_list_event(ui_gadget_h ug, + enum ug_event event, + app_control_h data, + void *priv) + { + switch (event) { + case UG_EVENT_LOW_MEMORY: +// MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_LOW_MEMORY \n"); + break; + case UG_EVENT_LOW_BATTERY: +// MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_LOW_BATTERY \n"); + break; + case UG_EVENT_LANG_CHANGE: /* old : SG_BINDTEXTDOMAIN_NOTIFY*/ + lang_changed(priv); + MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_LANG_CHANGE \n"); + break; + case UG_EVENT_ROTATE_PORTRAIT: +// MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_ROTATE_PORTRAIT \n"); + break; + case UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN: +// MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_ROTATE_PORTRAIT_UPSIDEDOWN \n"); + break; + case UG_EVENT_ROTATE_LANDSCAPE: +// MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_ROTATE_LANDSCAPE \n"); + break; + case UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN: +// MYACCOUNT_DBUG("myaccount_account_list_event: UG_EVENT_ROTATE_LANDSCAPE_UPSIDEDOWN \n"); + break; + default: +// MYACCOUNT_DBUG("myaccount_account_list_event: default !!! \n"); + break; + } + } + +static void myaccount_on_key_event(ui_gadget_h ug, + enum ug_key_event event , + app_control_h data, + void * priv) +{ + if(!ug) { + MYACCOUNT_DBUG("myaccount_on_key_event ug is NULL !!!"); + return; + } + switch (event) { + case UG_KEY_EVENT_END: { + ui_gadget_h ug = ((myaccount_appdata *)priv)->ug; + ug_destroy_me(ug); + } + break; + default: + break; + } +} + +UG_MODULE_API int UG_MODULE_INIT(struct ug_module_ops *ops) +{ + myaccount_appdata *ugd; + if (!ops) { + MYACCOUNT_DBUG("UG_MODULE_INIT ops is NULL !!!"); + return -1; + } + ugd = (myaccount_appdata*)myaccount_init_appdata(); + if (!ugd) { + MYACCOUNT_DBUG("myaccount_init_appdata failed!\n"); + return -1; + } + ops->create = myaccount_account_list_create; + ops->start = myaccount_account_list_start; + ops->pause = myaccount_account_list_pause; + ops->resume = myaccount_account_list_resume; + ops->destroy = myaccount_account_list_destroy; + ops->message = myaccount_account_list_message; + ops->event = myaccount_account_list_event; + ops->key_event= myaccount_on_key_event;/*to handle BACK(END)key Event recently added in UG*/ + ops->priv = ugd; + ops->opt = UG_OPT_INDICATOR_ENABLE;/*UG_OPT_INDICATOR_ENABLE;*/ + + return 0; +} + +UG_MODULE_API void UG_MODULE_EXIT(struct ug_module_ops *ops) +{ + MYACCOUNT_DBUG("myaccount UG_MODULE_EXIT!\n"); +} + +typedef enum { + MYACCOUNT_RESET_FAILED = -1, + MYACCOUNT_UNDEFINED_LIB_SYMBOL = -2, + MYACCOUNT_OPERATE_LIB_SUCCESS = 0 +}MyAccountResetErrorCode_e; + +static MyAccountResetErrorCode_e +__myaccount_account_exchange_reset(app_control_h data, void *priv) +{ + int (*reset) (app_control_h pair, void *ptr); + MyAccountResetErrorCode_e ret = MYACCOUNT_OPERATE_LIB_SUCCESS; + + void *handle = dlopen("/usr/ug/lib/libug-activesync-efl.so", RTLD_LAZY); + if (!handle) { + return MYACCOUNT_RESET_FAILED; + } + + reset = dlsym(handle, "setting_plugin_reset"); + if (dlerror() != NULL){ + dlclose(handle); + return MYACCOUNT_UNDEFINED_LIB_SYMBOL; + } + if (reset) + ret = (*reset) (data, priv); + + if (ret < 0) ret = MYACCOUNT_RESET_FAILED; + + dlclose(handle); + return ret; +} + +UG_MODULE_API int setting_plugin_reset(app_control_h data, void *priv) +{ + /*reset exchange account information first*/ +#ifdef TIZEN_ENGINEER_MODE + int error_code = -1; +#endif + MyAccountResetErrorCode_e ret = MYACCOUNT_OPERATE_LIB_SUCCESS; + + ret = __myaccount_account_exchange_reset(data, priv); + if(ret != MYACCOUNT_OPERATE_LIB_SUCCESS) { +#ifdef TIZEN_ENGINEER_MODE + MYACCOUNT_SLOGE("__myaccount_account_exchange_reset returns %d\n", + error_code); +#endif + return (int)ret; + } + return (int)MYACCOUNT_OPERATE_LIB_SUCCESS; +} diff --git a/ug.setting-myaccount-efl.include b/ug.setting-myaccount-efl.include deleted file mode 100755 index 2d02762..0000000 --- a/ug.setting-myaccount-efl.include +++ /dev/null @@ -1,12 +0,0 @@ -$1 system::homedir x -$1 com.samsung.indicator w -$1 system::vconf rwx -$1 device::app_logging w -$1 device::sys_logging w -$1 system::use_internet r -$1 com.samsung.dropbox r -$1 com.samsung.facebook rx -$1 pkgmgr::db rw -$1 libaccounts-svc::db r -$1 ug.setting-synchronise-efl include -$1 samsung-account-front rx -- 2.7.4