From 8935ac45a5343a305eb142866a920d2be7accdd9 Mon Sep 17 00:00:00 2001 From: Jaehyun Cho Date: Mon, 14 Mar 2016 17:19:13 +0900 Subject: [PATCH] Replace elm_app_name_get() with "enventor" for Windows. On Windows, elm_app_name_get() returns "enventor.exe". To set "enventor" style, elm_app_name_get() is replaced with "enventor". --- src/bin/base_gui.c | 3 +-- src/bin/live_edit.c | 2 +- src/bin/menu.c | 4 ++-- src/bin/panes.c | 2 +- src/bin/statusbar.c | 6 +++--- src/bin/text_setting.c | 6 +++--- src/bin/tools.c | 2 +- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c index 6146d69..8344202 100644 --- a/src/bin/base_gui.c +++ b/src/bin/base_gui.c @@ -289,8 +289,7 @@ base_gui_init(void) g_bd = bd; //Window - Evas_Object *win = elm_win_util_standard_add(elm_app_name_get(), - "Enventor"); + Evas_Object *win = elm_win_util_standard_add("enventor", "Enventor"); elm_win_focus_highlight_enabled_set(win, EINA_TRUE); Evas_Coord w, h; diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c index 3ef94a5..cd3d62a 100644 --- a/src/bin/live_edit.c +++ b/src/bin/live_edit.c @@ -1009,7 +1009,7 @@ static Evas_Object * live_btn_create(Evas_Object *parent, const char *name, void * data) { Evas_Object *btn = elm_button_add(parent); - elm_object_style_set(btn, elm_app_name_get()); + elm_object_style_set(btn, "enventor"); evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_object_focus_allow_set(btn, EINA_FALSE); diff --git a/src/bin/menu.c b/src/bin/menu.c index ae20669..7b35408 100644 --- a/src/bin/menu.c +++ b/src/bin/menu.c @@ -247,7 +247,7 @@ about_open(menu_data *md) //Back Button Evas_Object *back_button = elm_button_add(layout); - elm_object_style_set(back_button, elm_app_name_get()); + elm_object_style_set(back_button, "enventor"); elm_object_scale_set(back_button, 1.15); elm_object_focus_allow_set(back_button, EINA_FALSE); evas_object_show(back_button); @@ -629,7 +629,7 @@ menu_open(menu_data *md) //Back Button Evas_Object *back_button = elm_button_add(layout); - elm_object_style_set(back_button, elm_app_name_get()); + elm_object_style_set(back_button, "enventor"); elm_object_scale_set(back_button, 1.15); elm_object_focus_allow_set(back_button, EINA_FALSE); evas_object_show(back_button); diff --git a/src/bin/panes.c b/src/bin/panes.c index 0d4f3b7..573589c 100644 --- a/src/bin/panes.c +++ b/src/bin/panes.c @@ -338,7 +338,7 @@ panes_init(Evas_Object *parent) //Panes Horizontal Evas_Object *panes_h = elm_panes_add(parent); - elm_object_style_set(panes_h, elm_app_name_get()); + elm_object_style_set(panes_h, "enventor"); elm_panes_horizontal_set(panes_v, EINA_TRUE); evas_object_size_hint_weight_set(panes_h, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); diff --git a/src/bin/statusbar.c b/src/bin/statusbar.c index 6d68fcb..31e0784 100644 --- a/src/bin/statusbar.c +++ b/src/bin/statusbar.c @@ -173,7 +173,7 @@ view_resize_btn_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) Evas_Object *ctxpopup = elm_ctxpopup_add(base_layout_get()); if (!ctxpopup) return; - elm_object_style_set(ctxpopup, elm_app_name_get()); + elm_object_style_set(ctxpopup, "enventor"); elm_ctxpopup_direction_priority_set(ctxpopup, ELM_CTXPOPUP_DIRECTION_UP, ELM_CTXPOPUP_DIRECTION_RIGHT, ELM_CTXPOPUP_DIRECTION_LEFT, @@ -214,7 +214,7 @@ view_scale_btn_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) //Ctxpopup Evas_Object *ctxpopup = elm_ctxpopup_add(base_layout_get()); - elm_object_style_set(ctxpopup, elm_app_name_get()); + elm_object_style_set(ctxpopup, "enventor"); //Slider Evas_Object *slider = elm_slider_add(ctxpopup); @@ -250,7 +250,7 @@ create_statusbar_btn(Evas_Object *layout, const char *image, Evas_Object *box = elm_box_add(layout); Evas_Object *btn = elm_button_add(box); - elm_object_style_set(btn, elm_app_name_get()); + elm_object_style_set(btn, "enventor"); elm_object_focus_allow_set(btn, EINA_FALSE); evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL); diff --git a/src/bin/text_setting.c b/src/bin/text_setting.c index f611761..35fc496 100644 --- a/src/bin/text_setting.c +++ b/src/bin/text_setting.c @@ -347,7 +347,7 @@ color_ctxpopup_create(Evas_Object *parent, elm_config_focus_autoscroll_mode_set(ELM_FOCUS_AUTOSCROLL_MODE_NONE); - elm_object_style_set(ctxpopup, elm_app_name_get()); + elm_object_style_set(ctxpopup, "enventor"); evas_object_data_set(ctxpopup, "color_keyword", selected_color_keyword); elm_ctxpopup_direction_priority_set(ctxpopup, ELM_CTXPOPUP_DIRECTION_RIGHT, ELM_CTXPOPUP_DIRECTION_LEFT, @@ -595,7 +595,7 @@ text_setting_font_apply(void) char text_class_name[32]; snprintf(text_class_name, sizeof(text_class_name), "%s_setting_entry", - elm_app_name_get()); + "enventor"); char *font = NULL; if (tsd->font_name) @@ -709,7 +709,7 @@ text_setting_layout_create(Evas_Object *parent) //Text Editor Evas_Object *entry = elm_entry_add(layout); char style_name[128]; - snprintf(style_name, sizeof(style_name), "%s_setting", elm_app_name_get()); + snprintf(style_name, sizeof(style_name), "%s_setting", "enventor"); elm_object_style_set(entry, style_name); elm_entry_context_menu_disabled_set(entry, EINA_TRUE); elm_entry_line_wrap_set(entry, ELM_WRAP_NONE); diff --git a/src/bin/tools.c b/src/bin/tools.c index 06c5d69..69dd2fe 100644 --- a/src/bin/tools.c +++ b/src/bin/tools.c @@ -126,7 +126,7 @@ tools_btn_create(Evas_Object *parent, const char *icon, const char *tooltip_msg, Evas_Smart_Cb func) { Evas_Object *btn = elm_button_add(parent); - elm_object_style_set(btn, elm_app_name_get()); + elm_object_style_set(btn, "enventor"); elm_object_focus_allow_set(btn, EINA_FALSE); elm_object_tooltip_text_set(btn, tooltip_msg); elm_object_tooltip_orient_set(btn, ELM_TOOLTIP_ORIENT_BOTTOM);