Change EFL text image to Dali TextLable

Signed-off-by: juhee,park <juhee82.park@samsung.com>
Change-Id: Ib5401fa4dce6a011675ed752663f659938e0936f

diff --git a/cluster/custom-box-impl.cpp b/cluster/custom-box-impl.cpp
index a175d2a..c3beac4 100755 (executable)
--- a/cluster/custom-box-impl.cpp
+++ b/cluster/custom-box-impl.cpp
@@ -269,17 +269,11 @@ void CustomBox::OnInitialized()
 
                        if(!m_CUtilTextImgLoading)
                        {
-                               m_CUtilTextImgLoading = ClusterHome3D::CUtilTextImge::New();
-                               // need supply enough canvas space to draw, or else the area under the baseline not rendered
-                               m_CUtilTextImgLoading.SetTextSize(BOX_LOADING_TEXT_WIDTH, BOX_LOADING_TEXT_SIZE * 3);
-                               int fontSize = BOX_LOADING_TEXT_SIZE;
-                               Vector4 textColor((float)255/255, (float)255/255, (float)255/255, 1);
-                               char color[7] = {'0'};
-                               snprintf(color, 7, "%.2x%.2x%.2x", (unsigned int)(textColor.r*255), (unsigned int)(textColor.g*255), (unsigned int)(textColor.b*255));
-                               m_CUtilTextImgLoading.SetTextInfo(fontSize, color, "", false);
-                               m_CUtilTextImgLoading.SetTextName(_("IDS_ST_BODY_LOADING_ING"),false,false);
-                               m_CUtilTextImgLoading.SetTextAlignment("center","center");
-                               m_CUtilTextImgLoading.CreateImage();
+                               m_CUtilTextImgLoading = Toolkit::TextLabel::New( _("IDS_ST_BODY_LOADING_ING") );
+                               m_CUtilTextImgLoading.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE,BOX_LOADING_TEXT_SIZE*DALI_TEXT_CONST/DALI_DPI.y);
+                               m_CUtilTextImgLoading.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT_COLOR,Color::WHITE);
+                               m_CUtilTextImgLoading.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT,"CENTER");
+                               m_CUtilTextImgLoading.SetProperty( Dali::Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT,"CENTER");
                                m_CUtilTextImgLoading.SetParentOrigin(ParentOrigin::CENTER);
                                m_CUtilTextImgLoading.SetAnchorPoint(AnchorPoint::CENTER);
                                m_CUtilTextImgLoading.SetSize(BOX_LOADING_TEXT_WIDTH, BOX_LOADING_TEXT_SIZE * 3);
@@ -507,22 +501,15 @@ void CustomBox::OnSetFault()
                m_CUtilTextImgLoading.SetOpacity(0.0f);
        }
 
-       m_CUtilTextImgFault = ClusterHome3D::CUtilTextImge::New();
        TEST_DBG("box size %f,%f",mBoxSize.width,mBoxSize.height);
-       m_CUtilTextImgFault.SetTextSize(BOX_FAULT_TEXT_WIDTH, BOX_FAULT_TEXT_SIZE*2.5);
-
-       int fontSize = BOX_FAULT_TEXT_SIZE;
-       Vector4 textColor((float)255/255, (float)255/255, (float)255/255, 1);
-       char color[7] = {'0'};
-       snprintf(color, 7, "%.2x%.2x%.2x", (unsigned int)(textColor.r*255), (unsigned int)(textColor.g*255), (unsigned int)(textColor.b*255));
-       m_CUtilTextImgFault.SetTextInfo(fontSize, color, "", false);
-       m_CUtilTextImgFault.SetTextName(_("IDS_HS_BODY_UNABLE_TO_LOAD_DATA_TAP_TO_RETRY"),false,false);
-       m_CUtilTextImgFault.SetTextAlignment("center","center");
-       m_CUtilTextImgFault.CreateImage();
-
+       m_CUtilTextImgFault = Toolkit::TextLabel::New( _("IDS_HS_BODY_UNABLE_TO_LOAD_DATA_TAP_TO_RETRY") );
+       m_CUtilTextImgFault.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE,BOX_FAULT_TEXT_SIZE*DALI_TEXT_CONST/DALI_DPI.y);
+       m_CUtilTextImgFault.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT_COLOR,Color::WHITE);
+       m_CUtilTextImgFault.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT,"CENTER");
+       m_CUtilTextImgFault.SetProperty( Dali::Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT,"CENTER");
+       m_CUtilTextImgFault.SetSize(BOX_FAULT_TEXT_WIDTH, BOX_FAULT_TEXT_SIZE * 2.5);
        m_CUtilTextImgFault.SetAnchorPoint(AnchorPoint::CENTER);
        m_CUtilTextImgFault.SetParentOrigin(ParentOrigin::CENTER);
-
        m_CUtilTextImgFault.SetZ(0.1f);
        mFaultDim.Add(m_CUtilTextImgFault);
 
@@ -566,14 +553,9 @@ void CustomBox::OnSetFaultReloading(bool isReloading)
                // Set text "Loading..."
                if (m_CUtilTextImgFault)
                {
-                       int fontSize = BOX_FAULT_TEXT_SIZE;
-                       Vector4 textColor((float)255/255, (float)255/255, (float)255/255, 1);
-                       char color[7] = {'0'};
-                       snprintf(color, 7, "%.2x%.2x%.2x", (unsigned int)(textColor.r*255), (unsigned int)(textColor.g*255), (unsigned int)(textColor.b*255));
-
-                       m_CUtilTextImgFault.SetTextInfo(fontSize, color, "", true);
-                       m_CUtilTextImgFault.SetTextName(_("IDS_ST_BODY_LOADING_ING"), false, false);
-                       m_CUtilTextImgFault.ReCreateImage();
+                       m_CUtilTextImgFault.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE,BOX_FAULT_TEXT_SIZE*DALI_TEXT_CONST/DALI_DPI.y);
+                       m_CUtilTextImgFault.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT_COLOR,Color::WHITE);
+                       m_CUtilTextImgFault.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT,_("IDS_ST_BODY_LOADING_ING"));
                }
        }
        else
@@ -581,14 +563,9 @@ void CustomBox::OnSetFaultReloading(bool isReloading)
                // Set text "Tap to reload"
                if (m_CUtilTextImgFault)
                {
-                       int fontSize = BOX_FAULT_TEXT_SIZE;
-                       Vector4 textColor((float)255/255, (float)255/255, (float)255/255, 1);
-                       char color[7] = {'0'};
-                       snprintf(color, 7, "%.2x%.2x%.2x", (unsigned int)(textColor.r*255), (unsigned int)(textColor.g*255), (unsigned int)(textColor.b*255));
-
-                       m_CUtilTextImgFault.SetTextInfo(fontSize, color, "", true);
-                       m_CUtilTextImgFault.SetTextName(_("IDS_HS_BODY_UNABLE_TO_LOAD_DATA_TAP_TO_RETRY"), false, false);
-                       m_CUtilTextImgFault.ReCreateImage();
+                       m_CUtilTextImgFault.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE,BOX_FAULT_TEXT_SIZE*DALI_TEXT_CONST/DALI_DPI.y);
+                       m_CUtilTextImgFault.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT_COLOR,Color::WHITE);
+                       m_CUtilTextImgFault.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT,_("IDS_HS_BODY_UNABLE_TO_LOAD_DATA_TAP_TO_RETRY"));
                }
        }
 }
@@ -1374,14 +1351,10 @@ void CustomBox::UpdateDescription(const string& text)
 
        if(m_CUtilTextImgFault)
        {
-               int fontSize = BOX_FAULT_TEXT_SIZE;
-               Vector4 textColor((float)255/255, (float)255/255, (float)255/255, 1);
-               char color[7] = {'0'};
-               snprintf(color, 7, "%.2x%.2x%.2x", (unsigned int)(textColor.r*255), (unsigned int)(textColor.g*255), (unsigned int)(textColor.b*255));
+               m_CUtilTextImgFault.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE,BOX_FAULT_TEXT_SIZE*DALI_TEXT_CONST/DALI_DPI.y);
+               m_CUtilTextImgFault.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT_COLOR,Color::WHITE);
+               m_CUtilTextImgFault.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT,_("IDS_HS_BODY_UNABLE_TO_LOAD_DATA_TAP_TO_RETRY"));
 
-               m_CUtilTextImgFault.SetTextInfo(fontSize, color, "", true);
-               m_CUtilTextImgFault.SetTextName(_("IDS_HS_BODY_UNABLE_TO_LOAD_DATA_TAP_TO_RETRY"), false, false);
-               m_CUtilTextImgFault.ReCreateImage();
        }
 }
 

diff --git a/cluster/custom-box-impl.h b/cluster/custom-box-impl.h
index f66df8a..62b9338 100755 (executable)
--- a/cluster/custom-box-impl.h
+++ b/cluster/custom-box-impl.h
@@ -430,7 +430,7 @@ protected:
        TapGestureDetector mTapDetector;
        LongPressGestureDetector m_BoxLongpressDetector;
 
-       ClusterHome3D::CUtilTextImge m_CUtilTextImgFault;
+       Dali::Toolkit::TextLabel m_CUtilTextImgFault;
 
        /*
         * For description
@@ -440,7 +440,7 @@ protected:
        // Badge count textLabel
        Dali::Toolkit::TextLabel mBadgeCountText;
 
-       ClusterHome3D::CUtilTextImge m_CUtilTextImgLoading;
+       Dali::Toolkit::TextLabel m_CUtilTextImgLoading;
 
        /*
         * Animations

diff --git a/cluster/custom-cluster-page-impl.h b/cluster/custom-cluster-page-impl.h
index 1012c4b..dacaa2e 100755 (executable)
--- a/cluster/custom-cluster-page-impl.h
+++ b/cluster/custom-cluster-page-impl.h
@@ -196,8 +196,6 @@ protected:  // member variables
        Dali::ImageActor mEditModePageBg;
        bool mIsDeletePageButtonEnabled;
 
-       ClusterHome3D::CUtilTextImge    mDeletePageButtonTextImg;
-
        Dali::Toolkit::PushButton mEditModeAddButton;
 
        ImageActor mGlassImage;

diff --git a/common/homescreen-badge.cpp b/common/homescreen-badge.cpp
index da6e564..a84e853 100755 (executable)
--- a/common/homescreen-badge.cpp
+++ b/common/homescreen-badge.cpp
@@ -37,7 +37,7 @@ using namespace ClusterHome3D;
 #define BADGE_ICON_GAP_X  Scalable::GetX(13*(480.0f/720.0f))
 #define BADGE_ICON_GAP_Y  Scalable::GetY(3*(800.0f/1280.0f))
 
-#define BADGE_FONT_SIZE  Scalable::GetFontSize(12*(800.0f/1280.0f))
+#define BADGE_FONT_SIZE 34*DALI_TEXT_CONST/DALI_DPI.y
 
 CHomeScreenBadge::CHomeScreenBadge(BadgeType eBadgeType, unsigned int nCount) :
   m_eBadgeType(eBadgeType),

diff --git a/common/homescreen-center-popup.cpp b/common/homescreen-center-popup.cpp
index 85aae8a..ba676cd 100755 (executable)
--- a/common/homescreen-center-popup.cpp
+++ b/common/homescreen-center-popup.cpp
@@ -269,31 +269,26 @@ void CHomeScreenCenterPopup::SetText(std::string strText)
 
        TEST_DBG("fContentTextW:%f,fContentTextH:%f",fContentTextW,fContentTextH);
 
-       m_PopupContentTextImg = ClusterHome3D::CUtilTextImge::New();
-       m_PopupContentTextImg.SetTextSize(fContentTextW, fContentTextH);
-
-       int fontSize = CENTER_POPUP_CONTENT_TEXT_FONT_SIZE;
-
-       TEST_DBG("fontSize:%d",fontSize);
-
-       Vector4 textColor = CENTER_POPUP_CONTENT_TEXT_FONT_COLOR;
-       char color[7] = {'0'};
-       snprintf(color, 7, "%.2x%.2x%.2x", (unsigned int)(textColor.r*255), (unsigned int)(textColor.g*255), (unsigned int)(textColor.b*255));
-
-       m_PopupContentTextImg.SetTextInfo(fontSize, color, "", false);
-       m_PopupContentTextImg.SetTextName(strText,false,false);
+       m_PopupContentTextImg = Dali::Toolkit::TextLabel::New();
+       m_PopupContentTextImg.SetSize(fContentTextW, fContentTextH);
+       m_PopupContentTextImg.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT_COLOR,CENTER_POPUP_CONTENT_TEXT_FONT_COLOR);
+       m_PopupContentTextImg.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE,CENTER_POPUP_CONTENT_TEXT_FONT_SIZE*DALI_TEXT_CONST/DALI_DPI.y);      
+       m_PopupContentTextImg.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT,strText);
+       m_PopupContentTextImg.SetProperty( Dali::Toolkit::TextLabel::Property::MULTI_LINE,true);
        if (isTextAlignRight)
        {
-               m_PopupContentTextImg.SetTextAlignment("top","right");
+               m_PopupContentTextImg.SetProperty( Dali::Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT,"TOP");
+               m_PopupContentTextImg.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT,"END");
        }
        else
        {
-               m_PopupContentTextImg.SetTextAlignment("top","left");
+               m_PopupContentTextImg.SetProperty( Dali::Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT,"TOP");
+               m_PopupContentTextImg.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT,"BEGIN");
        }
-       m_PopupContentTextImg.CreateImage();
 
        int actualWidth,actualHeight;
-       m_PopupContentTextImg.GetActualSize(actualWidth,actualHeight);
+       actualWidth = fContentTextW;
+       actualHeight = m_PopupContentTextImg.GetHeightForWidth( actualWidth );
        m_PopupContentTextImg.SetAnchorPoint(AnchorPoint::TOP_LEFT);
        m_PopupContentTextImg.SetParentOrigin(ParentOrigin::TOP_LEFT);
        m_PopupContentTextImg.SetPosition(fContentTextX, fContentTextY, 0.4f);
@@ -440,26 +435,21 @@ unsigned int CHomeScreenCenterPopup::AddListItem(std::string strLabel)
 
        */
 
-       ClusterHome3D::CUtilTextImge aTextLabel = ClusterHome3D::CUtilTextImge::New();
-       aTextLabel.SetTextSize((CENTER_POPUP_WIDTH - (CENTER_POPUP_CONTENT_SIZE_W + CENTER_POPUP_SIZE_W) * 2), fListH);
-
-       int fontSize = MORE_POPUP_BUTTON_TEXT_NORMAL_FONT_SIZE;
-
-       Vector4 textColor = MORE_POPUP_BUTTON_TEXT_NORMAL_FONT_COLOR;
-       char color[10] = {'0'};
-       snprintf(color, sizeof(color), "%.2x%.2x%.2x%.2x", (unsigned int)(textColor.r*255), (unsigned int)(textColor.g*255), (unsigned int)(textColor.b*255), (unsigned int)(textColor.a*255));
+       Dali::Toolkit::TextLabel aTextLabel = Dali::Toolkit::TextLabel::New();
+       aTextLabel.SetSize((CENTER_POPUP_WIDTH - (CENTER_POPUP_CONTENT_SIZE_W + CENTER_POPUP_SIZE_W) * 2), fListH);
 
-       aTextLabel.SetTextInfo(fontSize, color, "", false);
-       aTextLabel.SetTextName(strLabel,false,false);
+       aTextLabel.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE,MORE_POPUP_BUTTON_TEXT_NORMAL_FONT_SIZE*DALI_TEXT_CONST/DALI_DPI.y);
+       aTextLabel.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT_COLOR,MORE_POPUP_BUTTON_TEXT_NORMAL_FONT_COLOR);
+       aTextLabel.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT,strLabel);
+       aTextLabel.SetProperty( Dali::Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT,"CENTER");
        if (isTextAlignRight)
        {
-               aTextLabel.SetTextAlignment("center","right");
+               aTextLabel.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT,"END");
        }
        else
        {
-               aTextLabel.SetTextAlignment("center","left");
+               aTextLabel.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT,"BEGIN");
        }
-       aTextLabel.CreateImage();
 
        float fLabelX = CENTER_POPUP_CONTENT_SIZE_W;
        aTextLabel.SetPosition(fLabelX, 0.0f, 0.0f);
@@ -468,29 +458,21 @@ unsigned int CHomeScreenCenterPopup::AddListItem(std::string strLabel)
 
        aNormalBg.Add(aTextLabel);
 
-       ClusterHome3D::CUtilTextImge aTextPressLabel = ClusterHome3D::CUtilTextImge::New();
-       aTextPressLabel.SetTextSize((CENTER_POPUP_WIDTH - (CENTER_POPUP_CONTENT_SIZE_W + CENTER_POPUP_SIZE_W) * 2), fListH);
-
-       int pressFontSize = MORE_POPUP_BUTTON_TEXT_PRESSED_FONT_SIZE;
-
-       Vector4 pressTextColor = MORE_POPUP_BUTTON_TEXT_PRESSED_FONT_COLOR;
-       char pressColor[10] = {'0'};
-       snprintf(pressColor, sizeof(pressColor), "%.2x%.2x%.2x%.2x", (unsigned int)(pressTextColor.r*255), (unsigned int)(pressTextColor.g*255), (unsigned int)(pressTextColor.b*255), (unsigned int)(textColor.a*255));
-
-       aTextPressLabel.SetTextInfo(pressFontSize, pressColor, "", false);
-       aTextPressLabel.SetTextName(strLabel,false,false);
+       Dali::Toolkit::TextLabel aTextPressLabel =  Dali::Toolkit::TextLabel::New();
+       aTextPressLabel.SetSize((CENTER_POPUP_WIDTH - (CENTER_POPUP_CONTENT_SIZE_W + CENTER_POPUP_SIZE_W) * 2), fListH);
+       aTextPressLabel.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE,MORE_POPUP_BUTTON_TEXT_PRESSED_FONT_SIZE*DALI_TEXT_CONST/DALI_DPI.y);
+       aTextPressLabel.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT_COLOR,MORE_POPUP_BUTTON_TEXT_PRESSED_FONT_COLOR);
+       aTextPressLabel.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT,strLabel);
+       aTextPressLabel.SetProperty( Dali::Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT,"CENTER");
        if (isTextAlignRight)
        {
-               aTextPressLabel.SetTextAlignment("center","right");
+               aTextPressLabel.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT,"END");
        }
        else
        {
-               aTextPressLabel.SetTextAlignment("center","left");
+               aTextPressLabel.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT,"BEGIN");
        }
-       aTextPressLabel.CreateImage();
-
        aTextPressLabel.SetPosition(fLabelX, 0.0f, 0.0f);
-
        aTextPressLabel.SetAnchorPoint(Dali::AnchorPoint::TOP_LEFT);
        aTextPressLabel.SetParentOrigin(Dali::ParentOrigin::TOP_LEFT);
 
@@ -692,55 +674,42 @@ unsigned int CHomeScreenCenterPopup::AddListItem(std::string strLabel, bool bSel
 
        pItem->m_bActivated = bSelected;
 
-       ClusterHome3D::CUtilTextImge aTextLabel = ClusterHome3D::CUtilTextImge::New();
-       aTextLabel.SetTextSize((CENTER_POPUP_WIDTH - (CENTER_POPUP_CONTENT_SIZE_W + CENTER_POPUP_SIZE_W) * 3 - CENTER_POPUP_LIST_RADIO_BUTTON_SIZE_W), fListH);
 
-       int fontSize = MORE_POPUP_BUTTON_TEXT_NORMAL_FONT_SIZE;
-
-       Vector4 textColor = MORE_POPUP_BUTTON_TEXT_NORMAL_FONT_COLOR;
-       char color[10] = {'0'};
-       snprintf(color, sizeof(color), "%.2x%.2x%.2x%.2x", (unsigned int)(textColor.r*255), (unsigned int)(textColor.g*255), (unsigned int)(textColor.b*255), (unsigned int)(textColor.a*255));
-
-       aTextLabel.SetTextInfo(fontSize, color, "", false);
-       aTextLabel.SetTextName(strLabel,false,false);
+       Dali::Toolkit::TextLabel aTextLabel = Dali::Toolkit::TextLabel::New();
+       aTextLabel.SetSize((CENTER_POPUP_WIDTH - (CENTER_POPUP_CONTENT_SIZE_W + CENTER_POPUP_SIZE_W) * 3 - CENTER_POPUP_LIST_RADIO_BUTTON_SIZE_W), fListH);
+       aTextLabel.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE,MORE_POPUP_BUTTON_TEXT_NORMAL_FONT_SIZE*DALI_TEXT_CONST/DALI_DPI.y);
+       aTextLabel.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT_COLOR,MORE_POPUP_BUTTON_TEXT_NORMAL_FONT_COLOR);
+       aTextLabel.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT,strLabel);
+       aTextLabel.SetProperty( Dali::Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT,"CENTER");
        if (isTextAlignRight)
        {
-               aTextLabel.SetTextAlignment("center","right");
+               aTextLabel.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT,"END");
        }
        else
        {
-               aTextLabel.SetTextAlignment("center","left");
+               aTextLabel.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT,"BEGIN");
        }
-       aTextLabel.CreateImage();
-
        float fLabelX = CENTER_POPUP_CONTENT_SIZE_W;
        aTextLabel.SetAnchorPoint(Dali::AnchorPoint::TOP_LEFT);
        aTextLabel.SetParentOrigin(Dali::ParentOrigin::TOP_LEFT);
        aTextLabel.SetPosition(fLabelX, 0.0f, 0.0f);
-
        aNormalBg.Add(aTextLabel);
 
-       ClusterHome3D::CUtilTextImge aTextPressLabel = ClusterHome3D::CUtilTextImge::New();
-       aTextPressLabel.SetTextSize((CENTER_POPUP_WIDTH - (CENTER_POPUP_CONTENT_SIZE_W + CENTER_POPUP_SIZE_W) * 3 - CENTER_POPUP_LIST_RADIO_BUTTON_SIZE_W), fListH);
-
-       int pressFontSize = MORE_POPUP_BUTTON_TEXT_PRESSED_FONT_SIZE;
 
-       Vector4 pressTextColor = MORE_POPUP_BUTTON_TEXT_PRESSED_FONT_COLOR;
-       char pressColor[10] = {'0'};
-       snprintf(pressColor, sizeof(pressColor), "%.2x%.2x%.2x%.2x", (unsigned int)(pressTextColor.r*255), (unsigned int)(pressTextColor.g*255), (unsigned int)(pressTextColor.b*255), (unsigned int)(pressTextColor.a*255));
-
-       aTextPressLabel.SetTextInfo(pressFontSize, pressColor, "", false);
-       aTextPressLabel.SetTextName(strLabel,false,false);
+       Dali::Toolkit::TextLabel aTextPressLabel =  Dali::Toolkit::TextLabel::New();
+       aTextPressLabel.SetSize((CENTER_POPUP_WIDTH - (CENTER_POPUP_CONTENT_SIZE_W + CENTER_POPUP_SIZE_W) * 3 - CENTER_POPUP_LIST_RADIO_BUTTON_SIZE_W), fListH);        
+       aTextPressLabel.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE,MORE_POPUP_BUTTON_TEXT_PRESSED_FONT_SIZE*DALI_TEXT_CONST/DALI_DPI.y);
+       aTextPressLabel.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT_COLOR,MORE_POPUP_BUTTON_TEXT_PRESSED_FONT_COLOR);
+       aTextPressLabel.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT,strLabel);
+       aTextPressLabel.SetProperty( Dali::Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT,"CENTER");
        if (isTextAlignRight)
        {
-               aTextPressLabel.SetTextAlignment("center","right");
+               aTextPressLabel.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT,"END");
        }
        else
        {
-               aTextPressLabel.SetTextAlignment("center","left");
+               aTextPressLabel.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT,"BEGIN");
        }
-       aTextPressLabel.CreateImage();
-
        aTextPressLabel.SetPosition(fLabelX, 0.0f, 0.0f);
        aTextPressLabel.SetAnchorPoint(Dali::AnchorPoint::TOP_LEFT);
        aTextPressLabel.SetParentOrigin(Dali::ParentOrigin::TOP_LEFT);
@@ -837,25 +806,16 @@ void CHomeScreenCenterPopup::SetTitle(std::string strTitle)
        float fTitleTextWidth = (CENTER_POPUP_WIDTH - (CENTER_POPUP_SIZE_W + CENTER_POPUP_CONTENT_SIZE_W) * 2);
        float fTitleTextHeight = CENTER_POPUP_TITLE_HEIGHT;
 
-       mPopupTitleTextImg = ClusterHome3D::CUtilTextImge::New();
-       mPopupTitleTextImg.SetTextSize(fTitleTextWidth, fTitleTextHeight);
-
-       Vector4 textColor = CENTER_POPUP_TITLE_TEXT_COLOR;
-       char color[10] = {'0'};
-       snprintf(color, sizeof(color), "%.2x%.2x%.2x%.2x", (unsigned int)(textColor.r*255), (unsigned int)(textColor.g*255), (unsigned int)(textColor.b*255), (unsigned int)(textColor.a*255));
-
-       int fontSize = CENTER_POPUP_TITLE_TEXT_SIZE;
-
-       mPopupTitleTextImg.SetTextInfo(fontSize, color, "0000004C", false);
-       mPopupTitleTextImg.SetTextName(strTitle,false,false);
-       mPopupTitleTextImg.SetTextAlignment("center","center");
-
-       mPopupTitleTextImg.CreateImage();
+       mPopupTitleTextImg = Dali::Toolkit::TextLabel::New();
+       mPopupTitleTextImg.SetSize(fTitleTextWidth, fTitleTextHeight);
+       mPopupTitleTextImg.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE,CENTER_POPUP_TITLE_TEXT_SIZE*DALI_TEXT_CONST/DALI_DPI.y);
+       mPopupTitleTextImg.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT_COLOR,CENTER_POPUP_TITLE_TEXT_COLOR);
+       mPopupTitleTextImg.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT,strTitle);
+       mPopupTitleTextImg.SetProperty( Dali::Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT,"CENTER");
+       mPopupTitleTextImg.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT,"CENTER");
        mPopupTitleTextImg.SetPosition(CENTER_POPUP_CONTENT_SIZE_W, 0.0f, 0.1f);
-
        mPopupTitleTextImg.SetAnchorPoint(Dali::AnchorPoint::TOP_LEFT);
        mPopupTitleTextImg.SetParentOrigin(Dali::ParentOrigin::TOP_LEFT);
-
        m_aPopupTitleBg.Add(mPopupTitleTextImg);
 
        float fW = CENTER_POPUP_WIDTH;
@@ -886,7 +846,7 @@ void CHomeScreenCenterPopup::SetButton(HomeScreenCenterPopupButtonType eButtonTy
                        m_aPopupButtonCenter.SetAnchorPoint(AnchorPoint::CENTER);
                        m_aPopupButtonCenter.SetParentOrigin(ParentOrigin::CENTER);
 
-                       m_aPopupButtonCenter.SetPosition(0.0f, 0.0f, 0.0f);
+                       m_aPopupButtonCenter.SetPosition(0.0f, 0.0f, 0.1f);
 
                        m_aPopupButtonCenter.ClickedSignal().Connect(this, &CHomeScreenCenterPopup::_OnButtonClicked);
 
@@ -910,7 +870,7 @@ void CHomeScreenCenterPopup::SetButton(HomeScreenCenterPopupButtonType eButtonTy
                                m_aPopupButtonLeft.SetAnchorPoint(AnchorPoint::CENTER_LEFT);
                                m_aPopupButtonLeft.SetParentOrigin(ParentOrigin::CENTER_LEFT);
 
-                               m_aPopupButtonLeft.SetPosition(CENTER_POPUP_BUTTON_GAP_X, 0.0f, 0.0f);
+                               m_aPopupButtonLeft.SetPosition(CENTER_POPUP_BUTTON_GAP_X, 0.0f, 0.1f);
 
                                m_aPopupButtonLeft.ClickedSignal().Connect(this, &CHomeScreenCenterPopup::_OnButtonClicked);
 
@@ -931,7 +891,7 @@ void CHomeScreenCenterPopup::SetButton(HomeScreenCenterPopupButtonType eButtonTy
                                m_aPopupButtonRight.SetAnchorPoint(AnchorPoint::CENTER_RIGHT);
                                m_aPopupButtonRight.SetParentOrigin(ParentOrigin::CENTER_RIGHT);
 
-                               m_aPopupButtonRight.SetPosition(-1.0f*CENTER_POPUP_BUTTON_GAP_X, 0.0f, 0.0f);
+                               m_aPopupButtonRight.SetPosition(-1.0f*CENTER_POPUP_BUTTON_GAP_X, 0.0f, 0.1f);
 
                                m_aPopupButtonRight.ClickedSignal().Connect(this, &CHomeScreenCenterPopup::_OnButtonClicked);
 
@@ -1024,19 +984,19 @@ void CHomeScreenCenterPopup::UpdateScreenReader()
        if (m_aPopupButtonLeft)
        {
                focusManager.SetFocusOrder(m_aPopupButtonLeft, nOrder++);
-               focusManager.SetAccessibilityAttribute(m_aPopupButtonLeft, Toolkit::AccessibilityManager::ACCESSIBILITY_LABEL, m_PopupButtonTextLeftImg.GetText());
+               focusManager.SetAccessibilityAttribute(m_aPopupButtonLeft, Toolkit::AccessibilityManager::ACCESSIBILITY_LABEL, m_PopupButtonTextLeftImg.GetProperty<std::string>( Toolkit::TextLabel::Property::TEXT ));
                focusManager.SetAccessibilityAttribute(m_aPopupButtonLeft, Toolkit::AccessibilityManager::ACCESSIBILITY_HINT, _("IDS_HS_BODY_BUTTON_T_TTS"));
        }
        if (m_aPopupButtonCenter)
        {
                focusManager.SetFocusOrder(m_aPopupButtonCenter, nOrder++);
-               focusManager.SetAccessibilityAttribute(m_aPopupButtonCenter, Toolkit::AccessibilityManager::ACCESSIBILITY_LABEL, m_PopupButtonTextCenterImg.GetText());
+               focusManager.SetAccessibilityAttribute(m_aPopupButtonCenter, Toolkit::AccessibilityManager::ACCESSIBILITY_LABEL, m_PopupButtonTextCenterImg.GetProperty<std::string>( Toolkit::TextLabel::Property::TEXT ));
                focusManager.SetAccessibilityAttribute(m_aPopupButtonCenter, Toolkit::AccessibilityManager::ACCESSIBILITY_HINT, _("IDS_HS_BODY_BUTTON_T_TTS"));
        }
        if (m_aPopupButtonRight)
        {
                focusManager.SetFocusOrder(m_aPopupButtonRight, nOrder++);
-               focusManager.SetAccessibilityAttribute(m_aPopupButtonRight, Toolkit::AccessibilityManager::ACCESSIBILITY_LABEL, m_PopupButtonTextRightImg.GetText());
+               focusManager.SetAccessibilityAttribute(m_aPopupButtonRight, Toolkit::AccessibilityManager::ACCESSIBILITY_LABEL, m_PopupButtonTextRightImg.GetProperty<std::string>( Toolkit::TextLabel::Property::TEXT ));
                focusManager.SetAccessibilityAttribute(m_aPopupButtonRight, Toolkit::AccessibilityManager::ACCESSIBILITY_HINT, _("IDS_HS_BODY_BUTTON_T_TTS"));
        }
 }
@@ -1500,25 +1460,15 @@ Dali::Toolkit::PushButton CHomeScreenCenterPopup::_CreateButton(HomeScreenCenter
        return aPushButton;
 }
 
-ClusterHome3D::CUtilTextImge CHomeScreenCenterPopup::_CreateButtonLabel(std::string strLabel,int width, int height)
+Dali::Toolkit::TextLabel CHomeScreenCenterPopup::_CreateButtonLabel(std::string strLabel,int width, int height)
 {
-       ClusterHome3D::CUtilTextImge aTextLabel = ClusterHome3D::CUtilTextImge::New();
-
-       int fontSize = CENTER_POPUP_BUTTON_TEXT_NORMAL_FONT_SIZE;
-
-       Vector4 textColor = CENTER_POPUP_BUTTON_TEXT_NORMAL_FONT_COLOR;
-       char color[7] = {'0'};
-       snprintf(color, 7, "%.2x%.2x%.2x", (unsigned int)(textColor.r*255), (unsigned int)(textColor.g*255), (unsigned int)(textColor.b*255));
-
-       aTextLabel.SetTextSize(width,height);
-       aTextLabel.SetTextInfo(fontSize, color, "", false);
-       aTextLabel.SetTextName(strLabel,false,false);
-       aTextLabel.SetTextAlignment("center","center");
-       aTextLabel.CreateImage();
-
-       aTextLabel.SetLeaveRequired(true);
+       Dali::Toolkit::TextLabel aTextLabel = Dali::Toolkit::TextLabel::New();
+       aTextLabel.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT_COLOR,CENTER_POPUP_BUTTON_TEXT_NORMAL_FONT_COLOR);
+       aTextLabel.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE,CENTER_POPUP_BUTTON_TEXT_NORMAL_FONT_SIZE*DALI_TEXT_CONST/DALI_DPI.y);
+       aTextLabel.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT,strLabel);
+       aTextLabel.SetProperty( Dali::Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT,"CENTER");
+       aTextLabel.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT,"CENTER");
        aTextLabel.TouchedSignal().Connect(this, &CHomeScreenCenterPopup::_OnButtonLabelTouched);
-
        return aTextLabel;
 }
 
@@ -1569,7 +1519,7 @@ bool CHomeScreenCenterPopup::_OnTouched(Actor aActor, const TouchEvent& stEvent)
 
 bool CHomeScreenCenterPopup::_OnButtonLabelTouched(Actor actor, const TouchEvent& event)
 {
-       ClusterHome3D::CUtilTextImge popupText = ClusterHome3D::CUtilTextImge::DownCast(actor);
+       Dali::Toolkit::TextLabel popupText = Dali::Toolkit::TextLabel::DownCast(actor);
        if (!popupText)
        {
                VIEWER_ERR("invalid actor");

diff --git a/common/homescreen-center-popup.h b/common/homescreen-center-popup.h
index fe99253..bb09fe8 100755 (executable)
--- a/common/homescreen-center-popup.h
+++ b/common/homescreen-center-popup.h
@@ -99,7 +99,7 @@ private:
        void _Finalize();
 
        Dali::Toolkit::PushButton _CreateButton(HomeScreenCenterPopupButtonType eButtonType);
-       ClusterHome3D::CUtilTextImge _CreateButtonLabel(std::string strLabel,int width, int height);
+       Dali::Toolkit::TextLabel _CreateButtonLabel(std::string strLabel,int width, int height);
 
        void _OnPan(Actor aActor, const PanGesture& stPan);
        void _OnTap(Dali::Actor actor, const Dali::TapGesture& tap);
@@ -148,7 +148,7 @@ private:
        bool m_bPopupContentScrolling;
        Timer m_ScrollBarContractTimer;
 
-       ClusterHome3D::CUtilTextImge    m_PopupContentTextImg;
+       Dali::Toolkit::TextLabel        m_PopupContentTextImg;
 
        std::string m_strContentText;
 
@@ -157,7 +157,7 @@ private:
 
        ImageActor m_aPopupTitleBg;
        Dali::Toolkit::TextLabel m_aPopupTitleText;
-       ClusterHome3D::CUtilTextImge mPopupTitleTextImg;
+       Dali::Toolkit::TextLabel mPopupTitleTextImg;
 
        std::string m_strTitleText;
 
@@ -171,9 +171,9 @@ private:
        Dali::Toolkit::TextLabel m_aPopupButtonTextRight;
        Dali::Toolkit::TextLabel m_aPopupButtonTextCenter;
 
-       ClusterHome3D::CUtilTextImge    m_PopupButtonTextLeftImg;
-       ClusterHome3D::CUtilTextImge    m_PopupButtonTextRightImg;
-       ClusterHome3D::CUtilTextImge    m_PopupButtonTextCenterImg;
+       Dali::Toolkit::TextLabel        m_PopupButtonTextLeftImg;
+       Dali::Toolkit::TextLabel        m_PopupButtonTextRightImg;
+       Dali::Toolkit::TextLabel        m_PopupButtonTextCenterImg;
 
        ImageActor m_aPopupButtonDivider;
 

diff --git a/common/homescreen-const.cpp b/common/homescreen-const.cpp
index adf8991..279e452 100755 (executable)
--- a/common/homescreen-const.cpp
+++ b/common/homescreen-const.cpp
@@ -29,6 +29,7 @@ const int SCREEN_RESOLUTION[4][2] = { {480, 640}, {320, 480}, {480, 800}, {540,
 Vector2 CHomeScreenConst::mScreenSize = Vector2(BASE_WIDTH, BASE_HEIGHT);
 int CHomeScreenConst::mBaseWidth = 480;
 int CHomeScreenConst::mBaseHeight = 800;
+Vector2 CHomeScreenConst::mDpi = Vector2(1, 1);
 unsigned int CHomeScreenConst::mScreenResolutionType = CHomeScreenConst::RESOLUTION_BASE_480X800;
 
 // 0 : 480x640 - unsupported
@@ -154,6 +155,14 @@ void CHomeScreenConst::SetScreenSize(Vector2 size)
        mScreenSize = size;
 
        _SetBaseScreenSize(size.x, size.y);
+
+       Stage stage = Stage::GetCurrent();
+       mDpi = stage.GetDpi();
+}
+
+Vector2 CHomeScreenConst::GetDpi()
+{
+       return mDpi;
 }
 
 void CHomeScreenConst::_SetBaseScreenSize(int width, int height)

diff --git a/common/homescreen-const.h b/common/homescreen-const.h
index aa76f1b..71a7d53 100755 (executable)
--- a/common/homescreen-const.h
+++ b/common/homescreen-const.h
@@ -27,6 +27,9 @@
 
 using namespace Dali;
 
+#define DALI_TEXT_CONST 72
+#define DALI_DPI CHomeScreenConst::GetDpi()
+
 #define BASE_HEIGHT            CHomeScreenConst::GetBaseHeight()
 #define BASE_WIDTH             CHomeScreenConst::GetBaseWidth()
 
@@ -438,6 +441,7 @@ public:
 
 public:
        static void SetScreenSize(Vector2 size);
+       static Vector2 GetDpi();
        static int GetBaseWidth() { return mBaseWidth; }
        static int GetBaseHeight() { return mBaseHeight; }
        static float GetScreenWidth() { return mScreenSize.width; }
@@ -549,6 +553,7 @@ private :
        static unsigned int _GetResolutionType(int x, int y);
 
        static Vector2 mScreenSize;
+       static Vector2 mDpi;
        static int mBaseWidth;
        static int mBaseHeight;
        static unsigned int mScreenResolutionType;

diff --git a/common/homescreen-theme.h b/common/homescreen-theme.h
index 7db87f8..8793707 100755 (executable)
--- a/common/homescreen-theme.h
+++ b/common/homescreen-theme.h
@@ -24,6 +24,7 @@
 #include <dali/dali.h>
 
 #define HOMESCREEN_BLACK Vector4(0.0f, 0.0f, 0.0f, 1.0f)
+#define HOMESCREEN_WHITE Vector4(1.0f, 1.0f, 1.0f, 1.0f)
 
 //T126
 #define MORE_POPUP_BUTTON_TEXT_NORMAL_FONT_COLOR       Vector4(0.0f, 0.0f, 0.0f, 1.0f)
@@ -34,7 +35,7 @@
 #define MORE_POPUP_BUTTON_TEXT_PRESSED_FONT_SIZE               Scalable::GetFontSize(30)
 
 //#define CENTER_POPUP_CONTENT_TEXT_FONT_THEME "T123"
-#define CENTER_POPUP_CONTENT_TEXT_FONT_COLOR   Vector4(0.0f, 0.0f, 0.0f, 0.1f)
+#define CENTER_POPUP_CONTENT_TEXT_FONT_COLOR   Vector4(0.0f, 0.0f, 0.0f, 1.0f)
 #define CENTER_POPUP_CONTENT_TEXT_FONT_SIZE            Scalable::GetFontSize(30)
 
 //#define CENTER_POPUP_TITLE_TEXT_THEME        "T121"

diff --git a/common/menu-popup-impl.cpp b/common/menu-popup-impl.cpp
index 4b5b192..5299024 100755 (executable)
--- a/common/menu-popup-impl.cpp
+++ b/common/menu-popup-impl.cpp
@@ -223,34 +223,20 @@ unsigned int MenuPopup::AddButton(std::string icon, std::string text, bool bDimm
 
        float width = Scalable::GetScreenWidth() - (MORE_POPUP_BUTTON_PADDING_W * 2 + MORE_POPUP_TEXT_PADDING_X * 2);
 
-       // normal text
-       ClusterHome3D::CUtilTextImge normalTextImage = ClusterHome3D::CUtilTextImge::New();
-       {
-               normalTextImage.SetTextSize(width, MORE_POPUP_BUTTON_TEXT_H);
-               Vector4 textColor = MORE_POPUP_BUTTON_TEXT_NORMAL_FONT_THEME_COLOR;
-               char color[7] = {'0'};
-               snprintf(color, 7, "%.2x%.2x%.2x", (unsigned int)(textColor.r*255), (unsigned int)(textColor.g*255), (unsigned int)(textColor.b*255));
-
-               normalTextImage.SetTextInfo(MORE_POPUP_BUTTON_TEXT_NORMAL_FONT_THEME_SIZE, color, "", false);
-
-               normalTextImage.SetTextName(text, false, false);
-               if (isTextAlignRight)
-               {
-                       normalTextImage.SetTextAlignment("center", "right");
-               }
-               else
-               {
-                       normalTextImage.SetTextAlignment("center", "left");
-               }
-               normalTextImage.CreateImage();
-
-               normalTextImage.SetParentOrigin(ParentOrigin::CENTER_LEFT);
-               normalTextImage.SetAnchorPoint(AnchorPoint::CENTER_LEFT);
-
-               normalTextImage.SetPosition(MORE_POPUP_TEXT_PADDING_X, 0.0f);
-
-               normal.Add(normalTextImage);
-       }
+       Dali::Toolkit::TextLabel normalTextImage = Dali::Toolkit::TextLabel::New();
+       normalTextImage.SetSize(width, MORE_POPUP_BUTTON_TEXT_H);
+       normalTextImage.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT_COLOR,MORE_POPUP_BUTTON_TEXT_NORMAL_FONT_THEME_COLOR);
+       normalTextImage.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE,MORE_POPUP_BUTTON_TEXT_NORMAL_FONT_THEME_SIZE*DALI_TEXT_CONST/DALI_DPI.y);
+       normalTextImage.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT,text);
+       normalTextImage.SetProperty( Dali::Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT,"CENTER");
+       if (isTextAlignRight)
+               normalTextImage.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT,"END");
+       else
+               normalTextImage.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT,"BEGIN");
+       normalTextImage.SetParentOrigin(ParentOrigin::CENTER_LEFT);
+       normalTextImage.SetAnchorPoint(AnchorPoint::CENTER_LEFT);
+       normalTextImage.SetPosition(MORE_POPUP_TEXT_PADDING_X, 0.0f);
+       normal.Add(normalTextImage);
 
        button.SetButtonImage(normal);
 
@@ -271,33 +257,21 @@ unsigned int MenuPopup::AddButton(std::string icon, std::string text, bool bDimm
 
        press.Add(pressBg);
 
-       // press text
-       ClusterHome3D::CUtilTextImge pressTextImage = ClusterHome3D::CUtilTextImge::New();
-       {
-               pressTextImage.SetTextSize(width, MORE_POPUP_BUTTON_TEXT_H);
-               Vector4 textColor = MORE_POPUP_BUTTON_TEXT_PRESSED_FONT_THEME_COLOR;
-               char color[7] = {'0'};
-               snprintf(color, 7, "%.2x%.2x%.2x", (unsigned int)(textColor.r*255), (unsigned int)(textColor.g*255), (unsigned int)(textColor.b*255));
-               pressTextImage.SetTextInfo(MORE_POPUP_BUTTON_TEXT_PRESSED_FONT_THEME_SIZE, color, "", false);
-
-               pressTextImage.SetTextName(text, false, false);
-               if (isTextAlignRight)
-               {
-                       pressTextImage.SetTextAlignment("center", "right");
-               }
-               else
-               {
-                       pressTextImage.SetTextAlignment("center", "left");
-               }
-               pressTextImage.CreateImage();
-
-               pressTextImage.SetParentOrigin(ParentOrigin::CENTER_LEFT);
-               pressTextImage.SetAnchorPoint(AnchorPoint::CENTER_LEFT);
+       Dali::Toolkit::TextLabel pressTextImage = Dali::Toolkit::TextLabel::New();
+       pressTextImage.SetSize(width, MORE_POPUP_BUTTON_TEXT_H);
+       pressTextImage.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT_COLOR,MORE_POPUP_BUTTON_TEXT_PRESSED_FONT_THEME_COLOR);
+       pressTextImage.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE,MORE_POPUP_BUTTON_TEXT_PRESSED_FONT_THEME_SIZE*DALI_TEXT_CONST/DALI_DPI.y);
+       pressTextImage.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT,text);
+       pressTextImage.SetProperty( Dali::Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT,"CENTER");
+       if (isTextAlignRight)
+               pressTextImage.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT,"END");
+       else
+               pressTextImage.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT,"BEGIN");
+       pressTextImage.SetParentOrigin(ParentOrigin::CENTER_LEFT);
+       pressTextImage.SetAnchorPoint(AnchorPoint::CENTER_LEFT);
 
-               pressTextImage.SetPosition(MORE_POPUP_TEXT_PADDING_X, 0.0f);
-
-               press.Add(pressTextImage);
-       }
+       pressTextImage.SetPosition(MORE_POPUP_TEXT_PADDING_X, 0.0f); 
+       press.Add(pressTextImage);
 
        button.SetSelectedImage(press);
 
@@ -336,26 +310,22 @@ unsigned int MenuPopup::AddButton(std::string icon, std::string text, bool bDimm
 
 void MenuPopup::UpdateButtonText(unsigned int id, std::string text)
 {
-       ClusterHome3D::CUtilTextImge normalTextImage = mNormalTextMap[id];
+       Dali::Toolkit::TextLabel normalTextImage = mNormalTextMap[id];
        if (normalTextImage)
        {
-               Vector4 textColor = MORE_POPUP_BUTTON_TEXT_NORMAL_FONT_THEME_COLOR;
-               char color[6] = {'0'};
-               snprintf(color, 6, "%2x%2x%2x", (unsigned int)(textColor.r*255), (unsigned int)(textColor.g*255), (unsigned int)(textColor.b*255));
-               normalTextImage.SetTextInfo(MORE_POPUP_BUTTON_TEXT_NORMAL_FONT_THEME_SIZE, color, "", false);
-               normalTextImage.SetTextName(text, false, false);
+               normalTextImage.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT_COLOR,MORE_POPUP_BUTTON_TEXT_NORMAL_FONT_THEME_COLOR);
+               normalTextImage.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE,MORE_POPUP_BUTTON_TEXT_NORMAL_FONT_THEME_SIZE*DALI_TEXT_CONST/DALI_DPI.y);  
+               normalTextImage.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT,text);
        }
 
-       ClusterHome3D::CUtilTextImge pressTextImage = mNormalTextMap[id];
+       Dali::Toolkit::TextLabel pressTextImage = mNormalTextMap[id];
        if (pressTextImage)
        {
-               Vector4 textColor = MORE_POPUP_BUTTON_TEXT_PRESSED_FONT_THEME_COLOR;
-               char color[6] = {'0'};
-               snprintf(color, 6, "%2x%2x%2x", (unsigned int)(textColor.r*255), (unsigned int)(textColor.g*255), (unsigned int)(textColor.b*255));
-               pressTextImage.SetTextInfo(MORE_POPUP_BUTTON_TEXT_PRESSED_FONT_THEME_SIZE, color, "", false);
-               pressTextImage.SetTextName(text, false, false);
+               pressTextImage.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT_COLOR,MORE_POPUP_BUTTON_TEXT_PRESSED_FONT_THEME_COLOR);
+               pressTextImage.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE,MORE_POPUP_BUTTON_TEXT_PRESSED_FONT_THEME_SIZE*DALI_TEXT_CONST/DALI_DPI.y);  
+               pressTextImage.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT,text);
        }
-}
+ }
 
 void MenuPopup::Show(void)
 {
@@ -675,7 +645,7 @@ void MenuPopup::OnStyleChange( StyleChange::Type change )
 {
        mButtonMaxWidth = 0.f;
 
-       for( std::map<int, ClusterHome3D::CUtilTextImge>::const_iterator it = mNormalTextMap.begin(), endIt = mNormalTextMap.end(); it != endIt; ++it )
+       for( std::map<int, Dali::Toolkit::TextLabel>::const_iterator it = mNormalTextMap.begin(), endIt = mNormalTextMap.end(); it != endIt; ++it )
        {
          UpdateButtonText( it->first, mTextMap[it->first] );
        }

diff --git a/common/menu-popup-impl.h b/common/menu-popup-impl.h
index 0301e50..4ed7f62 100755 (executable)
--- a/common/menu-popup-impl.h
+++ b/common/menu-popup-impl.h
@@ -152,8 +152,8 @@ private:
        unsigned int mButtonCount;
        float mButtonMaxWidth;
        std::map<int, Dali::Toolkit::PushButton> mButtonMap;
-       std::map<int, ClusterHome3D::CUtilTextImge> mNormalTextMap;
-       std::map<int, ClusterHome3D::CUtilTextImge> mPressTextMap;
+       std::map<int, Dali::Toolkit::TextLabel> mNormalTextMap;
+       std::map<int, Dali::Toolkit::TextLabel> mPressTextMap;
        std::map<int, std::string> mTextMap;
        std::map<int, bool> mDimmedMap;
 

diff --git a/mainmenu/mainmenu-apps-view-impl.cpp b/mainmenu/mainmenu-apps-view-impl.cpp
index ca01269..38de319 100755 (executable)
--- a/mainmenu/mainmenu-apps-view-impl.cpp
+++ b/mainmenu/mainmenu-apps-view-impl.cpp
@@ -26,6 +26,8 @@
 #include "util-text-image.h"
 #include "util-color-image.h"
 #include "shader/image-region-effect.h"
+#include "homescreen-theme.h"
+
 
 using namespace ClusterHome3D;
 
@@ -430,10 +432,10 @@ void CMainMenuAppsView::AddBoxToMenuView(ClusterHome3D::CMainMenuBox& box)
        Actor aNameActor = box.GetNameActor();
        if(aNameActor)
        {
-               ClusterHome3D::CUtilTextImge aUtilTextImage = ClusterHome3D::CUtilTextImge::DownCast(aNameActor);
-               aUtilTextImage.SetTextSize(BOX_TEXT_WIDTH, BOX_TEXT_HEIGHT*2);
+               Dali::Toolkit::TextLabel aUtilTextImage = Dali::Toolkit::TextLabel::DownCast(aNameActor);
+               aUtilTextImage.SetSize(BOX_TEXT_WIDTH, BOX_TEXT_HEIGHT*2);
        }
-       box.SetBoxTextColorByString("FFFFFF","000000");
+       box.SetBoxTextColorByString(HOMESCREEN_WHITE,HOMESCREEN_BLACK);
 
        cMainMenuPage.InsertBoxToPage(box, nPageBoxCount+1, false);
 
@@ -1903,10 +1905,10 @@ void CMainMenuAppsView::AddUnFoldBoxToMenuView(ClusterHome3D::CMainMenuBox& box)
        Actor aNameActor = box.GetNameActor();
        if(aNameActor)
        {
-               ClusterHome3D::CUtilTextImge aUtilTextImage = ClusterHome3D::CUtilTextImge::DownCast(aNameActor);
-               aUtilTextImage.SetTextSize(BOX_TEXT_WIDTH, BOX_TEXT_HEIGHT*2);
+               Dali::Toolkit::TextLabel aUtilTextImage = Dali::Toolkit::TextLabel::DownCast(aNameActor);
+               aUtilTextImage.SetSize(BOX_TEXT_WIDTH, BOX_TEXT_HEIGHT*2);
        }
-       box.SetBoxTextColorByString("FFFFFF","000000");
+       box.SetBoxTextColorByString(HOMESCREEN_WHITE,HOMESCREEN_BLACK);
 
        menuPage.InsertBoxToPage(box, nPageBoxCount+1, false);
 }

diff --git a/mainmenu/mainmenu-box-impl.cpp b/mainmenu/mainmenu-box-impl.cpp
index 99b70cb..59e97fa 100755 (executable)
--- a/mainmenu/mainmenu-box-impl.cpp
+++ b/mainmenu/mainmenu-box-impl.cpp
@@ -216,8 +216,8 @@ void CMainMenuBox::Initialize()
                mMenuBoxContainer.Add(mMenuBoxBaseImage);
        }
 
-       mBoxFontColor = "FFFFFF";
-       mBoxFontShadowColor = "";
+       mBoxFontColor = HOMESCREEN_WHITE;
+       mBoxFontShadowColor = Vector4( 0.f, 0.0f, 0.0f, 0.0f);
 
        if(!mBoxName.empty())
        {
@@ -577,18 +577,21 @@ void CMainMenuBox::SetBoxEditMode(AppsViewType editMode, bool bIsOnFolder)
                {
                        if(bIsOnFolder)
                        {
-                               m_CUtilTextImge.SetTextSize(BOX_TEXT_WIDTH, BOX_TEXT_FONT_SIZE*3);
-                               mBoxFontSize = BOX_TEXT_FONT_SIZE;
-                               mBoxFontColor = "000000";
-                               OnSetBoxNameStyle();
+                               mBoxFontColor = HOMESCREEN_BLACK;
+                               m_CUtilTextImge.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE,BOX_TEXT_FONT_SIZE*DALI_TEXT_CONST/DALI_DPI.y);             
+                               m_CUtilTextImge.SetSize(BOX_TEXT_WIDTH, BOX_TEXT_FONT_SIZE * 3);
+                               m_CUtilTextImge.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT_COLOR,mBoxFontColor);
+                               m_CUtilTextImge.SetProperty( Dali::Toolkit::TextLabel::Property::SHADOW_COLOR,mBoxFontShadowColor);
                                m_CUtilTextImge.SetPosition(Vector3(BOX_TEXT_GAP_X, BOX_TEXT_GAP_Y, 0.0f));
                        }
                        else
                        {
-                               m_CUtilTextImge.SetTextSize(EDIT_BOX_TEXT_WIDTH, BOX_TEXT_FONT_SMALL_SIZE*3);
-                               mBoxFontSize = BOX_TEXT_FONT_SMALL_SIZE;
-                               OnSetBoxNameStyle();
+                               mBoxFontColor = HOMESCREEN_WHITE;
+                               m_CUtilTextImge.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE,BOX_TEXT_FONT_SMALL_SIZE*DALI_TEXT_CONST/DALI_DPI.y);               
+                               m_CUtilTextImge.SetSize(EDIT_BOX_TEXT_WIDTH, BOX_TEXT_FONT_SMALL_SIZE * 3);
                                m_CUtilTextImge.SetPosition(Vector3(EDIT_BOX_TEXT_GAP_X, EDIT_BOX_TEXT_GAP_Y, 0.0f));
+                               m_CUtilTextImge.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT_COLOR,mBoxFontColor);
+                               m_CUtilTextImge.SetProperty( Dali::Toolkit::TextLabel::Property::SHADOW_COLOR,mBoxFontShadowColor);
                        }
                }
 
@@ -617,16 +620,16 @@ void CMainMenuBox::SetBoxEditMode(AppsViewType editMode, bool bIsOnFolder)
 
                if(m_CUtilTextImge)
                {
-                       m_CUtilTextImge.SetTextSize(BOX_TEXT_WIDTH, BOX_TEXT_FONT_SIZE*3);
+                       m_CUtilTextImge.SetSize(BOX_TEXT_WIDTH, BOX_TEXT_FONT_SIZE * 3);
                        mBoxFontSize = BOX_TEXT_FONT_SIZE;
 
                        if(bIsOnFolder)
                        {
-                               mBoxFontColor = "000000";
+                               mBoxFontColor = HOMESCREEN_BLACK;
                        }
                        else
                        {
-                               mBoxFontColor = "FFFFFF";
+                               mBoxFontColor = HOMESCREEN_WHITE;
                        }
 
                        OnSetBoxNameStyle();
@@ -681,7 +684,7 @@ void CMainMenuBox::SetBoxEditMode(AppsViewType eEditMode, AppsViewType eAppsView
 
                if (m_CUtilTextImge)
                {
-                       m_CUtilTextImge.SetTextSize(EDIT_BOX_TEXT_WIDTH, BOX_TEXT_FONT_SIZE*3);
+                       m_CUtilTextImge.SetSize(EDIT_BOX_TEXT_WIDTH, BOX_TEXT_FONT_SIZE*3);
                        mBoxFontSize = BOX_TEXT_FONT_SMALL_SIZE;
                        OnSetBoxNameStyle();
                        m_CUtilTextImge.SetPosition(Vector3(EDIT_BOX_TEXT_GAP_X, EDIT_BOX_TEXT_GAP_Y, 0.0f));
@@ -712,7 +715,7 @@ void CMainMenuBox::SetBoxEditMode(AppsViewType eEditMode, AppsViewType eAppsView
 
                if (m_CUtilTextImge)
                {
-                       m_CUtilTextImge.SetTextSize(BOX_TEXT_WIDTH, BOX_TEXT_FONT_SIZE*3);
+                       m_CUtilTextImge.SetSize(BOX_TEXT_WIDTH, BOX_TEXT_FONT_SIZE*3);
                        mBoxFontSize = BOX_TEXT_FONT_SIZE;
                        OnSetBoxNameStyle();
                        m_CUtilTextImge.SetPosition(Vector3(BOX_TEXT_GAP_X, BOX_TEXT_GAP_Y, 0.0f));
@@ -782,7 +785,7 @@ void CMainMenuBox::SetBoxTextColor(Vector4 color)
 
 }
 
-void CMainMenuBox::SetBoxTextColorByString(const char* strFontColor, const char* strShadowColor)
+void CMainMenuBox::SetBoxTextColorByString(const Vector4 strFontColor, const Vector4 strShadowColor)
 {
        mBoxFontColor = strFontColor;
        mBoxFontShadowColor = strShadowColor;
@@ -1486,26 +1489,16 @@ void CMainMenuBox::OnSetBoxNameStyle()
 {
        if(!m_CUtilTextImge)
        {
-               m_CUtilTextImge = ClusterHome3D::CUtilTextImge::New();
-               mBoxFontShadowColor = "0000004C";
-               if(m_eViewType ==  APPS_VIEW_MAIN_EDIT)
-               {
-                       m_CUtilTextImge.SetTextSize(EDIT_BOX_TEXT_WIDTH, BOX_TEXT_FONT_SMALL_SIZE*2);
-                       m_CUtilTextImge.SetTextInfo(BOX_TEXT_FONT_SMALL_SIZE, "FFFFFF", mBoxFontShadowColor, false);
-               }
-               else
-               {
-                       m_CUtilTextImge.SetTextSize(BOX_TEXT_WIDTH, BOX_TEXT_FONT_SIZE*3);
-                       m_CUtilTextImge.SetTextInfo(BOX_TEXT_FONT_SIZE, "FFFFFF", mBoxFontShadowColor, false);
-               }
-
-               m_CUtilTextImge.SetTextName(mBoxName, false, false);
-               m_CUtilTextImge.SetTextAlignment("top","center");
-               m_CUtilTextImge.SetColorCode(BOX_CODE_NAME_CODE);
-               m_CUtilTextImge.SetLineGap(-3);
-
-               m_CUtilTextImge.CreateImage();
-
+               m_CUtilTextImge = Toolkit::TextLabel::New();
+               mBoxFontShadowColor = Vector4( 0.0f,0.0f,0.0f, 0.29f );
+               m_CUtilTextImge.SetSize(mBoxFontSize, mBoxFontSize*2);
+               m_CUtilTextImge.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE,mBoxFontSize*DALI_TEXT_CONST/DALI_DPI.y);
+               m_CUtilTextImge.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT_COLOR,mBoxFontColor);
+               m_CUtilTextImge.SetProperty( Dali::Toolkit::TextLabel::Property::SHADOW_COLOR,mBoxFontShadowColor);
+               m_CUtilTextImge.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT,mBoxName);
+               m_CUtilTextImge.SetProperty( Dali::Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT,"TOP");
+               m_CUtilTextImge.SetProperty( Dali::Toolkit::TextLabel::Property::MULTI_LINE,true);
+               m_CUtilTextImge.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT,"CENTER");
 
                m_CUtilTextImge.SetParentOrigin(ParentOrigin::TOP_CENTER);
                m_CUtilTextImge.SetAnchorPoint(AnchorPoint::TOP_CENTER);
@@ -1518,24 +1511,18 @@ void CMainMenuBox::OnSetBoxNameStyle()
                {
                        m_CUtilTextImge.SetPosition(Vector3(BOX_TEXT_GAP_X, BOX_TEXT_GAP_Y, 0.0f));
                }
-/*
-               Actor testActor = Dali::Toolkit::CreateSolidColorActor(Vector4(1.0f, 0.0f, 0.0f, 0.4f));
-               testActor.SetParentOrigin(ParentOrigin::CENTER);
-               testActor.SetAnchorPoint(AnchorPoint::CENTER);
-               testActor.ApplyConstraint( Constraint::New<Vector3>( Actor::Property::SIZE, ParentSource( Actor::Property::SIZE ), EqualToConstraint() ) );
-               m_CUtilTextImge.Add(testActor);
-*/
-//             if(mMenuBoxBaseImage)
-//                     mMenuBoxBaseImage.Add(m_CUtilTextImge);
 
                mMenuBoxContainer.Add(m_CUtilTextImge);
        }
        else
        {
-               m_CUtilTextImge.SetTextName(mBoxName, false, false);
-               m_CUtilTextImge.SetTextInfo(mBoxFontSize, mBoxFontColor, mBoxFontShadowColor, false);
-               m_CUtilTextImge.SetColorCode(BOX_CODE_NAME_CODE);
-               m_CUtilTextImge.ReCreateImage();
+               m_CUtilTextImge.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT,mBoxName);
+               m_CUtilTextImge.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE,mBoxFontSize*DALI_TEXT_CONST/DALI_DPI.y);
+               m_CUtilTextImge.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT_COLOR,mBoxFontColor);
+               m_CUtilTextImge.SetProperty( Dali::Toolkit::TextLabel::Property::SHADOW_COLOR,mBoxFontShadowColor);
+               m_CUtilTextImge.SetProperty( Dali::Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT,"TOP");
+               m_CUtilTextImge.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT,"CENTER");
+               m_CUtilTextImge.SetProperty( Dali::Toolkit::TextLabel::Property::MULTI_LINE,true);
        }
 }
 

diff --git a/mainmenu/mainmenu-box-impl.h b/mainmenu/mainmenu-box-impl.h
index 6f4107a..e755c7e 100755 (executable)
--- a/mainmenu/mainmenu-box-impl.h
+++ b/mainmenu/mainmenu-box-impl.h
@@ -94,8 +94,8 @@ protected:
        float mBoxPage;                 ///< box page
        Vector3 mBoxPosition;   ///< box position info
        Vector4 mBoxNameColor;
-       const char* mBoxFontColor;
-       const char* mBoxFontShadowColor;
+       Vector4 mBoxFontColor;
+       Vector4 mBoxFontShadowColor;
        int mBoxFontSize;
 
        std::string mBoxName;   ///< box name
@@ -107,7 +107,7 @@ protected:
        ResourceImage mMenuBoxBaseImageData;
        Actor mMenuBoxContainer;                ///< container actor that has base image and shadow image or text..
 
-       ClusterHome3D::CUtilTextImge    m_CUtilTextImge;
+       Dali::Toolkit::TextLabel        m_CUtilTextImge;
 
        PageSwitchedDirection mSwitchedDirection;
        Timer mPageSwitchTimer;
@@ -214,7 +214,7 @@ public:
        void SetTouchSensitive(bool bTouchSensitive);
        void ChangeBoxRatio(float ratio);
        void SetBoxTextColor(Vector4 color);
-       void SetBoxTextColorByString(const char* strFontColor, const char* strShadowColor);
+       void SetBoxTextColorByString(const Vector4 strFontColor, const Vector4 strShadowColor);
        void UpdateBoxData(BoxDataPtr boxData);
        void UpdateScreenPostion(Vector3 boxPos, Vector3 pressedPos);
 

diff --git a/mainmenu/mainmenu-box.cpp b/mainmenu/mainmenu-box.cpp
index 9a56c0b..29251c9 100755 (executable)
--- a/mainmenu/mainmenu-box.cpp
+++ b/mainmenu/mainmenu-box.cpp
@@ -223,7 +223,7 @@ void CMainMenuBox::SetBoxTextColor(Vector4 color)
        GetImpl(*this).SetBoxTextColor(color);
 }
 
-void CMainMenuBox::SetBoxTextColorByString(const char* strFontColor, const char* strShadowColor)
+void CMainMenuBox::SetBoxTextColorByString(const Vector4 strFontColor, const Vector4 strShadowColor)
 {
        GetImpl(*this).SetBoxTextColorByString(strFontColor, strShadowColor);
 }

diff --git a/mainmenu/mainmenu-box.h b/mainmenu/mainmenu-box.h
index 1aa0cf9..14fde9b 100755 (executable)
--- a/mainmenu/mainmenu-box.h
+++ b/mainmenu/mainmenu-box.h
@@ -164,7 +164,7 @@ public:
        void DoBoxAddAnimation();
        void ChangeBoxRatio(float ratio);
        void SetBoxTextColor(Vector4 color);
-       void SetBoxTextColorByString(const char* strFontColor, const char* strShadowColor);
+       void SetBoxTextColorByString(const Vector4 strFontColor, const Vector4 strShadowColor);
        void UpdateBoxData(BoxDataPtr boxData);
        void UpdateScreenPostion(Vector3 boxPos, Vector3 pressedPos);
 

diff --git a/mainmenu/mainmenu-folder-box-impl.cpp b/mainmenu/mainmenu-folder-box-impl.cpp
index a9ac976..0d60644 100755 (executable)
--- a/mainmenu/mainmenu-folder-box-impl.cpp
+++ b/mainmenu/mainmenu-folder-box-impl.cpp
@@ -663,10 +663,10 @@ void CMainMenuFolderBox::OnBoxDragged(ClusterHome3D::CMainMenuBox& menuBox,  Vec
                Actor aNameActor = menuBox.GetNameActor();
                if(aNameActor)
                {
-                       ClusterHome3D::CUtilTextImge aUtilTextImage = ClusterHome3D::CUtilTextImge::DownCast(aNameActor);
-                       aUtilTextImage.SetTextSize(BOX_TEXT_WIDTH, BOX_TEXT_HEIGHT*2);
+                       Dali::Toolkit::TextLabel aUtilTextImage = Dali::Toolkit::TextLabel::DownCast(aNameActor);
+                       aUtilTextImage.SetSize(BOX_TEXT_WIDTH, BOX_TEXT_HEIGHT*2);
                }
-               menuBox.SetBoxTextColorByString("F5F5F5","000000");
+               menuBox.SetBoxTextColorByString(Vector4(0.95f,0.95f,0.95f,1.0f) ,HOMESCREEN_BLACK);
 
                //remove virtual box
                if (m_pVirtualBoxData)
@@ -2461,11 +2461,7 @@ void CMainMenuFolderBox::OnBoxDragInFolder(ClusterHome3D::CMainMenuBox& menuBox,
        boxData->SetPageId(pageId);
        boxData->SetMenuId(mBoxData->GetBoxId());
 
-       Vector4 vColor(FOLDER_CODE_ICON_NAME_COLOR);
-
-       char sTextColor[10] = { 0, };
-       snprintf(sTextColor, sizeof(sTextColor), "%02X%02X%02X%02X", (unsigned int)(vColor.x*255), (unsigned int)(vColor.y*255), (unsigned int)(vColor.z*255), (unsigned int)(vColor.w*255));
-       menuBox.SetBoxTextColorByString(sTextColor,NULL);
+       menuBox.SetBoxTextColorByString(FOLDER_CODE_ICON_NAME_COLOR,Vector4( 0.0f,0.0f,0.0f,0.0f));
 
        m_bPageSwitching = false;
 

diff --git a/mainmenu/mainmenu-folder-page-impl.cpp b/mainmenu/mainmenu-folder-page-impl.cpp
index 0f83ae8..d2124d9 100755 (executable)
--- a/mainmenu/mainmenu-folder-page-impl.cpp
+++ b/mainmenu/mainmenu-folder-page-impl.cpp
@@ -158,17 +158,7 @@ void CMainMenuFolderPage::AddBoxToPage(BoxDataPtr  menuBoxData)
 
                _SetBoxPositionConstraints(newBox, _GetBoxOrderByGridPosition(boxGridPos));
 
-               Vector4 vColor = Color::BLACK;
-
-               char sTextColor[10] = { 0, };
-               snprintf(sTextColor, sizeof(sTextColor), "%02X%02X%02X%02X", (unsigned int)(vColor.x*255), (unsigned int)(vColor.y*255), (unsigned int)(vColor.z*255), (unsigned int)(vColor.w*255));
-
-               Actor aNameActor = newBox.GetNameActor();
-               if(aNameActor)
-               {
-                       ClusterHome3D::CUtilTextImge aUtilTextImage = ClusterHome3D::CUtilTextImge::DownCast(aNameActor);
-               }
-               newBox.SetBoxTextColorByString(sTextColor, NULL);
+               newBox.SetBoxTextColorByString(Color::BLACK, Vector4( 0.0f, 0.0f, 0.0f, 0.0f));
 
                //Focus
                newBox.SetKeyboardFocusable(true);
@@ -231,17 +221,7 @@ void CMainMenuFolderPage::AddBoxToPage(ClusterHome3D::CMainMenuBox& box)
 
                _SetBoxPositionConstraints(box, _GetBoxOrderByGridPosition(boxGridPos));
 
-               Vector4 vColor = Color::BLACK;
-
-               char sTextColor[10] = { 0, };
-               snprintf(sTextColor, sizeof(sTextColor), "%02X%02X%02X%02X", (unsigned int)(vColor.x*255), (unsigned int)(vColor.y*255), (unsigned int)(vColor.z*255), (unsigned int)(vColor.w*255));
-
-               Actor aNameActor = box.GetNameActor();
-               if(aNameActor)
-               {
-                       ClusterHome3D::CUtilTextImge aUtilTextImage = ClusterHome3D::CUtilTextImge::DownCast(aNameActor);
-               }
-               box.SetBoxTextColorByString(sTextColor, NULL);
+               box.SetBoxTextColorByString(Color::BLACK, Vector4( 0.0f, 0.0f,0.0f, 0.0f));
 
                //Focus
                box.SetKeyboardFocusable(true);
@@ -297,18 +277,7 @@ void CMainMenuFolderPage::InsertBoxToPage(BoxDataPtr  menuBoxData, int firstPage
        newBox.SetParentOrigin(ParentOrigin::TOP_CENTER);
        newBox.SetAnchorPoint(AnchorPoint::TOP_CENTER);
        newBox.SetSize( FOLDER_BOX_WIDTH, FOLDER_BOX_HEIGHT );
-
-       Vector4 vColor = Color::BLACK;
-
-       char sTextColor[10] = { 0, };
-       snprintf(sTextColor, sizeof(sTextColor), "%02X%02X%02X%02X", (unsigned int)(vColor.x*255), (unsigned int)(vColor.y*255), (unsigned int)(vColor.z*255), (unsigned int)(vColor.w*255));
-
-       Actor aNameActor = newBox.GetNameActor();
-       if(aNameActor)
-       {
-               ClusterHome3D::CUtilTextImge aUtilTextImage = ClusterHome3D::CUtilTextImge::DownCast(aNameActor);
-       }
-       newBox.SetBoxTextColorByString(sTextColor, NULL);
+       newBox.SetBoxTextColorByString(Color::BLACK, Vector4( 0.0f, 0.0f, 0.0f, 0.0f ));
 
        _PullBoxesFromPosition( _GetBoxOrderByGridPosition(boxGridPos) );
 
@@ -378,17 +347,7 @@ void CMainMenuFolderPage::InsertBoxToPage(ClusterHome3D::CMainMenuBox& menuBox,
        menuBox.SetAnchorPoint(AnchorPoint::TOP_CENTER);
        menuBox.SetSize( FOLDER_BOX_WIDTH, FOLDER_BOX_HEIGHT );
 
-       Vector4 vColor = Color::BLACK;
-
-       char sTextColor[10] = { 0, };
-       snprintf(sTextColor, sizeof(sTextColor), "%02X%02X%02X%02X", (unsigned int)(vColor.x*255), (unsigned int)(vColor.y*255), (unsigned int)(vColor.z*255), (unsigned int)(vColor.w*255));
-
-       Actor aNameActor = menuBox.GetNameActor();
-       if(aNameActor)
-       {
-               ClusterHome3D::CUtilTextImge aUtilTextImage = ClusterHome3D::CUtilTextImge::DownCast(aNameActor);
-       }
-       menuBox.SetBoxTextColorByString(sTextColor, NULL);
+       menuBox.SetBoxTextColorByString(Color::BLACK, Vector4( 0.0f, 0.0f, 0.0f, 0.0f ));
 
        Vector3 boxGridPos(0.0f, 0.0f,0.0f) ;
        boxGridPos = _GetBoxGridPositionByOrder(order);
@@ -671,17 +630,7 @@ void CMainMenuFolderPage::AddPickingBox(ClusterHome3D::CMainMenuBox& menuBox, in
        menuBox.SetSize(FOLDER_BOX_WIDTH, FOLDER_BOX_HEIGHT);
        menuBox.SetBoxEditMode(m_eViewType, true);
 
-       Vector4 vColor = Color::BLACK;
-
-       char sTextColor[10] = { 0, };
-       snprintf(sTextColor, sizeof(sTextColor), "%02X%02X%02X%02X", (unsigned int)(vColor.x*255), (unsigned int)(vColor.y*255), (unsigned int)(vColor.z*255), (unsigned int)(vColor.w*255));
-
-       Actor aNameActor = menuBox.GetNameActor();
-       if(aNameActor)
-       {
-               ClusterHome3D::CUtilTextImge aUtilTextImage = ClusterHome3D::CUtilTextImge::DownCast(aNameActor);
-       }
-       menuBox.SetBoxTextColorByString(sTextColor, NULL);
+       menuBox.SetBoxTextColorByString(Color::BLACK, Vector4( 0.0f, 0.0f, 0.0f, 0.0f ));
 
        //Focus
        menuBox.SetKeyboardFocusable(true);
@@ -925,18 +874,7 @@ void CMainMenuFolderPage::UpdateBoxData(BoxDataPtr boxData)
                if(menuBoxData->GetBoxId() ==  boxData->GetBoxId())
                {
                        tBox.UpdateBoxData(boxData);
-
-                       Vector4 vColor = Color::BLACK;
-
-                       char sTextColor[10] = { 0, };
-                       snprintf(sTextColor, sizeof(sTextColor), "%02X%02X%02X%02X", (unsigned int)(vColor.x*255), (unsigned int)(vColor.y*255), (unsigned int)(vColor.z*255), (unsigned int)(vColor.w*255));
-
-                       Actor aNameActor = tBox.GetNameActor();
-                       if(aNameActor)
-                       {
-                               ClusterHome3D::CUtilTextImge aUtilTextImage = ClusterHome3D::CUtilTextImge::DownCast(aNameActor);
-                       }
-                       tBox.SetBoxTextColorByString(sTextColor, NULL);
+                       tBox.SetBoxTextColorByString(Color::BLACK, Vector4( 0.0f, 0.0f, 0.0f, 0.0f ));
 
                        break;
                }

diff --git a/mainmenu/mainmenu-package-manager.cpp b/mainmenu/mainmenu-package-manager.cpp
index 5a4bb48..b463cf4 100755 (executable)
--- a/mainmenu/mainmenu-package-manager.cpp
+++ b/mainmenu/mainmenu-package-manager.cpp
@@ -547,9 +547,10 @@ bool CMainMenuPackageManager::_GetAppInfo(string appId, BoxDataPtr data)
        pkgmgrinfo_appinfo_h app_handle = NULL;
        uid_t uid = getuid();
        int ret = pkgmgrinfo_appinfo_get_usr_appinfo(appId.c_str(), uid, &app_handle);
-
+       
+       HOME_ERR("pkgmgrinfo_appinfo_get_usr_appinfo return [%s][[%d]",appId.c_str(), ret);
        if (PMINFO_R_OK != ret) {
-               HOME_ERR("pkgmgrinfo_pkginfo_get_usr_pkginfo return [%d]", ret);
+               HOME_ERR("pkgmgrinfo_appinfo_get_usr_appinfo return [%d]", ret);
                return false;
        }
 

diff --git a/mainmenu/mainmenu-view-manager-impl.cpp b/mainmenu/mainmenu-view-manager-impl.cpp
index 4205b10..d316448 100755 (executable)
--- a/mainmenu/mainmenu-view-manager-impl.cpp
+++ b/mainmenu/mainmenu-view-manager-impl.cpp
@@ -1507,12 +1507,10 @@ void CMainMenuViewManager::_CreateTitle()
        self.Add(m_ViewTitleBg);
 
        // title
-       m_CUtilTextImgTitle = ClusterHome3D::CUtilTextImge::New();
-       m_CUtilTextImgTitle.SetTextSize(VIEW_MANAGER_TITLE_TEXT_WIDTH, VIEW_MANAGER_TITLE_TEXT_HEIGHT);
+       m_CUtilTextImgTitle = Dali::Toolkit::TextLabel::New();
+       m_CUtilTextImgTitle.SetSize(VIEW_MANAGER_TITLE_TEXT_WIDTH, VIEW_MANAGER_TITLE_TEXT_HEIGHT);
        m_CUtilTextImgTitle.SetParentOrigin(ParentOrigin::CENTER);
        m_CUtilTextImgTitle.SetAnchorPoint(AnchorPoint::CENTER);
-       m_CUtilTextImgTitle.SetSize(VIEW_MANAGER_TITLE_ICON_WIDTH, VIEW_MANAGER_TITLE_ICON_HEIGHT);
-       m_CUtilTextImgTitle.SetPosition(Vector3(0.0f, 0.0f, 1.0f));
 
        m_ViewTitleBg.Add(m_CUtilTextImgTitle);
 
@@ -1545,7 +1543,7 @@ void CMainMenuViewManager::_SetTitleButtonImage()
        {
                if(!m_TitleLeftNormalTextImg)
                {
-                       m_TitleLeftNormalTextImg = CreateTitleButtonText(TITLE_CANCEL_BUTTON_TEXT_THEME_COLOR, TITLE_CANCEL_BUTTON_TEXT_THEME_SIZE ,TITLE_CANCEL_BUTTON_TEXT_THEME_NAME,TITLE_CANCEL_TEXT,"left", "");
+                       m_TitleLeftNormalTextImg = CreateTitleButtonText(TITLE_CANCEL_BUTTON_TEXT_THEME_COLOR, TITLE_CANCEL_BUTTON_TEXT_THEME_SIZE ,TITLE_CANCEL_BUTTON_TEXT_THEME_NAME,TITLE_CANCEL_TEXT,"BEGIN", "");
                }
                else
                {
@@ -1553,7 +1551,7 @@ void CMainMenuViewManager::_SetTitleButtonImage()
                }
                if(!m_TitleLeftPressTextImg)
                {
-                       m_TitleLeftPressTextImg =  CreateTitleButtonText(TITLE_CANCEL_BUTTON_PRESS_TEXT_THEME_COLOR, TITLE_CANCEL_BUTTON_PRESS_TEXT_THEME_SIZE, TITLE_CANCEL_BUTTON_PRESS_TEXT_THEME_NAME,TITLE_CANCEL_TEXT,"left", "");
+                       m_TitleLeftPressTextImg =  CreateTitleButtonText(TITLE_CANCEL_BUTTON_PRESS_TEXT_THEME_COLOR, TITLE_CANCEL_BUTTON_PRESS_TEXT_THEME_SIZE, TITLE_CANCEL_BUTTON_PRESS_TEXT_THEME_NAME,TITLE_CANCEL_TEXT,"BEGIN", "");
                }
                else
                {
@@ -1561,7 +1559,7 @@ void CMainMenuViewManager::_SetTitleButtonImage()
                }
                if(!m_TitleLeftDimmedTextImg)
                {
-                       m_TitleLeftDimmedTextImg = CreateTitleButtonText(TITLE_CANCEL_BUTTON_DIMMED_TEXT_THEME_COLOR,TITLE_CANCEL_BUTTON_DIMMED_TEXT_THEME_SIZE, TITLE_CANCEL_BUTTON_DIMMED_TEXT_THEME_NAME,TITLE_CANCEL_TEXT,"left", "");
+                       m_TitleLeftDimmedTextImg = CreateTitleButtonText(TITLE_CANCEL_BUTTON_DIMMED_TEXT_THEME_COLOR,TITLE_CANCEL_BUTTON_DIMMED_TEXT_THEME_SIZE, TITLE_CANCEL_BUTTON_DIMMED_TEXT_THEME_NAME,TITLE_CANCEL_TEXT,"BEGIN", "");
                }
                else
                {
@@ -1577,7 +1575,7 @@ void CMainMenuViewManager::_SetTitleButtonImage()
        {
                if(!m_TitleRightNormalTextImg)
                {
-                       m_TitleRightNormalTextImg = CreateTitleButtonText(TITLE_DONE_BUTTON_TEXT_THEME_COLOR, TITLE_DONE_BUTTON_TEXT_THEME_SIZE, TITLE_DONE_BUTTON_TEXT_THEME_NAME,TITLE_DONE_TEXT,"right", "");
+                       m_TitleRightNormalTextImg = CreateTitleButtonText(TITLE_DONE_BUTTON_TEXT_THEME_COLOR, TITLE_DONE_BUTTON_TEXT_THEME_SIZE, TITLE_DONE_BUTTON_TEXT_THEME_NAME,TITLE_DONE_TEXT,"END", "");
                }
                else
                {
@@ -1586,7 +1584,7 @@ void CMainMenuViewManager::_SetTitleButtonImage()
 
                if(!m_TitleRightPressTextImg)
                {
-                       m_TitleRightPressTextImg =  CreateTitleButtonText(TITLE_DONE_BUTTON_PRESS_TEXT_THEME_COLOR,TITLE_DONE_BUTTON_PRESS_TEXT_THEME_SIZE, TITLE_DONE_BUTTON_PRESS_TEXT_THEME_NAME,TITLE_DONE_TEXT,"right", "");
+                       m_TitleRightPressTextImg =  CreateTitleButtonText(TITLE_DONE_BUTTON_PRESS_TEXT_THEME_COLOR,TITLE_DONE_BUTTON_PRESS_TEXT_THEME_SIZE, TITLE_DONE_BUTTON_PRESS_TEXT_THEME_NAME,TITLE_DONE_TEXT,"END", "");
                }
                else
                {
@@ -1595,7 +1593,7 @@ void CMainMenuViewManager::_SetTitleButtonImage()
 
                if(!m_TitleRightDimmedTextImg)
                {
-                       m_TitleRightDimmedTextImg = CreateTitleButtonText(TITLE_DONE_BUTTON_DIMMED_TEXT_THEME_COLOR, TITLE_DONE_BUTTON_DIMMED_TEXT_THEME_SIZE, TITLE_DONE_BUTTON_DIMMED_TEXT_THEME_NAME,TITLE_DONE_TEXT,"right", "");
+                       m_TitleRightDimmedTextImg = CreateTitleButtonText(TITLE_DONE_BUTTON_DIMMED_TEXT_THEME_COLOR, TITLE_DONE_BUTTON_DIMMED_TEXT_THEME_SIZE, TITLE_DONE_BUTTON_DIMMED_TEXT_THEME_NAME,TITLE_DONE_TEXT,"END", "");
                }
                else
                {
@@ -1608,21 +1606,16 @@ void CMainMenuViewManager::_SetTitleButtonImage()
 }
 
 
-ClusterHome3D::CUtilTextImge CMainMenuViewManager::CreateTitleButtonText(const Vector4 font_color, const unsigned int size ,const char* font_name, const char* textStr, const char* horizonDir, const char* shadowStr)
+Dali::Toolkit::TextLabel CMainMenuViewManager::CreateTitleButtonText(const Vector4 font_color, const unsigned int size ,const char* font_name, const char* textStr, const char* horizonDir, const char* shadowStr)
 {
-       ClusterHome3D::CUtilTextImge buttonText = ClusterHome3D::CUtilTextImge::New();
-       buttonText.SetTextSize(VIEW_MANAGER_TITLE_ICON_WIDTH-Scalable::GetX(30) , VIEW_MANAGER_TITLE_ICON_HEIGHT);
+       Dali::Toolkit::TextLabel buttonText = Dali::Toolkit::TextLabel::New();
+       buttonText.SetSize(VIEW_MANAGER_TITLE_ICON_WIDTH-Scalable::GetX(30) , VIEW_MANAGER_TITLE_ICON_HEIGHT);
 
-       char color[10] = {'0'};
-       snprintf(color, sizeof(color), "%.2x%.2x%.2x%.2x", (unsigned int)(font_color.r*255), (unsigned int)(font_color.g*255), (unsigned int)(font_color.b*255), (unsigned int)(font_color.a*255));
-
-       buttonText.SetTextInfo(size, color, shadowStr, false);
-       buttonText.SetTextName(textStr,false,false);
-       buttonText.SetTextAlignment("center",horizonDir);
-
-       buttonText.SetFontType( font_name );
-
-       buttonText.CreateImage();
+       buttonText.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE,size*DALI_TEXT_CONST/DALI_DPI.y);
+       buttonText.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT_COLOR,font_color);
+       buttonText.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT,textStr);
+       buttonText.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT,horizonDir);
+       buttonText.SetProperty( Dali::Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT,"CENTER");
 
        buttonText.SetParentOrigin(ParentOrigin::CENTER);
        buttonText.SetAnchorPoint(AnchorPoint::CENTER);
@@ -1635,15 +1628,11 @@ ClusterHome3D::CUtilTextImge CMainMenuViewManager::CreateTitleButtonText(const V
 }
 
 
-void CMainMenuViewManager::UpdateTitleButtonText(ClusterHome3D::CUtilTextImge textImage,const Vector4 font_color, const unsigned int size ,const char* font_name,const char* textStr, const char* shadowStr)
+void CMainMenuViewManager::UpdateTitleButtonText(Dali::Toolkit::TextLabel textImage,const Vector4 font_color, const unsigned int size ,const char* font_name,const char* textStr, const char* shadowStr)
 {
-       char color[10] = {'0'};
-       snprintf(color, sizeof(color), "%.2x%.2x%.2x%.2x", (unsigned int)(font_color.r*255), (unsigned int)(font_color.g*255), (unsigned int)(font_color.b*255), (unsigned int)(font_color.a*255));
-
-       textImage.SetTextInfo(size, color, shadowStr, false);
-       textImage.SetTextName(textStr,false,false);
-       textImage.ReCreateImage();
-
+       textImage.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE,size*DALI_TEXT_CONST/DALI_DPI.y);
+       textImage.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT_COLOR,font_color);
+       textImage.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT,textStr);
 }
 
 
@@ -1651,16 +1640,12 @@ void CMainMenuViewManager::_UpdateTitleText(std::string strTitle)
 {
        if (m_CUtilTextImgTitle)
        {
-
-               int fontSize = TITLE_CONTENT_TEXT_THEME_SIZE;
-               Vector4 textColor = TITLE_CONTENT_TEXT_THEME_COLOR;
-               char color[10] = {'0'};
-               snprintf(color, sizeof(color), "%.2x%.2x%.2x%.2x", (unsigned int)(textColor.r*255), (unsigned int)(textColor.g*255), (unsigned int)(textColor.b*255), (unsigned int)(textColor.a*255));
-               m_CUtilTextImgTitle.SetTextInfo(fontSize, color, "000000BF", false);
-               m_CUtilTextImgTitle.SetTextName(strTitle,false,false);
-               m_CUtilTextImgTitle.SetTextAlignment("center","center");
-               m_CUtilTextImgTitle.CreateImage();
-
+               m_CUtilTextImgTitle.SetProperty( Dali::Toolkit::TextLabel::Property::POINT_SIZE,TITLE_CONTENT_TEXT_THEME_SIZE*DALI_TEXT_CONST/DALI_DPI.y);      
+               m_CUtilTextImgTitle.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT_COLOR,TITLE_CONTENT_TEXT_THEME_COLOR);
+               m_CUtilTextImgTitle.SetProperty( Dali::Toolkit::TextLabel::Property::SHADOW_COLOR,Vector4( 0.0f, 0.0f, 0.0f, 0.74f ));
+               m_CUtilTextImgTitle.SetProperty( Dali::Toolkit::TextLabel::Property::TEXT,strTitle);
+               m_CUtilTextImgTitle.SetProperty( Dali::Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT,"CENTER");
+               m_CUtilTextImgTitle.SetProperty( Dali::Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT,"CENTER");
        }
 }
 
@@ -1683,7 +1668,7 @@ void CMainMenuViewManager::_UpdateTitleButton(int nType, bool bDimmed)
                if (m_CUtilTextImgTitle)
                {
                        float fWidth = (VIEW_MANAGER_TITLE_TEXT_WIDTH + VIEW_MANAGER_TITLE_ICON_WIDTH + VIEW_MANAGER_TITLE_GAP_X * 2);
-                       m_CUtilTextImgTitle.SetTextSize(fWidth, VIEW_MANAGER_TITLE_TEXT_HEIGHT);
+                       m_CUtilTextImgTitle.SetSize(fWidth, VIEW_MANAGER_TITLE_TEXT_HEIGHT);
                }
        }
        else if (nType == TITLE_BUTTON_TYPE_ICON)
@@ -1703,7 +1688,7 @@ void CMainMenuViewManager::_UpdateTitleButton(int nType, bool bDimmed)
                if (m_CUtilTextImgTitle)
                {
                        float fWidth = VIEW_MANAGER_TITLE_TEXT_WIDTH;
-                       m_CUtilTextImgTitle.SetTextSize(fWidth, VIEW_MANAGER_TITLE_TEXT_HEIGHT);
+                       m_CUtilTextImgTitle.SetSize(fWidth, VIEW_MANAGER_TITLE_TEXT_HEIGHT);
                }
        }
        else if (nType == TITLE_BUTTON_TYPE_TEXT)
@@ -2137,13 +2122,13 @@ void CMainMenuViewManager::_UpdateScreenReader()
                        if (m_CUtilTextImgTitle)
                        {
                                focusManager.SetFocusOrder(m_CUtilTextImgTitle, BASE_FOCUS_ORDER_TITLE);
-                               focusManager.SetAccessibilityAttribute(m_CUtilTextImgTitle, Toolkit::AccessibilityManager::ACCESSIBILITY_LABEL, m_CUtilTextImgTitle.GetText());
+                               focusManager.SetAccessibilityAttribute(m_CUtilTextImgTitle, Toolkit::AccessibilityManager::ACCESSIBILITY_LABEL, m_CUtilTextImgTitle.GetProperty<std::string>( Toolkit::TextLabel::Property::TEXT ));
                                focusManager.SetAccessibilityAttribute(m_CUtilTextImgTitle, Toolkit::AccessibilityManager::ACCESSIBILITY_TRAIT, _("IDS_COM_HEADER_TITLE"));
 
                                if (nFocusUpdateType == FOCUS_UPDATE_TYPE_RESET)
                                {
                                        char sBuf[1024] = { 0, };
-                                       snprintf(sBuf, sizeof(sBuf), "%s, %s", _("IDS_ST_HEADER_APPLICATIONS"), m_CUtilTextImgTitle.GetText().c_str());
+                                       snprintf(sBuf, sizeof(sBuf), "%s, %s", _("IDS_ST_HEADER_APPLICATIONS"), m_CUtilTextImgTitle.GetProperty<std::string>( Toolkit::TextLabel::Property::TEXT ).c_str());
                                        cHomeAccessibility->Speak(sBuf);
                                }
                        }

diff --git a/mainmenu/mainmenu-view-manager-impl.h b/mainmenu/mainmenu-view-manager-impl.h
index 4f8b52e..0d249bf 100755 (executable)
--- a/mainmenu/mainmenu-view-manager-impl.h
+++ b/mainmenu/mainmenu-view-manager-impl.h
@@ -68,18 +68,18 @@ private:
        // title
        Actor m_ViewTitleBg;
 
-       ClusterHome3D::CUtilTextImge m_CUtilTextImgTitle;
+       Dali::Toolkit::TextLabel m_CUtilTextImgTitle;
 
        Dali::Toolkit::PushButton m_aTitleLeftButton;
        Dali::Toolkit::PushButton m_aTitleRightButton;
 
-       ClusterHome3D::CUtilTextImge m_TitleLeftNormalTextImg;
-       ClusterHome3D::CUtilTextImge m_TitleLeftPressTextImg;
-       ClusterHome3D::CUtilTextImge m_TitleLeftDimmedTextImg;
+       Dali::Toolkit::TextLabel m_TitleLeftNormalTextImg;
+       Dali::Toolkit::TextLabel m_TitleLeftPressTextImg;
+       Dali::Toolkit::TextLabel m_TitleLeftDimmedTextImg;
 
-       ClusterHome3D::CUtilTextImge m_TitleRightNormalTextImg;
-       ClusterHome3D::CUtilTextImge m_TitleRightPressTextImg;
-       ClusterHome3D::CUtilTextImge m_TitleRightDimmedTextImg;
+       Dali::Toolkit::TextLabel m_TitleRightNormalTextImg;
+       Dali::Toolkit::TextLabel m_TitleRightPressTextImg;
+       Dali::Toolkit::TextLabel m_TitleRightDimmedTextImg;
 
        /*
         * box management
@@ -355,8 +355,8 @@ private:
 
        void _OnPageIndicatorButtonClicked(CHomeScreenPageIndicator::HomeScreenButtonType type);
 
-       ClusterHome3D::CUtilTextImge CreateTitleButtonText(const Vector4 color, const unsigned int size ,const char* font_name,const char* textStr, const char* horizonDir, const char* shadowStr);
-       void UpdateTitleButtonText(ClusterHome3D::CUtilTextImge textImage,const Vector4 font_color, const unsigned int size ,const char* font_name,const char* textStr, const char* shadowStr);
+       Dali::Toolkit::TextLabel CreateTitleButtonText(const Vector4 color, const unsigned int size ,const char* font_name,const char* textStr, const char* horizonDir, const char* shadowStr);
+       void UpdateTitleButtonText(Dali::Toolkit::TextLabel textImage,const Vector4 font_color, const unsigned int size ,const char* font_name,const char* textStr, const char* shadowStr);
 
        bool HideAllCenterPopup();
        bool DestroyAllCenterPopup();