Enlightenment CVS committal
Author : iamsthitha
Project : e_modules
Module : taskbar
Dir : e_modules/taskbar/data/themes
Modified Files:
Makefile.am taskbar.edc
Added Files:
taskbar2.edc
Log Message:
-Added a config dialog
-"Popular" Taskbar functionality
-Old theme still available as taskbar2.edj
-A few bug fixes
===================================================================
RCS file: /cvs/e/e_modules/taskbar/data/themes/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 13 Jun 2006 23:54:41 -0000 1.1
+++ Makefile.am 22 Jun 2006 05:30:18 -0000 1.2
@@ -6,15 +6,14 @@
filesdir = $(datadir)
files_DATA = \
fonts/VeraBd.ttf \
-$(wildcard taskbar.ed?)
+$(wildcard taskbar.ed?) \
+$(wildcard taskbar2.ed?)
EXTRA_DIST = $(files_DATA) $(wildcard images/*.png)
-
-taskbar.edj: Makefile taskbar.edc
- $(EDJE_CC) $(EDJE_FLAGS) \
- taskbar.edc \
- taskbar.edj
+
+%.edj: %.edc
+ $(EDJE_CC) $(EDJE_FLAGS) $< $@
clean-local:
rm -f *.edj
===================================================================
RCS file: /cvs/e/e_modules/taskbar/data/themes/taskbar.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- taskbar.edc 13 Jun 2006 23:54:41 -0000 1.1
+++ taskbar.edc 22 Jun 2006 05:30:18 -0000 1.2
@@ -8,6 +8,13 @@
image: "e17_ibar_arrow_r.png" COMP;
image: "e17_ibar_arrow_u.png" COMP;
image: "e17_pager_desk.png" COMP;
+ image: "e17_button_sm.png" COMP;
+ image: "e17_button_sm2.png" COMP;
+ image: "e17_button_sm_disabled.png" COMP;
+ image: "e17_titlebar_glint1.png" COMP;
+ image: "e17_titlebar_glint2.png" COMP;
+ image: "e17_titlebar_glint3.png" COMP;
+ image: "focus.png" COMP;
}
collections {
group {
@@ -31,66 +38,85 @@
}
}
part {
+ name: "button_image";
+ type: IMAGE;
+ mouse_events: 0;
+ description {
+ state: "default" 0.0;
+ min: 56 16;
+ image {
+ normal: "e17_button_sm.png";
+ border: 8 8 8 8;
+ }
+ }
+ description {
+ state: "clicked" 0.0;
+ inherit: "default" 0.0;
+ image {
+ normal: "e17_button_sm2.png";
+ }
+ }
+ description {
+ state: "iconified" 0.0;
+ inherit: "default" 0.0;
+ rel1 {
+ relative: 0.0 0.3;
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ }
+ }
+ }
+ part {
name: "item";
type: SWALLOW;
mouse_events: 0;
clip_to: "item_clip";
description {
state: "default" 0.0;
+ aspect: 1.0 1.0;
+ align: 0.0 0.5;
rel1 {
relative: 0.0 0.0;
- offset: 2 2;
+ to: "button_image";
+ offset: 8 8;
}
rel2 {
relative: 1.0 1.0;
- offset: -3 -3;
+ to: "button_image";
+ offset: 7 -9;
}
color: 0 0 0 0;
}
- description {
- state: "bigger" 0.0;
- inherit: "default" 0.0;
- rel1 {
- relative: 0.0 0.0;
- offset: 0 0;
- }
- rel2 {
- relative: 1.0 1.0;
- offset: -1 -1;
- }
- }
- description {
- state: "iconified" 0.0;
- inherit: "default" 0.0;
- rel1 {
- relative: 0.0 0.5;
- offset: 0 0;
- }
- rel2 {
- relative: 1.0 1.0;
- offset: -1 -1;
- }
- }
}
part {
- name: "border";
+ name: "focus";
mouse_events: 0;
description {
state: "default" 0.0;
+ visible: 0;
image {
- normal: "e17_pager_desk.png";
- border: 2 2 2 2;
+ normal: "focus.png";
+ border: 7 7 7 7;
middle: 0;
}
+ fill {
+ smooth: 0;
+ }
+ rel1 {
+ relative: 0.0 0.0;
+ to: "button_image";
+ }
+ rel2 {
+ relative: 1.0 1.0;
+ to: "button_image";
+ }
color: 255 255 255 0;
}
description {
- state: "visible" 0.0;
- image {
- normal: "e17_pager_desk.png";
- border: 2 2 2 2;
- middle: 0;
- }
+ state: "focused" 0.0;
+ inherit: "default" 0.0;
+ visible: 1;
color: 255 255 255 255;
}
}
@@ -101,40 +127,28 @@
mouse_events: 0;
description {
state: "default" 0.0;
- align: 0.5 0.5;
rel1 {
- relative: 0.0 1.0;
- offset: 0 -1;
+ relative: 1.0 0.0;
+ offset: 0 8;
+ to_x: "item";
+ to_y: "button_image";
}
rel2 {
relative: 1.0 1.0;
- offset: -1 -1;
+ offset: -8 -8;
+ to: "button_image";
}
- color: 255 255 255 0;
- color3: 0 0 0 0;
+ color: 255 255 255 255;
+ color3: 0 0 0 42;
text {
text: "Icon Name";
font: "Vera Bold";
size: 10;
- min: 1 1;
align: 0.5 0.5;
+ min: 0 1;
text_class: "module_normal";
}
}
- description {
- state: "visible" 0.0;
- inherit: "default" 0.0;
- rel1 {
- relative: 0.0 0.7;
- offset: 0 0;
- }
- rel2 {
- relative: 1.0 1.0;
- offset: -1 -1;
- }
- color: 255 255 255 255;
- color3: 0 0 0 42;
- }
}
part {
name: "over";
@@ -172,12 +186,28 @@
target: "item_clip";
}
program {
+ name: "instant_iconify";
+ signal: "instant_iconify";
+ source: "";
+ action: STATE_SET "iconified" 0.0;
+ transition: LINEAR 0.0;
+ target: "button_image";
+ }
+ program {
+ name: "instant_uniconify";
+ signal: "instant_uniconify";
+ source: "";
+ action: STATE_SET "default" 0.0;
+ transition: LINEAR 0.0;
+ target: "button_image";
+ }
+ program {
name: "iconify";
signal: "iconify";
source: "";
action: STATE_SET "iconified" 0.0;
transition: LINEAR 0.5;
- target: "item";
+ target: "button_image";
}
program {
name: "uniconify";
@@ -185,15 +215,31 @@
source: "";
action: STATE_SET "default" 0.0;
transition: LINEAR 0.5;
- target: "item";
+ target: "button_image";
+ }
+ program {
+ name: "instant_focused";
+ signal: "instant_focused";
+ source: "";
+ action: STATE_SET "focused" 0.0;
+ transition: LINEAR 0.0;
+ target: "focus";
+ }
+ program {
+ name: "instant_unfocused";
+ signal: "instant_unfocused";
+ source: "";
+ action: STATE_SET "default" 0.0;
+ transition: LINEAR 0.0;
+ target: "focus";
}
program {
name: "focused";
signal: "focused";
source: "";
- action: STATE_SET "visible" 0.0;
+ action: STATE_SET "focused" 0.0;
transition: LINEAR 0.5;
- target: "border";
+ target: "focus";
}
program {
name: "unfocused";
@@ -201,7 +247,7 @@
source: "";
action: STATE_SET "default" 0.0;
transition: LINEAR 0.5;
- target: "border";
+ target: "focus";
}
}
}
@@ -297,7 +343,7 @@
mouse_events: 0;
description {
state: "default" 0.0;
- align: 0.5 0.5;
+ align: 0.5 0.0;
rel1 {
relative: 0.0 1.0;
offset: 0 -1;
@@ -313,7 +359,7 @@
font: "Vera Bold";
size: 10;
min: 1 1;
- align: 0.5 0.5;
+ align: 0.5 0.0;
text_class: "module_normal";
}
}
All the advantages of Linux Managed Hosting--Without the Cost and Risk!
Fully trained technicians. The highest number of Red Hat certifications in
the hosting industry. Fanatical Support. Click to learn more
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=107521&bid=248729&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
