Update3(prevent) and update4(scene builder error)

Change-Id: Ide743d91153b883fc51432e251811dc0547f7df4

diff --git a/.cproject b/.cproject
index 60998e2..b08e532 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -90,7 +90,7 @@
                                                                        <listOptionValue builtIn="false" value="-target i386-tizen-linux-gnueabi -gcc-toolchain /home/sangs/tizen-sdk/tools/smart-build-interface/../i386-linux-gnueabi-gcc-4.5/ -ccc-gcc-name i386-linux-gnueabi-g++ -march=i386 -Xlinker --as-needed"/>
                                                                        <listOptionValue builtIn="false" value=""/>
                                                                        <listOptionValue builtIn="false" value="-pie -lpthread "/>
-                                                                       <listOptionValue builtIn="false" value="-Xlinker -rpath=&quot;/opt/apps/D7eOJquGtL/lib&quot; -Xlinker -rpath=&quot;/home/developer/sdk_tools/lib&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="-Xlinker -rpath=&quot;/opt/usr/apps/D7eOJquGtL/lib&quot; -Xlinker -rpath=&quot;/home/developer/sdk_tools/lib&quot;"/>
                                                                        <listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="-L&quot;${SBI_SYSROOT}/usr/lib&quot;"/>
                                                                        <listOptionValue builtIn="false" value="-L&quot;${SBI_SYSROOT}/usr/lib/osp&quot;"/>
@@ -230,7 +230,7 @@
                                                                        <listOptionValue builtIn="false" value="-target arm-tizen-linux-gnueabi -gcc-toolchain /home/sangs/tizen-sdk/tools/smart-build-interface/../arm-linux-gnueabi-gcc-4.5/ -ccc-gcc-name arm-linux-gnueabi-g++ -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mtune=cortex-a8 -Xlinker --as-needed"/>
                                                                        <listOptionValue builtIn="false" value=""/>
                                                                        <listOptionValue builtIn="false" value="-pie -lpthread "/>
-                                                                       <listOptionValue builtIn="false" value="-Xlinker -rpath=&quot;/opt/apps/D7eOJquGtL/lib&quot; -Xlinker -rpath=&quot;/home/developer/sdk_tools/lib&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="-Xlinker -rpath=&quot;/opt/usr/apps/D7eOJquGtL/lib&quot; -Xlinker -rpath=&quot;/home/developer/sdk_tools/lib&quot;"/>
                                                                        <listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="-L&quot;${SBI_SYSROOT}/usr/lib&quot;"/>
                                                                        <listOptionValue builtIn="false" value="-L&quot;${SBI_SYSROOT}/usr/lib/osp&quot;"/>
@@ -364,7 +364,7 @@
                                                                        <listOptionValue builtIn="false" value="-target i386-tizen-linux-gnueabi -gcc-toolchain /home/sangs/tizen-sdk/tools/smart-build-interface/../i386-linux-gnueabi-gcc-4.5/ -ccc-gcc-name i386-linux-gnueabi-g++ -march=i386 -Xlinker --as-needed"/>
                                                                        <listOptionValue builtIn="false" value=""/>
                                                                        <listOptionValue builtIn="false" value="-pie -lpthread "/>
-                                                                       <listOptionValue builtIn="false" value="-Xlinker -rpath=&quot;/opt/apps/D7eOJquGtL/lib&quot; -Xlinker -rpath=&quot;/home/developer/sdk_tools/lib&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="-Xlinker -rpath=&quot;/opt/usr/apps/D7eOJquGtL/lib&quot; -Xlinker -rpath=&quot;/home/developer/sdk_tools/lib&quot;"/>
                                                                        <listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="-L&quot;${SBI_SYSROOT}/usr/lib&quot;"/>
                                                                        <listOptionValue builtIn="false" value="-L&quot;${SBI_SYSROOT}/usr/lib/osp&quot;"/>
@@ -504,7 +504,7 @@
                                                                        <listOptionValue builtIn="false" value="-target i386-tizen-linux-gnueabi -gcc-toolchain /home/sangs/tizen-sdk/tools/smart-build-interface/../i386-linux-gnueabi-gcc-4.5/ -ccc-gcc-name i386-linux-gnueabi-g++ -march=i386 -Xlinker --as-needed"/>
                                                                        <listOptionValue builtIn="false" value=""/>
                                                                        <listOptionValue builtIn="false" value="-pie -lpthread "/>
-                                                                       <listOptionValue builtIn="false" value="-Xlinker -rpath=&quot;/opt/apps/D7eOJquGtL/lib&quot; -Xlinker -rpath=&quot;/home/developer/sdk_tools/lib&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="-Xlinker -rpath=&quot;/opt/usr/apps/D7eOJquGtL/lib&quot; -Xlinker -rpath=&quot;/home/developer/sdk_tools/lib&quot;"/>
                                                                        <listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="-L&quot;${SBI_SYSROOT}/usr/lib&quot;"/>
                                                                        <listOptionValue builtIn="false" value="-L&quot;${SBI_SYSROOT}/usr/lib/osp&quot;"/>
@@ -644,7 +644,7 @@
                                                                        <listOptionValue builtIn="false" value="-target arm-tizen-linux-gnueabi -gcc-toolchain /home/sangs/tizen-sdk/tools/smart-build-interface/../arm-linux-gnueabi-gcc-4.5/ -ccc-gcc-name arm-linux-gnueabi-g++ -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mtune=cortex-a8 -Xlinker --as-needed"/>
                                                                        <listOptionValue builtIn="false" value=""/>
                                                                        <listOptionValue builtIn="false" value="-pie -lpthread "/>
-                                                                       <listOptionValue builtIn="false" value="-Xlinker -rpath=&quot;/opt/apps/D7eOJquGtL/lib&quot; -Xlinker -rpath=&quot;/home/developer/sdk_tools/lib&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="-Xlinker -rpath=&quot;/opt/usr/apps/D7eOJquGtL/lib&quot; -Xlinker -rpath=&quot;/home/developer/sdk_tools/lib&quot;"/>
                                                                        <listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
                                                                        <listOptionValue builtIn="false" value="-L&quot;${SBI_SYSROOT}/usr/lib&quot;"/>
                                                                        <listOptionValue builtIn="false" value="-L&quot;${SBI_SYSROOT}/usr/lib/osp&quot;"/>

diff --git a/inc/IstFormFactory.h b/inc/IstFormFactory.h
index d4baacd..63ad14d 100644 (file)
--- a/inc/IstFormFactory.h
+++ b/inc/IstFormFactory.h
@@ -26,6 +26,8 @@
 #include <FUi.h>
 
 
+extern const wchar_t* FORM_INSTALL;
+
 class FormFactory
        : public Tizen::Ui::Scenes::IFormFactory
 {

diff --git a/inc/IstInstallForm.h b/inc/IstInstallForm.h
index 7d1bf30..9e7f7e7 100644 (file)
--- a/inc/IstInstallForm.h
+++ b/inc/IstInstallForm.h
@@ -25,6 +25,7 @@
 
 #include <FBase.h>
 #include <FUi.h>
+#include "IstInstallEventListener.h"
 
 using namespace Tizen::Base::Runtime;
 
@@ -59,6 +60,7 @@ public:
 private:
        int __timerCounter;
        bool __isInstalling;
+       InstallEventListener* __appInstallObj;
 
        Timer* __pTimer;
        Tizen::Ui::Controls::Header* __pHeader;
@@ -75,11 +77,6 @@ private:
        Tizen::Base::String __packageName;
        Tizen::App::AppManager* __pAppManager;
 
-       Tizen::Base::Collection::ArrayList* __pAnimationFrameList;
-       Tizen::Base::Collection::ArrayList* __pAnimationFrameList2;
-       Tizen::Ui::Controls::Animation* __pAnimation;
-       Tizen::Ui::Controls::Animation* __pAnimation2;
-
 };
 
 #endif

diff --git a/inc/IstMainFrame.h b/inc/IstMainFrame.h
index a8e2f24..de3fbf2 100644 (file)
--- a/inc/IstMainFrame.h
+++ b/inc/IstMainFrame.h
@@ -4,6 +4,7 @@
 #include <FBase.h>
 #include <FUi.h>
 
+extern const wchar_t* SCENE_INSTALL_FORM;
 
 class MainFrame
        : public Tizen::Ui::Controls::Frame

diff --git a/res/screen-density-high/mainmenu.png b/res/screen-density-high/mainmenu.png
new file mode 100644 (file)
index 0000000..983c883
Binary files /dev/null and b/res/screen-density-high/mainmenu.png differ

diff --git a/res/screen-density-xhigh/mainmenu.png b/res/screen-density-xhigh/mainmenu.png
new file mode 100644 (file)
index 0000000..983c883
Binary files /dev/null and b/res/screen-density-xhigh/mainmenu.png differ

diff --git a/res/screen-size-normal/IDL_DETAIL_FORM.xml b/res/screen-size-normal/IDL_DETAIL_FORM.xml
index 270f785..8e2959f 100644 (file)
--- a/res/screen-size-normal/IDL_DETAIL_FORM.xml
+++ b/res/screen-size-normal/IDL_DETAIL_FORM.xml
@@ -3,31 +3,28 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-<Scene Bversion="2.0.0.201302151107" Dversion="20120315">
+<Scene Bversion="2.0.0.201304041646" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_DETAIL_FORM">
-        <property backgroundColor="" backgroundColorOpacity="100" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
+        <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
         <layout mode="Portrait" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="NONE"/>
     </Form>
     <Footer>
-        <property backgroundBitmapPath="" color="" colorOpacity="100" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_ICON_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" showBackButton="true"/>
-        <itemSet>
-            <footerItem actionId="101" disabledIconPath="" highlightedIconPath="" normalIconPath="" pressedIconPath="" selectedIconPath="" text="Install"/>
-        </itemSet>
+        <property backgroundBitmapPath="" color="" colorOpacity="100" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_ICON_TEXT" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" showBackButton="true"/>        
     </Footer>
     <Header>
-        <property backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="APP NAME" titleTextColor=""/>
+        <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="APP NAME" titleTextColor=""/>
         <itemSet/>
     </Header>
     <TextBox id="IDC_INFO_TEXTBOX" parent="IDL_DETAIL_FORM">
-        <property disabledBackgroundBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" highlightedBackgroundBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" lineSpacingExtra="1" lineSpacingMultiplier="1" normalBackgroundBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" text="" textAlignment="" textSize="33" textboxBorder="TEXT_BOX_BORDER_ROUNDED"/>
-        <layout height="221" mode="Portrait" width="629" x="47" y="22"/>
-        <layout height="166" mode="Landscape" width="1118" x="76" y="20"/>
+        <property accessibilityHint="" disabledBackgroundBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" highlightedBackgroundBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" lineSpacingExtra="1.0" lineSpacingMultiplier="1.0" normalBackgroundBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" text="" textAlignment="" textSize="33.0" textboxBorder="TEXT_BOX_BORDER_ROUNDED"/>
+        <layout height="221.0" mode="Portrait" width="629.0" x="47.0" y="22.0"/>
+        <layout height="166.0" mode="Landscape" width="1118.0" x="76.0" y="20.0"/>
     </TextBox>
     <ListView id="IDC_INFO_LIST" parent="IDL_DETAIL_FORM">
-        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="" colorOfEmptyListText="" fastScroll="false" itemDivider="true" itemDividerColor="" sweepEnabled="false" textOfEmptyList=""/>
-        <layout height="737" mode="Portrait" width="625" x="49" y="265"/>
-        <layout height="414" mode="Landscape" width="1111" x="87" y="70"/>
+        <property backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" bitmapPathOfEmptyList="" colorOfEmptyListText="" fastScroll="false" itemDivider="true" itemDividerColor="" scrollInputMode="SCROLL_INPUT_MODE_ALLOW_ANY_DIRECTION" sweepEnabled="false" textOfEmptyList=""/>
+        <layout height="737.0" mode="Portrait" width="625.0" x="49.0" y="265.0"/>
+        <layout height="414.0" mode="Landscape" width="1111.0" x="87.0" y="70.0"/>
     </ListView>
 </Scene>

diff --git a/res/screen-size-normal/IDL_MESSAGE_POPUP.xml b/res/screen-size-normal/IDL_MESSAGE_POPUP.xml
new file mode 100644 (file)
index 0000000..a3f527f
--- /dev/null
+++ b/res/screen-size-normal/IDL_MESSAGE_POPUP.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+       This XML file was automatically generated by UiBuilder - do not modify by hand.
+-->
+<!DOCTYPE ScenePopup SYSTEM "UIForm.dtd">
+<ScenePopup Bversion="2.0.0.201304041646" Dversion="20120315">
+    <Popup id="IDL_MESSAGE_POPUP">
+        <property accessibilityHint="" color="" titleText="Title" titleTextColor=""/>
+        <layout height="393.0" mode="Portrait" style="" type="LAYOUT_RELATIVE" width="657.0"/>
+        <layout height="680.0" mode="Landscape" style="" type="LAYOUT_RELATIVE" width="390.0"/>
+    </Popup>
+    <Label id="IDC_MESSAGE_LABEL" parent="IDL_MESSAGE_POPUP">
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="Label1" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="75.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_MESSAGE_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="20.0" marginRight="20.0" marginTop="20.0" mode="Portrait" rightRelation="IDL_MESSAGE_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_MESSAGE_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="617.0" x="20.0" y="20.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="438.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="390.0" x="0.0" y="81.0"/>
+    </Label>
+    <Button id="IDC_EXIT_BUTTON" parent="IDL_MESSAGE_POPUP">
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Exit" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="IDL_MESSAGE_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="20.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="298.0" x="179.0" y="221.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="125.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="221.0" x="169.0" y="433.0"/>
+    </Button>
+</ScenePopup>

diff --git a/res/screen-size-normal/IDL_SECURITY_POPUP.xml b/res/screen-size-normal/IDL_SECURITY_POPUP.xml
new file mode 100644 (file)
index 0000000..d5c5a96
--- /dev/null
+++ b/res/screen-size-normal/IDL_SECURITY_POPUP.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+       This XML file was automatically generated by UiBuilder - do not modify by hand.
+-->
+<!DOCTYPE ScenePopup SYSTEM "UIForm.dtd">
+<ScenePopup Bversion="2.0.0.201304041646" Dversion="20120315">
+    <Popup id="IDL_SECURITY_POPUP">
+        <property accessibilityHint="" color="" titleText="" titleTextColor=""/>
+        <layout height="486.0" mode="Portrait" style="" type="LAYOUT_RELATIVE" width="657.0"/>
+        <layout height="680.0" mode="Landscape" style="" type="LAYOUT_RELATIVE" width="430.0"/>
+    </Popup>
+    <Label id="IDC_LABEL1" parent="IDL_SECURITY_POPUP">
+        <property accessibilityHint="" backgroundBitmapPath="mainmenu.png" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="20.0" marginRight="0.0" marginTop="20.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="72.0" x="20.0" y="20.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="119.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="33.0" x="13.0" y="65.0"/>
+    </Label>
+    <Progress id="IDC_PROGRESS1" parent="IDL_SECURITY_POPUP">
+        <property accessibilityHint="" backgroundColor="" barBGColor="" barColor="" leftText="" max="5" min="0" rightText="" showValueState="true" value="0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="72.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDC_LABEL1" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_RIGHT" marginBottom="0.0" marginLeft="16.0" marginRight="16.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_SECURITY_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" style="" topRelation="IDC_LABEL1" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="533.0" x="108.0" y="20.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="131.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" style="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="276.0" x="71.0" y="63.0"/>
+    </Progress>
+    <Button id="IDC_BUTTON1" parent="IDL_SECURITY_POPUP">
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="OK" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="298.0" x="0.0" y="392.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="129.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="207.0" x="153.0" y="430.0"/>
+    </Button>
+    <Label id="IDC_LABEL2" parent="IDL_SECURITY_POPUP">
+        <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="#BFBFBF" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="16" text="" textColor="" textSize="33.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="77.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="556.0" x="3.0" y="309.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="111.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="372.0" x="15.0" y="445.0"/>
+    </Label>
+    <TextBox id="IDC_TEXTBOX1" parent="IDL_SECURITY_POPUP">
+        <property accessibilityHint="" disabledBackgroundBitmapPath="" disabledColor="" disabledColorOpacity="100" disabledTextColor="" highlightedBackgroundBitmapPath="" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" lineSpacingExtra="1.0" lineSpacingMultiplier="1.0" normalBackgroundBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" text="" textAlignment="" textSize="45.0" textboxBorder="TEXT_BOX_BORDER_ROUNDED"/>
+        <layout bottomRelation="IDC_BUTTON1" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="true" centerVertical="false" height="260.0" horizontalFitPolicy="FIT_POLICY_PARENT" leftRelation="" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20.0" marginLeft="20.0" marginRight="20.0" marginTop="20.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDC_PROGRESS1" topRelationType="RECT_EDGE_RELATION_TOP_TO_BOTTOM" verticalFitPolicy="FIT_POLICY_FIXED" width="657.0" x="0" y="112.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="241.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="372.0" x="13.0" y="148.0"/>
+    </TextBox>
+    <Button id="IDC_BUTTON2" parent="IDL_SECURITY_POPUP">
+        <property DisabledBitmapX="0.0" DisabledBitmapY="0.0" NormalBitmapX="0.0" NormalBitmapY="0.0" PressedBitmapX="0.0" PressedBitmapY="0.0" accessibilityHint="" disableTextColor="" disabledBGBitmapPath="" disabledBitmapPath="" disabledColor="" disabledColorOpacity="100" highlightedBGBitmapPath="" highlightedBitmapPath="" highlightedBitmapX="0.0" highlightedBitmapY="0.0" highlightedColor="" highlightedColorOpacity="100" highlightedTextColor="" horizontalAlign="ALIGN_CENTER" normalBGBitmapPath="" normalBitmapPath="" normalColor="" normalColorOpacity="100" normalTextColor="" pressedBGBitmapPath="" pressedBitmapPath="" pressedColor="" pressedColorOpacity="100" pressedTextColor="" text="Keep" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="10.0" marginTop="0.0" mode="Portrait" rightRelation="" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="298.0" x="309.0" y="392.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="false" height="90.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="" leftRelationType="" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="" rightRelationType="" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="171.0" x="219.0" y="509.0"/>
+    </Button>
+</ScenePopup>

diff --git a/res/screen-size-normal/workflow.xml b/res/screen-size-normal/workflow.xml
index e89967c..8d1c713 100644 (file)
--- a/res/screen-size-normal/workflow.xml
+++ b/res/screen-size-normal/workflow.xml
@@ -3,5 +3,10 @@
     <Scene Form="IDL_DETAIL_FORM" Id="FORM_DETAIL"/>
     <Scene Form="IDL_APP_INSTALL_FORM" Id="FORM_APP_INSTALL"/>
     <SceneTransition AnimationType="none" DestroyOption="keep" DirectionType="forward" HistoryOption="add" Id="ID_SCNT_MAINSCENE" Method="" SourceId="" SourceResourceType="" TargetId="FORM_DETAIL"/>
-    <SceneTransition AnimationType="left" DestroyOption="keep" DirectionType="forward" HistoryOption="add" Id="ID_SCNT_1" Method="OnActionPerformed" SourceId="FORM_DETAIL" SourceResourceType="IDL_DETAIL_FORM" TargetId="FORM_APP_INSTALL"/>
+    
+    <!--UI Builder(Workflow Designer) only-->
+    <WorkflowDesigner>
+        <Position Name="FORM_DETAIL" X="129" Y="155"/>
+        <Position Name="FORM_APP_INSTALL" X="557" Y="58"/>
+    </WorkflowDesigner>
 </Workflow>

diff --git a/src/IstDetailForm.cpp b/src/IstDetailForm.cpp
index 632f7d9..1e40790 100644 (file)
--- a/src/IstDetailForm.cpp
+++ b/src/IstDetailForm.cpp
@@ -27,6 +27,7 @@
 #include "IstInstallEventListener.h"
 #include "IstInstallerApp.h"
 #include "IstTypes.h"
+#include "IstMainFrame.h"
 
 using namespace Tizen::Base;
 using namespace Tizen::App;
@@ -51,8 +52,8 @@ static const wchar_t ROLL_UP_IMAGE[] = L"00_list_expand_opened.png";
 static const wchar_t ELM_CHECK_IMAGE[] = L"00_check_checking_dim.png";
 
 // Color
-static const Color UI_COLOR_WHITE = Color(248, 246, 239, 100);
-static const Color UI_COLOR_WHITE2 = Color(0, 0, 0, 0);
+static const unsigned int UI_COLOR_WHITE = Color32<248, 246, 239>::Value;
+static const unsigned int UI_COLOR_WHITE2 = Color32<255, 255, 255>::Value;
 // Font
 static const int FONT_SIZE_MAIN_TEXT = 33;
 static const int FONT_SIZE_SUB_TEXT = 30;
@@ -116,7 +117,8 @@ DetailForm::CreateTableView(void)
        __pList->SetItemProvider(this);
        __pList->AddGroupedTableViewItemEventListener(*this);
 
-       AddControl(*__pList);
+       AddControl(__pList);
+//     __pList->UpdateTableView();
 }
 
 void
@@ -155,7 +157,7 @@ DetailForm::ParsingTPK()
        filePath = static_cast<InstallerApp*>(UiApp::GetInstance())->GetPackagePath();
        // 2. parsing tpk file with file-path
        __pTargetPackageInfo = pMgr->GetPackageInfoFromFileN(filePath);
-       TryReturn(__pTargetPackageInfo, E_FAILURE, "Package Path is not delivered");
+       TryReturn(__pTargetPackageInfo != null, GetLastResult(), "[%s] Package Path is not delivered", GetErrorMessage(GetLastResult()))
 
        __pHeader->SetTitleText(__pTargetPackageInfo->GetDisplayName());
        packageId = __pTargetPackageInfo->GetId().GetPointer();
@@ -265,7 +267,7 @@ DetailForm::SetPopupControl()
        popUpLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        popUpLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
 
-       TextBox* pTextBox = new TextBox();
+       TextBox* pTextBox = new (std::nothrow) TextBox();
        pTextBox->Construct(Rectangle(X_POPUP_LABLE, Y_POPUP_LABLE, __pPopup->GetBounds().width - GAP_BETWEEN_POPUP_LABEL*2, UI_H_POPUP - H_POPUP_TITLE), TEXT_BOX_BORDER_NONE);
        pTextBox->SetText(L"Application is already installed\n\nInstallation will be closed.");
        pTextBox->SetTextSize(33);
@@ -285,18 +287,18 @@ DetailForm::SetPopupControl()
        String packagePath = pUiApp->GetPackagePath();
        if (packagePath.IsEmpty() || pUiApp->IsValidAccess() == false){
                pTextBox->SetText(L"Wrong Execution.");
-               __pPopup->AddControl(*pTextBox);
+               __pPopup->AddControl(pTextBox);
                pButtonClose->SetPosition(X_CANCEL_BTN_ALONE, pButtonClose->GetY());
        }
        else if (__isInstalled && !__isUpdatable){
-               __pPopup->AddControl(*pTextBox);
+               __pPopup->AddControl(pTextBox);
                pButtonClose->SetPosition(X_CANCEL_BTN_ALONE, pButtonClose->GetY());
        }
        else{
-               __pPopup->AddControl(*popUpLabel);
-               __pPopup->AddControl(*pButtonInstall);
+               __pPopup->AddControl(popUpLabel);
+               __pPopup->AddControl(pButtonInstall);
        }
-       __pPopup->AddControl(*pButtonClose);
+       __pPopup->AddControl(pButtonClose);
 }
 
 result
@@ -313,9 +315,14 @@ DetailForm::OnInitializing(void)
        __pHeader->SetTitleIcon(__pHeaderImage);
 
        // Footer Item Set
+       FooterItem  footerItem1;
+       footerItem1.Construct(IDA_INSTALL_BTN);
+       footerItem1.SetText(L"Install");
+
        Footer* pFooter = GetFooter();
        SetFormBackEventListener(this);
        pFooter->AddActionEventListener(*this);
+       pFooter->AddItem(footerItem1);
 
        // initialize variable
        __itemCount = 0;
@@ -377,8 +384,7 @@ DetailForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        IList* pArgs = null;
                        pArgs = new (std::nothrow) ArrayList();
                        pArgs->Add(*(new (std::nothrow) String(__pTargetPackageInfo->GetDisplayName())));
-
-                       pSceneManager->GoForward(SceneTransitionId(L"ID_SCNT_1"), pArgs);
+                       pSceneManager->GoForward(ForwardSceneTransition(SCENE_INSTALL_FORM, SCENE_TRANSITION_ANIMATION_TYPE_LEFT), pArgs);
                }
                break;
        case ID_BUTTON_CLOSE_POPUP:
@@ -464,12 +470,9 @@ DetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pMainTextLable->Construct(Rectangle(X_MAIN_TEXT_LABEL, Y_MAIN_TEXT_LABEL, pItem->GetWidth() - X_MAIN_TEXT_LABEL, H_MAIN_TEXT_LABEL), name);
 
                Label* pImageLable = null;
-               Label* pSubTextLabel = null;
-               TextBox* pSubTextBox = new TextBox();
+               TextBox* pSubTextBox = new (std::nothrow) TextBox();
 
                pImageLable = new (std::nothrow) Label();
-               pSubTextLabel = new (std::nothrow) Label();
-               pSubTextBox = new TextBox();
 
                pMainTextLable->SetTextConfig(FONT_SIZE_MAIN_TEXT, LABEL_TEXT_STYLE_BOLD);
                pMainTextLable->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
@@ -486,9 +489,9 @@ DetailForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                pSubTextBox->SetColor(TEXT_BOX_STATUS_DISABLED, UI_COLOR_WHITE2);
                ResizeSubText(pSubTextBox->GetLineCount(), pItem, pSubTextBox);
 
-               pItem->AddControl(*pMainTextLable);
-               pItem->AddControl(*pImageLable);
-               pItem->AddControl(*pSubTextBox);
+               pItem->AddControl(pMainTextLable);
+               pItem->AddControl(pImageLable);
+               pItem->AddControl(pSubTextBox);
 
                return pItem;
        }

diff --git a/src/IstFormFactory.cpp b/src/IstFormFactory.cpp
index 7e0d9d3..b784b78 100644 (file)
--- a/src/IstFormFactory.cpp
+++ b/src/IstFormFactory.cpp
@@ -26,6 +26,7 @@
 
 using namespace Tizen::Ui::Scenes;
 
+const wchar_t* FORM_INSTALL = L"IDL_APP_INSTALL_FORM";
 
 FormFactory::FormFactory(void)
 {
@@ -44,13 +45,13 @@ FormFactory::CreateFormN(const Tizen::Base::String& formId, const Tizen::Ui::Sce
 
        if (formId == L"IDL_DETAIL_FORM")
        {
-               DetailForm* pForm = new DetailForm();
+               DetailForm* pForm = new (std::nothrow) DetailForm();
                pForm->Initialize();
                pNewForm = pForm;
        }
        else if (formId == L"IDL_APP_INSTALL_FORM")
        {
-               InstallForm* pForm = new InstallForm();
+               InstallForm* pForm = new (std::nothrow) InstallForm();
                pForm->Initialize();
                pSceneManager->AddSceneEventListener(sceneId, *pForm);
                pNewForm = pForm;

diff --git a/src/IstInstallEventListener.cpp b/src/IstInstallEventListener.cpp
index 3ffb617..5fe5de1 100644 (file)
--- a/src/IstInstallEventListener.cpp
+++ b/src/IstInstallEventListener.cpp
@@ -72,6 +72,7 @@ InstallEventListener::OnPackageInstallationResponseReceived(const PackageId& pac
                }
                break;
        }
+//     delete pArgs;
 }
 
 void
@@ -83,4 +84,6 @@ InstallEventListener::OnPackageInstallationInProgressResponseReceived(const Pack
        pArgs = new (std::nothrow) ArrayList();
        pArgs->Add(*(new (std::nothrow) String(data)));
        UiApp::GetInstance()->GetFrame(APP_NAME)->GetCurrentForm()->SendUserEvent(INSTALL_PROGRESS_VALUE, pArgs);
+
+//     delete pArgs;
 }

diff --git a/src/IstInstallForm.cpp b/src/IstInstallForm.cpp
index dae2670..0ff874d 100644 (file)
--- a/src/IstInstallForm.cpp
+++ b/src/IstInstallForm.cpp
@@ -53,10 +53,6 @@ InstallForm::InstallForm(void)
        , __pProgressImage(null)
        , __pProgressEfImage(null)
        , __pAppManager(null)
-       , __pAnimationFrameList(null)
-       , __pAnimationFrameList2(null)
-       , __pAnimation(null)
-       , __pAnimation2(null)
        , __timerCounter(0)
        , __isInstalling(false)
 {
@@ -91,9 +87,11 @@ void
 InstallForm::InstallApplication()
 {
        PackageManager* packManager = PackageManager::GetInstance();
-       InstallEventListener* appInstallObj = new InstallEventListener();
-       String packageId = L"sangs_temp_id";
        String packagePath = static_cast<InstallerApp*>(UiApp::GetInstance())->GetPackagePath();
+       PackageInfo* pTargetPackageInfo;
+       pTargetPackageInfo = packManager->GetPackageInfoFromFileN(packagePath);
+       String packageId = pTargetPackageInfo->GetId();
+
        result res;
 
        if (packagePath.IsEmpty()){
@@ -103,7 +101,7 @@ InstallForm::InstallApplication()
                return;
        }
 
-       res = packManager->InstallPackage(packageId, packagePath, appInstallObj);
+       res = packManager->InstallPackage(packageId, packagePath, __appInstallObj);
        if (res != E_SUCCESS)
        {
                TryLog(res != E_INVALID_ARG, "E_INVALID_ARG");
@@ -142,7 +140,7 @@ InstallForm::SetPopupControl()
        popUpLabel->SetTextHorizontalAlignment(ALIGNMENT_LEFT);
        popUpLabel->SetTextVerticalAlignment(ALIGNMENT_TOP);
 
-       __pPopupTextBox = new TextBox();
+       __pPopupTextBox = new (std::nothrow) TextBox();
        __pPopupTextBox->Construct(Rectangle(X_POPUP_LABLE, Y_POPUP_LABLE, __pPopup->GetBounds().width - GAP_BETWEEN_POPUP_LABEL*2, UI_H_POPUP - H_POPUP_TITLE), TEXT_BOX_BORDER_NONE);
        __pPopupTextBox->SetTextSize(33);
 
@@ -151,9 +149,9 @@ InstallForm::SetPopupControl()
        pButtonClose->SetActionId(ID_BUTTON_CLOSE_POPUP);
        pButtonClose->AddActionEventListener(*this);
 
-       __pPopup->AddControl(*__pPopupTextBox);
+       __pPopup->AddControl(__pPopupTextBox);
        pButtonClose->SetPosition(X_CANCEL_BTN_ALONE, pButtonClose->GetY());
-       __pPopup->AddControl(*pButtonClose);
+       __pPopup->AddControl(pButtonClose);
 }
 
 result
@@ -163,6 +161,7 @@ InstallForm::OnInitializing(void)
 
        AppResource* pAppResource = Application::GetInstance()->GetAppResource();
        __pAppManager = AppManager::GetInstance();
+       __appInstallObj = new (std::nothrow) InstallEventListener();
 
        SetFormBackEventListener(this);
 
@@ -180,7 +179,7 @@ InstallForm::OnInitializing(void)
        __progressImageLabel = new (std::nothrow) Label();
        __progressImageLabel->Construct(Rectangle(70, 550, 580, 20), L"");
 
-       AddControl(*__progressImageLabel);
+       AddControl(__progressImageLabel);
 
        __pProgress = static_cast<Progress*>(GetControl(L"IDF_PROGRESS", true));
        __pProgressLabel = static_cast<Label*>(GetControl(L"IDC_PROGRESS_LABEL", true));
@@ -199,9 +198,7 @@ InstallForm::OnTerminating(void)
 {
        result r = E_SUCCESS;
 
-       if (__pTimer){
-               delete __pTimer;
-       }
+       delete __pTimer;
 
        return r;
 }
@@ -239,6 +236,8 @@ InstallForm::OnUserEventReceivedN (RequestId requestId, Tizen::Base::Collection:
                AddFooterItem();
                __pProgressLabel->SetText(POPUP_MSESSAGE_SUCCESS);
 
+//             delete pLocalPackageInfo;
+//             __appInstallObj->~InstallEventListener();
        }
        else if (requestId == INSTALL_PROGRESS_VALUE)
        {

diff --git a/src/IstInstallerApp.cpp b/src/IstInstallerApp.cpp
index fee857f..29a1989 100644 (file)
--- a/src/IstInstallerApp.cpp
+++ b/src/IstInstallerApp.cpp
@@ -45,7 +45,7 @@ UiApp*
 InstallerApp::CreateInstance(void)
 {
        // Create the instance through the constructor.
-       return new InstallerApp();
+       return new (std::nothrow) InstallerApp();
 }
 
 String
@@ -89,7 +89,7 @@ bool
 InstallerApp::OnAppInitialized(void)
 {
        // Create a Frame
-       MainFrame* pMainFrame = new MainFrame();
+       MainFrame* pMainFrame = new (std::nothrow) MainFrame();
        pMainFrame->Construct();
        pMainFrame->SetName(APP_NAME);
        AddFrame(*pMainFrame);

diff --git a/src/IstMainFrame.cpp b/src/IstMainFrame.cpp
index d5192b3..cbca603 100644 (file)
--- a/src/IstMainFrame.cpp
+++ b/src/IstMainFrame.cpp
@@ -7,6 +7,8 @@ using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
+const wchar_t* SCENE_INSTALL_FORM = L"Scene_InstallForm";
+
 MainFrame::MainFrame(void)
 {
 }
@@ -26,6 +28,8 @@ MainFrame::OnInitializing(void)
        pSceneManager->RegisterPanelFactory(panelFactory);
        pSceneManager->RegisterScene(L"workflow");
 
+       pSceneManager->RegisterScene(SCENE_INSTALL_FORM, FORM_INSTALL, L"");
+
        // Goto the scene.
        result r = pSceneManager->GoForward(SceneTransitionId(L"ID_SCNT_MAINSCENE"));