Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entrance
Dir : e17/apps/entrance/data/themes/Nebulous
Modified Files:
Nebulous.edc
Log Message:
I broke my theme, but it's necessary for incoming code.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/data/themes/Nebulous/Nebulous.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Nebulous.edc 16 Oct 2003 03:30:20 -0000 1.1
+++ Nebulous.edc 21 Oct 2003 05:09:35 -0000 1.2
@@ -6,17 +6,12 @@
image, "e_logo.png" LOSSY 80;
image, "e_logo_bg.jpg" LOSSY 80;
image, "menu.png" LOSSY 80;
- image, "default.png" LOSSY 80;
- image, "gnome.png" LOSSY 80;
- image, "kde.png" LOSSY 80;
- image, "blackbox.png" LOSSY 80;
- image, "failsafe.png" LOSSY 80;
}
collections
{
group
{
- name, "main";
+ name, "Main";
parts
{
part
@@ -741,8 +736,8 @@
}
part
{
- name, "EntranceSessionMenu";
- type, IMAGE;
+ name, "EntranceSessionListClip";
+ type, RECT;
mouse_events, 1;
description
{
@@ -760,47 +755,48 @@
offset, 0 0;
to, "bg";
}
- image
- {
- normal, "menu.png";
- }
+ color, 255 255 255 0;
}
description
{
- state, "default" 0.5;
+ state, "visible" 0.0;
visible, 1;
rel1
{
- relative, 0.5 0.75;
- offset, 0 0;
+ relative, 0.5 0.5;
+ offset, -100 -200;
to, "bg";
}
rel2
{
- relative, 0.5 0.75;
- offset, 0 0;
+ relative, 0.5 0.5;
+ offset, 100 200;
to, "bg";
}
- image
- {
- normal, "menu.png";
- }
+ color, 255 255 255 255;
}
+ }
+ part
+ {
+ name, "EntranceSessionMenu";
+ type, IMAGE;
+ mouse_events, 1;
+ clip_to, "EntranceSessionListClip";
description
{
- state, "default" 1.0;
+ state, "default" 0.0;
visible, 1;
rel1
{
- relative, 0.0 0.5;
- offset, 20 -150;
- to, "bg";
+ relative, 0.0 0.0;
+ offset, 0 0;
+ to, "EntranceSessionListClip";
}
rel2
{
- relative, 0.0 0.5;
- offset, 200 150;
- to, "bg";
+ relative, 1.0 1.0;
+ offset, 0 0;
+ to, "EntranceSessionListClip";
}
image
{
@@ -810,142 +806,34 @@
}
part
{
- name, "EntranceSessionIcon";
- type, IMAGE;
- mouse_events, 0;
+ name, "EntranceSessionList";
+ type, RECT;
+ mouse_events, 1;
+ clip_to, "EntranceSessionListClip";
description
{
state, "default" 0.0;
visible, 1;
rel1
{
- relative, 0.0 1.0;
- offset, 20 -53;
- to, "bg";
- }
- rel2
- {
- relative, 0.0 1.0;
- offset, 68 -5;
- to, "bg";
- }
- image
- {
- normal, "default.png";
- }
- }
- description
- {
- state, "SessionEnlightenment" 0.0;
- visible, 1;
- rel1
- {
- relative, 0.0 1.0;
- offset, 20 -53;
- to, "bg";
- }
- rel2
- {
- relative, 0.0 1.0;
- offset, 68 -5;
- to, "bg";
- }
- image
- {
- normal, "e.png";
- }
- }
- description
- {
- state, "SessionBlackbox" 0.0;
- visible, 1;
- rel1
- {
- relative, 0.0 1.0;
- offset, 20 -53;
- to, "bg";
- }
- rel2
- {
- relative, 0.0 1.0;
- offset, 68 -5;
- to, "bg";
- }
- image
- {
- normal, "blackbox.png";
- }
- }
- description
- {
- state, "SessionKDE" 0.0;
- visible, 1;
- rel1
- {
- relative, 0.0 1.0;
- offset, 20 -53;
- to, "bg";
- }
- rel2
- {
- relative, 0.0 1.0;
- offset, 68 -5;
- to, "bg";
- }
- image
- {
- normal, "kde.png";
- }
- }
- description
- {
- state, "SessionGnome" 0.0;
- visible, 1;
- rel1
- {
- relative, 0.0 1.0;
- offset, 20 -53;
- to, "bg";
- }
- rel2
- {
- relative, 0.0 1.0;
- offset, 68 -5;
- to, "bg";
- }
- image
- {
- normal, "gnome.png";
- }
- }
- description
- {
- state, "SessionFailsafe" 0.0;
- visible, 1;
- rel1
- {
- relative, 0.0 1.0;
- offset, 20 -53;
- to, "bg";
+ relative, 0.0 0.0;
+ offset, 0 35;
+ to, "EntranceSessionMenu";
}
rel2
{
- relative, 0.0 1.0;
- offset, 68 -5;
- to, "bg";
- }
- image
- {
- normal, "failsafe.png";
+ relative, 1.0 1.0;
+ offset, 0 0;
+ to, "EntranceSessionMenu";
}
+ color, 255 255 255 0;
}
}
part
{
- name, "EntranceSession";
- type, TEXT;
+ name, "EntranceUserListClip";
+ type, RECT;
mouse_events, 1;
- effect, SOFT_SHADOW;
description
{
state, "default" 0.0;
@@ -953,488 +841,111 @@
rel1
{
relative, 1.0 0.5;
- offset, 5 -20;
- to, "EntranceSessionIcon";
- }
- rel2
- {
- relative, 1.0 0.5;
- offset, 400 20;
- to, "EntranceSessionIcon";
- }
- color, 100 100 100 192;
- color3, 227 227 227 192;
- text
- {
- text, "Default";
- font, "orbit";
- size, 20;
- fit, 0 0;
- align, 0.0 0.0;
- }
- }
- description
- {
- state, "SessionEnlightenment" 0.0;
- visible, 1;
- rel1
- {
- relative, 1.0 0.5;
- offset, 5 -20;
- to, "EntranceSessionIcon";
+ offset, -125 -75;
}
rel2
{
relative, 1.0 0.5;
- offset, 400 20;
- to, "EntranceSessionIcon";
- }
- color, 100 100 100 192;
- color3, 227 227 227 192;
- text
- {
- text, "Enlightenment";
- font, "orbit";
- size, 20;
- fit, 0 0;
- align, 0.0 0.0;
+ offset, -15 75;
}
+ color, 255 255 255 255;
}
description
{
- state, "SessionGnome" 0.0;
+ state, "visible" 0.0;
visible, 1;
rel1
{
relative, 1.0 0.5;
- offset, 5 -20;
- to, "EntranceSessionIcon";
+ offset, -125 -75;
}
rel2
{
relative, 1.0 0.5;
- offset, 400 20;
- to, "EntranceSessionIcon";
- }
- color, 100 100 100 192;
- color3, 227 227 227 192;
- text
- {
- text, "Gnome";
- font, "orbit";
- size, 20;
- fit, 0 0;
- align, 0.0 0.5;
+ offset, -15 75;
}
+ color, 255 255 255 255;
}
+ }
+ part
+ {
+ name, "EntranceUserMenu";
+ type, IMAGE;
+ mouse_events, 1;
+ clip_to, "EntranceUserListClip";
description
{
- state, "SessionKDE" 0.0;
+ state, "default" 0.0;
visible, 1;
rel1
{
- relative, 1.0 0.5;
- offset, 5 -20;
- to, "EntranceSessionIcon";
+ relative, 0.0 0.0;
+ offset, 0 0;
+ to, "EntranceUserListClip";
}
rel2
{
- relative, 1.0 0.5;
- offset, 400 20;
- to, "EntranceSessionIcon";
+ relative, 1.0 1.0;
+ offset, 0 0;
+ to, "EntranceUserListClip";
}
- color, 100 100 100 192;
- color3, 227 227 227 192;
- text
+ image
{
- text, "KDE";
- font, "orbit";
- size, 20;
- fit, 0 0;
- align, 0.0 0.5;
+ normal, "menu.png";
}
}
+ }
+ part
+ {
+ name, "EntranceUserList";
+ type, RECT;
+ mouse_events, 1;
+ clip_to, "EntranceUserListClip";
description
{
- state, "SessionBlackbox" 0.0;
+ state, "default" 0.0;
visible, 1;
rel1
{
- relative, 1.0 0.5;
- offset, 5 -20;
- to, "EntranceSessionIcon";
+ relative, 0.0 0.0;
+ offset, 0 35;
+ to, "EntranceUserMenu";
}
rel2
{
- relative, 1.0 0.5;
- offset, 400 20;
- to, "EntranceSessionIcon";
- }
- color, 100 100 100 192;
- color3, 227 227 227 192;
- text
- {
- text, "Blackbox";
- font, "orbit";
- size, 20;
- fit, 0 0;
- align, 0.0 0.5;
+ relative, 1.0 1.0;
+ offset, 0 0;
+ to, "EntranceUserMenu";
}
+ color, 255 255 255 0;
}
+ }
+ part
+ {
+ name, "EntranceSession";
+ type, RECT;
+ mouse_events, 1;
description
{
- state, "SessionFailsafe" 0.0;
+ state, "default" 0.0;
visible, 1;
rel1
{
- relative, 1.0 0.5;
- offset, 5 -20;
- to, "EntranceSessionIcon";
+ relative, 0.8 0.0;
+ offset, 0 6;
+ to, "bg";
}
rel2
{
- relative, 1.0 0.5;
- offset, 400 20;
- to, "EntranceSessionIcon";
- }
- color, 100 100 100 192;
- color3, 227 227 227 192;
- text
- {
- text, "Failsafe";
- font, "orbit";
- size, 20;
- fit, 0 0;
- align, 0.0 0.5;
- }
- }
- }
- part
- {
- name, "SessionEnlightenment";
- type, TEXT
- mouse_events, 1
- effect, SOFT_SHADOW;
- description
- {
- state, "default" 0.0;
- visible, 0;
- rel1 { relative, 0.0 0.0; offset, 20 40; to,
"EntranceSessionMenu"; }
- rel2 { relative, 1.0 0.0; offset, 0 70; to, "EntranceSessionMenu";
}
- color, 100 100 100 192;
- color3, 0 0 0 192;
- text
- {
- text, "Enlightenment";
- font, "orbit";
- size, "18";
- fit, 0 0;
- align, 0.0 0.5;
- }
- }
- description
- {
- state, "visible" 0.0;
- visible, 1;
- color, 100 100 100 192;
- color3, 227 227 227 192;
- rel1 { relative, 0.0 0.0; offset, 20 40; to,
"EntranceSessionMenu"; }
- rel2 { relative, 1.0 0.0; offset, 0 70; to, "EntranceSessionMenu";
}
- text
- {
- text, "Enlightenment";
- font, "orbit";
- size, "18";
- fit, 0 0;
- align, 0.0 0.5;
- }
- }
- }
- part
- {
- name, "SessionGnome";
- type, TEXT
- mouse_events, 1
- effect, SOFT_SHADOW;
- description
- {
- state, "default" 0.0;
- visible, 0;
- rel1 {
- relative, 0.0 1.0;
- offset, 0 10;
- to, "SessionEnlightenment";
- }
- rel2 {
- relative, 1.0 1.0;
- offset, 0 40;
- to, "SessionEnlightenment";
- }
- color, 100 100 100 192;
- color3, 0 0 0 192;
- text
- {
- text, "Gnome";
- font, "orbit";
- size, "18";
- fit, 0 0;
- align, 0.0 0.5;
- }
- }
- description
- {
- state, "visible" 0.0;
- visible, 1;
- rel1 {
- relative, 0.0 1.0;
- offset, 0 10;
- to, "SessionEnlightenment";
- }
- rel2 {
- relative, 1.0 1.0;
- offset, 0 40;
- to, "SessionEnlightenment";
- }
- color, 100 100 100 192;
- color3, 227 227 227 192;
- text
- {
- text, "Gnome";
- font, "orbit";
- size, "18";
- fit, 0 0;
- align, 0.0 0.5;
- }
- }
- }
- part
- {
- name, "SessionKDE";
- type, TEXT
- mouse_events, 1
- effect, SOFT_SHADOW;
- description
- {
- state, "default" 0.0;
- visible, 0;
- rel1 {
- relative, 0.0 1.0;
- offset, 0 10;
- to, "SessionGnome";
- }
- rel2 {
- relative, 1.0 1.0;
- offset, 0 40;
- to, "SessionGnome";
- }
- color, 100 100 100 192;
- color3, 0 0 0 192;
- text
- {
- text, "KDE";
- font, "orbit";
- size, "18";
- fit, 0 0;
- align, 0.0 0.5;
- }
- }
- description
- {
- state, "visible" 0.0;
- visible, 1;
- rel1 {
- relative, 0.0 1.0;
- offset, 0 10;
- to, "SessionGnome";
- }
- rel2 {
- relative, 1.0 1.0;
- offset, 0 40;
- to, "SessionGnome";
- }
- color, 100 100 100 192;
- color3, 227 227 227 192;
- text
- {
- text, "KDE";
- font, "orbit";
- size, "18";
- fit, 0 0;
- align, 0.0 0.5;
- }
- }
- }
- part
- {
- name, "SessionBlackbox";
- type, TEXT
- mouse_events, 1
- effect, SOFT_SHADOW;
- description
- {
- state, "default" 0.0;
- visible, 0;
- rel1 {
- relative, 0.0 1.0;
- offset, 0 10;
- to, "SessionKDE";
- }
- rel2 {
- relative, 1.0 1.0;
- offset, 0 40;
- to, "SessionKDE";
- }
- color, 100 100 100 192;
- color3, 0 0 0 192;
- text
- {
- text, "Blackbox";
- font, "orbit";
- size, "18";
- fit, 0 0;
- align, 0.0 0.5;
- }
- }
- description
- {
- state, "visible" 0.0;
- visible, 1;
- rel1 {
- relative, 0.0 1.0;
- offset, 0 10;
- to, "SessionKDE";
- }
- rel2 {
- relative, 1.0 1.0;
- offset, 0 40;
- to, "SessionKDE";
- }
- color, 100 100 100 192;
- color3, 227 227 227 192;
- text
- {
- text, "Blackbox";
- font, "orbit";
- size, "18";
- fit, 0 0;
- align, 0.0 0.5;
- }
- }
- }
- part
- {
- name, "SessionDefault";
- type, TEXT
- mouse_events, 1
- effect, SOFT_SHADOW;
- description
- {
- state, "default" 0.0;
- visible, 0;
- rel1 {
- relative, 0.0 1.0;
- offset, 0 10;
- to, "SessionBlackbox";
- }
- rel2 {
- relative, 1.0 1.0;
- offset, 0 40;
- to, "SessionBlackbox";
- }
- color, 100 100 100 192;
- color3, 0 0 0 192;
- text
- {
- text, "Default";
- font, "orbit";
- size, "18";
- fit, 0 0;
- align, 0.0 0.5;
- }
- }
- description
- {
- state, "visible" 0.0;
- visible, 1;
- rel1 {
- relative, 0.0 1.0;
- offset, 0 10;
- to, "SessionBlackbox";
- }
- rel2 {
- relative, 1.0 1.0;
- offset, 0 40;
- to, "SessionBlackbox";
- }
- color, 100 100 100 192;
- color3, 227 227 227 192;
- text
- {
- text, "Default";
- font, "orbit";
- size, "18";
- fit, 0 0;
- align, 0.0 0.5;
- }
- }
- }
- part
- {
- name, "SessionFailsafe";
- type, TEXT
- mouse_events, 1
- effect, SOFT_SHADOW;
- description
- {
- state, "default" 0.0;
- visible, 0;
- rel1 {
- relative, 0.0 1.0;
- offset, 0 10;
- to, "SessionDefault";
- }
- rel2 {
- relative, 1.0 1.0;
- offset, 0 40;
- to, "SessionDefault";
- }
- color, 100 100 100 192;
- color3, 0 0 0 192;
- text
- {
- text, "Failsafe";
- font, "orbit";
- size, "18";
- fit, 0 0;
- align, 0.0 0.5;
- }
- }
- description
- {
- state, "visible" 0.0;
- visible, 1;
- rel1 {
- relative, 0.0 1.0;
- offset, 0 10;
- to, "SessionDefault";
- }
- rel2 {
- relative, 1.0 1.0;
- offset, 0 40;
- to, "SessionDefault";
- }
- color, 100 100 100 192;
- color3, 227 227 227 192;
- text
- {
- text, "Failsafe";
- font, "orbit";
- size, "18";
- fit, 0 0;
- align, 0.0 0.5;
+ relative, 1.0 0.0;
+ offset, -10 70;
+ to, "bg";
}
}
}
+ // TODO
+ // EntranceUserList
+ // Callback for Entrance[Session|User]List
}
programs
{
@@ -1569,98 +1080,96 @@
name, "ShowSessionChooser";
signal, "mouse,up,1";
source, "EntranceSession";
- action, STATE_SET "default" 1.0;
- target, "EntranceSessionMenu";
- transition, SINUSOIDAL 0.75;
- }
- program
- {
- name, "ShowSessions";
- signal, "mouse,up,1";
- source, "EntranceSession";
action, STATE_SET "visible" 0.0;
- target, "SessionEnlightenment";
- target, "SessionBlackbox";
- target, "SessionKDE";
- target, "SessionGnome";
- target, "SessionDefault";
- target, "SessionFailsafe";
- transition, SINUSOIDAL 1.5;
+ target, "EntranceSessionListClip";
+ transition, SINUSOIDAL 0.75;
}
program
{
name, "SelectSession";
- signal, "mouse,up,1";
- source, "Session*";
+ signal, "";
+ source, "";
action, STATE_SET "default" 0.0;
- target, "SessionEnlightenment";
- target, "SessionBlackbox";
- target, "SessionKDE";
- target, "SessionGnome";
- target, "SessionDefault";
- target, "SessionFailsafe";
- target, "EntranceSessionMenu";
- transition, SINUSOIDAL 0.5;
- }
- program
- {
- name, "SelectSessionKDE";
- signal, "mouse,up,1";
- source, "SessionKDE";
- action, STATE_SET "SessionKDE" 0.0;
target, "EntranceSession";
- target, "EntranceSessionIcon";
- transition, SINUSOIDAL 1.0;
- }
- program
- {
- name, "SelectSessionGnome";
- signal, "mouse,up,1";
- source, "SessionGnome";
- action, STATE_SET "SessionGnome" 0.0;
- target, "EntranceSession";
- target, "EntranceSessionIcon";
- transition, SINUSOIDAL 1.0;
+ transition, SINUSOIDAL 0.5;
}
- program
+ }
+ }
+ group
+ {
+ name, "Session";
+ parts
+ {
+ part
{
- name, "SelectSessionBlackbox";
- signal, "mouse,up,1";
- source, "SessionBlackbox";
- action, STATE_SET "SessionBlackbox" 0.0;
- target, "EntranceSession";
- target, "EntranceSessionIcon";
- transition, SINUSOIDAL 1.0;
+ name, "EntranceSessionIcon";
+ type, RECT;
+ mouse_events, 1;
+ description
+ {
+ state, "default" 0.0;
+ visible, 1;
+ rel1
+ {
+ relative, 0.0 0.0;
+ offset, 2 2;
+ }
+ rel2
+ {
+ relative, 0.0 1.0;
+ offset, 66 -2;
+ }
+ color, 255 255 255 255;
+ }
}
- program
+ part
{
- name, "SelectSessionEnlightenment";
- signal, "mouse,up,1";
- source, "SessionEnlightenment";
- action, STATE_SET "SessionEnlightenment" 0.0;
- target, "EntranceSession";
- target, "EntranceSessionIcon";
- transition, SINUSOIDAL 1.0;
+ name, "EntranceSessionTitle";
+ type, TEXT;
+ mouse_events, 1;
+ effect, SOFT_SHADOW;
+ description
+ {
+ state, "default" 0.0;
+ visible, 1;
+ rel1
+ {
+ relative, 1.0 0.0;
+ offset, 2 2;
+ to_x, "EntranceSessionIcon";
+ }
+ rel2
+ {
+ relative, 1.0 1.0;
+ offset, -2 -2;
+ }
+ color, 100 100 100 255;
+ text
+ {
+ text, "Doesn't Matter";
+ font, "orbit";
+ size, 10;
+ align, 1.0 0.5;
+ fit, 0 0;
+ }
+ }
}
+ }
+ programs
+ {
program
{
- name, "SelectSessionDefault";
- signal, "mouse,up,1";
- source, "SessionDefault";
- action, STATE_SET "default" 0.0;
- target, "EntranceSession";
- target, "EntranceSessionIcon";
- transition, SINUSOIDAL 1.0;
+ name, "SessionIconClicked";
+ signal, "mouse,clicked,1";
+ source, "EntranceSessionIcon";
+ action, SIGNAL_EMIT "SessionSelected" "";
}
program
{
- name, "SelectSessionFailsafe";
- signal, "mouse,up,1";
- source, "SessionFailsafe";
- action, STATE_SET "SessionFailsafe" 0.0;
- target, "EntranceSession";
- target, "EntranceSessionIcon";
- transition, SINUSOIDAL 1.0;
+ name, "SessionTitleClicked";
+ signal, "mouse,clicked,1";
+ source, "EntranceSessionTitle";
+ action, SIGNAL_EMIT "SessionSelected" "";
}
}
}
-------------------------------------------------------
This SF.net email is sponsored by OSDN developer relations
Here's your chance to show off your extensive product knowledge
We want to know what you know. Tell us and you have a chance to win $100
http://www.zoomerang.com/survey.zgi?HRPT1X3RYQNC5V4MLNSV3E54
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
