Disabled START_MINIBROWSER and READ_MODE features 72/46172/1
authorMarcin Lapinski <m.lapinski@samsung.com>
Mon, 17 Aug 2015 12:28:24 +0000 (14:28 +0200)
committerMarcin Lapinski <m.lapinski@samsung.com>
Mon, 17 Aug 2015 12:33:04 +0000 (14:33 +0200)
[Issue#]   https://bugs.tizen.org/jira/browse/TT-129
[Problem]  N/A
[Cause]    N/A
[Solution] N/A
[Verify]   1. Change builds.
           2. Feature buttons in More Menu should be not visible.

Change-Id: I9aec51faabafb9503a31e30955cd92d0ed31b10b

services/MoreMenuUI/MoreMenuUI.cpp
services/MoreMenuUI/MoreMenuUI.h

index 2670648..ff31301 100644 (file)
@@ -282,7 +282,7 @@ void MoreMenuUI::hide()
 void MoreMenuUI::addItems()
 {
      BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
-     for (size_t i = 0; i < 10; i++) {
+     for (size_t i = 0; i < static_cast<int>(END_OF_RANGE); i++) {
          MoreMenuItemData *itemData = new MoreMenuItemData();
          itemData->item = static_cast<ItemType>(i);;
          itemData->moreMenuUI = std::shared_ptr<tizen_browser::base_ui::MoreMenuUI>(this);
@@ -304,9 +304,11 @@ char* MoreMenuUI::_grid_text_get(void* data, Evas_Object*, const char* part)
         if (!strncmp(part_name, part, part_name_len)) {
             const char* item_name = NULL;
             switch (itemData->item) {
+#ifdef READER_MODE_ENABLED
             case READER_MODE:
                 item_name = "Reader mode";
                 break;
+#endif
             case BOOKMARK_MANAGER:
                 item_name = "Bookmark manager";
                 break;
@@ -316,9 +318,11 @@ char* MoreMenuUI::_grid_text_get(void* data, Evas_Object*, const char* part)
             case SCREEN_ZOOM:
                 item_name = "Screen zoom";
                 break;
+#ifdef START_MINIBROWSER_ENABLED
             case START_MINIBROWSER:
                 item_name = "Start minibrowser";
                 break;
+#endif
             case FOCUS_MODE:
                 item_name = "Focus mode";
                 break;
@@ -347,9 +351,11 @@ static const char* getImageFileNameForType(ItemType type, bool focused)
 {
     const char* file_name = NULL;
     switch (type) {
+#ifdef READER_MODE_ENABLED
     case READER_MODE:
         file_name = focused ? "ic_more_readermode_foc.png" : "ic_more_readermode_nor.png";
         break;
+#endif
     case BOOKMARK_MANAGER:
         file_name = focused ? "ic_more_bookmark_foc.png" : "ic_more_bookmark_nor.png";
         break;
@@ -359,9 +365,11 @@ static const char* getImageFileNameForType(ItemType type, bool focused)
     case SCREEN_ZOOM:
         file_name = focused ? "ic_more_zoom_foc.png" : "ic_more_zoom_nor.png";
         break;
+#ifdef START_MINIBROWSER_ENABLED
     case START_MINIBROWSER:
         file_name = focused ? "ic_more_minibrowser_foc.png" : "ic_more_minibrowser_nor.png";
         break;
+#endif
     case FOCUS_MODE:
         file_name = focused ? "ic_more_focusmode_foc.png" : "ic_more_focusmode_nor.png";
         break;
@@ -455,9 +463,15 @@ void MoreMenuUI::_thumbSelected(void* data, Evas_Object*, void*)
         case BOOKMARK_MANAGER:
             itemData->moreMenuUI->bookmarkManagerClicked(std::string());
             break;
+#ifdef READER_MODE_ENABLED
         case READER_MODE:
+        //TODO: Implement reader mode
+#endif
         case SCREEN_ZOOM:
+#ifdef START_MINIBROWSER_ENABLED
         case START_MINIBROWSER:
+        //TODO: Implement minibrowser launching
+#endif
         case FOCUS_MODE:
         case VIEW_MOBILE_WEB:
         case SHARE:
index a837fad..1d87456 100644 (file)
@@ -38,16 +38,21 @@ namespace base_ui{
 
 class SimpleUI;
 enum ItemType {
+#ifdef READER_MODE_ENABLED
     READER_MODE,
+#endif
     BOOKMARK_MANAGER,
     HISTORY,
     SCREEN_ZOOM,
+#ifdef START_MINIBROWSER_ENABLED
     START_MINIBROWSER,
+#endif
     FOCUS_MODE,
     VIEW_MOBILE_WEB,
     SHARE,
     SETTINGS,
-    EXIT_BROWSER
+    EXIT_BROWSER,
+    END_OF_RANGE
 } item;
 
 class BROWSER_EXPORT MoreMenuUI