Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entrance
Dir : e17/apps/entrance/data/themes/Nebulous
Modified Files:
Nebulous.edc
Log Message:
Use dragables
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/data/themes/Nebulous/Nebulous.edc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Nebulous.edc 22 Oct 2003 15:42:41 -0000 1.6
+++ Nebulous.edc 31 Oct 2003 20:32:45 -0000 1.7
@@ -11,6 +11,7 @@
image, "menu_top_center.png" LOSSY 80;
image, "menu_top_left.png" LOSSY 80;
image, "menu_top_right.png" LOSSY 80;
+ image, "menu.png" LOSSY 80;
}
collections
{
@@ -45,7 +46,7 @@
{
name, "bg";
type, IMAGE;
- mouse_events, 0;
+ mouse_events, 1;
description
{
state, "default" 0.0;
@@ -413,6 +414,102 @@
}
part
{
+ name, "EntranceFaceClip";
+ type, RECT;
+ mouse_events, 1;
+ description
+ {
+ state, "default" 0.0;
+ visible, 1;
+ rel1
+ {
+ relative, 0.5 1.0;
+ offset, -80 -80;
+ to_y, "EntrancePassEntry";
+ }
+ rel2
+ {
+ relative, 0.5 1.0;
+ offset, 80 5;
+ to_y, "EntrancePassEntry";
+ }
+ color, 255 255 255 0;
+ }
+ description
+ {
+ state, "visible" 0.0;
+ visible, 1;
+ rel1
+ {
+ relative, 0.5 1.00;
+ offset, -120 -140;
+ to_y, "EntrancePassEntry";
+ }
+ rel2
+ {
+ relative, 0.5 1.0;
+ offset, 120 5;
+ to_y, "EntrancePassEntry";
+ }
+ color, 255 255 255 255;
+ }
+ }
+ part
+ {
+ name, "EntranceFaceBorder";
+ type, IMAGE;
+ mouse_events, 1;
+ clip_to, "EntranceFaceClip";
+ description
+ {
+ state, "default" 0.0;
+ visible, 1;
+ rel1
+ {
+ relative, 0.0 0.0;
+ offset, 0 0;
+ to, "EntranceFaceClip";
+ }
+ rel2
+ {
+ relative, 1.0 1.0;
+ offset, 0 0;
+ to, "EntranceFaceClip";
+ }
+ image
+ {
+ normal, "menu.png";
+ }
+ border, 20 20 20 20;
+ }
+ }
+ part
+ {
+ name, "EntranceFace";
+ type, RECT;
+ mouse_events, 1;
+ clip_to, "EntranceFaceClip";
+ description
+ {
+ state, "default" 0.0;
+ visible, 1;
+ rel1
+ {
+ relative, 0.0 0.0;
+ offset, 5 20;
+ to, "EntranceFaceClip";
+ }
+ rel2
+ {
+ relative, 1.0 1.0;
+ offset, -5 -20;
+ to, "EntranceFaceClip";
+ }
+ color, 255 255 255 0;
+ }
+ }
+ part
+ {
name, "EntrancePassEntry";
type, TEXT;
mouse_events, 0;
@@ -1056,48 +1153,34 @@
}
part
{
- name, "EntranceUserListClip";
- type, RECT;
- mouse_events, 1;
+ name, "EntranceSessionClip";
+ type, RECT;
+ mouse_events, 0;
description
{
state, "default" 0.0;
visible, 1;
rel1
{
- relative, 1.0 0.0;
- offset, -300 100;
- }
- rel2
- {
- relative, 1.0 0.0;
- offset, -15 200;
- }
- color, 255 255 255 255;
- }
- description
- {
- state, "visible" 0.0;
- visible, 1;
- rel1
- {
- relative, 1.0 0.0;
- offset, -300 100;
+ relative, 0.0 1.0;
+ offset, 25 -53;
+ to, "bg";
}
rel2
{
- relative, 1.0 0.0;
- offset, -15 200;
+ relative, 0.0 1.0;
+ offset, 200 -5;
+ to, "bg";
}
color, 255 255 255 255;
}
}
part
{
- name, "EntranceUserMenuTopLeft";
- type, IMAGE;
+ name, "EntranceSession";
+ type, RECT;
mouse_events, 0;
- clip_to, "EntranceUserListClip";
+ clip_to, "EntranceSessionClip";
description
{
state, "default" 0.0;
@@ -1106,54 +1189,23 @@
{
relative, 0.0 0.0;
offset, 0 0;
- to, "EntranceUserListClip";
- }
- rel2
- {
- relative, 0.0 0.0;
- offset, 5 20;
- to, "EntranceUserListClip";
- }
- image
- {
- normal, "menu_top_left.png";
- }
- }
- }
- part
- {
- name, "EntranceUserMenuTopRight";
- type, IMAGE;
- mouse_events, 0;
- clip_to, "EntranceUserListClip";
- description
- {
- state, "default" 0.0;
- visible, 1;
- rel1
- {
- relative, 1.0 0.0;
- offset, -5 0;
- to, "EntranceUserListClip";
+ to, "EntranceSessionClip";
}
rel2
{
- relative, 1.0 0.0;
- offset, 0 20;
- to, "EntranceUserListClip";
- }
- image
- {
- normal, "menu_top_right.png";
+ relative, 1.0 1.0;
+ offset, 0 0;
+ to, "EntranceSessionClip";
}
+ color, 255 255 255 0;
}
}
part
{
- name, "EntranceUserMenuTopCenter";
- type, IMAGE;
- mouse_events, 0;
- clip_to, "EntranceUserListClip";
+ name, "EntranceSessionMouseArea";
+ type, RECT;
+ mouse_events, 1;
+ clip_to, "EntranceSessionClip";
description
{
state, "default" 0.0;
@@ -1161,173 +1213,122 @@
rel1
{
relative, 0.0 0.0;
- offset, 5 0;
- to, "EntranceUserListClip";
+ offset, 0 0;
+ to, "EntranceSessionClip";
}
rel2
{
- relative, 1.0 0.0;
- offset, -5 20;
- to, "EntranceUserListClip";
- }
- image
- {
- normal, "menu_top_center.png";
+ relative, 1.0 1.0;
+ offset, 0 0;
+ to, "EntranceSessionClip";
}
+ color, 255 255 255 0;
}
}
part
{
- name, "EntranceUserMenuTitle";
- type, TEXT;
+ name, "EntranceSessionListMouseArea";
+ type, RECT;
mouse_events, 1;
- effect, SOFT_SHADOW;
- clip_to, "EntranceUserListClip";
description
{
state, "default" 0.0;
visible, 1;
rel1
{
- relative, 1.0 0.0;
- offset, 2 2;
- to_x, "EntranceUserMenuTopLeft";
- to_y, "EntranceUserMenuTopCenter";
+ relative, 0.0 0.0;
+ offset, 0 0;
}
rel2
{
- relative, 0.0 1.0;
- offset, -2 -2;
- to_x, "EntranceUserMenuTopRight";
- to_y, "EntranceUserMenuTopCenter";
- }
- color, 100 100 100 192;
- color3, 255 255 255 255;
- text
- {
- text, "Users";
- font, "orbit";
- size, 12;
- align, 0.5 0.5;
- fit, 0 0;
+ relative, 0.0 0.0;
+ offset, 0 0;
}
+ color, 255 255 255 0;
}
- }
- part
- {
- name, "EntranceUserMenuBottomCenter";
- type, IMAGE;
- mouse_events, 0;
- clip_to, "EntranceUserListClip";
description
{
- state, "default" 0.0;
+ state, "visible" 0.0;
visible, 1;
rel1
{
- relative, 0.0 1.0;
- offset, 5 -20;
- to, "EntranceUserListClip";
+ relative, 0.0 0.0;
+ offset, 0 0;
+ to, "EntranceSessionClip";
}
rel2
{
relative, 1.0 1.0;
- offset, -5 0;
- to, "EntranceUserListClip";
- }
- image
- {
- normal, "menu_bottom_center.png";
+ offset, 0 0;
+ to, "EntranceSessionClip";
}
+ color, 255 255 255 0;
}
}
part
{
- name, "EntranceUserMenuBottomLeft";
+ name, "EntranceUserMenu";
type, IMAGE;
- mouse_events, 0;
- clip_to, "EntranceUserListClip";
+ mouse_events, 1;
+ dragable
+ {
+ confine, "bg";
+ x, 1 1 0;
+ y, 1 1 0;
+ }
description
{
state, "default" 0.0;
visible, 1;
+ min, 300 90;
rel1
{
- relative, 0.0 1.0;
- offset, 0 -20;
- to, "EntranceUserListClip";
+ relative, 1.0 0.0;
+ offset, -300 0;
+ to, "bg";
}
rel2
{
- relative, 0.0 1.0;
- offset, 5 0;
- to, "EntranceUserListClip";
+ relative, 1.0 0.0;
+ offset, 0 120;
+ to, "bg";
}
image
{
- normal, "menu_bottom_left.png";
+ normal, "menu.png";
}
+ border, 20 20 20 20;
}
- }
- part
- {
- name, "EntranceUserMenuBottomRight";
- type, IMAGE;
- mouse_events, 0;
- clip_to, "EntranceUserListClip";
description
{
- state, "default" 0.0;
+ state, "hidden" 0.0;
visible, 1;
+ min, 300 40;
rel1
{
- relative, 1.0 1.0;
- offset, -5 -20;
- to, "EntranceUserListClip";
+ relative, 0.5 0.5;
+ offset, 0 0;
+ to, "bg";
}
rel2
{
- relative, 1.0 1.0;
+ relative, 0.5 0.5;
offset, 0 0;
- to, "EntranceUserListClip";
+ to, "bg";
}
image
{
- normal, "menu_bottom_right.png";
+ normal, "menu.png";
}
+ border, 20 20 20 20;
}
}
part
{
- name, "EntranceUserMenu";
- type, RECT;
+ name, "EntranceUserMenuTitle";
+ type, TEXT;
mouse_events, 0;
- clip_to, "EntranceUserListClip";
- description
- {
- state, "default" 0.0;
- visible, 1;
- rel1
- {
- relative, 0.0 0.0;
- offset, 1 20;
- to, "EntranceUserListClip";
- }
- rel2
- {
- relative, 1.0 1.0;
- offset, -1 -20;
- to, "EntranceUserListClip";
- }
- color, 255 255 255 64;
- }
- }
- part
- {
- name, "EntranceUserList";
- type, RECT;
- mouse_events, 1;
- clip_to, "EntranceUserListClip";
+ effect, SOFT_SHADOW;
description
{
state, "default" 0.0;
@@ -1335,73 +1336,32 @@
rel1
{
relative, 0.0 0.0;
- offset, 5 5;
+ offset, 2 2;
to, "EntranceUserMenu";
}
rel2
{
- relative, 1.0 1.0;
- offset, 5 -5;
+ relative, 1.0 0.0;
+ offset, -2 30;
to, "EntranceUserMenu";
}
- color, 255 255 255 0;
- }
- }
- part
- {
- name, "EntranceSessionClip";
- type, RECT;
- mouse_events, 0;
- description
- {
- state, "default" 0.0;
- visible, 1;
- rel1
- {
- relative, 0.0 1.0;
- offset, 25 -53;
- to, "bg";
- }
- rel2
- {
- relative, 0.0 1.0;
- offset, 200 -5;
- to, "bg";
- }
- color, 255 255 255 255;
- }
- }
- part
- {
- name, "EntranceSession";
- type, RECT;
- mouse_events, 0;
- clip_to, "EntranceSessionClip";
- description
- {
- state, "default" 0.0;
- visible, 1;
- rel1
- {
- relative, 0.0 0.0;
- offset, 0 0;
- to, "EntranceSessionClip";
- }
- rel2
+ color, 100 100 100 192;
+ color3, 255 255 255 255;
+ text
{
- relative, 1.0 1.0;
- offset, 0 0;
- to, "EntranceSessionClip";
+ text, "Users";
+ font, "orbit";
+ size, 12;
+ align, 0.5 0.0;
+ fit, 0 0;
}
- color, 255 255 255 0;
}
}
part
{
- name, "EntranceSessionMouseArea";
+ name, "EntranceUserList";
type, RECT;
mouse_events, 1;
- clip_to, "EntranceSessionClip";
description
{
state, "default" 0.0;
@@ -1409,75 +1369,14 @@
rel1
{
relative, 0.0 0.0;
- offset, 0 0;
- to, "EntranceSessionClip";
+ offset, 5 25;
+ to, "EntranceUserMenu";
}
rel2
{
relative, 1.0 1.0;
- offset, 0 0;
- to, "EntranceSessionClip";
- }
- color, 255 255 255 0;
- }
- }
- part
- {
- name, "EntranceFaceClip";
- type, RECT;
- mouse_events, 1;
- description
- {
- state, "default" 0.0;
- visible, 1;
- rel1
- {
- relative, 0.5 0.8;
- offset, -80 0;
- }
- rel2
- {
- relative, 0.5 0.8;
- offset, 80 70;
- }
- color, 255 255 255 0;
- }
- description
- {
- state, "visible" 0.0;
- visible, 1;
- rel1
- {
- relative, 0.5 0.8;
- offset, -80 0;
- }
- rel2
- {
- relative, 0.5 0.8;
- offset, 80 70;
- }
- color, 255 255 255 255;
- }
- }
- part
- {
- name, "EntranceFace";
- type, RECT;
- mouse_events, 1;
- clip_to, "EntranceFaceClip";
- description
- {
- state, "default" 0.0;
- visible, 1;
- rel1
- {
- relative, 0.5 0.8;
- offset, -80 0;
- }
- rel2
- {
- relative, 0.5 0.8;
- offset, 80 70;
+ offset, -5 -25;
+ to, "EntranceUserMenu";
}
color, 255 255 255 0;
}
@@ -1630,6 +1529,7 @@
source, "EntranceSessionMouseArea";
action, STATE_SET "visible" 0.0;
target, "EntranceSessionListClip";
+ target, "EntranceSessionListMouseArea";
transition, LINEAR 0.5;
}
program
@@ -1639,6 +1539,7 @@
source, "";
action, STATE_SET "default" 0.0;
target, "EntranceSessionListClip";
+ target, "EntranceSessionListMouseArea";
transition, SINUSOIDAL 0.5;
}
program
@@ -1668,6 +1569,26 @@
target, "EntranceFaceClip";
transition, SINUSOIDAL 0.5;
}
+ /*
+ program
+ {
+ name, "HideUsersMenu";
+ signal, "mouse,in";
+ source, "bg";
+ action, STATE_SET "hidden" 0.0;
+ target, "EntranceUserMenu";
+ transition, LINEAR 0.3;
+ }
+ program
+ {
+ name, "ShowUsersMenu";
+ signal, "mouse,in";
+ source, "EntranceUserMenu";
+ action, STATE_SET "default" 0.0;
+ target, "EntranceUserMenu";
+ transition, LINEAR 0.3;
+ }
+ */
}
}
group
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
