improve horizontal progress bar

Signed-off-by: Olliver Schinagl <o.schinagl@ultimaker.com>

14 files changed, 28 insertions, 445 deletions

diff --git a/data/themes/default/edc/elm/progress.edc b/data/themes/default/edc/elm/progress.edc
index e301d53..e5e1759 100644
--- a/data/themes/default/edc/elm/progress.edc
+++ b/data/themes/default/edc/elm/progress.edc
@@ -1,14 +1,8 @@
 group { name: "elm/progressbar/horizontal/default";
    images.image: "inset_bar_horiz_base.png" COMP;
-   images.image: "inset_bar_horiz_light.png" COMP;
-   images.image: "inset_bar_horiz_inside_base.png" COMP;
-   images.image: "inset_bar_horiz_inside_light.png" COMP;
    images.image: "inset_bar_horiz_glow_base.png" COMP;
-   images.image: "inset_bar_horiz_glow_light.png" COMP;
    images.image: "inset_bar_horiz_glow_inv_base.png" COMP;
-   images.image: "inset_bar_horiz_glow_inv_light.png" COMP;
    images.image: "inset_bar_horiz_glow_mid_base.png" COMP;
-   images.image: "inset_bar_horiz_glow_mid_light.png" COMP;
 #define ICON    1
 #define LABEL   2
 #define DISABLE 4
@@ -146,76 +140,45 @@ group { name: "elm/progressbar/horizontal/default";
             color: FN_COL_DISABLE;
          }
       }
-      part { name: "bg-hi";
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel1.offset: 0 1;
-            rel2.to: "bg";
-            rel2.offset: -1 0;
-            image.normal: "inset_bar_horiz_light.png";
-            image.border: 32 32 0 0;
-            image.border_scale_by: 0.25; image.border_scale: 1;
-         }
-      }
       part { name: "bg";
-         scale: 1;
          description { state: "default" 0.0;
-            min: 16 16;
-            max: -1 16;
+            min: 16 10;
+            max: -1 10;
             rel1.to_x: "elm.text";
             rel1.relative: 1.0 0.0;
-            rel1.offset: 3 3;
-            rel2.offset: -4 -4;
+            rel1.offset: 3 0;
+            rel2.offset: -3 0;
             image.normal: "inset_bar_horiz_base.png";
-            image.border: 32 32 0 0;
-            image.border_scale_by: 0.25; image.border_scale: 1;
+            image.border: 1 1 0 0;
          }
       }
       part { name: "ins0"; type: SPACER;
-         scale: 1;
          description { state: "default" 0.0;
             fixed: 1 0;
             rel1.to: "bg";
             rel2.to: "bg";
             rel2.relative: 0.0 1.0;
-            min: 5 16;
+            min: 5 10;
             align: 0.0 0.5;
          }
       }
       part { name: "ins1"; type: SPACER;
-         scale: 1;
          description { state: "default" 0.0;
             fixed: 1 0;
             rel1.to: "bg";
             rel1.relative: 1.0 0.0;
             rel2.to: "bg";
-            min: 5 16;
+            min: 5 10;
             align: 1.0 0.5;
          }
       }
-      part { name: "inside-hi";
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "inside";
-            rel1.offset: 0 1;
-            rel2.to: "inside";
-            rel2.offset: -1 0;
-            image.normal: "inset_bar_horiz_inside_light.png";
-            image.border: 8 8 0 0;
-            image.border_scale_by: 0.25; image.border_scale: 1;
-         }
-      }
-      part { name: "inside";
-         scale: 1;
+      part { name: "inside"; type: SPACER;
          description { state: "default" 0.0;
             min: 4 4;
             rel1.to: "ins0";
-            rel1.relative: 1.0 (6/16);
+            rel1.relative: 1.0 0.0;
             rel2.to: "ins1";
-            rel2.relative: 0.0 (10/16);
-            image.normal: "inset_bar_horiz_inside_base.png";
-            image.border: 8 8 0 0;
-            image.border_scale_by: 0.25; image.border_scale: 1;
+            rel2.relative: 0.0 1.0;
          }
       }
       part { name: "elm.swallow.bar"; type: SWALLOW; mouse_events: 0;
@@ -225,10 +188,6 @@ group { name: "elm/progressbar/horizontal/default";
          }
       }
       part { name: "elm.cur.progressbar"; mouse_events: 0; type: SPACER;
-         scale: 1;
-         dragable.confine: "inside";
-         dragable.x: 1 1 1;
-         dragable.y: 0 0 0;
          description { state: "default" 0.0;
             fixed: 1 1;
             min: 8 4;
@@ -241,7 +200,7 @@ group { name: "elm/progressbar/horizontal/default";
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 0;
-            min: 14 16;
+            min: 14 10;
             rel1.to_x: "elm.cur.progressbar";
             rel1.relative: 1.0 0.0;
             rel2.to_x: "elm.cur.progressbar";
@@ -255,26 +214,24 @@ group { name: "elm/progressbar/horizontal/default";
             align: 1.0 0.5;
          }
       }
-      part { name: "bar";
+      part { name: "bar"; type: IMAGE;
          clip_to: "fract_clip";
-         scale: 1;
          description { state: "default" 0.0;
             rel1.to_x: "ins0";
             rel1.to_y: "bg";
-            rel1.relative: (12/16) -0.25;
+            rel1.relative: 0.5 0.2;
             rel2.to_x: "barend";
             rel2.to_y: "bg";
-            rel2.relative: 1.0 1.25;
+            rel2.relative: 0.9 0.8;
             image.normal: "inset_bar_horiz_glow_base.png";
-            image.border: 0 72 0 0;
-            image.border_scale_by: 0.25; image.border_scale: 1;
+            image.border: 0 0 0 0;
          }
          description { state: "inv" 0.0;
             inherit: "default" 0.0;
             rel1.to_x: "barend";
-            rel1.relative: 0.0 -0.25;
+            rel1.relative: 0.5 0.2;
             rel2.to_x: "ins1";
-            rel2.relative: (4/16) 1.25;
+            rel2.relative: 0.5 0.8;
             image.normal: "inset_bar_horiz_glow_inv_base.png";
             image.border: 72 0 0 0;
          }
@@ -283,7 +240,7 @@ group { name: "elm/progressbar/horizontal/default";
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 0;
-            min: 20 16;
+            min: 20 10;
             rel1.to_x: "inside";
             rel1.relative: 0.0 0.0;
             rel2.to_x: "inside";
@@ -295,7 +252,7 @@ group { name: "elm/progressbar/horizontal/default";
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 0;
-            min: 20 16;
+            min: 20 10;
             rel1.to_x: "inside";
             rel1.relative: 1.0 0.0;
             rel2.to_x: "inside";
@@ -308,8 +265,8 @@ group { name: "elm/progressbar/horizontal/default";
          scale: 1;
          description { state: "default" 0.0;
             fixed: 1 1;
-            min: 64 24;
-            max: 64 24;
+            min: 64 10;
+            max: 64 10;
             rel1.to_x: "insidep0";
             rel1.to_y: "bar";
             rel1.relative: 0.0 0.0;
@@ -345,53 +302,6 @@ group { name: "elm/progressbar/horizontal/default";
             visible: 0;
          }
       }
-      part { name: "pulse2";
-         clip_to: "pulse_clip";
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            min: 36 14;
-            max: 36 14;
-            rel1.to: "pulse";
-            rel2.to: "pulse";
-            image.normal: "inset_bar_horiz_glow_mid_light.png";
-            color: 255 255 255 0;
-         }
-         description { state: "glow" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255;
-         }
-      }
-      part { name: "light";
-         clip_to: "fract_clip";
-         scale: 1;
-         description { state: "default" 0.0;
-            max: 36 11;
-            rel1.to_x: "bar";
-            rel1.to_y: "bar";
-            rel1.relative: 0.0 (26/96);
-            rel2.to_x: "barend";
-            rel2.to_y: "bar";
-            rel2.relative: 0.2 ((26+44)/96);
-            align: 1.0 0.0;
-            image.normal: "inset_bar_horiz_glow_light.png";
-            image.border: 0 20 0 0;
-            image.border_scale_by: 0.25; image.border_scale: 1;
-            color: 255 255 255 0;
-         }
-         description { state: "inv" 0.0;
-            inherit: "default" 0.0;
-            rel1.to_x: "barend";
-            rel1.to_y: "bar";
-            rel1.relative: 0.8 (26/96);
-            rel2.to_x: "bar";
-            rel2.to_y: "bar";
-            rel2.relative: 1.0 ((26+44)/96);
-            align: 0.0 0.0;
-            image.normal: "inset_bar_horiz_glow_inv_light.png";
-            image.border: 20 0 0 0;
-         }
-      }
    }
    programs {
       program { name: "inverted-on";
@@ -399,33 +309,12 @@ group { name: "elm/progressbar/horizontal/default";
          action:  STATE_SET "inv" 0.0;
          target: "bar";
          target: "barend";
-         target: "light";
       }
       program { name: "inverted-off";
          signal: "elm,state,inverted,off"; source: "elm";
          action:  STATE_SET "default" 0.0;
          target: "bar";
          target: "barend";
-         target: "light";
-      }
-      program { name: "drag-set";
-         signal: "drag,set"; source: "elm.cur.progressbar";
-         script {
-            new a, Float:dx, Float:dy, Float:vl, st[20];
-
-            get_drag(PART:"elm.cur.progressbar", dx, dy);
-            get_state(PART:"bar", st, 19, vl);
-            if (!strcmp(st, "inv")) {
-               a = round(((1.0 - dx) * 255) / 0.2);
-               custom_state(PART:"light", "inv", 0.0);
-            } else {
-               a = round((dx * 255) / 0.2);
-               custom_state(PART:"light", "default", 0.0);
-            }
-            if (a > 255) { a = 255; }
-            set_state_val(PART:"light", STATE_COLOR, 255, 255, 255, a);
-            set_state(PART:"light", "custom", 0.0);
-         }
       }
       program { name: "pulse-mode0";
          signal: "elm,state,pulse"; source: "elm";
@@ -444,32 +333,18 @@ group { name: "elm/progressbar/horizontal/default";
          target: "pulse_clip";
          target: "fract_clip";
          after: "pulse0";
-         after: "pulse0.1";
-      }
-      program { name: "pulse0.1";
-         action:  STATE_SET "glow" 0.0;
-         transition: ACCELERATE 0.4;
-         target: "pulse2";
-         after: "pulse0.2";
-      }
-      program { name: "pulse0.2";
-         action:  STATE_SET "default" 0.0;
-         transition: DECELERATE 0.4;
-         target: "pulse2";
       }
       program { name: "pulse0";
          action:  STATE_SET "end" 0.0;
          transition: SINUSOIDAL 0.8;
          target: "pulse";
          after: "pulse1";
-         after: "pulse0.1";
       }
       program { name: "pulse1";
          action:  STATE_SET "default" 0.0;
          transition: SINUSOIDAL 0.8;
          target: "pulse";
          after: "pulse0";
-         after: "pulse0.1";
       }
       program { name: "fraction";
          signal: "elm,state,fraction"; source: "elm";
@@ -555,15 +430,9 @@ group { name: "elm/progressbar/horizontal/default";
 
 group { name: "elm/progressbar/vertical/default";
    images.image: "inset_bar_vert_base.png" COMP;
-   images.image: "inset_bar_vert_light.png" COMP;
-   images.image: "inset_bar_vert_inside_base.png" COMP;
-   images.image: "inset_bar_vert_inside_light.png" COMP;
    images.image: "inset_bar_vert_glow_base.png" COMP;
-   images.image: "inset_bar_vert_glow_light.png" COMP;
    images.image: "inset_bar_vert_glow_inv_base.png" COMP;
-   images.image: "inset_bar_vert_glow_inv_light.png" COMP;
    images.image: "inset_bar_vert_glow_mid_base.png" COMP;
-   images.image: "inset_bar_vert_glow_mid_light.png" COMP;
 #define ICON    1
 #define LABEL   2
 #define DISABLE 4
@@ -701,22 +570,11 @@ group { name: "elm/progressbar/vertical/default";
             color: FN_COL_DISABLE;
          }
       }
-      part { name: "bg-hi";
-         description { state: "default" 0.0;
-            rel1.to: "bg";
-            rel1.offset: 0 1;
-            rel2.to: "bg";
-            rel2.offset: -1 0;
-            image.normal: "inset_bar_vert_light.png";
-            image.border: 0 0 32 32;
-            image.border_scale_by: 0.25; image.border_scale: 1;
-         }
-      }
       part { name: "bg";
          scale: 1;
          description { state: "default" 0.0;
-            min: 16 16;
-            max: 16 -1;
+            min: 10 10;
+            max: 10 -1;
             rel1.to_y: "elm.text";
             rel1.relative: 0.0 1.0;
             rel1.offset: 3 3;
@@ -733,7 +591,7 @@ group { name: "elm/progressbar/vertical/default";
             rel1.to: "bg";
             rel2.to: "bg";
             rel2.relative: 1.0 0.0;
-            min: 16 5;
+            min: 10 5;
             align: 0.5 0.0;
          }
       }
@@ -744,33 +602,17 @@ group { name: "elm/progressbar/vertical/default";
             rel1.to: "bg";
             rel1.relative: 0.0 1.0;
             rel2.to: "bg";
-            min: 16 5;
+            min: 10 5;
             align: 0.5 1.0;
          }
       }
-      part { name: "inside-hi";
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to: "inside";
-            rel1.offset: 0 1;
-            rel2.to: "inside";
-            rel2.offset: -1 0;
-            image.normal: "inset_bar_vert_inside_light.png";
-            image.border: 0 0 8 8;
-            image.border_scale_by: 0.25; image.border_scale: 1;
-         }
-      }
-      part { name: "inside";
-         scale: 1;
+      part { name: "inside"; type: SPACER;
          description { state: "default" 0.0;
             min: 4 4;
             rel1.to: "ins0";
-            rel1.relative: (6/16) 1.0;
+            rel1.relative: 0.0 1.0;
             rel2.to: "ins1";
-            rel2.relative: (10/16) 0.0;
-            image.normal: "inset_bar_vert_inside_base.png";
-            image.border: 0 0 8 8;
-            image.border_scale_by: 0.25; image.border_scale: 1;
+            rel2.relative: 1.0 0.0;
          }
       }
       part { name: "elm.swallow.bar"; type: SWALLOW; mouse_events: 0;
@@ -913,53 +755,6 @@ group { name: "elm/progressbar/vertical/default";
             visible: 0;
          }
       }
-      part { name: "pulse2";
-         clip_to: "pulse_clip";
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            min: 14 36;
-            max: 14 36;
-            rel1.to: "pulse";
-            rel2.to: "pulse";
-            image.normal: "inset_bar_vert_glow_mid_light.png";
-            color: 255 255 255 0;
-         }
-         description { state: "glow" 0.0;
-            inherit: "default" 0.0;
-            color: 255 255 255 255;
-         }
-      }
-      part { name: "light";
-         clip_to: "fract_clip";
-         scale: 1;
-         description { state: "default" 0.0;
-            max: 11 36;
-            rel1.to_y: "bar";
-            rel1.to_x: "bar";
-            rel1.relative: (26/96) 0.0;
-            rel2.to_y: "barend";
-            rel2.to_x: "bar";
-            rel2.relative: ((26+44)/96) 0.2;
-            align: 0.0 1.0;
-            image.normal: "inset_bar_vert_glow_light.png";
-            image.border: 0 0 0 20;
-            image.border_scale_by: 0.25; image.border_scale: 1;
-            color: 255 255 255 0;
-         }
-         description { state: "inv" 0.0;
-            inherit: "default" 0.0;
-            rel1.to_y: "barend";
-            rel1.to_x: "bar";
-            rel1.relative: (26/96) 0.8;
-            rel2.to_y: "bar";
-            rel2.to_x: "bar";
-            rel2.relative: ((26+44)/96) 1.0;
-            align: 0.0 0.0;
-            image.normal: "inset_bar_vert_glow_inv_light.png";
-            image.border: 0 0 20 0;
-         }
-      }
    }
    programs {
       program { name: "inverted-on";
@@ -967,33 +762,12 @@ group { name: "elm/progressbar/vertical/default";
          action:  STATE_SET "inv" 0.0;
          target: "bar";
          target: "barend";
-         target: "light";
       }
       program { name: "inverted-off";
          signal: "elm,state,inverted,off"; source: "elm";
          action:  STATE_SET "default" 0.0;
          target: "bar";
          target: "barend";
-         target: "light";
-      }
-      program { name: "drag-set";
-         signal: "drag,set"; source: "elm.cur.progressbar";
-         script {
-            new a, Float:dx, Float:dy, Float:vl, st[20];
-
-            get_drag(PART:"elm.cur.progressbar", dx, dy);
-            get_state(PART:"bar", st, 19, vl);
-            if (!strcmp(st, "inv")) {
-               a = round(((1.0 - dy) * 255) / 0.2);
-               custom_state(PART:"light", "inv", 0.0);
-            } else {
-               a = round((dy * 255) / 0.2);
-               custom_state(PART:"light", "default", 0.0);
-            }
-            if (a > 255) { a = 255; }
-            set_state_val(PART:"light", STATE_COLOR, 255, 255, 255, a);
-            set_state(PART:"light", "custom", 0.0);
-         }
       }
       program { name: "pulse-mode0";
          signal: "elm,state,pulse"; source: "elm";
@@ -1012,32 +786,18 @@ group { name: "elm/progressbar/vertical/default";
          target: "pulse_clip";
          target: "fract_clip";
          after: "pulse0";
-         after: "pulse0.1";
-      }
-      program { name: "pulse0.1";
-         action:  STATE_SET "glow" 0.0;
-         transition: ACCELERATE 0.4;
-         target: "pulse2";
-         after: "pulse0.2";
-      }
-      program { name: "pulse0.2";
-         action:  STATE_SET "default" 0.0;
-         transition: DECELERATE 0.4;
-         target: "pulse2";
       }
       program { name: "pulse0";
          action:  STATE_SET "end" 0.0;
          transition: SINUSOIDAL 0.8;
          target: "pulse";
          after: "pulse1";
-         after: "pulse0.1";
       }
       program { name: "pulse1";
          action:  STATE_SET "default" 0.0;
          transition: SINUSOIDAL 0.8;
          target: "pulse";
          after: "pulse0";
-         after: "pulse0.1";
       }
       program { name: "fraction";
          signal: "elm,state,fraction"; source: "elm";
@@ -1213,180 +973,3 @@ group { name: "elm/progressbar/horizontal/wheel";
       }
    }
 }
-
-group { name: "elm/progressbar/horizontal/double";
-   inherit: "elm/progressbar/horizontal/default";
-   images {
-      image: "inset_bar_horiz_glow_base_double.png" COMP;
-      image: "inset_bar_horiz_glow_inv_base_double.png" COMP;
-   }
-   parts {
-      part { name: "elm.cur.progressbar1"; mouse_events: 0; type: SPACER;
-         insert_after: "inside";
-         scale: 1;
-         dragable.confine: "inside";
-         dragable.x: 1 1 1;
-         dragable.y: 0 0 0;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            min: 8 4;
-            max: 8 4;
-            rel1.to: "inside";
-            rel2.to: "inside";
-         }
-      }
-      part { name: "barend1"; type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 1 0;
-            min: 14 16;
-            rel1.to_x: "elm.cur.progressbar1";
-            rel1.relative: 1.0 0.0;
-            rel2.to_x: "elm.cur.progressbar1";
-            rel2.relative: 1.0 1.0;
-            align: 0.0 0.5;
-         }
-         description { state: "inv" 0.0;
-            inherit: "default" 0.0;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 0.0 1.0;
-            align: 1.0 0.5;
-         }
-      }
-      part { name: "bar1";
-         insert_after: "barend";
-         clip_to: "fract_clip";
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to_x: "ins0";
-            rel1.to_y: "bg";
-            rel1.relative: (12/16) -0.25;
-            rel2.to_x: "barend1";
-            rel2.to_y: "bg";
-            rel2.relative: 1.0 1.25;
-            image.normal: "inset_bar_horiz_glow_base_double.png";
-            image.border: 0 72 0 0;
-            image.border_scale_by: 0.25; image.border_scale: 1;
-            color: 51 153 255 128;
-         }
-         description { state: "inv" 0.0;
-            inherit: "default" 0.0;
-            rel1.to_x: "barend";
-            rel1.relative: 0.0 -0.25;
-            rel2.to_x: "ins1";
-            rel2.relative: (4/16) 1.25;
-            image.normal: "inset_bar_horiz_glow_inv_base_double.png";
-            image.border: 72 0 0 0;
-         }
-      }
-   }
-   programs {
-      program { name: "inverted-on";
-         signal: "elm,state,inverted,on"; source: "elm";
-         action:  STATE_SET "inv" 0.0;
-         target: "bar";
-         target: "bar1";
-         target: "barend";
-         target: "barend1";
-         target: "light";
-      }
-      program
-       { name: "inverted-off";
-         signal: "elm,state,inverted,off"; source: "elm";
-         action:  STATE_SET "default" 0.0;
-         target: "bar";
-         target: "bar1";
-         target: "barend";
-         target: "barend1";
-         target: "light";
-      }
-   }
-}
-
-group { name: "elm/progressbar/vertical/double";
-   inherit: "elm/progressbar/vertical/default";
-   images {
-      image: "inset_bar_vert_glow_base_double.png" COMP;
-      image: "inset_bar_vert_glow_inv_base_double.png" COMP;
-   }
-   parts {
-      part { name: "elm.cur.progressbar1"; mouse_events: 0; type: SPACER;
-         insert_after: "inside";
-         scale: 1;
-         dragable.confine: "inside";
-         dragable.x: 0 0 0;
-         dragable.y: 1 1 1;
-         description { state: "default" 0.0;
-            fixed: 1 1;
-            min: 4 8;
-            max: 4 8;
-            rel1.to: "inside";
-            rel2.to: "inside";
-         }
-      }
-      part { name: "barend1"; type: SPACER;
-         scale: 1;
-         description { state: "default" 0.0;
-            fixed: 0 1;
-            min: 16 14;
-            rel1.to_y: "elm.cur.progressbar1";
-            rel1.relative: 0.0 1.0;
-            rel2.to_y: "elm.cur.progressbar1";
-            rel2.relative: 1.0 1.0;
-            align: 0.5 0.0;
-         }
-         description { state: "inv" 0.0;
-            inherit: "default" 0.0;
-            rel1.relative: 0.0 0.0;
-            rel2.relative: 1.0 0.0;
-            align: 0.5 1.0;
-         }
-      }
-      part { name: "bar1";
-         insert_after: "barend";
-         clip_to: "fract_clip";
-         scale: 1;
-         description { state: "default" 0.0;
-            rel1.to_y: "ins0";
-            rel1.to_x: "bg";
-            rel1.relative: -0.25 (12/16);
-            rel2.to_y: "barend1";
-            rel2.to_x: "bg";
-            rel2.relative: 1.25 1.0;
-            image.normal: "inset_bar_vert_glow_base_double.png";
-            image.border: 0 0 0 72;
-            image.border_scale_by: 0.25; image.border_scale: 1;
-            color: 51 153 255 128;
-         }
-         description { state: "inv" 0.0;
-            inherit: "default" 0.0;
-            rel1.to_y: "barend1";
-            rel1.relative: -0.25 0.0;
-            rel2.to_y: "ins1";
-            rel2.relative: 1.25 (4/16);
-            image.normal: "inset_bar_vert_glow_inv_base_double.png";
-            image.border: 0 0 72 0;
-         }
-      }
-   }
-   programs {
-      program { name: "inverted-on";
-         signal: "elm,state,inverted,on"; source: "elm";
-         action:  STATE_SET "inv" 0.0;
-         target: "bar";
-         target: "barend";
-         target: "light";
-         target: "bar1";
-         target: "barend1";
-      }
-      program { name: "inverted-off";
-         signal: "elm,state,inverted,off"; source: "elm";
-         action:  STATE_SET "default" 0.0;
-         target: "bar";
-         target: "barend";
-         target: "light";
-         target: "bar1";
-         target: "barend1";
-      }
-   }
-}
diff --git a/data/themes/default/img/inset_bar_horiz_base.png b/data/themes/default/img/inset_bar_horiz_base.png
index fd18449..d8896e1 100644
--- a/data/themes/default/img/inset_bar_horiz_base.png
+++ b/data/themes/default/img/inset_bar_horiz_base.png
diff --git a/data/themes/default/img/inset_bar_horiz_glow_base.png b/data/themes/default/img/inset_bar_horiz_glow_base.png
index 3527887..84ee377 100644
--- a/data/themes/default/img/inset_bar_horiz_glow_base.png
+++ b/data/themes/default/img/inset_bar_horiz_glow_base.png
diff --git a/data/themes/default/img/inset_bar_horiz_glow_base_double.png b/data/themes/default/img/inset_bar_horiz_glow_base_double.png
deleted file mode 100644
index e57e676..0000000
--- a/data/themes/default/img/inset_bar_horiz_glow_base_double.png
+++ /dev/null
diff --git a/data/themes/default/img/inset_bar_horiz_glow_inv_base_double.png b/data/themes/default/img/inset_bar_horiz_glow_inv_base_double.png
deleted file mode 100644
index f2b986c..0000000
--- a/data/themes/default/img/inset_bar_horiz_glow_inv_base_double.png
+++ /dev/null
diff --git a/data/themes/default/img/inset_bar_horiz_glow_mid_base.png b/data/themes/default/img/inset_bar_horiz_glow_mid_base.png
index bf1ea5d..724c990 100644
--- a/data/themes/default/img/inset_bar_horiz_glow_mid_base.png
+++ b/data/themes/default/img/inset_bar_horiz_glow_mid_base.png
diff --git a/data/themes/default/img/inset_bar_horiz_glow_mid_light.png b/data/themes/default/img/inset_bar_horiz_glow_mid_light.png
deleted file mode 100644
index 5b51ce1..0000000
--- a/data/themes/default/img/inset_bar_horiz_glow_mid_light.png
+++ /dev/null
diff --git a/data/themes/default/img/inset_bar_horiz_inside_base.png b/data/themes/default/img/inset_bar_horiz_inside_base.png
deleted file mode 100644
index a136ac6..0000000
--- a/data/themes/default/img/inset_bar_horiz_inside_base.png
+++ /dev/null
diff --git a/data/themes/default/img/inset_bar_horiz_inside_light.png b/data/themes/default/img/inset_bar_horiz_inside_light.png
deleted file mode 100644
index b3924d7..0000000
--- a/data/themes/default/img/inset_bar_horiz_inside_light.png
+++ /dev/null
diff --git a/data/themes/default/img/inset_bar_vert_glow_base_double.png b/data/themes/default/img/inset_bar_vert_glow_base_double.png
deleted file mode 100644
index e71022e..0000000
--- a/data/themes/default/img/inset_bar_vert_glow_base_double.png
+++ /dev/null
diff --git a/data/themes/default/img/inset_bar_vert_glow_inv_base_double.png b/data/themes/default/img/inset_bar_vert_glow_inv_base_double.png
deleted file mode 100644
index 919c623..0000000
--- a/data/themes/default/img/inset_bar_vert_glow_inv_base_double.png
+++ /dev/null
diff --git a/data/themes/default/img/inset_bar_vert_glow_mid_light.png b/data/themes/default/img/inset_bar_vert_glow_mid_light.png
deleted file mode 100644
index 3318d82..0000000
--- a/data/themes/default/img/inset_bar_vert_glow_mid_light.png
+++ /dev/null
diff --git a/data/themes/default/img/inset_bar_vert_inside_base.png b/data/themes/default/img/inset_bar_vert_inside_base.png
deleted file mode 100644
index 9beda37..0000000
--- a/data/themes/default/img/inset_bar_vert_inside_base.png
+++ /dev/null
diff --git a/data/themes/default/img/inset_bar_vert_inside_light.png b/data/themes/default/img/inset_bar_vert_inside_light.png
deleted file mode 100644
index e3f2695..0000000
--- a/data/themes/default/img/inset_bar_vert_inside_light.png
+++ /dev/null