Search : scroller & item

diff --git a/.cproject b/.cproject
index 81b6121..b0bdcbc 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-emulator.core_llvm34.i386.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-2.3-device.core_llvm34.armel.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,6 +94,7 @@
                                                                        <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;"/>
@@ -111,7 +112,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-emulator.core_llvm34.i386.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-2.3-device.core_llvm34.armel.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;"/>
@@ -180,6 +181,7 @@
                                                                        <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;"/>
@@ -213,7 +215,7 @@
                                                                        <additionalInput kind="additionalinput" paths="$(LIBS)"/>
                                                                </inputType>
                                                        </tool>
-                                                       <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">
+                                                       <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">
                                                                <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"/>
@@ -234,7 +236,7 @@
                                        </fileInfo>
                                        <fileInfo id="org.tizen.nativecore.config.sbi.gcc45.app.debug.1621246236.995894341" name="item.edc" rcbsApplicability="disable" resourcePath="res/edje/item.edc" toolsToInvoke="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.1964376477">
                                                <tool id="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924.1964376477" name="EDC Resource Compiler" superClass="org.tizen.nativecore.tool.sbi.edc.compiler.1535918924">
-                                                       <option id="sbi.gnu.edc.compiler.option.misc.id.110524609" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList">
+                                                       <option id="sbi.gnu.edc.compiler.option.misc.id.110524609" name="Image Path (-id)" superClass="sbi.gnu.edc.compiler.option.misc.id" valueType="stringList">
                                                                <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/edje/images&quot;"/>
                                                                <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}/res/edje/images&quot;"/>
                                                        </option>

diff --git a/.rds_delta b/.rds_delta
index 2c64b8f..2b2e92e 100644 (file)
--- a/.rds_delta
+++ b/.rds_delta
@@ -1,9 +1,14 @@
 #delete
-#add
+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 0948ea1..655c136 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 fd5e37b..25f3805 100644 (file)
--- a/.sign/.manifest.tmp
+++ b/.sign/.manifest.tmp
@@ -1,5 +1,3 @@
-res/edje/.ui_manager.edc.swp__DEL__FdzMWrU685Z4CBkIo+DTEMDroxiw1EWmgkBkES/WFcg=
-res/edje/adventure.edj__DEL__X0lLhpjFISr9oUvwO8D+7EiWQgVj1KhVbUOCxEqHCaE=
 res/edje/btn.png__DEL__/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=
 res/edje/images/1.png__DEL__oP1soFdNokYu42XfoWKq0uYAP9o6PGUCGdnxQYErGdQ=
 res/edje/images/10.png__DEL__gebvW4D13j2AGUPkJInqNpANPhlECcq5EkIty5Coxhk=
@@ -34,14 +32,15 @@ res/edje/images/Aventure01_background.png__DEL__uVdgx+2km5hdx3T3JYTz+hNSxxd4gTcg
 res/edje/images/Location.gif__DEL__Ko18RQvv9/53OIzUjRn3RQX7OY/uxSMrTftVR+U5MyQ=
 res/edje/images/bg.jpg__DEL__SSV4Z8etCQia9+5Dq/LbsKCEOyQw41pkBmaarK34/us=
 res/edje/images/btn.png__DEL__/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=
+res/edje/images/delete_button.png__DEL__M7GV+elEh5vUdXpHd+n3prFpfuCQ8zr8OKrRkPFQYmc=
+res/edje/images/my_status_small.png__DEL__WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=
+res/edje/images/other_location_blue.png__DEL__HM597R6uiLMSWC4J1aJrLX8gKil8XnqPQEu7NdYfsb8=
+res/edje/images/other_location_blue_small.png__DEL__8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=
+res/edje/images/other_location_mint.png__DEL__OdqkoE6muo6CRz8MZ+n2eVFYpcWKikNDX/InU/dZGD8=
+res/edje/images/other_location_mint_small.png__DEL__6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=
 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__tRQOFk919joeNAQB6/qaVXMHO+bJwNCV6M4SUGU3cjw=
-res/edje/map.edj__DEL__S0shummBRTE46oVfSeS5lI7fxRlE+tzF7aBP9gqDTHI=
-res/edje/ui_manager.edj__DEL__9CHFRPeJblDPPktd3vUohJxPSMnjFd8wMWESIUWEcbw=
 res/images/1.png__DEL__QzqOQcOu0VhhyeDuwdiubeHhy+gzc2UU0S1Xy2zk1N4=
 res/images/2.png__DEL__Nqg8/Msf7nJDUGTk7wtYNeep0vlxqJY40h30x2uZs3g=
 res/images/3.png__DEL__Dd9LyPZ83o2gyNvkdbQbiDsUBOnzB5EuVRjYLZJ72ec=
@@ -54,19 +53,23 @@ res/images/floting_next_button.png__DEL__Xnd/jLz72da0xhXIOh2i/GaI8rKE85jxY39NaTs
 res/images/line.png__DEL__mC2lw0XczhZ41ZKBKt5ft3YcObs+IGDudh0xfkOJwQE=
 res/images/map_background.png__DEL__fidI2puLNy+2OtfFScQOt4BhzflQJ2EU87bersaQZPM=
 res/images/my status.png__DEL__chJQ+viqT/s6txKWRQ/8IDkZUP47RkBzDvKjW1p+0iM=
-res/images/my status_small.png__DEL__WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=
-res/images/other location_blue.png__DEL__HM597R6uiLMSWC4J1aJrLX8gKil8XnqPQEu7NdYfsb8=
-res/images/other location_blue_small.png__DEL__8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=
-res/images/other location_mint.png__DEL__OdqkoE6muo6CRz8MZ+n2eVFYpcWKikNDX/InU/dZGD8=
-res/images/other location_mint_small.png__DEL__6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=
+res/images/my_status_small.png__DEL__WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=
+res/images/other_location_blue.png__DEL__HM597R6uiLMSWC4J1aJrLX8gKil8XnqPQEu7NdYfsb8=
+res/images/other_location_blue_small.png__DEL__8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=
+res/images/other_location_mint.png__DEL__OdqkoE6muo6CRz8MZ+n2eVFYpcWKikNDX/InU/dZGD8=
+res/images/other_location_mint_small.png__DEL__6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=
 res/images/searching_X.png__DEL__6/v6iyrX0VC79xo5sWw6RsvOQMTwjHprPpyOTBpmNak=
 res/images/searching_bar.png__DEL__j4Dcx7rYG8+eeyOZVoEbQweee9+MbC6ifCUq5MOkhO0=
 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__nFxynF3Jm+ulXIncwGL+HtamNoGZ990bTXs02Zfc9iY=
-res/edje/entry.edj__DEL__fNXD4kEtJobkUFECfF/6+2M5amQd2dWQ4bqM1ZyNfvQ=
-bin/adventure__DEL__5djdG3hRBXD6UgUaeKwJ0ZuafF/5yUlHrIcRf0nCQz0=
-res/edje/item.edj__DEL__x2E/6ScWuOlAbzCgY5kEK5CKGCjoIboJ27yfJig2i24=
-res/edje/main_view.edj__DEL__E6dsQViGfjXCj8UsKH3tCbZC2PZR65srKrSHgwhz6lE=
+author-signature.xml__DEL__Z6itIJ1KFMy3xz4Tu3HHRtigxZe64eORSqh161+Ifu0=
+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=

diff --git a/.sign/author-signature.xml b/.sign/author-signature.xml
index e368263..7a68f1f 100644 (file)
--- a/.sign/author-signature.xml
+++ b/.sign/author-signature.xml
@@ -4,23 +4,19 @@
 <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>5djdG3hRBXD6UgUaeKwJ0ZuafF/5yUlHrIcRf0nCQz0=</DigestValue>
-</Reference>
-<Reference URI="res%2Fedje%2F.ui_manager.edc.swp">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>FdzMWrU685Z4CBkIo+DTEMDroxiw1EWmgkBkES/WFcg=</DigestValue>
-</Reference>
-<Reference URI="res%2Fedje%2Fadventure.edj">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>X0lLhpjFISr9oUvwO8D+7EiWQgVj1KhVbUOCxEqHCaE=</DigestValue>
+<DigestValue>HbvN6Er7lz1CkmHOluplj6RE8AvhU/d/9WBVEQeYyWI=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fbtn.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=</DigestValue>
 </Reference>
+<Reference URI="res%2Fedje%2Fconf.h">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>2L7Zm8aBUiBKOlvrJDGAq6HfqPaIEm4imGYdgrAJPuc=</DigestValue>
+</Reference>
 <Reference URI="res%2Fedje%2Fentry.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>fNXD4kEtJobkUFECfF/6+2M5amQd2dWQ4bqM1ZyNfvQ=</DigestValue>
+<DigestValue>dhfb2+UGowaqDXlPRl0vcyHfBKXP/z4mKSLii70kZPE=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fimages%2F1.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
@@ -154,6 +150,30 @@
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=</DigestValue>
 </Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fdelete_button.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>M7GV+elEh5vUdXpHd+n3prFpfuCQ8zr8OKrRkPFQYmc=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fmy_status_small.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fother_location_blue.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>HM597R6uiLMSWC4J1aJrLX8gKil8XnqPQEu7NdYfsb8=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fother_location_blue_small.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fother_location_mint.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>OdqkoE6muo6CRz8MZ+n2eVFYpcWKikNDX/InU/dZGD8=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fother_location_mint_small.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=</DigestValue>
+</Reference>
 <Reference URI="res%2Fedje%2Fimages%2Fsearching_X.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>6/v6iyrX0VC79xo5sWw6RsvOQMTwjHprPpyOTBpmNak=</DigestValue>
@@ -166,33 +186,25 @@
 <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>x2E/6ScWuOlAbzCgY5kEK5CKGCjoIboJ27yfJig2i24=</DigestValue>
-</Reference>
-<Reference URI="res%2Fedje%2Floading.edj">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>h2nDJeSMjLz/rZ8wSyfDFmr511KV7s++t8STE6UhqW8=</DigestValue>
+<DigestValue>iZZ/S6hEKFjbDwVnpkRzgpkt3ygEoskGoTH2J+yC15k=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fmain.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>tRQOFk919joeNAQB6/qaVXMHO+bJwNCV6M4SUGU3cjw=</DigestValue>
+<DigestValue>tKBHNngjGJ0Sg7oLbjUMXSvxRhBhe+sXkWRMBcB6G/g=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fmain_view.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>E6dsQViGfjXCj8UsKH3tCbZC2PZR65srKrSHgwhz6lE=</DigestValue>
+<DigestValue>WIKYMj7yZa27YrFfJ8mQ7XszljiLnRi3gXcg55pCQ5Q=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fmap.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>S0shummBRTE46oVfSeS5lI7fxRlE+tzF7aBP9gqDTHI=</DigestValue>
+<DigestValue>UXAXof+qIgT8nIlkBr2FlorpXygjAv+uZYUDPoHodLk=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fui_manager.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>9CHFRPeJblDPPktd3vUohJxPSMnjFd8wMWESIUWEcbw=</DigestValue>
+<DigestValue>uE2PyHTnHOBJ0FD0PtaMrNq9s6UYZX/ggAwF5amY0yA=</DigestValue>
 </Reference>
 <Reference URI="res%2Fimages%2F1.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
@@ -242,23 +254,23 @@
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>chJQ+viqT/s6txKWRQ/8IDkZUP47RkBzDvKjW1p+0iM=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2Fmy%20status_small.png">
+<Reference URI="res%2Fimages%2Fmy_status_small.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2Fother%20location_blue.png">
+<Reference URI="res%2Fimages%2Fother_location_blue.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>HM597R6uiLMSWC4J1aJrLX8gKil8XnqPQEu7NdYfsb8=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2Fother%20location_blue_small.png">
+<Reference URI="res%2Fimages%2Fother_location_blue_small.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2Fother%20location_mint.png">
+<Reference URI="res%2Fimages%2Fother_location_mint.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>OdqkoE6muo6CRz8MZ+n2eVFYpcWKikNDX/InU/dZGD8=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2Fother%20location_mint_small.png">
+<Reference URI="res%2Fimages%2Fother_location_mint_small.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=</DigestValue>
 </Reference>
@@ -295,11 +307,11 @@
 </Reference>
 </SignedInfo>
 <SignatureValue>
-Wx++glY2PNxVZ3isaCcQE/XK4aJi+vCsNw2tBTVXrn5f3P6Vco2YKEIeWJQcZYzxWJMO8cELjmLU
-ZtXwXso5UuI1OmrGfUYRepwIzBLGnCqVokyv3oTGCTINIB1KoDYROVsNRi5Q+Nx8U/FF6q3ewDaY
-acrgyzKOYfcAfsjpsa9i8RuQr9uxI2FHhZJ6s/UOK+BDNE4RcCtlSMNR5UUId7W10Ys3w39+t64W
-66vr6gsufT+O0GVK89qY1DBba4SIakfgL+pbG7BffmjQaUFKn3oKOrSPOHxNyw8R8rUy5xPQ3baB
-Mzn17ZKwYjqcgREJ+BjAkUJXakbr67OUwYgt+w==
+rpnfAAyBNrKwtCMT/UQz9RLCgfYSQjAfJcF/B2KwVsglxrniUA+lrxAHxjmfECeVDrqH3NJP6Pct
+HSopEoWz29J5w22Ywb3sTAeZHGsmmI24e9J6s9EiL1HOryOfMuoNv3yP4ob5aLSulUxKxR27Qz4I
+8GhkJJt/CnvIu3+Di5uN8Q7y9BXmVtry7lK8zULM9RBTgepEt2l7nW1ZbScHL2kcCG2WYcf27/YW
+6GgCkWe6PU7UaLwHLimhgNDkgi+BTV5QvhYUiIB80sJSSZB8ZeXzPN+EuVzRp1OFnFkr34FwvqaW
+6GLNxsigP49jYUu4RW8d0umRpMO0A5AhhAoXrg==
 </SignatureValue>
 <KeyInfo>
 <X509Data>
@@ -307,20 +319,20 @@ Mzn17ZKwYjqcgREJ+BjAkUJXakbr67OUwYgt+w==
 MIIDqTCCApGgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBsDELMAkGA1UEBhMCS1IxFDASBgNVBAgM
 C1NvdXRoIEtvcmVhMQ4wDAYDVQQHDAVTdXdvbjEmMCQGA1UECgwdU2Ftc3VuZyBFbGVjdHJvbmlj
 cyBDby4sIEx0ZC4xDzANBgNVBAsMBk1vYmlsZTEgMB4GA1UEAwwXU2Ftc3VuZyBBdXRob3IgQ0Eg
-Q2xhc3MxIDAeBgkqhkiG9w0BCQEWEXRpemVuQHNhbXN1bmcuY29tMB4XDTE1MDcxMjE2MzY0M1oX
-DTE2MDcxMTE2MzY0M1owYzELMAkGA1UEBhMCS1IxCTAHBgNVBAgTADEOMAwGA1UEBxMFU2VvdWwx
+Q2xhc3MxIDAeBgkqhkiG9w0BCQEWEXRpemVuQHNhbXN1bmcuY29tMB4XDTE1MDcxNDAwNTIwMVoX
+DTE2MDcxMzAwNTIwMVowYzELMAkGA1UEBhMCS1IxCTAHBgNVBAgTADEOMAwGA1UEBxMFU2VvdWwx
 FjAUBgNVBAoTDXN0b3J5Y29tcGlsZXIxCTAHBgNVBAsTADEWMBQGA1UEAxMNc3Rvcnljb21waWxl
-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=
+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=
 </X509Certificate>
 <X509Certificate>
 MIIDmzCCAoOgAwIBAgICYygwDQYJKoZIhvcNAQELBQAwXjEaMBgGA1UECgwRVGl6ZW4gQXNzb2Np

diff --git a/.sign/signature1.xml b/.sign/signature1.xml
index 1dc694f..e8ebf38 100644 (file)
--- a/.sign/signature1.xml
+++ b/.sign/signature1.xml
@@ -4,27 +4,23 @@
 <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>nFxynF3Jm+ulXIncwGL+HtamNoGZ990bTXs02Zfc9iY=</DigestValue>
+<DigestValue>Z6itIJ1KFMy3xz4Tu3HHRtigxZe64eORSqh161+Ifu0=</DigestValue>
 </Reference>
 <Reference URI="bin%2Fadventure">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>5djdG3hRBXD6UgUaeKwJ0ZuafF/5yUlHrIcRf0nCQz0=</DigestValue>
-</Reference>
-<Reference URI="res%2Fedje%2F.ui_manager.edc.swp">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>FdzMWrU685Z4CBkIo+DTEMDroxiw1EWmgkBkES/WFcg=</DigestValue>
-</Reference>
-<Reference URI="res%2Fedje%2Fadventure.edj">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>X0lLhpjFISr9oUvwO8D+7EiWQgVj1KhVbUOCxEqHCaE=</DigestValue>
+<DigestValue>HbvN6Er7lz1CkmHOluplj6RE8AvhU/d/9WBVEQeYyWI=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fbtn.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=</DigestValue>
 </Reference>
+<Reference URI="res%2Fedje%2Fconf.h">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>2L7Zm8aBUiBKOlvrJDGAq6HfqPaIEm4imGYdgrAJPuc=</DigestValue>
+</Reference>
 <Reference URI="res%2Fedje%2Fentry.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>fNXD4kEtJobkUFECfF/6+2M5amQd2dWQ4bqM1ZyNfvQ=</DigestValue>
+<DigestValue>dhfb2+UGowaqDXlPRl0vcyHfBKXP/z4mKSLii70kZPE=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fimages%2F1.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
@@ -158,6 +154,30 @@
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>/mnezJ6XMU4nvJ7/Ts0SYNw07RbVB7g3Lfe2XTkipH8=</DigestValue>
 </Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fdelete_button.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>M7GV+elEh5vUdXpHd+n3prFpfuCQ8zr8OKrRkPFQYmc=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fmy_status_small.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fother_location_blue.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>HM597R6uiLMSWC4J1aJrLX8gKil8XnqPQEu7NdYfsb8=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fother_location_blue_small.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fother_location_mint.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>OdqkoE6muo6CRz8MZ+n2eVFYpcWKikNDX/InU/dZGD8=</DigestValue>
+</Reference>
+<Reference URI="res%2Fedje%2Fimages%2Fother_location_mint_small.png">
+<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
+<DigestValue>6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=</DigestValue>
+</Reference>
 <Reference URI="res%2Fedje%2Fimages%2Fsearching_X.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>6/v6iyrX0VC79xo5sWw6RsvOQMTwjHprPpyOTBpmNak=</DigestValue>
@@ -170,33 +190,25 @@
 <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>x2E/6ScWuOlAbzCgY5kEK5CKGCjoIboJ27yfJig2i24=</DigestValue>
-</Reference>
-<Reference URI="res%2Fedje%2Floading.edj">
-<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>h2nDJeSMjLz/rZ8wSyfDFmr511KV7s++t8STE6UhqW8=</DigestValue>
+<DigestValue>iZZ/S6hEKFjbDwVnpkRzgpkt3ygEoskGoTH2J+yC15k=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fmain.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>tRQOFk919joeNAQB6/qaVXMHO+bJwNCV6M4SUGU3cjw=</DigestValue>
+<DigestValue>tKBHNngjGJ0Sg7oLbjUMXSvxRhBhe+sXkWRMBcB6G/g=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fmain_view.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>E6dsQViGfjXCj8UsKH3tCbZC2PZR65srKrSHgwhz6lE=</DigestValue>
+<DigestValue>WIKYMj7yZa27YrFfJ8mQ7XszljiLnRi3gXcg55pCQ5Q=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fmap.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>S0shummBRTE46oVfSeS5lI7fxRlE+tzF7aBP9gqDTHI=</DigestValue>
+<DigestValue>UXAXof+qIgT8nIlkBr2FlorpXygjAv+uZYUDPoHodLk=</DigestValue>
 </Reference>
 <Reference URI="res%2Fedje%2Fui_manager.edj">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
-<DigestValue>9CHFRPeJblDPPktd3vUohJxPSMnjFd8wMWESIUWEcbw=</DigestValue>
+<DigestValue>uE2PyHTnHOBJ0FD0PtaMrNq9s6UYZX/ggAwF5amY0yA=</DigestValue>
 </Reference>
 <Reference URI="res%2Fimages%2F1.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
@@ -246,23 +258,23 @@
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>chJQ+viqT/s6txKWRQ/8IDkZUP47RkBzDvKjW1p+0iM=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2Fmy%20status_small.png">
+<Reference URI="res%2Fimages%2Fmy_status_small.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>WDdILiYzac6fTLJ0DVyJE5uGQw0LSSvt+wG9yoRbMV8=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2Fother%20location_blue.png">
+<Reference URI="res%2Fimages%2Fother_location_blue.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>HM597R6uiLMSWC4J1aJrLX8gKil8XnqPQEu7NdYfsb8=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2Fother%20location_blue_small.png">
+<Reference URI="res%2Fimages%2Fother_location_blue_small.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>8a1G7uaJKXrZIB60LoEv6fogXEgdWfeqo7dyhdFRzBw=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2Fother%20location_mint.png">
+<Reference URI="res%2Fimages%2Fother_location_mint.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>OdqkoE6muo6CRz8MZ+n2eVFYpcWKikNDX/InU/dZGD8=</DigestValue>
 </Reference>
-<Reference URI="res%2Fimages%2Fother%20location_mint_small.png">
+<Reference URI="res%2Fimages%2Fother_location_mint_small.png">
 <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"></DigestMethod>
 <DigestValue>6yDIP2Ej+jMDvbP3sjwGwYDhrCvEYVw9vJWBTYP+ODU=</DigestValue>
 </Reference>
@@ -299,11 +311,11 @@
 </Reference>
 </SignedInfo>
 <SignatureValue>
-mLb2Q2E1EhZeAIpHZSYuwrkD3TWOL0AETVDaylb2bxWdb+sCzxnQsjwyCDjUoDHh+pii60deCbzD
-aG8jTMbZQj47teP+7y6vJjfUnJ3ABvQ6f3RedXyru7ImJTTKAyuDsixmwF/rxX42JSFKMz8VYsda
-vjoOuak//EZ5gkml0asEXjuP3uv0azhEXPFRv4o0A4ZdgUVg75HuLxTGvOqftm/dhN9sD3EzzkRN
-jift0/vvPhiQH/2YH+W7ZO/iW0HPqzACvCFp6YM6wwvjmO5b88UMS97Y3WEt1K7y+m4Gpajmw8n5
-YMtsta1sLGfU+oCHlgZGN36i8qsSY6El6DOQwQ==
+0i+htmy7WW/Keyk/znLkah+4+e0iHZTwuK/IhSUZ9/WNoGaRw1koAUEvcmN0vQdUD1LPE2+ew4m/
+di2x9HMuc12iaXHleVRtH/a72QVaqf7J8NduXw6ihsdqxS9K3j/eWj5LWzMnzNL8VGM8fYWdE+2m
+AumTKVczTSpTcG4op/eL7QEbOs0jVwNHEylzFUeIgnoyu3f0HENYblWhKo3RtATX/kXCb2v1glyF
+kpWAhSuplPz70id1WoGcEu/BhXqcCCokgV5HBYfc9VXUirhvKNOarbFsCUztWZCEnRfCxMxZR1Hs
+dGoMDuW/vT9EnWNsfc0k+nVERWrFUIo0YQ4W2A==
 </SignatureValue>
 <KeyInfo>
 <X509Data>
@@ -311,19 +323,19 @@ YMtsta1sLGfU+oCHlgZGN36i8qsSY6El6DOQwQ==
 MIIDgDCCAmigAwIBAgIBZTANBgkqhkiG9w0BAQsFADCBnjELMAkGA1UEBhMCS1IxFDASBgNVBAgM
 C1NvdXRoIEtvcmVhMQ4wDAYDVQQHDAVTdXdvbjEmMCQGA1UECgwdU2Ftc3VuZyBFbGVjdHJvbmlj
 cyBDby4sIEx0ZC4xDzANBgNVBAsMBk1vYmlsZTEwMC4GA1UEAwwnU2Ftc3VuZyBUaXplbiBERVZF
-TE9QRVIgUHVibGljIENBIENsYXNzMB4XDTE1MDcxMjE2Mzg0OVoXDTE2MDcxMTE2Mzg0OVowTDEg
+TE9QRVIgUHVibGljIENBIENsYXNzMB4XDTE1MDcxNDAwNTMwMloXDTE2MDcxMzAwNTMwMlowTDEg
 MB4GA1UEAwwXU2Ftc3VuZyBUaXplbiBEZXZlbG9wZXIxKDAmBgkqhkiG9w0BCQEWGXN0b3J5Y29t
-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
+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
 </X509Certificate>
 <X509Certificate>
 MIIDuzCCAqOgAwIBAgICL+cwDQYJKoZIhvcNAQELBQAwgY8xCzAJBgNVBAYTAktSMRQwEgYDVQQI

diff --git a/inc/conf.h b/inc/conf.h
new file mode 100644 (file)
index 0000000..adc65c1
--- /dev/null
+++ b/inc/conf.h
@@ -0,0 +1,8 @@
+#ifndef __MOMENT_CONF_H__
+#define __MOMENT_CONF_H__
+
+#define ENTRY_WIDTH 446
+#define ENTRY_HEIGHT 38
+#define ENTRY_RESULT_HEIGHT 400
+
+#endif /* __MOMENT_CONF_H__ */

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

diff --git a/res/edje/entry.edc b/res/edje/entry.edc
index 162d807..cc42d9a 100644 (file)
--- a/res/edje/entry.edc
+++ b/res/edje/entry.edc
@@ -1,9 +1,12 @@
+#include "conf.h"
+
 images {
        image: "searching_bar.png" COMP;
        image: "searching_X.png" COMP;
 }
 
 collections {
+       base_scale: 1.8;
        group {
                name: "main";
                parts {
@@ -12,8 +15,11 @@ collections {
                                type: SPACER;
                                description {
                                        state: "default" 0.0;
-                                       rel1 { relative: 0.0 0.0; }
-                                       rel2 { relative: 1.0 1.0; }
+                                       rel1 { relative: 0.5 0.5; }
+                                       rel2 { relative: 0.5 0.5; }
+                                       align: 0.5 0.5;
+                                       min: ENTRY_WIDTH ENTRY_HEIGHT;
+                                       fixed: 1 1;
                                }
                        }
                        part {
@@ -21,11 +27,8 @@ collections {
                                type: IMAGE;
                                description {
                                        state: "default" 0.0;
-                                       rel1 { relative: 0.5 0.5; }
-                                       rel2 { relative: 0.5 0.5; }
-                                       align: 0.5 0.5;
-                                       min: 446 38;
-                                       fixed: 1 1;
+                                       rel1 { relative: 0.0 0.0; to: "bg"; }
+                                       rel2 { relative: 1.0 1.0; to: "bg"; }
                                        image {
                                                normal: "searching_bar.png";
                                        }
@@ -36,7 +39,7 @@ collections {
                                name: "entry";
                                type: SWALLOW;
                                description {
-                                       rel1 { relative: 0.05 0.0; to: "bg_img"; }
+                                       rel1 { relative: 0.05 0.1; to: "bg_img"; }
                                        rel2 { relative: 0.0 1.0; to_x: "delete_event"; to_y: "bg_img"; }
                                        align: 0.5 0.5;
                                        fixed: 1 1;
@@ -70,10 +73,10 @@ collections {
                                type: RECT;
                                description {
                                        state: "default" 0.0;
-                                       rel1 { relative: 420/446 0.5; to: "bg_img"; }
-                                       rel2 { relative: 420/446 0.5; to: "bg_img"; }
+                                       rel1 { relative: 420/ENTRY_WIDTH 0.5; to: "bg_img"; }
+                                       rel2 { relative: 420/ENTRY_WIDTH 0.5; to: "bg_img"; }
                                        align: 0.5 0.5;
-                                       min: 38 38;
+                                       min: ENTRY_HEIGHT ENTRY_HEIGHT;
                                        fixed: 1 1;
                                        color: 0 0 0 0;
                                        visible: 1;

diff --git a/res/edje/item.edc b/res/edje/item.edc
index 682f57c..ae81596 100755 (executable)
--- a/res/edje/item.edc
+++ b/res/edje/item.edc
@@ -15,6 +15,7 @@ images {
 }
 
 collections {
+       base_scale: 1.8;
        group {
                name: "item_typing";
                parts {

diff --git a/res/edje/main.edc b/res/edje/main.edc
index a178e78..23f95c1 100644 (file)
--- a/res/edje/main.edc
+++ b/res/edje/main.edc
@@ -284,4 +284,4 @@ collections {
       }
    }
 }
-*/
\ No newline at end of file
+*/

diff --git a/res/edje/main_view.edc b/res/edje/main_view.edc
index 84dc7ea..12a4c9a 100755 (executable)
--- a/res/edje/main_view.edc
+++ b/res/edje/main_view.edc
@@ -1,4 +1,7 @@
+#include "conf.h"
+
 collections {
+       base_scale: 1.8;
        group {
                name: "main";
 
@@ -26,24 +29,6 @@ collections {
                                }
                        }
                        part {
-                               name: "entry";
-                               type: SWALLOW;
-                               scale: 1;
-                               mouse_events: 1;
-                               description {
-                                       state: "default" 0.0;
-                                       rel1 { relative: 0.5 26/800; to: "bg"; }
-                                       rel2 { relative: 0.5 26/800; to: "bg"; }
-                                       align: 0.5 0.0;
-                                       visible: 1;
-                               }
-                               description {
-                                       state: "hide" 0.0;
-                                       inherit: "default" 0.0;
-                                       align: 0.5 1.0;
-                               }
-                       }
-                       part {
                                name: "map_area";
                                type: RECT;
                                scale: 1;
@@ -161,9 +146,11 @@ collections {
                                mouse_events: 0;
                                description {
                                        state: "default" 0.0;
-                                       rel1 { relative: 0.0 1.0; to: "entry"; }
-                                       rel2 { relative: 1.0 1.0; to: "bg"; }
+                                       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;
+                                       fixed: 1 1;
                                        visible: 1;
                                }
                                description {
@@ -172,6 +159,26 @@ collections {
                                        visible: 0;
                                }
                        }
+                       part {
+                               name: "entry";
+                               type: SWALLOW;
+                               scale: 1;
+                               mouse_events: 1;
+                               description {
+                                       state: "default" 0.0;
+                                       rel1 { relative: 0.5 26/800; to: "bg"; }
+                                       rel2 { relative: 0.5 26/800; to: "bg"; }
+                                       align: 0.5 0.5;
+                                       min: ENTRY_WIDTH ENTRY_HEIGHT;
+                                       fixed: 1 1;
+                                       visible: 1;
+                               }
+                               description {
+                                       state: "hide" 0.0;
+                                       inherit: "default" 0.0;
+                                       align: 0.5 1.0;
+                               }
+                       }
                }
                programs {
                        program {

diff --git a/res/edje/map.edc b/res/edje/map.edc
index 8a0c426..033f5f8 100755 (executable)
--- a/res/edje/map.edc
+++ b/res/edje/map.edc
@@ -3,6 +3,7 @@ images {
 }
 
 collections {
+       base_scale: 1.8;
        group {
                name: "main";
                parts {

diff --git a/res/edje/ui_manager.edc b/res/edje/ui_manager.edc
index f5205f4..2e2393e 100755 (executable)
--- a/res/edje/ui_manager.edc
+++ b/res/edje/ui_manager.edc
@@ -1,4 +1,5 @@
 collections {
+       base_scale: 1.8;
        group {
                name: "main";
                parts {

diff --git a/src/item.c b/src/item.c
index 9e139cc..25d04d2 100644 (file)
--- a/src/item.c
+++ b/src/item.c
@@ -91,7 +91,7 @@ Evas_Object *item_create_typing(Evas_Object *parent, int city)
        item = elm_layout_add(parent);
        retv_if(!item, NULL);
 
-       elm_layout_file_set(item, ITEM_EDJE, "item_typing");
+       elm_layout_file_set(item, full_path, "item_typing");
 
        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);
@@ -104,7 +104,7 @@ Evas_Object *item_create_typing(Evas_Object *parent, int city)
                return NULL;
        }
        
-       snprintf(city_str, sizeof(city_str), "%s", city_info[city].name);
+       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);
@@ -158,7 +158,7 @@ Evas_Object *item_create_selecting(Evas_Object *parent, int city, int color)
        item = elm_layout_add(parent);
        retv_if(!item, NULL);
 
-       elm_layout_file_set(item, ITEM_EDJE, "item_selecting");
+       elm_layout_file_set(item, full_path, "item_selecting");
 
        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);
@@ -273,7 +273,7 @@ Evas_Object *item_create_result(Evas_Object *parent, int city, int color, int st
        item = elm_layout_add(parent);
        goto_if(!item, error);
 
-       elm_layout_file_set(item, ITEM_EDJE, "item_result");
+       elm_layout_file_set(item, full_path, "item_result");
 
        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);

diff --git a/src/main.c b/src/main.c
index 378d866..c91824e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -42,6 +42,8 @@ app_create(void *data)
 {\r
        moment_info_s *moment_info = data;\r
 \r
+       elm_app_base_scale_set(1.8);\r
+\r
        moment_info->win = elm_win_util_standard_add(PACKAGE, PACKAGE);\r
        retv_if(!moment_info->win, false);\r
 \r

diff --git a/src/main_view.c b/src/main_view.c
index 0c7d00d..88d8515 100644 (file)
--- a/src/main_view.c
+++ b/src/main_view.c
@@ -6,6 +6,7 @@
 #include "scroller.h"
 #include "city.h"
 #include "util.h"
+#include "item.h"
 
 const char *const MAIN_VIEW_EDJE = "main_view.edj";
 const char *const ENTRY_EDJE = "entry.edj";
@@ -235,42 +236,6 @@ static void _destroy_plus_button(Evas_Object *plus_button)
        evas_object_del(plus_button);
 }
 
-static Evas_Object *_create_predict_item(Evas_Object *parent, const char *city, const char *nation)
-{
-       Evas_Object *predict_item = NULL;
-
-       char *path = NULL;
-       char full_path[PATH_LEN] = {0, };
-       char city_name[PATH_LEN] = {0, };
-
-       retv_if(!parent, NULL);
-
-       path = app_get_resource_path();
-       retv_if(!path, NULL);
-
-       snprintf(full_path, sizeof(full_path), "%s/edje/%s", path, PREDICT_ITEM_EDJE);
-       free(path);
-
-       predict_item = elm_layout_add(parent);
-       retv_if(!predict_item, NULL);
-
-       elm_layout_file_set(predict_item, full_path, "main");
-       evas_object_size_hint_weight_set(predict_item, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-       evas_object_size_hint_align_set(predict_item, EVAS_HINT_FILL, EVAS_HINT_FILL);
-       evas_object_show(predict_item);
-
-       snprintf(city_name, sizeof(city_name), "%s, %s", city, nation);
-       elm_object_part_text_set(predict_item, "city", city_name);
-
-       return predict_item;
-}
-
-static void _destroy_predict_item(Evas_Object *predict_item)
-{
-       ret_if(!predict_item);
-       evas_object_del(predict_item);
-}
-
 static Evas_Object *_create_predict_scroller(Evas_Object *parent)
 {
        Evas_Object *predict_scroller = NULL;
@@ -305,7 +270,7 @@ static void _clean_predict_scroller(Evas_Object *predict_scroller)
        ret_if(!list);
 
        EINA_LIST_FREE(list, predict_item) {
-               _destroy_predict_item(predict_item);
+               item_destroy_typing(predict_item);
        }
 }
 
@@ -342,8 +307,7 @@ static void _update_predict_scroller(Evas_Object *predict_scroller, const char *
 
        ret_if(!predict_scroller);
 
-       if (!str)
-               _clean_predict_scroller(predict_scroller);
+       _clean_predict_scroller(predict_scroller);
 
        city_info = city_get();
        ret_if(!city_info);
@@ -355,9 +319,11 @@ static void _update_predict_scroller(Evas_Object *predict_scroller, const char *
                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 = _create_predict_item(predict_scroller, city_info[i].name, city_info[i].nation);
+                       predict_item = item_create_typing(predict_scroller, i);
                        if (predict_item)
                                _append_item_to_predict_scroller(predict_scroller, predict_item);
                }
@@ -421,7 +387,7 @@ Evas_Object *main_view_create(Evas_Object *parent, moment_info_s *moment_info)
 
        main_view_info->predict_scroller = _create_predict_scroller(main_view_info->main_view);
        if (main_view_info->predict_scroller)
-               elm_object_part_content_set(main_view_info->main_view, "predict_scroller", main_view_info->predict_scroller);
+               elm_object_part_content_set(main_view_info->main_view, "entry_result", main_view_info->predict_scroller);
 
        return main_view_info->main_view;
 }

diff --git a/src/scroller.c b/src/scroller.c
index 9f4a0c6..bd98e5a 100644 (file)
--- a/src/scroller.c
+++ b/src/scroller.c
@@ -83,13 +83,14 @@ Evas_Object *scroller_create(Evas_Object *parent)
        scroller = elm_scroller_add(parent);
        retv_if(!scroller, NULL);
 
-       elm_scroller_bounce_set(scroller, EINA_TRUE, EINA_FALSE);
-       elm_scroller_policy_set(scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_OFF);
+       elm_scroller_bounce_set(scroller, EINA_FALSE, EINA_TRUE);
+       elm_scroller_policy_set(scroller, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_ON);
        elm_scroller_page_scroll_limit_set(scroller, 0, 0);
-       elm_scroller_content_min_limit(scroller, EINA_FALSE, EINA_TRUE);
+       elm_scroller_content_min_limit(scroller, EINA_TRUE, EINA_FALSE);
        elm_scroller_single_direction_set(scroller, ELM_SCROLLER_SINGLE_DIRECTION_HARD);
 
        evas_object_size_hint_weight_set(scroller, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+       evas_object_size_hint_align_set(scroller, 0.0, EVAS_HINT_EXPAND);
        evas_object_size_hint_min_set(scroller, 0, 0);
 
        elm_object_style_set(scroller, "effect");
@@ -106,7 +107,7 @@ Evas_Object *scroller_create(Evas_Object *parent)
        goto_if(!box, ERROR);
 
        elm_box_horizontal_set(box, EINA_FALSE);
-       elm_box_align_set(box, 0.0, 0.5);
+       elm_box_align_set(box, 0.0, 0.0);
        evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
        evas_object_show(box);