hotkeys - renames to tools
conceptually, the function is changed.
This commit is contained in:
parent
fb2b1f1dc4
commit
084211579f
|
@ -452,7 +452,7 @@ group { name: "main_layout";
|
|||
min: 640 440;
|
||||
}
|
||||
}
|
||||
part { name: "elm.swallow.hotkeys";
|
||||
part { name: "elm.swallow.tools";
|
||||
type: SWALLOW;
|
||||
scale: 1;
|
||||
description { state: "default" 0.0;
|
||||
|
@ -473,7 +473,7 @@ group { name: "main_layout";
|
|||
description { state: "default" 0.0;
|
||||
rel1.relative: 0 1;
|
||||
rel2.relative: 1 0;
|
||||
rel1.to_y: "elm.swallow.hotkeys";
|
||||
rel1.to_y: "elm.swallow.tools";
|
||||
rel2.to_y: "elm.swallow.statusbar";
|
||||
}
|
||||
}
|
||||
|
@ -506,16 +506,16 @@ group { name: "main_layout";
|
|||
target: "elm.swallow.statusbar";
|
||||
transition: DECELERATE 0.35;
|
||||
}
|
||||
program { name: "hotkeys_show";
|
||||
signal: "elm,state,hotkeys,show";
|
||||
program { name: "tools_show";
|
||||
signal: "elm,state,tools,show";
|
||||
action: STATE_SET "visible" 0.0;
|
||||
target: "elm.swallow.hotkeys";
|
||||
target: "elm.swallow.tools";
|
||||
transition: DECELERATE 0.35;
|
||||
}
|
||||
program { name: "hotkeys_hide";
|
||||
signal: "elm,state,hotkeys,hide";
|
||||
program { name: "tools_hide";
|
||||
signal: "elm,state,tools,hide";
|
||||
action: STATE_SET "default" 0.0;
|
||||
target: "elm.swallow.hotkeys";
|
||||
target: "elm.swallow.tools";
|
||||
transition: DECELERATE 0.35;
|
||||
}
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ enventor_SOURCES = \
|
|||
indent.c \
|
||||
edj_mgr.c \
|
||||
build.c \
|
||||
hotkeys.c \
|
||||
tools.c \
|
||||
search.c \
|
||||
globals.c
|
||||
|
||||
|
|
|
@ -39,16 +39,16 @@ base_statusbar_toggle(Eina_Bool config)
|
|||
}
|
||||
|
||||
void
|
||||
base_hotkey_toggle(Eina_Bool config)
|
||||
base_tools_toggle(Eina_Bool config)
|
||||
{
|
||||
base_data *bd = g_bd;
|
||||
|
||||
if (config) config_hotkeys_set(!config_hotkeys_get());
|
||||
if (config) config_tools_set(!config_tools_get());
|
||||
|
||||
if (config_hotkeys_get())
|
||||
elm_object_signal_emit(bd->layout, "elm,state,hotkeys,show", "");
|
||||
if (config_tools_get())
|
||||
elm_object_signal_emit(bd->layout, "elm,state,tools,show", "");
|
||||
else
|
||||
elm_object_signal_emit(bd->layout, "elm,state,hotkeys,hide", "");
|
||||
elm_object_signal_emit(bd->layout, "elm,state,tools,hide", "");
|
||||
}
|
||||
|
||||
Evas_Object *
|
||||
|
@ -72,15 +72,15 @@ base_win_resize_object_add(Evas_Object *resize_obj)
|
|||
elm_win_resize_object_add(bd->win, resize_obj);
|
||||
}
|
||||
|
||||
void base_hotkeys_set(Evas_Object *hotkeys)
|
||||
void base_tools_set(Evas_Object *tools)
|
||||
{
|
||||
base_data *bd = g_bd;
|
||||
elm_object_part_content_set(bd->layout, "elm.swallow.hotkeys", hotkeys);
|
||||
elm_object_part_content_set(bd->layout, "elm.swallow.tools", tools);
|
||||
|
||||
if (config_hotkeys_get())
|
||||
elm_object_signal_emit(bd->layout, "elm,state,hotkeys,show", "");
|
||||
if (config_tools_get())
|
||||
elm_object_signal_emit(bd->layout, "elm,state,tools,show", "");
|
||||
else
|
||||
elm_object_signal_emit(bd->layout, "elm,state,hotkeys,hide", "");
|
||||
elm_object_signal_emit(bd->layout, "elm,state,tools,hide", "");
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -27,7 +27,7 @@ typedef struct config_s
|
|||
Eina_Bool part_highlight;
|
||||
Eina_Bool dummy_swallow;
|
||||
Eina_Bool auto_indent;
|
||||
Eina_Bool hotkeys;
|
||||
Eina_Bool tools;
|
||||
} config_data;
|
||||
|
||||
static config_data *g_cd = NULL;
|
||||
|
@ -127,7 +127,7 @@ config_load()
|
|||
cd->part_highlight = EINA_TRUE;
|
||||
cd->dummy_swallow = EINA_TRUE;
|
||||
cd->auto_indent = EINA_TRUE;
|
||||
cd->hotkeys = EINA_FALSE;
|
||||
cd->tools = EINA_FALSE;
|
||||
}
|
||||
|
||||
g_cd = cd;
|
||||
|
@ -198,8 +198,8 @@ eddc_init()
|
|||
dummy_swallow, EET_T_UCHAR);
|
||||
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "auto_indent",
|
||||
auto_indent, EET_T_UCHAR);
|
||||
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "hotkeys",
|
||||
hotkeys, EET_T_UCHAR);
|
||||
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "tools",
|
||||
tools, EET_T_UCHAR);
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -666,15 +666,15 @@ config_view_size_get(Evas_Coord *w, Evas_Coord *h)
|
|||
}
|
||||
|
||||
Eina_Bool
|
||||
config_hotkeys_get()
|
||||
config_tools_get()
|
||||
{
|
||||
config_data *cd = g_cd;
|
||||
return cd->hotkeys;
|
||||
return cd->tools;
|
||||
}
|
||||
|
||||
void
|
||||
config_hotkeys_set(Eina_Bool enabled)
|
||||
config_tools_set(Eina_Bool enabled)
|
||||
{
|
||||
config_data *cd = g_cd;
|
||||
cd->hotkeys = enabled;
|
||||
cd->tools = enabled;
|
||||
}
|
||||
|
|
|
@ -290,7 +290,7 @@ main_key_down_cb(void *data, int type EINA_UNUSED, void *ev)
|
|||
//Tools
|
||||
if (!strcmp(event->key, "F11"))
|
||||
{
|
||||
base_hotkey_toggle(EINA_TRUE);
|
||||
base_tools_toggle(EINA_TRUE);
|
||||
return ECORE_CALLBACK_DONE;
|
||||
}
|
||||
//Setting
|
||||
|
@ -377,7 +377,7 @@ config_update_cb(void *data)
|
|||
edit_line_number_toggle(ad->ed);
|
||||
edit_font_size_update(ad->ed, EINA_FALSE);
|
||||
|
||||
base_hotkey_toggle(EINA_FALSE);
|
||||
base_tools_toggle(EINA_FALSE);
|
||||
base_statusbar_toggle(EINA_FALSE);
|
||||
edit_part_highlight_toggle(ad->ed, EINA_TRUE);
|
||||
view_dummy_toggle(VIEW_DATA, EINA_FALSE);
|
||||
|
@ -501,10 +501,10 @@ edj_mgr_set()
|
|||
}
|
||||
|
||||
static void
|
||||
hotkeys_set(edit_data *ed)
|
||||
tools_set(edit_data *ed)
|
||||
{
|
||||
Evas_Object *hotkeys = hotkeys_create(base_layout_get(), ed);
|
||||
base_hotkeys_set(hotkeys);
|
||||
Evas_Object *tools = tools_create(base_layout_get(), ed);
|
||||
base_tools_set(tools);
|
||||
}
|
||||
|
||||
static Eina_Bool
|
||||
|
@ -530,7 +530,7 @@ init(app_data *ad, int argc, char **argv)
|
|||
edc_edit_set(ad);
|
||||
edc_view_set(stats_group_name_get());
|
||||
menu_init(ad->ed);
|
||||
hotkeys_set(ad->ed);
|
||||
tools_set(ad->ed);
|
||||
|
||||
ad->edc_monitor = eio_monitor_add(config_edc_path_get());
|
||||
ecore_event_handler_add(EIO_MONITOR_FILE_MODIFIED, edc_changed_cb, ad);
|
||||
|
|
|
@ -201,7 +201,7 @@ setting_apply_btn_cb(void *data, Evas_Object *obj EINA_UNUSED,
|
|||
config_edc_data_path_set(elm_object_text_get(md->data_path_entry));
|
||||
config_font_size_set((float) elm_slider_value_get(md->slider_font));
|
||||
config_view_scale_set(elm_slider_value_get(md->slider_view));
|
||||
config_hotkeys_set(elm_check_state_get(md->toggle_tools));
|
||||
config_tools_set(elm_check_state_get(md->toggle_tools));
|
||||
config_stats_bar_set(elm_check_state_get(md->toggle_stats));
|
||||
config_linenumber_set(elm_check_state_get(md->toggle_linenum));
|
||||
config_part_highlight_set(elm_check_state_get(md->toggle_highlight));
|
||||
|
@ -446,7 +446,7 @@ setting_open(menu_data *md)
|
|||
|
||||
//Toggle (Tool bar)
|
||||
Evas_Object *toggle_tools = toggle_create(box, "Tools",
|
||||
config_hotkeys_get());
|
||||
config_tools_get());
|
||||
elm_box_pack_end(box, toggle_tools);
|
||||
|
||||
//Toggle (Status bar)
|
||||
|
|
|
@ -87,7 +87,7 @@ f12_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info)
|
|||
}
|
||||
|
||||
Evas_Object *
|
||||
hotkeys_create(Evas_Object *parent, edit_data *ed)
|
||||
tools_create(Evas_Object *parent, edit_data *ed)
|
||||
{
|
||||
Evas_Object *toolbar = elm_toolbar_add(parent);
|
||||
elm_object_style_set(toolbar, "item_horizontal");
|
|
@ -18,5 +18,5 @@ EXTRA_DIST = common.h \
|
|||
indent.h \
|
||||
syntax_helper.h \
|
||||
template_code.h \
|
||||
hotkeys.h \
|
||||
tools.h \
|
||||
search.h
|
||||
|
|
|
@ -6,8 +6,8 @@ Evas_Object *base_layout_get();
|
|||
void base_win_resize_object_add(Evas_Object *resize_obj);
|
||||
void base_title_set(const char *path);
|
||||
void base_statusbar_toggle(Eina_Bool config);
|
||||
void base_hotkey_toggle(Eina_Bool config);
|
||||
void base_hotkeys_set(Evas_Object *hotkeys);
|
||||
void base_tools_toggle(Eina_Bool config);
|
||||
void base_tools_set(Evas_Object *tools);
|
||||
void base_full_view_left();
|
||||
void base_full_view_right();
|
||||
void base_left_view_set(Evas_Object *left);
|
||||
|
|
|
@ -24,7 +24,7 @@ typedef struct indent_s indent_data;
|
|||
#include "edj_mgr.h"
|
||||
#include "globals.h"
|
||||
#include "build.h"
|
||||
#include "hotkeys.h"
|
||||
#include "tools.h"
|
||||
#include "base_gui.h"
|
||||
#include "search.h"
|
||||
|
||||
|
|
|
@ -38,6 +38,6 @@ void config_font_size_set(float font_size);
|
|||
float config_font_size_get();
|
||||
void config_view_scale_set(double view_scale);
|
||||
double config_view_scale_get();
|
||||
Eina_Bool config_hotkeys_get();
|
||||
void config_hotkeys_set(Eina_Bool enabled);
|
||||
Eina_Bool config_tools_get();
|
||||
void config_tools_set(Eina_Bool enabled);
|
||||
|
||||
|
|
|
@ -1,2 +0,0 @@
|
|||
Evas_Object *hotkeys_create(Evas_Object *parent, edit_data *ed);
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
Evas_Object *tools_create(Evas_Object *parent, edit_data *ed);
|
||||
|
Loading…
Reference in New Issue