TizenRefApp-9761 [Gallery] Replace Page class implementation with Call

Setting application version

Change-Id: Ibc4ac94e11cfff96909ab5b34c72f0d0020f9e4f

diff --git a/.cproject b/.cproject
index e8c16625384fa27f6d68d04246e8e1f148a4926b..2ef6a051af7f8f2c291ec7429e7c230b91fc4fa2 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -21,18 +21,17 @@
                                                <toolChain id="org.tizen.nativecore.toolchain.sbi.gcc45.app.debug.531160032" name="Tizen Native Toolchain" superClass="org.tizen.nativecore.toolchain.sbi.gcc45.app.debug">
                                                        <targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.728531842" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
                                                        <builder autoBuildTarget="all" buildPath="${workspace_loc:/gallery}/Debug" enableAutoBuild="true" id="org.tizen.nativecore.target.sbi.gnu.builder.1903374037" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Tizen Application Builder" superClass="org.tizen.nativecore.target.sbi.gnu.builder"/>
-                                                       <tool id="org.tizen.nativecore.tool.sbi.gnu.archiver.683429809" name="Archiver" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver"/>
-                                                       <tool command="arm-linux-gnueabi-g++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.1060076319" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler">
+                                                       <tool command="arm-linux-gnueabi-ar.exe" id="org.tizen.nativecore.tool.sbi.gnu.archiver.683429809" name="Archiver" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver"/>
+                                                       <tool command="clang++.exe" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.1060076319" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler">
                                                                <option id="gnu.cpp.compiler.option.optimization.level.1602641110" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
                                                                <option defaultValue="gnu.cpp.compiler.debugging.level.max" id="sbi.gnu.cpp.compiler.option.debugging.level.core.1369151974" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
                                                                <option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.1996885248" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.1964350537" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="wearable-4.0-device.core_gcc62.armel.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="wearable-4.0-device.core_llvm40.armel"/>
                                                                </option>
                                                                <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.1290986068" 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;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-watch&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
@@ -46,6 +45,7 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/contacts-svc&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/content&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/context-service&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/context-service/wearable/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/csr&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/dali&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/dali-toolkit&quot;"/>
@@ -100,6 +100,8 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/privacy-privilege-manager/&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
@@ -136,17 +138,16 @@
                                                                <option id="gnu.cpp.compiler.option.dialect.std.220245897" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" value="gnu.cpp.compiler.dialect.c++11" valueType="enumerated"/>
                                                                <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.592894666" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
                                                        </tool>
-                                                       <tool command="arm-linux-gnueabi-gcc" id="org.tizen.nativecore.tool.sbi.gnu.c.compiler.1433876771" name="C Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.c.compiler">
+                                                       <tool command="clang.exe" id="org.tizen.nativecore.tool.sbi.gnu.c.compiler.1433876771" name="C Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.c.compiler">
                                                                <option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.982057263" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
                                                                <option defaultValue="gnu.c.debugging.level.max" id="sbi.gnu.c.compiler.option.debugging.level.core.1672854934" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
                                                                <option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.1117960579" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
                                                                <option id="sbi.gnu.c.compiler.option.2144981321" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="wearable-4.0-device.core_gcc62.armel.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="wearable-4.0-device.core_llvm40.armel"/>
                                                                </option>
                                                                <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.625351371" 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;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-watch&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
@@ -160,6 +161,7 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/contacts-svc&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/content&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/context-service&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/context-service/wearable/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/csr&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/dali&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/dali-toolkit&quot;"/>
@@ -214,6 +216,8 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/privacy-privilege-manager/&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
@@ -250,7 +254,7 @@
                                                                <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1564318540" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
                                                        </tool>
                                                        <tool id="org.tizen.nativeide.tool.sbi.gnu.c.linker.base.1520359031" name="C Linker" superClass="org.tizen.nativeide.tool.sbi.gnu.c.linker.base"/>
-                                                       <tool command="arm-linux-gnueabi-g++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.1597861570" name="C++ Linker" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker">
+                                                       <tool command="clang++.exe" id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.1597861570" name="C++ Linker" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker">
                                                                <option defaultValue="false" id="sbi.gnu.cpp.linker.option.shared_flag.core.1262973541" name="Linker.Shared" superClass="sbi.gnu.cpp.linker.option.shared_flag.core" valueType="boolean"/>
                                                                <option defaultValue="false" id="sbi.gnu.cpp.linker.option.noundefined.core.1726486558" name="Report unresolved symbol references (-Wl,--no-undefined)" superClass="sbi.gnu.cpp.linker.option.noundefined.core" valueType="boolean"/>
                                                                <option id="sbi.gnu.cpp.linker.option.frameworks_lflags.core.1232921885" name="Tizen-Frameworks-Other-Lflags" superClass="sbi.gnu.cpp.linker.option.frameworks_lflags.core" valueType="stringList">
@@ -268,7 +272,7 @@
                                                                        <additionalInput kind="additionalinput" paths="$(LIBS)"/>
                                                                </inputType>
                                                        </tool>
-                                                       <tool command="arm-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.2068371360" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
+                                                       <tool command="#{PLATFORM_DEFAULT_GCC_PREFIX}as.exe" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.2068371360" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
                                                                <option id="gnu.both.asm.option.include.paths.1187156753" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths"/>
                                                                <inputType id="cdt.managedbuild.tool.gnu.assembler.input.473129413" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
                                                        </tool>
@@ -320,31 +324,34 @@
                                                <toolChain id="org.tizen.nativecore.toolchain.sbi.gcc45.app.release.1777319067" name="Tizen Native Toolchain" superClass="org.tizen.nativecore.toolchain.sbi.gcc45.app.release">
                                                        <targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.1905316156" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
                                                        <builder buildPath="${workspace_loc:/gallery}/Release" id="org.tizen.nativecore.target.sbi.gnu.builder.2018439737" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Tizen Application Builder" superClass="org.tizen.nativecore.target.sbi.gnu.builder"/>
-                                                       <tool id="org.tizen.nativecore.tool.sbi.gnu.archiver.1278616718" name="Archiver" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver"/>
-                                                       <tool command="arm-linux-gnueabi-g++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.1877650577" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler">
+                                                       <tool command="i386-linux-gnueabi-ar.exe" id="org.tizen.nativecore.tool.sbi.gnu.archiver.1278616718" name="Archiver" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver"/>
+                                                       <tool command="clang++.exe" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.1877650577" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler">
                                                                <option id="gnu.cpp.compiler.option.optimization.level.1349943786" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
                                                                <option defaultValue="gnu.cpp.compiler.debugging.level.none" id="sbi.gnu.cpp.compiler.option.debugging.level.core.2118322735" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" valueType="enumerated"/>
                                                                <option defaultValue="false" id="sbi.gnu.cpp.compiler.option.misc.pic.core.350374090" name="-fPIC option" superClass="sbi.gnu.cpp.compiler.option.misc.pic.core" valueType="boolean"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.205445558" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="wearable-4.0-device.core_gcc62.armel.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="wearable-4.0-emulator.core.private.20170926_1_llvm40.i386"/>
                                                                </option>
                                                                <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.2129264981" 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;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-watch&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/asp/&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/aul/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/badge&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/base&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/cairo&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/calendar-service2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/call-manager&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/chromium-ewk&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ckm&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/contacts-svc&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/content&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/context-service&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/context-service/wearable/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/csr&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/dali&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/dali-toolkit&quot;"/>
@@ -395,16 +402,24 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/messaging&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/metadata-editor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/minizip&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/msg-service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/network&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/pkgmgr&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/privacy-privilege-manager/&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/rua/&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony-client&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/tzsh&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ug-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ui&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vconf&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vulkan&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_viewer_dali&quot;"/>
@@ -418,7 +433,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.2064434934" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
@@ -430,30 +444,33 @@
                                                                <option id="gnu.cpp.compiler.option.dialect.std.1157770444" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" value="gnu.cpp.compiler.dialect.c++11" valueType="enumerated"/>
                                                                <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.67986536" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
                                                        </tool>
-                                                       <tool command="arm-linux-gnueabi-gcc" id="org.tizen.nativecore.tool.sbi.gnu.c.compiler.904054681" name="C Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.c.compiler">
+                                                       <tool command="clang.exe" id="org.tizen.nativecore.tool.sbi.gnu.c.compiler.904054681" name="C Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.c.compiler">
                                                                <option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.option.optimization.level.877653241" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
                                                                <option defaultValue="gnu.c.debugging.level.default" id="sbi.gnu.c.compiler.option.debugging.level.core.530526098" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" valueType="enumerated"/>
                                                                <option defaultValue="false" id="sbi.gnu.c.compiler.option.misc.pic.core.658919778" name="-fPIC option" superClass="sbi.gnu.c.compiler.option.misc.pic.core" valueType="boolean"/>
                                                                <option id="sbi.gnu.c.compiler.option.1532282184" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="wearable-4.0-device.core_gcc62.armel.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="wearable-4.0-emulator.core.private.20170926_1_llvm40.i386"/>
                                                                </option>
                                                                <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1707321532" 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;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include&quot;"/>
-                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-agent&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appcore-watch&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/appfw&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/asp/&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/aul/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/badge&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/base&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/cairo&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/calendar-service2&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/call-manager&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/chromium-ewk&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ckm&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/contacts-svc&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/content&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/context-service&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/context-service/wearable/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/csr&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/dali&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/dali-toolkit&quot;"/>
@@ -504,16 +521,24 @@
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/messaging&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/metadata-editor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/minizip&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/msg-service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/network&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/notification&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/nsd/&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/phonenumber-utils&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/pkgmgr&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/privacy-privilege-manager/&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/rua/&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/SDL2&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/sensor&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/storage&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/system&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/telephony-client&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/tzsh&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ug-1&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/ui&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vconf&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/vulkan&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_service&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/widget_viewer_dali&quot;"/>
@@ -527,7 +552,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.1214715962" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}}&quot;"/>
@@ -539,7 +563,7 @@
                                                                <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1964837320" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
                                                        </tool>
                                                        <tool id="org.tizen.nativeide.tool.sbi.gnu.c.linker.base.499300439" name="C Linker" superClass="org.tizen.nativeide.tool.sbi.gnu.c.linker.base"/>
-                                                       <tool command="arm-linux-gnueabi-g++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.1838325853" name="C++ Linker" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker">
+                                                       <tool command="clang++.exe" id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.1838325853" name="C++ Linker" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker">
                                                                <option defaultValue="false" id="sbi.gnu.cpp.linker.option.shared_flag.core.1256173694" name="Linker.Shared" superClass="sbi.gnu.cpp.linker.option.shared_flag.core" valueType="boolean"/>
                                                                <option defaultValue="false" id="sbi.gnu.cpp.linker.option.noundefined.core.642735052" name="Report unresolved symbol references (-Wl,--no-undefined)" superClass="sbi.gnu.cpp.linker.option.noundefined.core" valueType="boolean"/>
                                                                <option id="sbi.gnu.cpp.linker.option.frameworks_lflags.core.1632577677" name="Tizen-Frameworks-Other-Lflags" superClass="sbi.gnu.cpp.linker.option.frameworks_lflags.core" valueType="stringList">
@@ -557,7 +581,7 @@
                                                                        <additionalInput kind="additionalinput" paths="$(LIBS)"/>
                                                                </inputType>
                                                        </tool>
-                                                       <tool command="arm-linux-gnueabi-as" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1784629853" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
+                                                       <tool command="#{PLATFORM_DEFAULT_GCC_PREFIX}as.exe" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1784629853" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
                                                                <option id="gnu.both.asm.option.include.paths.2144441251" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths"/>
                                                                <inputType id="cdt.managedbuild.tool.gnu.assembler.input.249179591" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
                                                        </tool>

diff --git a/edc/layouts.edc b/edc/layouts.edc
index 20dc42c5b7bf280897a2557d3c25c19cd6fca4aa..9effc60ab0896b5c2ae75378fe92cfef04ab12a6 100644 (file)
--- a/edc/layouts.edc
+++ b/edc/layouts.edc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-group { "elm/layout/gallery/more_options";
+group { "elm/layout/gallery/page_content";
    parts {
       swallow { "elm.swallow.content";
          desc { "default";
@@ -24,10 +24,6 @@ group { "elm/layout/gallery/more_options";
          desc { "default";
          }
       }
-      swallow { "gallery.swallow.overlay";
-         desc { "default";
-         }
-      }
    }
 }
 

diff --git a/gallery/presenters/base/Page.cpp b/gallery/presenters/base/Page.cpp
index c04381a6f8bc430d3bdfeb6a8da004c295890c85..998ad79d77eb9c3822f4946a036ede5257f4bf0f 100644 (file)
--- a/gallery/presenters/base/Page.cpp
+++ b/gallery/presenters/base/Page.cpp
@@ -31,14 +31,14 @@ namespace gallery {
        using ucl::NAVI_TRANSITION_STARTED;
        using ucl::NAVI_TRANSITION_FINISHED;
 
-       Page::Page(IRefCountObj &rc, const NaviframeSRef &navi,
-                       const ExitRequestHandler &onExitRequest) :
+       Page::Page(IRefCountObj &rc, NaviframeSRef navi,
+                       ExitRequestHandler onExitRequest) :
                GuiPresenter(rc),
-               m_navi(navi),
-               m_onExitRequest(onExitRequest)
+               m_navi(std::move(navi)),
+               m_onExitRequest(std::move(onExitRequest))
        {
-               UCL_ASSERT(navi, "navi is NULL!");
-               UCL_ASSERT(onExitRequest, "onExitRequest is NULL!");
+               UCL_ASSERT(m_navi, "m_navi is NULL!");
+               UCL_ASSERT(m_onExitRequest, "m_onExitRequest is NULL!");
 
                deactivateBy(m_navi.get());
        }
@@ -47,15 +47,33 @@ namespace gallery {
        {
        }
 
+       Result Page::preparePart1(const int contentFlags)
+       {
+               FAIL_RETURN(GuiPresenter::prepare(*m_navi),
+                               "GuiPresenter::prepare() failed!");
+
+               m_content = PageContent::Builder().
+                               setFlags(contentFlags).
+                               build(*m_navi);
+               if (!m_content) {
+                       LOG_RETURN(RES_FAIL, "PageContent::build() failed!");
+               }
+
+               setDeactivatorSink(m_content);
+
+               return RES_OK;
+       }
+
        Result Page::preparePart2()
        {
                if (!m_item) {
-                       UCL_LOG_RETURN(ucl::RES_FAIL, "m_item is NULL");
+                       LOG_RETURN(RES_FAIL, "m_item is NULL");
                }
 
                Evas_Object *content = m_item.getContent();
-               if (!content) {
-                       LOG_RETURN(RES_FAIL, "content is NULL");
+               if (content != as_eo(*m_content)) {
+                       dispose();
+                       LOG_RETURN(RES_FAIL, "content is not m_content");
                }
 
                m_navi->addEventHandler(NAVI_TRANSITION_STARTED,
@@ -149,11 +167,6 @@ namespace gallery {
                }
        }
 
-       NaviItem Page::getItem()
-       {
-               return m_item;
-       }
-
        void Page::requestExit()
        {
                if (const auto handler = m_onExitRequest.lock()) {

diff --git a/gallery/presenters/base/Page.h b/gallery/presenters/base/Page.h
index a25d0ccb5cfbd4499505b9fc09ea2b930a859358..0d2756674a71944456b431b8d0d5364383cc9fe5 100644 (file)
--- a/gallery/presenters/base/Page.h
+++ b/gallery/presenters/base/Page.h
@@ -21,6 +21,8 @@
 
 #include "ucl/mvp/GuiPresenter.h"
 
+#include "gallery/view/PageContent.h"
+
 namespace gallery {
 
        UCL_DECLARE_REF_ALIASES(Page);
@@ -104,7 +106,6 @@ namespace gallery {
                 */
                virtual bool isDisposed() const final override;
 
-
        protected:
                /**
                 * @brief Constructor
@@ -112,21 +113,22 @@ namespace gallery {
                 * @param[in] navi Shared reference to Naviframe object
                 * @param[in] onExitRequest Exit request handler
                 */
-               Page(ucl::IRefCountObj &rc, const ucl::NaviframeSRef &navi,
-                               const ExitRequestHandler &onExitRequest);
+               Page(ucl::IRefCountObj &rc, ucl::NaviframeSRef navi,
+                               ExitRequestHandler onExitRequest);
 
                /**
                 * @brief Default destructor
                 */
-               virtual ~Page();
+               ~Page();
 
                /**
                 * @brief Prepares content
                 * @param[in] onPrepare Prepare callback
                 * @param[in] contentFlags Content flags
+                * @return RES_OK on success, otherwise an error code on failure
                 */
                template <class ON_PREPARE>
-               ucl::Result prepare(ON_PREPARE &&onPrepare);
+               ucl::Result prepare(ON_PREPARE &&onPrepare, int contentFlags = 0);
 
                /**
                 * @brief Gets NaviItem
@@ -134,6 +136,12 @@ namespace gallery {
                 */
                ucl::NaviItem getItem();
 
+               /**
+                * @brief Gets page content
+                * @return Page content
+                */
+               PageContent &getContent();
+
                /**
                 * @brief Requests application exit
                 */
@@ -145,6 +153,7 @@ namespace gallery {
                virtual void onBackKey();
 
        private:
+               ucl::Result preparePart1(int contentFlags);
                ucl::Result preparePart2();
 
                void dispatchTopPageChanged();
@@ -162,6 +171,7 @@ namespace gallery {
                const ucl::NaviframeSRef m_navi;
                const ExitRequestHandler m_onExitRequest;
                ucl::NaviItem m_item;
+               PageContentSRef m_content;
                PageSRef m_selfRef;
        };
 

diff --git a/gallery/presenters/base/Page.hpp b/gallery/presenters/base/Page.hpp
index 426445a615af261e56b8cf16a72d9835a67ec3ed..5e309d83fd5750a90b93a7ba28a0928ddfd45b5c 100644 (file)
--- a/gallery/presenters/base/Page.hpp
+++ b/gallery/presenters/base/Page.hpp
@@ -19,14 +19,16 @@
 namespace gallery {
 
        template <class ON_PREPARE>
-       inline ucl::Result Page::prepare(ON_PREPARE &&onPrepare)
+       inline ucl::Result Page::prepare(
+                       ON_PREPARE &&onPrepare, const int contentFlags)
        {
-               UCL_FAIL_RETURN(GuiPresenter::prepare(*m_navi),
-                               "GuiPresenter::prepare() failed!");
+               UCL_FAIL_RETURN(preparePart1(contentFlags), "preparePart1() failed!");
 
                UCL_FAIL_RETURN(onPrepare(m_item), "onPrepare() failed!");
 
-               return preparePart2();
+               UCL_FAIL_RETURN(preparePart2(), "preparePart2() failed!");
+
+               return ucl::RES_OK;
        }
 
        template <class ...ARGS>
@@ -57,6 +59,17 @@ namespace gallery {
                return (m_navi->getBottomItem() == m_item);
        }
 
+       inline ucl::NaviItem Page::getItem()
+       {
+               return m_item;
+       }
+
+       inline PageContent &Page::getContent()
+       {
+               UCL_ASSERT(m_content, "m_content is NULL");
+               return *m_content;
+       }
+
        // Non-member functions //
 
        inline bool isLast(const Page &page)

diff --git a/gallery/presenters/pages/NoContentPage.cpp b/gallery/presenters/pages/NoContentPage.cpp
index fb00b835d6c69b668ddb0f39d9a9133ab2728072..dd3ad8a299009b19e65fe0109c35231c40fa1224 100644 (file)
--- a/gallery/presenters/pages/NoContentPage.cpp
+++ b/gallery/presenters/pages/NoContentPage.cpp
@@ -91,6 +91,7 @@ namespace gallery {
                if (!layout) {
                        LOG_RETURN(RES_FAIL, "Layout::build() failed!");
                }
+               getContent().set(*layout);
 
                const auto icon = Layout::Builder().
                                setTheme(getImageTheme(ICON_NO_PHOTOS)).
@@ -104,7 +105,7 @@ namespace gallery {
                layout->setText(STR_APP_NAME, PART_TITLE);
                layout->setText(STR_NO_PHOTOS);
 
-               item = getNaviframe().push(*layout, NAVIFRAME_NO_CLIP);
+               item = getNaviframe().push(getContent(), NAVIFRAME_NO_CLIP);
                if (!item) {
                        LOG_RETURN(RES_FAIL, "Naviframe::push() failed!");
                }

diff --git a/gallery/presenters/pages/PreviewPage.cpp b/gallery/presenters/pages/PreviewPage.cpp
index 3d38488c0aedda16f738486e2baf58f6ce1f3bfd..a520df768fb12603a6a3b63adba2f1d98e5029fd 100644 (file)
--- a/gallery/presenters/pages/PreviewPage.cpp
+++ b/gallery/presenters/pages/PreviewPage.cpp
@@ -109,7 +109,8 @@ namespace gallery {
                FAIL_RETURN_VALUE(result->prepare([this, &result](NaviItem &item)
                        {
                                return result->doPrepare(m_startItemIndex, item);
-                       }),
+                       },
+                       PageContent::FLAGS_SELECT_MODE),
                        {}, "result->prepare() failed!");
 
                if ((m_startupMode == Mode::SELECT) && m_autoSelectStartItem) {
@@ -301,29 +302,19 @@ namespace gallery {
 
        Result PreviewPage::doPrepare(const int startItemIndex, NaviItem &item)
        {
-               m_content = PageContent::Builder().
-                               setFlags(PageContent::FLAG_BOTTOM_BUTTON |
-                                               PageContent::FLAG_SELECT_BUTTON |
-                                               PageContent::FLAG_MORE_OPTIONS).
-                               build(getNaviframe());
-               if (!m_content) {
-                       LOG_RETURN(RES_FAIL, "PageContent::build() failed!");
-               }
-               setDeactivatorSink(m_content);
-
                m_imageGrid = ImageGrid::Builder().
                                setListener(asWeakThis<ImageGrid::IListener>(this)).
                                setType(ImageGrid::Type::LINEAR).
                                setSelectModeStartup(m_startupMode == Mode::SELECT).
-                               build(*m_content);
+                               build(getContent());
                if (!m_imageGrid) {
                        LOG_RETURN(RES_FAIL, "ImageGrid::build() failed!");
                }
-               m_content->set(*m_imageGrid);
+               getContent().set(*m_imageGrid);
                ImageGrid::Unrealizer u(*m_imageGrid);
 
                MoreOptionsPresenter::Builder moreBuilder;
-               moreBuilder.setParentWidget(m_content);
+               moreBuilder.setParentWidget(asShared(getContent()));
 
                if (m_startupMode != Mode::OPERATION_VIEW) {
                        moreBuilder.addOption({impl::MORE_OPTION_ID_DELETE,
@@ -339,13 +330,13 @@ namespace gallery {
                if (!m_more) {
                        LOG_RETURN(RES_FAIL, "MoreOptionsPresenter::build() failed!");
                }
-               m_content->set(m_more->getWidget(), PageContent::Part::MORE_OPTIONS);
+               getContent().set(m_more->getWidget(), PageContent::Part::MORE_OPTIONS);
 
                m_more->setListener(asWeakThis<MoreOptionsPresenter::IListener>(this));
 
                if (m_startupMode != Mode::OPERATION_VIEW) {
                        m_smp = SelectModePresenter::Builder().
-                                       setPageContent(m_content).
+                                       setPageContent(asShared(getContent())).
                                        setFlags(SelectModePresenter::FLAG_NO_MORE_OPTIONS).
                                        build(*this);
                        if (!m_smp) {
@@ -362,7 +353,7 @@ namespace gallery {
 
                m_imageGrid->setItemCount(m_items.size());
 
-               item = getNaviframe().push(*m_content, NAVIFRAME_NO_CLIP);
+               item = getNaviframe().push(getContent(), NAVIFRAME_NO_CLIP);
                if (!item) {
                        LOG_RETURN(RES_FAIL, "Naviframe::push() failed!");
                }
@@ -588,7 +579,7 @@ namespace gallery {
 
                m_processing = ProcessingPresenter::Builder().
                                setProcessingText(STR_SAVING).
-                               build(*m_content);
+                               build(getContent());
        }
 
        bool PreviewPage::onAlertEvent(AlertDialog &dialog,
@@ -625,7 +616,7 @@ namespace gallery {
 
                m_processing = ProcessingPresenter::Builder().
                        setProcessingText(STR_DELETING).
-                       build(*m_content);
+                       build(getContent());
 
                return true;
        }
@@ -674,7 +665,7 @@ namespace gallery {
                        deactivateBy(m_imageGrid.get());
                }
 
-               m_content->setMoreOptionsVisible(false);
+               getContent().setMoreOptionsVisible(false);
 
                m_smp->setBottomButtonText(STR_DELETE_CAPS);
                m_smp->update(m_selectCount, m_items.size());
@@ -693,7 +684,7 @@ namespace gallery {
                        deactivateBy(m_imageGrid.get());
                }
 
-               m_content->setMoreOptionsVisible(true);
+               getContent().setMoreOptionsVisible(true);
 
                m_smp->setVisible(false);
        }

diff --git a/gallery/presenters/pages/PreviewPage.h b/gallery/presenters/pages/PreviewPage.h
index f936382bf1748b9b59730427e5f9fd7d2c2d6883..19694594037190199e40b2e55e103376b02cc4d1 100644 (file)
--- a/gallery/presenters/pages/PreviewPage.h
+++ b/gallery/presenters/pages/PreviewPage.h
@@ -200,7 +200,6 @@ namespace gallery {
                std::vector<ItemSRef> m_items;
                IJobSRef m_job;
 
-               PageContentSRef m_content;
                MoreOptionsPresenterSRef m_more;
                SelectModePresenterSRef m_smp;
                DialogWRef m_alert;

diff --git a/gallery/presenters/pages/ThumbnailPage.cpp b/gallery/presenters/pages/ThumbnailPage.cpp
index 64a4965f8a13dbebaf6818ef1d76b60bab385ff6..6a0aa13628de0803efbedb72e1c9daea877b7139 100644 (file)
--- a/gallery/presenters/pages/ThumbnailPage.cpp
+++ b/gallery/presenters/pages/ThumbnailPage.cpp
@@ -175,25 +175,17 @@ namespace gallery {
 
        Result ThumbnailPage::doPrepare(NaviItem &item)
        {
-               m_content = PageContent::Builder().
-                               setFlags(PageContent::FLAG_MORE_OPTIONS).
-                               build(getNaviframe());
-               if (!m_content) {
-                       LOG_RETURN(RES_FAIL, "PageContent::build() failed!");
-               }
-               setDeactivatorSink(m_content);
-
                m_imageGrid = ImageGrid::Builder().
                                setListener(asWeakThis<ImageGrid::IListener>(this)).
                                setType(ImageGrid::Type::HCOMB_3X3).
-                               build(*m_content);
+                               build(getContent());
                if (!m_imageGrid) {
                        LOG_RETURN(RES_FAIL, "ImageGrid::build() failed!");
                }
-               m_content->set(*m_imageGrid);
+               getContent().set(*m_imageGrid);
 
                m_more = MoreOptionsPresenter::Builder().
-                               setParentWidget(m_content).
+                               setParentWidget(asShared(getContent())).
                                addOption({impl::MORE_OPTION_ID_DELETE,
                                        STR_DELETE, nullptr,
                                        getImageTheme(ICON_MORE_OPT_DELETE)}).
@@ -201,7 +193,7 @@ namespace gallery {
                if (!m_more) {
                        LOG_RETURN(RES_FAIL, "MoreOptionsPresenter::build() failed!");
                }
-               m_content->set(m_more->getWidget(), PageContent::Part::MORE_OPTIONS);
+               getContent().set(m_more->getWidget(), PageContent::Part::MORE_OPTIONS);
 
                FAIL_RETURN(m_album->forEachMedia(
                                DELEGATE(ThumbnailPage::onEachMedia, this)),
@@ -209,7 +201,7 @@ namespace gallery {
 
                m_imageGrid->setItemCount(m_mediaItems.size());
 
-               item = getNaviframe().push(*m_content, NAVIFRAME_NO_CLIP);
+               item = getNaviframe().push(getContent(), NAVIFRAME_NO_CLIP);
                if (!item) {
                        LOG_RETURN(RES_FAIL, "Naviframe::push() failed!");
                }

diff --git a/gallery/presenters/pages/ThumbnailPage.h b/gallery/presenters/pages/ThumbnailPage.h
index 4c311435aceca88728fdd7b3b1c8b18a68748e86..c58fe9b6128141298ab9dc5f5690f7a6edc29861 100644 (file)
--- a/gallery/presenters/pages/ThumbnailPage.h
+++ b/gallery/presenters/pages/ThumbnailPage.h
@@ -125,7 +125,6 @@ namespace gallery {
 
                std::vector<RealizedItemSRef> m_realizedItems;
 
-               PageContentSRef m_content;
                ImageGridSRef m_imageGrid;
                MoreOptionsPresenterSRef m_more;
 

diff --git a/gallery/presenters/pages/VideoPlayerPage.cpp b/gallery/presenters/pages/VideoPlayerPage.cpp
index 53c871ce729163b1b2ff247525f877b5935848ec..963cc03d3f6ae8493c15dce30802e7a7e0ba4c9d 100644 (file)
--- a/gallery/presenters/pages/VideoPlayerPage.cpp
+++ b/gallery/presenters/pages/VideoPlayerPage.cpp
@@ -187,17 +187,18 @@ namespace gallery {
 
        Result VideoPlayerPage::doPrepare(NaviItem &item)
        {
-               m_content = Layout::Builder().
+               m_layout = Layout::Builder().
                                setTheme(impl::LAYOUT_VIDEO_PLAYER).
                                build(getNaviframe());
-               if (!m_content) {
-                       LOG_RETURN(RES_FAIL, "m_content is NULL");
+               if (!m_layout) {
+                       LOG_RETURN(RES_FAIL, "m_layout is NULL");
                }
+               getContent().set(*m_layout);
 
-               elm_object_mirrored_automatic_set(as_eo(*m_content), EINA_FALSE);
-               elm_object_mirrored_set(as_eo(*m_content), EINA_FALSE);
+               elm_object_mirrored_automatic_set(as_eo(*m_layout), EINA_FALSE);
+               elm_object_mirrored_set(as_eo(*m_layout), EINA_FALSE);
 
-               item = getNaviframe().push(*m_content, NAVIFRAME_NO_CLIP);
+               item = getNaviframe().push(getContent(), NAVIFRAME_NO_CLIP);
                if (!item) {
                        LOG_RETURN(RES_FAIL, "Naviframe::push() failed!");
                }
@@ -252,10 +253,10 @@ namespace gallery {
        void VideoPlayerPage::createImage()
        {
                m_image = makeShared<Widget>(
-                               evas_object_image_filled_add(m_content->getEvas()));
+                               evas_object_image_filled_add(m_layout->getEvas()));
                show(*m_image);
 
-               m_content->setContent(*m_image);
+               m_layout->setContent(*m_image);
        }
 
        Result VideoPlayerPage::preparePlayer()
@@ -336,11 +337,11 @@ namespace gallery {
                        const EdjePart part, const WidgetEventHandler &handler)
        {
                const auto btn = makeShared<StyledWidget>(
-                               elm_button_add(as_eo(*m_content)), false);
+                               elm_button_add(as_eo(*m_layout)), false);
                btn->setStyle(style);
                show(*btn);
 
-               m_content->setContent(*btn, part);
+               m_layout->setContent(*btn, part);
 
                btn->addEventHandler(BTN_CLICKED, handler);
 
@@ -418,14 +419,14 @@ namespace gallery {
                        showVolumeBtn();
 
                        if (m_state == State::PLAYING) {
-                               m_content->emit(impl::SHOW_PAUSE_BTN);
+                               m_layout->emit(impl::SHOW_PAUSE_BTN);
                                resetTickTimer();
                                updatePlayTimeText();
                        } else {
-                               m_content->emit(impl::SHOW_PLAY_BTN);
+                               m_layout->emit(impl::SHOW_PLAY_BTN);
                        }
 
-                       m_content->emit(impl::SHOW_TEXT);
+                       m_layout->emit(impl::SHOW_TEXT);
                }
 
                resetControlsHideTimer();
@@ -436,9 +437,9 @@ namespace gallery {
                if (m_isControlsVisible) {
                        m_isControlsVisible = false;
 
-                       m_content->emit(impl::HIDE_VOLUME_BTN);
-                       m_content->emit(impl::HIDE_PLAY_PAUSE_BTN);
-                       m_content->emit(impl::HIDE_TEXT);
+                       m_layout->emit(impl::HIDE_VOLUME_BTN);
+                       m_layout->emit(impl::HIDE_PLAY_PAUSE_BTN);
+                       m_layout->emit(impl::HIDE_TEXT);
 
                        stopTimer(m_tickTimer);
                        stopTimer(m_controlsHideTimer);
@@ -448,13 +449,13 @@ namespace gallery {
        void VideoPlayerPage::showVolumeBtn()
        {
                if (!m_soundMgr || !m_soundMgr->isMediaDeviceReady()) {
-                       m_content->emit(impl::SHOW_VOLUME_MUTE_BTN);
+                       m_layout->emit(impl::SHOW_VOLUME_MUTE_BTN);
                        disable(*m_volumeMuteBtn);
                } else {
                        if (m_soundMgr->getCurrentMediaVolume() > 0) {
-                               m_content->emit(impl::SHOW_VOLUME_ON_BTN);
+                               m_layout->emit(impl::SHOW_VOLUME_ON_BTN);
                        } else {
-                               m_content->emit(impl::SHOW_VOLUME_MUTE_BTN);
+                               m_layout->emit(impl::SHOW_VOLUME_MUTE_BTN);
                                enable(*m_volumeMuteBtn);
                        }
                }
@@ -488,10 +489,10 @@ namespace gallery {
                impl::timeMsToHMS(m_videoDuration, durH, durM, durS);
 
                if (durH == 0) {
-                       m_content->setText(impl::TIME_SHORT_FORMAT.format(
+                       m_layout->setText(impl::TIME_SHORT_FORMAT.format(
                                        posM, posS, durM, durS));
                } else {
-                       m_content->setText(impl::TIME_LONG_FORMAT.format(
+                       m_layout->setText(impl::TIME_LONG_FORMAT.format(
                                        posH, posM, posS, durH, durM, durS));
                }
        }
@@ -534,7 +535,7 @@ namespace gallery {
                m_needAutoStart = false;
 
                if (m_isControlsVisible) {
-                       m_content->emit(impl::SHOW_PAUSE_BTN);
+                       m_layout->emit(impl::SHOW_PAUSE_BTN);
                }
        }
 
@@ -561,7 +562,7 @@ namespace gallery {
                updatePlayTimeText();
 
                if (m_isControlsVisible) {
-                       m_content->emit(impl::SHOW_PLAY_BTN);
+                       m_layout->emit(impl::SHOW_PLAY_BTN);
                }
        }
 

diff --git a/gallery/presenters/pages/VideoPlayerPage.h b/gallery/presenters/pages/VideoPlayerPage.h
index d11a7342e0e4a1f03e8bca62b45b80919e72705a..a41454451f797d3c8df5d985982343b1e0ed86d9 100644 (file)
--- a/gallery/presenters/pages/VideoPlayerPage.h
+++ b/gallery/presenters/pages/VideoPlayerPage.h
@@ -158,7 +158,7 @@ namespace gallery {
        private:
                const MediaItemSRef m_media;
                SoundManagerSRef m_soundMgr;
-               ucl::LayoutSRef m_content;
+               ucl::LayoutSRef m_layout;
                ucl::WidgetSRef m_image;
                ucl::StyledWidgetSRef m_volumeMuteBtn;
                TouchParserSRef m_touchParser;

diff --git a/gallery/presenters/pages/ViewerPage.cpp b/gallery/presenters/pages/ViewerPage.cpp
index a842ee74108869ad98f24514ab250a1fad3d9962..283017f4d9a44543b17332cefbee0cdace3946a8 100644 (file)
--- a/gallery/presenters/pages/ViewerPage.cpp
+++ b/gallery/presenters/pages/ViewerPage.cpp
@@ -143,6 +143,7 @@ namespace gallery {
                if (!m_imageViewer) {
                        LOG_RETURN(RES_FAIL, "ImageViewer::build() failed!");
                }
+               getContent().set(*m_imageViewer);
 
                if (useThumb) {
                        FAIL_RETURN(m_media->getThumbnailPath(
@@ -158,9 +159,9 @@ namespace gallery {
                const auto topItem = getNaviframe().getTopItem();
                if (topItem) {
                        item = getNaviframe().insertAfter(topItem,
-                                       *m_imageViewer, NAVIFRAME_NO_CLIP);
+                                       getContent(), NAVIFRAME_NO_CLIP);
                } else {
-                       item = getNaviframe().push(*m_imageViewer, NAVIFRAME_NO_CLIP);
+                       item = getNaviframe().push(getContent(), NAVIFRAME_NO_CLIP);
                }
                if (!item) {
                        LOG_RETURN(RES_FAIL, "Naviframe::push() failed!");

diff --git a/gallery/view/PageContent.cpp b/gallery/view/PageContent.cpp
index 6e6261d6ac8af93d979cfb094cd3b448673bf91f..ec1d0e2cc2a9c12fd018582e4d50c658219a9618 100644 (file)
--- a/gallery/view/PageContent.cpp
+++ b/gallery/view/PageContent.cpp
@@ -20,8 +20,8 @@
 
 namespace gallery { namespace { namespace impl {
 
-       constexpr LayoutTheme LAYOUT_MORE_OPTIONS
-                       {"layout", "gallery", "more_options"};
+       constexpr LayoutTheme LAYOUT_PAGE_CONTENT
+                       {"layout", "gallery", "page_content"};
 
        constexpr LayoutTheme LAYOUT_SELECT_MODE
                        {"layout", "select_mode", "default"};
@@ -30,7 +30,6 @@ namespace gallery { namespace { namespace impl {
                        {"layout", "bottom_button", "default"};
 
        constexpr EdjePart PART_MORE_OPTIONS {"gallery.swallow.more_options"};
-       constexpr EdjePart PART_OVERLAY {"gallery.swallow.overlay"};
 
        constexpr EdjeSignal SIGNAL_SHOW_SELECT_BUTTON {"select_mode,button,show"};
        constexpr EdjeSignal SIGNAL_HIDE_SELECT_BUTTON {"select_mode,button,hide"};
@@ -75,13 +74,13 @@ namespace gallery {
        PageContentSRef PageContent::Builder::build(ElmWidget &parent) const
        {
                auto layout = Layout::Builder().
-                               setTheme(impl::LAYOUT_MORE_OPTIONS).
+                               setTheme(impl::LAYOUT_PAGE_CONTENT).
                                build(parent);
                if (!layout) {
                        LOG_RETURN_VALUE(RES_FAIL, {}, "Layout::build() failed!");
                }
 
-               auto result = makeShared<PageContent>(layout, m_flags);
+               auto result = makeShared<PageContent>(layout.get(), m_flags, PRIVATE);
 
                result->bindToEo();
 
@@ -91,9 +90,9 @@ namespace gallery {
        // PageContent //
 
        PageContent::PageContent(IRefCountObj &rc,
-                       const LayoutSRef &layout, const int flags) :
+                       Layout *const layout, const int flags, Private) :
                ElmWidget(&rc, as_eo(*layout)),
-               m_mainLayout(layout.get())
+               m_mainLayout(layout)
        {
                prepare(flags);
        }
@@ -129,7 +128,7 @@ namespace gallery {
                }
        }
 
-       Result PageContent::set(ucl::Widget &widget, const Part part)
+       Result PageContent::set(Widget &widget, const Part part)
        {
                return doWithPart(part,
                        [&widget](Layout &layout, const EdjePart part)
@@ -189,9 +188,6 @@ namespace gallery {
                switch (part) {
                case Part::DEFAULT:
                        return impl::callSafe(getTopLayout(), func, PART_CONTENT);
-               case Part::OVERLAY:
-                       func(*m_mainLayout, impl::PART_OVERLAY);
-                       return RES_OK;
                case Part::MORE_OPTIONS:
                        func(*m_mainLayout, impl::PART_MORE_OPTIONS);
                        return RES_OK;

diff --git a/gallery/view/PageContent.h b/gallery/view/PageContent.h
index c7d9461bbef3130ed51cd21115637f82e802bca6..0a85879f08dfc5e7e322c4b4afdcbb009c319ad1 100644 (file)
--- a/gallery/view/PageContent.h
+++ b/gallery/view/PageContent.h
@@ -26,11 +26,10 @@ namespace gallery {
        UCL_DECLARE_REF_ALIASES(PageContent);
 
        /**
-        * @brief Represents page content
+        * @brief Provides set of instruments to manipulate page contents
         */
        class PageContent final : public ucl::ElmWidget {
        public:
-
                /**
                 * @brief Provides set of instruments for creation of
                 * PageContent object with set of options
@@ -63,9 +62,8 @@ namespace gallery {
                 * @brief Enumeration of flags
                 */
                enum {
-                       FLAG_MORE_OPTIONS = 1,                             /**< Select button flag*/
-                       FLAG_SELECT_BUTTON = 2,                            /**< Select button flag*/
-                       FLAG_BOTTOM_BUTTON = 4,                            /**< Bottom button flag*/
+                       FLAG_SELECT_BUTTON = 1,                    /**< Select button flag*/
+                       FLAG_BOTTOM_BUTTON = 2,                    /**< Bottom button flag*/
 
                        FLAGS_SELECT_MODE =
                                        (FLAG_SELECT_BUTTON | FLAG_BOTTOM_BUTTON), /**< Select mode flag*/
@@ -77,7 +75,6 @@ namespace gallery {
                 */
                enum class Part {
                        DEFAULT,           /**< Default*/
-                       OVERLAY,           /**< Overlay*/
                        MORE_OPTIONS,      /**< More option button*/
                        SELECT_BUTTON,     /**< Selector button*/
                        BOTTOM_BUTTON      /**< Bottom button*/
@@ -122,9 +119,8 @@ namespace gallery {
                ucl::Result setMoreOptionsVisible(bool visible);
 
        private:
-               friend class ucl::ReffedObj<PageContent>;
                PageContent(ucl::IRefCountObj &rc,
-                               const ucl::LayoutSRef &layout, int flags);
+                               ucl::Layout *layout, int flags, Private);
                virtual ~PageContent();
 
                void prepare(int flags);
@@ -138,6 +134,8 @@ namespace gallery {
                ucl::Layout *m_mainLayout;
                ucl::LayoutSRef m_selectMode;
                ucl::LayoutSRef m_bottomButton;
+
+               friend class ucl::ReffedObj<PageContent>;
        };
 }