From 94fb905d6570aa4f1b6c93ffe245435c71cf9b80 Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Thu, 26 Feb 2015 14:31:06 +0900 Subject: [PATCH] lib/edc_editor: add 2 more apis - redo, undo. --- data/themes/default/images/redo.png | Bin 0 -> 3209 bytes data/themes/default/images/undo.png | Bin 0 -> 3203 bytes src/lib/edc_editor.c | 48 +++++++++++----------------- src/lib/enventor_object.eo | 21 ++++++++++-- src/lib/enventor_private.h | 1 + src/lib/enventor_smart.c | 11 +++++++ 6 files changed, 50 insertions(+), 31 deletions(-) create mode 100755 data/themes/default/images/redo.png create mode 100755 data/themes/default/images/undo.png diff --git a/data/themes/default/images/redo.png b/data/themes/default/images/redo.png new file mode 100755 index 0000000000000000000000000000000000000000..38624f787da3d2fd3424f90dfa32140d5f0db9df GIT binary patch literal 3209 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 literal 0 HcmV?d00001 diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c index e206a4b..0896f0f 100644 --- a/src/lib/edc_editor.c +++ b/src/lib/edc_editor.c @@ -643,35 +643,6 @@ syntax_color_full_update(edit_data *ed, Eina_Bool thread) } } -static void -edit_redoundo(edit_data *ed, Eina_Bool undo) -{ - int lines; - Eina_Bool changed; - - if (undo) lines = redoundo_undo(ed->rd, &changed); - else lines = redoundo_redo(ed->rd, &changed); - if (!changed) - { -#if 0 - if (undo) stats_info_msg_update("No text to be undo."); - else stats_info_msg_update("No text to be redo."); -#endif - return; - } - -#if 0 - if (undo) stats_info_msg_update("Undo text."); - else stats_info_msg_update("Redo text."); -#endif - - if (lines > 0) edit_line_increase(ed, lines); - else edit_line_decrease(ed, abs(lines)); - - edit_changed_set(ed, EINA_TRUE); - syntax_color_full_update(ed, EINA_TRUE); -} - static Eina_Bool key_down_cb(void *data, int type EINA_UNUSED, void *ev) { @@ -1360,3 +1331,22 @@ edit_ctxpopup_dismiss(edit_data *ed) { if (ed->ctxpopup) elm_ctxpopup_dismiss(ed->ctxpopup); } + +Eina_Bool +edit_redoundo(edit_data *ed, Eina_Bool undo) +{ + int lines; + Eina_Bool changed; + + if (undo) lines = redoundo_undo(ed->rd, &changed); + else lines = redoundo_redo(ed->rd, &changed); + if (!changed) return EINA_FALSE; + + if (lines > 0) edit_line_increase(ed, lines); + else edit_line_decrease(ed, abs(lines)); + + edit_changed_set(ed, EINA_TRUE); + syntax_color_full_update(ed, EINA_TRUE); + + return EINA_TRUE; +} diff --git a/src/lib/enventor_object.eo b/src/lib/enventor_object.eo index e924e42..0f0e66c 100644 --- a/src/lib/enventor_object.eo +++ b/src/lib/enventor_object.eo @@ -463,7 +463,24 @@ class Enventor.Object (Elm_Widget, Efl.File) { @in Evas_Coord *h; /*@ ... */ } } - + redo { + /*@ + @brief + @return + @warning + @see + @ingroup Enventor */ + return: Eina_Bool; + } + undo { + /*@ + @brief + @return + @warning + @see + @ingroup Enventor */ + return: Eina_Bool; + } } implements { class.constructor; @@ -491,6 +508,6 @@ class Enventor.Object (Elm_Widget, Efl.File) { ctxpopup,selected; ctxpopup,dismissed; edc,modified; - focused; + focused; } } diff --git a/src/lib/enventor_private.h b/src/lib/enventor_private.h index 11eb855..ef50ad4 100644 --- a/src/lib/enventor_private.h +++ b/src/lib/enventor_private.h @@ -236,5 +236,6 @@ Eina_Bool edit_ctxpopup_visible_get(edit_data *ed); void edit_ctxpopup_dismiss(edit_data *ed); Eina_Bool edit_load(edit_data *ed, const char *edc_path); void edit_selection_clear(edit_data *ed); +Eina_Bool edit_redoundo(edit_data *ed, Eina_Bool undo); #endif diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c index dc65a79..2785f63 100644 --- a/src/lib/enventor_smart.c +++ b/src/lib/enventor_smart.c @@ -564,6 +564,17 @@ _enventor_object_disabled_set(Eo *obj EINA_UNUSED, edit_disabled_set(pd->ed, disabled); } +EOLIAN static Eina_Bool +_enventor_object_redo(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd) +{ + return edit_redoundo(pd->ed, EINA_FALSE); +} + +EOLIAN static Eina_Bool +_enventor_object_undo(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd) +{ + return edit_redoundo(pd->ed, EINA_TRUE); +} /*****************************************************************************/ /* Externally accessible calls */