fix messages for checking version.

Change-Id: I50c30bdad9a2c4c1803927812379fffdd0ec299d

diff --git a/Installer/inc/IstPanelFactory.h b/Installer/inc/IstPanelFactory.h
deleted file mode 100644 (file)
index 3eb43d4..0000000
--- a/Installer/inc/IstPanelFactory.h
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// Copyright (c) 2012 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.1 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-/**
- *@file                IstPanelFactory.h
- *@brief               This file contains the implementation PanelFactory class, which manages
- *                             all the panels of the application.
- */
-
-#ifndef _IST_PANEL_FACTORY_H_
-#define _IST_PANEL_FACTORY_H_
-
-#include <FBase.h>
-#include <FUi.h>
-
-class PanelFactory
-       : public Tizen::Ui::Scenes::IPanelFactory
-{
-public:
-       PanelFactory(void);
-       virtual ~PanelFactory(void);
-
-       virtual Tizen::Ui::Controls::Panel* CreatePanelN(const Tizen::Base::String& panelId, const Tizen::Ui::Scenes::SceneId& sceneId);
-};
-
-#endif /* _IST_PANEL_FACTORY_H_ */

diff --git a/Installer/res/screen-size-normal/IDL_INSTALLED_POPUP.xml b/Installer/res/screen-size-normal/IDL_INSTALLED_POPUP.xml
index ee85236..3523e03 100644 (file)
--- a/Installer/res/screen-size-normal/IDL_INSTALLED_POPUP.xml
+++ b/Installer/res/screen-size-normal/IDL_INSTALLED_POPUP.xml
@@ -4,7 +4,7 @@
 -->
 <!DOCTYPE ScenePopup SYSTEM "UIForm.dtd">
 
-<ScenePopup Bversion="2.0.0.201306151404" Dversion="20120315">
+<ScenePopup Bversion="2.0.0.201306211508" Dversion="20120315">
     <Popup id="IDL_INSTALLED_POPUP">
         <property accessibilityHint="" color="" titleText="" titleTextColor=""/>
         <layout height="350.0" mode="Portrait" style="" type="LAYOUT_RELATIVE" width="688.0"/>
@@ -12,32 +12,32 @@
     </Popup>
     <Panel id="IDC_PANEL" parent="IDL_INSTALLED_POPUP">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
-        <layout bottomRelation="IDL_INSTALLED_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" column1Collapsed="false" column1Shrinkable="true" column1Spacing="0.0" column1Stretchable="true" column2Collapsed="false" column2Shrinkable="true" column2Spacing="10.0" column2Stretchable="true" column3Collapsed="false" column3Shrinkable="true" column3Spacing="10.0" column3Stretchable="true" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_INSTALLED_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="16.0" marginLeft="16.0" marginRight="16.0" marginTop="0.0" maxColumn="3" maxRow="1" mode="Portrait" rightRelation="IDL_INSTALLED_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" row1Collapsed="false" row1Shrinkable="true" row1Spacing="0.0" row1Stretchable="true" topRelation="" topRelationType="" type="LAYOUT_GRID" verticalFitPolicy="FIT_POLICY_FIXED" width="656.0" x="16.0" y="260.0"/>
-        <layout bottomRelation="IDL_INSTALLED_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" column1Collapsed="false" column1Shrinkable="true" column1Spacing="0.0" column1Stretchable="true" column2Collapsed="false" column2Shrinkable="true" column2Spacing="10.0" column2Stretchable="true" column3Collapsed="false" column3Shrinkable="true" column3Spacing="10.0" column3Stretchable="true" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_INSTALLED_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="16.0" marginLeft="16.0" marginRight="16.0" marginTop="0.0" maxColumn="3" maxRow="1" mode="Landscape" rightRelation="IDL_INSTALLED_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" row1Collapsed="false" row1Shrinkable="true" row1Spacing="0.0" row1Stretchable="true" topRelation="" topRelationType="" type="LAYOUT_GRID" verticalFitPolicy="FIT_POLICY_FIXED" width="656.0" x="16.0" y="260.0"/>
+        <layout bottomRelation="IDL_INSTALLED_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" column1Collapsed="false" column1Shrinkable="true" column1Spacing="0.0" column1Stretchable="true" column2Collapsed="false" column2Shrinkable="true" column2Spacing="10.0" column2Stretchable="true" column3Collapsed="false" column3Shrinkable="true" column3Spacing="10.0" column3Stretchable="true" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_INSTALLED_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20.0" marginLeft="20.0" marginRight="20.0" marginTop="0.0" maxColumn="3" maxRow="1" mode="Portrait" rightRelation="IDL_INSTALLED_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" row1Collapsed="false" row1Shrinkable="true" row1Spacing="0.0" row1Stretchable="true" topRelation="" topRelationType="" type="LAYOUT_GRID" verticalFitPolicy="FIT_POLICY_FIXED" width="648.0" x="20.0" y="256.0"/>
+        <layout bottomRelation="IDL_INSTALLED_POPUP" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" column1Collapsed="false" column1Shrinkable="true" column1Spacing="0.0" column1Stretchable="true" column2Collapsed="false" column2Shrinkable="true" column2Spacing="10.0" column2Stretchable="true" column3Collapsed="false" column3Shrinkable="true" column3Spacing="10.0" column3Stretchable="true" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_INSTALLED_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="20.0" marginLeft="20.0" marginRight="20.0" marginTop="0.0" maxColumn="3" maxRow="1" mode="Landscape" rightRelation="IDL_INSTALLED_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" row1Collapsed="false" row1Shrinkable="true" row1Spacing="0.0" row1Stretchable="true" topRelation="" topRelationType="" type="LAYOUT_GRID" verticalFitPolicy="FIT_POLICY_FIXED" width="648.0" x="20.0" y="256.0"/>
     </Panel>
     <Button id="IDC_BUTTON_REINSTALL" parent="IDC_PANEL">
         <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="Reinstall" textSize="36.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout height="74.0" horizontalAlignment="LAYOUT_HORIZONTAL_ALIGN_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" positionColumn="0" positionColumnSpan="1" positionRow="0" positionRowSpan="1" verticalAlignment="LAYOUT_VERTICAL_ALIGN_TOP" visible="true" width="212.0"/>
-        <layout height="74.0" horizontalAlignment="LAYOUT_HORIZONTAL_ALIGN_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" positionColumn="0" positionColumnSpan="1" positionRow="0" positionRowSpan="1" verticalAlignment="LAYOUT_VERTICAL_ALIGN_TOP" visible="true" width="295.91672"/>
+        <layout height="74.0" horizontalAlignment="LAYOUT_HORIZONTAL_ALIGN_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" positionColumn="0" positionColumnSpan="1" positionRow="0" positionRowSpan="1" verticalAlignment="LAYOUT_VERTICAL_ALIGN_TOP" visible="true" width="210.00002"/>
+        <layout height="74.0" horizontalAlignment="LAYOUT_HORIZONTAL_ALIGN_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" positionColumn="0" positionColumnSpan="1" positionRow="0" positionRowSpan="1" verticalAlignment="LAYOUT_VERTICAL_ALIGN_TOP" visible="true" width="210.33333"/>
     </Button>
     <Button id="IDC_BUTTON_LAUNCH" parent="IDC_PANEL">
         <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="Launch" textSize="36.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout height="74.0" horizontalAlignment="LAYOUT_HORIZONTAL_ALIGN_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" positionColumn="1" positionColumnSpan="1" positionRow="0" positionRowSpan="1" verticalAlignment="LAYOUT_VERTICAL_ALIGN_TOP" visible="true" width="212.0"/>
-        <layout height="74.0" horizontalAlignment="LAYOUT_HORIZONTAL_ALIGN_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" positionColumn="1" positionColumnSpan="1" positionRow="0" positionRowSpan="1" verticalAlignment="LAYOUT_VERTICAL_ALIGN_TOP" visible="true" width="202.3854"/>
+        <layout height="74.0" horizontalAlignment="LAYOUT_HORIZONTAL_ALIGN_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" positionColumn="1" positionColumnSpan="1" positionRow="0" positionRowSpan="1" verticalAlignment="LAYOUT_VERTICAL_ALIGN_TOP" visible="true" width="210.00002"/>
+        <layout height="74.0" horizontalAlignment="LAYOUT_HORIZONTAL_ALIGN_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" positionColumn="1" positionColumnSpan="1" positionRow="0" positionRowSpan="1" verticalAlignment="LAYOUT_VERTICAL_ALIGN_TOP" visible="true" width="209.33333"/>
     </Button>
     <Button id="IDC_BUTTON_CANCEL" parent="IDC_PANEL">
         <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="Cancel" textSize="36.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout height="74.0" horizontalAlignment="LAYOUT_HORIZONTAL_ALIGN_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" positionColumn="2" positionColumnSpan="1" positionRow="0" positionRowSpan="1" verticalAlignment="LAYOUT_VERTICAL_ALIGN_TOP" visible="true" width="212.0"/>
-        <layout height="74.0" horizontalAlignment="LAYOUT_HORIZONTAL_ALIGN_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" positionColumn="2" positionColumnSpan="1" positionRow="0" positionRowSpan="1" verticalAlignment="LAYOUT_VERTICAL_ALIGN_TOP" visible="true" width="138.69783"/>
+        <layout height="74.0" horizontalAlignment="LAYOUT_HORIZONTAL_ALIGN_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" positionColumn="2" positionColumnSpan="1" positionRow="0" positionRowSpan="1" verticalAlignment="LAYOUT_VERTICAL_ALIGN_TOP" visible="true" width="211.00002"/>
+        <layout height="74.0" horizontalAlignment="LAYOUT_HORIZONTAL_ALIGN_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" positionColumn="2" positionColumnSpan="1" positionRow="0" positionRowSpan="1" verticalAlignment="LAYOUT_VERTICAL_ALIGN_TOP" visible="true" width="209.33333"/>
     </Button>
     <Label id="IDC_LABEL_VERSION" parent="IDL_INSTALLED_POPUP">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="0" text="" textColor="#6E6F76" textSize="32.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="IDC_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="90.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_INSTALLED_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="16.0" marginLeft="16.0" marginRight="16.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_INSTALLED_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="656.0" x="16.0" y="154.0"/>
-        <layout bottomRelation="IDC_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="90.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_INSTALLED_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="16.0" marginLeft="16.0" marginRight="16.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_INSTALLED_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="656.0" x="16.0" y="154.0"/>
+        <layout bottomRelation="IDC_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="90.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_INSTALLED_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="16.0" marginLeft="20.0" marginRight="20.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_INSTALLED_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="648.0" x="20.0" y="150.0"/>
+        <layout bottomRelation="IDC_PANEL" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="90.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_INSTALLED_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="16.0" marginLeft="20.0" marginRight="20.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_INSTALLED_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="648.0" x="20.0" y="150.0"/>
     </Label>
     <Label id="IDC_LABEL_MESSAGE" parent="IDL_INSTALLED_POPUP">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="0" text="" textColor="" textSize="32.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="IDC_LABEL_VERSION" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="138.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_INSTALLED_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="16.0" marginTop="16.0" mode="Portrait" rightRelation="IDL_INSTALLED_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_INSTALLED_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="656.0" x="16.0" y="16.0"/>
-        <layout bottomRelation="IDC_LABEL_VERSION" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="138.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_INSTALLED_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="16.0" marginTop="16.0" mode="Landscape" rightRelation="IDL_INSTALLED_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_INSTALLED_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="656.0" x="16.0" y="16.0"/>
+        <layout bottomRelation="IDC_LABEL_VERSION" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="130.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_INSTALLED_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="20.0" marginRight="20.0" marginTop="20.0" mode="Portrait" rightRelation="IDL_INSTALLED_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_INSTALLED_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="648.0" x="20.0" y="20.0"/>
+        <layout bottomRelation="IDC_LABEL_VERSION" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="130.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_INSTALLED_POPUP" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="20.0" marginRight="20.0" marginTop="20.0" mode="Landscape" rightRelation="IDL_INSTALLED_POPUP" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="IDL_INSTALLED_POPUP" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="648.0" x="20.0" y="20.0"/>
     </Label>
 </ScenePopup>

diff --git a/Installer/res/screen-size-normal/IDL_PANEL_BACKGROUND_BUTTON_ITEM.xml b/Installer/res/screen-size-normal/IDL_PANEL_BACKGROUND_BUTTON_ITEM.xml
index 5a83594..942f9ed 100644 (file)
--- a/Installer/res/screen-size-normal/IDL_PANEL_BACKGROUND_BUTTON_ITEM.xml
+++ b/Installer/res/screen-size-normal/IDL_PANEL_BACKGROUND_BUTTON_ITEM.xml
@@ -4,7 +4,7 @@
 -->
 <!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">
 
-<ScenePanel Bversion="2.0.0.201306151404" Dversion="20120315">
+<ScenePanel Bversion="2.0.0.201306211508" Dversion="20120315">
     <Panel id="IDL_PANEL_BACKGROUND_BUTTON_ITEM">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
         <layout height="80.0" mode="Portrait" type="LAYOUT_RELATIVE" width="720.0" x="0.0" y="0.0"/>
@@ -12,7 +12,7 @@
     </Panel>
     <Button id="IDC_BUTTON_INSTALL" parent="IDL_PANEL_BACKGROUND_BUTTON_ITEM">
         <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="Accept and install" textSize="32.0" verticalAlign="ALIGN_MIDDLE"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_PANEL_BACKGROUND_BUTTON_ITEM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_PANEL_BACKGROUND_BUTTON_ITEM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="3.0"/>
-        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="74.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_PANEL_BACKGROUND_BUTTON_ITEM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_PANEL_BACKGROUND_BUTTON_ITEM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="3.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="true" centerVertical="true" height="80.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_PANEL_BACKGROUND_BUTTON_ITEM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Portrait" rightRelation="IDL_PANEL_BACKGROUND_BUTTON_ITEM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="0.0"/>
+        <layout bottomRelation="" bottomRelationType="" centerHorizontal="false" centerVertical="true" height="80.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_PANEL_BACKGROUND_BUTTON_ITEM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="0.0" marginRight="0.0" marginTop="0.0" mode="Landscape" rightRelation="IDL_PANEL_BACKGROUND_BUTTON_ITEM" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_RIGHT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="720.0" x="0.0" y="0.0"/>
     </Button>
 </ScenePanel>

diff --git a/Installer/res/screen-size-normal/IDL_PANEL_EXPANDABLE_ITEM.xml b/Installer/res/screen-size-normal/IDL_PANEL_EXPANDABLE_ITEM.xml
index c5274a4..03ab45a 100644 (file)
--- a/Installer/res/screen-size-normal/IDL_PANEL_EXPANDABLE_ITEM.xml
+++ b/Installer/res/screen-size-normal/IDL_PANEL_EXPANDABLE_ITEM.xml
@@ -4,7 +4,7 @@
 -->
 <!DOCTYPE ScenePanel SYSTEM "UIForm.dtd">
 
-<ScenePanel Bversion="2.0.0.201306151404" Dversion="20120315">
+<ScenePanel Bversion="2.0.0.201306211508" Dversion="20120315">
     <Panel id="IDL_PANEL_EXPANDABLE_ITEM">
         <property backgroundColor="" backgroundColorOpacity="0" compositeEnabled="true" groupStyle="GROUP_STYLE_NONE"/>
         <layout height="140.0" mode="Portrait" type="LAYOUT_RELATIVE" width="720.0" x="0.0" y="0.0"/>
@@ -17,12 +17,12 @@
     </Label>
     <Label id="IDC_LABEL_SUB_TEXT" parent="IDL_PANEL_EXPANDABLE_ITEM">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="0" text="" textColor="#808080" textSize="32.0" textStyle="LABEL_TEXT_STYLE_BOLD" topMargin="0" verticalAlign="ALIGN_TOP"/>
-        <layout bottomRelation="IDL_PANEL_EXPANDABLE_ITEM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="42.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_PANEL_EXPANDABLE_ITEM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="22.0" marginLeft="16.0" marginRight="10.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_LABEL_EX" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="602.0" x="16.0" y="76.0"/>
-        <layout bottomRelation="IDL_PANEL_EXPANDABLE_ITEM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="42.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_PANEL_EXPANDABLE_ITEM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="22.0" marginLeft="16.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_LABEL_EX" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1162.0" x="16.0" y="76.0"/>
+        <layout bottomRelation="IDL_PANEL_EXPANDABLE_ITEM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="42.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_PANEL_EXPANDABLE_ITEM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="22.0" marginLeft="20.0" marginRight="10.0" marginTop="0.0" mode="Portrait" rightRelation="IDC_LABEL_EX" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="598.0" x="20.0" y="76.0"/>
+        <layout bottomRelation="IDL_PANEL_EXPANDABLE_ITEM" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_BOTTOM" centerHorizontal="false" centerVertical="false" height="42.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_PANEL_EXPANDABLE_ITEM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="22.0" marginLeft="20.0" marginRight="10.0" marginTop="0.0" mode="Landscape" rightRelation="IDC_LABEL_EX" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="" topRelationType="" verticalFitPolicy="FIT_POLICY_FIXED" width="1158.0" x="20.0" y="76.0"/>
     </Label>
     <Label id="IDC_LABEL_MAIN_TEXT" parent="IDL_PANEL_EXPANDABLE_ITEM">
         <property accessibilityHint="" backgroundBitmapPath="" backgroundColor="" backgroundColorOpacity="0" horizontalAlign="ALIGN_LEFT" leftMargin="0" text="" textColor="" textSize="44.0" textStyle="LABEL_TEXT_STYLE_NORMAL" topMargin="0" verticalAlign="ALIGN_BOTTOM"/>
-        <layout bottomRelation="IDC_LABEL_SUB_TEXT" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="54.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_PANEL_EXPANDABLE_ITEM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="10.0" marginTop="22.0" mode="Portrait" rightRelation="IDC_LABEL_EX" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_PANEL_EXPANDABLE_ITEM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="602.0" x="16.0" y="22.0"/>
-        <layout bottomRelation="IDC_LABEL_SUB_TEXT" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="54.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_PANEL_EXPANDABLE_ITEM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="16.0" marginRight="10.0" marginTop="22.0" mode="Landscape" rightRelation="IDC_LABEL_EX" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_PANEL_EXPANDABLE_ITEM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1162.0" x="16.0" y="22.0"/>
+        <layout bottomRelation="IDC_LABEL_SUB_TEXT" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="54.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_PANEL_EXPANDABLE_ITEM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="20.0" marginRight="10.0" marginTop="22.0" mode="Portrait" rightRelation="IDC_LABEL_EX" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_PANEL_EXPANDABLE_ITEM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="598.0" x="20.0" y="22.0"/>
+        <layout bottomRelation="IDC_LABEL_SUB_TEXT" bottomRelationType="RECT_EDGE_RELATION_BOTTOM_TO_TOP" centerHorizontal="false" centerVertical="false" height="54.0" horizontalFitPolicy="FIT_POLICY_FIXED" leftRelation="IDL_PANEL_EXPANDABLE_ITEM" leftRelationType="RECT_EDGE_RELATION_LEFT_TO_LEFT" marginBottom="0.0" marginLeft="20.0" marginRight="10.0" marginTop="22.0" mode="Landscape" rightRelation="IDC_LABEL_EX" rightRelationType="RECT_EDGE_RELATION_RIGHT_TO_LEFT" topRelation="IDL_PANEL_EXPANDABLE_ITEM" topRelationType="RECT_EDGE_RELATION_TOP_TO_TOP" verticalFitPolicy="FIT_POLICY_FIXED" width="1158.0" x="20.0" y="22.0"/>
     </Label>
 </ScenePanel>

diff --git a/Installer/src/InstallerEntry.cpp b/Installer/src/InstallerEntry.cpp
index 0135051..6a485f2 100644 (file)
--- a/Installer/src/InstallerEntry.cpp
+++ b/Installer/src/InstallerEntry.cpp
@@ -40,7 +40,7 @@ OspMain(int argc, char* pArgv[])
        }
 
        result r = Tizen::App::UiApp::Execute(InstallerApp::CreateInstance, &args);
-       TryLog(r == E_SUCCESS, "[%s] Application execution failed", GetErrorMessage(r));
+       AppLogExceptionIf(r != E_SUCCESS, "[%s] Application execution failed", GetErrorMessage(r));
        AppLog("Application finished.");
 
        return static_cast<int>(r);

diff --git a/Installer/src/IstInstalledPopup.cpp b/Installer/src/IstInstalledPopup.cpp
index d8c4b0f..962b589 100644 (file)
--- a/Installer/src/IstInstalledPopup.cpp
+++ b/Installer/src/IstInstalledPopup.cpp
@@ -57,7 +57,21 @@ result
 InstalledPopup::RequestPopup(const Tizen::Base::String& appName, const Tizen::Base::String& installedVersion,
                const Tizen::Base::String& currentVersion)
 {
-       __installMessage.Format(100, L"%ls already had been installed.", appName.GetPointer());
+       int compare = currentVersion.CompareTo(installedVersion);
+       if (compare > 0)
+       {
+               __installMessage = L"Older version already exists on phone. Update?";
+       }
+       else if (compare < 0)
+       {
+               __installMessage = L"An newer version of this application already exists. Reinstall it with older version?";
+       }
+       else
+       {
+               String installMessage = L"%ls already had been installed.";
+               __installMessage.Format(100, installMessage.GetPointer(), appName.GetPointer());
+       }
+
        __versionMessage.Format(100, L"Installed version: %ls\nPackaged version: %ls", installedVersion.GetPointer(), currentVersion.GetPointer());
 
        SetShowState(true);

diff --git a/Installer/src/IstInstallerApp.cpp b/Installer/src/IstInstallerApp.cpp
index fd3f3a3..0bdf19b 100644 (file)
--- a/Installer/src/IstInstallerApp.cpp
+++ b/Installer/src/IstInstallerApp.cpp
@@ -98,14 +98,26 @@ void
 InstallerApp::OnAppControlRequestReceived(RequestId reqId, const Tizen::Base::String& operationId,
                const Tizen::Base::String* pUriData, const Tizen::Base::String* pMimeType, const Tizen::Base::Collection::IMap* pExtraData)
 {
-       if (!pUriData || !pUriData->StartsWith(L"file://", 0))
+       if (pExtraData)
+       {
+               const String* pFilePath = static_cast<const String*>(pExtraData->GetValue(String(L"http://tizen.org/appcontrol/data/notification")));
+               if (pFilePath)
+               {
+                       __packageFilePath = *pFilePath;
+               }
+       }
+       else if (!pUriData || !pUriData->StartsWith(L"file://", 0))
        {
                AppLogException("Invalid URI date.");
                return;
        }
+       else
+       {
+               __packageFilePath = *pUriData;
+               __packageFilePath.Replace(L"file://", L"");
+       }
 
-       __packageFilePath = *pUriData;
-       __packageFilePath.Replace(L"file://", L"");
+       AppLogDebug("file path: %ls", __packageFilePath.GetPointer());
        __pPackageInfo = PackageManager::GetInstance()->GetPackageInfoFromFileN(__packageFilePath);
-       TryLog(GetLastResult() == E_SUCCESS, "[%s] Failed to get package information - %ls", GetErrorMessage(GetLastResult()), __packageFilePath.GetPointer());
+       AppLogExceptionIf(GetLastResult() != E_SUCCESS, "[%s] Failed to get package information - %ls", GetErrorMessage(GetLastResult()), __packageFilePath.GetPointer());
 }

diff --git a/Installer/src/IstMainFrame.cpp b/Installer/src/IstMainFrame.cpp
index 68d1f1a..9dfa113 100644 (file)
--- a/Installer/src/IstMainFrame.cpp
+++ b/Installer/src/IstMainFrame.cpp
@@ -27,7 +27,6 @@
 #include "IstMainFrame.h"
 #include "IstInstallerApp.h"
 #include "IstFormFactory.h"
-#include "IstPanelFactory.h"
 
 using namespace Tizen::App;
 using namespace Tizen::App::Package;
@@ -56,7 +55,7 @@ MainFrame::OnInitializing(void)
        {
                SetBackgroundColor(Color(0, 0, 0, 0));
                MessageBox msgBox;
-               msgBox.Construct(L"Error",L"Can't install the file. Invalid format file.",MSGBOX_STYLE_OK, 5000);
+               msgBox.Construct(L"Error", L"Can't install the file. Invalid format file.",MSGBOX_STYLE_OK, 5000);
                int modal;
                msgBox.ShowAndWait(modal);
                return E_FAILURE;
@@ -64,7 +63,6 @@ MainFrame::OnInitializing(void)
 
        SceneManager* pSceneManager = SceneManager::GetInstance();
        pSceneManager->RegisterFormFactory(*new (std::nothrow) FormFactory());
-       pSceneManager->RegisterPanelFactory(*new (std::nothrow) PanelFactory());
        pSceneManager->RegisterScene("workflow");
 
        __pInstalledPopup = new (std::nothrow) InstalledPopup();

diff --git a/Installer/src/IstPanelFactory.cpp b/Installer/src/IstPanelFactory.cpp
deleted file mode 100644 (file)
index 83ceb2e..0000000
--- a/Installer/src/IstPanelFactory.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// Copyright (c) 2012 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.1 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-
-/**
- *@file                IstPanelFactory.cpp
- *@brief               This file contains the implementation PanelFactory class, which manages
- *                             all the panels of the application.
- */
-
-#include "IstPanelFactory.h"
-
-PanelFactory::PanelFactory(void)
-{
-}
-
-PanelFactory::~PanelFactory(void)
-{
-}
-
-Tizen::Ui::Controls::Panel*
-PanelFactory::CreatePanelN(const Tizen::Base::String& panelId, const Tizen::Ui::Scenes::SceneId& sceneId)
-{
-       return null;
-}