Action::Action(const Action& other)
- :m_iconText(other.m_iconText)
- ,m_text(other.m_text)
+ :m_text(other.m_text)
,m_statusTip(other.m_statusTip)
,m_toolTip(other.m_toolTip)
,m_icon(other.m_icon)
return m_icon;
}
-std::string Action::getIconText() const
-{
- return m_iconText;
-}
-
std::string Action::getSelIcon() const
{
return m_selIcon;
m_icon = icon;
}
-void Action::setIconText(const std::string& iconText)
-{
- m_iconText = iconText;
-}
-
void Action::setSelIcon(const std::string& selIcon)
{
m_selIcon = selIcon;
Action(const Action& other);
~Action();
- std::string getIconText()const;
std::string getText()const;
std::string getStatusTip()const;
std::string getToolTip()const;
boost::signals2::signal<void ()> enabledChanged;
private:
- std::string m_iconText; ///< Text displayed under the icon.
std::string m_text; ///< Text displayed in menu.
std::string m_statusTip;///< Text displayed in status bar.
std::string m_toolTip; ///< Text displayed "on mouse over" in tool tip box.
// m_webPageUI->getUrlHistoryList()->uriChanged.connect(boost::bind(&SimpleUI::filterURL, this, _1));
m_webPageUI->backPage.connect(boost::bind(&SimpleUI::switchViewToWebPage, this));
m_webPageUI->backPage.connect(boost::bind(&tizen_browser::basic_webengine::AbstractWebEngine<Evas_Object>::back, m_webEngine.get()));
- m_webPageUI->reloadPage.connect(boost::bind(&SimpleUI::switchViewToWebPage, this));
m_webPageUI->showTabUI.connect(boost::bind(&SimpleUI::showTabUI, this));
+ m_webPageUI->showBookmarksUI.connect(boost::bind(&SimpleUI::showBookmarkManagerUI, this));
m_webPageUI->showMoreMenu.connect(boost::bind(&SimpleUI::showMoreMenu, this));
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->showQuickAccess.connect(boost::bind(&SimpleUI::showQuickAccess, this));
m_webPageUI->hideQuickAccess.connect(boost::bind(&QuickAccess::hideUI, m_quickAccess));
m_webPageUI->bookmarkManagerClicked.connect(boost::bind(&SimpleUI::showBookmarkManagerUI, this));
m_webPageUI->showBookmarkFlowUI.connect(boost::bind(&SimpleUI::showBookmarkFlowUI, this, _1));
m_webPageUI->showFindOnPageUI.connect(boost::bind(&SimpleUI::showFindOnPageUI, this, std::string()));
m_webPageUI->showSettingsUI.connect(boost::bind(&SimpleUI::showSettingsUI, this));
-#if PROFILE_MOBILE
m_webPageUI->hideMoreMenu.connect(boost::bind(&SimpleUI::closeMoreMenu, this));
+ m_webPageUI->addNewTab.connect(boost::bind(&SimpleUI::newTabClicked, this));
m_webPageUI->getURIEntry().mobileEntryFocused.connect(boost::bind(&WebPageUI::mobileEntryFocused, m_webPageUI));
m_webPageUI->getURIEntry().mobileEntryUnfocused.connect(boost::bind(&WebPageUI::mobileEntryUnfocused, m_webPageUI));
m_webPageUI->qaOrientationChanged.connect(boost::bind(&QuickAccess::orientationChanged, m_quickAccess));
m_webPageUI->getURIEntry().secureIconClicked.connect(boost::bind(&SimpleUI::showCertificatePopup, this));
m_webPageUI->getURIEntry().isValidCert.connect(boost::bind(&services::CertificateContents::isValidCertificate, m_certificateContents, _1));
-#endif
+ m_webPageUI->getURIEntry().reloadPage.connect(
+ boost::bind(&tizen_browser::basic_webengine::AbstractWebEngine<Evas_Object>::reload, m_webEngine.get()));
+ m_webPageUI->getURIEntry().stopLoadingPage.connect(
+ boost::bind(&tizen_browser::basic_webengine::AbstractWebEngine<Evas_Object>::stopLoading, m_webEngine.get()));
M_ASSERT(m_quickAccess.get());
m_quickAccess->getDetailPopup().openURL.connect(boost::bind(&SimpleUI::onOpenURL, this, _1, _2));
return main_window;
}
-void SimpleUI::reloadEnable(bool enable)
-{
- m_webPageUI->setReloadButtonEnabled(enable);
-}
-
void SimpleUI::downloadStarted(int status)
{
BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
popup->dismiss();
}
-void SimpleUI::stopEnable(bool enable)
-{
- m_webPageUI->setStopButtonEnabled(enable);
-}
-
void SimpleUI::loadStarted()
{
BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
Evas_Object* createErrorLayout(Evas_Object* parent);
void forwardEnable(bool enable);
- void stopEnable(bool enable);
- void reloadEnable(bool enable);
void downloadStarted(int status);
void loadFinished();
namespace tizen_browser {
namespace base_ui {
-#if !PROFILE_MOBILE
-double ButtonBar::tooltipHideTimeout = 0.;
-double ButtonBar::tooltipShowDelay = 0.;
-Ecore_Timer* ButtonBar::m_tooltipHideTimer = NULL;
-Ecore_Timer* ButtonBar::m_tooltipShowTimer = NULL;
-#endif
ButtonBar::ButtonBar(Evas_Object* parent, const std::string& edjFile, const std::string& groupName)
{
-#if !PROFILE_MOBILE
- ButtonBar::tooltipHideTimeout = boost::any_cast <double> (tizen_browser::config::Config::getInstance().get("TOOLTIP_HIDE_TIMEOUT"));
-#endif
-
- std::string edjFilePath = EDJE_DIR;
- edjFilePath.append(edjFile);
- elm_theme_extension_add(NULL, edjFilePath.c_str());
+ m_edjFilePath = EDJE_DIR;
+ m_edjFilePath.append(edjFile);
+ elm_theme_extension_add(NULL, m_edjFilePath.c_str());
m_layout = elm_layout_add(parent);
- Eina_Bool layoutSetResult = elm_layout_file_set(m_layout, edjFilePath.c_str(), groupName.c_str());
+ Eina_Bool layoutSetResult = elm_layout_file_set(m_layout, m_edjFilePath.c_str(), groupName.c_str());
if (!layoutSetResult)
- throw std::runtime_error("Layout file not found: " + edjFilePath);
+ throw std::runtime_error("Layout file not found: " + m_edjFilePath);
evas_object_size_hint_weight_set(m_layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(m_layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(m_layout);
}
+
ButtonBar::~ButtonBar()
{
-#if !PROFILE_MOBILE
- if (ButtonBar::m_tooltipShowTimer) {
- ecore_timer_del(ButtonBar::m_tooltipShowTimer);
- ButtonBar::m_tooltipShowTimer = NULL;
- }
- if (ButtonBar::m_tooltipHideTimer) {
- ecore_timer_del(ButtonBar::m_tooltipHideTimer);
- ButtonBar::m_tooltipHideTimer = NULL;
- }
-#endif
+
}
void ButtonBar::addAction(sharedAction action, const std::string& buttonName)
actionButton.eAction = eAction;
Evas_Object* button = elm_button_add(m_layout);
- evas_object_event_callback_add(button, EVAS_CALLBACK_MOUSE_IN, __cb_mouse_in, NULL);
- evas_object_event_callback_add(button, EVAS_CALLBACK_MOUSE_OUT, __cb_mouse_out, NULL);
-#if !PROFILE_MOBILE
- evas_object_smart_callback_add(button, "focused", __cb_focus_in, NULL);
- evas_object_smart_callback_add(button, "unfocused", __cb_focus_out, NULL);
-#endif
+ edje_color_class_set("elm/widget/button/default/bg-default", 240, 240, 240, 255,
+ 255, 255, 255, 255,
+ 255, 255, 255, 255);
+
+ edje_color_class_set("elm/widget/button/default/bg-disabled", 240, 240, 240, 255,
+ 255, 255, 255, 255,
+ 255, 255, 255, 255);
+
+ Evas_Object* m_box = elm_box_add(button);
+ evas_object_size_hint_weight_set(m_box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(m_box, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_box_homogeneous_set(m_box, EINA_FALSE);
+
+ // Set a source file to fetch pixel data
+ Evas_Object *img = elm_image_add(m_box);
+ elm_image_file_set(img, m_edjFilePath.c_str(), action->getIcon().c_str());
+ evas_object_size_hint_min_set(img, 0, BUTTON_WITH_ICON_HEIGHT);
+ elm_box_pack_end(m_box, img);
+ evas_object_show(img);
+
+ Evas_Object *label = elm_label_add(m_box);
+ elm_object_text_set(label, action->getText().c_str());
+ elm_box_pack_end(m_box, label);
+ evas_object_show(label);
+ evas_object_show(m_box);
+ elm_object_part_content_set(button, "elm.swallow.content", m_box);
-
- elm_object_style_set(button, action->getIcon().c_str());
elm_object_disabled_set(button, action->isEnabled() ? EINA_FALSE : EINA_TRUE);
evas_object_smart_callback_add(button, "clicked", EAction::callbackFunction, eAction.get());
evas_object_show(button);
-#if !PROFILE_MOBILE
- if (action->isEnabled()) {
- elm_object_tooltip_text_set(button, eAction->getAction()->getToolTip().c_str());
- elm_object_tooltip_orient_set(button, ELM_TOOLTIP_ORIENT_BOTTOM);
- elm_object_tooltip_style_set(button, "browserTip");
- }
-#endif
-
elm_object_part_content_set(m_layout, buttonName.c_str(), button);
actionButton.button = button;
void ButtonBar::refreshButton(const std::string& buttonName)
{
Evas_Object* button = m_buttonsMap[buttonName].button;
- if (m_actionsMap[buttonName]->isEnabled()) {
- elm_object_disabled_set(button, EINA_FALSE);
-#if !PROFILE_MOBILE
- elm_object_tooltip_text_set(button, m_actionsMap[buttonName]->getToolTip().c_str());
- elm_object_tooltip_orient_set(button, ELM_TOOLTIP_ORIENT_BOTTOM);
- elm_object_tooltip_style_set(button, "browserTip");
-#endif
- } else {
- elm_object_disabled_set(button, EINA_TRUE);
-#if !PROFILE_MOBILE
- elm_object_tooltip_unset(button);
-#endif
- }
+ elm_object_disabled_set(button, m_actionsMap[buttonName]->isEnabled() ? EINA_FALSE : EINA_TRUE);
}
Evas_Object* ButtonBar::getContent()
elm_object_disabled_set(getContent(), disabled ? EINA_TRUE : EINA_FALSE);
}
-#if !PROFILE_MOBILE
-void ButtonBar::__cb_focus_in(void*, Evas_Object* obj, void*)
-{
- //BROWSER_LOGD("[%s:%d] %d", __PRETTY_FUNCTION__, __LINE__, reinterpret_cast<int>(obj));
-
- if (ButtonBar::m_tooltipHideTimer) {
- ecore_timer_del(ButtonBar::m_tooltipHideTimer);
- ButtonBar::m_tooltipHideTimer = NULL;
- }
- if (ButtonBar::m_tooltipShowTimer) {
- ecore_timer_del(ButtonBar::m_tooltipShowTimer);
- ButtonBar::m_tooltipShowTimer = NULL;
- }
- ButtonBar::m_tooltipHideTimer = ecore_timer_add(ButtonBar::tooltipHideTimeout, ButtonBar::__cb_tooltip_hide_timeout, obj);
- //emulate native behaviour
- //tooltip works better with some delay
- ButtonBar::m_tooltipShowTimer = ecore_timer_add(elm_config_tooltip_delay_get(), ButtonBar::__cb_tooltip_show_delay, obj);
-}
-
-void ButtonBar::__cb_focus_out(void*, Evas_Object* obj, void*)
-{
- BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
- if (ButtonBar::m_tooltipHideTimer) {
- ecore_timer_del(ButtonBar::m_tooltipHideTimer);
- ButtonBar::m_tooltipHideTimer = NULL;
- }
- if (ButtonBar::m_tooltipShowTimer) {
- ecore_timer_del(ButtonBar::m_tooltipShowTimer);
- ButtonBar::m_tooltipShowTimer = NULL;
- }
- elm_object_tooltip_hide(obj);
-}
-#endif
-
-void ButtonBar::__cb_mouse_in(void* /*data*/, Evas* /*e*/, Evas_Object* obj, void* /*event_info*/)
-{
- //BROWSER_LOGD("[%s:%d] %d", __PRETTY_FUNCTION__, __LINE__, reinterpret_cast<int>(obj));
- elm_object_focus_set(obj, EINA_TRUE);
-}
-
-void ButtonBar::__cb_mouse_out(void* /*data*/, Evas* /*e*/, Evas_Object* obj, void* /*event_info*/)
-{
- elm_object_focus_set(obj, EINA_FALSE);
-}
-
-#if !PROFILE_MOBILE
-Eina_Bool ButtonBar::__cb_tooltip_hide_timeout(void* data)
-{
- Evas_Object* button = static_cast<Evas_Object*>(data);
-
- if (ButtonBar::m_tooltipHideTimer) {
- ecore_timer_del(ButtonBar::m_tooltipHideTimer);
- ButtonBar::m_tooltipHideTimer = NULL;
- }
-
- elm_object_tooltip_hide(button);
- return ECORE_CALLBACK_CANCEL;
-}
-
-
-Eina_Bool ButtonBar::__cb_tooltip_show_delay(void* data)
-{
- Evas_Object* button = static_cast<Evas_Object*>(data);
-
- if (ButtonBar::m_tooltipShowTimer) {
- ecore_timer_del(ButtonBar::m_tooltipShowTimer);
- ButtonBar::m_tooltipShowTimer = NULL;
- }
-
- elm_object_tooltip_show(button);
- return ECORE_CALLBACK_CANCEL;
-}
-#endif
-
}
}
void setDisabled(bool disabled);
private:
+ std::string m_edjFilePath;
//map button name to current action assigned to button
std::map<std::string, sharedAction> m_actionsMap;
//map button name to struct ActionButton which contains Evas_Object of button
Evas_Object* m_layout;
void refreshButton(const std::string& buttonName);
void onEnabledChanged(const std::string& buttonName, sharedAction action);
-#if !PROFILE_MOBILE
- static Ecore_Timer* m_tooltipHideTimer;
- static Ecore_Timer* m_tooltipShowTimer;
-
- static double tooltipHideTimeout;
- static double tooltipShowDelay;
-#endif
-
- static void __cb_mouse_in(void* data, Evas* e, Evas_Object* obj, void* event_info);
- static void __cb_mouse_out(void* data, Evas* e, Evas_Object* obj, void* event_info);
-#if !PROFILE_MOBILE
- static void __cb_focus_in(void* data, Evas_Object* obj, void* event_info);
- static void __cb_focus_out(void* data, Evas_Object* obj, void* event_info);
-
- static Eina_Bool __cb_tooltip_hide_timeout(void* data);
- static Eina_Bool __cb_tooltip_show_delay(void* data);
-#endif
+ static const int BUTTON_WITH_ICON_HEIGHT = 56;
};
}
endif (${PROFILE} MATCHES "mobile")
#please do not add edc/ directory
-if (${PROFILE} MATCHES "mobile") # mobile profile
- set(edcFiles
- WebPageUI_mob.edc
- ErrorMessage.edc
- LeftButtonBar_mob.edc
- RightButtonBar_mob.edc
- URIEntry_mob.edc
- PrivateMode_mob.edc
- UrlHistoryList.edc
- )
-else (${PROFILE} MATCHES "mobile") # tv profile
- set(edcFiles
- WebPageUI.edc
- ErrorMessage.edc
- LeftButtonBar.edc
- RightButtonBar.edc
- URIEntry.edc
- PrivateMode.edc
- UrlHistoryList.edc
- )
-endif (${PROFILE} MATCHES "mobile")
+set(edcFiles
+ WebPageUI.edc
+ ErrorMessage.edc
+ BottomButtonBar.edc
+ RightButtonBar.edc
+ URIEntry.edc
+ PrivateMode.edc
+ UrlHistoryList.edc
+ )
foreach(edec ${edcFiles})
- string(REGEX REPLACE "(_mob)?.edc" ".edj" target_name ${edec})
+ string(REGEX REPLACE ".edc" ".edj" target_name ${edec})
EDJ_TARGET(${target_name}
${CMAKE_CURRENT_SOURCE_DIR}/edc/${edec}
${CMAKE_CURRENT_BINARY_DIR})
namespace base_ui {
#define GUIDE_TEXT_FOCUSED "Search or URL"
-#if PROFILE_MOBILE
#define GUIDE_TEXT_UNFOCUSED "Search or URL"
-#else
-#define GUIDE_TEXT_UNFOCUSED "Search or URL - Press [A] to enter"
-#endif
const std::string keynameSelect = "Select";
const std::string keynameClear = "Clear";
const std::string keynameReturn = "Return";
const std::string keynameEsc = "XF86Back";
-URIEntry::URIEntry()
+URIEntry::URIEntry(WPUStatesManagerPtrConst statesMgr)
: m_parent(nullptr)
, m_currentIconType(IconTypeSearch)
, m_entry(NULL)
, m_entryContextMenuOpen(false)
, m_searchTextEntered(false)
, m_first_click(true)
-#if PROFILE_MOBILE
+ , m_isPageLoading(false)
+ , m_statesMgr(statesMgr)
, m_rightIconType(RightIconType::NONE)
-#endif
{
std::string edjFilePath = EDJE_DIR;
edjFilePath.append("WebPageUI/URIEntry.edj");
elm_entry_single_line_set(m_entry, EINA_TRUE);
elm_entry_scrollable_set(m_entry, EINA_TRUE);
elm_entry_input_panel_layout_set(m_entry, ELM_INPUT_PANEL_LAYOUT_URL);
-#if PROFILE_MOBILE
elm_object_signal_callback_add(m_entry_layout, "right_icon_clicked", "ui", _uri_right_icon_clicked, this);
-#endif
setUrlGuideText(GUIDE_TEXT_UNFOCUSED);
if (elm_object_focus_get(m_entry) == EINA_FALSE) {
if (!m_URI.empty()) {
elm_entry_entry_set(m_entry, elm_entry_utf8_to_markup(m_URI.c_str()));
- #if PROFILE_MOBILE
m_rightIconType = RightIconType::NONE;
- #endif
} else
elm_entry_entry_set(m_entry, elm_entry_utf8_to_markup(""));
}
-#if PROFILE_MOBILE
updateSecureIcon();
-#endif
}
void URIEntry::setFavIcon(std::shared_ptr< tizen_browser::tools::BrowserImage > favicon)
{
BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
URIEntry* self = static_cast<URIEntry*>(data);
-#if PROFILE_MOBILE
self->showCancelIcon();
-#endif
// TODO This line should be uncommented when input events will be fixed
// elm_entry_select_none(self->m_entry);
self->selectionTool();
} else {
self->setSearchIcon();
}
-#if PROFILE_MOBILE
self->showCancelIcon();
-#endif
if(entry.find(" ") != std::string::npos)
return;
self->uriEntryEditingChangedByUser(std::make_shared<std::string>(entry));
if (!self->m_entryContextMenuOpen) {
self->m_entrySelectionState = SelectionState::SELECTION_NONE;
-#if PROFILE_MOBILE
self->mobileEntryUnfocused();
- self->showCancelIcon();
-#endif
+ if (!self->m_statesMgr->equals(WPUState::QUICK_ACCESS) && !self->m_statesMgr->equals(WPUState::MAIN_INCOGNITO_PAGE)) {
+ if (self->m_isPageLoading)
+ self->showStopIcon();
+ else
+ self->showReloadIcon();
+ } else {
+ self->hideRightIcon();
+ }
}
self->m_first_click = true;
elm_entry_select_none(self->m_entry);
-#if PROFILE_MOBILE
self->showSecureIcon(self->m_showSecureIcon, self->m_securePageIcon);
-#endif
elm_entry_entry_set(self->m_entry, elm_entry_utf8_to_markup(self->m_URI.c_str()));
}
BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
URIEntry* self = static_cast<URIEntry*>(data);
if (!self->m_entryContextMenuOpen) {
-#if PROFILE_MOBILE
self->mobileEntryFocused();
-#endif
} else {
self->m_entryContextMenuOpen = false;
}
self->editingCompleted();
return;
}
- if (keynameEsc == ev->keyname) {
-#if !PROFILE_MOBILE
- elm_object_focus_set(self->m_entry, EINA_TRUE);
-#endif
- return;
- }
}
void URIEntry::editingCompleted()
elm_entry_input_panel_hide(m_entry);
m_URI = rewriteURI(userString);
uriChanged(m_URI);
-#if !PROFILE_MOBILE
- elm_object_focus_set(m_entry, EINA_TRUE);
-#else
showSecureIcon(false, false);
-#endif
}
std::string URIEntry::rewriteURI(const std::string& url)
return url;
}
+void URIEntry::editingCanceled()
+{
+ elm_entry_input_panel_hide(m_entry);
+ setCurrentFavIcon();
+}
+
+void URIEntry::loadStarted()
+{
+ m_isPageLoading = true;
+ elm_object_signal_emit(m_entry_layout, "shiftright_uribg", "ui");
+ showStopIcon();
+}
+
+void URIEntry::loadFinished()
+{
+ m_isPageLoading = false;
+ showReloadIcon();
+}
+
void URIEntry::AddAction(sharedAction action)
{
m_actions.push_back(action);
elm_object_focus_set(m_entry, EINA_FALSE);
}
-void URIEntry::setFocus()
-{
- BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
-#if !PROFILE_MOBILE
- elm_object_focus_set(m_entry, EINA_TRUE);
-#endif
-}
-
bool URIEntry::hasFocus() const
{
BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
}
-#if PROFILE_MOBILE
void URIEntry::_uri_right_icon_clicked(void* data, Evas_Object* /*obj*/, const char* /*emission*/, const char* /*source*/)
{
BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
elm_entry_entry_set(self->m_entry, "");
elm_object_signal_emit(self->m_entry_layout, "hide_icon", "ui");
break;
- case RightIconType::SECURE:
- self->secureIconClicked();
+ case RightIconType::RELOAD:
+ self->reloadPage();
+ break;
+ case RightIconType::STOP_LOADING:
+ self->stopLoadingPage();
break;
default:
BROWSER_LOGW("[%s:%d] Unknown icon type!", __PRETTY_FUNCTION__, __LINE__);
showSecureIcon(show, secure);
}
+void URIEntry::showStopIcon()
+{
+ BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+ m_rightIconType = RightIconType::STOP_LOADING;
+ elm_object_signal_emit(m_entry_layout, "show_cancel_icon", "ui");
+}
+
+void URIEntry::showReloadIcon()
+{
+ BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+ m_rightIconType = RightIconType::RELOAD;
+ elm_object_signal_emit(m_entry_layout, "show,reload,icon", "");
+}
+
+void URIEntry::hideRightIcon()
+{
+ BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
+ elm_object_signal_emit(m_entry_layout, "hide_icon", "ui");
+}
+
void URIEntry::showSecureIcon(bool show, bool secure)
{
BROWSER_LOGD("[%s:%d] [ show : %d, secure : %d] ", __PRETTY_FUNCTION__, __LINE__, show, secure);
- m_rightIconType = RightIconType::SECURE;
m_securePageIcon = secure;
m_showSecureIcon = show;
if (show) {
elm_object_signal_emit(m_entry_layout, "show,unsecure,icon", "");
}
else {
- elm_object_signal_emit(m_entry_layout, "hide_icon", "ui");
+ // TODO: new signal for left side secure icon needed
}
}
-#endif
}
}
#include "BasicUI/Action.h"
#include "BrowserImage.h"
#include "EflTools.h"
+#include "WebPageUIStatesManager.h"
namespace tizen_browser {
SELECTION_KEEP
, SELECTION_NONE
};
- URIEntry();
+ URIEntry(WPUStatesManagerPtrConst statesMgr);
~URIEntry();
void init(Evas_Object* parent);
Evas_Object* getContent();
// uri edition change (by a user)
boost::signals2::signal<void (const std::shared_ptr<std::string>)> uriEntryEditingChangedByUser;
-#if PROFILE_MOBILE
boost::signals2::signal<void ()> mobileEntryFocused;
boost::signals2::signal<void ()> mobileEntryUnfocused;
boost::signals2::signal<void ()> secureIconClicked;
boost::signals2::signal<bool (const std::string&)> isValidCert;
+ boost::signals2::signal<void ()> reloadPage;
+ boost::signals2::signal<void ()> stopLoadingPage;
void updateSecureIcon();
void showSecureIcon(bool show, bool secure);
-#endif
void setFavIcon(std::shared_ptr<tizen_browser::tools::BrowserImage> favicon);
void setCurrentFavIcon();
*/
std::list<sharedAction> actions() const;
- /**
- * \brief Sets Focus to URI entry.
- */
- void setFocus();
-
/**
* @brief Remove focus form URI
*/
bool hasFocus() const;
void setDisabled(bool disabled);
+ void editingCanceled();
+ void loadStarted();
+ void loadFinished();
private:
static void activated(void* data, Evas_Object* obj, void* event_info);
static void _uri_entry_double_clicked(void* data, Evas_Object* obj, void* event_info);
static void _uri_entry_selection_changed(void* data, Evas_Object* obj, void* event_info);
static void _uri_entry_longpressed(void* data, Evas_Object* obj, void* event_info);
-#if PROFILE_MOBILE
enum class RightIconType {
NONE,
CANCEL,
- SECURE
+ RELOAD,
+ STOP_LOADING
};
static void _uri_right_icon_clicked(void* data, Evas_Object*, const char*, const char*);
void showCancelIcon();
-#endif
+ void showStopIcon();
+ void showReloadIcon();
+ void hideRightIcon();
private:
Evas_Object* m_parent;
bool m_entryContextMenuOpen;
bool m_searchTextEntered;
bool m_first_click;
-#if PROFILE_MOBILE
+ bool m_isPageLoading;
+ WPUStatesManagerPtrConst m_statesMgr;
RightIconType m_rightIconType;
bool m_securePageIcon;
bool m_showSecureIcon;
-#endif
};
, m_errorLayout(nullptr)
, m_privateLayout(nullptr)
, m_bookmarkManagerButton(nullptr)
- , m_URIEntry(new URIEntry())
, m_statesMgr(std::make_shared<WebPageUIStatesManager>(WPUState::MAIN_WEB_PAGE))
+ , m_URIEntry(new URIEntry(m_statesMgr))
, m_urlHistoryList(std::make_shared<UrlHistoryList>(getStatesMgr()))
, m_webviewLocked(false)
, m_WebPageUIvisible(false)
-#if PROFILE_MOBILE && GESTURE
+#if GESTURE
, m_gestureLayer(nullptr)
, m_uriBarHidden(false)
#endif
evas_object_show(elm_object_part_content_get(m_mainLayout, "web_view"));
evas_object_show(m_URIEntry->getContent());
- evas_object_show(elm_object_part_content_get(m_mainLayout, "uri_bar_buttons_left"));
+ evas_object_show(elm_object_part_content_get(m_mainLayout, "bottom_toolbar"));
evas_object_show(elm_object_part_content_get(m_mainLayout, "uri_bar_buttons_right"));
if (m_statesMgr->equals(WPUState::QUICK_ACCESS)) {
- evas_object_hide(m_leftButtonBar->getContent());
+ evas_object_hide(m_bottomButtonBar->getContent());
elm_object_signal_emit(m_mainLayout, "shiftback_uri", "ui");
showQuickAccess();
}
m_WebPageUIvisible = true;
- elm_object_event_callback_add(m_leftButtonBar->getContent(), _cb_down_pressed_on_urlbar, this);
+ elm_object_event_callback_add(m_bottomButtonBar->getContent(), _cb_down_pressed_on_urlbar, this);
elm_object_event_callback_add(m_rightButtonBar->getContent(), _cb_down_pressed_on_urlbar, this);
elm_object_event_callback_add(m_URIEntry->getContent(), _cb_down_pressed_on_urlbar, this);
-#if PROFILE_MOBILE && GESTURE
+#if GESTURE
elm_gesture_layer_cb_add(m_gestureLayer, ELM_GESTURE_N_LINES, ELM_GESTURE_STATE_MOVE, _gesture_move, this);
elm_gesture_layer_line_min_length_set(m_gestureLayer, SWIPE_MOMENTUM_TRESHOLD);
elm_gesture_layer_line_distance_tolerance_set(m_gestureLayer, SWIPE_MOMENTUM_TRESHOLD);
evas_object_hide(elm_object_part_content_get(m_mainLayout, "web_view"));
evas_object_hide(m_URIEntry->getContent());
- evas_object_hide(elm_object_part_content_get(m_mainLayout, "uri_bar_buttons_left"));
+ evas_object_hide(elm_object_part_content_get(m_mainLayout, "bottom_toolbar"));
evas_object_hide(elm_object_part_content_get(m_mainLayout, "uri_bar_buttons_right"));
m_WebPageUIvisible = false;
- elm_object_event_callback_del(m_leftButtonBar->getContent(), _cb_down_pressed_on_urlbar, this);
+ elm_object_event_callback_del(m_bottomButtonBar->getContent(), _cb_down_pressed_on_urlbar, this);
elm_object_event_callback_del(m_rightButtonBar->getContent(), _cb_down_pressed_on_urlbar, this);
elm_object_event_callback_del(m_URIEntry->getContent(), _cb_down_pressed_on_urlbar, this);
-#if PROFILE_MOBILE && GESTURE
+#if GESTURE
elm_gesture_layer_cb_del(m_gestureLayer, ELM_GESTURE_N_LINES, ELM_GESTURE_STATE_MOVE, _gesture_move, this);
#endif
-#if PROFILE_MOBILE
hideMoreMenu();
hideFindOnPage();
-#endif
}
void WebPageUI::loadStarted()
{
BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
showProgressBar();
- elm_object_signal_emit(m_URIEntry->getContent(), "shiftright_uribg", "ui");
+ m_URIEntry->loadStarted();
elm_object_signal_emit(m_mainLayout, "shiftright_uri", "ui");
- m_leftButtonBar->setActionForButton("refresh_stop_button", m_stopLoading);
}
void WebPageUI::progressChanged(double progress)
void WebPageUI::loadFinished()
{
BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
- m_leftButtonBar->setActionForButton("refresh_stop_button", m_reload);
+ m_URIEntry->loadFinished();
hideProgressBar();
-#if PROFILE_MOBILE
m_URIEntry->updateSecureIcon();
-#endif
}
void WebPageUI::toIncognito(bool incognito)
M_ASSERT(content);
hideWebView();
elm_object_part_content_set(m_mainLayout, "web_view", content);
-#if PROFILE_MOBILE && GESTURE
+#if GESTURE
elm_gesture_layer_attach(m_gestureLayer, content);
#endif
-#if PROFILE_MOBILE
evas_object_smart_callback_add(content, "mouse,down", _content_clicked, this);
-#endif
evas_object_show(content);
}
if (!m_errorLayout)
createErrorLayout();
setMainContent(m_errorLayout);
- evas_object_show(m_leftButtonBar->getContent());
+ evas_object_show(m_bottomButtonBar->getContent());
elm_object_signal_emit(m_mainLayout, "shiftright_uri", "ui");
elm_object_signal_emit(m_URIEntry->getContent(), "shiftright_uribg", "ui");
setErrorButtons();
-#if !PROFILE_MOBILE
- refreshFocusChain();
-#endif
}
void WebPageUI::switchViewToIncognitoPage()
if (!m_privateLayout)
createPrivateLayout();
setMainContent(m_privateLayout);
-#if PROFILE_MOBILE
orientationChanged();
-#endif
- evas_object_show(m_leftButtonBar->getContent());
+ evas_object_show(m_bottomButtonBar->getContent());
elm_object_signal_emit(m_mainLayout, "shiftright_uri", "ui");
elm_object_signal_emit(m_URIEntry->getContent(), "shiftright_uribg", "ui");
setPrivateButtons();
-#if !PROFILE_MOBILE
- refreshFocusChain();
-#endif
m_URIEntry->changeUri("");
- m_URIEntry->setFocus();
}
void WebPageUI::switchViewToWebPage(Evas_Object* content, const std::string uri)
m_statesMgr->set(WPUState::MAIN_WEB_PAGE);
}
setMainContent(content);
-#if !PROFILE_MOBILE
- refreshFocusChain();
- elm_object_focus_custom_chain_append(m_mainLayout, content, NULL);
-#endif
- evas_object_show(m_leftButtonBar->getContent());
+ evas_object_show(m_bottomButtonBar->getContent());
elm_object_signal_emit(m_mainLayout, "shiftright_uri", "ui");
elm_object_signal_emit(m_URIEntry->getContent(), "shiftright_uribg", "ui");
updateURIBar(uri);
m_statesMgr->set(WPUState::QUICK_ACCESS);
toIncognito(false);
setMainContent(content);
- evas_object_hide(m_leftButtonBar->getContent());
+ evas_object_hide(m_bottomButtonBar->getContent());
elm_object_signal_emit(m_mainLayout, "shiftback_uri", "ui");
elm_object_signal_emit(m_URIEntry->getContent(), "shiftback_uribg", "ui");
hideProgressBar();
-#if !PROFILE_MOBILE
- refreshFocusChain();
-#endif
m_URIEntry->changeUri("");
-#if PROFILE_MOBILE
m_URIEntry->showSecureIcon(false, false);
-#endif
- m_URIEntry->setFocus();
showQuickAccess();
}
{
BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
if (tabs == 0) {
- elm_object_part_text_set(m_rightButtonBar->getContent(), "tabs_number", "");
+ elm_object_part_text_set(m_bottomButtonBar->getContent(), "tabs_number", "");
} else {
- elm_object_part_text_set(m_rightButtonBar->getContent(), "tabs_number", (boost::format("%1%") % tabs).str().c_str());
+ elm_object_part_text_set(m_bottomButtonBar->getContent(), "tabs_number", (boost::format("%1%") % tabs).str().c_str());
}
}
void WebPageUI::unlockUrlHistoryList()
{
-#if !PROFILE_MOBILE
- refreshFocusChain();
-#endif
elm_object_focus_set(m_URIEntry->getEntryWidget(), EINA_TRUE);
getUrlHistoryList()->onListWidgetFocusChange(false);
}
elm_object_focus_set(m_rightButtonBar->getButton("tab_button"), EINA_TRUE);
}
-#if !PROFILE_MOBILE
-void WebPageUI::onRedKeyPressed()
-{
- BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
- if(isWebPageUIvisible()) {
- if(m_statesMgr->equals(WPUState::MAIN_WEB_PAGE)) {
- if(m_webviewLocked) {
- refreshFocusChain();
- m_URIEntry->setFocus();
- m_webviewLocked = false;
- }
- }
- }
-}
-
-void WebPageUI::onYellowKeyPressed()
-{
- if (!isWebPageUIvisible())
- return;
- if (!getUrlHistoryList()->getGenlistVisible())
- return;
- if (getUrlHistoryList()->getWidgetFocused()) {
- unlockUrlHistoryList();
- } else {
- lockUrlHistoryList();
- }
-}
-#endif
-
-#if PROFILE_MOBILE
void WebPageUI::orientationChanged()
{
BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
qaOrientationChanged();
}
}
-#endif
void WebPageUI::showContextMenu()
{
createActions();
- // left buttons
- m_leftButtonBar = std::unique_ptr<ButtonBar>(new ButtonBar(m_mainLayout, "WebPageUI/LeftButtonBar.edj", "left_button_bar"));
- m_leftButtonBar->addAction(m_back, "prev_button");
- m_leftButtonBar->addAction(m_forward, "next_button");
- m_leftButtonBar->addAction(m_reload, "refresh_stop_button");
-
- //register action that will be used later by buttons"
- m_leftButtonBar->registerEnabledChangedCallback(m_stopLoading, "refresh_stop_button");
+ // bottom buttons
+ m_bottomButtonBar = std::unique_ptr<ButtonBar>(new ButtonBar(m_mainLayout, "WebPageUI/BottomButtonBar.edj", "bottom_button_bar"));
+ m_bottomButtonBar->addAction(m_back, "prev_button");
+ m_bottomButtonBar->addAction(m_forward, "next_button");
+ m_bottomButtonBar->addAction(m_homePage, "home_button");
+ m_bottomButtonBar->addAction(m_bookmarks, "bookmarks_button");
+ m_bottomButtonBar->addAction(m_tabs, "tabs_button");
// right buttons
m_rightButtonBar = std::unique_ptr<ButtonBar>(new ButtonBar(m_mainLayout, "WebPageUI/RightButtonBar.edj", "right_button_bar"));
- m_rightButtonBar->addAction(m_tab, "tab_button");
- m_rightButtonBar->addAction(m_showMoreMenu, "setting_button");
+ m_rightButtonBar->addAction(m_addTab, "tab_button");
//URL bar (Evas Object is shipped by URIEntry object)
m_URIEntry->init(m_mainLayout);
elm_object_part_content_set(m_mainLayout, "uri_entry", m_URIEntry->getContent());
- elm_object_part_content_set(m_mainLayout, "uri_bar_buttons_left", m_leftButtonBar->getContent());
+ elm_object_part_content_set(m_mainLayout, "bottom_swallow", m_bottomButtonBar->getContent());
elm_object_part_content_set(m_mainLayout, "uri_bar_buttons_right", m_rightButtonBar->getContent());
elm_layout_signal_callback_add(m_URIEntry->getContent(), "slide_websearch", "elm", faviconClicked, this);
-#if PROFILE_MOBILE
edje_object_signal_callback_add(elm_layout_edje_get(m_mainLayout), "mouse,clicked,1", "moremenu_dimmed_bg", _more_menu_background_clicked, this);
-#endif
// elm_theme_extension_add(nullptr, edjePath("WebPageUI/UrlHistoryList.edj").c_str());
// m_urlHistoryList->setMembers(m_mainLayout, m_URIEntry->getEntryWidget());
connectActions();
-#if PROFILE_MOBILE && GESTURE
+#if GESTURE
// will be attatch on every 'setMainContent'
m_gestureLayer = elm_gesture_layer_add(m_mainLayout);
#endif
webpageUI->bookmarkManagerClicked();
}
-#if PROFILE_MOBILE
void WebPageUI::setContentFocus()
{
BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
WebPageUI* webPageUI = static_cast<WebPageUI*>(data);
webPageUI->hideMoreMenu();
}
-#endif
void WebPageUI::createActions()
{
BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
m_back = sharedAction(new Action(_("IDS_BR_BUTTON_BACK_ABB")));
- m_back->setIcon("browser/toolbar_prev");
+ m_back->setIcon("toolbar_prev");
m_forward = sharedAction(new Action(_("IDS_BR_SK_NEXT")));
- m_forward->setIcon("browser/toolbar_next");
-
- m_stopLoading = sharedAction(new Action(_("IDS_BR_OPT_STOP")));
- m_stopLoading->setIcon("browser/toolbar_stop");
-
- m_reload = sharedAction(new Action("Reload"));
- m_reload->setIcon("browser/toolbar_reload");
- m_tab = sharedAction(new Action(_("IDS_BR_SK_TABS")));
- m_tab->setIcon("browser/toolbar_tab");
-
- m_showMoreMenu = sharedAction(new Action("More_Menu"));
- m_showMoreMenu->setIcon("browser/toolbar_setting");
-
-#if !PROFILE_MOBILE
- m_back->setToolTip(_("IDS_BR_SK_PREVIOUS"));
- m_forward->setToolTip(_("IDS_BR_SK_NEXT"));
- m_stopLoading->setToolTip(_("IDS_BR_OPT_STOP"));
- m_reload->setToolTip("Reload");
- m_tab->setToolTip("Tab Manager");
- m_showMoreMenu->setToolTip("More Menu");
-#endif
+ m_forward->setIcon("toolbar_next");
+
+ m_addTab = sharedAction(new Action("Add tab"));
+ m_addTab->setIcon("add_tab");
+
+ m_homePage = sharedAction(new Action("Home"));
+ m_homePage->setIcon("toolbar_home");
+
+ m_bookmarks = sharedAction(new Action(_("IDS_BR_BODY_BOOKMARKS")));
+ m_bookmarks->setIcon("toolbar_bookmark");
+
+ m_tabs = sharedAction(new Action(_("IDS_BR_SK_TABS")));
+ m_tabs->setIcon("toolbar_tabs");
}
void WebPageUI::connectActions()
{
BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
- //left bar
+ //bottom bar
m_back->triggered.connect(boost::bind(&WebPageUI::backPageConnect, this));
m_forward->triggered.connect(boost::bind(&WebPageUI::forwardPageConnect, this));
- m_stopLoading->triggered.connect(boost::bind(&WebPageUI::stopLoadingPageConnect, this));
- m_reload->triggered.connect(boost::bind(&WebPageUI::reloadPageConnect, this));
+ m_tabs->triggered.connect(WebPageUI::showTabUI);
+ m_bookmarks->triggered.connect(WebPageUI::showBookmarksUI);
//right bar
- m_tab->triggered.connect(boost::bind(&WebPageUI::showTabUIConnect, this));
- m_showMoreMenu->triggered.connect(boost::bind(&WebPageUI::showMoreMenuConnect, this));
+ m_addTab->triggered.connect(boost::bind(&WebPageUI::addNewTabConnect, this));
}
void WebPageUI::showProgressBar()
void WebPageUI::setErrorButtons()
{
BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
- m_leftButtonBar->setActionForButton("refresh_stop_button", m_reload);
- m_stopLoading->setEnabled(false);
- m_reload->setEnabled(true);
m_forward->setEnabled(false);
}
void WebPageUI::setPrivateButtons()
{
BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
- m_stopLoading->setEnabled(false);
- m_reload->setEnabled(false);
m_forward->setEnabled(false);
}
{
BROWSER_LOGD("[%s:%d] URI:%s", __PRETTY_FUNCTION__, __LINE__, uri.c_str());
m_URIEntry->changeUri(uri);
- m_leftButtonBar->setActionForButton("refresh_stop_button", m_reload);
-
- m_stopLoading->setEnabled(true);
- m_reload->setEnabled(true);
hideProgressBar();
}
return std::string(EDJE_DIR) + file;
}
-void WebPageUI::showTabUIConnect()
-{
- hideUI();
- showTabUI();
-}
void WebPageUI::showMoreMenuConnect()
{
-#if !PROFILE_MOBILE
- hideUI();
-#else
hideFindOnPage();
-#endif
showMoreMenu();
}
-#if !PROFILE_MOBILE
-void WebPageUI::refreshFocusChain()
-{
- // set custom focus chain
- elm_object_focus_custom_chain_unset(m_mainLayout);
- elm_object_focus_custom_chain_append(m_mainLayout, m_rightButtonBar->getContent(), NULL);
- if(!m_statesMgr->equals(WPUState::QUICK_ACCESS)) {
- elm_object_focus_custom_chain_append(m_mainLayout, m_leftButtonBar->getContent(), NULL);
- elm_object_focus_custom_chain_append(m_mainLayout, m_bookmarkManagerButton, NULL);
- } else {
- m_reload->setEnabled(false);
- }
- elm_object_focus_custom_chain_append(m_mainLayout, m_URIEntry->getContent(), NULL);
-}
-#endif
-
-#if PROFILE_MOBILE && GESTURE
+#if GESTURE
Evas_Event_Flags WebPageUI::_gesture_move(void* data , void* event_info)
{
auto info = static_cast<Elm_Gesture_Line_Info*>(event_info);
}
#endif
-#if PROFILE_MOBILE
void WebPageUI::mobileEntryFocused()
{
BROWSER_LOGD("[%s:%d] ", __PRETTY_FUNCTION__, __LINE__);
return ECORE_CALLBACK_CANCEL;
}
-#endif
-
} // namespace tizen_browser
} // namespace base_ui
class WebPageUIStatesManager;
enum class WPUState;
-typedef std::shared_ptr<WebPageUIStatesManager> WPUStatesManagerPtr;
-typedef std::shared_ptr<const WebPageUIStatesManager> WPUStatesManagerPtrConst;
class UrlHistoryList;
typedef std::shared_ptr<UrlHistoryList> UrlHistoryPtr;
: public interfaces::AbstractContextMenu
, public tizen_browser::core::AbstractService
, public tizen_browser::interfaces::AbstractUIComponent
-#if PROFILE_MOBILE
, public tizen_browser::interfaces::AbstractRotatable
-#endif
{
public:
WebPageUI();
virtual void showUI();
virtual void hideUI();
void createDummyButton();
-#if PROFILE_MOBILE
virtual void orientationChanged() override;
-#endif
//AbstractContextMenu interface implementation
virtual void showContextMenu() override;
void setTabsNumber(int tabs);
void setBackButtonEnabled(bool enabled) { m_back->setEnabled(enabled); }
void setForwardButtonEnabled(bool enabled) { m_forward->setEnabled(enabled); }
- void setReloadButtonEnabled(bool enabled) { m_reload->setEnabled(enabled); }
- void setStopButtonEnabled(bool enabled) { m_stopLoading->setEnabled(enabled); }
- void setMoreMenuButtonEnabled(bool enabled) { m_showMoreMenu->setEnabled(enabled); }
void lockWebview();
void lockUrlHistoryList();
void unlockUrlHistoryList();
void setFocusOnSuspend();
-#if PROFILE_MOBILE
void mobileEntryFocused();
void mobileEntryUnfocused();
void setContentFocus();
static Eina_Bool _hideDelay(void *data);
-#else
- void onRedKeyPressed();
- void onYellowKeyPressed();
-#endif
boost::signals2::signal<void ()> backPage;
boost::signals2::signal<void ()> forwardPage;
- boost::signals2::signal<void ()> stopLoadingPage;
- boost::signals2::signal<void ()> reloadPage;
boost::signals2::signal<void ()> showTabUI;
-#if PROFILE_MOBILE
+ boost::signals2::signal<void ()> showBookmarksUI;
boost::signals2::signal<void ()> hideMoreMenu;
boost::signals2::signal<void ()> qaOrientationChanged;
-#else
- boost::signals2::signal<void ()> showZoomNavigation;
-#endif
boost::signals2::signal<void ()> showMoreMenu;
boost::signals2::signal<void ()> hideQuickAccess;
boost::signals2::signal<void ()> showQuickAccess;
boost::signals2::signal<void ()> bookmarkManagerClicked;
boost::signals2::signal<void ()> focusWebView;
boost::signals2::signal<void ()> unfocusWebView;
+ boost::signals2::signal<void ()> addNewTab;
//AbstractContextMenu signals
boost::signals2::signal<bool ()> isBookmark;
static void _bookmark_manager_clicked(void * data, Evas_Object *, void *);
static void _dummy_button_focused(void *data, Evas_Object *, void *);
static void _dummy_button_unfocused(void *data, Evas_Object *, void *);
-#if PROFILE_MOBILE
static void _more_menu_background_clicked(void* data, Evas_Object*, const char*, const char*);
static void _content_clicked(void * data, Evas_Object *, void *);
-#endif
-#if PROFILE_MOBILE && GESTURE
+#if GESTURE
static Evas_Event_Flags _gesture_move(void *data, void *event_info);
#endif
static void _cm_edit_qa_clicked(void*, Evas_Object*, void*);
void setMainContent(Evas_Object* content);
void updateURIBar(const std::string& uri);
std::string edjePath(const std::string& file);
-#if !PROFILE_MOBILE
- void refreshFocusChain();
-#endif
-#if PROFILE_MOBILE && GESTURE
+#if GESTURE
void gestureUp();
void gestureDown();
#endif
// wrappers to call singal as a reaction to other signal
void backPageConnect() { backPage(); }
void forwardPageConnect() { forwardPage(); }
- void stopLoadingPageConnect() { stopLoadingPage(); }
- void reloadPageConnect() { reloadPage(); }
- void showTabUIConnect();
void showMoreMenuConnect();
+ void addNewTabConnect() { addNewTab(); }
Evas_Object* m_parent;
Evas_Object* m_mainLayout;
Evas_Object* m_privateLayout;
Evas_Object* m_bookmarkManagerButton;
- std::unique_ptr<ButtonBar> m_leftButtonBar;
+ std::unique_ptr<ButtonBar> m_bottomButtonBar;
std::unique_ptr<ButtonBar> m_rightButtonBar;
- std::unique_ptr<URIEntry> m_URIEntry;
WPUStatesManagerPtr m_statesMgr;
+ std::unique_ptr<URIEntry> m_URIEntry;
UrlHistoryPtr m_urlHistoryList;
bool m_webviewLocked;
bool m_WebPageUIvisible;
sharedAction m_back;
sharedAction m_forward;
- sharedAction m_stopLoading;
- sharedAction m_reload;
- sharedAction m_tab;
- sharedAction m_showMoreMenu;
+ sharedAction m_addTab;
+ sharedAction m_homePage;
+ sharedAction m_bookmarks;
+ sharedAction m_tabs;
-#if PROFILE_MOBILE && GESTURE
+#if GESTURE
Evas_Object* m_gestureLayer;
bool m_uriBarHidden;
static const int SINGLE_FINGER = 1;
#include <map>
#include <string>
#include <initializer_list>
+#include <memory>
namespace tizen_browser {
namespace base_ui {
};
+typedef std::shared_ptr<WebPageUIStatesManager> WPUStatesManagerPtr;
+typedef std::shared_ptr<const WebPageUIStatesManager> WPUStatesManagerPtrConst;
+
} /* namespace base_ui */
} /* namespace tizen_browser */
--- /dev/null
+#include "ImageButton.edc"
+#include "../../../core/Tools/edc/Spacer.edc"
+
+#define BUTTON_WIDTH 120
+#define BUTTON_HEIGHT 94
+#define TOOLBAR_HEIGHT 96
+#define SPACER_SIZE 20
+
+#define ADD_BUTTON(NAME, RELATIVE_TO) \
+ part { \
+ name: NAME; \
+ type : SWALLOW; \
+ scale: 1; \
+ description { \
+ state: "default" 0.0; \
+ visible: 1; \
+ align: 0.0 0.0; \
+ fixed: 1 1; \
+ min: BUTTON_WIDTH BUTTON_HEIGHT; \
+ max: BUTTON_WIDTH BUTTON_HEIGHT; \
+ rel1 { relative: 1.0 0.0; to: RELATIVE_TO; } \
+ rel2 { relative: 0.0 0.0; } \
+ } \
+ description { \
+ state: "hidden" 0.0; \
+ inherit: "default" 0.0; \
+ visible: 0; \
+ } \
+ description { \
+ state: "visible" 0.0; \
+ inherit: "default" 0.0; \
+ visible: 1; \
+ } \
+ }
+
+collections { base_scale: 2.6;
+
+ IMAGE_BUTTON("toolbar_prev", ICON_SIZE, ICON_SIZE, "toolbar_ic_back.png")
+
+ IMAGE_BUTTON("toolbar_next", ICON_SIZE, ICON_SIZE, "toolbar_ic_forward.png")
+
+ IMAGE_BUTTON("toolbar_home", ICON_SIZE, ICON_SIZE, "toolbar_ic_home.png")
+
+ IMAGE_BUTTON("toolbar_bookmark", ICON_SIZE, ICON_SIZE, "toolbar_ic_bookmark.png")
+
+ IMAGE_BUTTON("toolbar_tabs", ICON_SIZE, ICON_SIZE, "toolbar_ic_tabs.png")
+
+ group {
+ name: "bottom_button_bar";
+
+ parts {
+ part {
+ name: "spacer_0";
+ type: SPACER;
+ scale: 1;
+ description {
+ state: "default" 0.0;
+ fixed: 1 1;
+ align: 0.0 0.0;
+ min: SPACER_SIZE BUTTON_HEIGHT;
+ max: SPACER_SIZE BUTTON_HEIGHT;
+ }
+ }
+
+ ADD_BUTTON("prev_button", "spacer_0")
+
+ ADD_SPACER_NEXT_TO("spacer_1", "prev_button", SPACER_SIZE, BUTTON_HEIGHT)
+
+ ADD_BUTTON("next_button", "spacer_1")
+
+ ADD_SPACER_NEXT_TO("spacer_2", "next_button", SPACER_SIZE, BUTTON_HEIGHT)
+
+ ADD_BUTTON("home_button", "spacer_2")
+
+ ADD_SPACER_NEXT_TO("spacer_3", "home_button", SPACER_SIZE, BUTTON_HEIGHT)
+
+ ADD_BUTTON("bookmarks_button", "spacer_3")
+
+ ADD_SPACER_NEXT_TO("spacer_4", "bookmarks_button", SPACER_SIZE, BUTTON_HEIGHT)
+
+ ADD_BUTTON("tabs_button", "spacer_4")
+
+ part {
+ name: "tabs_number";
+ type: TEXT;
+ scale: 1;
+ repeat_events: 1;
+ description{
+ state: "default" 0.0;
+ visible: 1;
+ fixed: 1 1;
+ align: 0.0 0.0;
+ color: 255 255 255 255;
+ min: BUTTON_WIDTH BUTTON_HEIGHT*3/4;
+ max: BUTTON_WIDTH BUTTON_HEIGHT*3/4;
+ rel1 { relative: 0.0 0.0; to: "tabs_button"; }
+ rel2 { relative: 1.0 1.0; to: "tabs_button"; }
+ text {
+ text: "";
+ font: "Tizen:style=Bold";
+ size: 19;
+ align: 0.5 0.5;
+ }
+ }
+ }
+
+ }
+ }
+}
#define __CONCAT1(X,Y) X##Y
#define __CONCAT(X,Y) __CONCAT1(X,Y)
-#if PROFILE_MOBILE
+#define ICON_SIZE 48
+
+#define IMAGE_BUTTON(NAME, W, H, IMG) \
+ group { \
+ name: NAME; \
+ images.image: IMG COMP; \
+ parts { \
+ part { \
+ name: "image"; \
+ type: IMAGE; \
+ mouse_events: 1; \
+ repeat_events: 0; \
+ description { \
+ state: "default" 0.0; \
+ min: W H; \
+ max: W H; \
+ image.normal: IMG; \
+ color: 105 105 105 255; \
+ } \
+ } \
+ } \
+ }
#define FOUR_STATE_IMAGE_BUTTON(CLASS_NAME, W, H, IMG_NORMAL, R, G, B) \
group { \
image: "round_rectangle_4X4.png" COMP; \
} \
parts { \
- part { name: high_layer; \
- scale:1; \
- type : IMAGE; \
- repeat_events: 1; \
- description { \
- state: "default" 0.0; \
- visible: 0; \
- color: R G B 255; \
- rel1 { to: "bg"; relative: 0 0; } \
- rel2 { to: "bg"; relative: 1 1; } \
- } \
- description { state: "highlight" 0.0; \
- inherit: "default" 0.0; \
- visible: 1; \
- image.normal: "round_rectangle_4X4.png"; \
- image.border: 4 4 4 4; \
- image.border_scale: 1; \
- image.middle: 1; \
- } \
- description { state: "disabled" 0.0; \
- inherit: "highlight" 0.0; \
- visible: 1; \
- color: R G B 102; \
- } \
- } \
part { \
name: "bg"; \
scale: 1; \
- type: IMAGE; \
+ type: RECT; \
description { state: "default" 0.0; \
min: W H; \
max: W H; \
fixed: 1 1; \
align: 0 0; \
- image.normal: IMG_NORMAL; \
color: 255 255 255 153; \
} \
description { state: "disabled" 0.0; \
} \
description { state: "highlight" 0.0; \
inherit: "default" 0.0; \
- color: 255 255 255 255; \
- } \
- } \
- part { name: "over2"; \
- type: RECT; \
- scale:1; \
- mouse_events: 1; \
- repeat_events: 1; \
- ignore_flags: ON_HOLD; \
- description { state: "default" 0.0; \
- color: 0 0 0 0; \
- rel1 { relative: 0 0; to: "bg"; } \
- rel2 { relative: 1 1; to: "bg"; } \
+ color: 0 0 255 255; \
} \
} \
- part { name: "over3"; \
+ part { name: high_layer; \
scale:1; \
- type: RECT; \
- mouse_events: 1; \
+ type : IMAGE; \
repeat_events: 1; \
- description { state: "default" 0.0; \
- color: 0 0 0 0; \
- rel1 { relative: 0 0; to: "bg"; } \
- rel2 { relative: 1 1; to: "bg"; } \
- } \
- } \
- part { name: "disabler"; \
- scale:1; \
- type: RECT; \
- repeat_events: 0; \
- mouse_events: 1; \
- description { state: "default" 0.0; \
- color: 0 0 0 0; \
+ description { \
+ state: "default" 0.0; \
visible: 0; \
- rel1 { relative: 0 0; to: "bg"; } \
- rel2 { relative: 1 1; to: "bg"; } \
+ color: R G B 255; \
+ rel1 { to: "bg"; relative: 0.1 0.1; } \
+ rel2 { to: "bg"; relative: 0.9 0.9; } \
+ image.normal: "round_rectangle_4X4.png"; \
+ image.border: 14 14 14 14; \
+ image.border_scale: 1; \
+ image.middle: 1; \
} \
- description { state: "disabled" 0.0; \
+ description { state: "highlight" 0.0; \
inherit: "default" 0.0; \
visible: 1; \
} \
- } \
- part { \
- name: "elm.swallow.content"; \
- scale:1; \
- type: SWALLOW; \
- description { state: "default" 0.0; \
- visible: 0; \
+ description { state: "disabled" 0.0; \
+ inherit: "highlight" 0.0; \
+ visible: 1; \
+ color: R G B 102; \
} \
} \
part { \
- name: "elm.swallow.text"; \
+ name: "top_spacer"; \
scale: 1; \
- type: TEXT; \
- description { state: "default" 0.0; \
+ type: RECT; \
+ description { \
visible: 0; \
- text { \
- min: 0 0; \
- } \
+ min: 0 10; \
+ max: -1 10; \
+ align: 0 0; \
+ rel1 {to: "bg"; relative: 0 0; } \
+ rel2 {to: "bg"; relative: 1 1; } \
} \
} \
part { \
- name: "elm.swallow.end"; \
+ name: "img"; \
scale: 1; \
- type: SWALLOW; \
+ type: IMAGE; \
description { state: "default" 0.0; \
- visible: 0; \
- } \
- } \
- } \
- programs { \
- program { \
- name: "disable"; \
- signal: "elm,state,disabled"; \
- source: "elm"; \
- action: STATE_SET "disabled" 0.0; \
- target: "bg"; \
- target: "disabler"; \
- } \
- program { \
- name: "enable"; \
- signal: "elm,state,enabled"; \
- source: "elm"; \
- action: STATE_SET "default" 0.0; \
- target: "bg"; \
- target: "disabler"; \
- } \
- program { \
- name: "mouse_down"; \
- signal: "mouse,down,1"; \
- source: "over2"; \
- script { \
- emit("elm,action,press", ""); \
+ rel1 { to: "top_spacer"; relative: 0 1; } \
+ rel2 { to: "bg"; relative: 1 1; } \
+ fixed: 1 1; \
+ align: 0.5 0; \
+ min: 48 48; \
+ max: 48 48; \
+ image.normal: IMG_NORMAL; \
+ color: 105 105 105 255; \
} \
- after: "focused"; \
- } \
- program { \
- name: "mouse_up"; \
- signal: "mouse,up,1"; \
- source: "over2"; \
- script { \
- emit("elm,action,unpress", ""); \
+ description { state: "disabled" 0.0; \
+ inherit: "default" 0.0; \
+ color: 0 255 0 51; \
} \
- after: "unfocused"; \
- } \
- program { \
- name: "mouse_click"; \
- signal: "mouse,clicked,1"; \
- source: "over2"; \
- script { \
- emit("elm,action,click", ""); \
+ description { state: "highlight" 0.0; \
+ inherit: "default" 0.0; \
+ color: 255 0 0 255; \
} \
} \
- program { \
- name: "mouse_down_disabled"; \
- signal: "mouse,down,*"; \
- source: "disabler"; \
- action: STATE_SET "disabled" 0.0; \
- target: "high_layer"; \
- target: "bg"; \
- } \
- program { \
- name: "mouse_up_disabled"; \
- signal: "mouse,up,*"; \
- source: "disabler"; \
- action: STATE_SET "default" 0.0; \
- target: "high_layer"; \
- } \
- program { \
- name: "focused"; \
- action: STATE_SET "highlight" 0.0; \
- target: "high_layer"; \
- target: "bg"; \
- } \
- program { \
- name: "unfocused"; \
- action: STATE_SET "default" 0.0; \
- target: "high_layer"; \
- target: "bg"; \
- } \
- } \
- }
-
-#else
-
-#define FOUR_STATE_IMAGE_BUTTON(CLASS_NAME, W, H, IMG_NORMAL, R, G, B) \
- group { \
- name: __CONCAT("elm/button/base/", CLASS_NAME); \
- min: W H; \
- max: W H; \
- data { item: "focus_highlight" "off"; } \
- images { \
- image: IMG_NORMAL COMP; \
- image: "round_rectangle_4X4.png" COMP; \
- } \
- parts { \
- part { name: high_layer; \
- scale:1; \
- type : IMAGE; \
+ part { \
+ name: "text_spacer"; \
+ scale: 1; \
+ type: RECT; \
repeat_events: 1; \
description { \
- state: "default" 0.0; \
visible: 0; \
- color: R G B 255; \
- rel1 { to: "bg"; relative: 0 0; } \
- rel2 { to: "bg"; relative: 1 1; } \
- } \
- description { state: "highlight" 0.0; \
- inherit: "default" 0.0; \
- visible: 1; \
- image.normal: "round_rectangle_4X4.png"; \
- image.border: 4 4 4 4; \
- image.border_scale: 1; \
- image.middle: 1; \
- } \
- description { state: "disabled" 0.0; \
- inherit: "highlight" 0.0; \
- visible: 1; \
- color: R G B 102; \
+ min: 0 60; \
+ max: -1 60; \
+ align: 0 0; \
+ rel1 {to: "bg"; relative: 0 0; } \
+ rel2 {to: "bg"; relative: 1 1; } \
} \
} \
part { \
- name: "bg"; \
+ name: "elm.swallow.text"; \
scale: 1; \
- type: IMAGE; \
+ type: TEXT; \
+ repeat_events: 1; \
description { state: "default" 0.0; \
- min: W H; \
- max: W H; \
+ visible: 1; \
+ rel1 { to: "text_spacer"; relative: 0 1; } \
+ rel2 { to: "bg"; relative: 1 1; } \
fixed: 1 1; \
align: 0 0; \
- image.normal: IMG_NORMAL; \
- color: 255 255 255 153; \
- } \
- description { state: "disabled" 0.0; \
- inherit: "default" 0.0; \
- color: 255 255 255 51; \
- } \
- description { state: "highlight" 0.0; \
- inherit: "default" 0.0; \
- color: 255 255 255 255; \
+ color: 0 0 0 255; \
+ text { \
+ text: "Bookmarks"; \
+ font: "ATO005"; \
+ size: 24; \
+ align: 0.0 0.0; \
+ } \
} \
} \
part { name: "over2"; \
visible: 1; \
} \
} \
- part { \
- name: "elm.swallow.content"; \
- scale:1; \
- type: SWALLOW; \
- description { state: "default" 0.0; \
- visible: 0; \
- } \
- } \
- part { \
- name: "elm.swallow.text"; \
- scale: 1; \
- type: TEXT; \
- description { state: "default" 0.0; \
- visible: 0; \
- text { \
- min: 0 0; \
- } \
- } \
- } \
- part { \
- name: "elm.swallow.end"; \
- scale: 1; \
- type: SWALLOW; \
- description { state: "default" 0.0; \
- visible: 0; \
- } \
- } \
} \
programs { \
program { \
} \
} \
program { \
- name: "mouse_in_disabled"; \
- signal: "mouse,in"; \
+ name: "mouse_down_disabled"; \
+ signal: "mouse,down,*"; \
source: "disabler"; \
action: STATE_SET "disabled" 0.0; \
target: "high_layer"; \
target: "bg"; \
} \
program { \
- name: "mouse_out_disabled"; \
- signal: "mouse,out"; \
+ name: "mouse_up_disabled"; \
+ signal: "mouse,up,*"; \
source: "disabler"; \
action: STATE_SET "default" 0.0; \
target: "high_layer"; \
} \
program { \
name: "focused"; \
- signal: "elm,action,focus"; \
- source: "elm"; \
action: STATE_SET "highlight" 0.0; \
target: "high_layer"; \
target: "bg"; \
} \
program { \
name: "unfocused"; \
- signal: "elm,action,focus"; \
- source: "elm"; \
action: STATE_SET "default" 0.0; \
target: "high_layer"; \
target: "bg"; \
} \
} \
}
-
-#endif
+++ /dev/null
-#include "ImageButton.edc"
-#include "../../../core/Tools/edc/Spacer.edc"
-
-collections { base_scale: 2.0;
-
- FOUR_STATE_IMAGE_BUTTON("browser/toolbar_prev", 82, 102, "btn_bar_back_nor.png", 69, 149, 255)
-
- FOUR_STATE_IMAGE_BUTTON("browser/toolbar_next", 82, 102, "btn_bar_forward_nor.png", 69, 149, 255)
-
- FOUR_STATE_IMAGE_BUTTON("browser/toolbar_reload", 82, 102, "btn_bar_reload_nor.png", 69, 149, 255)
-
- FOUR_STATE_IMAGE_BUTTON("browser/toolbar_stop", 82, 102, "btn_bar_stop_nor.png", 69, 149, 255)
-
- group {
- name: "left_button_bar";
-
- parts {
-
- part {
- name: "prev_button";
- type : SWALLOW;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 1;
- align: 0.0 0.0;
- fixed: 1 1;
- min: 70 70;
- max: 70 70;
- rel1 { relative: 0.0 0.0; }
- rel2 { relative: 0.0 0.0; }
- }
- description {
- state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
-
- ADD_SPACER("spacer_1", "prev_button", 10, 70)
-
- part {
- name: "next_button";
- type : SWALLOW;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 1;
- align: 0.0 0.0;
- fixed: 1 1;
- min: 70 70;
- max: 70 70;
- rel1 { relative: 1.0 0.0; to: "spacer_1"; }
- rel2 { relative: 0.0 0.0; }
- }
- description {
- state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
-
- ADD_SPACER("spacer_2", "next_button", 10, 70)
-
- part {
- name: "refresh_stop_button";
- type : SWALLOW;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 1;
- align: 0.0 0.0;
- fixed: 1 1;
- min: 70 70;
- max: 70 70;
- rel1 { relative: 1.0 0.0; to: "spacer_2"; }
- rel2 { relative: 0.0 0.0; }
- }
- description {
- state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
-
- }
-}
-}
+++ /dev/null
-#include "ImageButton.edc"
-#include "../../../core/Tools/edc/Spacer.edc"
-
-collections { base_scale: 2.6;
-
- FOUR_STATE_IMAGE_BUTTON("browser/toolbar_prev", 64, 64, "btn_bar_back_nor.png", 224, 237, 251)
-
- FOUR_STATE_IMAGE_BUTTON("browser/toolbar_next", 64, 64, "btn_bar_forward_nor.png", 224, 237, 251)
-
- FOUR_STATE_IMAGE_BUTTON("browser/toolbar_reload", 64, 64, "btn_bar_reload_nor.png", 224, 237, 251)
-
- FOUR_STATE_IMAGE_BUTTON("browser/toolbar_stop", 64, 64, "btn_bar_stop_nor.png", 224, 237, 251)
-
- group {
- name: "left_button_bar";
-
- parts {
-
- part {
- name: "prev_button";
- type : SWALLOW;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 1;
- align: 0.0 0.0;
- fixed: 1 1;
- min: 64 64;
- max: 64 64;
- rel1 { relative: 0.0 0.0; }
- rel2 { relative: 0.0 0.0; }
- }
- description {
- state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
-
- ADD_SPACER("spacer_1", "prev_button", 2, 64)
-
- part {
- name: "next_button";
- type : SWALLOW;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 1;
- align: 0.0 0.0;
- fixed: 1 1;
- min: 64 64;
- max: 64 64;
- rel1 { relative: 1.0 0.0; to: "spacer_1"; }
- rel2 { relative: 0.0 0.0; }
- }
- description {
- state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
-
- ADD_SPACER("spacer_2", "next_button", 2, 64)
-
- part {
- name: "refresh_stop_button";
- type : SWALLOW;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 1;
- align: 0.0 0.0;
- fixed: 1 1;
- min: 64 64;
- max: 64 64;
- rel1 { relative: 1.0 0.0; to: "spacer_2"; }
- rel2 { relative: 0.0 0.0; }
- }
- description {
- state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
-
- }
-}
-}
-#include "../../../core/Tools/edc/InvisibleButton.edc"
+#define PARAGRAPH_SPACER(NAME, RELATIVE_TO, HEIGHT) \
+part { name: NAME; \
+ type: SPACER; \
+ scale: 1; \
+ description { \
+ state: "default" 0.0; \
+ rel1 { relative: 0.0 1.0; to: RELATIVE_TO; } \
+ rel2 { relative: 1.0 1.0; to: RELATIVE_TO; } \
+ fixed: 1 1; \
+ align: 0 0; \
+ min: 0 HEIGHT; \
+ max: 0 HEIGHT; \
+ } \
+ }
+
+#define CORNER_SPACER(NAME, RELATIVE_TO, WIDTH, HEIGHT) \
+part { name: NAME; \
+ type: SPACER; \
+ scale: 1; \
+ description { \
+ state: "default" 0.0; \
+ rel1 { relative: 0.0 0.0; to: RELATIVE_TO; } \
+ rel2 { relative: 1.0 1.0; to: RELATIVE_TO; offset: WIDTH 0; }\
+ fixed: 1 1; \
+ align: 0 0; \
+ min: WIDTH HEIGHT; \
+ max: WIDTH HEIGHT; \
+ } \
+ }
-collections { base_scale: 2.0;
+collections { base_scale: 2.6;
styles {
style {
name: "message_style";
- base: "font=Sans font_size=36 color=#676767 wrap=word align=0.5 ellipsis=1.0";
+ base: "font=Sans font_size=36 color=#333333 wrap=word align=0.5";
}
style {
name: "message_hint_style";
- base: "font=Sans font_size=28 color=#676767 wrap=word align=0.0 ellipsis=1.0";
+ base: "font=Sans font_size=31 color=#747474 wrap=word align=0.0";
}
}
group {
parts {
part {
name: "message_background";
+ scale: 1;
type: RECT;
mouse_events: 1;
description{
state: "default" 0.0;
visible: 1;
+ color: 242 242 242 255;
rel1.relative: 0 0;
rel2.relative: 1 1;
}
}
part {
name: "inco_message_background";
+ scale: 1;
type:RECT;
description{
state: "default" 0.0;
visible: 1;
- min: 920 356;
- max: 920 356;
+ color: 242 242 242 255;
+ min: 580 0;
+ max: 580 -1;
+ align: 0.5 0.0;
+ rel1 {
+ to: "message_background";
+ relative: 0 0.2;
+ }
+ rel2 {
+ to: "message_background";
+ relative: 1 1;
+ }
+ }
+ description {
+ state: "landscape" 0.0;
+ inherit: "default";
+ min: 916 410;
+ max: 916 -1;
+ rel1 {
+ to: "message_background";
+ relative: 0 0.1;
+ }
+ }
+ description {
+ state: "vertical" 0.0;
+ inherit: "default";
+ }
+ }
+ part {
+ name: "inco_text";
+ scale: 1;
+ type: TEXTBLOCK;
+ description {
+ state: "default" 0.0;
+ visible: 1;
fixed: 1 1;
- align: 0.5 0.5;
+ min: 580 38;
+ max: 580 38;
+ align: 0.5 0;
+ rel1 {
+ relative: 0 0;
+ to: "inco_message_background";
+ }
+ rel2 {
+ relative: 1 1;
+ to: "inco_message_background";
+ }
+ text {
+ min: 0 1;
+ max: 0 1;
+ style: "message_style";
+ text: "You've gone incognito.";
+ }
+ }
+ description {
+ state: "landscape" 0.0;
+ inherit: "default";
+ visible: 1;
+ min: 916 38;
+ max: 916 38;
+ }
+ description {
+ state: "vertical" 0.0;
+ inherit: "default";
+ visible: 1;
+ min: 580 38;
+ max: 580 38;
+ }
}
- }
+
+ PARAGRAPH_SPACER("spacer_1", "inco_text", 38)
+
part {
- name: "inco_dot";
- images {
- image: "ic_text_form.png" COMP;
- }
- type: "IMAGE";
+ name: content_1;
+ type: RECT;
+ scale: 1;
description {
state: "default" 0.0;
- visible: 1;
- min: 20 28;
- max: 20 28;
+ rel1 { relative: 0.0 1.0; to: "spacer_1";}
+ rel2 { relative: 1.0 1.0;}
+ fixed: 1 1;
align: 0 0;
- image.normal: "ic_text_form.png";
- rel1 {
- offset: 0 100;
- relative: 0 0;
- to: "inco_message_background";
- }
- rel2 {
- relative: 1 1;
- to: "inco_message_background";
+ visible: 0;
+ color: 255 255 255 0;
+ min: 580 160;
+ max: 580 160;
}
+ description {
+ state: "landscape" 0.0;
+ inherit: "default";
+ visible: 1;
+ min: 916 84;
+ max: 916 84;
}
- }
- part {
- name: "inco_dot2";
- images {
- image: "ic_text_form.png" COMP;
- }
- type: "IMAGE";
description {
- state: "default" 0.0;
+ state: "vertical" 0.0;
+ inherit: "default";
visible: 1;
- min: 20 28;
- max: 20 28;
- align: 0 0;
- image.normal: "ic_text_form.png";
- rel1 {
- offset: 0 216;
- relative: 0 0;
- to: "inco_message_background";
- }
- rel2 {
- relative: 1 1;
- to: "inco_message_background";
- }
+ min: 580 160;
+ max: 580 160;
}
}
+ CORNER_SPACER("corner_1", "content_1", 26, 20)
part {
- name: "inco_dot3";
+ name: "inco_dot";
+ scale: 1;
images {
- image: "ic_text_form.png" COMP;
+ image: "text_bullet.png" COMP;
}
type: "IMAGE";
description {
state: "default" 0.0;
visible: 1;
- min: 20 28;
- max: 20 28;
+ min: 6 6;
+ max: 6 6;
align: 0 0;
- image.normal: "ic_text_form.png";
+ image.normal: "text_bullet.png";
rel1 {
- offset: 0 298;
- relative: 0 0;
- to: "inco_message_background";
+ relative: 0 1;
+ to: "corner_1";
}
rel2 {
relative: 1 1;
- to: "inco_message_background";
}
}
}
part {
- name: "inco_text";
+ name: "inco_hint";
+ scale: 1;
type: TEXTBLOCK;
description {
state: "default" 0.0;
visible: 1;
fixed: 1 1;
- min: 864 36;
- max: 864 36;
- align: 0.5 0;
- color: 103 103 103 255;
+ min: 554 160;
+ max: 554 160;
+ align: 0 0;
rel1 {
- relative: 0 0;
- to: "inco_message_background";
+ relative: 1 0;
+ to: "corner_1";
}
rel2 {
relative: 1 1;
- to: "inco_message_background";
}
text {
min: 0 1;
max: 0 1;
- style: "message_style";
- text: "You've gone incognito";
+ style: "message_hint_style";
+ text: "You can browse internet in incognito tabs without any traces including browsing history, cookie or search history.";
}
}
+ description {
+ state: "landscape" 0.0;
+ inherit: "default";
+ visible: 1;
+ min: 890 84;
+ max: 890 84;
+ }
+ description {
+ state: "vertical" 0.0;
+ inherit: "default";
+ visible: 1;
+ min: 554 160;
+ max: 554 160;
+ }
}
+
+ PARAGRAPH_SPACER("spacer_2", "content_1", 66)
+
part {
- name: "inco_hint";
- type: TEXTBLOCK;
+ name: content_2;
+ type: RECT;
+ scale: 1;
description {
state: "default" 0.0;
- visible: 1;
- fixed: 0 1;
- min: 864 68;
- max: 864 68;
- color: 103 103 103 179;
+ rel1 { relative: 0.0 1.0; to: "spacer_2";}
+ rel2 { relative: 1.0 1.0;}
+ fixed: 1 1;
align: 0 0;
- rel1 {
- relative: 0 0;
- offset: 28 90;
- to_y: "inco_message_background";
- to_x: "inco_dot";
- }
- rel2 {
- relative: 1 1;
- to_y: "inco_message_background";
- }
- text {
- min: 0 1;
- max: 0 1;
- style: "message_hint_style";
- text: "You can browse internet in incognito tabs without any traces including browsing history, cookie or search history.";
+ visible: 1;
+ color: 255 255 255 0;
+ min: 580 84;
+ max: 580 84;
}
+ description {
+ state: "landscape" 0.0;
+ inherit: "default";
+ visible: 1;
+ min: 916 34;
+ max: 916 34;
+ }
+ description {
+ state: "vertical" 0.0;
+ inherit: "default";
+ visible: 1;
+ min: 580 84;
+ max: 580 84;
}
}
+ CORNER_SPACER("corner_2", "content_2", 26, 20)
part {
- name: "inco_hint2";
- type: TEXTBLOCK;
+ name: "inco_dot2";
+ scale: 1;
+ images {
+ image: "text_bullet.png" COMP;
+ }
+ type: "IMAGE";
description {
state: "default" 0.0;
visible: 1;
- fixed: 1 1;
- min: 864 28;
- max: 864 28;
- color: 103 103 103 179;
- align: 0.0 0;
+ min: 6 6;
+ max: 6 6;
+ align: 0 0;
+ image.normal: "text_bullet.png";
rel1 {
- relative: 0 0;
- offset: 28 206;
- to_y: "inco_message_background";
- to_x: "inco_dot2";
+ relative: 0 1;
+ to: "corner_2";
}
rel2 {
relative: 1 1;
- to_y: "inco_message_background";
- }
- text {
- min: 0 1;
- max: 0 1;
- style: "message_hint_style";
- text: "Bookmarks or downloaded files will not be removed.";
}
}
}
part {
- name: "inco_hint3";
+ name: "inco_hint2";
+ scale: 1;
type: TEXTBLOCK;
description {
state: "default" 0.0;
visible: 1;
fixed: 1 1;
- min: 864 68;
- max: 864 68;
- color: 103 103 103 179;
- align: 0.0 0;
+ min: 554 84;
+ max: 554 84;
+ align: 0 0;
rel1 {
- relative: 0 0;
- offset: 28 288;
- to_y: "inco_message_background";
- to_x: "inco_dot3";
+ relative: 1 0;
+ to: "corner_2";
}
rel2 {
relative: 1 1;
- to_y: "inco_message_background";
}
text {
min: 0 1;
max: 0 1;
style: "message_hint_style";
- text: "You can not remove traces from your employer, internet service provider or websites you visit even you go incognito.";
+ text: "Bookmarks or downloaded files will not be removed.";
}
}
+ description {
+ state: "landscape" 0.0;
+ inherit: "default";
+ visible: 1;
+ min: 890 34;
+ max: 890 34;
+ }
+ description {
+ state: "vertical" 0.0;
+ inherit: "default";
+ visible: 1;
+ min: 554 84;
+ max: 554 84;
+ }
}
+
+ PARAGRAPH_SPACER("spacer_3", "content_2", 66)
+
part {
- name: "bookmarkmanager_button";
- scale:1;
- mouse_events: 1;
+ name: content_3;
type: RECT;
+ scale: 1;
description {
state: "default" 0.0;
- visible: 1;
+ rel1 { relative: 0.0 1.0; to: "spacer_3";}
+ rel2 { relative: 1.0 1.0;}
fixed: 1 1;
- align: 0.5 1.0;
- min: 348 65;
- max: 348 65;
- color: 192 192 192 255;
- rel1 { relative: 0.0 0.0; to: "message_background";}
- rel2 { relative: 1.0 1.0; to: "message_background"; offset: 0 -60;}
- }
+ align: 0 0;
+ visible: 1;
+ color: 255 255 255 0;
+ min: 580 160;
+ max: 580 160;
+ }
description {
- state: "highlight" 0.0;
- inherit: "default" 0.0;
- color_class: focusBgColor;
+ state: "landscape" 0.0;
+ inherit: "default";
visible: 1;
+ min: 916 84;
+ max: 916 84;
}
description {
- state: "focus" 0.0;
- inherit: "default" 0.0;
- color_class: focusbtBgColor;
+ state: "vertical" 0.0;
+ inherit: "default";
visible: 1;
+ min: 580 160;
+ max: 580 160;
}
}
+ CORNER_SPACER("corner_3", "content_3", 26, 20)
part {
- name: "bookmarkmanager_text";
- type: TEXT;
+ name: "inco_dot3";
scale: 1;
+ images {
+ image: "text_bullet.png" COMP;
+ }
+ type: "IMAGE";
description {
state: "default" 0.0;
visible: 1;
- fixed: 1 1;
- rel1 { relative: 0.0 0.0;to: "bookmarkmanager_button";}
- rel2 { relative: 1.0 1.0;to: "bookmarkmanager_button";}
- color: 0 0 0 255;
- text {
- text: "Bookmark Manager";
- font: "Sans";
- size: 27;
- align: 0.5 0.5;
+ min: 6 6;
+ max: 6 6;
+ align: 0 0;
+ image.normal: "text_bullet.png";
+ rel1 {
+ relative: 0 1;
+ to: "corner_3";
+ }
+ rel2 {
+ relative: 1 1;
}
}
}
part {
- name: "bookmarkmanager_over";
- scale:1;
- type: SWALLOW;
- mouse_events: 1;
+ name: "inco_hint3";
+ scale: 1;
+ type: TEXTBLOCK;
description {
state: "default" 0.0;
visible: 1;
- align: 0 0;
fixed: 1 1;
- min: 348 65;
- max: 348 65;
- rel1 { relative: 0.0 0.0; to: "bookmarkmanager_button";}
- rel2 { relative: 1.0 1.0; to: "bookmarkmanager_button";}
- color_class: transparent;
+ min: 554 160;
+ max: 554 160;
+ align: 0.0 0;
+ rel1 {
+ relative: 1 0;
+ to: "corner_3";
+ }
+ rel2 {
+ relative: 1 1;
+ }
+ text {
+ min: 0 1;
+ max: 0 1;
+ style: "message_hint_style";
+ text: "You can not remove traces from your employer, internet service provider or websites you visit even you go incognito.";
+ }
}
- }
- part {
- name: "bookmarkmanager_click";
- scale:1;
- type: SWALLOW;
- mouse_events: 1;
description {
- state: "default" 0.0;
+ state: "landscape" 0.0;
+ inherit: "default";
visible: 1;
- align: 0 0;
- fixed: 1 1;
- min: 348 65;
- max: 348 65;
- rel1 { relative: 0.0 0.0; to: "bookmarkmanager_over";}
- rel2 { relative: 1.0 1.0; to: "bookmarkmanager_over";}
+ min: 890 84;
+ max: 890 84;
}
- }
- }//parts
- programs{
- program {
- name: "mouse_click_bookmarkmanager";
- signal: "mouse,clicked,1";
- source: "bookmarkmanager_over";
- script {
- emit("elm,action,click", "");
+ description {
+ state: "vertical" 0.0;
+ inherit: "default";
+ visible: 1;
+ min: 554 160;
+ max: 554 160;
}
}
- program {
- name: "mouse_in_bookmarkmanager_click";
- signal: "mouse,in";
- source: "bookmarkmanager_*";
- action: STATE_SET "highlight" 0.0;
- target: "bookmarkmanager_button";
- target: "bookmarkmanager_over";
- target: "bookmarkmanager_text";
}
- program {
- name: "mouse_out_bookmarkmanager_click";
- signal: "mouse,out";
- source: "bookmarkmanager_*";
- action: STATE_SET "default" 0.0;
- target: "bookmarkmanager_button";
- target: "bookmarkmanager_over";
- target: "bookmarkmanager_text";
+
+ programs {
+ program {
+ name: "show_incognito_landscape";
+ signal: "show_incognito_landscape";
+ source: "ui";
+ action: STATE_SET "landscape" 0.0;
+ target: "inco_message_background";
+ target: "inco_text";
+ target: "content_1";
+ target: "content_2";
+ target: "content_3";
+ target: "inco_hint";
+ target: "inco_hint2";
+ target: "inco_hint3";
+ }
+ program {
+ name: "show_incognito_vertical";
+ signal: "show_incognito_vertical";
+ source: "ui";
+ action: STATE_SET "vertical" 0.0;
+ target: "inco_message_background";
+ target: "inco_text";
+ target: "content_1";
+ target: "content_2";
+ target: "content_3";
+ target: "inco_hint";
+ target: "inco_hint2";
+ target: "inco_hint3";
+ }
}
}
}
+++ /dev/null
-#define PARAGRAPH_SPACER(NAME, RELATIVE_TO, HEIGHT) \
-part { name: NAME; \
- type: SPACER; \
- scale: 1; \
- description { \
- state: "default" 0.0; \
- rel1 { relative: 0.0 1.0; to: RELATIVE_TO; } \
- rel2 { relative: 1.0 1.0; to: RELATIVE_TO; } \
- fixed: 1 1; \
- align: 0 0; \
- min: 0 HEIGHT; \
- max: 0 HEIGHT; \
- } \
- }
-
-#define CORNER_SPACER(NAME, RELATIVE_TO, WIDTH, HEIGHT) \
-part { name: NAME; \
- type: SPACER; \
- scale: 1; \
- description { \
- state: "default" 0.0; \
- rel1 { relative: 0.0 0.0; to: RELATIVE_TO; } \
- rel2 { relative: 1.0 1.0; to: RELATIVE_TO; offset: WIDTH 0; }\
- fixed: 1 1; \
- align: 0 0; \
- min: WIDTH HEIGHT; \
- max: WIDTH HEIGHT; \
- } \
- }
-
-collections { base_scale: 2.6;
- styles {
- style {
- name: "message_style";
- base: "font=Sans font_size=36 color=#333333 wrap=word align=0.5";
- }
- style {
- name: "message_hint_style";
- base: "font=Sans font_size=31 color=#747474 wrap=word align=0.0";
- }
- }
- group {
- name: "inco_message";
- parts {
- part {
- name: "message_background";
- scale: 1;
- type: RECT;
- mouse_events: 1;
- description{
- state: "default" 0.0;
- visible: 1;
- color: 242 242 242 255;
- rel1.relative: 0 0;
- rel2.relative: 1 1;
- }
- }
- part {
- name: "inco_message_background";
- scale: 1;
- type:RECT;
- description{
- state: "default" 0.0;
- visible: 1;
- color: 242 242 242 255;
- min: 580 0;
- max: 580 -1;
- align: 0.5 0.0;
- rel1 {
- to: "message_background";
- relative: 0 0.2;
- }
- rel2 {
- to: "message_background";
- relative: 1 1;
- }
- }
- description {
- state: "landscape" 0.0;
- inherit: "default";
- min: 916 410;
- max: 916 -1;
- rel1 {
- to: "message_background";
- relative: 0 0.1;
- }
- }
- description {
- state: "vertical" 0.0;
- inherit: "default";
- }
- }
- part {
- name: "inco_text";
- scale: 1;
- type: TEXTBLOCK;
- description {
- state: "default" 0.0;
- visible: 1;
- fixed: 1 1;
- min: 580 38;
- max: 580 38;
- align: 0.5 0;
- rel1 {
- relative: 0 0;
- to: "inco_message_background";
- }
- rel2 {
- relative: 1 1;
- to: "inco_message_background";
- }
- text {
- min: 0 1;
- max: 0 1;
- style: "message_style";
- text: "You've gone incognito.";
- }
- }
- description {
- state: "landscape" 0.0;
- inherit: "default";
- visible: 1;
- min: 916 38;
- max: 916 38;
- }
- description {
- state: "vertical" 0.0;
- inherit: "default";
- visible: 1;
- min: 580 38;
- max: 580 38;
- }
- }
-
- PARAGRAPH_SPACER("spacer_1", "inco_text", 38)
-
- part {
- name: content_1;
- type: RECT;
- scale: 1;
- description {
- state: "default" 0.0;
- rel1 { relative: 0.0 1.0; to: "spacer_1";}
- rel2 { relative: 1.0 1.0;}
- fixed: 1 1;
- align: 0 0;
- visible: 0;
- color: 255 255 255 0;
- min: 580 160;
- max: 580 160;
- }
- description {
- state: "landscape" 0.0;
- inherit: "default";
- visible: 1;
- min: 916 84;
- max: 916 84;
- }
- description {
- state: "vertical" 0.0;
- inherit: "default";
- visible: 1;
- min: 580 160;
- max: 580 160;
- }
- }
- CORNER_SPACER("corner_1", "content_1", 26, 20)
- part {
- name: "inco_dot";
- scale: 1;
- images {
- image: "text_bullet.png" COMP;
- }
- type: "IMAGE";
- description {
- state: "default" 0.0;
- visible: 1;
- min: 6 6;
- max: 6 6;
- align: 0 0;
- image.normal: "text_bullet.png";
- rel1 {
- relative: 0 1;
- to: "corner_1";
- }
- rel2 {
- relative: 1 1;
- }
- }
- }
- part {
- name: "inco_hint";
- scale: 1;
- type: TEXTBLOCK;
- description {
- state: "default" 0.0;
- visible: 1;
- fixed: 1 1;
- min: 554 160;
- max: 554 160;
- align: 0 0;
- rel1 {
- relative: 1 0;
- to: "corner_1";
- }
- rel2 {
- relative: 1 1;
- }
- text {
- min: 0 1;
- max: 0 1;
- style: "message_hint_style";
- text: "You can browse internet in incognito tabs without any traces including browsing history, cookie or search history.";
- }
- }
- description {
- state: "landscape" 0.0;
- inherit: "default";
- visible: 1;
- min: 890 84;
- max: 890 84;
- }
- description {
- state: "vertical" 0.0;
- inherit: "default";
- visible: 1;
- min: 554 160;
- max: 554 160;
- }
- }
-
- PARAGRAPH_SPACER("spacer_2", "content_1", 66)
-
- part {
- name: content_2;
- type: RECT;
- scale: 1;
- description {
- state: "default" 0.0;
- rel1 { relative: 0.0 1.0; to: "spacer_2";}
- rel2 { relative: 1.0 1.0;}
- fixed: 1 1;
- align: 0 0;
- visible: 1;
- color: 255 255 255 0;
- min: 580 84;
- max: 580 84;
- }
- description {
- state: "landscape" 0.0;
- inherit: "default";
- visible: 1;
- min: 916 34;
- max: 916 34;
- }
- description {
- state: "vertical" 0.0;
- inherit: "default";
- visible: 1;
- min: 580 84;
- max: 580 84;
- }
- }
- CORNER_SPACER("corner_2", "content_2", 26, 20)
- part {
- name: "inco_dot2";
- scale: 1;
- images {
- image: "text_bullet.png" COMP;
- }
- type: "IMAGE";
- description {
- state: "default" 0.0;
- visible: 1;
- min: 6 6;
- max: 6 6;
- align: 0 0;
- image.normal: "text_bullet.png";
- rel1 {
- relative: 0 1;
- to: "corner_2";
- }
- rel2 {
- relative: 1 1;
- }
- }
- }
- part {
- name: "inco_hint2";
- scale: 1;
- type: TEXTBLOCK;
- description {
- state: "default" 0.0;
- visible: 1;
- fixed: 1 1;
- min: 554 84;
- max: 554 84;
- align: 0 0;
- rel1 {
- relative: 1 0;
- to: "corner_2";
- }
- rel2 {
- relative: 1 1;
- }
- text {
- min: 0 1;
- max: 0 1;
- style: "message_hint_style";
- text: "Bookmarks or downloaded files will not be removed.";
- }
- }
- description {
- state: "landscape" 0.0;
- inherit: "default";
- visible: 1;
- min: 890 34;
- max: 890 34;
- }
- description {
- state: "vertical" 0.0;
- inherit: "default";
- visible: 1;
- min: 554 84;
- max: 554 84;
- }
- }
-
- PARAGRAPH_SPACER("spacer_3", "content_2", 66)
-
- part {
- name: content_3;
- type: RECT;
- scale: 1;
- description {
- state: "default" 0.0;
- rel1 { relative: 0.0 1.0; to: "spacer_3";}
- rel2 { relative: 1.0 1.0;}
- fixed: 1 1;
- align: 0 0;
- visible: 1;
- color: 255 255 255 0;
- min: 580 160;
- max: 580 160;
- }
- description {
- state: "landscape" 0.0;
- inherit: "default";
- visible: 1;
- min: 916 84;
- max: 916 84;
- }
- description {
- state: "vertical" 0.0;
- inherit: "default";
- visible: 1;
- min: 580 160;
- max: 580 160;
- }
- }
- CORNER_SPACER("corner_3", "content_3", 26, 20)
- part {
- name: "inco_dot3";
- scale: 1;
- images {
- image: "text_bullet.png" COMP;
- }
- type: "IMAGE";
- description {
- state: "default" 0.0;
- visible: 1;
- min: 6 6;
- max: 6 6;
- align: 0 0;
- image.normal: "text_bullet.png";
- rel1 {
- relative: 0 1;
- to: "corner_3";
- }
- rel2 {
- relative: 1 1;
- }
- }
- }
- part {
- name: "inco_hint3";
- scale: 1;
- type: TEXTBLOCK;
- description {
- state: "default" 0.0;
- visible: 1;
- fixed: 1 1;
- min: 554 160;
- max: 554 160;
- align: 0.0 0;
- rel1 {
- relative: 1 0;
- to: "corner_3";
- }
- rel2 {
- relative: 1 1;
- }
- text {
- min: 0 1;
- max: 0 1;
- style: "message_hint_style";
- text: "You can not remove traces from your employer, internet service provider or websites you visit even you go incognito.";
- }
- }
- description {
- state: "landscape" 0.0;
- inherit: "default";
- visible: 1;
- min: 890 84;
- max: 890 84;
- }
- description {
- state: "vertical" 0.0;
- inherit: "default";
- visible: 1;
- min: 554 160;
- max: 554 160;
- }
- }
- }
-
- programs {
- program {
- name: "show_incognito_landscape";
- signal: "show_incognito_landscape";
- source: "ui";
- action: STATE_SET "landscape" 0.0;
- target: "inco_message_background";
- target: "inco_text";
- target: "content_1";
- target: "content_2";
- target: "content_3";
- target: "inco_hint";
- target: "inco_hint2";
- target: "inco_hint3";
- }
- program {
- name: "show_incognito_vertical";
- signal: "show_incognito_vertical";
- source: "ui";
- action: STATE_SET "vertical" 0.0;
- target: "inco_message_background";
- target: "inco_text";
- target: "content_1";
- target: "content_2";
- target: "content_3";
- target: "inco_hint";
- target: "inco_hint2";
- target: "inco_hint3";
- }
- }
- }
-}
#include "ImageButton.edc"
#include "../../../core/Tools/edc/Spacer.edc"
-collections { base_scale: 2.0;
- FOUR_STATE_IMAGE_BUTTON("browser/toolbar_tab", 82, 102, "btn_bar_manager_nor.png", 69, 149, 255)
- FOUR_STATE_IMAGE_BUTTON("browser/toolbar_setting", 82, 102, "btn_bar_more_nor.png", 69, 149, 255)
+collections { base_scale: 2.6;
+
+ IMAGE_BUTTON("add_tab", 50, 50, "internet_ic_add.png")
+
group {
name: "right_button_bar";
parts {
state: "default" 0.0;
visible: 1;
fixed: 1 1;
- align: 0.0 0.0;
- min: 70 70;
- max: 70 70;
- rel1 { relative: 0.0 0.0; }
- rel2 { relative: 0.0 0.0; }
- }
- description {
- state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part {
- name: "tabs_number";
- type: TEXT;
- scale: 1;
- repeat_events: 1;
- description{
- state: "default" 0.0;
- visible: 1;
- fixed: 1 1;
- align: 0.0 0.0;
- min: 70 70;
- max: 70 70;
- color: 86 86 86 255;
- rel1 { relative: 0.0 0.0; to: "tab_button"; offset: 5 13; }
- rel2 { relative: 1.0 1.0; to: "tab_button"; }
- text {
- text: "";
- font: "Tizen:style=Bold";
- size: 19;
- align: 0.5 0.5;
+ align: 0.0 0.0;
+ min: 100 106;
+ max: 100 106;
+ rel1 { relative: 0.0 0.0; }
}
}
}
- ADD_SPACER("spacer_1", "tab_button", 10, 70)
- part {
- name: "setting_button";
- type : SWALLOW;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 1;
- fixed: 1 1;
- align: 0.0 0.0;
- min: 70 70;
- max: 70 70;
- fixed: 1 1;
- rel1 { relative: 1.0 0.0; to: "spacer_1"; }
- rel2 { relative: 0.0 0.0; }
- }
- description {
- state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
}
}
-}
+++ /dev/null
-#include "ImageButton.edc"
-#include "../../../core/Tools/edc/Spacer.edc"
-collections { base_scale: 2.6;
- FOUR_STATE_IMAGE_BUTTON("browser/toolbar_tab", 64, 64, "btn_bar_manager_nor.png", 224, 237, 251)
- FOUR_STATE_IMAGE_BUTTON("browser/toolbar_setting", 64, 64, "btn_bar_more_nor.png", 224, 237, 251)
- group {
- name: "right_button_bar";
- parts {
- part {
- name: "tab_button";
- type : SWALLOW;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 1;
- fixed: 1 1;
- align: 0.0 0.0;
- min: 64 64;
- max: 64 64;
- rel1 { relative: 0.0 0.0; }
- rel2 { relative: 0.0 0.0; }
- }
- description {
- state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part {
- name: "tabs_number";
- type: TEXT;
- scale: 1;
- repeat_events: 1;
- description{
- state: "default" 0.0;
- visible: 1;
- fixed: 1 1;
- align: 0.0 0.0;
- min: 64 64;
- max: 64 64;
- color: 86 86 86 255;
- rel1 { relative: 0.0 0.0; to: "tab_button"; }
- rel2 { relative: 1.0 1.0; to: "tab_button"; }
- text {
- text: "";
- font: "Tizen:style=Bold";
- size: 19;
- align: 0.5 0.5;
- }
- }
- }
-
- ADD_SPACER("spacer_1", "tab_button", 2, 64)
-
- part {
- name: "setting_button";
- type : SWALLOW;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 1;
- fixed: 1 1;
- align: 0.0 0.0;
- min: 64 64;
- max: 64 64;
- fixed: 1 1;
- rel1 { relative: 1.0 0.0; to: "spacer_1"; }
- rel2 { relative: 0.0 0.0; }
- }
- description {
- state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- }
-}
-}
-#define URI_INPUTBOX_LENGTH 1720
-#define URI_INPUTBOX_LENGTH_SMALL 1460
-#define URI_INPUTBOX_WIDTH 82
-collections { base_scale: 2.0;
+#define URI_INPUTBOX_LENGTH 518
+#define URI_INPUTBOX_LENGTH_ENLARGED 656
+#define URI_INPUTBOX_LENGTH_SMALL 320
+#define URI_INPUTBOX_HEIGHT 80
+#define BORDER_WIDTH 5
+
+#define RESOURCE_IMAGE_LOSSY( FILE_NAME ) \
+ group { \
+ name: FILE_NAME; \
+ images.image: FILE_NAME LOSSY 100; \
+ parts { \
+ part { name: "image"; \
+ description { \
+ state: "default" 0.0; \
+ image.normal: FILE_NAME; \
+ aspect: 1 1; \
+ aspect_preference: BOTH; \
+ } \
+ } \
+ } \
+ }
+
+collections { base_scale: 2.6;
+RESOURCE_IMAGE_LOSSY("input_ic_incognito.png")
+RESOURCE_IMAGE_LOSSY("toolbar_input_ic_cancel.png")
+RESOURCE_IMAGE_LOSSY("ic_lock.png")
+RESOURCE_IMAGE_LOSSY("ic_lock_unsecure.png")
+RESOURCE_IMAGE_LOSSY("toolbar_input_ic_refresh.png")
group {
name: "elm/entry/selection/browser_entry";
parts {
mouse_events: 0;
description {
state: "default" 0.0;
- color: 255 255 255 255;
+ color: 224 237 251 255;
}
}
}
mouse_events: 0;
description {
state: "default" 0.0;
- color: 22 120 237 255;
- min: 2 36;
- max: 2 36;
+ color: 10 132 229 255;
+ min: 3 38;
+ max: 3 38;
visible: 0;
}
description {
source: "elm";
action: STATE_SET "focused" 0.0;
target: "bg";
+ after: "cursor_show";
}
program {
name: "unfocused";
source: "elm";
action: STATE_SET "default" 0.0;
target: "bg";
+ after: "stop_action";
+ }
+ program { name: "cursor_show";
+ action: STATE_SET "focused" 0.0;
+ target: "bg";
+ after: "cursor_show_timer";
+ }
+ program { name: "cursor_hide";
+ action: STATE_SET "default" 0.0;
+ target: "bg";
+ transition: SINUSOIDAL 0.2;
+ after: "cursor_hide_timer";
+ }
+ program { name: "cursor_show_timer";
+ in: 0.4 0.0;
+ after: "cursor_hide";
+ }
+ program { name: "cursor_hide_timer";
+ in: 0.3 0.0;
+ after: "cursor_show";
+ }
+ program {
+ name: "stop_action";
+ action: ACTION_STOP;
+ target: "cursor_show";
+ target: "cursor_hide";
+ target: "cursor_show_timer";
+ target: "cursor_hide_timer";
}
}
}
group {
name: "elm/entry/base-single/uri_entry";
+ color_classes {
+ color_class {
+ name: "guide_text_unselected_color";
+ color: 51 51 51 0.5;
+ }
+ }
styles {
style {
name: "browser-entry-uri-style-unselected";
- base: "font=Sans:style=SVD_Medium font_size="42" wrap=none color=#969696";
+ base: "font=Sans:style=SVD_Medium font_size="40" wrap=none color=#969696";
tag: "br" "";
}
style {
name: "browser-entry-uri-style-selected";
- base: "font=Sans:style=SVD_Medium font_size="42" wrap=none ellipsis="0.0" color=#4088d3";
+ base: "font=Sans:style=SVD_Medium font_size="40" wrap=none color=#4088d3";
tag: "br" "";
}
style {
name: "browser-entry-uri-style-selected-incognito";
- base: "font=Sans:style=SVD_Medium font_size="42" wrap=none ellipsis="0.0" right_margin="60" color=#4088d3";
+ base: "font=Sans:style=SVD_Medium font_size="40" wrap=none color=#4088d3";
tag: "br" "";
}
}
data {
item: focus_highlight "off";
}
+ images {
+ image: "input_ic_incognito.png" COMP;
+ }
parts {
part {
mouse_events: 0;
description {
state: "default" 0.0;
- color: 255 255 255 255;
- }
- }
-
- part {
- name: "elm.guide";
- scale:1;
- type: TEXTBLOCK;
- mouse_events: 0;
- description {
- state: "default" 0.0;
- rel1.relative: 0.0 0.0;
- rel2.relative: 1.0 1.0;
+ color: 0 0 0 0;
+ fixed: 0 1;
+ min: 0 URI_INPUTBOX_HEIGHT;
+ max: -1 URI_INPUTBOX_HEIGHT;
align: 0.0 0.0;
- text {
- style: "browser-entry-uri-style-unselected";
- min: 0 1;
- }
- }
- description {
- state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
}
}
part {
}
part {
name: "elm.text";
- scale:1;
+ scale: 1;
multiline: 0;
entry_mode: EDITABLE;
select_mode: DEFAULT;
cursor_mode: BEFORE;
type: TEXTBLOCK;
- clip_to: "label.text.clip";
source: "elm/entry/selection/browser_entry";
source4: "elm/entry/cursor/browser_entry";
description {
state: "default" 0.0;
- max: -1 82;
+ rel1.to: "bg";
rel1.relative: 0.0 0.0;
+ rel2.to: "bg";
rel2.relative: 1.0 1.0;
align: 0.0 0.0;
text {
}
description {
state: "incognito" 0.0;
- max: -1 82;
- rel1.relative: 0.0 0.0;
- rel2.relative: 1.0 1.0;
align: 0.0 0.0;
text {
style: "browser-entry-uri-style-selected-incognito";
}
}
}
+ part {
+ name: "elm.guide";
+ scale:1;
+ type: TEXTBLOCK;
+ mouse_events: 0;
+ clip_to: "label.text.clip";
+ source4: "elm/entry/cursor/browser_entry";
+ description {
+ state: "default" 0.0;
+ rel1.to: "bg";
+ rel1.relative: 0.0 0.0;
+ rel1.offset: BORDER_WIDTH 0;
+ rel2.relative: 1.0 1.0;
+ max: -1 URI_INPUTBOX_HEIGHT;
+ text {
+ style: "browser-entry-uri-style-unselected";
+ min: 0 1;
+ }
+ }
+ description {
+ state: "hidden" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
+ }
+ }
}
programs {
program {
name: "normal_mode_uri_entry";
source: "ui";
signal: "uri_entry_normal";
- action: STATE_SET "default" 0.0;
- target: "elm.text";
}
program {
name: "incognito_mode_uri_entry";
}//group
group {
- name: "elm/button/base/entry_btn";
+ name: "uri_entry_layout";
parts {
part {
- name: "bg";
+ name: "uri_entry_space";
+ type : RECT;
+ repeat_events: 1;
+ scale: 1;
+ description {
+ state: "default" 0.0;
+ visible: 1;
+ align: 0.0 0.0;
+ min: 0 URI_INPUTBOX_HEIGHT;
+ max: -1 URI_INPUTBOX_HEIGHT;
+ fixed: 0 1;
+ color: 244 244 244 255;
+ rel1 { relative: 0.0 0.0; }
+ rel2 { relative: 1.0 1.0; }
+ }
+ description {
+ state: "moveright" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ description {
+ state: "hidden" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
+ }
+ description {
+ state: "visible" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ }
+ part {
+ name: "over_icon";
+ scale: 1;
type: RECT;
+ mouse_events: 0;
description {
state: "default" 0.0;
- color: 0 0 0 0;
+ min: 0 0;
+ max: 0 0;
+ rel1.to: "uri_entry_space";
+ rel1.relative: 0.0 0.0;
+ rel2.to: "uri_entry_space";
+ rel2.relative: 1.0 1.0;
+ align: 0 0;
+ color: 244 244 244 255;
+ }
+ description {
+ state: "incognito" 0.0;
+ inherit: "default" 0.0;
+ min: 38 URI_INPUTBOX_HEIGHT;
+ max: 38 URI_INPUTBOX_HEIGHT;
+ }
+ }
+ part {
+ name: "incognito_icon";
+ type: IMAGE;
+ scale: 1;
+ description {
+ state: "default" 0.0;
+ visible: 0;
+ min: 0 0;
+ max: 0 0;
+ rel1 {
+ to: "over_icon";
+ relative: 0.0 0.0;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ }
+ image.normal: "input_ic_incognito.png";
+ align: 0 0.5;
+ }
+ description {
+ state: "incognito" 0.0;
+ inherit: "default" 0.0;
+ min: 38 38;
+ max: 38 38;
visible: 1;
}
}
- }
- programs {
- program {
- name: "mouse_click";
- signal: "mouse,clicked,1";
- source: "bg";
- script {
- emit("elm,action,click", "");
+ part {
+ name: "over";
+ type: RECT;
+ mouse_events: 1;
+ repeat_events: 1;
+ description {
+ state: "default" 0.0;
+ color: 0 0 0 0;
+ rel1 { relative: 0 0; }
+ rel2 { relative: 1 1; }
+ }
+ }
+ part {
+ name: "right_icon_bg";
+ scale:1;
+ type: RECT;
+ mouse_events: 1;
+ description {
+ state: "default" 0.0;
+ min: 0 URI_INPUTBOX_HEIGHT;
+ max: 0 URI_INPUTBOX_HEIGHT;
+ visible: 0;
+ color: 0 0 0 0;
+ fixed: 0 1;
+ align: 1 0;
+ }
+ description {
+ state: "visible" 0.0;
+ inherit: "default" 0.0;
+ fixed: 0 1;
+ align: 1 1;
+ min: URI_INPUTBOX_HEIGHT URI_INPUTBOX_HEIGHT;
+ max: URI_INPUTBOX_HEIGHT URI_INPUTBOX_HEIGHT;
+ rel1 {
+ to: "uri_entry_space";
+ relative: 0.0 0.0;
+ }
+ rel2 {
+ to: "uri_entry_space";
+ relative: 1.0 1.0;
+ }
+ visible: 1;
+ color: 244 244 244 255;
+ }
+ description {
+ state: "focused" 0.0;
+ inherit: "visible" 0.0;
+ visible: 1;
+ color: 224 237 251 255;
+ }
+ description {
+ state: "moveright" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
}
}
- }
- }
-
-
- group {
- name: "uri_entry_layout";
- parts {
part {
- name: "spacer_1";
- type: SPACER;
+ name: "uri_entry_swallow";
+ type : SWALLOW;
+ mouse_events: 1;
scale: 1;
description {
state: "default" 0.0;
- rel1 { relative: 0.0 0.0; }
- rel2 { relative: 0.0 0.0; offset: 15 0; }
+ visible: 1;
align: 0.0 0.0;
fixed: 1 1;
- min: 1 102;
- max: 1 102;
+ rel1 { relative: 1.0 0.0; to: "over_icon"; }
+ rel2 { relative: 0.0 1.0; to: "right_icon_bg"; }
+ min: 0 URI_INPUTBOX_HEIGHT;
+ max: -1 URI_INPUTBOX_HEIGHT;
+ }
+ description {
+ state: "moveright" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ description {
+ state: "hidden" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
+ }
+ description {
+ state: "visible" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
}
- }
- part {
- name: "uri_entry_swallow";
- type : SWALLOW;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 1;
- color: 255 255 255 255;
- align: 0.0 0.0;
- min: URI_INPUTBOX_LENGTH URI_INPUTBOX_WIDTH;
- max: URI_INPUTBOX_LENGTH URI_INPUTBOX_WIDTH;
- fixed: 1 1;
- rel1 { relative: 1 0; to: "spacer_1"; }
- rel2 { relative: 1 1; to: "spacer_1"; }
- }
- description {
- state: "moveright" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- min: URI_INPUTBOX_LENGTH_SMALL URI_INPUTBOX_WIDTH;
- max: URI_INPUTBOX_LENGTH_SMALL URI_INPUTBOX_WIDTH;
- }
- description {
- state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
+ part {
+ name: "right_icon";
+ type: IMAGE;
+ scale: 1;
+ description {
+ state: "default" 0.0;
+ visible: 0;
+ min: 0 0;
+ max: 0 0;
+ color: 105 105 105 255;
+ rel1 {
+ to: "right_icon_bg";
+ relative: 0.0 0.0;
+ }
+ rel2 {
+ to: "right_icon_bg";
+ relative: 1.0 1.0;
+ }
+ image.border_scale: 1;
+ align: 0.5 0.5;
+ }
+ description {
+ state: "visible" 0.0;
+ inherit: "default" 0.0;
+ min: 50 50;
+ max: 50 50;
+ visible: 1;
+ }
+ description {
+ state: "cancel" 0.0;
+ inherit: "visible" 0.0;
+ image.normal: "toolbar_input_ic_cancel.png";
+ }
+ description {
+ state: "secure" 0.0;
+ inherit: "visible" 0.0;
+ image.normal: "ic_lock.png";
+ }
+ description {
+ state: "unsecure" 0.0;
+ inherit: "visible" 0.0;
+ image.normal: "ic_lock_unsecure.png";
+ }
+ description {
+ state: "reload" 0.0;
+ inherit: "visible" 0.0;
+ image.normal: "toolbar_input_ic_refresh.png";
+ }
+ }
+ part {
+ name: "cancel_over";
+ scale:1;
+ type: RECT;
+ mouse_events: 1;
+ description {
+ state: "default" 0.0;
+ min: URI_INPUTBOX_HEIGHT URI_INPUTBOX_HEIGHT;
+ max: URI_INPUTBOX_HEIGHT URI_INPUTBOX_HEIGHT;
+ visible: 0;
+ rel1 {
+ to: "right_icon_bg";
+ relative: 0.0 0.0;
+ }
+ rel2 {
+ to: "right_icon_bg";
+ relative: 1.0 1.0;
+ }
+ color: 0 0 0 0;
+ }
+ description {
+ state: "moveright" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
+ }
+ description {
+ state: "visible" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ }
+ part {
+ name: "cancel_click";
+ scale:1;
+ mouse_events: 1;
+ repeat_events: 1;
+ type: SWALLOW;
+ description {
+ state: "default" 0.0;
+ visible: 1;
+ align: 0 0;
+ fixed: 1 1;
+ min: URI_INPUTBOX_HEIGHT URI_INPUTBOX_HEIGHT;
+ max: URI_INPUTBOX_HEIGHT URI_INPUTBOX_HEIGHT;
+ rel1 { relative: 0.0 0.0; to: "cancel_over";}
+ rel2 { relative: 1.0 1.0; to: "cancel_over";}
+ color: 0 0 0 0;
+ }
}
}
- }
- programs {
- program {
- name: "shiftright_uribarbg";
- signal: "shiftright_uribg";
- source: "ui";
- action: STATE_SET "moveright" 0.0;
- target: "uri_entry_swallow";
- }
- program {
- name: "shiftback_uribarbg";
- signal: "shiftback_uribg";
- source: "ui";
- action: STATE_SET "default" 0.0;
- target: "uri_entry_swallow";
+ programs {
+ program {
+ name: "shiftright_uribarbg";
+ signal: "shiftright_uribg";
+ source: "ui";
+ action: STATE_SET "moveright" 0.0;
+ target: "uri_entry_swallow";
+ target: "right_icon";
+ target: "cancel_over";
+ target: "right_icon_bg";
+ target: "uri_entry_space";
+ }
+ program {
+ name: "shiftback_uribarbg";
+ signal: "shiftback_uribg";
+ source: "ui";
+ action: STATE_SET "default" 0.0;
+ target: "uri_entry_swallow";
+ target: "right_icon";
+ target: "cancel_over";
+ target: "uri_entry_space";
+ }
+ program {
+ name: "mouse_in_right_icon";
+ signal: "mouse,down,*";
+ source: "cancel_over";
+ action: STATE_SET "focused" 0.0;
+ target: "right_icon_bg";
+ }
+ program {
+ name: "mouse_out_right_icon";
+ signal: "mouse,up,*";
+ source: "cancel_over";
+ action: STATE_SET "visible" 0.0;
+ target: "right_icon_bg";
+ }
+ program {
+ name: "show_secure_icon";
+ signal: "show,secure,icon";
+ source: "";
+ action: STATE_SET "secure" 0.0;
+ target: "right_icon";
+ after: "show_icon_bg";
+ }
+ program {
+ name: "show_unsecure_icon";
+ signal: "show,unsecure,icon";
+ source: "";
+ action: STATE_SET "unsecure" 0.0;
+ target: "right_icon";
+ after: "show_icon_bg";
+ }
+ program {
+ name: "show_reload_icon";
+ signal: "show,reload,icon";
+ source: "";
+ action: STATE_SET "reload" 0.0;
+ target: "right_icon";
+ after: "show_icon_bg";
+ }
+ program {
+ name: "mouse_clicked_right_icon";
+ signal: "mouse,clicked,*";
+ source: "cancel_over";
+ after: "call_on_right_icon_clicked_cb";
+ }
+ program {
+ name: "call_on_right_icon_clicked_cb";
+ signal: "call_on_right_icon_clicked_cb";
+ source: "ui";
+ action: SIGNAL_EMIT "right_icon_clicked" "ui";
+ }
+ program {
+ name: "normal_mode_uri_entry";
+ source: "ui";
+ signal: "uri_entry_normal";
+ action: STATE_SET "default" 0.0;
+ target: "incognito_icon";
+ target: "over_icon";
+ }
+ program {
+ name: "incognito_mode_uri_entry";
+ source: "ui";
+ signal: "uri_entry_incognito";
+ action: STATE_SET "incognito" 0.0;
+ target: "incognito_icon";
+ target: "over_icon";
+ }
+ program {
+ name: "show_cancel_icon";
+ source: "ui";
+ signal: "show_cancel_icon";
+ action: STATE_SET "cancel" 0.0;
+ target: "right_icon";
+ after: "show_icon_bg";
+ }
+ program {
+ name: "show_icon_bg";
+ signal: "show_icon_bg";
+ action: STATE_SET "visible" 0.0;
+ target: "right_icon_bg";
+ target: "cancel_over";
+ }
+ program {
+ name: "hide_icon";
+ source: "ui";
+ signal: "hide_icon";
+ action: STATE_SET "default" 0.0;
+ target: "right_icon";
+ target: "right_icon_bg";
+ target: "cancel_over";
+ }
}
}
}
-}
+++ /dev/null
-#define URI_INPUTBOX_LENGTH 518
-#define URI_INPUTBOX_LENGTH_ENLARGED 656
-#define URI_INPUTBOX_LENGTH_SMALL 320
-#define URI_INPUTBOX_WIDTH 64
-#define CANCEL_ICON_FIELD_SIZE 64
-#define SECURE_ICON_FIELD_SIZE 48
-#define BORDER_WIDTH 5
-
-#define RESOURCE_IMAGE_LOSSY( FILE_NAME ) \
- group { \
- name: FILE_NAME; \
- images.image: FILE_NAME LOSSY 100; \
- parts { \
- part { name: "image"; \
- description { \
- state: "default" 0.0; \
- image.normal: FILE_NAME; \
- aspect: 1 1; \
- aspect_preference: BOTH; \
- } \
- } \
- } \
- }
-
-collections { base_scale: 2.6;
-RESOURCE_IMAGE_LOSSY("input_ic_incognito.png")
-RESOURCE_IMAGE_LOSSY("navi_input_ic_cancel.png")
-RESOURCE_IMAGE_LOSSY("ic_lock.png")
-RESOURCE_IMAGE_LOSSY("ic_lock_unsecure.png")
- group {
- name: "elm/entry/selection/browser_entry";
- parts {
- part {
- name: "bg";
- scale:1;
- type: RECT;
- mouse_events: 0;
- description {
- state: "default" 0.0;
- color: 224 237 251 255;
- }
- }
- }
- }
- group {
- name: "elm/entry/cursor/browser_entry";
- parts {
- part {
- name: "bg";
- scale:1;
- type: RECT;
- mouse_events: 0;
- description {
- state: "default" 0.0;
- color: 10 132 229 255;
- min: 3 38;
- max: 3 38;
- visible: 0;
- }
- description {
- state: "focused" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- }
- programs {
- program {
- name: "focused";
- signal: "elm,action,focus";
- source: "elm";
- action: STATE_SET "focused" 0.0;
- target: "bg";
- after: "cursor_show";
- }
- program {
- name: "unfocused";
- signal: "elm,action,unfocus";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "bg";
- after: "stop_action";
- }
- program { name: "cursor_show";
- action: STATE_SET "focused" 0.0;
- target: "bg";
- after: "cursor_show_timer";
- }
- program { name: "cursor_hide";
- action: STATE_SET "default" 0.0;
- target: "bg";
- transition: SINUSOIDAL 0.2;
- after: "cursor_hide_timer";
- }
- program { name: "cursor_show_timer";
- in: 0.4 0.0;
- after: "cursor_hide";
- }
- program { name: "cursor_hide_timer";
- in: 0.3 0.0;
- after: "cursor_show";
- }
- program {
- name: "stop_action";
- action: ACTION_STOP;
- target: "cursor_show";
- target: "cursor_hide";
- target: "cursor_show_timer";
- target: "cursor_hide_timer";
- }
- }
- }
- group {
- name: "elm/entry/base-single/uri_entry";
- color_classes {
- color_class {
- name: "guide_text_unselected_color";
- color: 51 51 51 0.5;
- }
- }
- styles {
- style {
- name: "browser-entry-uri-style-unselected";
- base: "font=Sans:style=SVD_Medium font_size="40" wrap=none color=#969696";
- tag: "br" "";
- }
- style {
- name: "browser-entry-uri-style-selected";
- base: "font=Sans:style=SVD_Medium font_size="40" wrap=none color=#4088d3";
- tag: "br" "";
- }
- style {
- name: "browser-entry-uri-style-selected-incognito";
- base: "font=Sans:style=SVD_Medium font_size="40" wrap=none color=#4088d3";
- tag: "br" "";
- }
- }
- data {
- item: focus_highlight "off";
- }
- images {
- image: "input_ic_incognito.png" COMP;
- }
- parts {
-
- part {
- name: "bg";
- scale:1;
- type: RECT;
- mouse_events: 0;
- description {
- state: "default" 0.0;
- color: 244 244 244 255;
- fixed: 0 1;
- max: -1 URI_INPUTBOX_WIDTH;
- align: 0.0 0.0;
- }
- }
- part {
- name: "label.text.clip";
- scale:1;
- type: RECT;
- description {
- state: "default" 0.0;
- }
- }
- part {
- name: "elm.text";
- scale: 1;
- multiline: 0;
- entry_mode: EDITABLE;
- select_mode: DEFAULT;
- cursor_mode: BEFORE;
- type: TEXTBLOCK;
- clip_to: "label.text.clip";
- source: "elm/entry/selection/browser_entry";
- source4: "elm/entry/cursor/browser_entry";
- description {
- state: "default" 0.0;
- rel1.to: "bg";
- rel1.relative: 0.0 0.0;
- rel1.offset: BORDER_WIDTH 0;
- rel2.to: "bg";
- rel2.relative: 1.0 1.0;
- align: 0.0 0.0;
- fixed: 0 1;
- text {
- style: "browser-entry-uri-style-selected";
- min: 0 1;
- }
- }
- description {
- state: "incognito" 0.0;
- align: 0.0 0.0;
- text {
- style: "browser-entry-uri-style-selected-incognito";
- min: 0 1;
- }
- }
- }
- part {
- name: "elm.guide";
- scale:1;
- type: TEXTBLOCK;
- mouse_events: 0;
- clip_to: "label.text.clip";
- source4: "elm/entry/cursor/browser_entry";
- description {
- state: "default" 0.0;
- rel1.to: "bg";
- rel1.relative: 0.0 0.0;
- rel1.offset: BORDER_WIDTH 0;
- rel2.relative: 1.0 1.0;
- max: -1 URI_INPUTBOX_WIDTH;
- text {
- style: "browser-entry-uri-style-unselected";
- min: 0 1;
- }
- }
- description {
- state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
- }
- programs {
- program {
- name: "focus";
- signal: "load";
- source: "";
- action: FOCUS_SET;
- target: "elm.text";
- }
- program {
- name: "gdisabled";
- signal: "elm,guide,disabled";
- source: "elm";
- action: STATE_SET "hidden" 0.0;
- target: "elm.guide";
- }
- program {
- name: "genabled";
- signal: "elm,guide,enabled";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "elm.guide";
- }
- program {
- name: "normal_mode_uri_entry";
- source: "ui";
- signal: "uri_entry_normal";
- }
- program {
- name: "incognito_mode_uri_entry";
- source: "ui";
- signal: "uri_entry_incognito";
- action: STATE_SET "incognito" 0.0;
- target: "elm.text";
- }
- }
- }//group
-
- group {
- name: "uri_entry_layout";
- parts {
- part {
- name: "uri_entry_space";
- type : RECT;
- repeat_events: 1;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 1;
- align: 0.0 0.0;
- min: 0 URI_INPUTBOX_WIDTH;
- max: -1 URI_INPUTBOX_WIDTH;
- fixed: 0 1;
- color: 244 244 244 255;
- rel1 { relative: 0.0 0.0; }
- rel2 { relative: 1.0 1.0; }
- }
- description {
- state: "moveright" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- description {
- state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part {
- name: "over_icon";
- scale: 1;
- type: RECT;
- mouse_events: 0;
- description {
- state: "default" 0.0;
- min: 0 0;
- max: 0 0;
- rel1.to: "uri_entry_space";
- rel1.relative: 0.0 0.0;
- rel2.relative: 1.0 1.0;
- align: 0 0;
- color: 244 244 244 255;
- }
- description {
- state: "incognito" 0.0;
- inherit: "default" 0.0;
- min: 38 URI_INPUTBOX_WIDTH;
- max: 38 URI_INPUTBOX_WIDTH;
- }
- }
- part {
- name: "incognito_icon";
- type: IMAGE;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 0;
- min: 0 0;
- max: 0 0;
- rel1 {
- to: "over_icon";
- relative: 0.0 0.0;
- }
- rel2 {
- relative: 1.0 1.0;
- }
- image.normal: "input_ic_incognito.png";
- align: 0 0.5;
- }
- description {
- state: "incognito" 0.0;
- inherit: "default" 0.0;
- min: 38 38;
- max: 38 38;
- visible: 1;
- }
- }
- part {
- name: "over";
- type: RECT;
- mouse_events: 1;
- repeat_events: 1;
- description {
- state: "default" 0.0;
- color: 0 0 0 0;
- rel1 { relative: 0 0; }
- rel2 { relative: 1 1; }
- }
- }
- part {
- name: "right_icon_bg";
- scale:1;
- type: RECT;
- mouse_events: 1;
- description {
- state: "default" 0.0;
- min: 0 64;
- max: 0 64;
- visible: 0;
- color: 0 0 0 0;
- fixed: 0 1;
- align: 1 0;
- }
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- fixed: 0 1;
- align: 1 1;
- min: 64 64;
- max: 64 64;
- rel1 {
- to: "uri_entry_space";
- relative: 0.0 0.0;
- }
- rel2 {
- to: "uri_entry_space";
- relative: 1.0 1.0;
- }
- visible: 1;
- color: 244 244 244 255;
- }
- description {
- state: "focused" 0.0;
- inherit: "visible" 0.0;
- visible: 1;
- color: 224 237 251 255;
- }
- description {
- state: "moveright" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- }
- part {
- name: "uri_entry_swallow";
- type : SWALLOW;
- mouse_events: 1;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 1;
- align: 0.0 0.0;
- fixed: 1 1;
- rel1 { relative: 1.0 0.0; to: "over_icon"; }
- rel2 { relative: 0.0 1.0; to: "right_icon_bg"; }
- }
- description {
- state: "moveright" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- description {
- state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part {
- name: "right_icon";
- type: IMAGE;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 0;
- min: 0 0;
- max: 0 0;
- rel1 {
- to: "right_icon_bg";
- relative: 0.0 0.0;
- }
- rel2 {
- to: "right_icon_bg";
- relative: 1.0 1.0;
- }
- image.border: 8 8 8 8;
- image.border_scale: 1;
- align: 0.5 0.5;
- }
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- min: 46 46;
- max: 46 46;
- visible: 1;
- }
- description {
- state: "moveright" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- description {
- state: "cancel" 0.0;
- inherit: "visible" 0.0;
- image.normal: "navi_input_ic_cancel.png";
- }
- description {
- state: "secure" 0.0;
- inherit: "visible" 0.0;
- image.normal: "ic_lock.png";
- }
- description {
- state: "unsecure" 0.0;
- inherit: "visible" 0.0;
- image.normal: "ic_lock_unsecure.png";
- }
- }
- part {
- name: "cancel_over";
- scale:1;
- type: RECT;
- mouse_events: 1;
- description {
- state: "default" 0.0;
- min: 64 64;
- max: 64 64;
- visible: 0;
- rel1 {
- to: "right_icon_bg";
- relative: 0.0 0.0;
- }
- rel2 {
- to: "right_icon_bg";
- relative: 1.0 1.0;
- }
- color: 0 0 0 0;
- }
- description {
- state: "moveright" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part {
- name: "cancel_click";
- scale:1;
- mouse_events: 1;
- repeat_events: 1;
- type: SWALLOW;
- description {
- state: "default" 0.0;
- visible: 1;
- align: 0 0;
- fixed: 1 1;
- min: 64 64;
- max: 64 64;
- rel1 { relative: 0.0 0.0; to: "cancel_over";}
- rel2 { relative: 1.0 1.0; to: "cancel_over";}
- color: 0 0 0 0;
- }
- }
- }
- programs {
- program {
- name: "shiftright_uribarbg";
- signal: "shiftright_uribg";
- source: "ui";
- action: STATE_SET "moveright" 0.0;
- target: "uri_entry_swallow";
- target: "right_icon";
- target: "cancel_over";
- target: "right_icon_bg";
- target: "uri_entry_space";
- }
- program {
- name: "shiftback_uribarbg";
- signal: "shiftback_uribg";
- source: "ui";
- action: STATE_SET "default" 0.0;
- target: "uri_entry_swallow";
- target: "right_icon";
- target: "cancel_over";
- target: "uri_entry_space";
- }
- program {
- name: "mouse_in_right_icon";
- signal: "mouse,down,*";
- source: "cancel_over";
- action: STATE_SET "focused" 0.0;
- target: "right_icon_bg";
- }
- program {
- name: "mouse_out_right_icon";
- signal: "mouse,up,*";
- source: "cancel_over";
- action: STATE_SET "visible" 0.0;
- target: "right_icon_bg";
- }
- program {
- name: "show_secure_icon";
- signal: "show,secure,icon";
- source: "";
- action: STATE_SET "secure" 0.0;
- target: "right_icon";
- after: "show_icon_bg";
- }
- program {
- name: "show_unsecure_icon";
- signal: "show,unsecure,icon";
- source: "";
- action: STATE_SET "unsecure" 0.0;
- target: "right_icon";
- after: "show_icon_bg";
- }
- program {
- name: "mouse_clicked_right_icon";
- signal: "mouse,clicked,*";
- source: "cancel_over";
- after: "call_on_right_icon_clicked_cb";
- }
- program {
- name: "call_on_right_icon_clicked_cb";
- signal: "call_on_right_icon_clicked_cb";
- source: "ui";
- action: SIGNAL_EMIT "right_icon_clicked" "ui";
- }
- program {
- name: "normal_mode_uri_entry";
- source: "ui";
- signal: "uri_entry_normal";
- action: STATE_SET "default" 0.0;
- target: "incognito_icon";
- target: "over_icon";
- }
- program {
- name: "incognito_mode_uri_entry";
- source: "ui";
- signal: "uri_entry_incognito";
- action: STATE_SET "incognito" 0.0;
- target: "incognito_icon";
- target: "over_icon";
- }
- program {
- name: "show_cancel_icon";
- source: "ui";
- signal: "show_cancel_icon";
- action: STATE_SET "cancel" 0.0;
- target: "right_icon";
- after: "show_icon_bg";
- }
- program {
- name: "show_icon_bg";
- signal: "show_icon_bg";
- action: STATE_SET "visible" 0.0;
- target: "right_icon_bg";
- target: "cancel_over";
- }
- program {
- name: "hide_icon";
- source: "ui";
- signal: "hide_icon";
- action: STATE_SET "default" 0.0;
- target: "right_icon";
- target: "right_icon_bg";
- target: "cancel_over";
- }
- }
- }
-}
-#define URI_LENGTH 1720
-#define URI_LENGTH_SHORT 1460
-#define URI_WIDTH 82
+#define URI_LENGTH 518
+#define URI_WIDTH 80
+#define URI_BG_HEIGHT 108
+#define URI_BG_WIDTH 720
+#define BOTTOM_TOOLBAR_HEIGHT 96
+#define MORE_HEIGHT_VERTICAL 586
+#define MORE_HEIGHT_LANDSCAPE 373
+#define FINDONPAGE_HEIGHT 104
+#define FINDONPAGE_WIDTH 720
+#define SPACER_SIZE 16
#include "../../../core/Tools/edc/Spacer.edc"
-#define DEBUG_RECT_OVER(over_part, r, g, b) \
- part { name: __CONCAT("dbg_rect_at_", __stringify(__LINE__)); \
- \
-scale:1; \
- type : RECT; \
- repeat_events: 1; \
- description { \
- state: "default" 0.0; \
- visible: 1; \
- color: r g b 255; \
- rel1 { to: over_part; relative: 0 0; } \
- rel2 { to: over_part; relative: 1 1; } \
- } \
+
+#define PROGRESS_DESCRIPTIONS\
+ PROGRESS_DESCRIPTION(0.00)\
+ PROGRESS_DESCRIPTION(0.05)\
+ PROGRESS_DESCRIPTION(0.10)\
+ PROGRESS_DESCRIPTION(0.15)\
+ PROGRESS_DESCRIPTION(0.20)\
+ PROGRESS_DESCRIPTION(0.25)\
+ PROGRESS_DESCRIPTION(0.30)\
+ PROGRESS_DESCRIPTION(0.35)\
+ PROGRESS_DESCRIPTION(0.40)\
+ PROGRESS_DESCRIPTION(0.45)\
+ PROGRESS_DESCRIPTION(0.50)\
+ PROGRESS_DESCRIPTION(0.55)\
+ PROGRESS_DESCRIPTION(0.60)\
+ PROGRESS_DESCRIPTION(0.65)\
+ PROGRESS_DESCRIPTION(0.70)\
+ PROGRESS_DESCRIPTION(0.75)\
+ PROGRESS_DESCRIPTION(0.80)\
+ PROGRESS_DESCRIPTION(0.85)\
+ PROGRESS_DESCRIPTION(0.90)\
+ PROGRESS_DESCRIPTION(0.95)\
+ PROGRESS_DESCRIPTION(1.00)
+
+#define PROGRESS_DESCRIPTION(RATE)\
+ description { state: "progress" RATE;\
+ inherit: "default" 0.0;\
+ visible: 1;\
+ rel1 { relative: 0.0 0.0; to: "progressbar_bg"; }\
+ rel2 { relative: RATE 1.0; to: "progressbar_bg"; }\
}
-collections { base_scale: 2.0;
+
+#define PROGRESS_PROGRAMS\
+ PROGRESS_PROGRAM(0.10)\
+ PROGRESS_PROGRAM(0.15)\
+ PROGRESS_PROGRAM(0.20)\
+ PROGRESS_PROGRAM(0.25)\
+ PROGRESS_PROGRAM(0.30)\
+ PROGRESS_PROGRAM(0.35)\
+ PROGRESS_PROGRAM(0.40)\
+ PROGRESS_PROGRAM(0.45)\
+ PROGRESS_PROGRAM(0.50)\
+ PROGRESS_PROGRAM(0.55)\
+ PROGRESS_PROGRAM(0.60)\
+ PROGRESS_PROGRAM(0.65)\
+ PROGRESS_PROGRAM(0.70)\
+ PROGRESS_PROGRAM(0.75)\
+ PROGRESS_PROGRAM(0.80)\
+ PROGRESS_PROGRAM(0.85)\
+ PROGRESS_PROGRAM(0.90)\
+ PROGRESS_PROGRAM(0.95)
+
+#define PROGRESS_PROGRAM(RATE)\
+ program { name: "update,progress,"RATE;\
+ signal: "update,progress,"RATE",signal";\
+ transition: DECELERATE 0.1;\
+ action: STATE_SET "progress" RATE;\
+ target: "progress_bar";\
+ }
+
+#define PROGRESS_BG_IMAGE "I01_toolbar_progress_bg.#.png"
+#define PROGRESS_BAR_IMAGE "I01_toolbar_progress.#.png"
+
+collections { base_scale: 2.6;
group {
name: "main_layout";
images {
- image: "web_shadow.png" COMP;
- image: "btn_bar_incognito.png" COMP;
+ image: PROGRESS_BG_IMAGE COMP;
+ image: PROGRESS_BAR_IMAGE COMP;
}
parts {
part {
- name: "uri_bar_bg";
- type : RECT;
+ name: "bg";
+ type: RECT;
scale: 1;
description {
state: "default" 0.0;
- visible: 1;
- fixed: 1 1;
- align: 0 0;
- min: 1920 104;
- max: 1920 104;
- color: 255 255 255 255;
- rel1 { relative: 0.0 0.0; }
- rel2 { relative: 1.0 0.0; }
+ color: 0 0 0 0;
+ rel1 {
+ relative: 0.0 0.0;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ }
+ }
}
- }
- ADD_SPACER_OVER("left_spacer", "uri_bar_bg", 7, 104)
part {
- name: "uri_bar_buttons_left";
- type : SWALLOW;
+ name: "uri_bar_bg";
+ type : RECT;
scale: 1;
description {
state: "default" 0.0;
visible: 1;
- align: 0 0.5;
- min: 246 102;
- max: 246 102;
- fixed: 1 1;
- rel1 { relative: 1.0 1.0; to: "left_spacer"; }
- rel2 { relative: 0.0 0.0; to: "left_spacer"; }
- }
- description {
- state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
+ fixed: 0 1;
+ align: 0 0;
+ min: 0 URI_BG_HEIGHT;
+ max: -1 URI_BG_HEIGHT;
+ color: 240 240 240 255;
+ rel1 {relative: 0.0 0.0; to:"bg";}
+ rel2 {relative: 1.0 1.0; to:"bg";}
+ }
+ description {
+ state: "hidden_vertical" 0.0;
+ inherit: "default" 0.0;
+ rel1 {relative: 0.0 -URI_BG_HEIGHT/1228; to:"bg";}
+ }
+ description {
+ state: "hidden_landscape" 0.0;
+ inherit: "default" 0.0;
+ rel1 {relative: 0.0 -URI_BG_HEIGHT/668; to:"bg";}
+ }
}
- }
- ADD_SPACER("left_buttons_spacer", "uri_bar_buttons_left", 0.5, 102)
+ ADD_SPACER_OVER("left_spacer", "uri_bar_bg", SPACER_SIZE, SPACER_SIZE)
+
part {
name: "uri_entry";
type : SWALLOW;
description {
state: "default" 0.0;
visible: 1;
- align: 0.0 0.5;
- min: URI_LENGTH URI_WIDTH;
- max: URI_LENGTH URI_WIDTH;
- fixed: 1 1;
- rel1 { relative: 1.0 0.5; to: "left_spacer"; }
- rel2 { relative: 1.0 0.5; to: "left_spacer"; }
- }
- description {
- state: "moveright" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- min: URI_LENGTH_SHORT URI_WIDTH;
- max: URI_LENGTH_SHORT URI_WIDTH;
- rel1 { relative: 1.0 0.5; to: "left_buttons_spacer"; }
- rel2 { relative: 1.0 0.5; to: "left_buttons_spacer"; }
- }
- description {
- state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
+ align: 0.0 0.0;
+ min: 0 URI_WIDTH;
+ max: -1 URI_WIDTH;
+ fixed: 0 1;
+ rel1 { relative: 1.0 1.0; to: "left_spacer"; }
+ rel2 { relative: 0.0 1.0; to: "spacer_after_uri_entry"; }
+ }
+ description {
+ state: "moveright" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ rel1 { relative: 1.0 1.0; to: "left_spacer"; }
+ rel2 { relative: 0.0 1.0; to: "spacer_after_uri_entry"; }
+ }
+ description {
+ state: "entry_enlarged" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ max: -1 URI_WIDTH;
+ rel2 {
+ to: "spacer_after_uri_entry";
+ relative: 0.0 1.0;
+ }
+ }
+ description {
+ state: "hidden" 0.0;
+ inherit: "default" 0.0;
+ visible: 0;
+ }
+ description {
+ state: "visible" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ description {
+ state: "entry_decreased_wp" 0.0;
+ inherit: "moveright" 0.0;
+ }
}
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
+
+ part {
+ name: "spacer_after_uri_entry";
+ type: RECT;
+ scale: 1;
+ description {
+ state: "default" 0.0;
+ visible: 0;
+ fixed: 0 1;
+ align: 1 1;
+ min: SPACER_SIZE URI_BG_HEIGHT;
+ max: SPACER_SIZE URI_BG_HEIGHT;
+ rel1 { relative: 0.0 0.0; to: "uri_bar_bg"; }
+ rel2 { relative: 0.0 1.0; to: "uri_bar_buttons_right"; }
+ }
}
- }
- ADD_SPACER("right_buttons_spacer", "uri_entry", 26, 102)
+
part {
name: "uri_bar_buttons_right";
type : SWALLOW;
description {
state: "default" 0.0;
visible: 1;
- align: 0.0 0.5;
- min: 164 102;
- max: 164 102;
+ align: 1.0 1.0;
+ min: 100 URI_BG_HEIGHT;
+ max: 100 URI_BG_HEIGHT;
fixed: 1 1;
- rel1 { relative: 1.0 0.5; to: "right_buttons_spacer"; }
- rel2 { relative: 1.0 0.5; to: "right_buttons_spacer"; }
- }
- description {
- state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- ADD_SPACER("right_spacer", "uri_bar_buttons_right", 74, 102)
- part {
- name: "web_view";
- type : SWALLOW;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 1;
- align: 0.0 0.0;
- fixed: 0 0;
- rel1 { relative: 0.0 1.0; to: "uri_bar_bg"; }
- rel2 { relative: 1.0 1.0; }
- }
- }
- part {
- name: "shadow";
- type: IMAGE;
- scale: 1;
- repeat_events: 1;
- description {
- state: "default" 0.0;
- visible: 1;
- align: 0.0 0.0;
- fixed: 0 0;
- min: 1920 14;
- max: 1920 14;
- image.normal: "web_shadow.png";
- rel1 { relative: 0.0 0.0; to: "web_view"; }
- rel2 { relative: 1.0 1.0; }
+ rel1 { relative: 0.0 0.0; to: "uri_bar_bg"; }
+ rel2 { relative: 1.0 1.0; to: "uri_bar_bg"; }
+ }
+ description {
+ state: "hidden" 0.0;
+ inherit: "default" 0.0;
+ min: 0 URI_BG_HEIGHT;
+ max: 0 URI_BG_HEIGHT;
+ visible: 0;
+ }
+ description {
+ state: "entry_enlarged" 0.0;
+ inherit: "default" 0.0;
+ min: 0 URI_BG_HEIGHT;
+ max: 0 URI_BG_HEIGHT;
+ visible: 0;
+ }
+ description {
+ state: "visible" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
+ description {
+ state: "entry_decreased_wp" 0.0;
+ inherit: "default" 0.0;
+ }
}
- }
- part {
- name: "incognito";
- type: IMAGE;
- repeat_events: 1;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 0;
- rel1 {
- relative: 0.0 0.0;
- to: "uri_bar_bg";
- offset: 1623 0;
- }
- rel2 {
- relative: 0.0 0.0;
- to: "uri_bar_bg";
- offset: 1623+82 0+102;
- }
- align: 0.5 0.5;
- image.normal: "btn_bar_incognito.png";
+
+ part {
+ name: "bottom_toolbar";
+ type: RECT;
+ scale: 1;
+ description {
+ state: "default" 0.0;
+ visible: 1;
+ align: 0.0 1.0;
+ min: 0 0;
+ max: -1 BOTTOM_TOOLBAR_HEIGHT;
+ color: 240 240 240 255;
+ rel1 { relative: 0.0 0.0; to: "bg"; }
+ rel2 { relative: 1.0 1.0; to: "bg"; }
+ }
+ description {
+ state: "hidden_vertical" 0.0;
+ inherit: "default" 0.0;
+ rel1 {relative: 0.0 1.0; to:"bg";}
+ }
+ description {
+ state: "hidden_landscape" 0.0;
+ inherit: "default" 0.0;
+ rel1 {relative: 0.0 1.0; to:"bg";}
+ }
}
- description {
- state: "visible" 1.0;
- inherit: "default" 0.0;
- visible: 1;
+ part {
+ name: "bottom_swallow";
+ type: SWALLOW;
+ scale: 1;
+ description {
+ state: "default" 0.0;
+ visible: 1;
+ rel1 { relative: 0.0 0.0; to: "bottom_toolbar"; }
+ rel2 { relative: 1.0 1.0; to: "bottom_toolbar"; }
+ }
}
- }
- part {
- name: "progress_bar";
- type: SWALLOW;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 1;
- align: 0.0 0.0;
- fixed: 0 0;
- min: 1920 2;
- max: 1920 2;
- rel1 {
- relative: 0.0 0.0;
- offset: 0 1;
- to: "web_view";
- }
- rel2 { relative: 1.0 1.0; }
+
+ part {
+ name: "web_view";
+ type: SWALLOW;
+ scale: 1;
+ description {
+ state: "default" 0.0;
+ visible: 1;
+ align: 0.0 0.0;
+ fixed: 0 0;
+ min: 0 0;
+ max: -1 -1;
+ rel1 { relative: 0.0 1.0; to: "uri_bar_bg"; }
+ rel2 { relative: 1.0 0.0; to: "bottom_toolbar"; }
+ }
}
- }
- part {
- name: "progress_bar_light_bg";
- type: RECT;
- repeat_events: 1;
- description {
- state: "default" 0.0;
- fixed: 1 1;
- min: 0 8;
- max: 1920 8;
- align: 0 0;
- visible: 0;
- rel1.to: "web_view";
- rel1.relative: 0.0 0.0;
- rel2.relative: 1.0 0.0;
- color: 69 143 255 55;
+ part {
+ name: "web_view_dummy_button";
+ type: SWALLOW;
+ mouse_events: 1;
+ repeat_events: 1;
+ scale: 1;
+ description {
+ state: "default" 0.0;
+ visible: 1;
+ align: 0.0 0.0;
+ fixed: 0 0;
+ min: 0 0;
+ max: -1 -1;
+ rel1 { relative: 0.0 0.0; to: "web_view"; }
+ rel2 { relative: 1.0 1.0; to: "web_view"; }
+ }
}
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
+ part { name: "progressbar_bg";
+ type: IMAGE;
+ scale: 1;
+ description {
+ state: "default" 0.0;
+ visible: 0;
+ fixed: 0 1;
+ min: 0 5;
+ max: -1 5;
+ align: 0.5 1;
+ image.normal: PROGRESS_BG_IMAGE;
+ rel1 { relative: 0.0 0.0; to: "uri_bar_bg";}
+ rel2 { relative: 1.0 1.0; to: "uri_bar_bg";}
+ }
+ description {
+ state: "progress" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
+ }
}
- }
- #include "WebPageUIUrlHistoryList.edc"
- part {
- name: "popup_bg";
- type: RECT;
- scale: 1;
- mouse_events: 1;
- description {
- state: "default" 0.0;
- visible: 0;
- min: 1920 1080;
- fixed: 1 1;
- color: 100 100 100 128;
- rel1 {relative: 0.0 0.0; }
- rel2 {relative: 1.0 1.0; }
+ part { name: "progress_bar";
+ type: IMAGE;
+ scale: 1;
+ description {
+ state: "default" 0.0;
+ visible: 0;
+ align: 0.0 0.0;
+ image.normal: PROGRESS_BAR_IMAGE;
+ rel1 { relative: 0.0 0.0; to: "progressbar_bg"; }
+ rel2 { relative: 1.0 1.0; to: "progressbar_bg"; }
+ }
+ PROGRESS_DESCRIPTIONS
}
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
+ programs {
+ program { name: "hide,progress";
+ signal: "hide,progress,signal";
+ transition: DECELERATE 0.1;
+ action: STATE_SET "default" 0.0;
+ target: "progress_bar";
+ target: "bg";
+ }
+ program { name: "show,progress";
+ signal: "show,progress,signal";
+ action: STATE_SET "progress" 0.0;
+ target: "bg";
+ }
+ program { name: "update,progress,0.00";
+ signal: "update,progress,0.00,signal";
+ action: STATE_SET "progress" 0.05;
+ target: "progress_bar";
+ }
+ PROGRESS_PROGRAMS
+ program { name: "update,progress,1.0";
+ signal: "update,progress,1.00,signal";
+ transition: DECELERATE 0.05;
+ action: STATE_SET "progress" 1.00;
+ target: "progress_bar";
+ }
}
+
+ #include "WebPageUIUrlHistoryList.edc"
part {
- name: "popup";
- type: SWALLOW;
+ name: "moremenu_dimmed_bg";
+ type: RECT;
scale: 1;
+ mouse_events: 1;
description {
state: "default" 0.0;
visible: 0;
+ align: 0.0 0.0;
min: 0 0;
- max: 700 800;
- align: 0.5 0.5;
- rel1 { relative: 0.0 0.0; to: "web_view";}
- rel2 { relative: 1.0 1.0; to: "web_view";}
- fixed: 1 1;
+ max: -1 -1;
+ fixed: 0 0;
+ color: 0 0 0 102.4;
+ rel1 {
+ relative: 0.0 0.0;
+ to: "web_view";
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ to: "web_view";
+ }
}
description {
state: "visible" 0.0;
- inherit: "default" 0.0;
+ inherit: "default";
visible: 1;
- max: 1920 1080;
}
}
+ part {
+ name: "moremenu_bg";
+ type: RECT;
+ scale: 1;
+ description {
+ state: "default" 0.0;
+ visible: 0;
+ align: 0.0 0.0;
+ min: 0 MORE_HEIGHT_VERTICAL;
+ max: -1 MORE_HEIGHT_VERTICAL;
+ fixed: 0 1;
+ color: 244 244 244 255;
+ rel1 {
+ relative: 0.0 0.0;
+ to: "web_view";
+ }
+ rel2.relative: 1.0 1.0;
+ }
+ description { state: "landscape" 0.0;
+ inherit: "default";
+ visible: 1;
+ min: 0 MORE_HEIGHT_LANDSCAPE;
+ max: -1 MORE_HEIGHT_LANDSCAPE;
+ }
+ description { state: "vertical" 0.0;
+ inherit: "default";
+ visible: 1;
+ min: 0 MORE_HEIGHT_VERTICAL;
+ max: -1 MORE_HEIGHT_VERTICAL;
+ }
+ }
+ part {
+ name: "moremenu";
+ type: SWALLOW;
+ scale: 1;
+ mouse_events: 1;
+ description {
+ state: "default" 0.0;
+ visible: 0;
+ align: 0.0 0.0;
+ min: 0 MORE_HEIGHT_VERTICAL;
+ max: -1 MORE_HEIGHT_VERTICAL;
+ fixed: 0 1;
+ rel1 {
+ relative: 0.0 0.0;
+ to: "moremenu_bg";
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ to: "moremenu_bg";
+ }
+ }
+ description { state: "landscape" 0.0;
+ inherit: "default";
+ visible: 1;
+ min: 0 MORE_HEIGHT_LANDSCAPE;
+ max: -1 MORE_HEIGHT_LANDSCAPE;
+ }
+ description { state: "vertical" 0.0;
+ inherit: "default";
+ visible: 1;
+ min: 0 MORE_HEIGHT_VERTICAL;
+ max: -1 MORE_HEIGHT_VERTICAL;
+ }
+ }
+ part {
+ name: "findonpage";
+ type: SWALLOW;
+ scale: 1;
+ mouse_events: 1;
+ description {
+ state: "default" 0.0;
+ visible: 0;
+ align: 0 0;
+ fixed: 1 1;
+ color: 244 244 244 255;
+ min: 0 FINDONPAGE_HEIGHT;
+ max: -1 FINDONPAGE_HEIGHT;
+ rel1 {
+ relative: 0 0;
+ to: "web_view";
+ }
+ rel2 {
+ relative: 1 1;
+ to: "web_view";
+ }
+ }
+ description {
+ state: "visible" 0.0;
+ inherit: "default";
+ visible: 1;
+ }
+ }
}
- }
- programs {
- program {
- name: "shiftright_uribar";
- signal: "shiftright_uri";
- source: "ui";
- action: STATE_SET "moveright" 0.0;
- target: "uri_entry";
- }
- program {
- name: "shiftback_uribar";
- signal: "shiftback_uri";
- source: "ui";
- action: STATE_SET "default" 0.0;
- target: "uri_entry";
- }
- program {
- name: "hide_progress";
- signal: "hide_progressbar_bg";
- source: "ui";
- action: STATE_SET "default" 0.0;
- target: "progress_bar_light_bg";
- }
- program {
- name: "show_progress";
- signal: "show_progressbar_bg";
- source: "ui";
- action: STATE_SET "visible" 0.0;
- target: "progress_bar_light_bg";
- }
- program {
- name: "show_incognito_ico";
- signal: "incognito,true";
- source: "ui";
- action: STATE_SET "visible" 1.0;
- target: "incognito";
- }
- program {
- name: "hide_incognito_ico";
- signal: "incognito,false";
- source: "ui";
- action: STATE_SET "default" 0.0;
- target: "incognito";
- }
- program {
- name: "show_popup";
- signal: "elm,state,show";
- source: "elm";
- action: STATE_SET "visible" 0.0;
- transition: LINEAR 0.0;
- target: "popup";
- target: "popup_bg";
- }
- program {
- name: "hide_popup";
- signal: "elm,state,hide";
- source: "elm";
- action: STATE_SET "default" 0.0;
- transition: LINEAR 0.0;
- target: "popup";
- target: "popup_bg";
+ programs {
+ program {
+ name: "shiftright_uribar";
+ signal: "shiftright_uri";
+ source: "ui";
+ action: STATE_SET "moveright" 0.0;
+ target: "uri_entry";
+ }
+ program {
+ name: "shiftback_uribar";
+ signal: "shiftback_uri";
+ source: "ui";
+ action: STATE_SET "default" 0.0;
+ target: "uri_entry";
+ }
+ program {
+ name: "enlarge_focused_uribar";
+ signal: "enlarge_focused_uri";
+ source: "ui";
+ action: STATE_SET "entry_enlarged" 0.0;
+ target: "uri_entry";
+ target: "uri_bar_buttons_right";
+ }
+ program {
+ name: "decrease_unfocused_uribar";
+ signal: "decrease_unfocused_uri";
+ source: "ui";
+ action: STATE_SET "default" 0.0;
+ target: "uri_entry";
+ target: "uri_bar_buttons_right";
+ }
+ program {
+ name: "decrease_unfocused_uribar_wp";
+ signal: "decrease_unfocused_uri_wp";
+ source: "ui";
+ action: STATE_SET "entry_decreased_wp" 0.0;
+ target: "uri_entry";
+ target: "uri_bar_buttons_right";
+ }
+ program {
+ name: "hide_uri_bar_landscape";
+ signal: "hide_uri_bar_landscape";
+ source: "ui";
+ in: 0.01 0.0;
+ action: STATE_SET "hidden_landscape" 0.0;
+ target: "uri_bar_bg";
+ target: "bottom_toolbar";
+ transition: LINEAR 0.15;
+ }
+ program {
+ name: "hide_uri_bar_vertical";
+ signal: "hide_uri_bar_vertical";
+ source: "ui";
+ in: 0.01 0.0;
+ action: STATE_SET "hidden_vertical" 0.0;
+ target: "uri_bar_bg";
+ target: "bottom_toolbar";
+ transition: LINEAR 0.15;
+ }
+ program {
+ name: "show_uri_bar";
+ signal: "show_uri_bar";
+ source: "ui";
+ action: STATE_SET "default" 0.0;
+ target: "uri_bar_bg";
+ target: "bottom_toolbar";
+ transition: LINEAR 0.15;
+ }
+ program {
+ name: "hide_moremenu";
+ signal: "hide_moremenu";
+ source: "ui";
+ action: STATE_SET "default" 0.0;
+ target: "moremenu";
+ target: "moremenu_bg";
+ target: "moremenu_dimmed_bg";
+ }
+ program {
+ name: "show_moremenu_landscape";
+ signal: "show_moremenu_landscape";
+ source: "ui";
+ action: STATE_SET "landscape" 0.0;
+ target: "moremenu";
+ target: "moremenu_bg";
+ after: "show_moremenu_dimmed_bg";
+ }
+ program {
+ name: "show_moremenu_vertical";
+ signal: "show_moremenu_vertical";
+ source: "ui";
+ action: STATE_SET "vertical" 0.0;
+ target: "moremenu";
+ target: "moremenu_bg";
+ after: "show_moremenu_dimmed_bg";
+ }
+ program {
+ name: "show_moremenu_dimmed_bg";
+ action: STATE_SET "visible" 0.0;
+ target: "moremenu_dimmed_bg";
+ }
+ program {
+ name: "hide_findonpage";
+ signal: "hide_findonpage";
+ source: "ui";
+ action: STATE_SET "default" 0.0;
+ target: "findonpage";
+ }
+ program {
+ name: "show_findonpage";
+ signal: "show_findonpage";
+ source: "ui";
+ action: STATE_SET "visible" 0.0;
+ target: "findonpage";
+ }
}
}
}
-}
+++ /dev/null
-#define URI_LENGTH 518
-#define URI_WIDTH 64
-#define URI_BG_HEIGHT 108
-#define URI_BG_WIDTH 720
-#define MORE_HEIGHT_VERTICAL 586
-#define MORE_HEIGHT_LANDSCAPE 373
-#define FINDONPAGE_HEIGHT 104
-#define FINDONPAGE_WIDTH 720
-#include "../../../core/Tools/edc/Spacer.edc"
-
-#define PROGRESS_DESCRIPTIONS\
- PROGRESS_DESCRIPTION(0.00)\
- PROGRESS_DESCRIPTION(0.05)\
- PROGRESS_DESCRIPTION(0.10)\
- PROGRESS_DESCRIPTION(0.15)\
- PROGRESS_DESCRIPTION(0.20)\
- PROGRESS_DESCRIPTION(0.25)\
- PROGRESS_DESCRIPTION(0.30)\
- PROGRESS_DESCRIPTION(0.35)\
- PROGRESS_DESCRIPTION(0.40)\
- PROGRESS_DESCRIPTION(0.45)\
- PROGRESS_DESCRIPTION(0.50)\
- PROGRESS_DESCRIPTION(0.55)\
- PROGRESS_DESCRIPTION(0.60)\
- PROGRESS_DESCRIPTION(0.65)\
- PROGRESS_DESCRIPTION(0.70)\
- PROGRESS_DESCRIPTION(0.75)\
- PROGRESS_DESCRIPTION(0.80)\
- PROGRESS_DESCRIPTION(0.85)\
- PROGRESS_DESCRIPTION(0.90)\
- PROGRESS_DESCRIPTION(0.95)\
- PROGRESS_DESCRIPTION(1.00)
-
-#define PROGRESS_DESCRIPTION(RATE)\
- description { state: "progress" RATE;\
- inherit: "default" 0.0;\
- visible: 1;\
- rel1 { relative: 0.0 0.0; to: "progressbar_bg"; }\
- rel2 { relative: RATE 1.0; to: "progressbar_bg"; }\
- }
-
-#define PROGRESS_PROGRAMS\
- PROGRESS_PROGRAM(0.10)\
- PROGRESS_PROGRAM(0.15)\
- PROGRESS_PROGRAM(0.20)\
- PROGRESS_PROGRAM(0.25)\
- PROGRESS_PROGRAM(0.30)\
- PROGRESS_PROGRAM(0.35)\
- PROGRESS_PROGRAM(0.40)\
- PROGRESS_PROGRAM(0.45)\
- PROGRESS_PROGRAM(0.50)\
- PROGRESS_PROGRAM(0.55)\
- PROGRESS_PROGRAM(0.60)\
- PROGRESS_PROGRAM(0.65)\
- PROGRESS_PROGRAM(0.70)\
- PROGRESS_PROGRAM(0.75)\
- PROGRESS_PROGRAM(0.80)\
- PROGRESS_PROGRAM(0.85)\
- PROGRESS_PROGRAM(0.90)\
- PROGRESS_PROGRAM(0.95)
-
-#define PROGRESS_PROGRAM(RATE)\
- program { name: "update,progress,"RATE;\
- signal: "update,progress,"RATE",signal";\
- transition: DECELERATE 0.1;\
- action: STATE_SET "progress" RATE;\
- target: "progress_bar";\
- }
-
-#define PROGRESS_BG_IMAGE "I01_toolbar_progress_bg.#.png"
-#define PROGRESS_BAR_IMAGE "I01_toolbar_progress.#.png"
-
-collections { base_scale: 2.6;
- group {
- name: "main_layout";
- images {
- image: PROGRESS_BG_IMAGE COMP;
- image: PROGRESS_BAR_IMAGE COMP;
- }
- parts {
- part {
- name: "bg";
- type: RECT;
- scale: 1;
- description {
- state: "default" 0.0;
- color: 0 0 0 0;
- rel1 {
- relative: 0.0 0.0;
- }
- rel2 {
- relative: 1.0 1.0;
- }
- }
- }
- part {
- name: "uri_bar_bg";
- type : RECT;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 1;
- fixed: 0 1;
- align: 0 0;
- min: 0 URI_BG_HEIGHT;
- max: -1 URI_BG_HEIGHT;
- color: 255 255 255 255;
- rel1 {relative: 0.0 0.0; to:"bg";}
- rel2 {relative: 1.0 0.0; to:"bg";}
- }
- description {
- state: "hidden_vertical" 0.0;
- inherit: "default" 0.0;
- rel1 {relative: 0.0 -URI_BG_HEIGHT/1228; to:"bg";}
- }
- description {
- state: "hidden_landscape" 0.0;
- inherit: "default" 0.0;
- rel1 {relative: 0.0 -URI_BG_HEIGHT/668; to:"bg";}
- }
- }
- ADD_SPACER_OVER("left_spacer", "uri_bar_bg", 16, URI_BG_HEIGHT)
- part {
- name: "uri_bar_buttons_left";
- type : SWALLOW;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 0;
- align: 0 0.5;
- min: 0 64;
- max: 0 64;
- fixed: 0 1;
- rel1 { relative: 1.0 0.0; to: "left_spacer"; }
- rel2 { relative: 1.0 1.0; to: "uri_bar_bg"; }
- }
- description {
- state: "moveright" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- min: 196 64;
- max: 196 64;
- }
- description {
- state: "hidden" 0.0;
- inherit: "default" 0.0;
- }
- description {
- state: "entry_enlarged" 0.0;
- inherit: "default" 0.0;
- }
- description {
- state: "entry_decreased_wp" 0.0;
- inherit: "moveright" 0.0;
- visible: 1;
- }
- description {
- state: "visible" 0.0;
- inherit: "moveright" 0.0;
- visible: 1;
- }
- }
-
- ADD_SPACER("left_buttons_spacer", "uri_bar_buttons_left", 18, URI_BG_HEIGHT)
-
- part {
- name: "uri_entry";
- type : SWALLOW;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 1;
- align: 0.0 1.0;
- min: 0 URI_WIDTH;
- max: -1 URI_WIDTH;
- fixed: 0 1;
- rel1 { relative: 1.0 0.0; to: "left_buttons_spacer"; }
- rel2 { relative: 0.0 1.0; to: "spacer_after_uri_entry"; }
- }
- description {
- state: "moveright" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- rel1 { relative: 1.0 0.0; to: "left_buttons_spacer"; }
- rel2 { relative: 0.0 1.0; to: "spacer_after_uri_entry"; }
- }
- description {
- state: "entry_enlarged" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- max: -1 URI_WIDTH;
- rel2 {
- to: "spacer_after_uri_entry";
- relative: 0.0 1.0;
- }
- }
- description {
- state: "hidden" 0.0;
- inherit: "default" 0.0;
- visible: 0;
- }
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- description {
- state: "entry_decreased_wp" 0.0;
- inherit: "moveright" 0.0;
- }
- }
-
- part {
- name: "spacer_after_uri_entry";
- type: RECT;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 1;
- fixed: 0 1;
- align: 1 1;
- color: 0 0 0 0;
- min: 18 URI_BG_HEIGHT;
- max: 18 URI_BG_HEIGHT;
- rel1 { relative: 0.0 0.0; to: "uri_bar_bg"; }
- rel2 { relative: 0.0 1.0; to: "uri_bar_buttons_right"; }
- }
- }
-
- part {
- name: "uri_bar_buttons_right";
- type : SWALLOW;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 1;
- align: 1.0 0.5;
- min: 130 64;
- max: 130 64;
- fixed: 1 1;
- rel1 { relative: 0.0 0.0; to: "uri_bar_bg"; }
- rel2 { relative: 0.0 1.0; to: "spacer_after_right_bar_buttons"; }
- }
- description {
- state: "hidden" 0.0;
- inherit: "default" 0.0;
- min: 0 64;
- max: 0 64;
- visible: 0;
- }
- description {
- state: "entry_enlarged" 0.0;
- inherit: "default" 0.0;
- min: 0 64;
- max: 0 64;
- visible: 0;
- }
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- description {
- state: "entry_decreased_wp" 0.0;
- inherit: "default" 0.0;
- }
- }
-
- part {
- name: "spacer_after_right_bar_buttons";
- type: RECT;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 1;
- fixed: 0 1;
- align: 1 0.5;
- color: 0 0 0 0;
- min: 16 URI_BG_HEIGHT;
- max: 16 URI_BG_HEIGHT;
- rel1 { relative: 0.0 0.0; to: "uri_bar_bg"; }
- rel2 { relative: 1.0 1.0; to: "uri_bar_bg"; }
- }
- }
- part {
- name: "web_view";
- type: SWALLOW;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 1;
- align: 0.0 0.0;
- fixed: 0 0;
- min: 0 0;
- max: -1 -1;
- rel1 { relative: 0.0 1.0; to: "uri_bar_bg"; }
- rel2 { relative: 1.0 1.0; to: "bg"; }
- }
- }
- part {
- name: "web_view_dummy_button";
- type: SWALLOW;
- mouse_events: 1;
- repeat_events: 1;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 1;
- align: 0.0 0.0;
- fixed: 0 0;
- min: 0 0;
- max: -1 -1;
- rel1 { relative: 0.0 0.0; to: "web_view"; }
- rel2 { relative: 1.0 1.0; to: "web_view"; }
- }
- }
- part { name: "progressbar_bg";
- type: IMAGE;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 0;
- fixed: 0 1;
- min: 0 5;
- max: -1 5;
- align: 0.5 1;
- image.normal: PROGRESS_BG_IMAGE;
- rel1 { relative: 0.0 0.0; to: "uri_bar_bg";}
- rel2 { relative: 1.0 1.0; to: "uri_bar_bg";}
- }
- description {
- state: "progress" 0.0;
- inherit: "default" 0.0;
- visible: 1;
- }
- }
- part { name: "progress_bar";
- type: IMAGE;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 0;
- align: 0.0 0.0;
- image.normal: PROGRESS_BAR_IMAGE;
- rel1 { relative: 0.0 0.0; to: "progressbar_bg"; }
- rel2 { relative: 1.0 1.0; to: "progressbar_bg"; }
- }
- PROGRESS_DESCRIPTIONS
- }
- programs {
- program { name: "hide,progress";
- signal: "hide,progress,signal";
- transition: DECELERATE 0.1;
- action: STATE_SET "default" 0.0;
- target: "progress_bar";
- target: "bg";
- }
- program { name: "show,progress";
- signal: "show,progress,signal";
- action: STATE_SET "progress" 0.0;
- target: "bg";
- }
- program { name: "update,progress,0.00";
- signal: "update,progress,0.00,signal";
- action: STATE_SET "progress" 0.05;
- target: "progress_bar";
- }
- PROGRESS_PROGRAMS
- program { name: "update,progress,1.0";
- signal: "update,progress,1.00,signal";
- transition: DECELERATE 0.05;
- action: STATE_SET "progress" 1.00;
- target: "progress_bar";
- }
- }
-
- #include "WebPageUIUrlHistoryList.edc"
- part {
- name: "moremenu_dimmed_bg";
- type: RECT;
- scale: 1;
- mouse_events: 1;
- description {
- state: "default" 0.0;
- visible: 0;
- align: 0.0 0.0;
- min: 0 0;
- max: -1 -1;
- fixed: 0 0;
- color: 0 0 0 102.4;
- rel1 {
- relative: 0.0 0.0;
- to: "web_view";
- }
- rel2 {
- relative: 1.0 1.0;
- to: "web_view";
- }
- }
- description {
- state: "visible" 0.0;
- inherit: "default";
- visible: 1;
- }
- }
- part {
- name: "moremenu_bg";
- type: RECT;
- scale: 1;
- description {
- state: "default" 0.0;
- visible: 0;
- align: 0.0 0.0;
- min: 0 MORE_HEIGHT_VERTICAL;
- max: -1 MORE_HEIGHT_VERTICAL;
- fixed: 0 1;
- color: 244 244 244 255;
- rel1 {
- relative: 0.0 0.0;
- to: "web_view";
- }
- rel2.relative: 1.0 1.0;
- }
- description { state: "landscape" 0.0;
- inherit: "default";
- visible: 1;
- min: 0 MORE_HEIGHT_LANDSCAPE;
- max: -1 MORE_HEIGHT_LANDSCAPE;
- }
- description { state: "vertical" 0.0;
- inherit: "default";
- visible: 1;
- min: 0 MORE_HEIGHT_VERTICAL;
- max: -1 MORE_HEIGHT_VERTICAL;
- }
- }
- part {
- name: "moremenu";
- type: SWALLOW;
- scale: 1;
- mouse_events: 1;
- description {
- state: "default" 0.0;
- visible: 0;
- align: 0.0 0.0;
- min: 0 MORE_HEIGHT_VERTICAL;
- max: -1 MORE_HEIGHT_VERTICAL;
- fixed: 0 1;
- rel1 {
- relative: 0.0 0.0;
- to: "moremenu_bg";
- }
- rel2 {
- relative: 1.0 1.0;
- to: "moremenu_bg";
- }
- }
- description { state: "landscape" 0.0;
- inherit: "default";
- visible: 1;
- min: 0 MORE_HEIGHT_LANDSCAPE;
- max: -1 MORE_HEIGHT_LANDSCAPE;
- }
- description { state: "vertical" 0.0;
- inherit: "default";
- visible: 1;
- min: 0 MORE_HEIGHT_VERTICAL;
- max: -1 MORE_HEIGHT_VERTICAL;
- }
- }
- part {
- name: "findonpage";
- type: SWALLOW;
- scale: 1;
- mouse_events: 1;
- description {
- state: "default" 0.0;
- visible: 0;
- align: 0 0;
- fixed: 1 1;
- color: 244 244 244 255;
- min: 0 FINDONPAGE_HEIGHT;
- max: -1 FINDONPAGE_HEIGHT;
- rel1 {
- relative: 0 0;
- to: "web_view";
- }
- rel2 {
- relative: 1 1;
- to: "web_view";
- }
- }
- description {
- state: "visible" 0.0;
- inherit: "default";
- visible: 1;
- }
- }
- }
- programs {
- program {
- name: "shiftright_uribar";
- signal: "shiftright_uri";
- source: "ui";
- action: STATE_SET "moveright" 0.0;
- target: "uri_entry";
- target: "uri_bar_buttons_left";
- }
- program {
- name: "shiftback_uribar";
- signal: "shiftback_uri";
- source: "ui";
- action: STATE_SET "default" 0.0;
- target: "uri_entry";
- target: "uri_bar_buttons_left";
- }
- program {
- name: "enlarge_focused_uribar";
- signal: "enlarge_focused_uri";
- source: "ui";
- action: STATE_SET "entry_enlarged" 0.0;
- target: "uri_entry";
- target: "uri_bar_buttons_left";
- target: "uri_bar_buttons_right";
- }
- program {
- name: "decrease_unfocused_uribar";
- signal: "decrease_unfocused_uri";
- source: "ui";
- action: STATE_SET "default" 0.0;
- target: "uri_entry";
- target: "uri_bar_buttons_left";
- target: "uri_bar_buttons_right";
- }
- program {
- name: "decrease_unfocused_uribar_wp";
- signal: "decrease_unfocused_uri_wp";
- source: "ui";
- action: STATE_SET "entry_decreased_wp" 0.0;
- target: "uri_entry";
- target: "uri_bar_buttons_left";
- target: "uri_bar_buttons_right";
- }
- program {
- name: "hide_uri_bar_landscape";
- signal: "hide_uri_bar_landscape";
- source: "ui";
- in: 0.01 0.0;
- action: STATE_SET "hidden_landscape" 0.0;
- target: "uri_bar_bg";
- transition: LINEAR 0.15;
- }
- program {
- name: "hide_uri_bar_vertical";
- signal: "hide_uri_bar_vertical";
- source: "ui";
- in: 0.01 0.0;
- action: STATE_SET "hidden_vertical" 0.0;
- target: "uri_bar_bg";
- transition: LINEAR 0.15;
- }
- program {
- name: "show_uri_bar";
- signal: "show_uri_bar";
- source: "ui";
- action: STATE_SET "default" 0.0;
- target: "uri_bar_bg";
- transition: LINEAR 0.15;
- }
- program {
- name: "hide_moremenu";
- signal: "hide_moremenu";
- source: "ui";
- action: STATE_SET "default" 0.0;
- target: "moremenu";
- target: "moremenu_bg";
- target: "moremenu_dimmed_bg";
- }
- program {
- name: "show_moremenu_landscape";
- signal: "show_moremenu_landscape";
- source: "ui";
- action: STATE_SET "landscape" 0.0;
- target: "moremenu";
- target: "moremenu_bg";
- after: "show_moremenu_dimmed_bg";
- }
- program {
- name: "show_moremenu_vertical";
- signal: "show_moremenu_vertical";
- source: "ui";
- action: STATE_SET "vertical" 0.0;
- target: "moremenu";
- target: "moremenu_bg";
- after: "show_moremenu_dimmed_bg";
- }
- program {
- name: "show_moremenu_dimmed_bg";
- action: STATE_SET "visible" 0.0;
- target: "moremenu_dimmed_bg";
- }
- program {
- name: "hide_findonpage";
- signal: "hide_findonpage";
- source: "ui";
- action: STATE_SET "default" 0.0;
- target: "findonpage";
- }
- program {
- name: "show_findonpage";
- signal: "show_findonpage";
- source: "ui";
- action: STATE_SET "visible" 0.0;
- target: "findonpage";
- }
- }
- }
-}
projects / profile / common / apps / web / browser.git / commitdiff
