arf, one more bug to solve :P 2012/10/30 Carsten Haitzler <ras...@rasterman.com>
> On Mon, 29 Oct 2012 16:36:53 +0100 Michaël Bouchaud <y...@efl.so> said: > > yup! the message() func wasnt inherited (in the general script {} sectin > not > the script {} per program). > > > Hum, I've fixed this bug in edje recently ... still here ? > > > > 2012/10/29 Enlightenment SVN <no-re...@enlightenment.org> > > > > > Log: > > > hmmm i found a bug in group in heritance... the embryo script section > > > inst inherited! ooooooooooooooooh! > > > > > > > > > > > > Author: raster > > > Date: 2012-10-29 08:23:04 -0700 (Mon, 29 Oct 2012) > > > New Revision: 78616 > > > Trac: http://trac.enlightenment.org/e/changeset/78616 > > > > > > Modified: > > > trunk/THEMES/dark/edje/edc/connman.edc > > > > > > Modified: trunk/THEMES/dark/edje/edc/connman.edc > > > =================================================================== > > > --- trunk/THEMES/dark/edje/edc/connman.edc 2012-10-29 12:40:14 UTC > > > (rev 78615) > > > +++ trunk/THEMES/dark/edje/edc/connman.edc 2012-10-29 15:23:04 UTC > > > (rev 78616) > > > @@ -383,145 +383,132 @@ > > > } > > > } > > > } > > > - script { > > > - public message(Msg_Type:type, id, ...) { > > > - if ((type == MSG_INT_SET) && (id == 1)) { /* state + > strength */ > > > - new state = getarg(2); > > > - new signl = getarg(3); > > > - > > > - /* Connecting if in association or configuration */ > > > - if ((state == 2)) { > > > - set_state(PART:"led", "default", 0.0); > > > - run_program(PROGRAM:"connecting"); > > > - return; > > > - } > > > - else if ((state == 3)) { /* ??? ignore */ > > > - return; > > > - } > > > - else if ((state == 4)) { /* connected to network */ > > > - set_state(PART:"led", "connected", 0.0); > > > - } > > > - else if ((state == 5)) { /* internet all working and > happy */ > > > - set_state(PART:"led", "online", 0.0); > > > - } > > > - else { /* ??? */ > > > - set_state(PART:"led", "default", 0.0); > > > - } > > > - ////////////////////////// > > > - if (signl <= 14) { > > > - set_state(PART:"wifi_1", "default", 0.0); > > > - set_state(PART:"wifi_2", "default", 0.0); > > > - set_state(PART:"wifi_3", "default", 0.0); > > > - } > > > - else if (signl <= 28) { > > > - set_state(PART:"wifi_1", "partly", 0.0); > > > - set_state(PART:"wifi_2", "default", 0.0); > > > - set_state(PART:"wifi_3", "default", 0.0); > > > - } > > > - else if (signl <= 42) { > > > - set_state(PART:"wifi_1", "visible", 0.0); > > > - set_state(PART:"wifi_2", "default", 0.0); > > > - set_state(PART:"wifi_3", "default", 0.0); > > > - } > > > - else if (signl <= 57) { > > > - set_state(PART:"wifi_1", "visible", 0.0); > > > - set_state(PART:"wifi_2", "partly", 0.0); > > > - set_state(PART:"wifi_3", "default", 0.0); > > > - } > > > - else if (signl <= 71) { > > > - set_state(PART:"wifi_1", "visible", 0.0); > > > - set_state(PART:"wifi_2", "visible", 0.0); > > > - set_state(PART:"wifi_3", "default", 0.0); > > > - } > > > - else if (signl <= 85) { > > > - set_state(PART:"wifi_1", "visible", 0.0); > > > - set_state(PART:"wifi_2", "visible", 0.0); > > > - set_state(PART:"wifi_3", "partly", 0.0); > > > - } > > > - else { > > > - set_state(PART:"wifi_1", "visible", 0.0); > > > - set_state(PART:"wifi_2", "visible", 0.0); > > > - set_state(PART:"wifi_3", "visible", 0.0); > > > - } > > > - ////////////////////////// > > > - if (signl <= 20) { > > > - set_state(PART:"bt_1", "default", 0.0); > > > - set_state(PART:"bt_2", "default", 0.0); > > > - } > > > - else if (signl <= 40) { > > > - set_state(PART:"bt_1", "partly", 0.0); > > > - set_state(PART:"bt_2", "default", 0.0); > > > - } > > > - else if (signl <= 60) { > > > - set_state(PART:"bt_1", "visible", 0.0); > > > - set_state(PART:"bt_2", "default", 0.0); > > > - } > > > - else if (signl <= 80) { > > > - set_state(PART:"bt_1", "visible", 0.0); > > > - set_state(PART:"bt_2", "partly", 0.0); > > > - } > > > - else { > > > - set_state(PART:"bt_1", "visible", 0.0); > > > - set_state(PART:"bt_2", "visible", 0.0); > > > - } > > > - ////////////////////////// > > > - if (signl <= 11) { > > > - set_state(PART:"cell_1", "default", 0.0); > > > - set_state(PART:"cell_2", "default", 0.0); > > > - set_state(PART:"cell_3", "default", 0.0); > > > - set_state(PART:"cell_4", "default", 0.0); > > > - } > > > - else if (signl <= 22) { > > > - set_state(PART:"cell_1", "partly", 0.0); > > > - set_state(PART:"cell_2", "default", 0.0); > > > - set_state(PART:"cell_3", "default", 0.0); > > > - set_state(PART:"cell_4", "default", 0.0); > > > - } > > > - else if (signl <= 33) { > > > - set_state(PART:"cell_1", "visible", 0.0); > > > - set_state(PART:"cell_2", "default", 0.0); > > > - set_state(PART:"cell_3", "default", 0.0); > > > - set_state(PART:"cell_4", "default", 0.0); > > > - } > > > - else if (signl <= 44) { > > > - set_state(PART:"cell_1", "visible", 0.0); > > > - set_state(PART:"cell_2", "partly", 0.0); > > > - set_state(PART:"cell_3", "default", 0.0); > > > - set_state(PART:"cell_4", "default", 0.0); > > > - } > > > - else if (signl <= 55) { > > > - set_state(PART:"cell_1", "visible", 0.0); > > > - set_state(PART:"cell_2", "visible", 0.0); > > > - set_state(PART:"cell_3", "default", 0.0); > > > - set_state(PART:"cell_4", "default", 0.0); > > > - } > > > - else if (signl <= 66) { > > > - set_state(PART:"cell_1", "visible", 0.0); > > > - set_state(PART:"cell_2", "visible", 0.0); > > > - set_state(PART:"cell_3", "partly", 0.0); > > > - set_state(PART:"cell_4", "default", 0.0); > > > - } > > > - else if (signl <= 77) { > > > - set_state(PART:"cell_1", "visible", 0.0); > > > - set_state(PART:"cell_2", "visible", 0.0); > > > - set_state(PART:"cell_3", "visible", 0.0); > > > - set_state(PART:"cell_4", "default", 0.0); > > > - } > > > - else if (signl <= 88) { > > > - set_state(PART:"cell_1", "visible", 0.0); > > > - set_state(PART:"cell_2", "visible", 0.0); > > > - set_state(PART:"cell_3", "visible", 0.0); > > > - set_state(PART:"cell_4", "partly", 0.0); > > > - } > > > - else { > > > - set_state(PART:"cell_1", "visible", 0.0); > > > - set_state(PART:"cell_2", "visible", 0.0); > > > - set_state(PART:"cell_3", "visible", 0.0); > > > - set_state(PART:"cell_4", "visible", 0.0); > > > - } > > > - } > > > - } > > > - } > > > + > > > +#define SCRIPT_MESSAGE() \ > > > +script { \ > > > +public message(Msg_Type:type, id, ...) { \ > > > +if ((type == MSG_INT_SET) && (id == 1)) { \ > > > +new state = getarg(2), signl = getarg(3); \ > > > +if (signl <= 14) { \ > > > +set_state(PART:"wifi_1", "default", 0.0); \ > > > +set_state(PART:"wifi_2", "default", 0.0); \ > > > +set_state(PART:"wifi_3", "default", 0.0); \ > > > +} \ > > > +else if (signl <= 28) { \ > > > +set_state(PART:"wifi_1", "partly", 0.0); \ > > > +set_state(PART:"wifi_2", "default", 0.0); \ > > > +set_state(PART:"wifi_3", "default", 0.0); \ > > > +} \ > > > +else if (signl <= 42) { \ > > > +set_state(PART:"wifi_1", "visible", 0.0); \ > > > +set_state(PART:"wifi_2", "default", 0.0); \ > > > +set_state(PART:"wifi_3", "default", 0.0); \ > > > +} \ > > > +else if (signl <= 57) { \ > > > +set_state(PART:"wifi_1", "visible", 0.0); \ > > > +set_state(PART:"wifi_2", "partly", 0.0); \ > > > +set_state(PART:"wifi_3", "default", 0.0); \ > > > +} \ > > > +else if (signl <= 71) { \ > > > +set_state(PART:"wifi_1", "visible", 0.0); \ > > > +set_state(PART:"wifi_2", "visible", 0.0); \ > > > +set_state(PART:"wifi_3", "default", 0.0); \ > > > +} \ > > > +else if (signl <= 85) { \ > > > +set_state(PART:"wifi_1", "visible", 0.0); \ > > > +set_state(PART:"wifi_2", "visible", 0.0); \ > > > +set_state(PART:"wifi_3", "partly", 0.0); \ > > > +} \ > > > +else { \ > > > +set_state(PART:"wifi_1", "visible", 0.0); \ > > > +set_state(PART:"wifi_2", "visible", 0.0); \ > > > +set_state(PART:"wifi_3", "visible", 0.0); \ > > > +} \ > > > +if (signl <= 20) { \ > > > +set_state(PART:"bt_1", "default", 0.0); \ > > > +set_state(PART:"bt_2", "default", 0.0); \ > > > +} \ > > > +else if (signl <= 40) { \ > > > +set_state(PART:"bt_1", "partly", 0.0); \ > > > +set_state(PART:"bt_2", "default", 0.0); \ > > > +} \ > > > +else if (signl <= 60) { \ > > > +set_state(PART:"bt_1", "visible", 0.0); \ > > > +set_state(PART:"bt_2", "default", 0.0); \ > > > +} \ > > > +else if (signl <= 80) { \ > > > +set_state(PART:"bt_1", "visible", 0.0); \ > > > +set_state(PART:"bt_2", "partly", 0.0); \ > > > +} \ > > > +else { \ > > > +set_state(PART:"bt_1", "visible", 0.0); \ > > > +set_state(PART:"bt_2", "visible", 0.0); \ > > > +} \ > > > +if (signl <= 11) { \ > > > +set_state(PART:"cell_1", "default", 0.0); \ > > > +set_state(PART:"cell_2", "default", 0.0); \ > > > +set_state(PART:"cell_3", "default", 0.0); \ > > > +set_state(PART:"cell_4", "default", 0.0); \ > > > +} \ > > > +else if (signl <= 22) { \ > > > +set_state(PART:"cell_1", "partly", 0.0); \ > > > +set_state(PART:"cell_2", "default", 0.0); \ > > > +set_state(PART:"cell_3", "default", 0.0); \ > > > +set_state(PART:"cell_4", "default", 0.0); \ > > > +} \ > > > +else if (signl <= 33) { \ > > > +set_state(PART:"cell_1", "visible", 0.0); \ > > > +set_state(PART:"cell_2", "default", 0.0); \ > > > +set_state(PART:"cell_3", "default", 0.0); \ > > > +set_state(PART:"cell_4", "default", 0.0); \ > > > +} \ > > > +else if (signl <= 44) { \ > > > +set_state(PART:"cell_1", "visible", 0.0); \ > > > +set_state(PART:"cell_2", "partly", 0.0); \ > > > +set_state(PART:"cell_3", "default", 0.0); \ > > > +set_state(PART:"cell_4", "default", 0.0); \ > > > +} \ > > > +else if (signl <= 55) { \ > > > +set_state(PART:"cell_1", "visible", 0.0); \ > > > +set_state(PART:"cell_2", "visible", 0.0); \ > > > +set_state(PART:"cell_3", "default", 0.0); \ > > > +set_state(PART:"cell_4", "default", 0.0); \ > > > +} \ > > > +else if (signl <= 66) { \ > > > +set_state(PART:"cell_1", "visible", 0.0); \ > > > +set_state(PART:"cell_2", "visible", 0.0); \ > > > +set_state(PART:"cell_3", "partly", 0.0); \ > > > +set_state(PART:"cell_4", "default", 0.0); \ > > > +} \ > > > +else if (signl <= 77) { \ > > > +set_state(PART:"cell_1", "visible", 0.0); \ > > > +set_state(PART:"cell_2", "visible", 0.0); \ > > > +set_state(PART:"cell_3", "visible", 0.0); \ > > > +set_state(PART:"cell_4", "default", 0.0); \ > > > +} \ > > > +else if (signl <= 88) { \ > > > +set_state(PART:"cell_1", "visible", 0.0); \ > > > +set_state(PART:"cell_2", "visible", 0.0); \ > > > +set_state(PART:"cell_3", "visible", 0.0); \ > > > +set_state(PART:"cell_4", "partly", 0.0); \ > > > +} \ > > > +else { \ > > > +set_state(PART:"cell_1", "visible", 0.0); \ > > > +set_state(PART:"cell_2", "visible", 0.0); \ > > > +set_state(PART:"cell_3", "visible", 0.0); \ > > > +set_state(PART:"cell_4", "visible", 0.0); \ > > > +} \ > > > +if ((state == 2)) { \ > > > +set_state(PART:"led", "default", 0.0); \ > > > +run_program(PROGRAM:"connecting"); \ > > > +return; } \ > > > +else if ((state == 3)) { return; } \ > > > +else if ((state == 4)) { set_state(PART:"led", "connected", 0.0); } \ > > > +else if ((state == 5)) { set_state(PART:"led", "online", 0.0); } \ > > > +else { set_state(PART:"led", "default", 0.0); \ > > > +} } } } > > > + > > > + SCRIPT_MESSAGE() > > > programs { > > > program { name: "connecting"; > > > action: STATE_SET "connected" 0.0; > > > @@ -600,6 +587,7 @@ > > > > > > group { name: "e/modules/connman/icon/wifi"; > > > inherit: "e/modules/connman/main"; > > > + SCRIPT_MESSAGE() > > > programs { > > > program { > > > signal: "load"; source: ""; > > > @@ -615,6 +603,7 @@ > > > > > > group { name: "e/modules/connman/icon/ethernet"; > > > inherit: "e/modules/connman/main"; > > > + SCRIPT_MESSAGE() > > > programs { > > > program { > > > signal: "load"; source: ""; > > > @@ -630,6 +619,7 @@ > > > > > > group { name: "e/modules/connman/icon/bluetooth"; > > > inherit: "e/modules/connman/main"; > > > + SCRIPT_MESSAGE() > > > programs { > > > program { > > > signal: "load"; source: ""; > > > @@ -645,6 +635,7 @@ > > > > > > group { name: "e/modules/connman/icon/cellular"; > > > inherit: "e/modules/connman/main"; > > > + SCRIPT_MESSAGE() > > > programs { > > > program { > > > signal: "load"; source: ""; > > > > > > > > > > > > > ------------------------------------------------------------------------------ > > > The Windows 8 Center - In partnership with Sourceforge > > > Your idea - your app - 30 days. > > > Get started! > > > http://windows8center.sourceforge.net/ > > > > what-html-developers-need-to-know-about-coding-windows-8-metro-style-apps/ > > > _______________________________________________ > > > enlightenment-svn mailing list > > > enlightenment-...@lists.sourceforge.net > > > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > > > > > > > > > > > -- > > Michaël Bouchaud (yoz) <y...@efl.so> > > > ------------------------------------------------------------------------------ > > The Windows 8 Center - In partnership with Sourceforge > > Your idea - your app - 30 days. > > Get started! > > http://windows8center.sourceforge.net/ > > > what-html-developers-need-to-know-about-coding-windows-8-metro-style-apps/ > > _______________________________________________ > > enlightenment-devel mailing list > > enlightenment-devel@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > > > -- > ------------- Codito, ergo sum - "I code, therefore I am" -------------- > The Rasterman (Carsten Haitzler) ras...@rasterman.com > > > > ------------------------------------------------------------------------------ > Everyone hates slow websites. So do we. > Make your web apps faster with AppDynamics > Download AppDynamics Lite for free today: > http://p.sf.net/sfu/appdyn_sfd2d_oct > _______________________________________________ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > -- Michaël Bouchaud (yoz) <y...@efl.so> ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_sfd2d_oct _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel