diff options
author | Shuhrat Dehkanov <sh.dehkanov@samsung.com> | 2015-06-10 16:29:57 +0900 |
---|---|---|
committer | Shuhrat Dehkanov <sh.dehkanov@samsung.com> | 2015-06-10 16:29:57 +0900 |
commit | 048feed01306053db5dde27a8176077e9ce5b974 (patch) | |
tree | f5ca4f3b8503ee6cf19b8a9cb641fc05f65a111d | |
parent | f862f3e401c1e4854f34a5b5a598416e92daf4cf (diff) | |
download | settings-048feed01306053db5dde27a8176077e9ce5b974.tar.gz settings-048feed01306053db5dde27a8176077e9ce5b974.tar.bz2 settings-048feed01306053db5dde27a8176077e9ce5b974.zip |
Remove key definitionssubmit/tizen/20150610.115226accepted/tizen/tv/20150611.004723
These are provided by app-common
Change-Id: If61ad40967aa285b37c540f1e6920a6cdeadb38d
-rw-r--r-- | include/def.h | 19 | ||||
-rw-r--r-- | ug/network/include/defs.h | 19 | ||||
-rw-r--r-- | ug/proxy/include/defs.h | 19 | ||||
-rw-r--r-- | ug/proxy/src/main_view.c | 4 | ||||
-rw-r--r-- | ug/system/clock/include/ug_clock_define.h | 17 | ||||
-rw-r--r-- | ug/wifi-direct/include/defs.h | 18 |
6 files changed, 2 insertions, 94 deletions
diff --git a/include/def.h b/include/def.h index fed4bd5..e90d53e 100644 --- a/include/def.h +++ b/include/def.h @@ -266,23 +266,4 @@ #define TEXT_STYLE_MEDIUM "Tizen Sans:style=Medium" #define TEXT_STYLE_BOLD "Tizen Sans:style=Bold" -/* Key defines */ -#define KEY_UP "Up" -#define KEY_DOWN "Down" -#define KEY_LEFT "Left" -#define KEY_RIGHT "Right" -#define KEY_ENTER "Return" -#define KEY_EXIT "XF86Close" - -#define KEY_0 "0" -#define KEY_1 "1" -#define KEY_2 "2" -#define KEY_3 "3" -#define KEY_4 "4" -#define KEY_5 "5" -#define KEY_6 "6" -#define KEY_7 "7" -#define KEY_8 "8" -#define KEY_9 "9" - #endif /* __DEF_H__ */ diff --git a/ug/network/include/defs.h b/ug/network/include/defs.h index dc58d0f..cc9048f 100644 --- a/ug/network/include/defs.h +++ b/ug/network/include/defs.h @@ -137,25 +137,6 @@ #define POPUP_WIDTH 688 #define POPUP_HEIGHT 411 -/* Key defines */ -#define KEY_UP "Up" -#define KEY_DOWN "Down" -#define KEY_LEFT "Left" -#define KEY_RIGHT "Right" -#define KEY_ENTER "Return" -#define KEY_EXIT "XF86Close" - -#define KEY_0 "0" -#define KEY_1 "1" -#define KEY_2 "2" -#define KEY_3 "3" -#define KEY_4 "4" -#define KEY_5 "5" -#define KEY_6 "6" -#define KEY_7 "7" -#define KEY_8 "8" -#define KEY_9 "9" - /* FIXME: do not pre-define */ #define DEFAULT_WIN_WIDTH 1920 #define DEFAULT_WIN_HEIGHT 1080 diff --git a/ug/proxy/include/defs.h b/ug/proxy/include/defs.h index 4163f4f..7ed946a 100644 --- a/ug/proxy/include/defs.h +++ b/ug/proxy/include/defs.h @@ -94,25 +94,6 @@ #define PART_TEXT_CONTENT "content.txt" #define PART_ENTRY "part.entry" -/* Key defines */ -#define KEY_UP "Up" -#define KEY_DOWN "Down" -#define KEY_LEFT "Left" -#define KEY_RIGHT "Right" -#define KEY_ENTER "Return" -#define KEY_EXIT "XF86Close" - -#define KEY_0 "0" -#define KEY_1 "1" -#define KEY_2 "2" -#define KEY_3 "3" -#define KEY_4 "4" -#define KEY_5 "5" -#define KEY_6 "6" -#define KEY_7 "7" -#define KEY_8 "8" -#define KEY_9 "9" - /* FIXME: do not pre-define */ #define DEFAULT_WIN_WIDTH 1920 #define DEFAULT_WIN_HEIGHT 1080 diff --git a/ug/proxy/src/main_view.c b/ug/proxy/src/main_view.c index 2096d8b..156f23c 100644 --- a/ug/proxy/src/main_view.c +++ b/ug/proxy/src/main_view.c @@ -30,7 +30,6 @@ #include "common.h" #define KEY_PRIV "priv" -#define KEY_PROXY_ENTER "Select" #define IP_VALUE1 "value1" #define IP_VALUE2 "value2" #define IP_VALUE3 "value3" @@ -1226,7 +1225,8 @@ static void _entry_key_pressed_cb(void *data, Evas *e, } _unset_layout_dim(priv); - } else if (!strcmp(ev->keyname, KEY_PROXY_ENTER)) { + } else if (!strcmp(ev->keyname, KEY_ENTER_REMOTE) + || !strcmp(ev->keyname, KEY_ENTER)) { value = elm_entry_entry_get(obj); elm_object_part_text_set(priv->url_btn, PART_VALUE, value); memset(priv->url, 0, MOTHED_URL_LEN + 1); diff --git a/ug/system/clock/include/ug_clock_define.h b/ug/system/clock/include/ug_clock_define.h index 6b0527f..6830756 100644 --- a/ug/system/clock/include/ug_clock_define.h +++ b/ug/system/clock/include/ug_clock_define.h @@ -81,21 +81,4 @@ #define SIG_SRC_FOC_HIDE_ICON "focus_hide_icon" #define SIG_NAME_SUBLIST "sublist" -/* Key defines */ -#define KEY_UP "Up" -#define KEY_DOWN "Down" -#define KEY_LEFT "Left" -#define KEY_RIGHT "Right" - -#define KEY_0 "0" -#define KEY_1 "1" -#define KEY_2 "2" -#define KEY_3 "3" -#define KEY_4 "4" -#define KEY_5 "5" -#define KEY_6 "6" -#define KEY_7 "7" -#define KEY_8 "8" -#define KEY_9 "9" - #endif /* __UG_CLOCK_DEFINE_H__ */ diff --git a/ug/wifi-direct/include/defs.h b/ug/wifi-direct/include/defs.h index a40c295..ebbd145 100644 --- a/ug/wifi-direct/include/defs.h +++ b/ug/wifi-direct/include/defs.h @@ -91,22 +91,4 @@ #define SIG_CLICKED "clicked" #define SIG_BTN_SELECTED "btn,selected" -/* Key defines */ -#define KEY_UP "Up" -#define KEY_DOWN "Down" -#define KEY_LEFT "Left" -#define KEY_RIGHT "Right" -#define KEY_EXIT "XF86Close" - -#define KEY_0 "0" -#define KEY_1 "1" -#define KEY_2 "2" -#define KEY_3 "3" -#define KEY_4 "4" -#define KEY_5 "5" -#define KEY_6 "6" -#define KEY_7 "7" -#define KEY_8 "8" -#define KEY_9 "9" - #endif /* __DEFS_H__ */ |