ibar/ibox styled now too...

SVN revision: 79374

diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 5d84f19..ba9d353 100644 (file)
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -32,6 +32,7 @@ edc/entry.edc \
 edc/fileman.edc \
 edc/frame.edc \
 edc/gadman.edc \
+edc/ibar-ibox.edc \
 edc/ilist.edc \
 edc/label.edc \
 edc/menu.edc \

diff --git a/data/themes/default.edc b/data/themes/default.edc
index e187d6c..26a3b71 100644 (file)
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -40,6 +40,7 @@ collections {
 #include "edc/connman.edc"
 #include "edc/systray.edc"
 #include "edc/clock.edc"
+#include "edc/ibar-ibox.edc"
 
 // port unchanged stuff so this can work as a replacement
 #include "edc/O/about.edc"
@@ -55,7 +56,6 @@ collections {
 #include "edc/O/evrything.edc"
 #include "edc/O/fontpreview.edc"
 #include "edc/O/gadman.edc"
-#include "edc/O/ibarbox.edc"
 #include "edc/O/icons.edc"
 #include "edc/O/illume_gad.edc"
 #include "edc/O/init.edc"
@@ -65,6 +65,7 @@ collections {
 #include "edc/O/temperature.edc"
 #include "edc/O/transitions.edc"
 #include "edc/O/wallpaper.edc"
+//#include "edc/O/ibarbox.edc"
 //#include "edc/O/wizard.edc"
 //#include "edc/O/desklock.edc"
 //#include "edc/O/winlist.edc"

diff --git a/data/themes/edc/ibar-ibox.edc b/data/themes/edc/ibar-ibox.edc
new file mode 100644 (file)
index 0000000..3519b89
--- /dev/null
+++ b/data/themes/edc/ibar-ibox.edc
@@ -0,0 +1,451 @@
+group { name: "e/modules/ibox/icon";
+   alias: "e/modules/ibar/icon";
+   // 1 or 0 if u want an icon holder to raise when the mouse (or keyboard) hilights it
+   data.item: "raise_on_hilight" "0";
+//   data.item: "item_list" "item item2 item3";
+   parts {
+      part { name: "item_clip"; type: RECT;
+         description { state: "default" 0.0;
+            rel1.offset: -100 -100;
+            rel2.offset: 99 99;
+            color: 255 255 255 255;
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 64;
+         }
+      }
+      part { name: "e.swallow.content"; type: SWALLOW;
+         clip_to: "item_clip";
+         description { state: "default" 0.0;
+            rel1.offset: 3 3;
+            rel2.offset: -4 -4;
+         }
+         description { state: "bounce1" 0.0;
+            inherit: "default" 0.0;
+            rel1.relative: 0.0 0.15;
+            rel2.relative: 1.0 1.15;
+         }
+         description { state: "bounce2" 0.0;
+            inherit: "default" 0.0;
+            rel1.relative: 0.0 -0.15;
+            rel2.relative: 1.0 0.85;
+         }
+      }
+      part { name: "over"; type: RECT;
+         description { state: "default" 0.0;
+            color: 0 0 0 0;
+         }
+      }
+   }
+   programs {
+//      program {
+//         signal: "e,action,exec"; source: "e";
+//      }
+//      program {
+//         signal: "e,action,start"; source: "e";
+//      }
+//      program { name: "go_active";
+//         signal: "e,state,focused"; source: "e";
+//      }
+//      program { name: "go_passive";
+//         signal: "e,state,unfocused"; source: "e";
+//      }
+//      program {
+//         signal: "e,action,show,label"; source: "e";
+//      }
+//      program {
+//         signal: "e,action,hide,label"; source: "e";
+//      }
+      program {
+         signal: "e,state,starting"; source: "e";
+         action: STATE_SET "disabled" 0.0;
+         target: "item_clip";
+      }
+      program {
+         signal: "e,state,started"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "item_clip";
+      }
+      program {
+         signal: "e,state,urgent"; source: "e";
+         action: STATE_SET "bounce1" 0.0;
+         target: "e.swallow.content";
+         after: "urg1";
+      }
+      program { name: "urg1";
+         action: STATE_SET "bounce2" 0.0;
+         transition: DECELERATE 0.2;
+         target: "e.swallow.content";
+         after: "urg2";
+      }
+      program { name: "urg2";
+         action: STATE_SET "bounce1" 0.0;
+         transition: ACCELERATE 0.2;
+         target: "e.swallow.content";
+         after: "urg1";
+      }
+      program {
+         signal: "e,state,not_urgent"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "e.swallow.content";
+      }
+   }
+}
+
+group { name: "e/modules/ibox/icon_overlay";
+   alias: "e/modules/ibar/icon_overlay";
+   script {
+      public urgent;
+   }
+   parts {
+      part { name: "item_clip"; type: RECT;
+         description { state: "default" 0.0;
+            rel1.offset: -100 -100;
+            rel2.offset: 99 99;
+            color: 255 255 255 255;
+         }
+         description { state: "disabled" 0.0;
+            inherit: "default" 0.0;
+            color: 255 255 255 64;
+         }
+      }
+      part { name: "base"; type: SPACER;
+         description { state: "default" 0.0;
+            rel1.offset: 3 4;
+            rel2.offset: -4 -4;
+         }
+         description { state: "bounce1" 0.0;
+            inherit: "default" 0.0;
+            rel1.relative: 0.0 0.15;
+            rel2.relative: 1.0 1.15;
+         }
+         description { state: "bounce2" 0.0;
+            inherit: "default" 0.0;
+            rel1.relative: 0.0 -0.15;
+            rel2.relative: 1.0 0.85;
+         }
+      }
+      part { name: "background"; type: RECT;
+         clip_to: "item_clip";
+         description { state: "default" 0.0;
+            visible: 0;
+            rel1.to: "base";
+            rel2.to: "base";
+            color: 255 255 255 0;
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            color: 255 255 255 255;
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            rel1.relative: -0.5 -0.5;
+            rel2.relative: 1.5 1.5;
+         }
+         description { state: "huge" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+            rel1.relative: -2.0  -2.0;
+            rel2.relative: 3.0  3.0;
+            color: 255 255 255 0;
+         }
+      }
+      part { name: "e.swallow.content"; type: SWALLOW;
+         clip_to: "background";
+         description {
+            state: "default" 0.0;
+            rel1.to: "background";
+            rel2.to: "background";
+         }
+      }
+      part { name: "e.text.label"; type: TEXT;
+         effect: SOFT_SHADOW;
+         mouse_events: 0;
+         scale: 1;
+         description { state: "default" 0.0;
+            rel1.relative: 0.0 1.0;
+            rel1.offset: 0 -1;
+            rel2.relative: 1.0 1.0;
+            rel2.offset: -1 -1;
+            color: 255 255 255 0;
+            color3: 0 0 0 0;
+            color_class: "module_label";
+            text { font: "Sans:style=Bold"; size: 10;
+               min: 1 1;
+               align: 0.5 0.5;
+               text_class: "module_normal";
+            }
+         }
+         description { state: "visible" 0.0;
+            inherit: "default" 0.0;
+            rel1.relative: 0.0 0.0;
+            rel1.offset: 0 0;
+            rel2.relative: 1.0 1.0;
+            rel2.offset: -1 -1;
+            color: 255 255 255 255;
+            color3: 0 0 0 42;
+         }
+      }
+   }
+   programs {
+//      program {
+//         signal: "e,action,exec"; source: "e";
+//      }
+//      program {
+//         signal: "e,action,start"; source: "e";
+//      }
+      program {
+         signal: "load"; source: "";
+         script {
+            set_int(urgent, 0);
+         }
+      }
+      program { name: "go_active";
+         signal: "e,state,focused"; source: "e";
+         action: STATE_SET "visible" 0.0;
+         target: "background";
+         after: "go_active2";
+      }
+      program { name: "go_active2";
+         action: STATE_SET "hidden" 0.0;
+         transition: LINEAR 0.5;
+         target: "background";
+         after: "go_active";
+      }
+      program { name: "go_passive";
+         signal: "e,state,unfocused"; source: "e";
+         action: ACTION_STOP;
+         target: "go_active";
+         target: "go_active2";
+         after: "go_passive2";
+      }
+      program {
+         signal: "e,action,show,label"; source: "e";
+         action: STATE_SET "visible" 0.0;
+         transition: SINUSOIDAL 0.5;
+         target: "e.text.label";
+      }
+      program {
+         signal: "e,action,hide,label"; source: "e";
+         action: STATE_SET "default" 0.0;
+         transition: SINUSOIDAL 1.0;
+         target: "e.text.label";
+      }
+      program { name: "go_passive2";
+         action: STATE_SET "default" 0.0;
+         target: "background";
+         script {
+            if (get_int(urgent) == 1) {
+               run_program(PROGRAM:"go_urgent");
+            } else {
+               run_program(PROGRAM:"go_not_urgent");
+            }
+         }
+      }
+      program {
+         signal: "e,state,urgent"; source: "e";
+         script {
+            set_int(urgent, 1);
+         }
+      }
+      program { name: "go_urgent";
+         signal: "e,state,urgent"; source: "e";
+         action: STATE_SET "disabled" 0.0;
+         target: "item_clip";
+      }
+      program {
+         signal: "e,state,not_urgent"; source: "e";
+         script {
+            set_int(urgent, 0);
+         }
+      }
+      program { name: "go_not_urgent";
+         signal: "e,state,not_urgent"; source: "e";
+         action: STATE_SET "default" 0.0;
+         target: "item_clip";
+      }
+      program {
+         signal: "e,action,exec"; source: "e";
+         after: "exec_start";
+      }
+      program { name: "exec_start";
+         signal: "e,action,start"; source: "e";
+         action: ACTION_STOP;
+         target: "go_active";
+         target: "go_active2";
+         target: "go_passive";
+         target: "go_passive2";
+         target: "go_big";
+         target: "go_big2";
+         after: "go_big";
+      }
+      program { name: "go_big";
+         action: STATE_SET "visible" 0.0;
+         target: "background";
+         after: "go_big2";
+      }
+      program { name: "go_big2";
+         action: STATE_SET "huge" 0.0;
+         transition: LINEAR 0.5;
+         target: "background";
+      }
+   }
+}
+
+group { name: "e/modules/ibox/drop";
+   alias: "e/modules/ibar/drop";
+   images.image: "outline_glow.png" COMP;
+   images.image: "diagonal_stripes.png" COMP;
+   parts {
+      part { name: "base"; mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.offset: 2 2;
+            rel2.offset: -3 -3;
+            image.normal: "outline_glow.png";
+            image.border: 4 4 4 4;
+            image.middle: 0;
+            fill.smooth: 0;
+         }
+      }
+      part { name: "pat"; mouse_events: 0;
+         description { state: "default" 0.0;
+            rel1.to: "base";
+            rel1.offset: 1 1;
+            rel2.offset: -2 -2;
+            rel2.to: "base";
+            image.normal: "diagonal_stripes.png";
+            color: 255 255 255 25;
+            TILED_PATTERN(240, 240)
+         }
+      }
+   }
+}
+
+group { name: "e/modules/ibox/drop_overlay";
+   alias: "e/modules/ibar/drop_overlay";
+   images.image: "mini_blue_glow_arrow_0.png" COMP;
+   images.image: "mini_blue_glow_arrow_1.png" COMP;
+   images.image: "mini_blue_glow_arrow_2.png" COMP;
+   images.image: "mini_blue_glow_arrow_3.png" COMP;
+   parts {
+      part { name: "drop0"; mouse_events: 0;
+         description { state: "default" 0.0;
+            image.normal: "mini_blue_glow_arrow_0.png";
+            rel1.offset: -10 -10;
+            rel1.relative: 0.0 0.0;
+            rel2.offset: -10 -10;
+            rel2.relative: 0.0 0.0;
+            align: 0.0 0.0;
+            min: 10 10;
+            fixed: 1 1;
+            visible: 0;
+         }
+         description { state: "active" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            rel1.offset: 11 11;
+            rel2.offset: 11 11;
+            min: 1 1;
+            color: 255 255 255 0;
+         }
+      }
+      part { name: "drop1"; mouse_events: 0;
+         description { state: "default" 0.0;
+            image.normal: "mini_blue_glow_arrow_1.png";
+            rel1.offset: 9 -10;
+            rel1.relative: 1.0 0.0;
+            rel2.offset: 9 -10;
+            rel2.relative: 1.0 0.0;
+            align: 1.0 0.0;
+            min: 10 10;
+            fixed: 1 1;
+            visible: 0;
+         }
+         description { state: "active" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            rel1.offset: -12 11;
+            rel2.offset: -12 11;
+            min: 1 1;
+            color: 255 255 255 0;
+         }
+      }
+      part { name: "drop2"; mouse_events: 0;
+         description { state: "default" 0.0;
+            image.normal: "mini_blue_glow_arrow_2.png";
+            rel1.offset: 9 9;
+            rel1.relative: 1.0 1.0;
+            rel2.offset: 9 9;
+            rel2.relative: 1.0 1.0;
+            align: 1.0 1.0;
+            min: 10 10;
+            fixed: 1 1;
+            visible: 0;
+         }
+         description { state: "active" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            rel1.offset: -12 -12;
+            rel2.offset: -12 -12;
+            min: 1 1;
+            color: 255 255 255 0;
+         }
+      }
+      part { name: "drop3"; mouse_events: 0;
+         description { state: "default" 0.0;
+            image.normal: "mini_blue_glow_arrow_3.png";
+            rel1.offset: -10 9;
+            rel1.relative: 0.0 1.0;
+            rel2.offset: -10 9;
+            rel2.relative: 0.0 1.0;
+            align: 0.0 1.0;
+            min: 10 10;
+            fixed: 1 1;
+            visible: 0;
+         }
+         description { state: "active" 0.0;
+            inherit: "default" 0.0;
+            visible: 1;
+         }
+         description { state: "hidden" 0.0;
+            inherit: "default" 0.0;
+            rel1.offset: 11 -12;
+            rel2.offset: 11 -12;
+            min: 1 1;
+            color: 255 255 255 0;
+         }
+      }
+   }
+   programs {
+      program { name: "drop1";
+         signal: "show"; source: "";
+         action: STATE_SET "active" 0.0;
+         target: "drop0";
+         target: "drop1";
+         target: "drop2";
+         target: "drop3";
+         after: "drop2";
+      }
+      program { name: "drop2";
+         action: STATE_SET "hidden" 0.0;
+         transition: LINEAR 0.5;
+         target: "drop0";
+         target: "drop1";
+         target: "drop2";
+         target: "drop3";
+         after: "drop1";
+      }
+   }
+}