[EGIT] [tools/expedite] master 01/01: expedite: Add 1080p portrait resolution.

[Nicolas Aguirre]

captainigloo pushed a commit to branch master.

http://git.enlightenment.org/tools/expedite.git/commit/?id=58857a657c6e5303bcd36d9d83d29bc5d28efaa7

commit 58857a657c6e5303bcd36d9d83d29bc5d28efaa7
Author: Nicolas Aguirre 
Date:   Mon Nov 16 17:11:55 2015 +0100

expedite: Add 1080p portrait resolution.
---
 src/bin/main.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bin/main.c b/src/bin/main.c
index 98e8ee7..d879378 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -1164,6 +1164,7 @@ static const Expedite_Resolution resolutions[] = {
   { "720p",1280, 720 },
   { "1050p",   1680, 1050},
   { "1080p",   1920, 1080},
+  { "1080p-p", 1080, 1920},
   { "wsvga",   1024, 600 },
   { "wsvga-p", 600 , 1024},
   { "s9",  1600, 900 },

-- 

[EGIT] [tools/eflete] master 27/52: style_editor: change UI

[Mykola Solyanko]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=ad3e38c1efdb1efbe58e1be7db380248066b7da6

commit ad3e38c1efdb1efbe58e1be7db380248066b7da6
Author: Mykola Solyanko 
Date:   Tue Nov 10 18:13:12 2015 +0200

style_editor: change UI
---
 data/themes/default/widgets/layout.edc   | 110 +
 data/themes/default/widgets/layouts/tabs.edc | 211 
 src/bin/ui/editors/style_editor.c| 232 +++
 3 files changed, 486 insertions(+), 67 deletions(-)

diff --git a/data/themes/default/widgets/layout.edc 
b/data/themes/default/widgets/layout.edc
index 37b810b..2e6223f 100644
--- a/data/themes/default/widgets/layout.edc
+++ b/data/themes/default/widgets/layout.edc
@@ -371,6 +371,116 @@ group { name: "elm/layout/block/default";
}
 }
 
+group { name: "elm/layout/style_editor/font_list";
+   parts {
+  part { name: "label.font_list";
+ type: TEXT;
+ scale: 1;
+ description { state: "default" 0.0;
+align: 0.0 0.0;
+fixed: 1 1;
+color_class: "main";
+max: 232 19;
+text {
+   font: "PT";
+   size: 12;
+   align: 0.0 0.0;
+}
+ }
+  }
+  part { name: "swallow.button_rm";
+ type: SWALLOW;
+ description { state: "default" 0.0;
+align: 0.0 0.0;
+FIXED_SIZE(31, 21);
+rel1 {
+   to: "label.font_list";
+   relative: 1.0 0.0;
+}
+ }
+  }
+  part { name: "pad_between_but";
+ type: SPACER;
+ description { state: "default" 0.0;
+align: 0.0 0.0;
+FIXED_SIZE(6, 21);
+rel1 {
+   to: "swallow.button_rm";
+   relative: 1.0 0.0;
+}
+ }
+  }
+  part { name: "swallow.button_add";
+ type: SWALLOW;
+ description { state: "default" 0.0;
+align: 0.0 0.0;
+FIXED_SIZE(31, 21);
+rel1 {
+   to: "pad_between_but";
+   relative: 1.0 0.0;
+}
+ }
+  }
+  part { name: "pad_list";
+ type: SPACER;
+ description { state: "default" 0.0;
+align: 0.5 0.0;
+fixed: 0 1;
+max: -1 6;
+rel1 {
+   to: "label.font_list";
+   relative: 0.0 1.0;
+}
+ }
+  }
+  part { name: "pad_bottom";
+ type: SPACER;
+ description { state: "default" 0.0;
+align: 0.0 1.0;
+fixed: 1 1;
+max: -1 6;
+ }
+  }
+  part { name: "swallow.search";
+ type: SWALLOW;
+ description { state: "default" 0.0;
+align: 0.0 1.0;
+fixed: 1 1;
+max: -1 19;
+rel2 {
+   to: "pad_bottom";
+   relative: 1.0 0.0;
+}
+ }
+  }
+  part { name: "pad_list_between_search";
+ type: SPACER;
+ description { state: "default" 0.0;
+align: 0.0 1.0;
+fixed: 1 1;
+max: -1 6;
+rel2 {
+   to: "swallow.search";
+   relative: 1.0 0.0;
+}
+ }
+  }
+  part { name: "swallow.font_list";
+ type: SWALLOW;
+ description { state: "default" 0.0;
+rel1 {
+   to: "pad_list";
+   relative: 0.0 1.0;
+}
+rel2 {
+   to: "pad_list_between_search";
+   relative: 1.0 0.0;
+}
+ }
+  }
+   }
+}
+
 group { name: "elm/layout/navigator/default";
parts {
   part { name: "bg";
diff --git a/data/themes/default/widgets/layouts/tabs.edc 
b/data/themes/default/widgets/layouts/tabs.edc
index e8c05fe..caf22ea 100644
--- a/data/themes/default/widgets/layouts/tabs.edc
+++ b/data/themes/default/widgets/layouts/tabs.edc
@@ -1301,3 +1301,214 @@ group { name: "elm/layout/tab_home/item";
   }
}
 }
+
+group { name: "elm/layout/tab_style/style_editor";
+   images {
+  image: "separator-vertical.png" COMP;
+  image: "separator-horizontal.png" COMP;
+   }
+   parts {
+  part { name: "top_pad";
+ type: SPACER;
+ description {
+align: 0.5 0.0;
+fixed: 0 1;
+max: -1 20;
+ }
+  }
+  part { name: "left_pad";
+ type: SPACER;
+ description {
+align: 0.0 0.0;
+fixed: 1 0;
+max: 6 -1;
+ }
+  }
+  part { name: "right_pad";
+ type: SPACER;
+ description {
+align: 1.0 1.0;
+fixed: 1 0;
+max: 6 -1;
+ }
+  }
+  part { name: "bottom_pad";
+ type: SPACER;
+ description {
+align: 0.0 1.0;
+

[EGIT] [tools/eflete] master 09/52: property_image: use FRAME for info (name, location, type etc)

[Vitalii Vorobiov]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=540987d17209da08e4f0b34ca786264c51447895

commit 540987d17209da08e4f0b34ca786264c51447895
Author: Vitalii Vorobiov 
Date:   Mon Nov 9 16:20:28 2015 +0200

property_image: use FRAME for info (name, location, type etc)
---
 src/bin/ui/property_image.c | 63 -
 1 file changed, 34 insertions(+), 29 deletions(-)

diff --git a/src/bin/ui/property_image.c b/src/bin/ui/property_image.c
index 0170321..d3098a4 100644
--- a/src/bin/ui/property_image.c
+++ b/src/bin/ui/property_image.c
@@ -37,7 +37,7 @@
 struct _Image_Prop_Data
 {
Evas_Object *box;
-   Evas_Object *image_preview;
+   Evas_Object *preview_image;
Evas_Object *preview_frame;
 
Evas_Object *name;
@@ -48,6 +48,7 @@ struct _Image_Prop_Data
Evas_Object *size_width;
Evas_Object *size_height;
Evas_Object *usage_list;
+   Evas_Object *info_frame;
 
Eina_Stringshare *selected_image;
 };
@@ -174,7 +175,7 @@ _on_image_selected(void *data,
 
if (image)
  {
-elm_object_part_content_set(pd->image_preview, "eflete.swallow.image", 
image);
+elm_object_part_content_set(pd->preview_image, "eflete.swallow.image", 
image);
 
 image_name = evas_object_data_get(image, "image_name");
 
@@ -209,7 +210,7 @@ _on_image_selected(void *data,
  }
else
  {
-image = elm_object_part_content_unset(pd->image_preview, 
"eflete.swallow.image");
+image = elm_object_part_content_unset(pd->preview_image, 
"eflete.swallow.image");
 evas_object_del(image);
 elm_object_text_set(pd->name, _(" - "));
 elm_object_text_set(pd->location, _(" - "));
@@ -225,44 +226,48 @@ Evas_Object *
 ui_property_image_add(Evas_Object *parent)
 {
Image_Prop_Data *pd;
-   Evas_Object *item;
+   Evas_Object *item, *box;
 
assert(parent != NULL);
 
pd = mem_calloc(1, sizeof(Image_Prop_Data));
 
/* editors */
-   BOX_ADD(parent, pd->box, EINA_FALSE, EINA_FALSE);
+   BOX_ADD(parent, pd->box, false, false);
elm_box_align_set(pd->box, 0.5, 0.0);
evas_object_hide(pd->box);
+   evas_object_data_set(pd->box, IMAGE_PROP_DATA, pd);
 
+   /* Frame with preview */
FRAME_PROPERTY_ADD(pd->box, pd->preview_frame, true, _("Preview"), pd->box)
-   pd->image_preview = elm_layout_add(parent);
-   elm_layout_theme_set(pd->image_preview, "layout", "image_editor", 
"preview");
-   evas_object_size_hint_weight_set(pd->image_preview, EVAS_HINT_EXPAND, 
EVAS_HINT_EXPAND);
-   evas_object_size_hint_align_set(pd->image_preview, EVAS_HINT_FILL, 
EVAS_HINT_FILL);
-   evas_object_show(pd->image_preview);
-   elm_object_content_set(pd->preview_frame, pd->image_preview);
+   pd->preview_image = elm_layout_add(parent);
+   elm_layout_theme_set(pd->preview_image, "layout", "image_editor", 
"preview");
+   evas_object_size_hint_weight_set(pd->preview_image, EVAS_HINT_EXPAND, 
EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(pd->preview_image, EVAS_HINT_FILL, 
EVAS_HINT_FILL);
+   evas_object_show(pd->preview_image);
+   elm_object_content_set(pd->preview_frame, pd->preview_image);
elm_box_pack_end(pd->box, pd->preview_frame);
 
-   evas_object_data_set(pd->box, IMAGE_PROP_DATA, pd);
-
-   item = prop_item_label_add(pd->box, >name, _("name"), _(" - "));
-   elm_box_pack_end(pd->box, item);
-   item = prop_item_label_add(pd->box, >location, _("location"), _(" - "));
-   elm_box_pack_end(pd->box, item);
-   item = prop_item_label_add(pd->box, >type, _("type"), _(" - "));
-   elm_box_pack_end(pd->box, item);
-   item = prop_image_editor_compression_type_add(pd->box, pd);
-   elm_box_pack_end(pd->box, item);
-   item = prop_image_editor_compression_quality_add(pd->box, pd);
-   elm_box_pack_end(pd->box, item);
-
-   item = prop_item_label_add(pd->box, >size_width, _("image width"), _(" 
- "));
-   elm_box_pack_end(pd->box, item);
-
-   item = prop_item_label_add(pd->box, >size_height, _("image height"), 
_(" - "));
-   elm_box_pack_end(pd->box, item);
+   /* Frame with info */
+   FRAME_PROPERTY_ADD(pd->box, pd->info_frame, true, _("Info"), pd->box)
+   BOX_ADD(pd->info_frame, box, false, false);
+   elm_box_align_set(box, 0.5, 0.0);
+   item = prop_item_label_add(box, >name, _("name"), _(" - "));
+   elm_box_pack_end(box, item);
+   item = prop_item_label_add(box, >location, _("location"), _(" - "));
+   elm_box_pack_end(box, item);
+   item = prop_item_label_add(box, >type, _("type"), _(" - "));
+   elm_box_pack_end(box, item);
+   item = prop_image_editor_compression_type_add(box, pd);
+   elm_box_pack_end(box, item);
+   item = prop_image_editor_compression_quality_add(box, pd);
+   elm_box_pack_end(box, item);
+   item = prop_item_label_add(box, >size_width, _("image width"), _(" - 
"));
+   elm_box_pack_end(box, item);
+   item = prop_item_label_add(box, >size_height, _("image height"), _(" - 
"));
+   elm_box_pack_end(box, item);
+   

[EGIT] [tools/eflete] master 41/52: Merge "editor: include part name in state_add/state_del signals"

[Gerrit User]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=27d823314f5770ab61888a809e2237aa31677497

commit 27d823314f5770ab61888a809e2237aa31677497
Merge: 378cbd9 5728810
Author: Gerrit User 
Date:   Thu Nov 12 12:27:17 2015 +0200

Merge "editor: include part name in state_add/state_del signals"

 src/bin/common/signals.h   | 10 +++---
 src/bin/editor/editor_states.c | 30 ++
 src/bin/ui/group_navigator.c   | 11 ---
 3 files changed, 33 insertions(+), 18 deletions(-)

-- 

[EGIT] [tools/eflete] master 13/52: sound_editor: remove old code (CID 85131)

[Andrii Kroitor]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=5564ec1197d238ecb5fa5ead621527f4dfcfade9

commit 5564ec1197d238ecb5fa5ead621527f4dfcfade9
Author: Andrii Kroitor 
Date:   Mon Nov 9 18:41:36 2015 +0200

sound_editor: remove old code (CID 85131)
---
 src/bin/ui/editors/sound_editor.c | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/bin/ui/editors/sound_editor.c 
b/src/bin/ui/editors/sound_editor.c
index 8b21904..cf4d0f7 100644
--- a/src/bin/ui/editors/sound_editor.c
+++ b/src/bin/ui/editors/sound_editor.c
@@ -1265,7 +1265,6 @@ _add_tone_done(void *data,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
 {
-   Sound *snd;
Item *it;
Eina_Stringshare *tone_name;
const char *str_value;
@@ -1297,9 +1296,6 @@ _add_tone_done(void *data,
str_value = elm_entry_entry_get(edit->frq_entry);
frq = atoi(str_value);
 
-   snd = (Sound *)mem_calloc(1, sizeof(Sound));
-   snd->name = tone_name;
-   snd->tone_frq = frq;
it = (Item *)mem_calloc(1, sizeof(Item));
it->sound_name = eina_stringshare_add(tone_name);
it->tone_frq = frq;
@@ -1311,7 +1307,7 @@ _add_tone_done(void *data,
tone->freq = frq;
ap.project->tones = eina_list_sorted_insert(ap.project->tones, 
(Eina_Compare_Cb) resource_cmp, tone);
 
-   edje_edit_sound_tone_add(ap.project->global_object, snd->name, 
snd->tone_frq);
+   edje_edit_sound_tone_add(ap.project->global_object, tone_name, frq);
editor_save(ap.project->global_object);
TODO("Remove this line once edje_edit_image_add would be added into Editor 
Module and saving would work properly")
ap.project->changed = true;

-- 

[EGIT] [tools/eflete] master 50/52: workspace: add switcher between modes

[Vyacheslav Reutskiy]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=e337b3117442d7cacc7f783be6fcf7270e54c515

commit e337b3117442d7cacc7f783be6fcf7270e54c515
Author: Vyacheslav Reutskiy 
Date:   Thu Nov 12 12:26:31 2015 +0200

workspace: add switcher between modes

Change-Id: I7fa41b2863ad4d32357c1e9abdc863300c0453ac
---
 src/bin/ui/shortcuts/shortcuts.c |  2 +-
 src/bin/ui/workspace/workspace.c | 72 ++--
 2 files changed, 62 insertions(+), 12 deletions(-)

diff --git a/src/bin/ui/shortcuts/shortcuts.c b/src/bin/ui/shortcuts/shortcuts.c
index 8be9788..561f390 100644
--- a/src/bin/ui/shortcuts/shortcuts.c
+++ b/src/bin/ui/shortcuts/shortcuts.c
@@ -149,7 +149,7 @@ _random_name_generate(char *part_name, unsigned int length)
if (workspace_edit_object_part_add(workspace, name, TYPE, DATA)) \
  ui_widget_list_part_add(widget_list, style, name); \
history_diff_add(style->obj, PART_TARGET, ADD, name); \
-   live_view_part_add(ap.live_view, 
ui_widget_list_selected_part_get(widget_list)); \
+   /* live_view_part_add(ap.live_view, 
ui_widget_list_selected_part_get(widget_list)); */ \
project_changed(true);
 
 #define PART_ADD(TYPE, FUNC) \
diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c
index f42291e..0ea14bb 100644
--- a/src/bin/ui/workspace/workspace.c
+++ b/src/bin/ui/workspace/workspace.c
@@ -27,6 +27,7 @@
 #include "signals.h"
 #include "new_history.h"
 #include "editor.h"
+#include "demo.h"
 
 struct _Ws_Menu
 {
@@ -54,6 +55,16 @@ struct _Ws_Menu
 };
 typedef struct _Ws_Menu Ws_Menu;
 
+typedef enum
+{
+   MODE_NORMAL = 1,
+   MODE_SEPARATE,
+   /* MODE_ANIMATOR, */
+   /* MODE_CODE, */
+   MODE_DEMO,
+   MODE_LAST
+} Workspace_Mode;
+
 /**
  * @typedef Ws_Smart_Data
  *
@@ -90,6 +101,8 @@ struct _Ws_Smart_Data
Evas_Object *bottom_box;
Evas_Object *groupedit;   /**< A groupedit smart object, \
needed for view and edit style.*/
+   Workspace_Mode active_mode;
+   Evas_Object *active_mode_object;
 
struct {
 Evas_Object *obj;/**< Container that contains groupedit.*/
@@ -957,21 +970,48 @@ _mode_changed(void *data,
   Evas_Object *obj,
   void *event_info __UNUSED__)
 {
+   Workspace_Mode mode;
Ws_Smart_Data *sd = (Ws_Smart_Data *)data;
 
-   switch (elm_radio_state_value_get(obj))
+   /* delete all object besides groupedit, because all these objects we created
+* on mode chage. It's do for create, alwayes actual and correct object, and
+* eliminates from updates, like live_view update mehanism. So, Profit! */
+   container_confine_unset(sd->container.obj);
+   if ((sd->active_mode == MODE_NORMAL) || (sd->active_mode == MODE_SEPARATE))
+ evas_object_hide(sd->groupedit);
+   else
+ evas_object_del(sd->active_mode_object);
+
+   mode = elm_radio_state_value_get(obj);
+   switch (mode)
  {
-  case 1:
+  case MODE_NORMAL:
+ container_content_set(sd->container.obj, sd->groupedit);
+ evas_object_show(sd->groupedit);
  workspace_separate_mode_set(sd->obj, false);
  break;
-  case 2:
+  case MODE_SEPARATE:
+ container_content_set(sd->container.obj, sd->groupedit);
+ evas_object_show(sd->groupedit);
  workspace_separate_mode_set(sd->obj, true);
+ container_border_hide(sd->container.obj);
  break;
-  case 3: break;
-  case 4: break;
-  case 5: break;
+  /* case MODE_ANIMATOR: break; */
+  /* case MODE_CODE: break; */
+  case MODE_DEMO:
+ {
+/* return container to default state */
+workspace_separate_mode_set(sd->obj, false);
+container_border_show(sd->container.obj);
+
+sd->active_mode_object = demo_add(sd->scroller, sd->group);
+evas_object_show(sd->active_mode_object);
+container_content_set(sd->container.obj, sd->active_mode_object);
+break;
+ }
   default: break;
  }
+   sd->active_mode = mode;
 }
 
 static void
@@ -1007,35 +1047,39 @@ _mode_part_add(Ws_Smart_Data *sd)
Evas_Object *radio_mode, *radio_group;
 
radio_group = radio_mode = elm_radio_add(sd->scroller);
-   elm_radio_state_value_set(radio_mode, 1);
+   elm_radio_state_value_set(radio_mode, MODE_NORMAL);
elm_radio_value_set(radio_mode, true);
evas_object_smart_callback_add(radio_mode, "changed", _mode_changed, sd);
elm_box_pack_end(sd->bottom_box, radio_mode);
evas_object_show(radio_mode);
 
radio_mode = elm_radio_add(sd->scroller);
-   elm_radio_state_value_set(radio_mode, 2);
+   elm_radio_state_value_set(radio_mode, MODE_SEPARATE);
evas_object_smart_callback_add(radio_mode, "changed", _mode_changed, sd);
elm_box_pack_end(sd->bottom_box, radio_mode);
evas_object_show(radio_mode);
elm_radio_group_add(radio_mode, radio_group);
 
+   /*
  

[EGIT] [tools/eflete] master 15/52: Merge "workspace: fix segfault after closing tab"

[Gerrit User]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=e617cb65520c1c55f86027dfdf82864f0b49a444

commit e617cb65520c1c55f86027dfdf82864f0b49a444
Merge: 540987d c8b1762
Author: Gerrit User 
Date:   Wed Nov 11 07:45:03 2015 +0200

Merge "workspace: fix segfault after closing tab"

 src/bin/ui/tabs.c| 12 
 src/bin/ui/workspace/workspace.c | 22 --
 2 files changed, 16 insertions(+), 18 deletions(-)

-- 

[EGIT] [tools/eflete] master 26/52: Property: start to implement/move sound editor property to property module

[Elizabeth Shevchenko]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=1aa91408042811881d1b2bb54224b9f526a8e5f8

commit 1aa91408042811881d1b2bb54224b9f526a8e5f8
Author: Elizabeth Shevchenko 
Date:   Wed Nov 11 08:57:03 2015 +0200

Property: start to implement/move sound editor property to property module
---
 src/bin/Makefile.am   |   1 +
 src/bin/ui/property_private.h |   3 ++
 src/bin/ui/property_sound.c   | 100 ++
 3 files changed, 104 insertions(+)

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index d444ef9..b27071d 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -64,6 +64,7 @@ libete_a_SOURCES = \
 ../../src/bin/ui/property.c \
 ../../src/bin/ui/property_group.c \
 ../../src/bin/ui/property_image.c \
+../../src/bin/ui/property_sound.c \
 ../../src/bin/ui/blocks/ui_widget_list.c \
 ../../src/bin/ui/blocks/ui_signal_list.c \
 ../../src/bin/ui/blocks/ui_states_list.c \
diff --git a/src/bin/ui/property_private.h b/src/bin/ui/property_private.h
index d8d3ffc..5ada7f3 100644
--- a/src/bin/ui/property_private.h
+++ b/src/bin/ui/property_private.h
@@ -58,4 +58,7 @@ _on_frame_click(void *data,
 Evas_Object *obj,
 void *event_info);
 
+Evas_Object *
+ui_property_sound_add(Evas_Object *parent);
+
 #endif /* UI_PROPERTY_1_H */
diff --git a/src/bin/ui/property_sound.c b/src/bin/ui/property_sound.c
new file mode 100644
index 000..5aac95d
--- /dev/null
+++ b/src/bin/ui/property_sound.c
@@ -0,0 +1,100 @@
+/*
+ * Edje Theme Editor
+ * Copyright (C) 2013-2014 Samsung Electronics.
+ *
+ * This file is part of Edje Theme Editor.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
+ */
+
+#include "property_private.h"
+#include "property_macros.h"
+#include "main_window.h"
+#include "string_common.h"
+#include "new_history.h"
+#include "editor.h"
+#include "validator.h"
+
+#include "signals.h"
+
+#define SOUND_PROP_DATA "sound_prop_data"
+
+#define SOUND_PROP_DATA_GET() \
+   assert(property != NULL); \
+   Sound_Prop_Data *pd = evas_object_data_get(property, SOUND_PROP_DATA); \
+   assert(pd != NULL);
+
+/*
+ * Callback is added for frames at property box to correct scroller
+ * work while each frame would be expanded/collapsed
+ */
+#define FRAME_PROPERTY_ADD(PARENT, FRAME, AUTOCOLLAPSE, TITLE, SCROLLER) \
+FRAME_ADD(PARENT, FRAME, AUTOCOLLAPSE, TITLE) \
+evas_object_smart_callback_add(FRAME, "clicked", _on_frame_click, SCROLLER);
+
+struct _Sound_Prop_Data
+{
+   Evas_Object *box;
+   Evas_Object *sound_player;
+
+   Evas_Object *name;
+   Evas_Object *location;
+   Evas_Object *type;
+   Evas_Object *size;
+   Evas_Object *compression;
+   Evas_Object *usage_list;
+};
+typedef struct _Sound_Prop_Data Sound_Prop_Data;
+
+static void
+_on_sound_selected(void *data __UNUSED__,
+   Evas_Object *obj __UNUSED__,
+   void *event_info __UNUSED__)
+{
+}
+
+static void
+_on_tone_selected(void *data __UNUSED__,
+  Evas_Object *obj __UNUSED__,
+  void *event_info __UNUSED__)
+{
+}
+
+Evas_Object *
+ui_property_sound_add(Evas_Object *parent)
+{
+   Sound_Prop_Data *pd;
+
+   assert(parent != NULL);
+
+   pd = mem_calloc(1, sizeof(Sound_Prop_Data));
+
+   /* editors */
+   BOX_ADD(parent, pd->box, EINA_FALSE, EINA_FALSE);
+   elm_box_align_set(pd->box, 0.5, 0.0);
+   evas_object_hide(pd->box);
+
+   pd->sound_player = elm_layout_add(parent);
+   elm_layout_theme_set(pd->sound_player, "layout", "sound_editor", "player");
+   elm_box_pack_end(pd->box, pd->sound_player);
+   evas_object_size_hint_weight_set(pd->sound_player, EVAS_HINT_EXPAND, 
EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(pd->sound_player, EVAS_HINT_FILL, 
EVAS_HINT_FILL);
+   evas_object_show(pd->sound_player);
+
+   evas_object_data_set(pd->box, SOUND_PROP_DATA, pd);
+
+   evas_object_smart_callback_add(ap.win, SIGNAL_SOUND_SELECTED, 
_on_sound_selected, pd->box);
+   evas_object_smart_callback_add(ap.win, SIGNAL_SOUND_SELECTED, 
_on_tone_selected, pd->box);
+
+   return pd->box;
+}
\ No newline at end of file

-- 

[EGIT] [tools/eflete] master 03/52: history_ui: don't show history by default

[Andrii Kroitor]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=36b232c052273edc95750429511f030f588da95e

commit 36b232c052273edc95750429511f030f588da95e
Author: Andrii Kroitor 
Date:   Mon Nov 9 12:03:13 2015 +0200

history_ui: don't show history by default
---
 src/bin/ui/history_ui.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/bin/ui/history_ui.c b/src/bin/ui/history_ui.c
index 301fbce..02cb68c 100644
--- a/src/bin/ui/history_ui.c
+++ b/src/bin/ui/history_ui.c
@@ -211,6 +211,5 @@ history_ui_add(void)
evas_object_smart_callback_add(ap.win, SIGNAL_TAB_CHANGED, _history_set, 
NULL);
 
TODO("Add clean-up callbacks here")
-   evas_object_show(hd.layout);
return hd.layout;
 }

-- 

[EGIT] [tools/eflete] master 14/52: sound_editor: add missing return (CID 85133)

[Andrii Kroitor]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=f907fd5067b80cab60f6d986f0f7741f4472

commit f907fd5067b80cab60f6d986f0f7741f4472
Author: Andrii Kroitor 
Date:   Mon Nov 9 18:48:16 2015 +0200

sound_editor: add missing return (CID 85133)
---
 src/bin/ui/editors/sound_editor.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bin/ui/editors/sound_editor.c 
b/src/bin/ui/editors/sound_editor.c
index cf4d0f7..da1f075 100644
--- a/src/bin/ui/editors/sound_editor.c
+++ b/src/bin/ui/editors/sound_editor.c
@@ -1205,6 +1205,7 @@ _add_sample_done(void *data,
   {
  WIN_NOTIFY_ERROR(obj, _("File exist"));
  free(res);
+ goto del;
   }
 
 edje_edit_sound_sample_add(ap.project->global_object, res->name, 
res->source);

-- 

[EGIT] [tools/eflete] master 23/52: tabs: remove liveview from tab

[Vyacheslav Reutskiy]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=5eed1298a40f678f65fb2601f96e0add6b23ab60

commit 5eed1298a40f678f65fb2601f96e0add6b23ab60
Author: Vyacheslav Reutskiy 
Date:   Mon Nov 9 15:58:47 2015 +0200

tabs: remove liveview from tab

LiveView will be moved to workspace as a mode.

Change-Id: I3e0a48b7ae4506f973a90d6a5a1ed04646fe96e2
---
 src/bin/ui/tabs.c | 25 -
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/bin/ui/tabs.c b/src/bin/ui/tabs.c
index 7bbb358..d1f0159 100644
--- a/src/bin/ui/tabs.c
+++ b/src/bin/ui/tabs.c
@@ -31,9 +31,7 @@
 struct _Tabs_Item {
Group *group;
Elm_Object_Item *toolbar_item;
-   Evas_Object *content; //panes
-   Evas_Object *workspace;
-   Evas_Object *live_view;
+   Evas_Object *content;
Eina_Bool need_recalc : 1;
 };
 
@@ -47,7 +45,6 @@ struct _Tabs {
Elm_Object_Item *selected;
Eina_List *items;
Evas_Object *current_workspace;
-   Evas_Object *current_live_view;
Group *current_group;
struct {
   Elm_Object_Item *item_home;
@@ -87,7 +84,6 @@ _content_unset(void)
 
assert(tabs.layout != NULL);
tabs.current_workspace = NULL;
-   tabs.current_live_view = NULL;
tabs.current_group = NULL;
content = elm_layout_content_unset(tabs.layout, NULL);
evas_object_hide(content);
@@ -110,22 +106,19 @@ _content_set(void *data,
  {
 _content_unset();
 elm_layout_content_set(tabs.layout, NULL, item->content);
-tabs.current_workspace = item->workspace;
-tabs.current_live_view = item->live_view;
+tabs.current_workspace = item->content;
 tabs.current_group = item->group;
 if (ap.project)
   ui_menu_items_list_disable_set(ap.menu, MENU_ITEMS_LIST_STYLE_ONLY, 
false);
 if (item->need_recalc)
   {
  workspace_edit_object_recalc(tabs.current_workspace);
- live_view_theme_update(tabs.current_live_view);
  item->need_recalc = false;
   }
  }
else
  {
 tabs.current_workspace = NULL;
-tabs.current_live_view = NULL;
 tabs.current_group = NULL;
 if (ap.project)
   ui_menu_items_list_disable_set(ap.menu, MENU_ITEMS_LIST_STYLE_ONLY, 
true);
@@ -218,7 +211,6 @@ _part_added(void *data __UNUSED__,
assert(tabs.current_workspace != NULL);
 
workspace_edit_object_part_add(tabs.current_workspace, part);
-   live_view_part_add(tabs.current_live_view, part);
 }
 
 static void
@@ -231,7 +223,6 @@ _part_deleted(void *data __UNUSED__,
assert(tabs.current_workspace != NULL);
 
workspace_edit_object_part_del(tabs.current_workspace, part);
-   live_view_part_del(tabs.current_live_view, part);
 }
 
 static void
@@ -269,8 +260,6 @@ _project_changed(void *data __UNUSED__,
  void *ei __UNUSED__)
 {
/* project may be changed in editors for example */
-   if (tabs.current_live_view == NULL) return;
-   live_view_theme_update(tabs.current_live_view);
 }
 
 static void
@@ -285,10 +274,9 @@ _editor_saved(void *data __UNUSED__,
EINA_LIST_FOREACH(tabs.items, l, item)
  {
 edje_object_mmap_set(item->group->edit_object, ap.project->mmap_file, 
item->group->name);
-if (item->workspace == tabs.current_workspace)
+if (item->content == tabs.current_workspace)
   {
  workspace_edit_object_recalc(tabs.current_workspace);
- live_view_theme_update(tabs.current_live_view);
   }
 else
   item->need_recalc = true;
@@ -521,12 +509,7 @@ tabs_tab_add(Group *group)
 
item = mem_calloc(1, sizeof(Tabs_Item));
item->group = group;
-   item->content = elm_panes_add(tabs.layout);
-   elm_panes_horizontal_set(item->content, true);
-   item->workspace = workspace_add(item->content, group);
-   item->live_view = live_view_add(item->content, false, group);
-   elm_object_part_content_set(item->content, "left", item->workspace);
-   elm_object_part_content_set(item->content, "right", item->live_view);
+   item->content = workspace_add(tabs.layout, group);
 
item->toolbar_item = elm_toolbar_item_append(tabs.toolbar, NULL, 
group->name,
_content_set, (void *)item);

-- 

[EGIT] [tools/eflete] master 29/52: layout.edc: usage_info was deleted, move it back

[Vitalii Vorobiov]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=c6152c007e25d25f9eab76330bd501637298abb5

commit c6152c007e25d25f9eab76330bd501637298abb5
Author: Vitalii Vorobiov 
Date:   Mon Nov 9 16:47:51 2015 +0200

layout.edc: usage_info was deleted, move it back
---
 data/themes/default/widgets/layout.edc | 64 ++
 1 file changed, 64 insertions(+)

diff --git a/data/themes/default/widgets/layout.edc 
b/data/themes/default/widgets/layout.edc
index 2e6223f..16ee668 100644
--- a/data/themes/default/widgets/layout.edc
+++ b/data/themes/default/widgets/layout.edc
@@ -2541,6 +2541,70 @@ group { name: "elm/layout/image_editor/preview";
}
 }
 
+group { name: "elm/layout/image_editor/usage_info";
+   parts {
+  part { name: "padding.top.left";
+ type: SPACER;
+ description { state: "default" 0.0;
+align: 0.0 0.0;
+PADDING_SIZE_SET;
+ }
+  }
+  part { name: "padding.bottom.right";
+ type: SPACER;
+ description { state: "default" 0.0;
+align: 1.0 1.0;
+PADDING_SIZE_SET;
+ }
+  }
+  part { name: "area.usage_info";
+ type: SPACER;
+ description { state: "default" 0.0;
+rel1 {
+   to: "padding.top.left";
+   relative: 1.0 1.0;
+}
+rel2 {
+   to: "padding.bottom.right";
+   relative: 0.0 0.0;
+}
+ }
+  }
+  part { name: "eflete.swallow.search_line";
+ type: SWALLOW;
+ description { state: "default" 0.0;
+align: 0.0 0.0;
+min: 80 30;
+rel1.to: "area.usage_info";
+rel2.to: "area.usage_info";
+ }
+  }
+  part { name: "padding.genlist";
+ type: SPACER;
+ description { state: "default" 0.0;
+align: 1.0 0.0;
+PADDING_SIZE_SET;
+rel1 {
+   to_y: "eflete.swallow.search_line";
+   relative: 0.0 1.0;
+}
+ }
+  }
+  part { name: "eflete.swallow.genlist";
+ type: SWALLOW;
+ description { state: "default" 0.0;
+align: 0.0 0.0;
+rel1 {
+   to_y: "padding.genlist";
+   to_x: "area.usage_info";
+   relative: 0.0 1.0;
+}
+rel2.to: "area.usage_info";
+ }
+  }
+   }
+}
+
 group { name: "elm/layout/sound_editor/default";
parts {
   part { name: "area.edit";

-- 

[EGIT] [tools/eflete] master 31/52: property_image: add usage list

[Vitalii Vorobiov]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=c3aab758f7dc42aba4a5d689ff2e9fe3db3e5113

commit c3aab758f7dc42aba4a5d689ff2e9fe3db3e5113
Author: Vitalii Vorobiov 
Date:   Mon Nov 9 17:25:29 2015 +0200

property_image: add usage list
---
 src/bin/ui/editors/image_editor.c |   6 +-
 src/bin/ui/property_image.c   | 129 +-
 2 files changed, 130 insertions(+), 5 deletions(-)

diff --git a/src/bin/ui/editors/image_editor.c 
b/src/bin/ui/editors/image_editor.c
index ef998c1..e7f2843 100644
--- a/src/bin/ui/editors/image_editor.c
+++ b/src/bin/ui/editors/image_editor.c
@@ -66,8 +66,8 @@ struct _Image_Editor
   Evas_Object *tabs;
   Evas_Object *image_info;
   Evas_Object *image_usage;
-  Elm_Object_Item *item_image_info;
-  Elm_Object_Item *item_image_usage;
+  Elm_Object_Item *item_image_info; //kill
+  Elm_Object_Item *item_image_usage; //kill
} property;
struct {
   Evas_Object *genlist;
@@ -227,7 +227,7 @@ _grid_del(void *data,
free(it);
 }
 
-void
+static void
 _grid_group_item_del(void *data, Evas_Object *obj __UNUSED__)
 {
if (data)
diff --git a/src/bin/ui/property_image.c b/src/bin/ui/property_image.c
index 11c3ac0..c02336d 100644
--- a/src/bin/ui/property_image.c
+++ b/src/bin/ui/property_image.c
@@ -21,6 +21,7 @@
 #include "property_macros.h"
 #include "main_window.h"
 #include "string_common.h"
+#include "common_macro.h"
 #include "new_history.h"
 #include "editor.h"
 #include "validator.h"
@@ -64,6 +65,10 @@ struct _Image_Prop_Data
 };
 typedef struct _Image_Prop_Data Image_Prop_Data;
 
+static Elm_Genlist_Item_Class *_itc_group = NULL;
+static Elm_Genlist_Item_Class *_itc_part = NULL;
+static Elm_Genlist_Item_Class *_itc_state = NULL;
+
 /* accroding to Edje_Edit.h */
 static const char *edje_image_compression[] = { N_("RAW"),
 N_("USER"),
@@ -133,6 +138,53 @@ prop_image_editor_compression_type_add(Evas_Object 
*parent, Image_Prop_Data *pd)
 }
 
 static void
+_grid_group_item_del(void *data, Evas_Object *obj __UNUSED__)
+{
+   if (data)
+ eina_stringshare_del(data);
+}
+static char *
+_grid_group_item_label_get(void *data,
+   Evas_Object *obj __UNUSED__,
+   const char  *part)
+{
+   if ((part) && (!strcmp(part, "elm.text")))
+ return strdup(data);
+   else
+ return NULL;
+}
+static inline void
+genlist_item_classes_init()
+{
+   if (!_itc_group)
+ {
+_itc_group = elm_genlist_item_class_new();
+_itc_group->item_style = "title";
+_itc_group->func.text_get = _grid_group_item_label_get;
+_itc_group->func.content_get = NULL;
+_itc_group->func.state_get = NULL;
+_itc_group->func.del = _grid_group_item_del;
+ }
+   if (!_itc_part)
+ {
+_itc_part = elm_genlist_item_class_new();
+_itc_part->item_style = "default";
+_itc_part->func.text_get = _grid_group_item_label_get;
+_itc_part->func.content_get = NULL;
+_itc_part->func.state_get = NULL;
+_itc_part->func.del = _grid_group_item_del;
+ }
+   if (!_itc_state)
+ {
+_itc_state = elm_genlist_item_class_new();
+_itc_state->item_style = "default";
+_itc_state->func.text_get = _grid_group_item_label_get;
+_itc_state->func.content_get = NULL;
+_itc_state->func.state_get = NULL;
+_itc_state->func.del = _grid_group_item_del;
+ }
+}
+static void
 _image_info_type_setup(Evas_Object *layout,
const char *image_name)
 {
@@ -169,6 +221,77 @@ _image_info_type_setup(Evas_Object *layout,
  }
elm_object_text_set(layout, buf);
 }
+static inline void
+_image_info_update_usage_info(Image_Prop_Data *pd, int list_count)
+{
+   Eina_Stringshare *title;
+
+   assert(pd != NULL);
+
+   if (list_count)
+ title = eina_stringshare_printf(_("Usage (%d)"), list_count);
+   else
+ title = eina_stringshare_add(_("Usage ( - )"));
+
+   elm_object_disabled_set(pd->usage_search_data.search_entry,
+   !list_count);
+   elm_entry_entry_set(pd->usage_search_data.search_entry, "");
+   pd->usage_search_data.last_item_found = NULL;
+
+   elm_object_text_set(pd->usage_frame, title);
+   eina_stringshare_del(title);
+}
+static void
+_image_info_usage_update(Image_Prop_Data *pd, const char *image_name)
+{
+   Eina_List *l;
+   Evas_Object *list;
+   Elm_Object_Item *it_group, *it_part;
+   const char *cur_group = NULL;
+   const char *cur_part = NULL;
+   State *state;
+
+   assert(pd != NULL);
+   assert(image_name != NULL);
+
+   list = pd->usage_genlist;
+   elm_genlist_clear(list);
+   if (!pd->selected_image) return;
+
+   Resource *res = (Resource *) pm_resource_get(ap.project->images, 
image_name);
+   _image_info_update_usage_info(pd, eina_list_count(res->used_in));
+   if 

[EGIT] [tools/eflete] master 43/52: demo: add module demo

[Vyacheslav Reutskiy]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=86a2167005f78b148f86f17f35e2d7c801422c41

commit 86a2167005f78b148f86f17f35e2d7c801422c41
Author: Vyacheslav Reutskiy 
Date:   Wed Nov 11 16:02:24 2015 +0200

demo: add module demo

This module develop for show the demo view on workspace for editing
group.

Change-Id: I4c7beca4a9845c9fe913688b515c804230ab19ee
---
 src/bin/Makefile.am |  1 +
 src/bin/ui/live_view/demo.c | 54 +
 src/bin/ui/live_view/demo.h | 41 ++
 3 files changed, 96 insertions(+)

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index b27071d..934fe95 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -73,6 +73,7 @@ libete_a_SOURCES = \
 ../../src/bin/ui/workspace/groupedit.c \
 ../../src/bin/ui/workspace/groupedit_box_layouts.c \
 ../../src/bin/ui/workspace/highlight.c \
+../../src/bin/ui/live_view/demo.c \
 ../../src/bin/ui/live_view/live_view_prop.c \
 ../../src/bin/ui/live_view/live_view.c \
 ../../src/bin/ui/live_view/live_widget.c \
diff --git a/src/bin/ui/live_view/demo.c b/src/bin/ui/live_view/demo.c
new file mode 100644
index 000..83b2f6d
--- /dev/null
+++ b/src/bin/ui/live_view/demo.c
@@ -0,0 +1,54 @@
+/*
+ * Edje Theme Editor
+ * Copyright (C) 2013-2015 Samsung Electronics.
+ *
+ * This file is part of Edje Theme Editor.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
+ */
+
+#include "live_view.h"
+#include "live_view_prop.h"
+
+Evas_Object *
+demo_add(Evas_Object *parent, Group *group)
+{
+   Evas_Object *obj;
+
+   if (group->widget)
+ {
+obj = live_widget_create(group, parent);
+if (!obj)
+   ERR(N_("Widget live view isn't implemented yet. Using fallback to 
layout"))
+else
+{
+   Elm_Theme *theme = elm_theme_new();
+   elm_theme_set(theme, ap.project->dev);
+   elm_object_theme_set(obj, theme);
+   elm_theme_free(theme);
+   return obj;
+}
+ }
+   /* if widget is not created, need use the layout */
+   obj = elm_layout_add(parent);
+   if (!elm_layout_file_set(obj, ap.project->dev, group->name))
+ {
+ERR(N_("Could not load group '%s' from mapped file '%s'."), 
group->name, ap.project->dev)
+evas_object_del(obj);
+obj = NULL;
+TODO("Add frame to container with info that need this state is 
unstable"
+ "and need to restart Eflete.");
+ }
+
+   return obj;
+}
diff --git a/src/bin/ui/live_view/demo.h b/src/bin/ui/live_view/demo.h
new file mode 100644
index 000..c23e737
--- /dev/null
+++ b/src/bin/ui/live_view/demo.h
@@ -0,0 +1,41 @@
+/*
+ * Edje Theme Editor
+ * Copyright (C) 2013-2015 Samsung Electronics.
+ *
+ * This file is part of Edje Theme Editor.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
+ */
+
+#include "eflete.h"
+
+/**
+ * @defgroup Demo Demo
+ *
+ * A Demo is responsible for showing widgets with contexts.
+ * After user manipulations with parts, states or programs and saving
+ * into a file, this space will show the resulted widget
+ * by using user's theme (already saved one).
+ */
+
+/**
+ * Create a object accordingly to given group.
+ *
+ * @param parent The parent object
+ * @param group The group for create widget
+ * @return The widget or layout with contexts
+ *
+ * @ingroup Demo
+ */
+Evas_Object *
+demo_add(Evas_Object *parent, Group *group);

-- 

[EGIT] [tools/eflete] master 07/52: workspace: fix segfault after closing tab

[Andrii Kroitor]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=c8b1762afce74bf97a1cc6fda13f77bb16bb6c18

commit c8b1762afce74bf97a1cc6fda13f77bb16bb6c18
Author: Andrii Kroitor 
Date:   Mon Nov 9 16:05:11 2015 +0200

workspace: fix segfault after closing tab

@fix #48232
---
 src/bin/ui/tabs.c| 12 
 src/bin/ui/workspace/workspace.c | 22 --
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/bin/ui/tabs.c b/src/bin/ui/tabs.c
index ed9d3b4..7bbb358 100644
--- a/src/bin/ui/tabs.c
+++ b/src/bin/ui/tabs.c
@@ -253,6 +253,17 @@ _part_renamed(void *data __UNUSED__,
 }
 
 static void
+_part_unselected(void *data __UNUSED__,
+ Evas_Object *obj __UNUSED__,
+ void *ei __UNUSED__)
+{
+   assert(tabs.current_group != NULL);
+   assert(tabs.current_workspace != NULL);
+
+   workspace_highlight_unset(tabs.current_workspace);
+}
+
+static void
 _project_changed(void *data __UNUSED__,
  Evas_Object *obj __UNUSED__,
  void *ei __UNUSED__)
@@ -408,6 +419,7 @@ tabs_add(void)
evas_object_smart_callback_add(ap.win, SIGNAL_PART_ADDED, _part_added, 
NULL);
evas_object_smart_callback_add(ap.win, SIGNAL_PART_DELETED, _part_deleted, 
NULL);
evas_object_smart_callback_add(ap.win, SIGNAL_PART_RENAMED, _part_renamed, 
NULL);
+   evas_object_smart_callback_add(ap.win, SIGNAL_PART_UNSELECTED, 
_part_unselected, NULL);
evas_object_smart_callback_add(ap.win, SIGNAL_PROJECT_CHANGED, 
_project_changed, NULL);
evas_object_smart_callback_add(ap.win, SIGNAL_EDITOR_SAVED, _editor_saved, 
NULL);
evas_object_smart_callback_add(ap.win, SIGNAL_PROJECT_OPENED, 
_project_opened, NULL);
diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c
index 4426ec3..779f1c8 100644
--- a/src/bin/ui/workspace/workspace.c
+++ b/src/bin/ui/workspace/workspace.c
@@ -895,8 +895,8 @@ _workspace_highlight_set(Evas_Object *obj, Part_ *part)
return true;
 }
 
-static Eina_Bool
-_workspace_highlight_unset(Evas_Object *obj)
+Eina_Bool
+workspace_highlight_unset(Evas_Object *obj)
 {
WS_DATA_GET(obj, sd)
if ((!sd->highlight.highlight) || (!sd->highlight.space_hl)) return false;
@@ -1367,7 +1367,7 @@ _on_group_navigator_part_select(void *data,
WS_DATA_GET(workspace, sd);
 
TODO("Combine this methods to one")
-   _workspace_highlight_unset(workspace);
+   workspace_highlight_unset(workspace);
_workspace_highlight_set(workspace, part);
 
evas_object_smart_callback_call(ap.win, SIGNAL_PART_SELECTED, (void *)part);
@@ -1397,22 +1397,10 @@ _on_groupedit_part_unselect(void *data,
 
WS_DATA_GET(workspace, sd);
 
-   _workspace_highlight_unset(workspace);
+   workspace_highlight_unset(workspace);
group_navigator_part_select(sd->group_navigator, NULL);
 }
 
-static void
-_on_group_navigator_part_unselect(void *data,
-Evas_Object *obj __UNUSED__,
-void *event_info __UNUSED__)
-{
-   Evas_Object *workspace = (Evas_Object *)data;
-
-   WS_DATA_GET(workspace, sd);
-
-   _workspace_highlight_unset(workspace);
-}
-
 Evas_Object *
 workspace_add(Evas_Object *parent, Group *group)
 {
@@ -1470,8 +1458,6 @@ workspace_add(Evas_Object *parent, Group *group)
   _on_groupedit_part_select, obj);
evas_object_smart_callback_add(sd->groupedit, 
SIGNAL_GROUPEDIT_PART_UNSELECTED,
   _on_groupedit_part_unselect, obj);
-   evas_object_smart_callback_add(ap.win, SIGNAL_PART_UNSELECTED,
-  _on_group_navigator_part_unselect, obj);
evas_object_smart_callback_add(sd->groupedit, "container,changed",
   _ws_ruler_abs_zero_move_cb, obj);
evas_object_smart_callback_add(sd->groupedit, "object,area,changed",

-- 

[EGIT] [tools/eflete] master 11/52: validator: fix CID 85129

[Andrii Kroitor]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=bb6dbf0f0375edb5956d6676055ff8d599df0db7

commit bb6dbf0f0375edb5956d6676055ff8d599df0db7
Author: Andrii Kroitor 
Date:   Mon Nov 9 18:32:40 2015 +0200

validator: fix CID 85129
---
 src/bin/common/validator.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/bin/common/validator.c b/src/bin/common/validator.c
index 1044cca..c57ff70 100644
--- a/src/bin/common/validator.c
+++ b/src/bin/common/validator.c
@@ -17,6 +17,7 @@
  * along with this program; If not, see www.gnu.org/licenses/lgpl.html.
  */
 #include "validator.h"
+#include "alloc.h"
 #include 
 
 struct _Resource_Name_Validator
@@ -54,7 +55,7 @@ resource_name_validator_new(const char *pattern, const char 
*sig)
 
assert(pattern != NULL);
 
-   validator = calloc(1, sizeof(Resource_Name_Validator));
+   validator = mem_calloc(1, sizeof(Resource_Name_Validator));
validator->signal = eina_stringshare_add(sig ? sig : "default");
validator->status = regcomp(>regex, pattern, REG_EXTENDED | 
REG_NOSUB) ? ELM_REG_BADPAT : ELM_REG_NOERROR;
 

-- 

[EGIT] [tools/eflete] master 28/52: style_editor: fix warning with unused varible

[Vyacheslav Reutskiy]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=7f9bfce083a77a220f65a7069d61d5d1a53b84ad

commit 7f9bfce083a77a220f65a7069d61d5d1a53b84ad
Author: Vyacheslav Reutskiy 
Date:   Wed Nov 11 09:09:02 2015 +0200

style_editor: fix warning with unused varible

Change-Id: Ic9716632d506abc515532a0dcaababd7946481a2
---
 src/bin/ui/editors/style_editor.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bin/ui/editors/style_editor.c 
b/src/bin/ui/editors/style_editor.c
index e6a3dc7..746efe6 100644
--- a/src/bin/ui/editors/style_editor.c
+++ b/src/bin/ui/editors/style_editor.c
@@ -1467,7 +1467,7 @@ ITEM_COLOR_ADD(underline_color, "underline_color", 
"underline_color")
 ITEM_COLOR_ADD(underline2_color, "underline2_color", "underline2_color")
 
 static void
-_text_tab_update(Style_Editor *style_edit, Evas_Object *tabs, const char 
*value)
+_text_tab_update(Style_Editor *style_edit, Evas_Object *tabs __UNUSED__, const 
char *value)
 {
Evas_Object *layout;
Evas_Object *fonts_list, *font_size;
@@ -1856,7 +1856,7 @@ _glow_tab_update(Style_Editor *style_edit, Evas_Object 
*tabs, const char *value)
 }*/
 
 static void
-_lines_tab_update(Style_Editor *style_edit, Evas_Object *tabs, const char 
*value)
+_lines_tab_update(Style_Editor *style_edit, Evas_Object *tabs __UNUSED__, 
const char *value)
 {
Evas_Object *layout;
Evas_Object *font_strikethrough, *strikethrough_color;

-- 

[EGIT] [tools/eflete] master 34/52: group_navigator: move part deletion into separate method.

[Andrii Kroitor]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=15701978afb166a5ac4a242d93b7fa6a4d1511ed

commit 15701978afb166a5ac4a242d93b7fa6a4d1511ed
Author: Andrii Kroitor 
Date:   Tue Nov 10 16:08:11 2015 +0200

group_navigator: move part deletion into separate method.
---
 src/bin/ui/group_navigator.c | 40 ++--
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/bin/ui/group_navigator.c b/src/bin/ui/group_navigator.c
index 0fc101c..2656679 100644
--- a/src/bin/ui/group_navigator.c
+++ b/src/bin/ui/group_navigator.c
@@ -774,6 +774,30 @@ _on_btn_plus_clicked(void *data,
 }
 
 static void
+_part_del(Part_List *pl,
+  Elm_Object_Item *glit)
+{
+   Part_ *part;
+   Eina_Stringshare *part_name;
+
+   assert(pl != NULL);
+   assert(glit != NULL);
+
+   part = elm_object_item_data_get(glit);
+   _unselect_part(pl);
+
+   /* This callbck should be called before actual part deletion */
+   evas_object_smart_callback_call(ap.win, SIGNAL_PART_DELETED, (void *)part);
+
+   elm_object_item_del(glit);
+   /* part is freed after deletion so we need to save its name */
+   part_name = eina_stringshare_ref(part->name);
+   gm_part_del(ap.project, part);
+   edje_edit_part_del(pl->group->edit_object, part_name);
+   eina_stringshare_del(part_name);
+}
+
+static void
 _on_btn_minus_clicked(void *data,
   Evas_Object *obj __UNUSED__,
   void *ei __UNUSED__)
@@ -781,8 +805,6 @@ _on_btn_minus_clicked(void *data,
Part_List *pl = data;
Elm_Object_Item *glit;
const Elm_Genlist_Item_Class* itc;
-   Part_ *part;
-   Eina_Stringshare *part_name;
 
assert(pl != NULL);
 
@@ -793,22 +815,12 @@ _on_btn_minus_clicked(void *data,
itc = elm_genlist_item_item_class_get(glit);
if (itc == pl->itc_part_selected)
  {
-part = elm_object_item_data_get(glit);
-_unselect_part(pl);
-
-/* This callbck should be called before actual part deletion */
-evas_object_smart_callback_call(ap.win, SIGNAL_PART_DELETED, (void 
*)part);
-
-elm_object_item_del(glit);
-/* part is freed after deletion so we need to save its name */
-part_name = eina_stringshare_ref(part->name);
-gm_part_del(ap.project, part);
-edje_edit_part_del(pl->group->edit_object, part_name);
-eina_stringshare_del(part_name);
+_part_del(pl, glit);
  }
 
TODO("Add state/item del here")
 
+   TODO("Check if we still need this")
/* Need to save pl->group->edit_object, since we changed it */
editor_save_all(ap.project->global_object);
TODO("Remove this line once edje_edit_image_add would be added into Editor 
Modulei and saving would work properly")

-- 

[EGIT] [tools/eflete] master 10/52: editor: fix CID 85132, 85134, 85135

[Andrii Kroitor]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=295b6a5f656a327be1cd4518a1c9398ef26b0597

commit 295b6a5f656a327be1cd4518a1c9398ef26b0597
Author: Andrii Kroitor 
Date:   Mon Nov 9 16:54:49 2015 +0200

editor: fix CID 85132, 85134, 85135
---
 src/bin/editor/editor_macro.h | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/bin/editor/editor_macro.h b/src/bin/editor/editor_macro.h
index 3fe90e5..0eaae00 100644
--- a/src/bin/editor/editor_macro.h
+++ b/src/bin/editor/editor_macro.h
@@ -157,10 +157,6 @@ editor_state_## FUNC ##_set(Evas_Object *edit_object, 
Change *change, Eina_Bool
 diff->undo.args.type_ssds.s2 = eina_stringshare_add(state_name); \
 diff->undo.args.type_ssds.d3 = state_val; \
 diff->undo.args.type_ssds.s4 = old_value; /* assuming that getter 
returned stringshare */\
-if (merge) \
-  change_diff_merge_add(change, diff); \
-else \
-  change_diff_add(change, diff); \
  } \
if (!edje_edit_state_## FUNC ##_set(edit_object, part_name, state_name, 
state_val, new_val)) \
  { \
@@ -172,6 +168,13 @@ editor_state_## FUNC ##_set(Evas_Object *edit_object, 
Change *change, Eina_Bool
 diff->redo.args.type_ssds.s4 = eina_stringshare_add(FALLBACK_VAL); 
\
   } \
  } \
+   if (change) /* we should add diff only after all changes to it */\
+ { \
+if (merge) \
+  change_diff_merge_add(change, diff); \
+else \
+  change_diff_add(change, diff); \
+ } \
_editor_project_changed(); \
evas_object_smart_callback_call(ap.win, SIGNAL_EDITOR_ATTRIBUTE_CHANGED, 
); \
return true; \

-- 

[EGIT] [tools/eflete] master 22/52: Going to move sound player and sound info to property

[Elizabeth Shevchenko]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=944a91b5ca522bb314fd23d3e93771e8a79c2d39

commit 944a91b5ca522bb314fd23d3e93771e8a79c2d39
Author: Elizabeth Shevchenko 
Date:   Tue Nov 10 09:11:01 2015 +0200

Going to move sound player and sound info to property
---
 data/themes/default/widgets/layout.edc | 62 +-
 1 file changed, 8 insertions(+), 54 deletions(-)

diff --git a/data/themes/default/widgets/layout.edc 
b/data/themes/default/widgets/layout.edc
index 3ec6fa7..37b810b 100644
--- a/data/themes/default/widgets/layout.edc
+++ b/data/themes/default/widgets/layout.edc
@@ -2432,41 +2432,20 @@ group { name: "elm/layout/image_editor/preview";
 }
 
 group { name: "elm/layout/sound_editor/default";
-   images {
-  image: "separator-horizontal.png" COMP;
-   }
parts {
-  part { name: "area.info";
- type: SPACER;
- scale: 1;
- description { state: "default" 0.0;
-align: 1.0 1.0;
-SET_SIZE(320, 200);
- }
-  }
-  part { name: "area.player";
- type: SPACER;
- scale: 1;
- description { state: "default" 0.0;
-align: 1.0 0.0;
-SET_SIZE(320, 180);
-rel2 {
-   relative: 1.0 0.0;
-   to_y: "area.info";
-}
- }
-  }
   part { name: "area.edit";
  type: SPACER;
  scale: 1;
  description { state: "default" 0.0;
 align: 1.0 0.0;
-min: 0 40;
-max: -1 40;
+fixed: 1 1;
+min: 37 25;
+max: -1 25;
+rel1 {
+   offset: 0 2;
+}
 rel2 {
-   relative: 0.0 1.0;
-   offset: -7 -1;
-   to_x: "area.player";
+   relative: 1.0 0.0;
 }
  }
   }
@@ -2489,33 +2468,8 @@ group { name: "elm/layout/sound_editor/default";
 fixed: 1 1;
 rel1 {
relative: 0.0 1.0;
-   to: "padding.edit_area";
-}
-rel2 {
-   relative: 0.0 1.0;
-   offset: -7 -1;
-   to_x: "area.player";
-}
- }
-  }
-  part { name: "player";
- type: SWALLOW;
- scale: 1;
- description { state: "default" 0.0;
-fixed: 1 1;
-rel1.to: "area.player";
-rel2.to: "area.player";
- }
-  }
-  part { name: "sound_info";
- type: SWALLOW;
- description { state: "default" 0.0;
-align: 0.5 0.0;
-rel1 {
-   offset: 6 6;
-   to: "area.info";
+   to_y: "area.edit";
 }
-rel2.to: "area.info";
  }
   }
   part { name: "swallow.search_area";

-- 

[EGIT] [tools/eflete] master 25/52: workspace: select default radio

[Vyacheslav Reutskiy]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=9d75939aa75580c751d6121a45d842fc952f2041

commit 9d75939aa75580c751d6121a45d842fc952f2041
Author: Vyacheslav Reutskiy 
Date:   Mon Nov 9 16:00:28 2015 +0200

workspace: select default radio

Change-Id: I8285032f0358ab2a2246b00d08909e0392b95544
---
 src/bin/ui/workspace/workspace.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c
index c22362b..60204de 100644
--- a/src/bin/ui/workspace/workspace.c
+++ b/src/bin/ui/workspace/workspace.c
@@ -985,6 +985,7 @@ _mode_part_add(Evas_Object *parent)
 
radio_group = radio_mode = elm_radio_add(parent);
elm_radio_state_value_set(radio_mode, 1);
+   elm_radio_value_set(radio_mode, true);
elm_box_pack_end(parent, radio_mode);
evas_object_show(radio_mode);
 

-- 

[EGIT] [tools/eflete] master 20/52: Merge "sound_editor: remove old code (CID 85131)"

[Gerrit User]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=d7cd1af3c2cd79b5a7b5f6a930d23548a3f5170c

commit d7cd1af3c2cd79b5a7b5f6a930d23548a3f5170c
Merge: aac45ec 5564ec1
Author: Gerrit User 
Date:   Wed Nov 11 07:46:23 2015 +0200

Merge "sound_editor: remove old code (CID 85131)"

 src/bin/ui/editors/sound_editor.c | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

-- 

[EGIT] [tools/eflete] master 05/52: project_navigator: set the corrent string to entry

[Vyacheslav Reutskiy]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=811aab3c970fe45d1f7006cd2eb47379998fc482

commit 811aab3c970fe45d1f7006cd2eb47379998fc482
Author: Vyacheslav Reutskiy 
Date:   Mon Nov 9 12:19:39 2015 +0200

project_navigator: set the corrent string to entry

@fix #48271

Change-Id: I5ef792063d01bb258189a64ee7e8a4f00f0c45cd
---
 src/bin/ui/project_navigator.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/bin/ui/project_navigator.c b/src/bin/ui/project_navigator.c
index 2ef25c2..dde50df 100644
--- a/src/bin/ui/project_navigator.c
+++ b/src/bin/ui/project_navigator.c
@@ -440,7 +440,8 @@ _btn_add_group_cb(void *data __UNUSED__,
elm_layout_content_set(item, NULL, layout_p.entry);
elm_box_pack_end(layout_p.box, item);
glit = elm_genlist_selected_item_get(project_navigator.genlist);
-   if (glit) elm_entry_entry_set(layout_p.entry, 
elm_object_item_data_get(glit));
+   if (glit && (elm_genlist_item_item_class_get(item) == 
project_navigator.itc_folder))
+ elm_entry_entry_set(layout_p.entry, elm_object_item_data_get(glit));
/* copy: combobox */
LAYOUT_PROP_ADD(layout_p.box, _("copy of"), "property", "1swallow")
layout_p.layout_combo = item;

-- 

[EGIT] [tools/eflete] master 30/52: property_image: usage_info frame and fill with content

[Vitalii Vorobiov]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=53614760bb2736efb8762c0cad63560c798afc28

commit 53614760bb2736efb8762c0cad63560c798afc28
Author: Vitalii Vorobiov 
Date:   Mon Nov 9 16:48:26 2015 +0200

property_image: usage_info frame and fill with content
---
 src/bin/ui/property_image.c | 104 +++-
 1 file changed, 103 insertions(+), 1 deletion(-)

diff --git a/src/bin/ui/property_image.c b/src/bin/ui/property_image.c
index d3098a4..11c3ac0 100644
--- a/src/bin/ui/property_image.c
+++ b/src/bin/ui/property_image.c
@@ -34,6 +34,12 @@
Image_Prop_Data *pd = evas_object_data_get(property, IMAGE_PROP_DATA); \
assert(pd != NULL);
 
+typedef struct _Search_Data Search_Data;
+struct _Search_Data
+{
+   Evas_Object *search_entry;
+   Elm_Object_Item *last_item_found;
+};
 struct _Image_Prop_Data
 {
Evas_Object *box;
@@ -50,6 +56,10 @@ struct _Image_Prop_Data
Evas_Object *usage_list;
Evas_Object *info_frame;
 
+   Search_Data usage_search_data;
+   Evas_Object *usage_genlist;
+   Evas_Object *usage_frame;
+
Eina_Stringshare *selected_image;
 };
 typedef struct _Image_Prop_Data Image_Prop_Data;
@@ -222,11 +232,93 @@ _on_image_selected(void *data,
  }
 }
 
+ITEM_SEARCH_FUNC(genlist, ELM_GENLIST_ITEM_SCROLLTO_MIDDLE, NULL)
+static void
+_on_usage_search_entry_changed_cb(void *data,
+  Evas_Object *obj __UNUSED__,
+  void *event_info __UNUSED__)
+{
+   Image_Prop_Data *pd = data;
+
+   assert(pd != NULL);
+
+   _genlist_item_search(pd->usage_genlist,
+&(pd->usage_search_data),
+pd->usage_search_data.last_item_found);
+}
+static void
+_search_next_genlist_item_cb(void *data,
+ Evas_Object *obj __UNUSED__,
+ void *event_info __UNUSED__)
+{
+   Image_Prop_Data *pd = data;
+   Elm_Object_Item *start_from = NULL;
+
+   assert(pd != NULL);
+
+   if (pd->usage_search_data.last_item_found)
+ {
+start_from =
+   elm_genlist_item_next_get(pd->usage_search_data.last_item_found);
+ }
+
+   _genlist_item_search(pd->usage_genlist,
+&(pd->usage_search_data), start_from);
+}
+static inline Evas_Object *
+_image_editor_search_field_create(Evas_Object *parent)
+{
+   Evas_Object *entry, *icon;
+
+   assert(parent != NULL);
+
+   ENTRY_ADD(parent, entry, true);
+   elm_object_part_text_set(entry, "guide", _("Search"));
+   ICON_STANDARD_ADD(entry, icon, true, "search");
+   elm_object_part_content_set(entry, "elm.swallow.end", icon);
+   return entry;
+}
+static Evas_Object *
+_image_usage_layout_create(Image_Prop_Data *pd)
+{
+   Evas_Object *layout = NULL;
+   Evas_Object *genlist = NULL;
+   Evas_Object *entry = NULL;
+   Evas_Object *parent = NULL;
+
+   assert(pd != NULL);
+   parent = pd->usage_frame;
+
+   layout = elm_layout_add(parent);
+   elm_layout_theme_set(layout, "layout", "image_editor", "usage_info");
+   evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, 
EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(layout, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_show(layout);
+
+   genlist = elm_genlist_add(layout);
+   evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND, 
EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_show(genlist);
+   elm_object_part_content_set(layout, "eflete.swallow.genlist", genlist);
+   pd->usage_genlist = genlist;
+
+   entry = _image_editor_search_field_create(layout);
+   elm_object_part_content_set(layout, "eflete.swallow.search_line", entry);
+   evas_object_smart_callback_add(entry, "changed",
+  _on_usage_search_entry_changed_cb, pd);
+   evas_object_smart_callback_add(entry, "activated",
+  _search_next_genlist_item_cb, pd);
+   pd->usage_search_data.search_entry = entry;
+   pd->usage_search_data.last_item_found = NULL;
+   evas_object_hide(layout);
+   return layout;
+}
+
 Evas_Object *
 ui_property_image_add(Evas_Object *parent)
 {
Image_Prop_Data *pd;
-   Evas_Object *item, *box;
+   Evas_Object *item, *box, *layout;
 
assert(parent != NULL);
 
@@ -269,6 +361,16 @@ ui_property_image_add(Evas_Object *parent)
elm_object_content_set(pd->info_frame, box);
elm_box_pack_end(pd->box, pd->info_frame);
 
+   /* Frame with usage */
+   FRAME_PROPERTY_ADD(pd->box, pd->usage_frame, true, _("Usage"), pd->box)
+   BOX_ADD(pd->info_frame, box, false, false);
+   elm_box_align_set(box, 0.5, 0.0);
+
+   layout = _image_usage_layout_create(pd);
+
+   elm_object_content_set(pd->usage_frame, layout);
+   elm_box_pack_end(pd->box, pd->usage_frame);
+
evas_object_smart_callback_add(ap.win, SIGNAL_IMAGE_SELECTED, 
_on_image_selected, pd->box);
 
return pd->box;

-- 

[EGIT] [tools/eflete] master 16/52: Merge "workspace: remove extra unset call"

[Gerrit User]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=cedd6881eef0d014a2540a4e652e8c284038d27a

commit cedd6881eef0d014a2540a4e652e8c284038d27a
Merge: e617cb6 6a3e0fb
Author: Gerrit User 
Date:   Wed Nov 11 07:45:23 2015 +0200

Merge "workspace: remove extra unset call"

 src/bin/ui/workspace/workspace.c | 1 -
 1 file changed, 1 deletion(-)

-- 

[EGIT] [tools/eflete] master 49/52: Merge "demo: add module demo"

[Gerrit User]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=2bb9edec2fd01029638b075b54fb900375042b2f

commit 2bb9edec2fd01029638b075b54fb900375042b2f
Merge: a9172ea 86a2167
Author: Gerrit User 
Date:   Fri Nov 13 07:27:51 2015 +0200

Merge "demo: add module demo"

 src/bin/Makefile.am |  1 +
 src/bin/ui/live_view/demo.c | 54 +
 src/bin/ui/live_view/demo.h | 41 ++
 3 files changed, 96 insertions(+)

-- 

[EGIT] [tools/eflete] master 02/52: use same layout for both navigators

[Andrii Kroitor]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=11cb09ccabc4d0b791775a3fb36058f6b1ddcb68

commit 11cb09ccabc4d0b791775a3fb36058f6b1ddcb68
Author: Andrii Kroitor 
Date:   Mon Nov 9 11:35:46 2015 +0200

use same layout for both navigators
---
 data/themes/default/widgets/layout.edc | 136 +++--
 src/bin/ui/group_navigator.c   |  14 ++--
 src/bin/ui/project_navigator.c |   4 +-
 3 files changed, 18 insertions(+), 136 deletions(-)

diff --git a/data/themes/default/widgets/layout.edc 
b/data/themes/default/widgets/layout.edc
index e64d001..acc1a6c 100644
--- a/data/themes/default/widgets/layout.edc
+++ b/data/themes/default/widgets/layout.edc
@@ -401,7 +401,7 @@ group { name: "elm/layout/navigator/default";
 rel2 {
relative: 0.0 1.0;
offset: -4 -1;
-   to_x: "elm.swallow.bt1";
+   to_x: "elm.swallow.btn3";
to_y: "area.top";
 }
 text {
@@ -421,7 +421,7 @@ group { name: "elm/layout/navigator/default";
 rel2 {
relative: 0.0 1.0;
offset: -4 -1;
-   to_x: "elm.swallow.bt1";
+   to_x: "elm.swallow.btn3";
to_y: "area.top";
 }
 text {
@@ -442,7 +442,7 @@ group { name: "elm/layout/navigator/default";
 rel2.offset: -4 -4;
  }
   }
-  part { name: "elm.swallow.bt0";
+  part { name: "elm.swallow.btn0";
  type: SWALLOW;
  description { state: "default" 0.0;
 align: 1.0 0.5;
@@ -456,7 +456,7 @@ group { name: "elm/layout/navigator/default";
 }
  }
   }
-  part { name: "elm.swallow.bt1";
+  part { name: "elm.swallow.btn1";
  type: SWALLOW;
  description { state: "default" 0.0;
 align: 1.0 0.5;
@@ -467,130 +467,12 @@ group { name: "elm/layout/navigator/default";
 rel2 {
relative: 0.0 1.0;
offset: -4 0;
-   to_x: "elm.swallow.bt0";
+   to_x: "elm.swallow.btn0";
to_y: "area.top";
 }
  }
   }
-   }
-   programs {
-  program { name: "enabled";
- signal: "elm,state,enabled";
- source: "elm";
- action: STATE_SET "default" 0.0;
- target: "elm.text";
-  }
-  program { name: "disabled";
- signal: "elm,state,disabled";
- source: "elm";
- action: STATE_SET "disabled" 0.0;
- target: "elm.text";
-  }
-   }
-}
-
-group { name: "elm/layout/group_navigator/default";
-   parts {
-  part { name: "bg";
- type: RECT;
- description { state: "default" 0.0;
-color: 80 82 83 255;
- }
-  }
-  part { name: "area.top";
- type: SPACER;
- description { state: "default" 0.0;
-align: 0.5 0.0;
-fixed: 0 1;
-min: 0 23;
-max: -1 23;
- }
-  }
-  part { name: "elm.text";
- type: TEXT;
- description { state: "default" 0.0;
-align: 0.5 0.5;
-fixed: 1 1;
-color_class: "main";
-rel1 {
-   offset: 20 0;
-   to: "area.top";
-}
-rel2 {
-   relative: 0.0 1.0;
-   offset: -4 -1;
-   to_x: "elm.swallow.btn_add";
-   to_y: "area.top";
-}
-text {
-   font: "PT";
-   size: 13;
-   align: 0.0 0.5;
-}
- }
- description { state: "disabled" 0.0;
-align: 0.5 0.5;
-fixed: 1 1;
-color_class: "main_disabled";
-rel1 {
-   offset: 20 0;
-   to: "area.top";
-}
-rel2 {
-   relative: 0.0 1.0;
-   offset: -4 -1;
-   to_x: "elm.swallow.btn_add";
-   to_y: "area.top";
-}
-text {
-   font: "pt";
-   size: 15;
-   align: 0.0 0.5;
-}
- }
-  }
-  part { name: "elm.swallow.content";
- type: SWALLOW;
- description { state: "default" 0.0;
-rel1 {
-   relative: 0.0 1.0;
-   offset: 3 3;
-   to_y: "area.top";
-}
-rel2.offset: -4 -4;
- }
-  }
-  part { name: "elm.swallow.btn_up";
- type: SWALLOW;
- description { state: "default" 0.0;
-align: 1.0 0.5;
-fixed: 1 1;
-min: 18 19;
-max: 18 19;
-rel1.to_y: "area.top";
-rel2 {
-   offset: -4 -1;
-   to_y: "area.top";
-}
- }
-  }
-  part { name: "elm.swallow.btn_down";
- type: 

[EGIT] [tools/eflete] master 42/52: workspace: posible change workspace mode to separate and normal

[Vyacheslav Reutskiy]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=cbbda4a6e2dc773ac9c2392f22059e184a862920

commit cbbda4a6e2dc773ac9c2392f22059e184a862920
Author: Vyacheslav Reutskiy 
Date:   Wed Nov 11 10:24:13 2015 +0200

workspace: posible change workspace mode to separate and normal

Change-Id: Ie18a43fd17d579f11256d13e63b0c24ce4b96ebd
---
 src/bin/ui/workspace/workspace.c | 123 +++
 1 file changed, 73 insertions(+), 50 deletions(-)

diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c
index 60204de..f42291e 100644
--- a/src/bin/ui/workspace/workspace.c
+++ b/src/bin/ui/workspace/workspace.c
@@ -87,6 +87,7 @@ struct _Ws_Smart_Data
Evas_Object *scroller;/**< A scroler with 'eflete/workspace' style. 
\
Implement scrollable interface.*/
char scroll_flag; /**< Needed for control drag bar's in 
scroller*/
+   Evas_Object *bottom_box;
Evas_Object *groupedit;   /**< A groupedit smart object, \
needed for view and edit style.*/
 
@@ -952,126 +953,148 @@ _workspace_smart_add(Evas_Object *o)
 }
 
 static void
-_zoom_part_add(Evas_Object *parent)
+_mode_changed(void *data,
+  Evas_Object *obj,
+  void *event_info __UNUSED__)
+{
+   Ws_Smart_Data *sd = (Ws_Smart_Data *)data;
+
+   switch (elm_radio_state_value_get(obj))
+ {
+  case 1:
+ workspace_separate_mode_set(sd->obj, false);
+ break;
+  case 2:
+ workspace_separate_mode_set(sd->obj, true);
+ break;
+  case 3: break;
+  case 4: break;
+  case 5: break;
+  default: break;
+ }
+}
+
+static void
+_zoom_part_add(Ws_Smart_Data *sd)
 {
Evas_Object *image, *slider_zoom;
Evas_Object *button_resize, *button_zoom;
 
-   button_resize = elm_button_add(parent);
-   elm_box_pack_end(parent, button_resize);
+   button_resize = elm_button_add(sd->scroller);
+   elm_box_pack_end(sd->bottom_box, button_resize);
evas_object_show(button_resize);
 
-   button_zoom = elm_button_add(parent);
+   button_zoom = elm_button_add(sd->scroller);
elm_object_text_set(button_zoom, N_("100%"));
-   elm_box_pack_end(parent, button_zoom);
+   elm_box_pack_end(sd->bottom_box, button_zoom);
evas_object_show(button_zoom);
 
-   slider_zoom = elm_slider_add(parent);
-   image = elm_image_add(parent);
+   slider_zoom = elm_slider_add(sd->scroller);
+   image = elm_image_add(sd->bottom_box);
elm_image_file_set(image, EFLETE_IMG_PATH"scale-smaller.png", NULL);
elm_object_part_content_set(slider_zoom, "elm.swallow.icon", image);
 
-   image = elm_image_add(parent);
+   image = elm_image_add(sd->scroller);
elm_image_file_set(image, EFLETE_IMG_PATH"scale-larger.png", NULL);
elm_object_part_content_set(slider_zoom, "elm.swallow.end", image);
-   elm_box_pack_end(parent, slider_zoom);
+   elm_box_pack_end(sd->bottom_box, slider_zoom);
evas_object_show(slider_zoom);
 }
 
 static void
-_mode_part_add(Evas_Object *parent)
+_mode_part_add(Ws_Smart_Data *sd)
 {
Evas_Object *radio_mode, *radio_group;
 
-   radio_group = radio_mode = elm_radio_add(parent);
+   radio_group = radio_mode = elm_radio_add(sd->scroller);
elm_radio_state_value_set(radio_mode, 1);
elm_radio_value_set(radio_mode, true);
-   elm_box_pack_end(parent, radio_mode);
+   evas_object_smart_callback_add(radio_mode, "changed", _mode_changed, sd);
+   elm_box_pack_end(sd->bottom_box, radio_mode);
evas_object_show(radio_mode);
 
-   radio_mode = elm_radio_add(parent);
+   radio_mode = elm_radio_add(sd->scroller);
elm_radio_state_value_set(radio_mode, 2);
-   elm_box_pack_end(parent, radio_mode);
+   evas_object_smart_callback_add(radio_mode, "changed", _mode_changed, sd);
+   elm_box_pack_end(sd->bottom_box, radio_mode);
evas_object_show(radio_mode);
elm_radio_group_add(radio_mode, radio_group);
 
-   radio_mode = elm_radio_add(parent);
+   radio_mode = elm_radio_add(sd->scroller);
elm_radio_state_value_set(radio_mode, 3);
-   elm_box_pack_end(parent, radio_mode);
+   evas_object_smart_callback_add(radio_mode, "changed", _mode_changed, sd);
+   elm_box_pack_end(sd->bottom_box, radio_mode);
evas_object_show(radio_mode);
elm_radio_group_add(radio_mode, radio_group);
 
-   radio_mode = elm_radio_add(parent);
+   radio_mode = elm_radio_add(sd->scroller);
elm_radio_state_value_set(radio_mode, 4);
-   elm_box_pack_end(parent, radio_mode);
+   evas_object_smart_callback_add(radio_mode, "changed", _mode_changed, sd);
+   elm_box_pack_end(sd->bottom_box, radio_mode);
evas_object_show(radio_mode);
elm_radio_group_add(radio_mode, radio_group);
 
-   radio_mode = elm_radio_add(parent);
+   radio_mode = elm_radio_add(sd->scroller);
elm_radio_state_value_set(radio_mode, 5);
-   elm_box_pack_end(parent, radio_mode);
+   

[EGIT] [tools/eflete] master 37/52: group_navigator: fix del button disabling

[Andrii Kroitor]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=ef495fc7106808cfbbc4f7645ed6037af14e25e4

commit ef495fc7106808cfbbc4f7645ed6037af14e25e4
Author: Andrii Kroitor 
Date:   Wed Nov 11 11:31:57 2015 +0200

group_navigator: fix del button disabling
---
 src/bin/ui/group_navigator.c | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/bin/ui/group_navigator.c b/src/bin/ui/group_navigator.c
index 0e3e166..e677253 100644
--- a/src/bin/ui/group_navigator.c
+++ b/src/bin/ui/group_navigator.c
@@ -401,6 +401,7 @@ _selected_cb(void *data,
  void *event_info)
 {
Elm_Object_Item *glit = event_info;
+   Elm_Object_Item *glit_part;
const Elm_Genlist_Item_Class* itc;
Eina_Stringshare *item_name;
Part_List *pl = data;
@@ -415,20 +416,21 @@ _selected_cb(void *data,
else
  item_name = NULL;
 
-   while (elm_genlist_item_parent_get(glit))
- glit = elm_genlist_item_parent_get(glit);
+   glit_part = glit;
+   while (elm_genlist_item_parent_get(glit_part))
+ glit_part = elm_genlist_item_parent_get(glit_part);
 
-   part = elm_object_item_data_get(glit);
-   if ((pl->selected_part_item != glit) || (part->current_item_name != 
item_name))
+   part = elm_object_item_data_get(glit_part);
+   if ((pl->selected_part_item != glit_part) || (part->current_item_name != 
item_name))
  {
 if (pl->selected_part_item)
   _unselect_part(pl);
-pl->selected_part_item = glit;
+pl->selected_part_item = glit_part;
 part->current_item_name = item_name;
 pl->group->current_part = part;
 evas_object_smart_callback_call(pl->layout, 
SIGNAL_GROUP_NAVIGATOR_PART_SELECTED,
 (void *)part);
-elm_genlist_item_item_class_update(glit, pl->itc_part_selected);
+elm_genlist_item_item_class_update(glit_part, pl->itc_part_selected);
  }
elm_object_item_disabled_set(pl->add_state_menu_item, false);
if ((itc == pl->itc_item_caption) ||

-- 

[EGIT] [tools/eflete] master 06/52: property_macros: use frame to show image preview

[Vitalii Vorobiov]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=e93ddbee638deb962892b29b9c5bbb5d7e81d927

commit e93ddbee638deb962892b29b9c5bbb5d7e81d927
Author: Vitalii Vorobiov 
Date:   Fri Nov 6 16:48:34 2015 +0200

property_macros: use frame to show image preview

Move FRAME_PROPERTY_ADD, since it will be used in
editor props (image, group etc).
Set default size for image preview since it will be used inside of a frame
---
 data/themes/default/widgets/layout.edc | 24 +
 src/bin/ui/property.c  | 29 +
 src/bin/ui/property_group.c| 47 --
 src/bin/ui/property_image.c| 13 +++---
 src/bin/ui/property_macros.h   | 17 
 src/bin/ui/property_private.h  |  6 +
 6 files changed, 57 insertions(+), 79 deletions(-)

diff --git a/data/themes/default/widgets/layout.edc 
b/data/themes/default/widgets/layout.edc
index acc1a6c..3ec6fa7 100644
--- a/data/themes/default/widgets/layout.edc
+++ b/data/themes/default/widgets/layout.edc
@@ -2422,32 +2422,10 @@ group { name: "elm/layout/image_editor/default";
 
 group { name: "elm/layout/image_editor/preview";
parts {
-  part { name: "image_preview_decoration";
- type: IMAGE;
- description { state: "default" 0.0;
-align: 0.0 0.0;
-fixed: 1 1;
-aspect: 1.0 1.0;
-aspect_preference: BOTH;
-color: 48 48 48 255;
-image {
-   normal: "border_1.png";
-   border: 1 1 1 1;
-   middle: NONE;
-}
- }
-  }
   part { name: "eflete.swallow.image";
  type: SWALLOW;
  description { state: "default" 0.0;
-rel1 {
-   offset: 2 2;
-   to: "image_preview_decoration";
-}
-rel2 {
-   offset: -3 -3;
-   to: "image_preview_decoration";
-}
+min: 1 300;
  }
   }
}
diff --git a/src/bin/ui/property.c b/src/bin/ui/property.c
index c0123bc..5295d56 100644
--- a/src/bin/ui/property.c
+++ b/src/bin/ui/property.c
@@ -44,6 +44,35 @@
Prop_Data *pd = evas_object_data_get(property, PROP_DATA); \
assert(pd != NULL);
 
+TODO("remove this hack after scroller would be fixed")
+/*
+ * Hack start
+ */
+void
+_on_frame_click(void *data,
+Evas_Object *obj,
+void *event_info __UNUSED__)
+{
+   Evas_Object *scroller = (Evas_Object *)data;
+   Evas_Object *box, *frame_box;
+   int h_box, h_frame_box, h_scr, y_reg, h_reg, y_frame;
+   box = elm_object_content_get(scroller);
+   evas_object_geometry_get(scroller, NULL, NULL, NULL, _scr);
+   evas_object_geometry_get(box, NULL, NULL, NULL, _box);
+   frame_box = elm_object_content_get(obj);
+   evas_object_geometry_get(frame_box, NULL, _frame, NULL, _frame_box);
+   elm_scroller_region_get(scroller, NULL, _reg, NULL, _reg);
+   elm_scroller_region_bring_in(scroller, 0.0, y_reg + 1, 0.0, h_reg);
+   if (!elm_frame_collapse_get(obj))
+ {
+if (h_box == h_scr + y_reg)
+  elm_scroller_region_show(scroller, 0.0, y_reg + h_frame_box, 0.0, 
h_reg);
+else
+  elm_scroller_region_bring_in(scroller, 0.0, y_reg + 1, 0.0, h_reg);
+ }
+}
+/* Hack end */
+
 /* enum for identifying current property
  (group's, image's, sound's or other kind of peroperty) */
 enum _Property_Type {
diff --git a/src/bin/ui/property_group.c b/src/bin/ui/property_group.c
index 3af2071..1dbe93c 100644
--- a/src/bin/ui/property_group.c
+++ b/src/bin/ui/property_group.c
@@ -44,14 +44,6 @@
Group_Prop_Data *pd = evas_object_data_get(property, GROUP_PROP_DATA); \
assert(pd != NULL);
 
-/*
- * Callback is added for frames at property box to correct scroller
- * work while each frame would be expanded/collapsed
- */
-#define FRAME_PROPERTY_ADD(PARENT, FRAME, AUTOCOLLAPSE, TITLE, SCROLLER) \
-FRAME_ADD(PARENT, FRAME, AUTOCOLLAPSE, TITLE) \
-evas_object_smart_callback_add(FRAME, "clicked", _on_frame_click, SCROLLER);
-
 struct _Group_Prop_Data
 {
Group *group;
@@ -453,35 +445,6 @@ _on_spinner_mouse_wheel(void *data __UNUSED__,
mev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
 }
 
-TODO("remove this hack after scroller would be fixed")
-/*
- * Hack start
- */
-static void
-_on_frame_click(void *data,
-Evas_Object *obj,
-void *event_info __UNUSED__)
-{
-   Evas_Object *scroller = (Evas_Object *)data;
-   Evas_Object *box, *frame_box;
-   int h_box, h_frame_box, h_scr, y_reg, h_reg, y_frame;
-   box = elm_object_content_get(scroller);
-   evas_object_geometry_get(scroller, NULL, NULL, NULL, _scr);
-   evas_object_geometry_get(box, NULL, NULL, NULL, _box);
-   frame_box = elm_object_content_get(obj);
-   evas_object_geometry_get(frame_box, NULL, _frame, NULL, _frame_box);
-   

[EGIT] [tools/eflete] master 45/52: editor: fix CID 85369, 85370, 85371

[Andrii Kroitor]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=3888fad3fb63192d9a7e7e212511f05f58b9ca41

commit 3888fad3fb63192d9a7e7e212511f05f58b9ca41
Author: Andrii Kroitor 
Date:   Thu Nov 12 14:35:20 2015 +0200

editor: fix CID 85369, 85370, 85371
---
 src/bin/editor/editor_macro.h | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/bin/editor/editor_macro.h b/src/bin/editor/editor_macro.h
index 0eaae00..c5b351f 100644
--- a/src/bin/editor/editor_macro.h
+++ b/src/bin/editor/editor_macro.h
@@ -161,7 +161,10 @@ editor_state_## FUNC ##_set(Evas_Object *edit_object, 
Change *change, Eina_Bool
if (!edje_edit_state_## FUNC ##_set(edit_object, part_name, state_name, 
state_val, new_val)) \
  { \
 if (!edje_edit_state_## FUNC ##_set(edit_object, part_name, 
state_name, state_val, FALLBACK_VAL)) \
-   return false; \
+  { \
+ diff_free(diff); \
+ return false; \
+  } \
 if (diff) \
   { \
 eina_stringshare_del(diff->redo.args.type_ssds.s4); \

-- 

[EGIT] [tools/eflete] master 12/52: sound_editor: remove unused code (CID 85130)

[Andrii Kroitor]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=a84c06d1625f864ab5756473884774ec02b38687

commit a84c06d1625f864ab5756473884774ec02b38687
Author: Andrii Kroitor 
Date:   Mon Nov 9 18:39:48 2015 +0200

sound_editor: remove unused code (CID 85130)
---
 src/bin/ui/editors/sound_editor.c | 4 
 1 file changed, 4 deletions(-)

diff --git a/src/bin/ui/editors/sound_editor.c 
b/src/bin/ui/editors/sound_editor.c
index d280bc5..8b21904 100644
--- a/src/bin/ui/editors/sound_editor.c
+++ b/src/bin/ui/editors/sound_editor.c
@@ -1157,7 +1157,6 @@ _add_sample_done(void *data,
  Evas_Object *obj,
  void *event_info)
 {
-   Sound *snd;
Item *it;
Eina_Stringshare *sound_name;
Eina_List *samples_list, *l;
@@ -1210,9 +1209,6 @@ _add_sample_done(void *data,
 
 edje_edit_sound_sample_add(ap.project->global_object, res->name, 
res->source);
 
-snd = (Sound *)mem_calloc(1, sizeof(Sound));
-snd->name = eina_stringshare_add(file_name);
-snd->src = eina_stringshare_add(res->source);
 it = (Item *)mem_calloc(1, sizeof(Item));
 it->sound_name = eina_stringshare_add(sound_name);
 it->format = _sound_format_get(selected);

-- 

[EGIT] [tools/eflete] master 24/52: workspace: set text to zoom button

[Vyacheslav Reutskiy]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=95d406c64f8589832ccdf7bcc35c6977411c65f4

commit 95d406c64f8589832ccdf7bcc35c6977411c65f4
Author: Vyacheslav Reutskiy 
Date:   Mon Nov 9 16:00:01 2015 +0200

workspace: set text to zoom button

Change-Id: I7f5efbeb74472671345c76e5faa6fc6147fb9674
---
 src/bin/ui/workspace/workspace.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c
index 5d836ae..c22362b 100644
--- a/src/bin/ui/workspace/workspace.c
+++ b/src/bin/ui/workspace/workspace.c
@@ -962,6 +962,7 @@ _zoom_part_add(Evas_Object *parent)
evas_object_show(button_resize);
 
button_zoom = elm_button_add(parent);
+   elm_object_text_set(button_zoom, N_("100%"));
elm_box_pack_end(parent, button_zoom);
evas_object_show(button_zoom);
 

-- 

[EGIT] [tools/eflete] master 51/52: property: fix entry unfocus been too late

[Andrii Kroitor]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=77d23bee52a4c257a419c2ab1c0978fa24c0c700

commit 77d23bee52a4c257a419c2ab1c0978fa24c0c700
Author: Andrii Kroitor 
Date:   Mon Nov 16 11:03:13 2015 +0200

property: fix entry unfocus been too late
---
 src/bin/ui/property_macros.h | 4 
 1 file changed, 4 insertions(+)

diff --git a/src/bin/ui/property_macros.h b/src/bin/ui/property_macros.h
index ca79afc..b42ad13 100644
--- a/src/bin/ui/property_macros.h
+++ b/src/bin/ui/property_macros.h
@@ -169,6 +169,8 @@ _on_##MEMBER##_##VALUE##_start(void *data, \
void *ei __UNUSED__) \
 { \
Group_Prop_Data *pd = (Group_Prop_Data *)data; \
+   elm_object_focus_set(obj, true); /* there are problems with unfocusing 
entry.
+  elementary is too lazy to change focus in time 
*/ \
assert(pd->change == NULL); \
pd->change = change_add(NULL); \
pd->old_##TYPE##_val = 
edje_edit_##SUB##_##VALUE##_get(pd->group->edit_object ARGS); \
@@ -683,6 +685,8 @@ _on_group_##SUB1##_##VALUE##_start(void *data, \
void *ei __UNUSED__) \
 { \
Group_Prop_Data *pd = (Group_Prop_Data *)data; \
+   elm_object_focus_set(obj, true); /* there are problems with unfocusing 
entry.
+  elementary is too lazy to change focus in time 
*/ \
assert(pd->change == NULL); \
pd->change = change_add(DESCRIPTION);\
pd->old_int_val = 
edje_edit_group_##SUB1##_##VALUE##_get(pd->group->edit_object); \

-- 

[EGIT] [tools/eflete] master 18/52: Merge "validator: fix CID 85129"

[Gerrit User]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=28af015a7e337837fe1e51ada84a29c29f5c0bfc

commit 28af015a7e337837fe1e51ada84a29c29f5c0bfc
Merge: daa3970 bb6dbf0
Author: Gerrit User 
Date:   Wed Nov 11 07:45:55 2015 +0200

Merge "validator: fix CID 85129"

 src/bin/common/validator.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 

[EGIT] [tools/eflete] master 40/52: group_manager: do not try to delete font resource yet

[Vitalii Vorobiov]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=378cbd95d5743b14b844346dce53b94ec046e273

commit 378cbd95d5743b14b844346dce53b94ec046e273
Author: Vitalii Vorobiov 
Date:   Wed Nov 11 14:11:30 2015 +0200

group_manager: do not try to delete font resource yet

We can't work with fonts since there are no font editors yet
Uncomment when it will be done
---
 src/bin/project_manager/group_manager.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/bin/project_manager/group_manager.c 
b/src/bin/project_manager/group_manager.c
index d48fa0c..b1ec99a 100644
--- a/src/bin/project_manager/group_manager.c
+++ b/src/bin/project_manager/group_manager.c
@@ -534,7 +534,10 @@ gm_state_del(Project *pro, State *state)
  break;
   case EDJE_PART_TYPE_TEXT:
  USAGE_DEL(color_class, pro->colorclasses);
- USAGE_DEL(font, pro->fonts);
+ TODO("Uncomment this when font editor would be implemented,"
+  "or else it caused eflete to be aborted on part deletion");
+
+ /* USAGE_DEL(font, pro->fonts); */
  break;
   case EDJE_PART_TYPE_TEXTBLOCK:
  USAGE_DEL(text_style, pro->styles);

-- 

[EGIT] [tools/eflete] master 52/52: Merge branch 'master' of internal eflete repo

[Vyacheslav Reutskiy]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=6eb7717301148786b519bedb97743169dce7648d

commit 6eb7717301148786b519bedb97743169dce7648d
Merge: 52fdaf4 77d23be
Author: Vyacheslav Reutskiy 
Date:   Mon Nov 16 15:52:32 2015 +0200

Merge branch 'master' of internal eflete repo

 data/themes/default/widgets/layout.edc| 302 -
 data/themes/default/widgets/layouts/tabs.edc  | 211 ++
 po/POTFILES.in|   2 +-
 src/bin/Makefile.am   |   4 +-
 src/bin/common/signals.h  |  10 +-
 src/bin/common/validator.c|   3 +-
 src/bin/editor/editor_macro.h |  16 +-
 src/bin/editor/editor_states.c|  30 ++-
 src/bin/project_manager/group_manager.c   |   5 +-
 src/bin/ui/editors/image_editor.c | 297 -
 src/bin/ui/editors/sound_editor.c |  11 +-
 src/bin/ui/editors/style_editor.c | 236 ++--
 src/bin/ui/{part_list.c => group_navigator.c} | 152 +
 src/bin/ui/{part_list.h => group_navigator.h} |  16 +-
 src/bin/ui/history_ui.c   |   1 -
 src/bin/ui/live_view/demo.c   |  54 +
 src/bin/ui/{part_list.h => live_view/demo.h}  |  46 +---
 src/bin/ui/project_navigator.c|   9 +-
 src/bin/ui/property.c |  61 +-
 src/bin/ui/property_group.c   |  47 
 src/bin/ui/property_image.c   | 303 ++
 src/bin/ui/property_macros.h  |  21 ++
 src/bin/ui/property_private.h |   9 +
 src/bin/ui/property_sound.c   | 100 +
 src/bin/ui/shortcuts/shortcuts.c  |   2 +-
 src/bin/ui/tabs.c |  41 ++--
 src/bin/ui/workspace/workspace.c  | 240 
 src/bin/ui/workspace/workspace.h  |   2 +-
 28 files changed, 1378 insertions(+), 853 deletions(-)

-- 

[EGIT] [tools/eflete] master 19/52: Merge "sound_editor: remove unused code (CID 85130)"

[Gerrit User]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=aac45ecabf0ae7454c5d5c74bdd6e16cbfc6921b

commit aac45ecabf0ae7454c5d5c74bdd6e16cbfc6921b
Merge: 28af015 a84c06d
Author: Gerrit User 
Date:   Wed Nov 11 07:46:11 2015 +0200

Merge "sound_editor: remove unused code (CID 85130)"

 src/bin/ui/editors/sound_editor.c | 4 
 1 file changed, 4 deletions(-)

-- 

[EGIT] [tools/eflete] master 36/52: Merge "Property: select/unselect sound tab on click on it"

[Gerrit User]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=700a5449690c4b08db1ef743b107a0b65daf4751

commit 700a5449690c4b08db1ef743b107a0b65daf4751
Merge: 6a3e03c 18bae0b
Author: Gerrit User 
Date:   Thu Nov 12 08:50:42 2015 +0200

Merge "Property: select/unselect sound tab on click on it"

 src/bin/ui/property.c | 32 +---
 src/bin/ui/tabs.c |  2 +-
 2 files changed, 30 insertions(+), 4 deletions(-)

-- 

[EGIT] [tools/eflete] master 08/52: workspace: remove extra unset call

[Andrii Kroitor]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=6a3e0fb9d2dcc38eb98e6994657486eca444a3f4

commit 6a3e0fb9d2dcc38eb98e6994657486eca444a3f4
Author: Andrii Kroitor 
Date:   Mon Nov 9 16:08:01 2015 +0200

workspace: remove extra unset call

this unset is called in callback anyway
---
 src/bin/ui/workspace/workspace.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c
index 779f1c8..5d836ae 100644
--- a/src/bin/ui/workspace/workspace.c
+++ b/src/bin/ui/workspace/workspace.c
@@ -1397,7 +1397,6 @@ _on_groupedit_part_unselect(void *data,
 
WS_DATA_GET(workspace, sd);
 
-   workspace_highlight_unset(workspace);
group_navigator_part_select(sd->group_navigator, NULL);
 }
 

-- 

[EGIT] [tools/eflete] master 33/52: Property: select/unselect sound tab on click on it

[Elizabeth Shevchenko]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=18bae0bdb990a5174543cc12e3b831d5810a24a2

commit 18bae0bdb990a5174543cc12e3b831d5810a24a2
Author: Elizabeth Shevchenko 
Date:   Wed Nov 11 15:42:34 2015 +0200

Property: select/unselect sound tab on click on it
---
 src/bin/ui/property.c | 32 +---
 src/bin/ui/tabs.c |  2 +-
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/bin/ui/property.c b/src/bin/ui/property.c
index 5295d56..26a8dd6 100644
--- a/src/bin/ui/property.c
+++ b/src/bin/ui/property.c
@@ -77,7 +77,8 @@ _on_frame_click(void *data,
  (group's, image's, sound's or other kind of peroperty) */
 enum _Property_Type {
PROPERTY,
-   IMAGE_PROPERTY
+   IMAGE_PROPERTY,
+   SOUND_PROPERTY
 };
 typedef enum _Property_Type Property_Type;
 
@@ -108,6 +109,7 @@ _on_different_clicked(void *data,
/* hide everything */
evas_object_hide(pd->group_property);
evas_object_hide(pd->image_property);
+   evas_object_hide(pd->sound_property);
 
pd->type = PROPERTY;
 }
@@ -127,11 +129,32 @@ _on_image_editor_clicked(void *data,
elm_object_content_set(pd->layout, pd->image_property);
evas_object_hide(pd->group_property);
evas_object_show(pd->image_property);
+   evas_object_hide(pd->sound_property);
 
pd->type = IMAGE_PROPERTY;
 }
 
 static void
+_on_sound_editor_clicked(void *data,
+ Evas_Object *obj __UNUSED__,
+ void *event_info __UNUSED__)
+{
+   Evas_Object *property = data;
+   PROP_DATA_GET()
+
+   assert(pd != NULL);
+
+   ui_property_group_unset(pd->group_property);
+   elm_object_content_unset(pd->layout);
+   elm_object_content_set(pd->layout, pd->sound_property);
+   evas_object_hide(pd->group_property);
+   evas_object_hide(pd->image_property);
+   evas_object_show(pd->sound_property);
+
+   pd->type = SOUND_PROPERTY;
+}
+
+static void
 _on_tab_changed(void *data,
 Evas_Object *obj __UNUSED__,
 void *event_info)
@@ -149,13 +172,14 @@ _on_tab_changed(void *data,
 return;
  }
/* it has group here, and group's tab was clicked,
-  but if previous tab was image_property tab,
+  but if previous tab was image_property or sound_property tab,
   we need to remove it from there and set group property in there */
-   if (pd->type == IMAGE_PROPERTY)
+   if ((pd->type == IMAGE_PROPERTY) || (pd->type == SOUND_PROPERTY))
  {
 elm_object_content_unset(pd->layout);
 elm_object_content_set(pd->layout, pd->group_property);
 evas_object_hide(pd->image_property);
+evas_object_hide(pd->sound_property);
  }
ui_property_group_set(pd->group_property, group);
 
@@ -182,10 +206,12 @@ ui_property_add(Evas_Object *parent)
evas_object_data_set(pd->layout, PROP_DATA, pd);
 
pd->image_property = ui_property_image_add(pd->layout);
+   pd->sound_property = ui_property_sound_add(pd->layout);
 
/* register global callbacks */
evas_object_smart_callback_add(ap.win, SIGNAL_TAB_CHANGED, _on_tab_changed, 
pd->layout);
evas_object_smart_callback_add(ap.win, SIGNAL_IMAGE_EDITOR_TAB_CLICKED, 
_on_image_editor_clicked, pd->layout);
+   evas_object_smart_callback_add(ap.win, SIGNAL_SOUND_EDITOR_TAB_CLICKED, 
_on_sound_editor_clicked, pd->layout);
evas_object_smart_callback_add(ap.win, SIGNAL_DIFFERENT_TAB_CLICKED, 
_on_different_clicked, pd->layout);
 
return pd->layout;
diff --git a/src/bin/ui/tabs.c b/src/bin/ui/tabs.c
index d1f0159..3f57159 100644
--- a/src/bin/ui/tabs.c
+++ b/src/bin/ui/tabs.c
@@ -126,7 +126,7 @@ _content_set(void *data,
 if (toolbar_item == tabs.menu.item_sound)
   {
  tabs_menu_tab_open(TAB_SOUND_EDITOR);
- evas_object_smart_callback_call(ap.win, 
SIGNAL_DIFFERENT_TAB_CLICKED, NULL);
+ evas_object_smart_callback_call(ap.win, 
SIGNAL_SOUND_EDITOR_TAB_CLICKED, NULL);
   }
 else if (toolbar_item == tabs.menu.item_text)
   {

-- 

[EGIT] [tools/eflete] master 46/52: Merge "editor: fix CID 85369, 85370, 85371"

[Gerrit User]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=6ccc217ad9a9dd8f0235d4f6dcfc4c1e2cbe54a7

commit 6ccc217ad9a9dd8f0235d4f6dcfc4c1e2cbe54a7
Merge: 27d8233 3888fad
Author: Gerrit User 
Date:   Thu Nov 12 14:37:47 2015 +0200

Merge "editor: fix CID 85369, 85370, 85371"

 src/bin/editor/editor_macro.h | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

-- 

[EGIT] [tools/eflete] master 32/52: image_editor: cleanup from old code

[Vitalii Vorobiov]

rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=32052cc13cd98dc83451b42438ccc8fa57a083aa

commit 32052cc13cd98dc83451b42438ccc8fa57a083aa
Author: Vitalii Vorobiov 
Date:   Mon Nov 9 17:31:09 2015 +0200

image_editor: cleanup from old code

Since it has been moved to property_image
---
 src/bin/ui/editors/image_editor.c | 297 --
 1 file changed, 297 deletions(-)

diff --git a/src/bin/ui/editors/image_editor.c 
b/src/bin/ui/editors/image_editor.c
index e7f2843..3e66d99 100644
--- a/src/bin/ui/editors/image_editor.c
+++ b/src/bin/ui/editors/image_editor.c
@@ -61,31 +61,9 @@ struct _Image_Editor
Evas_Object *gengrid;
Evas_Object *layout;
Search_Data image_search_data;
-   Search_Data usage_search_data;
-   struct {
-  Evas_Object *tabs;
-  Evas_Object *image_info;
-  Evas_Object *image_usage;
-  Elm_Object_Item *item_image_info; //kill
-  Elm_Object_Item *item_image_usage; //kill
-   } property;
-   struct {
-  Evas_Object *genlist;
-   } image_usage_fields;
-   struct {
-  const char  *image_name;
-  Evas_Object *layout;
-  Evas_Object *image;
-  Evas_Object *file_name;
-  Evas_Object *comp;
-  Evas_Object *quality;
-   } image_data_fields;
 };
 
 static Elm_Gengrid_Item_Class *gic = NULL;
-static Elm_Genlist_Item_Class *_itc_group = NULL;
-static Elm_Genlist_Item_Class *_itc_part = NULL;
-static Elm_Genlist_Item_Class *_itc_state = NULL;
 
 static void _image_editor_del(Image_Editor *img_edit);
 
@@ -121,13 +99,7 @@ _image_editor_del(Image_Editor *img_edit)
evas_object_event_callback_del(img_edit->layout, EVAS_CALLBACK_DEL, 
_on_image_editor_del);
 
elm_gengrid_item_class_free(gic);
-   elm_genlist_item_class_free(_itc_group);
-   elm_genlist_item_class_free(_itc_part);
-   elm_genlist_item_class_free(_itc_state);
gic = NULL;
-   _itc_group = NULL;
-   _itc_part = NULL;
-   _itc_state = NULL;
evas_object_data_del(img_edit->layout, IMG_EDIT_KEY);
evas_object_data_del(img_edit->gengrid, IMG_EDIT_KEY);
//evas_object_del(img_edit->gengrid);
@@ -228,116 +200,6 @@ _grid_del(void *data,
 }
 
 static void
-_grid_group_item_del(void *data, Evas_Object *obj __UNUSED__)
-{
-   if (data)
- eina_stringshare_del(data);
-}
-
-static char *
-_grid_group_item_label_get(void *data,
-   Evas_Object *obj __UNUSED__,
-   const char  *part)
-{
-   if ((part) && (!strcmp(part, "elm.text")))
- return strdup(data);
-   else
- return NULL;
-}
-
-static inline void
-genlist_item_classes_init()
-{
-   if (!_itc_group)
- {
-_itc_group = elm_genlist_item_class_new();
-_itc_group->item_style = "title";
-_itc_group->func.text_get = _grid_group_item_label_get;
-_itc_group->func.content_get = NULL;
-_itc_group->func.state_get = NULL;
-_itc_group->func.del = _grid_group_item_del;
- }
-   if (!_itc_part)
- {
-_itc_part = elm_genlist_item_class_new();
-_itc_part->item_style = "default";
-_itc_part->func.text_get = _grid_group_item_label_get;
-_itc_part->func.content_get = NULL;
-_itc_part->func.state_get = NULL;
-_itc_part->func.del = _grid_group_item_del;
- }
-   if (!_itc_state)
- {
-_itc_state = elm_genlist_item_class_new();
-_itc_state->item_style = "default";
-_itc_state->func.text_get = _grid_group_item_label_get;
-_itc_state->func.content_get = NULL;
-_itc_state->func.state_get = NULL;
-_itc_state->func.del = _grid_group_item_del;
- }
-}
-
-/*
-USABLE FOR GENLIST OF IMAGE USAGE
-
-be used like this:
->   Resource *res = (Resource *) pm_resource_get(ap.project->images, 
it->image_name);
->   _image_info_update_usage_info(img_edit, eina_list_count(res->used_in));
->   _image_info_usage_update(img_edit, res);
->   evas_object_smart_calculate(img_edit->image_data_fields.layout);
-
-static void
-_image_info_usage_update(Image_Editor *img_edit, Resource *res)
-{
-   Eina_List *l;
-   Evas_Object *list;
-   Elm_Object_Item *it_group, *it_part;
-   const char *cur_group = NULL;
-   const char *cur_part = NULL;
-   State *state;
-
-   assert(img_edit != NULL);
-   assert(res != NULL);
-
-   if (!img_edit->image_data_fields.image_name) return;
-
-   if (!eina_list_count(res->used_in))
- return;
-
-   genlist_item_classes_init();
-
-   list = img_edit->image_usage_fields.genlist;
-
-   EINA_LIST_FOREACH(res->used_in, l, state)
- {
-if ((!cur_group) || (strcmp(cur_group, state->part->group->name)))
-  {
- it_group = elm_genlist_item_append(list, _itc_group,
-
eina_stringshare_add(state->part->group->name),
-NULL, ELM_GENLIST_ITEM_NONE,
-NULL, 

[EGIT] [tools/eflete] annotated tag v0.6.0-alpha created (now 0a39d0b)

[Enlightenment Git]

This is an automated email from the git hooks/post-receive script.

rimmed pushed a change to annotated tag v0.6.0-alpha
in repository tools/eflete.

at  0a39d0b   (tag)
   tagging  6eb7717301148786b519bedb97743169dce7648d (commit)
  replaces  v0.5.0
 tagged by  Vyacheslav Reutskiy
on  Mon Nov 16 16:04:11 2015 +0200

- Log -
Version 0.5.0

Andrii Kroitor (362):
  configure: Switch to dev mode again
  ewe: update .eo and .c files due to new EOLIAN syntax
  sound_editor: fix build due to changes in ecore_audio
  ewe_tabs: fix default orientation
  styles: fix popup style
  UTC: update groupedit test
  project_manager: remove unneccesary mutex from pm_project_open
  project_manager: move common project open code into internal function
  project_manager: add special group for global actions
  wizard_import_edc: change generated source for new project
  project_manager: create global object on project open
  project_manager: use global object to save all groups to dev file
  project_manager: use pm_save_to_dev instead of saving individual groups
  widget_manager: remove isModify flag
  remove GET_OBJ macro
  remove GET_STYL macro
  widget_manager: hide special internal group from list
  connector: allow to delete last group in the project
  UTC: fix build
  project_manager: add ecore_evas buffer to project
  UTC: add failed only report
  UTC: fix ui_widget test
  UTC: fix project_manager tests
  remove unused panes block
  Live_view: update theme regardless the style content
  Connector: fix workspace unset order
  Connector: update live view only when style is loaded
  Make aggressive check for functions arguments and some return values
  groupedit: fix unselect
  shortcuts: fix init logic
  UTC: fix shortcuts tests
  UTC: fix colorclass_manager tests
  UTC: fix about_window tests
  UTC: fix ui_state_list tests
  UTC: fix widget_manager tests
  UTC: fix cursor tests
  UTC: fix ui_main_window tests
  UTC: fix groupedit tests
  UTC: fix modal_widnow tests
  UTC: fix style_editor tests
  UTC: fix live_widget tests
  UTC: fix live_view tests
  group_edit: delete assert for part_to
  group_edit: add assertion to part_rename
  ui_workspace: add aggressive check
  history: fix state restore
  ui_workspace: fix comback from separate mode
  UTC: fix ui_workspace tests
  UTC: fix ui_widget_list tests
  Add error message to every abort() call
  UTC: fix project_manager tests
  UTC: fix notify tests
  UTC: fix live_prop tests
  UTC: fix container tests
  UTC: fix image_editor tests
  UTC: fix config tests
  History: add missing asserts
  History: fix history_attributes
  History: history redo for state works again
  Widget List: make check weaker to fix history UTC
  UTC: fix hisoty tests
  eflete: add assert for check main window
  UTC: fix eflete tests
  UTC: fix ui_block tests
  UTC: fix highlight tests
  UTC: fix colorselector tests
  UTC: fix sound_editor tests
  UTC: fix signal list tests
  UTC: delete *_dialog tests
  UTC: fix animator tests
  UTC: fix widget_manager NOT_FOUND tests
  groupedit: remove unused style_get/set functions
  UTC: remove phantom tests from groupedit
  UTC: fix modal_window NOT_FOUND tests
  UTC: remove commented out tests from ui_widget_list
  UTC: fix ewe NOT_FOUND tests
  UTC: fix workspace_zoom_factor tests
  UTC: fix project_manager chain-failing tests
  update .gitignore rules
  project_manager: add TODO
  Merge branch 'master' into refactor
  project_manager: add resource lists
  project_manager: add group_manager module
  project_manager: remove unnecessary thread sync
  project_manager: abort program if thread can't be created
  project_manager: remove extra check from pm_project_thread_free
  project_manager: make Project_Thread structure private
  UTC: adapt tests to project_manager changes
  project_manager: fix project load order
  wizard_common: fix SEGFAULT on cancel
  project_manager: move pm_project_open to thread
  UTC: fix tests after changes in pm_project_open
  project_manager: reuse import_edj in import_edc
  Merge branch 'master' into refactor
  project_manager: remove _linked_images_copy
  history: rename  Module into History_Module and make it public
  image_editor: added TODO
  project_manager: move resource export to project_open
  project_manager: add the structure for external resource
  project_manager: add tones loading
  project_manager: add colorclasses loading
  project_manager: add styles loading on project open
  project_manager: load groups and usage lists
  

[EGIT] [core/efl] master 01/01: ecore-evas drm: null global device pointer after free

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=2a7d4d62db481c50dea171f099e26886f22c

commit 2a7d4d62db481c50dea171f099e26886f22c
Author: Mike Blumenkrantz 
Date:   Mon Nov 16 14:10:52 2015 -0500

ecore-evas drm: null global device pointer after free

ref T2844

@fix
---
 src/modules/ecore_evas/engines/drm/ecore_evas_drm.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c 
b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
index f7cfc55..a806cc0 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -575,6 +575,7 @@ sprite_err:
 dev_open_err:
ecore_drm_launcher_disconnect(dev);
ecore_drm_device_free(dev);
+   dev = NULL;
 launcher_err:
 dev_err:
ecore_drm_shutdown();
@@ -592,6 +593,7 @@ _ecore_evas_drm_shutdown(void)
ecore_drm_device_close(dev);
ecore_drm_launcher_disconnect(dev);
ecore_drm_device_free(dev);
+   dev = NULL;
ecore_drm_shutdown();
 
ecore_event_evas_shutdown();

-- 

[EGIT] [core/efl] efl-1.16 01/01: ecore-evas drm: null global device pointer after free

[Mike Blumenkrantz]

discomfitor pushed a commit to branch efl-1.16.

http://git.enlightenment.org/core/efl.git/commit/?id=abb9610a3b7e56f15cb9b012161dd483ee003f65

commit abb9610a3b7e56f15cb9b012161dd483ee003f65
Author: Mike Blumenkrantz 
Date:   Mon Nov 16 14:10:52 2015 -0500

ecore-evas drm: null global device pointer after free

ref T2844

@fix
---
 src/modules/ecore_evas/engines/drm/ecore_evas_drm.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c 
b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
index f7cfc55..a806cc0 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -575,6 +575,7 @@ sprite_err:
 dev_open_err:
ecore_drm_launcher_disconnect(dev);
ecore_drm_device_free(dev);
+   dev = NULL;
 launcher_err:
 dev_err:
ecore_drm_shutdown();
@@ -592,6 +593,7 @@ _ecore_evas_drm_shutdown(void)
ecore_drm_device_close(dev);
ecore_drm_launcher_disconnect(dev);
ecore_drm_device_free(dev);
+   dev = NULL;
ecore_drm_shutdown();
 
ecore_event_evas_shutdown();

-- 

[EGIT] [core/enlightenment] master 01/01: further improve csd calculations for x11 clients

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=11c632ab44ed568384c7015e1b9930dc9b46901b

commit 11c632ab44ed568384c7015e1b9930dc9b46901b
Author: Mike Blumenkrantz 
Date:   Mon Nov 16 16:21:52 2015 -0500

further improve csd calculations for x11 clients

there was previously a frame in which maximized x11 csd clients would
reposition themselves offscreen before rendering

this is now fixed by adjusting the client geometries either upon
unsetting the csd or re-setting it, allowing the client to retain its
expected positioning without jitters
---
 src/bin/e_comp_object.c | 19 +++
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c
index ce97702..790c70d 100644
--- a/src/bin/e_comp_object.c
+++ b/src/bin/e_comp_object.c
@@ -2971,11 +2971,14 @@ e_comp_object_frame_geometry_get(Evas_Object *obj, int 
*l, int *r, int *t, int *
 E_API void
 e_comp_object_frame_geometry_set(Evas_Object *obj, int l, int r, int t, int b)
 {
+   Eina_Bool calc;
+
API_ENTRY;
if (cw->frame_object)
  CRI("ACK!");
if ((cw->client_inset.l == l) && (cw->client_inset.r == r) &&
(cw->client_inset.t == t) && (cw->client_inset.b == b)) return;
+   calc = cw->client_inset.calc;
cw->client_inset.calc = l || r || t || b;
eina_stringshare_replace(>frame_theme, "borderless");
if (cw->client_inset.calc)
@@ -2983,14 +2986,22 @@ e_comp_object_frame_geometry_set(Evas_Object *obj, int 
l, int r, int t, int b)
 cw->ec->w += (l + r) - (cw->client_inset.l + cw->client_inset.r);
 cw->ec->h += (t + b) - (cw->client_inset.t + cw->client_inset.b);
  }
-   else if ((!e_client_has_xwindow(cw->ec)) && (cw->ec->maximized || 
cw->ec->fullscreen))
+   else if (cw->ec->maximized || cw->ec->fullscreen)
  {
-cw->ec->saved.w -= ((l + r) - (cw->client_inset.l + 
cw->client_inset.r));
-cw->ec->saved.h -= ((t + b) - (cw->client_inset.t + 
cw->client_inset.b));
+if (e_client_has_xwindow(cw->ec))
+  {
+ cw->ec->saved.x += l - cw->client_inset.l;
+ cw->ec->saved.y += t - cw->client_inset.t;
+  }
+else
+  {
+ cw->ec->saved.w -= ((l + r) - (cw->client_inset.l + 
cw->client_inset.r));
+ cw->ec->saved.h -= ((t + b) - (cw->client_inset.t + 
cw->client_inset.b));
+  }
  }
if (!cw->ec->new_client)
  {
-if (cw->client_inset.calc)
+if ((calc || (!e_client_has_xwindow(cw->ec))) && cw->client_inset.calc)
   {
  cw->ec->x -= l - cw->client_inset.l;
  cw->ec->y -= t - cw->client_inset.t;

-- 

[EGIT] [enlightenment/modules/desksanity] master 01/01: disable maximize effect for x11 csd windows

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/enlightenment/modules/desksanity.git/commit/?id=3664906fd3b60c696d13004ca13876f5e3e17dbc

commit 3664906fd3b60c696d13004ca13876f5e3e17dbc
Author: Mike Blumenkrantz 
Date:   Mon Nov 16 15:05:16 2015 -0500

disable maximize effect for x11 csd windows

this is impossible to sanely handle at present
---
 src/maximize.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/maximize.c b/src/maximize.c
index 9b34b26..9b0eac4 100644
--- a/src/maximize.c
+++ b/src/maximize.c
@@ -18,6 +18,7 @@ _ds_unmaximize_post(void *data, Evas_Object *obj, void 
*event_info EINA_UNUSED)
double time = 0.15;
 
if (e_comp_config_get()->match.disable_borders) return;
+   if (e_client_has_xwindow(ec) && (!e_comp_object_frame_allowed(ec->frame))) 
return;
if (e_comp_config_get()->fast_borders)
  time /= 2;
w = ec->w, h = ec->h;
@@ -75,6 +76,7 @@ _ds_maximize(void *data, Evas_Object *obj EINA_UNUSED, void 
*event_info EINA_UNU
double time = 0.2;
 
if (e_comp_config_get()->match.disable_borders) return;
+   if (e_client_has_xwindow(ec) && (!e_comp_object_frame_allowed(ec->frame))) 
return;
if (e_comp_config_get()->fast_borders)
  time /= 2;
ecx = ec->x, ecy = ec->y, ecw = ec->w, ech = ec->h;

-- 

[EGIT] [bindings/python/python-efl] master 01/02: A new ecore module: ecore_con

[Dave Andreoli]

davemds pushed a commit to branch master.

http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=eaf31100891e631e5d9dd0a713003b6d70178650

commit eaf31100891e631e5d9dd0a713003b6d70178650
Author: Dave Andreoli 
Date:   Mon Nov 16 20:45:07 2015 +0100

A new ecore module: ecore_con

It's now super easy to perform various network task in a full efl fashion.
Implemented "Lookup" for dns query and "Url" to perform http requests.
"Server" will come soon.

Comes with quite complete docs, examples and unit tests
---
 CODING |   1 +
 doc/ecore/class-lookup.rst |   6 +
 doc/ecore/class-url.rst|   9 +
 doc/ecore/ecore.rst|  24 +-
 doc/ecore/module-ecore_con.rst |   5 +
 efl/ecore/efl.ecore_events.pxi |   8 +
 efl/ecore_con/efl.ecore_con.pxd| 179 +++
 efl/ecore_con/efl.ecore_con.pyx| 315 +
 efl/ecore_con/efl.ecore_con_lookup.pxi |  88 
 efl/ecore_con/efl.ecore_con_url.pxi| 827 +
 examples/ecore/con/lookup.py   |  18 +
 examples/ecore/con/url.py  |  31 ++
 include/efl.ecore.pxd  |   3 +
 setup.py   |  18 +-
 tests/ecore/test_11_con.py | 156 +++
 15 files changed, 1680 insertions(+), 8 deletions(-)

diff --git a/CODING b/CODING
index f793701..ec9e28e 100644
--- a/CODING
+++ b/CODING
@@ -32,6 +32,7 @@ Documentation cheatsheet
   :func:`elm_list_go`  (for functions)
   :attr:`homogeneous`  (for properties)
   :ref:`Elm_List_Mode` (for enums)
+  :data:`ELM_LIST_LIMIT` (for enum values)
 
   :func:`efl.evas.Object.delete`  (for items not in current scope)
   :func:`~efl.evas.Object.delete` (will show it short, just "delete")
diff --git a/doc/ecore/class-lookup.rst b/doc/ecore/class-lookup.rst
new file mode 100644
index 000..a98e4e9
--- /dev/null
+++ b/doc/ecore/class-lookup.rst
@@ -0,0 +1,6 @@
+.. currentmodule:: efl.ecore_con
+
+:class:`efl.ecore_con.Lookup` Class
+===
+
+.. autoclass:: efl.ecore_con.Lookup
diff --git a/doc/ecore/class-url.rst b/doc/ecore/class-url.rst
new file mode 100644
index 000..c3f735d
--- /dev/null
+++ b/doc/ecore/class-url.rst
@@ -0,0 +1,9 @@
+.. currentmodule:: efl.ecore_con
+
+:class:`efl.ecore_con.Url` Class
+===
+
+.. autoclass:: efl.ecore_con.Url
+.. autoclass:: efl.ecore_con.EventUrlComplete
+.. autoclass:: efl.ecore_con.EventUrlProgress
+.. autoclass:: efl.ecore_con.EventUrlData
diff --git a/doc/ecore/ecore.rst b/doc/ecore/ecore.rst
index bf261ce..cfb36c1 100644
--- a/doc/ecore/ecore.rst
+++ b/doc/ecore/ecore.rst
@@ -73,6 +73,16 @@ error. Any valid file descriptor can be used with this API, 
regardless of if
 was gotten with an OS specific API or from ecore.
 see :py:class:`FdHandler`
 
+
+File monitor
+
+
+Using the :py:class:`FileMonitor` class you can monitor
+a directory for changes, a single calback will be called when events occur.
+Events will be generatd everytime a file or directory (that live in the
+give path) is created/deleted/modified.
+
+
 File download
 -
 
@@ -82,13 +92,14 @@ used to inform the user while progress occurs and when the 
download has
 finished.
 
 
-File monitor
-
+Ecore Con
+-
 
-Using the :py:class:`FileMonitor` class you can monitor
-a directory for changes, a single calback will be called when events occur.
-Events will be generatd everytime a file or directory (that live in the
-give path) is created/deleted/modified.
+The ecore_con module provide various utilities to perform different network
+related tasks. Everything provided in a fully async way. Most notable are the
+:class:`efl.ecore_con.Lookup` class to perform DNS requests, the
+:class:`efl.ecore_con.Url` class to perform HTTP requests and the
+:class:`efl.ecore_con.Server` class to implement your own server.
 
 
 
@@ -99,6 +110,7 @@ API Reference
:titlesonly:
 
module-ecore
+   module-ecore_con
 
 
 Inheritance diagram
diff --git a/doc/ecore/module-ecore_con.rst b/doc/ecore/module-ecore_con.rst
new file mode 100644
index 000..c756d90
--- /dev/null
+++ b/doc/ecore/module-ecore_con.rst
@@ -0,0 +1,5 @@
+
+.. automodule:: efl.ecore_con
+   :exclude-members: Url, EventUrlComplete, EventUrlProgress, EventUrlData,
+ Lookup, ConEventFilter
+
diff --git a/efl/ecore/efl.ecore_events.pxi b/efl/ecore/efl.ecore_events.pxi
index 880cc7e..d3f739d 100644
--- a/efl/ecore/efl.ecore_events.pxi
+++ b/efl/ecore/efl.ecore_events.pxi
@@ -29,6 +29,11 @@ cdef object _event_mapping_register(int type, cls):
 cdef object _event_mapping_unregister(int type):
 _event_type_mapping.pop(type)
 
+cdef object _event_mapping_get(int type):
+if not type in _event_type_mapping:
+raise ValueError("event type '%d' not registered." % type)
+return 

[EGIT] [core/efl] master 01/01: Evas GL: Fix failing make check test case

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=cc4b54ec0a69c43f5163addbb6a4f4a6615cb8c0

commit cc4b54ec0a69c43f5163addbb6a4f4a6615cb8c0
Author: Jean-Philippe Andre 
Date:   Mon Nov 16 19:43:16 2015 +0900

Evas GL: Fix failing make check test case

The version field was not properly set for GLES 1 and 3 (but not tested),
double free() could happen on the API structs, and empty API structs
could be returned.
---
 src/modules/evas/engines/gl_common/evas_gl_api.c|  5 +
 src/modules/evas/engines/gl_common/evas_gl_api_gles1.c  |  2 ++
 src/modules/evas/engines/gl_common/evas_gl_core.c   |  6 +-
 src/modules/evas/engines/software_generic/evas_engine.c | 13 -
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/modules/evas/engines/gl_common/evas_gl_api.c 
b/src/modules/evas/engines/gl_common/evas_gl_api.c
index 2c96a6c..e469fb3 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_api.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_api.c
@@ -2467,6 +2467,9 @@ _evgl_api_gles2_get(Evas_GL_API *funcs, Eina_Bool debug)
 static void
 _normal_gles3_api_get(Evas_GL_API *funcs)
 {
+   if (!funcs) return;
+   funcs->version = EVAS_GL_API_VERSION;
+
 #define ORD(f) EVAS_API_OVERRIDE(f, funcs, evgl_)
// GLES 3.0 APIs that are same as GLES 2.0
ORD(glActiveTexture);
@@ -2727,6 +2730,8 @@ _normal_gles3_api_get(Evas_GL_API *funcs)
 static void
 _debug_gles3_api_get(Evas_GL_API *funcs)
 {
+   if (!funcs) return;
+   funcs->version = EVAS_GL_API_VERSION;
 
 #define ORD(f) EVAS_API_OVERRIDE(f, funcs, _evgld_)
// GLES 3.0 APIs that are same as GLES 2.0
diff --git a/src/modules/evas/engines/gl_common/evas_gl_api_gles1.c 
b/src/modules/evas/engines/gl_common/evas_gl_api_gles1.c
index 4a2f7dd..28d4784 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_api_gles1.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_api_gles1.c
@@ -4018,6 +4018,7 @@ static void
 _debug_gles1_api_get(Evas_GL_API *funcs)
 {
if (!funcs) return;
+   funcs->version = EVAS_GL_API_VERSION;
 
 #define ORD(name) EVAS_API_OVERRIDE(name, funcs, _evgld_gles1_)
/* Available only in Common profile */
@@ -4174,6 +4175,7 @@ static void
 _normal_gles1_api_get(Evas_GL_API *funcs)
 {
if (!funcs) return;
+   funcs->version = EVAS_GL_API_VERSION;
 
 #define ORD(name) EVAS_API_OVERRIDE(name, funcs, _evgl_gles1_)
/* Available only in Common profile */
diff --git a/src/modules/evas/engines/gl_common/evas_gl_core.c 
b/src/modules/evas/engines/gl_common/evas_gl_core.c
index 75b1b98..bf179bc 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_core.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_core.c
@@ -1881,6 +1881,9 @@ evgl_engine_shutdown(void *eng_data)
if (gles1_funcs) free(gles1_funcs);
if (gles2_funcs) free(gles2_funcs);
if (gles3_funcs) free(gles3_funcs);
+   gles1_funcs = NULL;
+   gles2_funcs = NULL;
+   gles3_funcs = NULL;
 
// Destroy internal resources
_evgl_tls_resource_destroy(eng_data);
@@ -3053,7 +3056,8 @@ evgl_api_get(void *eng_data, Evas_GL_Context_Version 
version, Eina_Bool alloc_on
 api = gles3_funcs;
  }
else return NULL;
-   if (alloc_only) return api;
+   if (alloc_only && (api->version == EVAS_GL_API_VERSION))
+ return api;
 
 #ifdef GL_GLES
 if (!evgl_api_egl_ext_init(evgl_engine->funcs->proc_address_get, 
evgl_engine->funcs->ext_string_get(eng_data)))
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c 
b/src/modules/evas/engines/software_generic/evas_engine.c
index ecd96f18..3d26fc6 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -286,6 +286,8 @@ static void   (*_sym_glViewport)
(GLint x, GLint
 /* static void   (*_sym_glGetProgramBinary)(GLuint a, 
GLsizei b, GLsizei* c, GLenum* d, void* e) = NULL; */
 /* static void   (*_sym_glProgramBinary)   (GLuint a, 
GLenum b, const void* c, GLint d) = NULL; */
 /* static void   (*_sym_glProgramParameteri)   (GLuint a, 
GLuint b, GLint d) = NULL; */
+
+static int gl_lib_init(void);
 #endif
 
 // Threaded Render
@@ -3055,6 +3057,12 @@ eng_gl_context_create(void *data EINA_UNUSED, void 
*share_context, int version,
Render_Engine_GL_Context *ctx;
Render_Engine_GL_Context *share_ctx;
 
+   if (!_tls_check() && !gl_lib_init())
+ {
+WRN("Failed to initialize Evas GL (with OSMesa)");
+return NULL;
+ }
+
if (version != EVAS_GL_GLES_2_X)
  {
 ERR("This engine only supports OpenGL-ES 2.0 contexts for now!");
@@ -3251,6 +3259,9 @@ eng_gl_api_get(void *data EINA_UNUSED, int version)
  return NULL;
 
 #ifdef EVAS_GL
+   if (!_tls_init)
+ gl_lib_init();
+
return _funcs;
 #else
return NULL;
@@ -4990,7 +5001,7 @@ evgl_glGetString(GLenum name)