TH - streamline some formatting/naming to be more minimal

2 files changed, 38 insertions, 78 deletions

diff --git a/data/elementary/themes/edc/comp.edc b/data/elementary/themes/edc/comp.edc
index dda8dcf379..5ab902f818 100644
--- a/data/elementary/themes/edc/comp.edc
+++ b/data/elementary/themes/edc/comp.edc
@@ -86,9 +86,7 @@ group { name: "e/comp/screen/overlay/default";
       }
    }
    programs {
-         program {
-            name: "screensaver_on";
-            signal: "e,state,screensaver,on"; source: "e";
+         program { signal: "e,state,screensaver,on"; source: "e";
             action: STATE_SET "visible" 0.0;
             transition: ACCELERATE 3.0 USE_DURATION_FACTOR 1 CURRENT;
             target: "blanker";
@@ -96,30 +94,22 @@ group { name: "e/comp/screen/overlay/default";
                action: SIGNAL_EMIT "e,state,screensaver,active" "e";
             }
          }
-         program {
-            name: "screensaver_on2";
-            signal: "e,state,screensaver,on"; source: "e";
+         program { signal: "e,state,screensaver,on"; source: "e";
             action: STATE_SET "visible" 0.0;
             transition: DECELERATE 3.0 USE_DURATION_FACTOR 1 CURRENT;
             target: "shadow";
          }
-         program {
-            name: "screensaver_off";
-            signal: "e,state,screensaver,off"; source: "e";
+         program { signal: "e,state,screensaver,off"; source: "e";
             action: STATE_SET "default" 0.0;
             transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
             target: "blanker";
          }
-         program {
-            name: "screensaver_off2";
-            signal: "e,state,screensaver,off"; source: "e";
+         program { signal: "e,state,screensaver,off"; source: "e";
             action: STATE_SET "default" 0.0;
             transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
             target: "shadow";
          }
-         program {
-            name: "suspend";
-            signal: "e,state,sys,suspend"; source: "e";
+         program { signal: "e,state,sys,suspend"; source: "e";
             action: STATE_SET "visible" 0.0;
             transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
             target: "suspender";
@@ -127,9 +117,7 @@ group { name: "e/comp/screen/overlay/default";
                action: SIGNAL_EMIT "e,state,sys,suspend,done" "e";
             }
          }
-         program {
-            name: "hibernate";
-            signal: "e,state,sys,hibernate"; source: "e";
+         program { signal: "e,state,sys,hibernate"; source: "e";
             action: STATE_SET "visible" 0.0;
             transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
             target: "suspender";
@@ -137,16 +125,12 @@ group { name: "e/comp/screen/overlay/default";
                action: SIGNAL_EMIT "e,state,sys,hibernate,done" "e";
             }
          }
-         program {
-            name: "resume";
-            signal: "e,state,sys,resume"; source: "e";
+         program { signal: "e,state,sys,resume"; source: "e";
             action: STATE_SET "default" 0.0;
             transition: DECELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
             target: "suspender";
          }
-         program {
-            name: "reboot";
-            signal: "e,state,sys,reboot"; source: "e";
+         program { signal: "e,state,sys,reboot"; source: "e";
             action: STATE_SET "visible" 0.0;
             transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
             target: "suspender";
@@ -154,9 +138,7 @@ group { name: "e/comp/screen/overlay/default";
                 action: SIGNAL_EMIT "e,state,sys,reboot,done" "e";
             }
          }
-         program {
-            name: "halt";
-            signal: "e,state,sys,halt"; source: "e";
+         program { signal: "e,state,sys,halt"; source: "e";
             action: STATE_SET "visible" 0.0;
             transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
             target: "suspender";
@@ -164,9 +146,7 @@ group { name: "e/comp/screen/overlay/default";
                 action: SIGNAL_EMIT "e,state,sys,halt,done" "e";
             }
          }
-         program {
-            name: "logout";
-            signal: "e,state,sys,logout"; source: "e";
+         program { signal: "e,state,sys,logout"; source: "e";
             action: STATE_SET "visible" 0.0;
             transition: ACCELERATE 0.5 USE_DURATION_FACTOR 1 CURRENT;
             target: "suspender";
@@ -272,18 +252,15 @@ group { name: "e/comp/frame/default";
       }
    }
    programs {
-       program {
-         signal: "e,state,shadow,on"; source: "e";
+       program { signal: "e,state,shadow,on"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "shadow";
       }
-      program {
-         signal: "e,state,shadow,off"; source: "e";
+      program { signal: "e,state,shadow,off"; source: "e";
          action: STATE_SET "hidden" 0.0;
          target: "shadow";
       }
-      program {
-         name: "visible_on";
+      program { name: "visible_on";
          signal: "e,state,visible"; source: "e";
          action: STATE_SET "visible" 0.0;
          transition: DECELERATE 0.15 USE_DURATION_FACTOR 1;
@@ -292,18 +269,15 @@ group { name: "e/comp/frame/default";
              action: SIGNAL_EMIT "e,action,show,done" "e";
          }
       }
-      program {
-         signal: "e,state,visible"; source: "e";
+      program { signal: "e,state,visible"; source: "e";
          action: ACTION_STOP;
          target: "visible_off";
       }
-      program {
-         signal: "e,state,hidden"; source: "e";
+      program { signal: "e,state,hidden"; source: "e";
          action: ACTION_STOP;
          target: "visible_on";
       }
-      program {
-         name: "visible_off";
+      program { name: "visible_off";
          signal: "e,state,hidden"; source: "e";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.30 USE_DURATION_FACTOR 1;
@@ -393,14 +367,12 @@ group { name: "e/comp/frame/rotate";
       }
    }
    programs {
-      program { name: "focus3";
-         signal: "e,state,focused"; source: "e";
+      program { signal: "e,state,focused"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "e.swallow.content";
          transition: LINEAR 0.3 USE_DURATION_FACTOR 1;
       }
-      program { name: "focus_off3";
-         signal: "e,state,unfocused"; source: "e";
+      program { signal: "e,state,unfocused"; source: "e";
          action: STATE_SET "focus-out" 0.0;
          target: "e.swallow.content";
          transition: LINEAR 0.3 USE_DURATION_FACTOR 1;
@@ -455,12 +427,10 @@ group { name: "e/comp/frame/none";
       }
    }
    programs {
-      program {
-         signal: "e,state,visible"; source: "e";
+      program { signal: "e,state,visible"; source: "e";
          action: SIGNAL_EMIT "e,action,show,done" "e";
       }
-      program {
-         signal: "e,state,hidden"; source: "e";
+      program { signal: "e,state,hidden"; source: "e";
          action: SIGNAL_EMIT "e,action,hide,done" "e";
       }
    }
@@ -620,15 +590,13 @@ group { name: "e/comp/frame/fullscreen";
       }
    }
    programs {
-      program {
-         name: "visible_on";
+      program { name: "visible_on";
          signal: "e,state,visible"; source: "e";
          action: STATE_SET "visible" 0.0;
          transition: DECELERATE 0.25 USE_DURATION_FACTOR 1;
          targets: "scr_shadow" "scr_shade";
       }
-      program {
-         name: "visible_on2";
+      program { name: "visible_on2";
          signal: "e,state,visible"; source: "e";
          action: STATE_SET "visible1" 0.0;
          transition: DECELERATE 0.05 USE_DURATION_FACTOR 1;
@@ -640,25 +608,21 @@ group { name: "e/comp/frame/fullscreen";
              action: SIGNAL_EMIT "e,action,show,done" "e";
          }
       }
-      program {
-         signal: "e,state,visible"; source: "e";
+      program { signal: "e,state,visible"; source: "e";
          action: ACTION_STOP;
          targets: "visible_off" "visible_off2";
       }
-      program {
-         signal: "e,state,hidden"; source: "e";
+      program { signal: "e,state,hidden"; source: "e";
          action: ACTION_STOP;
          targets: "visible_on" "visible_on2";
       }
-      program {
-         name: "visible_off";
+      program { name: "visible_off";
          signal: "e,state,hidden"; source: "e";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.25 USE_DURATION_FACTOR 1;
          targets: "scr_shadow" "scr_shade";
       }
-      program {
-         name: "visible_off2";
+      program { name: "visible_off2";
          signal: "e,state,hidden"; source: "e";
          action: STATE_SET "visible1" 0.0;
          transition: DECELERATE 0.2 USE_DURATION_FACTOR 1;
diff --git a/data/elementary/themes/edc/desklock.edc b/data/elementary/themes/edc/desklock.edc
index 7bd51fc376..de63eeb5fd 100644
--- a/data/elementary/themes/edc/desklock.edc
+++ b/data/elementary/themes/edc/desklock.edc
@@ -195,26 +195,24 @@ group { name: "e/desklock/login_box";
          target: "cursor";
          after: "cursor_show_timer";
       }
+      program { name: "cursor_show_timer";
+         in: 0.4 0.0;
+         after: "cursor_hide";
+      }
       program { name: "cursor_hide";
          action: STATE_SET "default" 0.0;
          target: "cursor";
          after: "cursor_hide_timer";
       }
-      program { name: "cursor_show_timer";
-         in: 0.4 0.0;
-         after: "cursor_hide";
-      }
       program { name: "cursor_hide_timer";
          in: 0.4 0.0;
          after: "cursor_show";
       }
-      program {
-         signal: "e,state,selected"; source: "e";
+      program { signal: "e,state,selected"; source: "e";
          action: STATE_SET "active" 0.0;
          target: "selection";
       }
-      program {
-         signal: "e,state,unselected"; source: "e";
+      program { signal: "e,state,unselected"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "selection";
       }
@@ -316,27 +314,25 @@ group { name: "e/desklock/pin_box";
          target: "cursor";
          after: "cursor_show_timer";
       }
+      program { name: "cursor_show_timer";
+         in: 0.5 0.0;
+         after: "cursor_hide";
+      }
       program { name: "cursor_hide";
          action: STATE_SET "default" 0.0;
          target: "cursor";
          transition: SINUSOIDAL 0.2 USE_DURATION_FACTOR 1;
          after: "cursor_hide_timer";
       }
-      program { name: "cursor_show_timer";
-         in: 0.5 0.0;
-         after: "cursor_hide";
-      }
       program { name: "cursor_hide_timer";
          in: 0.2 0.0;
          after: "cursor_show";
       }
-      program {
-         signal: "e,state,selected"; source: "e";
+      program { signal: "e,state,selected"; source: "e";
          action: STATE_SET "active" 0.0;
          target: "selection";
       }
-      program {
-         signal: "e,state,unselected"; source: "e";
+      program { signal: "e,state,unselected"; source: "e";
          action: STATE_SET "default" 0.0;
          target: "selection";
       }