Removed the deprecated Menu and Back buuton api

Change-Id: I6a02dce8b5b94b3dd0af37d862bb050b998d0114
Signed-off-by: Himanshu <himanshu.t@samsung.com>

diff --git a/inc/GlFileListForm.h b/inc/GlFileListForm.h
index f98f7f8..e69a37a 100644 (file)
--- a/inc/GlFileListForm.h
+++ b/inc/GlFileListForm.h
@@ -57,13 +57,13 @@ public:
 
        virtual void OnFormMenuRequested (Tizen::Ui::Controls::Form &source);
 
-       void SetFooterState(bool state);
+       void SetMenuState(bool state);
 
 private:
        result InitializeFooter(void);
 
 private:
-       
+       bool __menuState;
        Tizen::Ui::Controls::OptionMenu* __pOptionMenu;
        SlideShowPopUp* __pPopUp;
        FileListPresentationModel* __pPresentationModel;

diff --git a/res/screen-size-normal/IDL_FORM_ALBUM_LIST.xml b/res/screen-size-normal/IDL_FORM_ALBUM_LIST.xml
index 484d1fa..b2f6b5e 100644 (file)
--- a/res/screen-size-normal/IDL_FORM_ALBUM_LIST.xml
+++ b/res/screen-size-normal/IDL_FORM_ALBUM_LIST.xml
@@ -3,8 +3,7 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-
-<Scene Bversion="2.0.0.201303182057" Dversion="20120315">
+<Scene Bversion="2.0.0.201306101756" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_FORM_ALBUM_LIST">
         <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
@@ -12,11 +11,11 @@
         <layout mode="Landscape" style="FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
     </Form>
     <Footer>
-        <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_ICON" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="true"/>
+        <property backgroundBitmapPath="" color="" colorOpacity="0" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_ICON" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="false" showOptionButton="false"/>
         <itemSet/>
     </Footer>
     <Header>
-        <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="0" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" titleIconPath="" titleText="" titleTextColor=""/>
+        <property accessibilityHint="" backgroundBitmapPath="" color="" colorOpacity="0" descriptionText="" descriptionTextColor="" disabledButtonColor="" disabledButtonColorOpacity="0" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="0" disabledItemTextColor="" headerStyle="HEADER_STYLE_TITLE" highlightedButtonColor="" highlightedButtonColorOpacity="0" highlightedButtonTextColor="" highlightedItemColor="" highlightedItemColorOpacity="0" highlightedItemTextColor="" normalButtonColor="" normalButtonColorOpacity="0" normalButtonTextColor="" normalItemColor="" normalItemColorOpacity="0" normalItemTextColor="" pressedButtonColor="" pressedButtonColorOpacity="0" pressedButtonTextColor="" pressedItemColor="" pressedItemColorOpacity="0" pressedItemTextColor="" selectedItemColor="" selectedItemColorOpacity="0" selectedItemTextColor="" showBackButton="false" titleIconPath="" titleText="" titleTextColor=""/>
         <itemSet/>
     </Header>
     <IconListView id="IDC_ICONLISTVIEW_ALBUM_LIST" parent="IDL_FORM_ALBUM_LIST">

diff --git a/res/screen-size-normal/IDL_FORM_SETTING_MAIN.xml b/res/screen-size-normal/IDL_FORM_SETTING_MAIN.xml
index 759e035..8f48b9a 100644 (file)
--- a/res/screen-size-normal/IDL_FORM_SETTING_MAIN.xml
+++ b/res/screen-size-normal/IDL_FORM_SETTING_MAIN.xml
@@ -3,7 +3,7 @@
        This XML file was automatically generated by UiBuilder - do not modify by hand.
 -->
 <!DOCTYPE Scene SYSTEM "UIForm.dtd">
-<Scene Bversion="2.0.0.201305311836" Dversion="20120315">
+<Scene Bversion="2.0.0.201306101756" Dversion="20120315">
     <LogicalCoordinate>720</LogicalCoordinate>
     <Form id="IDL_FORM_SETTING_MAIN">
         <property backgroundColor="" backgroundColorOpacity="100" notificationTrayOpenEnabled="false" orientation="Portrait" softKey0NormalIcon="" softKey0PressedIcon="" softKey0Text="" softKey1NormalIcon="" softKey1PressedIcon="" softKey1Text="" title="" titleAlign="ALIGN_CENTER" titleIcon="" translucentFooter="false" translucentHeader="false" translucentIndicator="false"/>
@@ -11,7 +11,7 @@
         <layout mode="Landscape" style="FORM_STYLE_INDICATOR|FORM_STYLE_HEADER|FORM_STYLE_FOOTER" type="LAYOUT_RELATIVE"/>
     </Form>
     <Footer>
-        <property backgroundBitmapPath="" color="" colorOpacity="100" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_TEXT" 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="" showBackButton="true"/>
+        <property backgroundBitmapPath="" color="" colorOpacity="100" disabledButtonColor="" disabledButtonColorOpacity="100" disabledButtonTextColor="" disabledItemColor="" disabledItemColorOpacity="100" disabledItemTextColor="" footerStyle="FOOTER_STYLE_BUTTON_TEXT" 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="" showBackButton="false" showOptionButton="false"/>
         <itemSet/>
     </Footer>
     <Header>

diff --git a/src/GlAlbumListForm.cpp b/src/GlAlbumListForm.cpp
index 143a193..7b543c4 100644 (file)
--- a/src/GlAlbumListForm.cpp
+++ b/src/GlAlbumListForm.cpp
@@ -157,14 +157,11 @@ AlbumListForm::InitializeFooter(void)
 
        if (__pPresentationModel->GetAppControlMode() == APPCONTROL_MODE_PICK)
        {
-               pFooter->SetBackButton();
                SetFormBackEventListener(this);
        }
        else
        {
                pFooter->SetStyle(FOOTER_STYLE_BUTTON_ICON);
-               pFooter->SetBackButton();
-               pFooter->SetMenuButton();
                pFooter->RemoveAllItems();
 
                FooterItem itemCamera;
@@ -416,15 +413,6 @@ AlbumListForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId&
        }
        __itemCount = __pPresentationModel->GetFolderCount();
 
-       if ( __itemCount == 0 )
-       {
-               GetFooter()->SetMenuButtonEnabled(false);
-       }
-       else
-       {
-               GetFooter()->SetMenuButtonEnabled(true);
-       }
-
        if (__pAlbumViewIconList != null)
        {
                __pAlbumViewIconList->UpdateList();
@@ -477,16 +465,6 @@ AlbumListForm::OnContentUpdated(void)
        __itemCount = __pPresentationModel->GetFolderCount();
        __pAlbumViewIconList->UpdateList();
 
-       if (__itemCount == 0 )
-       {
-               GetFooter()->SetMenuButtonEnabled(false);
-       }
-       else
-       {
-               GetFooter()->SetMenuButtonEnabled(true);
-       }
-
-       GetFooter()->Invalidate(true);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));
 }
 

diff --git a/src/GlAlbumNameEditorForm.cpp b/src/GlAlbumNameEditorForm.cpp
index a2e945e..4da5a0a 100644 (file)
--- a/src/GlAlbumNameEditorForm.cpp
+++ b/src/GlAlbumNameEditorForm.cpp
@@ -101,9 +101,6 @@ AlbumNameEditorForm::OnInitializing(void)
 
        pHeader->SetStyle(HEADER_STYLE_TITLE);
 
-       GetFooter()->SetBackButtonEnabled(true);
-       GetFooter()->SetBackButton();
-
        FooterItem itemSave;
        itemSave.Construct(IDA_BUTTON_CREATE_NAME_SAVE);
        itemSave.SetText(ResourceManager::GetString(L"IDS_COM_OPT_SAVE"));

diff --git a/src/GlAllListPanel.cpp b/src/GlAllListPanel.cpp
index a91d0e4..e7590a6 100644 (file)
--- a/src/GlAllListPanel.cpp
+++ b/src/GlAllListPanel.cpp
@@ -360,11 +360,11 @@ AllListPanel::OnSceneActivatedN(const SceneId& previousSceneId,
 
                        if( __itemCount == 0)
                        {
-                               pFileListForm->SetFooterState(false);
+                               pFileListForm->SetMenuState(false);
                        }
                        else
                        {
-                               pFileListForm->SetFooterState(true);
+                               pFileListForm->SetMenuState(true);
                        }
 
                }

diff --git a/src/GlFileListEditorForm.cpp b/src/GlFileListEditorForm.cpp
index 1236ea5..82c206f 100644 (file)
--- a/src/GlFileListEditorForm.cpp
+++ b/src/GlFileListEditorForm.cpp
@@ -170,14 +170,13 @@ FileListEditorForm::InitializeFooter(void)
                {
                        pFooter->SetStyle(FOOTER_STYLE_SEGMENTED_TEXT);
                }
-               pFooter->SetBackButton();
+
                SetFormBackEventListener(this);
 
        }
        else
        {
                pFooter->SetStyle(FOOTER_STYLE_BUTTON_ICON_TEXT);
-               pFooter->SetMenuButton();
                SetFormMenuEventListener(this);
 
                FooterItem footerShare;
@@ -214,7 +213,6 @@ FileListEditorForm::InitializeFooter(void)
                delete pBitmapDeleteDim;
                TryReturn(r == E_SUCCESS, r, "[%s] Unable to add item", GetErrorMessage(r));
 
-               pFooter->SetBackButton();
                SetFormBackEventListener(this);
 
                SceneManager* pSceneManager = SceneManager::GetInstance();
@@ -1053,13 +1051,11 @@ FileListEditorForm::SetFooterButtonsState(const bool enableState)
        {
                if (enableState == true)
                {
-                       pFooter->SetMenuButtonEnabled(true);
                        pFooter->SetItemEnabled(0, true);
                        pFooter->SetItemEnabled(1, true);
                }
                else
                {
-                       pFooter->SetMenuButtonEnabled(false);
                        pFooter->SetItemEnabled(0, false);
                        pFooter->SetItemEnabled(1, false);
                }

diff --git a/src/GlFileListForm.cpp b/src/GlFileListForm.cpp
index 0e96fae..b6f4fc1 100644 (file)
--- a/src/GlFileListForm.cpp
+++ b/src/GlFileListForm.cpp
@@ -39,7 +39,8 @@ using namespace Tizen::Ui::Scenes;
 using namespace Tizen::Content;
 
 FileListForm::FileListForm(void)
-       : __pOptionMenu(null)
+       : __menuState(true)
+       , __pOptionMenu(null)
        , __pPopUp(null)
        , __pPresentationModel(null)
 {
@@ -193,8 +194,6 @@ FileListForm::InitializeFooter(void)
 
        pFooter->RemoveAllItems();
        pFooter->SetStyle(FOOTER_STYLE_BUTTON_ICON);
-       pFooter->SetMenuButton();
-       pFooter->SetBackButton();
 
        FooterItem itemCamera;
        itemCamera.Construct(IDA_FOOTER_CAMERA);
@@ -294,24 +293,26 @@ FileListForm::OnSlideSettingPopUpItemSelected(int index)
 }
 
 void
-FileListForm::SetFooterState(bool state)
+FileListForm::SetMenuState(bool state)
 {
-       GetFooter()->SetMenuButtonEnabled(state);
-       GetFooter()->Invalidate(true);
+       __menuState = state;
 }
 
 void
 FileListForm::OnFormMenuRequested (Tizen::Ui::Controls::Form &source)
 {
 
-       InitializeFooter();
-
-       if ( __pOptionMenu == null )
+       if (__menuState == true )
        {
-               return ;
-       }
+               InitializeFooter();
 
-       __pOptionMenu->SetShowState(true);
-       __pOptionMenu->Show();
+               if ( __pOptionMenu == null )
+               {
+                       return ;
+               }
+
+               __pOptionMenu->SetShowState(true);
+               __pOptionMenu->Show();
+       }
 
 }

diff --git a/src/GlSettingMainForm.cpp b/src/GlSettingMainForm.cpp
index c25cdaf..51ae65f 100644 (file)
--- a/src/GlSettingMainForm.cpp
+++ b/src/GlSettingMainForm.cpp
@@ -90,13 +90,6 @@ SettingMainForm::OnInitializing(void)
                __pList->AddGroupedListViewItemEventListener(*this);
        }
 
-       Footer* pFooter = GetFooter();
-       if (pFooter)
-       {
-               AppLogDebug("setting back button");
-               pFooter->SetBackButtonEnabled(true);
-       }
-
        SetFormBackEventListener(this);
        AppLogDebug("EXIT(%s)", GetErrorMessage(GetLastResult()));