Enlightenment CVS committal Author : atmosphere Project : e17 Module : apps/entice
Dir : e17/apps/entice/data/themes/default
Modified Files:
default.edc
Log Message:
More content in the theme.
This should really be modified to use macros, it's getting big
Theme now understands EnticeImageModified signals and the save button
returns! It doesn't actually save yet though...
Also the image area expands when the thumbnail area hides
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entice/data/themes/default/default.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- default.edc 14 Oct 2003 13:03:40 -0000 1.2
+++ default.edc 14 Oct 2003 16:39:57 -0000 1.3
@@ -90,9 +90,10 @@
visible, 1;
rel1
{
- relative, 0.0 0.0;
- offset, 100 75;
- to, "bg";
+ relative, 1.0 0.0;
+ offset, 40 75;
+ to_y, "bg";
+ to_x, "EnticeThumbnailArea";
}
rel2
{
@@ -441,7 +442,25 @@
rel2
{
relative, 1.0 0.0;
- offset, 0 68;
+ offset, 0 73;
+ to, "bg";
+ }
+ color, 255 255 255 0;
+ }
+ description
+ {
+ state, "visible" 0.0;
+ visible, 1;
+ rel1
+ {
+ relative, 1.0 0.0;
+ offset, -260 0;
+ to, "bg";
+ }
+ rel2
+ {
+ relative, 1.0 0.0;
+ offset, 0 73;
to, "bg";
}
color, 255 255 255 0;
@@ -844,15 +863,15 @@
visible, 1;
rel1
{
- relative, 0.0 1.0;
- offset, 0 3;
- to, "ButtonPrevImage";
+ relative, 0.0 0.0;
+ offset, -35 0;
+ to, "ButtonZoomNormal";
}
rel2
{
- relative, 1.0 1.0;
- offset, 0 35;
- to, "ButtonPrevImage";
+ relative, 0.0 1.0;
+ offset, -3 0;
+ to, "ButtonZoomNormal";
}
image
{
@@ -865,15 +884,15 @@
visible, 0;
rel1
{
- relative, 0.0 1.0;
- offset, 0 3;
- to, "ButtonPrevImage";
+ relative, 0.0 0.0;
+ offset, -35 0;
+ to, "ButtonZoomNormal";
}
rel2
{
- relative, 1.0 1.0;
- offset, 0 35;
- to, "ButtonPrevImage";
+ relative, 0.0 1.0;
+ offset, -3 0;
+ to, "ButtonZoomNormal";
}
image
{
@@ -893,15 +912,15 @@
visible, 0;
rel1
{
- relative, 0.0 1.0;
- offset, 0 3;
- to, "ButtonPrevImage";
+ relative, 0.0 0.0;
+ offset, -35 0;
+ to, "ButtonZoomNormal";
}
rel2
{
- relative, 1.0 1.0;
- offset, 0 35;
- to, "ButtonPrevImage";
+ relative, 0.0 1.0;
+ offset, -3 0;
+ to, "ButtonZoomNormal";
}
image
{
@@ -914,15 +933,15 @@
visible, 1;
rel1
{
- relative, 0.0 1.0;
- offset, 0 3;
- to, "ButtonPrevImage";
+ relative, 0.0 0.0;
+ offset, -35 0;
+ to, "ButtonZoomNormal";
}
rel2
{
- relative, 1.0 1.0;
- offset, 0 35;
- to, "ButtonPrevImage";
+ relative, 0.0 1.0;
+ offset, -3 0;
+ to, "ButtonZoomNormal";
}
image
{
@@ -942,15 +961,15 @@
visible, 1;
rel1
{
- relative, 1.0 0.0;
- offset, 3 0;
- to, "ButtonSlideShowStart";
+ relative, 0.0 0.0;
+ offset, -35 0;
+ to, "ButtonZoomIn";
}
rel2
{
- relative, 1.0 1.0;
- offset, 35 0;
- to, "ButtonSlideShowStart";
+ relative, 0.0 1.0;
+ offset, -3 0;
+ to, "ButtonZoomIn";
}
image
{
@@ -963,15 +982,15 @@
visible, 1;
rel1
{
- relative, 1.0 0.0;
- offset, 3 0;
- to, "ButtonSlideShowStart";
+ relative, 0.0 0.0;
+ offset, -35 0;
+ to, "ButtonZoomIn";
}
rel2
{
- relative, 1.0 1.0;
- offset, 35 0;
- to, "ButtonSlideShowStart";
+ relative, 0.0 1.0;
+ offset, -3 0;
+ to, "ButtonZoomIn";
}
image
{
@@ -991,15 +1010,15 @@
visible, 1;
rel1
{
- relative, 1.0 0.0;
- offset, 3 0;
- to, "ButtonZoomNormal";
+ relative, 0.0 0.0;
+ offset, -35 0;
+ to, "ButtonZoomOut";
}
rel2
{
- relative, 1.0 1.0;
- offset, 35 0;
- to, "ButtonZoomNormal";
+ relative, 0.0 1.0;
+ offset, -3 0;
+ to, "ButtonZoomOut";
}
image
{
@@ -1012,15 +1031,15 @@
visible, 1;
rel1
{
- relative, 1.0 0.0;
- offset, 3 0;
- to, "ButtonZoomNormal";
+ relative, 0.0 0.0;
+ offset, -35 0;
+ to, "ButtonZoomOut";
}
rel2
{
- relative, 1.0 1.0;
- offset, 35 0;
- to, "ButtonZoomNormal";
+ relative, 0.0 1.0;
+ offset, -3 0;
+ to, "ButtonZoomOut";
}
image
{
@@ -1040,15 +1059,15 @@
visible, 1;
rel1
{
- relative, 1.0 0.0;
- offset, 3 0;
- to, "ButtonZoomIn";
+ relative, 0.0 0.0;
+ offset, -35 0;
+ to, "ButtonExpandImage";
}
rel2
{
- relative, 1.0 1.0;
- offset, 35 0;
- to, "ButtonZoomIn";
+ relative, 0.0 1.0;
+ offset, -3 0;
+ to, "ButtonExpandImage";
}
image
{
@@ -1061,15 +1080,15 @@
visible, 1;
rel1
{
- relative, 1.0 0.0;
- offset, 3 0;
- to, "ButtonZoomIn";
+ relative, 0.0 0.0;
+ offset, -35 0;
+ to, "ButtonExpandImage";
}
rel2
{
- relative, 1.0 1.0;
- offset, 35 0;
- to, "ButtonZoomIn";
+ relative, 0.0 1.0;
+ offset, -3 0;
+ to, "ButtonExpandImage";
}
image
{
@@ -1089,15 +1108,15 @@
visible, 1;
rel1
{
- relative, 1.0 0.0;
- offset, 3 0;
- to, "ButtonZoomOut";
+ relative, 0.0 0.0;
+ offset, -35 0;
+ to, "ButtonFullScreen";
}
rel2
{
- relative, 1.0 1.0;
- offset, 35 0;
- to, "ButtonZoomOut";
+ relative, 0.0 1.0;
+ offset, -3 0;
+ to, "ButtonFullScreen";
}
image
{
@@ -1110,15 +1129,15 @@
visible, 1;
rel1
{
- relative, 1.0 0.0;
- offset, 3 0;
- to, "ButtonZoomOut";
+ relative, 0.0 0.0;
+ offset, -35 0;
+ to, "ButtonFullScreen";
}
rel2
{
- relative, 1.0 1.0;
- offset, 35 0;
- to, "ButtonZoomOut";
+ relative, 0.0 1.0;
+ offset, -3 0;
+ to, "ButtonFullScreen";
}
image
{
@@ -1138,20 +1157,112 @@
visible, 1;
rel1
{
+ relative, 0.0 1.0;
+ offset, 0 3;
+ to, "ButtonExit";
+ }
+ rel2
+ {
+ relative, 1.0 1.0;
+ offset, 0 35;
+ to, "ButtonExit";
+ }
+ image
+ {
+ normal, "bt_full_1.png";
+ }
+ }
+ description
+ {
+ state, "clicked" 0.0;
+ visible, 1;
+ rel1
+ {
+ relative, 0.0 1.0;
+ offset, 0 3;
+ to, "ButtonExit";
+ }
+ rel2
+ {
+ relative, 1.0 1.0;
+ offset, 0 35;
+ to, "ButtonExit";
+ }
+ image
+ {
+ normal, "bt_full_2.png";
+ }
+ }
+ }
+ part
+ {
+ name, "ButtonSaveImage";
+ type, IMAGE;
+ mouse_events, 1;
+ clip_to, "Buttons";
+ description
+ {
+ state, "default" 0.0;
+ visible, 1;
+ rel1
+ {
+ relative, 1.0 0.0;
+ offset, 0 0;
+ to, "ButtonRotateRight";
+ }
+ rel2
+ {
+ relative, 1.0 1.0;
+ offset, 0 0;
+ to, "ButtonRotateRight";
+ }
+ image
+ {
+ normal, "bt_save_1.png";
+ }
+ }
+ description
+ {
+ state, "visible" 0.0;
+ visible, 1;
+ rel1
+ {
relative, 1.0 0.0;
offset, 3 0;
- to, "ButtonExpandImage";
+ to, "ButtonRotateRight";
}
rel2
{
relative, 1.0 1.0;
offset, 35 0;
- to, "ButtonExpandImage";
+ to, "ButtonRotateRight";
}
image
{
- normal, "bt_full_1.png";
+ normal, "bt_save_1.png";
+ }
+ }
+ description
+ {
+ state, "pulsing" 0.0;
+ visible, 1;
+ rel1
+ {
+ relative, 1.0 0.0;
+ offset, 3 0;
+ to, "ButtonRotateRight";
}
+ rel2
+ {
+ relative, 1.0 1.0;
+ offset, 35 0;
+ to, "ButtonRotateRight";
+ }
+ image
+ {
+ normal, "bt_save_1.png";
+ }
+ color, 255 255 255 32;
}
description
{
@@ -1161,17 +1272,17 @@
{
relative, 1.0 0.0;
offset, 3 0;
- to, "ButtonExpandImage";
+ to, "ButtonRotateRight";
}
rel2
{
relative, 1.0 1.0;
offset, 35 0;
- to, "ButtonExpandImage";
+ to, "ButtonRotateRight";
}
image
{
- normal, "bt_full_2.png";
+ normal, "bt_save_2.png";
}
}
}
@@ -1189,13 +1300,13 @@
{
relative, 1.0 0.0;
offset, 3 0;
- to, "ButtonRotateRight";
+ to, "ButtonSaveImage";
}
rel2
{
relative, 1.0 1.0;
offset, 35 0;
- to, "ButtonRotateRight";
+ to, "ButtonSaveImage";
}
image
{
@@ -1210,13 +1321,13 @@
{
relative, 1.0 0.0;
offset, 3 0;
- to, "ButtonRotateRight";
+ to, "ButtonSaveImage";
}
rel2
{
relative, 1.0 1.0;
offset, 35 0;
- to, "ButtonRotateRight";
+ to, "ButtonSaveImage";
}
image
{
@@ -1329,14 +1440,15 @@
{
relative, 1.0 0.0;
offset, 15 10;
- to_y, "Buttons";
+ to_y, "ButtonMouseArea";
to_x, "EnticeThumbnailArea";
}
rel2
{
- relative, 0.0 1.0;
- offset, -15 0;
- to, "Buttons";
+ relative, 0.0 0.0;
+ offset, -15 40;
+ to_x, "Buttons";
+ to_y, "ButtonMouseArea";
}
color, 100 100 100 255;
color3, 229 229 229 255;
@@ -1346,7 +1458,7 @@
font, "Vera";
size, 16;
fit, 0 0;
- align, 1.0, 0.5;
+ align, 1.0, 0.0;
}
}
}
@@ -1589,6 +1701,13 @@
}
program
{
+ name, "SaveImageRequest";
+ signal, "mouse,clicked,1";
+ source, "ButtonSaveImage";
+ action, SIGNAL_EMIT "EnticeSaveCurrent" "";
+ }
+ program
+ {
name, "RotateRightImageRequest";
signal, "mouse,clicked,1";
source, "ButtonRotateRight";
@@ -1660,12 +1779,32 @@
name, "ButtonUnClicked";
signal, "mouse,up,1";
source, "ButtonDeleteImage";
- action, STATE_SET "default" 0.0;
+ action, STATE_SET "visible" 0.0;
transition, DECELERATE 0.25;
target, "ButtonDeleteImage";
}
program
{
+ name, "ButtonClicked";
+ signal, "mouse,down,1";
+ source, "ButtonSaveImage";
+ action, STATE_SET "clicked" 0.0;
+ transition, LINEAR 0.0;
+ target, "ButtonSaveImage";
+ }
+ program
+ {
+ name, "ButtonUnClicked";
+ signal, "mouse,up,1";
+ source, "ButtonSaveImage";
+ action, STATE_SET "default" 0.0;
+ transition, DECELERATE 0.25;
+ target, "ButtonSaveImage";
+ target, "ButtonMouseArea";
+ after, "KillSaveImagePulsing";
+ }
+ program
+ {
name, "ZoomInButtonClicked";
signal, "mouse,clicked,1";
source, "ButtonZoomIn";
@@ -1870,6 +2009,9 @@
transition, DECELERATE 0.2;
target, "EnticeImage";
target, "EnticeImagePreview";
+ target, "ButtonMouseArea";
+ target, "ButtonSaveImage";
+ after, "KillSaveImagePulsing";
}
program
{
@@ -1898,6 +2040,46 @@
action, STATE_SET "visible" 0.0;
transition, ACCELERATE 0.25;
target, "EnticeImagePreview";
+ }
+ program
+ {
+ name, "DisplaySaveImageButton";
+ signal, "EnticeImageModified";
+ source, "";
+ action, STATE_SET "visible" 0.0;
+ transition, LINEAR 0.25;
+ target, "ButtonSaveImage";
+ target, "ButtonMouseArea";
+ after, "EnticeButtonSaveImagePulseUp";
+ }
+ program
+ {
+ name, "EnticeButtonSaveImagePulseUp";
+ signal, "";
+ source, "";
+ action, STATE_SET "pulsing" 0.0;
+ transition, SINUSOIDAL 0.5;
+ target, "ButtonSaveImage";
+ after, "EnticeButtonSaveImagePulseDown";
+ }
+ program
+ {
+ name, "EnticeButtonSaveImagePulseDown";
+ signal, "";
+ source, "";
+ action, STATE_SET "visible" 0.0;
+ transition, SINUSOIDAL 0.5;
+ target, "ButtonSaveImage";
+ after, "EnticeButtonSaveImagePulseUp";
+ }
+ program
+ {
+ name, "KillSaveImagePulsing";
+ signal, "";
+ source, "";
+ action, ACTION_STOP;
+ target, "EnticeButtonSaveImagePulseDown";
+ target, "EnticeButtonSaveImagePulseUp";
}
}
}
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
