Menu
▾
▴
enlightenment-svn — SVN Commits Mailing List
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(281) |
Sep
(604) |
Oct
(993) |
Nov
(511) |
Dec
(520) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(476) |
Feb
(432) |
Mar
(524) |
Apr
(653) |
May
(393) |
Jun
(356) |
Jul
(329) |
Aug
(584) |
Sep
(683) |
Oct
(559) |
Nov
(690) |
Dec
(762) |
| 2010 |
Jan
(924) |
Feb
(912) |
Mar
(964) |
Apr
(859) |
May
(867) |
Jun
(593) |
Jul
(769) |
Aug
(1067) |
Sep
(1142) |
Oct
(1134) |
Nov
(1030) |
Dec
(691) |
| 2011 |
Jan
(822) |
Feb
(828) |
Mar
(791) |
Apr
(824) |
May
(799) |
Jun
(1039) |
Jul
(1035) |
Aug
(1121) |
Sep
(687) |
Oct
(852) |
Nov
(1138) |
Dec
(979) |
| 2012 |
Jan
(957) |
Feb
(893) |
Mar
(1265) |
Apr
(737) |
May
(1051) |
Jun
(1464) |
Jul
(1618) |
Aug
(1202) |
Sep
(1304) |
Oct
(1504) |
Nov
(1219) |
Dec
(1981) |
| 2013 |
Jan
(1566) |
Feb
(858) |
Mar
(83) |
Apr
(66) |
May
(9) |
Jun
(14) |
Jul
(13) |
Aug
|
Sep
(5) |
Oct
|
Nov
|
Dec
|
|
From: Enlightenment S. <no-...@en...> - 2013-03-13 12:54:24
|
Log: PROTO/elocation: Remove from svn as it lifes in my devs dir on git.enlightenment.org now Author: stefan Date: 2013-03-13 05:54:12 -0700 (Wed, 13 Mar 2013) New Revision: 84434 Trac: http://trac.enlightenment.org/e/changeset/84434 Removed: trunk/PROTO/elocation/.gitignore trunk/PROTO/elocation/AUTHORS trunk/PROTO/elocation/Makefile.am trunk/PROTO/elocation/README trunk/PROTO/elocation/autogen.sh trunk/PROTO/elocation/configure.ac trunk/PROTO/elocation/doc/Doxyfile.in trunk/PROTO/elocation/doc/Makefile.am trunk/PROTO/elocation/doc/e.css trunk/PROTO/elocation/doc/elocation.dox.in trunk/PROTO/elocation/doc/foot.html trunk/PROTO/elocation/doc/head.html trunk/PROTO/elocation/doc/img/edoxy.css trunk/PROTO/elocation/doc/img/foot_bg.png trunk/PROTO/elocation/doc/img/head_bg.png trunk/PROTO/elocation/doc/img/header_menu_background.png trunk/PROTO/elocation/doc/img/header_menu_background_last.png trunk/PROTO/elocation/doc/img/header_menu_current_background.png trunk/PROTO/elocation/doc/img/header_menu_unselected_background.png trunk/PROTO/elocation/doc/img/logo.png trunk/PROTO/elocation/elocation.pc.in trunk/PROTO/elocation/m4/ac_attribute.m4 trunk/PROTO/elocation/m4/efl_doxygen.m4 trunk/PROTO/elocation/m4/efl_path_max.m4 trunk/PROTO/elocation/m4/efl_tests.m4 trunk/PROTO/elocation/m4/efl_threads.m4 trunk/PROTO/elocation/src/Makefile.am trunk/PROTO/elocation/src/bin/Makefile.am trunk/PROTO/elocation/src/bin/elocation-test.c trunk/PROTO/elocation/src/lib/Elocation.h trunk/PROTO/elocation/src/lib/Makefile.am trunk/PROTO/elocation/src/lib/elocation.c trunk/PROTO/elocation/src/lib/elocation_private.h trunk/PROTO/elocation/src/tests/Makefile.am trunk/PROTO/elocation/src/tests/elocation_suite.c |
|
From: Enlightenment S. <no-...@en...> - 2013-03-13 11:47:11
|
Log: rmoev evasgenericloaders.. already in OLD. Author: raster Date: 2013-03-13 04:47:01 -0700 (Wed, 13 Mar 2013) New Revision: 84433 Trac: http://trac.enlightenment.org/e/changeset/84433 Removed: trunk/evas_generic_loaders/ |
|
From: Enlightenment S. <no-...@en...> - 2013-03-13 09:46:17
|
Log: oops fixe entry glow focus indicator. Author: raster Date: 2013-03-13 02:46:07 -0700 (Wed, 13 Mar 2013) New Revision: 84432 Trac: http://trac.enlightenment.org/e/changeset/84432 Modified: trunk/THEMES/dark/edje/edc/elm/entry.edc Modified: trunk/THEMES/dark/edje/edc/elm/entry.edc =================================================================== --- trunk/THEMES/dark/edje/edc/elm/entry.edc 2013-03-13 09:36:24 UTC (rev 84431) +++ trunk/THEMES/dark/edje/edc/elm/entry.edc 2013-03-13 09:46:07 UTC (rev 84432) @@ -281,15 +281,15 @@ image.border: 7 7 7 7; image.middle: 0; fill.smooth: 0; - color: 51 153 255 0; + color: 255 255 255 0; } description { state: "focused" 0.0; inherit: "default" 0.0; - color: 51 153 255 255; + color: 255 255 255 255; } description { state: "focused2" 0.0; inherit: "default" 0.0; - color: 51 153 255 64; + color: 255 255 255 64; } } } |
|
From: Enlightenment S. <no-...@en...> - 2013-03-13 09:36:33
|
Log: and fix sizer calce and color issues. Author: raster Date: 2013-03-13 02:36:24 -0700 (Wed, 13 Mar 2013) New Revision: 84431 Trac: http://trac.enlightenment.org/e/changeset/84431 Modified: trunk/THEMES/dark/edje/edc/elm/button.edc trunk/THEMES/dark/edje/edc/elm/check.edc Modified: trunk/THEMES/dark/edje/edc/elm/button.edc =================================================================== --- trunk/THEMES/dark/edje/edc/elm/button.edc 2013-03-13 09:31:04 UTC (rev 84430) +++ trunk/THEMES/dark/edje/edc/elm/button.edc 2013-03-13 09:36:24 UTC (rev 84431) @@ -115,6 +115,7 @@ part { name: "sizer.content"; type: TEXT; mouse_events: 0; scale: 1; description { state: "default" 0.0; + fixed: 1 1; visible: 0; text { font: "Sans"; size: 10; min: 0 0; Modified: trunk/THEMES/dark/edje/edc/elm/check.edc =================================================================== --- trunk/THEMES/dark/edje/edc/elm/check.edc 2013-03-13 09:31:04 UTC (rev 84430) +++ trunk/THEMES/dark/edje/edc/elm/check.edc 2013-03-13 09:36:24 UTC (rev 84431) @@ -160,6 +160,7 @@ part { name: "sizer.content"; type: TEXT; mouse_events: 0; scale: 1; description { state: "default" 0.0; + fixed: 1 1; visible: 0; text { font: "Sans"; size: 10; min: 0 0; @@ -424,7 +425,7 @@ rel1.relative: -5.0 0.0; rel2.to: "button"; rel2.relative: 0.5 1.0; - color: 48 48 48 255; + color: 24 24 24 255; } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -439,7 +440,7 @@ rel1.relative: 0.5 0.0; rel2.to: "button"; rel2.relative: 6.0 1.0; - color: 48 48 48 255; + color: 24 24 24 255; } description { state: "disabled" 0.0; inherit: "default" 0.0; @@ -638,6 +639,7 @@ part { name: "sizer.content"; type: TEXT; mouse_events: 0; scale: 1; description { state: "default" 0.0; + fixed: 1 1; visible: 0; text { font: "Sans"; size: 10; min: 0 0; |
|
From: Enlightenment S. <no-...@en...> - 2013-03-13 09:31:14
|
Log: checkbox/toggles now done in dark for elm. Author: raster Date: 2013-03-13 02:31:04 -0700 (Wed, 13 Mar 2013) New Revision: 84430 Trac: http://trac.enlightenment.org/e/changeset/84430 Added: trunk/THEMES/dark/edje/edc/elm/check.edc trunk/THEMES/dark/edje/edc/elm/separator.edc trunk/THEMES/dark/edje/img/bevel_dark_in.png Modified: trunk/THEMES/dark/edje/dark.edc trunk/THEMES/dark/edje/edc/elm/button.edc trunk/THEMES/dark/edje/edc/elm/entry.edc trunk/THEMES/dark/edje/img/bg_glow_in.png Modified: trunk/THEMES/dark/edje/dark.edc =================================================================== --- trunk/THEMES/dark/edje/dark.edc 2013-03-13 06:48:02 UTC (rev 84429) +++ trunk/THEMES/dark/edje/dark.edc 2013-03-13 09:31:04 UTC (rev 84430) @@ -10,6 +10,8 @@ #include "edc/elm/entry.edc" #include "edc/elm/frame.edc" #include "edc/elm/label.edc" +#include "edc/elm/separator.edc" +#include "edc/elm/check.edc" // desktop in general #include "edc/comp.edc" Modified: trunk/THEMES/dark/edje/edc/elm/button.edc =================================================================== --- trunk/THEMES/dark/edje/edc/elm/button.edc 2013-03-13 06:48:02 UTC (rev 84429) +++ trunk/THEMES/dark/edje/edc/elm/button.edc 2013-03-13 09:31:04 UTC (rev 84430) @@ -116,7 +116,7 @@ scale: 1; description { state: "default" 0.0; visible: 0; - text { font: "Sans,Edje-Vera"; size: 10; + text { font: "Sans"; size: 10; min: 0 0; text_class: "button_text"; } @@ -405,7 +405,7 @@ scale: 1; description { state: "default" 0.0; visible: 0; - text { font: "Sans,Edje-Vera"; size: 10; + text { font: "Sans"; size: 10; min: 0 0; text_class: "button_text"; } Added: trunk/THEMES/dark/edje/edc/elm/check.edc =================================================================== --- trunk/THEMES/dark/edje/edc/elm/check.edc (rev 0) +++ trunk/THEMES/dark/edje/edc/elm/check.edc 2013-03-13 09:31:04 UTC (rev 84430) @@ -0,0 +1,888 @@ +group { name: "elm/check/base/default"; + images.image: "inset_shadow_tiny.png" COMP; + images.image: "bevel_in.png" COMP; + images.image: "sym_check_alum.png" COMP; +#define ICON 1 +#define LABEL 2 +#define MASK 3 +#define DISABLE 4 + script { + public btmode; + public eval_mode(m) { + new m1 = m & MASK; + new d = m & DISABLE; + if (m1 == (ICON | LABEL)) { + if (!d) { + set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"sizer.content", "visible", 0.0); + set_state(PART:"elm.text", "visible", 0.0); + set_state(PART:"shadow", "default", 0.0); + set_state(PART:"base", "default", 0.0); + set_state(PART:"clip", "default", 0.0); + set_state(PART:"event", "default", 0.0); + } else { + set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"sizer.content", "visible", 0.0); + set_state(PART:"elm.text", "disabled_visible", 0.0); + set_state(PART:"shadow", "disabled", 0.0); + set_state(PART:"base", "disabled", 0.0); + set_state(PART:"clip", "disabled", 0.0); + set_state(PART:"event", "disabled", 0.0); + } + } else if (m1 == (ICON)) { + if (!d) { + set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"sizer.content", "icononly", 0.0); + set_state(PART:"elm.text", "default", 0.0); + set_state(PART:"shadow", "default", 0.0); + set_state(PART:"base", "default", 0.0); + set_state(PART:"clip", "default", 0.0); + set_state(PART:"event", "default", 0.0); + } else { + set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"sizer.content", "icononly", 0.0); + set_state(PART:"elm.text", "disabled", 0.0); + set_state(PART:"shadow", "disabled", 0.0); + set_state(PART:"base", "disabled", 0.0); + set_state(PART:"clip", "disabled", 0.0); + set_state(PART:"event", "disabled", 0.0); + } + } else if (m1 == (LABEL)) { + if (!d) { + set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"sizer.content", "default", 0.0); + set_state(PART:"elm.text", "visible", 0.0); + set_state(PART:"shadow", "default", 0.0); + set_state(PART:"base", "default", 0.0); + set_state(PART:"clip", "default", 0.0); + set_state(PART:"event", "default", 0.0); + } else { + set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"sizer.content", "default", 0.0); + set_state(PART:"elm.text", "disabled_visible", 0.0); + set_state(PART:"shadow", "disabled", 0.0); + set_state(PART:"base", "disabled", 0.0); + set_state(PART:"clip", "disabled", 0.0); + set_state(PART:"event", "disabled", 0.0); + } + } + } + } + parts { + part { name: "base"; type: RECT; + description { state: "default" 0.0; + rel1.offset: 1 1; + rel1.to: "inset"; + rel2.offset: -2 -2; + rel2.to: "inset"; + color: 24 24 24 255; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 64 64 64 255; + } + } + part { name: "shadow"; mouse_events: 0; + description { state: "default" 0.0; + image.normal: "inset_shadow_tiny.png"; + image.border: 4 4 4 4; + rel1.to: "base"; + rel2.to: "base"; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } + part { name: "inset"; mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + fixed: 1 1; + rel1.offset: 2 2; + rel2.relative: 0.0 1.0; + rel2.offset: 2 -3; + align: 0.0 0.5; + min: 13 13; + max: 13 13; + image.normal: "bevel_in.png"; + image.border: 1 1 1 1; + image.middle: 0; + fill.smooth: 0; + } + } + part { name: "indicator"; mouse_events: 0; + scale: 1; + clip_to: "clip"; + description { state: "default" 0.0; + rel1.to: "base"; + rel2.to: "base"; + image.normal: "sym_check_alum.png"; + min: 11 11; + max: 11 11; + visible: 0; + } + description { state: "selected" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part { name: "clip"; type: RECT; + description { state: "default" 0.0; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 255 255 255 64; + } + } + part { name: "elm.swallow.content"; type: SWALLOW; + scale: 1; + clip_to: "clip"; + description { state: "default" 0.0; + fixed: 1 0; + visible: 0; + align: 0.0 0.5; + max: 0 0; + rel1.to_x: "inset"; + rel1.relative: 1.0 0.0; + rel1.offset: 1 1; + rel2.to_x: "inset"; + rel2.offset: 1 -2; + rel2.relative: 1.0 1.0; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + fixed: 0 0; + visible: 1; + aspect: 1.0 1.0; + min: 16 16; + } + } + part { name: "sizer.content"; type: TEXT; mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + visible: 0; + text { font: "Sans"; size: 10; + min: 0 0; + text_class: "check_text"; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + rel1.to: "elm.swallow.content"; + rel2.to: "elm.swallow.content"; + text { + min: 1 1; + text: "M"; + } + } + description { state: "icononly" 0.0; + inherit: "default" 0.0; + rel1.to: "elm.swallow.content"; + rel2.to: "elm.swallow.content"; + text { + min: 1 1; + text: "M"; + } + } + } + part { name: "elm.text"; type: TEXT; mouse_events: 0; + effect: SHADOW BOTTOM; + scale: 1; + description { state: "default" 0.0; + rel1.offset: 2 2; + rel1.to_x: "elm.swallow.content"; + rel1.relative: 1.0 0.0; + rel2.offset: -3 -3; + color: 255 255 255 255; + color3: 0 0 0 128; + color_class: "check_text"; + text { font: "Sans"; size: 10; + min: 0 0; + align: 0.0 0.5; + text_class: "check"; + } + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 21 21 21 255; + color3: 255 255 255 25; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + text.min: 1 1; + } + description { state: "disabled_visible" 0.0; + inherit: "default" 0.0; + color: 21 21 21 255; + color3: 255 255 255 25; + visible: 1; + text.min: 1 1; + } + } + part { name: "event"; type: RECT; + ignore_flags: ON_HOLD; + description { state: "default" 0.0; + color: 0 0 0 0; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } + } + programs { + program { + signal: "mouse,clicked,1"; source: "event"; + action: SIGNAL_EMIT "elm,action,check,toggle" ""; + } + program { + signal: "elm,state,check,on"; source: "elm"; + action: STATE_SET "selected" 0.0; + target: "indicator"; + } + program { + signal: "elm,state,check,off"; source: "elm"; + action: STATE_SET "default" 0.0; + target: "indicator"; + } + program { + signal: "elm,state,text,visible"; source: "elm"; + script { + new m = get_int(btmode); + m |= LABEL; set_int(btmode, m); + eval_mode(m); + } + } + program { + signal: "elm,state,text,hidden"; source: "elm"; + script { + new m = get_int(btmode); + m &= ~LABEL; set_int(btmode, m); + eval_mode(m); + } + } + program { + signal: "elm,state,icon,visible"; source: "elm"; + script { + new m = get_int(btmode); + m |= ICON; set_int(btmode, m); + eval_mode(m); + } + } + program { + signal: "elm,state,icon,hidden"; source: "elm"; + script { + new m = get_int(btmode); + m &= ~ICON; set_int(btmode, m); + eval_mode(m); + } + } + program { + signal: "elm,state,disabled"; source: "elm"; + script { + new m = get_int(btmode); + m |= DISABLE; set_int(btmode, m); + eval_mode(m); + } + } + program { + signal: "elm,state,enabled"; source: "elm"; + script { + new m = get_int(btmode); + m &= ~DISABLE; set_int(btmode, m); + eval_mode(m); + } + } + } +#undef ICON +#undef LABEL +#undef MASK +#undef DISABLE +} + +group { name: "elm/check/base/toggle"; + images.image: "inset_shadow_tiny.png" COMP; + images.image: "bevel_in.png" COMP; + images.image: "bevel_out.png" COMP; + images.image: "vgrad_med_lighter.png" COMP; + images.image: "shadow_square_tiny.png" COMP; + images.image: "glow_small.png" COMP; + +#define ICON 1 +#define LABEL 2 +#define MASK 3 +#define DISABLE 4 + script { + public is_rtl; + public is_drag; + public was_drag; + + public btmode; + public eval_mode(m) { + new m1 = m & MASK; + new d = m & DISABLE; + if (m1 == (ICON | LABEL)) { + if (!d) { + set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"sizer.content", "visible", 0.0); + set_state(PART:"elm.text", "visible", 0.0); + set_state(PART:"shadow", "default", 0.0); + set_state(PART:"clip", "default", 0.0); + set_state(PART:"event", "default", 0.0); + set_state(PART:"event2", "default", 0.0); + set_state(PART:"elm.ontext", "default", 0.0); + set_state(PART:"elm.offtext", "default", 0.0); + set_state(PART:"onrect", "default", 0.0); + set_state(PART:"offrect", "default", 0.0); + } else { + set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"sizer.content", "visible", 0.0); + set_state(PART:"elm.text", "disabled_visible", 0.0); + set_state(PART:"shadow", "disabled", 0.0); + set_state(PART:"clip", "disabled", 0.0); + set_state(PART:"event", "disabled", 0.0); + set_state(PART:"event2", "disabled", 0.0); + set_state(PART:"elm.ontext", "disabled", 0.0); + set_state(PART:"elm.offtext", "disabled", 0.0); + set_state(PART:"onrect", "disabled", 0.0); + set_state(PART:"offrect", "disabled", 0.0); + } + } else if (m1 == (ICON)) { + if (!d) { + set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"sizer.content", "icononly", 0.0); + set_state(PART:"elm.text", "default", 0.0); + set_state(PART:"shadow", "default", 0.0); + set_state(PART:"clip", "default", 0.0); + set_state(PART:"event", "default", 0.0); + set_state(PART:"event2", "default", 0.0); + set_state(PART:"elm.ontext", "default", 0.0); + set_state(PART:"elm.offtext", "default", 0.0); + set_state(PART:"onrect", "default", 0.0); + set_state(PART:"offrect", "default", 0.0); + } else { + set_state(PART:"elm.swallow.content", "visible", 0.0); + set_state(PART:"sizer.content", "icononly", 0.0); + set_state(PART:"elm.text", "disabled", 0.0); + set_state(PART:"shadow", "disabled", 0.0); + set_state(PART:"clip", "disabled", 0.0); + set_state(PART:"event", "disabled", 0.0); + set_state(PART:"event2", "disabled", 0.0); + set_state(PART:"elm.ontext", "disabled", 0.0); + set_state(PART:"elm.offtext", "disabled", 0.0); + set_state(PART:"onrect", "disabled", 0.0); + set_state(PART:"offrect", "disabled", 0.0); + } + } else if (m1 == (LABEL)) { + if (!d) { + set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"sizer.content", "default", 0.0); + set_state(PART:"elm.text", "visible", 0.0); + set_state(PART:"shadow", "default", 0.0); + set_state(PART:"clip", "default", 0.0); + set_state(PART:"event", "default", 0.0); + set_state(PART:"event2", "default", 0.0); + set_state(PART:"elm.ontext", "default", 0.0); + set_state(PART:"elm.offtext", "default", 0.0); + set_state(PART:"onrect", "default", 0.0); + set_state(PART:"offrect", "default", 0.0); + } else { + set_state(PART:"elm.swallow.content", "default", 0.0); + set_state(PART:"sizer.content", "default", 0.0); + set_state(PART:"elm.text", "disabled_visible", 0.0); + set_state(PART:"shadow", "disabled", 0.0); + set_state(PART:"clip", "disabled", 0.0); + set_state(PART:"event", "disabled", 0.0); + set_state(PART:"event2", "disabled", 0.0); + set_state(PART:"elm.ontext", "disabled", 0.0); + set_state(PART:"elm.offtext", "disabled", 0.0); + set_state(PART:"onrect", "disabled", 0.0); + set_state(PART:"offrect", "disabled", 0.0); + } + } + } + } + parts { + part { name: "tog"; type: SPACER; + scale: 1; + description { state: "default" 0.0; + fixed: 1 0; + rel1.relative: 1.0 0.0; + rel1.offset: 2 2; + rel2.offset: -3 -3; + align: 1.0 0.5; + min: 88 15; + max: 88 15; + } + } + part { name: "onrect"; type: RECT; mouse_events: 0; + scale: 1; + clip_to: "tog_clip"; + description { state: "default" 0.0; + rel1.to: "button"; + rel1.relative: -5.0 0.0; + rel2.to: "button"; + rel2.relative: 0.5 1.0; + color: 48 48 48 255; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 64 64 64 255; + } + } + part { name: "offrect"; type: RECT; mouse_events: 0; + scale: 1; + clip_to: "tog_clip"; + description { state: "default" 0.0; + rel1.to: "button"; + rel1.relative: 0.5 0.0; + rel2.to: "button"; + rel2.relative: 6.0 1.0; + color: 48 48 48 255; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 64 64 64 255; + } + } + part { name: "elm.offtext"; type: TEXT; mouse_events: 0; + effect: SHADOW BOTTOM; + scale: 1; + clip_to: "tog_clip"; + description { state: "default" 0.0; + fixed: 1 1; + rel1.to: "button"; + rel1.relative: 1.0 0.0; + rel2.to: "offrect"; + color: 255 255 255 255; + color3: 0 0 0 128; + color_class: "check_off_text"; + text { font: "Sans"; size: 10; + min: 0 1; + align: 0.5 0.5; + text_class: "check_off_text"; + text: "OFF"; + } + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 21 21 21 255; + color3: 255 255 255 25; + } + } + part { name: "elm.ontext"; type: TEXT; mouse_events: 0; + effect: GLOW; + scale: 1; + clip_to: "tog_clip"; + description { state: "default" 0.0; + fixed: 1 1; + rel1.to: "onrect"; + rel1.offset: 2 -1; + rel2.to: "button"; + rel2.relative: 0.0 1.0; + rel2.offset: -1 -2; + color: 51 153 255 255; + color2: 51 153 255 24; + color3: 51 153 255 18; + color_class: "check_on_text"; + text { font: "Sans"; size: 10; + min: 0 1; + align: 0.5 0.5; + text_class: "check_on_text"; + text: "ON"; + } + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 51 153 255 64; + color2: 51 153 255 16; + color3: 51 153 255 8; + } + } + part { name: "shadow"; mouse_events: 0; + description { state: "default" 0.0; + image.normal: "inset_shadow_tiny.png"; + image.border: 4 4 4 4; + rel1.to: "tog"; + rel2.to: "tog"; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } + part { name: "inset"; mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + fixed: 1 1; + rel1.to: "tog"; + rel1.offset: -1 -1; + rel2.to: "tog"; + rel2.offset: 0 0; + image.normal: "bevel_in.png"; + image.border: 1 1 1 1; + image.middle: 0; + fill.smooth: 0; + } + } + part { name: "tog_clip"; type: RECT; + description { state: "default" 0.0; + rel1.to: "tog"; + rel2.to: "tog"; + } + } + part { name: "button"; type: RECT; + scale: 1; + clip_to: "tog_clip"; + dragable { + x: 1 1 0; + y: 0 0 0; + confine: "tog"; + } + description { state: "default" 0.0; + fixed: 1 1; + rel1.to: "tog"; + rel2.to: "tog"; + min: 15 15; + max: 15 99999; + color: 255 128 0 128; + } + } + part { name: "shadow_but"; mouse_events: 0; + description { state: "default" 0.0; + rel1.offset: -3 -2; + rel1.to: "base_but"; + rel2.offset: 2 4; + rel2.to: "base_but"; + image.normal: "shadow_square_tiny.png"; + image.border: 6 6 6 6; + fill.smooth: 0; + } + description { state: "clicked" 0.0; + inherit: "default" 0.0; + rel1.offset: -2 -2; + rel2.offset: 1 1; + color: 255 255 255 128; + } + } + part { name: "glow_but"; mouse_events: 0; + description { state: "default" 0.0; + rel1.offset: -3 -3; + rel1.to: "base_but"; + rel2.offset: 2 2; + rel2.to: "base_but"; + image.normal: "glow_small.png"; + image.border: 7 7 7 7; + fill.smooth: 0; + visible: 0; + } + description { state: "clicked" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + part { name: "base_but"; mouse_events: 0; + description { state: "default" 0.0; + rel1.to: "button"; + rel2.to: "button"; + image.normal: "vgrad_med_lighter.png"; + fill.smooth: 0; + TILED_HORIZ(120) + } + } + part { name: "bevel_but"; mouse_events: 0; + description { state: "default" 0.0; + rel1.to: "base_but"; + rel2.to: "base_but"; + image.normal: "bevel_out.png"; + image.border: 1 1 1 1; + image.middle: 0; + fill.smooth: 0; + } + } + part { name: "button_events"; type: RECT; + dragable.events: "button"; + description { state: "default" 0.0; + color: 0 0 0 0; + } + } + part { name: "clip"; type: RECT; + description { state: "default" 0.0; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 255 255 255 64; + } + } + part { name: "elm.swallow.content"; type: SWALLOW; + scale: 1; + clip_to: "clip"; + description { state: "default" 0.0; + fixed: 1 0; + visible: 0; + align: 0.0 0.5; + max: 0 0; + rel1.offset: 1 1; + rel2.offset: 1 -2; + rel2.relative: 0.0 1.0; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + fixed: 0 0; + visible: 1; + aspect: 1.0 1.0; aspect_preference: VERTICAL; + min: 16 16; + } + } + part { name: "sizer.content"; type: TEXT; mouse_events: 0; + scale: 1; + description { state: "default" 0.0; + visible: 0; + text { font: "Sans"; size: 10; + min: 0 0; + text_class: "check_text"; + } + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + rel1.to: "elm.swallow.content"; + rel2.to: "elm.swallow.content"; + text { + min: 1 1; + text: "M"; + } + } + description { state: "icononly" 0.0; + inherit: "default" 0.0; + rel1.to: "elm.swallow.content"; + rel2.to: "elm.swallow.content"; + text { + min: 1 1; + text: "M"; + } + } + } + part { name: "elm.text"; type: TEXT; mouse_events: 0; + effect: SHADOW BOTTOM; + scale: 1; + description { state: "default" 0.0; + rel1.to_x: "elm.swallow.content"; + rel1.relative: 1.0 0.0; + rel1.offset: 2 2; + rel2.to_x: "tog"; + rel2.relative: 0.0 1.0; + rel2.offset: -5 -3; + color: 255 255 255 255; + color3: 0 0 0 128; + color_class: "check_text"; + text { font: "Sans"; size: 10; + min: 0 0; + align: 0.0 0.5; + text_class: "check"; + } + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + color: 21 21 21 255; + color3: 255 255 255 25; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + text.min: 1 1; + } + description { state: "disabled_visible" 0.0; + inherit: "default" 0.0; + color: 21 21 21 255; + color3: 255 255 255 25; + visible: 1; + text.min: 1 1; + } + } + part { name: "event"; type: RECT; + ignore_flags: ON_HOLD; + description { state: "default" 0.0; + color: 0 0 0 0; + rel1.to_x: "elm.swallow.content"; + rel2.to_x: "elm.text"; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } + part { name: "event2"; type: RECT; + ignore_flags: ON_HOLD; + description { state: "default" 0.0; + color: 0 0 0 0; + visible: 0; + } + description { state: "disabled" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } + } + programs { + program { + signal: "mouse,clicked,1"; source: "event"; + action: SIGNAL_EMIT "elm,action,check,toggle" ""; + } + program { + signal: "elm,state,check,on"; source: "elm"; + script { + new Float:drag; + if (get_int(is_rtl) == 0) { + drag = 100.0; + } else { + drag = 0.0; + } + set_drag(PART:"button", drag, 0.0); + } + } + program { + signal: "elm,state,check,off"; source: "elm"; + script { + new Float:drag; + if (get_int(is_rtl) == 0) { + drag = 0.0; + } else { + drag = 100.0; + } + set_drag(PART:"button", drag, 0.0); + } + } + program { + signal: "mouse,clicked,1"; source: "button"; + script { + new Float:dx, Float:dy; + get_drag(PART:"button", dx, dy); + if (!get_int(was_drag)) { + if (dx > 0.5) { + set_drag(PART:"button", 0.0, 0.0); + } else { + set_drag(PART:"button", 1.0, 0.0); + } + if (((get_int(is_rtl) == 1) && (dx <= 0.5)) || + (get_int(is_rtl) == 0) && (dx > 0.5)) { + emit("elm,action,check,off", ""); + } else { + emit("elm,action,check,on", ""); + } + } + } + } + program { + signal: "drag"; source: "button"; + script { + set_int(is_drag, 1); + } + } + program { + signal: "mouse,down,1"; source: "button"; + script { + set_int(was_drag, 0); + set_int(is_drag, 0); + } + } + program { name: "drag_end"; + signal: "mouse,up,1"; source: "button"; + script { + new Float:dx, Float:dy; + get_drag(PART:"button", dx, dy); + if (get_int(is_drag)) { + if (dx > 0.5) { + set_drag(PART:"button", 1.0, 0.0); + } else { + set_drag(PART:"button", 0.0, 0.0); + } + if (((get_int(is_rtl) == 1) && (dx <= 0.5)) || + (get_int(is_rtl) == 0) && (dx > 0.5)) { + emit("elm,action,check,on", ""); + } else { + emit("elm,action,check,off", ""); + } + set_int(was_drag, 1); + set_int(is_drag, 0); + } + } + } + program { + signal: "mouse,down,1"; source: "button"; + action: STATE_SET "clicked" 0.0; + target: "shadow_but"; + target: "glow_but"; + } + program { + signal: "mouse,up,1"; source: "button"; + action: STATE_SET "default" 0.0; + target: "shadow_but"; + target: "glow_but"; + } + program { + signal: "elm,state,text,visible"; source: "elm"; + script { + new m = get_int(btmode); + m |= LABEL; set_int(btmode, m); + eval_mode(m); + } + } + program { + signal: "elm,state,text,hidden"; source: "elm"; + script { + new m = get_int(btmode); + m &= ~LABEL; set_int(btmode, m); + eval_mode(m); + } + } + program { + signal: "elm,state,icon,visible"; source: "elm"; + script { + new m = get_int(btmode); + m |= ICON; set_int(btmode, m); + eval_mode(m); + } + } + program { + signal: "elm,state,icon,hidden"; source: "elm"; + script { + new m = get_int(btmode); + m &= ~ICON; set_int(btmode, m); + eval_mode(m); + } + } + program { + signal: "elm,state,disabled"; source: "elm"; + script { + new m = get_int(btmode); + m |= DISABLE; set_int(btmode, m); + eval_mode(m); + } + } + program { + signal: "elm,state,enabled"; source: "elm"; + script { + new m = get_int(btmode); + m &= ~DISABLE; set_int(btmode, m); + eval_mode(m); + } + } + program { + signal: "edje,state,rtl"; source: "edje"; + script { + set_int(is_rtl, 1); + } + } + program { + signal: "edje,state,ltr"; source: "edje"; + script { + set_int(is_rtl, 0); + } + } + } +#undef ICON +#undef LABEL +#undef MASK +#undef DISABLE +} Modified: trunk/THEMES/dark/edje/edc/elm/entry.edc =================================================================== --- trunk/THEMES/dark/edje/edc/elm/entry.edc 2013-03-13 06:48:02 UTC (rev 84429) +++ trunk/THEMES/dark/edje/edc/elm/entry.edc 2013-03-13 09:31:04 UTC (rev 84430) @@ -79,15 +79,15 @@ image.border: 7 7 7 7; image.middle: 0; fill.smooth: 0; - color: 51 153 255 0; + color: 255 255 255 0; } description { state: "focused" 0.0; inherit: "default" 0.0; - color: 51 153 255 255; + color: 255 255 255 255; } description { state: "focused2" 0.0; inherit: "default" 0.0; - color: 51 153 255 64; + color: 255 255 255 64; } } } Added: trunk/THEMES/dark/edje/edc/elm/separator.edc =================================================================== --- trunk/THEMES/dark/edje/edc/elm/separator.edc (rev 0) +++ trunk/THEMES/dark/edje/edc/elm/separator.edc 2013-03-13 09:31:04 UTC (rev 84430) @@ -0,0 +1,27 @@ +group { name: "elm/separator/horizontal/default"; + images.image: "bevel_dark_in.png" COMP; + parts { + part { name: "base"; + description { state: "default" 0.0; + min: 2 2; + max: 99999 2; + rel1.offset: 4 4; + rel2.offset: -5 -5; + image.normal: "bevel_dark_in.png"; + image.border: 2 2 2 2; + fill.smooth: 0; + } + } + } +} +group { name: "elm/separator/vertical/default"; + inherit: "elm/separator/horizontal/default"; + parts { + part { name: "base"; + description { state: "default" 0.0; + max: 2 99999; + } + } + } +} + Added: trunk/THEMES/dark/edje/img/bevel_dark_in.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/bevel_dark_in.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/THEMES/dark/edje/img/bg_glow_in.png =================================================================== (Binary files differ) |
|
From: Enlightenment S. <no-...@en...> - 2013-03-13 06:48:09
|
Log: add a new news link for official announcementsd for e via phab. Author: raster Date: 2013-03-12 23:48:02 -0700 (Tue, 12 Mar 2013) New Revision: 84429 Trac: http://trac.enlightenment.org/e/changeset/84429 Modified: trunk/web/www/p.php Modified: trunk/web/www/p.php =================================================================== --- trunk/web/www/p.php 2013-03-13 06:28:58 UTC (rev 84428) +++ trunk/web/www/p.php 2013-03-13 06:48:02 UTC (rev 84429) @@ -47,6 +47,7 @@ <ul class="menu"> <?php echo(nav_button("homelink", ""));?> <?php echo(nav_button("news", ""));?> + <li class="news"><a href="https://phab.enlightenment.org/phame/live/3"><span>News2</span></a></li> <?php echo(nav_button("about", ""));?> <?php echo(nav_button("download", ""));?> <?php echo(nav_button("support", ""));?> |
|
From: Enlightenment S. <no-...@en...> - 2013-03-13 06:29:06
|
Log: phab now in homepage navbar. Author: raster Date: 2013-03-12 23:28:58 -0700 (Tue, 12 Mar 2013) New Revision: 84428 Trac: http://trac.enlightenment.org/e/changeset/84428 Modified: trunk/web/www/p.php Modified: trunk/web/www/p.php =================================================================== --- trunk/web/www/p.php 2013-03-12 08:31:08 UTC (rev 84427) +++ trunk/web/www/p.php 2013-03-13 06:28:58 UTC (rev 84428) @@ -53,8 +53,9 @@ <?php echo(nav_button("contribute", ""));?> <?php echo(nav_button("contact", ""));?> <?php echo(nav_button("docs", ""));?> - <li class="tracker"><a href="http://trac.enlightenment.org/e"><span>Tracker</span></a></li> - <li class="events"><a href="http://trac.enlightenment.org/e/wiki/Events"><span>Events</span></a></li> + <li class="devel"><a href="https://phab.enlightenment.org"><span>Devel</span></a></li> + <li class="blog"><a href="https://phab.enlightenment.org/phame/live/1/"><span>Blog</span></a></li> + <li class="wiki"><a href="https://phab.enlightenment.org/w"><span>Wiki</span></a></li> </ul> </div> </div> |
|
From: Enlightenment S. <no-...@en...> - 2013-03-12 08:31:16
|
Log: python-efl: api_coverage: Include prefix in the excluded functions, add efreet to supported libs. Author: kuuko Date: 2013-03-12 01:31:08 -0700 (Tue, 12 Mar 2013) New Revision: 84427 Trac: http://trac.enlightenment.org/e/changeset/84427 Modified: trunk/BINDINGS/python/python-efl/api_coverage.py Modified: trunk/BINDINGS/python/python-efl/api_coverage.py =================================================================== --- trunk/BINDINGS/python/python-efl/api_coverage.py 2013-03-12 08:24:49 UTC (rev 84426) +++ trunk/BINDINGS/python/python-efl/api_coverage.py 2013-03-12 08:31:08 UTC (rev 84427) @@ -6,8 +6,8 @@ import subprocess import argparse -c_excludes = "app|widget|prefs" -py_excludes = "naviframe_item_simple_push|object_item_content|object_item_text|object_content|object_text" +c_excludes = "elm_app|elm_widget|elm_prefs" +py_excludes = "elm_naviframe_item_simple_push|elm_object_item_content|elm_object_item_text|elm_object_content|elm_object_text" def pkg_config(require, min_vers=None): name = require.capitalize() @@ -31,7 +31,7 @@ for f in files: with open(os.path.join(path, f), "r") as header: capi = header.read() - matches = re.finditer("^ *EAPI [A-Za-z_ *\n]+ +\**(" + prefix + "_(?!" + c_excludes + ")\w+) *\(", capi, re.S|re.M) + matches = re.finditer("^ *EAPI [A-Za-z_ *\n]+ +\**(?!" + c_excludes + ")(" + prefix + "_\w+) *\(", capi, re.S|re.M) for match in matches: func = match.group(1) capis.append(func) @@ -48,7 +48,7 @@ pyapi = pxd.read() cdef = re.search('(cdef extern from "' + header_name + '\.h":\n)(.+)', pyapi, re.S) if cdef: - matches = re.finditer("^ [a-zA-Z _*]+?(" + prefix + "_(?!" + py_excludes + ")\w+)\(", cdef.group(2), re.M) + matches = re.finditer("^ [a-zA-Z _*]+?(?!" + py_excludes + ")(" + prefix + "_\w+)\(", cdef.group(2), re.M) for match in matches: func = match.group(1) pyapis.append(func) @@ -58,15 +58,16 @@ parser = argparse.ArgumentParser() parser.add_argument("--python", action="store_true", default=False, help="Show Python API coverage") parser.add_argument("--c", action="store_true", default=False, help="Show C API coverage") -parser.add_argument("libs", nargs="+", help="Possible values are eo, evas, ecore, ecore-file, edje, emotion, edbus, elementary and all.") +parser.add_argument("libs", nargs="+", help="Possible values are eo, evas, efreet, ecore, ecore-file, edje, emotion, edbus, elementary and all.") args = parser.parse_args() if args.libs is "all": - args.libs = ["eo", "evas", "ecore", "efile", "edje", "emotion", "edbus", "elementary"] + args.libs = ["eo", "evas", "efreet", "ecore", "efile", "edje", "emotion", "edbus", "elementary"] params = { "eo": ("include", "Eo", "eo"), "evas": ("include", "Evas", "evas"), + "efreet": ("efl/efreet", "Efreet", "efreet"), "ecore": ("include", "Ecore", "ecore"), "ecore-file": ("include", "Ecore_File", "ecore_file"), "edje": ("include", "Edje", "edje"), |
|
From: Enlightenment S. <no-...@en...> - 2013-03-12 08:25:01
|
Log: python-efl: Initial work on Efreet bindings. Author: kuuko Date: 2013-03-12 01:24:49 -0700 (Tue, 12 Mar 2013) New Revision: 84426 Trac: http://trac.enlightenment.org/e/changeset/84426 Added: trunk/BINDINGS/python/python-efl/efl/efreet/ trunk/BINDINGS/python/python-efl/efl/efreet/base.pxi trunk/BINDINGS/python/python-efl/efl/efreet/desktop.pxi trunk/BINDINGS/python/python-efl/efl/efreet/efreet.pxd trunk/BINDINGS/python/python-efl/efl/efreet/efreet.pyx trunk/BINDINGS/python/python-efl/efl/efreet/ini.pxi Modified: trunk/BINDINGS/python/python-efl/setup.py Added: trunk/BINDINGS/python/python-efl/efl/efreet/base.pxi =================================================================== --- trunk/BINDINGS/python/python-efl/efl/efreet/base.pxi (rev 0) +++ trunk/BINDINGS/python/python-efl/efl/efreet/base.pxi 2013-03-12 08:24:49 UTC (rev 84426) @@ -0,0 +1,225 @@ +from efl.eo cimport _ctouni, _strings_to_python + +def data_home_get(): + """ + + Retrieves the XDG Data Home directory + :return: Returns the XDG Data Home directory + + """ + return _ctouni(efreet_data_home_get()) + +def data_dirs_get(): + """ + + Returns the Eina_List of preference ordered extra data directories + :return: Returns the Eina_List of preference ordered extra data directories + + .. note:: The returned list is static inside Efreet. If you add/remove from the + list then the next call to efreet_data_dirs_get() will return your + modified values. DO NOT free this list. + + """ + return _strings_to_python(efreet_data_dirs_get()) + +def config_home_get(): + """ + + Retrieves the XDG Config Home directory + :return: Returns the XDG Config Home directory + + """ + return _ctouni(efreet_config_home_get()) + +def desktop_dir_get(): + """ + + Retrieves the XDG Desktop directory + :return: Returns the XDG Desktop directory + + """ + return _ctouni(efreet_desktop_dir_get()) + +def download_dir_get(): + """ + + Retrieves the XDG Download directory + + This is where user-specific download files should be located. It's + localized (translated) to current user locale + (~/.config/user-dirs.locale and ~/.config/user-dirs.dirs). + + It's meant for large download or in-progress downloads, it's + private for the user but may be shared among different + machines. It's not automatically cleaned up. + + @see efreet_cache_home_get() + @see efreet_runtime_dir_get() + @see http://0pointer.de/blog/projects/tmp.html + + @return Returns the XDG Download directory + + """ + return _ctouni(efreet_download_dir_get()) + +def templates_dir_get(): + """ + + Retrieves the XDG Templates directory + + This is where user-specific template files should be located. It's + localized (translated) to current user locale + (~/.config/user-dirs.locale and ~/.config/user-dirs.dirs). + + @return Returns the XDG Templates directory + + """ + return _ctouni(efreet_templates_dir_get()) + +def public_share_dir_get(): + """ + + Retrieves the XDG Public Share directory + + This is where user-specific public shareable files should be + located. It's localized (translated) to current user locale + (~/.config/user-dirs.locale and ~/.config/user-dirs.dirs). + + Usually local file servers should look here (Apache, Samba, FTP). + + @return Returns the XDG Public Share directory + + """ + return _ctouni(efreet_public_share_dir_get()) + +def documents_dir_get(): + """ + + @return Returns the XDG Documents directory + @brief Retrieves the XDG Documents directory + + This is where user-specific documents files should be located. It's + localized (translated) to current user locale + (~/.config/user-dirs.locale and ~/.config/user-dirs.dirs). + + """ + return _ctouni(efreet_documents_dir_get()) + +def music_dir_get(): + """ + + @return Returns the XDG Music directory + @brief Retrieves the XDG Music directory + + This is where user-specific music files should be located. It's + localized (translated) to current user locale + (~/.config/user-dirs.locale and ~/.config/user-dirs.dirs). + + """ + return _ctouni(efreet_music_dir_get()) + +def pictures_dir_get(): + """ + + @return Returns the XDG Pictures directory + @brief Retrieves the XDG Pictures directory + + This is where user-specific pictures files should be located. It's + localized (translated) to current user locale + (~/.config/user-dirs.locale and ~/.config/user-dirs.dirs). + + """ + return _ctouni(efreet_pictures_dir_get()) + +def videos_dir_get(): + """ + + @return Returns the XDG Videos directory + @brief Retrieves the XDG Videos directory + + This is where user-specific video files should be located. It's + localized (translated) to current user locale + (~/.config/user-dirs.locale and ~/.config/user-dirs.dirs). + + """ + return _ctouni(efreet_videos_dir_get()) + +def config_dirs_get(): + """ + + Returns the Eina_List of preference ordered extra config + directories + :return: Returns the Eina_List of preference ordered extra config directories + + .. note:: The returned list is static inside Efreet. If you add/remove from the + list then the next call to efreet_config_dirs_get() will return your + modified values. DO NOT free this list. + + """ + return _strings_to_python(efreet_config_dirs_get()) + +def cache_home_get(): + """ + + Retrieves the XDG Cache Home directory + :return: Returns the XDG Cache Home directory + + """ + return _ctouni(efreet_cache_home_get()) + +def runtime_dir_get(): + """ + + @return Returns the XDG User Runtime directory. + @brief Retrieves the XDG User Runtime directory. + + This is the base directory relative to which user-specific + non-essential runtime files and other file objects (such as + sockets, named pipes, ...) should be stored. The directory @b must + be owned by the user, and he @b must be the only one having read + and write access to it. Its Unix access mode @b must be 0700. + + The lifetime of this directory @b must be bound to the user being + logged in. It @b must be created when the user first logs in and if + the user fully logs out the directory @b must be removed. If the + user logs in more than once he should get pointed to the same + directory, and it is mandatory that the directory continues to + exist from his first login to his last logout on the system, and + not removed in between. Files in the directory @b must not survive + reboot or a full logout/login cycle. + + The directory @b must be on a local file system and not shared with + any other system. The directory @b must by fully-featured by the + standards of the operating system. More specifically, on Unix-like + operating systems AF_UNIX sockets, symbolic links, hard links, + proper permissions, file locking, sparse files, memory mapping, + file change notifications, a reliable hard link count must be + supported, and no restrictions on the file name character set + should be imposed. Files in this directory @b may be subjected to + periodic clean-up. To ensure that your files are not removed, they + should have their access time timestamp modified at least once + every 6 hours of monotonic time or the 'sticky' bit should be set + on the file. + + If @c NULL applications should fall back to a replacement directory + with similar capabilities and print a warning message. Applications + should use this directory for communication and synchronization + purposes and should not place larger files in it, since it might + reside in runtime memory and cannot necessarily be swapped out to + disk. + + @note this directory is similar to @c /run and is often created in + tmpfs (memory-only/RAM filesystem). It is created, managed and + cleaned automatically by systemd. + + """ + return _ctouni(efreet_runtime_dir_get()) + +def hostname_get(): + """ + + Returns the current hostname or empty string if not found + :return: Returns the current hostname + + """ + return _ctouni(efreet_hostname_get()) Added: trunk/BINDINGS/python/python-efl/efl/efreet/desktop.pxi =================================================================== --- trunk/BINDINGS/python/python-efl/efl/efreet/desktop.pxi (rev 0) +++ trunk/BINDINGS/python/python-efl/efl/efreet/desktop.pxi 2013-03-12 08:24:49 UTC (rev 84426) @@ -0,0 +1,41 @@ +EAPI extern int EFREET_DESKTOP_TYPE_APPLICATION; +EAPI extern int EFREET_DESKTOP_TYPE_LINK; +EAPI extern int EFREET_DESKTOP_TYPE_DIRECTORY; + +cdef class EfreetDesktop(object): + + int type # type of desktop file + + int ref # reference count - internal + + char *version # version of spec file conforms to + + char *orig_path # original path to .desktop file + long long load_time # modified time of .desktop on disk + + char *name # Specific name of the application + char *generic_name # Generic name of the application + char *comment # Tooltip for the entry + char *icon # Icon to display in file manager, menus, etc + char *try_exec # Binary to determine if app is installed + char *exec # Program to execute + char *path # Working directory to run app in + char *startup_wm_class # If specified will map at least one window with + # the given string as it's WM class or WM name + char *url # URL to access if type is EFREET_TYPE_LINK + + Eina_List *only_show_in # list of environments that should + # display the icon + Eina_List *not_show_in # list of environments that shoudn't + # display the icon + Eina_List *categories # Categories in which item should be shown + Eina_List *mime_types # The mime types supppored by this app + + unsigned char no_display # Don't display this application in menus + unsigned char hidden # User delete the item + unsigned char terminal # Does the program run in a terminal + unsigned char startup_notify # The starup notify settings of the app + unsigned char eet:1 # The desktop file is in eet cache + + Eina_Hash *x # Keep track of all user extensions, keys that begin with X- + void *type_data # Type specific data for custom types Added: trunk/BINDINGS/python/python-efl/efl/efreet/efreet.pxd =================================================================== --- trunk/BINDINGS/python/python-efl/efl/efreet/efreet.pxd (rev 0) +++ trunk/BINDINGS/python/python-efl/efl/efreet/efreet.pxd 2013-03-12 08:24:49 UTC (rev 84426) @@ -0,0 +1,134 @@ +from libc.string cimport const_char + +cdef extern from "Eina.h": + ctypedef struct Eina_List + ctypedef struct Eina_Hash + ctypedef int Eina_Bool + +cdef extern from "Efreet.h": + + struct Efreet_Desktop: + int type # type of desktop file + + int ref # reference count - internal + + char *version # version of spec file conforms to + + char *orig_path # original path to .desktop file + long long load_time # modified time of .desktop on disk + + char *name # Specific name of the application + char *generic_name # Generic name of the application + char *comment # Tooltip for the entry + char *icon # Icon to display in file manager, menus, etc + char *try_exec # Binary to determine if app is installed + char *executable "exec" # Program to execute + char *path # Working directory to run app in + char *startup_wm_class # If specified will map at least one window with + # the given string as it's WM class or WM name + char *url # URL to access if type is EFREET_TYPE_LINK + + Eina_List *only_show_in # list of environments that should + # display the icon + Eina_List *not_show_in # list of environments that shoudn't + # display the icon + Eina_List *categories # Categories in which item should be shown + Eina_List *mime_types # The mime types supppored by this app + + unsigned char no_display # Don't display this application in menus + unsigned char hidden # User delete the item + unsigned char terminal # Does the program run in a terminal + unsigned char startup_notify # The starup notify settings of the app + unsigned char eet # The desktop file is in eet cache + + Eina_Hash *x # Keep track of all user extensions, keys that begin with X- + void *type_data # Type specific data for custom types + + struct Efreet_Ini: + Eina_Hash *data # Hash of string => (Hash of string => string) + Eina_Hash *section # currently selected section + + ctypedef void *(*Efreet_Desktop_Command_Cb) (void *data, Efreet_Desktop *desktop, char *command, int remaining) + ctypedef int (*Efreet_Desktop_Progress_Cb) (void *data, Efreet_Desktop *desktop, char *uri, long int total, long int current) + ctypedef void *(*Efreet_Desktop_Type_Parse_Cb) (Efreet_Desktop *desktop, Efreet_Ini *ini) + ctypedef void (*Efreet_Desktop_Type_Save_Cb) (Efreet_Desktop *desktop, Efreet_Ini *ini) + ctypedef void *(*Efreet_Desktop_Type_Free_Cb) (void *data) + + # Functions + int efreet_init() + int efreet_shutdown() + void efreet_lang_reset() + + # Base + const_char * efreet_data_home_get() + Eina_List * efreet_data_dirs_get() + const_char * efreet_config_home_get() + const_char * efreet_desktop_dir_get() + const_char * efreet_download_dir_get() + const_char * efreet_templates_dir_get() + const_char * efreet_public_share_dir_get() + const_char * efreet_documents_dir_get() + const_char * efreet_music_dir_get() + const_char * efreet_pictures_dir_get() + const_char * efreet_videos_dir_get() + Eina_List * efreet_config_dirs_get() + const_char * efreet_cache_home_get() + const_char * efreet_runtime_dir_get() + const_char * efreet_hostname_get() + + # Desktop +# Efreet_Desktop * efreet_desktop_get(const_char *file) +# int efreet_desktop_ref(Efreet_Desktop *desktop) +# Efreet_Desktop * efreet_desktop_empty_new(const_char *file) +# Efreet_Desktop * efreet_desktop_new(const_char *file) +# Efreet_Desktop * efreet_desktop_uncached_new(const_char *file) +# void efreet_desktop_free(Efreet_Desktop *desktop) +# int efreet_desktop_save(Efreet_Desktop *desktop) +# int efreet_desktop_save_as(Efreet_Desktop *desktop, const_char *file) +# void efreet_desktop_exec(Efreet_Desktop *desktop, Eina_List *files, void *data) +# void efreet_desktop_environment_set(const_char *environment) +# const_char * efreet_desktop_environment_get() +# void * efreet_desktop_command_progress_get(Efreet_Desktop *desktop, Eina_List *files, Efreet_Desktop_Command_Cb cb_command, Efreet_Desktop_Progress_Cb cb_prog, void *data) +# void * efreet_desktop_command_get(Efreet_Desktop *desktop, Eina_List *files, Efreet_Desktop_Command_Cb func, void *data) +# Eina_List * efreet_desktop_command_local_get(Efreet_Desktop *desktop, Eina_List *files) +# unsigned int efreet_desktop_category_count_get(Efreet_Desktop *desktop) +# void efreet_desktop_category_add(Efreet_Desktop *desktop, const_char *category) +# int efreet_desktop_category_del(Efreet_Desktop *desktop, const_char *category) +# int efreet_desktop_type_add(const_char *type, Efreet_Desktop_Type_Parse_Cb parse_func, Efreet_Desktop_Type_Save_Cb save_func, Efreet_Desktop_Type_Free_Cb free_func) +# int efreet_desktop_type_alias (int from_type, const_char *alias) +# void * efreet_desktop_type_data_get(Efreet_Desktop *desktop) +# Eina_List * efreet_desktop_string_list_parse(const_char *string) +# char * efreet_desktop_string_list_join(Eina_List *list) +# Eina_Bool efreet_desktop_x_field_set(Efreet_Desktop *desktop, const_char *key, const_char *data) +# const_char * efreet_desktop_x_field_get(Efreet_Desktop *desktop, const_char *key) +# Eina_Bool efreet_desktop_x_field_del(Efreet_Desktop *desktop, const_char *key) + + # Icon + + # Ini + Efreet_Ini * efreet_ini_new(const_char *file) + void efreet_ini_free(Efreet_Ini *ini) + int efreet_ini_save(Efreet_Ini *ini, const_char *path) + int efreet_ini_section_set(Efreet_Ini *ini, const_char *section) + void efreet_ini_section_add(Efreet_Ini *ini, const_char *section) + const_char * efreet_ini_string_get(Efreet_Ini *ini, const_char *key) + void efreet_ini_string_set(Efreet_Ini *ini, const_char *key, const_char *value) + const_char * efreet_ini_localestring_get(Efreet_Ini *ini, const_char *key) + void efreet_ini_localestring_set(Efreet_Ini *ini, const_char *key, const_char *value) + unsigned int efreet_ini_boolean_get(Efreet_Ini *ini, const_char *key) + void efreet_ini_boolean_set(Efreet_Ini *ini, const_char *key, unsigned int value) + int efreet_ini_int_get(Efreet_Ini *ini, const_char *key) + void efreet_ini_int_set(Efreet_Ini *ini, const_char *key, int value) + double efreet_ini_double_get(Efreet_Ini *ini, const_char *key) + void efreet_ini_double_set(Efreet_Ini *ini, const_char *key, double value) + void efreet_ini_key_unset(Efreet_Ini *ini, const_char *key) + + # Menu + + # Mime + + # Trash + + # URI + + # Utils Added: trunk/BINDINGS/python/python-efl/efl/efreet/efreet.pyx =================================================================== --- trunk/BINDINGS/python/python-efl/efl/efreet/efreet.pyx (rev 0) +++ trunk/BINDINGS/python/python-efl/efl/efreet/efreet.pyx 2013-03-12 08:24:49 UTC (rev 84426) @@ -0,0 +1,60 @@ + +""" + +The Efreet Library + +.. rubric:: Introduction + +Efreet is a library designed to help apps work several of the +Freedesktop.org standards regarding Icons, Desktop files and Menus. To +that end it implements the following specifications: + + - XDG Base Directory Specification + - Icon Theme Specification + - Desktop Entry Specification + - Desktop Menu Specification + - FDO URI Specification + - Shared Mime Info Specification + - Trash Specification + +""" + +def init(): + """ + + Initializes the Efreet system. + + :return: Value > ``0`` if the initialization was successful, ``0`` otherwise. + + """ + return efreet_init() + +def shutdown(): + """ + + Shuts down Efreet if a balanced number of init/shutdown calls have + been made + + :return: The number of times the init function has been called minus the + corresponding init call. + + """ + return efreet_shutdown() + +def lang_reset(): + """ + + Resets language dependent variables and resets language dependent + caches This must be called whenever the locale is changed. + + """ + efreet_lang_reset() + +include "base.pxi" +#include "desktop.pxi" +#include "icon.pxi +include "ini.pxi" +#include "menu.pxi" +#include "mime.pxi" +#include "trash.pxi" +#include "uri.pxi" Added: trunk/BINDINGS/python/python-efl/efl/efreet/ini.pxi =================================================================== --- trunk/BINDINGS/python/python-efl/efl/efreet/ini.pxi (rev 0) +++ trunk/BINDINGS/python/python-efl/efl/efreet/ini.pxi 2013-03-12 08:24:49 UTC (rev 84426) @@ -0,0 +1,192 @@ +from efl.eo cimport _cfruni, _ctouni + +cdef class Ini(object): + + """ + + Contains all the information about an ini file. + + """ + + cdef Efreet_Ini *ini + #cdef Eina_Hash *data # Hash of string => (Hash of string => string) + #cdef Eina_Hash *section # currently selected section + + def __cinit__(self, file): + """ + :param file: The file to parse + :return: Returns a new Efreet_Ini structure initialized with the contents + of @a file, or NULL on memory allocation failure + Creates and initializes a new Ini structure with the contents of + @a file, or NULL on failure + + """ + self.ini = efreet_ini_new(_cfruni(file)) + + def __dealloc__(self): + if self.ini is not NULL: + efreet_ini_free(self.ini) + + def save(self, path): + """save(unicode path) -> bool + + Saves the given Efree_Ini structure. + + :param path: The path to save the ini to + :type path: unicode + :return: Whether save succeeded + :rtype: bool + + """ + return bool(efreet_ini_save(self.ini, _cfruni(path))) + + #TODO: property data: + + property section: + """ + + :param section: The section of the ini file we want to get values from + :return: Returns 1 if the section exists, otherwise 0 + Sets the current working section of the ini file to @a section + + """ + #TODO: def __get__(self): + + def __set__(self, section): + ret = efreet_ini_section_set(self.ini, _cfruni(section)) + if ret is 0: + raise RuntimeError("Setting Ini section failed") + + def section_add(self, section): + """section_add(unicode section) + + Adds a new working section of the ini file to section + + :param section: The section of the ini file we want to add + + """ + efreet_ini_section_add(self.ini, _cfruni(section)) + + def string_get(self, key): + """string_get(unicode key) -> unicode + + Retrieves the value for the given key or NULL if none found. + + :param key: The key to lookup + :return: Returns the string associated with the given key or NULL if not + found. + + """ + return _ctouni(efreet_ini_string_get(self.ini, _cfruni(key))) + + def string_set(self, key, value): + """string_set(unicode key, unicode value) + + Sets the value for the given key + + :param key: The key to use + :param value: The value to set + + """ + efreet_ini_string_set(self.ini, _cfruni(key), _cfruni(value)) + + def localestring_get(self, key): + """localestring_get(unicode key) -> unicode + + Retrieves the utf8 encoded string associated with key in the current locale or None if none found + + :param key: The key to search for + :return: Returns the utf8 encoded string associated with key, or None + if none found + + """ + _ctouni(efreet_ini_localestring_get(self.ini, _cfruni(key))) + + def localestring_set(self, key, value): + """localestring_set(unicode key, unicode value) + + Sets the value for the given key + + :param key: The key to use + :param value: The value to set + + """ + efreet_ini_localestring_set(self.ini, _cfruni(key), _cfruni(value)) + + def boolean_get(self, key): + """boolean_get(unicode key) -> bool + + Retrieves the boolean value at key @a key from the ini @a ini + + :param key: The key to search for + :return: Returns 1 if the boolean is true, 0 otherwise + + """ + return bool(efreet_ini_boolean_get(self.ini, _cfruni(key))) + + def boolean_set(self, key, int value): + """boolean_set(unicode key, bool value) + + Sets the value for the given key + + :param key: The key to use + :param value: The value to set + + """ + efreet_ini_boolean_set(self.ini, _cfruni(key), value) + + def int_get(self, key): + """int_get(unicode key) -> int + + Retrieves the value for the given key or -1 if none found. + + :param key: The key to lookup + :return: Returns the integer associated with the given key or -1 if not + found. + + """ + return efreet_ini_int_get(self.ini, _cfruni(key)) + + def int_set(self, key, int value): + """int_set(unicode key, int value) + + Sets the value for the given key + + :param key: The key to use + :param value: The value to set + + """ + efreet_ini_int_set(self.ini, _cfruni(key), value) + + def double_get(self, key): + """double_get(unicode key) -> double + + Retrieves the value for the given key or -1 if none found. + + :param key: The key to lookup + :return: Returns the double associated with the given key or -1 if not + found. + + """ + return efreet_ini_double_get(self.ini, _cfruni(key)) + + def double_set(self, key, double value): + """double_set(unicode key, double value) + + Sets the value for the given key + + :param key: The key to use + :param value: The value to set + + """ + efreet_ini_double_set(self.ini, _cfruni(key), value) + + def key_unset(self, key): + """key_unset(unicode key) + + Remove the given key from the ini struct + + :param key: The key to remove + + """ + efreet_ini_key_unset(self.ini, _cfruni(key)) Modified: trunk/BINDINGS/python/python-efl/setup.py =================================================================== --- trunk/BINDINGS/python/python-efl/setup.py 2013-03-12 03:44:55 UTC (rev 84425) +++ trunk/BINDINGS/python/python-efl/setup.py 2013-03-12 08:24:49 UTC (rev 84426) @@ -72,6 +72,14 @@ extra_link_args = evas_libs) modules.append(evas_ext) + # Efreet + efreet_cflags, efreet_libs = pkg_config('Efreet', 'efreet', "1.7.99") + efreet_ext = Extension("efl.efreet", ["efl/efreet/efreet.pyx"], + include_dirs = ['include/'], + extra_compile_args = efreet_cflags + evas_cflags + eo_cflags, + extra_link_args = efreet_libs) + modules.append(efreet_ext) + # Ecore ecore_cflags, ecore_libs = pkg_config('Ecore', 'ecore', "1.7.99") efile_cflags, efile_libs = pkg_config('EcoreFile', 'ecore-file', "1.7.99") |
|
From: Enlightenment S. <no-...@en...> - 2013-03-12 03:45:04
|
Log: better padding for dark entry Author: raster Date: 2013-03-11 20:44:55 -0700 (Mon, 11 Mar 2013) New Revision: 84425 Trac: http://trac.enlightenment.org/e/changeset/84425 Modified: trunk/THEMES/dark/edje/edc/elm/entry.edc Modified: trunk/THEMES/dark/edje/edc/elm/entry.edc =================================================================== --- trunk/THEMES/dark/edje/edc/elm/entry.edc 2013-03-11 14:34:03 UTC (rev 84424) +++ trunk/THEMES/dark/edje/edc/elm/entry.edc 2013-03-12 03:44:55 UTC (rev 84425) @@ -462,6 +462,8 @@ description { state: "default" 0.0; /* we gotta use 0 0 here, because of scrolled entries */ fixed: 0 0; + rel1.offset: 2 2; + rel2.offset: -3 -3; text { style: "entry_style"; min: 0 1; align: 0.0 0.0; |
|
From: Enlightenment S. <no-...@en...> - 2013-03-11 14:34:13
|
Log: more elm dark theme work. entry done now. scroller basically done as best i can see for desktop mode, emoticons in.... Author: raster Date: 2013-03-11 07:34:03 -0700 (Mon, 11 Mar 2013) New Revision: 84424 Trac: http://trac.enlightenment.org/e/changeset/84424 Added: trunk/THEMES/dark/edje/img/bg_glow_in.png trunk/THEMES/dark/edje/img/emo-angry-shout.png trunk/THEMES/dark/edje/img/emo-angry.png trunk/THEMES/dark/edje/img/emo-crazy-laugh.png trunk/THEMES/dark/edje/img/emo-evil-laugh.png trunk/THEMES/dark/edje/img/emo-evil.png trunk/THEMES/dark/edje/img/emo-goggle-smile.png trunk/THEMES/dark/edje/img/emo-grumpy-smile.png trunk/THEMES/dark/edje/img/emo-grumpy.png trunk/THEMES/dark/edje/img/emo-guilty-smile.png trunk/THEMES/dark/edje/img/emo-guilty.png trunk/THEMES/dark/edje/img/emo-haha.png trunk/THEMES/dark/edje/img/emo-half-smile.png trunk/THEMES/dark/edje/img/emo-happy-panting.png trunk/THEMES/dark/edje/img/emo-happy.png trunk/THEMES/dark/edje/img/emo-indifferent.png trunk/THEMES/dark/edje/img/emo-kiss.png trunk/THEMES/dark/edje/img/emo-knowing-grin.png trunk/THEMES/dark/edje/img/emo-laugh.png trunk/THEMES/dark/edje/img/emo-little-bit-sorry.png trunk/THEMES/dark/edje/img/emo-love-lots.png trunk/THEMES/dark/edje/img/emo-love.png trunk/THEMES/dark/edje/img/emo-minimal-smile.png trunk/THEMES/dark/edje/img/emo-not-happy.png trunk/THEMES/dark/edje/img/emo-not-impressed.png trunk/THEMES/dark/edje/img/emo-omg.png trunk/THEMES/dark/edje/img/emo-opensmile.png trunk/THEMES/dark/edje/img/emo-smile.png trunk/THEMES/dark/edje/img/emo-sorry.png trunk/THEMES/dark/edje/img/emo-squint-laugh.png trunk/THEMES/dark/edje/img/emo-surprised.png trunk/THEMES/dark/edje/img/emo-suspicious.png trunk/THEMES/dark/edje/img/emo-tongue-dangling.png trunk/THEMES/dark/edje/img/emo-tongue-poke.png trunk/THEMES/dark/edje/img/emo-uh.png trunk/THEMES/dark/edje/img/emo-unhappy.png trunk/THEMES/dark/edje/img/emo-very-sorry.png trunk/THEMES/dark/edje/img/emo-what.png trunk/THEMES/dark/edje/img/emo-wink.png trunk/THEMES/dark/edje/img/emo-worried.png trunk/THEMES/dark/edje/img/emo-wtf.png Modified: trunk/THEMES/dark/edje/dark.edc trunk/THEMES/dark/edje/edc/elm/entry.edc trunk/THEMES/dark/edje/edc/elm/scroller.edc Modified: trunk/THEMES/dark/edje/dark.edc =================================================================== --- trunk/THEMES/dark/edje/dark.edc 2013-03-11 11:31:14 UTC (rev 84423) +++ trunk/THEMES/dark/edje/dark.edc 2013-03-11 14:34:03 UTC (rev 84424) @@ -6,10 +6,10 @@ // elm #include "edc/elm/bg.edc" #include "edc/elm/button.edc" +#include "edc/elm/scroller.edc" #include "edc/elm/entry.edc" #include "edc/elm/frame.edc" #include "edc/elm/label.edc" -#include "edc/elm/scroller.edc" // desktop in general #include "edc/comp.edc" Modified: trunk/THEMES/dark/edje/edc/elm/entry.edc =================================================================== --- trunk/THEMES/dark/edje/edc/elm/entry.edc 2013-03-11 11:31:14 UTC (rev 84423) +++ trunk/THEMES/dark/edje/edc/elm/entry.edc 2013-03-11 14:34:03 UTC (rev 84424) @@ -1,3 +1,319 @@ +group { name: "elm/scroller/entry/default"; + inherit: "elm/scroller/base/default"; + image: "bg_glow_in.png" COMP; + parts { + part { name: "bg"; + description { state: "default" 0.0; + color: 48 48 48 255; + } + } + part { name: "elm.swallow.content"; + description { state: "default" 0.0; + rel1.to: "elm.swallow.icon"; + rel1.relative: 1.0 0.0; + rel1.offset: 0 0; + rel2.to: "elm.swallow.end"; + rel2.relative: 0.0 1.0; + rel2.offset: -1 -1; + } + } + part { name: "elm.swallow.icon"; type: SWALLOW; + clip_to: "clipper"; + description { state: "default" 0.0; + fixed: 1 1; + rel1.offset: 1 1; + rel2.offset: 1 -2; + rel2.relative: 0.0 1.0; + visible: 0; + align: 1.0 0.0; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + align: 0.0 0.0; + } + } + program { + signal: "elm,action,show,icon"; source: "elm"; + action: STATE_SET "visible" 0.0; + target: "elm.swallow.icon"; + } + program { + signal: "elm,action,hide,icon"; source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.swallow.icon"; + } + part { name: "elm.swallow.end"; type: SWALLOW; + clip_to: "clipper"; + description { state: "default" 0.0; + fixed: 1 1; + rel1.offset: -2 1; + rel1.relative: 1.0 0.0; + rel2.offset: -2 -2; + visible: 0; + align: 0.0 0.0; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + align: 1.0 0.0; + } + } + program { + signal: "elm,action,show,end"; source: "elm"; + action: STATE_SET "visible" 0.0; + target: "elm.swallow.end"; + } + program { + signal: "elm,action,hide,end"; source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.swallow.end"; + } + part { name: "glow"; + insert_after: "shadow"; + mouse_events: 0; + description { state: "default" 0.0; + rel1.to: "bg"; + rel2.to: "bg"; + image.normal: "bg_glow_in.png"; + image.border: 7 7 7 7; + image.middle: 0; + fill.smooth: 0; + color: 51 153 255 0; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + color: 51 153 255 255; + } + description { state: "focused2" 0.0; + inherit: "default" 0.0; + color: 51 153 255 64; + } + } + } + programs { + program { + signal: "elm,action,focus_highlight,show"; source: "elm"; + action: STATE_SET "focused" 0.0; + target: "glow"; + after: "focus_in2"; + } + program { name: "focus_in2"; + action: STATE_SET "focused2" 0.0; + transition: DECELERATE 0.5; + target: "glow"; + } + program { + signal: "elm,action,focus_highlight,hide"; source: "elm"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 0.3; + target: "glow"; + } + } +} + +group { name: "elm/scroller/entry_single/default"; + images.image: "bevel_in.png" COMP; + images.image: "inset_shadow.png" COMP; + image: "bg_glow_in.png" COMP; + + data.item: "focus_highlight" "on"; + + parts { + part { name: "sb_vbar_base"; type: RECT; + description { state: "default" 0.0; + fixed: 1 1; + rel2.relative: 1.0 0.0; + visible: 0; + } + } + part { name: "elm.dragable.vbar"; type: RECT; + dragable.x: 0 0 0; + dragable.y: 1 1 0; + dragable.confine: "sb_vbar_base"; + description { state: "default" 0.0; + fixed: 1 1; + rel1.relative: 0.5 0.5; + rel1.to: "sb_vbar_base"; + rel2.relative: 0.5 0.5; + rel2.to: "sb_vbar_base"; + visible: 0; + } + } + part { name: "sb_hbar_base"; type: RECT; + description { state: "default" 0.0; + fixed: 1 1; + rel1.relative: 1.0 0.0; + visible: 0; + } + } + part { name: "elm.dragable.hbar"; type: RECT; + dragable.x: 1 1 0; + dragable.y: 0 0 0; + dragable.confine: "sb_hbar_base"; + description { state: "default" 0.0; + fixed: 1 1; + rel1.relative: 0.5 0.5; + rel1.to: "sb_hbar_base"; + rel2.relative: 0.5 0.5; + rel2.to: "sb_hbar_base"; + visible: 0; + } + } + part { name: "bg"; type: RECT; + description { state: "default" 0.0; + rel1.to: "elm.swallow.background"; + rel2.to: "elm.swallow.background"; + color: 48 48 48 255; + color_class: "scrollframe_base"; + } + } + part { name: "clipper"; type: RECT; + description { state: "default" 0.0; + rel1.to: "elm.swallow.background"; + rel2.to: "elm.swallow.background"; + } + } + part { name: "elm.swallow.background"; type: SWALLOW; + clip_to: "clipper"; + description { state: "default" 0.0; + rel1.offset: 1 1; + rel2.offset: -2 -2; + } + } + part { name: "elm.swallow.content"; type: SWALLOW; + clip_to: "clipper"; + description { state: "default" 0.0; + rel1.to: "elm.swallow.icon"; + rel1.relative: 1.0 0.0; + rel2.to: "elm.swallow.end"; + rel2.relative: 0.0 1.0; + } + } + part { name: "elm.swallow.icon"; type: SWALLOW; + clip_to: "clipper"; + description { state: "default" 0.0; + fixed: 1 1; + rel1.offset: 1 1; + rel2.offset: 1 -2; + rel2.relative: 0.0 1.0; + visible: 0; + align: 1.0 0.5; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + align: 0.0 0.5; + } + } + program { + signal: "elm,action,show,icon"; source: "elm"; + action: STATE_SET "visible" 0.0; + target: "elm.swallow.icon"; + } + program { + signal: "elm,action,hide,icon"; source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.swallow.icon"; + } + part { name: "elm.swallow.end"; type: SWALLOW; + clip_to: "clipper"; + description { state: "default" 0.0; + fixed: 1 1; + rel1.offset: -2 1; + rel1.relative: 1.0 0.0; + rel2.offset: -2 -2; + visible: 0; + align: 0.0 0.5; + } + description { state: "visible" 0.0; + inherit: "default" 0.0; + visible: 1; + align: 1.0 0.5; + } + } + program { + signal: "elm,action,show,end"; source: "elm"; + action: STATE_SET "visible" 0.0; + target: "elm.swallow.end"; + } + program { + signal: "elm,action,hide,end"; source: "elm"; + action: STATE_SET "default" 0.0; + target: "elm.swallow.end"; + } + part { name: "inset"; mouse_events: 0; + description { state: "default" 0.0; + image.normal: "bevel_in.png"; + image.border: 1 1 1 1; + image.middle: 0; + rel1.to: "bg"; + rel1.offset: -1 -1; + rel2.to: "bg"; + rel2.offset: 0 0; + fill.smooth: 0; + } + } + part { name: "shadow"; mouse_events: 0; + description { state: "default" 0.0; + image.normal: "inset_shadow.png"; + image.border: 5 5 7 3; + image.middle: 0; + rel1.to: "bg"; + rel2.to: "bg"; + fill.smooth: 0; + color: 255 255 255 128; + } + } + part { name: "elm.swallow.overlay"; type: SWALLOW; + clip_to: "clipper"; + description { state: "default" 0.0; + rel1.offset: 1 1; + rel2.offset: -2 -2; + } + } + part { name: "glow"; + mouse_events: 0; + description { state: "default" 0.0; + rel1.to: "bg"; + rel2.to: "bg"; + image.normal: "bg_glow_in.png"; + image.border: 7 7 7 7; + image.middle: 0; + fill.smooth: 0; + color: 51 153 255 0; + } + description { state: "focused" 0.0; + inherit: "default" 0.0; + color: 51 153 255 255; + } + description { state: "focused2" 0.0; + inherit: "default" 0.0; + color: 51 153 255 64; + } + } + } + programs { + program { + signal: "elm,action,focus_highlight,show"; source: "elm"; + action: STATE_SET "focused" 0.0; + target: "glow"; + after: "focus_in2"; + } + program { name: "focus_in2"; + action: STATE_SET "focused2" 0.0; + transition: DECELERATE 0.5; + target: "glow"; + } + program { + signal: "elm,action,focus_highlight,hide"; source: "elm"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 0.3; + target: "glow"; + } + } +} + group { name: "elm/entry/cursor/default"; min: 1 0; images.image: "white_bar_vert_glow.png" COMP; @@ -561,578 +877,6 @@ } } -#if 0 -group { name: "elm/scroller/entry/default"; - data.item: "focus_highlight" "on"; - script { - public sbvis_v, sbvis_h, sbalways_v, sbalways_h, sbvis_timer; - public timer0(val) { - new v; - v = get_int(sbvis_v); - if (v) { - v = get_int(sbalways_v); - if (!v) { - emit("do-hide-vbar", ""); - set_int(sbvis_v, 0); - } - } - v = get_int(sbvis_h); - if (v) { - v = get_int(sbalways_h); - if (!v) { - emit("do-hide-hbar", ""); - set_int(sbvis_h, 0); - } - } - set_int(sbvis_timer, 0); - return 0; - } - } - images { - image: "shelf_inset.png" COMP; - image: "bt_sm_base2.png" COMP; - image: "bt_sm_shine.png" COMP; - image: "bt_sm_hilight.png" COMP; - image: "sl_bt2_2.png" COMP; - } - parts { - part { name: "bg"; - type: RECT; - description { state: "default" 0.0; - rel1.offset: 2 2; - rel2.offset: -3 -3; - color: 255 255 255 0; - } - } - part { name: "clipper"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - rel1.offset: 2 2; - rel2.offset: -3 -3; - } - } - part { name: "contentclipper"; - type: RECT; - mouse_events: 0; - clip_to: "clipper"; - description { state: "default" 0.0; - rel1.to: "elm.swallow.icon"; - rel1.relative: 1.0 0.0; - rel2.to: "elm.swallow.end"; - rel2.relative: 0.0 1.0; - } - } - part { name: "elm.swallow.icon"; - type: SWALLOW; - clip_to: "clipper"; - description { state: "default" 0.0; - fixed: 1 1; - rel1 { - to: "bg"; - relative: -1.0 0.0; - offset: 0 0; - } - rel2 { - to: "bg"; - relative: 0.0 1.0; - offset: -1 -1; - } - visible: 0; - } - description { state: "visible" 0.0; - fixed: 1 1; - align: 0.0 1.0; - rel1 { - to: "bg"; - relative: 0.0 0.0; - offset: 0 0; - } - rel2 { - to: "bg"; - relative: 0.0 1.0; - offset: -1 -1; - } - visible: 1; - } - } - part { name: "elm.swallow.end"; - type: SWALLOW; - clip_to: "clipper"; - description { state: "default" 0.0; - fixed: 1 1; - rel1 { - to: "bg"; - relative: 1.0 0.0; - offset: 0 0; - } - rel2 { - to: "bg"; - relative: 1.0 1.0; - offset: -1 -1; - } - visible: 0; - } - description { state: "visible" 0.0; - fixed: 1 1; - align: 1.0 1.0; - rel1 { - to: "bg"; - relative: 1.0 0.0; - offset: 0 0; - } - rel2 { - to: "bg"; - relative: 1.0 1.0; - offset: -1 -1; - } - visible: 1; - } - } - part { name: "elm.swallow.content"; - clip_to: "contentclipper"; - type: SWALLOW; - description { state: "default" 0.0; - rel1 { - to: "elm.swallow.icon"; - relative: 1.0 0.0; - offset: 4 4; - } - rel2 { - to: "elm.swallow.end"; - relative: 0.0 1.0; - offset: -5 -5; - } - } - } - part { name: "conf_over"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "bg"; - rel2.to: "bg"; - image { - normal: "shelf_inset.png"; - border: 7 7 7 7; - middle: 0; - } - fill.smooth : 0; - } - description { state: "enabled" 0.0; - inherit: "default" 0.0; - color: 200 155 0 255; - } - } - part { name: "focus_highlight"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.offset: -1 -1; - rel2.offset: 0 0; - image { - normal: "sl_bt2_2.png"; - border: 7 7 7 7; - middle: 0; - } - fill.smooth : 0; - color: 200 155 0 0; - } - description { state: "enabled" 0.0; - inherit: "default" 0.0; - color: 200 155 0 255; - } - } - part { name: "sb_vbar_clip_master"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - } - description { state: "hidden" 0.0; - visible: 0; - color: 255 255 255 0; - } - } - part { name: "sb_vbar_clip"; - clip_to: "sb_vbar_clip_master"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - } - description { state: "hidden" 0.0; - visible: 0; - color: 255 255 255 0; - } - } - part { name: "sb_vbar"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - min: 10 17; - align: 1.0 0.0; - rel1 { - relative: 0.0 0.0; - offset: -2 2; - to_y: "elm.swallow.content"; - to_x: "elm.swallow.end"; - } - rel2 { - relative: 0.0 0.0; - offset: -2 -1; - to_y: "sb_hbar"; - to_x: "elm.swallow.end"; - } - } - } - part { name: "elm.dragable.vbar"; - clip_to: "sb_vbar_clip"; - mouse_events: 0; - dragable { - x: 0 0 0; - y: 1 1 0; - confine: "sb_vbar"; - } - description { state: "default" 0.0; - fixed: 1 1; - min: 10 17; - max: 10 99999; - rel1 { - relative: 0.5 0.5; - offset: 0 0; - to: "sb_vbar"; - } - rel2 { - relative: 0.5 0.5; - offset: 0 0; - to: "sb_vbar"; - } - image { - normal: "bt_sm_base2.png"; - border: 6 6 6 6; - middle: SOLID; - } - } - } - part { name: "sb_vbar_over1"; - clip_to: "sb_vbar_clip"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "elm.dragable.vbar"; - rel2.relative: 1.0 0.5; - rel2.to: "elm.dragable.vbar"; - image { - normal: "bt_sm_hilight.png"; - border: 6 6 6 0; - } - } - } - part { name: "sb_vbar_over2"; - clip_to: "sb_vbar_clip"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "elm.dragable.vbar"; - rel2.to: "elm.dragable.vbar"; - image { - normal: "bt_sm_shine.png"; - border: 6 6 6 0; - } - } - } - - part { name: "sb_hbar_clip_master"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - } - description { state: "hidden" 0.0; - visible: 0; - color: 255 255 255 0; - } - } - part { name: "sb_hbar_clip"; - clip_to: "sb_hbar_clip_master"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - } - description { state: "hidden" 0.0; - visible: 0; - color: 255 255 255 0; - } - } - part { name: "sb_hbar"; - type: RECT; - mouse_events: 0; - description { state: "default" 0.0; - fixed: 1 1; - visible: 0; - min: 17 10; - align: 0.0 1.0; - rel1 { - relative: 0.0 1.0; - offset: 2 0; - to_x: "elm.swallow.content"; - to_y: "elm.swallow.content"; - } - rel2 { - relative: 0.0 1.0; - offset: -1 -1; - to_x: "sb_vbar"; - to_y: "elm.swallow.content"; - } - } - } - part { name: "elm.dragable.hbar"; - clip_to: "sb_hbar_clip"; - mouse_events: 0; - dragable { - x: 1 1 0; - y: 0 0 0; - confine: "sb_hbar"; - } - description { state: "default" 0.0; - fixed: 1 1; - min: 17 10; - max: 99999 10; - rel1 { - relative: 0.5 0.5; - offset: 0 0; - to: "sb_hbar"; - } - rel2 { - relative: 0.5 0.5; - offset: 0 0; - to: "sb_hbar"; - } - image { - normal: "bt_sm_base2.png"; - border: 4 4 4 4; - middle: SOLID; - } - } - } - part { name: "sb_hbar_over1"; - clip_to: "sb_hbar_clip"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "elm.dragable.hbar"; - rel2.relative: 1.0 0.5; - rel2.to: "elm.dragable.hbar"; - image { - normal: "bt_sm_hilight.png"; - border: 4 4 4 0; - } - } - } - part { name: "sb_hbar_over2"; - clip_to: "sb_hbar_clip"; - mouse_events: 0; - description { state: "default" 0.0; - rel1.to: "elm.dragable.hbar"; - rel2.to: "elm.dragable.hbar"; - image { - normal: "bt_sm_shine.png"; - border: 4 4 4 0; - } - } - } - } - programs { - program { name: "load"; - signal: "load"; - source: ""; - script { - set_state(PART:"sb_hbar_clip", "hidden", 0.0); - set_state(PART:"sb_vbar_clip", "hidden", 0.0); - set_int(sbvis_h, 0); - set_int(sbvis_v, 0); - set_int(sbalways_v, 0); - set_int(sbalways_h, 0); - set_int(sbvis_timer, 0); - } - } - program { name: "icon_show"; - signal: "elm,action,show,icon"; - source: "elm"; - action: STATE_SET "visible" 0.0; - target: "elm.swallow.icon"; - } - program { name: "icon_hide"; - signal: "elm,action,hide,icon"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.swallow.icon"; - } - program { name: "end_show"; - signal: "elm,action,show,end"; - source: "elm"; - action: STATE_SET "visible" 0.0; - target: "elm.swallow.end"; - } - program { name: "end_hide"; - signal: "elm,action,hide,end"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "elm.swallow.end"; - } - program { name: "vbar_show"; - signal: "elm,action,show,vbar"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "sb_vbar_clip_master"; - } - program { name: "vbar_hide"; - signal: "elm,action,hide,vbar"; - source: "elm"; - action: STATE_SET "hidden" 0.0; - target: "sb_vbar_clip_master"; - } - program { name: "vbar_show_always"; - signal: "elm,action,show_always,vbar"; - source: "elm"; - script { - new v; - v = get_int(sbvis_v); - v |= get_int(sbalways_v); - if (!v) { - set_int(sbalways_v, 1); - emit("do-show-vbar", ""); - set_int(sbvis_v, 1); - } - } - } - program { name: "vbar_show_notalways"; - signal: "elm,action,show_notalways,vbar"; - source: "elm"; - script { - new v; - v = get_int(sbalways_v); - if (v) { - set_int(sbalways_v, 0); - v = get_int(sbvis_v); - if (!v) { - emit("do-hide-vbar", ""); - set_int(sbvis_v, 0); - } - } - } - } - program { name: "sb_vbar_show"; - signal: "do-show-vbar"; - source: ""; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.5; - target: "sb_vbar_clip"; - } - program { name: "sb_vbar_hide"; - signal: "do-hide-vbar"; - source: ""; - action: STATE_SET "hidden" 0.0; - transition: LINEAR 0.5; - target: "sb_vbar_clip"; - } - - program { name: "hbar_show"; - signal: "elm,action,show,hbar"; - source: "elm"; - action: STATE_SET "default" 0.0; - target: "sb_hbar_clip_master"; - } - program { name: "hbar_hide"; - signal: "elm,action,hide,hbar"; - source: "elm"; - action: STATE_SET "hidden" 0.0; - target: "sb_hbar_clip_master"; - } - program { name: "hbar_show_always"; - signal: "elm,action,show_always,hbar"; - source: "elm"; - script { - new v; - v = get_int(sbvis_h); - v |= get_int(sbalways_h); - if (!v) { - set_int(sbalways_h, 1); - emit("do-show-hbar", ""); - set_int(sbvis_h, 1); - } - } - } - program { name: "hbar_show_notalways"; - signal: "elm,action,show_notalways,hbar"; - source: "elm"; - script { - new v; - v = get_int(sbalways_h); - if (v) { - set_int(sbalways_h, 0); - v = get_int(sbvis_h); - if (!v) { - emit("do-hide-hbar", ""); - set_int(sbvis_h, 0); - } - } - } - } - program { name: "sb_hbar_show"; - signal: "do-show-hbar"; - source: ""; - action: STATE_SET "default" 0.0; - transition: LINEAR 0.5; - target: "sb_hbar_clip"; - } - program { name: "sb_hbar_hide"; - signal: "do-hide-hbar"; - source: ""; - action: STATE_SET "hidden" 0.0; - transition: LINEAR 0.5; - target: "sb_hbar_clip"; - } - - program { name: "scroll"; - signal: "elm,action,scroll"; - source: "elm"; - script { - new v; - v = get_int(sbvis_v); - v |= get_int(sbalways_v); - if (!v) { - emit("do-show-vbar", ""); - set_int(sbvis_v, 1); - } - v = get_int(sbvis_h); - v |= get_int(sbalways_h); - if (!v) { - emit("do-show-hbar", ""); - set_int(sbvis_h, 1); - } - v = get_int(sbvis_timer); - if (v > 0) cancel_timer(v); - v = timer(1.0, "timer0", 0); - set_int(sbvis_timer, v); - } - } - - program { name: "highlight_show"; - signal: "elm,action,focus_highlight,show"; - source: "elm"; - action: STATE_SET "enabled" 0.0; - transition: ACCELERATE 0.3; - target: "focus_highlight"; - target: "conf_over"; - } - program { name: "highlight_hide"; - signal: "elm,action,focus_highlight,hide"; - source: "elm"; - action: STATE_SET "default" 0.0; - transition: DECELERATE 0.3; - target: "focus_highlight"; - target: "conf_over"; - } - } -} - /////////////////////////////////////////////////////////////////////////////// // emoticon images from: // Tanya - Latvia @@ -1258,5 +1002,4 @@ group { name: "elm/entry/emoticon/wtf/default"; images.image: "emo-wtf.png" COMP; parts { part { name: "icon"; mouse_events: 0; description { state: "default" 0.0; max: 64 64; image.normal: "emo-wtf.png"; } } } } - //------------------------------------------------------------ -#endif +//------------------------------------------------------------ Modified: trunk/THEMES/dark/edje/edc/elm/scroller.edc =================================================================== --- trunk/THEMES/dark/edje/edc/elm/scroller.edc 2013-03-11 11:31:14 UTC (rev 84423) +++ trunk/THEMES/dark/edje/edc/elm/scroller.edc 2013-03-11 14:34:03 UTC (rev 84424) @@ -43,8 +43,8 @@ part { name: "sb_vbar_show"; type: RECT; scale: 1; description { state: "default" 0.0; - rel1.offset: -11 -11; - rel2.offset: 10 10; +// rel1.offset: -11 -11; +// rel2.offset: 10 10; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -203,8 +203,8 @@ part { name: "sb_hbar_show"; type: RECT; scale: 1; description { state: "default" 0.0; - rel1.offset: -11 -11; - rel2.offset: 10 10; +// rel1.offset: -11 -11; +// rel2.offset: 10 10; } description { state: "hidden" 0.0; inherit: "default" 0.0; @@ -361,8 +361,8 @@ part { name: "bg"; type: RECT; description { state: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + rel1.to: "elm.swallow.background"; + rel2.to: "elm.swallow.background"; // color: 64 64 64 200; color: 0 0 0 0; color_class: "scrollframe_base"; @@ -370,15 +370,18 @@ } part { name: "clipper"; type: RECT; description { state: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + rel1.to: "elm.swallow.background"; + rel2.to: "elm.swallow.background"; } } part { name: "elm.swallow.background"; type: SWALLOW; clip_to: "clipper"; description { state: "default" 0.0; - rel1.to: "elm.swallow.content"; - rel2.to: "elm.swallow.content"; + rel1.offset: 1 1; + rel2.relative: 0.0 0.0; + rel2.offset: -2 -2; + rel2.to_x: "sb_vbar"; + rel2.to_y: "sb_hbar"; } } part { name: "elm.swallow.content"; type: SWALLOW; Added: trunk/THEMES/dark/edje/img/bg_glow_in.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/bg_glow_in.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-angry-shout.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-angry-shout.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-angry.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-angry.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-crazy-laugh.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-crazy-laugh.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-evil-laugh.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-evil-laugh.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-evil.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-evil.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-goggle-smile.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-goggle-smile.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-grumpy-smile.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-grumpy-smile.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-grumpy.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-grumpy.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-guilty-smile.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-guilty-smile.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-guilty.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-guilty.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-haha.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-haha.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-half-smile.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-half-smile.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-happy-panting.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-happy-panting.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-happy.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-happy.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-indifferent.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-indifferent.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-kiss.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-kiss.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-knowing-grin.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-knowing-grin.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-laugh.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-laugh.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-little-bit-sorry.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-little-bit-sorry.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-love-lots.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-love-lots.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-love.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-love.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-minimal-smile.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-minimal-smile.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-not-happy.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-not-happy.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-not-impressed.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-not-impressed.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-omg.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-omg.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-opensmile.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-opensmile.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-smile.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-smile.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-sorry.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-sorry.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-squint-laugh.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-squint-laugh.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-surprised.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-surprised.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-suspicious.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-suspicious.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-tongue-dangling.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-tongue-dangling.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-tongue-poke.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-tongue-poke.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-uh.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-uh.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-unhappy.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-unhappy.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-very-sorry.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-very-sorry.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-what.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-what.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-wink.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-wink.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-worried.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-worried.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/THEMES/dark/edje/img/emo-wtf.png =================================================================== (Binary files differ) Property changes on: trunk/THEMES/dark/edje/img/emo-wtf.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream |
|
From: Enlightenment S. <no-...@en...> - 2013-03-11 11:31:21
|
Log: don't abort on image fetch failure... Author: discomfitor Date: 2013-03-11 04:31:14 -0700 (Mon, 11 Mar 2013) New Revision: 84423 Trac: http://trac.enlightenment.org/e/changeset/84423 Modified: trunk/PROTO/shotgun/src/bin/chat_image.c Modified: trunk/PROTO/shotgun/src/bin/chat_image.c =================================================================== --- trunk/PROTO/shotgun/src/bin/chat_image.c 2013-03-11 11:30:51 UTC (rev 84422) +++ trunk/PROTO/shotgun/src/bin/chat_image.c 2013-03-11 11:31:14 UTC (rev 84423) @@ -197,7 +197,13 @@ { i->url = ecore_con_url_new(url); ecore_con_url_data_set(i->url, i); - if (!ecore_con_url_get(i->url)) abort(); /* don't even know how to deal with this */ + if (!ecore_con_url_get(i->url)) + { + /* don't even know how to deal with this */ + ERR("IMAGE FETCHING FAILURE: %s", url); + free(i); + return; + } } i->cl = cl; i->addr = url; |
|
From: Enlightenment S. <no-...@en...> - 2013-03-11 11:31:03
|
Log: update shotgun module to latest e api Author: discomfitor Date: 2013-03-11 04:30:51 -0700 (Mon, 11 Mar 2013) New Revision: 84422 Trac: http://trac.enlightenment.org/e/changeset/84422 Modified: trunk/PROTO/shotgun/src/modules/sawed-off/e_mod_main.c Modified: trunk/PROTO/shotgun/src/modules/sawed-off/e_mod_main.c =================================================================== --- trunk/PROTO/shotgun/src/modules/sawed-off/e_mod_main.c 2013-03-11 05:54:29 UTC (rev 84421) +++ trunk/PROTO/shotgun/src/modules/sawed-off/e_mod_main.c 2013-03-11 11:30:51 UTC (rev 84422) @@ -48,7 +48,7 @@ mod->contacts_list = eina_inlist_remove(mod->contacts_list, EINA_INLIST_GET(mc)); if (mod->contact_active == mc) { - E_FN_DEL(e_object_del, mod->popup); + E_FREE_FUNC(mod->popup, e_object_del); mod->popup_bg = mod->popup_entry = mod->popup_img = NULL; mod->contact_active = NULL; } @@ -86,7 +86,7 @@ e_grabinput_release(0, e_comp_get(mod->popup)->ee_win); e_popup_hide(mod->popup); } - E_FN_DEL(e_object_del, mod->popup); + E_FREE_FUNC(mod->popup, e_object_del); mod->popup_bg = mod->popup_entry = mod->popup_img = NULL; mod->contact_active = NULL; return; @@ -712,13 +712,13 @@ e_configure_registry_category_del("extensions"); - E_FN_DEL(e_object_del, mod->cfd); + E_FREE_FUNC(mod->cfd, e_object_del); if (mod->popup) { e_grabinput_release(0, e_comp_get(mod->popup)->ee_win); e_popup_hide(mod->popup); } - E_FN_DEL(e_object_del, mod->popup); + E_FREE_FUNC(mod->popup, e_object_del); e_config_domain_save("module.sawed-off_shotgun", conf_edd, sos_config); _e_mod_sos_config_free(); E_CONFIG_DD_FREE(conf_edd); @@ -736,7 +736,7 @@ eina_hash_free(mod->contacts); if (mod->ef) eet_close(mod->ef); E_FREE(mod); - E_FN_DEL(eio_file_cancel, eio_file); + E_FREE_FUNC(eio_file, eio_file_cancel); edbus_shutdown(); E_FREE_LIST(handlers, ecore_event_handler_del); return 1; |
|
From: Enlightenment S. <no-...@en...> - 2013-03-11 05:54:36
|
Log: E17.1 download link now says E17.1 Author: discomfitor Date: 2013-03-10 22:54:29 -0700 (Sun, 10 Mar 2013) New Revision: 84421 Trac: http://trac.enlightenment.org/e/changeset/84421 Modified: trunk/web/www/p/download/en-body Modified: trunk/web/www/p/download/en-body =================================================================== --- trunk/web/www/p/download/en-body 2013-03-11 05:22:23 UTC (rev 84420) +++ trunk/web/www/p/download/en-body 2013-03-11 05:54:29 UTC (rev 84421) @@ -175,7 +175,7 @@ <?php frame1("width=100%");?> <div class="main"><p><b><a href= "http://trac.enlightenment.org/e/wiki/User_Guide">Enlightenment</a> </b><em> - 0.17.0</em></p><p> + 0.17.1</em></p><p> The Window Manager and Desktop Shell. </p><p align=right><?php blinkdl("i/dl.png", "DOWNLOAD ENLIGHTENMENT", "http://download.enlightenment.org/releases/enlightenment-0.17.1.tar.gz" |
|
From: Enlightenment S. <no-...@en...> - 2013-03-11 05:22:31
|
Log: fix detourious and darkness e menu themes to allow mouse events, break build of efenniht and b&w because the menus won't work and it took me more than 5 minutes to fix them IF YOU USE ONE OF THESE THEMES WITH E18, YOU ******MUST***** REBUILD THE THEME BEFORE UPDATING OR YOU WILL HATE YOUR LIFE Author: discomfitor Date: 2013-03-10 22:22:23 -0700 (Sun, 10 Mar 2013) New Revision: 84420 Trac: http://trac.enlightenment.org/e/changeset/84420 Modified: trunk/THEMES/b_and_w/e/Makefile trunk/THEMES/darkness/widgets/menu.edc trunk/THEMES/detourious/bits/menu.edc trunk/THEMES/efenniht/Makefile Modified: trunk/THEMES/b_and_w/e/Makefile =================================================================== --- trunk/THEMES/b_and_w/e/Makefile 2013-03-10 14:46:39 UTC (rev 84419) +++ trunk/THEMES/b_and_w/e/Makefile 2013-03-11 05:22:23 UTC (rev 84420) @@ -1,3 +1,4 @@ +asdf .PHONY: default all: default Modified: trunk/THEMES/darkness/widgets/menu.edc =================================================================== --- trunk/THEMES/darkness/widgets/menu.edc 2013-03-10 14:46:39 UTC (rev 84419) +++ trunk/THEMES/darkness/widgets/menu.edc 2013-03-11 05:22:23 UTC (rev 84420) @@ -180,6 +180,11 @@ } } } + part { name: "events"; type: RECT; + description { state: "default"; + color: 0 0 0 0; + } + } } } group { @@ -201,6 +206,11 @@ } } } + part { name: "events"; type: RECT; + description { state: "default"; + color: 0 0 0 0; + } + } } } group { @@ -270,6 +280,11 @@ } } } + part { name: "events"; type: RECT; + description { state: "default"; + color: 0 0 0 0; + } + } } programs { program { @@ -355,6 +370,11 @@ } } } + part { name: "events"; type: RECT; + description { state: "default"; + color: 0 0 0 0; + } + } } programs { program { @@ -444,6 +464,11 @@ } } } + part { name: "events"; type: RECT; + description { state: "default"; + color: 0 0 0 0; + } + } } programs { program { @@ -500,6 +525,11 @@ } } } + part { name: "events"; type: RECT; + description { state: "default"; + color: 0 0 0 0; + } + } } } Modified: trunk/THEMES/detourious/bits/menu.edc =================================================================== --- trunk/THEMES/detourious/bits/menu.edc 2013-03-10 14:46:39 UTC (rev 84419) +++ trunk/THEMES/detourious/bits/menu.edc 2013-03-11 05:22:23 UTC (rev 84420) @@ -164,6 +164,11 @@ image.normal: "images/menu_im4.png"; } } + part { name: "events"; type: RECT; + description { state: "default"; + color: 0 0 0 0; + } + } } programs { program { @@ -298,6 +303,11 @@ } } } + part { name: "events"; type: RECT; + description { state: "default"; + color: 0 0 0 0; + } + } } programs { TOGGLE("check"); @@ -389,6 +399,11 @@ } } } + part { name: "events"; type: RECT; + description { state: "default"; + color: 0 0 0 0; + } + } } programs { TOGGLE("radio"); @@ -398,9 +413,13 @@ name: "e/widgets/menu/default/item_bg"; alias: "e/widgets/menu/default/submenu_bg"; parts { - + part { name: "bg"; type: RECT; mouse_events: 0; + description { state: "default"; + } + } part { name: "item_hilight"; + clip_to: "bg"; description { state: "default" 0.0; image { @@ -429,6 +448,7 @@ part { name: "e.swallow.content"; type: SWALLOW; + clip_to: "bg"; description { state: "default" 0.0; align: 0.0 0.0; @@ -442,6 +462,11 @@ } } } + part { name: "events"; type: RECT; + description { state: "default"; + color: 0 0 0 0; + } + } } programs { ITEM(); @@ -478,6 +503,11 @@ color_class: "menu_item_active"; } } + part { name: "events"; type: RECT; + description { state: "default"; + color: 0 0 0 0; + } + } } programs { SELECT("go_passive", "e,state,unselected", "default", 0.0, LINEAR, 0.0, "e.text.label"); @@ -512,6 +542,11 @@ fixed: 1 1; } } + part { name: "events"; type: RECT; + description { state: "default"; + color: 0 0 0 0; + } + } } programs { program { Modified: trunk/THEMES/efenniht/Makefile =================================================================== --- trunk/THEMES/efenniht/Makefile 2013-03-10 14:46:39 UTC (rev 84419) +++ trunk/THEMES/efenniht/Makefile 2013-03-11 05:22:23 UTC (rev 84420) @@ -1,6 +1,6 @@ ## Requirements: ## for elm-efenniht, elementary should exist in ../../elementary - +asdf EDJE_CC := edje_cc INSTALL := install PKG_CONFIG := pkg-config |
|
From: Enlightenment S. <no-...@en...> - 2013-03-10 14:46:48
|
Log: e-modules/comp-scale: follow e17 comp api changes Author: jeffdameth Date: 2013-03-10 07:46:39 -0700 (Sun, 10 Mar 2013) New Revision: 84419 Trac: http://trac.enlightenment.org/e/changeset/84419 Modified: trunk/E-MODULES-EXTRA/comp-scale/src/e_mod_main.c trunk/E-MODULES-EXTRA/comp-scale/src/e_mod_pager.c trunk/E-MODULES-EXTRA/comp-scale/src/e_mod_scale.c Modified: trunk/E-MODULES-EXTRA/comp-scale/src/e_mod_main.c =================================================================== --- trunk/E-MODULES-EXTRA/comp-scale/src/e_mod_main.c 2013-03-10 10:56:34 UTC (rev 84418) +++ trunk/E-MODULES-EXTRA/comp-scale/src/e_mod_main.c 2013-03-10 14:46:39 UTC (rev 84419) @@ -159,7 +159,7 @@ man = eina_list_data_get(e_manager_list()); if (!man) return; - e = man->comp->evas; + e = e_manager_comp_evas_get(man); if (!e) return; if (!strncmp(params, "go_pager", 8)) Modified: trunk/E-MODULES-EXTRA/comp-scale/src/e_mod_pager.c =================================================================== --- trunk/E-MODULES-EXTRA/comp-scale/src/e_mod_pager.c 2013-03-10 10:56:34 UTC (rev 84418) +++ trunk/E-MODULES-EXTRA/comp-scale/src/e_mod_pager.c 2013-03-10 14:46:39 UTC (rev 84419) @@ -10,7 +10,7 @@ Evas_Object *o, *o_win; E_Border *bd; E_Desk *desk; - E_Comp_Win *src; + E_Manager_Comp_Source *src; E_Manager *man; double x; @@ -64,7 +64,7 @@ Evas_Object *obj, void *event_info); -static Item *_pager_win_new(Evas *e, E_Manager *man, E_Comp_Win *src); +static Item *_pager_win_new(Evas *e, E_Manager *man, E_Manager_Comp_Source *src); static void _pager_win_del(Item *it); static void _pager_finish(); @@ -171,7 +171,7 @@ if (scale_state == SCALE_STATE_HOLD) { E_Manager *man = e_manager_current_get(); - e_comp_render_update(man->comp); + e_manager_comp_evas_update(man); return ECORE_CALLBACK_RENEW; } @@ -628,7 +628,7 @@ if (it->bd && !it->o) { - e_comp_win_hidden_set(it->src, EINA_FALSE); + e_manager_comp_src_hidden_set(it->man, it->src, EINA_FALSE); e_object_unref(E_OBJECT(it->bd)); } @@ -652,7 +652,7 @@ if ((it->bd->desk != current_desk) && (!it->bd->sticky)) e_border_hide(it->bd, 2); - e_comp_win_hidden_set(it->src, EINA_FALSE); + e_manager_comp_src_hidden_set(it->man, it->src, EINA_FALSE); evas_object_del(it->o_win); evas_object_del(it->o); @@ -668,23 +668,23 @@ } static Item * -_pager_win_new(Evas *e, E_Manager *man, E_Comp_Win *src) +_pager_win_new(Evas *e, E_Manager *man, E_Manager_Comp_Source *src) { Item *it; Evas_Object *o, *sh_obj, *obj; E_Border *bd; - sh_obj = src->shobj; + sh_obj = e_manager_comp_src_shadow_get(man, src); if (!sh_obj) return NULL; - obj = src->obj; + obj = e_manager_comp_src_image_get(man, src); if (!obj) return NULL; - bd = src->bd; + bd = e_manager_comp_src_border_get(man, src); if (!bd) { - Ecore_X_Window win = src-win; + Ecore_X_Window win = e_manager_comp_src_window_get(man, src); if (win == zone->container->bg_win) { @@ -707,7 +707,7 @@ } else if (scale_conf->pager_fade_popups) { - E_Popup *pop = src->pop; + E_Popup *pop = e_manager_comp_src_popup_get(man, src); if ((pop) && (pop->zone != zone)) return NULL; @@ -738,7 +738,7 @@ it->src = src; e_object_ref(E_OBJECT(it->bd)); - e_comp_win_hidden_set(src, EINA_TRUE); + e_manager_comp_src_hidden_set(man, src, EINA_TRUE); items = eina_list_append(items, it); @@ -749,7 +749,7 @@ (e_mod_border_ignore(it->bd))) return NULL; - it->o_win = e_comp_win_image_mirror_add(src); + it->o_win = e_manager_comp_src_image_mirror_add(man, src); /* it->o_win = evas_object_image_filled_add(e); * o = e_manager_comp_src_image_get(man, src); * evas_object_image_source_set(it->o_win, o); */ @@ -1059,7 +1059,7 @@ _pager_run(E_Manager *man) { Evas *e; - E_Comp_Win *src; + E_Manager_Comp_Source *src; Ecore_Event_Handler *h; const char *file, *group; Eina_List *l; @@ -1072,7 +1072,7 @@ if (input_win) return EINA_FALSE; - e = man->comp->evas; + e = e_manager_comp_evas_get(man); if (!e) return EINA_FALSE; zone = e_util_zone_current_get(man); @@ -1147,7 +1147,7 @@ evas_object_resize(zone_clip, zone_w, zone_h); evas_object_show(zone_clip); - EINA_LIST_FOREACH((Eina_List *)e_comp_win_list_get(man->comp), l, src) + EINA_LIST_FOREACH((Eina_List *)e_manager_comp_src_list(man), l, src) _pager_win_new(e, man, src); edje_object_file_get(zone->bg_object, &file, &group); @@ -1253,7 +1253,7 @@ void *msgdata) { E_Manager *man = (E_Manager *)obj; - E_Comp_Win *src = (E_Comp_Win *)msgdata; + E_Manager_Comp_Source *src = (E_Manager_Comp_Source *)msgdata; Evas *e; /* if (!scale_state) return; */ @@ -1265,7 +1265,7 @@ /* XXX disabled for now. */ /* return; */ - e = man->comp->evas; + e = e_manager_comp_evas_get(man); if (!strcmp(info, "change.comp")) { if (!e) @@ -1284,7 +1284,7 @@ else if (!strcmp(info, "add.src")) { DBG("%s: %p | %p\n", info, man, src); - e_comp_win_hidden_set(src, EINA_TRUE); + e_manager_comp_src_hidden_set(man, src, EINA_TRUE); } else if (!strcmp(info, "del.src")) { Modified: trunk/E-MODULES-EXTRA/comp-scale/src/e_mod_scale.c =================================================================== --- trunk/E-MODULES-EXTRA/comp-scale/src/e_mod_scale.c 2013-03-10 10:56:34 UTC (rev 84418) +++ trunk/E-MODULES-EXTRA/comp-scale/src/e_mod_scale.c 2013-03-10 14:46:39 UTC (rev 84419) @@ -14,7 +14,7 @@ { Evas_Object *o, *o_win; E_Border *bd; - E_Comp_Win *src; + E_Manager_Comp_Source *src; E_Manager *man; double scale; @@ -94,7 +94,7 @@ static Item *_scale_win_new(Evas *e, E_Manager *man, - E_Comp_Win *src, + E_Manager_Comp_Source *src, E_Desk *desk); static void _scale_win_del(Item *it); @@ -298,7 +298,7 @@ } man = e_manager_current_get(); - e_comp_render_update(man->comp); + e_manager_comp_evas_update(man); if (finish) { @@ -477,15 +477,15 @@ { Eina_List *l; - E_Comp_Win *src; + E_Manager_Comp_Source *src; E_Manager *man = zone->container->manager; - EINA_LIST_FOREACH((Eina_List *)e_comp_win_list_get(man->comp), l, src) - e_comp_win_hidden_set(src, EINA_FALSE); + EINA_LIST_FOREACH((Eina_List *)e_manager_comp_src_list(man), l, src) + e_manager_comp_src_hidden_set(man, src, EINA_FALSE); } man = e_manager_current_get(); - e_comp_render_update(man->comp); + e_manager_comp_evas_update(man); if (!bd_move) { @@ -697,17 +697,17 @@ evas_object_event_callback_del(it->o, EVAS_CALLBACK_MOUSE_UP, _scale_win_cb_mouse_up); - e_comp_win_hidden_set(it->src, EINA_FALSE); + e_manager_comp_src_hidden_set(it->man, it->src, EINA_FALSE); if ((it->bd->desk != current_desk) && (!it->bd->sticky)) { e_border_hide(it->bd, 2); - evas_object_hide(it->src->shobj); + //FIXME evas_object_hide(it->src->shobj); } else if (it->was_hidden) { e_border_hide(it->bd, 1); - evas_object_hide(it->src->shobj); + //FIXME evas_object_hide(it->src->shobj); } if (it->was_shaded) { @@ -728,26 +728,26 @@ } static Item * -_scale_win_new(Evas *e, E_Manager *man, E_Comp_Win *src, E_Desk *desk) +_scale_win_new(Evas *e, E_Manager *man, E_Manager_Comp_Source *src, E_Desk *desk) { Item *it; E_Border *bd; - if (!src->obj) - return NULL; + //if (!src->obj) + // return NULL; - bd = src->bd; + bd = e_manager_comp_src_border_get(man, src); if (!bd) { - Ecore_X_Window win = src->win; + Ecore_X_Window win = e_manager_comp_src_window_get(man, src); if ((win == zone->container->bg_win) && (scale_conf->fade_desktop)) { it = E_NEW(Item, 1); it->man = man; - it->o_win = src->shobj; + it->o_win = e_manager_comp_src_shadow_get(man, src); evas_object_event_callback_add(it->o_win, EVAS_CALLBACK_DEL, _scale_win_cb_delorig, it); background = it; @@ -755,14 +755,14 @@ } else if (scale_conf->fade_popups) { - E_Popup *pop = src->pop; + E_Popup *pop = e_manager_comp_src_popup_get(man, src); if ((pop) && (pop->zone != zone)) return NULL; it = E_NEW(Item, 1); it->man = man; - it->o_win = src->shobj; + it->o_win = e_manager_comp_src_shadow_get(man, src); evas_object_event_callback_add(it->o_win, EVAS_CALLBACK_DEL, _scale_win_cb_delorig, it); popups = eina_list_append(popups, it); @@ -809,9 +809,9 @@ it->bd = bd; it->man = man; it->src = src; - e_comp_win_hidden_set(src, EINA_TRUE); + e_manager_comp_src_hidden_set(man, src, EINA_TRUE); - it->o_win = e_comp_win_image_mirror_add(src); + it->o_win = e_manager_comp_src_image_mirror_add(man, src); evas_object_show(it->o_win); it->o = edje_object_add(e); @@ -1116,7 +1116,7 @@ _scale_run(E_Manager *man) { Eina_List *l; - E_Comp_Win *src; + E_Manager_Comp_Source *src; Ecore_Event_Handler *h; Evas *e; int i; @@ -1128,7 +1128,7 @@ mouse_y = -1; warp_pointer = 0; - e = man->comp->evas; + e = e_manager_comp_evas_get(man); if (!e) return EINA_FALSE; zone = e_util_zone_current_get(e_manager_current_get()); @@ -1177,7 +1177,7 @@ evas_object_resize(zone_clip, zone->w, zone->h); evas_object_show(zone_clip); - EINA_LIST_FOREACH((Eina_List *)e_comp_win_list_get(man->comp), l, src) + EINA_LIST_FOREACH((Eina_List *)e_manager_comp_src_list(man), l, src) { Item *it = _scale_win_new(e, man, src, current_desk); if (it) evas_object_clip_set(it->o, zone_clip); @@ -1556,7 +1556,7 @@ E_Object *obj, void *msgdata) { E_Manager *man = (E_Manager *)obj; - E_Comp_Win *src = (E_Comp_Win *)msgdata; + E_Manager_Comp_Source *src = (E_Manager_Comp_Source *)msgdata; Evas *e; if (strcmp(name, "comp.manager")) return; @@ -1566,7 +1566,7 @@ /* XXX disabled for now. */ /* return; */ - e = man->comp->evas; + e = e_manager_comp_evas_get(man); if (!strcmp(info, "change.comp")) { if (!e) @@ -1585,7 +1585,7 @@ else if (!strcmp(info, "add.src")) { DBG("%s: %p | %p\n", info, man, src); - e_comp_win_hidden_set(src, EINA_TRUE); + e_manager_comp_src_hidden_set(man, src, EINA_TRUE); } else if (!strcmp(info, "del.src")) { |
|
From: Enlightenment S. <no-...@en...> - 2013-03-10 10:56:42
|
Log: python-efl: api_coverage: Exclude functions we'll be unlikely to implement cover. Also some false matches that are in macros, which we don't parse atm. Author: kuuko Date: 2013-03-10 03:56:34 -0700 (Sun, 10 Mar 2013) New Revision: 84418 Trac: http://trac.enlightenment.org/e/changeset/84418 Modified: trunk/BINDINGS/python/python-efl/api_coverage.py Modified: trunk/BINDINGS/python/python-efl/api_coverage.py =================================================================== --- trunk/BINDINGS/python/python-efl/api_coverage.py 2013-03-10 09:56:15 UTC (rev 84417) +++ trunk/BINDINGS/python/python-efl/api_coverage.py 2013-03-10 10:56:34 UTC (rev 84418) @@ -6,6 +6,9 @@ import subprocess import argparse +c_excludes = "app|widget|prefs" +py_excludes = "naviframe_item_simple_push|object_item_content|object_item_text|object_content|object_text" + def pkg_config(require, min_vers=None): name = require.capitalize() try: @@ -28,10 +31,9 @@ for f in files: with open(os.path.join(path, f), "r") as header: capi = header.read() - matches = re.finditer("^ *EAPI [A-Za-z_ *\n]+ +\**(" + prefix + "_\w+) *\(", capi, re.S|re.M) + matches = re.finditer("^ *EAPI [A-Za-z_ *\n]+ +\**(" + prefix + "_(?!" + c_excludes + ")\w+) *\(", capi, re.S|re.M) for match in matches: func = match.group(1) - #print(func) capis.append(func) return capis @@ -46,10 +48,9 @@ pyapi = pxd.read() cdef = re.search('(cdef extern from "' + header_name + '\.h":\n)(.+)', pyapi, re.S) if cdef: - matches = re.finditer("^ [a-zA-Z _*]+?(" + prefix + "_\w+)\(", cdef.group(2), re.M) + matches = re.finditer("^ [a-zA-Z _*]+?(" + prefix + "_(?!" + py_excludes + ")\w+)\(", cdef.group(2), re.M) for match in matches: func = match.group(1) - #print(func) pyapis.append(func) return pyapis |
|
From: Enlightenment S. <no-...@en...> - 2013-03-10 09:56:22
|
Log: elev8: proper detection of systemd user session directory. Thanks Auke Kok. Author: cedric Date: 2013-03-10 01:56:15 -0800 (Sun, 10 Mar 2013) New Revision: 84417 Trac: http://trac.enlightenment.org/e/changeset/84417 Added: trunk/PROTO/elev8/m4/pkg_var.m4 Modified: trunk/PROTO/elev8/configure.ac trunk/PROTO/elev8/data/units/ trunk/PROTO/elev8/data/units/Makefile.am Modified: trunk/PROTO/elev8/configure.ac =================================================================== --- trunk/PROTO/elev8/configure.ac 2013-03-10 08:42:43 UTC (rev 84416) +++ trunk/PROTO/elev8/configure.ac 2013-03-10 09:56:15 UTC (rev 84417) @@ -115,6 +115,12 @@ PKG_CHECK_MODULES([EDBUS], [edbus2]) PKG_CHECK_MODULES([EIO], [eio]) +# Detect systemd user session directory properly +EFL_PKG_CHECK_VAR([USER_SESSION_DIR], [systemd], [systemduserunitdir], + [have_systemd_user_session="yes"], [have_systemd_user_session="no"]) +AM_CONDITIONAL([HAVE_SYSTEMD_USER_SESSION], [test "x${have_systemd_user_session}" = "xyes"]) +AC_SUBST([USER_SESSION_DIR]) + dnl Check for libv8 and v8.h by linking a bit of code using v8 AC_LANG_PUSH(C++) AC_SUBST(V8_LIBS) Property changes on: trunk/PROTO/elev8/data/units ___________________________________________________________________ Added: svn:ignore + Makefile Makefile.in Modified: trunk/PROTO/elev8/data/units/Makefile.am =================================================================== --- trunk/PROTO/elev8/data/units/Makefile.am 2013-03-10 08:42:43 UTC (rev 84416) +++ trunk/PROTO/elev8/data/units/Makefile.am 2013-03-10 09:56:15 UTC (rev 84417) @@ -1,8 +1,10 @@ AUTOMAKE_OPTIONS = 1.4 foreign MAINTAINERCLEANFILES = Makefile.in -unitsdir = $(libdir)/systemd/user/ +if HAVE_SYSTEMD_USER_SESSION +unitsdir = $(USER_SESSION_DIR) units_DATA = elev8d.service elev8d.socket +endif EXTRA_DIST = $(units_DATA) Added: trunk/PROTO/elev8/m4/pkg_var.m4 =================================================================== --- trunk/PROTO/elev8/m4/pkg_var.m4 (rev 0) +++ trunk/PROTO/elev8/m4/pkg_var.m4 2013-03-10 09:56:15 UTC (rev 84417) @@ -0,0 +1,14 @@ +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([EFL_PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR + |
|
From: Enlightenment S. <no-...@en...> - 2013-03-10 08:42:51
|
Log: elev8: add systemd socket activation. This patch move the socket to become a user socket, turn on systemd socket activation from ecore and provide systemd user session unit. Author: cedric Date: 2013-03-10 00:42:43 -0800 (Sun, 10 Mar 2013) New Revision: 84416 Trac: http://trac.enlightenment.org/e/changeset/84416 Added: trunk/PROTO/elev8/data/units/ trunk/PROTO/elev8/data/units/Makefile.am trunk/PROTO/elev8/data/units/elev8d.service trunk/PROTO/elev8/data/units/elev8d.socket Modified: trunk/PROTO/elev8/configure.ac trunk/PROTO/elev8/data/Makefile.am trunk/PROTO/elev8/src/bin/server.cc Modified: trunk/PROTO/elev8/configure.ac =================================================================== --- trunk/PROTO/elev8/configure.ac 2013-03-09 00:13:54 UTC (rev 84415) +++ trunk/PROTO/elev8/configure.ac 2013-03-10 08:42:43 UTC (rev 84416) @@ -158,6 +158,7 @@ data/images/Makefile data/desktop/Makefile data/javascript/Makefile +data/units/Makefile ]) ##################################################################### Modified: trunk/PROTO/elev8/data/Makefile.am =================================================================== --- trunk/PROTO/elev8/data/Makefile.am 2013-03-09 00:13:54 UTC (rev 84415) +++ trunk/PROTO/elev8/data/Makefile.am 2013-03-10 08:42:43 UTC (rev 84416) @@ -1,3 +1,4 @@ AUTOMAKE_OPTIONS = 1.4 foreign MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = images desktop javascript +SUBDIRS = images desktop javascript units + Added: trunk/PROTO/elev8/data/units/Makefile.am =================================================================== --- trunk/PROTO/elev8/data/units/Makefile.am (rev 0) +++ trunk/PROTO/elev8/data/units/Makefile.am 2013-03-10 08:42:43 UTC (rev 84416) @@ -0,0 +1,8 @@ +AUTOMAKE_OPTIONS = 1.4 foreign +MAINTAINERCLEANFILES = Makefile.in + +unitsdir = $(libdir)/systemd/user/ +units_DATA = elev8d.service elev8d.socket + +EXTRA_DIST = $(units_DATA) + Added: trunk/PROTO/elev8/data/units/elev8d.service =================================================================== --- trunk/PROTO/elev8/data/units/elev8d.service (rev 0) +++ trunk/PROTO/elev8/data/units/elev8d.service 2013-03-10 08:42:43 UTC (rev 84416) @@ -0,0 +1,11 @@ +[Unit] +Description=Elev8 javascript preloading service +Requires=xorg.target +After=xorg.target + +[Service] +ExecStart=/usr/bin/elev8 --server + +[Install] +Also=elev8d.socket + Added: trunk/PROTO/elev8/data/units/elev8d.socket =================================================================== --- trunk/PROTO/elev8/data/units/elev8d.socket (rev 0) +++ trunk/PROTO/elev8/data/units/elev8d.socket 2013-03-10 08:42:43 UTC (rev 84416) @@ -0,0 +1,8 @@ +[Unit] +Description=Elev8 JavaScript preloading Service Sockets + +[Socket] +ListenStream=%t/.ecore/elev8-serversockpath/6523 + +[Install] +WantedBy=sockets.target Modified: trunk/PROTO/elev8/src/bin/server.cc =================================================================== --- trunk/PROTO/elev8/src/bin/server.cc 2013-03-09 00:13:54 UTC (rev 84415) +++ trunk/PROTO/elev8/src/bin/server.cc 2013-03-10 08:42:43 UTC (rev 84416) @@ -106,6 +106,7 @@ } splitted_argv = split_argv(command->argc, command->argv); + DBG("Executing '%s' with %i argument in directory '%s'.", command->script, command->argc, command->current_dir); execute_elev8_script(command->script, command->argc, splitted_argv); end: @@ -130,8 +131,9 @@ void server_start() { - if (!(server = ecore_con_server_add(ECORE_CON_LOCAL_SYSTEM, ELEV8_SOCK_PATH, - ELEV8_SOCK_PORT, NULL))) + if (!(server = ecore_con_server_add((Ecore_Con_Type) ((int) ECORE_CON_LOCAL_USER | (int) ECORE_CON_SOCKET_ACTIVATE), + ELEV8_SOCK_PATH, + ELEV8_SOCK_PORT, NULL))) { ERR("Couldn't create server control socket, check permissions for %s:%d.", ELEV8_SOCK_PATH, ELEV8_SOCK_PORT); @@ -184,7 +186,7 @@ ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ADD, (Ecore_Event_Handler_Cb)_cb_server_add, scw); - if (!(server = ecore_con_server_connect(ECORE_CON_LOCAL_SYSTEM, + if (!(server = ecore_con_server_connect(ECORE_CON_LOCAL_USER, ELEV8_SOCK_PATH, ELEV8_SOCK_PORT, NULL))) { @@ -249,7 +251,7 @@ ecore_event_handler_add(ECORE_CON_EVENT_SERVER_ADD, (Ecore_Event_Handler_Cb)_cb_server_add, scw); - if (!ecore_con_server_connect(ECORE_CON_LOCAL_SYSTEM, + if (!ecore_con_server_connect(ECORE_CON_LOCAL_USER, ELEV8_SOCK_PATH, ELEV8_SOCK_PORT, NULL)) { |
|
From: Enlightenment S. <no-...@en...> - 2013-03-09 00:14:02
|
Log: python-efl: api_coverage: Fix ecore-file and refine the regexps. Author: kuuko Date: 2013-03-08 16:13:54 -0800 (Fri, 08 Mar 2013) New Revision: 84415 Trac: http://trac.enlightenment.org/e/changeset/84415 Modified: trunk/BINDINGS/python/python-efl/api_coverage.py Modified: trunk/BINDINGS/python/python-efl/api_coverage.py =================================================================== --- trunk/BINDINGS/python/python-efl/api_coverage.py 2013-03-08 18:35:13 UTC (rev 84414) +++ trunk/BINDINGS/python/python-efl/api_coverage.py 2013-03-09 00:13:54 UTC (rev 84415) @@ -28,17 +28,17 @@ for f in files: with open(os.path.join(path, f), "r") as header: capi = header.read() - matches = re.finditer("^ *EAPI [A-Za-z_ *\n]+ +\**(" + prefix + "_\w+)\(", capi, re.S|re.M) + matches = re.finditer("^ *EAPI [A-Za-z_ *\n]+ +\**(" + prefix + "_\w+) *\(", capi, re.S|re.M) for match in matches: func = match.group(1) #print(func) capis.append(func) - + return capis def get_pyapis(pxd_path, header_name, prefix): pyapis = [] - + for path, dirs, files in os.walk(pxd_path): for f in files: if f.endswith(".pxd"): @@ -46,18 +46,18 @@ pyapi = pxd.read() cdef = re.search('(cdef extern from "' + header_name + '\.h":\n)(.+)', pyapi, re.S) if cdef: - matches = re.finditer(" .+(" + prefix + "_\w+)\(", cdef.group(2)) + matches = re.finditer("^ [a-zA-Z _*]+?(" + prefix + "_\w+)\(", cdef.group(2), re.M) for match in matches: func = match.group(1) #print(func) pyapis.append(func) - + return pyapis parser = argparse.ArgumentParser() parser.add_argument("--python", action="store_true", default=False, help="Show Python API coverage") parser.add_argument("--c", action="store_true", default=False, help="Show C API coverage") -parser.add_argument("libs", nargs="+", help="Possible values are eo, evas, ecore, efile, edje, emotion, edbus, elementary and all.") +parser.add_argument("libs", nargs="+", help="Possible values are eo, evas, ecore, ecore-file, edje, emotion, edbus, elementary and all.") args = parser.parse_args() if args.libs is "all": @@ -67,7 +67,7 @@ "eo": ("include", "Eo", "eo"), "evas": ("include", "Evas", "evas"), "ecore": ("include", "Ecore", "ecore"), - "efile": ("include", "Ecore_File", "ecore_file"), + "ecore-file": ("include", "Ecore_File", "ecore_file"), "edje": ("include", "Edje", "edje"), "emotion": ("include", "Emotion", "emotion"), "edbus2": ("efl/edbus", "EDBus", "edbus"), @@ -77,38 +77,37 @@ for key in args.libs: inc_path = pkg_config(key, "1.7.99")[0][2:] pxd_path, header_name, prefix = params[key] - + capis = get_capis(inc_path, prefix) pyapis = get_pyapis(pxd_path, header_name, prefix) - + ecs = set(capis) eps = set(pyapis) differences = ecs.union(eps) - ecs.intersection(eps) - + for d in sorted(differences): if args.python and d in ecs: print("{0} is missing from Python API".format(d)) if args.c and d in eps: print("{0} is missing from C API".format(d)) - + if args.python or args.c: print("\n---") - + if args.python: print("Number of functions missing from Python API: {0}".format(len(ecs - ecs.intersection(eps)))) if args.c: print("Number of functions missing from C API: {0}".format(len(eps - ecs.intersection(eps)))) if args.python or args.c: print("---") - + if args.python: print("Python API functions: {0}".format(len(eps))) if args.c: print("C API functions: {0}".format(len(ecs))) - + if args.python: percentage = float(len(ecs.intersection(eps))) / float(len(ecs)) * 100.0 print("===") print("Bindings coverage {0:.2f}%".format(percentage)) - + if args.python or args.c: print("---\n") - \ No newline at end of file |
|
From: Enlightenment S. <no-...@en...> - 2013-03-08 18:35:23
|
Log: python-efl: api_coverage: Filter _-prefixed functions, add options for selecting API coverage output. Author: kuuko Date: 2013-03-08 10:35:13 -0800 (Fri, 08 Mar 2013) New Revision: 84414 Trac: http://trac.enlightenment.org/e/changeset/84414 Modified: trunk/BINDINGS/python/python-efl/api_coverage.py Modified: trunk/BINDINGS/python/python-efl/api_coverage.py =================================================================== --- trunk/BINDINGS/python/python-efl/api_coverage.py 2013-03-08 16:15:59 UTC (rev 84413) +++ trunk/BINDINGS/python/python-efl/api_coverage.py 2013-03-08 18:35:13 UTC (rev 84414) @@ -28,7 +28,7 @@ for f in files: with open(os.path.join(path, f), "r") as header: capi = header.read() - matches = re.finditer("^ *EAPI [A-Za-z_ *\n]+(" + prefix + "_\w+)\(", capi, re.S|re.M) + matches = re.finditer("^ *EAPI [A-Za-z_ *\n]+ +\**(" + prefix + "_\w+)\(", capi, re.S|re.M) for match in matches: func = match.group(1) #print(func) @@ -55,6 +55,8 @@ return pyapis parser = argparse.ArgumentParser() +parser.add_argument("--python", action="store_true", default=False, help="Show Python API coverage") +parser.add_argument("--c", action="store_true", default=False, help="Show C API coverage") parser.add_argument("libs", nargs="+", help="Possible values are eo, evas, ecore, efile, edje, emotion, edbus, elementary and all.") args = parser.parse_args() @@ -81,12 +83,32 @@ ecs = set(capis) eps = set(pyapis) - differences = sorted(ecs.union(eps) - ecs.intersection(eps)) - for d in differences: - if d in ecs: - print("{0} is missing from py api".format(d)) - else: - pass#print("{0} is missing from c api".format(d)) + differences = ecs.union(eps) - ecs.intersection(eps) + + for d in sorted(differences): + if args.python and d in ecs: + print("{0} is missing from Python API".format(d)) + if args.c and d in eps: + print("{0} is missing from C API".format(d)) + + if args.python or args.c: print("\n---") + + if args.python: + print("Number of functions missing from Python API: {0}".format(len(ecs - ecs.intersection(eps)))) + if args.c: + print("Number of functions missing from C API: {0}".format(len(eps - ecs.intersection(eps)))) + + if args.python or args.c: print("---") + + if args.python: + print("Python API functions: {0}".format(len(eps))) + if args.c: + print("C API functions: {0}".format(len(ecs))) + + if args.python: + percentage = float(len(ecs.intersection(eps))) / float(len(ecs)) * 100.0 + print("===") + print("Bindings coverage {0:.2f}%".format(percentage)) - print(header_name + " C api functions: {0}".format(len(ecs))) - print(header_name + " py api functions: {0}".format(len(eps))) + if args.python or args.c: print("---\n") + \ No newline at end of file |
|
From: Enlightenment S. <no-...@en...> - 2013-03-08 16:16:09
|
Log: python-efl: API coverage script now handles all bindings. Check --help for usage. Author: kuuko Date: 2013-03-08 08:15:59 -0800 (Fri, 08 Mar 2013) New Revision: 84413 Trac: http://trac.enlightenment.org/e/changeset/84413 Modified: trunk/BINDINGS/python/python-efl/api_coverage.py Modified: trunk/BINDINGS/python/python-efl/api_coverage.py =================================================================== --- trunk/BINDINGS/python/python-efl/api_coverage.py 2013-03-07 15:52:02 UTC (rev 84412) +++ trunk/BINDINGS/python/python-efl/api_coverage.py 2013-03-08 16:15:59 UTC (rev 84413) @@ -4,66 +4,89 @@ import sys import re import subprocess +import argparse -def pkg_config(name, require, min_vers=None): +def pkg_config(require, min_vers=None): + name = require.capitalize() try: sys.stdout.write("Checking for " + name + ": ") ver = subprocess.check_output(["pkg-config", "--modversion", require]).decode("utf-8").strip() if min_vers is not None: assert 0 == subprocess.call(["pkg-config", "--atleast-version", min_vers, require]) cflags = subprocess.check_output(["pkg-config", "--cflags", require]).decode("utf-8").split() - libs = subprocess.check_output(["pkg-config", "--libs", require]).decode("utf-8").split() sys.stdout.write("OK, found " + ver + "\n") - return (cflags, libs) + return cflags except (OSError, subprocess.CalledProcessError): - raise SystemExit("Failed to find Evas with 'pkg-config'. Please make sure that it is installed and available on your system path.") + raise SystemExit("Failed to find" + name + "with 'pkg-config'. Please make sure that it is installed and available on your system path.") except (AssertionError): raise SystemExit("Failed to match version. Found: " + ver + " Needed: " + min_vers) -eo_cflags, eo_libs = pkg_config('Eo', 'eo', "1.7.99") -evas_cflags, evas_libs = pkg_config('Evas', 'evas', "1.7.99") -ecore_cflags, ecore_libs = pkg_config('Ecore', 'ecore', "1.7.99") -efile_cflags, efile_libs = pkg_config('EcoreFile', 'ecore-file', "1.7.99") -edje_cflags, edje_libs = pkg_config('Edje', 'edje', "1.7.99") -emotion_cflags, emotion_libs = pkg_config('Emotion', 'emotion', "1.7.99") -edbus_cflags, edbus_libs = pkg_config('EDBus', 'edbus2', "1.7.99") -elm_cflags, elm_libs = pkg_config('Elementary', 'elementary', "1.7.99") +def get_capis(inc_path, prefix): + capis = [] -elm_capis = [] -elm_pyapis = [] + for path, dirs, files in os.walk(inc_path): + for f in files: + with open(os.path.join(path, f), "r") as header: + capi = header.read() + matches = re.finditer("^ *EAPI [A-Za-z_ *\n]+(" + prefix + "_\w+)\(", capi, re.S|re.M) + for match in matches: + func = match.group(1) + #print(func) + capis.append(func) + + return capis -elm_inc = elm_cflags[0] -elm_inc = elm_inc[2:] -for path, dirs, files in os.walk(elm_inc): - for f in files: - with open(os.path.join(path, f), "r") as header: - capi = header.read() - matches = re.finditer("^ *EAPI [A-Za-z_ *\n]+(elm_\w+)\(", capi, re.S|re.M) - for match in matches: - func = match.group(1) - #print(func) - elm_capis.append(func) +def get_pyapis(pxd_path, header_name, prefix): + pyapis = [] -for path, dirs, files in os.walk("efl/elementary"): - for f in files: - if f.endswith(".pxd"): - with open(os.path.join(path, f), "r") as pxd: - pyapif = pxd.read() - cdef = re.search('(cdef extern from "Elementary\.h":\n)(.+)', pyapif, re.S) - if cdef: - matches = re.finditer(" .+(elm_\w+)\(", cdef.group(2)) - for match in matches: - func = match.group(1) - #print(func) - elm_pyapis.append(func) - -ecs = set(elm_capis) -eps = set(elm_pyapis) -print("C api functions: {0}".format(len(ecs))) -print("py api functions: {0}".format(len(eps))) -differences = sorted(ecs.union(eps) - ecs.intersection(eps)) -for d in differences: - if d in ecs: - print("{0} is missing from py api".format(d)) - else: - pass#print("{0} is missing from c api".format(d)) \ No newline at end of file + for path, dirs, files in os.walk(pxd_path): + for f in files: + if f.endswith(".pxd"): + with open(os.path.join(path, f), "r") as pxd: + pyapi = pxd.read() + cdef = re.search('(cdef extern from "' + header_name + '\.h":\n)(.+)', pyapi, re.S) + if cdef: + matches = re.finditer(" .+(" + prefix + "_\w+)\(", cdef.group(2)) + for match in matches: + func = match.group(1) + #print(func) + pyapis.append(func) + + return pyapis + +parser = argparse.ArgumentParser() +parser.add_argument("libs", nargs="+", help="Possible values are eo, evas, ecore, efile, edje, emotion, edbus, elementary and all.") +args = parser.parse_args() + +if args.libs is "all": + args.libs = ["eo", "evas", "ecore", "efile", "edje", "emotion", "edbus", "elementary"] + +params = { + "eo": ("include", "Eo", "eo"), + "evas": ("include", "Evas", "evas"), + "ecore": ("include", "Ecore", "ecore"), + "efile": ("include", "Ecore_File", "ecore_file"), + "edje": ("include", "Edje", "edje"), + "emotion": ("include", "Emotion", "emotion"), + "edbus2": ("efl/edbus", "EDBus", "edbus"), + "elementary": ("efl/elementary", "Elementary", "elm"), +} + +for key in args.libs: + inc_path = pkg_config(key, "1.7.99")[0][2:] + pxd_path, header_name, prefix = params[key] + + capis = get_capis(inc_path, prefix) + pyapis = get_pyapis(pxd_path, header_name, prefix) + + ecs = set(capis) + eps = set(pyapis) + differences = sorted(ecs.union(eps) - ecs.intersection(eps)) + for d in differences: + if d in ecs: + print("{0} is missing from py api".format(d)) + else: + pass#print("{0} is missing from c api".format(d)) + + print(header_name + " C api functions: {0}".format(len(ecs))) + print(header_name + " py api functions: {0}".format(len(eps))) |
|
From: Enlightenment S. <no-...@en...> - 2013-03-07 15:52:15
|
Log: devs/seoz build.sh: updated build script to redirect new git repository. Author: seoz Date: 2013-03-07 07:52:02 -0800 (Thu, 07 Mar 2013) New Revision: 84412 Trac: http://trac.enlightenment.org/e/changeset/84412 Modified: trunk/devs/seoz/build.sh Modified: trunk/devs/seoz/build.sh =================================================================== --- trunk/devs/seoz/build.sh 2013-03-06 09:08:15 UTC (rev 84411) +++ trunk/devs/seoz/build.sh 2013-03-07 15:52:02 UTC (rev 84412) @@ -1,5 +1,11 @@ #!/bin/bash +echo "This script is DEPRECATED." +echo "Please use utility for new git." +echo "$ git clone gi...@gi.../devs/seoz/util.git" +echo "check efl.sh or efl_script.sh for more details." +exit + ################# Usage ################## # 1. adjust GIT and SVN variables according to your env export EFL_GIT_DIR=~/efl/git |
|
From: Enlightenment S. <no-...@en...> - 2013-03-06 09:08:23
|
Log: python-efl: A very quick and dirty api function coverage script that only does elm at the moment. Author: kuuko Date: 2013-03-06 01:08:15 -0800 (Wed, 06 Mar 2013) New Revision: 84411 Trac: http://trac.enlightenment.org/e/changeset/84411 Added: trunk/BINDINGS/python/python-efl/api_coverage.py Added: trunk/BINDINGS/python/python-efl/api_coverage.py =================================================================== --- trunk/BINDINGS/python/python-efl/api_coverage.py (rev 0) +++ trunk/BINDINGS/python/python-efl/api_coverage.py 2013-03-06 09:08:15 UTC (rev 84411) @@ -0,0 +1,69 @@ +#!/usr/bin/python + +import os +import sys +import re +import subprocess + +def pkg_config(name, require, min_vers=None): + try: + sys.stdout.write("Checking for " + name + ": ") + ver = subprocess.check_output(["pkg-config", "--modversion", require]).decode("utf-8").strip() + if min_vers is not None: + assert 0 == subprocess.call(["pkg-config", "--atleast-version", min_vers, require]) + cflags = subprocess.check_output(["pkg-config", "--cflags", require]).decode("utf-8").split() + libs = subprocess.check_output(["pkg-config", "--libs", require]).decode("utf-8").split() + sys.stdout.write("OK, found " + ver + "\n") + return (cflags, libs) + except (OSError, subprocess.CalledProcessError): + raise SystemExit("Failed to find Evas with 'pkg-config'. Please make sure that it is installed and available on your system path.") + except (AssertionError): + raise SystemExit("Failed to match version. Found: " + ver + " Needed: " + min_vers) + +eo_cflags, eo_libs = pkg_config('Eo', 'eo', "1.7.99") +evas_cflags, evas_libs = pkg_config('Evas', 'evas', "1.7.99") +ecore_cflags, ecore_libs = pkg_config('Ecore', 'ecore', "1.7.99") +efile_cflags, efile_libs = pkg_config('EcoreFile', 'ecore-file', "1.7.99") +edje_cflags, edje_libs = pkg_config('Edje', 'edje', "1.7.99") +emotion_cflags, emotion_libs = pkg_config('Emotion', 'emotion', "1.7.99") +edbus_cflags, edbus_libs = pkg_config('EDBus', 'edbus2', "1.7.99") +elm_cflags, elm_libs = pkg_config('Elementary', 'elementary', "1.7.99") + +elm_capis = [] +elm_pyapis = [] + +elm_inc = elm_cflags[0] +elm_inc = elm_inc[2:] +for path, dirs, files in os.walk(elm_inc): + for f in files: + with open(os.path.join(path, f), "r") as header: + capi = header.read() + matches = re.finditer("^ *EAPI [A-Za-z_ *\n]+(elm_\w+)\(", capi, re.S|re.M) + for match in matches: + func = match.group(1) + #print(func) + elm_capis.append(func) + +for path, dirs, files in os.walk("efl/elementary"): + for f in files: + if f.endswith(".pxd"): + with open(os.path.join(path, f), "r") as pxd: + pyapif = pxd.read() + cdef = re.search('(cdef extern from "Elementary\.h":\n)(.+)', pyapif, re.S) + if cdef: + matches = re.finditer(" .+(elm_\w+)\(", cdef.group(2)) + for match in matches: + func = match.group(1) + #print(func) + elm_pyapis.append(func) + +ecs = set(elm_capis) +eps = set(elm_pyapis) +print("C api functions: {0}".format(len(ecs))) +print("py api functions: {0}".format(len(eps))) +differences = sorted(ecs.union(eps) - ecs.intersection(eps)) +for d in differences: + if d in ecs: + print("{0} is missing from py api".format(d)) + else: + pass#print("{0} is missing from c api".format(d)) \ No newline at end of file Property changes on: trunk/BINDINGS/python/python-efl/api_coverage.py ___________________________________________________________________ Added: svn:executable + * |
|
From: Enlightenment S. <no-...@en...> - 2013-03-05 22:17:32
|
Log: python-efl: Add elm.general.cache_all_flush(), fix tests. Author: kuuko Date: 2013-03-05 14:17:24 -0800 (Tue, 05 Mar 2013) New Revision: 84410 Trac: http://trac.enlightenment.org/e/changeset/84410 Modified: trunk/BINDINGS/python/python-efl/TODO trunk/BINDINGS/python/python-efl/efl/elementary/general.pxd trunk/BINDINGS/python/python-efl/efl/elementary/general.pyx trunk/BINDINGS/python/python-efl/examples/elementary/test.py trunk/BINDINGS/python/python-efl/examples/elementary/test_genlist.py trunk/BINDINGS/python/python-efl/examples/elementary/test_grid.py Modified: trunk/BINDINGS/python/python-efl/TODO =================================================================== --- trunk/BINDINGS/python/python-efl/TODO 2013-03-05 18:58:18 UTC (rev 84409) +++ trunk/BINDINGS/python/python-efl/TODO 2013-03-05 22:17:24 UTC (rev 84410) @@ -2,9 +2,6 @@ BUGS: * Evas: smart object doesn't work -* Elm: test genlist 2 -> Flush ('elm_cache_all_flush' not defined) -* Elm: test genlist Sorted ('Genlist' object has no attribute 'obj') -* Elm: test grid -> click 'Change' btn ('Grid' object has no attribute 'pack_get') * Elm: remove tooltips.pxi TODO: Modified: trunk/BINDINGS/python/python-efl/efl/elementary/general.pxd =================================================================== --- trunk/BINDINGS/python/python-efl/efl/elementary/general.pxd 2013-03-05 18:58:18 UTC (rev 84409) +++ trunk/BINDINGS/python/python-efl/efl/elementary/general.pxd 2013-03-05 22:17:24 UTC (rev 84410) @@ -120,6 +120,9 @@ # General - Language (py3: TODO) void elm_language_set(const_char_ptr lang) + + # Cache + void elm_cache_all_flush() # Finger void elm_coords_finger_size_adjust(int times_w, Evas_Coord *w, int times_h, Evas_Coord *h) Modified: trunk/BINDINGS/python/python-efl/efl/elementary/general.pyx =================================================================== --- trunk/BINDINGS/python/python-efl/efl/elementary/general.pyx 2013-03-05 18:58:18 UTC (rev 84409) +++ trunk/BINDINGS/python/python-efl/efl/elementary/general.pyx 2013-03-05 22:17:24 UTC (rev 84410) @@ -206,3 +206,13 @@ height = h elm_coords_finger_size_adjust(times_w, &width, times_h, &height) +def cache_all_flush(): + """cache_all_flush() + + Frees all data that was in cache and is not currently being used to reduce + memory usage. This frees Edje's, Evas' and Eet's cache. + + .. note:: Evas caches are flushed for every canvas associated with a window. + + """ + elm_cache_all_flush() \ No newline at end of file Modified: trunk/BINDINGS/python/python-efl/examples/elementary/test.py =================================================================== --- trunk/BINDINGS/python/python-efl/examples/elementary/test.py 2013-03-05 18:58:18 UTC (rev 84409) +++ trunk/BINDINGS/python/python-efl/examples/elementary/test.py 2013-03-05 22:17:24 UTC (rev 84410) @@ -44,7 +44,7 @@ from test_flipselector import flipselector_clicked from test_frame import frame_clicked from test_gengrid import gengrid_clicked -from test_genlist import genlist_clicked, genlist2_clicked, genlist3_clicked, genlist4_clicked +from test_genlist import genlist_clicked, genlist2_clicked, genlist3_clicked, genlist4_clicked, genlist5_clicked from test_grid import grid_clicked from test_hover import hover_clicked, hover2_clicked from test_hoversel import hoversel_clicked @@ -160,6 +160,7 @@ ("Genlist 2", genlist2_clicked), ("Genlist Group", genlist3_clicked), ("Genlist Sorted", genlist4_clicked), + ("Genlist Iteration", genlist5_clicked), ("Gengrid", gengrid_clicked), ]), ("Naviframe", [ Modified: trunk/BINDINGS/python/python-efl/examples/elementary/test_genlist.py =================================================================== --- trunk/BINDINGS/python/python-efl/examples/elementary/test_genlist.py 2013-03-05 18:58:18 UTC (rev 84409) +++ trunk/BINDINGS/python/python-efl/examples/elementary/test_genlist.py 2013-03-05 22:17:24 UTC (rev 84410) @@ -15,6 +15,7 @@ from efl.elementary.list import List from efl.elementary.icon import Icon from efl.elementary.genlist import Genlist, GenlistItem, GenlistItemClass +from efl.elementary.general import cache_all_flush def gl_text_get(obj, part, item_data): @@ -364,7 +365,7 @@ def my_gl_flush(bt, gl): def my_gl_flush_delay(): - elm_cache_all_flush() + cache_all_flush() ecore.timer_add(1.2, my_gl_flush_delay) bt = Button(win) bt.text_set("Flush") Modified: trunk/BINDINGS/python/python-efl/examples/elementary/test_grid.py =================================================================== --- trunk/BINDINGS/python/python-efl/examples/elementary/test_grid.py 2013-03-05 18:58:18 UTC (rev 84409) +++ trunk/BINDINGS/python/python-efl/examples/elementary/test_grid.py 2013-03-05 22:17:24 UTC (rev 84410) @@ -11,9 +11,9 @@ from efl.elementary.grid import Grid -def cb_change(bt, grid): - (x, y, w, h) = grid.pack_get(bt) - grid.pack_set(bt, x - 2, y - 2, w + 4, h + 4) +def cb_change(bt): + (x, y, w, h) = grid_pack_get(bt) + grid_pack_set(bt, x - 2, y - 2, w + 4, h + 4) def grid_clicked(obj): win = Window("grid", elementary.ELM_WIN_BASIC) @@ -68,7 +68,7 @@ bt = Button(win); bt.text = "Change" - bt.callback_clicked_add(cb_change, gd) + bt.callback_clicked_add(cb_change) gd.pack(bt, 40, 40, 20, 20) bt.show() |
90 messages has been excluded from this view by a project administrator.
