From: Enlightenment S. <no-...@en...> - 2011-08-14 21:16:33
|
Log: port of the most excellent clock from r62461 Author: discomfitor Date: 2011-08-14 14:16:26 -0700 (Sun, 14 Aug 2011) New Revision: 62462 Trac: http://trac.enlightenment.org/e/changeset/62462 Modified: trunk/THEMES/darkness/modules/clock.edc Modified: trunk/THEMES/darkness/modules/clock.edc =================================================================== --- trunk/THEMES/darkness/modules/clock.edc 2011-08-14 21:01:09 UTC (rev 62461) +++ trunk/THEMES/darkness/modules/clock.edc 2011-08-14 21:16:26 UTC (rev 62462) @@ -356,3 +356,150 @@ } } + +group { name: "e/modules/clock/digital"; + min: 56 16; + + script { + public do_seconds, do_24h, tick_timer; + + public clock_cb(val) { + new year, month, day, yearday, weekday, hour, minute; + new Float:second; + new v, dosec, do24h, tim; + new buf[32], bhour[3], bminute[3], bsecond[4], bampm[3]; + + date(year, month, day, yearday, weekday, hour, minute, second); + + dosec = get_int(do_seconds); + do24h = get_int(do_24h); + + if (do24h) { + strcat(bampm, ""); + if (hour < 10) + snprintf(bhour, sizeof(bhour), "0%d", hour); + else + snprintf(bhour, sizeof(bhour), "%d", hour); + + } else { + v = hour % 12; + + if (hour >= 12) + strcat(bampm, "pm"); + else + strcat(bampm, "am"); + + if (v == 0) + v = 12; + + snprintf(bhour, sizeof(bhour), "%d", v); + } + + if (minute < 10) + snprintf(bminute, sizeof(bminute), "0%d", minute); + else + snprintf(bminute, sizeof(bminute), "%d", minute); + + if (dosec) { + v = round(second); + if (v < 10) + snprintf(bsecond, sizeof(bsecond), ":0%d", v); + else + snprintf(bsecond, sizeof(bsecond), ":%d", v); + } else + strcat(bsecond, ""); + + snprintf(buf, sizeof(buf), "%s:%s%s%s", + bhour, bminute, bsecond, bampm); + set_text(PART:"time", buf); + + if (dosec) { + v = round(second); + tim = timer(1.0 - (second - v), "clock_cb", 1); + } else { + tim = timer(60.0 - (second), "clock_cb", 1); + } + set_int(tick_timer, tim); + } + + public restart_clock() { + new tim; + tim = get_int(tick_timer); + if (tim) { + cancel_timer(tim); + set_int(tick_timer, 0); + } + clock_cb(0); + } + } + + parts { + part { name: "time"; + type: TEXT; + effect: SOFT_SHADOW; + description { state: "default" 0.0; + color: 255 255 255 255; + color3: DARKNESS_BLUE 170; + text { + text_class: "module_large"; + font: "DejaVu-Bold"; + size: 14; + fit: 1 1; + min: 1 1; + size_range: 9 72; + text: "--:--"; + } + } + } + + part { name: "event"; + type: RECT; + mouse_events: 1; + description { state: "default" 0.0; + color: 0 0 0 0; + } + } + } + + programs { + program { name: "init"; + signal: "load"; + source: ""; + script { + clock_cb(0); + } + } + program { name: "secon"; + signal: "e,state,seconds,on"; + source: "e"; + script { + set_int(do_seconds, 1); + restart_clock(); + } + } + program { name: "secoff"; + signal: "e,state,seconds,off"; + source: "e"; + script { + set_int(do_seconds, 0); + restart_clock(); + } + } + program { name: "24h"; + signal: "e,state,24h,on"; + source: "e"; + script { + set_int(do_24h, 1); + restart_clock(); + } + } + program { name: "12h"; + signal: "e,state,24h,off"; + source: "e"; + script { + set_int(do_24h, 0); + restart_clock(); + } + } + } + } |
From: Enlightenment S. <no-...@en...> - 2011-10-19 17:46:56
|
Log: fix notification module popup Author: discomfitor Date: 2011-10-19 10:46:48 -0700 (Wed, 19 Oct 2011) New Revision: 64186 Trac: http://trac.enlightenment.org/e/changeset/64186 Modified: trunk/THEMES/darkness/modules/notification.edc Modified: trunk/THEMES/darkness/modules/notification.edc =================================================================== --- trunk/THEMES/darkness/modules/notification.edc 2011-10-19 17:36:51 UTC (rev 64185) +++ trunk/THEMES/darkness/modules/notification.edc 2011-10-19 17:46:48 UTC (rev 64186) @@ -32,6 +32,7 @@ /* Popup Theme */ group { data { + item: "app_icon_max" "48 48"; item: "shaped" "1"; } name: "modules/notification/main"; @@ -106,6 +107,43 @@ visible: 1; } } + part { + name: "notification.text.title"; + type: TEXT; + mouse_events: 0; + scale: 1; + effect: SOFT_SHADOW; + clip_to: "clipper"; + description { + state: "default" 0.0; + fixed: 1 1; + visible: 1; + min: 250 0; + max: 250 9999; + align: 0.0 0.0; + rel1 { + to_x: "notification.swallow.app_icon"; + relative: 1.0 0.0; + offset: 4 5; + } + rel2 { + relative: 1.0 0.0; + offset: -20 15; + } + color: DARKNESS_TEXT 255; + color3: 0 0 0 64; + color_class: "menu_title_active"; + text { + /* text_source: "notification.text.title"; */ + font: "DejaVu-Bold"; + size: 14; + align: 0.0 0.0; + min: 0 1; + text_class: "module_large"; + } + } + } + /* App Icon */ part { name: "notification.swallow.app_icon"; |
From: Enlightenment S. <no-...@en...> - 2011-10-19 18:02:06
|
Log: fix text wrapping in notifications Author: discomfitor Date: 2011-10-19 11:01:59 -0700 (Wed, 19 Oct 2011) New Revision: 64188 Trac: http://trac.enlightenment.org/e/changeset/64188 Modified: trunk/THEMES/darkness/modules/notification.edc Modified: trunk/THEMES/darkness/modules/notification.edc =================================================================== --- trunk/THEMES/darkness/modules/notification.edc 2011-10-19 17:46:59 UTC (rev 64187) +++ trunk/THEMES/darkness/modules/notification.edc 2011-10-19 18:01:59 UTC (rev 64188) @@ -196,7 +196,7 @@ text { style: "notification_style"; - min: 1 1; + min: 0 1; } } } |
From: Enlightenment S. <no-...@en...> - 2011-10-24 03:32:15
|
Log: fix notification theme to size properly also change mouse bindings: left click hides notification, right click focuses sender's window Author: discomfitor Date: 2011-10-23 20:32:08 -0700 (Sun, 23 Oct 2011) New Revision: 64351 Trac: http://trac.enlightenment.org/e/changeset/64351 Modified: trunk/THEMES/darkness/modules/notification.edc Modified: trunk/THEMES/darkness/modules/notification.edc =================================================================== --- trunk/THEMES/darkness/modules/notification.edc 2011-10-24 03:31:46 UTC (rev 64350) +++ trunk/THEMES/darkness/modules/notification.edc 2011-10-24 03:32:08 UTC (rev 64351) @@ -35,7 +35,8 @@ item: "app_icon_max" "48 48"; item: "shaped" "1"; } - name: "modules/notification/main"; + name: "modules/notification/main/alpha"; + alias: "modules/notification/main"; parts { /* Background */ part { @@ -112,37 +113,57 @@ type: TEXT; mouse_events: 0; scale: 1; - effect: SOFT_SHADOW; clip_to: "clipper"; description { state: "default" 0.0; + visible: 1; fixed: 1 1; - visible: 1; - min: 250 0; - max: 250 9999; align: 0.0 0.0; rel1 { + to_y: "clipper"; to_x: "notification.swallow.app_icon"; relative: 1.0 0.0; offset: 4 5; } rel2 { + to: "clipper"; relative: 1.0 0.0; offset: -20 15; } color: DARKNESS_TEXT 255; color3: 0 0 0 64; - color_class: "menu_title_active"; text { /* text_source: "notification.text.title"; */ + min: 0 1; + size: 14; font: "DejaVu-Bold"; - size: 14; - align: 0.0 0.0; - min: 0 1; - text_class: "module_large"; + style: "notification_style"; } } } + part { + name: "notification.close_btn"; + clip_to: "clipper"; + description { + state: "default" 0.0; + min: 15 15; + max: 15 15; + rel1 { + relative: 1.0 0.0; + offset: -24 5; + } + rel2 { + relative: 1.0 0.0; + offset: -6 20; + } + image.normal: "button_detail_close.png"; + } + description { + state: "active" 0.0; + inherit: "default" 0.0; + visible: 1; + } + } /* App Icon */ part { @@ -185,11 +206,13 @@ rel1 { to_x: "notification.swallow.app_icon"; + to_y: "notification.text.title"; relative: 1.0 0.0; offset: 15 10; } - rel2 { + rel2 { + to: "clipper"; relative: 1.0 1.0; offset: -5 -10; } @@ -274,7 +297,7 @@ program { name: "find"; - signal: "mouse,down,1"; + signal: "mouse,down,3"; source: "bg"; action: SIGNAL_EMIT "notification,find" "theme"; } |
From: Enlightenment S. <no-...@en...> - 2011-10-31 00:02:43
|
Log: typo-- Author: discomfitor Date: 2011-10-30 17:02:37 -0700 (Sun, 30 Oct 2011) New Revision: 64535 Trac: http://trac.enlightenment.org/e/changeset/64535 Modified: trunk/THEMES/darkness/modules/pager.edc Modified: trunk/THEMES/darkness/modules/pager.edc =================================================================== --- trunk/THEMES/darkness/modules/pager.edc 2011-10-31 00:00:51 UTC (rev 64534) +++ trunk/THEMES/darkness/modules/pager.edc 2011-10-31 00:02:37 UTC (rev 64535) @@ -297,18 +297,19 @@ } } part { - name: "e.swallow.content"; - type: SWALLOW; - clip_to: "clip"; - description { - state: "default" 0.0; - rel1 { - offset: 2 2; - } - rel2 { - offset: -3 -3; - } - } + name: "e.swallow.content"; + type: SWALLOW; + clip_to: "clip"; + description { + state: "default" 0.0; + rel1 { + offset: 2 2; + } + rel2 { + offset: -3 -3; + } + } + } part { name: "e.text.label"; type: TEXT; @@ -333,7 +334,6 @@ color: 0 0 0 128; } } - } } programs { program { |
From: Enlightenment S. <no-...@en...> - 2011-11-03 07:51:31
|
Log: also scale here Author: discomfitor Date: 2011-11-03 00:51:23 -0700 (Thu, 03 Nov 2011) New Revision: 64682 Trac: http://trac.enlightenment.org/e/changeset/64682 Modified: trunk/THEMES/darkness/modules/forecasts.edc Modified: trunk/THEMES/darkness/modules/forecasts.edc =================================================================== --- trunk/THEMES/darkness/modules/forecasts.edc 2011-11-03 07:50:28 UTC (rev 64681) +++ trunk/THEMES/darkness/modules/forecasts.edc 2011-11-03 07:51:23 UTC (rev 64682) @@ -59,6 +59,7 @@ name: "e.text.temp"; type: TEXT; effect: SOFT_SHADOW; + scale: 1; mouse_events: 0; description { state: "default" 0.0; @@ -88,6 +89,7 @@ name: "e.text.description"; type: TEXT; effect: OUTLINE_SOFT_SHADOW; + scale: 1; mouse_events: 0; description { state: "default" 0.0; |
From: Enlightenment S. <no-...@en...> - 2011-11-03 15:18:54
|
Log: fix some notification text offsets Author: discomfitor Date: 2011-11-03 08:18:44 -0700 (Thu, 03 Nov 2011) New Revision: 64703 Trac: http://trac.enlightenment.org/e/changeset/64703 Modified: trunk/THEMES/darkness/modules/notification.edc Modified: trunk/THEMES/darkness/modules/notification.edc =================================================================== --- trunk/THEMES/darkness/modules/notification.edc 2011-11-03 14:50:58 UTC (rev 64702) +++ trunk/THEMES/darkness/modules/notification.edc 2011-11-03 15:18:44 UTC (rev 64703) @@ -123,7 +123,7 @@ to_y: "clipper"; to_x: "notification.swallow.app_icon"; relative: 1.0 0.0; - offset: 4 5; + offset: 10 5; } rel2 { to: "clipper"; @@ -208,13 +208,13 @@ to_x: "notification.swallow.app_icon"; to_y: "notification.text.title"; relative: 1.0 0.0; - offset: 15 10; + offset: 10 0; } rel2 { to: "clipper"; relative: 1.0 1.0; - offset: -5 -10; + offset: -10 -10; } text { |
From: Enlightenment S. <no-...@en...> - 2011-11-04 15:49:12
|
Log: fix text layout in large notifications Author: discomfitor Date: 2011-11-04 08:49:06 -0700 (Fri, 04 Nov 2011) New Revision: 64738 Trac: http://trac.enlightenment.org/e/changeset/64738 Modified: trunk/THEMES/darkness/modules/notification.edc Modified: trunk/THEMES/darkness/modules/notification.edc =================================================================== --- trunk/THEMES/darkness/modules/notification.edc 2011-11-04 15:01:34 UTC (rev 64737) +++ trunk/THEMES/darkness/modules/notification.edc 2011-11-04 15:49:06 UTC (rev 64738) @@ -200,14 +200,14 @@ clip_to: "clipper"; description { state: "default" 0.0; - align: 0.0 0.5; - min: 260 80; + align: 0.0 0.0; + min: 260 40; // fixed: 1 1; rel1 { to_x: "notification.swallow.app_icon"; to_y: "notification.text.title"; - relative: 1.0 0.0; + relative: 1.0 1.0; offset: 10 0; } |
From: Enlightenment S. <no-...@en...> - 2011-11-07 20:50:37
|
Log: close notification when right clicked Author: discomfitor Date: 2011-11-07 12:50:28 -0800 (Mon, 07 Nov 2011) New Revision: 64872 Trac: http://trac.enlightenment.org/e/changeset/64872 Modified: trunk/THEMES/darkness/modules/notification.edc Modified: trunk/THEMES/darkness/modules/notification.edc =================================================================== --- trunk/THEMES/darkness/modules/notification.edc 2011-11-07 18:17:09 UTC (rev 64871) +++ trunk/THEMES/darkness/modules/notification.edc 2011-11-07 20:50:28 UTC (rev 64872) @@ -301,5 +301,12 @@ source: "bg"; action: SIGNAL_EMIT "notification,find" "theme"; } + program { + name: "close_find"; + signal: "mouse,down,3"; + source: "bg"; + action: SIGNAL_EMIT "notification,close" "theme"; + after: "find"; + } } } |
From: Enlightenment S. <no-...@en...> - 2012-07-03 07:49:59
|
Log: formatting Author: discomfitor Date: 2012-07-03 00:49:42 -0700 (Tue, 03 Jul 2012) New Revision: 73207 Trac: http://trac.enlightenment.org/e/changeset/73207 Modified: trunk/THEMES/darkness/modules/battery.edc trunk/THEMES/darkness/modules/calendar.edc trunk/THEMES/darkness/modules/clock.edc trunk/THEMES/darkness/modules/cpu.edc trunk/THEMES/darkness/modules/cpufreq.edc trunk/THEMES/darkness/modules/deskshow.edc trunk/THEMES/darkness/modules/forecasts.edc trunk/THEMES/darkness/modules/ibar.edc trunk/THEMES/darkness/modules/ibox.edc trunk/THEMES/darkness/modules/language.edc trunk/THEMES/darkness/modules/mem.edc trunk/THEMES/darkness/modules/net.edc trunk/THEMES/darkness/modules/notification.edc trunk/THEMES/darkness/modules/pager.edc trunk/THEMES/darkness/modules/start.edc trunk/THEMES/darkness/modules/taskbar.edc trunk/THEMES/darkness/modules/temperature.edc trunk/THEMES/darkness/modules/weather.edc trunk/THEMES/darkness/modules/winselector.edc Modified: trunk/THEMES/darkness/modules/battery.edc =================================================================== --- trunk/THEMES/darkness/modules/battery.edc 2012-07-03 07:44:17 UTC (rev 73206) +++ trunk/THEMES/darkness/modules/battery.edc 2012-07-03 07:49:42 UTC (rev 73207) @@ -5,278 +5,278 @@ script { public message(Msg_Type:type, id, ...) { if ((type == MSG_FLOAT) && (id == 1)) { - new Float:val; - val = getfarg(2); - set_state(PART:"battery", "default", val); + new Float:val; + val = getfarg(2); + set_state(PART:"battery", "default", val); } } } parts { part { - name: "battery"; - clip_to: "pulse_clip"; - description { - state: "default" 0.0; - aspect: 0.669291339 0.669291339; - align: 0.0 0.5; - max: 85 127; - rel1 { - relative: 0.0 0.0; - } - rel2 { - relative: 1.0 1.0; - } - image { - normal: "battery_000.png"; - } - } - description { - state: "default" 0.1; - inherit: "default" 0.0; - image { - normal: "battery_010.png"; - } - } - description { - state: "default" 0.2; - inherit: "default" 0.0; - image { - normal: "battery_020.png"; - } - } - description { - state: "default" 0.3; - inherit: "default" 0.0; - image { - normal: "battery_030.png"; - } - } - description { - state: "default" 0.4; - inherit: "default" 0.0; - image { - normal: "battery_040.png"; - } - } - description { - state: "default" 0.5; - inherit: "default" 0.0; - image { - normal: "battery_050.png"; - } - } - description { - state: "default" 0.6; - inherit: "default" 0.0; - image { - normal: "battery_060.png"; - } - } - description { - state: "default" 0.7; - inherit: "default" 0.0; - image { - normal: "battery_070.png"; - } - } - description { - state: "default" 0.8; - inherit: "default" 0.0; - image { - normal: "battery_080.png"; - } - } - description { - state: "default" 0.9; - inherit: "default" 0.0; - image { - normal: "battery_090.png"; - } - } - description { - state: "default" 1.0; - inherit: "default" 0.0; - image { - normal: "battery_100.png"; - } - } + name: "battery"; + clip_to: "pulse_clip"; + description { + state: "default" 0.0; + aspect: 0.669291339 0.669291339; + align: 0.0 0.5; + max: 85 127; + rel1 { + relative: 0.0 0.0; + } + rel2 { + relative: 1.0 1.0; + } + image { + normal: "battery_000.png"; + } + } + description { + state: "default" 0.1; + inherit: "default" 0.0; + image { + normal: "battery_010.png"; + } + } + description { + state: "default" 0.2; + inherit: "default" 0.0; + image { + normal: "battery_020.png"; + } + } + description { + state: "default" 0.3; + inherit: "default" 0.0; + image { + normal: "battery_030.png"; + } + } + description { + state: "default" 0.4; + inherit: "default" 0.0; + image { + normal: "battery_040.png"; + } + } + description { + state: "default" 0.5; + inherit: "default" 0.0; + image { + normal: "battery_050.png"; + } + } + description { + state: "default" 0.6; + inherit: "default" 0.0; + image { + normal: "battery_060.png"; + } + } + description { + state: "default" 0.7; + inherit: "default" 0.0; + image { + normal: "battery_070.png"; + } + } + description { + state: "default" 0.8; + inherit: "default" 0.0; + image { + normal: "battery_080.png"; + } + } + description { + state: "default" 0.9; + inherit: "default" 0.0; + image { + normal: "battery_090.png"; + } + } + description { + state: "default" 1.0; + inherit: "default" 0.0; + image { + normal: "battery_100.png"; + } + } } part { - name: "ac"; - clip_to: "fade_clip"; - description { - state: "default" 0.0; - aspect: 0.975609756 0.975609756; - align: 1.0 1.0; - max: 40 41; - visible: 0; - rel1 { - relative: 0.5 0.5; - } - rel2 { - relative: 1.0 1.0; - } - image { - normal: "battery_ac.png"; - } - } - description { - state: "active" 0.0; - inherit: "default" 0.0; - visible: 1; - } + name: "ac"; + clip_to: "fade_clip"; + description { + state: "default" 0.0; + aspect: 0.975609756 0.975609756; + align: 1.0 1.0; + max: 40 41; + visible: 0; + rel1 { + relative: 0.5 0.5; + } + rel2 { + relative: 1.0 1.0; + } + image { + normal: "battery_ac.png"; + } + } + description { + state: "active" 0.0; + inherit: "default" 0.0; + visible: 1; + } } part { - name: "e.text.reading"; - type: TEXT; - effect: SOFT_SHADOW; + name: "e.text.reading"; + type: TEXT; + effect: SOFT_SHADOW; scale: 1; - clip_to: "fade_clip"; - description { - state: "default" 0.0; - align: 1.0 0.0; - rel1 { - relative: 1.0 0.0; - to_x: "battery"; - } - rel2 { - relative: 1.0 0.0; - } - color: 255 255 255 255; - color3: 0 0 0 32; - color_class: "battery_label"; - text { - text: "100%"; - font: "Sans"; - size: 7; - min: 1 1; - align: 1.0 0.0; - text_class: "module_small"; - } - } + clip_to: "fade_clip"; + description { + state: "default" 0.0; + align: 1.0 0.0; + rel1 { + relative: 1.0 0.0; + to_x: "battery"; + } + rel2 { + relative: 1.0 0.0; + } + color: 255 255 255 255; + color3: 0 0 0 32; + color_class: "battery_label"; + text { + text: "100%"; + font: "Sans"; + size: 7; + min: 1 1; + align: 1.0 0.0; + text_class: "module_small"; + } + } } part { - name: "e.text.time"; - type: TEXT; - effect: SOFT_SHADOW; + name: "e.text.time"; + type: TEXT; + effect: SOFT_SHADOW; scale: 1; - clip_to: "fade_clip"; - description { - state: "default" 0.0; - align: 1.0 0.0; - rel1 { - relative: 1.0 1.0; - to_x: "battery"; - to_y: "e.text.reading"; - } - rel2 { - relative: 1.0 1.0; - to_y: "e.text.reading"; - } - color: 255 255 255 255; - color3: 0 0 0 32; - color_class: "battery_label"; - text { - text: "00:00"; - font: "Sans"; - size: 7; - min: 1 1; - align: 1.0 0.0; + clip_to: "fade_clip"; + description { + state: "default" 0.0; + align: 1.0 0.0; + rel1 { + relative: 1.0 1.0; + to_x: "battery"; + to_y: "e.text.reading"; + } + rel2 { + relative: 1.0 1.0; + to_y: "e.text.reading"; + } + color: 255 255 255 255; + color3: 0 0 0 32; + color_class: "battery_label"; + text { + text: "00:00"; + font: "Sans"; + size: 7; + min: 1 1; + align: 1.0 0.0; text_class: "module_small"; - } - } + } + } } part { - name: "fade_clip"; - type: RECT; - mouse_events: 0; - description { - state: "default" 0.0; - color: 255 255 255 255; - } - description { - state: "faded" 0.0; - color: 255 255 255 128; - } + name: "fade_clip"; + type: RECT; + mouse_events: 0; + description { + state: "default" 0.0; + color: 255 255 255 255; + } + description { + state: "faded" 0.0; + color: 255 255 255 128; + } } part { - name: "pulse_clip"; - type: RECT; - mouse_events: 0; - clip_to: "fade_clip"; - description { - state: "default" 0.0; - color: 255 255 255 255; - } - description { - state: "faded" 1.0; - color: 255 255 255 255; - } - description { - state: "faded" 0.0; - color: 255 255 255 0; - } + name: "pulse_clip"; + type: RECT; + mouse_events: 0; + clip_to: "fade_clip"; + description { + state: "default" 0.0; + color: 255 255 255 255; + } + description { + state: "faded" 1.0; + color: 255 255 255 255; + } + description { + state: "faded" 0.0; + color: 255 255 255 0; + } } } programs { program { - name: "charge"; - signal: "e,state,charging"; - source: "e"; - action: STATE_SET "default" 0.0; - target: "fade_clip"; + name: "charge"; + signal: "e,state,charging"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "fade_clip"; } program { - name: "charge2"; - signal: "e,state,charging"; - source: "e"; - action: STATE_SET "active" 0.0; - target: "ac"; + name: "charge2"; + signal: "e,state,charging"; + source: "e"; + action: STATE_SET "active" 0.0; + target: "ac"; } program { - name: "discharge"; - signal: "e,state,discharging"; - source: "e"; - action: STATE_SET "default" 0.0; - target: "fade_clip"; + name: "discharge"; + signal: "e,state,discharging"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "fade_clip"; } program { - name: "discharge2"; - signal: "e,state,discharging"; - source: "e"; - action: STATE_SET "default" 0.0; - target: "ac"; + name: "discharge2"; + signal: "e,state,discharging"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "ac"; } program { - name: "unknown"; - signal: "e,state,unknown"; - source: "e"; - action: STATE_SET "faded" 0.0; - target: "fade_clip"; + name: "unknown"; + signal: "e,state,unknown"; + source: "e"; + action: STATE_SET "faded" 0.0; + target: "fade_clip"; } program { - name: "pulse"; - signal: "e,action,pulse,start"; - source: "e"; - action: STATE_SET "faded" 0.0; - transition: ACCELERATE 0.3; - after: "pulse2"; - target: "pulse_clip"; + name: "pulse"; + signal: "e,action,pulse,start"; + source: "e"; + action: STATE_SET "faded" 0.0; + transition: ACCELERATE 0.3; + after: "pulse2"; + target: "pulse_clip"; } program { - name: "pulse2"; - signal: "pulse2"; - source: ""; - action: STATE_SET "faded" 1.0; - transition: ACCELERATE 0.1; - target: "pulse_clip"; + name: "pulse2"; + signal: "pulse2"; + source: ""; + action: STATE_SET "faded" 1.0; + transition: ACCELERATE 0.1; + target: "pulse_clip"; } program { - name: "pulsestop"; - signal: "e,action,pulse,stop"; - source: "e"; - action: STATE_SET "default" 0.0; - target: "pulse_clip"; + name: "pulsestop"; + signal: "e,action,pulse,stop"; + source: "e"; + action: STATE_SET "default" 0.0; + target: "pulse_clip"; } } } Modified: trunk/THEMES/darkness/modules/calendar.edc =================================================================== --- trunk/THEMES/darkness/modules/calendar.edc 2012-07-03 07:44:17 UTC (rev 73206) +++ trunk/THEMES/darkness/modules/calendar.edc 2012-07-03 07:49:42 UTC (rev 73207) @@ -6,46 +6,46 @@ image: "arrow2_right.png" COMP; } -#define FLASHY_RECT(To, X1, X2) \ - part { \ - name: To"/back"; \ - type: RECT; \ - mouse_events: 1; \ - description { \ - state: "default" 0.0; \ - rel1.to: To; \ - rel1.offset: -1 -1; \ - rel2.to: To; \ - rel2.offset: 0 0; \ - color: 255 128 128 0; \ - } \ - description { \ - state: "click" 0.0; \ - inherit: "default" 0.0; \ - color: DARKNESS_FRAME_BORDER 255; \ - } \ - } \ - part { \ - name: To; \ - type: RECT; \ - mouse_events: 1; \ - description { \ - state: "default" 0.0; \ - rel1.relative: X1 0.0; \ - rel2.relative: X2 1.0; \ - color: 255 195 195 0; \ - } \ - description { \ - state: "click" 0.0; \ - inherit: "default" 0.0; \ - color: DARKNESS_VERY_LIGHT_BLUE 255; \ - } \ +#define FLASHY_RECT(To, X1, X2) \ + part { \ + name: To"/back"; \ + type: RECT; \ + mouse_events: 1; \ + description { \ + state: "default" 0.0; \ + rel1.to: To; \ + rel1.offset: -1 -1; \ + rel2.to: To; \ + rel2.offset: 0 0; \ + color: 255 128 128 0; \ + } \ + description { \ + state: "click" 0.0; \ + inherit: "default" 0.0; \ + color: DARKNESS_FRAME_BORDER 255; \ + } \ + } \ + part { \ + name: To; \ + type: RECT; \ + mouse_events: 1; \ + description { \ + state: "default" 0.0; \ + rel1.relative: X1 0.0; \ + rel2.relative: X2 1.0; \ + color: 255 195 195 0; \ + } \ + description { \ + state: "click" 0.0; \ + inherit: "default" 0.0; \ + color: DARKNESS_VERY_LIGHT_BLUE 255; \ + } \ } group { name: "modules/calendar/header"; min: 42 9; - parts { + parts { part { name: "base"; type: RECT; Modified: trunk/THEMES/darkness/modules/clock.edc =================================================================== --- trunk/THEMES/darkness/modules/clock.edc 2012-07-03 07:44:17 UTC (rev 73206) +++ trunk/THEMES/darkness/modules/clock.edc 2012-07-03 07:49:42 UTC (rev 73207) @@ -3,69 +3,69 @@ name: "e/modules/clock/main"; script { public clock_cb(val) { - new buf[11]; - new year, month, day, yearday, weekday, hour, minute; - new Float:second; - new v; - - date(year, month, day, yearday, weekday, hour, minute, second); - v = round(second); + new buf[11]; + new year, month, day, yearday, weekday, hour, minute; + new Float:second; + new v; + + date(year, month, day, yearday, weekday, hour, minute, second); + v = round(second); #if E17_PROFILE != HIRES_PDA && E17_PROFILE != LOWRES_PDA && E17_PROFILE != MEDIUMRES_PDA - timer(1.0 - (second - v), "clock_cb", 1); + timer(1.0 - (second - v), "clock_cb", 1); #else - timer(10.0 - (second - v), "clock_cb", 1); + timer(10.0 - (second - v), "clock_cb", 1); #endif #if E17_PROFILE != HIRES_PDA && E17_PROFILE != LOWRES_PDA && E17_PROFILE != MEDIUMRES_PDA - buf[0] = 0; - if (v < 10) {snprintf(buf, 10, "0%i", v);} - else {snprintf(buf, 10, "%i", v);} - set_state(PART:"seconds", buf, 0.0); + buf[0] = 0; + if (v < 10) {snprintf(buf, 10, "0%i", v);} + else {snprintf(buf, 10, "%i", v);} + set_state(PART:"seconds", buf, 0.0); #endif - v = minute; - buf[0] = 0; - if (v < 10) {snprintf(buf, 10, "0%i", v);} - else {snprintf(buf, 10, "%i", v);} - set_state(PART:"minutes", buf, 0.0); + v = minute; + buf[0] = 0; + if (v < 10) {snprintf(buf, 10, "0%i", v);} + else {snprintf(buf, 10, "%i", v);} + set_state(PART:"minutes", buf, 0.0); - if (hour > 7 && hour < 20) { - set_state(PART:"special", "default", 0.0); - } else { - set_state(PART:"special", "moon", 0.0); - } - v = ((hour % 12) * 5) + ((minute * 5) / 60); - buf[0] = 0; - if (v < 10) {snprintf(buf, 10, "0%i", v);} - else {snprintf(buf, 10, "%i", v);} - set_state(PART:"hour", buf, 0.0); + if (hour > 7 && hour < 20) { + set_state(PART:"special", "default", 0.0); + } else { + set_state(PART:"special", "moon", 0.0); + } + v = ((hour % 12) * 5) + ((minute * 5) / 60); + buf[0] = 0; + if (v < 10) {snprintf(buf, 10, "0%i", v);} + else {snprintf(buf, 10, "%i", v);} + set_state(PART:"hour", buf, 0.0); } } parts { part { - name: "special"; - description { - state: "default" 0.0; - aspect: 1.0 1.0; - image { - normal: "clock_sun.png"; - } - } - description { - state: "moon" 0.0; - inherit: "default" 0.0; - image { - normal: "clock_moon.png"; - } - } + name: "special"; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + image { + normal: "clock_sun.png"; + } + } + description { + state: "moon" 0.0; + inherit: "default" 0.0; + image { + normal: "clock_moon.png"; + } + } } part { - name: "bg"; - description { - state: "default" 0.0; - aspect: 1.0 1.0; - image { - normal: "clock_bg.png"; - } - } + name: "bg"; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + image { + normal: "clock_bg.png"; + } + } } #ifdef IND # undef IND @@ -73,86 +73,86 @@ #if E17_PROFILE != HIRES_PDA && E17_PROFILE != LOWRES_PDA && E17_PROFILE != MEDIUMRES_PDA # define IND "seconds" part { - name: IND; - mouse_events: 0; - description { - state: "default" 0.0; - aspect: 1.0 1.0; - image { - normal: "clock_"IND"_00.png"; - } - } + name: IND; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + image { + normal: "clock_"IND"_00.png"; + } + } # ifdef HAND # undef HAND # endif # define HAND(num) \ - description { \ - state: num 0.0; \ - inherit: "default" 0.0; \ - image { \ - normal: "clock_"IND"_"num".png"; \ - } \ - } - HAND("00") - HAND("01") - HAND("02") - HAND("03") - HAND("04") - HAND("05") - HAND("06") - HAND("07") - HAND("08") - HAND("09") - HAND("10") - HAND("11") - HAND("12") - HAND("13") - HAND("14") - HAND("15") - HAND("16") - HAND("17") - HAND("18") - HAND("19") - HAND("20") - HAND("21") - HAND("22") - HAND("23") - HAND("24") - HAND("25") - HAND("26") - HAND("27") - HAND("28") - HAND("29") - HAND("30") - HAND("31") - HAND("32") - HAND("33") - HAND("34") - HAND("35") - HAND("36") - HAND("37") - HAND("38") - HAND("39") - HAND("40") - HAND("41") - HAND("42") - HAND("43") - HAND("44") - HAND("45") - HAND("46") - HAND("47") - HAND("48") - HAND("49") - HAND("50") - HAND("51") - HAND("52") - HAND("53") - HAND("54") - HAND("55") - HAND("56") - HAND("57") - HAND("58") - HAND("59") + description { \ + state: num 0.0; \ + inherit: "default" 0.0; \ + image { \ + normal: "clock_"IND"_"num".png"; \ + } \ + } + HAND("00") + HAND("01") + HAND("02") + HAND("03") + HAND("04") + HAND("05") + HAND("06") + HAND("07") + HAND("08") + HAND("09") + HAND("10") + HAND("11") + HAND("12") + HAND("13") + HAND("14") + HAND("15") + HAND("16") + HAND("17") + HAND("18") + HAND("19") + HAND("20") + HAND("21") + HAND("22") + HAND("23") + HAND("24") + HAND("25") + HAND("26") + HAND("27") + HAND("28") + HAND("29") + HAND("30") + HAND("31") + HAND("32") + HAND("33") + HAND("34") + HAND("35") + HAND("36") + HAND("37") + HAND("38") + HAND("39") + HAND("40") + HAND("41") + HAND("42") + HAND("43") + HAND("44") + HAND("45") + HAND("46") + HAND("47") + HAND("48") + HAND("49") + HAND("50") + HAND("51") + HAND("52") + HAND("53") + HAND("54") + HAND("55") + HAND("56") + HAND("57") + HAND("58") + HAND("59") } #endif #ifdef IND @@ -160,347 +160,347 @@ #endif #define IND "minutes" part { - name: IND; - mouse_events: 0; - description { - state: "default" 0.0; - aspect: 1.0 1.0; - image { - normal: "clock_"IND"_00.png"; - } - } + name: IND; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + image { + normal: "clock_"IND"_00.png"; + } + } #ifdef HAND # undef HAND #endif #define HAND(num) \ - description { \ - state: num 0.0; \ - inherit: "default" 0.0; \ - image { \ - normal: "clock_"IND"_"num".png"; \ - } \ - } - HAND("00") - HAND("01") - HAND("02") - HAND("03") - HAND("04") - HAND("05") - HAND("06") - HAND("07") - HAND("08") - HAND("09") - HAND("10") - HAND("11") - HAND("12") - HAND("13") - HAND("14") - HAND("15") - HAND("16") - HAND("17") - HAND("18") - HAND("19") - HAND("20") - HAND("21") - HAND("22") - HAND("23") - HAND("24") - HAND("25") - HAND("26") - HAND("27") - HAND("28") - HAND("29") - HAND("30") - HAND("31") - HAND("32") - HAND("33") - HAND("34") - HAND("35") - HAND("36") - HAND("37") - HAND("38") - HAND("39") - HAND("40") - HAND("41") - HAND("42") - HAND("43") - HAND("44") - HAND("45") - HAND("46") - HAND("47") - HAND("48") - HAND("49") - HAND("50") - HAND("51") - HAND("52") - HAND("53") - HAND("54") - HAND("55") - HAND("56") - HAND("57") - HAND("58") - HAND("59") + description { \ + state: num 0.0; \ + inherit: "default" 0.0; \ + image { \ + normal: "clock_"IND"_"num".png"; \ + } \ + } + HAND("00") + HAND("01") + HAND("02") + HAND("03") + HAND("04") + HAND("05") + HAND("06") + HAND("07") + HAND("08") + HAND("09") + HAND("10") + HAND("11") + HAND("12") + HAND("13") + HAND("14") + HAND("15") + HAND("16") + HAND("17") + HAND("18") + HAND("19") + HAND("20") + HAND("21") + HAND("22") + HAND("23") + HAND("24") + HAND("25") + HAND("26") + HAND("27") + HAND("28") + HAND("29") + HAND("30") + HAND("31") + HAND("32") + HAND("33") + HAND("34") + HAND("35") + HAND("36") + HAND("37") + HAND("38") + HAND("39") + HAND("40") + HAND("41") + HAND("42") + HAND("43") + HAND("44") + HAND("45") + HAND("46") + HAND("47") + HAND("48") + HAND("49") + HAND("50") + HAND("51") + HAND("52") + HAND("53") + HAND("54") + HAND("55") + HAND("56") + HAND("57") + HAND("58") + HAND("59") } #ifdef IND # undef IND #endif #define IND "hour" part { - name: IND; - mouse_events: 0; - description { - state: "default" 0.0; - aspect: 1.0 1.0; - image { - normal: "clock_"IND"_00.png"; - } - } + name: IND; + mouse_events: 0; + description { + state: "default" 0.0; + aspect: 1.0 1.0; + image { + normal: "clock_"IND"_00.png"; + } + } #ifdef HAND # undef HAND #endif #define HAND(num) \ - description { \ - state: num 0.0; \ - inherit: "default" 0.0; \ - image { \ - normal: "clock_"IND"_"num".png"; \ - } \ - } - HAND("00") - HAND("01") - HAND("02") - HAND("03") - HAND("04") - HAND("05") - HAND("06") - HAND("07") - HAND("08") - HAND("09") - HAND("10") - HAND("11") - HAND("12") - HAND("13") - HAND("14") - HAND("15") - HAND("16") - HAND("17") - HAND("18") - HAND("19") - HAND("20") - HAND("21") - HAND("22") - HAND("23") - HAND("24") - HAND("25") - HAND("26") - HAND("27") - HAND("28") - HAND("29") - HAND("30") - HAND("31") - HAND("32") - HAND("33") - HAND("34") - HAND("35") - HAND("36") - HAND("37") - HAND("38") - HAND("39") - HAND("40") - HAND("41") - HAND("42") - HAND("43") - HAND("44") - HAND("45") - HAND("46") - HAND("47") - HAND("48") - HAND("49") - HAND("50") - HAND("51") - HAND("52") - HAND("53") - HAND("54") - HAND("55") - HAND("56") - HAND("57") - HAND("58") - HAND("59") + description { \ + state: num 0.0; \ + inherit: "default" 0.0; \ + image { \ + normal: "clock_"IND"_"num".png"; \ + } \ + } + HAND("00") + HAND("01") + HAND("02") + HAND("03") + HAND("04") + HAND("05") + HAND("06") + HAND("07") + HAND("08") + HAND("09") + HAND("10") + HAND("11") + HAND("12") + HAND("13") + HAND("14") + HAND("15") + HAND("16") + HAND("17") + HAND("18") + HAND("19") + HAND("20") + HAND("21") + HAND("22") + HAND("23") + HAND("24") + HAND("25") + HAND("26") + HAND("27") + HAND("28") + HAND("29") + HAND("30") + HAND("31") + HAND("32") + HAND("33") + HAND("34") + HAND("35") + HAND("36") + HAND("37") + HAND("38") + HAND("39") + HAND("40") + HAND("41") + HAND("42") + HAND("43") + HAND("44") + HAND("45") + HAND("46") + HAND("47") + HAND("48") + HAND("49") + HAND("50") + HAND("51") + HAND("52") + HAND("53") + HAND("54") + HAND("55") + HAND("56") + HAND("57") + HAND("58") + HAND("59") } part { - name: "main"; - mouse_events: 0; - description { - state: "default" 0.0; - rel1 { - to: "bg"; - } - rel2 { - to: "bg"; - } - image { - normal: "clock_fg.png"; - } - } + name: "main"; + mouse_events: 0; + description { + state: "default" 0.0; + rel1 { + to: "bg"; + } + rel2 { + to: "bg"; + } + image { + normal: "clock_fg.png"; + } + } } } programs { program { - name: "init"; - signal: "load"; - source: ""; - script { - clock_cb(0); - } + name: "init"; + signal: "load"; + source: ""; + script { + clock_cb(0); + } } } } group { name: "e/modules/clock/digital"; - min: 56 16; + min: 56 16; - script { - public do_seconds, do_24h, tick_timer; + script { + public do_seconds, do_24h, tick_timer; - public clock_cb(val) { - new year, month, day, yearday, weekday, hour, minute; - new Float:second; - new v, dosec, do24h, tim; - new buf[32], bhour[3], bminute[3], bsecond[4], bampm[3]; + public clock_cb(val) { + new year, month, day, yearday, weekday, hour, minute; + new Float:second; + new v, dosec, do24h, tim; + new buf[32], bhour[3], bminute[3], bsecond[4], bampm[3]; - date(year, month, day, yearday, weekday, hour, minute, second); + date(year, month, day, yearday, weekday, hour, minute, second); - dosec = get_int(do_seconds); - do24h = get_int(do_24h); + dosec = get_int(do_seconds); + do24h = get_int(do_24h); - if (do24h) { - strcat(bampm, ""); - if (hour < 10) - snprintf(bhour, sizeof(bhour), "0%d", hour); - else - snprintf(bhour, sizeof(bhour), "%d", hour); + if (do24h) { + strcat(bampm, ""); + if (hour < 10) + snprintf(bhour, sizeof(bhour), "0%d", hour); + else + snprintf(bhour, sizeof(bhour), "%d", hour); - } else { - v = hour % 12; + } else { + v = hour % 12; - if (hour >= 12) - strcat(bampm, "pm"); - else - strcat(bampm, "am"); + if (hour >= 12) + strcat(bampm, "pm"); + else + strcat(bampm, "am"); - if (v == 0) - v = 12; + if (v == 0) + v = 12; - snprintf(bhour, sizeof(bhour), "%d", v); - } + snprintf(bhour, sizeof(bhour), "%d", v); + } - if (minute < 10) - snprintf(bminute, sizeof(bminute), "0%d", minute); - else - snprintf(bminute, sizeof(bminute), "%d", minute); + if (minute < 10) + snprintf(bminute, sizeof(bminute), "0%d", minute); + else + snprintf(bminute, sizeof(bminute), "%d", minute); - if (dosec) { - v = round(second); - if (v < 10) - snprintf(bsecond, sizeof(bsecond), ":0%d", v); - else - snprintf(bsecond, sizeof(bsecond), ":%d", v); - } else - strcat(bsecond, ""); + if (dosec) { + v = round(second); + if (v < 10) + snprintf(bsecond, sizeof(bsecond), ":0%d", v); + else + snprintf(bsecond, sizeof(bsecond), ":%d", v); + } else + strcat(bsecond, ""); - snprintf(buf, sizeof(buf), "%s:%s%s%s", - bhour, bminute, bsecond, bampm); - set_text(PART:"time", buf); + snprintf(buf, sizeof(buf), "%s:%s%s%s", + bhour, bminute, bsecond, bampm); + set_text(PART:"time", buf); - if (dosec) { - v = round(second); - tim = timer(1.0 - (second - v), "clock_cb", 1); - } else { - tim = timer(60.0 - (second), "clock_cb", 1); - } - set_int(tick_timer, tim); - } + if (dosec) { + v = round(second); + tim = timer(1.0 - (second - v), "clock_cb", 1); + } else { + tim = timer(60.0 - (second), "clock_cb", 1); + } + set_int(tick_timer, tim); + } - public restart_clock() { - new tim; - tim = get_int(tick_timer); - if (tim) { - cancel_timer(tim); - set_int(tick_timer, 0); - } - clock_cb(0); - } - } + public restart_clock() { + new tim; + tim = get_int(tick_timer); + if (tim) { + cancel_timer(tim); + set_int(tick_timer, 0); + } + clock_cb(0); + } + } - parts { - part { name: "time"; - type: TEXT; - effect: SOFT_SHADOW; + parts { + part { name: "time"; + type: TEXT; + effect: SOFT_SHADOW; scale: 1; - description { state: "default" 0.0; - color: 255 255 255 255; - color3: DARKNESS_BLUE 170; - text { - text_class: "module_large"; - font: "Sans:style=Bold"; - size: 14; - fit: 1 1; - min: 1 1; - size_range: 9 72; - text: "--:--"; - } - } - } + description { state: "default" 0.0; + color: 255 255 255 255; + color3: DARKNESS_BLUE 170; + text { + text_class: "module_large"; + font: "Sans:style=Bold"; + size: 14; + fit: 1 1; + min: 1 1; + size_range: 9 72; + text: "--:--"; + } + } + } - part { name: "event"; - type: RECT; - mouse_events: 1; - description { state: "default" 0.0; - color: 0 0 0 0; - } - } - } + part { name: "event"; + type: RECT; + mouse_events: 1; + description { state: "default" 0.0; + color: 0 0 0 0; + } + } + } - programs { - program { name: "init"; - signal: "load"; - source: ""; - script { - clock_cb(0); - } - } - program { name: "secon"; - signal: "e,state,seconds,on"; - source: "e"; - script { - set_int(do_seconds, 1); - restart_clock(); - } - } - program { name: "secoff"; - signal: "e,state,seconds,off"; - source: "e"; - script { - set_int(do_seconds, 0); - restart_clock(); - } - } - program { name: "24h"; - signal: "e,state,24h,on"; - source: "e"; - script { - set_int(do_24h, 1); - restart_clock(); - } - } - program { name: "12h"; - signal: "e,state,24h,off"; - source: "e"; - script { - set_int(do_24h, 0); - restart_clock(); - } - } - } + programs { + program { name: "init"; + signal: "load"; + source: ""; + script { + clock_cb(0); + } + } + program { name: "secon"; + signal: "e,state,seconds,on"; + source: "e"; + script { + set_int(do_seconds, 1); + restart_clock(); + } + } + program { name: "secoff"; + signal: "e,state,seconds,off"; + source: "e"; + script { + set_int(do_seconds, 0); + restart_clock(); + } + } + program { name: "24h"; + signal: "e,state,24h,on"; + source: "e"; + script { + set_int(do_24h, 1); + restart_clock(); + } + } + program { name: "12h"; + signal: "e,state,24h,off"; + source: "e"; + script { + set_int(do_24h, 0); + restart_clock(); + } + } + } } Modified: trunk/THEMES/darkness/modules/cpu.edc =================================================================== --- trunk/THEMES/darkness/modules/cpu.edc 2012-07-03 07:44:17 UTC (rev 73206) +++ trunk/THEMES/darkness/modules/cpu.edc 2012-07-03 07:49:42 UTC (rev 73207) @@ -45,7 +45,7 @@ font: "Sans:style=Bold"; min: 1 1; align: 0.0 0.5; - text_class: "module_small"; + text_class: "module_small"; } } } Modified: trunk/THEMES/darkness/modules/cpufreq.edc =================================================================== --- trunk/THEMES/darkness/modules/cpufreq.edc 2012-07-03 07:44:17 UTC (rev 73206) +++ trunk/THEMES/darkness/modules/cpufreq.edc 2012-07-03 07:49:42 UTC (rev 73207) @@ -8,431 +8,431 @@ public available_governors; public message(Msg_Type:type, id, ...) { - if ((type == MSG_INT_SET) && (id == 1)) { - while (count(available_frequencies) > 0) { - remove(available_frequencies, 0); - } - for (new i = 2; i < numargs(); i++) { - append_int(available_frequencies, getarg(i)); - } - } else if ((type == MSG_STRING_SET) && (id == 2)) { - new text[100]; - - while (count(available_governors) > 0) { - remove(available_governors, 0); - } - - for (new i = 2; i < numargs(); i++) { - snprintf(text, 100, "%s", getarg(i)); - append_str(available_governors, text); - } - } else if ((type == MSG_INT_SET) && (id == 3)) { - new f = getarg(2); - new use_buttons = getarg(3); - new Float:freq, Float:min_freq, Float:max_freq; - new text[100]; - - freq = f; - min_freq = fetch_int(available_frequencies, 0); - max_freq = fetch_int(available_frequencies, - count(available_frequencies) - 1); - - freq = (freq - min_freq) / (max_freq - min_freq); - set_state(PART:"meter", "default", freq); - - if (f < 1000000) { - snprintf(text, 100, "%i Mhz", f / 1000); - } else { - snprintf(text, 100, "%i.%i Ghz", f / 1000000, - (f % 1000000) / 100000); - } - set_text(PART:"readout", text); - - if (use_buttons == 0) { - set_state(PART:"increase_button", "inactive", 0.0); - set_state(PART:"decrease_button", "inactive", 0.0); - set_state(PART:"increase", "inactive", 0.0); - set_state(PART:"decrease", "inactive", 0.0); - } else { - set_state(PART:"increase_button", "default", 0.0); - set_state(PART:"decrease_button", "default", 0.0); - set_state(PART:"increase", "default", 0.0); - set_state(PART:"decrease", "default", 0.0); - } - } else if((type == MSG_STRING) && (id == 4)) { - new text[100]; - snprintf(text, 100, "%s", getarg(2)); -/* - if (!strcmp(text, "performance") || !strcmp(text, "powersave") || - !strcmp(text, "userspace") || !strcmp(text, "ondemand")) { - set_state(PART:"governor", text, 0.0); - set_state(PART:"governorbackground", text, 0.0); - } else { - set_state(PART:"governor", "default", 0.0); - set_state(PART:"governorbackground", "default", 0.0); - } + if ((type == MSG_INT_SET) && (id == 1)) { + while (count(available_frequencies) > 0) { + remove(available_frequencies, 0); + } + for (new i = 2; i < numargs(); i++) { + append_int(available_frequencies, getarg(i)); + } + } else if ((type == MSG_STRING_SET) && (id == 2)) { + new text[100]; + + while (count(available_governors) > 0) { + remove(available_governors, 0); + } + + for (new i = 2; i < numargs(); i++) { + snprintf(text, 100, "%s", getarg(i)); + append_str(available_governors, text); + } + } else if ((type == MSG_INT_SET) && (id == 3)) { + new f = getarg(2); + new use_buttons = getarg(3); + new Float:freq, Float:min_freq, Float:max_freq; + new text[100]; + + freq = f; + min_freq = fetch_int(available_frequencies, 0); + max_freq = fetch_int(available_frequencies, + count(available_frequencies) - 1); + + freq = (freq - min_freq) / (max_freq - min_freq); + set_state(PART:"meter", "default", freq); + + if (f < 1000000) { + snprintf(text, 100, "%i Mhz", f / 1000); + } else { + snprintf(text, 100, "%i.%i Ghz", f / 1000000, + (f % 1000000) / 100000); + } + set_text(PART:"readout", text); + + if (use_buttons == 0) { + set_state(PART:"increase_button", "inactive", 0.0); + set_state(PART:"decrease_button", "inactive", 0.0); + set_state(PART:"increase", "inactive", 0.0); + set_state(PART:"decrease", "inactive", 0.0); + } else { + set_state(PART:"increase_button", "default", 0.0); + set_state(PART:"decrease_button", "default", 0.0); + set_state(PART:"increase", "default", 0.0); + set_state(PART:"decrease", "default", 0.0); + } + } else if((type == MSG_STRING) && (id == 4)) { + new text[100]; + snprintf(text, 100, "%s", getarg(2)); +/* + if (!strcmp(text, "performance") || !strcmp(text, "powersave") || + !strcmp(text, "userspace") || !strcmp(text, "ondemand")) { + set_state(PART:"governor", text, 0.0); + set_state(PART:"governorbackground", text, 0.0); + } else { + set_state(PART:"governor", "default", 0.0); + set_state(PART:"governorbackground", "default", 0.0); + } */ - } + } } } parts { part { - name: "meter"; - type: IMAGE; + name: "meter"; + type: IMAGE; clip_to: "fade_clip"; - mouse_events: 0; - - description { - state: "default" 0.0; - rel1 { - relative: 0.078125 0.0; - offset: 0 0; - } - rel2 { - relative: 0.921875 0.375; - offset: -1 -1; - } - image { - normal: "cpufreq_freq00.png"; - } - } - description { - state: "default" 0.1; - inherit: "default" 0.0; - image { - normal: "cpufreq_freq01.png"; - } - } - description { - state: "default" 0.2; - inherit: "default" 0.0; - image { - normal: "cpufreq_freq02.png"; - } - } - description { - state: "default" 0.3; - inherit: "default" 0.0; - image { - normal: "cpufreq_freq03.png"; - } - } - description { - state: "default" 0.4; - inherit: "default" 0.0; - image { - normal: "cpufreq_freq04.png"; - } - } - description { - state: "default" 0.5; - inherit: "default" 0.0; - image { - normal: "cpufreq_freq05.png"; - } - } - description { - state: "default" 0.6; - inherit: "default" 0.0; - image { - normal: "cpufreq_freq06.png"; - } - } - description { - state: "default" 0.7; - inherit: "default" 0.0; - image { - normal: "cpufreq_freq07.png"; - } - } - description { - state: "default" 0.8; - inherit: "default" 0.0; - image { - normal: "cpufreq_freq08.png"; - } - } - description { - state: "default" 0.9; - inherit: "default" 0.0; - image { - normal: "cpufreq_freq09.png"; - } - } - description { - state: "default" 1.00; - inherit: "default" 0.0; - image { - normal: "cpufreq_freq10.png"; - } - } + mouse_events: 0; + + description { + state: "default" 0.0; + rel1 { + relative: 0.078125 0.0; + offset: 0 0; + } + rel2 { + relative: 0.921875 0.375; + offset: -1 -1; + } + image { + normal: "cpufreq_freq00.png"; + } + } + description { + state: "default" 0.1; + inherit: "default" 0.0; + image { + normal: "cpufreq_freq01.png"; + } + } + description { + state: "default" 0.2; + inherit: "default" 0.0; + image { + normal: "cpufreq_freq02.png"; + } + } + description { + state: "default" 0.3; + inherit: "default" 0.0; + image { + normal: "cpufreq_freq03.png"; + } + } + description { + state: "default" 0.4; + inherit: "default" 0.0; + image { + normal: "cpufreq_freq04.png"; + } + } + description { + state: "default" 0.5; + inherit: "default" 0.0; + image { + normal: "cpufreq_freq05.png"; + } + } + description { + state: "default" 0.6; + inherit: "default" 0.0; + image { + normal: "cpufreq_freq06.png"; + } + } + description { + state: "default" 0.7; + inherit: "default" 0.0; + image { + normal: "cpufreq_freq07.png"; + } + } + description { + state: "default" 0.8; + inherit: "default" 0.0; + image { + normal: "cpufreq_freq08.png"; + } + } + description { + state: "default" 0.9; + inherit: "default" 0.0; + image { + normal: "cpufreq_freq09.png"; + } + } + description { + state: "default" 1.00; + inherit: "default" 0.0; + image { + normal: "cpufreq_freq10.png"; + } + } } part { - name: "decrease_button"; - type: IMAGE; - mouse_events: 1; + name: "decrease_button"; + type: IMAGE; + mouse_events: 1; clip_to: "fade_clip"; - - description { - state: "default" 0.0; - rel1 { - relative: 0.0 0.; - offset: 0 0; - } - rel2 { - relative: 1.0 0.375; - offset: -1 -1; - } - image { - normal: "cpufreq_decrease1.png"; - } - } - description { - state: "clicked" 0.0; - inherit: "default" 0.0; - image { - normal: "cpufreq_decrease2.png"; - } - } - description { - state: "inactive" 0.0; - inherit: "default" 0.0; - visible: 0; - } + + description { + state: "default" 0.0; + rel1 { + relative: 0.0 0.; + offset: 0 0; + } + rel2 { + relative: 1.0 0.375; + offset: -1 -1; + } + image { + normal: "cpufreq_decrease1.png"; + } + } + description { + state: "clicked" 0.0; + inherit: "default" 0.0; + image { + normal: "cpufreq_decrease2.png"; + } + } + description { + state: "inactive" 0.0; + inherit: "default" 0.0; + visible: 0; + } } part { - name: "increase_button"; - type: IMAGE; - mouse_events: 1; + name: "increase_button"; + type: IMAGE; + mouse_events: 1; clip_to: "fade_clip"; - - description { - state: "default" 0.0; - rel1 { - relative: 0.0 0.; - offset: 0 0; - } - rel2 { - relative: 1.0 0.375; - offset: -1 -1; - } - image { - normal: "cpufreq_increase1.png"; - } - } - description { - state: "clicked" 0.0; - inherit: "default" 0.0; - image { - normal: "cpufreq_increase2.png"; - } - } - description { - state: "inactive" 0.0; - inherit: "default" 0.0; - visible: 0; - } + + description { + state: "default" 0.0; + rel1 { + relative: 0.0 0.; + offset: 0 0; + } + rel2 { + relative: 1.0 0.375; + offset: -1 -1; + } + image { + normal: "cpufreq_increase1.png"; + } + } + description { + state: "clicked" 0.0; + inherit: "default" 0.0; + image { + normal: "cpufreq_increase2.png"; + } + } + description { + state: "inactive" 0.0; + inherit: "default" 0.0; + visible: 0; + } } part { - name: "cpu"; - type: IMAGE; - mouse_events: 1; + name: "cpu"; + type: IMAGE; + mouse_events: 1; clip_to: "fade_clip"; - description { - state: "default" 0.0; - rel1 { - relative: 0.1953125 0.3671875; - offset: 0 0; - } - rel2 { - relative: 0.8359375 1.0; - offset: -1 -1; - } - image { - normal: "cpufreq_cpu1.png"; - } - } - description { - state: "clicked" 0.0; - inherit: "default" 0.0; - image { - normal: "cpufreq_cpu2.png"; - } - } + description { + state: "default" 0.0; + rel1 { + relative: 0.1953125 0.3671875; + offset: 0 0; + } + rel2 { + relative: 0.8359375 1.0; + offset: -1 -1; + } + image { + normal: "cpufreq_cpu1.png"; + } + } + description { + state: "clicked" 0.0; + inherit: "default" 0.0; + image { + normal: "cpufreq_cpu2.png"; + } + } } part { - name: "readout"; - type: TEXT; - effect: SOFT_SHADOW; - mouse_events: 0; + name: "readout"; + type: TEXT; + effect: SOFT_SHADOW; + mouse_events: 0; scale: 1; clip_to: "fade_clip"; - description { - state: "default" 0.0; - rel1 { - relative: 0.5 0.7; - offset: 0 0; - } - rel2 { - relative: 0.5 0.7; - offset: 0 0; - } - color: 255 255 255 255; - color3: 0 0 0 32; - color_class: "cpufreq_label"; - text { - text: "??? Ghz"; - font: "Sans"; - size: 7; - align: 0.5 0.5; - min: 1 1; - text_class: "module_small"; - } - } + description { + state: "default" 0.0; + rel1 { + relative: 0.5 0.7; + offset: 0 0; + } + rel2 { + relative: 0.5 0.7; + offset: 0 0; + } + color: 255 255 255 255; + color3: 0 0 0 32; + color_class: "cpufreq_label"; + text { + text: "??? Ghz"; + font: "Sans"; + size: 7; + align: 0.5 0.5; + min: 1 1; + text_class: "module_small"; + } + } } part { - name: "decrease"; - type: RECT; + name: "decrease"; + type: RECT; clip_to: "fade_clip"; - description { - state: "default" 0.0; - visible: 1; - rel1 { - relative: 0.0 0.0; - offset: 0 0; - } - rel2 { - relative: 0.5 0.375; - offset: -1 -1; - } - color: 0 0 0 0; - } - description { - state: "inactive" 0.0; - inherit: "default" 0.0; - visible: 0; - } + description { + state: "default" 0.0; + visible: 1; + rel1 { + relative: 0.0 0.0; + offset: 0 0; + } + rel2 { + relative: 0.5 0.375; + offset: -1 -1; + } + color: 0 0 0 0; + } + description { + state: "inactive" 0.0; + inherit: "default" 0.0; + visible: 0; + } } part { - name: "increase"; - type: RECT; + name: "increase"; + type: RECT; clip_to: "fade_clip"; - description { - state: "default" 0.0; - visible: 1; - rel1 { - relative: 0.5 0.0; - offset: 0 0; - } - rel2 { - relative: 1.0 0.375; - offset: -1 -1; - } - color: 0 0 0 0; - } - description { - state: "inactive" 0.0; - inherit: "default" 0.0; - visible: 0; - } + description { + state: "default" 0.0; + visible: 1; + rel1 { + relative: 0.5 0.0; + offset: 0 0; + } + rel2 { + relative: 1.0 0.375; + offset: -1 -1; + } + color: 0 0 0 0; + } + description { + state: "inactive" 0.0; + inherit: "default" 0.0; + visible: 0; + } } part { - name: "fade_clip"; - type: RECT; - mouse_events: 0; - description { - state: "default" 0.0; - color: 255 255 255 255; - } - description { - state: "faded" 0.0; - color: 255 255 255 128; - } + name: "fade_clip"; + type: RECT; + mouse_events: 0; + description { + state: "default" 0.0; + color: 255 255 255 255; + } + description { + state: "faded" 0.0; + color: 255 255 255 128; + } } } /* end parts */ programs { program { - name: "next_governor"; - signal: "mouse,down,1"; - source: "cpu"; - action: SIGNAL_EMIT "next_governor" "governor"; + name: "next_governor"; + signal: "mouse,down,1"; + source: "cpu"; + action: SIGNAL_EMIT "next_governor" "governor"; } program { - name: "next_governor2"; - signal: "mouse,down,1"; - source: "cpu"; - action: STATE_SET "clicked" 0.0; - target: "cpu"; + name: "next_governor2"; + signal: "mouse,down,1"; + source: "cpu"; + action: STATE_SET "clicked" 0.0; + target: "cpu"; } program { - name: "next_governor3"; - signal: "mouse,up,1"; - source: "cpu"; - action: STATE_SET "default" 0.0; - target: "cpu"; + name: "next_governor3"; + signal: "mouse,up,1"; + source: "cpu"; + action: STATE_SET "default" 0.0; + target: "cpu"; } program { - name: "increase_frequency"; - signal: "mouse,down,1"; - source: "increase"; - action: SIGNAL_EMIT "increase_frequency" "frequency"; + name: "increase_frequency"; + signal: "mouse,down,1"; + source: "increase"; + action: SIGNAL_EMIT "increase_frequency" "frequency"; } program { - name: "increase_frequency2"; - signal: "mouse,down,1"; - source: "increase"; - action: STATE_SET "clicked" 0.0; - target: "increase_button"; + name: "increase_frequency2"; + signal: "mouse,down,1"; + source: "increase"; + action: STATE_SET "clicked" 0.0; + target: "increase_button"; } program { - name: "increase_frequency3"; - signal: "mouse,up,1"; - source: "increase"; - action: STATE_SET "default" 0.0; - target: "increase_button"; + name: "increase_frequency3"; + signal: "mouse,up,1"; + source: "increase"; + action: STATE_SET "default" 0.0; + target: "increase_button"; } program { - name: "decrease_frequency"; - signal: "mouse,down,1"; - source: "decrease"; - action: SIGNAL_EMIT "decrease_frequency" "frequency"; + name: "decrease_frequency"; + signal: "mouse,down,1"; + source: "decrease"; + action: SIGNAL_EMIT "decrease_frequency" "frequency"; } program { - name: "decrease_frequency2"; - signal: "mouse,down,1"; - source: "decrease"; - action: STATE_SET "clicked" 0.0; - target: "decrease_button"; + name: "decrease_frequency2"; + signal: "mouse,down,1"; + source: "decrease"; + action: STATE_SET "clicked" 0.0; + target: "decrease_button"; } program { - name: "decrease_frequency3"; - signal: "mouse,up,1"; - source: "decrease"; - action: STATE_SET "default" 0.0; - target: "decrease_button"; + name: "decrease_frequency3"; + signal: "mouse,up,1"; + source: "decrease"; + action: STATE_SET "default" 0.0;... [truncated message content] |
From: Enlightenment S. <no-...@en...> - 2012-07-11 09:28:40
|
Log: live pager previews for darkness Author: discomfitor Date: 2012-07-11 02:28:33 -0700 (Wed, 11 Jul 2012) New Revision: 73557 Trac: http://trac.enlightenment.org/e/changeset/73557 Modified: trunk/THEMES/darkness/modules/pager.edc Modified: trunk/THEMES/darkness/modules/pager.edc =================================================================== --- trunk/THEMES/darkness/modules/pager.edc 2012-07-11 09:26:37 UTC (rev 73556) +++ trunk/THEMES/darkness/modules/pager.edc 2012-07-11 09:28:33 UTC (rev 73557) @@ -202,9 +202,10 @@ group { name: "e/modules/pager/desk"; script { - public active; - public drag; - public urgent; + public active = 0; + public drag = 0; + public urgent = 0; + public disable_live_preview = 0; } parts { part { @@ -228,6 +229,46 @@ } } part { + name: "e.background"; + type: SWALLOW; + clip_to: "bg_clip"; + description { + state: "default" 0.0; + visible: 1; + color: 255 255 255 255; + rel1 { + to: "clip"; + offset: -1 -1; + } + rel2.to: "clip"; + } + description { + state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } + part { + name: "bg_clip"; + type: RECT; + description { + state: "default" 0.0; + color: 200 200 200 200; + rel1.to: "e.background"; + rel2.to: "e.background"; + } + description { + state: "active" 0.0; + inherit: "default" 0.0; + color: 255 255 255 255; + } + description { + state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } + part { name: "sel"; mouse_events: 0; description { @@ -248,7 +289,7 @@ state: "active" 0.0; inherit: "default" 0.0; visible: 1; - color: 255 255 255 255; + color: 255 255 255 200; } description { state: "urgent" 0.0; @@ -376,6 +417,30 @@ } } program { + name: "preview"; + signal: "e,preview,on"; + source: "e"; + script { + set_int(disable_live_preview, 0); + set_state(PART:"bg_clip", "default", 0.0); + set_state(PART:"e.background", "default", 0.0); + set_state(PART:"sel", "default", 0.0); + } + transition: LINEAR 0.3; + } + program { + name: "preview_off"; + signal: "e,preview,off"; + source: "e"; + script { + set_int(disable_live_preview, 1); + set_state(PART:"bg_clip", "hidden", 0.0); + set_state(PART:"e.background", "hidden", 0.0); + set_state(PART:"sel", "default", 0.0); + } + transition: LINEAR 0.3; + } + program { name: "drag_in"; signal: "drag"; source: "in"; @@ -401,16 +466,6 @@ } } program { - name: "init"; - signal: "load"; - source: ""; - script { - set_int(active, 0); - set_int(drag, 0); - set_int(urgent, 0); - } - } - program { name: "set_urgent"; signal: "e,state,urgent"; source: "e"; |
From: Enlightenment S. <no-...@en...> - 2012-07-11 11:40:43
|
Log: pager desk name display for darkness theme Author: discomfitor Date: 2012-07-11 04:40:37 -0700 (Wed, 11 Jul 2012) New Revision: 73565 Trac: http://trac.enlightenment.org/e/changeset/73565 Modified: trunk/THEMES/darkness/modules/pager.edc Modified: trunk/THEMES/darkness/modules/pager.edc =================================================================== --- trunk/THEMES/darkness/modules/pager.edc 2012-07-11 11:38:33 UTC (rev 73564) +++ trunk/THEMES/darkness/modules/pager.edc 2012-07-11 11:40:37 UTC (rev 73565) @@ -206,6 +206,8 @@ public drag = 0; public urgent = 0; public disable_live_preview = 0; + public mouse_in = 0; + public show_desk_names = 0; } parts { part { @@ -360,8 +362,8 @@ state: "default" 0.0; rel1.to: "clip"; rel2.to: "clip"; - color: 255 255 255 255; - color3: DARKNESS_BLUE 32; + visible: 0; + color: 0 0 0 128; text { font: "Sans:style=Bold"; size: 8; @@ -372,7 +374,9 @@ description { state: "active" 0.0; inherit: "default" 0.0; - color: 0 0 0 128; + visible: 1; + color: 255 255 255 255; + color3: DARKNESS_BLUE 32; } } } @@ -441,6 +445,48 @@ transition: LINEAR 0.3; } program { + name: "name_enable"; + signal: "e,name,show"; + source: "e"; + script { + set_int(show_desk_names, 1); + set_state(PART:"e.text.label", "active", 0.0); + } + } + program { + name: "name_disable"; + signal: "e,name,hide"; + source: "e"; + script { + set_int(show_desk_names, 0); + if (!get_int(mouse_in)) + set_state(PART:"e.text.label", "default", 0.0); + } + } + program { + name: "name_show"; + signal: "mouse,in"; + source: "overlay"; + script { + if (get_int(show_desk_names) != 1) + set_state(PART:"e.text.label", "active", 0.0); + set_int(mouse_in, 1); + } + transition: SINUSOIDAL 0.1; + } + program { + name: "name_hide"; + signal: "mouse,out"; + source: "overlay"; + script { + if (get_int(show_desk_names) != 1) + set_state(PART:"e.text.label", "default", 0.0); + set_int(mouse_in, 0); + } + + transition: SINUSOIDAL 0.2; + } + program { name: "drag_in"; signal: "drag"; source: "in"; |
From: Enlightenment S. <no-...@en...> - 2012-07-11 11:48:42
|
Log: darkness start gadget no longer looks horrible Author: discomfitor Date: 2012-07-11 04:48:32 -0700 (Wed, 11 Jul 2012) New Revision: 73566 Trac: http://trac.enlightenment.org/e/changeset/73566 Modified: trunk/THEMES/darkness/modules/start.edc Modified: trunk/THEMES/darkness/modules/start.edc =================================================================== --- trunk/THEMES/darkness/modules/start.edc 2012-07-11 11:40:37 UTC (rev 73565) +++ trunk/THEMES/darkness/modules/start.edc 2012-07-11 11:48:32 UTC (rev 73566) @@ -12,17 +12,18 @@ mouse_events: 0; description { state: "default" 0.0; - visible: 1; + visible: 0; image { normal: "titlebar.png"; border: 8 8 8 8; } - color: 255 255 255 200; + color: 255 255 255 0; } description { state: "active" 0.0; inherit: "default" 0.0; color: 255 255 255 255; + visible: 1; } } @@ -42,7 +43,7 @@ image { normal: "logo.png"; } - color: 255 255 255 50; + color: 255 255 255 125; } description { state: "active" 0.0; |
From: Enlightenment S. <no-...@en...> - 2012-07-11 18:13:40
|
Log: pager live windows for darkness Author: discomfitor Date: 2012-07-11 11:13:29 -0700 (Wed, 11 Jul 2012) New Revision: 73589 Trac: http://trac.enlightenment.org/e/changeset/73589 Modified: trunk/THEMES/darkness/modules/pager.edc Modified: trunk/THEMES/darkness/modules/pager.edc =================================================================== --- trunk/THEMES/darkness/modules/pager.edc 2012-07-11 17:59:10 UTC (rev 73588) +++ trunk/THEMES/darkness/modules/pager.edc 2012-07-11 18:13:29 UTC (rev 73589) @@ -574,6 +574,9 @@ group { name: "e/modules/pager/window"; + script { + public live_windows = 0; + } parts { part { name: "overlay"; @@ -622,6 +625,7 @@ type: SWALLOW; description { state: "default" 0.0; + visible: 1; align: 1.0 1.0; max: 24 24; aspect: 1.0 1.0; @@ -657,32 +661,99 @@ offset: 1 -2; } } + description { + state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } } + part { + name: "e.swallow.content"; + type: SWALLOW; + mouse_events: 0; + description { + state: "default" 0.0; + visible: 1; + rel1 { + to: "overlay"; + offset: 2 2; + } + rel2 { + to: "overlay"; + offset: -3 -3; + } + } + description { + state: "urgent" 0.0; + inherit: "default" 0.0; + rel1 { + to: "overlay"; + relative: -0.2 -0.2; + offset: -2 5; + } + rel2 { + to: "overlay"; + relative: 1.2 1.2; + offset: -5 -2; + } + } + description { + state: "urgent2" 0.0; + inherit: "default" 0.0; + rel1 { + to: "overlay"; + relative: -0.2 -0.2; + offset: 4 5; + } + rel2 { + to: "overlay"; + relative: 1.2 1.2; + offset: 1 -2; + } + } + description { + state: "hidden" 0.0; + inherit: "default" 0.0; + visible: 0; + } + } } programs { program { name: "go_urgent_pre"; signal: "e,state,urgent"; source: "e"; - action: STATE_SET "default" 0.0; - target: "overlay"; - target: "e.swallow.icon"; + script { + if (get_int(live_windows) == 1) + set_state(PART:"e.swallow.content", "default", 0.0); + else + set_state(PART:"e.swallow.icon", "default", 0.0); + set_state(PART:"overlay", "default", 0.0); + } after: "go_urgent"; } program { name: "go_urgent"; - action: STATE_SET "urgent" 0.0; transition: SINUSOIDAL 0.07; - target: "overlay"; - target: "e.swallow.icon"; + script { + if (get_int(live_windows) == 1) + set_state(PART:"e.swallow.content", "urgent", 0.0); + else + set_state(PART:"e.swallow.icon", "urgent", 0.0); + set_state(PART:"overlay", "urgent", 0.0); + } after: "go_urgent2"; } program { name: "go_urgent2"; - action: STATE_SET "urgent2" 0.0; transition: SINUSOIDAL 0.07; - target: "overlay"; - target: "e.swallow.icon"; + script { + if (get_int(live_windows) == 1) + set_state(PART:"e.swallow.content", "urgent2", 0.0); + else + set_state(PART:"e.swallow.icon", "urgent2", 0.0); + set_state(PART:"overlay", "urgent2", 0.0); + } after: "go_urgent"; } program { @@ -696,11 +767,35 @@ } program { name: "go_unurgent2"; - action: STATE_SET "default" 0.0; transition: SINUSOIDAL 0.3; - target: "overlay"; - target: "e.swallow.icon"; + script { + if (get_int(live_windows) == 1) + set_state(PART:"e.swallow.content", "default", 0.0); + else + set_state(PART:"e.swallow.icon", "default", 0.0); + set_state(PART:"overlay", "default", 0.0); + } } + program { + name: "preview"; + signal: "e,preview,on"; + source: "e"; + script { + set_int(live_windows, 1); + set_state(PART:"e.swallow.content", "default", 0.0); + set_state(PART:"e.swallow.icon", "hidden", 0.0); + } + } + program { + name: "preview_off"; + signal: "e,preview,off"; + source: "e"; + script { + set_int(live_windows, 0); + set_state(PART:"e.swallow.content", "hidden", 0.0); + set_state(PART:"e.swallow.icon", "default", 0.0); + } + } } } |