Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto.c ephoto.h ephoto_presentation.c
Log Message:
Fix a command line option for zooming images. Updated TODO.
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- ephoto.c 22 May 2006 20:04:00 -0000 1.52
+++ ephoto.c 23 May 2006 00:30:17 -0000 1.53
@@ -21,6 +21,7 @@
int arglload = 0;
int argviewi = 0;
int argloadidir = 0;
+int argzoom = 0;
char *audios;
char buf[PATH_MAX];
char argimage[PATH_MAX];
@@ -223,6 +224,10 @@
"--load-dir-images") ) {
argloadidir = 1;
}
+ else if ( argint < argc && !strcmp(argv[argint],
+ "--zoom-images") ) {
+ argzoom = 1;
+ }
else if ( argint < argc && !strcmp(argv[argint], "--help") ) {
printf("ephoto /path/to/dir loads /path/to/dir"
"as default directory | "
@@ -267,7 +272,8 @@
" integer1 integer2 sets the first integer"
" as the width and the second integer as the"
" height of the presentation/slideshow"
- " window\n");
+ " window | ephoto --zoom-images zooms the"
+ " images to fit the window\n");
mainwin = 0;
}
argint++;
@@ -598,7 +604,7 @@
EWL_FLAG_ALIGN_CENTER);
ewl_box_spacing_set(EWL_BOX(m->settings), 2);
ewl_object_maximum_size_set(EWL_OBJECT(m->settings),
- 999999, 240);
+ 999999, 225);
ewl_widget_show(m->settings);
m->hboxv = ewl_hbox_new();
@@ -744,6 +750,10 @@
ewl_container_child_append(EWL_CONTAINER(m->settings),
m->zoom);
ewl_object_alignment_set(EWL_OBJECT(m->zoom),
EWL_FLAG_ALIGN_CENTER);
+ if ( argzoom == 1 ) {
+ ewl_checkbutton_checked_set(EWL_CHECKBUTTON(m->zoom),
+ TRUE);
+ }
ewl_widget_show(m->zoom);
m->hboxv = ewl_hbox_new();
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ephoto.h 22 May 2006 20:04:00 -0000 1.25
+++ ephoto.h 23 May 2006 00:30:17 -0000 1.26
@@ -159,6 +159,7 @@
extern int argfullscreen;
extern int argloop;
extern int arglload;
+extern int argzoom;
extern char argload[PATH_MAX];
extern char argwidth[PATH_MAX];
extern char argheight[PATH_MAX];
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_presentation.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ephoto_presentation.c 22 May 2006 20:10:36 -0000 1.18
+++ ephoto_presentation.c 23 May 2006 00:30:17 -0000 1.19
@@ -30,7 +30,8 @@
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 ) {
+ 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);
@@ -58,7 +59,8 @@
ewl_theme_data_str_set(s->screen,
"/image/group", "entry");
if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON
- (m->zoom)) == 1 ) {
+ (m->zoom)) == 1 ||
+ argzoom == 1 ) {
ewl_object_fill_policy_set(EWL_OBJECT
(s->screen), EWL_FLAG_FILL_ALL);
ewl_image_proportional_set(EWL_IMAGE
@@ -98,7 +100,8 @@
ewl_theme_data_str_set(s->screen,
"/image/group", "entry");
if ( ewl_checkbutton_is_checked(EWL_CHECKBUTTON
- (m->zoom)) == 1 ) {
+ (m->zoom)) == 1 ||
+ argzoom == 1 ) {
ewl_object_fill_policy_set(EWL_OBJECT
(s->screen), EWL_FLAG_FILL_ALL);
ewl_image_proportional_set(EWL_IMAGE
@@ -283,7 +286,8 @@
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 ) {
+ 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);
@@ -314,7 +318,8 @@
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 ) {
+ 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);
@@ -352,7 +357,8 @@
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 ) {
+ 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);
@@ -390,7 +396,8 @@
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 ) {
+ 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);
@@ -423,7 +430,8 @@
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 ) {
+ 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);
@@ -518,7 +526,8 @@
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 ) {
+ 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);
-------------------------------------------------------
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
