Enlightenment CVS committal Author : davemds Project : e17 Module : proto/edje_editor
Dir : e17/proto/edje_editor/data Modified Files: Makefile.am blank.edc edje_editor.edc Log Message: * Make the groups combobox searchable ! * Add spectra preview in the tree. I have done a tree model for gradients :) * Add spectra preview in the spectra combobox * Add alpha slider for gradients * Add gradient type images in gradient type combobox * Changed the image for gradient parts * Remove unused images * Add 1 default font to all the file created * invert fill points * don't use edje_edit_state_gradient_spectra_id_get as it don't exist enymore :P * tons of bug fixed =================================================================== RCS file: /cvs/e/e17/proto/edje_editor/data/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- Makefile.am 12 Jul 2008 13:14:51 -0000 1.6 +++ Makefile.am 15 Jul 2008 00:55:42 -0000 1.7 @@ -9,7 +9,6 @@ images/bg2_i.png \ images/bg3.png \ images/bg4.png \ - images/frame.png \ images/frame_bg.png \ images/frame_bg_label.png \ images/lbl_group.png \ @@ -27,8 +26,12 @@ images/image.png \ images/rect.png \ images/text.png \ - images/grad.png \ images/grad_h.png \ + images/grad_linear.png \ + images/grad_radial.png \ + images/grad_rectangular.png \ + images/grad_angular.png \ + images/grad_sinusoidal.png \ images/swallow.png \ images/swallow2.png \ images/spectra_arrow.png \ @@ -39,10 +42,6 @@ images/e17.png \ images/none.png \ images/focus.png \ - images/arrow_u.png \ - images/arrow_d.png \ - images/arrow_l.png \ - images/arrow_r.png \ images/fakewin.png \ images/rel1.png \ images/rel2.png \ =================================================================== RCS file: /cvs/e/e17/proto/edje_editor/data/blank.edc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- blank.edc 13 Jul 2008 17:41:41 -0000 1.2 +++ blank.edc 15 Jul 2008 00:55:42 -0000 1.3 @@ -1,6 +1,10 @@ images { } +fonts { + font: "vera.ttf" "vera"; +} + spectra { spectrum{ name: "Abstract 1"; =================================================================== RCS file: /cvs/e/e17/proto/edje_editor/data/edje_editor.edc,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- edje_editor.edc 12 Jul 2008 13:05:16 -0000 1.16 +++ edje_editor.edc 15 Jul 2008 00:55:42 -0000 1.17 @@ -117,7 +117,6 @@ image: "bg3.png" LOSSY 95; image: "bg4.png" LOSSY 95; image: "logo.png" LOSSY 95; - image: "frame.png" LOSSY 95; image: "frame_bg.png" LOSSY 95; image: "frame_bg_label.png" LOSSY 95; image: "lbl_group.png" LOSSY 95; @@ -141,10 +140,6 @@ image: "e17.png" LOSSY 95; image: "none.png" LOSSY 95; image: "focus.png" LOSSY 95; - image: "arrow_u.png" LOSSY 95; - image: "arrow_d.png" LOSSY 95; - image: "arrow_l.png" LOSSY 95; - image: "arrow_r.png" LOSSY 95; image: "fakewin.png" LOSSY 95; image: "rel1.png" LOSSY 95; image: "rel2.png" LOSSY 95; @@ -152,11 +147,15 @@ image: "e17.png" LOSSY 95; image: "miniarrow.png" LOSSY 95; image: "gimp.png" LOSSY 95; - image: "grad.png" LOSSY 95; image: "grad_h.png" LOSSY 95; image: "spectra_arrow.png" LOSSY 95; image: "spectra_color.png" LOSSY 95; image: "spectra_icon.png" LOSSY 95; + image: "grad_linear.png" LOSSY 95; + image: "grad_radial.png" LOSSY 95; + image: "grad_rectangular.png" LOSSY 95; + image: "grad_angular.png" LOSSY 95; + image: "grad_sinusoidal.png" LOSSY 95; } fonts { @@ -309,24 +308,6 @@ } } group{ - name: "GRAD.PNG"; - min: 15 16; - max: 15 16; - parts{ - part{ - name: "StaticImage"; - type: IMAGE; - mouse_events: 0; - description{ - state: "default" 0.0; - rel1 {relative: 0.0 0.0; offset: 0 0;} - rel2 {relative: 0.0 0.0; offset: 15 16;} - image {normal: "grad.png";} - } - } - } - } - group{ name: "SPECTRA.PNG"; min: 22 20; max: 22 20; @@ -472,6 +453,97 @@ } } } + group{ + name: "GRAD_LINEAR.PNG"; + min: 15 15; + max: 100 100; + parts{ + part{ + name: "StaticImage"; + type: IMAGE; + mouse_events: 0; + description{ + state: "default" 0.0; + rel1 {relative: 0.0 0.0; offset: 0 0;} + rel2 {relative: 1.0 1.0; offset: 0 0;} + image {normal: "grad_linear.png";} + } + } + } + } + group{ + name: "GRAD_RADIAL.PNG"; + min: 15 15; + max: 100 100; + parts{ + part{ + name: "StaticImage"; + type: IMAGE; + mouse_events: 0; + description{ + state: "default" 0.0; + rel1 {relative: 0.0 0.0; offset: 0 0;} + rel2 {relative: 1.0 1.0; offset: 0 0;} + image {normal: "grad_radial.png";} + } + } + } + } + group{ + name: "GRAD_RECTANGULAR.PNG"; + min: 15 15; + max: 100 100; + parts{ + part{ + name: "StaticImage"; + type: IMAGE; + mouse_events: 0; + description{ + state: "default" 0.0; + rel1 {relative: 0.0 0.0; offset: 0 0;} + rel2 {relative: 1.0 1.0; offset: 0 0;} + image {normal: "grad_rectangular.png";} + } + } + } + } + group{ + name: "GRAD_ANGULAR.PNG"; + min: 15 15; + max: 100 100; + parts{ + part{ + name: "StaticImage"; + type: IMAGE; + mouse_events: 0; + description{ + state: "default" 0.0; + rel1 {relative: 0.0 0.0; offset: 0 0;} + rel2 {relative: 1.0 1.0; offset: 0 0;} + image {normal: "grad_angular.png";} + } + } + } + } + group{ + name: "GRAD_SINUSOIDAL.PNG"; + min: 15 15; + max: 100 100; + parts{ + part{ + name: "StaticImage"; + type: IMAGE; + mouse_events: 0; + description{ + state: "default" 0.0; + rel1 {relative: 0.0 0.0; offset: 0 0;} + rel2 {relative: 1.0 1.0; offset: 0 0;} + image {normal: "grad_sinusoidal.png";} + } + } + } + } + /************************************************************/ /* MainUI /************************************************************/ @@ -544,7 +616,7 @@ FRAME("rect", 120, 77, "lbl_rect.png", 14, 72, "description_frame") FRAME("text", 250, 160, "lbl_text.png", 14, 36, "rect_frame") FRAME("image", 250, 230, "lbl_image.png", 14, 46, "text_frame") - FRAME("gradient", 250, 130, "lbl_grad.png", 14, 67, "image_frame") + FRAME("gradient", 250, 135, "lbl_grad.png", 14, 67, "image_frame") FRAME("fill", 250, 45, "lbl_fill.png", 14, 30, "gradient_frame") FRAME("position", 250, 130, "lbl_pos.png", 14, 60, "fill_frame") FRAME("program", 250, 250, "lbl_prog.png", 14, 60, "position_frame") ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs