[Title] about page refactoring

[Type] about message management
[Module] about dialog
[Priority] Major
[CQ#]
[Redmine#] 4602
[Problem]
[Cause]
[Solution]

Change-Id: Iff8e794422fa0085e637da054c83fdebfeb8c85d

diff --git a/org.tizen.base.feature/feature.xml b/org.tizen.base.feature/feature.xml
index 78ebd25..c5cfb6b 100644 (file)
--- a/org.tizen.base.feature/feature.xml
+++ b/org.tizen.base.feature/feature.xml
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
       id="org.tizen.base.feature"
-      label="Tizen Base Plugins"
+      label="Tizen Base Feature"
       version="1.17.0.qualifier"
       provider-name="Samsung"
       plugin="org.tizen.base.platform">
 
    <description>
       Common library for Tizen SDK.
-This feature supports Native and Web IDE.
    </description>
 
    <copyright>
@@ -245,6 +244,14 @@ BY CLICKING THE &quot;I AGREE&quot; BUTTON OR BY USING ANY PART OF TIZEN SDK, YO
          id="org.eclipse.wst.xml_userdoc.feature"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.egit"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.jgit"
+         version="0.0.0"/>
+
    <plugin
          id="org.tizen.base.platform"
          download-size="0"

diff --git a/org.tizen.base.platform/OSGI-INF/l10n/bundle.properties b/org.tizen.base.platform/OSGI-INF/l10n/bundle.properties
index e1d2361..e5ba3a3 100644 (file)
--- a/org.tizen.base.platform/OSGI-INF/l10n/bundle.properties
+++ b/org.tizen.base.platform/OSGI-INF/l10n/bundle.properties
@@ -1,16 +1,23 @@
-#Properties file for org.tizen.base.platform
+#Properties file for org.tizen.base.platform 
 Bundle-Vendor = Samsung
-Bundle-Name = Tizen SDK 
+Bundle-Name = Tizen SDK
 
-perspective.name=Tizen Native
 product.name=Tizen IDE
-product.provider=Samsung
 product.description=\n\
-Tizen SDK\n\
+{0}\n\
+\n\
+       Version : {1}\n\
+       Build id : {2}\n\
        \n\
-       Version: {0}.{1}.{2}\n\
-       Build id: {3}\n\
+       {3}\n\
        \n\
-       Copyright (c) 2008-2011 Samsung Electronics Co., LTD. All Rights Reserved.\n\
-       \n\
-       Visit https://developer.tizen.org\n
\ No newline at end of file
+       {4}             
+windowImages=icons/branding/16_TIZEN_SDK_icon.png,icons/branding/32_TIZEN_SDK_icon.png,icons/branding/48_TIZEN_SDK_icon.png,icons/branding/64_TIZEN_SDK_icon.png,icons/branding/128_TIZEN_SDK_icon.png
+aboutImage=icons/branding/about_tizen_sdk.png
+featureImage=icons/branding/32_TIZEN_SDK_icon.png
+
+productIntroTitle = Welcome to Tizen SDK
+productIntroBrandingText = Samsung
+introDescription-overview = The Eclipse Platform is a kind of universal tool platform - an open extensible IDE for anything and nothing in particular. 
+introDescription-tutorials = Learn how to be productive using Eclipse by completing end-to-end tutorials that will guide you along the way.
+introDescription-samples = Explore Eclipse by installing prefabricated samples (may require Internet connection).

diff --git a/org.tizen.base.platform/about.ini b/org.tizen.base.platform/about.ini
index 6c10b50..beea3b8 100644 (file)
--- a/org.tizen.base.platform/about.ini
+++ b/org.tizen.base.platform/about.ini
@@ -7,25 +7,5 @@
 # Property "aboutText" contains blurb for "About" dialog (translated)
 aboutText=%blurb
 
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-aboutImage=%product.aboutImage
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-#windowImage=%product.windowImages
-
 # Property "featureImage" contains path to feature image (32x32)
-featureImage=icons/branding/32_TIZEN_SDK_icon.png
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-#welcomePage=
-#welcomePerspective=
-
-# Property "appName" contains name of the application (translated)
-# needed for primary features only
-appName=%product.name
-
-tipsAndTricksHref=https://developer.tizen.org
\ No newline at end of file
+featureImage=icons/branding/32_TIZEN_SDK_icon.png
\ No newline at end of file

diff --git a/org.tizen.base.platform/about.mappings b/org.tizen.base.platform/about.mappings
index e773a4c..24afbc9 100644 (file)
--- a/org.tizen.base.platform/about.mappings
+++ b/org.tizen.base.platform/about.mappings
@@ -1,9 +1,10 @@
 # about.mappings
-# contains fill-ins for about.properties
+# contains fill-ins for about.properties and bundle.properties
 # java.io.Properties file (ISO 8859-1 with "\" escapes)
 # This file does not need to be translated.
 
-0=0
-1=ir#
-2=build#
-3=date-time
\ No newline at end of file
+0=Tizen SDK
+1=0
+2=date-time
+3=Copyright (c) 2010-2011 Samsung Electronics Co., LTD. All Rights Reserved.
+4=Visit https://developer.tizen.org\n

diff --git a/org.tizen.base.platform/about.properties b/org.tizen.base.platform/about.properties
index 929b472..55bf0fb 100644 (file)
--- a/org.tizen.base.platform/about.properties
+++ b/org.tizen.base.platform/about.properties
@@ -4,19 +4,10 @@
 # fill-ins are supplied by about.mappings
 # This file should be translated.
 
-blurb=Tizen SDK\n\
+blurb={0}\n\
 \n\
-Version: {0}.{1}.{2}\n\
-Build id: {3}\n\
+Version : {1}\n\
+Build id : {2}\n\
 \n\
-Copyright (c) 2010-2011, Samsung Electronics Co., LTD. All rights reserved.\n\
-\n\
-Visit https://developer.tizen.org\n
-product.windowImages=icons/branding/16_TIZEN_SDK_icon.png,icons/branding/32_TIZEN_SDK_icon.png,icons/branding/48_TIZEN_SDK_icon.png,icons/branding/64_TIZEN_SDK_icon.png,icons/branding/128_TIZEN_SDK_icon.png,product.windowImages256=icons/branding/256_TIZEN_SDK_icon.png
-product.aboutImage=icons/branding/about_tizen_sdk.png
-product.featureImage=icons/branding/32_TIZEN_SDK_icon.png
-productIntroTitle = Welcome to Tizen SDK
-productIntroBrandingText = Samsung
-introDescription-overview = The Eclipse Platform is a kind of universal tool platform - an open extensible IDE for anything and nothing in particular. 
-introDescription-tutorials = Learn how to be productive using Eclipse by completing end-to-end tutorials that will guide you along the way.
-introDescription-samples = Explore Eclipse by installing prefabricated samples (may require Internet connection).
\ No newline at end of file
+{3}\n\
+{4}\n
\ No newline at end of file

diff --git a/org.tizen.base.platform/plugin.xml b/org.tizen.base.platform/plugin.xml
index b3d04b8..61ded9e 100644 (file)
--- a/org.tizen.base.platform/plugin.xml
+++ b/org.tizen.base.platform/plugin.xml
@@ -34,10 +34,10 @@
       <product
             application="org.eclipse.ui.ide.workbench"
             description="%product.description"
-            name="Tizen Base Plugins">
+            name="%product.name">
          <property
                name="windowImages"
-               value="icons/branding/16_TIZEN_SDK_icon.png,icons/branding/32_TIZEN_SDK_icon.png,icons/branding/48_TIZEN_SDK_icon.png,icons/branding/64_TIZEN_SDK_icon.png,icons/branding/128_TIZEN_SDK_icon.png">
+               value="%windowImages">
          </property>
          <property
                name="aboutText"
@@ -45,7 +45,7 @@
          </property>
          <property
                name="aboutImage"
-               value="icons/branding/about_tizen_sdk.png">
+               value="%aboutImage">
          </property>
          <property
                name="preferenceCustomization"
@@ -53,7 +53,7 @@
          </property>
          <property
                name="appName"
-               value="Tizen Base Plugins">
+               value="%product.name">
          </property>
          <property
                name="introTitle"
@@ -89,7 +89,7 @@
          </property>
          <property
                name="featureImage"
-               value="%product.featureImage">
+               value="%featureImage">
          </property>
          <property
                name="buildIdLocation"

diff --git a/package/build.linux b/package/build.linux
index 68cdb99..bdeaf7b 100755 (executable)
--- a/package/build.linux
+++ b/package/build.linux
@@ -33,9 +33,6 @@ __set_build_parameter()
 {
        manifest_version=`grep Version: ${SRCDIR}/package/pkginfo.manifest | cut -f2 -d":" | head -n 1`
        product_version=${manifest_version}
-       build_major_version=`echo ${manifest_version} | cut -f1 -d"."`
-       build_minor_version=`echo ${manifest_version} | cut -f2 -d"."`
-       build_bugfix_version=`echo ${manifest_version} | cut -f3 -d"."`
        branding_path="org.tizen.base.platform"
        branding_file="TizenIDE_base_${platform}.product"
        
@@ -141,13 +138,9 @@ __set_product_version() {
        mv ${product_path}.mod ${product_path}
        
        about_mapping_path="${build_path}/plugins/${branding_path}/about.mappings"
-       about_major_version_parameter="0"
-       about_ir_version_parameter="1"
-       about_build_version_parameter="2"
-       about_build_time_parameter="3"
-       sed -e "s;\(^${about_major_version_parameter}=\).*;\1${build_major_version};g" \
-               -e "s;\(^${about_ir_version_parameter}=\).*;\1${build_minor_version};g" \
-               -e "s;\(^${about_build_version_parameter}=\).*;\1${build_bugfix_version};g" \
+       about_version_parameter="1"
+       about_build_time_parameter="2"
+       sed -e "s;\(^${about_version_parameter}=\).*;\1${product_version};g" \
                -e "s;\(^${about_build_time_parameter}=\).*;\1${build_time};g" \
                < ${about_mapping_path} > ${about_mapping_path}.mod
        mv ${about_mapping_path}.mod ${about_mapping_path}