diff --git a/ChangeLog b/ChangeLog index fa7015e70..c28b2ac95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-01-22 Mike Blumenkrantz + + * No longer build illume edj files + 2013-01-15 Mike Blumenkrantz * Removed old comp hook and msgbus API, replacing with new e_comp namespaced API and events diff --git a/NEWS b/NEWS index b190df884..d93071664 100644 --- a/NEWS +++ b/NEWS @@ -71,6 +71,7 @@ Improvements: * prevent windows dragged from one screen to another from being larger than the destination screen * track module directories * improve module config dialog load speed + * No longer build illume edj files Fixes: * Shelf option 'overlapping' made clearer and disabled when window automatic movement on shelf hide isn't set. diff --git a/src/modules/Makefile_illume-indicator.am b/src/modules/Makefile_illume-indicator.am index aa2c2ae62..84c33e53e 100644 --- a/src/modules/Makefile_illume-indicator.am +++ b/src/modules/Makefile_illume-indicator.am @@ -1,19 +1,8 @@ illume_indicatordir = $(MDIR)/illume-indicator illume_indicator_DATA = illume-indicator/e-module-illume-indicator.edj \ illume-indicator/module.desktop -CLEANFILES += illume-indicator/e-module-illume-indicator.edj -EXTRA_DIST += illume-indicator/e-module-illume-indicator.edc \ - illume-indicator/module.desktop.in - -# images -EXTRA_DIST += illume-indicator/images/base_bg.png \ - illume-indicator/images/module_icon.png - -ILLUME_INDICATOR_EDJE_FLAGS = $(EDJE_FLAGS) \ - -id $(srcdir)/illume-indicator/images - -illume-indicator/%.edj: illume-indicator/%.edc Makefile - $(EDJE_CC) $(ILLUME_INDICATOR_EDJE_FLAGS) $< $@ +EXTRA_DIST += illume-indicator/module.desktop.in \ + illume-indicator/e-module-illume-indicator.edj illume_indicatorpkgdir = $(MDIR)/illume-indicator/$(MODULE_ARCH) illume_indicatorpkg_LTLIBRARIES = illume-indicator/module.la diff --git a/src/modules/Makefile_illume-keyboard.am b/src/modules/Makefile_illume-keyboard.am index 5a78b54d9..eb8b06f99 100644 --- a/src/modules/Makefile_illume-keyboard.am +++ b/src/modules/Makefile_illume-keyboard.am @@ -2,10 +2,8 @@ illume_keyboarddir = $(MDIR)/illume-keyboard illume_keyboard_DATA = illume-keyboard/e-module-illume-keyboard.edj \ illume-keyboard/module.desktop -EXTRA_DIST += $(illume_keyboard_DATA) \ - illume-keyboard/e-module-illume-keyboard.edj \ +EXTRA_DIST += illume-keyboard/e-module-illume-keyboard.edj \ illume-keyboard/module.desktop.in -CLEANFILES += illume-keyboard/e-module-illume-keyboard.edj # keyboards @@ -36,11 +34,6 @@ illumedicts_DATA = illume-keyboard/dicts/English_US.dic \ EXTRA_DIST += $(illumedicts_DATA) -ILLUME_KEYBOARD_EDJE_FLAGS = $(EDJE_FLAGS) -id $(srcdir)/illume-keyboard/images - -illume-keyboard/%.edj: illume-keyboard/%.edc Makefile - $(EDJE_CC) $(ILLUME_KEYBOARD_EDJE_FLAGS) $< $@ - illume_keyboardpkgdir = $(MDIR)/illume-keyboard/$(MODULE_ARCH) illume_keyboardpkg_LTLIBRARIES = illume-keyboard/module.la diff --git a/src/modules/Makefile_illume-softkey.am b/src/modules/Makefile_illume-softkey.am index 58657e8ed..bd6ee334d 100644 --- a/src/modules/Makefile_illume-softkey.am +++ b/src/modules/Makefile_illume-softkey.am @@ -2,18 +2,9 @@ illume_softkeydir = $(MDIR)/illume-softkey illume_softkey_DATA = illume-softkey/e-module-illume-softkey.edj \ illume-softkey/module.desktop -EXTRA_DIST += $(illume_softkey_DATA) +EXTRA_DIST += illume-softkey/e-module-illume-softkey.edj \ + illume-softkey/module.desktop.in -# images -EXTRA_DIST += illume-softkey/images/shelf_alt_bg.png \ - illume-softkey/images/shelf_alt_shine.png \ - illume-softkey/images/module_icon.png \ - illume-softkey/images/shelf_alt_over.png - -ILLUME_SOFTKEY_EDJE_FLAGS = $(EDJE_FLAGS) -id $(srcdir)/illume-softkey/images - -illume-softkey/%.edj: illume-softkey/%.edc Makefile - $(EDJE_CC) $(ILLUME_SOFTKEY_EDJE_FLAGS) $< $@ illume_softkeypkgdir = $(MDIR)/illume-softkey/$(MODULE_ARCH) illume_softkeypkg_LTLIBRARIES = illume-softkey/module.la diff --git a/src/modules/Makefile_illume2.am b/src/modules/Makefile_illume2.am index 4887bc5f7..b565e8165 100644 --- a/src/modules/Makefile_illume2.am +++ b/src/modules/Makefile_illume2.am @@ -2,12 +2,8 @@ illume2dir = $(MDIR)/illume2 illume2_DATA = illume2/e-module-illume2.edj \ illume2/module.desktop -EXTRA_DIST += illume2/e-module-illume2.edc \ +EXTRA_DIST += illume2/e-module-illume2.edj \ illume2/module.desktop.in -CLEANFILES += illume2/e-module-illume2.edj - -# images -EXTRA_DIST += illume2/images/module_icon.png # keyboards illume2keyboardsdir = $(MDIR)/illume2/keyboards @@ -38,11 +34,6 @@ illume2_policies_tablet_tablet_la_SOURCES = illume2/policies/tablet/policy.c \ illume2/policies/tablet/tablet.h illume2_policies_tablet_tablet_la_LIBTOOLFLAGS = --tag=disable-static -ILLUME2_EDJE_FLAGS = $(EDJE_FLAGS) -id $(srcdir)/illume2/images - -illume2/%.edj: illume2/%.edc Makefile - $(EDJE_CC) $(ILLUME2_EDJE_FLAGS) $< $@ - illume2pkgdir = $(MDIR)/illume2/$(MODULE_ARCH) illume2pkg_LTLIBRARIES = illume2/module.la diff --git a/src/modules/illume-indicator/e-module-illume-indicator.edc b/src/modules/illume-indicator/e-module-illume-indicator.edc deleted file mode 100644 index 6f2513e03..000000000 --- a/src/modules/illume-indicator/e-module-illume-indicator.edc +++ /dev/null @@ -1,175 +0,0 @@ -styles -{ - style - { - name: "notification_style"; - base: "font=Sans font_size=10 align=left style=soft_shadow shadow_color=#fff color=#000 wrap=word text_class=module_normal"; - tag: "subject" "+ text_class=module_large font_size=10"; - tag: "body" "+ text_class=module_normal font_size=10"; - tag: "br" "\n"; - tag: "b" "+ font=Sans:style=Bold text_class=module_bold"; - tag: "i" "+ font=Sans:style=Oblique text_class=module_bold"; - tag: "u" "+ underline=on"; - tag: "img" ""; /* images not supported */ - tag: "a" ""; /* links not supported */ - } -} - -collections -{ - group - { - images.image: "module_icon.png" COMP; - name: "icon"; - max: 128 128; - parts - { - part - { - name: "base"; - mouse_events: 0; - description - { - state: "default" 0.0; - aspect: 1.0 1.0; - aspect_preference: BOTH; - image.normal: "module_icon.png"; - } - } - } - } - group - { - images.image: "base_bg.png" COMP; - name: "modules/illume-indicator/window"; - parts - { - part - { - name: "base"; - type: IMAGE; - mouse_events: 0; - description - { - state: "default" 0.0; - color_class: "shelf_base"; - image.normal: "base_bg.png"; - image.border: 1 1 1 1; - fill.smooth: 0; - } - } - part - { - name: "e.swallow.content"; - type: SWALLOW; - description - { - state: "default" 0.0; - rel1.offset: 3 3; - rel2.offset: -4 -4; - } - } - } - } - group - { - images.image: "base_bg.png" COMP; - name: "modules/illume-indicator/notify"; - parts - { - part - { - name: "base"; - type: IMAGE; - mouse_events: 0; - description - { - state: "default" 0.0; - color_class: "shelf_base"; - image.normal: "base_bg.png"; - image.border: 1 1 1 1; - fill.smooth: 0; - } - } - part - { - name: "e.swallow.icon"; - type: SWALLOW; - mouse_events: 0; - description - { - state: "default" 0.0; - align: 0.0 0.0; - aspect: 1 1; - aspect_preference: BOTH; - rel1.offset: 4 4; - rel2 - { - relative: 0.0 1.0; - offset: 52 -5; - } - } - } - part - { - name: "e.text.title"; - type: TEXT; - mouse_events: 0; - scale: 1; - effect: SOFT_SHADOW; - description - { - state: "default" 0.0; - fixed: 1 1; - align: 0.0 0.0; - rel1 - { - relative: 1.0 0.0; - offset: 3 4; - to_x: "e.swallow.icon"; - } - rel2 - { - relative: 1.0 0.0; - offset: -5 4; // 15 - } - color: 0 0 0 255; - color3: 224 224 224 64; - color_class: "menu_title_active"; - text - { - font: "Sans:style=Bold"; - size: 10; - align: 0.0 0.0; - min: 0 1; - fit: 1 1; - text_class: "menu_title"; - } - } - } - part - { - name: "e.text.message"; - type: TEXTBLOCK; - mouse_events: 0; - description - { - state: "default" 0.0; - align: 0.0 0.0; - rel1 - { - relative: 1.0 0.0; - offset: 4 22; - to_x: "e.swallow.icon"; - } - rel2.offset: -5 -5; - text - { - style: "notification_style"; -// min: 0 1; - } - } - } - } - } -} diff --git a/src/modules/illume-indicator/e-module-illume-indicator.edj b/src/modules/illume-indicator/e-module-illume-indicator.edj new file mode 100644 index 000000000..9e8efbb8a Binary files /dev/null and b/src/modules/illume-indicator/e-module-illume-indicator.edj differ diff --git a/src/modules/illume-indicator/images/base_bg.png b/src/modules/illume-indicator/images/base_bg.png deleted file mode 100644 index a47ea1659..000000000 Binary files a/src/modules/illume-indicator/images/base_bg.png and /dev/null differ diff --git a/src/modules/illume-indicator/images/module_icon.png b/src/modules/illume-indicator/images/module_icon.png deleted file mode 100644 index c759dba47..000000000 Binary files a/src/modules/illume-indicator/images/module_icon.png and /dev/null differ diff --git a/src/modules/illume-keyboard/e-module-illume-keyboard.edc b/src/modules/illume-keyboard/e-module-illume-keyboard.edc deleted file mode 100644 index 132ebea16..000000000 --- a/src/modules/illume-keyboard/e-module-illume-keyboard.edc +++ /dev/null @@ -1,891 +0,0 @@ -collections -{ - group - { - images.image: "module_icon.png" COMP; - name: "icon"; - max: 128 128; - parts - { - part - { - name: "base"; - mouse_events: 0; - description - { - state: "default" 0.0; - aspect: 1.0 1.0; - aspect_preference: BOTH; - image.normal: "module_icon.png"; - } - } - } - } - group { name: "e/modules/kbd/base/default"; - images { - image: "k_wtgr.png" COMP; - image: "k_tpsh.png" COMP; - image: "k_tabl.png" COMP; - image: "k_tabr.png" COMP; - image: "k_tabhl.png" COMP; - image: "k_tabhm.png" COMP; - image: "k_tabhr.png" COMP; - image: "k_grad.png" COMP; -// image: "k_ltgry.png" COMP; -// image: "grill_dark_tiny_pattern.png" COMP; - image: "big_arrow_up.png" COMP; - image: "bt_basew.png" COMP; - image: "bt_base2.png" COMP; - image: "bt_hilightw.png" COMP; - } -// data.item: "shaped" "1"; - parts { - part { name: "base"; - description { state: "default" 0.0; - rel1 { - to_y: "compose_bg"; - relative: 0.0 1.0; - offset: 0 0; - } - image.normal: "k_grad.png"; - fill { - smooth: 0; - size { - relative: 0 1.0; - offset: 36 0; - } - } - } - } -/* - part { name: "base"; - type: RECT; - description { state: "default" 0.0; - color: 51 51 51 255; - } - } - part { name: "grill"; - description { state: "default" 0.0; - rel1 { - to_y: "compose_bg"; - relative: 0.0 1.0; - offset: 0 0; - } - image.normal: "grill_dark_tiny_pattern.png"; - fill { - size { - relative: 0 0; - offset: 144 144; - } - } - } - } - part { name: "light"; - description { state: "default" 0.0; - rel1.to: "grill"; - rel2.to: "grill"; - image.normal: "k_ltgry.png"; - fill { - smooth: 0; - size { - relative: 0 1.0; - offset: 36 0; - } - } - } - } - */ - part { name: "compose_bg"; - description { state: "default" 0.0; - image.normal: "k_wtgr.png"; - rel2.to: "e.swallow.label"; - rel2.offset: 1 2; - fill { - smooth: 0; - size { - relative: 0 1.0; - offset: 36 0; - } - } - } - } - part { name: "e.text.label"; - type: TEXT; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - visible: 0; - rel1.to_x: "tl_tab"; - rel1.relative: 1.0 0.0; - rel1.offset: 1 8; - rel2.to_x: "rt_tab"; - rel2.relative: 0.0 0.0; - rel2.offset: -2 8; - align: 0.5 0.0; - fixed: 0 1; - text { - font: "Sans"; - size: 10; - min: 0 1; - } - } - } - part { name: "e.swallow.label"; - type: SWALLOW; - description { state: "default" 0.0; - rel1.to: "e.text.label"; - rel1.offset: -8 -8; - rel2.to: "e.text.label"; - rel2.offset: 7 7; - align: 0.5 0.0; - } - } - part { name: "compose_sh"; - mouse_events: 0; - description { state: "default" 0.0; - image.normal: "k_tpsh.png"; - rel1 { - to_x: "tl_tab"; - relative: 1.0 0.0; - offset: -12 0; - } - rel2 { - to_x: "rt_tab"; - to_y: "compose_bg"; - relative: 0.0 1.0; - offset: 11 -1; - } - image.border: 12 12 12 12; - fill.smooth: 0; - } - } - part { name: "tl_tab"; - mouse_events: 0; - description { state: "default" 0.0; - image.normal: "k_tabl.png"; - image.border: 0 12 6 6; - fill.smooth: 0; - rel1.to: "lprev"; - rel2.to: "lprev"; - rel2.offset: 13 -1; - } - } - part { name: "rt_tab"; - mouse_events: 0; - description { state: "default" 0.0; - image.normal: "k_tabr.png"; - image.border: 12 0 6 6; - fill.smooth: 0; - rel1.to: "lnext"; - rel1.offset: -12 0; - rel2.to: "lnext"; - } - } - part { name: "lprev"; - type: RECT; - description { state: "default" 0.0; - aspect: 1.5 1.5; - align: 0.0 0.5; - aspect_preference: VERTICAL; - color: 0 0 0 0; - rel2 { - to_y: "compose_bg"; - relative: 0.0 1.0; - offset: 0 -1; - } - } - } - part { name: "lnext"; - type: RECT; - description { state: "default" 0.0; - aspect: 1.5 1.5; - align: 1.0 0.5; - aspect_preference: VERTICAL; - color: 0 0 0 0; - rel1 { - relative: 1.0 0.0; - offset: -1 0; - } - rel2 { - to_y: "compose_bg"; - relative: 1.0 1.0; - offset: -1 -1; - } - } - } - - part { name: "tl_tabh"; - mouse_events: 0; - description { state: "default" 0.0; - image.normal: "k_tabhl.png"; - image.border: 0 12 6 20; - fill.smooth: 0; - rel1.to: "tl_tab"; - rel2.to: "tl_tab"; - rel2.offset: -2 15; - } - } - part { name: "tr_tabh"; - mouse_events: 0; - description { state: "default" 0.0; - image.normal: "k_tabhr.png"; - image.border: 12 0 6 20; - fill.smooth: 0; - rel1.to: "rt_tab"; - rel1.offset: 1 0; - rel2.to: "rt_tab"; - rel2.offset: -1 15; - } - } - part { name: "t_h"; - mouse_events: 0; - description { state: "default" 0.0; - image.normal: "k_tabhm.png"; - fill.smooth: 0; - rel1 { - to: "tl_tabh"; - relative: 1.0 1.0; - offset: 0 -15; - } - rel2 { - to: "tr_tabh"; - relative: 0.0 1.0; - offset: -1 -1; - } - } - } - // dict/selection selector - part { name: "lprev2"; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - max: 22 22; - aspect: 1.39393939 1.39393939; - aspect_preference: BOTH; - image.normal: "big_arrow_up.png"; - color: 255 255 255 255; - align: 0.5 0.5; - rel1.to: "lprev"; - rel2.to: "lprev"; - } - } - - // layout selector icon/config - part { name: "button_image"; - type: IMAGE; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "lnext"; - rel1.offset: 0 1; - rel2.to: "lnext"; -rel2.offset: -4 -1; - image.normal: "bt_basew.png"; - image.border: 7 7 7 7; - fill.smooth: 0; - } - description { state: "active" 0.0; - inherit: "default" 0.0; - image.normal: "bt_base2.png"; - image.border: 7 7 7 7; - fill.smooth: 0; - } - } - part { name: "e.swallow.layout"; - type: SWALLOW; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "button_image"; - rel2.to: "button_image"; - } - } - part { name: "over"; - type: IMAGE; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "button_image"; - rel2.to: "button_image"; - rel2.relative: 1.0 0.5; - image.normal: "bt_hilightw.png"; - image.border: 7 7 7 0; - fill.smooth: 0; - } - } - part { name: "e.swallow.content"; - type: SWALLOW; - description { state: "default" 0.0; - rel1 { - to_y: "e.swallow.label"; - relative: 0.0 1.0; - offset: 0 4; - } - rel2 { - relative: 1.0 1.0; - offset: -1 -1; - } - } - } - } - programs { - program { name: "lprev"; - signal: "mouse,down,1"; - source: "lprev"; - action: SIGNAL_EMIT "e,action,do,matches" ""; - } - program { name: "lnext"; - signal: "mouse,up,1"; - source: "lnext"; - action: SIGNAL_EMIT "e,action,do,layouts" ""; - } - program { name: "clicked"; - signal: "mouse,down,1"; - source: "lnext"; - action: STATE_SET active 0.0; - target: "button_image"; - } - program { name: "released"; - signal: "mouse,up,1"; - source: "lnext"; - action: STATE_SET default 0.0; - target: "button_image"; - } - } - } - - group { name: "e/modules/kbd/match/word"; - images { - image: "bt_basew.png" COMP; - image: "bt_base2.png" COMP; - image: "bt_hilight.png" COMP; - image: "bt_shine.png" COMP; - image: "bt_glow.png" COMP; -image: "bt_dis_hilight.png" COMP; - } - parts { - part { name: "button_image"; - mouse_events: 1; - description { state: "default" 0.0; - rel1.to: "e.text.label"; - rel1.offset: -3 -3; - rel2.to_x: "e.text.label"; - rel2.offset: 2 2; - image { - normal: "bt_basew.png"; - border: 7 7 7 7; - } - fill.smooth: 0; - } - description { state: "active" 0.0; - inherit: "default" 0.0; - image.normal: "bt_base2.png"; - } - } - part { name: "e.text.label"; - type: TEXT; - effect: SOFT_SHADOW; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - color: 0 0 0 255; - color3: 0 0 0 0; - min: 32 0; - rel1 { - relative: 0.0 0.0; - offset: 3 3; - } - rel2 { - relative: 1.0 1.0; - offset: -4 -4; - } - text { - font: "Sans"; - size: 10; - min: 1 1; - } - } - description { state: "active" 0.0; - inherit: "default" 0.0; - color: 224 224 224 255; - color3: 0 0 0 64; - } - } - part { name: "over1"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "button_image"; - rel2.to: "button_image"; - rel2.relative: 1.0 0.5; - image { - normal: "bt_hilight.png"; - border: 7 7 7 0; - } - fill.smooth: 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - image { - normal: "bt_dis_hilight.png"; - border: 4 4 4 0; - } - } - } - part { name: "over2"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "button_image"; - rel2.to: "button_image"; - image { - normal: "bt_shine.png"; - border: 7 7 7 7; - } - fill.smooth: 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - part { name: "over3"; - mouse_events: 0; - description { state: "default" 0.0; - visible: 0; - color: 255 255 255 0; - image { - normal: "bt_glow.png"; - border: 12 12 12 12; - } - fill.smooth : 0; - } - description { state: "clicked" 0.0; - inherit: "default" 0.0; - visible: 1; - color: 255 255 255 255; - } - } - } - programs { - program { name: "select"; - signal: "mouse,up,1"; - source: "button_image"; - action: SIGNAL_EMIT "e,action,do,select" ""; - } - program { name: "default"; - signal: "e,state,selected"; - source: "e"; - action: STATE_SET "active" 0.0; - target: "button_image"; - target: "e.text.label"; - } - program { name: "select2"; - signal: "mouse,down,1"; - source: "button_image"; - action: STATE_SET "active" 0.0; - target: "button_image"; - target: "e.text.label"; - } - program { name: "select3"; - signal: "mouse,up,1"; - source: "button_image"; - action: STATE_SET "default" 0.0; - target: "button_image"; - target: "over3"; - target: "e.text.label"; - } - program { name: "select4"; - signal: "mouse,down,1"; - source: "button_image"; - action: STATE_SET "clicked" 0.0; - target: "over3"; - } - } - } - - group { name: "e/modules/kbd/key/default"; - images { - image: "bt_base2.png" COMP; - image: "bt_basew.png" COMP; - image: "bt_hilightw.png" COMP; - image: "bt_shine.png" COMP; - } - parts { - part { name: "button_image"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "e.swallow.content"; - rel1.offset: -3 -3; - rel2.to_x: "e.swallow.content"; - rel2.offset: 2 2; - image { - normal: "bt_basew.png"; - border: 7 7 7 7; - } - fill.smooth: 0; - } - description { state: "active" 0.0; - inherit: "default" 0.0; - image { - normal: "bt_base2.png"; - border: 7 7 7 7; - } - } - } - part { name: "content_clip"; - type: RECT; - description { state: "default" 0.0; - color: 0 0 0 255; - rel1.to: "button_image"; - rel2.to: "button_image"; - } - description { state: "active" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - } - } - part { - name: "e.swallow.content"; - type: SWALLOW; - clip_to: "content_clip"; - mouse_events: 0; - description { state: "default" 0.0; - rel1 { - relative: 0.0 0.0; - offset: 3 3; - } - rel2 { - relative: 1.0 1.0; - offset: -4 -4; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - rel1 { - relative: -0.5 -2.0; - offset: 3 3; - } - rel2 { - relative: 1.5 0.0; - offset: -4 -4; - } - } - } - part { name: "e.text.label"; - type: TEXT; - clip_to: "content_clip"; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - rel1.to: "e.swallow.content"; - rel2.to: "e.swallow.content"; - color: 255 255 255 255; - text { - font: "Sans"; - size: 10; - min: 1 1; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - text { - size: 24; - } - } - } - part { name: "over1"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "button_image"; - rel2.to: "button_image"; - rel2.relative: 1.0 0.5; - image { - normal: "bt_hilightw.png"; - border: 7 7 7 0; - } - fill.smooth: 0; - } - } - part { name: "over2"; - mouse_events: 1; - description { state: "default" 0.0; - rel1.to: "button_image"; - rel2.to: "button_image"; - image { - normal: "bt_shine.png"; - border: 7 7 7 7; - } - fill.smooth: 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - } - programs { - program { name: "down"; - signal: "e,state,pressed"; - source: "e"; - action: STATE_SET "selected" 0.0; - target: "e.swallow.content"; - target: "e.text.label"; - } - program { name: "up"; - signal: "e,state,released"; - source: "e"; - action: STATE_SET "default" 0.0; - transition: DECELERATE 0.25; - target: "e.swallow.content"; - target: "e.text.label"; - } - program { name: "selected"; - signal: "e,state,selected"; - source: "e"; - action: STATE_SET "active" 0.0; - target: "button_image"; - target: "content_clip"; - } - program { name: "sunelected"; - signal: "e,state,unselected"; - source: "e"; - action: STATE_SET "default" 0.0; - target: "button_image"; - target: "content_clip"; - } - } - } - - group { name: "e/modules/kbd/zoomkey/default"; - images { - image: "bt_base2.png" COMP; - image: "bt_basew.png" COMP; - image: "bt_hilightw.png" COMP; - image: "bt_shine.png" COMP; - } - parts { - part { name: "button_image"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "e.swallow.content"; - rel1.offset: -3 -3; - rel2.to: "e.swallow.content"; - rel2.offset: 2 2; - image { - normal: "bt_basew.png"; - border: 7 7 7 7; - } - fill.smooth: 0; - } - description { state: "active" 0.0; - inherit: "default" 0.0; - image { - normal: "bt_base2.png"; - border: 7 7 7 7; - } - } - } - part { name: "content_clip"; - type: RECT; - description { state: "default" 0.0; - color: 0 0 0 255; - rel1.to: "button_image"; - rel2.to: "button_image"; - } - description { state: "active" 0.0; - inherit: "default" 0.0; - color: 255 255 255 255; - } - } - part { - name: "e.swallow.content"; - type: SWALLOW; - clip_to: "content_clip"; - mouse_events: 0; - description { state: "default" 0.0; - rel1 { - relative: 0.0 0.0; - offset: 3 3; - } - rel2 { - relative: 1.0 1.0; - offset: -4 -4; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - rel1 { - relative: -0.25 -0.25; - offset: 3 3; - } - rel2 { - relative: 1.25 1.25; - offset: -4 -4; - } - } - } - part { name: "e.text.label"; - type: TEXT; - clip_to: "content_clip"; - mouse_events: 0; - scale: 1; - description { state: "default" 0.0; - rel1.to: "e.swallow.content"; - rel2.to: "e.swallow.content"; - color: 255 255 255 255; - text { - font: "Sans"; - size: 40; - min: 1 1; - } - } - description { state: "selected" 0.0; - inherit: "default" 0.0; - text { - size: 60; - } - } - } - part { name: "over1"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "button_image"; - rel2.to: "button_image"; - rel2.relative: 1.0 0.5; - image { - normal: "bt_hilightw.png"; - border: 7 7 7 0; - } - fill.smooth: 0; - } - } - part { name: "over2"; - mouse_events: 1; - description { state: "default" 0.0; - rel1.to: "button_image"; - rel2.to: "button_image"; - image { - normal: "bt_shine.png"; - border: 7 7 7 7; - } - fill.smooth: 0; - } - description { state: "disabled" 0.0; - inherit: "default" 0.0; - visible: 0; - } - } - } - programs { - program { name: "down"; - signal: "e,state,pressed"; - source: "e"; - action: STATE_SET "selected" 0.0; - target: "e.swallow.content"; - target: "e.text.label"; - } - program { name: "up"; - signal: "e,state,released"; - source: "e"; - action: STATE_SET "default" 0.0; - transition: DECELERATE 0.25; - target: "e.swallow.content"; - target: "e.text.label"; - } - program { name: "selected"; - signal: "e,state,selected"; - source: "e"; - action: STATE_SET "active" 0.0; - target: "button_image"; - target: "content_clip"; - } - program { name: "sunelected"; - signal: "e,state,unselected"; - source: "e"; - action: STATE_SET "default" 0.0; - target: "button_image"; - target: "content_clip"; - } - } - } - - group { name: "e/modules/kbd/zoom/default"; -// data.item: "shaped" "1"; -// max: 320 320; // hmm size here should be determined some other way - images { - image: "base_bg.png" COMP; - image: "inset_sunk.png" COMP; - } - parts { - part { name: "base"; - mouse_events: 0; - description { state: "default" 0.0; - image.normal: "base_bg.png"; - image.border: 2 2 2 2; - fill.smooth: 0; - } - } - part { name: "clip"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "border"; - rel2.to: "border"; - rel1.offset: 1 1; - rel2.offset: -2 -2; - } - } - part { name: "e.swallow.content"; - clip_to: "clip"; - type: SWALLOW; - scale: 1; - description { state: "default" 0.0; - min: 120 120; - max: 120 120; - rel1.offset: 4 4; - rel2.offset: -5 -5; - } - } - part { name: "border"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.offset: 3 3; - rel2.offset: -4 -4; - image { - normal: "inset_sunk.png"; - border: 7 7 7 7; - middle: 0; - } - fill.smooth : 0; - } - } - } - } - - group { name: "e/modules/kbd/match/default"; -// data.item: "shaped" "1"; - images { - image: "base_bg.png" COMP; - } - parts { - part { name: "base"; - mouse_events: 0; - description { state: "default" 0.0; - image.normal: "base_bg.png"; - image.border: 2 2 2 2; - fill.smooth: 0; - } - } - part { name: "e.swallow.content"; - type: SWALLOW; - description { state: "default" 0.0; - rel1 { - relative: 0.0 0.0; - offset: 4 4; - } - rel2 { - relative: 1.0 1.0; - offset: -5 -5; - } - } - } - } - } - -} diff --git a/src/modules/illume-keyboard/e-module-illume-keyboard.edj b/src/modules/illume-keyboard/e-module-illume-keyboard.edj new file mode 100644 index 000000000..8f744d62e Binary files /dev/null and b/src/modules/illume-keyboard/e-module-illume-keyboard.edj differ diff --git a/src/modules/illume-keyboard/images/base_bg.png b/src/modules/illume-keyboard/images/base_bg.png deleted file mode 100644 index a47ea1659..000000000 Binary files a/src/modules/illume-keyboard/images/base_bg.png and /dev/null differ diff --git a/src/modules/illume-keyboard/images/big_arrow_up.png b/src/modules/illume-keyboard/images/big_arrow_up.png deleted file mode 100644 index 864f1ce7d..000000000 Binary files a/src/modules/illume-keyboard/images/big_arrow_up.png and /dev/null differ diff --git a/src/modules/illume-keyboard/images/bt_base2.png b/src/modules/illume-keyboard/images/bt_base2.png deleted file mode 100644 index f91441886..000000000 Binary files a/src/modules/illume-keyboard/images/bt_base2.png and /dev/null differ diff --git a/src/modules/illume-keyboard/images/bt_basew.png b/src/modules/illume-keyboard/images/bt_basew.png deleted file mode 100644 index 2a241f2ee..000000000 Binary files a/src/modules/illume-keyboard/images/bt_basew.png and /dev/null differ diff --git a/src/modules/illume-keyboard/images/bt_dis_hilight.png b/src/modules/illume-keyboard/images/bt_dis_hilight.png deleted file mode 100644 index e03cd3c93..000000000 Binary files a/src/modules/illume-keyboard/images/bt_dis_hilight.png and /dev/null differ diff --git a/src/modules/illume-keyboard/images/bt_glow.png b/src/modules/illume-keyboard/images/bt_glow.png deleted file mode 100644 index 735787e37..000000000 Binary files a/src/modules/illume-keyboard/images/bt_glow.png and /dev/null differ diff --git a/src/modules/illume-keyboard/images/bt_hilight.png b/src/modules/illume-keyboard/images/bt_hilight.png deleted file mode 100644 index 173ee6412..000000000 Binary files a/src/modules/illume-keyboard/images/bt_hilight.png and /dev/null differ diff --git a/src/modules/illume-keyboard/images/bt_hilightw.png b/src/modules/illume-keyboard/images/bt_hilightw.png deleted file mode 100644 index d5dbd3193..000000000 Binary files a/src/modules/illume-keyboard/images/bt_hilightw.png and /dev/null differ diff --git a/src/modules/illume-keyboard/images/bt_shine.png b/src/modules/illume-keyboard/images/bt_shine.png deleted file mode 100644 index 7a43de78f..000000000 Binary files a/src/modules/illume-keyboard/images/bt_shine.png and /dev/null differ diff --git a/src/modules/illume-keyboard/images/inset_sunk.png b/src/modules/illume-keyboard/images/inset_sunk.png deleted file mode 100644 index 4be55c716..000000000 Binary files a/src/modules/illume-keyboard/images/inset_sunk.png and /dev/null differ diff --git a/src/modules/illume-keyboard/images/k_grad.png b/src/modules/illume-keyboard/images/k_grad.png deleted file mode 100644 index e96638f1e..000000000 Binary files a/src/modules/illume-keyboard/images/k_grad.png and /dev/null differ diff --git a/src/modules/illume-keyboard/images/k_tabhl.png b/src/modules/illume-keyboard/images/k_tabhl.png deleted file mode 100644 index 04d298c9f..000000000 Binary files a/src/modules/illume-keyboard/images/k_tabhl.png and /dev/null differ diff --git a/src/modules/illume-keyboard/images/k_tabhm.png b/src/modules/illume-keyboard/images/k_tabhm.png deleted file mode 100644 index a1f1e12d7..000000000 Binary files a/src/modules/illume-keyboard/images/k_tabhm.png and /dev/null differ diff --git a/src/modules/illume-keyboard/images/k_tabhr.png b/src/modules/illume-keyboard/images/k_tabhr.png deleted file mode 100644 index 6c54fb117..000000000 Binary files a/src/modules/illume-keyboard/images/k_tabhr.png and /dev/null differ diff --git a/src/modules/illume-keyboard/images/k_tabl.png b/src/modules/illume-keyboard/images/k_tabl.png deleted file mode 100644 index 3b3701043..000000000 Binary files a/src/modules/illume-keyboard/images/k_tabl.png and /dev/null differ diff --git a/src/modules/illume-keyboard/images/k_tabr.png b/src/modules/illume-keyboard/images/k_tabr.png deleted file mode 100644 index 524914b62..000000000 Binary files a/src/modules/illume-keyboard/images/k_tabr.png and /dev/null differ diff --git a/src/modules/illume-keyboard/images/k_tpsh.png b/src/modules/illume-keyboard/images/k_tpsh.png deleted file mode 100644 index f2b4097d1..000000000 Binary files a/src/modules/illume-keyboard/images/k_tpsh.png and /dev/null differ diff --git a/src/modules/illume-keyboard/images/k_wtgr.png b/src/modules/illume-keyboard/images/k_wtgr.png deleted file mode 100644 index 099a22345..000000000 Binary files a/src/modules/illume-keyboard/images/k_wtgr.png and /dev/null differ diff --git a/src/modules/illume-keyboard/images/module_icon.png b/src/modules/illume-keyboard/images/module_icon.png deleted file mode 100644 index 2bf6d32fb..000000000 Binary files a/src/modules/illume-keyboard/images/module_icon.png and /dev/null differ diff --git a/src/modules/illume-softkey/e-module-illume-softkey.edc b/src/modules/illume-softkey/e-module-illume-softkey.edc deleted file mode 100644 index a8eeb0638..000000000 --- a/src/modules/illume-softkey/e-module-illume-softkey.edc +++ /dev/null @@ -1,133 +0,0 @@ -collections -{ - group - { - images.image: "module_icon.png" COMP; - name: "icon"; - max: 128 128; - parts - { - part - { - name: "base"; - mouse_events: 0; - description - { - state: "default" 0.0; - aspect: 1.0 1.0; - aspect_preference: BOTH; - image.normal: "module_icon.png"; - } - } - } - } - group - { - images - { - image: "shelf_alt_bg.png" COMP; - image: "shelf_alt_over.png" COMP; - image: "shelf_alt_shine.png" COMP; - } - name: "modules/illume-softkey/window"; - parts - { - part - { - name: "base"; - type: IMAGE; - mouse_events: 0; - description - { - state: "default" 0.0; - color_class: "shelf_base"; - image.normal: "shelf_alt_bg.png"; - fill.smooth: 0; - } - } - part - { - name: "shine"; - type: IMAGE; - mouse_events: 0; - description - { - state: "default" 0.0; - image.normal: "shelf_alt_shine.png"; - rel2.relative: 1.0 0.5; - fill.smooth: 0; - } - } - part - { - name: "over"; - type: IMAGE; - mouse_events: 0; - description - { - state: "default" 0.0; - image - { - normal: "shelf_alt_over.png"; - border: 5 5 5 5; - middle: 0; - } - fill.smooth: 0; - } - } - part - { - name: "e.box.extra_buttons"; - type: BOX; - description - { - state: "default" 0.0; - rel1 - { - offset: 3 3; - to: "base"; - } - rel2 - { - relative: 0.30 1.0; - offset: 0 -4; - to: "base"; - } - box - { - layout: "horizontal"; - padding: 2 0; - align: 0.0 0.5; - min: 1 1; - } - } - } - part - { - name: "e.box.buttons"; - type: BOX; - description - { - state: "default" 0.0; - rel1 - { - relative: 1.0 0.0; - to: "e.box.extra_buttons"; - } - rel2 - { - offset: -2 -4; - to: "base"; - } - box - { - layout: "horizontal"; - padding: 2 0; - align: 1.0 0.5; - min: 1 1; - } - } - } - } - } -} diff --git a/src/modules/illume-softkey/e-module-illume-softkey.edj b/src/modules/illume-softkey/e-module-illume-softkey.edj new file mode 100644 index 000000000..351bfdcb6 Binary files /dev/null and b/src/modules/illume-softkey/e-module-illume-softkey.edj differ diff --git a/src/modules/illume-softkey/images/module_icon.png b/src/modules/illume-softkey/images/module_icon.png deleted file mode 100644 index 56691d0b0..000000000 Binary files a/src/modules/illume-softkey/images/module_icon.png and /dev/null differ diff --git a/src/modules/illume-softkey/images/shelf_alt_bg.png b/src/modules/illume-softkey/images/shelf_alt_bg.png deleted file mode 100644 index 64e2b2c2c..000000000 Binary files a/src/modules/illume-softkey/images/shelf_alt_bg.png and /dev/null differ diff --git a/src/modules/illume-softkey/images/shelf_alt_over.png b/src/modules/illume-softkey/images/shelf_alt_over.png deleted file mode 100644 index cef17132f..000000000 Binary files a/src/modules/illume-softkey/images/shelf_alt_over.png and /dev/null differ diff --git a/src/modules/illume-softkey/images/shelf_alt_shine.png b/src/modules/illume-softkey/images/shelf_alt_shine.png deleted file mode 100644 index 5c0588d8b..000000000 Binary files a/src/modules/illume-softkey/images/shelf_alt_shine.png and /dev/null differ diff --git a/src/modules/illume2/e-module-illume2.edc b/src/modules/illume2/e-module-illume2.edc deleted file mode 100644 index 8b408f9f4..000000000 --- a/src/modules/illume2/e-module-illume2.edc +++ /dev/null @@ -1,25 +0,0 @@ -collections -{ - group - { - images.image: "module_icon.png" COMP; - name: "icon"; - max: 128 128; - parts - { - part - { - name: "icon"; - type: IMAGE; - mouse_events: 0; - description - { - state: "default" 0.0; - aspect: 1.0 1.0; - aspect_preference: BOTH; - image.normal: "module_icon.png"; - } - } - } - } -} diff --git a/src/modules/illume2/e-module-illume2.edj b/src/modules/illume2/e-module-illume2.edj new file mode 100644 index 000000000..43d815081 Binary files /dev/null and b/src/modules/illume2/e-module-illume2.edj differ diff --git a/src/modules/illume2/images/module_icon.png b/src/modules/illume2/images/module_icon.png deleted file mode 100644 index babb89634..000000000 Binary files a/src/modules/illume2/images/module_icon.png and /dev/null differ