hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=4276c9479e1c5d7a1168057ebcf8dcb3dfbb11aa
commit 4276c9479e1c5d7a1168057ebcf8dcb3dfbb11aa Author: Hermet Park <[email protected]> Date: Wed Jun 1 23:15:05 2016 +0900 config: set error-message-red-alert-effect configurable. that effect is up to user's preference. let user choose it enabled or not. --- src/bin/base_gui.c | 3 ++- src/bin/config_data.c | 18 ++++++++++++++++++ src/bin/preference_setting.c | 15 ++++++++++++--- src/include/common.h | 2 +- src/include/config_data.h | 2 ++ 5 files changed, 35 insertions(+), 5 deletions(-) diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c index 32bff9a..686993a 100644 --- a/src/bin/base_gui.c +++ b/src/bin/base_gui.c @@ -51,7 +51,8 @@ base_error_msg_set(const char *msg) { base_data *bd = g_bd; assert(bd); - elm_object_signal_emit(bd->layout, "elm,state,alert,show", ""); + if (config_red_alert_get()) + elm_object_signal_emit(bd->layout, "elm,state,alert,show", ""); console_text_set(bd->console, msg); panes_editors_full_view(EINA_FALSE); bd->console_msg = EINA_TRUE; diff --git a/src/bin/config_data.c b/src/bin/config_data.c index 69f8b00..a2789c8 100644 --- a/src/bin/config_data.c +++ b/src/bin/config_data.c @@ -43,6 +43,7 @@ typedef struct config_s Eina_Bool file_browser; Eina_Bool file_browser_loaded; Eina_Bool edc_navigator; + Eina_Bool red_alert; } config_data; static config_data *g_cd = NULL; @@ -193,6 +194,7 @@ config_load(void) cd->smart_undo_redo = EINA_FALSE; cd->file_browser = EINA_TRUE; cd->edc_navigator = EINA_TRUE; + cd->red_alert = EINA_TRUE; } g_cd = cd; @@ -317,6 +319,8 @@ eddc_init(void) file_browser, EET_T_UCHAR); EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "edc_navigator", edc_navigator, EET_T_UCHAR); + EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "red_alert", + red_alert, EET_T_UCHAR); } void @@ -938,6 +942,20 @@ config_tools_set(Eina_Bool enabled) } void +config_red_alert_set(Eina_Bool enabled) +{ + config_data *cd = g_cd; + cd->red_alert = enabled; +} + +Eina_Bool +config_red_alert_get(void) +{ + config_data *cd = g_cd; + return cd->red_alert; +} + +void config_file_browser_set(Eina_Bool enabled) { config_data *cd = g_cd; diff --git a/src/bin/preference_setting.c b/src/bin/preference_setting.c index 8458bb1..5cb479c 100644 --- a/src/bin/preference_setting.c +++ b/src/bin/preference_setting.c @@ -13,6 +13,7 @@ typedef struct preference_setting_s Evas_Object *toggle_indent; Evas_Object *toggle_autocomp; Evas_Object *toggle_smart_undo_redo; + Evas_Object *toggle_red_alert; } preference_setting_data; /*****************************************************************************/ @@ -73,6 +74,7 @@ preference_setting_config_set(preference_setting_data *psd) config_auto_indent_set(elm_check_state_get(psd->toggle_indent)); config_auto_complete_set(elm_check_state_get(psd->toggle_autocomp)); config_smart_undo_redo_set(elm_check_state_get(psd->toggle_smart_undo_redo)); + config_red_alert_set(elm_check_state_get(psd->toggle_red_alert)); Evas_Coord w = 0; Evas_Coord h = 0; @@ -94,6 +96,7 @@ preference_setting_reset(preference_setting_data *psd) elm_check_state_set(psd->toggle_autocomp, config_auto_complete_get()); elm_check_state_set(psd->toggle_smart_undo_redo, config_smart_undo_redo_get()); + elm_check_state_set(psd->toggle_red_alert, config_red_alert_get()); //Reset view scale int view_size_w, view_size_h; @@ -235,11 +238,16 @@ preference_setting_content_get(preference_setting_data *psd, //Toggle (Smart Undo/Redo) Evas_Object *toggle_smart_undo_redo = toggle_create(box, _("Smart Undo/Redo"), config_smart_undo_redo_get()); - evas_object_size_hint_weight_set(toggle_smart_undo_redo, EVAS_HINT_EXPAND, - EVAS_HINT_EXPAND); - evas_object_size_hint_align_set(toggle_smart_undo_redo, EVAS_HINT_FILL, 0); elm_box_pack_end(box, toggle_smart_undo_redo); + //Toggle (Red Alert) + Evas_Object *toggle_red_alert = toggle_create(box, _("Error Message Red Alert"), + config_red_alert_get()); + evas_object_size_hint_weight_set(toggle_red_alert, EVAS_HINT_EXPAND, + EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(toggle_red_alert, EVAS_HINT_FILL, 0); + elm_box_pack_end(box, toggle_red_alert); + psd->box = box; psd->view_size_w_entry = entry_view_size_w; psd->view_size_h_entry = entry_view_size_h; @@ -248,6 +256,7 @@ preference_setting_content_get(preference_setting_data *psd, psd->toggle_indent = toggle_indent; psd->toggle_autocomp = toggle_autocomp; psd->toggle_smart_undo_redo = toggle_smart_undo_redo; + psd->toggle_red_alert = toggle_red_alert; return box; } diff --git a/src/include/common.h b/src/include/common.h index c03d6e5..e976490 100644 --- a/src/include/common.h +++ b/src/include/common.h @@ -57,7 +57,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n" #define ROUNDING(x, dig) (floor((x) * pow(10, dig) + 0.5) / pow(10, dig)) -#define ENVENTOR_CONFIG_VERSION 9 +#define ENVENTOR_CONFIG_VERSION 10 #define EVENT_KEY_MODIFIER_CHECK(NAME, MASK) \ ((MASK & ECORE_EVENT_MODIFIER_##NAME) && \ diff --git a/src/include/config_data.h b/src/include/config_data.h index 59f97b7..fc677a3 100644 --- a/src/include/config_data.h +++ b/src/include/config_data.h @@ -65,3 +65,5 @@ void config_edc_navigator_set(Eina_Bool enabled); Eina_Bool config_edc_navigator_get(void); Eina_Bool config_mirror_mode_get(void); void config_mirror_mode_set(Eina_Bool mirror_mode); +void config_red_alert_set(Eina_Bool enabled); +Eina_Bool config_red_alert_get(void); --
