Basic routine : type -> select

diff --git a/.cproject b/.cproject
index b0bdcbc..91a7b66 100755 (executable)
--- a/.cproject
+++ b/.cproject
@@ -25,7 +25,7 @@
                                                                <option id="gnu.cpp.compiler.option.optimization.level.764615478" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.debugging.level.core.287247668" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.1762641182" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="mobile-2.3-device.core_llvm34.armel.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-2.3-emulator.core_llvm34.i386.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1550287729" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
@@ -94,7 +94,6 @@
                                                                        <listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/>
                                                                        <listOptionValue builtIn="false" value=" -fPIE"/>
                                                                        <listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="-mthumb"/>
                                                                </option>
                                                                <option id="gnu.cpp.compiler.option.include.paths.2009528832" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -112,7 +111,7 @@
                                                                <option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.928507427" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
                                                                <option id="sbi.gnu.c.compiler.option.debugging.level.core.975928777" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" value="gnu.c.debugging.level.max" valueType="enumerated"/>
                                                                <option id="sbi.gnu.c.compiler.option.1294129822" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="mobile-2.3-device.core_llvm34.armel.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-2.3-emulator.core_llvm34.i386.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1153181887" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
@@ -181,7 +180,6 @@
                                                                        <listOptionValue builtIn="false" value="${RS_COMPILER_MISC}"/>
                                                                        <listOptionValue builtIn="false" value=" -fPIE"/>
                                                                        <listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="-mthumb"/>
                                                                </option>
                                                                <option id="gnu.c.compiler.option.include.paths.1308825906" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
@@ -215,7 +213,7 @@
                                                                        <additionalInput kind="additionalinput" paths="$(LIBS)"/>
                                                                </inputType>
                                                        </tool>
-                                                       <tool command="arm-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1778607987" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
+                                                       <tool command="i386-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1778607987" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
                                                                <inputType id="cdt.managedbuild.tool.gnu.assembler.input.195154528" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
                                                        </tool>
                                                        <tool id="org.tizen.nativecore.tool.fnmapgen.523856279" name="C FN-Map Generator" superClass="org.tizen.nativecore.tool.fnmapgen"/>

diff --git a/.rds_delta b/.rds_delta
index 2b2e92e..0793a12 100644 (file)
--- a/.rds_delta
+++ b/.rds_delta
@@ -1,14 +1,6 @@
 #delete
-res/edje/.item.edc.swp
-res/edje/.main_view.edc.swp
 #add
 #modify
 author-signature.xml
 signature1.xml
 bin/adventure
-res/edje/entry.edj
-res/edje/item.edj
-res/edje/main.edj
-res/edje/main_view.edj
-res/edje/map.edj
-res/edje/ui_manager.edj

diff --git a/.sdk_delta.info b/.sdk_delta.info
index 655c136..12cc068 100644 (file)
Binary files a/.sdk_delta.info and b/.sdk_delta.info differ

diff --git a/.sign/.manifest.tmp b/.sign/.manifest.tmp
index 25f3805..050768d 100644 (file)
--- a/.sign/.manifest.tmp
+++ b/.sign/.manifest.tmp
@@ -1,4 +1,6 @@
+res/edje/adventure.edj__DEL__X0lLhpjFISr9oUvwO8D+7EiWQgVj1KhVbUOCxEqHCaE=
 res/edje/btn.png__DEL__/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=
+res/edje/entry.edj__DEL__dhfb2+UGowaqDXlPRl0vcyHfBKXP/z4mKSLii70kZPE=
 res/edje/images/1.png__DEL__oP1soFdNokYu42XfoWKq0uYAP9o6PGUCGdnxQYErGdQ=
 res/edje/images/10.png__DEL__gebvW4D13j2AGUPkJInqNpANPhlECcq5EkIty5Coxhk=
 res/edje/images/11.png__DEL__DL48rNIwpgkN9kmnaZrCRBEZ8eb4O7bs1cojj5TmA5E=
@@ -41,6 +43,11 @@ res/edje/images/other_location_mint_small.png__DEL__6yDIP2Ej+jMDvbP3sjwGwYDhrCvE
 res/edje/images/searching_X.png__DEL__6/v6iyrX0VC79xo5sWw6RsvOQMTwjHprPpyOTBpmNak=
 res/edje/images/searching_bar.png__DEL__j4Dcx7rYG8+eeyOZVoEbQweee9+MbC6ifCUq5MOkhO0=
 res/edje/images/world_map.png__DEL__qzld1q4JAzcy/4ndsTnaCAG5tWuy+DpL9WK1a6noKLU=
+res/edje/initial.edj__DEL__lcGlKgrBUdQ2/z7UM79zg84fs88c+kFeYcqJFowyzH4=
+res/edje/loading.edj__DEL__h2nDJeSMjLz/rZ8wSyfDFmr511KV7s++t8STE6UhqW8=
+res/edje/main.edj__DEL__tKBHNngjGJ0Sg7oLbjUMXSvxRhBhe+sXkWRMBcB6G/g=
+res/edje/map.edj__DEL__UXAXof+qIgT8nIlkBr2FlorpXygjAv+uZYUDPoHodLk=
+res/edje/ui_manager.edj__DEL__uE2PyHTnHOBJ0FD0PtaMrNq9s6UYZX/ggAwF5amY0yA=
 res/images/1.png__DEL__QzqOQcOu0VhhyeDuwdiubeHhy+gzc2UU0S1Xy2zk1N4=
 res/images/2.png__DEL__Nqg8/Msf7nJDUGTk7wtYNeep0vlxqJY40h30x2uZs3g=
 res/images/3.png__DEL__Dd9LyPZ83o2gyNvkdbQbiDsUBOnzB5EuVRjYLZJ72ec=
@@ -64,12 +71,8 @@ res/images/searching_list.png__DEL__DxLv0eY7y9WnJYMHrcOYG2s5lHRJY40hRdUhvkRJyoM=
 res/images/world_map.png__DEL__qzld1q4JAzcy/4ndsTnaCAG5tWuy+DpL9WK1a6noKLU=
 shared/res/adventure.png__DEL__1d0oEZHqPn+QzNzGIHwj9ODby6x9ggFs9uOsav6jPNs=
 tizen-manifest.xml__DEL__Yqjrp1NnUuO8yN5E0COzisOuxQ6Rf1IK71K8FAFHPr8=
-author-signature.xml__DEL__Z6itIJ1KFMy3xz4Tu3HHRtigxZe64eORSqh161+Ifu0=
+author-signature.xml__DEL__F2Bw1gK/36loCRR2gKi6JtuBduRrg9NSUEnThXWNaP0=
 res/edje/conf.h__DEL__2L7Zm8aBUiBKOlvrJDGAq6HfqPaIEm4imGYdgrAJPuc=
-bin/adventure__DEL__HbvN6Er7lz1CkmHOluplj6RE8AvhU/d/9WBVEQeYyWI=
-res/edje/entry.edj__DEL__dhfb2+UGowaqDXlPRl0vcyHfBKXP/z4mKSLii70kZPE=
-res/edje/item.edj__DEL__iZZ/S6hEKFjbDwVnpkRzgpkt3ygEoskGoTH2J+yC15k=
-res/edje/main.edj__DEL__tKBHNngjGJ0Sg7oLbjUMXSvxRhBhe+sXkWRMBcB6G/g=
-res/edje/main_view.edj__DEL__WIKYMj7yZa27YrFfJ8mQ7XszljiLnRi3gXcg55pCQ5Q=
-res/edje/map.edj__DEL__UXAXof+qIgT8nIlkBr2FlorpXygjAv+uZYUDPoHodLk=
-res/edje/ui_manager.edj__DEL__uE2PyHTnHOBJ0FD0PtaMrNq9s6UYZX/ggAwF5amY0yA=
+res/edje/item.edj__DEL__NbZos12kPJqigFIFTr2p6uno3CFx9si9dBZ8i4qXq0c=
+res/edje/main_view.edj__DEL__I2Hbg+dKCMMGe+WFLoVF1G2ZSw0mEoVO8106wIDPgCw=
+bin/adventure__DEL__O9q561q7u3DWeJ9n2JtUa3BB4wrlEgQfvSWeiiZnoFg=

diff --git a/.sign/author-signature.xml b/.sign/author-signature.xml
index 7a68f1f..ea89e67 100644 (file)
--- a/.sign/author-signature.xml
+++ b/.sign/author-signature.xml
@@ -4,7 +4,11 @@
 <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"></SignatureMethod>
 <Reference URI="bin%2Fadventure">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>HbvN6Er7lz1CkmHOluplj6RE8AvhU/d/9WBVEQeYyWI=</DigestValue>
+<DigestValue>O9q561q7u3DWeJ9n2JtUa3BB4wrlEgQfvSWeiiZnoFg=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fadventure.edj">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>X0lLhpjFISr9oUvwO8D+7EiWQgVj1KhVbUOCxEqHCaE=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fbtn.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
@@ -186,9 +190,17 @@
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>qzld1q4JAzcy/4ndsTnaCAG5tWuy+DpL9WK1a6noKLU=</DigestValue>
 </Reference>
+<Reference URI="res%2Fedje%2Finitial.edj">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>lcGlKgrBUdQ2/z7UM79zg84fs88c+kFeYcqJFowyzH4=</DigestValue>
+</Reference>
 <Reference URI="res%2Fedje%2Fitem.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>iZZ/S6hEKFjbDwVnpkRzgpkt3ygEoskGoTH2J+yC15k=</DigestValue>
+<DigestValue>NbZos12kPJqigFIFTr2p6uno3CFx9si9dBZ8i4qXq0c=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Floading.edj">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>h2nDJeSMjLz/rZ8wSyfDFmr511KV7s++t8STE6UhqW8=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fmain.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
@@ -196,7 +208,7 @@
 </Reference>
 <Reference URI="res%2Fedje%2Fmain_view.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>WIKYMj7yZa27YrFfJ8mQ7XszljiLnRi3gXcg55pCQ5Q=</DigestValue>
+<DigestValue>I2Hbg+dKCMMGe+WFLoVF1G2ZSw0mEoVO8106wIDPgCw=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fmap.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
@@ -307,11 +319,11 @@
 </Reference>
 </SignedInfo>
 <SignatureValue>
-rpnfAAyBNrKwtCMT/UQz9RLCgfYSQjAfJcF/B2KwVsglxrniUA+lrxAHxjmfECeVDrqH3NJP6Pct
-HSopEoWz29J5w22Ywb3sTAeZHGsmmI24e9J6s9EiL1HOryOfMuoNv3yP4ob5aLSulUxKxR27Qz4I
-8GhkJJt/CnvIu3+Di5uN8Q7y9BXmVtry7lK8zULM9RBTgepEt2l7nW1ZbScHL2kcCG2WYcf27/YW
-6GgCkWe6PU7UaLwHLimhgNDkgi+BTV5QvhYUiIB80sJSSZB8ZeXzPN+EuVzRp1OFnFkr34FwvqaW
-6GLNxsigP49jYUu4RW8d0umRpMO0A5AhhAoXrg==
+PEvfwKUu3H3x044gAQi/qz0q39iuTsqgfekmdVEr1Tov6EjJxU8AzIgChJFJC271Qd07ntKXxpc6
+PTYdni80INHUIPhFzR5YKYIb5wzaN4i9Ws/PkBLUh6r5AfW+x0CSOgfkoM+52Fxh9digl3WR1u+z
+EVquAN/IT2u8K8imMZ4yo2+LwnYrGqkAXclcqDN0Z3KqDe50Zx/DMSqsleM8YllmUjHHeOl2hvMQ
+oPAxYYVAwNIdjkPf0B5235h16ywVOy3pLtapKdEOG3qc2uwnaIkdj5zM79YRqzAqA92zyKAUFsyQ
+t9BHjHKroVEbwoHj3drUM3lvmwjRtlh/dInXFw==
 </SignatureValue>
 <KeyInfo>
 <X509Data>
@@ -319,20 +331,20 @@ HSopEoWz29J5w22Ywb3sTAeZHGsmmI24e9J6s9EiL1HOryOfMuoNv3yP4ob5aLSulUxKxR27Qz4I
 MIIDqTCCApGgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBsDELMAkGA1UEBhMCS1IxFDASBgNVBAgM
 C1NvdXRoIEtvcmVhMQ4wDAYDVQQHDAVTdXdvbjEmMCQGA1UECgwdU2Ftc3VuZyBFbGVjdHJvbmlj
 cyBDby4sIEx0ZC4xDzANBgNVBAsMBk1vYmlsZTEgMB4GA1UEAwwXU2Ftc3VuZyBBdXRob3IgQ0Eg
-Q2xhc3MxIDAeBgkqhkiG9w0BCQEWEXRpemVuQHNhbXN1bmcuY29tMB4XDTE1MDcxNDAwNTIwMVoX
-DTE2MDcxMzAwNTIwMVowYzELMAkGA1UEBhMCS1IxCTAHBgNVBAgTADEOMAwGA1UEBxMFU2VvdWwx
+Q2xhc3MxIDAeBgkqhkiG9w0BCQEWEXRpemVuQHNhbXN1bmcuY29tMB4XDTE1MDcxMjE2MzY0M1oX
+DTE2MDcxMTE2MzY0M1owYzELMAkGA1UEBhMCS1IxCTAHBgNVBAgTADEOMAwGA1UEBxMFU2VvdWwx
 FjAUBgNVBAoTDXN0b3J5Y29tcGlsZXIxCTAHBgNVBAsTADEWMBQGA1UEAxMNc3Rvcnljb21waWxl
-cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0HE4TB6oWNUk4IHuJOL+4UuH1LnTIK
-JRjMONEwpHQW7MLGVzlS6rFGeVxBaoqpKQ+D+QefE3ckLhwUNGR4vLTqQk4OQM2xtlgEoBc7FalJ
-6PtAgwKHtAJhavJxQGwmYe+jodFs/N6WoehuGv7K+JvFniXuhL5bDrnU7zOzv8yqB5S+jBR0MsvO
-GbHf2NaV/K+F+GLCMoT/FDlJFwLMntKb3kN8Y/mKIdXcdxRonOg8BTHczcqQcf4k5ocW6AxpATrS
-Y5wEkIFo2kqv8ZrsAVJbedCiUZt08akgrc+NShcEdpsPrAIieDX0mkCBqRlF7RdLX4PG7oKj3xYq
-fA1fUecCAwEAAaMaMBgwCQYDVR0TBAIwADALBgNVHQ8EBAMCB4AwDQYJKoZIhvcNAQELBQADggEB
-AGgVJ4D9nJYDeqI0aBNL09vfbqY1JRKHS06r9/gNawlnm8NDyBwUwlGJoZoFZrHc+9ASrBF5+A6G
-GHb8HwS3mor9CbMVKFO0b7kyXMFDwx8Ev69SN067sDusHrrEy68X5oxV9coVtRu6x91aSbGG/lZb
-jK4DDzqgw4q8Sm61IhjIms1jzH6at6VMweOzHcF3+dvv4BIGZKv4+sDpmNGnj4g1cLLxe1GbnVKC
-vXXmGsLw0dh83frXoZxfHkuAu+IpyrK1oFMinxp72FzAFJXl9i2gbkWVS/+39RqtrzaV1sfmcMb1
-0D45NzqJ5VC4qZMkM7YgcICxSHoqh57eRovCJE0=
+cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtSaQjkdqd3YjDUM5rnY0Ak0m0H/4Mp
+doG2AILo5iWvNCazuWUAi7kfqJZMCSooWWuoON58ymXPBVxP2wDVz2Nb8zbOsMGaYYi9I96QexeG
+RB2tR67ZC9MsVGZdPtIH8JkFsJQlh08rKz69FmrDOdIvOYaix1ww5f1KGUxZh6sNx7G/P4JvqlDL
+9VhnJhZcKEDE+VyvGEi90Hi9urw64MJajXJ7ByRLMTXni25xf63oHWsdT4u5VAvL1cH/fZK1xiZs
+sQXcuZYtM3tTPWKVbXQC69MrL5ZBOZn04ysjR2HWqvsVzdHlhn9dfQUQAqeKZPjTSHQoYIIHVnvW
+yj3yyyMCAwEAAaMaMBgwCQYDVR0TBAIwADALBgNVHQ8EBAMCB4AwDQYJKoZIhvcNAQELBQADggEB
+AJKkHvaPqYCpmb5ZRoTu6a0wWOZ+N6T5PJIZ04LjbcED8HIeegOkTdNmnGujXfqhlgNpKGteINk7
+E2/dDm6IaYHfiGtfH6KsuMbsGqz07Kk1MYYb9hI+4453hf27dt5UlX3PCSHqDdUCTCqVBvKxSfBR
+q/arVv8Vi9HqBOQG2A+x0nyo0QTWTOt2ata2KdeTYFCReD/IT60PnEYIXB+5CF71SqQLdIBMxpis
+ERuIb0bKE/x1Cni5opYPuYQOBmVJyB15AjSnMI9wivCl5Gz/jOB/ORCjCLALrJZE2LZzqGPdScGX
+XtlunfEoxvoAf/3sCqst0xA/zq0W9dzXg/tPNLc=
 </X509Certificate>
 <X509Certificate>
 MIIDmzCCAoOgAwIBAgICYygwDQYJKoZIhvcNAQELBQAwXjEaMBgGA1UECgwRVGl6ZW4gQXNzb2Np

diff --git a/.sign/signature1.xml b/.sign/signature1.xml
index e8ebf38..ee73263 100644 (file)
--- a/.sign/signature1.xml
+++ b/.sign/signature1.xml
@@ -4,11 +4,15 @@
 <SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"></SignatureMethod>
 <Reference URI="author-signature.xml">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>Z6itIJ1KFMy3xz4Tu3HHRtigxZe64eORSqh161+Ifu0=</DigestValue>
+<DigestValue>F2Bw1gK/36loCRR2gKi6JtuBduRrg9NSUEnThXWNaP0=</DigestValue>
 </Reference>
 <Reference URI="bin%2Fadventure">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>HbvN6Er7lz1CkmHOluplj6RE8AvhU/d/9WBVEQeYyWI=</DigestValue>
+<DigestValue>O9q561q7u3DWeJ9n2JtUa3BB4wrlEgQfvSWeiiZnoFg=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fadventure.edj">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>X0lLhpjFISr9oUvwO8D+7EiWQgVj1KhVbUOCxEqHCaE=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fbtn.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
@@ -190,9 +194,17 @@
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>qzld1q4JAzcy/4ndsTnaCAG5tWuy+DpL9WK1a6noKLU=</DigestValue>
 </Reference>
+<Reference URI="res%2Fedje%2Finitial.edj">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>lcGlKgrBUdQ2/z7UM79zg84fs88c+kFeYcqJFowyzH4=</DigestValue>
+</Reference>
 <Reference URI="res%2Fedje%2Fitem.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>iZZ/S6hEKFjbDwVnpkRzgpkt3ygEoskGoTH2J+yC15k=</DigestValue>
+<DigestValue>NbZos12kPJqigFIFTr2p6uno3CFx9si9dBZ8i4qXq0c=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Floading.edj">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>h2nDJeSMjLz/rZ8wSyfDFmr511KV7s++t8STE6UhqW8=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fmain.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
@@ -200,7 +212,7 @@
 </Reference>
 <Reference URI="res%2Fedje%2Fmain_view.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>WIKYMj7yZa27YrFfJ8mQ7XszljiLnRi3gXcg55pCQ5Q=</DigestValue>
+<DigestValue>I2Hbg+dKCMMGe+WFLoVF1G2ZSw0mEoVO8106wIDPgCw=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fmap.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
@@ -311,11 +323,11 @@
 </Reference>
 </SignedInfo>
 <SignatureValue>
-0i+htmy7WW/Keyk/znLkah+4+e0iHZTwuK/IhSUZ9/WNoGaRw1koAUEvcmN0vQdUD1LPE2+ew4m/
-di2x9HMuc12iaXHleVRtH/a72QVaqf7J8NduXw6ihsdqxS9K3j/eWj5LWzMnzNL8VGM8fYWdE+2m
-AumTKVczTSpTcG4op/eL7QEbOs0jVwNHEylzFUeIgnoyu3f0HENYblWhKo3RtATX/kXCb2v1glyF
-kpWAhSuplPz70id1WoGcEu/BhXqcCCokgV5HBYfc9VXUirhvKNOarbFsCUztWZCEnRfCxMxZR1Hs
-dGoMDuW/vT9EnWNsfc0k+nVERWrFUIo0YQ4W2A==
+dML8C5HAU3r5G2uLzn0E8H14POWk2sRUqktakFU2b+e3Wbu5XTpZqFILhM/gz1YnlK/psm1xrDr3
+hhZ5/YRwo/YTHslRXL7BiTIGM8uEEbZVjz0wyN/4vGRP+lLKr22ApOntH2V8eZc1c+hMqIqZU4km
+vKpmo5YjXPevPS82VyIKK7GLVigUybYrXMivHoun4X/0BB9T9inj8sxNEE+nzs5IHlVfh6FWR0dy
+KwJ5oz74HRCEmhKtHPok81emGI9ZjCWzhszEZ2OAUwPw5HhCZ3mTxrLsKhxmAhcRVBHI5XcSEgJU
+nqps2gzDcthJrZKxJfuGv+hVhhNM6TwVH/G7NQ==
 </SignatureValue>
 <KeyInfo>
 <X509Data>
@@ -323,19 +335,19 @@ dGoMDuW/vT9EnWNsfc0k+nVERWrFUIo0YQ4W2A==
 MIIDgDCCAmigAwIBAgIBZTANBgkqhkiG9w0BAQsFADCBnjELMAkGA1UEBhMCS1IxFDASBgNVBAgM
 C1NvdXRoIEtvcmVhMQ4wDAYDVQQHDAVTdXdvbjEmMCQGA1UECgwdU2Ftc3VuZyBFbGVjdHJvbmlj
 cyBDby4sIEx0ZC4xDzANBgNVBAsMBk1vYmlsZTEwMC4GA1UEAwwnU2Ftc3VuZyBUaXplbiBERVZF
-TE9QRVIgUHVibGljIENBIENsYXNzMB4XDTE1MDcxNDAwNTMwMloXDTE2MDcxMzAwNTMwMlowTDEg
+TE9QRVIgUHVibGljIENBIENsYXNzMB4XDTE1MDcxMjE2Mzg0OVoXDTE2MDcxMTE2Mzg0OVowTDEg
 MB4GA1UEAwwXU2Ftc3VuZyBUaXplbiBEZXZlbG9wZXIxKDAmBgkqhkiG9w0BCQEWGXN0b3J5Y29t
-cGlsZXJAaGFubWFpbC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnAsQ5EukD
-8yPijdHPR4SC1sxT4PlfJkzQcV5udo7WXv7zg6xKHbnunFsYPIVr5mpsZm09TsLkN4cxxRvcX8to
-ky7X59q+fQ+hv7aFSNjqFU3fXe+OImSwr7rpXbi9SaNYDtGgYN8UCCFv1HJi5P7S2CU7Y3QpeZPm
-dFxBtA6s/H9BweDPnpUGBy+P5eEA5RzAiHKFxkXsUXoocUTZD/PS6NRJ1fW/fB1G1+m71iO0W1vg
-jdAzXexATUubLKpleYO6Cv7/qabBXtK9BirhKRy1Bse7sjFHLxmpdkmnBTY0JcZVGztllLu9vOhF
-N+RYXNx8CniPme3nUEa+si749MxdAgMBAAGjGjAYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgeAMA0G
-CSqGSIb3DQEBCwUAA4IBAQAmNV2xLkzcBQXo6pqs0aXm5yOknlUvY+w4qFVSHZFzuTUmCvawTnU+
-WB9UxNvHawbCu9H02bglKO8W06wWOT13ut+ZBSLEA5lREJO7jPdDNdEpzgOMm0CZI7wLV1V4gMRs
-7rrjv8WYKpm7xDSseYaWpiA/9uzLrBmjea5DBX8tYNTf1p5Tlu3bflVvj62rQDX8s0eLKkDOR6of
-/mTkGtNcI5QLjuCPH+OEzehJZClEvLGHaZtnX2zqM+Txk6oW/vI7tDK99fKpkxv7yGQnvFgAl3hD
-vYMjaiv1m1V8ZFJBrrZ8xQ8o1bubhyScQnnYxD/iJg3sUP2RxvQ38Op8zyuA
+cGlsZXJAaGFubWFpbC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBshhsY0pe
+M09HGcZlsCIVhnRXnEnJVW0SQ5ySfH9F4lngLBx6vsiMQiztKlCnDESAanNlauw+QMVjOfDmAtaH
+xY0GwCLdpYWJ0SYbRRaITV9cqgxau0UnwK+6x++zZoRorrvHYR9uOw8rtZhSeSyLbP/VQtf6Lr1c
+gZRdCToe+eEL+pZe9ZK/a22mNjUHtTMjbobqdHgY0MAHhu8+XDM8W3I2kGVoFbEGlCqU7FaTBFLW
+aTMRaANYsNcDbZ4Q0po/TVuXnFCgdRU2Y6OKR41x7t9mabYp379IoEzFeNIG6omC0XqQ/rPynEKB
+N1uhs25nE3wLBXj0er82/mnB4EW5AgMBAAGjGjAYMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgeAMA0G
+CSqGSIb3DQEBCwUAA4IBAQBbEG53EAnMQ/arTYz/XRZ9po4Agfg/NowPo7yFbiahYBnSefMh4jFo
+GT8GQWZLjhSs0PO5Brx6HMsLIk1RjnMiZyiQ82b5pdUoi7nNYa+NclemIVt6viTnCu5SMp9NNOzK
+iTttZI8VgepyqGOP5ky1uyikL15kBaCeiiDeuPawhnqGX1CScIZjTJ1unviBYgRc4U4cyIujNCZ9
+r9ui8yGT4dvX5cmVusmJvMA7+9ciuZ8kicjTxuJcVgQGhve66i5tY9fBDVnSpRVz3a6oyHAcRa7a
+aOlHNYdz4Feo0A44zUJXF0mKZ+TdH0XGT0uTg0O2+8w2GDsPToSXv+11YP0n
 </X509Certificate>
 <X509Certificate>
 MIIDuzCCAqOgAwIBAgICL+cwDQYJKoZIhvcNAQELBQAwgY8xCzAJBgNVBAYTAktSMRQwEgYDVQQI

diff --git a/inc/item.h b/inc/item.h
index ecf2300..086b52c 100644 (file)
--- a/inc/item.h
+++ b/inc/item.h
@@ -2,8 +2,9 @@
 #define __MOMENTIC_ITEM_H__
 
 #include <Elementary.h>
+#include "main_view.h"
 
-extern Evas_Object *item_create_typing(Evas_Object *parent, int city);
+extern Evas_Object *item_create_typing(Evas_Object *parent, int city, main_view_s *main_view_info);
 extern void item_destroy_typing(Evas_Object *item);
 
 extern Evas_Object *item_create_selecting(Evas_Object *parent, int city, int color);

diff --git a/res/edje/conf.h b/res/edje/conf.h
deleted file mode 120000 (symlink)
index 9c2356f..0000000
--- a/res/edje/conf.h
+++ /dev/null
@@ -1 +0,0 @@
-../../inc/conf.h
\ No newline at end of file

diff --git a/res/edje/item.edc b/res/edje/item.edc
index ae81596..e1415f5 100755 (executable)
--- a/res/edje/item.edc
+++ b/res/edje/item.edc
@@ -1,5 +1,5 @@
 #define ITEM_TYPING_WIDTH 442
-#define ITEM_TYPING_HEIGHT 30
+#define ITEM_TYPING_HEIGHT 50
 
 #define ITEM_SELECTING_WIDTH 480
 #define ITEM_SELECTING_HEIGHT 75
@@ -26,7 +26,7 @@ collections {
                                        rel1 { relative: 0.0 0.0; }
                                        rel2 { relative: 1.0 1.0; }
                                        min: ITEM_TYPING_WIDTH ITEM_TYPING_HEIGHT;
-                                       color: 247 208 143 255;
+                                       color: 247 208 143 200;
                                        visible: 1;
                                }
                        }
@@ -64,10 +64,10 @@ collections {
                                scale: 1;
                                description {
                                        state: "default" 0.0;
-                                       rel1 { relative: 73/ITEM_TYPING_WIDTH 0.0; to: "bg"; }
+                                       rel1 { relative: 20/ITEM_TYPING_WIDTH 0.0; to: "bg"; }
                                        rel2 { relative: 400/ITEM_TYPING_WIDTH 1.0; to: "bg"; }
                                        align: 0.5 0.5;
-                                       min: ITEM_SELECTING_HEIGHT ITEM_SELECTING_HEIGHT;
+                                       min: ITEM_TYPING_HEIGHT ITEM_TYPING_HEIGHT;
                                        fixed: 1 1;
                                        color: 0 0 0 0;
                                        visible: 1;

diff --git a/res/edje/main_view.edc b/res/edje/main_view.edc
index 12a4c9a..0db59a7 100755 (executable)
--- a/res/edje/main_view.edc
+++ b/res/edje/main_view.edc
@@ -125,12 +125,14 @@ collections {
                                name: "selected_scroller";
                                type: SWALLOW;
                                scale: 1;
-                               mouse_events: 0;
+                               mouse_events: 1;
                                description {
                                        state: "default" 0.0;
-                                       rel1 { relative: 0.5 1.0; to: "map"; }
-                                       rel2 { relative: 0.5 1.0; to: "map"; }
+                                       rel1 { relative: 0.5 0.5; to: "bg"; }
+                                       rel2 { relative: 0.5 0.5; to: "bg"; }
                                        align: 0.5 0.0;
+                                       min: 480 400;
+                                       fixed: 1 1;
                                        visible: 1;
                                }
                                description {
@@ -143,13 +145,13 @@ collections {
                                name: "entry_result";
                                type: SWALLOW;
                                scale: 1;
-                               mouse_events: 0;
+                               mouse_events: 1;
                                description {
                                        state: "default" 0.0;
                                        rel1 { relative: 0.5 0.5; to: "entry"; }
                                        rel2 { relative: 0.5 0.5; to: "entry"; }
                                        align: 0.5 0.0;
-                                       min: ENTRY_WIDTH ENTRY_RESULT_HEIGHT;
+                                       min: (ENTRY_WIDTH - 5) ENTRY_RESULT_HEIGHT;
                                        fixed: 1 1;
                                        visible: 1;
                                }

diff --git a/src/item.c b/src/item.c
index 25d04d2..a82c9b2 100644 (file)
--- a/src/item.c
+++ b/src/item.c
@@ -9,9 +9,12 @@
 #include "util.h"
 #include "city.h"
 #include "item.h"
+#include "main_view.h"
+#include "scroller.h"
 
 #define _EDJ(o) elm_layout_edje_get(o)
 const char *const DATA_KEY_RESULT = "result";
+const char *const DATA_KEY_CITY = "city";
 
 struct _result_info_s {
        Evas_Object *rect1;
@@ -55,23 +58,32 @@ void _text_set_here_time(Evas_Object *item, const char *part)
        elm_object_part_text_set(item, part, timezone_str);
 }
 
-static void _item_down_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
+static void _item_typing_down_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
        _D("An item is down");
 }
 
-static void _item_up_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
+static void _item_typing_up_cb(void *data, Evas_Object *obj, const char *emission, const char *source)
 {
-       Evas_Object *item= obj;
+       Evas_Object *item = obj;
+       Evas_Object *selecting_item = NULL;
+       main_view_s *main_view_info = data;
+       int city = 0;
 
        ret_if(!item);
+       ret_if(!main_view_info);
+       ret_if(!main_view_info->selected_scroller);
 
        _D("An item is selected");
 
-       /* Append to the selecting scroller */
+       city = (int) evas_object_data_get(item, DATA_KEY_CITY);
+       selecting_item = item_create_selecting(main_view_info->selected_scroller, city, 0);
+       ret_if(!selecting_item);
+
+       scroller_append_item(main_view_info->selected_scroller, selecting_item);
 }
 
-Evas_Object *item_create_typing(Evas_Object *parent, int city)
+Evas_Object *item_create_typing(Evas_Object *parent, int city, main_view_s *main_view_info)
 {
        Evas_Object *item = NULL;
        city_s *city_info = NULL;
@@ -95,6 +107,7 @@ Evas_Object *item_create_typing(Evas_Object *parent, int city)
 
        evas_object_size_hint_weight_set(item, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_size_hint_align_set(item, EVAS_HINT_FILL, EVAS_HINT_FILL);
+       evas_object_data_set(item, DATA_KEY_CITY, (void *) city);
        evas_object_show(item);
 
        city_info = city_get();
@@ -107,8 +120,8 @@ Evas_Object *item_create_typing(Evas_Object *parent, int city)
        snprintf(city_str, sizeof(city_str), "%s, %s", city_info[city].name, city_info[city].nation);
        elm_object_part_text_set(item, "city", city_str);
 
-       elm_object_signal_callback_add(item, "down", "item", _item_down_cb, NULL);
-       elm_object_signal_callback_add(item, "up", "item", _item_up_cb, NULL);
+       elm_object_signal_callback_add(item, "down", "item", _item_typing_down_cb, NULL);
+       elm_object_signal_callback_add(item, "up", "item", _item_typing_up_cb, main_view_info);
 
        return item;
 }
@@ -117,9 +130,10 @@ void item_destroy_typing(Evas_Object *item)
 {
        ret_if(!item);
 
-       elm_object_signal_callback_del(item, "down", "item", _item_down_cb);
-       elm_object_signal_callback_del(item, "up", "item", _item_up_cb);
+       elm_object_signal_callback_del(item, "down", "item", _item_typing_down_cb);
+       elm_object_signal_callback_del(item, "up", "item", _item_typing_up_cb);
 
+       evas_object_data_del(item, DATA_KEY_CITY);
        evas_object_del(item);
 }
 
@@ -149,6 +163,7 @@ Evas_Object *item_create_selecting(Evas_Object *parent, int city, int color)
 
        retv_if(!parent, NULL);
 
+       _D("HELLO, city:%d, color:%d", city, color);
        path = app_get_resource_path();
        retv_if(!path, NULL);
 
@@ -174,8 +189,10 @@ Evas_Object *item_create_selecting(Evas_Object *parent, int city, int color)
        snprintf(city_str, sizeof(city_str), "%s, %s", city_info[city].name, city_info[city].nation);
        elm_object_part_text_set(item, "city", city_str);
 
-       snprintf(color_str, sizeof(color_str), "%d", color);
-       elm_object_signal_emit(item, color_str, "mark");
+       if (color) {
+               snprintf(color_str, sizeof(color_str), "%d", color);
+               elm_object_signal_emit(item, color_str, "mark");
+       }
 
        elm_object_signal_callback_add(item, "delete,down", "item", _delete_down_cb, NULL);
        elm_object_signal_callback_add(item, "delete,up", "item", _delete_up_cb, NULL);

diff --git a/src/main_view.c b/src/main_view.c
index 88d8515..7ba71b7 100644 (file)
--- a/src/main_view.c
+++ b/src/main_view.c
@@ -12,7 +12,79 @@ const char *const MAIN_VIEW_EDJE = "main_view.edj";
 const char *const ENTRY_EDJE = "entry.edj";
 const char *const PREDICT_ITEM_EDJE = "predict_item.edj";
 
-static void _update_predict_scroller(Evas_Object *predict_scroller, const char *str);
+static void _append_item_to_predict_scroller(Evas_Object *predict_scroller, Evas_Object *item)
+{
+       Evas_Object *box = NULL;
+
+       ret_if(!predict_scroller);
+       ret_if(!item);
+
+       box = elm_object_content_get(predict_scroller);
+       ret_if(!box);
+
+       elm_box_pack_end(box, item);
+}
+
+static void _remove_item_in_predict_scroller(Evas_Object *predict_scroller, Evas_Object *item)
+{
+       Evas_Object *box = NULL;
+
+       ret_if(!predict_scroller);
+       ret_if(!item);
+
+       box = elm_object_content_get(predict_scroller);
+       ret_if(!box);
+
+       elm_box_unpack(box, item);
+}
+
+static void _clean_predict_scroller(Evas_Object *predict_scroller)
+{
+       Evas_Object *box = NULL;
+       Evas_Object *predict_item = NULL;
+       Eina_List *list = NULL;
+
+       ret_if(!predict_scroller);
+
+       box = elm_object_content_get(predict_scroller);
+       ret_if(!box);
+
+       list = elm_box_children_get(box);
+       ret_if(!list);
+
+       EINA_LIST_FREE(list, predict_item) {
+               item_destroy_typing(predict_item);
+       }
+}
+
+static void _update_predict_scroller(Evas_Object *predict_scroller, const char *str, main_view_s *main_view_info)
+{
+       city_s *city_info = NULL;
+       register int i = 0;
+
+       ret_if(!predict_scroller);
+
+       _clean_predict_scroller(predict_scroller);
+
+       city_info = city_get();
+       ret_if(!city_info);
+
+       for (; i < CITY_MAX; i++) {
+               int matched = 0;
+               if (city_info[i].name && strstr(city_info[i].name, str))
+                       matched = 1;
+               else if (city_info[i].nation && strstr(city_info[i].nation, str))
+                       matched = 1;
+
+               if (matched) {
+                       Evas_Object *predict_item = NULL;
+                       predict_item = item_create_typing(predict_scroller, i, main_view_info);
+                       if (predict_item)
+                               _append_item_to_predict_scroller(predict_scroller, predict_item);
+               }
+       }
+       elm_object_signal_emit(main_view_info->main_view, "show", "entry_result");
+}
 
 static void _change_entry_cb(void *data, Evas_Object *obj, void *event_info)
 {
@@ -22,19 +94,46 @@ static void _change_entry_cb(void *data, Evas_Object *obj, void *event_info)
 
        ret_if(!main_view_info);
 
+       _D("Entry is changed");
+
        str = elm_entry_entry_get(entry);
-       if (!str)
+       if (!str
+               || (str && !strlen(str))) {
+               _clean_predict_scroller(main_view_info->predict_scroller);
                return;
+       }
 
-       _update_predict_scroller(main_view_info->predict_scroller, str);
+       _update_predict_scroller(main_view_info->predict_scroller, str, main_view_info);
 }
 
 static void _focus_entry_cb(void *data, Evas_Object *obj, void *event_info)
 {
+       main_view_s *main_view_info = data;
+       Evas_Object *entry = obj;
+       const char *str = NULL;
+
+       ret_if(!main_view_info);
+
+       _D("Entry is focused");
+
+       str = elm_entry_entry_get(entry);
+       if (!str)
+               return;
+
+       _update_predict_scroller(main_view_info->predict_scroller, str, main_view_info);
 }
 
 static void _unfocus_entry_cb(void *data, Evas_Object *obj, void *event_info)
 {
+       main_view_s *main_view_info = data;
+
+       ret_if(!main_view_info);
+       ret_if(!main_view_info->predict_scroller);
+
+       _D("Entry is unfocused");
+
+       elm_object_signal_emit(main_view_info->main_view, "hide", "entry_result");
+       //_clean_predict_scroller(main_view_info->predict_scroller);
 }
 
 static void
@@ -54,12 +153,19 @@ static void _delete_up_cb(void *data, Evas_Object *obj, const char *emission, co
 {
        Evas_Object *entry = obj;
        Evas_Object *entry_obj = NULL;
+       main_view_s *main_view_info = data;
 
        ret_if(!entry);
+       ret_if(!main_view_info);
+       ret_if(!main_view_info->predict_scroller);
+
+       _D("Delete button is up");
 
        entry_obj = elm_object_part_content_get(entry, "entry");
        if (entry_obj)
                elm_entry_entry_set(entry_obj, "");
+
+       _clean_predict_scroller(main_view_info->predict_scroller);
 }
 
 static Evas_Object *_create_search_entry(Evas_Object *parent, main_view_s *main_view_info)
@@ -82,8 +188,8 @@ static Evas_Object *_create_search_entry(Evas_Object *parent, main_view_s *main_
        retv_if(!entry, NULL);
 
        elm_layout_file_set(entry, full_path, "main");
-       elm_object_signal_callback_add(entry, "delete,down", "entry", _delete_down_cb, entry);
-       elm_object_signal_callback_add(entry, "delete,up", "entry", _delete_up_cb, entry);
+       elm_object_signal_callback_add(entry, "delete,down", "entry", _delete_down_cb, main_view_info);
+       elm_object_signal_callback_add(entry, "delete,up", "entry", _delete_up_cb, main_view_info);
 
        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);
@@ -255,81 +361,6 @@ static void _destroy_predict_scroller(Evas_Object *predict_scroller)
        evas_object_del(predict_scroller);
 }
 
-static void _clean_predict_scroller(Evas_Object *predict_scroller)
-{
-       Evas_Object *box = NULL;
-       Evas_Object *predict_item = NULL;
-       Eina_List *list = NULL;
-
-       ret_if(!predict_scroller);
-
-       box = elm_object_content_get(predict_scroller);
-       ret_if(!box);
-
-       list = elm_box_children_get(box);
-       ret_if(!list);
-
-       EINA_LIST_FREE(list, predict_item) {
-               item_destroy_typing(predict_item);
-       }
-}
-
-static void _append_item_to_predict_scroller(Evas_Object *predict_scroller, Evas_Object *item)
-{
-       Evas_Object *box = NULL;
-
-       ret_if(!predict_scroller);
-       ret_if(!item);
-
-       box = elm_object_content_get(predict_scroller);
-       ret_if(!box);
-
-       elm_box_pack_end(box, item);
-}
-
-static void _remove_item_in_predict_scroller(Evas_Object *predict_scroller, Evas_Object *item)
-{
-       Evas_Object *box = NULL;
-
-       ret_if(!predict_scroller);
-       ret_if(!item);
-
-       box = elm_object_content_get(predict_scroller);
-       ret_if(!box);
-
-       elm_box_unpack(box, item);
-}
-
-static void _update_predict_scroller(Evas_Object *predict_scroller, const char *str)
-{
-       city_s *city_info = NULL;
-       register int i = 0;
-
-       ret_if(!predict_scroller);
-
-       _clean_predict_scroller(predict_scroller);
-
-       city_info = city_get();
-       ret_if(!city_info);
-
-       for (; i < CITY_MAX; i++) {
-               int matched = 0;
-               if (city_info[i].name && strstr(city_info[i].name, str))
-                       matched = 1;
-               else if (city_info[i].nation && strstr(city_info[i].nation, str))
-                       matched = 1;
-
-       _D("HELLO, matched:%d, name:%s, nation:%s", matched, city_info[i].name, city_info[i].nation);
-
-               if (matched) {
-                       Evas_Object *predict_item = NULL;
-                       predict_item = item_create_typing(predict_scroller, i);
-                       if (predict_item)
-                               _append_item_to_predict_scroller(predict_scroller, predict_item);
-               }
-       }
-}
-
 Evas_Object *main_view_create(Evas_Object *parent, moment_info_s *moment_info)
 {
        main_view_s *main_view_info = NULL;

diff --git a/src/scroller.c b/src/scroller.c
index bd98e5a..bf73762 100644 (file)
--- a/src/scroller.c
+++ b/src/scroller.c
@@ -84,7 +84,7 @@ Evas_Object *scroller_create(Evas_Object *parent)
        retv_if(!scroller, NULL);
 
        elm_scroller_bounce_set(scroller, EINA_FALSE, EINA_TRUE);
-       elm_scroller_policy_set(scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_ON);
+       elm_scroller_policy_set(scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);
        elm_scroller_page_scroll_limit_set(scroller, 0, 0);
        elm_scroller_content_min_limit(scroller, EINA_TRUE, EINA_FALSE);
        elm_scroller_single_direction_set(scroller, ELM_SCROLLER_SINGLE_DIRECTION_HARD);
@@ -107,8 +107,9 @@ Evas_Object *scroller_create(Evas_Object *parent)
        goto_if(!box, ERROR);
 
        elm_box_horizontal_set(box, EINA_FALSE);
+       elm_box_homogeneous_set(box, EINA_FALSE);
        elm_box_align_set(box, 0.0, 0.0);
-       evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, 0.0);
        evas_object_show(box);
 
        elm_object_content_set(scroller, box);