diff options
| author | jk7744.park <jk7744.park@samsung.com> | 2015-10-24 15:46:47 +0900 |
|---|---|---|
| committer | jk7744.park <jk7744.park@samsung.com> | 2015-10-24 15:46:47 +0900 |
| commit | ed6f6d6361c80a7556f1e770f4cba110e8d9cb74 (patch) | |
| tree | 5a676478faf70523f4409bdc11e69bfaa8963ee5 | |
| parent | 846156199507bf77ab91e4e437cca12782d86bc0 (diff) | |
| download | ug-wifi-efl-accepted/tizen_2.4_mobile.tar.gz ug-wifi-efl-accepted/tizen_2.4_mobile.tar.bz2 ug-wifi-efl-accepted/tizen_2.4_mobile.zip | |
tizen 2.4 releasetizen_2.4_mobile_releasesubmit/tizen_2.4/20151028.062742accepted/tizen/2.4/mobile/20151029.041022accepted/tizen_2.4_mobile
82 files changed, 669 insertions, 405 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9224e66..718339c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,6 @@ pkg_check_modules(pkgs REQUIRED ecore-input appcore-efl elementary - efl-assist capi-ui-efl-util glib-2.0 utilX @@ -42,6 +41,7 @@ pkg_check_modules(pkgs REQUIRED sensor openssl cert-svc-vcore + efl-extension #syspopup #syspopup-caller feedback @@ -1,75 +1,206 @@ Flora License -Version 1.0, May, 2012 +Version 1.1, April, 2013 -http://www.tizenopensource.org/license +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 Compatibility Definition Document and passes the Compatibility Test Suite 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. - -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. +"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. +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.0 (the "License"); + 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://www.tizenopensource.org/license + 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/net.wifi-qs.efl b/net.wifi-qs.efl index fbe2b16..f08e387 100644 --- a/net.wifi-qs.efl +++ b/net.wifi-qs.efl @@ -13,23 +13,13 @@ net.wifi-qs connman::profile rw---- ------ net.wifi-qs telephony_framework::api_ps_public rw net.wifi-qs telephony_framework::api_ps_profile rw net.wifi-qs net-config rw---- ------ -net.wifi-qs ail::db rw---- ------ net.wifi-qs mdm-server::admin r----- ------ net.wifi-qs mdm-server::wifi r----- ------ net.wifi-qs csc-manager --x--- ------ net.wifi-qs sound_server rw---- ------ net.wifi-qs pulseaudio rwxat- ------ net.wifi-qs syspopup::db rw---- ------ -net.wifi-qs system::vconf rwxat- ------ -net.wifi-qs system::vconf_inhouse rw---- ------ -net.wifi-qs system::vconf_misc rw---- ------ -net.wifi-qs system::vconf_setting rw---- ------ -net.wifi-qs system::vconf_system rw---- ------ -net.wifi-qs system::vconf_network r----l ------ -net.wifi-qs system::vconf_multimedia r----l ------ -net.wifi-qs ug-setting-call-efl::vconf r----l ------ net.wifi-qs org.tizen.indicator rwx--- ------ -net.wifi-qs starter::vconf rw---- ------ net.wifi-qs system::media::root rwxat- ------ net.wifi-qs system::media rwxat- ------ net.wifi-qs system::share rwxat- ------ @@ -41,5 +31,9 @@ net.wifi-qs system::use_internet r----- ------ net.wifi-qs aul::launch r-x--- ------ net.wifi-qs e17::notification rw---- ------ net.wifi-qs ecore::lock rwx--- ------ +net.wifi-qs tizen::vconf::setting::admin rwx--- ------ +net.wifi-qs tizen::vconf::tethering::admin rwx--- ------ +net.wifi-qs tizen::vconf::public::r rwx--- ------ +net.wifi-qs tizen::vconf::platform::rw rwx--- ------ org.tizen.app-tray net.wifi-qs r-x--- ------ org.tizen.quickpanel net.wifi-qs rwx--- ------ diff --git a/net.wifi-qs.rule b/net.wifi-qs.rule index e29135c..464c5a9 100644 --- a/net.wifi-qs.rule +++ b/net.wifi-qs.rule @@ -5,7 +5,6 @@ net.wifi-qs isf rwx net.wifi-qs dbus rwx net.wifi-qs connman rw net.wifi-qs net-config rw -net.wifi-qs ail::db rw net.wifi-qs mdm-server::admin r net.wifi-qs mdm-server::wifi r net.wifi-qs csc-manager x @@ -14,16 +13,7 @@ net.wifi-qs cert-svc::pkcs12 rwx net.wifi-qs sound_server rw net.wifi-qs pulseaudio rwxat net.wifi-qs syspopup::db rw -net.wifi-qs system::vconf rwxat -net.wifi-qs system::vconf_inhouse rw -net.wifi-qs system::vconf_misc rw -net.wifi-qs system::vconf_setting rw -net.wifi-qs system::vconf_system rw -net.wifi-qs system::vconf_network rl -net.wifi-qs system::vconf_multimedia rl -net.wifi-qs ug-setting-call-efl::vconf rl net.wifi-qs com.samsung.indicator rwx -net.wifi-qs starter::vconf rw net.wifi-qs system::media::root rwxat net.wifi-qs system::media rwxat net.wifi-qs system::share rwxat @@ -35,5 +25,9 @@ net.wifi-qs system::use_internet r net.wifi-qs aul::launch rx net.wifi-qs e17::notification rw net.wifi-qs ecore::lock rwx +net.wifi-qs tizen::vconf::setting::admin rwx +net.wifi-qs tizen::vconf::tethering::admin rwx +net.wifi-qs tizen::vconf::public::r rwx +net.wifi-qs tizen::vconf::platform::rw rwx com.samsung.app-tray net.wifi-qs rx com.samsung.quickpanel net.wifi-qs rwx diff --git a/packaging/wifi-efl-ug.spec b/packaging/wifi-efl-ug.spec index 267c098..99bd91a 100644..100755 --- a/packaging/wifi-efl-ug.spec +++ b/packaging/wifi-efl-ug.spec @@ -1,17 +1,21 @@ %define _unpackaged_files_terminate_build 0 Name: wifi-efl-ug Summary: Wi-Fi UI Gadget for TIZEN -Version: 1.0.131 +Version: 1.0.158 Release: 1 Group: App/Network -License: Flora-1.0 +License: Flora-1.1 Source0: %{name}-%{version}.tar.gz + +%if "%{?tizen_profile_name}" == "wearable" +ExcludeArch: %{arm} %ix86 x86_64 +%endif + BuildRequires: pkgconfig(ecore) BuildRequires: pkgconfig(ecore-imf) BuildRequires: pkgconfig(ecore-input) BuildRequires: pkgconfig(appcore-efl) BuildRequires: pkgconfig(elementary) -BuildRequires: pkgconfig(efl-assist) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(cert-svc-vcore) @@ -25,6 +29,7 @@ BuildRequires: pkgconfig(capi-network-tethering) BuildRequires: pkgconfig(capi-ui-efl-util) BuildRequires: pkgconfig(network) BuildRequires: pkgconfig(feedback) +BuildRequires: pkgconfig(efl-extension) #BuildRequires: pkgconfig(setting-common-internal) #BuildRequires: pkgconfig(setting-lite-common-internal) BuildRequires: cmake @@ -58,9 +63,7 @@ cmake -DCMAKE_INSTALL_PREFIX=%{PREFIX} \ %if ! 0%{?model_build_feature_network_tethering_disable} -DTIZEN_TETHERING_ENABLE=1 \ %endif -%if 0%{?model_build_feature_wlan_concurrent_mode} == 1 -DMODEL_BUILD_FEATURE_WLAN_CONCURRENT_MODE=1 \ -%endif . make %{?_smp_mflags} @@ -82,13 +85,13 @@ cp LICENSE %{buildroot}%{_datadir}/license/net.wifi-qs mkdir -p %{PREFIX}/bin/ -vconftool set -t int memory/wifi/ug_run_state 3 -i -g 6519 -s system::vconf_setting +vconftool set -t int memory/wifi/ug_run_state 3 -i -g 6519 -s tizen::vconf::platform::rw -vconftool set -t int memory/wifi/wifi_qs_exit 0 -g 6519 -i -s system::vconf_inhouse -vconftool set -t int db/wifi/enable_quick_start 1 -g 6519 -i -s system::vconf_setting +vconftool set -t int memory/wifi/wifi_qs_exit 0 -g 6519 -i -s tizen::vconf::platform::rw +vconftool set -t int db/wifi/enable_quick_start 1 -g 6519 -i -s tizen::vconf::setting::admin -vconftool set -t int file/private/wifi/network_bonding 0 -g 6519 -s system::vconf_setting -vconftool set -t int file/private/wifi/sort_by 1 -g 6519 -s system::vconf_setting +vconftool set -t int file/private/wifi/network_bonding 0 -g 6519 -s tizen::vconf::setting::admin +vconftool set -t int file/private/wifi/sort_by 1 -g 6519 -s tizen::vconf::setting::admin %postun -p /sbin/ldconfig @@ -1,5 +1,5 @@ msgid "IDS_ST_BODY_NONE" -msgstr "لا شيء" +msgstr "لاشيء" msgid "IDS_BT_BODY_CONNECT_TO_DEVICE" msgstr "توصيل الجهاز" @@ -259,6 +259,9 @@ msgstr "إجراء غير صالØ. Øاول مرة أخرى." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "تثبيت الشهادة" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "تبديل الشبكة الذكي" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -259,6 +259,9 @@ msgstr "ÆmÉ™liyyat sÉ™hvdir. YenidÉ™n cÉ™hd edin." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Sertifikatı quraÅŸdır" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Smart ÅŸÉ™bÉ™kÉ™ keçidi" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -259,6 +259,9 @@ msgstr "Ðевалидно дейÑтвие. Опитайте отново." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "ИнÑталиране на Ñертификат" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Превключване на умна мрежа" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -259,6 +259,9 @@ msgstr "Acció no và lida. Torni-ho a intentar." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Instal·lar certificat" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Canvi Smart network" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -259,6 +259,9 @@ msgstr "Neplatná akce. Opakujte akci." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Instalovat certifikát" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Inteligentnà pÅ™epÃnaÄ sÃtÄ›" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -259,6 +259,9 @@ msgstr "Ugyldig handling. Prøv igen." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Installér certifikat" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Smart netværksskift" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -259,6 +259,9 @@ msgstr "Ungültige Aktion. Erneut versuchen." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Zertifikat installieren" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Intelligenter Netzwechsel" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" diff --git a/po/el_GR.po b/po/el_GR.po index 426c052..3a3eee3 100755 --- a/po/el_GR.po +++ b/po/el_GR.po @@ -259,6 +259,9 @@ msgstr "Μη ÎγκυÏη ενÎÏγεια. Δοκιμάστε ξανά." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Εγκατάσταση πιστοποιητικοÏ" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Έξυπνη εναλλαγή δικτÏου" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -259,6 +259,9 @@ msgstr "Invalid action. Try again." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Install certificate" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Smart network switch" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" diff --git a/po/en_PH.po b/po/en_PH.po index 30ce0f2..f192b35 100755 --- a/po/en_PH.po +++ b/po/en_PH.po @@ -259,6 +259,9 @@ msgstr "Invalid action. Try again." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Install certificate" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Smart network switch" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" diff --git a/po/en_US.po b/po/en_US.po index c78c81c..51908f7 100755 --- a/po/en_US.po +++ b/po/en_US.po @@ -259,6 +259,9 @@ msgstr "Invalid action. Try again." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Install certificate" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Smart network switch" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" diff --git a/po/es_ES.po b/po/es_ES.po index 184a498..93fd760 100755 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -259,6 +259,9 @@ msgstr "Acción no válida. Vuelva a intentarlo." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Instalar certificado" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Smart network switch" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" diff --git a/po/es_US.po b/po/es_US.po index f16dd59..0e3c224 100755 --- a/po/es_US.po +++ b/po/es_US.po @@ -248,7 +248,7 @@ msgid "IDS_WIFI_BODY_A_WI_FI_NETWORK_HAS_BEEN_DETECTED_YOU_WILL_BE_CONNECTED" msgstr "Se detectó una red Wi-Fi. Se conectará." msgid "IDS_WIFI_BODY_ADVANCED_SETTINGS" -msgstr "Configuración avanzada" +msgstr "Ajustes avanzados" msgid "IDS_ST_BODY_TURNING_ON_ING" msgstr "Activando..." @@ -259,6 +259,9 @@ msgstr "Acción no válida. Inténtelo de nuevo." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Instalar certificado" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Cambio de Red inteligente" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -259,6 +259,9 @@ msgstr "Vale toiming. Proovige uuesti." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Installi sertifikaat" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Nutikas võrgu vahetamine" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -113,7 +113,7 @@ msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS" msgstr "Autentifikazio errorea gertatu da" msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG" -msgstr "Sare adimendunaren tekla gaitu da. Funtzio horrek Internet konexio egonkorrari eusten laguntzen du, sare mugikorren eta Wi-Fi sareen artean aldatuz. Baliteke datu erabilera handitzea." +msgstr "Smart network switch gaitu da. Funtzio horrek Internet konexio egonkorrari eusten laguntzen du, sare mugikorren eta Wi-Fi sareen artean aldatuz. Baliteke datu erabilera handitzea." msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES" msgstr "Sakatu WPS Wi-Fi sargunean %d minutu igaro baino lehen" @@ -143,7 +143,7 @@ msgid "IDS_WIFI_OPT_FORGET_NETWORK" msgstr "Ahaztu sarea" msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH" -msgstr "Sare adimendunaren tekla" +msgstr "Smart network switch" msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT" msgstr "Seinale indarra" @@ -259,6 +259,9 @@ msgstr "Ekintza baliogabea. Saiatu berriz." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Instalatu ziurtagiria" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Smart network switch" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -134,7 +134,7 @@ msgid "IDS_WIFI_OPT_SHOW_PASSWORD" msgstr "Näytä salasana" msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON" -msgstr "Päällä" +msgstr "Päälle" msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF" msgstr "Pois" @@ -259,6 +259,9 @@ msgstr "Virheellinen toiminto. Yritä uudelleen." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Asenna varmenne" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Älykäs verkon vaihto" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -113,7 +113,7 @@ msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS" msgstr "Une erreur d'authentification est survenue" msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG" -msgstr "Réseau intelligent a été activé. Cette fonction permet de maintenir une connexion Internet stable en jonglant entre les réseaux mobiles et Wi-Fi. Ceci peut augmenter votre utilisation des données." +msgstr "La fonction Réseau intelligent a été activée. Cette fonction permet de maintenir une connexion Internet stable en jonglant entre les réseaux mobiles et Wi-Fi. Ceci peut augmenter votre utilisation des données." msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES" msgstr "Appuyez sur la touche WPS de votre point d'accès Wi-Fi sous %d minutes." @@ -143,7 +143,7 @@ msgid "IDS_WIFI_OPT_FORGET_NETWORK" msgstr "Oublier le réseau" msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH" -msgstr "Bascul. réseau intellig." +msgstr "Réseau intelligent" msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT" msgstr "Force du signal" @@ -259,6 +259,9 @@ msgstr "Action non valide. Réessayez." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Installer le certificat" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Réseau intelligent" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" diff --git a/po/fr_CA.po b/po/fr_CA.po index e6fcd74..91d5472 100755 --- a/po/fr_CA.po +++ b/po/fr_CA.po @@ -259,6 +259,9 @@ msgstr "Action non valide. Réessayez." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Installer le certificat" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Réseau intelligent" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -259,6 +259,9 @@ msgstr "GnÃomh neamhbhailÃ. Triail arÃs." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Suiteálaà deimhniú" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Aistriú lÃonra cliste" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -143,7 +143,7 @@ msgid "IDS_WIFI_OPT_FORGET_NETWORK" msgstr "Ignorar rede" msgid "IDS_WIFI_MBODY_SMART_NETWORK_SWITCH" -msgstr "Cambio rede intelixente" +msgstr "Smart network switch" msgid "IDS_WIFI_MBODY_SIGNAL_STRENGTH_KOR_SKT" msgstr "Intensidade do sinal" @@ -259,6 +259,9 @@ msgstr "Acción non válida. Téntao de novo." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Instalar certificado" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Smart network switch" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -86,7 +86,7 @@ msgid "IDS_WIFI_TPOP_FAILED_TO_OBTAIN_IP_ADDRESS" msgstr "IP पता पà¥à¤°à¤¾à¤ªà¥à¤¤ करने में विफल।" msgid "IDS_WIFI_TPOP_CONNECTED_TO_WI_FI_NETWORK_PS" -msgstr "Wi-Fi नेटवरà¥à¤• %s से जोड़ा गया" +msgstr "Wi-Fi नेटवरà¥à¤• %s से जोड़ा गया।" msgid "IDS_WIFI_TMBODY_NEVER_M_ALWAYS_OFF" msgstr "कà¤à¥€ नहीं" @@ -119,7 +119,7 @@ msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES" msgstr "%d मिनटों के अंदर आप के Wi-Fi à¤à¤•à¥à¤¸à¥‡à¤¸ पॉइंट पर WPS दबाà¤à¤" msgid "IDS_WIFI_POP_OPEN" -msgstr "खोलें" +msgstr "ओपन" msgid "IDS_WIFI_POP_NO_WI_FI_AP_FOUND" msgstr "कोई Wi-Fi AP नहीं मिला।" @@ -259,6 +259,9 @@ msgstr "अमानà¥à¤¯ कà¥à¤°à¤¿à¤¯à¤¾à¥¤ फिर से पà¥à¤°à¤¯à¤ msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "पà¥à¤°à¤®à¤¾à¤£à¤ªà¤¤à¥à¤° सà¥à¤¥à¤¾à¤ªà¤¿à¤¤ करें" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "सà¥à¤®à¤¾à¤°à¥à¤Ÿ नेटवरà¥à¤• सà¥à¤µà¤¿à¤š" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "पासपॉइंट" @@ -101,7 +101,7 @@ msgid "IDS_WIFI_SK_CANCEL" msgstr "Prekid" msgid "IDS_WIFI_SK2_OK" -msgstr "OK" +msgstr "U redu" msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS" msgstr "Spojen" @@ -155,7 +155,7 @@ msgid "IDS_WIFI_HEADER_SELECT_WPS_METHOD_ABB" msgstr "Odaberite WPS-naÄin" msgid "IDS_WIFI_HEADER_PASSWORD" -msgstr "Å ifra" +msgstr "Lozinka" msgid "IDS_WIFI_HEADER_ENTER_PASSWORD" msgstr "Unesite lozinku." @@ -259,6 +259,9 @@ msgstr "Neispravna radnja. Ponovite." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Instaliraj potvrdu" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Pametna promjena mreže" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -259,6 +259,9 @@ msgstr "Érvénytelen művelet. Próbálja újra." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "TanúsÃtvány telepÃtése" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Intelligens hálózatváltás" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -259,6 +259,9 @@ msgstr "Ô±Õ¶Õ¾Õ¡Õ¾Õ¥Ö€ Õ£Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶: Õ†Õ¸Ö€Õ«Ö ÖƒÕ¸Ö€Õ±Õ¥Ö„:" msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "ÕÕ¥Õ²Õ¡Õ¤Ö€Õ¥Õ¬ Õ¾Õ¯Õ¡ÕµÕ¡Õ¯Õ¡Õ¶Õ¨" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Õ‘Õ¡Õ¶ÖÕ¥Ö€Õ« ÕÕ¥Õ¬Õ¡ÖÕ« ÖƒÕ¸ÕÕ¡Ö€Õ¯Õ¸Ö‚Õ´" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -259,6 +259,9 @@ msgstr "Ógild aðgerð. Reyndu aftur." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Setja upp vottorð" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Snjöll netskipti" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" diff --git a/po/it_IT.po b/po/it_IT.po index 377a530..3132cfc 100755 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -20,7 +20,7 @@ msgid "IDS_COM_BODY_FIND" msgstr "Trova" msgid "IDS_STU_BUTTON_PREVIOUS" -msgstr "Indietro" +msgstr "Precedente" msgid "IDS_STU_BUTTON_NEXT" msgstr "Avanti" @@ -259,6 +259,9 @@ msgstr "Azione non valida. Riprovare." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Installa certificato" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Rete Intelligente" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" diff --git a/po/ja_JP.po b/po/ja_JP.po index d32027c..2014d40 100755 --- a/po/ja_JP.po +++ b/po/ja_JP.po @@ -259,6 +259,9 @@ msgstr "æ“作ãŒæ£ã—ãã‚ã‚Šã¾ã›ã‚“。å†åº¦ãŠè©¦ã—ãã ã•ã„。" msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "証明書をインストールã—ã¦ãã ã•ã„。" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "スマートãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯åˆ‡ã‚Šæ›¿ãˆ" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -259,6 +259,9 @@ msgstr "მáƒáƒ¥áƒ›áƒ”დებრáƒáƒ áƒáƒ¡áƒ¬áƒáƒ იáƒ. ისევ რmsgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "დáƒáƒáƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒ˜áƒ ეთ სერთიფიკáƒáƒ¢áƒ˜" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "ქსელის ინტელექტუáƒáƒšáƒ£áƒ ი გáƒáƒ“áƒáƒ თვáƒ" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -259,6 +259,9 @@ msgstr "Әрекет қате. Қайталап көріңіз." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Куәлік орнату" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Смарт желіні ауыÑтыру" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" diff --git a/po/ko_KR.po b/po/ko_KR.po index 2603663..2a64efa 100755 --- a/po/ko_KR.po +++ b/po/ko_KR.po @@ -259,6 +259,9 @@ msgstr "ë™ìž‘ì´ ë°”ë¥´ì§€ 않습니다. 다시 ì‹œë„하세요." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "ì¸ì¦ì„œ 설치" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "스마트 ë„¤íŠ¸ì›Œí¬ ì „í™˜" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "패스í¬ì¸íŠ¸" @@ -259,6 +259,9 @@ msgstr "Neteisingas veiksmas. Bandykite dar kartÄ…." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Ä®diegti sertifikatÄ…" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "IÅ¡manusis tinklo jungiklis" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -134,10 +134,10 @@ msgid "IDS_WIFI_OPT_SHOW_PASSWORD" msgstr "RÄdÄ«t paroli" msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON" -msgstr "IeslÄ“gt" +msgstr "IeslÄ“gts" msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF" -msgstr "IzslÄ“gt" +msgstr "IzslÄ“gts" msgid "IDS_WIFI_OPT_FORGET_NETWORK" msgstr "Aizmirst tÄ«klu" @@ -259,6 +259,9 @@ msgstr "NederÄ«ga darbÄ«ba. MÄ“Ä£iniet vÄ“lreiz." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "InstalÄ“t sertifikÄtu" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "ViedÄ tÄ«kla pÄrslÄ“gÅ¡ana" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -259,6 +259,9 @@ msgstr "Ðеважечо дејÑтво. Обидете Ñе повторно." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "ИнÑталирај Ñертификати" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Прекинувач за паметна мрежа" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -259,6 +259,9 @@ msgstr "Ugyldig handling. Prøv pÃ¥ nytt." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Installer sertifikat" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Smart nettverksbytte" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -259,6 +259,9 @@ msgstr "Ongeldige actie. Probeer het opnieuw." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Certificaat installeren" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Slimme netwerkwissel" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -259,6 +259,9 @@ msgstr "NieprawidÅ‚owa akcja. Spróbuj ponownie." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Zainstaluj certyfikat" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Inteligentne przeÅ‚Ä…czanie sieci" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" diff --git a/po/pt_BR.po b/po/pt_BR.po index 4ce813f..66ed9f5 100755 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -62,7 +62,7 @@ msgid "IDS_ST_BODY_NETWORK_NOTIFICATION" msgstr "Notificação de rede" msgid "IDS_ST_BODY_KEEP_WI_FI_ON_DURING_SLEEP" -msgstr "Manter Wi-Fi ligado durante suspensão" +msgstr "Manter Wi-Fi ligado na tela desligada" msgid "IDS_ST_BODY_GOOD_M_BATTERY" msgstr "Bom" @@ -107,13 +107,13 @@ msgid "IDS_WIFI_SBODY_CONNECTED_M_STATUS" msgstr "Conectado" msgid "IDS_WIFI_SBODY_AUTOMATICALLY_SWITCH_BETWEEN_WI_FI_AND_MOBILE_NETWORKS_TO_MAINTAIN_A_STABLE_INTERNET_CONNECTION" -msgstr "Alternar automaticamente entre Wi-Fi e redes móveis para manter uma conexão estável com a Internet." +msgstr "Alterna automaticamente entre Wi-Fi e redes móveis para manter uma conexão estável com a Internet." msgid "IDS_WIFI_SBODY_AUTHENTICATION_ERROR_OCCURRED_M_STATUS" msgstr "Ocorreu um erro de autenticação" msgid "IDS_WIFI_POP_SMART_NETWORK_SWITCH_HAS_BEEN_ENABLED_MSG" -msgstr "A Troca de rede inteligente foi ativada. Esta função ajuda a manter uma conexão estável com a Internet alterando entre redes móveis e Wi-Fi. Isto pode aumentar o uso de dados." +msgstr "A Troca de rede inteligente foi ativada. Esta função ajuda a manter uma conexão estável com a Internet alternando entre redes móveis e Wi-Fi. Isto pode aumentar o uso de dados." msgid "IDS_WIFI_POP_PRESS_WPS_ON_YOUR_WI_FI_ACCESS_POINT_WITHIN_PD_MINUTES" msgstr "Pressione WPS no seu ponto de acesso Wi-Fi dentro de %d minutos." @@ -259,6 +259,9 @@ msgstr "Ação inválida. Tente novamente." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Instalar certificado" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Troca de rede inteligente" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" diff --git a/po/pt_PT.po b/po/pt_PT.po index 552c218..8858fad 100755 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -134,10 +134,10 @@ msgid "IDS_WIFI_OPT_SHOW_PASSWORD" msgstr "Mostrar palavra-passe" msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_ON" -msgstr "Ligar" +msgstr "Ligado" msgid "IDS_WIFI_OPT_MOBILEACCESSSERVICEATCIVATION_OFF" -msgstr "Desligar" +msgstr "Desligado" msgid "IDS_WIFI_OPT_FORGET_NETWORK" msgstr "Esquecer rede" @@ -259,6 +259,9 @@ msgstr "Acção inválida. Tente novamente." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Instalar certificado" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Mudança de rede inteligente" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -259,6 +259,9 @@ msgstr "AcÅ£iune nevalidă. ÃŽncercaÅ£i din nou." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Instalare certificat" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Comutare inteligentă reÅ£ea" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" diff --git a/po/ru_RU.po b/po/ru_RU.po index b31486a..4367ae3 100755 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -259,6 +259,9 @@ msgstr "ÐедопуÑтимое дейÑтвие. Повторите попыт msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "УÑтановить Ñертификат" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Смарт-переключатель Ñети" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -259,6 +259,9 @@ msgstr "Neplatná akcia. Skúste to znova." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "InÅ¡talovaÅ¥ certifikát" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Inteligentné prepÃnanie sietÃ" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -259,6 +259,9 @@ msgstr "Neveljavno dejanje. Poskusite znova." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Namesti certifikat" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Pametni preklop omrežja" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -259,6 +259,9 @@ msgstr "Neispravna radnja. PokuÅ¡aj ponovo." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Instaliraj sertifikat" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Pametna promena mreže" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -259,6 +259,9 @@ msgstr "Ogiltig Ã¥tgärd. Försök igen." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Installera certifikat" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Smart nätverksbyte" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" diff --git a/po/tr_TR.po b/po/tr_TR.po index e151ce4..9fb07bf 100755 --- a/po/tr_TR.po +++ b/po/tr_TR.po @@ -259,6 +259,9 @@ msgstr "Geçersiz eylem. Yeniden deneyin." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Sertifika yükle" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Akıllı aÄŸ anahtarı" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -197,7 +197,7 @@ msgid "IDS_WIFI_BODY_STATIC_IP" msgstr "Статична IP-адреÑа" msgid "IDS_WIFI_BODY_SORT_BY" -msgstr "ВиглÑд" +msgstr "СортуваннÑ" msgid "IDS_WIFI_BODY_SCANNING_ING" msgstr "СкануваннÑ..." @@ -259,6 +259,9 @@ msgstr "ÐеприпуÑтима діÑ. Cпробуйте ще раз." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "ІнÑталювати Ñертифікат" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Розумний перемикач мережі" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" @@ -259,6 +259,9 @@ msgstr "Noto‘g‘ri harakat. Qayta urinib ko‘ring." msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "Sertifikatni o‘rnatish" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "Smart tarmoqni almashtirish" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" diff --git a/po/zh_CN.po b/po/zh_CN.po index 2c9afb8..a767848 100755 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -259,6 +259,9 @@ msgstr "æ— æ•ˆåŠ¨ä½œï¼Œè¯·é‡è¯•ã€‚" msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "安装è¯ä¹¦" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "智能网络切æ¢" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" diff --git a/po/zh_HK.po b/po/zh_HK.po index 930af10..f8fcc31 100755 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -259,6 +259,9 @@ msgstr "動作無效。請é‡è©¦ã€‚" msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "安è£è‰æ›¸" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "智能網絡切æ›" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" diff --git a/po/zh_TW.po b/po/zh_TW.po index f68f9b7..38474e9 100755 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -206,7 +206,7 @@ msgid "IDS_WIFI_BODY_RECEIVE_NOTIFICATIONS_WHEN_NETWORKS_ARE_AVAILABLE" msgstr "網路å¯ç”¨æ™‚接收通知" msgid "IDS_WIFI_BODY_NAME" -msgstr "姓å" +msgstr "å稱" msgid "IDS_WIFI_BODY_MAC_ADDRESS" msgstr "MAC ä½å€" @@ -259,6 +259,9 @@ msgstr "動作無效。請é‡è©¦ã€‚" msgid "IDS_ST_BODY_INSTALL_CERTIFICATE" msgstr "安è£æ†‘è‰" +msgid "IDS_WIFI_TMBODY_SMART_NETWORK_SWITCH" +msgstr "智慧網路切æ›" + msgid "IDS_WIFI_HEADER_PASSPOINT" msgstr "Passpoint" diff --git a/sources/libraries/Common/common_eap_connect.c b/sources/libraries/Common/common_eap_connect.c index 84e387f..49473c2 100755 --- a/sources/libraries/Common/common_eap_connect.c +++ b/sources/libraries/Common/common_eap_connect.c @@ -23,11 +23,11 @@ #include <cert-svc/cpkcs12.h> #include <cert-svc/cprimitives.h> #include <ui-gadget.h> -#include <efl_assist.h> #include <utilX.h> #include <Ecore_X.h> #include <vconf-keys.h> #include <glib/gstdio.h> +#include <efl_extension.h> #include "common.h" #include "ug_wifi.h" @@ -260,20 +260,18 @@ static void _gl_eap_type_sub_sel(void *data, Evas_Object *obj, void *event_info) eap_type_t pre_index = __common_eap_connect_popup_get_eap_type(eap_data->ap); const char *label = elm_object_item_text_get((Elm_Object_Item *) event_info); - if(label != NULL){ - if (strcmp(label, EAP_TYPE_UNKNOWN) == 0) - sel_index = EAP_SEC_TYPE_UNKNOWN; - else if (strcmp(label, EAP_TYPE_PEAP) == 0) - sel_index = EAP_SEC_TYPE_PEAP; - else if (strcmp(label, EAP_TYPE_TLS) == 0) - sel_index = EAP_SEC_TYPE_TLS; - else if (strcmp(label, EAP_TYPE_TTLS) == 0) - sel_index = EAP_SEC_TYPE_TTLS; - else if (strcmp(label, EAP_TYPE_SIM) == 0) - sel_index = EAP_SEC_TYPE_SIM; - else if (strcmp(label, EAP_TYPE_AKA) == 0) - sel_index = EAP_SEC_TYPE_AKA; - } + if (strcmp(label, EAP_TYPE_UNKNOWN) == 0) + sel_index = EAP_SEC_TYPE_UNKNOWN; + else if (strcmp(label, EAP_TYPE_PEAP) == 0) + sel_index = EAP_SEC_TYPE_PEAP; + else if (strcmp(label, EAP_TYPE_TLS) == 0) + sel_index = EAP_SEC_TYPE_TLS; + else if (strcmp(label, EAP_TYPE_TTLS) == 0) + sel_index = EAP_SEC_TYPE_TTLS; + else if (strcmp(label, EAP_TYPE_SIM) == 0) + sel_index = EAP_SEC_TYPE_SIM; + else if (strcmp(label, EAP_TYPE_AKA) == 0) + sel_index = EAP_SEC_TYPE_AKA; DEBUG_LOG(UG_NAME_NORMAL, "previous index = %d; selected index = %d;", pre_index, sel_index); @@ -376,19 +374,17 @@ static void _gl_eap_user_cert_sel(void *data, Evas_Object *obj, eap_data->privatekey_path = NULL; } - if(cert_alias != NULL){ - if (strcmp(cert_alias, sc(PACKAGE, I18N_TYPE_None)) == 0) { - if (eap_data->cert_alias != NULL) { - g_free(eap_data->cert_alias); - eap_data->cert_alias = NULL; - } - } else if (__cert_extract_files(cert_alias, eap_data)) { - if (eap_data->cert_alias != NULL) { - g_free(eap_data->cert_alias); - eap_data->cert_alias = NULL; - } - eap_data->cert_alias = g_strdup(cert_alias); + if (strcmp(cert_alias, sc(PACKAGE, I18N_TYPE_None)) == 0) { + if (eap_data->cert_alias != NULL) { + g_free(eap_data->cert_alias); + eap_data->cert_alias = NULL; } + } else if (__cert_extract_files(cert_alias, eap_data)) { + if (eap_data->cert_alias != NULL) { + g_free(eap_data->cert_alias); + eap_data->cert_alias = NULL; + } + eap_data->cert_alias = g_strdup(cert_alias); } if(eap_data->eap_user_cert_item != NULL) @@ -419,7 +415,7 @@ static void _create_eap_cert_list(eap_connect_data_t *eap_data, ctxpopup = elm_ctxpopup_add(eap_data->win); eap_data->sub_popup = ctxpopup; elm_object_style_set(ctxpopup, "dropdown/list"); - ea_object_event_callback_add(ctxpopup, EA_CALLBACK_BACK, + eext_object_event_callback_add(ctxpopup, EEXT_CALLBACK_BACK, cert_ctxpopup_dismissed_cb, NULL); evas_object_smart_callback_add(ctxpopup,"dismissed", cert_ctxpopup_dismissed_cb, eap_data); @@ -569,8 +565,8 @@ static void _create_eap_type_list(eap_connect_data_t *eap_data, ctxpopup = elm_ctxpopup_add(eap_data->win); eap_data->sub_popup = ctxpopup; elm_object_style_set(ctxpopup, "dropdown/list"); - ea_object_event_callback_add(ctxpopup, EA_CALLBACK_BACK, - ea_ctxpopup_back_cb, NULL); + eext_object_event_callback_add(ctxpopup, EEXT_CALLBACK_BACK, + eext_ctxpopup_back_cb, NULL); evas_object_smart_callback_add(ctxpopup,"dismissed", ctxpopup_dismissed_cb, eap_data); elm_ctxpopup_direction_priority_set(ctxpopup, @@ -666,20 +662,18 @@ static void _gl_eap_auth_sub_sel(void *data, Evas_Object *obj, void *event_info) const char *label = elm_object_item_text_get((Elm_Object_Item *) event_info); - if(label != NULL){ - if (strcmp(label, sc(PACKAGE, I18N_TYPE_None)) == 0) - sel_index = EAP_SEC_AUTH_NONE; - else if (strcmp(label, EAP_AUTH_TYPE_PAP) == 0) - sel_index = EAP_SEC_AUTH_PAP; - else if (strcmp(label, EAP_AUTH_TYPE_MSCHAP) == 0) - sel_index = EAP_SEC_AUTH_MSCHAP; - else if (strcmp(label, EAP_AUTH_TYPE_MSCHAPV2) == 0) - sel_index = EAP_SEC_AUTH_MSCHAPV2; - else if (strcmp(label, EAP_AUTH_TYPE_GTC) == 0) - sel_index = EAP_SEC_AUTH_GTC; - else if (strcmp(label, EAP_AUTH_TYPE_MD5) == 0) - sel_index = EAP_SEC_AUTH_MD5; - } + if (strcmp(label, sc(PACKAGE, I18N_TYPE_None)) == 0) + sel_index = EAP_SEC_AUTH_NONE; + else if (strcmp(label, EAP_AUTH_TYPE_PAP) == 0) + sel_index = EAP_SEC_AUTH_PAP; + else if (strcmp(label, EAP_AUTH_TYPE_MSCHAP) == 0) + sel_index = EAP_SEC_AUTH_MSCHAP; + else if (strcmp(label, EAP_AUTH_TYPE_MSCHAPV2) == 0) + sel_index = EAP_SEC_AUTH_MSCHAPV2; + else if (strcmp(label, EAP_AUTH_TYPE_GTC) == 0) + sel_index = EAP_SEC_AUTH_GTC; + else if (strcmp(label, EAP_AUTH_TYPE_MD5) == 0) + sel_index = EAP_SEC_AUTH_MD5; wifi_ap_set_eap_auth_type(eap_data->ap, __common_eap_connect_popup_get_wlan_auth_type(sel_index)); @@ -710,7 +704,7 @@ static void _create_eap_auth_list(eap_connect_data_t *eap_data, ctxpopup = elm_ctxpopup_add(eap_data->win); eap_data->sub_popup = ctxpopup; elm_object_style_set(ctxpopup, "dropdown/list"); - ea_object_event_callback_add(ctxpopup, EA_CALLBACK_BACK, ea_ctxpopup_back_cb, NULL); + eext_object_event_callback_add(ctxpopup, EEXT_CALLBACK_BACK, eext_ctxpopup_back_cb, NULL); evas_object_smart_callback_add(ctxpopup,"dismissed", ctxpopup_dismissed_cb, eap_data); elm_ctxpopup_direction_priority_set(ctxpopup, ELM_CTXPOPUP_DIRECTION_DOWN, @@ -1019,9 +1013,11 @@ static Evas_Object *_gl_eap_entry_item_content_get(void *data, Evas_Object *obj, return NULL; } - entry = ea_editfield_add(obj, EA_EDITFIELD_SCROLL_SINGLELINE); + entry = elm_entry_add(obj); retvm_if(NULL == entry, NULL); + elm_entry_single_line_set(entry, EINA_TRUE); + elm_entry_scrollable_set(entry, EINA_TRUE); elm_entry_password_set(entry, hide_entry_txt); elm_entry_prediction_allow_set(entry, EINA_FALSE); elm_entry_autocapital_type_set(entry, ELM_AUTOCAPITAL_TYPE_NONE); @@ -1107,7 +1103,7 @@ static char *_gl_eap_chkbox_item_text_get(void *data, Evas_Object *obj, { char *str_pkg_name = (char *)data; - if (!g_strcmp0(part, "elm.text.main.left")) { + if (!strcmp("elm.text", part)) { char buf[1024]; snprintf(buf, 1023, "%s", sc(str_pkg_name, I18N_TYPE_Show_password)); return strdup(buf); @@ -1121,7 +1117,7 @@ static Evas_Object *_gl_eap_chkbox_item_content_get(void *data, { Evas_Object *check = NULL; - if(!g_strcmp0(part, "elm.icon.right")) { + if (!strcmp("elm.swallow.end", part)) { check = elm_check_add(obj); evas_object_propagate_events_set(check, EINA_FALSE); @@ -1187,7 +1183,7 @@ static void __common_eap_connect_popup_init_item_class(void *data) g_eap_entry_itc.func.state_get = NULL; g_eap_entry_itc.func.del = _gl_eap_entry_item_del; - g_eap_chkbox_itc.item_style = "1line"; + g_eap_chkbox_itc.item_style = WIFI_GENLIST_1LINE_TEXT_ICON_STYLE; g_eap_chkbox_itc.func.text_get = _gl_eap_chkbox_item_text_get; g_eap_chkbox_itc.func.content_get = _gl_eap_chkbox_item_content_get; g_eap_chkbox_itc.func.state_get = NULL; @@ -1609,7 +1605,7 @@ static Evas_Object* _create_list(Evas_Object* parent, void *data) eap_data->eap_done_ok = FALSE; eap_data->genlist = view_list = elm_genlist_add(parent); - elm_genlist_realization_mode_set(view_list, TRUE); + elm_genlist_realization_mode_set(view_list, EINA_TRUE); elm_genlist_mode_set(view_list, ELM_LIST_COMPRESS); elm_scroller_content_min_limit(view_list, EINA_FALSE, EINA_TRUE); @@ -1779,10 +1775,6 @@ static void __common_eap_connect_done_cb(void *data, Evas_Object *obj, eap_data->eap_done_ok = FALSE; eap_data->info_popup = common_utils_show_info_popup(eap_data->win, &popup_data); - if(str_id) { - g_free(str_id); - str_id = NULL; - } return; } @@ -1797,14 +1789,6 @@ static void __common_eap_connect_done_cb(void *data, Evas_Object *obj, eap_data->eap_done_ok = FALSE; eap_data->info_popup = common_utils_show_info_popup(eap_data->win, &popup_data); - if(str_id) { - g_free(str_id); - str_id = NULL; - } - if(str_pw) { - g_free(str_pw); - str_pw = NULL; - } return; } @@ -1867,15 +1851,6 @@ static void __common_eap_connect_done_cb(void *data, Evas_Object *obj, __common_eap_connect_cleanup(eap_data); - if(str_id){ - g_free(str_id); - str_id = NULL; - } - if(str_pw){ - g_free(str_pw); - str_pw = NULL; - } - __COMMON_FUNC_EXIT__; } @@ -2229,7 +2204,7 @@ eap_info_list_t *eap_info_append_items(wifi_ap_h ap, Evas_Object* view_list, auth_type = __common_eap_connect_popup_get_auth_type(ap); item = common_utils_add_2_line_txt_disabled_item(view_list, - "2line.top", + WIFI_GENLIST_2LINE_TOP_TEXT_STYLE, sc(str_pkg_name, I18N_TYPE_EAP_method), list_eap_type[eap_type].name); eap_info_list_data->eap_method_item = item; @@ -2253,8 +2228,8 @@ eap_info_list_t *eap_info_append_items(wifi_ap_h ap, Evas_Object* view_list, if (eap_type == EAP_SEC_TYPE_PEAP || eap_type == EAP_SEC_TYPE_TTLS) { /* Add EAP phase2 authentication */ - item = common_utils_add_2_line_txt_disabled_item( - view_list, "2line.top", + item = common_utils_add_2_line_txt_disabled_item(view_list, + WIFI_GENLIST_2LINE_TOP_TEXT_STYLE, sc(str_pkg_name, I18N_TYPE_Phase_2_authentication), list_eap_auth[auth_type].name); eap_info_list_data->eap_auth_item = item; @@ -2272,8 +2247,8 @@ eap_info_list_t *eap_info_append_items(wifi_ap_h ap, Evas_Object* view_list, I18N_TYPE_Unspecified)); } - item = common_utils_add_2_line_txt_disabled_item( - view_list, "2line.top", + item = common_utils_add_2_line_txt_disabled_item(view_list, + WIFI_GENLIST_2LINE_TOP_TEXT_STYLE, sc(str_pkg_name, I18N_TYPE_User_Certificate), temp_str); eap_info_list_data->user_cert_item = item; @@ -2284,8 +2259,10 @@ eap_info_list_t *eap_info_append_items(wifi_ap_h ap, Evas_Object* view_list, bool is_paswd_set; temp_str = NULL; wifi_ap_get_eap_passphrase(ap, &temp_str, &is_paswd_set); - item = common_utils_add_2_line_txt_disabled_item(view_list, "2line.top", - sc(str_pkg_name, I18N_TYPE_Identity), temp_str); + item = common_utils_add_2_line_txt_disabled_item(view_list, + WIFI_GENLIST_2LINE_TOP_TEXT_STYLE, + sc(str_pkg_name, I18N_TYPE_Identity), + temp_str); eap_info_list_data->id_item = item; g_free(temp_str); diff --git a/sources/libraries/Common/common_generate_pin.c b/sources/libraries/Common/common_generate_pin.c index 8ed1f00..8ed1f00 100644..100755 --- a/sources/libraries/Common/common_generate_pin.c +++ b/sources/libraries/Common/common_generate_pin.c diff --git a/sources/libraries/Common/common_ip_info.c b/sources/libraries/Common/common_ip_info.c index bbe4ae6..0d361a1 100755 --- a/sources/libraries/Common/common_ip_info.c +++ b/sources/libraries/Common/common_ip_info.c @@ -18,7 +18,6 @@ */ #include <glib.h> -#include <efl_assist.h> #include "common.h" #include "ug_wifi.h" @@ -117,7 +116,9 @@ static Evas_Object *_ip_info_detail_description_content_get(void *data, if (g_strcmp0(part, "elm.icon.entry") == 0) { Evas_Object *entry = NULL; - entry = ea_editfield_add(obj, EA_EDITFIELD_SCROLL_SINGLELINE); + entry = elm_entry_add(obj); + elm_entry_single_line_set(entry, EINA_TRUE); + elm_entry_scrollable_set(entry, EINA_TRUE); elm_object_domain_translatable_part_text_set(entry, "elm.guide", PACKAGE, det->description); @@ -451,7 +452,10 @@ static Evas_Object *_ip_info_entry_item_content_get(void *data, Evas_Object *obj return NULL; } - entry = ea_editfield_add(obj, EA_EDITFIELD_SCROLL_SINGLELINE); + entry = elm_entry_add(obj); + elm_entry_single_line_set(entry, EINA_TRUE); + elm_entry_scrollable_set(entry, EINA_TRUE); + if (!g_strcmp0(entry_info->str_pkg_name, "wifi-qs")) { elm_entry_input_panel_imdata_set(entry, "type=systempopup", 16); } @@ -527,15 +531,16 @@ static void _create_static_ip_table(full_ip_info_t *ip_data) ip_info_list_t *ip_info_list_data = ip_data->ip_info_list; prev_ip_info_t *prev_ip_info = ip_data->prev_ip_info; common_utils_entry_info_t *edit_box_details; + wifi_ip_config_type_e ip_type; retm_if(NULL == ip_data || NULL == prev_ip_info || NULL == ip_info_list_data); wifi_ap_h ap = ip_info_list_data->ap; __COMMON_FUNC_ENTER__; /* IP Address */ - int ret = wifi_ap_get_ip_address(ap, WIFI_ADDRESS_FAMILY_IPV4, &txt); + int ret = wifi_ap_get_ip_config_type(ap, WIFI_ADDRESS_FAMILY_IPV4, &ip_type); if (ret != WIFI_ERROR_NONE) - INFO_LOG(UG_NAME_ERR, "Failed to get IP Address! [%d]", ret); + INFO_LOG(UG_NAME_ERR, "Failed to get IP config_type! [%d]", ret); edit_box_details = g_try_new0(common_utils_entry_info_t, 1); if (edit_box_details == NULL) { @@ -544,7 +549,15 @@ static void _create_static_ip_table(full_ip_info_t *ip_data) edit_box_details->entry_id = ENTRY_TYPE_IP_ADDR; edit_box_details->title_txt = "IDS_WIFI_BODY_IP_ADDRESS"; - edit_box_details->entry_txt = txt; + if(ip_type == WIFI_IP_CONFIG_TYPE_DYNAMIC) { + edit_box_details->entry_txt = g_strdup(DEFAULT_GUIDE_IP); + } + else { + ret = wifi_ap_get_ip_address(ap, WIFI_ADDRESS_FAMILY_IPV4, &txt); + if (ret != WIFI_ERROR_NONE) + INFO_LOG(UG_NAME_ERR, "Failed to get IP Address! [%d]", ret); + edit_box_details->entry_txt = txt; + } edit_box_details->guide_txt = DEFAULT_GUIDE_IP; edit_box_details->str_pkg_name = ip_info_list_data->str_pkg_name; edit_box_details->input_panel_cb = ip_info_list_data->input_panel_cb; @@ -564,10 +577,6 @@ static void _create_static_ip_table(full_ip_info_t *ip_data) } /* Subnet Mask */ - ret = wifi_ap_get_subnet_mask(ap, WIFI_ADDRESS_FAMILY_IPV4, &txt); - if (ret != WIFI_ERROR_NONE) - INFO_LOG(UG_NAME_ERR, "Failed to get subnet mask! [%d]", ret); - edit_box_details = g_try_new0(common_utils_entry_info_t, 1); if (edit_box_details == NULL) { return; @@ -575,7 +584,15 @@ static void _create_static_ip_table(full_ip_info_t *ip_data) edit_box_details->entry_id = ENTRY_TYPE_SUBNET_MASK; edit_box_details->title_txt = "IDS_WIFI_BODY_SUBNET_MASK"; - edit_box_details->entry_txt = txt; + if(ip_type == WIFI_IP_CONFIG_TYPE_DYNAMIC) { + edit_box_details->entry_txt = g_strdup(DEFAULT_GUIDE_IP); + } + else { + ret = wifi_ap_get_subnet_mask(ap, WIFI_ADDRESS_FAMILY_IPV4, &txt); + if (ret != WIFI_ERROR_NONE) + INFO_LOG(UG_NAME_ERR, "Failed to get subnet mask! [%d]", ret); + edit_box_details->entry_txt = txt; + } edit_box_details->guide_txt = DEFAULT_GUIDE_IP; edit_box_details->str_pkg_name = ip_info_list_data->str_pkg_name; edit_box_details->input_panel_cb = ip_info_list_data->input_panel_cb; @@ -745,7 +762,7 @@ static char* _ip_info_iptoggle_text_get(void *data, Evas_Object *obj, retvm_if(NULL == data || NULL == part, NULL); full_ip_info_t *ip_data = (full_ip_info_t *) data; - if (!strncmp(part, "elm.text.main.left", strlen(part))) { + if (!strcmp("elm.text", part)) { ip_info_list_t *ip_info_list_data = ip_data->ip_info_list; #ifdef ACCESSIBLITY_FEATURE char buf[100]; @@ -890,9 +907,9 @@ static Evas_Object *_ip_info_iptoggle_content_get(void *data, Evas_Object *ic = NULL; Evas_Object *toggle_btn = NULL; - ic = elm_layout_add(obj); + if (!strcmp("elm.swallow.end", part)) { + ic = elm_layout_add(obj); - if (!g_strcmp0(part, "elm.icon.2")) { elm_layout_theme_set(ic, "layout", "list/C/type.3", "default"); toggle_btn = elm_check_add(ic); @@ -1051,7 +1068,7 @@ full_ip_info_t *ip_info_append_items(wifi_ap_h ap, const char *pkg_name, ip_info_list_data->input_panel_cb = input_panel_cb; ip_info_list_data->input_panel_cb_data = input_panel_cb_data; - ip_toggle_itc.item_style = "1line"; + ip_toggle_itc.item_style = WIFI_GENLIST_1LINE_TEXT_ICON_STYLE; ip_toggle_itc.func.text_get = _ip_info_iptoggle_text_get; ip_toggle_itc.func.content_get = _ip_info_iptoggle_content_get; ip_toggle_itc.func.state_get = NULL; diff --git a/sources/libraries/Common/common_pswd_popup.c b/sources/libraries/Common/common_pswd_popup.c index 4b47a9c..a959d28 100755 --- a/sources/libraries/Common/common_pswd_popup.c +++ b/sources/libraries/Common/common_pswd_popup.c @@ -17,7 +17,7 @@ * */ #include <feedback.h> -#include <efl_assist.h> +#include <efl_extension.h> #include "common.h" #include "common_pswd_popup.h" @@ -29,7 +29,7 @@ #define EDJ_GRP_POPUP_WPS_PIN_LAYOUT "popup_wps_pin_layout" #define MAX_PBC_TIMEOUT_SECS 120 // Time in seconds -#define PASSWORD_LENGTH 63 +#define PASSWORD_LENGTH 64 static Elm_Genlist_Item_Class g_wps_itc; static Elm_Genlist_Item_Class g_check_box_itc; @@ -271,14 +271,12 @@ void create_pbc_popup(pswd_popup_t *pswd_popup_data, Evas_Smart_Cb cancel_cb, evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); progressbar = elm_progressbar_add(layout); - elm_object_style_set(progressbar, "list_progress"); elm_progressbar_horizontal_set(progressbar, EINA_TRUE); evas_object_size_hint_align_set(progressbar, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(progressbar, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_progressbar_value_set(progressbar, 0.0); timer_label = elm_label_add(layout); - elm_object_style_set(timer_label, "label3"); elm_label_line_wrap_set(timer_label, ELM_WRAP_MIXED); elm_object_text_set(timer_label, _("<font_size=40><align=center>02:00</align></font_size>")); evas_object_size_hint_weight_set(timer_label, EVAS_HINT_EXPAND, 0.0); @@ -311,7 +309,7 @@ void create_pbc_popup(pswd_popup_t *pswd_popup_data, Evas_Smart_Cb cancel_cb, static char *_gl_wps_text_get(void *data, Evas_Object *obj, const char *part) { - if (!g_strcmp0(part, "elm.text.main.left")) { + if (!strcmp("elm.text", part)) { char buf[1024]; snprintf(buf, 1023, "%s", sc(PACKAGE, (int)data)); return g_strdup(dgettext(PACKAGE, buf)); @@ -362,7 +360,7 @@ void create_wps_options_popup(Evas_Object *win_main, elm_scroller_content_min_limit(genlist, EINA_FALSE, EINA_TRUE); evas_object_smart_callback_add(genlist, "realized", _gl_realized, NULL); - wps_itc.item_style = "1line"; + wps_itc.item_style = WIFI_GENLIST_1LINE_TEXT_STYLE; wps_itc.func.text_get = _gl_wps_text_get; wps_itc.func.content_get = NULL; wps_itc.func.state_get = NULL; @@ -379,7 +377,7 @@ void create_wps_options_popup(Evas_Object *win_main, evas_object_show(genlist); - ea_object_event_callback_add(popup, EA_CALLBACK_BACK, + eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, popup_info->cancel_cb, popup_info->cb_data); elm_object_content_set(popup, genlist); evas_object_show(popup); @@ -393,7 +391,7 @@ void create_wps_options_popup(Evas_Object *win_main, static char *_passwd_popup_wps_item_text_get(void *data, Evas_Object *obj, const char *part) { - if (!g_strcmp0(part, "elm.text.main.left")) { + if (!strcmp("elm.text", part)) { char buf[1024]; snprintf(buf, 1023, "%s", sc(PACKAGE, I18N_TYPE_WPS)); return strdup(buf); @@ -410,7 +408,7 @@ static Evas_Object *_passwd_popup_wps_item_content_get(void *data, ic = elm_layout_add(obj); retvm_if(NULL == ic, NULL); - if (!g_strcmp0(part, "elm.icon.1")) { + if (!strcmp("elm.swallow.icon", part)) { elm_layout_theme_set(ic, "layout", "list/B/type.3", "default"); /* image */ @@ -418,7 +416,7 @@ static Evas_Object *_passwd_popup_wps_item_content_get(void *data, retvm_if(NULL == icon, NULL); elm_image_file_set(icon, CUSTOM_EDITFIELD_PATH, "wifi_icon_wps.png"); - ea_theme_object_color_set(icon, "AO001"); + evas_object_color_set(icon, 2, 61, 132, 153); evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -453,15 +451,23 @@ static Evas_Object* _gl_pswd_entry_item_content_get(void *data, int return_key_type; Evas_Object *entry = NULL; + Evas_Object *editfield = NULL; static Elm_Entry_Filter_Limit_Size limit_filter_data; pswd_popup_t *pswd_popup_data = (pswd_popup_t *)data; if (!g_strcmp0(part, "elm.icon.entry")) { - entry = ea_editfield_add(obj, EA_EDITFIELD_SCROLL_SINGLELINE_PASSWORD); - ea_entry_selection_back_event_allow_set(entry, EINA_TRUE); - evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL); + editfield = elm_layout_add(obj); + elm_layout_theme_set(editfield, "layout", "editfield", "singleline"); + evas_object_size_hint_align_set(editfield, EVAS_HINT_FILL, 0.0); + evas_object_size_hint_weight_set(editfield, EVAS_HINT_EXPAND, 0.0); + entry = elm_entry_add(editfield); + elm_entry_single_line_set(entry, EINA_TRUE); + elm_entry_scrollable_set(entry, EINA_TRUE); + elm_entry_password_set(entry, EINA_TRUE); + eext_entry_selection_back_event_allow_set(entry, EINA_TRUE); + evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, 0.0); if (!g_strcmp0(pswd_popup_data->str_pkg_name, "wifi-qs")) { elm_entry_input_panel_imdata_set(entry, "type=systempopup", 16); @@ -490,11 +496,12 @@ static Evas_Object* _gl_pswd_entry_item_content_get(void *data, __popup_entry_maxlength_reached, NULL); evas_object_event_callback_add(entry, EVAS_CALLBACK_SHOW, _entry_edit_mode_show_cb, NULL); + elm_object_part_content_set(editfield, "elm.swallow.content", entry); pswd_popup_data->entry = entry; - elm_entry_input_panel_show_on_demand_set(entry, EINA_TRUE); - return entry; + elm_entry_input_panel_show(entry); + return editfield; } return NULL; @@ -512,11 +519,12 @@ static void _chk_changed_cb(void *data, Evas_Object *obj, void *ei) } else { elm_entry_password_set((Evas_Object *)data, EINA_TRUE); } + elm_entry_cursor_end_set((Evas_Object *)data); } static char *_gl_pswd_check_box_item_text_get(void *data, Evas_Object *obj, const char *part) { - if (!g_strcmp0(part, "elm.text.main.left")) { + if (!strcmp("elm.text", part)) { char buf[1024]; snprintf(buf, 1023, "%s", sc(PACKAGE, I18N_TYPE_Show_password)); return strdup(buf); @@ -531,7 +539,7 @@ static Evas_Object *_gl_pswd_check_box_item_content_get(void *data, Evas_Object *check = NULL; pswd_popup_t *pswd_popup_data = (pswd_popup_t *)data; - if(!g_strcmp0(part, "elm.icon.right")) { + if (!strcmp("elm.swallow.end", part)) { check = elm_check_add(obj); evas_object_propagate_events_set(check, EINA_FALSE); @@ -728,7 +736,7 @@ pswd_popup_t *create_passwd_popup(Evas_Object *conformant,Evas_Object *win_main, NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL); /* Checkbox genlist item */ - g_check_box_itc.item_style = "1line"; + g_check_box_itc.item_style = WIFI_GENLIST_1LINE_TEXT_ICON_STYLE; g_check_box_itc.func.text_get = _gl_pswd_check_box_item_text_get; g_check_box_itc.func.content_get = _gl_pswd_check_box_item_content_get; g_check_box_itc.func.state_get = NULL; @@ -740,7 +748,7 @@ pswd_popup_t *create_passwd_popup(Evas_Object *conformant,Evas_Object *win_main, if (popup_info->show_wps_btn) { /* WPS options genlist item */ - g_wps_itc.item_style = "1line"; + g_wps_itc.item_style = WIFI_GENLIST_1LINE_TEXT_ICON_STYLE; g_wps_itc.func.text_get = _passwd_popup_wps_item_text_get; g_wps_itc.func.content_get = _passwd_popup_wps_item_content_get; g_wps_itc.func.state_get = NULL; @@ -849,6 +857,8 @@ void passwd_popup_free(pswd_popup_t *pswd_popup_data) } if (pswd_popup_data->conf) { + if (keypad_state == TRUE) + keypad_state = FALSE; evas_object_smart_callback_del(pswd_popup_data->conf, "virtualkeypad,state,on", _passwd_popup_keypad_on_cb); diff --git a/sources/libraries/Common/common_utils.c b/sources/libraries/Common/common_utils.c index 914b378..be80608 100644..100755 --- a/sources/libraries/Common/common_utils.c +++ b/sources/libraries/Common/common_utils.c @@ -20,6 +20,8 @@ #include <vconf.h> #include <aul.h> #include <ui-gadget-module.h> +#include <bundle_internal.h> +#include <efl_extension.h> #include "common.h" #include "ug_wifi.h" @@ -56,35 +58,13 @@ static Eina_Bool is_setting = EINA_FALSE; static Eina_Bool is_portrait_mode = EINA_TRUE; static Ecore_Timer *scan_update_timer = NULL; -Ea_Theme_Color_Table *common_utils_color_table_set(void) -{ - Ea_Theme_Color_Table *table; - - table = ea_theme_color_table_new(COLOR_TABLE); - INFO_LOG(UG_NAME_NORMAL, "Wi-Fi color table : %p", table); - ea_theme_colors_set(table, EA_THEME_STYLE_DEFAULT); - - return table; -} - -Ea_Theme_Font_Table *common_utils_font_table_set(void) -{ - Ea_Theme_Font_Table *table; - - table = ea_theme_color_table_new(FONT_TABLE); - INFO_LOG(UG_NAME_NORMAL, "Wi-Fi font table : %p", table); - ea_theme_fonts_set(table); - - return table; -} - static char *__common_utils_2line_text_get(void *data, Evas_Object *obj, const char *part) { two_line_disp_data_t *item_data = (two_line_disp_data_t *)data; - if (!g_strcmp0(part, "elm.text.sub.left.bottom")) { - return g_strdup(item_data->info_str); - } else if (!g_strcmp0(part, "elm.text.main.left.top")) { + if (!strcmp("elm.text", part)) { return g_strdup(item_data->title_str); + } else if (!strcmp("elm.text.sub", part)) { + return g_strdup(item_data->info_str); } return NULL; } @@ -387,12 +367,6 @@ Evas_Object *common_utils_create_layout(Evas_Object *navi_frame) layout = elm_layout_add(navi_frame); elm_layout_theme_set(layout, "layout", "application", "noindicator"); evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - - Evas_Object* bg = elm_bg_add(layout); - evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); - elm_object_style_set(bg, "group_list"); - elm_object_part_content_set(layout, "elm.swallow.bg", bg); - evas_object_show(layout); return layout; @@ -441,12 +415,12 @@ Evas_Object *common_utils_show_info_popup(Evas_Object *parent, if (popup_data->btn1_cb) { evas_object_smart_callback_add(btn_1, "clicked", popup_data->btn1_cb, popup_data->btn1_data); - ea_object_event_callback_add(popup, EA_CALLBACK_BACK, + eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, popup_data->btn1_cb, popup_data->btn1_data); } else { evas_object_smart_callback_add(btn_1, "clicked", __common_utils_del_popup, popup); - ea_object_event_callback_add(popup, EA_CALLBACK_BACK, + eext_object_event_callback_add(popup, EEXT_CALLBACK_BACK, __common_utils_del_popup, popup); } } diff --git a/sources/libraries/Common/include/common.h b/sources/libraries/Common/include/common.h index a26e09e..a04c432 100644..100755 --- a/sources/libraries/Common/include/common.h +++ b/sources/libraries/Common/include/common.h @@ -68,6 +68,16 @@ extern "C" /* Device-picker width for landscape mode */ #define DEVICE_PICKER_POPUP_LN_W 600 +/* Genlist new style for Tizen 2.4 */ +#define WIFI_GENLIST_1LINE_TEXT_STYLE "type1" +#define WIFI_GENLIST_1LINE_TEXT_ICON_STYLE "type1" +#define WIFI_GENLIST_2LINE_TOP_TEXT_STYLE "type1" +#define WIFI_GENLIST_2LINE_TOP_TEXT_ICON_STYLE "type1" +#define WIFI_GENLIST_2LINE_BOTTOM_TEXT_STYLE "type2" +#define WIFI_GENLIST_2LINE_BOTTOM_TEXT_ICON_STYLE "type2" +#define WIFI_GENLIST_MULTILINE_TEXT_STYLE "multiline" +#define WIFI_GENLIST_GROUP_INDEX_STYLE "group_index" + typedef enum { UG_VIEW_DEFAULT = 0, UG_VIEW_SETUP_WIZARD diff --git a/sources/libraries/Common/include/common_utils.h b/sources/libraries/Common/include/common_utils.h index c7962df..bf62e4d 100755 --- a/sources/libraries/Common/include/common_utils.h +++ b/sources/libraries/Common/include/common_utils.h @@ -34,7 +34,6 @@ extern "C" #undef _ #endif #include <appcore-common.h> -#include <efl_assist.h> #include "wlan_manager.h" @@ -128,8 +127,6 @@ void common_util_manager_ecore_scan_update_timer_reset(void); gboolean common_util_subscribe_scanning_signal(GDBusSignalCallback callback); gboolean common_util_unsubscribe_scanning_signal(void); -Ea_Theme_Color_Table *common_utils_color_table_set(void); -Ea_Theme_Font_Table *common_utils_font_table_set(void); int common_utils_get_sim_state(void); #ifdef __cplusplus diff --git a/sources/libraries/WlanManager/WlanManager/wlan_manager.c b/sources/libraries/WlanManager/WlanManager/wlan_manager.c index e82017c..9d9f4b9 100644 --- a/sources/libraries/WlanManager/WlanManager/wlan_manager.c +++ b/sources/libraries/WlanManager/WlanManager/wlan_manager.c @@ -318,7 +318,13 @@ static void wlan_manager_network_event_cb( case WLAN_MANAGER_REQ_TYPE_WPS_CONNECT: event_info.ap = req_data->ap; - goto exit; + + if (WIFI_ERROR_NONE != error_code) { + event_info.event_type = WLAN_MANAGER_RESPONSE_TYPE_WPS_ENROLL_FAIL; + } else { + goto exit; + } + break; default: diff --git a/sources/ui-gadget/edcs/custom_editfield.edc b/sources/ui-gadget/edcs/custom_editfield.edc index 22abec5..41b7b83 100755 --- a/sources/ui-gadget/edcs/custom_editfield.edc +++ b/sources/ui-gadget/edcs/custom_editfield.edc @@ -1,6 +1,6 @@ #define WPS_POPUP_PADDING_LEFT_MIN_INC 15 0 #define WPS_POPUP_TEXT_SLIDER_PADDING 15 27 -#define PBC_POPUP_TEXT_SLIDER_TEXT_DISCRIPTION_MIN_INC 266 90 +#define PBC_POPUP_TEXT_SLIDER_TEXT_DISCRIPTION_MIN_INC 266 76 #define WPS_POPUP_TEXT_SLIDER_BG_MIN_INC 266 42 #define WPS_POPUP_SLIDER_VIEW_LAYOUT_PADDING_TOP_MIN_INC 266 28 #define WPS_POPUP_SLIDER_VIEW_LAYOUT_SWALLOW_MIN_INC 266 10 @@ -272,6 +272,7 @@ group { scale: 1; description { state: "default" 0.0; + align: 0.0 0.0; visible: 0; min: 480 260; max: 480 260; @@ -447,15 +448,15 @@ group { rel1.to: "base"; rel2.to: "base"; image.normal: "wifi_icon_badge_container.png"; - color_class: "AO002"; + color: 2 61 132 255; } description { state: "pressed" 0.0; inherit: "default" 0.0; - color_class: "AO002P"; + color: 1 31 68 255; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color_class: "AO002D"; + color: 2 61 132 76.5; } } /* part { name: "bg_effect"; @@ -482,15 +483,15 @@ group { max: BUTTON_CIRCLE_SIZE; rel1.to: "bg"; rel2.to: "bg"; - color_class: "AO003"; + color: 255 255 255 255; } description { state: "visible" 0.0; inherit: "default" 0.0; - color_class: "AO003"; + color: 255 255 255 255; } description { state: "disabled" 0.0; inherit: "default" 0.0; - color_class: "AO003D"; + color: 255 255 255 127.5; } } part { name: "mid_padding"; diff --git a/sources/ui-gadget/include/ug_wifi.h b/sources/ui-gadget/include/ug_wifi.h index 38ede8f..56bf9c2 100644..100755 --- a/sources/ui-gadget/include/ug_wifi.h +++ b/sources/ui-gadget/include/ug_wifi.h @@ -28,7 +28,6 @@ extern "C" #endif #include <ui-gadget-module.h> -#include <efl_assist.h> #include "common.h" #include "common_pswd_popup.h" @@ -39,7 +38,6 @@ extern "C" #include "viewer_manager.h" #include <Ecore_X.h> #include <utilX.h> -#include <efl_assist.h> #include <efl_util.h> #define PACKAGE "ug-wifi-efl-UG" @@ -70,8 +68,6 @@ typedef struct { popup_manager_object_t *popup_manager; #endif eap_connect_data_t *eap_view; - Ea_Theme_Color_Table *color_table; - Ea_Theme_Font_Table *font_table; bool is_hidden; guint timeout; diff --git a/sources/ui-gadget/include/viewer_manager.h b/sources/ui-gadget/include/viewer_manager.h index c5f2c31..e0eafa8 100755 --- a/sources/ui-gadget/include/viewer_manager.h +++ b/sources/ui-gadget/include/viewer_manager.h @@ -86,7 +86,9 @@ void viewer_manager_ctxpopup_cleanup(void); void viewer_manager_cleanup_views(void); void viewer_manager_rotate_top_setupwizard_layout(void); Evas_Object *viewer_manager_naviframe_power_item_get(void); +#if 0 /* not used */ Evas_Object *viewer_manager_create_bg(Evas_Object *parent, char *style); +#endif void viewer_manager_update_hidden_btn(void); int viewer_manager_create_scan_btn(void); void viewer_manager_setup_wizard_btns_color_set(bool state); diff --git a/sources/ui-gadget/viewers-layout/view_advanced.c b/sources/ui-gadget/viewers-layout/view_advanced.c index 5b808e3..e206c71 100644..100755 --- a/sources/ui-gadget/viewers-layout/view_advanced.c +++ b/sources/ui-gadget/viewers-layout/view_advanced.c @@ -19,7 +19,8 @@ #include <vconf.h> #include <vconf-keys.h> -#include <efl_assist.h> +#include <app_control_internal.h> +#include <efl_extension.h> #include "ug_wifi.h" #include "view_advanced.h" @@ -56,54 +57,58 @@ struct _private_data { struct _private_data g_pd; /* Prototype */ -static char *_gl_text_get(void *data, Evas_Object *obj, const char *part); static char *_gl_network_notification_text_get(void *data, Evas_Object *obj, const char *part); static char *_gl_sort_by_text_get(void *data, Evas_Object *obj, const char *part); static char *_gl_sort_by_sub_text_get(void *data, Evas_Object *obj, const char *part); -static char *_gl_never_text_get(void *data, Evas_Object *obj,const char *part); -static char *_gl_keep_wifi_on_during_sleep_text_get(void *data, Evas_Object *obj,const char *part); static Evas_Object *_gl_content_get_network_noti(void *data, Evas_Object *obj, const char *part); -static Evas_Object *_gl_content_get_keep_wifi_sub(void *data, Evas_Object *obj, const char *part); static Evas_Object *_gl_content_get_sort_by_sub(void *data, Evas_Object *obj, const char *part); static char *_gl_install_certificate_text_get(void *data, Evas_Object *obj, const char *part); +#if TIZEN_SLEEP_POLICY +static char *_gl_text_get(void *data, Evas_Object *obj, const char *part); +static char *_gl_never_text_get(void *data, Evas_Object *obj,const char *part); +static char *_gl_keep_wifi_on_during_sleep_text_get(void *data, Evas_Object *obj,const char *part); +static Evas_Object *_gl_content_get_keep_wifi_sub(void *data, Evas_Object *obj, const char *part); +#endif /* Global variables for elm_genlist itc */ static Elm_Genlist_Item_Class itc_network_noti = { - .item_style = "multiline_sub.main.1icon", + .item_style = WIFI_GENLIST_MULTILINE_TEXT_STYLE, .func.text_get = _gl_network_notification_text_get, .func.content_get = _gl_content_get_network_noti }; +#if TIZEN_SLEEP_POLICY static Elm_Genlist_Item_Class itc_keep_wifi = { - .item_style = "2line.top", + .item_style = WIFI_GENLIST_2LINE_TOP_TEXT_STYLE, .func.text_get = _gl_keep_wifi_on_during_sleep_text_get, }; static Elm_Genlist_Item_Class itc_keep_wifi_sub = { - .item_style = "1line", + .item_style = WIFI_GENLIST_1LINE_TEXT_ICON_STYLE, .func.text_get = _gl_text_get, .func.content_get = _gl_content_get_keep_wifi_sub, }; static Elm_Genlist_Item_Class itc_keep_wifi_sub_never = { - .item_style = "2line.top", + .item_style = WIFI_GENLIST_2LINE_TOP_TEXT_ICON_STYLE, .func.text_get = _gl_never_text_get, .func.content_get = _gl_content_get_keep_wifi_sub, }; +#endif static Elm_Genlist_Item_Class itc_sort_by = { - .item_style = "2line.top", + .item_style = WIFI_GENLIST_2LINE_TOP_TEXT_STYLE, .func.text_get = _gl_sort_by_text_get, }; static Elm_Genlist_Item_Class itc_sort_by_sub = { - .item_style = "1line", + .item_style = WIFI_GENLIST_1LINE_TEXT_ICON_STYLE, .func.text_get = _gl_sort_by_sub_text_get, .func.content_get = _gl_content_get_sort_by_sub, }; static Elm_Genlist_Item_Class itc_install_cert = { - .item_style = "1line", + .item_style = WIFI_GENLIST_1LINE_TEXT_STYLE, .func.text_get = _gl_install_certificate_text_get, }; @@ -112,7 +117,7 @@ static char *_gl_install_certificate_text_get(void *data, Evas_Object *obj, { char buf[1024]; - if (!g_strcmp0(part, "elm.text.main.left")) { + if (!strcmp("elm.text", part)) { snprintf(buf, 1023, "%s", sc(PACKAGE, I18N_TYPE_Install_certificate)); return strdup(buf); } @@ -146,6 +151,7 @@ static void _gl_cert_sel_cb(void *data, Evas_Object *obj, void *event_info) elm_genlist_item_selected_set(g_pd.item_install_cert, EINA_FALSE); } +#if TIZEN_SLEEP_POLICY static int _convert_wifi_keep_value_to_vconf(int i18n_key) { switch (i18n_key) { @@ -177,6 +183,7 @@ static int _convert_vconf_to_wifi_keep_value(int vconf_value) return -1; } +#endif int _convert_sort_by_value_to_vconf(int i18n_key) { @@ -208,12 +215,12 @@ static char *_gl_sort_by_text_get(void *data, Evas_Object *obj, const char *part) { char buf[1024]; - if (!g_strcmp0(part, "elm.text.main.left.top")||!g_strcmp0(part, "elm.text.main.left")) { + if (!strcmp("elm.text", part)) { if ((int) data != 0) { snprintf(buf, 1023, "%s", sc(PACKAGE, (int) data)); return strdup(buf); } - } else if (!g_strcmp0(part, "elm.text.sub.left.bottom")) { + } else if (!strcmp("elm.text.sub", part)) { int value; value = _convert_vconf_to_sort_by_value( @@ -230,7 +237,7 @@ static char *_gl_sort_by_text_get(void *data, Evas_Object *obj, static char *_gl_sort_by_sub_text_get(void *data, Evas_Object *obj, const char *part) { char buf[1024]; - if (!g_strcmp0(part, "elm.text.main.left")) { + if (!strcmp("elm.text", part)) { if ((int) data != 0) { snprintf(buf, 1023, "%s", sc(PACKAGE, (int) data)); return strdup(buf); @@ -243,21 +250,23 @@ static char *_gl_network_notification_text_get(void *data, Evas_Object *obj, con { char buf[1024]; - if (!g_strcmp0(part, "elm.text.main")) { + if (!strcmp("elm.text", part)) { snprintf(buf, 1023, "%s", sc(PACKAGE, I18N_TYPE_Network_notification)); return strdup(buf); - } else if (!g_strcmp0(part, "elm.text.multiline")) { - snprintf(buf, 1023, "%s", sc(PACKAGE, I18N_TYPE_Network_notify_me_later)); + } else if (!strcmp("elm.text.multiline", part)) { + snprintf(buf, 1023, "<font_size=30>%s</font_size>", + sc(PACKAGE, I18N_TYPE_Network_notify_me_later)); return strdup(buf); } return NULL; } +#if TIZEN_SLEEP_POLICY static char *_gl_text_get(void *data, Evas_Object *obj, const char *part) { char buf[1024]; - if (!g_strcmp0(part, "elm.text.main.left")) { + if (!strcmp("elm.text", part)) { if ((int) data != 0) { snprintf(buf, 1023, "%s", sc(PACKAGE, (int) data)); return strdup(buf); @@ -271,12 +280,10 @@ static char *_gl_keep_wifi_on_during_sleep_text_get(void *data, Evas_Object *obj { char buf[1024]; - if(!strcmp(part, "elm.text.main.left.top")) { + if (!strcmp("elm.text", part)) { snprintf(buf, 1023, "%s", sc(PACKAGE, I18N_TYPE_Keep_WIFI_on_during_sleep)); return strdup(buf); - } - - if(!strcmp(part, "elm.text.sub.left.bottom")) { + } else if (!strcmp("elm.text.sub", part)) { int value; value = _convert_vconf_to_wifi_keep_value( common_util_get_system_registry(VCONF_SLEEP_POLICY)); @@ -292,17 +299,19 @@ static char *_gl_keep_wifi_on_during_sleep_text_get(void *data, Evas_Object *obj } return NULL; } + static char *_gl_never_text_get(void *data, Evas_Object *obj, const char *part) { - if (!g_strcmp0(part, "elm.text.main.left.top")) { + if (!strcmp("elm.text", part)) { return g_strdup(sc(PACKAGE, I18N_TYPE_Donot_Use)); - } else if (!g_strcmp0(part, "elm.text.sub.left.bottom")) { + } else if (!strcmp("elm.text.sub", part)) { return g_strdup(sc(PACKAGE, I18N_TYPE_Increases_Data_Usage)); } return NULL; } +#endif static void _gl_changed_network_noti(void *data, Evas_Object *obj, void *event_info) @@ -351,8 +360,7 @@ static Evas_Object *_gl_content_get_network_noti(void *data, Evas_Object *toggle_btn = NULL; int ret; - - if (!strncmp(part, "elm.icon", strlen(part))) { + if (!strcmp("elm.swallow.end", part)) { toggle_btn = elm_check_add(obj); evas_object_size_hint_align_set(toggle_btn, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(toggle_btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -401,6 +409,7 @@ static Evas_Object *_gl_content_get_network_noti(void *data, return toggle_btn; } +#if TIZEN_SLEEP_POLICY static void _gl_changed_keep_wifi_sub(void *data, Evas_Object *obj, void *event_info) { @@ -450,14 +459,16 @@ static Evas_Object *_gl_content_get_keep_wifi_sub(void *data, __COMMON_FUNC_ENTER__; Evas_Object *radio; int value; - Evas_Object *content = elm_layout_add(obj); + Evas_Object *content = NULL; if (!g_pd.keep_wifi_radio_group) { g_pd.keep_wifi_radio_group = elm_radio_add(obj); elm_radio_state_value_set (g_pd.keep_wifi_radio_group, -1); } - if (!g_strcmp0(part, "elm.icon.2")) { + if (!strcmp("elm.swallow.end", part)) { + content = elm_layout_add(obj); + elm_layout_theme_set(content, "layout", "list/C/type.2", "default"); radio = elm_radio_add(content); #ifdef ACCESSIBLITY_FEATURE @@ -480,6 +491,7 @@ static Evas_Object *_gl_content_get_keep_wifi_sub(void *data, __COMMON_FUNC_EXIT__; return content; } +#endif static void _gl_changed_sort_by_sub(void *data, Evas_Object *obj, void *event_info) @@ -531,14 +543,16 @@ static Evas_Object *_gl_content_get_sort_by_sub(void *data, Evas_Object *radio; int value; - Evas_Object *content = elm_layout_add(obj); + Evas_Object *content = NULL; if (!g_pd.sort_by_radio_group) { g_pd.sort_by_radio_group = elm_radio_add(obj); elm_radio_state_value_set (g_pd.sort_by_radio_group, -1); } - if (!g_strcmp0(part, "elm.icon.2")) { + if (!strcmp("elm.swallow.end", part)) { + content = elm_layout_add(obj); + elm_layout_theme_set(content, "layout", "list/C/type.2", "default"); radio = elm_radio_add(content); #ifdef ACCESSIBLITY_FEATURE @@ -574,15 +588,17 @@ static void _block_clicked_cb(void *data, Evas_Object *obj, } } +#if TIZEN_SLEEP_POLICY static void _gl_keep_wifi(void *data, Evas_Object *obj, void *event_info) { __COMMON_FUNC_ENTER__; Evas_Object *genlist; g_pd.keep_wifi_popup = elm_popup_add(obj); - ea_object_event_callback_add(g_pd.keep_wifi_popup, EA_CALLBACK_BACK, ea_popup_back_cb, NULL); + eext_object_event_callback_add(g_pd.keep_wifi_popup, EEXT_CALLBACK_BACK, eext_popup_back_cb, NULL); elm_object_domain_translatable_part_text_set(g_pd.keep_wifi_popup, "title,text", PACKAGE, "IDS_ST_BODY_KEEP_WI_FI_ON_DURING_SLEEP"); + elm_popup_align_set(g_pd.keep_wifi_popup, ELM_NOTIFY_ALIGN_FILL, 1.0); evas_object_size_hint_weight_set(g_pd.keep_wifi_popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_smart_callback_add(g_pd.keep_wifi_popup, "block,clicked", _block_clicked_cb, g_pd.keep_wifi_popup); @@ -617,6 +633,7 @@ static void _gl_keep_wifi(void *data, Evas_Object *obj, void *event_info) elm_genlist_item_selected_set(g_pd.item_keep_wifi_switch, EINA_FALSE); __COMMON_FUNC_EXIT__; } +#endif static void _gl_sort_by(void *data, Evas_Object *obj, void *event_info) { @@ -624,9 +641,10 @@ static void _gl_sort_by(void *data, Evas_Object *obj, void *event_info) Evas_Object *genlist = NULL; g_pd.sort_by_popup = elm_popup_add(obj); - ea_object_event_callback_add(g_pd.sort_by_popup, EA_CALLBACK_BACK, ea_popup_back_cb, NULL); + eext_object_event_callback_add(g_pd.sort_by_popup, EEXT_CALLBACK_BACK, eext_popup_back_cb, NULL); elm_object_domain_translatable_part_text_set(g_pd.sort_by_popup, "title,text", PACKAGE, "IDS_WIFI_BODY_SORT_BY"); + elm_popup_align_set(g_pd.sort_by_popup, ELM_NOTIFY_ALIGN_FILL, 1.0); evas_object_size_hint_weight_set(g_pd.sort_by_popup, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_smart_callback_add(g_pd.sort_by_popup, "block,clicked", _block_clicked_cb, g_pd.sort_by_popup); @@ -682,10 +700,12 @@ static Evas_Object *_create_list(Evas_Object *parent) (const void *) I18N_TYPE_Network_notification, NULL, ELM_GENLIST_ITEM_NONE, _gl_changed_network_noti, NULL); +#if TIZEN_SLEEP_POLICY /* Keep WI-FI on during sleep */ g_pd.item_keep_wifi_switch = elm_genlist_item_append(gl, &itc_keep_wifi, (const void *) I18N_TYPE_Keep_WIFI_on_during_sleep, NULL, ELM_GENLIST_ITEM_NONE, _gl_keep_wifi, NULL); +#endif /* Sort By */ g_pd.item_sort_by= elm_genlist_item_append(gl, &itc_sort_by, diff --git a/sources/ui-gadget/viewers-layout/view_detail.c b/sources/ui-gadget/viewers-layout/view_detail.c index 79347e6..2cb09d5 100755 --- a/sources/ui-gadget/viewers-layout/view_detail.c +++ b/sources/ui-gadget/viewers-layout/view_detail.c @@ -16,6 +16,7 @@ * limitations under the License. * */ +#include <efl_extension.h> #include "ug_wifi.h" #include "view_detail.h" @@ -79,9 +80,9 @@ static void _create_ctxpopup_forget_btn_cb(void *data, Evas_Object *obj, void *e elm_ctxpopup_auto_hide_disabled_set(_detail_data->ctxpopup, EINA_TRUE); elm_object_style_set(_detail_data->ctxpopup, "more/default"); - ea_object_event_callback_add(_detail_data->ctxpopup, EA_CALLBACK_BACK, + eext_object_event_callback_add(_detail_data->ctxpopup, EEXT_CALLBACK_BACK, _ctxpopup_del_cb, NULL); - ea_object_event_callback_add(_detail_data->ctxpopup, EA_CALLBACK_MORE, + eext_object_event_callback_add(_detail_data->ctxpopup, EEXT_CALLBACK_MORE, _ctxpopup_del_cb, NULL); evas_object_smart_callback_add(_detail_data->ctxpopup, "dismissed", _ctxpopup_dismissed_cb, NULL); @@ -255,10 +256,7 @@ static char *_view_detail_grouptitle_text_get(void *data, char *tmp = NULL; char *txt = NULL; - if (!strncmp(part, "elm.text.sub.left.top", strlen(part))) { - ret = (char*) g_strdup(dgettext(PACKAGE, "IDS_WIFI_BODY_NAME")); - } else if (!strncmp(part, "elm.text.main.left.bottom", strlen(part))) { -// view_detail_data *_detail_data = (view_detail_data *)data; + if (!strcmp("elm.text", part)) { _detail_data = (view_detail_data *)data; retvm_if(NULL == _detail_data, NULL); @@ -285,7 +283,7 @@ static Evas_Object *_view_detail_grouptitle_content_get(void *data, Evas_Object Evas_Object* icon = NULL; Evas_Object* ic = NULL; - if (!strncmp(part, "elm.icon.2", strlen(part))) { + if (!strcmp("elm.swallow.end", part)) { char *temp_str = NULL; ic = elm_layout_add(obj); @@ -301,7 +299,7 @@ static Evas_Object *_view_detail_grouptitle_content_get(void *data, Evas_Object * So use a default image */ temp_str = g_strdup_printf("%s.png", "A01-3_icon_lock_00"); } - ea_theme_object_color_set(icon,"AO001"); + evas_object_color_set(icon, 2, 61, 132, 204); elm_image_file_set(icon, CUSTOM_EDITFIELD_PATH, temp_str); g_free(temp_str); @@ -649,7 +647,7 @@ void view_detail(wifi_device_info_t *device_info, Evas_Object *win_main, detailview_list = elm_genlist_add(layout); assertm_if(NULL == detailview_list, "NULL!!"); - elm_genlist_realization_mode_set(detailview_list, TRUE); + elm_genlist_realization_mode_set(detailview_list, EINA_TRUE); elm_object_style_set(detailview_list, "dialogue"); _detail_data->view_detail_list = detailview_list; @@ -657,7 +655,7 @@ void view_detail(wifi_device_info_t *device_info, Evas_Object *win_main, evas_object_smart_callback_add(detailview_list, "language,changed", gl_lang_changed, NULL); - grouptitle_itc.item_style = "2line.bottom"; + grouptitle_itc.item_style = WIFI_GENLIST_2LINE_BOTTOM_TEXT_ICON_STYLE; grouptitle_itc.func.text_get = _view_detail_grouptitle_text_get; grouptitle_itc.func.content_get = _view_detail_grouptitle_content_get; grouptitle_itc.func.state_get = NULL; diff --git a/sources/ui-gadget/viewers-layout/view_ime_hidden.c b/sources/ui-gadget/viewers-layout/view_ime_hidden.c index d0a3e64..f53b6cd 100644 --- a/sources/ui-gadget/viewers-layout/view_ime_hidden.c +++ b/sources/ui-gadget/viewers-layout/view_ime_hidden.c @@ -18,7 +18,6 @@ */ #include <feedback.h> -#include <efl_assist.h> #include "ug_wifi.h" #include "view_ime_hidden.h" @@ -59,7 +58,7 @@ static void __popup_entry_changed_cb(void* data, Evas_Object* obj, void* event_i hiddep_ap_popup_data_t *popup_data = g_hidden_ap_popup_data; Evas_Object *ok_btn = popup_data->ok_btn; - if (elm_object_part_content_get(obj, "elm.swallow.clear")) { +// if (elm_object_part_content_get(obj, "elm.swallow.clear")) { if (elm_object_focus_get(obj)) { if (elm_entry_is_empty(obj)) { elm_object_signal_emit(obj, "elm,state,clear,hidden", ""); @@ -71,7 +70,7 @@ static void __popup_entry_changed_cb(void* data, Evas_Object* obj, void* event_i elm_entry_input_panel_return_key_disabled_set(obj, EINA_FALSE); } } - } +// } } static void __popup_entry_focused_cb(void *data, Evas_Object *obj, void *event_info) @@ -183,9 +182,12 @@ static Evas_Object *_gl_entry_item_content_get(void *data, static Elm_Entry_Filter_Limit_Size limit_filter_data; if (!g_strcmp0(part, "elm.icon.entry")) { - entry = ea_editfield_add(obj, EA_EDITFIELD_SCROLL_SINGLELINE); + entry = elm_entry_add(obj); + elm_layout_theme_set(entry, "layout", "editfield", "singleline"); evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(entry, EVAS_HINT_FILL, EVAS_HINT_FILL); + elm_entry_single_line_set(entry, EINA_TRUE); + elm_entry_scrollable_set(entry, EINA_TRUE); if (!entry) return NULL; @@ -220,7 +222,7 @@ static Evas_Object *_gl_entry_item_content_get(void *data, evas_object_smart_callback_add(entry, "maxlength,reached", __popup_entry_maxlength_reached, NULL); - elm_entry_input_panel_show_on_demand_set(entry, EINA_TRUE); + elm_entry_input_panel_show(entry); return entry; } @@ -236,7 +238,6 @@ static void popup_animation_finish_cb(void *data, Evas_Object *obj, void *event_ entry = elm_object_item_part_content_get(item, "elm.icon.entry"); elm_entry_input_panel_show(entry); - elm_entry_input_panel_show_on_demand_set(entry, EINA_FALSE); elm_object_focus_set(entry, EINA_TRUE); __COMMON_FUNC_EXIT__; diff --git a/sources/ui-gadget/viewers-layout/viewer_manager.c b/sources/ui-gadget/viewers-layout/viewer_manager.c index ba19e03..5280e12 100644..100755 --- a/sources/ui-gadget/viewers-layout/viewer_manager.c +++ b/sources/ui-gadget/viewers-layout/viewer_manager.c @@ -19,9 +19,10 @@ #include <vconf.h> #include <utilX.h> -#include <efl_assist.h> #include <vconf-keys.h> #include <ui-gadget.h> +#include <app_control_internal.h> +#include <efl_extension.h> #include "common.h" #include "ug_wifi.h" @@ -329,7 +330,7 @@ static void __back_cb(void *data, Evas_Object *obj, void *event_info) if ((view_manager_view_type_t)evas_object_data_get(obj, SCREEN_TYPE_ID_KEY) != VIEW_MANAGER_VIEW_TYPE_MAIN) { - ea_naviframe_back_cb(data, obj, event_info); + eext_naviframe_back_cb(data, obj, event_info); __COMMON_FUNC_EXIT__; return; } @@ -545,9 +546,9 @@ static void _more_button_cb(void *data, Evas_Object *obj, void *event_info) manager_object->ctxpopup = elm_ctxpopup_add(parent); elm_ctxpopup_auto_hide_disabled_set(manager_object->ctxpopup, EINA_TRUE); elm_object_style_set(manager_object->ctxpopup, "more/default"); - ea_object_event_callback_add(manager_object->ctxpopup, EA_CALLBACK_BACK, + eext_object_event_callback_add(manager_object->ctxpopup, EEXT_CALLBACK_BACK, _ctxpopup_del_cb, NULL); - ea_object_event_callback_add(manager_object->ctxpopup, EA_CALLBACK_MORE, + eext_object_event_callback_add(manager_object->ctxpopup, EEXT_CALLBACK_MORE, _ctxpopup_del_cb, NULL); evas_object_smart_callback_add(manager_object->ctxpopup, "dismissed", _ctxpopup_dismissed_cb, _win_main); @@ -669,7 +670,7 @@ static char *_gl_wifi_onoff_text_get(void *data, Evas_Object *obj, const char *p retvm_if(NULL == manager_object, NULL); - if (!strncmp(part, "elm.text.main.left", strlen(part))) { + if (!strcmp("elm.text", part)) { det = g_strdup(manager_object->item_wifi_onoff_text); assertm_if(NULL == det, "NULL!!"); } @@ -690,7 +691,7 @@ static Evas_Object *_gl_wifi_onoff_content_get(void *data, Evas_Object *ao = NULL; #endif - if (!strncmp(part, "elm.icon.2", strlen(part))) { + if (!strcmp("elm.swallow.end", part)) { icon = elm_layout_add(obj); elm_layout_theme_set(icon, "layout", "list/C/type.3", "default"); @@ -749,7 +750,7 @@ static void __viewer_manager_wifi_onoff_item_create(Evas_Object* genlist) manager_object->item_wifi_onoff_text = g_strdup(sc(PACKAGE, I18N_TYPE_Wi_Fi)); - wifi_onoff_itc.item_style = "1line"; + wifi_onoff_itc.item_style = WIFI_GENLIST_1LINE_TEXT_ICON_STYLE; wifi_onoff_itc.func.text_get = _gl_wifi_onoff_text_get; wifi_onoff_itc.func.content_get = _gl_wifi_onoff_content_get; wifi_onoff_itc.func.state_get = NULL; @@ -793,7 +794,7 @@ void viewer_manager_setup_wizard_btns_color_set(bool state) int bg_r, bg_g, bg_b, bg_a = 0; int item_banded_a, bg_banded_a = 0; int i = 0; - int item_color[3]; + int item_color[3] = {0,}; Elm_Object_Item *item = NULL; if (state == TRUE && is_on_color_set == TRUE) { @@ -1013,7 +1014,7 @@ static void __ea_setup_wizard_back_cb(void *data, Evas_Object *obj, { if ((view_manager_view_type_t)evas_object_data_get(obj, SCREEN_TYPE_ID_KEY) != VIEW_MANAGER_VIEW_TYPE_MAIN) { - ea_naviframe_back_cb(data, obj, event_info); + eext_naviframe_back_cb(data, obj, event_info); return; } @@ -1035,7 +1036,7 @@ static void __viewer_manager_create_setup_wizard_content(Evas_Object *layout) elm_object_domain_translatable_part_text_set(layout, "text.title", PACKAGE, sc(PACKAGE, I18N_TYPE_Wi_Fi)); - ea_object_event_callback_add(manager_object->nav, EA_CALLBACK_BACK, + eext_object_event_callback_add(manager_object->nav, EEXT_CALLBACK_BACK, __ea_setup_wizard_back_cb, NULL); __viewer_manager_wifi_onoff_item_create(manager_object->list); @@ -1085,11 +1086,12 @@ static void __viewer_manager_create_wifi_ug_content(Evas_Object *layout, elm_object_part_content_set(layout, "elm.swallow.content", manager_object->list); - ea_object_event_callback_add(manager_object->nav, EA_CALLBACK_BACK, - __back_cb, NULL); + eext_object_event_callback_add(manager_object->nav, EEXT_CALLBACK_BACK, eext_naviframe_back_cb, NULL); back_btn = elm_button_add(manager_object->nav); elm_object_style_set(back_btn, "naviframe/back_btn/default"); + evas_object_smart_callback_add(back_btn, "clicked",__back_cb, _win_main); + elm_object_focus_allow_set(back_btn, EINA_FALSE); manager_object->navi_it = navi_it = elm_naviframe_item_push(manager_object->nav, sc(PACKAGE, I18N_TYPE_Wi_Fi), back_btn, NULL, @@ -1110,6 +1112,7 @@ static void __viewer_manager_create_wifi_ug_content(Evas_Object *layout, __COMMON_FUNC_EXIT__; } +#if 0 /* not used */ Evas_Object *viewer_manager_create_bg(Evas_Object *parent, char *style) { Evas_Object *bg; @@ -1126,6 +1129,7 @@ Evas_Object *viewer_manager_create_bg(Evas_Object *parent, char *style) return bg; } +#endif Evas_Object *viewer_manager_create(Evas_Object *_parent, Evas_Object *_win_main) { @@ -1135,7 +1139,6 @@ Evas_Object *viewer_manager_create(Evas_Object *_parent, Evas_Object *_win_main) Evas_Object *layout = NULL; Evas_Object *view_content = NULL; - Evas_Object *bg = NULL; manager_object = g_new0(viewer_manager_object, 1); retvm_if(NULL == manager_object, NULL); @@ -1160,8 +1163,8 @@ Evas_Object *viewer_manager_create(Evas_Object *_parent, Evas_Object *_win_main) elm_object_part_content_set(layout, "elm.swallow.content", manager_object->nav); elm_naviframe_prev_btn_auto_pushed_set(manager_object->nav, EINA_FALSE); - ea_object_event_callback_add(manager_object->nav, EA_CALLBACK_MORE, - ea_naviframe_more_cb, NULL); + eext_object_event_callback_add(manager_object->nav, EEXT_CALLBACK_MORE, + eext_naviframe_more_cb, NULL); /* Add layout for custom styles */ elm_theme_extension_add(NULL, CUSTOM_EDITFIELD_PATH); @@ -1178,9 +1181,6 @@ Evas_Object *viewer_manager_create(Evas_Object *_parent, Evas_Object *_win_main) __viewer_manager_create_setup_wizard_content(view_content); } else { __viewer_manager_create_wifi_ug_content(view_content, _win_main); - - bg = viewer_manager_create_bg(_win_main, "group_list"); - elm_object_part_content_set(view_content, "elm.swallow.bg", bg); } evas_object_show(layout); @@ -1515,8 +1515,13 @@ void viewer_manager_header_mode_set(HEADER_MODES new_mode) } old_mode = manager_object->header_mode; - if (old_mode == new_mode) + if (old_mode == new_mode) { + if (new_mode == HEADER_MODE_OFF && manager_object->scan_button) { + evas_object_del(manager_object->scan_button); + manager_object->scan_button = NULL; + } return; + } DEBUG_LOG(UG_NAME_NORMAL, "Header mode %d --> %d", old_mode, new_mode); diff --git a/sources/ui-gadget/viewers-layout/wifi_viewer_list.c b/sources/ui-gadget/viewers-layout/wifi_viewer_list.c index 265c538..8d8c935 100755 --- a/sources/ui-gadget/viewers-layout/wifi_viewer_list.c +++ b/sources/ui-gadget/viewers-layout/wifi_viewer_list.c @@ -75,10 +75,10 @@ char* ConvertRGBAtoHex(int r, int g, int b, int a) char* string = NULL; string = g_try_malloc0(sizeof(char )* 255); - - hexcolor = (r << 24) + (g << 16) + (b << 8) + a; - if(string != NULL) + if (string != NULL) { + hexcolor = (r << 24) + (g << 16) + (b << 8) + a; sprintf(string, "%08x", hexcolor); + } return string; } @@ -86,30 +86,26 @@ char* ConvertRGBAtoHex(int r, int g, int b, int a) static char* _gl_listview_text_get(void *data, Evas_Object *obj, const char *part) { char* det = NULL; - char* buf =NULL; - int r = 0, g = 0, b = 0, a = 0; + char* buf = NULL; ug_genlist_data_t* gdata = (ug_genlist_data_t*) data; retvm_if(NULL == gdata || NULL == gdata->device_info, NULL); assertm_if(NULL == gdata->device_info->ssid, "NULL!!"); - if (!strncmp(part, "elm.text.main.left.top", strlen(part))) { + if (!strcmp("elm.text", part)) { det = evas_textblock_text_utf8_to_markup(NULL, gdata->device_info->ssid); assertm_if(NULL == det, "NULL!!"); if (VIEWER_ITEM_RADIO_MODE_CONNECTED == gdata->radio_mode) { - ea_theme_color_get("ATO001S",&r, &g, &b, &a, - NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL); buf = g_strdup_printf("<color=#%s>%s</color>", - ConvertRGBAtoHex(r, g, b, a), det); + ConvertRGBAtoHex(2, 61, 132, 255), det); g_free(det); return buf; } - } else if (!strncmp(part, "elm.text.sub.left.bottom", strlen(part)) && - gdata->device_info->ap_status_txt != NULL) { + } else if (!strcmp("elm.text.sub", part) + && gdata->device_info->ap_status_txt != NULL) { det = g_strdup(gdata->device_info->ap_status_txt); assertm_if(NULL == det, "NULL!!"); @@ -130,7 +126,7 @@ static Evas_Object *_gl_listview_content_get(void *data, Evas_Object *obj, const /* if there is no ap_image_path (NO AP Found situation) */ DEBUG_LOG(UG_NAME_ERR, "Fatal: Image path is NULL"); - } else if (!g_strcmp0(part, "elm.icon.1")) { + } else if (!strcmp("elm.swallow.icon", part)) { ic = elm_layout_add(obj); elm_layout_theme_set(ic, "layout", "list/B/type.3", "default"); @@ -143,13 +139,13 @@ static Evas_Object *_gl_listview_content_get(void *data, Evas_Object *obj, const elm_image_file_set(icon, CUSTOM_EDITFIELD_PATH, temp_str); g_free(temp_str); - ea_theme_object_color_set(icon, "AO001"); + evas_object_color_set(icon, 2, 61, 132, 204); evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_layout_content_set(ic, "elm.swallow.content", icon); - } else if (!g_strcmp0(part, "elm.icon.2")) { + } else if (!strcmp("elm.swallow.end", part)) { if (VIEWER_ITEM_RADIO_MODE_CONNECTING == gdata->radio_mode || VIEWER_ITEM_RADIO_MODE_CONFIGURATION == gdata->radio_mode) { ic = elm_layout_add(obj); @@ -200,7 +196,7 @@ static void _gl_listview_del(void *data, Evas_Object *obj) static char *_gl_text_available_networks_get(void *data, Evas_Object *obj, const char *part) { - if (g_strcmp0(part, "elm.text.main") == 0) + if (!strcmp("elm.text", part)) return g_strdup(sc(PACKAGE, I18N_TYPE_Available_networks)); return NULL; @@ -367,10 +363,8 @@ static void __passwd_popup_ok_cb(void *data, Evas_Object *obj, void *event_info) ap = passwd_popup_get_ap(ug_app_state->passpopup); password = passwd_popup_get_txt(ug_app_state->passpopup); - if(password != NULL) + if (password != NULL) password_len = strlen(password); - else - password_len = 0; wifi_ap_get_security_type(ap, &sec_type); @@ -945,18 +939,18 @@ Evas_Object* viewer_list_create(Evas_Object *win) // To use multiline textblock/entry/editfield in genlist, set height_for_width mode // then the item's height is calculated while the item's width fits to genlist width. elm_genlist_mode_set(viewer_list, ELM_LIST_COMPRESS); - elm_genlist_homogeneous_set(viewer_list, EINA_TRUE); + elm_genlist_realization_mode_set(viewer_list, EINA_TRUE); evas_object_size_hint_weight_set(viewer_list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(viewer_list, EVAS_HINT_FILL, EVAS_HINT_FILL); - itc.item_style = "2line.top"; + itc.item_style = WIFI_GENLIST_2LINE_TOP_TEXT_ICON_STYLE; itc.func.text_get = _gl_listview_text_get; itc.func.content_get = _gl_listview_content_get; itc.func.state_get = NULL; itc.func.del = _gl_listview_del; - no_wifi_device_itc.item_style = "1line"; + no_wifi_device_itc.item_style = WIFI_GENLIST_1LINE_TEXT_STYLE; no_wifi_device_itc.func.text_get = _gl_listview_text_get; no_wifi_device_itc.func.content_get = NULL; no_wifi_device_itc.func.state_get = NULL; @@ -998,7 +992,7 @@ void viewer_list_title_item_set(Elm_Object_Item *item_header) } memset(&grouptitle_itc, 0, sizeof(grouptitle_itc)); - grouptitle_itc.item_style = "groupindex"; + grouptitle_itc.item_style = WIFI_GENLIST_GROUP_INDEX_STYLE; grouptitle_itc.func.text_get = _gl_text_available_networks_get; grouptitle_itc.func.content_get = _gl_content_scanning_icon_get; @@ -1257,7 +1251,7 @@ Elm_Object_Item* item_get_for_ap(wifi_ap_h ap) __COMMON_FUNC_EXIT__; return NULL; } - + char *essid = NULL; wifi_security_type_e type = WIFI_SECURITY_TYPE_NONE; diff --git a/sources/ui-gadget/wifi-efl-UG.c b/sources/ui-gadget/wifi-efl-UG.c index 04a767d..885a261 100644..100755 --- a/sources/ui-gadget/wifi-efl-UG.c +++ b/sources/ui-gadget/wifi-efl-UG.c @@ -77,10 +77,8 @@ static void _bg_scan_status_callback(GDBusConnection *conn, if (g_strcmp0(key, "Scanning") == 0) { value = g_variant_get_boolean(var); if (value) { - if (header_mode != HEADER_MODE_CONNECTING) { - viewer_manager_show(VIEWER_WINSET_SEARCHING_GRP_TITLE); - viewer_manager_header_mode_set(HEADER_MODE_SEARCHING); - } + viewer_manager_header_mode_set(HEADER_MODE_SEARCHING); + viewer_manager_show(VIEWER_WINSET_SEARCHING); } g_variant_unref(var); @@ -96,13 +94,13 @@ static void _bg_scan_status_callback(GDBusConnection *conn, static void _set_rotation(Evas_Object *win) { - int rots[1] = { 0 }; + int rots[4] = { 0, 90, 180, 270 }; if (!elm_win_wm_rotation_supported_get(win)) { return; } - elm_win_wm_rotation_available_rotations_set(win, rots, 1); + elm_win_wm_rotation_available_rotations_set(win, (const int *)(&rots), 4); } static void *on_create(ui_gadget_h ug, enum ug_mode mode, @@ -221,12 +219,6 @@ static void *on_create(ui_gadget_h ug, enum ug_mode mode, } } - /* Enablee Changeable UI feature */ - ea_theme_changeable_ui_enabled_set(EINA_TRUE); - - ug_app_state->color_table = common_utils_color_table_set(); - ug_app_state->font_table = common_utils_font_table_set(); - #if defined TIZEN_TETHERING_ENABLE ug_app_state->popup_manager = winset_popup_manager_create(layout_main, PACKAGE); #endif diff --git a/sources/ui-gadget/wifi-wlan-callbacks.c b/sources/ui-gadget/wifi-wlan-callbacks.c index eaaf037..9920379 100755 --- a/sources/ui-gadget/wifi-wlan-callbacks.c +++ b/sources/ui-gadget/wifi-wlan-callbacks.c @@ -263,7 +263,7 @@ void wlan_engine_callback(wlan_mgr_event_info_t *event_info, void *user_data) case WLAN_MANAGER_RESPONSE_TYPE_CONNECTION_INVALID_KEY: common_utils_send_message_to_net_popup( - "Network connection popup", "unable to connect", + "Network connection popup", "wrong password", "toast_popup", NULL); if (gdata) { diff --git a/sources/ui-gadget/winset_popup.c b/sources/ui-gadget/winset_popup.c index 1ba0c64..46efccf 100644 --- a/sources/ui-gadget/winset_popup.c +++ b/sources/ui-gadget/winset_popup.c @@ -18,7 +18,6 @@ */ #include <tethering.h> -#include <efl_assist.h> #include "common.h" #include "ug_wifi.h" diff --git a/sources/wifi-syspopup/include/wifi-syspopup.h b/sources/wifi-syspopup/include/wifi-syspopup.h index abe1e88..e385bd6 100644 --- a/sources/wifi-syspopup/include/wifi-syspopup.h +++ b/sources/wifi-syspopup/include/wifi-syspopup.h @@ -25,7 +25,6 @@ extern "C" { #endif -#include <efl_assist.h> #include "common.h" #include "wlan_manager.h" @@ -73,8 +72,6 @@ typedef struct wifi_object { pswd_popup_t *passpopup; eap_connect_data_t *eap_popup; Evas_Object *alertpopup; - Ea_Theme_Color_Table *color_table; - Ea_Theme_Font_Table *font_table; /* Sort type*/ int sort_type; diff --git a/sources/wifi-syspopup/net.wifi-qs-lite.xml b/sources/wifi-syspopup/net.wifi-qs-lite.xml index 84ab293..6287361 100644 --- a/sources/wifi-syspopup/net.wifi-qs-lite.xml +++ b/sources/wifi-syspopup/net.wifi-qs-lite.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <manifest xmlns="http://tizen.org/ns/packages" package="net.wifi-qs-lite" version="1.0.0" install-location="internal-only"> <label>Wi-Fi device picker</label> <author email="hj0426.kim@samsung.com" href="www.samsung.com">Hyunjee Kim</author> diff --git a/sources/wifi-syspopup/net.wifi-qs.xml b/sources/wifi-syspopup/net.wifi-qs.xml index 8e2080b..c8eac96 100644 --- a/sources/wifi-syspopup/net.wifi-qs.xml +++ b/sources/wifi-syspopup/net.wifi-qs.xml @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <manifest xmlns="http://tizen.org/ns/packages" package="net.wifi-qs" version="1.0.0" install-location="internal-only"> <label>Wi-Fi device picker</label> <author email="hj0426.kim@samsung.com" href="www.samsung.com">Hyunjee Kim</author> diff --git a/sources/wifi-syspopup/viewer-popups/view-main.c b/sources/wifi-syspopup/viewer-popups/view-main.c index 5789c47..c967b3d 100755 --- a/sources/wifi-syspopup/viewer-popups/view-main.c +++ b/sources/wifi-syspopup/viewer-popups/view-main.c @@ -84,10 +84,8 @@ static void __popup_ok_cb(void *data, Evas_Object *obj, void *event_info) ap = passwd_popup_get_ap(devpkr_app_state->passpopup); password = passwd_popup_get_txt(devpkr_app_state->passpopup); - if(password != NULL) + if (password != NULL) password_len = strlen(password); - else - password_len = 0; wifi_ap_get_security_type(ap, &sec_type); @@ -617,14 +615,14 @@ static char *_gl_text_get(void *data, Evas_Object *obj, const char *part) devpkr_gl_data_t *gdata = (devpkr_gl_data_t *) data; retvm_if(NULL == gdata, NULL); - if (!strncmp(part, "elm.text.main.left.top", strlen(part))) { + if (!strcmp("elm.text", part)) { txt = evas_textblock_text_utf8_to_markup(NULL, gdata->dev_info->ssid); ret = g_strdup(txt); if (ret == NULL) { ERROR_LOG(SP_NAME_NORMAL, "ssid name is NULL!!"); } g_free(txt); - } else if (!strncmp(part, "elm.text.sub.left.bottom", strlen(part))) { + } else if (!strcmp("elm.text.sub", part)) { if (ITEM_CONNECTION_MODE_CONNECTING == gdata->connection_mode) { ret = g_strdup(sc(PACKAGE, I18N_TYPE_Connecting)); } else if (ITEM_CONNECTION_MODE_CONFIGURATION == gdata->connection_mode) { @@ -652,7 +650,7 @@ static Evas_Object *_gl_content_get(void *data, Evas_Object *obj, const char *pa Evas_Object* icon = NULL; Evas_Object *ic = NULL; - if (!strncmp(part, "elm.icon.1", strlen(part))) { + if (!strcmp("elm.swallow.icon", part)) { char *temp_str = NULL; ic = elm_layout_add(obj); @@ -665,12 +663,12 @@ static Evas_Object *_gl_content_get(void *data, Evas_Object *obj, const char *pa elm_image_file_set(icon, CUSTOM_EDITFIELD_PATH, temp_str); g_free(temp_str); - ea_theme_object_color_set(icon, "AO001"); + evas_object_color_set(icon, 2, 61, 132, 204); evas_object_size_hint_align_set(icon, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(icon, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_layout_content_set(ic, "elm.swallow.content", icon); - } else if (!strncmp(part, "elm.icon.2", strlen(part))) { + } else if (!strcmp("elm.swallow.end", part)) { if (gdata->connection_mode == ITEM_CONNECTION_MODE_CONNECTING || gdata->connection_mode == ITEM_CONNECTION_MODE_CONFIGURATION) { ic = elm_layout_add(obj); @@ -719,12 +717,12 @@ static Evas_Object *_create_genlist(Evas_Object* parent) list = elm_genlist_add(parent); assertm_if(NULL == list, "list allocation fail!!"); elm_genlist_mode_set(list, ELM_LIST_COMPRESS); - elm_genlist_homogeneous_set(list, EINA_TRUE); + elm_genlist_realization_mode_set(list, EINA_TRUE); evas_object_size_hint_weight_set(list, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(list, EVAS_HINT_FILL, EVAS_HINT_FILL); - itc.item_style = "2line.top"; + itc.item_style = WIFI_GENLIST_2LINE_TOP_TEXT_ICON_STYLE; itc.func.text_get = _gl_text_get; itc.func.content_get = _gl_content_get; itc.func.state_get = NULL; @@ -940,7 +938,7 @@ static Evas_Object *_gl_content_title_get(void *data, Evas_Object *obj, const ch static char* _gl_text_title_get(void *data, Evas_Object *obj,const char *part) { - if (g_strcmp0(part, "elm.text.main") == 0) { + if (!strcmp("elm.text", part)) { return (char*) g_strdup(sc(PACKAGE, I18N_TYPE_Available_networks)); } @@ -949,7 +947,7 @@ static char* _gl_text_title_get(void *data, Evas_Object *obj,const char *part) static void view_main_add_group_title(void) { - grouptitle_itc.item_style = "groupindex"; + grouptitle_itc.item_style = WIFI_GENLIST_GROUP_INDEX_STYLE; grouptitle_itc.func.text_get = _gl_text_title_get; grouptitle_itc.func.content_get = _gl_content_title_get; @@ -988,6 +986,7 @@ void view_main_update_group_title(gboolean is_bg_scan) main_list = _create_genlist(box); view_main_add_group_title(); + elm_box_pack_start(box, main_list); evas_object_show(main_list); @@ -1121,7 +1120,7 @@ Elm_Object_Item *view_main_move_item_to_top(Elm_Object_Item *old_item) elm_genlist_item_update(old_item); } - common_util_managed_idle_add(__view_main_scroll_to_top, first_item); + common_util_managed_idle_add(__view_main_scroll_to_top, title_item); __COMMON_FUNC_EXIT__; return first_item; diff --git a/sources/wifi-syspopup/wifi-syspopup-engine-callback.c b/sources/wifi-syspopup/wifi-syspopup-engine-callback.c index 0b652c8..e551604 100755 --- a/sources/wifi-syspopup/wifi-syspopup-engine-callback.c +++ b/sources/wifi-syspopup/wifi-syspopup-engine-callback.c @@ -168,7 +168,7 @@ void wlan_engine_callback(wlan_mgr_event_info_t *event_info, void *user_data) case WLAN_MANAGER_RESPONSE_TYPE_CONNECTION_INVALID_KEY: common_utils_send_message_to_net_popup( - "Network connection popup", "unable to connect", + "Network connection popup", "wrong password", "toast_popup", NULL); item = view_main_item_get_for_ap(event_info->ap); diff --git a/sources/wifi-syspopup/wifi-syspopup.c b/sources/wifi-syspopup/wifi-syspopup.c index d02ccfc..f78bc63 100644..100755 --- a/sources/wifi-syspopup/wifi-syspopup.c +++ b/sources/wifi-syspopup/wifi-syspopup.c @@ -24,6 +24,7 @@ #include <ui-gadget-module.h> #include <utilX.h> #include <Ecore_X.h> +#include <efl_extension.h> #include "common.h" #include "view-main.h" @@ -214,6 +215,8 @@ static void wifi_devpkr_rotate_cb(void *data, Evas_Object *obj, void *event) INFO_LOG(SP_NAME_NORMAL, "rotate_angle: %d", rotate_angle); } +/* Tizen 2.4's setting supports auto rotate mode */ +#if 0 static void wifi_devpkr_set_rotation(Evas_Object *win) { if (!elm_win_wm_rotation_supported_get(win)) { @@ -222,6 +225,7 @@ static void wifi_devpkr_set_rotation(Evas_Object *win) elm_win_wm_rotation_preferred_rotation_set(win, 0); } +#endif static void _exit_cb(void *data, Evas_Object *obj, void *event_info) { @@ -325,7 +329,7 @@ static int wifi_devpkr_create(void) assertm_if(NULL == devpkr_app_state->popup, "syspopup is NULL!!"); } - ea_object_event_callback_add(devpkr_app_state->popup, EA_CALLBACK_BACK, + eext_object_event_callback_add(devpkr_app_state->popup, EEXT_CALLBACK_BACK, __keydown_cb, NULL); event_handler = ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, __key_press_cb, NULL); @@ -348,7 +352,10 @@ static int wifi_devpkr_create(void) view_main_create_main_list(); +/* Tizen 2.4's setting supports auto rotate mode */ +#if 0 wifi_devpkr_set_rotation(devpkr_app_state->win_main); +#endif wifi_devpkr_redraw(); elm_win_indicator_mode_set(devpkr_app_state->win_main, ELM_WIN_INDICATOR_SHOW); @@ -591,12 +598,6 @@ static void app_control(app_control_h request, void *data) devpkr_app_state->popup = elm_popup_add(devpkr_app_state->win_main); - /* Enablee Changeable UI feature */ - ea_theme_changeable_ui_enabled_set(EINA_TRUE); - - devpkr_app_state->color_table = common_utils_color_table_set(); - devpkr_app_state->font_table = common_utils_font_table_set(); - evas_object_show(devpkr_app_state->win_main); evas_object_show(devpkr_app_state->conformant); diff --git a/wifi-efl-ug.include b/wifi-efl-ug.include index fe0fc67..1681260 100644 --- a/wifi-efl-ug.include +++ b/wifi-efl-ug.include @@ -9,14 +9,14 @@ $1 mdm-server::admin r $1 mdm-server::wifi r $1 sound_server rw $1 pulseaudio rwxat -$1 system::vconf rwxat $1 system::media::root rwxat $1 system::media rwxat $1 system::share rwxat -$1 system::vconf_network r -$1 system::vconf_setting rw -$1 system::vconf_inhouse rw $1 device::app_logging w $1 system::homedir rwxat $1 sys-assert::core rwxat $1 cert-svc rwx +$1 tizen::vconf::setting::admin rwx +$1 tizen::vconf::tethering::admin rwx +$1 tizen::vconf::public::r rwx +$1 tizen::vconf::platform::rw rwx diff --git a/wifi-efl-ug.xml b/wifi-efl-ug.xml index d69cd2d..a322e45 100644 --- a/wifi-efl-ug.xml +++ b/wifi-efl-ug.xml @@ -1,16 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns="http://tizen.org/ns/packages" package="wifi-efl-ug" version="1.0.0" install-location="internal-only"> <label>Wi-Fi</label> - <author email="hj0426.kim@samsung.com" href="www.samsung.com">Hyunjee Kim</author> - <author email="sanghooon80@samsung.com" href="www.samsung.com">Sanghoon Jo</author> - <author email="sunil85.kim@samsung.com" href="www.samsung.com">Sunil Kim</author> <description>Wi-Fi</description> <ui-application appid="wifi-efl-ug" exec="/usr/apps/wifi-efl-ug/bin/wifi-efl-UG" ui-gadget="true" nodisplay="true" taskmanage="false" multiple="false" type="capp" process-pool="true" hw-acceleration="use-GL"> <label>Wi-Fi</label> <icon>/usr/apps/wifi-efl-ug/res/icons/setting_wifi.png</icon> <application-service> <operation name="http://tizen.org/appcontrol/operation/setting/wifi"/> - <operation name="http://samsung.com/appcontrol/operation/setting/wifi"/> </application-service> </ui-application> </manifest> |