Resolve some UI issues.

Change-Id: Ia5e2790490f21ac552caa81acd14514888720ee3
Signed-off-by: SungWan Kim <sw0726.kim@samsung.com>

diff --git a/inc/ClResourceManager.h b/inc/ClResourceManager.h
index 19945bd..932c953 100644 (file)
--- a/inc/ClResourceManager.h
+++ b/inc/ClResourceManager.h
@@ -33,7 +33,7 @@ public:
        static Tizen::Locales::DateTimeFormatter* CreateDateFormatterN(Tizen::Locales::DateTimeStyle dateStyle);
        static Tizen::Locales::DateTimeFormatter* CreateDateTimeFormatterN(Tizen::Locales::DateTimeStyle dateStyle);
        static Tizen::Locales::DateTimeFormatter* CreateTimeFormatterN(void);
-       static Tizen::Graphics::Bitmap* GetBitmapN(const Tizen::Base::String& bitmapPath);
+       static Tizen::Graphics::Bitmap* GetBitmapN(const Tizen::Base::String& bitmapPath, bool isAbsolute = false);
        static Tizen::Graphics::Bitmap* GetBlankBitmap(void);
        static Tizen::Base::String GetString(const Tizen::Base::String& stringId);
        static Tizen::Base::String GetMonthString(int month);

diff --git a/res/screen-size-normal/IDL_SETTING_FORM.xml b/res/screen-size-normal/IDL_SETTING_FORM.xml
index 17a8415..538868b 100644 (file)
--- a/res/screen-size-normal/IDL_SETTING_FORM.xml
+++ b/res/screen-size-normal/IDL_SETTING_FORM.xml
@@ -15,7 +15,7 @@
         <itemSet/>
     </Footer>
     <Header>
-        <property backgroundBitmapPath="" color="#F8F6EF" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="::IDS_CLD_BODY_CALENDAR" titleTextColor=""/>
+        <property backgroundBitmapPath="" color="#F8F6EF" colorOpacity="100" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="100" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="100" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="100" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="100" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="100" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="100" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="100" selectedItemTextColor="" titleIconPath="" titleText="::IDS_CLD_OPT_SETTINGS" titleTextColor=""/>
         <itemSet/>
     </Header>
     <SectionTableView id="IDC_SECTIONTABLEVIEW" parent="IDL_SETTING_FORM">

diff --git a/src/ClCalendarSelectorPopup.cpp b/src/ClCalendarSelectorPopup.cpp
index 85a7654..1dff9c0 100644 (file)
--- a/src/ClCalendarSelectorPopup.cpp
+++ b/src/ClCalendarSelectorPopup.cpp
@@ -168,13 +168,15 @@ CalendarSelectorPopup::CreateItem(int index, int itemWidth)
        if (pCalendar->GetAccountId() != INVALID_ACCOUNT_ID)
        {
                Account account = AccountAccessor::GetInstance()->GetAccount(pCalendar->GetAccountId());
-               pBitmapIcon = ResourceManager::GetBitmapN(account.GetAccountProvider().GetIconPath());
+               pBitmapIcon = ResourceManager::GetBitmapN(account.GetAccountProvider().GetIconPath(), true);
                accountName = account.GetUserName();
+               AppLogDebug("%ls - %ls", accountName.GetPointer(), account.GetAccountProvider().GetIconPath().GetPointer());
        }
        else
        {
                pBitmapIcon = ResourceManager::GetBitmapN(IDB_ICON_PHONE_CALENDAR);
                accountName = L"Phone";
+               AppLogDebug("%ls - %ls", accountName.GetPointer(), IDB_ICON_PHONE_CALENDAR);
        }
 
        int x = 0;

diff --git a/src/ClResourceManager.cpp b/src/ClResourceManager.cpp
index 601168d..f22636a 100644 (file)
--- a/src/ClResourceManager.cpp
+++ b/src/ClResourceManager.cpp
@@ -21,6 +21,7 @@
 
 #include <cstdlib>
 #include <new>
+#include <FMedia.h>
 #include <FSystem.h>
 #include "ClResourceManager.h"
 #include "ClTypes.h"
@@ -29,6 +30,7 @@ using namespace Tizen::App;
 using namespace Tizen::Base;
 using namespace Tizen::Graphics;
 using namespace Tizen::Locales;
+using namespace Tizen::Media;
 using namespace Tizen::System;
 
 static const int BASE_DAY = 7;
@@ -163,8 +165,15 @@ ResourceManager::CreateTimeFormatterN(void)
 }
 
 Bitmap*
-ResourceManager::GetBitmapN(const String& bitmapPath)
+ResourceManager::GetBitmapN(const String& bitmapPath, bool isAbsolute)
 {
+       if (isAbsolute == true)
+       {
+               Image image;
+               image.Construct();
+               return image.DecodeN(bitmapPath, BITMAP_PIXEL_FORMAT_ARGB8888);
+       }
+
        TryReturn(GetInstance() != null, null, "[E_FAILURE] Unable to get resource instance.");
 
        return GetInstance()->__pAppResource->GetBitmapN(bitmapPath);