diff --git a/src/modules/shot/data/shotedit-foot.png b/src/modules/shot/data/shotedit-foot.png new file mode 100644 index 000000000..b92032512 Binary files /dev/null and b/src/modules/shot/data/shotedit-foot.png differ diff --git a/src/modules/shot/data/shotedit-outline-box-shadow.png b/src/modules/shot/data/shotedit-outline-box-shadow.png new file mode 100644 index 000000000..9ef000174 Binary files /dev/null and b/src/modules/shot/data/shotedit-outline-box-shadow.png differ diff --git a/src/modules/shot/data/shotedit-outline-box.png b/src/modules/shot/data/shotedit-outline-box.png new file mode 100644 index 000000000..e4f054794 Binary files /dev/null and b/src/modules/shot/data/shotedit-outline-box.png differ diff --git a/src/modules/shot/data/shotedit-outline-box.svg b/src/modules/shot/data/shotedit-outline-box.svg new file mode 100644 index 000000000..7dd650b33 --- /dev/null +++ b/src/modules/shot/data/shotedit-outline-box.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/modules/shot/data/shotedit-outline-circle-shadow.png b/src/modules/shot/data/shotedit-outline-circle-shadow.png new file mode 100644 index 000000000..dd64286cb Binary files /dev/null and b/src/modules/shot/data/shotedit-outline-circle-shadow.png differ diff --git a/src/modules/shot/data/shotedit-outline-circle.png b/src/modules/shot/data/shotedit-outline-circle.png new file mode 100644 index 000000000..f75cd18aa Binary files /dev/null and b/src/modules/shot/data/shotedit-outline-circle.png differ diff --git a/src/modules/shot/data/shotedit-outline-circle.svg b/src/modules/shot/data/shotedit-outline-circle.svg new file mode 100644 index 000000000..2c88f25e5 --- /dev/null +++ b/src/modules/shot/data/shotedit-outline-circle.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/modules/shot/data/shotedit-tool-box-foot.png b/src/modules/shot/data/shotedit-tool-box-foot.png new file mode 100644 index 000000000..f09e7c6d6 Binary files /dev/null and b/src/modules/shot/data/shotedit-tool-box-foot.png differ diff --git a/src/modules/shot/data/shotedit-tool-box-foot.svg b/src/modules/shot/data/shotedit-tool-box-foot.svg new file mode 100644 index 000000000..b56d60754 --- /dev/null +++ b/src/modules/shot/data/shotedit-tool-box-foot.svg @@ -0,0 +1,78 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/modules/shot/data/shotedit-tool-box-outline-box.png b/src/modules/shot/data/shotedit-tool-box-outline-box.png new file mode 100644 index 000000000..af6a90a00 Binary files /dev/null and b/src/modules/shot/data/shotedit-tool-box-outline-box.png differ diff --git a/src/modules/shot/data/shotedit-tool-box-outline-box.svg b/src/modules/shot/data/shotedit-tool-box-outline-box.svg new file mode 100644 index 000000000..50ce40f36 --- /dev/null +++ b/src/modules/shot/data/shotedit-tool-box-outline-box.svg @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/modules/shot/data/shotedit-tool-box-outline-circle.png b/src/modules/shot/data/shotedit-tool-box-outline-circle.png new file mode 100644 index 000000000..2577e4ff1 Binary files /dev/null and b/src/modules/shot/data/shotedit-tool-box-outline-circle.png differ diff --git a/src/modules/shot/data/shotedit-tool-box-outline-circle.svg b/src/modules/shot/data/shotedit-tool-box-outline-circle.svg new file mode 100644 index 000000000..3e32ccdf6 --- /dev/null +++ b/src/modules/shot/data/shotedit-tool-box-outline-circle.svg @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/modules/shot/data/shotedit-tool-box-walk.png b/src/modules/shot/data/shotedit-tool-box-walk.png new file mode 100644 index 000000000..d8036038f Binary files /dev/null and b/src/modules/shot/data/shotedit-tool-box-walk.png differ diff --git a/src/modules/shot/data/shotedit-tool-box-walk.svg b/src/modules/shot/data/shotedit-tool-box-walk.svg new file mode 100644 index 000000000..d7116aa7a --- /dev/null +++ b/src/modules/shot/data/shotedit-tool-box-walk.svg @@ -0,0 +1,1863 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/src/modules/shot/data/shotedit-walk-shadow.png b/src/modules/shot/data/shotedit-walk-shadow.png new file mode 100644 index 000000000..ba4c92383 Binary files /dev/null and b/src/modules/shot/data/shotedit-walk-shadow.png differ diff --git a/src/modules/shot/data/shotedit-walk.png b/src/modules/shot/data/shotedit-walk.png new file mode 100644 index 000000000..24cfd7281 Binary files /dev/null and b/src/modules/shot/data/shotedit-walk.png differ diff --git a/src/modules/shot/data/shotedit-walk.svg b/src/modules/shot/data/shotedit-walk.svg new file mode 100644 index 000000000..9802171be --- /dev/null +++ b/src/modules/shot/data/shotedit-walk.svg @@ -0,0 +1,79 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/src/modules/shot/data/shotedit.edc b/src/modules/shot/data/shotedit.edc index 4448be968..aa0f96c56 100644 --- a/src/modules/shot/data/shotedit.edc +++ b/src/modules/shot/data/shotedit.edc @@ -38,6 +38,10 @@ collections { TOOL_ICON("box-demalloc") TOOL_ICON("box-finger") TOOL_ICON("box-logo") + TOOL_ICON("box-foot") + TOOL_ICON("box-walk") + TOOL_ICON("box-outline-box") + TOOL_ICON("box-outline-circle") TOOL_ICON("box-text-empty") TOOL_ICON("box-text-plain") TOOL_ICON("box-text-cloud") @@ -527,6 +531,102 @@ collections { } } } + group { name: "e/modules/shot/item/box/foot"; + images.image: "shotedit-foot.png" COMP; + parts { + part { name: "box"; + description { state: "default" 0.0; + image.normal: "shotedit-foot.png"; + min: 45 55; + } + } + } + } + group { name: "e/modules/shot/item/box/foot/shadow"; + parts { + } + } + group { name: "e/modules/shot/item/box/walk"; + images.image: "shotedit-walk.png" COMP; + parts { + part { name: "box"; + description { state: "default" 0.0; + min: 40 40; + color: 255 255 255 255; + color_class: "color"; + image.normal: "shotedit-walk.png"; + } + } + } + } + group { name: "e/modules/shot/item/box/walk/shadow"; + data.item: "offset_x" "0"; + data.item: "offset_y" "10"; + images.image: "shotedit-walk-shadow.png" COMP; + parts { + part { name: "shadow"; + description { state: "default" 0.0; + min: 50 50; + color: 0 0 0 128; + image.normal: "shotedit-walk-shadow.png"; + } + } + } + } + group { name: "e/modules/shot/item/box/outline-box"; + images.image: "shotedit-outline-box.png" COMP; + parts { + part { name: "box"; + description { state: "default" 0.0; + min: 40 40; + color: 255 255 255 255; + color_class: "color"; + image.normal: "shotedit-outline-box.png"; + } + } + } + } + group { name: "e/modules/shot/item/box/outline-box/shadow"; + data.item: "offset_x" "0"; + data.item: "offset_y" "10"; + images.image: "shotedit-outline-box-shadow.png" COMP; + parts { + part { name: "shadow"; + description { state: "default" 0.0; + min: 50 50; + color: 0 0 0 128; + image.normal: "shotedit-outline-box-shadow.png"; + } + } + } + } + group { name: "e/modules/shot/item/box/outline-circle"; + images.image: "shotedit-outline-circle.png" COMP; + parts { + part { name: "box"; + description { state: "default" 0.0; + min: 40 40; + color: 255 255 255 255; + color_class: "color"; + image.normal: "shotedit-outline-circle.png"; + } + } + } + } + group { name: "e/modules/shot/item/box/outline-circle/shadow"; + data.item: "offset_x" "0"; + data.item: "offset_y" "10"; + images.image: "shotedit-outline-circle-shadow.png" COMP; + parts { + part { name: "shadow"; + description { state: "default" 0.0; + min: 50 50; + color: 0 0 0 128; + image.normal: "shotedit-outline-circle-shadow.png"; + } + } + } + } group { name: "e/modules/shot/item/box/text/empty"; data.item: "entry_style" "DEFAULT='font=Sans style=outline outline_color=#0008 font_size=20 color=#fff align=center'"; parts { diff --git a/src/modules/shot/data/shotedit.png b/src/modules/shot/data/shotedit.png deleted file mode 100644 index 107ee130e..000000000 Binary files a/src/modules/shot/data/shotedit.png and /dev/null differ diff --git a/src/modules/shot/e_mod_edit.c b/src/modules/shot/e_mod_edit.c index ec2c28ba4..f92c0a9f9 100644 --- a/src/modules/shot/e_mod_edit.c +++ b/src/modules/shot/e_mod_edit.c @@ -1904,9 +1904,9 @@ ui_edit(Evas_Object *window, Evas_Object *o_bg, E_Zone *zone EINA_UNUSED, _tool_info_count = 0; radg - = ui_tool_add(win, tb2, NULL, 0, 0, "crop", "Select crop area", 40, NULL, TOOL_CROP); - o = ui_tool_add(win, tb2, radg, 1, 0, "modify", "Modify objects", 40, NULL, TOOL_MODIFY); - o = ui_tool_add(win, tb2, radg, 2, 0, "delete", "Delete objects", 40, NULL, TOOL_DELETE); + = ui_tool_add(win, tb2, NULL, 0, 0, "crop", "Select crop area", 40, NULL, TOOL_CROP); + o = ui_tool_add(win, tb2, radg, 1, 0, "modify", "Modify objects", 40, NULL, TOOL_MODIFY); + o = ui_tool_add(win, tb2, radg, 2, 0, "delete", "Delete objects", 40, NULL, TOOL_DELETE); o = elm_separator_add(win); evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); @@ -1915,25 +1915,30 @@ ui_edit(Evas_Object *window, Evas_Object *o_bg, E_Zone *zone EINA_UNUSED, elm_table_pack(tb2, o, 0, 1, 4, 1); evas_object_show(o); - o = ui_tool_add(win, tb2, radg, 0, 2, "line-arrow", "Single arrow line", 40, "arrow", TOOL_LINE); - o = ui_tool_add(win, tb2, radg, 1, 2, "line-arrow2", "Double arrow line", 40, "arrow2", TOOL_LINE); - o = ui_tool_add(win, tb2, radg, 2, 2, "line-arrow0", "Plain line", 40, "arrow0", TOOL_LINE); - o = ui_tool_add(win, tb2, radg, 3, 2, "box-solid", "Solid box", 40, "solid", TOOL_BOX); + o = ui_tool_add(win, tb2, radg, 0, 2, "line-arrow", "Single arrow line", 40, "arrow", TOOL_LINE); + o = ui_tool_add(win, tb2, radg, 1, 2, "line-arrow2", "Double arrow line", 40, "arrow2", TOOL_LINE); + o = ui_tool_add(win, tb2, radg, 2, 2, "line-arrow0", "Plain line", 40, "arrow0", TOOL_LINE); + o = ui_tool_add(win, tb2, radg, 3, 2, "box-solid", "Solid box", 40, "solid", TOOL_BOX); - o = ui_tool_add(win, tb2, radg, 0, 3, "box-malloc", "Malloc", 40, "malloc", TOOL_BOX); - o = ui_tool_add(win, tb2, radg, 1, 3, "box-demalloc", "Malloc (evil)", 40, "demalloc", TOOL_BOX); - o = ui_tool_add(win, tb2, radg, 2, 3, "box-finger", "Pointing finger", 40, "finger", TOOL_BOX); - o = ui_tool_add(win, tb2, radg, 3, 3, "box-logo", "Enlightenment logo", 40, "logo", TOOL_BOX); + o = ui_tool_add(win, tb2, radg, 0, 3, "box-malloc", "Malloc", 40, "malloc", TOOL_BOX); + o = ui_tool_add(win, tb2, radg, 1, 3, "box-demalloc", "Malloc (evil)", 40, "demalloc", TOOL_BOX); + o = ui_tool_add(win, tb2, radg, 2, 3, "box-finger", "Pointing finger", 40, "finger", TOOL_BOX); + o = ui_tool_add(win, tb2, radg, 3, 3, "box-logo", "Enlightenment logo", 40, "logo", TOOL_BOX); - o = ui_tool_add(win, tb2, radg, 0, 4, "box-text-empty", "Plain text", 40, "text/empty", TOOL_BOX); - o = ui_tool_add(win, tb2, radg, 1, 4, "box-text-plain", "Text box", 40, "text/plain", TOOL_BOX); - o = ui_tool_add(win, tb2, radg, 2, 4, "box-text-cloud", "Text thought bubble", 40, "text/cloud", TOOL_BOX); - o = ui_tool_add(win, tb2, radg, 3, 4, "box-text-cloud2", "Text thought bubble 2", 40, "text/cloud2", TOOL_BOX); + o = ui_tool_add(win, tb2, radg, 0, 4, "box-foot", "Foot", 40, "foot", TOOL_BOX); + o = ui_tool_add(win, tb2, radg, 1, 4, "box-walk", "Silly walk", 40, "walk", TOOL_BOX); + o = ui_tool_add(win, tb2, radg, 2, 4, "box-outline-box", "Box outline", 40, "outline-box", TOOL_BOX); + o = ui_tool_add(win, tb2, radg, 3, 4, "box-outline-circle", "Circle outline", 40, "outline-circle", TOOL_BOX); - o = ui_tool_add(win, tb2, radg, 0, 5, "box-text-speech", "Speech bubble", 40, "text/speech", TOOL_BOX); - o = ui_tool_add(win, tb2, radg, 1, 5, "box-text-speech2", "Speech bubble 2", 40, "text/speech2", TOOL_BOX); - o = ui_tool_add(win, tb2, radg, 2, 5, "box-text-kaboom", "Kaboom splat", 40, "text/kaboom", TOOL_BOX); - o = ui_tool_add(win, tb2, radg, 3, 5, "box-text-kapow", "Pow explode", 40, "text/kapow", TOOL_BOX); + o = ui_tool_add(win, tb2, radg, 0, 5, "box-text-empty", "Plain text", 40, "text/empty", TOOL_BOX); + o = ui_tool_add(win, tb2, radg, 1, 5, "box-text-plain", "Text box", 40, "text/plain", TOOL_BOX); + o = ui_tool_add(win, tb2, radg, 2, 5, "box-text-cloud", "Text thought bubble", 40, "text/cloud", TOOL_BOX); + o = ui_tool_add(win, tb2, radg, 3, 5, "box-text-cloud2", "Text thought bubble 2", 40, "text/cloud2", TOOL_BOX); + + o = ui_tool_add(win, tb2, radg, 0, 6, "box-text-speech", "Speech bubble", 40, "text/speech", TOOL_BOX); + o = ui_tool_add(win, tb2, radg, 1, 6, "box-text-speech2", "Speech bubble 2", 40, "text/speech2", TOOL_BOX); + o = ui_tool_add(win, tb2, radg, 2, 6, "box-text-kaboom", "Kaboom splat", 40, "text/kaboom", TOOL_BOX); + o = ui_tool_add(win, tb2, radg, 3, 6, "box-text-kapow", "Pow explode", 40, "text/kapow", TOOL_BOX); _cb_tool_changed(NULL, radg, NULL);