NABI_SE issues resolved

Change-Id: Idbae5fa0f6e16f19ab08060533410ad6bedd7160

diff --git a/inc/MfBaseForm.h b/inc/MfBaseForm.h
index 236f0a7..8827d8d 100644 (file)
--- a/inc/MfBaseForm.h
+++ b/inc/MfBaseForm.h
@@ -132,6 +132,7 @@ public:
        virtual void OnThumbnailReceived(ThumbRequest* pThumbReq);
        void OnSceneIdChanged(const Tizen::Ui::Scenes::SceneId&         currentSceneId, const Tizen::Ui::Scenes::SceneId&               previousSceneId);
        void OnAppControlCompleted(void);
+       void OnSettingValueChanged(void);
 };
 
 #endif

diff --git a/inc/MfIListViewStateChangeListener.h b/inc/MfIListViewStateChangeListener.h
index ea37cfc..4390a12 100644 (file)
--- a/inc/MfIListViewStateChangeListener.h
+++ b/inc/MfIListViewStateChangeListener.h
@@ -69,6 +69,8 @@ public:
        virtual void OnThumbnailReceived(ThumbRequest* pThumbReq) = 0;\r
        virtual void OnSceneIdChanged(const Tizen::Ui::Scenes::SceneId&         currentSceneId, const Tizen::Ui::Scenes::SceneId&               previousSceneId) = 0;\r
        virtual void OnAppControlCompleted(void) = 0;\r
+       virtual void OnSettingValueChanged(void) = 0;\r
+\r
 };\r
 \r
 #endif\r

diff --git a/inc/MfSubBaseFileManageForm.h b/inc/MfSubBaseFileManageForm.h
index f0fff45..e7c513f 100644 (file)
--- a/inc/MfSubBaseFileManageForm.h
+++ b/inc/MfSubBaseFileManageForm.h
@@ -71,6 +71,7 @@ protected:
        void SubBaseOnNotificationReceived(Tizen::Base::Collection::ArrayList* pArgs);
        void SubBaseOnThumbnailReceived(ThumbRequest* pThumbReq);
        void OnAppControlCompleted(void);
+       void OnSettingValueChanged(void);
        /*
         * A private member function taking and returning no arguments.
         * @fn CopyFile

diff --git a/inc/MfSubBaseFolderEntryForm.h b/inc/MfSubBaseFolderEntryForm.h
index 9798297..9820dfc 100644 (file)
--- a/inc/MfSubBaseFolderEntryForm.h
+++ b/inc/MfSubBaseFolderEntryForm.h
@@ -101,6 +101,7 @@ public:
        virtual void OnThumbnailReceived(ThumbRequest* pThumbReq);
        virtual void OnSceneIdChanged(const Tizen::Ui::Scenes::SceneId&         currentSceneId, const Tizen::Ui::Scenes::SceneId&               previousSceneId);
        void OnAppControlCompleted(void);
+       virtual void OnSettingValueChanged(void);
 
        /*! @fn OnListViewContextItemStateChanged(Tizen::Ui::Controls::ListView& listView, int index, int elementId, Tizen::Ui::Controls::ListContextItemStatus status)
         * @brief Called when the state of an element in the ListContextItem is changed.

diff --git a/inc/MfSubBaseSelectionForm.h b/inc/MfSubBaseSelectionForm.h
index b18d15d..1fb7007 100644 (file)
--- a/inc/MfSubBaseSelectionForm.h
+++ b/inc/MfSubBaseSelectionForm.h
@@ -98,6 +98,7 @@ public:
         */\r
        virtual void OnThumbnailReceived(ThumbRequest* pThumbReq);\r
 \r
+       virtual void OnSettingValueChanged(void);\r
 protected:\r
        /*\r
         * A private member function taking no argument and returning a result\r

diff --git a/inc/MfTopLevelFolderFileListForm.h b/inc/MfTopLevelFolderFileListForm.h
index 7175eba..c19c595 100644 (file)
--- a/inc/MfTopLevelFolderFileListForm.h
+++ b/inc/MfTopLevelFolderFileListForm.h
@@ -106,6 +106,8 @@ public:
        virtual void OnSceneTransitionCompleted (const Tizen::Ui::Scenes::SceneId &previousSceneId, const Tizen::Ui::Scenes::SceneId &currentSceneId);\r
        virtual void OnSceneTransitionStarted (const Tizen::Ui::Scenes::SceneId &currentSceneId, const Tizen::Ui::Scenes::SceneId &nextSceneId);\r
 \r
+       void OnAppControlCompleted(void);\r
+\r
 private:\r
        /*\r
         * A private member function taking and returning no arguments.\r

diff --git a/inc/MfTypes.h b/inc/MfTypes.h
index 268feaa..c1fc22f 100644 (file)
--- a/inc/MfTypes.h
+++ b/inc/MfTypes.h
@@ -241,6 +241,10 @@ extern const wchar_t* IDB_RENAME_OUTER_CIRCLE;
 extern const wchar_t* IDB_RENAME_PRESSED_CIRCLE;
 extern const wchar_t* IDB_RENAME;
 
+//System Date/Time Formats
+extern const wchar_t* IDB_DATETIME_24HR;
+extern const wchar_t* IDB_DATETIME_12HR;
+
 //Fonts
 extern const int ID_FONT_SIZE_44;
 extern const int ID_FONT_SIZE_40;
@@ -300,6 +304,15 @@ enum ViewType
        VIEW_TYPE_AS_MAX /*!< Enum value VIEW_AS_MAX. */
 };
 
+//!Enumerator containing the TimeFormat: 12 Hour or 24 Hour.
+enum TimeFormat
+{
+       TIME_FORMAT_NONE = -1, /*!< Enum value TIME_FORMAT_NONE. */
+       TIME_FORMAT_24_HOUR = 0, /*!< Enum value TIME_FORMAT_24_HOUR. */
+       TIME_FORMAT_12_HOUR, /*!< Enum value TIME_FORMAT_12_HOUR. */
+       TIME_FORMAT_MAX /*!< Enum value TIME_FORMAT_MAX. */
+};
+
 //!Enumerator containing the SortBy Types.
 enum ShareVia
 {

diff --git a/manifest.xml b/manifest.xml
index de28656..1e30fbc 100755 (executable)
--- a/manifest.xml
+++ b/manifest.xml
@@ -4,134 +4,91 @@
     <Version>1.0.0</Version>
     <Type>C++App</Type>
     <Author/>
-    <Descriptions>
-        <Description Locale="eng-PH"/>
-        <Description Locale="zho-SG"/>
-        <Description Locale="kat-GE"/>
-        <Description Locale="est-EE"/>
-        <Description Locale="ukr-UA"/>
-        <Description Locale="srp-RS"/>
-        <Description Locale="hrv-HR"/>
-        <Description Locale="ell-GR"/>
-        <Description Locale="isl-IS"/>
-        <Description Locale="glg-ES"/>
-        <Description Locale="lit-LT"/>
-        <Description Locale="aze-AZ"/>
-        <Description Locale="eng-US"/>
-        <Description Locale="mkd-MK"/>
-        <Description Locale="zho-HK"/>
-        <Description Locale="slk-SK"/>
-        <Description Locale="hun-HU"/>
-        <Description Locale="hye-AM"/>
-        <Description Locale="ces-CZ"/>
-        <Description Locale="fin-FI"/>
-        <Description Locale="ara-AE"/>
-        <Description Locale="ita-IT"/>
-        <Description Locale="eus-ES"/>
-        <Description Locale="tur-TR"/>
-        <Description Locale="rus-RU"/>
-        <Description Locale="cat-ES"/>
-        <Description Locale="kaz-KZ"/>
-        <Description Locale="deu-DE"/>
-        <Description Locale="zho-CN"/>
-        <Description Locale="por-PT"/>
-        <Description Locale="slv-SI"/>
-        <Description Locale="fra-FR"/>
-        <Description Locale="ron-RO"/>
-        <Description Locale="hin-IN"/>
-        <Description Locale="fra-CA"/>
-        <Description Locale="spa-ES"/>
-        <Description Locale="nld-NL"/>
-        <Description Locale="dan-DK"/>
-        <Description Locale="por-BR"/>
-        <Description Locale="bul-BG"/>
-        <Description Locale="zho-TW"/>
-        <Description Locale="jpn-JP"/>
-        <Description Locale="swe-SE"/>
-        <Description Locale="kor-KR"/>
-        <Description Locale="spa-US"/>
-        <Description Locale="uzb-UZ"/>
-        <Description Locale="nob-NO"/>
-        <Description Locale="pol-PL"/>
-        <Description Locale="gle-IE"/>
-        <Description Locale="lav-LV"/>
-        <Description Locale="eng-GB"/>
-    </Descriptions>
+    <Descriptions/>
     <Requirements>
         <Feature Name="http://tizen.org/feature/platform.core.cpu.arch">x86</Feature>
-        <Feature Name="http://tizen.org/feature/platform.core.fpu.arch">vfpv3</Feature>
     </Requirements>
     <Apps>
         <ApiVersion>2.0</ApiVersion>
         <Privileges>
             <Privilege>http://tizen.org/privilege/alarm</Privilege>
+            <Privilege>http://tizen.org/privilege/application.launch</Privilege>
             <Privilege>http://tizen.org/privilege/notification</Privilege>
             <Privilege>http://tizen.org/privilege/content.write</Privilege>
             <Privilege>http://tizen.org/privilege/setting</Privilege>
             <Privilege>http://tizen.org/privilege/packageinfo</Privilege>
             <Privilege>http://tizen.org/privilege/packagemanager.install</Privilege>
-            <Privilege>http://tizen.org/privilege/application.launch</Privilege>
         </Privileges>
         <UiApp Main="True" MenuIconVisible="True" Name="MyFiles" SubMode="True">
             <UiScalability BaseScreenSize="Normal" CoordinateSystem="Logical" LogicalCoordinate="720"/>
             <UiTheme SystemTheme="White"/>
             <DisplayNames>
-                <DisplayName Locale="eng-PH">My Files</DisplayName>
-                <DisplayName Locale="zho-SG">我的文件</DisplayName>
-                <DisplayName Locale="kat-GE">ჩემი ფაილები</DisplayName>
-                <DisplayName Locale="est-EE">Minu Failid</DisplayName>
-                <DisplayName Locale="ukr-UA">Мої файли</DisplayName>
-                <DisplayName Locale="srp-RS">Moji fajlovi</DisplayName>
-                <DisplayName Locale="hrv-HR">Moje datoteke</DisplayName>
-                <DisplayName Locale="ell-GR">Τα Αρχεία Μου</DisplayName>
-                <DisplayName Locale="isl-IS">Skrárnar mínar</DisplayName>
-                <DisplayName Locale="glg-ES">Os Meus Arquivos</DisplayName>
-                <DisplayName Locale="lit-LT">Mano failai</DisplayName>
-                <DisplayName Locale="aze-AZ">Mənim fayllarım</DisplayName>
-                <DisplayName Locale="eng-US">My Files</DisplayName>
-                <DisplayName Locale="mkd-MK">Мои фајлови</DisplayName>
-                <DisplayName Locale="zho-HK">我的檔案</DisplayName>
-                <DisplayName Locale="hye-AM">Իմ Ֆայլերը</DisplayName>
-                <DisplayName Locale="hun-HU">Saját fájlok</DisplayName>
-                <DisplayName Locale="slk-SK">Moje súbory</DisplayName>
-                <DisplayName Locale="ces-CZ">Moje soubory</DisplayName>
-                <DisplayName Locale="fin-FI">Omat tiedostot</DisplayName>
-                <DisplayName Locale="ara-AE">ملفاتي</DisplayName>
-                <DisplayName Locale="eus-ES">Nire Fitxategiak</DisplayName>
-                <DisplayName Locale="ita-IT">Archivio</DisplayName>
-                <DisplayName Locale="tur-TR">Dosyalarım</DisplayName>
-                <DisplayName Locale="rus-RU">Мои файлы</DisplayName>
-                <DisplayName Locale="cat-ES">Els meus fitxers</DisplayName>
-                <DisplayName Locale="kaz-KZ">Менің файлдарым</DisplayName>
-                <DisplayName Locale="deu-DE">Eigene Dateien</DisplayName>
-                <DisplayName Locale="zho-CN">我的文件</DisplayName>
-                <DisplayName Locale="por-PT">Os Meus Ficheiros</DisplayName>
-                <DisplayName Locale="slv-SI">Moje datoteke</DisplayName>
-                <DisplayName Locale="fra-FR">Mes fichiers</DisplayName>
-                <DisplayName Locale="ron-RO">Fişierele mele</DisplayName>
-                <DisplayName Locale="hin-IN">मेरी फाइलें</DisplayName>
-                <DisplayName Locale="fra-CA">Mes fichiers</DisplayName>
-                <DisplayName Locale="spa-ES">Mis archivos</DisplayName>
-                <DisplayName Locale="nld-NL">Mijn bestanden</DisplayName>
-                <DisplayName Locale="dan-DK">Mine filer</DisplayName>
-                <DisplayName Locale="por-BR">Meus Arquivos</DisplayName>
-                <DisplayName Locale="bul-BG">Моите файлове</DisplayName>
-                <DisplayName Locale="zho-TW">我的檔案</DisplayName>
-                <DisplayName Locale="jpn-JP">マイファイル</DisplayName>
-                <DisplayName Locale="swe-SE">Mina filer</DisplayName>
-                <DisplayName Locale="kor-KR">내 파일</DisplayName>
-                <DisplayName Locale="spa-US">Mis Archivos</DisplayName>
-                <DisplayName Locale="uzb-UZ">Mening fayllarim</DisplayName>
-                <DisplayName Locale="nob-NO">Mine Filer</DisplayName>
-                <DisplayName Locale="pol-PL">Moje pliki</DisplayName>
-                <DisplayName Locale="gle-IE">Mo Chomhaid</DisplayName>
-                <DisplayName Locale="eng-GB">My Files</DisplayName>
-                <DisplayName Locale="lav-LV">Mani faili</DisplayName>
+                <DisplayName Locale="eng-PH">My Files-Ref</DisplayName>
+                <DisplayName Locale="zho-SG">我的文件-Ref</DisplayName>
+                <DisplayName Locale="kat-GE">ჩემი ფაილები-Ref</DisplayName>
+                <DisplayName Locale="est-EE">Minu Failid-Ref</DisplayName>
+                <DisplayName Locale="ukr-UA">Мої файли-Ref</DisplayName>
+                <DisplayName Locale="srp-RS">Moji fajlovi-Ref</DisplayName>
+                <DisplayName Locale="hrv-HR">Moje datoteke-Ref</DisplayName>
+                <DisplayName Locale="ell-GR">Τα Αρχεία Μου-Ref</DisplayName>
+                <DisplayName Locale="isl-IS">Skrárnar mínar-Ref</DisplayName>
+                <DisplayName Locale="glg-ES">Os Meus Arquivos-Ref</DisplayName>
+                <DisplayName Locale="lit-LT">Mano failai-Ref</DisplayName>
+                <DisplayName Locale="aze-AZ">Mənim fayllarım-Ref</DisplayName>
+                <DisplayName Locale="eng-US">My Files-Ref</DisplayName>
+                <DisplayName Locale="mkd-MK">Мои фајлови-Ref</DisplayName>
+                <DisplayName Locale="zho-HK">我的檔案-Ref</DisplayName>
+                <DisplayName Locale="hye-AM">Իմ Ֆայլերը-Ref</DisplayName>
+                <DisplayName Locale="hun-HU">Saját fájlok-Ref</DisplayName>
+                <DisplayName Locale="slk-SK">Moje súbory-Ref</DisplayName>
+                <DisplayName Locale="ces-CZ">Moje soubory-Ref</DisplayName>
+                <DisplayName Locale="fin-FI">Omat tiedostot-Ref</DisplayName>
+                <DisplayName Locale="ara-AE">ملفاتي-Ref</DisplayName>
+                <DisplayName Locale="eus-ES">Nire Fitxategiak-Ref</DisplayName>
+                <DisplayName Locale="ita-IT">Archivio-Ref</DisplayName>
+                <DisplayName Locale="tur-TR">Dosyalarım-Ref</DisplayName>
+                <DisplayName Locale="rus-RU">Мои файлы-Ref</DisplayName>
+                <DisplayName Locale="cat-ES">Els meus fitxers-Ref</DisplayName>
+                <DisplayName Locale="kaz-KZ">Менің файлдарым-Ref</DisplayName>
+                <DisplayName Locale="deu-DE">Eigene Dateien-Ref</DisplayName>
+                <DisplayName Locale="zho-CN">我的文件-Ref</DisplayName>
+                <DisplayName Locale="por-PT">Os Meus Ficheiros-Ref</DisplayName>
+                <DisplayName Locale="slv-SI">Moje datoteke-Ref</DisplayName>
+                <DisplayName Locale="fra-FR">Mes fichiers-Ref</DisplayName>
+                <DisplayName Locale="ron-RO">Fişierele mele-Ref</DisplayName>
+                <DisplayName Locale="hin-IN">मेरी फाइलें-Ref</DisplayName>
+                <DisplayName Locale="fra-CA">Mes fichiers-Ref</DisplayName>
+                <DisplayName Locale="spa-ES">Mis archivos-Ref</DisplayName>
+                <DisplayName Locale="nld-NL">Mijn bestanden-Ref</DisplayName>
+                <DisplayName Locale="dan-DK">Mine filer-Ref</DisplayName>
+                <DisplayName Locale="por-BR">Meus Arquivos-Ref</DisplayName>
+                <DisplayName Locale="bul-BG">Моите файлове-Ref</DisplayName>
+                <DisplayName Locale="zho-TW">我的檔案-Ref</DisplayName>
+                <DisplayName Locale="jpn-JP">マイファイル-Ref</DisplayName>
+                <DisplayName Locale="swe-SE">Mina filer-Ref</DisplayName>
+                <DisplayName Locale="kor-KR">내 파일-Ref</DisplayName>
+                <DisplayName Locale="spa-US">Mis Archivos-Ref</DisplayName>
+                <DisplayName Locale="uzb-UZ">Mening fayllarim-Ref</DisplayName>
+                <DisplayName Locale="nob-NO">Mine Filer-Ref</DisplayName>
+                <DisplayName Locale="pol-PL">Moje pliki-Ref</DisplayName>
+                <DisplayName Locale="gle-IE">Mo Chomhaid-Ref</DisplayName>
+                <DisplayName Locale="eng-GB">My Files-Ref</DisplayName>
+                <DisplayName Locale="lav-LV">Mani faili-Ref</DisplayName>
             </DisplayNames>
             <Icons>
-                <Icon Section="MainMenu" Type="Xhigh">mainmenu.png</Icon>
-                <Icon Section="MainMenu" Type="High">mainmenu.png</Icon>
+                <Icon Section="MainMenu">mainmenu.png</Icon>
             </Icons>
+            <AppControls>
+               <AppControl>
+                   <Capability OperationId="http://tizen.org/appcontrol/operation/pick">
+                        <Resolution MimeType="*/*"/>
+                                               <Resolution MimeType="image/*"/>
+                                               <Resolution MimeType="audio/*"/>
+                        <Resolution MimeType="video/*"/>
+                                               <Resolution MimeType ="inode/directory"/>
+                                 </Capability>
+               </AppControl>
+            </AppControls>
             <LaunchConditions/>
             <Notifications>
                 <Notification Name="Ticker">On</Notification>

diff --git a/src/MfBaseForm.cpp b/src/MfBaseForm.cpp
index 8d213f3..2cb40e4 100644 (file)
--- a/src/MfBaseForm.cpp
+++ b/src/MfBaseForm.cpp
@@ -214,3 +214,9 @@ void BaseForm::OnAppControlCompleted(void)
 {
        //Empty implementation, derived class will override it
 }
+
+void
+BaseForm::OnSettingValueChanged(void)
+{
+       //empty Implementation
+}

diff --git a/src/MfCategorySearch.cpp b/src/MfCategorySearch.cpp
index b74e5ba..5e50e56 100644 (file)
--- a/src/MfCategorySearch.cpp
+++ b/src/MfCategorySearch.cpp
@@ -273,7 +273,8 @@ CategorySearch::OnListViewItemStateChanged(Tizen::Ui::Controls::ListView& listVi
 
                GetFileName(&fullPath);
                pArgs->Add(fullPath);
-               r = pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SUB_DIRECTORY_FORM, SCENE_TRANSITION_ANIMATION_TYPE_RIGHT), pArgs);
+               r = pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SUB_DIRECTORY_FORM, SCENE_TRANSITION_ANIMATION_TYPE_RIGHT, SCENE_HISTORY_OPTION_NO_HISTORY, SCENE_DESTROY_OPTION_DESTROY), pArgs);
+
                return;
        }
 

diff --git a/src/MfContentListItem.cpp b/src/MfContentListItem.cpp
index 3f975fc..b4665bc 100644 (file)
--- a/src/MfContentListItem.cpp
+++ b/src/MfContentListItem.cpp
@@ -476,7 +476,7 @@ ContentListItem::CreateFormatRectangleForDetailedList(int itemHeight, int textHe
        //Date\r
        int x_CreationDate = width / 2 - X_LISTVIEW; //(3 * X_DETAILEDLIST_COMMON_OFFSET) + thumbnailWidth + w_Description;//x_Title;\r
        int y_CreationDate = h_Title + X_LISTVIEW;\r
-       int w_CreationDate = (width / 2);\r
+       int w_CreationDate = (width / 2) + 2;\r
        int h_CreationDate = H_LISTVIEW_ITEM_DESCRIPTION;\r
 \r
        //Rename\r

diff --git a/src/MfMyFilesApp.cpp b/src/MfMyFilesApp.cpp
index d9730c2..f1efd2e 100644 (file)
--- a/src/MfMyFilesApp.cpp
+++ b/src/MfMyFilesApp.cpp
@@ -673,10 +673,18 @@ MyFilesApp::InitializeListeners(void)
 void
 MyFilesApp::OnSettingChanged(Tizen::Base::String& key)
 {
+       AppLogDebug("SettingChanged:%S", key.GetPointer());
+       AppRegistry* pAppRegistry = null;
+       result r = E_SUCCESS;
+
        String languageSettingKey = L"http://tizen.org/setting/locale.language";
        String languageSelected;
 
-       AppLogDebug("SettingChanged++");
+       String timeFormatKeyName(L"TimeFormat");
+       String timeFormatSettingSelected;
+       String timeFormatSettingKey = L"http://tizen.org/setting/locale.date_time.format";
+       TimeFormat timeFormatSelected = TIME_FORMAT_NONE;
+
        if ( key.CompareTo(languageSettingKey) == 0 )
        {
                SettingInfo::GetValue(languageSettingKey, languageSelected);
@@ -686,6 +694,26 @@ MyFilesApp::OnSettingChanged(Tizen::Base::String& key)
                        Application::Terminate();
                }
        }
+       else if (key.CompareTo(timeFormatSettingKey) == 0)
+       {
+               SettingInfo::GetValue(timeFormatSettingKey, timeFormatSettingSelected);
+               pAppRegistry = UiApp::App::GetInstance()->GetAppRegistry();
+
+               if (timeFormatSettingSelected.CompareTo(IDB_DATETIME_24HR) == 0)
+               {
+                       timeFormatSelected = TIME_FORMAT_24_HOUR;
+               }
+               else if (timeFormatSettingSelected.CompareTo(IDB_DATETIME_12HR) == 0)
+               {
+                       timeFormatSelected = TIME_FORMAT_12_HOUR;
+               }
+               r = pAppRegistry->Set(timeFormatKeyName, timeFormatSelected);
+               if (r == E_SUCCESS)
+               {
+                       r = pAppRegistry->Save();
+               }
+               __pCurrentListToUpdate->OnSettingValueChanged();
+       }
        AppLogDebug("SettingChanged--");
 }
 bool

diff --git a/src/MfSubBaseFileManageForm.cpp b/src/MfSubBaseFileManageForm.cpp
index c1633d4..b1be136 100644 (file)
--- a/src/MfSubBaseFileManageForm.cpp
+++ b/src/MfSubBaseFileManageForm.cpp
@@ -969,7 +969,6 @@ SubBaseFileManageForm::ShareFile(ShareVia shareType)
        AppControl* pAc = null;
        const String* pAttachKey = null;
        const String* pUriType = null;
-       //const HashMap* pResultHash = null;
        result r = E_SUCCESS;
 
        HashMap dataList;
@@ -977,6 +976,9 @@ SubBaseFileManageForm::ShareFile(ShareVia shareType)
        MessageBox messageBox;
        int modalResult = 0;
 
+       //Disable the form to avoid any more clicks, if the share button is already clicked
+       SetEnabled(false);
+
        dataList.Construct();
        pAttachKey = new (std::nothrow) const String(L"http://tizen.org/appcontrol/data/path");
 
@@ -1001,7 +1003,6 @@ SubBaseFileManageForm::ShareFile(ShareVia shareType)
        }
        break;
        }
-       //pResultHash = FolderEntryEditorPresentationModel::GetInstance()->GetCheckedList();
 
        if (_pFileManager != null && _pFileManager->IsCheckedListNull() == false)
        {
@@ -1047,6 +1048,7 @@ SubBaseFileManageForm::ShareFile(ShareVia shareType)
                //to avoid any file modification event
                if ( r == E_SUCCESS)
                {
+                       ((MyFilesApp*) Application::GetInstance())->SetAppControlLaunched(true);
                        if(_pFileEventManager != null)
                        {
                                _pFileEventManager->RemovePath(FolderNavigationPresentationModel::GetCurrentPath());
@@ -1824,7 +1826,9 @@ void
 SubBaseFileManageForm::OnAppControlCompleted(void)
 {
        AppLogDebug("SubBaseFileManageForm::OnAppControlCompleted");
-       //On coming back from Email/Message appcontrol, register the FileEvent Listener back
+       //On coming back from Email/Message appcontrol, Enable the Form and
+       //register the FileEvent Listener back
+       SetEnabled(true);
        if(_pFileEventManager == null)
        {
                _pFileEventManager = new (std::nothrow)FileEventManager();
@@ -1832,3 +1836,9 @@ SubBaseFileManageForm::OnAppControlCompleted(void)
        }
        _pFileEventManager->AddPath(FolderNavigationPresentationModel::GetCurrentPath(), FILE_EVENT_TYPE_DELETE | FILE_EVENT_TYPE_MOVE_SELF);
 }
+
+void
+SubBaseFileManageForm::OnSettingValueChanged(void)
+{
+       //Empty Implementation.
+}

diff --git a/src/MfSubBaseFolderEntryForm.cpp b/src/MfSubBaseFolderEntryForm.cpp
index 52c32fd..16b5626 100644 (file)
--- a/src/MfSubBaseFolderEntryForm.cpp
+++ b/src/MfSubBaseFolderEntryForm.cpp
@@ -1448,15 +1448,22 @@ SubBaseFolderEntryForm::SetNextDisplayPath(void)
                else
                {
                        tokenizer.GetNextToken(token);
-                       //dislayPath.Append(L"/");
+                       //displayPath.Append(L"\x200E");
                        displayPath.Append(token);
                        displayPath.Append(L"/");
+
                }
        }
 
        if (_pLabelDisplayPath != null)
        {
+
+               //_displayPath.Append(L"\x200E");
                _displayPath.Append(displayPath);
+               _displayPath.Append(L"\x200E");
+
+               AppLogDebug("SubBaseFolderEntryForm::SetNextDisplayPath:%S", _displayPath.GetPointer());
+
                _pLabelDisplayPath->SetText(_displayPath);
                _pLabelDisplayPath->Invalidate(true);
        }
@@ -2392,3 +2399,18 @@ SubBaseFolderEntryForm::OnSceneIdChanged(const Tizen::Ui::Scenes::SceneId&       curre
                }
        }
 }
+
+void
+SubBaseFolderEntryForm::OnSettingValueChanged(void)
+{
+       AppLogDebug("Entry");
+       if (_pListView != null && _pListView->IsVisible())
+       {
+               _pListView->UpdateList();
+       }
+
+       if (_pIconListView != null && _pIconListView->IsVisible())
+       {
+               _pIconListView->UpdateList();
+       }
+}

diff --git a/src/MfSubBaseMoveCopy.cpp b/src/MfSubBaseMoveCopy.cpp
index 6d1b98b..4b15497 100644 (file)
--- a/src/MfSubBaseMoveCopy.cpp
+++ b/src/MfSubBaseMoveCopy.cpp
@@ -975,7 +975,7 @@ SubBaseMoveCopy::OnNotificationReceived(ArrayList* pArgs)
                DeviceManager::GetState(DEVICE_TYPE_STORAGE_CARD,tempDeviceState);
                if(tempDeviceState == sdCardStatusUnmounted && deviceState == sdCardStatusMounted)
                {
-                       SceneManager::GetInstance()->GoForward(ForwardSceneTransition(IDSCN_ROOT_DIRECTORY_FORM, SCENE_TRANSITION_ANIMATION_TYPE_RIGHT, SCENE_HISTORY_OPTION_NO_HISTORY, SCENE_DESTROY_OPTION_DESTROY), null);
+                       SceneManager::GetInstance()->GoForward(ForwardSceneTransition(IDSCN_TOP_LEVEL_DIRECTORY_FORM, SCENE_TRANSITION_ANIMATION_TYPE_RIGHT, SCENE_HISTORY_OPTION_NO_HISTORY, SCENE_DESTROY_OPTION_DESTROY), null);
                }
                else
                {
@@ -1007,7 +1007,7 @@ SubBaseMoveCopy::OnNotificationReceived(ArrayList* pArgs)
                AppLogDebug("old device %ls",deviceState.GetPointer());
                if(tempDeviceState == sdCardStatusUnmounted && deviceState == sdCardStatusMounted)
                {
-                       SceneManager::GetInstance()->GoForward(ForwardSceneTransition(IDSCN_ROOT_DIRECTORY_FORM, SCENE_TRANSITION_ANIMATION_TYPE_RIGHT, SCENE_HISTORY_OPTION_NO_HISTORY, SCENE_DESTROY_OPTION_DESTROY), null);
+                       SceneManager::GetInstance()->GoForward(ForwardSceneTransition(IDSCN_TOP_LEVEL_DIRECTORY_FORM, SCENE_TRANSITION_ANIMATION_TYPE_RIGHT, SCENE_HISTORY_OPTION_NO_HISTORY, SCENE_DESTROY_OPTION_DESTROY), null);
                }
                else
                {
@@ -1078,7 +1078,7 @@ SubBaseMoveCopy::LoadDirectoryForm(void)
 
        if (_moveCopySource == MOVE_COPY_SOURCE_TOP_MOST)
        {
-               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_ROOT_DIRECTORY_FORM, SCENE_TRANSITION_ANIMATION_TYPE_LEFT, SCENE_HISTORY_OPTION_NO_HISTORY, SCENE_DESTROY_OPTION_DESTROY), null);
+               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_TOP_LEVEL_DIRECTORY_FORM, SCENE_TRANSITION_ANIMATION_TYPE_LEFT, SCENE_HISTORY_OPTION_NO_HISTORY, SCENE_DESTROY_OPTION_DESTROY), null);
        }
        else
        {

diff --git a/src/MfSubBaseSelectionForm.cpp b/src/MfSubBaseSelectionForm.cpp
index 4661236..c5fd8f3 100644 (file)
--- a/src/MfSubBaseSelectionForm.cpp
+++ b/src/MfSubBaseSelectionForm.cpp
@@ -949,3 +949,9 @@ SubBaseSelection::OnTelephonyCallStatusChangedN     (CallStatus     callStatus, CallInfo
        AppLogDebug("SubBaseSelection::OnTelephonyCallStatusChangedN");
        _pListView->UpdateList();
 }
+
+void
+SubBaseSelection::OnSettingValueChanged(void)
+{
+       //Empty Implementation.
+}

diff --git a/src/MfSubFolderFileListForm.cpp b/src/MfSubFolderFileListForm.cpp
index 5067cc7..f0fb640 100644 (file)
--- a/src/MfSubFolderFileListForm.cpp
+++ b/src/MfSubFolderFileListForm.cpp
@@ -617,7 +617,7 @@ SubFolderFileListForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previ
        }
        return;
 
-       CATCH:
+CATCH:
        if (pArgs != null)
        {
                pArgs->RemoveAll(false);
@@ -965,7 +965,7 @@ SubFolderFileListForm::ShowParentDirectoryView(void)
                //AddPath to add FileEventListener for Parent Directory Path
                if(_pFileEventManager != null)
                {
-                       _pFileEventManager->AddPath(__currentDirectoryPath, FILE_EVENT_TYPE_CREATE | FILE_EVENT_TYPE_MOVED_FROM | FILE_EVENT_TYPE_MOVED_TO | FILE_EVENT_TYPE_DELETE );
+                       _pFileEventManager->AddPath(__currentDirectoryPath, FILE_EVENT_TYPE_CREATE | FILE_EVENT_TYPE_MOVED_FROM | FILE_EVENT_TYPE_MOVED_TO | FILE_EVENT_TYPE_DELETE | FILE_EVENT_TYPE_MOVE_SELF);
                }
 
                FolderNavigationPresentationModel::SetCurrentFilePath(__currentDirectoryPath);
@@ -1065,14 +1065,24 @@ SubFolderFileListForm::OnNotificationReceived(Tizen::Base::Collection::ArrayList
        _pFolderEntryPM->RefreshFolderEntries();                        
        _pFolderEntryPM->InitThumbnailManager();                        //for thumbnail issues/disappering images/defulat images etc...
 
+       if (_pFolderEntryPM->GetFolderEntryList()->GetCount() == 0)
+       {
+               _bIsDirectoryEmpty = true;
+       }
+       else
+       {
+               _bIsDirectoryEmpty = false;
+       }
+
+       _pListView->UpdateList();
        SetFooterVisibility();
+
 CATCH:
        if (pArgs != null)
        {
                pArgs->RemoveAll(true);
                delete pArgs;
        }
-       ///return this;
 }
 
 void
@@ -1342,7 +1352,7 @@ SubFolderFileListForm::OnSceneTransitionCompleted (const Tizen::Ui::Scenes::Scen
        _pFileEventManager = new (std::nothrow)FileEventManager();
        _pFileEventManager->Construct(*this);
 
-       _pFileEventManager->AddPath(__currentDirectoryPath, FILE_EVENT_TYPE_CREATE | FILE_EVENT_TYPE_MOVED_FROM | FILE_EVENT_TYPE_MOVED_TO | FILE_EVENT_TYPE_DELETE );
+       _pFileEventManager->AddPath(__currentDirectoryPath, FILE_EVENT_TYPE_CREATE | FILE_EVENT_TYPE_MOVED_FROM | FILE_EVENT_TYPE_MOVED_TO | FILE_EVENT_TYPE_DELETE | FILE_EVENT_TYPE_MOVE_SELF);
 
        _pFolderEntryPM->GetFolderEntryCount(FolderNavigationPresentationModel::GetCurrentPath(),folderCount, fileCount);
 
@@ -1525,6 +1535,11 @@ SubFolderFileListForm::OnFileEventOccured(const unsigned long events,const Tizen
                        _pFolderEntryPM->InitThumbnailManager();
                }
        }
+       else if (events & FILE_EVENT_TYPE_MOVE_SELF)
+       {
+               FolderNavigationPresentationModel::SetCurrentFilePath(FolderNavigationPresentationModel::GetParentPath());
+               SceneManager::GetInstance()->GoBackward(BackwardSceneTransition());
+       }
 
        _indexTracker = -1;
        AppLogDebug("OnFileEventOccured: Exit");

diff --git a/src/MfSubFolderMoveCopy.cpp b/src/MfSubFolderMoveCopy.cpp
index 838a093..8db2410 100644 (file)
--- a/src/MfSubFolderMoveCopy.cpp
+++ b/src/MfSubFolderMoveCopy.cpp
@@ -1307,7 +1307,7 @@ SubFolderMoveCopy::OnNotificationReceived(ArrayList* pArgs)
                DeviceManager::GetState(DEVICE_TYPE_STORAGE_CARD,tempDeviceState);
                if(tempDeviceState == sdCardStatusUnmounted && deviceState == sdCardStatusMounted)
                {
-                       SceneManager::GetInstance()->GoForward(ForwardSceneTransition(IDSCN_ROOT_DIRECTORY_FORM, SCENE_TRANSITION_ANIMATION_TYPE_RIGHT, SCENE_HISTORY_OPTION_NO_HISTORY, SCENE_DESTROY_OPTION_DESTROY), null);
+                       SceneManager::GetInstance()->GoForward(ForwardSceneTransition(IDSCN_TOP_LEVEL_DIRECTORY_FORM, SCENE_TRANSITION_ANIMATION_TYPE_RIGHT, SCENE_HISTORY_OPTION_NO_HISTORY, SCENE_DESTROY_OPTION_DESTROY), null);
                }
                else
                {
@@ -1339,7 +1339,7 @@ SubFolderMoveCopy::OnNotificationReceived(ArrayList* pArgs)
                AppLogDebug("old device %ls",deviceState.GetPointer());
                if(tempDeviceState == sdCardStatusUnmounted && deviceState == sdCardStatusMounted)
                {
-                       SceneManager::GetInstance()->GoForward(ForwardSceneTransition(IDSCN_ROOT_DIRECTORY_FORM, SCENE_TRANSITION_ANIMATION_TYPE_RIGHT, SCENE_HISTORY_OPTION_NO_HISTORY, SCENE_DESTROY_OPTION_DESTROY), null);
+                       SceneManager::GetInstance()->GoForward(ForwardSceneTransition(IDSCN_TOP_LEVEL_DIRECTORY_FORM, SCENE_TRANSITION_ANIMATION_TYPE_RIGHT, SCENE_HISTORY_OPTION_NO_HISTORY, SCENE_DESTROY_OPTION_DESTROY), null);
                }
                else
                {

diff --git a/src/MfSubFolderSelection.cpp b/src/MfSubFolderSelection.cpp
index dc693b1..47be9d5 100644 (file)
--- a/src/MfSubFolderSelection.cpp
+++ b/src/MfSubFolderSelection.cpp
@@ -952,9 +952,10 @@ SubFolderSelection::SetNextDisplayPath(void)
                else
                {
                        tokenizer.GetNextToken(token);
-                       //dislayPath.Append(L"/");
                        displayPath.Append(token);
+                       //displayPath.Append(L"\x200E");
                        displayPath.Append(L"/");
+                       //displayPath.Append(L"\x200E");
                }
        }
 

diff --git a/src/MfTopLevelFolderFileListForm.cpp b/src/MfTopLevelFolderFileListForm.cpp
index 3c18597..2876690 100644 (file)
--- a/src/MfTopLevelFolderFileListForm.cpp
+++ b/src/MfTopLevelFolderFileListForm.cpp
@@ -364,7 +364,6 @@ TopLevelFolderFileListForm::OnDeviceStateChanged(Tizen::System::DeviceType devic
        _pListView->UpdateList();
        _pIconListView->UpdateList();
 
-       //OnDeviceChange(currentDeviceType, state);
 }
 
 void
@@ -707,8 +706,16 @@ TopLevelFolderFileListForm::InitializeAppRegistry(void)
        String sortbyKeyName(L"SortBy");
        SortByType sortStyle = SORT_BY_TYPE_DATE_RECENT;
 
+       String timeFormatKeyName(L"TimeFormat");
+       String timeFormatSettingSelected;
+
+       String timeFormatSettingKey = L"http://tizen.org/setting/locale.date_time.format";
+       TimeFormat timeFormatSelected = TIME_FORMAT_NONE;
+
        pAppRegistry = UiApp::App::GetInstance()->GetAppRegistry();
 
+       SettingInfo::GetValue(timeFormatSettingKey, timeFormatSettingSelected);
+
        r = pAppRegistry->Add(viewStyleKeyName, viewStyle);
        if (r == E_SUCCESS)
        {
@@ -727,6 +734,20 @@ TopLevelFolderFileListForm::InitializeAppRegistry(void)
                r = pAppRegistry->Save();
        }
 
+       if (timeFormatSettingSelected.CompareTo(IDB_DATETIME_24HR) == 0)
+       {
+               timeFormatSelected = TIME_FORMAT_24_HOUR;
+       }
+       else if (timeFormatSettingSelected.CompareTo(IDB_DATETIME_12HR) == 0)
+       {
+               timeFormatSelected = TIME_FORMAT_12_HOUR;
+       }
+       r = pAppRegistry->Add(timeFormatKeyName, timeFormatSelected);
+
+       if (r == E_SUCCESS)
+       {
+               r = pAppRegistry->Save();
+       }
        AppLogDebug("EXIT: r = %s", GetErrorMessage(r));
 }
 
@@ -1033,3 +1054,10 @@ TopLevelFolderFileListForm::CreateCategoryPanel(void)
        delete pDocsPressed;
        delete pOthersPressed;
 }
+
+void
+TopLevelFolderFileListForm::OnAppControlCompleted(void)
+{
+       AppLogDebug("TopLevelFolderFileListForm::OnAppControlCompleted");
+       Invalidate(true);
+}

diff --git a/src/MfTypes.cpp b/src/MfTypes.cpp
index e0e75e0..81f2e06 100644 (file)
--- a/src/MfTypes.cpp
+++ b/src/MfTypes.cpp
@@ -239,6 +239,10 @@ const wchar_t* IDB_RENAME_OUTER_CIRCLE = L"00_btn_circle_bg_normal.png";
 const wchar_t* IDB_RENAME_PRESSED_CIRCLE = L"00_btn_circle_bg_press.png";
 const wchar_t* IDB_RENAME = L"00_button_rename_normal.png";
 
+//System Date/Time Formats
+const wchar_t* IDB_DATETIME_24HR = L"EEEE, d MMMM y HH:mm:ss";
+const wchar_t* IDB_DATETIME_12HR = L"EEEE, d MMMM y h:mm:ss a";
+
 //Fonts
 const int ID_FONT_SIZE_26 = 26;
 const int ID_FONT_SIZE_32 = 32;

diff --git a/src/MfUtility.cpp b/src/MfUtility.cpp
index 955a7d5..24c79f8 100644 (file)
--- a/src/MfUtility.cpp
+++ b/src/MfUtility.cpp
@@ -104,13 +104,28 @@ MfUtility::ConvertDateTimeToString(Tizen::Base::DateTime fileCreationTime)
        DateTime dirCreationTime;\r
        Locale locale(LANGUAGE_ENG, COUNTRY_US);\r
 \r
+       String timeFormatKeyName(L"TimeFormat");\r
+       int timeFormatSelected = TIME_FORMAT_NONE;\r
+       AppRegistry* pAppRegistry = null;\r
+\r
        dirCreationTime = fileCreationTime;\r
+       pAppRegistry = UiApp::App::GetInstance()->GetAppRegistry();\r
 \r
        pDateFormatter = DateTimeFormatter::CreateDateFormatterN(locale, DATE_TIME_STYLE_DEFAULT);\r
        TryCatch(pDateFormatter != null, dateAndTime.Append("Not Found"), "Failed to get date time formatter");\r
 \r
+       pAppRegistry->Get(timeFormatKeyName, timeFormatSelected);\r
+\r
        // Customized pattern\r
-       cutomizedPattern.Append(L"d MMM, yyyy HH:mm");\r
+       if (timeFormatSelected == TIME_FORMAT_24_HOUR)\r
+       {\r
+               cutomizedPattern.Append(L"d MMM, yyyy HH:mm");\r
+       }\r
+       else\r
+       {\r
+               cutomizedPattern.Append(L"d MMM, yyyy hh:mm a");\r
+       }\r
+\r
        pDateFormatter->ApplyPattern(cutomizedPattern);\r
 \r
        // Format creation time with date formatter\r