summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2018-03-13 18:58:41 +0100
committerBoris Faure <billiob@gmail.com>2018-03-13 18:58:41 +0100
commitdad9e0db58856f1ce392fe1899710c766d7aacc4 (patch)
tree4a28c81e666954cd071c9a02e3d7073bdc85955a /data
parente8214d1da290c184a4ac40b6375ac1630e1bcda1 (diff)
remove compatibility #ifs to work with EFL < 1.16
Diffstat (limited to 'data')
-rw-r--r--data/themes/default.edc36
-rw-r--r--data/themes/mild.edc10
2 files changed, 0 insertions, 46 deletions
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 715f931..89fc7bc 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -1212,12 +1212,10 @@ collections {
1212 target: "shine_unfocused"; 1212 target: "shine_unfocused";
1213 target: "shine_focused"; 1213 target: "shine_focused";
1214 after: "focus_in2"; 1214 after: "focus_in2";
1215#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
1216 sequence { 1215 sequence {
1217 action: STATE_SET "custom" 0.0; 1216 action: STATE_SET "custom" 0.0;
1218 target: "shine_focused"; 1217 target: "shine_focused";
1219 } 1218 }
1220#endif
1221 } 1219 }
1222 program { 1220 program {
1223 signal: "focused,set"; source: "terminology"; 1221 signal: "focused,set"; source: "terminology";
@@ -1225,7 +1223,6 @@ collections {
1225 target: "glint"; 1223 target: "glint";
1226 target: "shine_focused"; 1224 target: "shine_focused";
1227 target: "shine_unfocused"; 1225 target: "shine_unfocused";
1228#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
1229 sequence { 1226 sequence {
1230 action: STATE_SET "focused2" 0.0; 1227 action: STATE_SET "focused2" 0.0;
1231 target: "glow"; 1228 target: "glow";
@@ -1234,7 +1231,6 @@ collections {
1234 action: STATE_SET "custom" 0.0; 1231 action: STATE_SET "custom" 0.0;
1235 target: "shine_focused"; 1232 target: "shine_focused";
1236 } 1233 }
1237#endif
1238 } 1234 }
1239 program { name: "focus_in2"; 1235 program { name: "focus_in2";
1240 action: STATE_SET "focused2" 0.0; 1236 action: STATE_SET "focused2" 0.0;
@@ -1248,7 +1244,6 @@ collections {
1248 target: "glow"; 1244 target: "glow";
1249 target: "shine_focused"; 1245 target: "shine_focused";
1250 target: "shine_unfocused"; 1246 target: "shine_unfocused";
1251#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
1252 sequence { 1247 sequence {
1253 action: STATE_SET "focused2" 0.0; 1248 action: STATE_SET "focused2" 0.0;
1254 target: "glow"; 1249 target: "glow";
@@ -1257,7 +1252,6 @@ collections {
1257 action: STATE_SET "custom" 0.0; 1252 action: STATE_SET "custom" 0.0;
1258 target: "shine_unfocused"; 1253 target: "shine_unfocused";
1259 } 1254 }
1260#endif
1261 } 1255 }
1262 1256
1263 //////////////////////////////////////////////////////////////////// 1257 ////////////////////////////////////////////////////////////////////
@@ -1578,11 +1572,7 @@ collections {
1578 } 1572 }
1579 program { 1573 program {
1580 signal: "bell,ring"; source: "terminology"; 1574 signal: "bell,ring"; source: "terminology";
1581#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
1582 action: PLAY_SAMPLE "bell" 1.0 ALERT; 1575 action: PLAY_SAMPLE "bell" 1.0 ALERT;
1583#else
1584 action: PLAY_SAMPLE "bell" 1.0;
1585#endif
1586 } 1576 }
1587 program { 1577 program {
1588 signal: "bell"; source: "terminology"; 1578 signal: "bell"; source: "terminology";
@@ -3583,51 +3573,25 @@ target: "0.clip"; target: "1.clip"; target: "2.clip"; target: "3.clip"; target:
3583 program { 3573 program {
3584 signal: "key,down"; source: "terminology"; 3574 signal: "key,down"; source: "terminology";
3585 script { 3575 script {
3586#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 8)
3587 new buf[32]; 3576 new buf[32];
3588 snprintf(buf, 31, "key-down%i", (rand() % 5) + 1); 3577 snprintf(buf, 31, "key-down%i", (rand() % 5) + 1);
3589 run_program(get_program_id(buf)); 3578 run_program(get_program_id(buf));
3590#else
3591 run_program(PROGRAM:"key-down4"); // chosen by a fair dice roll
3592 // guaranteed to be random.
3593 // http://xkcd.com/221/
3594#endif
3595 } 3579 }
3596 } 3580 }
3597 program { name: "key-down1"; 3581 program { name: "key-down1";
3598#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
3599 action: PLAY_SAMPLE "key-tap1" 1.0 INPUT; 3582 action: PLAY_SAMPLE "key-tap1" 1.0 INPUT;
3600#else
3601 action: PLAY_SAMPLE "key-tap1" 1.0;
3602#endif
3603 } 3583 }
3604 program { name: "key-down2"; 3584 program { name: "key-down2";
3605#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
3606 action: PLAY_SAMPLE "key-tap2" 1.0 INPUT; 3585 action: PLAY_SAMPLE "key-tap2" 1.0 INPUT;
3607#else
3608 action: PLAY_SAMPLE "key-tap2" 1.0;
3609#endif
3610 } 3586 }
3611 program { name: "key-down3"; 3587 program { name: "key-down3";
3612#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
3613 action: PLAY_SAMPLE "key-tap3" 1.0 INPUT; 3588 action: PLAY_SAMPLE "key-tap3" 1.0 INPUT;
3614#else
3615 action: PLAY_SAMPLE "key-tap3" 1.0;
3616#endif
3617 } 3589 }
3618 program { name: "key-down4"; 3590 program { name: "key-down4";
3619#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
3620 action: PLAY_SAMPLE "key-tap4" 1.0 INPUT; 3591 action: PLAY_SAMPLE "key-tap4" 1.0 INPUT;
3621#else
3622 action: PLAY_SAMPLE "key-tap4" 1.0;
3623#endif
3624 } 3592 }
3625 program { name: "key-down5"; 3593 program { name: "key-down5";
3626#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
3627 action: PLAY_SAMPLE "key-tap5" 1.0 INPUT; 3594 action: PLAY_SAMPLE "key-tap5" 1.0 INPUT;
3628#else
3629 action: PLAY_SAMPLE "key-tap5" 1.0;
3630#endif
3631 } 3595 }
3632 program { 3596 program {
3633 signal: "key,down"; source: "terminology"; 3597 signal: "key,down"; source: "terminology";
diff --git a/data/themes/mild.edc b/data/themes/mild.edc
index bf3a672..4a51c4b 100644
--- a/data/themes/mild.edc
+++ b/data/themes/mild.edc
@@ -217,11 +217,7 @@ collections {
217 } 217 }
218 program { 218 program {
219 signal: "bell,ring"; source: "terminology"; 219 signal: "bell,ring"; source: "terminology";
220#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 9)
221 action: PLAY_SAMPLE "bell" 1.0 ALERT; 220 action: PLAY_SAMPLE "bell" 1.0 ALERT;
222#else
223 action: PLAY_SAMPLE "bell" 1.0;
224#endif
225 } 221 }
226 program { 222 program {
227 signal: "bell"; 223 signal: "bell";
@@ -1658,15 +1654,9 @@ collections {
1658 program { 1654 program {
1659 signal: "key,down"; source: "terminology"; 1655 signal: "key,down"; source: "terminology";
1660 script { 1656 script {
1661#if (EFL_VERSION_MAJOR > 1) || (EFL_VERSION_MINOR >= 8)
1662 new buf[32]; 1657 new buf[32];
1663 snprintf(buf, 31, "key-down%i", (rand() % 5) + 1); 1658 snprintf(buf, 31, "key-down%i", (rand() % 5) + 1);
1664 run_program(get_program_id(buf)); 1659 run_program(get_program_id(buf));
1665#else
1666 run_program(PROGRAM:"key-down4"); // chosen by a fair dice roll
1667 // guaranteed to be random.
1668 // http://xkcd.com/221/
1669#endif
1670 } 1660 }
1671 } 1661 }
1672 program { name: "key-down1"; 1662 program { name: "key-down1";