hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=6ebb0d1ba524e64aa5482c78b1ca426fa38eac2e
commit 6ebb0d1ba524e64aa5482c78b1ca426fa38eac2e Author: Hermet Park <[email protected]> Date: Fri Jul 15 19:18:51 2016 +0900 Revert "templates: updated button" This reverts commit 25e6943e33e7535b9752de515a923d00d74198f2. This patch didn't intended... --- data/images/ENVENTOR_EMBEDDED_BUTTON_BG.png | Bin 405 -> 0 bytes data/images/ENVENTOR_EMBEDDED_BUTTON_BG_DOWN.png | Bin 436 -> 0 bytes data/images/ENVENTOR_EMBEDDED_BUTTON_BG_HOVER.png | Bin 393 -> 0 bytes data/images/Makefile.am | 3 - data/templates/Button.edc | 99 ---------------------- data/templates/Makefile.am | 5 -- 6 files changed, 107 deletions(-) diff --git a/data/images/ENVENTOR_EMBEDDED_BUTTON_BG.png b/data/images/ENVENTOR_EMBEDDED_BUTTON_BG.png deleted file mode 100644 index d0e399f..0000000 Binary files a/data/images/ENVENTOR_EMBEDDED_BUTTON_BG.png and /dev/null differ diff --git a/data/images/ENVENTOR_EMBEDDED_BUTTON_BG_DOWN.png b/data/images/ENVENTOR_EMBEDDED_BUTTON_BG_DOWN.png deleted file mode 100644 index d4882af..0000000 Binary files a/data/images/ENVENTOR_EMBEDDED_BUTTON_BG_DOWN.png and /dev/null differ diff --git a/data/images/ENVENTOR_EMBEDDED_BUTTON_BG_HOVER.png b/data/images/ENVENTOR_EMBEDDED_BUTTON_BG_HOVER.png deleted file mode 100644 index b83d3c6..0000000 Binary files a/data/images/ENVENTOR_EMBEDDED_BUTTON_BG_HOVER.png and /dev/null differ diff --git a/data/images/Makefile.am b/data/images/Makefile.am index 261f709..6f83bcc 100644 --- a/data/images/Makefile.am +++ b/data/images/Makefile.am @@ -25,9 +25,6 @@ files_DATA = ENVENTOR_EMBEDDED_IMAGE.png \ ENVENTOR_EMBEDDED_NEEDLE_MINUTE_RECT.png \ ENVENTOR_EMBEDDED_NEEDLE_SECOND_RECT.png \ ENVENTOR_EMBEDDED_WATCHFACE_RECT.png \ - ENVENTOR_EMBEDDED_BUTTON_BG.png \ - ENVENTOR_EMBEDDED_BUTTON_BG_HOVER.png \ - ENVENTOR_EMBEDDED_BUTTON_BG_DOWN.png \ ENVENTOR_EMBEDDED_ICON_ARROW.png \ ENVENTOR_EMBEDDED_ICON_BADGE.png \ ENVENTOR_EMBEDDED_ICON_BADGE_DOWN.png \ diff --git a/data/templates/Button.edc b/data/templates/Button.edc deleted file mode 100644 index 9782c11..0000000 --- a/data/templates/Button.edc +++ /dev/null @@ -1,99 +0,0 @@ -collections { - base_scale: 1.0; - group { "main"; - /* TODO: Please replace embedded image files to your application image files. */ - images { - image: "ENVENTOR_EMBEDDED_BUTTON_BG.png" COMP; - image: "ENVENTOR_EMBEDDED_BUTTON_BG_HOVER.png" COMP; - image: "ENVENTOR_EMBEDDED_BUTTON_BG_DOWN.png" COMP; - } - parts { - rect { "button_shadow"; - scale: 1; - desc { "default"; - color: 0 0 0 155; - visible: 1; - align: 0.5 0.5; - rel1.to: "button_bg"; - rel1.relative: 0.0 0.0; - rel2.to: "button_bg"; - rel2.relative: 1.0 1.0; - rel2.offset: 5 5; - min: 50 20; - max: 200 50; - fixed: 1 1; - } - } - image { "button_bg"; - scale: 1; - desc { "default"; - visible: 1; - /* TODO: Please replace embedded image files to your application image files. */ - image.normal: "ENVENTOR_EMBEDDED_BUTTON_BG.png"; - //aspect: 1 1; - image.border: 3 3 3 3; - align: 0.5 0.5; - align: 0.5 0.5; - rel1.relative: 0.0 0.0; - rel2.relative: 1.0 1.0; - min: 50 20; - max: 200 50; - fixed: 1 1; - } - desc { "hovered"; - inherit: "default"; - image.normal: "ENVENTOR_EMBEDDED_BUTTON_BG_HOVER.png"; - } - desc { "clicked"; - inherit: "default"; - image.normal: "ENVENTOR_EMBEDDED_BUTTON_BG_DOWN.png"; - } - } - text { "button_text"; - scale: 1; - mouse_events: 0; - desc { "default"; - color: 70 70 70 255; - visible: 1; - text { - size: 15; - font: "Mono"; - text: "EDC CUSTOM BUTTON"; - align: 0.5 0.5; - min: 0 0; - } - min: 50 20; - align: 0.5 0.5; - rel1.relative: 0.0 0.0; - rel2.relative: 1.0 1.0; - } - } - } - programs { - program { "mouse_down"; - signal: "mouse,down,1"; - source: "button_bg"; - action: STATE_SET "clicked"; - target: "button_bg"; - } - program { "mouse_up"; - signal: "mouse,up,1"; - source: "button_bg"; - action: STATE_SET "hovered"; - target: "button_bg"; - } - program { "mouse_in"; - signal: "mouse,in"; - source: "button_bg"; - action: STATE_SET "hovered"; - target: "button_bg"; - } - program { "mouse_out"; - signal: "mouse,out"; - source: "button_bg"; - action: STATE_SET "default"; - target: "button_bg"; - } - } - } -} \ No newline at end of file diff --git a/data/templates/Makefile.am b/data/templates/Makefile.am index 640a4d0..1634a98 100644 --- a/data/templates/Makefile.am +++ b/data/templates/Makefile.am @@ -6,8 +6,6 @@ EDJE_FLAGS = -id $(top_srcdir)/data/images -sd $(top_srcdir)/data/sounds filesdir = $(datadir)/$(PACKAGE)/templates files_DATA = Basic.edc \ Basic.edj \ - Button.edc \ - Button.edj \ Clip.edc \ Clip.edj \ Empty.edc \ @@ -51,9 +49,6 @@ builddir = $(top_builddir)/data/templates Basic.edj: Makefile Basic.edc $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Basic.edc $(builddir)/Basic.edj -Button.edj: Makefile Button.edc - $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Button.edc $(builddir)/Button.edj - Empty.edj: Makefile Empty.edc $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/Empty.edc $(builddir)/Empty.edj --
