From 0f615122e585edf872d189d5ab7f09297d8748b7 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Sun, 6 Oct 2013 20:42:37 +0900 Subject: [PATCH] theme - sync stripe imagery with dark in e17/elm theme and remove the pulse --- data/themes/default.edc | 201 +------------------------------ data/themes/images/sl_stripe.png | Bin 322 -> 1024 bytes 2 files changed, 4 insertions(+), 197 deletions(-) diff --git a/data/themes/default.edc b/data/themes/default.edc index eb5c0308..5900d67f 100644 --- a/data/themes/default.edc +++ b/data/themes/default.edc @@ -1394,10 +1394,8 @@ collections { // bottomfull: // | ######| // |##############| -#define PATCOL 51 153 255 128 -#define PATCOL2 51 153 255 144 +#define PATCOL 255 255 255 25 #define OUTCOL 51 153 255 128 -#define OUTCOL2 51 153 255 255 group { name: "terminology/selection"; images { @@ -1419,11 +1417,7 @@ collections { color: PATCOL; image.normal: "sl_stripe.png"; fill.size.relative: 0.0 0.0; - fill.size.offset: 40 40; - } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: PATCOL2; + fill.size.offset: 240 240; } } part { name: "background_middle"; @@ -1433,11 +1427,7 @@ collections { color: PATCOL; image.normal: "sl_stripe.png"; fill.size.relative: 0.0 0.0; - fill.size.offset: 40 40; - } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: PATCOL2; + fill.size.offset: 240 240; } } part { name: "background_bottom"; @@ -1447,11 +1437,7 @@ collections { color: PATCOL; image.normal: "sl_stripe.png"; fill.size.relative: 0.0 0.0; - fill.size.offset: 40 40; - } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: PATCOL2; + fill.size.offset: 240 240; } } @@ -1564,10 +1550,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.border: 0 0 4 4; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "0.right"; mouse_events: 0; @@ -1588,10 +1570,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.border: 0 0 4 4; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "0.top"; mouse_events: 0; @@ -1611,10 +1589,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.normal: "sl_htop.png"; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "0.bottom"; mouse_events: 0; @@ -1634,10 +1608,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.normal: "sl_hbottom.png"; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } program { name: "oneline"; signal: "mode,oneline"; @@ -1668,10 +1638,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.border: 0 0 4 4; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "1.right"; mouse_events: 0; @@ -1692,10 +1658,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.border: 0 0 4 4; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "1.top"; mouse_events: 0; @@ -1715,10 +1677,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.normal: "sl_htop.png"; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "1.bottom"; mouse_events: 0; @@ -1738,10 +1696,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.normal: "sl_hbottom.png"; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "1.left2"; mouse_events: 0; @@ -1761,10 +1715,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.border: 0 0 4 4; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "1.right2"; mouse_events: 0; @@ -1785,10 +1735,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.border: 0 0 4 4; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "1.top2"; mouse_events: 0; @@ -1808,10 +1754,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.normal: "sl_htop.png"; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "1.bottom2"; mouse_events: 0; @@ -1831,10 +1773,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.normal: "sl_hbottom.png"; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } program { name: "disjoint"; signal: "mode,disjoint"; @@ -1864,10 +1802,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.normal: "sl_top.png"; image.border: 0 0 4 7; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "2.bottomkink"; mouse_events: 0; @@ -1887,10 +1821,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.normal: "sl_bottom.png"; image.border: 0 0 7 4; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "2.left"; mouse_events: 0; @@ -1910,10 +1840,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.border: 0 0 4 4; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "2.right"; mouse_events: 0; @@ -1933,10 +1859,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.border: 0 0 4 4; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "2.top"; mouse_events: 0; @@ -1956,10 +1878,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.normal: "sl_htop.png"; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "2.top2"; mouse_events: 0; @@ -1979,10 +1897,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.normal: "sl_htop.png"; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "2.bottom"; mouse_events: 0; @@ -2002,10 +1916,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.normal: "sl_hbottom.png"; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "2.bottom2"; mouse_events: 0; @@ -2025,10 +1935,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.normal: "sl_hbottom.png"; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } program { name: "multiline"; signal: "mode,multiline"; @@ -2058,10 +1964,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.normal: "sl_bottom.png"; image.border: 0 0 7 4; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "3.left"; mouse_events: 0; @@ -2081,10 +1983,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.border: 0 0 4 4; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "3.right"; mouse_events: 0; @@ -2104,10 +2002,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.border: 0 0 4 4; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "3.top"; mouse_events: 0; @@ -2127,10 +2021,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.normal: "sl_htop.png"; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "3.bottom"; mouse_events: 0; @@ -2150,10 +2040,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.normal: "sl_hbottom.png"; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "3.bottom2"; mouse_events: 0; @@ -2173,10 +2059,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.normal: "sl_hbottom.png"; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } program { name: "topfull"; signal: "mode,topfull"; @@ -2206,10 +2088,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.normal: "sl_top.png"; image.border: 0 0 4 7; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "4.left"; mouse_events: 0; @@ -2229,10 +2107,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.border: 0 0 4 4; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "4.right"; mouse_events: 0; @@ -2251,10 +2125,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.border: 0 0 4 4; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "4.top"; mouse_events: 0; @@ -2274,10 +2144,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.normal: "sl_htop.png"; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "4.top2"; mouse_events: 0; @@ -2297,10 +2163,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.normal: "sl_htop.png"; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } part { name: "4.bottom"; mouse_events: 0; @@ -2320,10 +2182,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: image.normal: "sl_hbottom.png"; fill.smooth: 0; } - description { state: "pulse" 0.0; - inherit: "default" 0.0; - color: OUTCOL2; - } } program { signal: "mode,bottomfull"; source: "terminology"; @@ -2331,57 +2189,6 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target: TARGETS; } -#define SELPULSE \ -target: "background_top"; \ -target: "background_middle"; \ -target: "background_bottom"; \ -target: "0.left"; \ -target: "0.right"; \ -target: "0.top"; \ -target: "0.bottom"; \ -target: "1.left"; \ -target: "1.right"; \ -target: "1.top"; \ -target: "1.bottom"; \ -target: "1.left2"; \ -target: "1.right2"; \ -target: "1.top2"; \ -target: "1.bottom2"; \ -target: "2.topkink"; \ -target: "2.bottomkink"; \ -target: "2.left"; \ -target: "2.right"; \ -target: "2.top2"; \ -target: "2.top"; \ -target: "2.bottom"; \ -target: "2.bottom2"; \ -target: "3.bottomkink"; \ -target: "3.left"; \ -target: "3.right"; \ -target: "3.top"; \ -target: "3.bottom"; \ -target: "3.bottom2"; \ -target: "4.topkink"; \ -target: "4.left"; \ -target: "4.right"; \ -target: "4.top2"; \ -target: "4.top"; \ -target: "4.bottom" - - program { name: "selpulse"; - signal: "show"; source: ""; - action: STATE_SET "pulse" 0.0; - transition: SINUSOIDAL 0.5; - SELPULSE; - after: "selpulse2"; - } - program { name: "selpulse2"; - action: STATE_SET "default" 0.0; - transition: SINUSOIDAL 1.0; - SELPULSE; - after: "selpulse"; - } - // top and bottom swallows used to coimmunicate via min/max size the // size of the top and bottom lines part { name: "terminology.top_left"; type: SWALLOW; diff --git a/data/themes/images/sl_stripe.png b/data/themes/images/sl_stripe.png index f1ca571b671efed6423bddc30fef735db51f4e91..afa982a40aef4660c3beb38c2a51c33d2dd9eac1 100644 GIT binary patch literal 1024 zcmeAS@N?(olHy`uVBq!ia0vp^A3&Ic2}o`hQ1?#dvKsZL(up_)t9O5al2vcyZ#7bq0GN+f9MgiE2JT$!(@ z9_9iGhjMAghAy43Eia?{!X&L$lcf-qFwNn7+92T&%_SwFQ=M+@TBz&fy-MWL6o^Wg z<~YkW4nSeJ*=^f6KrR4U2T}>sJnAq+aF2!QL70(Y)*K0-AbW|YuPgfs0*}i@`$@kemI`}$ zXO;*p6?%VkVv)y|>cj1pOv;Ik4>gU;6PVaHFgjl{wQJ^Ipsne;t5smZ2^gFABik8}BQIi=!hcbA&`njxgN@xNAeKc;k