From 0f0b16192489eda4ece753d60a6d2f55fa8719f7 Mon Sep 17 00:00:00 2001 From: Shuhrat Dehkanov Date: Tue, 2 Jun 2015 23:11:17 +0900 Subject: [PATCH 01/16] Fix incompatible pointer type warning [ 54s] /home/abuild/rpmbuild/BUILD/org.tizen.settings-tv-ref-0.1/src /view_maincatalog.c: In function '_draw_subitems': [ 54s] /home/abuild/rpmbuild/BUILD/org.tizen.settings-tv-ref-0.1/src /view_maincatalog.c:1181:45: warning: passing argument 2 of 'provider_get_passcode' from incompatible pointer type [ 54s] && (provider_get_passcode(KEY_PASSCODE, &passcode) == -1)) { [ 54s] ^ [ 54s] In file included from /home/abuild/rpmbuild/BUILD/ org.tizen.settings-tv-ref-0.1/src/view_maincatalog.c:28:0: [ 54s] /home/abuild/rpmbuild/BUILD/org.tizen.settings-tv-ref-0.1/ include/settings_provider.h:28:5: note: expected 'char **' but argument is of type 'const char **' [ 54s] int provider_get_passcode(const char *key, char **val); [ 54s] ^ Change-Id: I4926ee81a6f19504ea8b6b5721fbf5d827bcaf0a --- src/view_maincatalog.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/view_maincatalog.c b/src/view_maincatalog.c index 4112ba6..d6e5ea2 100644 --- a/src/view_maincatalog.c +++ b/src/view_maincatalog.c @@ -1099,7 +1099,8 @@ static int _draw_subitems(struct _view_data *data, const char *name) int cnt; Eina_Array_Iterator a; unsigned int i; - const char *id, *passcode, *style, *status; + const char *id, *style, *status; + char *passcode; Eina_Array *enabled; if (!data || !name || !data->base) { -- 2.7.4 From fd484e011c47d611bee8effc8491df3ece42a927 Mon Sep 17 00:00:00 2001 From: Shuhrat Dehkanov Date: Tue, 2 Jun 2015 23:19:42 +0900 Subject: [PATCH 02/16] Add text.ellipsis This fixes edje_cc: Warning. Part 'elm.text' in group 'elm/progressbar/horizontal/update_progressbar' contains description 'default:0' which has text.min: 1 X; but not text.ellipsis: -1; edje_cc: Warning. This is almost certainly not what you want. warning. Change-Id: I328f3dee7a12e67ec01b9b478e5b5e32d16bc8b3 --- data/widget/progressbar.edc | 46 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/data/widget/progressbar.edc b/data/widget/progressbar.edc index 75109b9..35df42c 100644 --- a/data/widget/progressbar.edc +++ b/data/widget/progressbar.edc @@ -15,7 +15,7 @@ */ group { - name: "elm/progressbar/horizontal/subitembtnprogress"; + name: "elm/progressbar/horizontal/subitembtnprogress"; parts { part { name: "elm.background.progressbar"; @@ -155,29 +155,29 @@ group { } } } - } - programs { - program { - name: "focused"; - signal: SIG_UNCTRL_PB_FOCUSED; - source: SRC_PB_PROG; - action: STATE_SET "focused" 0.0; - target: "background"; - target: "elm.progress.progressbar"; - } - program { - name: "unfocused"; - signal: SIG_UNCTRL_PB_UNFOCUSED; - source: SRC_PB_PROG; - action: STATE_SET "default" 0.0; - target: "background"; - target: "elm.progress.progressbar"; - } - } + } + programs { + program { + name: "focused"; + signal: SIG_UNCTRL_PB_FOCUSED; + source: SRC_PB_PROG; + action: STATE_SET "focused" 0.0; + target: "background"; + target: "elm.progress.progressbar"; + } + program { + name: "unfocused"; + signal: SIG_UNCTRL_PB_UNFOCUSED; + source: SRC_PB_PROG; + action: STATE_SET "default" 0.0; + target: "background"; + target: "elm.progress.progressbar"; + } + } } group { - name: "elm/progressbar/horizontal/update_progressbar"; + name: "elm/progressbar/horizontal/update_progressbar"; parts { part { name: "elm.background.progressbar"; @@ -347,11 +347,11 @@ group { font: APP_TEXT_FONT; size: 18*2; min: 1 0; + ellipsis: -1; text_class: "tizen"; } fixed: 1 1; } } - } + } } - -- 2.7.4 From 773cb7a220332e7455cb8469cc33aad55b03215f Mon Sep 17 00:00:00 2001 From: Shuhrat Dehkanov Date: Wed, 3 Jun 2015 16:13:44 +0900 Subject: [PATCH 03/16] Add index normalizer Index returned by elm_genlist_item_index_get() starts from 1, but eina_list_nth() index starts from 0 consequently causing mismatch in user selected AP and the actual AP being connected to. This adds a normalizer to correct that. Change-Id: Ia04044ea49d5bacc28606216d4985c8d0655bc00 --- ug/network/src/main_view.c | 48 ++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/ug/network/src/main_view.c b/ug/network/src/main_view.c index 0f78e08..b20e2f8 100644 --- a/ug/network/src/main_view.c +++ b/ug/network/src/main_view.c @@ -39,6 +39,12 @@ #define TYPE_POPUP_X_OFFSET 190 +/* + * Index returned by elm_genlist_item_index_get() starts from 1, + * while eina_list_nth() index starts from 0 + */ +#define ELM_GENLIST_ITEM_INDEX_GET_NORMALIZER 1 + enum action_btn_enum { CONNECT, REFRESH, @@ -94,7 +100,7 @@ struct _priv { enum network_type_enum network_type; enum view_type cur_view; - int wifi_init; + Eina_Bool is_wifi_initialized; Eina_Bool wifi_conn; Eina_Bool wired_conn; @@ -942,7 +948,7 @@ static void _item_select_cb(void *data, Evas_Object *obj, void *ei) int index; if (!data || !ei) { - _ERR("Parameter error!"); + _ERR("Invalid parameter"); return; } @@ -950,6 +956,7 @@ static void _item_select_cb(void *data, Evas_Object *obj, void *ei) gen_item = ei; if (priv->last_item == gen_item) { + _DBG("The same item is selected again"); elm_object_item_signal_emit(gen_item, SIG_STATE_UNSELECTED, ELM); _disable_connect_btn(priv); @@ -969,15 +976,16 @@ static void _item_select_cb(void *data, Evas_Object *obj, void *ei) _enable_connect_btn(priv); _enable_other_btn(priv); - index = elm_genlist_item_index_get(priv->last_item); + index = elm_genlist_item_index_get(priv->last_item) + - ELM_GENLIST_ITEM_INDEX_GET_NORMALIZER; if (index < 0) { - _ERR("the index of item is invalid."); + _ERR("Invalid index"); return; } ap_info = eina_list_nth(priv->ap_list, index); if (!ap_info) { - _ERR("ap info is NULL."); + _ERR("Failed to get AP info"); return; } @@ -988,9 +996,10 @@ static void _item_select_cb(void *data, Evas_Object *obj, void *ei) priv->ap_name = strdup(ap_info->essid); if (!priv->ap_name) { - _ERR("ap name gets failed."); + _ERR("Failed to get AP name"); return; } + _DBG("Selected AP name: %s", priv->ap_name); if (priv->ap) { wifi_mgr_ap_destroy(priv->ap); @@ -999,7 +1008,7 @@ static void _item_select_cb(void *data, Evas_Object *obj, void *ei) wifi_mgr_ap_clone(&priv->ap, ap_info->ap); if (!priv->ap) { - _ERR("ap clone failed."); + _ERR("AP clone failed"); return; } @@ -1178,7 +1187,7 @@ static void _wifi_activated_cb(wifi_error_e result, void *data) /** * Clear the genlist item list. * -* Called when need clear the ap list,eg.refrsh button is clicked +* Called when need clear the AP list, e.g., when the refresh button is clicked * * @param[in] priv _priv object bypassed */ @@ -1187,7 +1196,7 @@ static void _clear_genlist_item_list(struct _priv *priv) void *temp; if (!priv || !priv->genlist) { - _ERR("Parameter error!"); + _ERR("Invalid parameter"); return; } @@ -1213,26 +1222,26 @@ static int _display_wireless_setting(struct _priv *priv) int ret; if (!priv) { - _ERR("the param is invalid."); + _ERR("Invalid parameter"); return RET_FAILED; } _create_wireless_disconnect_part(priv); - if (!priv->wifi_init) { + if (!priv->is_wifi_initialized) { obj = _create_genlist_view(priv); if (!obj) { - _ERR("fail to create genlist"); + _ERR("Failed to create genlist"); return RET_FAILED; } ret = wifi_mgr_init(); if (ret != RET_SUCCESS) { - _ERR("fail to init wifi network"); + _ERR("Failed to initialize Wi-Fi network"); return RET_FAILED; } - priv->wifi_init = 1; + priv->is_wifi_initialized = EINA_TRUE; } _clear_genlist_item_list(priv); @@ -1240,7 +1249,7 @@ static int _display_wireless_setting(struct _priv *priv) activated = EINA_FALSE; ret = wifi_mgr_is_activated(&activated); if (ret != RET_SUCCESS) { - _ERR("the wifi is not activated."); + _ERR("Wi-Fi is still not activated"); return RET_FAILED; } @@ -1855,17 +1864,18 @@ static void _connect_network(struct _priv *priv) int ret; if (!priv) { - _ERR("the param is NULL."); + _ERR("Invalid parameter"); return; } if (priv->network_type == TYPE_WIRELESS) { if (priv->last_item) { - index = elm_genlist_item_index_get(priv->last_item); + index = elm_genlist_item_index_get(priv->last_item) + - ELM_GENLIST_ITEM_INDEX_GET_NORMALIZER; ret = _wifi_connect_ap(priv, index); if (ret != RET_SUCCESS) { - _ERR("connect ap"); + _DBG("Failed to connect to selected AP"); _show_confirm_popup(priv); return; } @@ -1873,7 +1883,7 @@ static void _connect_network(struct _priv *priv) } else { ret = _wired_connect_proc(priv); if (ret != RET_SUCCESS) { - _ERR("connect ap"); + _DBG("Failed to connect to selected network"); _show_confirm_popup(priv); return; } -- 2.7.4 From 343c5ba1f919e2b0bb32bc4abc1867365dc617bd Mon Sep 17 00:00:00 2001 From: Shuhrat Dehkanov Date: Wed, 3 Jun 2015 19:24:51 +0900 Subject: [PATCH 04/16] Replace "Select" key with "Return" "Select" key is missing both from keyboard and remote controller. That's, use KEY_ENTER_REMOTE or KEY_ENTER to proceed with connection. This change also removes markup from password entry text. Change-Id: I3dbc7dc3a31b1b31984f41cc92d521e92feade97 --- ug/network/edje/ug-network-settings.edc | 4 +++ ug/network/src/wifi_passcode_view.c | 43 +++++++++++++++++++++------------ 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/ug/network/edje/ug-network-settings.edc b/ug/network/edje/ug-network-settings.edc index 99ef21f..b354222 100644 --- a/ug/network/edje/ug-network-settings.edc +++ b/ug/network/edje/ug-network-settings.edc @@ -1442,6 +1442,7 @@ collections { scale: 1; description { state: "default" 0.0; + fixed: 1 1; rel1.to: "bg"; rel2 { to: "bg"; @@ -1459,6 +1460,7 @@ collections { description { state: "default" 0.0; align: 0.0 0.0; + fixed: 1 1; rel1 { to: "progress_padding"; relative: 1.0 1.0; @@ -1479,6 +1481,7 @@ collections { scale: 1; description { state: "default" 0.0; + fixed: 1 1; rel1 { to: "progress_wheel"; relative: 1.0 0.0; @@ -1521,6 +1524,7 @@ collections { scale: 1; description { state: "default" 0.0; + fixed: 1 1; rel1.to: "bg"; rel2 { to: "bg"; diff --git a/ug/network/src/wifi_passcode_view.c b/ug/network/src/wifi_passcode_view.c index e8a03b1..42bda01 100644 --- a/ug/network/src/wifi_passcode_view.c +++ b/ug/network/src/wifi_passcode_view.c @@ -31,9 +31,16 @@ #include "wifi_mgr.h" #define KEY_PRIV "priv" -#define KEY_NETWORK_ENTER "Select" -#define AP_NAME_LENTH 256 +#define AP_NAME_LENGTH 256 + +/* + * TODO: should MIN_PWD_LENGTH be changed to 8? + * + * http://standards.ieee.org/getieee802/download/802.11i-2004.pdf, H.4.1: + * _A pass-phrase is a sequence of between 8 and 63 ASCII-encoded characters._ + */ +#define MIN_PWD_LENGTH 1 #define TXT_PASSCODE "Network passcode" #define TXT_ENTER_PASSCODE "Enter the network password" @@ -49,7 +56,7 @@ struct _priv { Evas_Object *entry; Evas_Object *dim_ly; Evas_Object *ctxpopup; - char ap_name[AP_NAME_LENTH + 1]; + char ap_name[AP_NAME_LENGTH + 1]; char *ap_pwd; }; @@ -675,7 +682,7 @@ static bool _wifi_found_ap_cb(wifi_ap_h ap, void *data) wifi_mgr_get_ap_info(ap, &ap_info); - if (!strncmp(priv->ap_name, ap_info.essid, AP_NAME_LENTH)) { + if (!strncmp(priv->ap_name, ap_info.essid, AP_NAME_LENGTH)) { ret = wifi_mgr_set_passphrase(ap, priv->ap_pwd); if (ret != RET_SUCCESS) { _ERR("wifi_mgr_set_passphrase() failed."); @@ -769,9 +776,10 @@ static void _entry_key_press_cb(void *data, Evas *e, Evas_Event_Key_Down *ev; struct _priv *priv; int ret; + char *pwd; if (!ei || !data) { - _ERR("ei or data is NULL"); + _ERR("Invalid parameter"); return; } @@ -783,24 +791,27 @@ static void _entry_key_press_cb(void *data, Evas *e, return; } - if (!strcmp(ev->keyname, KEY_NETWORK_ENTER)) { + if (!strcmp(ev->keyname, KEY_ENTER_REMOTE) + || !strcmp(ev->keyname, KEY_ENTER)) { + pwd = elm_entry_markup_to_utf8(elm_entry_entry_get(obj)); + if (!pwd || strlen(pwd) < MIN_PWD_LENGTH) { + _DBG("Invalid passcode is provided"); + free(pwd); + _show_invalid_pwd_popup(priv); + return; + } + if (priv->ap_pwd) { free(priv->ap_pwd); priv->ap_pwd = NULL; } - - priv->ap_pwd = strdup(elm_entry_entry_get(obj)); - if (!priv->ap_pwd) { - _ERR("the passcode in entry is NULL."); - _show_invalid_pwd_popup(priv); - return; - } + priv->ap_pwd = strdup(pwd); + free(pwd); ret = _wifi_connect_ap(priv); if (ret != RET_SUCCESS) { - _ERR("connect ap"); + _DBG("Connection failed"); _show_confirm_popup(priv); - return; } } } @@ -877,7 +888,7 @@ static Evas_Object *_create(struct viewmgr *vmgr, void *data) priv->vmgr = vmgr; ap_info = data; - strncpy(priv->ap_name, ap_info->essid, AP_NAME_LENTH); + strncpy(priv->ap_name, ap_info->essid, AP_NAME_LENGTH); base = util_add_layout(priv->win, UG_NETWORK_EDJ_FILE, GRP_WIFI_PASSCODE_BASE); -- 2.7.4 From 3c6278a023e39c33a30c1b57cb5015e0be2c7023 Mon Sep 17 00:00:00 2001 From: Shuhrat Dehkanov Date: Mon, 8 Jun 2015 16:38:42 +0900 Subject: [PATCH 05/16] Exit app and sub-catalog on remote back key press Change-Id: I92a284b9e89a4035972e1f0940c2b8f8751f9988 --- src/view_maincatalog.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/view_maincatalog.c b/src/view_maincatalog.c index d6e5ea2..9847b8a 100644 --- a/src/view_maincatalog.c +++ b/src/view_maincatalog.c @@ -121,8 +121,9 @@ static void _subitem_key_pressed_cb(void *data, Evas *e, priv = data; - if (!strcmp(ev->keyname, KEY_LEFT) || - !strcmp(ev->keyname, KEY_BACK)) { + if (!strcmp(ev->keyname, KEY_LEFT) + || !strcmp(ev->keyname, KEY_BACK) + || !strcmp(ev->keyname, KEY_BACK_REMOTE)) { pb = evas_object_data_get(obj, PROGRESS_BAR_DATA); if (pb) elm_object_signal_emit(pb, @@ -1356,8 +1357,9 @@ static void _main_setting_key_pressed_cb(void *data, Evas *e, _draw_subitems(priv, name); } else if (!strcmp(ev->keyname, KEY_RIGHT)) { _move_from_main_item_to_subitem(priv, obj); - } else if (!strcmp(ev->keyname, KEY_EXIT) || - !strcmp(ev->keyname, KEY_BACK)) { + } else if (!strcmp(ev->keyname, KEY_EXIT) + || !strcmp(ev->keyname, KEY_BACK) + || !strcmp(ev->keyname, KEY_BACK_REMOTE)) { app_efl_exit(); } } -- 2.7.4 From f862f3e401c1e4854f34a5b5a598416e92daf4cf Mon Sep 17 00:00:00 2001 From: Shuhrat Dehkanov Date: Tue, 9 Jun 2015 08:19:16 +0900 Subject: [PATCH 06/16] Exit Wi-Fi passcode view on remote back key press Change-Id: I9fc5fcc0540624337f046973463370a82e0e7bbb --- ug/network/src/wifi_passcode_view.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ug/network/src/wifi_passcode_view.c b/ug/network/src/wifi_passcode_view.c index 42bda01..93e8c54 100644 --- a/ug/network/src/wifi_passcode_view.c +++ b/ug/network/src/wifi_passcode_view.c @@ -168,7 +168,7 @@ static int _create_dim_layout(struct _priv *priv) /** * Callback for key pressed event. * - * If the key is KEY_BACK, delete this view. + * If the key is KEY_BACK or KEY_BACK_REMOTE, delete this view. * * @param[in] data User data * @param[in] e Evas handler @@ -194,7 +194,8 @@ static void _base_key_press_cb(void *data, Evas *e, return; } - if (!strcmp(ev->keyname, KEY_BACK)) + if (!strcmp(ev->keyname, KEY_BACK) + || !strcmp(ev->keyname, KEY_BACK_REMOTE)) viewmgr_pop(priv->vmgr); } @@ -280,7 +281,7 @@ static void _ctxpopup_unfocused_cb(void *data, /** * @Evas_Object_Event_Cb type callback for handling pressed event. * -* When KEY_BACK is pressed in the ctxpopup, delete the ctxpopup. +* When KEY_BACK or KEY_BACK_REMOTE is pressed in the ctxpopup, delete it. * * @param[in] data User data * @param[in] e Evas handler @@ -306,7 +307,8 @@ static void _ctxpopup_pressed_cb(void *data, Evas *e, return; } - if (!strcmp(ev->keyname, KEY_BACK)) { + if (!strcmp(ev->keyname, KEY_BACK) + || !strcmp(ev->keyname, KEY_BACK_REMOTE)) { _unset_layout_dim(priv); evas_object_del(obj); -- 2.7.4 From 048feed01306053db5dde27a8176077e9ce5b974 Mon Sep 17 00:00:00 2001 From: Shuhrat Dehkanov Date: Wed, 10 Jun 2015 16:29:57 +0900 Subject: [PATCH 07/16] Remove key definitions These are provided by app-common Change-Id: If61ad40967aa285b37c540f1e6920a6cdeadb38d --- include/def.h | 19 ------------------- ug/network/include/defs.h | 19 ------------------- ug/proxy/include/defs.h | 19 ------------------- ug/proxy/src/main_view.c | 4 ++-- ug/system/clock/include/ug_clock_define.h | 17 ----------------- 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__ */ -- 2.7.4 From 7be8032a66d283f24b095422993d08701009d024 Mon Sep 17 00:00:00 2001 From: Shuhrat Dehkanov Date: Thu, 11 Jun 2015 16:11:30 +0900 Subject: [PATCH 08/16] Show date in full length instead of ellipses Currently, the date is shown as ".../.../..." instead of "12/31/2000" in date setting pop-up dialog. This fixes that and shows the date in full length. Change-Id: Ie2da0a75b6a190f85ef0f72b1e8c9203687d291d --- ug/system/clock/edje/ug_clock.edc | 7 ++++++- ug/system/clock/edje/widgets/button.edc | 10 +++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ug/system/clock/edje/ug_clock.edc b/ug/system/clock/edje/ug_clock.edc index f4bc252..d561401 100644 --- a/ug/system/clock/edje/ug_clock.edc +++ b/ug/system/clock/edje/ug_clock.edc @@ -335,6 +335,11 @@ collections { fixed: 1 1; color: 128 128 128 38; } + description { + state: "hide" 0.0; + inherit: "default" 0.0; + visible: 0; + } } part { name: "spin_ctrl_2_swallow_padding"; @@ -434,7 +439,7 @@ collections { scale: 1; description { state: "default" 0.0; - min: 138 122; + min: 140 122; rel1 { to: "spin_ctrl_3_swallow_padding"; relative: 0.0 0.0; diff --git a/ug/system/clock/edje/widgets/button.edc b/ug/system/clock/edje/widgets/button.edc index 4d346e3..059a674 100644 --- a/ug/system/clock/edje/widgets/button.edc +++ b/ug/system/clock/edje/widgets/button.edc @@ -567,7 +567,7 @@ group { to: "elm_text_padding"; } text { - size: 30; + size: 26; align: 0.5 0.5; } color: 69 143 255 255; @@ -727,7 +727,7 @@ group { scale: 1; description { state: "default" 0.0; - min: 138 122; + min: 140 122; align: 0 0; fixed: 1 1; } @@ -836,7 +836,7 @@ group { to: "elm_text_padding"; } text { - size: 30; + size: 26; align: 0.5 0.5; } color: 69 143 255 255; @@ -1040,7 +1040,7 @@ group { to: "elm_text_padding"; } text { - size: 30; + size: 26; align: 0.0 0.5; } color: 69 143 255 255; @@ -1547,4 +1547,4 @@ group { target: "bg"; } } -} \ No newline at end of file +} -- 2.7.4 From 81de5cb011cb41b20bf4560d964ba2493730e2be Mon Sep 17 00:00:00 2001 From: Shuhrat Dehkanov Date: Thu, 11 Jun 2015 17:10:06 +0900 Subject: [PATCH 09/16] Do not fail if proxy method has never been setup Currently, the UI fails if no proxy method was setup previously i.e., if vconf_get_int(VCONF_PROXY_METHOD, value) returns non-zero value. However, we think, that should not be the case as user has to be able to get to the proxy settings UI in order to setup proxy in the first place. This fix that issue and enables the UI even if vconf_get_int() fails. Change-Id: Ie7308f75d75ec252ebab931550c48482476a94ab Signed-off-by: Shuhrat Dehkanov --- ug/proxy/include/vconf_mgr.h | 4 ++-- ug/proxy/src/main_view.c | 30 +++++++++--------------------- ug/proxy/src/vconf_mgr.c | 44 +++++++++++++------------------------------- 3 files changed, 24 insertions(+), 54 deletions(-) diff --git a/ug/proxy/include/vconf_mgr.h b/ug/proxy/include/vconf_mgr.h index 363a73a..cd354aa 100644 --- a/ug/proxy/include/vconf_mgr.h +++ b/ug/proxy/include/vconf_mgr.h @@ -22,7 +22,7 @@ char *vconf_mgr_get_string_value(const char *key); int vconf_mgr_set_string_value(const char *key, const char *value); -int vconf_mgr_get_int_value(const char *key, int *value); -int vconf_mgr_set_int_value(const char *key, const int value); +void vconf_mgr_get_proxy_method(int *value); +int vconf_mgr_set_proxy_method(const int value); #endif /* __VCONF_MGR_H__ */ diff --git a/ug/proxy/src/main_view.c b/ug/proxy/src/main_view.c index 156f23c..2135982 100644 --- a/ug/proxy/src/main_view.c +++ b/ug/proxy/src/main_view.c @@ -36,7 +36,6 @@ #define IP_VALUE4 "value4" static const char *VCONF_NETWORK_TYPE = "db/menu/network/network_type"; -static const char *VCONF_PROXY_METHOD = "db/menu/proxy/method"; static const char *VCONF_PROXY_IP = "db/menu/proxy/ip"; static const char *VCONF_PROXY_URL = "db/menu/proxy/url"; @@ -426,7 +425,6 @@ static void _get_man_saved_value(char *des_ip, static int _get_proxy_method(struct _priv *priv) { int value; - int ret; char *str; if (!priv) { @@ -440,26 +438,12 @@ static int _get_proxy_method(struct _priv *priv) else priv->net_type = TYPE_WIRELESS; - value = 0; - ret = vconf_mgr_get_int_value(VCONF_PROXY_METHOD, &value); - if (ret != RET_SUCCESS) { - _ERR("vconf_mgr_get_int_value() failed."); - return RET_FAILED; - } - - switch (value) { - case 0: - priv->method = METHOD_NONE; - break; - case 1: - priv->method = METHOD_MAN; - break; - case 2: - priv->method = METHOD_AUTO; - break; - default: + vconf_mgr_get_proxy_method(&value); + if (value < METHOD_NONE || value > METHOD_AUTO) { + _ERR("Unsupported method is returned from vconf"); return RET_FAILED; } + priv->method = value; _get_man_saved_value(priv->ip, VCONF_PROXY_IP); @@ -1697,12 +1681,16 @@ static void _show_invalid_info_ctxpopup(struct _priv *priv, int ret) */ static int _save_to_vconf(struct _priv *priv) { + int ret; + if (!priv) { _ERR("The param is invalid.\n"); return RET_SUCCESS; } - vconf_mgr_set_int_value(VCONF_PROXY_METHOD, priv->method); + ret = vconf_mgr_set_proxy_method(priv->method); + if (ret != RET_SUCCESS) + return RET_FAILED; switch (priv->method) { case METHOD_NONE: diff --git a/ug/proxy/src/vconf_mgr.c b/ug/proxy/src/vconf_mgr.c index d018549..27ac3f3 100644 --- a/ug/proxy/src/vconf_mgr.c +++ b/ug/proxy/src/vconf_mgr.c @@ -19,6 +19,8 @@ #include "vconf_mgr.h" #include "i18n.h" +static const char *VCONF_PROXY_METHOD = "db/menu/proxy/method"; + /** * Gets the string value from vconf. * @@ -61,49 +63,29 @@ int vconf_mgr_set_string_value(const char *key, const char *value) } /** - * Gets the integer value from vconf. + * Gets the current proxy method value from vconf. * - * @param[in] key Vconf key - * @param[out] value The value - * @return RET_SUCCESS if the operation is successful; RET_FAILED if failed; + * @param[out]: value : 0 - none; 1 - manual; 2 - auto. + * @return void. */ -int vconf_mgr_get_int_value(const char *key, int *value) +void vconf_mgr_get_proxy_method(int *value) { - int ret; - - if (!key || !value) { - _ERR("the param is invalid."); - return RET_FAILED; - } - - ret = vconf_get_int(key, value); - if (ret != 0) { - _ERR("vconf get int failed"); - return RET_FAILED; + if (vconf_get_int(VCONF_PROXY_METHOD, value) != 0) { + /* failed to get value from vconf, assume none set */ + *value = METHOD_NONE; } - - return RET_SUCCESS; } /** - * Sets the integer value to vconf. + * Sets the user selected proxy method value to vconf. * - * @param[in] key Vconf key * @param[in] value The value * @return RET_SUCCESS if the operation is successful; RET_FAILED if failed; */ -int vconf_mgr_set_int_value(const char *key, const int value) +int vconf_mgr_set_proxy_method(const int value) { - int ret; - - if (!key) { - _ERR("the param is invalid."); - return RET_FAILED; - } - - ret = vconf_set_int(key, value); - if (ret != 0) { - _ERR("vconf set int failed."); + if (vconf_set_int(VCONF_PROXY_METHOD, value) != 0) { + _ERR("Failed to set user selected proxy method to vconf"); return RET_FAILED; } -- 2.7.4 From e0e4c7ca0d4372cbbad23098344ae17fc3768def Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Fri, 12 Jun 2015 13:19:37 +0900 Subject: [PATCH 10/16] add focus_highlight on at widgets Change-Id: I26cd77402f1afcf5549d85fd829185858a5d618f Signed-off-by: Minkyu Kang --- data/widget/button.edc | 9 ++++++++- data/widget/ctxpopup.edc | 6 +++++- data/widget/progressbar.edc | 2 ++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/data/widget/button.edc b/data/widget/button.edc index 00056b3..c52af91 100644 --- a/data/widget/button.edc +++ b/data/widget/button.edc @@ -16,6 +16,7 @@ group{ name: MAINICONBTN; + data.item: "focus_highlight" "on"; images { image: "allbrowser_menu_bg.png" COMP; } @@ -244,6 +245,7 @@ group{ group { name: SUBITEMBTN; + data.item: "focus_highlight" "on"; parts { part { name: "bg"; @@ -535,6 +537,7 @@ group { group { name: "elm/button/base/subbtn_item_title_icon"; + data.item: "focus_highlight" "on"; images { image: "ico_hyperlink_arrow.png" COMP; } @@ -826,6 +829,7 @@ group { group { name: "elm/button/base/subbtn_item_title_slider_value"; + data.item: "focus_highlight" "on"; parts { part { name: "bg"; @@ -1210,6 +1214,7 @@ group { group{ name: CTXPOPUPBTN; + data.item: "focus_highlight" "on"; images { image: "ico_spincontrol_check.png" COMP; } @@ -1487,6 +1492,7 @@ group{ group { name: "elm/button/base/basic_btn"; + data.item: "focus_highlight" "on"; images { image: "round_rectangle_4X4.png" COMP; } @@ -1640,6 +1646,7 @@ group { group { name: "elm/button/base/input_passcode_btn"; + data.item: "focus_highlight" "on"; images { image: "search_searchbar_small_bg_foc.png" COMP; image: "search_searchbar_small_bg_nor.png" COMP; @@ -1715,4 +1722,4 @@ group { target: "elm.text"; } } -} \ No newline at end of file +} diff --git a/data/widget/ctxpopup.edc b/data/widget/ctxpopup.edc index ce0907a..f3f25d0 100644 --- a/data/widget/ctxpopup.edc +++ b/data/widget/ctxpopup.edc @@ -16,6 +16,7 @@ group { name: SUBLIST_CTXPOPUP1; + data.item: "focus_highlight" "on"; parts { part { name: SUBLIST_CTXPOPUP1_CLIPPER; @@ -51,6 +52,7 @@ group { group { name: SUBLIST_CTXPOPUP2; + data.item: "focus_highlight" "on"; images { image: "btn_down.png" COMP; image: "btn_up.png" COMP; @@ -246,7 +248,9 @@ group { } } -group { name: "elm/ctxpopup/base/change_passcode_ctxpopup"; +group { + name: "elm/ctxpopup/base/change_passcode_ctxpopup"; + data.item: "focus_highlight" "on"; parts { part { name: "elm.swallow.content"; diff --git a/data/widget/progressbar.edc b/data/widget/progressbar.edc index 35df42c..d987002 100644 --- a/data/widget/progressbar.edc +++ b/data/widget/progressbar.edc @@ -16,6 +16,7 @@ group { name: "elm/progressbar/horizontal/subitembtnprogress"; + data.item: "focus_highlight" "on"; parts { part { name: "elm.background.progressbar"; @@ -178,6 +179,7 @@ group { group { name: "elm/progressbar/horizontal/update_progressbar"; + data.item: "focus_highlight" "on"; parts { part { name: "elm.background.progressbar"; -- 2.7.4 From 41378c1bf08c5a5b1059ded33211299e448b577f Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Fri, 12 Jun 2015 13:31:16 +0900 Subject: [PATCH 11/16] disable unsupported menus Change-Id: I869a89ab61ed1205fe70aab094ea9dbffa33b7d6 Signed-off-by: Minkyu Kang --- json/sound.json | 1 + json/system.json | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/json/sound.json b/json/sound.json index db64a70..35ca9f4 100644 --- a/json/sound.json +++ b/json/sound.json @@ -29,6 +29,7 @@ "speakersettings": { "display-name": "Speaker settings", "style": "title.icon", + "status": "disabled", "setting-ui": { "style": "ctxpopup" }, diff --git a/json/system.json b/json/system.json index 4b2ad50..c51eacb 100644 --- a/json/system.json +++ b/json/system.json @@ -3,6 +3,7 @@ "clock": { "display-name": "Clock", "style": "title.value", + "status": "disabled", "setting-ui": { "style": "clock-ctxpopup", "name": "clock" @@ -25,6 +26,7 @@ "sleep-timer": { "display-name": "Sleep Timer", "style": "title.value", + "status": "disabled", "setting-ui": { "style": "ctxpopup" }, @@ -79,6 +81,7 @@ "change-passcode": { "display-name": "Change Passcode", "style": "title.value", + "status": "disabled", "setting-ui": { "style": "passcode-popup" }, @@ -90,6 +93,7 @@ "subtitle": { "display-name": "Subtitle", "style": "title.value", + "status": "disabled", "setting-ui": { "style": "ctxpopup" }, @@ -123,7 +127,7 @@ "type": "string", "list": [ { - "display-value": "Korean", + "display-value": "Korea", "value": "ko_KR.utf8" }, { @@ -136,6 +140,7 @@ "language": { "display-name": "Language", "style": "title.value", + "status": "disabled", "setting-ui": { "style": "ctxpopup" }, @@ -186,4 +191,4 @@ "parentitem": "maincatalog" } } -} \ No newline at end of file +} -- 2.7.4 From 93921891730dd84f3381da898b403adbb28f0bb7 Mon Sep 17 00:00:00 2001 From: Yu Jiung Date: Sat, 20 Jun 2015 18:07:18 +0900 Subject: [PATCH 12/16] Replace libwifi-direct with capi-network-wifi-direct Change-Id: I3adcaf456eaf3aacb8c7e3b733e92809462e5a34 Signed-off-by: Yu jiung --- packaging/org.tizen.settings-tv-ref.spec | 4 ++-- ug/wifi-direct/CMakeLists.txt | 4 ++-- ug/wifi-direct/include/wifi_direct_mgr.h | 4 ++-- ug/wifi-direct/src/wifi_direct_mgr.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packaging/org.tizen.settings-tv-ref.spec b/packaging/org.tizen.settings-tv-ref.spec index 2139bd2..f82326c 100644 --- a/packaging/org.tizen.settings-tv-ref.spec +++ b/packaging/org.tizen.settings-tv-ref.spec @@ -3,7 +3,7 @@ Name: org.tizen.settings-tv-ref Summary: Setting Reference Application -Version: 0.1 +Version: 0.2 Release: 1 Group: Applications/Native Applications License: Apache-2.0 @@ -26,7 +26,7 @@ BuildRequires: pkgconfig(capi-system-info) BuildRequires: pkgconfig(capi-network-wifi) BuildRequires: pkgconfig(capi-network-connection) BuildRequires: pkgconfig(capi-media-sound-manager) -BuildRequires: pkgconfig(wifi-direct) +BuildRequires: pkgconfig(capi-network-wifi-direct) BuildRequires: gettext-devel BuildRequires: vconf #BuildRequires: pkgconfig(capi-appfw-tvcontext) diff --git a/ug/wifi-direct/CMakeLists.txt b/ug/wifi-direct/CMakeLists.txt index 6e427e9..45aa3e1 100644 --- a/ug/wifi-direct/CMakeLists.txt +++ b/ug/wifi-direct/CMakeLists.txt @@ -37,7 +37,7 @@ pkg_check_modules(UG_WIFI_DIRECT_PKGS REQUIRED capi-appfw-application capi-network-wifi capi-network-connection - wifi-direct + capi-network-wifi-direct ) #ecore-x @@ -46,7 +46,7 @@ SET(PKGS_LDFLAGS "${PKGS_LDFLAGS} ${UG_WIFI_DIRECT_PKGS_LDFLAGS}") FOREACH(FLAG ${UG_WIFI_DIRECT_PKGS_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${FLAG}") ENDFOREACH(FLAG) -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fvisibility=hidden -Wall -Werror") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -fvisibility=hidden") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS}") SET(SRCS diff --git a/ug/wifi-direct/include/wifi_direct_mgr.h b/ug/wifi-direct/include/wifi_direct_mgr.h index d448ed4..fdde801 100644 --- a/ug/wifi-direct/include/wifi_direct_mgr.h +++ b/ug/wifi-direct/include/wifi_direct_mgr.h @@ -71,8 +71,8 @@ int wifi_direct_mgr_foreach_connected_peers( wifi_direct_connected_peer_cb cb, void *data); int wifi_direct_mgr_start_discovery(void); int wifi_direct_mgr_cancel_discovery(void); -int wifi_direct_mgr_connect(const char *mac_addr); -int wifi_direct_mgr_disconnect(const char *mac_addr); +int wifi_direct_mgr_connect(char *mac_addr); +int wifi_direct_mgr_disconnect(char *mac_addr); int wifi_direct_mgr_reject_connection(const char *mac_addr); int wifi_direct_mgr_accept_connection(char *mac_addr); int wifi_direct_mgr_get_wps_type(Eina_Bool *is_pbc); diff --git a/ug/wifi-direct/src/wifi_direct_mgr.c b/ug/wifi-direct/src/wifi_direct_mgr.c index 02cf4a3..2d18739 100644 --- a/ug/wifi-direct/src/wifi_direct_mgr.c +++ b/ug/wifi-direct/src/wifi_direct_mgr.c @@ -475,7 +475,7 @@ int wifi_direct_mgr_cancel_discovery(void) * @param[in] mac_adrr the MAC address * @return 0 on success, otherwise -1 */ -int wifi_direct_mgr_connect(const char *mac_addr) +int wifi_direct_mgr_connect(char *mac_addr) { int ret; @@ -500,7 +500,7 @@ int wifi_direct_mgr_connect(const char *mac_addr) * @param[in] mac_adrr the MAC address * @return 0 on success, otherwise -1 */ -int wifi_direct_mgr_disconnect(const char *mac_addr) +int wifi_direct_mgr_disconnect(char *mac_addr) { int ret; -- 2.7.4 From 540f170f953ef5a09a19a66337d49eef759014ea Mon Sep 17 00:00:00 2001 From: Jiwoong Im Date: Thu, 2 Jul 2015 17:05:13 +0900 Subject: [PATCH 13/16] Revert "Fixed the spec file to change the build according to graphic engine" This reverts commit f4fe14c37b8d6b42d462997f341be15848a7bbb4. Change-Id: Ifcaba63f81873d9945928d79517ffbefa03759a2 Signed-off-by: Jiwoong Im --- CMakeLists.txt | 4 ---- packaging/org.tizen.settings-tv-ref.spec | 14 +++++--------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 01a6284..6e3f1f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) PROJECT(settings-tv-ref) -IF (with_wayland) - ADD_DEFINITIONS("-DWAYLAND") -ENDIF (with_wayland) - INCLUDE(FindPkgConfig) pkg_check_modules(HOMEPANEL_PKGS REQUIRED application-common diff --git a/packaging/org.tizen.settings-tv-ref.spec b/packaging/org.tizen.settings-tv-ref.spec index f82326c..9c52c29 100644 --- a/packaging/org.tizen.settings-tv-ref.spec +++ b/packaging/org.tizen.settings-tv-ref.spec @@ -1,6 +1,3 @@ -%bcond_with x -%bcond_with wayland - Name: org.tizen.settings-tv-ref Summary: Setting Reference Application Version: 0.2 @@ -47,6 +44,10 @@ BuildRequires: vconf %define _ugedjedir /usr/ug/res/edje %define _jsonhelperfile %{_jsonoutputdir}/helper.json +%if "%{?_with_wayland}" == "1" +ExcludeArch: armv7l i586 i686 x86_64 aarch64 +%endif + %description Description: settings-tv-ref application @@ -69,12 +70,7 @@ cmake . \ -DDESKTOP_ICONDIR=%{_desktop_icondir} \ -DDESKTOP_ICON=%{name}.png \ -DDESKTOP_ICON_4X2=%{name}_4x2.png \ - -DJSONHELPERFILE=%{_jsonhelperfile} \ - %if %{with wayland} && !%{with x} - -Dwith_wayland=TRUE - %else - -Dwith_x=TRUE - %endif + -DJSONHELPERFILE=%{_jsonhelperfile} make %{?jobs:-j%jobs} %install -- 2.7.4 From 2387e6ae6a15ad8346d304f08e42b6fb899abba9 Mon Sep 17 00:00:00 2001 From: Jiwoong Im Date: Thu, 2 Jul 2015 17:05:46 +0900 Subject: [PATCH 14/16] Revert "Make this package not be included in wayland image (temp)" This reverts commit 6635834f7826eb04f72907fd2e28082f8f89058a. Change-Id: I473d9fa9ad5f4fd4be98314609337043d69063d9 Signed-off-by: Jiwoong Im --- packaging/org.tizen.settings-tv-ref.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packaging/org.tizen.settings-tv-ref.spec b/packaging/org.tizen.settings-tv-ref.spec index 9c52c29..e4eca06 100644 --- a/packaging/org.tizen.settings-tv-ref.spec +++ b/packaging/org.tizen.settings-tv-ref.spec @@ -44,10 +44,6 @@ BuildRequires: vconf %define _ugedjedir /usr/ug/res/edje %define _jsonhelperfile %{_jsonoutputdir}/helper.json -%if "%{?_with_wayland}" == "1" -ExcludeArch: armv7l i586 i686 x86_64 aarch64 -%endif - %description Description: settings-tv-ref application -- 2.7.4 From 81533504c6e6acc9d69504046e812b762b9bfe2a Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Tue, 28 Jul 2015 19:28:49 +0900 Subject: [PATCH 15/16] remove application-common dependency Change-Id: Ib9981649813d7d1ab071346fc21ddb6a6209ca22 Signed-off-by: Minkyu Kang --- CMakeLists.txt | 1 - include/KeyDefine.h | 122 +++++++++++++++++++++++++++++++ packaging/org.tizen.settings-tv-ref.spec | 1 - ug/proxy/src/main_view.c | 3 +- 4 files changed, 123 insertions(+), 4 deletions(-) create mode 100644 include/KeyDefine.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 6e3f1f1..02d01bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,6 @@ PROJECT(settings-tv-ref) INCLUDE(FindPkgConfig) pkg_check_modules(HOMEPANEL_PKGS REQUIRED - application-common capi-appfw-application dlog edje diff --git a/include/KeyDefine.h b/include/KeyDefine.h new file mode 100644 index 0000000..e664fc0 --- /dev/null +++ b/include/KeyDefine.h @@ -0,0 +1,122 @@ +#ifndef __KEY_DEFINE_H__ +#define __KEY_DEFINE_H__ + + +enum ESKey { + SKEY_UP, + SKEY_DOWN, + SKEY_LEFT, + SKEY_RIGHT, + SKEY_VOLUME_UP, // keyboard + remote controller + SKEY_VOLUME_DOWN, // keyboard + remote controller + SKEY_MUTE, // keyboard + remote controller + SKEY_ENTER, + SKEY_BACK, + SKEY_MENU, + SKEY_PLAY, + SKEY_PAUSE, + SKEY_NEXT, + SKEY_PREVIOUS, + SKEY_REWIND, + SKEY_FASTFORWARD, + SKEY_EXIT, + SKEY_HOME, + SKEY_0, + SKEY_1, + SKEY_2, + SKEY_3, + SKEY_4, + SKEY_5, + SKEY_6, + SKEY_7, + SKEY_8, + SKEY_9, + SKEY_MINUS, + SKEY_CHANNEL_UP, + SKEY_CHANNEL_DOWN, + SKEY_MAX, +}; + + +// Key String Definition +#undef KEY_UP +#define KEY_UP "Up" +#undef KEY_DOWN +#define KEY_DOWN "Down" +#undef KEY_LEFT +#define KEY_LEFT "Left" +#undef KEY_RIGHT +#define KEY_RIGHT "Right" +#undef KEY_VOLUMEUP +#define KEY_VOLUMEUP "F9" +#undef KEY_VOLUMEUP_REMOTE +#define KEY_VOLUMEUP_REMOTE "XF86AudioRaiseVolume" +#undef KEY_VOLUMEDOWN +#define KEY_VOLUMEDOWN "F10" +#undef KEY_VOLUMEDOWN_REMOTE +#define KEY_VOLUMEDOWN_REMOTE "XF86AudioLowerVolume" +#undef KEY_MUTE +#define KEY_MUTE "F8" +#undef KEY_MUTE_REMOTE +#define KEY_MUTE_REMOTE "XF86AudioMute" +#undef KEY_ENTER +#define KEY_ENTER "Return" +#undef KEY_ENTER_REMOTE +#define KEY_ENTER_REMOTE "Return" +#undef KEY_BACK +#define KEY_BACK "Escape" +#undef KEY_BACK_REMOTE +#define KEY_BACK_REMOTE "XF86Back" +#undef KEY_MENU +#define KEY_MENU "Super_L" +#undef KEY_MENU_REMOTE +#define KEY_MENU_REMOTE "XF86Menu" +#undef KEY_PLAY +#define KEY_PLAY "XF86AudioPlay" +#undef KEY_PAUSE +#define KEY_PAUSE "XF86AudioPause" +#undef KEY_NEXT +#define KEY_NEXT "XF86AudioNext" +#undef KEY_PREVIOUS +#define KEY_PREVIOUS "XF86AudioPrev" +#undef KEY_REWIND +#define KEY_REWIND "XF86AudioRewind" +#undef KEY_FASTFORWARD +#define KEY_FASTFORWARD "XF86AudioForward" +#undef KEY_EXIT +#define KEY_EXIT "XF86Close" +#undef KEY_HOME +#define KEY_HOME "XF86Home" +#undef KEY_0 +#define KEY_0 "0" +#undef KEY_1 +#define KEY_1 "1" +#undef KEY_2 +#define KEY_2 "2" +#undef KEY_3 +#define KEY_3 "3" +#undef KEY_4 +#define KEY_4 "4" +#undef KEY_5 +#define KEY_5 "5" +#undef KEY_6 +#define KEY_6 "6" +#undef KEY_7 +#define KEY_7 "7" +#undef KEY_8 +#define KEY_8 "8" +#undef KEY_9 +#define KEY_9 "9" +#undef KEY_MINUS +#define KEY_MINUS "-" +#undef KEY_CHANNELUP +#define KEY_CHANNELUP "F12" +#undef KEY_CHANNELUP_REMOTE +#define KEY_CHANNELUP_REMOTE "XF86RaiseChannel" +#undef KEY_CHANNELDOWN +#define KEY_CHANNELDOWN "F11" +#undef KEY_CHANNELDOWN_REMOTE +#define KEY_CHANNELDOWN_REMOTE "XF86LowerChannel" + + +#endif /* __KEY_DEFINE_H__ */ diff --git a/packaging/org.tizen.settings-tv-ref.spec b/packaging/org.tizen.settings-tv-ref.spec index e4eca06..bdf7c3c 100644 --- a/packaging/org.tizen.settings-tv-ref.spec +++ b/packaging/org.tizen.settings-tv-ref.spec @@ -9,7 +9,6 @@ Source1: %{name}.manifest BuildRequires: cmake BuildRequires: gettext-tools BuildRequires: edje-bin -BuildRequires: pkgconfig(application-common) BuildRequires: pkgconfig(capi-appfw-application) BuildRequires: pkgconfig(elementary) BuildRequires: pkgconfig(ecore) diff --git a/ug/proxy/src/main_view.c b/ug/proxy/src/main_view.c index 2135982..8b2d596 100644 --- a/ug/proxy/src/main_view.c +++ b/ug/proxy/src/main_view.c @@ -17,8 +17,7 @@ #include #include -#include - +#include "KeyDefine.h" #include "defs.h" #include "dbg.h" #include "main_view.h" -- 2.7.4 From 9789fe4662a9aefa1c62c4cd304eb025773ff8c9 Mon Sep 17 00:00:00 2001 From: Minkyu Kang Date: Wed, 29 Jul 2015 19:50:37 +0900 Subject: [PATCH 16/16] modify icon file Change-Id: I409ffbd7a6e1cad76c9b7196a0234841a7a00885 Signed-off-by: Minkyu Kang --- CMakeLists.txt | 2 +- org.tizen.settings-tv-ref.png | Bin 4072 -> 4658 bytes packaging/org.tizen.settings-tv-ref.spec | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 02d01bd..1436b83 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,7 @@ IF(NOT DEFINED MANIFESTDIR) SET(MANIFESTDIR "${PREFIX}/share/packages") ENDIF(NOT DEFINED MANIFESTDIR) IF(NOT DEFINED DESKTOP_ICONDIR) - SET(DESKTOP_ICONDIR "/usr/share/icons/default/small") + SET(DESKTOP_ICONDIR "/usr/share/icons") ENDIF(NOT DEFINED DESKTOP_ICONDIR) IF(NOT DEFINED DESKTOP_ICON) SET(DESKTOP_ICON ${PACKAGE_NAME}.png) diff --git a/org.tizen.settings-tv-ref.png b/org.tizen.settings-tv-ref.png index a29a76d5f1ec3e8fb42137202e64d8a17e10df3b..1e66adaf2f35838173e2f64beeda46fb5457765d 100644 GIT binary patch literal 4658 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 literal 4072 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 a!~X#ONwCRFssVcd0000