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

content: move statusbar into edi_content. 

sorry!!!
This commit is contained in:
Al Poole 2018-03-17 19:08:09 +00:00
parent fa03323a20
commit 461058bb8a
4 changed files with 124 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
src/bin/edi_content.c
View File

@ -2,6 +2,7 @@
# include "config.h"
#endif
#include "language/edi_language_provider.h"
#include "editor/edi_editor.h"
#include "edi_content.h"
@ -78,8 +79,114 @@ edi_content_image_add(Evas_Object *parent, Edi_Mainview_Item *item)
editor = calloc(1, sizeof(*editor));
editor->mimetype = item->mimetype;
edi_editor_statusbar_add(statusbar, editor, item);
edi_content_statusbar_add(statusbar, editor, item);
return vbox;
}
static void
_edit_cursor_moved(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
{
Elm_Code_Widget *widget;
char buf[30];
unsigned int line;
unsigned int col;
widget = (Elm_Code_Widget *)obj;
if (widget)
{
elm_code_widget_cursor_position_get(widget, &line, &col);
}
else
{
line = 0; col = 0;
}
snprintf(buf, sizeof(buf), _("Line:%6d, Column:%4d"), line, col);
elm_object_text_set((Evas_Object *)data, buf);
}
void
edi_content_statusbar_add(Evas_Object *panel, Edi_Editor *editor, Edi_Mainview_Item *item)
{
Edi_Language_Provider *provider;
Evas_Object *table, *rect, *tb, *position, *mime;
Elm_Code *code;
char text[256];
const char *format, *spaces = " ";
elm_box_horizontal_set(panel, EINA_TRUE);
table = elm_table_add(panel);
evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_show(table);
elm_box_pack_end(panel, table);
code = elm_code_widget_code_get(editor->entry);
if (code)
{
if (elm_code_file_line_ending_get(code->file) == ELM_CODE_FILE_LINE_ENDING_WINDOWS)
format = "WIN";
else
format = "UNIX";
}
else
{
format = "";
}
mime = elm_entry_add(panel);
elm_entry_editable_set(mime, EINA_FALSE);
elm_entry_scrollable_set(mime, EINA_FALSE);
elm_entry_single_line_set(mime, EINA_TRUE);
if (item->mimetype)
{
provider = edi_language_provider_get(editor);
if (provider && provider->mime_name(item->mimetype))
{
snprintf(text, sizeof(text), "%s (%s)%s%s", provider->mime_name(item->mimetype), item->mimetype, spaces, format);
}
else
{
snprintf(text, sizeof(text), "%s%s%s", item->mimetype, spaces, format);
}
}
else
{
snprintf(text, sizeof(text), "%s%s%s", item->editortype, spaces, format);
}
elm_object_text_set(mime, text);
rect = evas_object_rectangle_add(panel);
evas_object_size_hint_weight_set(rect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(rect, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_move(rect, 0, 0);
evas_object_resize(rect, 220, 1);
evas_object_color_set(rect, 0, 0, 0, 0);
evas_object_show(rect);
tb = elm_entry_textblock_get(mime);
evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_resize(tb, 220, 1);
evas_object_show(tb);
elm_table_pack(table, tb, 0, 0, 1, 1);
elm_table_pack(table, rect, 0, 0, 1, 1);
position = elm_entry_add(panel);
elm_entry_single_line_set(position, EINA_TRUE);
elm_entry_text_style_user_push(position, "DEFAULT='font=Mono')");
elm_entry_editable_set(position, EINA_FALSE);
evas_object_size_hint_align_set(position, 1.0, 0.5);
evas_object_size_hint_weight_set(position, EVAS_HINT_EXPAND, 0.0);
elm_table_pack(table, position, 1, 0, 1, 1);
evas_object_show(position);
_edit_cursor_moved(position, editor->entry, NULL);
evas_object_smart_callback_add(editor->entry, "cursor,changed", _edit_cursor_moved, position);
}

12
src/bin/edi_content.h
View File

@ -5,6 +5,7 @@
extern "C" {
#endif
#include "editor/edi_editor.h"
#include "mainview/edi_mainview_item.h"
/**
@ -46,6 +47,17 @@ Evas_Object *edi_content_image_add(Evas_Object *parent, Edi_Mainview_Item *item)
*/
Evas_Object *edi_content_diff_add(Evas_Object *parent, Edi_Mainview_Item *item);
/**
* Add a statusbar to the panel for displaying statistics about loaded content.
*
* @param panel the panel in which the content resides and into which the statusbar is shown.
* @param editor the editor object.
* @param item the item containing information about the file's content.
*
* @ingroup Content
*/
void edi_content_statusbar_add(Evas_Object *panel, Edi_Editor *editor, Edi_Mainview_Item *item);
/**
* @}
*/

159
src/bin/editor/edi_editor.c
View File

@ -10,6 +10,7 @@
#include "edi_editor.h"
#include "mainview/edi_mainview.h"
#include "edi_content.h"
#include "edi_filepanel.h"
#include "edi_config.h"
#include "edi_theme.h"
@ -856,29 +857,6 @@ _smart_cb_key_down(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
}
}
static void
_edit_cursor_moved(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
{
Elm_Code_Widget *widget;
char buf[30];
unsigned int line;
unsigned int col;
widget = (Elm_Code_Widget *)obj;
if (widget)
{
elm_code_widget_cursor_position_get(widget, &line, &col);
}
else
{
line = 0; col = 0;
}
snprintf(buf, sizeof(buf), _("Line:%6d, Column:%4d"), line, col);
elm_object_text_set((Evas_Object *)data, buf);
}
static void
_edit_file_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
@ -913,89 +891,6 @@ _edit_file_changed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EI
free(word);
}
void
edi_editor_statusbar_add(Evas_Object *panel, Edi_Editor *editor, Edi_Mainview_Item *item)
{
Edi_Language_Provider *provider;
Evas_Object *table, *rect, *tb, *position, *mime;
Elm_Code *code;
char text[256];
const char *format, *spaces = " ";
elm_box_horizontal_set(panel, EINA_TRUE);
table = elm_table_add(panel);
evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_show(table);
elm_box_pack_end(panel, table);
code = elm_code_widget_code_get(editor->entry);
if (code)
{
if (elm_code_file_line_ending_get(code->file) == ELM_CODE_FILE_LINE_ENDING_WINDOWS)
format = "WIN";
else
format = "UNIX";
}
else
{
format = "";
}
mime = elm_entry_add(panel);
elm_entry_editable_set(mime, EINA_FALSE);
elm_entry_scrollable_set(mime, EINA_FALSE);
elm_entry_single_line_set(mime, EINA_TRUE);
if (item->mimetype)
{
provider = edi_language_provider_get(editor);
if (provider && provider->mime_name(item->mimetype))
{
snprintf(text, sizeof(text), "%s (%s)%s%s", provider->mime_name(item->mimetype), item->mimetype, spaces, format);
}
else
{
snprintf(text, sizeof(text), "%s%s%s", item->mimetype, spaces, format);
}
}
else
{
snprintf(text, sizeof(text), "%s%s%s", item->editortype, spaces, format);
}
elm_object_text_set(mime, text);
rect = evas_object_rectangle_add(panel);
evas_object_size_hint_weight_set(rect, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(rect, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_move(rect, 0, 0);
evas_object_resize(rect, 220, 1);
evas_object_color_set(rect, 0, 0, 0, 0);
evas_object_show(rect);
tb = elm_entry_textblock_get(mime);
evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(tb, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_resize(tb, 220, 1);
evas_object_show(tb);
elm_table_pack(table, tb, 0, 0, 1, 1);
elm_table_pack(table, rect, 0, 0, 1, 1);
position = elm_entry_add(panel);
elm_entry_single_line_set(position, EINA_TRUE);
elm_entry_text_style_user_push(position, "DEFAULT='font=Mono')");
elm_entry_editable_set(position, EINA_FALSE);
evas_object_size_hint_align_set(position, 1.0, 0.5);
evas_object_size_hint_weight_set(position, EVAS_HINT_EXPAND, 0.0);
elm_table_pack(table, position, 1, 0, 1, 1);
evas_object_show(position);
_edit_cursor_moved(position, editor->entry, NULL);
evas_object_smart_callback_add(editor->entry, "cursor,changed", _edit_cursor_moved, position);
evas_object_smart_callback_add(editor->entry, "changed,user", _edit_file_changed, editor);
}
#if HAVE_LIBCLANG
static void
@ -1398,54 +1293,6 @@ edi_editor_reload(Edi_Editor *editor)
ecore_thread_main_loop_end();
}
Evas_Object *
edi_editor_image_add(Evas_Object *parent, Edi_Mainview_Item *item)
{
Evas_Object *vbox, *box, *searchbar, *statusbar, *scroll, *img;
Edi_Editor *editor;
vbox = elm_box_add(parent);
evas_object_size_hint_weight_set(vbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(vbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(vbox);
searchbar = elm_box_add(vbox);
evas_object_size_hint_weight_set(searchbar, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(searchbar, EVAS_HINT_FILL, 0.0);
elm_box_pack_end(vbox, searchbar);
box = elm_box_add(vbox);
elm_box_horizontal_set(box, EINA_TRUE);
evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(vbox, box);
evas_object_show(box);
statusbar = elm_box_add(vbox);
evas_object_size_hint_weight_set(statusbar, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(statusbar, EVAS_HINT_FILL, 0.0);
elm_box_pack_end(vbox, statusbar);
evas_object_show(statusbar);
scroll = elm_scroller_add(parent);
evas_object_size_hint_weight_set(scroll, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(scroll, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(scroll);
img = elm_image_add(vbox);
elm_image_file_set(img, item->path, NULL);
elm_image_no_scale_set(img, EINA_TRUE);
elm_object_content_set(scroll, img);
evas_object_show(img);
elm_box_pack_end(box, scroll);
editor = calloc(1, sizeof(*editor));
editor->mimetype = item->mimetype;
edi_editor_statusbar_add(statusbar, editor, item);
return vbox;
}
Evas_Object *
edi_editor_add(Evas_Object *parent, Edi_Mainview_Item *item)
{
@ -1522,7 +1369,7 @@ edi_editor_add(Evas_Object *parent, Edi_Mainview_Item *item)
elm_box_pack_end(box, widget);
edi_editor_search_add(searchbar, editor);
edi_editor_statusbar_add(statusbar, editor, item);
edi_content_statusbar_add(statusbar, editor, item);
e = evas_object_evas_get(widget);
ctrl = evas_key_modifier_mask_get(e, "Control");
@ -1540,6 +1387,8 @@ edi_editor_add(Evas_Object *parent, Edi_Mainview_Item *item)
ev_handler = ecore_event_handler_add(EDI_EVENT_CONFIG_CHANGED, _edi_editor_config_changed, widget);
evas_object_event_callback_add(item->view, EVAS_CALLBACK_DEL, _editor_del_cb, ev_handler);
evas_object_smart_callback_add(editor->entry, "changed,user", _edit_file_changed, editor);
if (edi_language_provider_has(editor))
{
edi_language_provider_get(editor)->add(editor);

22
src/bin/editor/edi_editor.h
View File

@ -89,17 +89,6 @@ struct _Edi_Editor
*/
Evas_Object *edi_editor_add(Evas_Object *parent, Edi_Mainview_Item *item);
/**
* Initialise a new image canvas and add it to the parent panel.
*
* @param parent The panel into which the image panel will be loaded.
* @param item The item describing the image file to be loaded in the canvas.
* @return the created evas object that contains the image.
*
* @ingroup Editor
*/
Evas_Object *edi_editor_image_add(Evas_Object *parent, Edi_Mainview_Item *item);
/**
* Reload existing editor's content from disk.
*
@ -166,17 +155,6 @@ void edi_editor_doc_open(Edi_Editor *editor);
*/
void edi_editor_widget_config_get(Elm_Code_Widget *widget);
/**
* Add a statusbar to the panel for displaying statistics about loaded content.
*
* @param panel the panel in which the content resides and into which the statusbar is shown.
* @param editor the editor object.
* @param item the item containing information about the file's content.
*
* @ingroup Widgets
*/
void edi_editor_statusbar_add(Evas_Object *panel, Edi_Editor *editor, Edi_Mainview_Item *item);
/**
* @}
*/