vtorri
/
enventor
forked from enlightenment/enventor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tools: Add template insert button. 

Add template insert button in tools to let users know how to use
template insert function.
This commit is contained in:
Jaehyun Cho 2016-05-20 05:46:13 +09:00
parent 2c0378467c
commit cf4c9ffb94
7 changed files with 90 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/themes/default/images.edc
View File

@ -45,6 +45,7 @@ images {
image: "brows_image.png" COMP;
image: "brows_sound.png" COMP;
image: "brows_font.png" COMP;
image: "template.png" COMP;
}
#define ICON_GROUP(_group_name, _image_path) \
@ -103,5 +104,6 @@ ICON_GROUP("brows_logo", "brows_logo.png")
ICON_GROUP("brows_image", "brows_image.png")
ICON_GROUP("brows_sound", "brows_sound.png")
ICON_GROUP("brows_font", "brows_font.png")
ICON_GROUP("template", "template.png")
#undef ICON_GROUP

3
data/themes/default/images/Makefile.am
View File

@ -93,4 +93,5 @@ EXTRA_DIST = \
brows_logo.png \
brows_image.png \
brows_sound.png \
brows_font.png
brows_font.png \
template.png

BIN
data/themes/default/images/template.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

59
data/themes/default/layout_common.edc
View File

@ -3166,6 +3166,31 @@ group { "text_editor_tools_layout";
}
}
spacer { "padding7";
scale: 1;
desc { "default";
rel1 {
to_x: "elm.swallow.lines";
relative: 1.0 0.0;
}
rel2.to_x: "elm.swallow.lines";
min: 8 0;
fixed: 1 0;
align: 0.0 0.5;
}
}
swallow { "elm.swallow.template";
scale: 1;
desc { "default";
rel1 {
to_x: "padding7";
relative: 1.0 0.0;
}
rel2.to_x: "padding7";
fixed: 1 0;
align: 0.0 0.5;
}
}
spacer { "padding8";
scale: 1;
desc { "default";
rel1 {
@ -3181,16 +3206,16 @@ group { "text_editor_tools_layout";
swallow { "elm.swallow.menu";
scale: 1;
desc { "default";
rel1.to_x: "padding7";
rel1.to_x: "padding8";
rel2 {
to_x: "padding7";
to_x: "padding8";
relative: 0.0 1.0;
}
fixed: 1 0;
align: 1.0 0.5;
}
}
spacer { "padding8";
spacer { "padding9";
scale: 1;
desc { "default";
rel1.to_x: "elm.swallow.menu";
@ -3207,11 +3232,11 @@ group { "text_editor_tools_layout";
scale: 1;
desc { "default";
rel1 {
to_x: "padding8";
to_x: "padding9";
relative: 0.0 0.5;
}
rel2 {
to_x: "padding8";
to_x: "padding9";
relative: 0.0 0.5;
}
min: 1 18;
@ -3220,7 +3245,7 @@ group { "text_editor_tools_layout";
color: 48 48 48 255;
}
}
spacer { "padding9";
spacer { "padding10";
scale: 1;
desc { "default";
rel1.to_x: "separator";
@ -3236,16 +3261,16 @@ group { "text_editor_tools_layout";
swallow { "elm.swallow.status";
scale: 1;
desc { "default";
rel1.to_x: "padding9";
rel1.to_x: "padding10";
rel2 {
to_x: "padding9";
to_x: "padding10";
relative: 0.0 1.0;
}
fixed: 1 0;
align: 1.0 0.5;
}
}
spacer { "padding10";
spacer { "padding11";
scale: 1;
desc { "default";
rel1.to_x: "elm.swallow.status";
@ -3261,16 +3286,16 @@ group { "text_editor_tools_layout";
swallow { "elm.swallow.edc_navigator";
scale: 1;
desc { "default";
rel1.to_x: "padding10";
rel1.to_x: "padding11";
rel2 {
to_x: "padding10";
to_x: "padding11";
relative: 0.0 1.0;
}
fixed: 1 0;
align: 1.0 0.5;
}
}
spacer { "padding11";
spacer { "padding12";
scale: 1;
desc { "default";
rel1.to_x: "elm.swallow.edc_navigator";
@ -3286,16 +3311,16 @@ group { "text_editor_tools_layout";
swallow { "elm.swallow.file_browser";
scale: 1;
desc { "default";
rel1.to_x: "padding11";
rel1.to_x: "padding12";
rel2 {
to_x: "padding11";
to_x: "padding12";
relative: 0.0 1.0;
}
fixed: 1 0;
align: 1.0 0.5;
}
}
spacer { "padding12";
spacer { "padding13";
scale: 1;
desc { "default";
rel1.to_x: "elm.swallow.file_browser";
@ -3311,9 +3336,9 @@ group { "text_editor_tools_layout";
swallow { "elm.swallow.console";
scale: 1;
desc { "default";
rel1.to_x: "padding12";
rel1.to_x: "padding13";
rel2 {
to_x: "padding12";
to_x: "padding13";
relative: 0.0 1.0;
}
fixed: 1 0;

29
src/bin/main.c
View File

@ -574,33 +574,6 @@ enventor_setup(app_data *ad)
base_live_view_set(enventor_object_live_view_get(enventor));
}
static void
default_template_insert(void)
{
if (live_edit_get())
{
stats_info_msg_update(_("Insertion of template code is disabled while in Live Edit mode"));
return;
}
char syntax[12];
if (enventor_object_template_insert(base_enventor_get(),
ENVENTOR_TEMPLATE_INSERT_DEFAULT,
syntax, sizeof(syntax)))
{
char msg[64];
snprintf(msg, sizeof(msg), _("Template code inserted, (%s)"), syntax);
stats_info_msg_update(msg);
enventor_object_save(base_enventor_get(), config_input_path_get());
}
else
{
stats_info_msg_update(_("Can't insert template code here. Move the "
"cursor inside the \"Collections,Images,Parts,"
"Part,Programs\" scope."));
}
}
static Eina_Bool
alt_func(Evas_Event_Key_Down *event)
{
@ -690,7 +663,7 @@ ctrl_func(Evas_Event_Key_Down *event)
//Template Code
if (!strcmp(event->key, "t") || !strcmp(event->key, "T"))
{
default_template_insert();
tools_template_insert();
return EINA_TRUE;
}
//Auto Indentation

42
src/bin/tools.c
View File

@ -11,6 +11,7 @@ typedef struct tools_s
Evas_Object *file_browser_btn;
Evas_Object *edc_navigator_btn;
Evas_Object *lines_btn;
Evas_Object *template_btn;
Evas_Object *highlight_btn;
Evas_Object *mirror_btn;
Evas_Object *goto_btn;
@ -62,6 +63,13 @@ lines_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
tools_lines_update(EINA_TRUE);
}
static void
template_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
tools_template_insert();
}
static void
file_browser_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
@ -278,6 +286,13 @@ tools_init(Evas_Object *parent)
elm_object_part_content_set(text_editor_ly, "elm.swallow.lines", btn);
td->lines_btn = btn;
btn = tools_btn_create(text_editor_ly, "template",
_("Insert Template (Ctrl + T)"), template_cb);
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_part_content_set(text_editor_ly, "elm.swallow.template", btn);
td->template_btn = btn;
btn = tools_btn_create(text_editor_ly, "console",
_("Console Box (Alt + Down)"), console_cb);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@ -515,6 +530,33 @@ tools_search_update(void)
elm_object_signal_emit(td->find_btn, "icon,highlight,disabled", "");
}
void
tools_template_insert(void)
{
if (live_edit_get())
{
stats_info_msg_update(_("Insertion of template code is disabled while in Live Edit mode"));
return;
}
char syntax[12];
if (enventor_object_template_insert(base_enventor_get(),
ENVENTOR_TEMPLATE_INSERT_DEFAULT,
syntax, sizeof(syntax)))
{
char msg[64];
snprintf(msg, sizeof(msg), _("Template code inserted, (%s)"), syntax);
stats_info_msg_update(msg);
enventor_object_save(base_enventor_get(), config_input_path_get());
}
else
{
stats_info_msg_update(_("Can't insert template code here. Move the "
"cursor inside the \"Collections,Images,Parts,"
"Part,Programs\" scope."));
}
}
void
tools_console_update(Eina_Bool on)
{

1
src/include/tools.h
View File

@ -9,6 +9,7 @@ void tools_file_browser_update(Eina_Bool toggle);
void tools_edc_navigator_update(Eina_Bool toggle);
void tools_goto_update(void);
void tools_search_update(void);
void tools_template_insert(void);
void tools_live_update(Eina_Bool on);
void tools_console_update(Eina_Bool on);
void tools_menu_update(Eina_Bool on);