Remove Flight mode

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

diff --git a/inc/StMainMenuForm.h b/inc/StMainMenuForm.h
index 011673b..d82eee2 100644 (file)
--- a/inc/StMainMenuForm.h
+++ b/inc/StMainMenuForm.h
@@ -27,16 +27,16 @@
 #include <FSystem.h>
 #include "StBaseForm.h"
 
-class IFlightModeSetValueAsyncResultListener
-       : public Tizen::System::ISettingInfoSetValueAsyncResultListener
-{
-public:
-       IFlightModeSetValueAsyncResultListener(void){}
-       virtual ~IFlightModeSetValueAsyncResultListener(void){}
-
-private:
-       virtual void OnResultReceivedForSetValueAsync(const Tizen::Base::String& key, result r);
-};
+//class IFlightModeSetValueAsyncResultListener
+//     : public Tizen::System::ISettingInfoSetValueAsyncResultListener
+//{
+//public:
+//     IFlightModeSetValueAsyncResultListener(void){}
+//     virtual ~IFlightModeSetValueAsyncResultListener(void){}
+//
+//private:
+//     virtual void OnResultReceivedForSetValueAsync(const Tizen::Base::String& key, result r);
+//};
 
 class MainMenuForm
        : public BaseForm
@@ -88,7 +88,7 @@ private:
        Tizen::Base::String GetDownLoadAppIdKeyAt(unsigned int index);
        unsigned int GetDownLoadAppCount(void);
        void FindAppControlScene(int itemIndex);
-       void SetIFlightModeSetValueAsyncResultListener(void);
+//     void SetIFlightModeSetValueAsyncResultListener(void);
        Tizen::Base::String GetAppSettingIconPathFromAppIdListAt(Tizen::Base::String& id);
        const wchar_t* GroupConnectivitySceneConnect(int viewMode, int itemIndex, Tizen::Ui::Controls::TableViewItemStatus status);
        const wchar_t* GroupPersonalSceneConnect(int viewMode, int itemIndex, Tizen::Ui::Controls::TableViewItemStatus status);
@@ -100,7 +100,7 @@ private:
        Tizen::Base::Collection::IList* __pDownloadAppIdKeyList;
        Tizen::Base::Collection::HashMap* __pAppIdHashMap;
        Tizen::Base::Collection::HashMap* __pAppIconPathHashMap;
-       Tizen::System::ISettingInfoSetValueAsyncResultListener* __pFlightModeSetValueAsyncResultListener;
+//     Tizen::System::ISettingInfoSetValueAsyncResultListener* __pFlightModeSetValueAsyncResultListener;
 };
 
 #endif // _ST_MAIN_MENU_FORM_H_
\ No newline at end of file

diff --git a/src/StMainMenuForm.cpp b/src/StMainMenuForm.cpp
index 92679cd..f71c5bd 100644 (file)
--- a/src/StMainMenuForm.cpp
+++ b/src/StMainMenuForm.cpp
@@ -41,7 +41,7 @@ using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
 
-static const int W_RESIZE_LABEL_GAP = 110;
+//static const int W_RESIZE_LABEL_GAP = 110;
 
 static const int H_GROUP_FONT_SIZE_GIANT = 146;
 static const int H_GROUP_FONT_SIZE_HUGE = 128;
@@ -65,17 +65,13 @@ static const int ID_ITEM_CONNECTIVITY_NETWORK = 2;
 static const int ID_ITEM_CONNECTIVITY_NFC = 3;
 static const int ID_GROUP_CONNECTIVITY_ITEM_COUNT = 4;
 
-static const int ID_GROUP_MODE = 1;
-static const int ID_ITEM_MODE_FLIGHT_MODE = 0;
-static const int ID_GROUP_MODE_ITEM_COUNT = 1;
-
-static const int ID_GROUP_PERSONAL = 2;
+static const int ID_GROUP_PERSONAL = 1;
 static const int ID_ITEM_PERSONAL_HOME_SCREEN = 0;
 static const int ID_ITEM_PERSONAL_LOCK_SCREEN = 1;
 static const int ID_ITEM_PERSONAL_ACCOUNTS = 2;
 static const int ID_GROUP_PERSONAL_ITEM_COUNT = 3;
 
-static const int ID_GROUP_DEVICE = 3;
+static const int ID_GROUP_DEVICE = 2;
 static const int ID_ITEM_DEVICE_DISPLAY = 0;
 static const int ID_ITEM_DEVICE_SOUND = 1;
 static const int ID_ITEM_DEVICE_LOCATION = 2;
@@ -84,27 +80,27 @@ static const int ID_ITEM_DEVICE_DATE_TIME = 4;
 static const int ID_ITEM_DEVICE_LANGUAGE_KEYBOARD = 5;
 static const int ID_GROUP_DEVICE_ITEM_COUNT = 6;
 
-static const int ID_GROUP_SYSTEM = 4;
+static const int ID_GROUP_SYSTEM = 3;
 static const int ID_ITEM_SYSTEM_MANAGE_APPLICATION = 0;
 static const int ID_ITEM_SYSTEM_DEVELOPER_OPTION = 2;
 static const int ID_ITEM_SYSTEM_ABOUT_PHONE = 1;
 static const int ID_GROUP_SYSTEM_ITEM_COUNT = 2;
 
-static const int ID_GROUP_APPSETTING = 5;
-static const int ID_GROUP_NO_APPSETTING = 5;
+static const int ID_GROUP_APPSETTING = 4;
+static const int ID_GROUP_NO_APPSETTING = 4;
 static const int ID_MAIN_MENU_DEFAULT_COUNT = 1;
 
-void
-IFlightModeSetValueAsyncResultListener::OnResultReceivedForSetValueAsync(const Tizen::Base::String& key, result r)
-{
-       AppLogDebug("key(%ls) r(%s)", key.GetPointer(), GetErrorMessage(r));
-}
+//void
+//IFlightModeSetValueAsyncResultListener::OnResultReceivedForSetValueAsync(const Tizen::Base::String& key, result r)
+//{
+//     AppLogDebug("key(%ls) r(%s)", key.GetPointer(), GetErrorMessage(r));
+//}
 
 MainMenuForm::MainMenuForm(void)
        : __pDownloadAppIdKeyList(null)
        , __pAppIdHashMap(null)
        , __pAppIconPathHashMap(null)
-       , __pFlightModeSetValueAsyncResultListener(null)
+//     , __pFlightModeSetValueAsyncResultListener(null)
 {
 }
 
@@ -156,11 +152,11 @@ MainMenuForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneI
 
        __pTableView->UpdateTableView();
 
-       bool flightModeEnableStatus = false;
-       if (SettingInfo::GetValue(SETTING_INFO_KEY_NETWORK_FLIGHTMODE, flightModeEnableStatus) == E_SUCCESS)
-       {
-               __pTableView->SetItemChecked(ID_GROUP_MODE, ID_ITEM_MODE_FLIGHT_MODE, flightModeEnableStatus);
-       }
+//     bool flightModeEnableStatus = false;
+//     if (SettingInfo::GetValue(SETTING_INFO_KEY_NETWORK_FLIGHTMODE, flightModeEnableStatus) == E_SUCCESS)
+//     {
+//             __pTableView->SetItemChecked(ID_GROUP_MODE, ID_ITEM_MODE_FLIGHT_MODE, flightModeEnableStatus);
+//     }
 }
 
 void
@@ -195,11 +191,11 @@ MainMenuForm::GetItemCount(int groupIndex)
                }
                break;
 
-       case ID_GROUP_MODE:
-               {
-                       itemCount = ID_GROUP_MODE_ITEM_COUNT;
-               }
-               break;
+//     case ID_GROUP_MODE:
+//             {
+//                     itemCount = ID_GROUP_MODE_ITEM_COUNT;
+//             }
+//             break;
 
        case ID_GROUP_DEVICE:
                {
@@ -252,11 +248,11 @@ MainMenuForm::CreateGroupItem(int groupIndex, int itemWidth)
                }
                break;
 
-       case ID_GROUP_MODE:
-               {
-                       groupText = L"Mode";
-               }
-               break;
+//     case ID_GROUP_MODE:
+//             {
+//                     groupText = L"Mode";
+//             }
+//             break;
 
        case ID_GROUP_PERSONAL:
                {
@@ -399,14 +395,14 @@ MainMenuForm::CreateItem(int groupIndex, int itemIndex, int itemWidth)
                }
                break;
 
-       case ID_GROUP_MODE:
-               {
-                       style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
-                       itemRectLabel.width -= W_RESIZE_LABEL_GAP;
-                       pBitmap = ResourceManager::GetBitmapN(IDB_FLIGHT_MODE);
-                       itemText = ResourceManager::GetString(L"IDS_ST_BODY_FLIGHT_MODE");
-               }
-               break;
+//     case ID_GROUP_MODE:
+//             {
+//                     style = TABLE_VIEW_ANNEX_STYLE_ONOFF_SLIDING;
+//                     itemRectLabel.width -= W_RESIZE_LABEL_GAP;
+//                     pBitmap = ResourceManager::GetBitmapN(IDB_FLIGHT_MODE);
+//                     itemText = ResourceManager::GetString(L"IDS_ST_BODY_FLIGHT_MODE");
+//             }
+//             break;
 
        case ID_GROUP_PERSONAL:
                {
@@ -657,29 +653,29 @@ MainMenuForm::OnGroupedTableViewItemStateChanged(Tizen::Ui::Controls::GroupedTab
                }
                break;
 
-       case ID_GROUP_MODE:
-               {
-                       if (itemIndex == ID_ITEM_MODE_FLIGHT_MODE)
-                       {
-                               bool flightModeStatus = tableView.IsItemChecked(groupIndex, itemIndex);
-                               if (status == TABLE_VIEW_ITEM_STATUS_SELECTED)
-                               {
-                                       flightModeStatus = (!(flightModeStatus));
-                               }
-
-                               SetIFlightModeSetValueAsyncResultListener();
-                               if (SettingInfo::SetValueAsyncForPrivilegedKey(SETTING_INFO_KEY_NETWORK_FLIGHTMODE, flightModeStatus, __pFlightModeSetValueAsyncResultListener) == E_SUCCESS)
-                               {
-                                       tableView.SetItemChecked(groupIndex, itemIndex, flightModeStatus);
-                                       AppLogDebug("flightmode(%d) GetLastResult(%s)", flightModeStatus, GetErrorMessage(GetLastResult()));
-                               }
-                               else
-                               {
-                                       AppLogDebug("flightmode(%d) GetLastResult(%s)", flightModeStatus, GetErrorMessage(GetLastResult()));
-                               }
-                       }
-               }
-               break;
+//     case ID_GROUP_MODE:
+//             {
+//                     if (itemIndex == ID_ITEM_MODE_FLIGHT_MODE)
+//                     {
+//                             bool flightModeStatus = tableView.IsItemChecked(groupIndex, itemIndex);
+//                             if (status == TABLE_VIEW_ITEM_STATUS_SELECTED)
+//                             {
+//                                     flightModeStatus = (!(flightModeStatus));
+//                             }
+//
+//                             SetIFlightModeSetValueAsyncResultListener();
+//                             if (SettingInfo::SetValueAsyncForPrivilegedKey(SETTING_INFO_KEY_NETWORK_FLIGHTMODE, flightModeStatus, __pFlightModeSetValueAsyncResultListener) == E_SUCCESS)
+//                             {
+//                                     tableView.SetItemChecked(groupIndex, itemIndex, flightModeStatus);
+//                                     AppLogDebug("flightmode(%d) GetLastResult(%s)", flightModeStatus, GetErrorMessage(GetLastResult()));
+//                             }
+//                             else
+//                             {
+//                                     AppLogDebug("flightmode(%d) GetLastResult(%s)", flightModeStatus, GetErrorMessage(GetLastResult()));
+//                             }
+//                     }
+//             }
+//             break;
 
        case ID_GROUP_PERSONAL:
                {
@@ -1298,11 +1294,11 @@ MainMenuForm::OnResultReceivedForSetValueAsync(const Tizen::Base::String& key, r
        AppLogDebug("ENTER");
 }
 
-void
-MainMenuForm::SetIFlightModeSetValueAsyncResultListener(void)
-{
-       __pFlightModeSetValueAsyncResultListener = new (std::nothrow) IFlightModeSetValueAsyncResultListener();
-}
+//void
+//MainMenuForm::SetIFlightModeSetValueAsyncResultListener(void)
+//{
+//     __pFlightModeSetValueAsyncResultListener = new (std::nothrow) IFlightModeSetValueAsyncResultListener();
+//}
 
 void
 MainMenuForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus)