[EGIT] [core/elementary] master 02/02: Genlist: add homogeneos mode to the tree test
davemds pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=7217133861bc380e63475f5756663cb462d1d94b commit 7217133861bc380e63475f5756663cb462d1d94b Author: Dave AndreoliDate: Tue Sep 1 20:08:42 2015 +0200 Genlist: add homogeneos mode to the tree test show tree+homogeneous brackage, as explained in T2708 --- src/bin/test_genlist.c | 63 ++ 1 file changed, 38 insertions(+), 25 deletions(-) diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c index a4ff096..e32c58b 100644 --- a/src/bin/test_genlist.c +++ b/src/bin/test_genlist.c @@ -1343,7 +1343,7 @@ gl4_exp(void *data, Evas_Object *obj EINA_UNUSED, void *event_info) int i = 0; val *= 10; - for (i = 0; i < 10; i++) + for (i = 0; i < 30; i++) { elm_genlist_item_append(gl, api->itc2, (void *)(uintptr_t) (val + i)/* item data */, @@ -1430,21 +1430,21 @@ gl4_del(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED) } static void -_tree_effect_enable_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_tree_effect_changed_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) { - elm_genlist_tree_effect_enabled_set(data, EINA_TRUE); + elm_genlist_tree_effect_enabled_set(data, elm_check_state_get(obj)); } static void -_tree_effect_disable_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) +_tree_homogeneous_changed_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) { - elm_genlist_tree_effect_enabled_set(data, EINA_FALSE); + elm_genlist_homogeneous_set(data, elm_check_state_get(obj)); } void test_genlist6(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { - Evas_Object *win, *gl, *bx, *fr, *bx2, *rd1, *rd2; + Evas_Object *win, *gl, *bx, *fr, *bx2, *ck1, *ck2; api_data *api = calloc(1, sizeof(api_data)); win = elm_win_util_standard_add("genlist-tree", "Genlist Tree"); @@ -1457,7 +1457,9 @@ test_genlist6(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ evas_object_show(bx); fr = elm_frame_add(win); - elm_object_text_set(fr, "Genlist Tree Effect"); + evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, 0.0); + evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, 0.0); + elm_object_text_set(fr, "Genlist Tree Options"); elm_box_pack_end(bx, fr); evas_object_show(fr); @@ -1469,25 +1471,21 @@ test_genlist6(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ elm_object_content_set(fr, bx2); evas_object_show(bx2); - rd1 = elm_radio_add(win); - elm_radio_state_value_set(rd1, 0); - elm_object_text_set(rd1, "Enable"); - evas_object_show(rd1); - elm_box_pack_end(bx2, rd1); + ck1 = elm_check_add(win); + elm_object_text_set(ck1, "Tree Effect"); + evas_object_show(ck1); + elm_box_pack_end(bx2, ck1); - rd2 = elm_radio_add(win); - elm_radio_state_value_set(rd2, 1); - elm_radio_group_add(rd1, rd2); - elm_object_text_set(rd2, "Disable"); - evas_object_show(rd2); - elm_box_pack_end(bx2, rd2); + ck2 = elm_check_add(win); + elm_object_text_set(ck2, "Homogeneous"); + evas_object_show(ck2); + elm_box_pack_end(bx2, ck2); gl = elm_genlist_add(win); evas_object_size_hint_align_set(gl, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(gl, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); api->gl = gl; evas_object_show(gl); - elm_genlist_tree_effect_enabled_set(gl, EINA_TRUE); evas_object_smart_callback_add(gl, "edge,left", scroll_left, NULL); evas_object_smart_callback_add(gl, "edge,right", scroll_right, NULL); evas_object_smart_callback_add(gl, "edge,top", scroll_top, NULL); @@ -1508,13 +1506,16 @@ test_genlist6(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ api->itc2->func.del = gl4_del; elm_genlist_item_append(gl, api->itc2, - (void *)1/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_TREE, gl4_sel/* func */, + (void *)1/* item data */, NULL/* parent */, + ELM_GENLIST_ITEM_TREE, gl4_sel/* func */, NULL/* func data */); elm_genlist_item_append(gl, api->itc2, - (void *)2/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_TREE, gl4_sel/* func */, + (void *)2/* item data */, NULL/* parent */, + ELM_GENLIST_ITEM_TREE, gl4_sel/* func */, NULL/* func data */); elm_genlist_item_append(gl, api->itc1, - (void *)3/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_NONE, gl4_sel/* func */, + (void *)3/* item data */, NULL/* parent */, + ELM_GENLIST_ITEM_NONE, gl4_sel/*
[EGIT] [core/elementary] master 01/02: Genlist test: cosmetics
davemds pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=624e0b1209cf8767573aadccb6e61c685ca1bdb4 commit 624e0b1209cf8767573aadccb6e61c685ca1bdb4 Author: Dave AndreoliDate: Tue Sep 1 19:34:43 2015 +0200 Genlist test: cosmetics * add separator comments between different tests * keep function definitions on 2 lines --- src/bin/test_genlist.c | 146 ++--- 1 file changed, 91 insertions(+), 55 deletions(-) diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c index d202b37..a4ff096 100644 --- a/src/bin/test_genlist.c +++ b/src/bin/test_genlist.c @@ -238,6 +238,8 @@ _move(void *data, Evas *evas EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ev INF("<%s> over none, where %i\n", __func__,where); } + +/*** Genlist ***/ static void _bt50_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { @@ -391,8 +393,8 @@ test_genlist(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i evas_object_show(win); } -/*/ +/*** Genlist 2 */ static void my_gl_clear(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) { @@ -773,8 +775,10 @@ test_genlist2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ evas_object_show(win); } -/*/ -char *gl2_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EINA_UNUSED) + +/*** Genlist 3 */ +char * +gl2_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EINA_UNUSED) { const Testitem *tit = data; char buf[256]; @@ -782,7 +786,8 @@ char *gl2_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EI return strdup(buf); } -Evas_Object *gl2_content_get(void *data, Evas_Object *obj, const char *part) +Evas_Object * +gl2_content_get(void *data, Evas_Object *obj, const char *part) { const Testitem *tit = data; char buf[PATH_MAX]; @@ -815,7 +820,8 @@ Evas_Object *gl2_content_get(void *data, Evas_Object *obj, const char *part) return ic; } -Eina_Bool gl2_state_get(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *part EINA_UNUSED) +Eina_Bool +gl2_state_get(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *part EINA_UNUSED) { return EINA_FALSE; } @@ -926,8 +932,8 @@ test_genlist3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ evas_object_show(win); } -/*/ +/*** Genlist 4 */ static void my_gl_item_check_changed(void *data, Evas_Object *obj, void *event_info EINA_UNUSED) { @@ -936,7 +942,8 @@ my_gl_item_check_changed(void *data, Evas_Object *obj, void *event_info EINA_UNU printf("item %p onoff = %i\n", tit, tit->onoff); } -char *gl3_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EINA_UNUSED) +char * +gl3_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EINA_UNUSED) { const Testitem *tit = data; char buf[256]; @@ -944,7 +951,8 @@ char *gl3_text_get(void *data, Evas_Object *obj EINA_UNUSED, const char *part EI return strdup(buf); } -Evas_Object *gl3_content_get(void *data, Evas_Object *obj, const char *part) +Evas_Object * +gl3_content_get(void *data, Evas_Object *obj, const char *part) { const Testitem *tit = data; if (!strcmp(part, "elm.swallow.icon")) @@ -969,12 +977,14 @@ Evas_Object *gl3_content_get(void *data, Evas_Object *obj, const char *part) return NULL; } -Eina_Bool gl3_state_get(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *part EINA_UNUSED) +Eina_Bool +gl3_state_get(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *part EINA_UNUSED) { return EINA_FALSE; } -static void _realized(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ei) +static void +_realized(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *ei) { Evas_Object *check; Eina_List *items; @@ -1026,15 +1036,18 @@ test_genlist4(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_ tit[0].mode = 0; tit[0].item = elm_genlist_item_append(gl, api->itc1, - &(tit[0])/* item data */, NULL/* parent */, ELM_GENLIST_ITEM_NONE, gl_sel/* func */, + &(tit[0])/* item data */, NULL/* parent */, + ELM_GENLIST_ITEM_NONE, gl_sel/* func */, NULL/* func data */); tit[1].mode = 1; tit[1].item = elm_genlist_item_append(gl, api->itc1, - &(tit[1])/* item data */, NULL/* parent */,
[EGIT] [core/efl] master 01/01: evas clip: add warning msg for wrong scenario.
hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ea442da9eda4635a259be7e920a6febbb49c3bd8 commit ea442da9eda4635a259be7e920a6febbb49c3bd8 Author: ChunEon ParkDate: Tue Sep 1 16:32:46 2015 +0900 evas clip: add warning msg for wrong scenario. --- src/lib/evas/canvas/evas_clip.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/evas/canvas/evas_clip.c b/src/lib/evas/canvas/evas_clip.c index e560a78..874beb8 100644 --- a/src/lib/evas/canvas/evas_clip.c +++ b/src/lib/evas/canvas/evas_clip.c @@ -289,6 +289,8 @@ _evas_object_clip_set(Eo *eo_obj, Evas_Object_Protected_Data *obj, Evas_Object * EINA_COW_STATE_WRITE_BEGIN(obj->cur->clipper, state_write, cur) { state_write->have_clipees = 0; + if (obj->cur->clipper->is_static_clip) +WRN("You override static clipper, it may be dangled! obj(%p) type(%s) new clip(%p)", eo_obj, obj->type, eo_clip); } EINA_COW_STATE_WRITE_END(obj->cur->clipper, state_write, cur); /* i know this was to handle a case where a clip stops having children and --
[EGIT] [apps/terminology] master 01/01: fix copy/paste bug. CID1316546
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=22ae02127b3c9ef11ccfe27fd4022586a10cb07f commit 22ae02127b3c9ef11ccfe27fd4022586a10cb07f Author: Boris FaureDate: Tue Sep 1 23:44:39 2015 +0200 fix copy/paste bug. CID1316546 --- src/bin/termio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/termio.c b/src/bin/termio.c index 42f5502..4357e42 100644 --- a/src/bin/termio.c +++ b/src/bin/termio.c @@ -2849,7 +2849,7 @@ _trim_sel_word(Termio *sd) ((y == pty->selection.end.y) && (start >= pty->selection.end.x))) { -pty->selection.start.y = pty->selection.start.y; +pty->selection.start.y = pty->selection.end.y; pty->selection.start.x = pty->selection.end.x; return; } --
[EGIT] [core/efl] master 02/02: evas:textgrid: correctly check malloc failures
billiob pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1df1b23e21a9afdd8d761c68719c2e079c39bc2c commit 1df1b23e21a9afdd8d761c68719c2e079c39bc2c Author: Boris FaureDate: Fri Mar 20 16:14:50 2015 +0100 evas:textgrid: correctly check malloc failures --- src/lib/evas/canvas/evas_object_textgrid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c index 2aee309..0e10f3c 100644 --- a/src/lib/evas/canvas/evas_object_textgrid.c +++ b/src/lib/evas/canvas/evas_object_textgrid.c @@ -220,7 +220,7 @@ evas_object_textgrid_textprop_ref(Evas_Object *eo_obj, Evas_Textgrid_Data *o, Ei o->master_used = calloc(6, sizeof (unsigned char)); o->glyphs = calloc(1, sizeof (Evas_Textgrid_Hash_Glyphs)); o->glyphs_used = calloc(1, sizeof (unsigned char)); -if (!o->master_used) +if (!o->master || !o->master_used || !o->glyphs || !o->glyphs_used) { free(o->master); o->master = NULL; --
[EGIT] [core/efl] master 01/02: evas:textgrid: rename text_props to text_props_index
billiob pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=7a7d3c4022d1811feac755b128d6824899d0c7b1 commit 7a7d3c4022d1811feac755b128d6824899d0c7b1 Author: Boris FaureDate: Fri Mar 20 15:48:08 2015 +0100 evas:textgrid: rename text_props to text_props_index --- src/lib/evas/canvas/evas_object_textgrid.c | 43 ++ 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_textgrid.c b/src/lib/evas/canvas/evas_object_textgrid.c index 47528d7..2aee309 100644 --- a/src/lib/evas/canvas/evas_object_textgrid.c +++ b/src/lib/evas/canvas/evas_object_textgrid.c @@ -101,7 +101,7 @@ struct _Evas_Object_Textgrid_Text { unsigned char r, g, b, a; int x; - unsigned int text_props; + unsigned int text_props_index; }; struct _Evas_Object_Textgrid_Line @@ -330,12 +330,19 @@ evas_object_textgrid_textprop_ref(Evas_Object *eo_obj, Evas_Textgrid_Data *o, Ei &(o->glyphs_used[glyphs_index])); } +static Evas_Text_Props * +_textprop_from_idx(Evas_Textgrid_Data *o, unsigned int props_index) +{ + return &(o->glyphs[props_index >> 8].props[props_index & 0xFF]); +} + + static void evas_object_textgrid_textprop_unref(Evas_Textgrid_Data *o, unsigned int props_index) { Evas_Text_Props *props; - props = &(o->glyphs[props_index >> 8].props[props_index & 0xFF]); + props = _textprop_from_idx(o, props_index); if (props->info) { @@ -349,12 +356,6 @@ evas_object_textgrid_textprop_unref(Evas_Textgrid_Data *o, unsigned int props_in } } -static Evas_Text_Props * -evas_object_textgrid_textprop_int_to(Evas_Textgrid_Data *o, int props) -{ - return &(o->glyphs[props >> 8].props[props & 0xFF]); -} - /* all nice and private */ static void evas_object_textgrid_init(Evas_Object *eo_obj) @@ -388,10 +389,10 @@ evas_object_textgrid_row_clear(Evas_Textgrid_Data *o, Evas_Object_Textgrid_Row * if (r->texts) { for (i = 0; i < r->texts_num; i++) - if (r->texts[i].text_props != 0x) + if (r->texts[i].text_props_index != 0x) { - evas_object_textgrid_textprop_unref(o, r->texts[i].text_props); - r->texts[i].text_props = 0x; + evas_object_textgrid_textprop_unref(o, r->texts[i].text_props_index); + r->texts[i].text_props_index = 0x; } free(r->texts); r->texts = NULL; @@ -528,7 +529,7 @@ evas_object_textgrid_row_text_append(Evas_Object_Textgrid_Row *row, Evas_Object text_props_index = evas_object_textgrid_textprop_ref(eo_obj, o, codepoint); - row->texts[row->texts_num - 1].text_props = text_props_index; + row->texts[row->texts_num - 1].text_props_index = text_props_index; row->texts[row->texts_num - 1].x = x; row->texts[row->texts_num - 1].r = r; row->texts[row->texts_num - 1].g = g; @@ -725,11 +726,9 @@ evas_object_textgrid_render(Evas_Object *eo_obj, for (xx = 0; xx < row->texts_num; xx++) { - Evas_Text_Props *props; + Evas_Text_Props *props; - props = - evas_object_textgrid_textprop_int_to - (o, row->texts[xx].text_props); + props = _textprop_from_idx(o, row->texts[xx].text_props_index); evas_common_font_draw_prepare(props); @@ -770,9 +769,7 @@ evas_object_textgrid_render(Evas_Object *eo_obj, int tx = xp + row->texts[xx].x; int ty = yp + o->ascent; - props = - evas_object_textgrid_textprop_int_to - (o, row->texts[xx].text_props); + props = _textprop_from_idx(o, row->texts[xx].text_props_index); r = row->texts[xx].r; g = row->texts[xx].g; @@ -969,8 +966,8 @@ evas_object_textgrid_render_post(Evas_Object *eo_obj, unsigned int props_index; props_index = (unsigned int) (intptr_t) eina_array_pop(>glyphs_cleanup); -prop = &(o->glyphs[props_index >> 8].props[props_index & 0xFF]); - +prop = _textprop_from_idx(o, props_index); + evas_common_text_props_content_nofree_unref(prop); if (!prop->info) { @@ -1268,8 +1265,8 @@ _evas_textgrid_efl_text_properties_font_set(Eo *eo_obj, Evas_Textgrid_Data *o, c unsigned int props_index; props_index = (unsigned int) (intptr_t) eina_array_pop(>glyphs_cleanup); -prop = &(o->glyphs[props_index >> 8].props[props_index & 0xFF]); - +prop = _textprop_from_idx(o, props_index); + evas_common_text_props_content_nofree_unref(prop); if (!prop->info) { --
[EGIT] [core/elementary] elementary-1.15 01/01: FileSelector: fix behaviour when the file is chosen
jackdanielz pushed a commit to branch elementary-1.15. http://git.enlightenment.org/core/elementary.git/commit/?id=071c91dde45d766b1ab22632bd64cc010fd4c5bc commit 071c91dde45d766b1ab22632bd64cc010fd4c5bc Author: Daniel ZaouiDate: Tue Sep 1 11:16:58 2015 +0300 FileSelector: fix behaviour when the file is chosen The wrong event was sent on the Ok file selector button when the file is chosen, leading to not update the upper layer. @fix --- src/lib/elc_fileselector_entry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c index a94b44e..8b5e889 100644 --- a/src/lib/elc_fileselector_entry.c +++ b/src/lib/elc_fileselector_entry.c @@ -297,7 +297,7 @@ _elm_fileselector_entry_evas_object_smart_add(Eo *obj, Elm_Fileselector_Entry_Da eo_do(priv->button, eo_event_callback_add(event, _##name##_fwd, obj)) SIG_FWD(CLICKED, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED); SIG_FWD(UNPRESSED, EVAS_CLICKABLE_INTERFACE_EVENT_UNPRESSED); - SIG_FWD(FILE_CHOSEN, ELM_FILESELECTOR_ENTRY_EVENT_FILE_CHOSEN); + SIG_FWD(FILE_CHOSEN, ELM_FILESELECTOR_BUTTON_EVENT_FILE_CHOSEN); #undef SIG_FWD priv->entry = elm_entry_add(obj); --
[EGIT] [core/elementary] master 01/01: FileSelector: fix behaviour when the file is chosen
jackdanielz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=a5c3589ac324c945f62d64f6c7064b0b253a93d0 commit a5c3589ac324c945f62d64f6c7064b0b253a93d0 Author: Daniel ZaouiDate: Tue Sep 1 11:16:58 2015 +0300 FileSelector: fix behaviour when the file is chosen The wrong event was sent on the Ok file selector button when the file is chosen, leading to not update the upper layer. @fix --- src/lib/elc_fileselector_entry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elc_fileselector_entry.c b/src/lib/elc_fileselector_entry.c index a94b44e..8b5e889 100644 --- a/src/lib/elc_fileselector_entry.c +++ b/src/lib/elc_fileselector_entry.c @@ -297,7 +297,7 @@ _elm_fileselector_entry_evas_object_smart_add(Eo *obj, Elm_Fileselector_Entry_Da eo_do(priv->button, eo_event_callback_add(event, _##name##_fwd, obj)) SIG_FWD(CLICKED, EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED); SIG_FWD(UNPRESSED, EVAS_CLICKABLE_INTERFACE_EVENT_UNPRESSED); - SIG_FWD(FILE_CHOSEN, ELM_FILESELECTOR_ENTRY_EVENT_FILE_CHOSEN); + SIG_FWD(FILE_CHOSEN, ELM_FILESELECTOR_BUTTON_EVENT_FILE_CHOSEN); #undef SIG_FWD priv->entry = elm_entry_add(obj); --
[EGIT] [core/enlightenment] master 01/01: e mixer - discovered bug as a lack of feature - does not remember volume
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=f18d9258fcbaed3305d47797941e65b8c72ad66d commit f18d9258fcbaed3305d47797941e65b8c72ad66d Author: Carsten Haitzler (Rasterman)Date: Wed Sep 2 12:49:42 2015 +0900 e mixer - discovered bug as a lack of feature - does not remember volume i have never seen this before until last night. on some systems audio starts up volume 0 and muted (either or) and thus on login the volume is not where you left it and you have to manually fix it every time. this fixes this by having mixer remember the last volume and mute state you set (option to enable/disable too) and handles "upgrading" to remember by default if you have old config @feature / @fix --- src/modules/mixer/e_mod_config.c | 65 src/modules/mixer/e_mod_config.h | 8 + src/modules/mixer/e_mod_main.c | 21 - 3 files changed, 93 insertions(+), 1 deletion(-) diff --git a/src/modules/mixer/e_mod_config.c b/src/modules/mixer/e_mod_config.c index 057b59a..bd8be04 100644 --- a/src/modules/mixer/e_mod_config.c +++ b/src/modules/mixer/e_mod_config.c @@ -9,6 +9,10 @@ typedef struct _Emix_Config int notify; int mute; + int save; + int save_mute; + int save_volume; + emix_config_backend_changed cb; const void *userdata; } Emix_Config; @@ -31,6 +35,10 @@ _emix_config_dd_new(void) E_CONFIG_VAL(result, Emix_Config, notify, INT); E_CONFIG_VAL(result, Emix_Config, mute, INT); + E_CONFIG_VAL(result, Emix_Config, save, INT); + E_CONFIG_VAL(result, Emix_Config, save_mute, INT); + E_CONFIG_VAL(result, Emix_Config, save_volume, INT); + return result; } @@ -68,6 +76,9 @@ _config_set(Emix_Config *config) _config->notify = config->notify; _config->mute = config->mute; + if (config->save == 0) _config->save = -1; + else if (config->save == 1) _config->save = 1; + DBG("SAVING CONFIG %s %d %d", _config->backend, config->notify, config->mute); e_config_domain_save("module.emix", cd, config); @@ -89,6 +100,13 @@ emix_config_init(emix_config_backend_changed cb, const void *userdata) _config->backend = eina_stringshare_add(l->data); } + if (_config->save == 0) + { +_config->save = 1; +_config->save_mute = 0; +_config->save_volume = 100; + } + _config->cb = cb; _config->userdata = userdata; DBG("Config loaded, backend to use: %s", _config->backend); @@ -104,6 +122,46 @@ emix_config_shutdown(void) emix_shutdown(); } +void +emix_config_save(void) +{ + if ((_config) && (cd)) + e_config_domain_save("module.emix", cd, _config); +} + +Eina_Bool +emix_config_save_get(void) +{ + if (_config->save == 1) return EINA_TRUE; + return EINA_FALSE; +} + +Eina_Bool +emix_config_save_mute_get(void) +{ + return _config->save_mute; +} + +void +emix_config_save_mute_set(Eina_Bool mute) +{ + _config->save_mute = mute; + if (_config->save == 1) e_config_save_queue(); +} + +int +emix_config_save_volume_get(void) +{ + return _config->save_volume; +} + +void +emix_config_save_volume_set(int volume) +{ + _config->save_volume = volume; + if (_config->save == 1) e_config_save_queue(); +} + static void* _create_data(E_Config_Dialog *cfg EINA_UNUSED) { @@ -114,6 +172,10 @@ _create_data(E_Config_Dialog *cfg EINA_UNUSED) d->config.notify = _config->notify; d->config.mute = _config->mute; + if (_config->save == -1) d->config.save = 0; + else if (_config->save == 1) d->config.save = 1; + else d->config.save = 1; + return d; } @@ -141,6 +203,9 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, l = e_widget_check_add(evas, "Mute on lock", >config.mute); e_widget_list_object_append(o, l, 0, 0, 0); + l = e_widget_check_add(evas, "Remember", >config.save); + e_widget_list_object_append(o, l, 0, 0, 0); + l = e_widget_label_add(evas, "Backend to use:"); e_widget_list_object_append(o, l, 0, 0, 0); diff --git a/src/modules/mixer/e_mod_config.h b/src/modules/mixer/e_mod_config.h index c725753..8630c02 100644 --- a/src/modules/mixer/e_mod_config.h +++ b/src/modules/mixer/e_mod_config.h @@ -8,6 +8,14 @@ typedef void (*emix_config_meter_changed)(Eina_Bool enable, void *data); void emix_config_init(emix_config_backend_changed cb, const void *userdata); void emix_config_shutdown(void); +void emix_config_save(void); + +Eina_Bool emix_config_save_get(void); +Eina_Bool emix_config_save_mute_get(void); +void emix_config_save_mute_set(Eina_Bool mute); +int emix_config_save_volume_get(void); +void emix_config_save_volume_set(int volume); + const char *emix_config_backend_get(void); void emix_config_backend_set(const char *backend); Eina_Bool emix_config_desklock_mute_get(void); diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c index
[EGIT] [core/enlightenment] master 01/01: e - mixer - fix leak when seting volume
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=bdcbf06b0f9532fd0d3bade6b5c36b374ac49804 commit bdcbf06b0f9532fd0d3bade6b5c36b374ac49804 Author: Carsten Haitzler (Rasterman)Date: Wed Sep 2 00:03:57 2015 +0900 e - mixer - fix leak when seting volume fixes a lieak i spotted in mixer after moving to epulse core. fix for e20 --- src/modules/mixer/e_mod_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/mixer/e_mod_main.c b/src/modules/mixer/e_mod_main.c index ea204db..abb3481 100644 --- a/src/modules/mixer/e_mod_main.c +++ b/src/modules/mixer/e_mod_main.c @@ -364,6 +364,7 @@ _slider_changed_cb(void *data EINA_UNUSED, Evas_Object *obj, for (i = 0; i < s->volume.channel_count; i++) v.volumes[i] = val; emix_sink_volume_set(s, v); elm_slider_value_set(obj, val); + free(v.volumes); } static void --
[EGIT] [admin/devs] master 01/01: Switch to EdDSA
okra pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=f1b357c62f139f08e78b8150582c0f6f11b46f24 commit f1b357c62f139f08e78b8150582c0f6f11b46f24 Author: Stephen HoustonDate: Tue Sep 1 09:07:12 2015 -0500 Switch to EdDSA --- developers/okra/id_ed25519.pub | 1 + developers/okra/id_rsa.pub | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/developers/okra/id_ed25519.pub b/developers/okra/id_ed25519.pub new file mode 100644 index 000..2f85766 --- /dev/null +++ b/developers/okra/id_ed25519.pub @@ -0,0 +1 @@ +ssh-ed25519 C3NzaC1lZDI1NTE5IFFuNoS3JJmHO7vd51qaxUp1NDL/ujNa+VjITEF5+s8p osauser@shouston-linux diff --git a/developers/okra/id_rsa.pub b/developers/okra/id_rsa.pub deleted file mode 100644 index ed623f4..000 --- a/developers/okra/id_rsa.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa B3NzaC1yc2EBIwAAAQEArxM+KMScbUUHvCQDCgrD0a6WpZrt4cjhYv4n9HxYY3BmMzhMer3oWvS7tPyh6aK3KhOEZ0pChT+WB1KmAGprbrL3ePHjWRTfp9pUwZycFytwa7vjzQoF9tKBUCU+mfcBtwsEdTIGKMWe2Od+E+/BJhZ2iMpmHLHhTlZFEcdDVtetXaEfdccyYgxBC9ToLzbdy7D+z5gF6Gu429VOITWroOBQN5kir7Duv4s2LVYIrheNKYc/wcn6qclrk/RRvLstoxx5DN+bV34vmgQ7AK2sFB0o91d0L+Q2mNk20ojOHJHUpOFdNZYAMzTvrJ7pDMBhuOP3UJeCW8TLZdtImgD2Aw== okra@localhost --