Modify icon image & size and fix some problem about wallpaper

Change-Id: Ia51ae4c4a8a8d88ddde6d07c4ea6d4e3840547c0
Signed-off-by: TaeHo Choi <thanks.choi@samsung.com>

diff --git a/inc/StLanguageAndRegionForm.h b/inc/StLanguageAndRegionForm.h
index 9f02bfe..d7e735c 100644 (file)
--- a/inc/StLanguageAndRegionForm.h
+++ b/inc/StLanguageAndRegionForm.h
@@ -62,7 +62,7 @@ public:
 private:
        void RefreshTableViewItem(void);
        void RefreshTableViewGroupItem(int groupIndex);
-       int GetLineheight(Tizen::Base::String& src, int labelWidth, int fontSize);
+       int GetLineheight(Tizen::Base::String& src, int labelWidth, int fontSize, int& lineCount, int& lineHieght);
 
 private:
        Tizen::Base::Collection::ArrayList* __languageDataList;

diff --git a/inc/StTypes.h b/inc/StTypes.h
index 1220c96..9957446 100644 (file)
--- a/inc/StTypes.h
+++ b/inc/StTypes.h
@@ -183,52 +183,45 @@ extern const int FRFRESH_REQUEST_EVENT;
 extern const int BACK_GROUND_EVENT;
 
 extern const wchar_t* IDB_MAIN_FOLDER_BACKGROUND;
-
 extern const wchar_t* IDB_HEADER_BACK_BUTTON_NORMAL;
 extern const wchar_t* IDB_HEADER_BACK_BUTTON_PRESS;
-
 extern const wchar_t* IDB_NO_CONTENTS;
-//Connectivity
-extern const wchar_t* IDB_FLIGHT_MODE;
-extern const wchar_t* IDB_WIFI;
-extern const wchar_t* IDB_LOCATION;
-extern const wchar_t* IDB_NETWORK;
+extern const wchar_t* IDB_NO_ICON;
+extern const wchar_t* IDB_MOBILE_AP;
+
+extern const wchar_t* IDB_CALENDAR;
+extern const wchar_t* IDB_PHONE;
+extern const wchar_t* IDB_CONTACTS;
+extern const wchar_t* IDB_EMAIL;
+extern const wchar_t* IDB_GALLERY;
+extern const wchar_t* IDB_MESSAGE;
+extern const wchar_t* IDB_MUSIC;
+extern const wchar_t* IDB_ABOUT_PHONE;
+
+extern const wchar_t* IDB_ACCESSIBILITY;
+extern const wchar_t* IDB_ACCOUNTS;
+extern const wchar_t* IDB_AUTO_ROTATE_SCREEN;
+extern const wchar_t* IDB_BACKUP_RESET;
 extern const wchar_t* IDB_BLUETOOTH;
-extern const wchar_t* IDB_WIFI_DIRECT;
-extern const wchar_t* IDB_NFC;
-//System
-extern const wchar_t* IDB_EVENT_NOTIFICATION;
-extern const wchar_t* IDB_WALLPAPER;
-extern const wchar_t* IDB_LOCK_SCREEN;
-extern const wchar_t* IDB_SOUND;
 extern const wchar_t* IDB_BRIGHTNESS;
-extern const wchar_t* IDB_SECURITY;
-extern const wchar_t* IDB_FONT;
+extern const wchar_t* IDB_DATE_AND_TIME;
+extern const wchar_t* IDB_DEFAULT_ICON;
+extern const wchar_t* IDB_DEVELOPER_OPTION;
 extern const wchar_t* IDB_DISPLAY;
+extern const wchar_t* IDB_FLIGHT_MODE;
+extern const wchar_t* IDB_FONT;
 extern const wchar_t* IDB_HOME_SCREEN;
-extern const wchar_t* IDB_AUTO_ROTATE_SCREEN;
-extern const wchar_t* IDB_ACCESSIBILITY;
-extern const wchar_t* IDB_DATE_AND_TIME;
-extern const wchar_t* IDB_LANGUAGE;
-extern const wchar_t* IDB_KEYBOARD;
-extern const wchar_t* IDB_STORAGE;
+extern const wchar_t* IDB_LANGUAGE_KEYBOARD;
+extern const wchar_t* IDB_LOCK_SCREEN;
+extern const wchar_t* IDB_LOCATION;
 extern const wchar_t* IDB_MANAGE_APPLICATION;
-extern const wchar_t* IDB_MEMORY;
-extern const wchar_t* IDB_RESET;
-extern const wchar_t* IDB_DEVELOPER_OPTION;
-extern const wchar_t* IDB_ABOUT_PHONE;
-//Application
-extern const wchar_t* IDB_PHONE;
-extern const wchar_t* IDB_ACCOUNTS;
-extern const wchar_t* IDB_MESSAGE;
-extern const wchar_t* IDB_EMAIL;
-extern const wchar_t* IDB_CONTACTS;
-extern const wchar_t* IDB_CALENDAR;
-extern const wchar_t* IDB_GALLERY;
-extern const wchar_t* IDB_MUSIC;
-extern const wchar_t* IDB_VOICE_RECODER;
-//Downloaded apps
-extern const wchar_t* IDB_APP_SETTING;
+extern const wchar_t* IDB_NETWORK;
+extern const wchar_t* IDB_NFC;
+extern const wchar_t* IDB_PRIVACY;
+extern const wchar_t* IDB_SEPARATOR;
+extern const wchar_t* IDB_SOUND;
+extern const wchar_t* IDB_WIFI;
+extern const wchar_t* IDB_WIFI_DIRECT;
 extern const wchar_t* IDB_DEFAULT_ICON;
 extern const wchar_t* IDB_SEPARATOR;
 //ETC using icon
@@ -279,20 +272,7 @@ extern const wchar_t* IDB_DETAIL_BUTTON_EXPAND_OPENED;
 extern const wchar_t* IDB_DETAIL_BUTTON_EXPAND_CLOSED;
 
 //ETC not using now.
-extern const wchar_t* IDB_POWER_SAVING_MODE;
-extern const wchar_t* IDB_DRIVING_MODE;
-extern const wchar_t* IDB_ALL_SHARE;
-extern const wchar_t* IDB_KIES_VIA_WIFI;
-extern const wchar_t* IDB_MOTION;
 extern const wchar_t* IDB_MOBILE_AP;
-extern const wchar_t* IDB_LICENCE;
-extern const wchar_t* IDB_APPS_INFORMATION;
-extern const wchar_t* IDB_ACTIVE_SYNC;
-extern const wchar_t* IDB_CHOOSE_DEFAULT;
-extern const wchar_t* IDB_DATA_ROAMING;
-extern const wchar_t* IDB_LICENSE;
-extern const wchar_t* IDB_MENU;
-extern const wchar_t* IDB_USB_THEME;
 
 //System Information key
 extern const wchar_t* SYSTEM_INFO_KEY_BLUETOOTH;

diff --git a/inc/StWallpaperAlbumListDetailForm.h b/inc/StWallpaperAlbumListDetailForm.h
index 153b21a..3198e5a 100644 (file)
--- a/inc/StWallpaperAlbumListDetailForm.h
+++ b/inc/StWallpaperAlbumListDetailForm.h
@@ -54,17 +54,20 @@ public:
        virtual void OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus);
        virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs);
        virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId);
+       virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
 
 private:
        void CreateIconListView(void);
        void SetOrientationAutoMode(void);
+       void UpdateIconListView(void);
+       int GetHeightForStringArea(const Tizen::Base::String source, int width, int fontSize = 0) const;
+       void SetAllAlbumPathList(void);
 
 private:
        int __itemCount;
        WallpaperAlbumListPresentationModel* __pPresentationModel;
-       AlbumInfo* __pAlbumInfo;
        Tizen::Ui::Controls::IconListView* __pIconListView;
-       Tizen::Base::String* __pArgs;
+       Tizen::Base::Collection::ArrayList* __pAlbumPathList;
 };
 
 #endif // _ST_WALLPAPER_ALBUM_LIST_DETAIL_FORM_H_
\ No newline at end of file

diff --git a/inc/StWallpaperAlbumListForm.h b/inc/StWallpaperAlbumListForm.h
index eca9a1a..c5e123a 100644 (file)
--- a/inc/StWallpaperAlbumListForm.h
+++ b/inc/StWallpaperAlbumListForm.h
@@ -54,6 +54,7 @@ public:
        virtual void OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus);
        virtual void OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs);
        virtual void OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId);
+       virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
 
 private:
        void CreateIconListView(void);
@@ -63,7 +64,6 @@ private:
        int __itemCount;
        WallpaperAlbumListPresentationModel* __pPresentationModel;
        Tizen::Ui::Controls::IconListView* __pIconListView;
-       Tizen::Base::Collection::IList* __pArgs;
 };
 
 #endif // _ST_WALLPAPER_ALBUM_LIST_FORM_H_
\ No newline at end of file

diff --git a/inc/StWallpaperAlbumListPresentationModel.h b/inc/StWallpaperAlbumListPresentationModel.h
index f857fad..dd54a67 100644 (file)
--- a/inc/StWallpaperAlbumListPresentationModel.h
+++ b/inc/StWallpaperAlbumListPresentationModel.h
@@ -33,10 +33,12 @@ public:
        static WallpaperAlbumListPresentationModel* GetInstance(void);
 
 public:
-       void InitializeFileList(AlbumInfo* pAlbumInfo);
+       void InitializeFileList(Tizen::Base::Collection::IList* pAlbumPathList);
        void InitializeAlbumInfoList(void);
        int GetFolderCount(void);
        int GetFileCount(void);
+       Tizen::Base::String* GetHomeLockArgument(void);
+       void SetHomeLockArgument(Tizen::Base::String* pSelectHomeLock);
 
        Tizen::Graphics::Bitmap* CreateDetailMergeBitmapN(int index);
        Tizen::Graphics::Bitmap* CreateMergeBitmapN(int index);
@@ -67,6 +69,7 @@ private:
        Tizen::Graphics::Bitmap* __pFolderBackgroundBitmap;
        static Tizen::Base::Collection::IList* __pCurrentFolderContentsIdList;
        static Tizen::Base::Collection::IList* __pAlbumInfoList;
+       Tizen::Base::String* __pSelectHomeLock;
 };
 
 #endif // _ST_ALBUM_LIST_PRESENTATION_MODEL_H_
\ No newline at end of file

diff --git a/res/screen-density-xhigh/apptray_icon_call.png b/res/screen-density-xhigh/apptray_icon_call.png
index 4ce436d..2b28ee4 100644 (file)
Binary files a/res/screen-density-xhigh/apptray_icon_call.png and b/res/screen-density-xhigh/apptray_icon_call.png differ

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/src/StLanguageAndRegionForm.cpp b/src/StLanguageAndRegionForm.cpp
index 8126c63..b5852cd 100644 (file)
--- a/src/StLanguageAndRegionForm.cpp
+++ b/src/StLanguageAndRegionForm.cpp
@@ -706,12 +706,24 @@ LocaleForm::CreateGroupItem(int groupIndex, int itemWidth)
 
                                formattedString.Remove(0, formattedString.GetLength());
                                pNumberFormatter->Format(inputNumber, formattedString);
-                               formattedString = L"Number : " + formattedString;
-                               groupText.Insert(L"\n" + formattedString, groupText.GetLength());
+                               groupText.Insert(L"\nNumber : " + formattedString, groupText.GetLength());
 
                                tmpText.Insert(formattedString, tmpText.GetLength());
-                               tmpHeight = GetHeightForStringArea(tmpText, itemWidth, fontSize);
+                               int lineCount = 0;
+                               int lineHeight = 0;
+                               tmpHeight = GetLineheight(tmpText, itemWidth, fontSize, lineCount, lineHeight);
                                tmpText.Remove(0, tmpText.GetLength());
+                               if (lineCount > 1)
+                               {
+                                       tmpHeight = (lineCount+1)*lineHeight;
+                               }
+                               else
+                               {
+                                       formattedString = L"Number : " + formattedString;
+                                       tmpText.Remove(0, tmpText.GetLength());
+                                       tmpText.Insert(formattedString, tmpText.GetLength());
+                                       tmpHeight = GetLineheight(tmpText, itemWidth, fontSize, lineCount, lineHeight);
+                               }
                                itemHeight += tmpHeight;
                        }
                        yItemOffset = H_GROUP_INDEX_HELP_TEXT_TOP_GAP / DEVIDE_TWO;
@@ -1027,7 +1039,9 @@ LocaleForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupI
 
                        if (pDateFormatter)
                        {
-                               tempHeight = GetLineheight(groupText, labelWidth, fontSize);
+                               int lineCount = 0;
+                               int lineHeight = 0;
+                               tempHeight = GetLineheight(groupText, labelWidth, fontSize, lineCount, lineHeight);
                                itemHeight += tempHeight;
 
                                pDateFormatter->ApplyPattern("EEE, MMM dd, yyyy");
@@ -1037,7 +1051,7 @@ LocaleForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupI
 
                                tmpText.Remove(0, tmpText.GetLength());
                                tmpText.Insert(formattedString, tmpText.GetLength());
-                               tempHeight = GetLineheight(tmpText, labelWidth, fontSize);
+                               tempHeight = GetLineheight(tmpText, labelWidth, fontSize, lineCount, lineHeight);
                                itemHeight += tempHeight;
 
                                formattedString.Remove(0, formattedString.GetLength());
@@ -1057,23 +1071,36 @@ LocaleForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupI
                                tmpText.Remove(0, tmpText.GetLength());
                                tmpText.Insert(formattedString, tmpText.GetLength());
 
-                               tempHeight = GetLineheight(tmpText, labelWidth, fontSize);
+                               tempHeight = GetLineheight(tmpText, labelWidth, fontSize, lineCount, lineHeight);
                                itemHeight += tempHeight;
 
                                formattedString.Remove(0, formattedString.GetLength());
                                pNumberFormatter->Format(inputNumber, formattedString);
-                               formattedString = L"Number : " + formattedString;
-                               groupText.Insert(L"\n" + formattedString, groupText.GetLength());
+                               groupText.Insert(L"\nNumber : " + formattedString, groupText.GetLength());
 
                                tmpText.Remove(0, tmpText.GetLength());
                                tmpText.Insert(formattedString, tmpText.GetLength());
-                               tempHeight = GetLineheight(tmpText, labelWidth, fontSize);
+                               tempHeight = GetLineheight(tmpText, labelWidth, fontSize, lineCount, lineHeight);
+                               if (lineCount > 1)
+                               {
+                                       tempHeight = (lineCount+1)*lineHeight;
+                               }
+                               else
+                               {
+                                       formattedString = L"Number : " + formattedString;
+                                       tmpText.Remove(0, tmpText.GetLength());
+                                       tmpText.Insert(formattedString, tmpText.GetLength());
+                                       tempHeight = GetLineheight(tmpText, labelWidth, fontSize, lineCount, lineHeight);
+                               }
                                itemHeight += tempHeight;
 
                                tmpText.Remove(0, tmpText.GetLength());
                        }
                        pItemBounds.height = itemHeight;
                        pItem->SetBounds(pItemBounds);
+                       AppLogTag("MyTime", "%d %d %d %d", pItemBounds.x, pItemBounds.y, pItemBounds.width, pItemBounds.height);
+                       pItemBounds.y = H_GROUP_INDEX_HELP_TEXT_TOP_GAP;
+                       pGroupLabel->SetBounds(pItemBounds);
                        pGroupLabel->SetText(groupText);
                        pGroupLabel->SetTextConfig(fontSize, LABEL_TEXT_STYLE_NORMAL);
                        pGroupLabel->Invalidate(false);
@@ -1087,15 +1114,15 @@ LocaleForm::UpdateGroupItem(int groupIndex, Tizen::Ui::Controls::TableViewGroupI
 }
 
 int
-LocaleForm::GetLineheight(Tizen::Base::String& src, int labelWidth, int fontSize)
+LocaleForm::GetLineheight(Tizen::Base::String& src, int labelWidth, int fontSize, int& lineCount, int& lineHeight)
 {
-       int lineCount = 0;
        Font font;
        Dimension dim;
 
        font.Construct(FONT_STYLE_PLAIN, fontSize);
        font.GetTextExtent(src, src.GetLength(), dim);
 
+       lineHeight = dim.height;
        if (dim.width > labelWidth)
        {
                lineCount = (dim.width / labelWidth);

diff --git a/src/StMainMenuForm.cpp b/src/StMainMenuForm.cpp
index da7465e..455bcb7 100644 (file)
--- a/src/StMainMenuForm.cpp
+++ b/src/StMainMenuForm.cpp
@@ -436,7 +436,7 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                        case ID_ITEM_PERSONAL_PRIVACY:
                                {
-                                       pBitmap = ResourceManager::GetBitmapN(IDB_ACCOUNTS);
+                                       pBitmap = ResourceManager::GetBitmapN(IDB_PRIVACY);
                                        itemText = L"Privacy";//ResourceManager::GetString(L"IDS_COM_BODY_ACCOUNTS");
                                }
                                break;
@@ -495,7 +495,7 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
                        case ID_ITEM_DEVICE_LANGUAGE_KEYBOARD:
                                {
-                                       pBitmap = ResourceManager::GetBitmapN(IDB_LANGUAGE);
+                                       pBitmap = ResourceManager::GetBitmapN(IDB_LANGUAGE_KEYBOARD);
                                        itemText = ResourceManager::GetString(L"IDS_ST_BODY_LANGUAGE_AND_KEYBOARD");
                                }
                                break;

diff --git a/src/StManageApplicationForm.cpp b/src/StManageApplicationForm.cpp
index 756911e..7b33129 100644 (file)
--- a/src/StManageApplicationForm.cpp
+++ b/src/StManageApplicationForm.cpp
@@ -373,7 +373,7 @@ ManageApplicationForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        if (pBitmap == null)
        {
-               pBitmap = ResourceManager::GetBitmapN(IDB_MANAGE_APPLICATION);
+               pBitmap = ResourceManager::GetBitmapN(IDB_DEFAULT_ICON);
        }
        pLabel = new (std::nothrow) Label();
        pLabel->Construct(iconRectangle, L"");

diff --git a/src/StManageApplicationInfoForm.cpp b/src/StManageApplicationInfoForm.cpp
index 67d596a..74fd7b5 100644 (file)
--- a/src/StManageApplicationInfoForm.cpp
+++ b/src/StManageApplicationInfoForm.cpp
@@ -350,7 +350,7 @@ ManageApplicationInfoForm::CreateItem(int groupIndex, int itemIndex, int itemWid
 
                                        if (pBitmap == null)
                                        {
-                                               pBitmap = ResourceManager::GetBitmapN(IDB_MANAGE_APPLICATION);
+                                               pBitmap = ResourceManager::GetBitmapN(IDB_DEFAULT_ICON);
                                        }
 
                                        String sizeData;

diff --git a/src/StMoreConnectivityForm.cpp b/src/StMoreConnectivityForm.cpp
index 5dca483..5150fdf 100644 (file)
--- a/src/StMoreConnectivityForm.cpp
+++ b/src/StMoreConnectivityForm.cpp
@@ -267,7 +267,7 @@ MoreConnectivityForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                {
                        secondLineText = ResourceManager::GetString(L"IDS_ST_BODY_OFF");
                }
-               itemText = L"NFC";
+               itemText = ResourceManager::GetString(L"IDS_NFC_BODY_NFC");
        }
        else
        {

diff --git a/src/StMoreSystemForm.cpp b/src/StMoreSystemForm.cpp
index 5f40089..2f6e296 100644 (file)
--- a/src/StMoreSystemForm.cpp
+++ b/src/StMoreSystemForm.cpp
@@ -217,13 +217,13 @@ MoreSystemForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
 
        case ID_ITEM_SYSTEM_LANGUAGE_AND_REGION:
                {
-                       pBitmap = ResourceManager::GetBitmapN(IDB_LANGUAGE);
+                       pBitmap = ResourceManager::GetBitmapN(IDB_LANGUAGE_KEYBOARD);
                }
                break;
 
        case ID_ITEM_SYSTEM_KEYBOARD:
                {
-                       pBitmap = ResourceManager::GetBitmapN(IDB_KEYBOARD);
+                       pBitmap = ResourceManager::GetBitmapN(IDB_LANGUAGE_KEYBOARD);
                        itemText = ResourceManager::GetString(L"IDS_ST_BODY_KEYBOARD");
                }
                break;

diff --git a/src/StNfcForm.cpp b/src/StNfcForm.cpp
index f49ce5b..d0cc900 100644 (file)
--- a/src/StNfcForm.cpp
+++ b/src/StNfcForm.cpp
@@ -77,7 +77,7 @@ NfcForm::CreateFooter(void)
 result
 NfcForm::OnInitializing(void)
 {
-       CreateHeader(L"NFC");
+       CreateHeader(ResourceManager::GetString(L"IDS_NFC_BODY_NFC"));
        CreateFooter();
        CreateTableView();
 

diff --git a/src/StTypes.cpp b/src/StTypes.cpp
index c659701..9c0e73a 100644 (file)
--- a/src/StTypes.cpp
+++ b/src/StTypes.cpp
@@ -128,8 +128,8 @@ const int H_ITEM_TYPE_2_LABEL_SUB = 48;
 
 const int X_ITEM_TYPE_3_ICON = 26;
 const int Y_ITEM_TYPE_3_ICON = 21;
-const int W_ITEM_TYPE_3_ICON = 74;
-const int H_ITEM_TYPE_3_ICON = 74;
+const int W_ITEM_TYPE_3_ICON = 72;
+const int H_ITEM_TYPE_3_ICON = 72;
 
 const int X_ITEM_TYPE_3_LABEL = (X_ITEM_TYPE_3_ICON + W_ITEM_TYPE_3_ICON);
 const int Y_ITEM_TYPE_3_LABEL = 0;
@@ -184,50 +184,43 @@ const wchar_t* IDB_HEADER_BACK_BUTTON_NORMAL = L"00_icon_Back_02.png";
 const wchar_t* IDB_HEADER_BACK_BUTTON_PRESS = L"00_icon_Back_02_press.png";
 
 const wchar_t* IDB_NO_CONTENTS = L"00_Nocontents_text_web.png";
-const wchar_t* IDB_NO_ICON = L"help_74_qna.png";
-//Connectivity
-const wchar_t* IDB_FLIGHT_MODE = L"settings_74_flight.png";
-const wchar_t* IDB_WIFI = L"settings_74_wifi.png";
-const wchar_t* IDB_LOCATION = L"settings_74_location.png";
-const wchar_t* IDB_NETWORK = L"settings_74_network.png";
-const wchar_t* IDB_BLUETOOTH = L"settings_74_bluetooth.png";
-const wchar_t* IDB_WIFI_DIRECT = L"settings_74_wifi_direct.png";
-const wchar_t* IDB_NFC = L"settings_106_nfc.png";
-//System
-const wchar_t* IDB_EVENT_NOTIFICATION = L"settings_74_event.png";
-const wchar_t* IDB_WALLPAPER = L"settings_106_wallpaper.png";
-const wchar_t* IDB_LOCK_SCREEN = L"settings_106_lockscreen.png";
-const wchar_t* IDB_SOUND = L"settings_74_sound.png";
-const wchar_t* IDB_BRIGHTNESS = L"A01-1_icon_Brightness.png";
-const wchar_t* IDB_SECURITY = L"settings_74_security.png";
-const wchar_t* IDB_FONT = L"A01-1_icon_Font.png";
-const wchar_t* IDB_DISPLAY = L"settings_74_display.png";
-const wchar_t* IDB_HOME_SCREEN = L"settings_74_home_lock.png";
-const wchar_t* IDB_AUTO_ROTATE_SCREEN = L"settings_74_auto_rate.png";
-const wchar_t* IDB_ACCESSIBILITY = L"settings_74_accessibility.png";
-const wchar_t* IDB_DATE_AND_TIME = L"settings_74_date_and_time.png";
-const wchar_t* IDB_LANGUAGE = L"A01-1_icon_Display_Language.png";
-const wchar_t* IDB_KEYBOARD = L"settings_74_keyboard.png";
-const wchar_t* IDB_STORAGE = L"settings_74_storage.png";
-const wchar_t* IDB_MANAGE_APPLICATION = L"settings_74_manager_app.png";
-const wchar_t* IDB_MEMORY = L"settings_74_data_usage.png";
-const wchar_t* IDB_RESET = L"settings_74_backup_reset.png";
-const wchar_t* IDB_DEVELOPER_OPTION = L"settings_74_developer.png";
-const wchar_t* IDB_ABOUT_PHONE = L"settings_74_about_phone.png";
-//Application
+const wchar_t* IDB_NO_ICON = L"settings_qna.png";
+const wchar_t* IDB_MOBILE_AP = L"A01-1_icon_mobileAP.png";
+
+const wchar_t* IDB_CALENDAR = L"apptray_icon_calendar.png";
 const wchar_t* IDB_PHONE = L"apptray_icon_call.png";
-const wchar_t* IDB_ACCOUNTS = L"settings_74_accounts.png";
-const wchar_t* IDB_MESSAGE = L"apptray_icon_message.png";
-const wchar_t* IDB_EMAIL = L"apptray_icon_email.png";
 const wchar_t* IDB_CONTACTS = L"apptray_icon_contact.png";
-const wchar_t* IDB_CALENDAR = L"apptray_icon_calendar.png";
+const wchar_t* IDB_EMAIL = L"apptray_icon_email.png";
 const wchar_t* IDB_GALLERY = L"apptray_icon_gallery.png";
+const wchar_t* IDB_MESSAGE = L"apptray_icon_message.png";
 const wchar_t* IDB_MUSIC = L"apptray_icon_music.png";
-const wchar_t* IDB_VOICE_RECODER = L"settings_74_voice.png";
-//Downloaded apps
-const wchar_t* IDB_APP_SETTING = L"settings_74_web_app.png";
-const wchar_t* IDB_DEFAULT_ICON = IDB_APP_SETTING;
+const wchar_t* IDB_ABOUT_PHONE = L"settings_about_phone.png";
+
+const wchar_t* IDB_ACCESSIBILITY = L"settings_accessibility.png";
+const wchar_t* IDB_ACCOUNTS = L"settings_account.png";
+const wchar_t* IDB_AUTO_ROTATE_SCREEN = L"settings_auto_rate.png";
+const wchar_t* IDB_BACKUP_RESET = L"settings_backup_reset.png";
+const wchar_t* IDB_BLUETOOTH = L"settings_bluetooth.png";
+const wchar_t* IDB_BRIGHTNESS = L"settings_brightness.png";
+const wchar_t* IDB_DATE_AND_TIME = L"settings_date_and_time.png";
+const wchar_t* IDB_DEFAULT_ICON = L"settings_tizenservice.png";
+const wchar_t* IDB_DEVELOPER_OPTION = L"settings_developer.png";
+const wchar_t* IDB_DISPLAY = L"settings_display.png";
+const wchar_t* IDB_FLIGHT_MODE = L"settings_flight.png";
+const wchar_t* IDB_FONT = L"settings_font.png";
+const wchar_t* IDB_HOME_SCREEN = L"settings_home.png";
+const wchar_t* IDB_LANGUAGE_KEYBOARD = L"settings_keyboard.png";
+const wchar_t* IDB_LOCK_SCREEN = L"settings_lockscreen.png";
+const wchar_t* IDB_LOCATION = L"settings_location.png";
+const wchar_t* IDB_MANAGE_APPLICATION = L"settings_manager_app.png";
+const wchar_t* IDB_NETWORK = L"settings_network.png";
+const wchar_t* IDB_NFC = L"settings_106_nfc.png";
+const wchar_t* IDB_PRIVACY = L"settings_privacy.png";
 const wchar_t* IDB_SEPARATOR = L"A01-1_Vibration_bar.png";
+const wchar_t* IDB_SOUND = L"settings_sound.png";
+const wchar_t* IDB_WIFI = L"settings_wifi.png";
+const wchar_t* IDB_WIFI_DIRECT = L"settings_wifi_direct.png";
+
 //ETC using icon
 const wchar_t* IDB_SEARCH_ICON_SIZE_LAGER_IMAGE_PATH_FORMAT = L"00_list_process_%d.png";
 const wchar_t* IDB_SOUND_MIN = L"A01-1_list_progress_sound_min.png";
@@ -275,22 +268,6 @@ const wchar_t* IDB_WIFI_RSSI_UNLOCK_03 = L"A01-3_Wifi_unlock_icon_03.png";
 const wchar_t* IDB_DETAIL_BUTTON_EXPAND_OPENED = L"00_button_expand_opened.png";
 const wchar_t* IDB_DETAIL_BUTTON_EXPAND_CLOSED = L"00_button_expand_closed.png";
 
-//ETC not using now.
-const wchar_t* IDB_POWER_SAVING_MODE = L"settings_74_power_saving_mode.png";
-const wchar_t* IDB_DRIVING_MODE = L"settings_74_driving_mode.png";
-const wchar_t* IDB_ALL_SHARE = L"settings_74_allahare.png";
-const wchar_t* IDB_KIES_VIA_WIFI = L"settings_74_kies_via_wifi.png";
-const wchar_t* IDB_MOTION = L"settings_74_motion.png";
-const wchar_t* IDB_MOBILE_AP = L"A01-1_icon_mobileAP.png";
-const wchar_t* IDB_LICENCE = L"A01-1_icon_License.png";
-const wchar_t* IDB_APPS_INFORMATION = IDB_NO_ICON;
-const wchar_t* IDB_ACTIVE_SYNC = IDB_NO_ICON;
-const wchar_t* IDB_CHOOSE_DEFAULT = IDB_NO_ICON;
-const wchar_t* IDB_DATA_ROAMING = IDB_NO_ICON;
-const wchar_t* IDB_LICENSE = IDB_NO_ICON;
-const wchar_t* IDB_MENU = IDB_NO_ICON;
-const wchar_t* IDB_USB_THEME = IDB_NO_ICON;
-
 //System info key
 const wchar_t* SYSTEM_INFO_KEY_BLUETOOTH = L"http://tizen.org/feature/network.bluetooth";
 const wchar_t* SYSTEM_INFO_KEY_DUID = L"http://tizen.org/system/duid";

diff --git a/src/StWallpaperAlbumListDetailForm.cpp b/src/StWallpaperAlbumListDetailForm.cpp
index f8db7a7..2f93520 100644 (file)
--- a/src/StWallpaperAlbumListDetailForm.cpp
+++ b/src/StWallpaperAlbumListDetailForm.cpp
@@ -34,13 +34,20 @@ using namespace Tizen::Ui::Scenes;
 static const int MAX_UNDER_FILE_SIZE = 334;
 static const int MAX_OVER_FILE_SIZE = 158;
 static const int FOLDER_BITMAP_MAX = 6;
+static const int DEVIDE_TWO = 2;
+static const int W_LARGE_SIZE_TEXT_GAP = 110;
+static const int W_HUGE_SIZE_PORTRAIT_TEXT_GAP = 90;
+static const int W_HUGE_SIZE_LANDSCAPE_TEXT_GAP = 220;
+static const int LINE_COUNT_DEFAULT = 1;
+
+static const int BASE_FORM_DEFAULT_MARGIN = 32;
+static const wchar_t* ALBUM_NAME_ALL_ALBUMS = L"All albums";
 
 WallpaperAlbumListDetailForm::WallpaperAlbumListDetailForm(void)
        : __itemCount(0)
        , __pPresentationModel(null)
-       , __pAlbumInfo(null)
        , __pIconListView(null)
-       , __pArgs(null)
+       , __pAlbumPathList(null)
 {
 }
 
@@ -66,6 +73,114 @@ WallpaperAlbumListDetailForm::SetOrientationAutoMode(void)
 }
 
 void
+WallpaperAlbumListDetailForm::UpdateIconListView(void)
+{
+       bool createIconListView = true;
+       if (__itemCount == 0)
+       {
+               createIconListView = false;
+       }
+       if (__pIconListView != null)
+       {
+               if (createIconListView)
+               {
+                       __pIconListView->UpdateList();
+                       return;
+               }
+       }
+
+       int controlCount = GetControlCount();
+       for (int i = 0; i < controlCount; i++)
+       {
+               RemoveControl(GetControl(0));
+       }
+//     RemoveAllControls();
+
+       if (createIconListView)
+       {
+               CreateIconListView();
+       }
+       else
+       {
+               Label* pLabel = static_cast<Label*>(this->GetControl(NO_CONTENTS, false));
+               if (pLabel == null)
+               {
+                       Rectangle clientRect = GetClientAreaBounds();
+                       Bitmap* pBitmp = ResourceManager::GetBitmapN(IDB_NO_CONTENTS);
+
+                       int bitmapWidth = pBitmp->GetWidth();
+                       int bitmapHeight = pBitmp->GetHeight();
+                       String labelText = ResourceManager::GetString(L"IDS_ST_BODY_NO_CONTENT");
+                       Color textColor = COLOR_HELP_TEXT_TYPE_03_NORMAL;
+                       int noContentTextHeight = GetHeightForStringArea(labelText, bitmapWidth, 32);
+
+                       int xPos = (clientRect.width / LINE_COUNT_2) - (bitmapWidth / DEVIDE_TWO);
+                       int yPos = (clientRect.height / LINE_COUNT_2) - ((bitmapHeight + noContentTextHeight) / DEVIDE_TWO);
+
+                       Label* pLabel = new (std::nothrow) Label();
+                       pLabel->Construct(Rectangle(xPos, yPos, bitmapWidth, bitmapHeight), L"");
+                       pLabel->SetName(NO_CONTENTS);
+                       pLabel->SetBackgroundBitmap(*pBitmp);
+
+                       yPos = yPos + bitmapHeight;
+
+                       Label* pLabelNoContents = new (std::nothrow) Label();
+                       pLabelNoContents->Construct(Rectangle(0, yPos, clientRect.width, noContentTextHeight), L"");
+                       pLabelNoContents->SetName(NO_CONTENTS_TEXT);
+                       pLabelNoContents->SetTextColor(textColor);
+                       pLabelNoContents->SetText(labelText);
+
+                       AddControl(*pLabel);
+                       AddControl(*pLabelNoContents);
+               }
+       }
+}
+
+int
+WallpaperAlbumListDetailForm::GetHeightForStringArea(const Tizen::Base::String source, int width, int fontSize) const
+{
+       Font font;
+       Dimension dim;
+       String temp;
+
+       int lineCount = LINE_COUNT_DEFAULT;
+       int margin = BASE_FORM_DEFAULT_MARGIN + RELATIVE_LAYOUT_RIGHT_MARGIN;
+       if (fontSize > FONT_MAIN_TEXT_SIZE_LARGE)
+       {
+               OrientationStatus orientationStatus = GetOrientationStatus();
+               if (((orientationStatus == ORIENTATION_STATUS_PORTRAIT)
+                       || (orientationStatus == ORIENTATION_STATUS_PORTRAIT_REVERSE))
+                       && (fontSize == FONT_MAIN_TEXT_SIZE_HUGE))
+               {
+                       width -= W_HUGE_SIZE_PORTRAIT_TEXT_GAP;
+               }
+               else if (((orientationStatus == ORIENTATION_STATUS_LANDSCAPE)
+                               || (orientationStatus == ORIENTATION_STATUS_LANDSCAPE_REVERSE))
+                               && (fontSize == FONT_MAIN_TEXT_SIZE_HUGE))
+               {
+                       width -= W_HUGE_SIZE_LANDSCAPE_TEXT_GAP;
+               }
+               width -= W_LARGE_SIZE_TEXT_GAP;
+       }
+       int boudwidth = width - margin;
+       font.Construct(FONT_STYLE_PLAIN, fontSize);
+
+       for (int i = 0; i < source.GetLength(); i++)
+       {
+               temp.Append(source[i]);
+               font.GetTextExtent(temp, temp.GetLength(), dim);
+               if (dim.width > boudwidth)
+               {
+                       temp.Clear();
+                       temp.Append(source[i]);
+                       lineCount++;
+               }
+       }
+
+       return dim.height * lineCount;
+}
+
+void
 WallpaperAlbumListDetailForm::CreateHeader(const Tizen::Base::String& textTitle)
 {
        Header* pHeader = GetHeader();
@@ -109,14 +224,10 @@ WallpaperAlbumListDetailForm::OnTerminating(void)
                __pIconListView = null;
        }
 
-       if (__pAlbumInfo != null)
+       if (__pAlbumPathList != null)
        {
-               __pAlbumInfo = null;
-       }
-
-       if (__pArgs != null)
-       {
-               __pArgs = null;
+               delete __pAlbumPathList;
+               __pAlbumPathList = null;
        }
 
        return E_SUCCESS;
@@ -170,7 +281,6 @@ WallpaperAlbumListDetailForm::OnIconListViewItemStateChanged(IconListView& view,
 
                ArrayList* aList = new (std::nothrow) ArrayList(SingleObjectDeleter);
                aList->Construct();
-               aList->Add(*(new (std::nothrow) String(*__pArgs)));
                aList->Add(pContentId);
 
                pSceneManager->GoForward(ForwardSceneTransition(IDSCN_WALLPAPER_IMAGE_SELECT, SCENE_TRANSITION_ANIMATION_TYPE_LEFT), aList);
@@ -192,27 +302,18 @@ WallpaperAlbumListDetailForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId
 {
        if (pArgs != null)
        {
-               if (__pArgs == null)
-               {
-                       __pArgs = static_cast<String*>(pArgs->GetAt(0));
-               }
-               if (__pAlbumInfo == null)
-               {
-                       __pAlbumInfo = static_cast<AlbumInfo*>(pArgs->GetAt(1));
-               }
+               __pAlbumPathList = static_cast<ArrayList*>(pArgs);
        }
 
        if (__pPresentationModel == null)
        {
                __pPresentationModel = WallpaperAlbumListPresentationModel::GetInstance();
        }
-       __pPresentationModel->InitializeFileList(__pAlbumInfo);
+       SetAllAlbumPathList();
+       __pPresentationModel->InitializeFileList(__pAlbumPathList);
        __itemCount = __pPresentationModel->GetFileCount();
 
-       if (__pIconListView == null)
-       {
-               CreateIconListView();
-       }
+       UpdateIconListView();
        CreateHeader(ResourceManager::GetString(L"IDS_MP_BODY_ADD_IMAGE"));
        CreateFooter();
 }
@@ -253,4 +354,47 @@ WallpaperAlbumListDetailForm::OnOrientationChanged(const Tizen::Ui::Control& sou
 {
        __pIconListView->SetBounds(Rectangle(0, 0, GetClientAreaBounds().width, GetClientAreaBounds().height));
        Invalidate(true);
+}
+
+void
+WallpaperAlbumListDetailForm::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs)
+{
+       if (requestId == FRFRESH_REQUEST_EVENT)
+       {
+               __pPresentationModel->InitializeAlbumInfoList();
+               SetAllAlbumPathList();
+               __pPresentationModel->InitializeFileList(__pAlbumPathList);
+               __itemCount = __pPresentationModel->GetFileCount();
+               UpdateIconListView();
+               if (pArgs)
+               {
+                       pArgs->RemoveAll(true);
+                       delete pArgs;
+               }
+       }
+}
+
+void
+WallpaperAlbumListDetailForm::SetAllAlbumPathList(void)
+{
+       String isAllAlbum = *static_cast<String*>(__pAlbumPathList->GetAt(0));
+
+       if (isAllAlbum.Equals(ALBUM_NAME_ALL_ALBUMS, true) == false)
+       {
+               AppLogDebug("__pAlbumPathList is not AllAlbum");
+               return;
+       }
+
+       delete __pAlbumPathList;
+       __pAlbumPathList = null;
+       IList* pAlbumInfoList = __pPresentationModel->GetAlbumInfoList();
+       AlbumInfo* pAlbumInfo = static_cast<AlbumInfo*>(pAlbumInfoList->GetAt(0));
+       ArrayList* pAlbumPathList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+       pAlbumPathList->Construct();
+       pAlbumPathList->Add(*(new (std::nothrow) String(ALBUM_NAME_ALL_ALBUMS)));
+       for (int i = 0; i < pAlbumInfo->GetDirectoryCount(); i++)
+       {
+               pAlbumPathList->Add(*(new (std::nothrow) String(pAlbumInfo->GetDirectory(i))));
+       }
+       __pAlbumPathList = pAlbumPathList;
 }
\ No newline at end of file

diff --git a/src/StWallpaperAlbumListForm.cpp b/src/StWallpaperAlbumListForm.cpp
index 4f99493..ab73d79 100644 (file)
--- a/src/StWallpaperAlbumListForm.cpp
+++ b/src/StWallpaperAlbumListForm.cpp
@@ -32,12 +32,12 @@ using namespace Tizen::Ui::Scenes;
 
 static const int W_FOLDER_SIZE = 334;
 static const int H_FOLDER_SIZE = 334;
+static const wchar_t* ALBUM_NAME_ALL_ALBUMS = L"All albums";
 
 WallpaperAlbumListForm::WallpaperAlbumListForm(void)
        : __itemCount(0)
        , __pPresentationModel(null)
        , __pIconListView(null)
-       , __pArgs(null)
 {
 }
 
@@ -103,11 +103,6 @@ WallpaperAlbumListForm::OnTerminating(void)
                __pIconListView = null;
        }
 
-       if (__pArgs != null)
-       {
-               __pArgs = null;
-       }
-
        return E_SUCCESS;
 }
 
@@ -155,15 +150,18 @@ WallpaperAlbumListForm::OnIconListViewItemStateChanged(IconListView& view, int i
 
                IList* pAlbumInfoList = __pPresentationModel->GetAlbumInfoList();
                AlbumInfo* pAlbumInfo = static_cast<AlbumInfo*>(pAlbumInfoList->GetAt(index));
-               AlbumInfo* pSendAlbumInfo = new (std::nothrow) AlbumInfo();
-               pSendAlbumInfo->Construct(*pAlbumInfo);
-
-               ArrayList* aList = new (std::nothrow) ArrayList(SingleObjectDeleter);
-               aList->Construct();
-               aList->Add(__pArgs->GetAt(0));
-               aList->Add(pSendAlbumInfo);
-
-               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_WALLPAPER_ALBUM_LIST_DETAIL, SCENE_TRANSITION_ANIMATION_TYPE_LEFT), aList);
+               ArrayList* pAlbumPathList = new (std::nothrow) ArrayList(SingleObjectDeleter);
+               pAlbumPathList->Construct();
+               if (index == 0)
+               {
+                       pAlbumPathList->Add(*(new (std::nothrow) String(ALBUM_NAME_ALL_ALBUMS)));
+               }
+               for (int i = 0; i < pAlbumInfo->GetDirectoryCount(); i++)
+               {
+                       pAlbumPathList->Add(*(new (std::nothrow) String(pAlbumInfo->GetDirectory(i))));
+               }
+
+               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_WALLPAPER_ALBUM_LIST_DETAIL, SCENE_TRANSITION_ANIMATION_TYPE_LEFT), pAlbumPathList);
        }
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
@@ -180,21 +178,26 @@ WallpaperAlbumListForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
 void
 WallpaperAlbumListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId, const Tizen::Ui::Scenes::SceneId& currentSceneId, Tizen::Base::Collection::IList* pArgs)
 {
-       if ((pArgs != null) && (__pArgs == null))
-       {
-               __pArgs = pArgs;
-       }
-
        if (__pPresentationModel == null)
        {
                __pPresentationModel = WallpaperAlbumListPresentationModel::GetInstance();
        }
+       if (pArgs != null)
+       {
+               String* selectHomeLock = static_cast<String*>(pArgs->GetAt(0));
+               __pPresentationModel->SetHomeLockArgument(selectHomeLock);
+       }
+
        __pPresentationModel->InitializeAlbumInfoList();
        __itemCount = __pPresentationModel->GetFolderCount();
        if (__pIconListView == null)
        {
                CreateIconListView();
        }
+       else
+       {
+               __pIconListView->UpdateList();
+       }
        CreateHeader(ResourceManager::GetString(L"IDS_MP_BODY_ADD_IMAGE"));
        CreateFooter();
 }
@@ -226,4 +229,20 @@ WallpaperAlbumListForm::OnOrientationChanged(const Tizen::Ui::Control& source, T
 {
        __pIconListView->SetBounds(Rectangle(0, 0, GetClientAreaBounds().width, GetClientAreaBounds().height));
        Invalidate(true);
+}
+
+void
+WallpaperAlbumListForm::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs)
+{
+       if (requestId == FRFRESH_REQUEST_EVENT)
+       {
+               __pPresentationModel->InitializeAlbumInfoList();
+               __itemCount = __pPresentationModel->GetFolderCount();
+               __pIconListView->UpdateList();
+               if (pArgs)
+               {
+                       pArgs->RemoveAll(true);
+                       delete pArgs;
+               }
+       }
 }
\ No newline at end of file

diff --git a/src/StWallpaperAlbumListPresentationModel.cpp b/src/StWallpaperAlbumListPresentationModel.cpp
index fbc5220..ddb5be7 100644 (file)
--- a/src/StWallpaperAlbumListPresentationModel.cpp
+++ b/src/StWallpaperAlbumListPresentationModel.cpp
@@ -19,7 +19,6 @@
  * @brief              This is the implementation file for WallpaperAlbumListPresentationModel class.
  */
 
-#include <cstdlib>
 #include <FSystem.h>
 #include "StWallpaperAlbumListPresentationModel.h"
 
@@ -122,6 +121,8 @@ WallpaperAlbumListPresentationModel::Construct(void)
                __pCurrentFolderContentsIdList = null;
        }
 
+       __pSelectHomeLock = null;
+
        return E_SUCCESS;
 }
 
@@ -487,8 +488,20 @@ WallpaperAlbumListPresentationModel::GetFileCount(void)
        return __pCurrentFolderContentsIdList->GetCount();
 }
 
+Tizen::Base::String*
+WallpaperAlbumListPresentationModel::GetHomeLockArgument(void)
+{
+       return __pSelectHomeLock;
+}
+
+void
+WallpaperAlbumListPresentationModel::SetHomeLockArgument(Tizen::Base::String* pSelectHomeLock)
+{
+       __pSelectHomeLock = pSelectHomeLock;
+}
+
 void
-WallpaperAlbumListPresentationModel::InitializeFileList(AlbumInfo* pAlbumInfo)
+WallpaperAlbumListPresentationModel::InitializeFileList(Tizen::Base::Collection::IList* pAlbumPathList)
 {
        if (__pCurrentFolderContentsIdList != null)
        {
@@ -498,9 +511,9 @@ WallpaperAlbumListPresentationModel::InitializeFileList(AlbumInfo* pAlbumInfo)
 
        __pCurrentFolderContentsIdList = new (std::nothrow) ArrayList(SingleObjectDeleter);
        int albumInfoDirectoryIndex = 0;
-       while (albumInfoDirectoryIndex < pAlbumInfo->GetDirectoryCount())
+       while (albumInfoDirectoryIndex < pAlbumPathList->GetCount())
        {
-               String fullPath = pAlbumInfo->GetDirectory(albumInfoDirectoryIndex++);
+               String fullPath = *static_cast<String*>(pAlbumPathList->GetAt(albumInfoDirectoryIndex++));
                IList* pList = GetContentIdListInDirectoryN(fullPath);
                int contentIdListIndex = 0;
 

diff --git a/src/StWallpaperForm.cpp b/src/StWallpaperForm.cpp
index b9ae863..4affede 100644 (file)
--- a/src/StWallpaperForm.cpp
+++ b/src/StWallpaperForm.cpp
@@ -19,7 +19,6 @@
  * @brief              This is the implementation file for WallpaperForm class.
  */
 
-#include <memory>
 #include <FIo.h>
 #include "StResourceManager.h"
 #include "StSettingScenesList.h"

diff --git a/src/StWallpaperImageSelectForm.cpp b/src/StWallpaperImageSelectForm.cpp
index 16505d3..e463b1c 100644 (file)
--- a/src/StWallpaperImageSelectForm.cpp
+++ b/src/StWallpaperImageSelectForm.cpp
@@ -235,7 +235,7 @@ WallpaperImageSelectForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& pr
 {
        if (pArgs != null)
        {
-               String* pStr = static_cast<String*>(pArgs->GetAt(0));
+               String* pStr = WallpaperAlbumListPresentationModel::GetInstance()->GetHomeLockArgument();
                if (pStr->Equals(L"0", true))
                {
                        __argIndex = 0;
@@ -248,7 +248,7 @@ WallpaperImageSelectForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& pr
                {
                        __argIndex = 2;
                }
-               __pContentId = static_cast<ContentId*>(pArgs->GetAt(1));
+               __pContentId = static_cast<ContentId*>(pArgs->GetAt(0));
        }
        if (__pContentId != null)
        {