Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto_browsing.c ephoto_presentation.c ephoto_misc.c
Log Message:
More zoom fixup. Also made sure we disabled the slideshow and presentation when
we need to, and enable them when we need to.
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_browsing.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- ephoto_browsing.c 22 May 2006 05:08:23 -0000 1.33
+++ ephoto_browsing.c 23 May 2006 01:07:26 -0000 1.34
@@ -331,6 +331,12 @@
if ( strcmp(name, name2) == 0 ) {
ecore_dlist_remove(m->imagelist);
slidenum--;
+ if ( ecore_dlist_is_empty(m->imagelist) ) {
+ ewl_widget_disable(m->slideshow);
+ ewl_widget_disable(m->presentation);
+ ewl_widget_state_set(m->slideshow, "disabled");
+ ewl_widget_state_set(m->presentation,
"disabled");
+ }
}
else {
ecore_dlist_next(m->imagelist);
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_presentation.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ephoto_presentation.c 23 May 2006 00:30:17 -0000 1.19
+++ ephoto_presentation.c 23 May 2006 01:07:26 -0000 1.20
@@ -29,17 +29,32 @@
ewl_image_proportional_set(EWL_IMAGE(s->screen), TRUE);
ewl_theme_data_str_set(s->screen, "/image/group", "entry");
ewl_image_file_set(EWL_IMAGE(s->screen), picture1, NULL);
- ewl_object_alignment_set(EWL_OBJECT(s->screen), EWL_FLAG_ALIGN_CENTER);
- if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->zoom)) == 1 ||
- argzoom == 1 ) {
- ewl_object_fill_policy_set(EWL_OBJECT(s->screen),
- EWL_FLAG_FILL_ALL);
- ewl_image_proportional_set(EWL_IMAGE(s->screen), FALSE);
- }
- else {
- ewl_object_fill_policy_set(EWL_OBJECT(s->screen),
- EWL_FLAG_FILL_SHRINK);
+ if ( mainwin == 1 ) {
+ if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->zoom))
+ == 1) {
+ ewl_object_fill_policy_set(EWL_OBJECT(s->screen),
+ EWL_FLAG_FILL_ALL);
+ ewl_image_proportional_set(EWL_IMAGE(s->screen),
FALSE);
+ }
+ else {
+ ewl_object_fill_policy_set(EWL_OBJECT(s->screen),
+ EWL_FLAG_FILL_SHRINK);
+ ewl_image_proportional_set(EWL_IMAGE(s->screen), TRUE);
+ }
+ }
+ if ( mainwin == 0 ) {
+ if ( argzoom == 1 ) {
+ ewl_object_fill_policy_set(EWL_OBJECT(s->screen),
+ EWL_FLAG_FILL_ALL);
+ ewl_image_proportional_set(EWL_IMAGE(s->screen),
FALSE);
+ }
+ else {
+ ewl_object_fill_policy_set(EWL_OBJECT(s->screen),
+ EWL_FLAG_FILL_SHRINK);
+ ewl_image_proportional_set(EWL_IMAGE(s->screen), TRUE);
+ }
}
+ ewl_object_alignment_set(EWL_OBJECT(s->screen), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(s->cell), s->screen);
ewl_widget_show(s->screen);
@@ -57,20 +72,19 @@
ewl_image_proportional_set(EWL_IMAGE(s->screen),
TRUE);
ewl_theme_data_str_set(s->screen,
- "/image/group", "entry");
- if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON
- (m->zoom)) == 1 ||
- argzoom == 1 ) {
- ewl_object_fill_policy_set(EWL_OBJECT
- (s->screen), EWL_FLAG_FILL_ALL);
- ewl_image_proportional_set(EWL_IMAGE
- (s->screen), FALSE);
- }
- else {
- ewl_object_fill_policy_set(EWL_OBJECT
- (s->screen),
- EWL_FLAG_FILL_SHRINK);
- }
+ "/image/group", "enttry");
+ if ( argzoom == 1 ) {
+ ewl_object_fill_policy_set(EWL_OBJECT
+ (s->screen),
EWL_FLAG_FILL_ALL);
+
ewl_image_proportional_set(EWL_IMAGE(s->screen),
+
FALSE);
+ }
+ else {
+ ewl_object_fill_policy_set(EWL_OBJECT
+ (s->screen),
EWL_FLAG_FILL_SHRINK);
+
ewl_image_proportional_set(EWL_IMAGE(s->screen),
+
TRUE);
+ }
ewl_image_file_set(EWL_IMAGE(s->screen),
picture2, NULL);
ewl_object_alignment_set(EWL_OBJECT(s->screen),
@@ -99,19 +113,19 @@
TRUE);
ewl_theme_data_str_set(s->screen,
"/image/group", "entry");
- if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON
- (m->zoom)) == 1 ||
- argzoom == 1 ) {
- ewl_object_fill_policy_set(EWL_OBJECT
- (s->screen), EWL_FLAG_FILL_ALL);
- ewl_image_proportional_set(EWL_IMAGE
- (s->screen), FALSE);
- }
- else {
- ewl_object_fill_policy_set(EWL_OBJECT
- (s->screen),
- EWL_FLAG_FILL_SHRINK);
- }
+ if ( ewl_checkbutton_is_checked
+ (EWL_CHECKBUTTON(m->zoom)) ==
1) {
+ ewl_object_fill_policy_set(EWL_OBJECT
+ (s->screen),
EWL_FLAG_FILL_ALL);
+
ewl_image_proportional_set(EWL_IMAGE(s->screen),
+
FALSE);
+ }
+ else {
+ ewl_object_fill_policy_set(EWL_OBJECT
+ (s->screen),
EWL_FLAG_FILL_SHRINK);
+
ewl_image_proportional_set(EWL_IMAGE(s->screen),
+
TRUE);
+ }
ewl_image_file_set(EWL_IMAGE(s->screen),
picture2, NULL);
ewl_object_alignment_set(EWL_OBJECT(s->screen),
@@ -286,16 +300,31 @@
ewl_theme_data_str_set(s->screen, "/image/group", "entry");
ewl_image_file_set(EWL_IMAGE(s->screen), pic1, NULL);
ewl_object_alignment_set(EWL_OBJECT(s->screen), EWL_FLAG_ALIGN_CENTER);
- if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->zoom)) == 1 ||
- argzoom == 1 ) {
- ewl_object_fill_policy_set(EWL_OBJECT(s->screen),
- EWL_FLAG_FILL_ALL);
- ewl_image_proportional_set(EWL_IMAGE(s->screen), FALSE);
- }
- else {
- ewl_object_fill_policy_set(EWL_OBJECT(s->screen),
- EWL_FLAG_FILL_SHRINK);
- }
+ if ( mainwin == 1 ) {
+ if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->zoom))
+ == 1) {
+ ewl_object_fill_policy_set(EWL_OBJECT(s->screen),
+ EWL_FLAG_FILL_ALL);
+ ewl_image_proportional_set(EWL_IMAGE(s->screen),
FALSE);
+ }
+ else {
+ ewl_object_fill_policy_set(EWL_OBJECT(s->screen),
+ EWL_FLAG_FILL_SHRINK);
+ ewl_image_proportional_set(EWL_IMAGE(s->screen), TRUE);
+ }
+ }
+ if ( mainwin == 0 ) {
+ if ( argzoom == 1 ) {
+ ewl_object_fill_policy_set(EWL_OBJECT(s->screen),
+ EWL_FLAG_FILL_ALL);
+ ewl_image_proportional_set(EWL_IMAGE(s->screen),
FALSE);
+ }
+ else {
+ ewl_object_fill_policy_set(EWL_OBJECT(s->screen),
+ EWL_FLAG_FILL_SHRINK);
+ ewl_image_proportional_set(EWL_IMAGE(s->screen), TRUE);
+ }
+ }
ewl_container_child_append(EWL_CONTAINER(s->cell), s->screen);
ewl_widget_show(s->screen);
return;
@@ -318,16 +347,31 @@
p->imagep = ewl_image_new();
ewl_image_proportional_set(EWL_IMAGE(p->imagep), TRUE);
ewl_theme_data_str_set(p->imagep, "/image/group", "entry");
- if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->zoom)) == 1 ||
- argzoom == 1 ) {
- ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
- EWL_FLAG_FILL_ALL);
- ewl_image_proportional_set(EWL_IMAGE(p->imagep), FALSE);
- }
- else {
- ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
- EWL_FLAG_FILL_SHRINK);
- }
+ if ( mainwin == 1 ) {
+ if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->zoom))
+ == 1) {
+ ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
+ EWL_FLAG_FILL_ALL);
+ ewl_image_proportional_set(EWL_IMAGE(p->imagep),
FALSE);
+ }
+ else {
+ ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
+ EWL_FLAG_FILL_SHRINK);
+ ewl_image_proportional_set(EWL_IMAGE(p->imagep), TRUE);
+ }
+ }
+ if ( mainwin == 0 ) {
+ if ( argzoom == 1 ) {
+ ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
+ EWL_FLAG_FILL_ALL);
+ ewl_image_proportional_set(EWL_IMAGE(p->imagep),
FALSE);
+ }
+ else {
+ ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
+ EWL_FLAG_FILL_SHRINK);
+ ewl_image_proportional_set(EWL_IMAGE(p->imagep), TRUE);
+ }
+ }
ewl_image_file_set(EWL_IMAGE(p->imagep), picturep, NULL);
ewl_object_alignment_set(EWL_OBJECT(p->imagep), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(p->vboxp), p->imagep);
@@ -357,16 +401,31 @@
p->imagep = ewl_image_new();
ewl_image_proportional_set(EWL_IMAGE(p->imagep), TRUE);
ewl_theme_data_str_set(p->imagep, "/image/group", "entry");
- if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->zoom)) == 1 ||
- argzoom == 1 ) {
- ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
- EWL_FLAG_FILL_ALL);
- ewl_image_proportional_set(EWL_IMAGE(p->imagep), FALSE);
- }
- else {
- ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
- EWL_FLAG_FILL_SHRINK);
- }
+ if ( mainwin == 1 ) {
+ if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->zoom))
+ == 1) {
+ ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
+ EWL_FLAG_FILL_ALL);
+ ewl_image_proportional_set(EWL_IMAGE(p->imagep),
FALSE);
+ }
+ else {
+ ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
+ EWL_FLAG_FILL_SHRINK);
+ ewl_image_proportional_set(EWL_IMAGE(p->imagep), TRUE);
+ }
+ }
+ if ( mainwin == 0 ) {
+ if ( argzoom == 1 ) {
+ ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
+ EWL_FLAG_FILL_ALL);
+ ewl_image_proportional_set(EWL_IMAGE(p->imagep),
FALSE);
+ }
+ else {
+ ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
+ EWL_FLAG_FILL_SHRINK);
+ ewl_image_proportional_set(EWL_IMAGE(p->imagep), TRUE);
+ }
+ }
ewl_image_file_set(EWL_IMAGE(p->imagep), picturep, NULL);
ewl_object_alignment_set(EWL_OBJECT(p->imagep), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(p->vboxp), p->imagep);
@@ -396,16 +455,31 @@
p->imagep = ewl_image_new();
ewl_image_proportional_set(EWL_IMAGE(p->imagep), TRUE);
ewl_theme_data_str_set(p->imagep, "/image/group", "entry");
- if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->zoom)) == 1 ||
- argzoom == 1 ) {
- ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
- EWL_FLAG_FILL_ALL);
- ewl_image_proportional_set(EWL_IMAGE(p->imagep), FALSE);
- }
- else {
- ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
- EWL_FLAG_FILL_SHRINK);
- }
+ if ( mainwin == 1 ) {
+ if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->zoom))
+ == 1) {
+ ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
+ EWL_FLAG_FILL_ALL);
+ ewl_image_proportional_set(EWL_IMAGE(p->imagep),
FALSE);
+ }
+ else {
+ ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
+ EWL_FLAG_FILL_SHRINK);
+ ewl_image_proportional_set(EWL_IMAGE(p->imagep), TRUE);
+ }
+ }
+ if ( mainwin == 0 ) {
+ if ( argzoom == 1 ) {
+ ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
+ EWL_FLAG_FILL_ALL);
+ ewl_image_proportional_set(EWL_IMAGE(p->imagep),
FALSE);
+ }
+ else {
+ ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
+ EWL_FLAG_FILL_SHRINK);
+ ewl_image_proportional_set(EWL_IMAGE(p->imagep), TRUE);
+ }
+ }
ewl_image_file_set(EWL_IMAGE(p->imagep), picturep, NULL);
ewl_object_alignment_set(EWL_OBJECT(p->imagep), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(p->vboxp), p->imagep);
@@ -430,16 +504,31 @@
p->imagep = ewl_image_new();
ewl_image_proportional_set(EWL_IMAGE(p->imagep), TRUE);
ewl_theme_data_str_set(p->imagep, "/image/group", "entry");
- if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->zoom)) == 1 ||
- argzoom == 1 ) {
- ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
- EWL_FLAG_FILL_ALL);
- ewl_image_proportional_set(EWL_IMAGE(p->imagep), FALSE);
- }
- else {
- ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
- EWL_FLAG_FILL_SHRINK);
- }
+ if ( mainwin == 1 ) {
+ if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->zoom))
+ == 1) {
+ ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
+ EWL_FLAG_FILL_ALL);
+ ewl_image_proportional_set(EWL_IMAGE(p->imagep),
FALSE);
+ }
+ else {
+ ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
+ EWL_FLAG_FILL_SHRINK);
+ ewl_image_proportional_set(EWL_IMAGE(p->imagep), TRUE);
+ }
+ }
+ if ( mainwin == 0 ) {
+ if ( argzoom == 1 ) {
+ ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
+ EWL_FLAG_FILL_ALL);
+ ewl_image_proportional_set(EWL_IMAGE(p->imagep),
FALSE);
+ }
+ else {
+ ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
+ EWL_FLAG_FILL_SHRINK);
+ ewl_image_proportional_set(EWL_IMAGE(p->imagep), TRUE);
+ }
+ }
ewl_image_file_set(EWL_IMAGE(p->imagep), picturep, NULL);
ewl_object_alignment_set(EWL_OBJECT(p->imagep), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(p->vboxp), p->imagep);
@@ -526,15 +615,30 @@
p->imagep = ewl_image_new();
ewl_theme_data_str_set(p->imagep, "/image/group", "entry");
ewl_image_proportional_set(EWL_IMAGE(p->imagep), TRUE);
- if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->zoom)) == 1 ||
- argzoom == 1 ) {
- ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
+ if ( mainwin == 1 ) {
+ if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON(m->zoom))
+ == 1) {
+ ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
EWL_FLAG_FILL_ALL);
- ewl_image_proportional_set(EWL_IMAGE(p->imagep), FALSE);
- }
- else {
- ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
+ ewl_image_proportional_set(EWL_IMAGE(p->imagep), FALSE);
+ }
+ else {
+ ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
EWL_FLAG_FILL_SHRINK);
+ ewl_image_proportional_set(EWL_IMAGE(p->imagep), TRUE);
+ }
+ }
+ if ( mainwin == 0 ) {
+ if ( argzoom == 1 ) {
+ ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
+ EWL_FLAG_FILL_ALL);
+ ewl_image_proportional_set(EWL_IMAGE(p->imagep),
FALSE);
+ }
+ else {
+ ewl_object_fill_policy_set(EWL_OBJECT(p->imagep),
+ EWL_FLAG_FILL_SHRINK);
+ ewl_image_proportional_set(EWL_IMAGE(p->imagep), TRUE);
+ }
}
ewl_image_file_set(EWL_IMAGE(p->imagep), pictureone, NULL);
ewl_object_alignment_set(EWL_OBJECT(p->imagep), EWL_FLAG_ALIGN_CENTER);
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_misc.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ephoto_misc.c 22 May 2006 20:04:00 -0000 1.21
+++ ephoto_misc.c 23 May 2006 01:07:26 -0000 1.22
@@ -496,6 +496,10 @@
EWL_FREEBOX_LAYOUT_AUTO);
ewl_container_child_append(EWL_CONTAINER(m->iscroll), m->ib);
ewl_widget_show(m->ib);
+ ewl_widget_disable(m->slideshow);
+ ewl_widget_disable(m->presentation);
+ ewl_widget_state_set(m->slideshow, "disabled");
+ ewl_widget_state_set(m->presentation, "disabled");
return;
w = NULL;
event = NULL;
@@ -571,6 +575,10 @@
ecore_dlist_append(m->imagelist, strdup(pathi));
slidenum++;
}
+ ewl_widget_enable(m->slideshow);
+ ewl_widget_enable(m->presentation);
+ ewl_widget_state_set(m->slideshow, "enabled");
+ ewl_widget_state_set(m->presentation, "enabled");
}
return;
w = NULL;
@@ -618,6 +626,8 @@
if ( argimage != NULL ) {
ewl_image_file_set(EWL_IMAGE(m->vimage),
argimage, NULL);
+ ewl_widget_enable(m->vbutton);
+ ewl_widget_state_set(m->vbutton, "enabled");
}
return;
w = NULL;
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
