Refactoring, renamed MainUI to QuickAccess

[Issue]    N/A
[Problem]  Misleading name
[Solution] Changed
[Verify]   Open Quick Access view, check if it works by clicking tiles etc.

Change-Id: Ibebaa3b3e4216adb762453b8d9bfc74dfa6ff3d8
Signed-off-by: Maciej Skrzypkowski <m.skrzypkows@samsung.com>

diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
index 8ff9167..aac3a8d 100644 (file)
--- a/services/CMakeLists.txt
+++ b/services/CMakeLists.txt
@@ -2,7 +2,7 @@ project(services)
 
 add_subdirectory(WebKitEngineService)
 add_subdirectory(MoreMenuUI)
-add_subdirectory(MainUI)
+add_subdirectory(QuickAccess)
 add_subdirectory(HistoryUI)
 add_subdirectory(TabUI)
 add_subdirectory(SimpleUI)

diff --git a/services/MainUI/CMakeLists.txt b/services/QuickAccess/CMakeLists.txt
similarity index 79%
rename from services/MainUI/CMakeLists.txt
rename to services/QuickAccess/CMakeLists.txt
index e12fb69..bacd28d 100644 (file)
--- a/services/MainUI/CMakeLists.txt
+++ b/services/QuickAccess/CMakeLists.txt
@@ -1,12 +1,12 @@
-project(MainUI)
+project(QuickAccess)
 
-set(MainUI_SRCS
-    MainUI.cpp
+set(QuickAccess_SRCS
+    QuickAccess.cpp
     DetailPopup.cpp
     )
 
-set(MainUI_HEADERS
-    MainUI.h
+set(QuickAccess_HEADERS
+    QuickAccess.h
     DetailPopup.h
     )
 
@@ -15,7 +15,7 @@ include(EFLHelpers)
 
 include_directories(${CMAKE_SOURCE_DIR}/services/FavoriteService)
 
-add_library(${PROJECT_NAME} SHARED ${MainUI_SRCS})
+add_library(${PROJECT_NAME} SHARED ${QuickAccess_SRCS})
 
 if(TIZEN_BUILD)
     target_link_libraries(${PROJECT_NAME} ${pkgs_LDFLAGS})
@@ -27,7 +27,7 @@ install(TARGETS ${PROJECT_NAME}
 
 #please do not add edc/ directory
 set(edcFiles
-    MainUI.edc
+    QuickAccess.edc
     DetailPopup.edc
     )
 

diff --git a/services/MainUI/DetailPopup.cpp b/services/QuickAccess/DetailPopup.cpp
similarity index 93%
rename from services/MainUI/DetailPopup.cpp
rename to services/QuickAccess/DetailPopup.cpp
index eafd236..1d08e4e 100644 (file)
--- a/services/MainUI/DetailPopup.cpp
+++ b/services/QuickAccess/DetailPopup.cpp
@@ -23,7 +23,7 @@
 #include "BrowserLogger.h"
 #include "Tools/GeneralTools.h"
 #include "Tools/EflTools.h"
-#include "MainUI.h"
+#include "QuickAccess.h"
 
 namespace tizen_browser{
 namespace base_ui{
@@ -31,16 +31,17 @@ namespace base_ui{
 const char * DetailPopup::URL_SEPARATOR = " - ";
 const int DetailPopup::HISTORY_ITEMS_NO = 5;
 
-DetailPopup::DetailPopup(MainUI *mainUI)
+DetailPopup::DetailPopup(QuickAccess *quickAccess)
     : m_main_view(nullptr)
     , m_parent(nullptr)
     , m_layout(nullptr)
     , m_historyList(nullptr)
-    , m_mainUI(mainUI)
     , m_urlButton(nullptr)
+    , m_history_item_class(nullptr)
+    , m_quickAccess(quickAccess)
 {
     edjFilePath = EDJE_DIR;
-    edjFilePath.append("MainUI/DetailPopup.edj");
+    edjFilePath.append("QuickAccess/DetailPopup.edj");
     elm_theme_extension_add(nullptr, edjFilePath.c_str());
 
     m_history_item_class = elm_genlist_item_class_new();
@@ -116,7 +117,7 @@ void DetailPopup::hide()
     elm_genlist_clear(m_historyList);
     evas_object_hide(m_layout);
     evas_object_del(m_layout);
-    m_mainUI->refreshFocusChain();
+    m_quickAccess->refreshFocusChain();
 }
 
 void DetailPopup::_bg_click(void* data, Evas_Object*, const char*, const char*)
@@ -130,7 +131,7 @@ void DetailPopup::_url_click(void* data, Evas_Object*, const char*, const char*)
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     DetailPopup *dp = reinterpret_cast<DetailPopup*>(data);
-    dp->openURLInNewTab(dp->m_item, dp->m_mainUI->isDesktopMode());
+    dp->openURLInNewTab(dp->m_item, dp->m_quickAccess->isDesktopMode());
     dp->hide();
 }
 
@@ -138,7 +139,7 @@ void DetailPopup::_url_click_button(void* data, Evas_Object*, void*)
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     DetailPopup *dp = reinterpret_cast<DetailPopup*>(data);
-    dp->openURLInNewTab(dp->m_item, dp->m_mainUI->isDesktopMode());
+    dp->openURLInNewTab(dp->m_item, dp->m_quickAccess->isDesktopMode());
     dp->hide();
 }
 
@@ -157,7 +158,7 @@ void DetailPopup::_history_url_click(void* data, Evas_Object*, void* event_info)
                            { return i.get() == item; }
                           );
     std::shared_ptr<services::HistoryItem> itemPtr= *it;
-    dp->openURLInNewTab(itemPtr, dp->m_mainUI->isDesktopMode());
+    dp->openURLInNewTab(itemPtr, dp->m_quickAccess->isDesktopMode());
     dp->hide();
 }
 

diff --git a/services/MainUI/DetailPopup.h b/services/QuickAccess/DetailPopup.h
similarity index 96%
rename from services/MainUI/DetailPopup.h
rename to services/QuickAccess/DetailPopup.h
index 019932a..44e6938 100644 (file)
--- a/services/MainUI/DetailPopup.h
+++ b/services/QuickAccess/DetailPopup.h
@@ -26,11 +26,11 @@
 namespace tizen_browser{
 namespace base_ui{
 
-    class MainUI;
+    class QuickAccess;
 
     class DetailPopup {
     public:
-        DetailPopup(MainUI *mainUI);
+        DetailPopup(QuickAccess *quickAccess);
         ~DetailPopup();
 
         /**
@@ -81,7 +81,7 @@ namespace base_ui{
         Evas_Object *m_historyList;
         Evas_Object* m_urlButton;
         Elm_Gengrid_Item_Class * m_history_item_class;
-        MainUI *m_mainUI;
+        QuickAccess *m_quickAccess;
         std::string edjFilePath;
         std::shared_ptr<services::HistoryItem> m_item;
         std::shared_ptr<services::HistoryItemVector> m_prevItems;

diff --git a/services/MainUI/MainUI.cpp b/services/QuickAccess/QuickAccess.cpp
similarity index 79%
rename from services/MainUI/MainUI.cpp
rename to services/QuickAccess/QuickAccess.cpp
index 6b30adf..7b57107 100644 (file)
--- a/services/MainUI/MainUI.cpp
+++ b/services/QuickAccess/QuickAccess.cpp
@@ -19,7 +19,7 @@
 #include <vector>
 #include <AbstractMainWindow.h>
 
-#include "MainUI.h"
+#include "QuickAccess.h"
 #include "ServiceManager.h"
 #include "BrowserLogger.h"
 #include "Tools/EflTools.h"
@@ -31,16 +31,16 @@
 namespace tizen_browser{
 namespace base_ui{
 
-EXPORT_SERVICE(MainUI, "org.tizen.browser.mainui")
+EXPORT_SERVICE(QuickAccess, "org.tizen.browser.quickaccess")
 
-const int MainUI::MAX_TILES_NUMBER = 5;
-const int MainUI::MAX_THUMBNAIL_WIDTH = 840;
-const int MainUI::MAX_THUMBNAIL_HEIGHT = 648;
-const int MainUI::BIG_TILE_INDEX = 0;
-const int MainUI::TOP_RIGHT_TILE_INDEX = 3;
-const int MainUI::BOTTOM_RIGHT_TILE_INDEX = 4;
+const int QuickAccess::MAX_TILES_NUMBER = 5;
+const int QuickAccess::MAX_THUMBNAIL_WIDTH = 840;
+const int QuickAccess::MAX_THUMBNAIL_HEIGHT = 648;
+const int QuickAccess::BIG_TILE_INDEX = 0;
+const int QuickAccess::TOP_RIGHT_TILE_INDEX = 3;
+const int QuickAccess::BOTTOM_RIGHT_TILE_INDEX = 4;
 
-const std::vector<std::string> MainUI::TILES_NAMES = {
+const std::vector<std::string> QuickAccess::TILES_NAMES = {
     "elm.swallow.big",
     "elm.swallow.small_first",
     "elm.swallow.small_second",
@@ -51,16 +51,16 @@ const std::vector<std::string> MainUI::TILES_NAMES = {
 typedef struct _HistoryItemData
 {
         std::shared_ptr<tizen_browser::services::HistoryItem> item;
-        std::shared_ptr<tizen_browser::base_ui::MainUI> mainUI;
+        std::shared_ptr<tizen_browser::base_ui::QuickAccess> quickAccess;
 } HistoryItemData;
 
 typedef struct _BookmarkItemData
 {
         std::shared_ptr<tizen_browser::services::BookmarkItem> item;
-        std::shared_ptr<tizen_browser::base_ui::MainUI> mainUI;
+        std::shared_ptr<tizen_browser::base_ui::QuickAccess> quickAccess;
 } BookmarkItemData;
 
-MainUI::MainUI()
+QuickAccess::QuickAccess()
     : m_parent(nullptr)
     , m_layout(nullptr)
     , m_bookmarksView(nullptr)
@@ -75,26 +75,26 @@ MainUI::MainUI()
 {
     BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
     edjFilePath = EDJE_DIR;
-    edjFilePath.append("MainUI/MainUI.edj");
+    edjFilePath.append("QuickAccess/QuickAccess.edj");
     elm_theme_extension_add(nullptr, edjFilePath.c_str());
-    MainUI::createItemClasses();
+    QuickAccess::createItemClasses();
 }
 
-MainUI::~MainUI()
+QuickAccess::~QuickAccess()
 {
     BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
     elm_gengrid_item_class_free(m_bookmark_item_class);
     eina_list_free(m_parentFocusChain);
 }
 
-void MainUI::init(Evas_Object* parent)
+void QuickAccess::init(Evas_Object* parent)
 {
     M_ASSERT(parent);
     m_parent = parent;
 }
 
 
-Evas_Object* MainUI::getContent()
+Evas_Object* QuickAccess::getContent()
 {
     M_ASSERT(m_parent);
     if (!m_layout) {
@@ -103,19 +103,19 @@ Evas_Object* MainUI::getContent()
     return m_layout;
 }
 
-void MainUI::showMostVisited(std::shared_ptr< services::HistoryItemVector > vec)
+void QuickAccess::showMostVisited(std::shared_ptr< services::HistoryItemVector > vec)
 {
     addHistoryItems(vec);
     showHistory();
 }
 
-void MainUI::showBookmarks(std::vector< std::shared_ptr< tizen_browser::services::BookmarkItem > > vec)
+void QuickAccess::showBookmarks(std::vector< std::shared_ptr< tizen_browser::services::BookmarkItem > > vec)
 {
     addBookmarkItems(vec);
     showBookmarks();
 }
 
-void MainUI::createItemClasses()
+void QuickAccess::createItemClasses()
 {
     BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
     if (!m_bookmark_item_class) {
@@ -129,7 +129,7 @@ void MainUI::createItemClasses()
 }
 
 
-Evas_Object* MainUI::createQuickAccessLayout(Evas_Object* parent)
+Evas_Object* QuickAccess::createQuickAccessLayout(Evas_Object* parent)
 {
     BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
     m_desktopMode = true;
@@ -146,7 +146,7 @@ Evas_Object* MainUI::createQuickAccessLayout(Evas_Object* parent)
     return layout;
 }
 
-Evas_Object* MainUI::createMostVisitedView (Evas_Object * parent)
+Evas_Object* QuickAccess::createMostVisitedView (Evas_Object * parent)
 {
     BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
 
@@ -161,7 +161,7 @@ Evas_Object* MainUI::createMostVisitedView (Evas_Object * parent)
     return mostVisitedLayout;
 }
 
-Evas_Object* MainUI::createBookmarksView (Evas_Object * parent)
+Evas_Object* QuickAccess::createBookmarksView (Evas_Object * parent)
 {
     BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
 
@@ -182,7 +182,7 @@ Evas_Object* MainUI::createBookmarksView (Evas_Object * parent)
     return bookmarkViewLayout;
 }
 
-Evas_Object* MainUI::createBookmarkGengrid(Evas_Object *parent)
+Evas_Object* QuickAccess::createBookmarkGengrid(Evas_Object *parent)
 {
     Evas_Object *bookmarkGengrid = elm_gengrid_add(parent);
 
@@ -200,7 +200,7 @@ Evas_Object* MainUI::createBookmarkGengrid(Evas_Object *parent)
     return bookmarkGengrid;
 }
 
-Evas_Object* MainUI::createTopButtons (Evas_Object *parent)
+Evas_Object* QuickAccess::createTopButtons (Evas_Object *parent)
 {
     BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
 
@@ -227,7 +227,7 @@ Evas_Object* MainUI::createTopButtons (Evas_Object *parent)
     return layoutTop;
 }
 
-Evas_Object* MainUI::createBottomButton(Evas_Object *parent)
+Evas_Object* QuickAccess::createBottomButton(Evas_Object *parent)
 {
     BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
 
@@ -248,28 +248,28 @@ Evas_Object* MainUI::createBottomButton(Evas_Object *parent)
     return layoutBottom;
 }
 
-void MainUI::_mostVisited_clicked(void * data, Evas_Object *, void *)
+void QuickAccess::_mostVisited_clicked(void * data, Evas_Object *, void *)
 {
     BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
-    MainUI* mainUI = reinterpret_cast<MainUI *>(data);
-    mainUI->mostVisitedClicked();
+    QuickAccess* quickAccess = reinterpret_cast<QuickAccess *>(data);
+    quickAccess->mostVisitedClicked();
 }
 
-void MainUI::_bookmark_clicked(void * data, Evas_Object *, void *)
+void QuickAccess::_bookmark_clicked(void * data, Evas_Object *, void *)
 {
     BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
-    MainUI* mainUI = reinterpret_cast<MainUI *>(data);
-    mainUI->bookmarkClicked();
+    QuickAccess* quickAccess = reinterpret_cast<QuickAccess *>(data);
+    quickAccess->bookmarkClicked();
 }
 
-void MainUI::_bookmark_manager_clicked(void * data, Evas_Object *, void *)
+void QuickAccess::_bookmark_manager_clicked(void * data, Evas_Object *, void *)
 {
     BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
-    MainUI*  mainUI = static_cast<MainUI *>(data);
-    mainUI->bookmarkManagerClicked();
+    QuickAccess*  quickAccess = static_cast<QuickAccess *>(data);
+    quickAccess->bookmarkManagerClicked();
 }
 
-void MainUI::addHistoryItem(std::shared_ptr<services::HistoryItem> hi)
+void QuickAccess::addHistoryItem(std::shared_ptr<services::HistoryItem> hi)
 {
     BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
     M_ASSERT(m_historyItems.size() < MAX_TILES_NUMBER);
@@ -277,7 +277,7 @@ void MainUI::addHistoryItem(std::shared_ptr<services::HistoryItem> hi)
     int tileNumber = m_historyItems.size();
     HistoryItemData *itemData = new HistoryItemData();
     itemData->item = hi;
-    itemData->mainUI = std::shared_ptr<MainUI>(this);
+    itemData->quickAccess = std::shared_ptr<QuickAccess>(this);
 
     Evas_Object* tile = elm_button_add(m_mostVisitedView);
     if (tileNumber == BIG_TILE_INDEX)
@@ -299,7 +299,7 @@ void MainUI::addHistoryItem(std::shared_ptr<services::HistoryItem> hi)
     m_historyItems.push_back(hi);
 }
 
-void MainUI::addHistoryItems(std::shared_ptr<services::HistoryItemVector> items)
+void QuickAccess::addHistoryItems(std::shared_ptr<services::HistoryItemVector> items)
 {
     BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
     clearHistoryGenlist();
@@ -314,16 +314,16 @@ void MainUI::addHistoryItems(std::shared_ptr<services::HistoryItemVector> items)
         setEmptyView(false);
 }
 
-void MainUI::addBookmarkItem(std::shared_ptr<tizen_browser::services::BookmarkItem> bi)
+void QuickAccess::addBookmarkItem(std::shared_ptr<tizen_browser::services::BookmarkItem> bi)
 {
     BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
     BookmarkItemData *itemData = new BookmarkItemData();
     itemData->item = bi;
-    itemData->mainUI = std::shared_ptr<tizen_browser::base_ui::MainUI>(this);
+    itemData->quickAccess = std::shared_ptr<tizen_browser::base_ui::QuickAccess>(this);
     elm_gengrid_item_append(m_bookmarkGengrid, m_bookmark_item_class, itemData, _thumbBookmarkClicked, itemData);
 }
 
-void MainUI::addBookmarkItems(std::vector<std::shared_ptr<tizen_browser::services::BookmarkItem> > items)
+void QuickAccess::addBookmarkItems(std::vector<std::shared_ptr<tizen_browser::services::BookmarkItem> > items)
 {
     clearBookmarkGengrid();
     for (auto it = items.begin(); it != items.end(); ++it) {
@@ -332,7 +332,7 @@ void MainUI::addBookmarkItems(std::vector<std::shared_ptr<tizen_browser::service
 }
 
 
-char* MainUI::_grid_bookmark_text_get(void *data, Evas_Object *, const char *part)
+char* QuickAccess::_grid_bookmark_text_get(void *data, Evas_Object *, const char *part)
 {
         BookmarkItemData *itemData = reinterpret_cast<BookmarkItemData*>(data);
         if (!strcmp(part, "page_title")) {
@@ -344,14 +344,14 @@ char* MainUI::_grid_bookmark_text_get(void *data, Evas_Object *, const char *par
         return strdup("");
 }
 
-Evas_Object * MainUI::_grid_bookmark_content_get(void *data, Evas_Object*, const char *part)
+Evas_Object * QuickAccess::_grid_bookmark_content_get(void *data, Evas_Object*, const char *part)
 {
     BROWSER_LOGD("%s:%d %s part=%s", __FILE__, __LINE__, __func__, part);
     BookmarkItemData *itemData = reinterpret_cast<BookmarkItemData*>(data);
 
     if (!strcmp(part, "elm.thumbnail")) {
         if (itemData->item->getThumbnail()) {
-                Evas_Object * thumb = tizen_browser::tools::EflTools::getEvasImage(itemData->item->getThumbnail(), itemData->mainUI->m_parent);
+                Evas_Object * thumb = tizen_browser::tools::EflTools::getEvasImage(itemData->item->getThumbnail(), itemData->quickAccess->m_parent);
                 return thumb;
         }
         else {
@@ -362,21 +362,21 @@ Evas_Object * MainUI::_grid_bookmark_content_get(void *data, Evas_Object*, const
     return nullptr;
 }
 
-void MainUI::_thumbBookmarkClicked(void * data, Evas_Object * , void *)
+void QuickAccess::_thumbBookmarkClicked(void * data, Evas_Object * , void *)
 {
     BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
     HistoryItemData * itemData = reinterpret_cast<HistoryItemData *>(data);
-    itemData->mainUI->openURLInNewTab(itemData->item, itemData->mainUI->isDesktopMode());
+    itemData->quickAccess->openURLInNewTab(itemData->item, itemData->quickAccess->isDesktopMode());
 }
 
-void MainUI::_thumbClicked(void* data, Evas_Object*, void*)
+void QuickAccess::_thumbClicked(void* data, Evas_Object*, void*)
 {
     BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
     HistoryItemData * itemData = reinterpret_cast<HistoryItemData *>(data);
-    itemData->mainUI->mostVisitedTileClicked(itemData->item, DetailPopup::HISTORY_ITEMS_NO);
+    itemData->quickAccess->mostVisitedTileClicked(itemData->item, DetailPopup::HISTORY_ITEMS_NO);
 }
 
-void MainUI::clearHistoryGenlist()
+void QuickAccess::clearHistoryGenlist()
 {
     BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
 
@@ -389,7 +389,7 @@ void MainUI::clearHistoryGenlist()
     m_historyItems.clear();
 }
 
-void MainUI::showHistory()
+void QuickAccess::showHistory()
 {
     BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
 
@@ -411,13 +411,13 @@ void MainUI::showHistory()
     elm_object_focus_set(m_mostVisitedButton, true);
 }
 
-void MainUI::clearBookmarkGengrid()
+void QuickAccess::clearBookmarkGengrid()
 {
     BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
     elm_gengrid_clear(m_bookmarkGengrid);
 }
 
-void MainUI::showBookmarks()
+void QuickAccess::showBookmarks()
 {
     BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
 
@@ -433,7 +433,7 @@ void MainUI::showBookmarks()
     elm_object_focus_set(m_bookmarksButton, true);
 }
 
-void MainUI::showUI()
+void QuickAccess::showUI()
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     evas_object_show(m_layout);
@@ -444,7 +444,7 @@ void MainUI::showUI()
     }
 }
 
-void MainUI::hideUI()
+void QuickAccess::hideUI()
 {
     BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
     evas_object_hide(m_layout);
@@ -454,55 +454,55 @@ void MainUI::hideUI()
     clearBookmarkGengrid();
 }
 
-void MainUI::openDetailPopup(std::shared_ptr<services::HistoryItem> currItem, std::shared_ptr<services::HistoryItemVector> prevItems)
+void QuickAccess::openDetailPopup(std::shared_ptr<services::HistoryItem> currItem, std::shared_ptr<services::HistoryItemVector> prevItems)
 {
     m_detailPopup.show(m_layout, m_parent, currItem, prevItems);
 }
 
-void MainUI::showNoHistoryLabel()
+void QuickAccess::showNoHistoryLabel()
 {
     elm_layout_text_set(m_mostVisitedView, "elm.text.empty", "No visited site");
-    elm_layout_signal_emit(m_mostVisitedView, "empty,view", "mainui");
+    elm_layout_signal_emit(m_mostVisitedView, "empty,view", "quickaccess");
 }
 
-void MainUI::setEmptyView(bool empty)
+void QuickAccess::setEmptyView(bool empty)
 {
     BROWSER_LOGD("%s:%d %s, empty: %d", __FILE__, __LINE__, __func__, empty);
     if(empty) {
         showNoHistoryLabel();
     } else {
-        elm_layout_signal_emit(m_mostVisitedView, "not,empty,view", "mainui");
+        elm_layout_signal_emit(m_mostVisitedView, "not,empty,view", "quickaccess");
     }
 }
 
-bool MainUI::isDesktopMode() const
+bool QuickAccess::isDesktopMode() const
 {
     return m_desktopMode;
 }
 
-void MainUI::setDesktopMode(bool mode)
+void QuickAccess::setDesktopMode(bool mode)
 {
     m_desktopMode = mode;
 }
 
-DetailPopup& MainUI::getDetailPopup()
+DetailPopup& QuickAccess::getDetailPopup()
 {
     return m_detailPopup;
 }
 
-void MainUI::backButtonClicked()
+void QuickAccess::backButtonClicked()
 {
     if (m_detailPopup.isVisible()) {
         m_detailPopup.hide();
     }
 }
 
-bool MainUI::isMostVisitedActive() const
+bool QuickAccess::isMostVisitedActive() const
 {
     return evas_object_visible_get(m_mostVisitedView);
 }
 
-void MainUI::refreshFocusChain()
+void QuickAccess::refreshFocusChain()
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
 

diff --git a/services/MainUI/MainUI.h b/services/QuickAccess/QuickAccess.h
similarity index 97%
rename from services/MainUI/MainUI.h
rename to services/QuickAccess/QuickAccess.h
index 592f45e..f26d402 100644 (file)
--- a/services/MainUI/MainUI.h
+++ b/services/QuickAccess/QuickAccess.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef MAINUI_H
-#define MAINUI_H
+#ifndef QUICKACCESS_H
+#define QUICKACCESS_H
 
 #include <Evas.h>
 #include <boost/signals2/signal.hpp>
@@ -33,12 +33,12 @@ namespace base_ui{
 
 //TODO: This class name is not revelant to what this class actually does.
 //Rename this class and file to "QuickAccessUI".
-class BROWSER_EXPORT MainUI
+class BROWSER_EXPORT QuickAccess
         : public tizen_browser::core::AbstractService
 {
 public:
-    MainUI();
-    ~MainUI();
+    QuickAccess();
+    ~QuickAccess();
     void init(Evas_Object *main_layout);
     Evas_Object* getContent();
     void showMostVisited(std::shared_ptr<services::HistoryItemVector> vec);
@@ -120,4 +120,4 @@ private:
 }
 }
 
-#endif // BOOKMARKSUI_H
+#endif // QUICKACCESS_H

diff --git a/services/MainUI/edc/DetailPopup.edc b/services/QuickAccess/edc/DetailPopup.edc
similarity index 100%
rename from services/MainUI/edc/DetailPopup.edc
rename to services/QuickAccess/edc/DetailPopup.edc

diff --git a/services/MainUI/edc/MainUI.edc b/services/QuickAccess/edc/QuickAccess.edc
similarity index 99%
rename from services/MainUI/edc/MainUI.edc
rename to services/QuickAccess/edc/QuickAccess.edc
index 46d4b5c..c87299b 100644 (file)
--- a/services/MainUI/edc/MainUI.edc
+++ b/services/QuickAccess/edc/QuickAccess.edc
@@ -434,7 +434,7 @@ group { name: "mv_bookmarks";
     programs {
         program { name: "empty";
             signal: "empty,view";
-            source: "mainui";
+            source: "quickaccess";
             action:  STATE_SET "empty" 0.0;
             target: "elm.swallow.big";
             target: "elm.swallow.small_first";
@@ -446,7 +446,7 @@ group { name: "mv_bookmarks";
         }
         program { name: "not_empty";
             signal: "not,empty,view";
-            source: "mainui";
+            source: "quickaccess";
             action:  STATE_SET "default" 0.0;
             target: "elm.text.empty";
             target: "center_rect";

diff --git a/services/MainUI/edc/error.edc b/services/QuickAccess/edc/error.edc
similarity index 100%
rename from services/MainUI/edc/error.edc
rename to services/QuickAccess/edc/error.edc

diff --git a/services/MainUI/images/ic_popup_list_arrow.png b/services/QuickAccess/images/ic_popup_list_arrow.png
similarity index 100%
rename from services/MainUI/images/ic_popup_list_arrow.png
rename to services/QuickAccess/images/ic_popup_list_arrow.png

diff --git a/services/MainUI/images/ic_thumbnail_favorite_01.png b/services/QuickAccess/images/ic_thumbnail_favorite_01.png
similarity index 100%
rename from services/MainUI/images/ic_thumbnail_favorite_01.png
rename to services/QuickAccess/images/ic_thumbnail_favorite_01.png

diff --git a/services/MainUI/images/ic_thumbnail_folder.png b/services/QuickAccess/images/ic_thumbnail_folder.png
similarity index 100%
rename from services/MainUI/images/ic_thumbnail_folder.png
rename to services/QuickAccess/images/ic_thumbnail_folder.png

diff --git a/services/MainUI/images/ic_thumbnail_folder_all.png b/services/QuickAccess/images/ic_thumbnail_folder_all.png
similarity index 100%
rename from services/MainUI/images/ic_thumbnail_folder_all.png
rename to services/QuickAccess/images/ic_thumbnail_folder_all.png

diff --git a/services/MainUI/images/ic_thumbnail_folder_mark.png b/services/QuickAccess/images/ic_thumbnail_folder_mark.png
similarity index 100%
rename from services/MainUI/images/ic_thumbnail_folder_mark.png
rename to services/QuickAccess/images/ic_thumbnail_folder_mark.png

diff --git a/services/MainUI/images/ic_thumbnail_lock_01.png b/services/QuickAccess/images/ic_thumbnail_lock_01.png
similarity index 100%
rename from services/MainUI/images/ic_thumbnail_lock_01.png
rename to services/QuickAccess/images/ic_thumbnail_lock_01.png

diff --git a/services/MainUI/images/ic_thumbnail_lock_04.png b/services/QuickAccess/images/ic_thumbnail_lock_04.png
similarity index 100%
rename from services/MainUI/images/ic_thumbnail_lock_04.png
rename to services/QuickAccess/images/ic_thumbnail_lock_04.png

diff --git a/services/MainUI/images/web_frame_selected.png b/services/QuickAccess/images/web_frame_selected.png
similarity index 100%
rename from services/MainUI/images/web_frame_selected.png
rename to services/QuickAccess/images/web_frame_selected.png

diff --git a/services/MainUI/images/web_shadow.png b/services/QuickAccess/images/web_shadow.png
similarity index 100%
rename from services/MainUI/images/web_shadow.png
rename to services/QuickAccess/images/web_shadow.png

diff --git a/services/SimpleUI/CMakeLists.txt b/services/SimpleUI/CMakeLists.txt
index 02f8aed..f7eac70 100644 (file)
--- a/services/SimpleUI/CMakeLists.txt
+++ b/services/SimpleUI/CMakeLists.txt
@@ -31,7 +31,7 @@ include_directories(${CMAKE_SOURCE_DIR}/services/FavoriteService)
 include_directories(${CMAKE_SOURCE_DIR}/services/HistoryService)
 include_directories(${CMAKE_SOURCE_DIR}/services/MoreMenuUI)
 include_directories(${CMAKE_SOURCE_DIR}/services/HistoryUI)
-include_directories(${CMAKE_SOURCE_DIR}/services/MainUI)
+include_directories(${CMAKE_SOURCE_DIR}/services/QuickAccess)
 include_directories(${CMAKE_SOURCE_DIR}/services/SettingsUI)
 include_directories(${CMAKE_SOURCE_DIR}/services/TabUI)
 include_directories(${CMAKE_SOURCE_DIR}/services/ZoomUI)
@@ -49,7 +49,7 @@ add_dependencies(${PROJECT_NAME} StorageService)
 add_dependencies(${PROJECT_NAME} HistoryService)
 add_dependencies(${PROJECT_NAME} MoreMenuUI)
 add_dependencies(${PROJECT_NAME} BookmarkManagerUI)
-add_dependencies(${PROJECT_NAME} MainUI)
+add_dependencies(${PROJECT_NAME} QuickAccess)
 add_dependencies(${PROJECT_NAME} HistoryUI)
 add_dependencies(${PROJECT_NAME} TabUI)
 add_dependencies(${PROJECT_NAME} SettingsUI)
@@ -60,7 +60,7 @@ target_link_libraries(${PROJECT_NAME} WebPageUI)
 target_link_libraries(${PROJECT_NAME} StorageService)
 target_link_libraries(${PROJECT_NAME} HistoryService)
 target_link_libraries(${PROJECT_NAME} MoreMenuUI)
-target_link_libraries(${PROJECT_NAME} MainUI)
+target_link_libraries(${PROJECT_NAME} QuickAccess)
 target_link_libraries(${PROJECT_NAME} HistoryUI)
 target_link_libraries(${PROJECT_NAME} TabUI)
 target_link_libraries(${PROJECT_NAME} SettingsUI)

diff --git a/services/SimpleUI/SimpleUI.cpp b/services/SimpleUI/SimpleUI.cpp
index e4044ed..98ba7e8 100644 (file)
--- a/services/SimpleUI/SimpleUI.cpp
+++ b/services/SimpleUI/SimpleUI.cpp
@@ -63,7 +63,7 @@ SimpleUI::SimpleUI()
     , m_webPageUI()
     , m_moreMenuUI()
     , m_bookmarkManagerUI()
-    , m_mainUI()
+    , m_quickAccess()
     , m_historyUI()
     , m_settingsUI()
     , m_tabUI()
@@ -192,10 +192,10 @@ void SimpleUI::loadUIServices()
         <tizen_browser::base_ui::WebPageUI,tizen_browser::core::AbstractService>
         (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.webpageui"));
 
-    m_mainUI =
+    m_quickAccess =
         std::dynamic_pointer_cast
-        <tizen_browser::base_ui::MainUI,tizen_browser::core::AbstractService>
-        (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.mainui"));
+        <tizen_browser::base_ui::QuickAccess,tizen_browser::core::AbstractService>
+        (tizen_browser::core::ServiceManager::getInstance().getService("org.tizen.browser.quickaccess"));
 
     m_tabUI =
         std::dynamic_pointer_cast
@@ -242,17 +242,17 @@ void SimpleUI::connectUISignals()
     m_webPageUI->forwardPage.connect(boost::bind(&tizen_browser::basic_webengine::AbstractWebEngine<Evas_Object>::forward, m_webEngine.get()));
     m_webPageUI->stopLoadingPage.connect(boost::bind(&tizen_browser::basic_webengine::AbstractWebEngine<Evas_Object>::stopLoading, m_webEngine.get()));
     m_webPageUI->reloadPage.connect(boost::bind(&tizen_browser::basic_webengine::AbstractWebEngine<Evas_Object>::reload, m_webEngine.get()));
-    m_webPageUI->showMainUI.connect(boost::bind(&SimpleUI::showMainUI, this));
-    m_webPageUI->hideMainUI.connect(boost::bind(&MainUI::hideUI, m_mainUI));
+    m_webPageUI->showQuickAccess.connect(boost::bind(&SimpleUI::showQuickAccess, this));
+    m_webPageUI->hideQuickAccess.connect(boost::bind(&QuickAccess::hideUI, m_quickAccess));
 
 
-    M_ASSERT(m_mainUI.get());
-    m_mainUI->getDetailPopup().openURLInNewTab.connect(boost::bind(&SimpleUI::onOpenURLInNewTab, this, _1, _2));
-    m_mainUI->openURLInNewTab.connect(boost::bind(&SimpleUI::onOpenURLInNewTab, this, _1, _2));
-    m_mainUI->mostVisitedTileClicked.connect(boost::bind(&SimpleUI::onMostVisitedTileClicked, this, _1, _2));
-    m_mainUI->mostVisitedClicked.connect(boost::bind(&SimpleUI::onMostVisitedClicked, this));
-    m_mainUI->bookmarkClicked.connect(boost::bind(&SimpleUI::onBookmarkButtonClicked, this));
-    m_mainUI->bookmarkManagerClicked.connect(boost::bind(&SimpleUI::showBookmarkManagerUI, this));
+    M_ASSERT(m_quickAccess.get());
+    m_quickAccess->getDetailPopup().openURLInNewTab.connect(boost::bind(&SimpleUI::onOpenURLInNewTab, this, _1, _2));
+    m_quickAccess->openURLInNewTab.connect(boost::bind(&SimpleUI::onOpenURLInNewTab, this, _1, _2));
+    m_quickAccess->mostVisitedTileClicked.connect(boost::bind(&SimpleUI::onMostVisitedTileClicked, this, _1, _2));
+    m_quickAccess->mostVisitedClicked.connect(boost::bind(&SimpleUI::onMostVisitedClicked, this));
+    m_quickAccess->bookmarkClicked.connect(boost::bind(&SimpleUI::onBookmarkButtonClicked, this));
+    m_quickAccess->bookmarkManagerClicked.connect(boost::bind(&SimpleUI::showBookmarkManagerUI, this));
 
     M_ASSERT(m_tabUI.get());
     m_tabUI->closeTabUIClicked.connect(boost::bind(&SimpleUI::closeTabUI, this));
@@ -333,8 +333,8 @@ void SimpleUI::initUIServices()
     M_ASSERT(m_webPageUI.get());
     m_webPageUI->init(m_viewManager->getContent());
 
-    M_ASSERT(m_mainUI.get());
-    m_mainUI->init(m_webPageUI->getContent());
+    M_ASSERT(m_quickAccess.get());
+    m_quickAccess->init(m_webPageUI->getContent());
 
     M_ASSERT(m_tabUI.get());
     m_tabUI->init(m_viewManager->getContent());
@@ -451,11 +451,11 @@ bool SimpleUI::isErrorPageActive()
     return m_webPageUI->isErrorPageActive();
 }
 
-void SimpleUI::showMainUI()
+void SimpleUI::showQuickAccess()
 {
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-    m_mainUI->showMostVisited(getMostVisitedItems());
-    m_mainUI->showUI();
+    m_quickAccess->showMostVisited(getMostVisitedItems());
+    m_quickAccess->showUI();
 }
 
 void SimpleUI::switchViewToQuickAccess()
@@ -463,7 +463,7 @@ void SimpleUI::switchViewToQuickAccess()
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_viewManager);
 
-    m_webPageUI->switchViewToQuickAccess(m_mainUI->getContent());
+    m_webPageUI->switchViewToQuickAccess(m_quickAccess->getContent());
     m_webEngine->disconnectCurrentWebViewSignals();
     m_viewManager->popStackTo(m_webPageUI.get());
 }
@@ -541,7 +541,7 @@ void SimpleUI::onOpenURLInNewTab(std::shared_ptr<tizen_browser::services::Histor
 void SimpleUI::onMostVisitedTileClicked(std::shared_ptr< services::HistoryItem > historyItem, int itemsNumber)
 {
     BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
-    m_mainUI->openDetailPopup(historyItem, m_historyService->getHistoryItemsByURL(historyItem->getUrl(), itemsNumber));
+    m_quickAccess->openDetailPopup(historyItem, m_historyService->getHistoryItemsByURL(historyItem->getUrl(), itemsNumber));
 }
 
 void SimpleUI::onClearHistoryClicked()
@@ -553,13 +553,13 @@ void SimpleUI::onClearHistoryClicked()
 void SimpleUI::onMostVisitedClicked()
 {
    BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
-   m_mainUI->showMostVisited(getMostVisitedItems());
+   m_quickAccess->showMostVisited(getMostVisitedItems());
 }
 
 void SimpleUI::onBookmarkButtonClicked()
 {
    BROWSER_LOGD("%s:%d %s", __FILE__, __LINE__, __func__);
-   m_mainUI->showBookmarks(getBookmarks());
+   m_quickAccess->showBookmarks(getBookmarks());
 }
 
 void SimpleUI::onBookmarkClicked(std::shared_ptr<tizen_browser::services::BookmarkItem> bookmarkItem)
@@ -595,7 +595,7 @@ void SimpleUI::onBackPressed()
 {
     BROWSER_LOGD("[%s]", __func__);
     if (m_webPageUI->isHomePageActive()) {
-        m_mainUI->backButtonClicked();
+        m_quickAccess->backButtonClicked();
     } else {
         if (!m_webPageUI->getURIEntry().hasFocus() && !m_wvIMEStatus)
             m_webEngine->backButtonClicked();
@@ -633,7 +633,7 @@ void SimpleUI::loadFinished()
     if(!m_webEngine->isPrivateMode()){
         m_historyService->addHistoryItem(std::make_shared<tizen_browser::services::HistoryItem> (m_webEngine->getURI(),
                                                                                                 m_webEngine->getTitle(),
-                                                                                                m_webEngine->getFavicon()), m_webEngine->getSnapshotData(MainUI::MAX_THUMBNAIL_WIDTH, MainUI::MAX_THUMBNAIL_HEIGHT));
+                                                                                                m_webEngine->getFavicon()), m_webEngine->getSnapshotData(QuickAccess::MAX_THUMBNAIL_WIDTH, QuickAccess::MAX_THUMBNAIL_HEIGHT));
     }
     m_webPageUI->loadFinished();
 }
@@ -866,7 +866,7 @@ void SimpleUI::showMoreMenu()
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     M_ASSERT(m_viewManager);
 
-    bool desktopMode = m_webPageUI->isHomePageActive() ? m_mainUI->isDesktopMode() : m_webEngine->isDesktopMode();
+    bool desktopMode = m_webPageUI->isHomePageActive() ? m_quickAccess->isDesktopMode() : m_webEngine->isDesktopMode();
     m_moreMenuUI->setDesktopMode(desktopMode);
     m_viewManager->pushViewToStack(m_moreMenuUI.get());
     m_moreMenuUI->showCurrentTab();
@@ -899,7 +899,7 @@ void SimpleUI::switchToMobileMode()
     m_viewManager->popStackTo(m_webPageUI.get());
         m_webEngine->reload();
     } else {
-        m_mainUI->setDesktopMode(false);
+        m_quickAccess->setDesktopMode(false);
     }
 }
 
@@ -910,7 +910,7 @@ void SimpleUI::switchToDesktopMode()
         m_webEngine->switchToDesktopMode();
         m_webEngine->reload();
     } else {
-        m_mainUI->setDesktopMode(true);
+        m_quickAccess->setDesktopMode(true);
     }
 }
 

diff --git a/services/SimpleUI/SimpleUI.h b/services/SimpleUI/SimpleUI.h
index 0e8c58a..5e87ddd 100644 (file)
--- a/services/SimpleUI/SimpleUI.h
+++ b/services/SimpleUI/SimpleUI.h
@@ -38,7 +38,7 @@
 #include "MoreMenuUI.h"
 #include "HistoryUI.h"
 #include "SettingsUI.h"
-#include "MainUI.h"
+#include "QuickAccess.h"
 #include "TabUI.h"
 #include "ZoomUI.h"
 #include "HistoryService.h"
@@ -102,7 +102,7 @@ private:
     void bookmarkAdded();
     void bookmarkDeleted();
 
-    void showMainUI();
+    void showQuickAccess();
     void switchViewToQuickAccess();
     void switchViewToWebPage();
     void updateView();
@@ -234,7 +234,7 @@ private:
     std::shared_ptr<services::HistoryService> m_historyService;
     std::shared_ptr<MoreMenuUI> m_moreMenuUI;
     std::shared_ptr<BookmarkManagerUI> m_bookmarkManagerUI;
-    std::shared_ptr<MainUI> m_mainUI;
+    std::shared_ptr<QuickAccess> m_quickAccess;
     std::shared_ptr<HistoryUI> m_historyUI;
     std::shared_ptr<SettingsUI> m_settingsUI;
     std::shared_ptr<TabUI> m_tabUI;

diff --git a/services/WebPageUI/CMakeLists.txt b/services/WebPageUI/CMakeLists.txt
index b9ac365..e410517 100644 (file)
--- a/services/WebPageUI/CMakeLists.txt
+++ b/services/WebPageUI/CMakeLists.txt
@@ -22,7 +22,7 @@ include_directories(${CMAKE_SOURCE_DIR}/services)
 include_directories(${CMAKE_SOURCE_DIR}/services/WebEngineService)
 include_directories(${CMAKE_SOURCE_DIR}/services/WebEngineService/src)
 include_directories(${CMAKE_SOURCE_DIR}/services/MoreMenuUI)
-include_directories(${CMAKE_SOURCE_DIR}/services/MainUI)
+include_directories(${CMAKE_SOURCE_DIR}/services/QuickAccess)
 include_directories(${CMAKE_SOURCE_DIR}/services/SettingsUI)
 include_directories(${CMAKE_SOURCE_DIR}/services/TabUI)
 
@@ -34,10 +34,10 @@ pkg_check_modules(capi_net QUIET capi-network-connection)
 add_library(${PROJECT_NAME} SHARED ${WebPageUI_SRCS})
 
 add_dependencies(${PROJECT_NAME} MoreMenuUI)
-add_dependencies(${PROJECT_NAME} MainUI)
+add_dependencies(${PROJECT_NAME} QuickAccess)
 add_dependencies(${PROJECT_NAME} TabUI)
 target_link_libraries(${PROJECT_NAME} MoreMenuUI)
-target_link_libraries(${PROJECT_NAME} MainUI)
+target_link_libraries(${PROJECT_NAME} QuickAccess)
 target_link_libraries(${PROJECT_NAME} TabUI)
 target_link_libraries(${PROJECT_NAME} ${EFL_LDFLAGS})
 

diff --git a/services/WebPageUI/WebPageUI.cpp b/services/WebPageUI/WebPageUI.cpp
index 18ae8d7..0a8e92f 100644 (file)
--- a/services/WebPageUI/WebPageUI.cpp
+++ b/services/WebPageUI/WebPageUI.cpp
@@ -72,7 +72,7 @@ void WebPageUI::showUI()
     evas_object_show(elm_object_part_content_get(m_mainLayout, "uri_bar_buttons_right"));
 
     if (m_homePageActive)
-        showMainUI();
+        showQuickAccess();
 }
 
 
@@ -84,7 +84,7 @@ void WebPageUI::hideUI()
     evas_object_hide(m_mainLayout);
 
     if (m_homePageActive)
-        hideMainUI();
+        hideQuickAccess();
 
     evas_object_hide(elm_object_part_content_get(m_mainLayout, "web_view"));
     m_URIEntry->editingCanceled();
@@ -148,7 +148,7 @@ void WebPageUI::switchViewToWebPage(Evas_Object* content, const std::string uri)
     BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
     if (m_homePageActive)
     {
-        hideMainUI();
+        hideQuickAccess();
         m_homePageActive = false;
     }
     setMainContent(content);
@@ -171,7 +171,7 @@ void WebPageUI::switchViewToQuickAccess(Evas_Object* content)
     refreshFocusChain();
     m_URIEntry->changeUri("");
     m_URIEntry->setFocus();
-    showMainUI();
+    showQuickAccess();
 }
 
 void WebPageUI::faviconClicked(void* data, Evas_Object*, const char*, const char*)

diff --git a/services/WebPageUI/WebPageUI.h b/services/WebPageUI/WebPageUI.h
index 0ad7158..cd616f0 100644 (file)
--- a/services/WebPageUI/WebPageUI.h
+++ b/services/WebPageUI/WebPageUI.h
@@ -60,8 +60,8 @@ public:
     boost::signals2::signal<void ()> reloadPage;
     boost::signals2::signal<void ()> showTabUI;
     boost::signals2::signal<void ()> showMoreMenu;
-    boost::signals2::signal<void ()> hideMainUI;
-    boost::signals2::signal<void ()> showMainUI;
+    boost::signals2::signal<void ()> hideQuickAccess;
+    boost::signals2::signal<void ()> showQuickAccess;
 
     static void faviconClicked(void* data, Evas_Object* obj, const char* emission, const char* source);