[Release] wrt_0.8.225

[platform/framework/web/wrt.git] / src / domain / widget_data_types.cpp

diff --git a/src/domain/widget_data_types.cpp b/src/domain/widget_data_types.cpp
index 2fee42c..87ebb73 100644 (file)
--- a/src/domain/widget_data_types.cpp
+++ b/src/domain/widget_data_types.cpp
@@ -98,10 +98,12 @@ WidgetSettingList::WidgetSettingList() :
     m_BackButtonPresence(BackButton_Disable),
     m_ContextMenu(ContextMenu_Enable),
     m_Encryption(Encryption_Disable),
-    m_BackgroundSupport(BackgroundSupport_Disable)
+    m_BackgroundSupport(BackgroundSupport_Disable),
+    m_ProgressbarPresence(ProgressBar_Disable),
+    m_HWkeyEvent(HWkeyEvent_Enable)
 {}
 
-WidgetSettingList::WidgetSettingList(WidgetSettings &widgetSettings)
+WidgetSettingList::WidgetSettingList(WrtDB::WidgetSettings &widgetSettings)
 {
     m_RotationLock = Screen_Portrait;
     m_IndicatorPresence = Indicator_Enable;
@@ -109,6 +111,8 @@ WidgetSettingList::WidgetSettingList(WidgetSettings &widgetSettings)
     m_ContextMenu = ContextMenu_Enable;
     m_Encryption = Encryption_Disable;
     m_BackgroundSupport = BackgroundSupport_Disable;
+    m_ProgressbarPresence = ProgressBar_Disable;
+    m_HWkeyEvent = HWkeyEvent_Enable;
 
     FOREACH(it, widgetSettings)
     {
@@ -122,6 +126,10 @@ WidgetSettingList::WidgetSettingList(WidgetSettings &widgetSettings)
                        SETTING_VALUE_SCREEN_ORIENTATION_LANDSCAPE)
             {
                 m_RotationLock = Screen_Landscape;
+            } else if (value ==
+                       SETTING_VALUE_SCREEN_ORIENTATION_AUTO_ROTATION)
+            {
+                m_RotationLock = Screen_AutoRotation;
             } else {
                 LogError("Invalid screen orientation value!! [" <<
                          value << "]");
@@ -149,11 +157,7 @@ WidgetSettingList::WidgetSettingList(WidgetSettings &widgetSettings)
                          value << "]");
                 m_BackButtonPresence = BackButton_Disable;
             }
-        } else if (name == SETTING_NAME_CONTEXT_MENU
-#ifndef DEPRECATED_SETTING_STRING
-                   || name == SETTING_NAME_CONTEXTMENU
-#endif
-                   )
+        } else if (name == SETTING_NAME_CONTEXT_MENU)
         {
             if (value == SETTING_VALUE_ENABLE) {
                 m_ContextMenu = ContextMenu_Enable;
@@ -191,51 +195,80 @@ WidgetSettingList::WidgetSettingList(WidgetSettings &widgetSettings)
             if (!userAgent.IsNull()) {
                 m_UserAgent = DPL::ToUTF8String(*userAgent);
             }
+        } else if (name == SETTING_NAME_PROGRESSBAR_PRESENCE) {
+            if (value == SETTING_VALUE_PROGRESSBAR_PRESENCE_ENABLE) {
+                m_ProgressbarPresence = ProgressBar_Enable;
+            } else if (value == SETTING_VALUE_PROGRESSBAR_PRESENCE_DISABLE) {
+                m_ProgressbarPresence = ProgressBar_Disable;
+            } else {
+                LogError("Invalid progressbar-presence value!! [" <<
+                         value << "]");
+                m_ProgressbarPresence = ProgressBar_Disable;
+            }
+        } else if (name == SETTING_NAME_HWKEY_EVENT) {
+            if (value == SETTING_VALUE_HWKEY_EVENT_ENABLE) {
+                m_HWkeyEvent = HWkeyEvent_Enable;
+            } else if (value == SETTING_VALUE_HWKEY_EVENT_DISABLE) {
+                m_HWkeyEvent = HWkeyEvent_Disable;
+            } else {
+                LogError("Invalid hwkey-event value!! [" <<
+                         value << "]");
+                m_HWkeyEvent = HWkeyEvent_Enable;
+            }
         } else {
             LogError("Invalid setting name!! [" << name << "]");
         }
     }
-    LogDebug("m_RotationLock: " << m_RotationLock);
-    LogDebug("m_IndicatorPresence: " << m_IndicatorPresence);
-    LogDebug("m_BackButtonPresence: " << m_BackButtonPresence);
-    LogDebug("m_ContextMenu: " << m_ContextMenu);
-    LogDebug("m_Encryption: " << m_Encryption);
-    LogDebug("m_BackgroundSupport: " << m_BackgroundSupport);
+
 }
 
 WidgetSettingScreenLock WidgetSettingList::getRotationValue() const
 {
+    LogDebug("m_RotationLock: " << m_RotationLock);
+
     return m_RotationLock;
 }
 
 WidgetSettingIndicatorPresence WidgetSettingList::getIndicatorPresence() const
 {
+    LogDebug("m_IndicatorPresence: " << m_IndicatorPresence);
+
     return m_IndicatorPresence;
 }
 
 WidgetSettingBackButtonPresence WidgetSettingList::getBackButtonPresence()
 const
 {
+    LogDebug("m_BackButtonPresence: " << m_BackButtonPresence);
+
     return m_BackButtonPresence;
 }
 
 WidgetSettingContextMenu WidgetSettingList::getContextMenu() const
 {
+    LogDebug("m_ContextMenu: " << m_ContextMenu);
+
     return m_ContextMenu;
 }
 
 WidgetSettingEncryption WidgetSettingList::getEncryption() const
 {
+    LogDebug("m_Encryption: " << m_Encryption);
+
     return m_Encryption;
 }
 
 WidgetSettingBackgroundSupport WidgetSettingList::getBackgroundSupport() const
 {
+    LogDebug("m_BackgroundSupport: " << m_BackgroundSupport);
+
     return m_BackgroundSupport;
 }
 
 bool WidgetSettingList::isEncrypted() const
 {
+    LogDebug("m_Encryption: " << m_Encryption);
+
     if (m_Encryption == Encryption_Enable) {
         return true;
     }
@@ -244,9 +277,25 @@ bool WidgetSettingList::isEncrypted() const
 
 std::string WidgetSettingList::getUserAgent() const
 {
+    LogDebug("m_UserAgent: " << m_UserAgent);
+
     return m_UserAgent;
 }
 
+WidgetSettingProgressBarPresence WidgetSettingList::getProgressBarPresence() const
+{
+    LogDebug("m_ProgressbarPresence: " << m_ProgressbarPresence);
+
+    return m_ProgressbarPresence;
+}
+
+WidgetSettingHWkeyEventPresence WidgetSettingList::getHWkeyEvent() const
+{
+    LogDebug("m_HWkeyEvent: " << m_HWkeyEvent);
+
+    return m_HWkeyEvent;
+}
+
 bool WidgetSettingList::operator ==(const WidgetSettingList& other) const
 {
     return m_RotationLock == other.m_RotationLock &&
@@ -255,5 +304,7 @@ bool WidgetSettingList::operator ==(const WidgetSettingList& other) const
            m_ContextMenu == other.m_ContextMenu &&
            m_Encryption == other.m_Encryption &&
            m_BackgroundSupport == other.m_BackgroundSupport &&
-           m_UserAgent == other.m_UserAgent;
+           m_UserAgent == other.m_UserAgent &&
+           m_ProgressbarPresence == other.m_ProgressbarPresence &&
+           m_HWkeyEvent == other.m_HWkeyEvent;
 }