Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_includes.h e_int_config_desks.c
e_int_config_transitions.c
Added Files:
e_widget_trans_preview.c e_widget_trans_preview.h
Log Message:
Added transition preview widget.
Added widget to the transition dialog.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -3 -r1.157 -r1.158
--- Makefile.am 9 Oct 2006 19:06:43 -0000 1.157
+++ Makefile.am 10 Oct 2006 16:26:29 -0000 1.158
@@ -174,7 +174,8 @@
e_int_config_transitions.h \
e_fwin.h \
e_widget_aspect.h \
-e_widget_desk_preview.h
+e_widget_desk_preview.h \
+e_widget_trans_preview.h
enlightenment_src = \
e_user.c \
@@ -325,6 +326,7 @@
e_fwin.c \
e_widget_aspect.c \
e_widget_desk_preview.c \
+e_widget_trans_preview.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_SOURCES = \
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -3 -r1.134 -r1.135
--- e_includes.h 9 Oct 2006 19:06:43 -0000 1.134
+++ e_includes.h 10 Oct 2006 16:26:29 -0000 1.135
@@ -151,3 +151,4 @@
#include "e_fwin.h"
#include "e_widget_aspect.h"
#include "e_widget_desk_preview.h"
+#include "e_widget_trans_preview.h"
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_desks.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- e_int_config_desks.c 9 Oct 2006 19:55:20 -0000 1.25
+++ e_int_config_desks.c 10 Oct 2006 16:26:29 -0000 1.26
@@ -281,5 +281,4 @@
E_Config_Dialog_Data *cfdata = data;
e_widget_desk_preview_num_desks_set(cfdata->preview, cfdata->x, cfdata->y);
-
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_transitions.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_int_config_transitions.c 8 Oct 2006 08:04:17 -0000 1.5
+++ e_int_config_transitions.c 10 Oct 2006 16:26:29 -0000 1.6
@@ -16,6 +16,7 @@
Evas_Object *event_list;
Evas_Object *trans_list;
+ Evas_Object *tp;
};
EAPI E_Config_Dialog *
@@ -104,9 +105,12 @@
static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
*cfdata)
{
- Evas_Object *o, *of, *ot, *il;
+ E_Zone *zone;
+ Evas_Object *o, *of, *ot, *il, *ob;
Evas_List *l;
char *t;
+
+ zone = e_zone_current_get(cfd->con);
o = e_widget_list_add(evas, 1, 0);
ot = e_widget_table_add(evas, 0);
@@ -114,7 +118,7 @@
of = e_widget_framelist_add(evas, _("Events"), 0);
il = e_widget_ilist_add(evas, 48, 48, NULL);
cfdata->event_list = il;
- e_widget_min_size_set(il, 160, 200);
+ e_widget_min_size_set(il, 160, 225);
e_widget_ilist_append(il, NULL, _("Startup"), _event_cb_changed, cfdata,
NULL);
e_widget_ilist_append(il, NULL, _("Desk Change"), _event_cb_changed,
cfdata, NULL);
e_widget_ilist_append(il, NULL, _("Background Change"), _event_cb_changed,
cfdata, NULL);
@@ -125,7 +129,7 @@
of = e_widget_framelist_add(evas, _("Transitions"), 0);
il = e_widget_ilist_add(evas, 48, 48, NULL);
cfdata->trans_list = il;
- e_widget_min_size_set(il, 160, 200);
+ e_widget_min_size_set(il, 160, 225);
e_widget_ilist_append(il, NULL, _("None"), _trans_cb_changed, cfdata, NULL);
l = e_theme_transition_list();
@@ -140,6 +144,12 @@
e_widget_framelist_object_append(of, il);
e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1);
+ of = e_widget_framelist_add(evas, _("Preview"), 0);
+ ob = e_widget_trans_preview_add(evas, 300, ((300 * zone->h) / zone->w));
+ cfdata->tp = ob;
+ e_widget_framelist_object_append(of, ob);
+ e_widget_table_object_append(ot, of, 2, 0, 1, 1, 1, 1, 1, 1);
+
e_widget_list_object_append(o, ot, 1, 1, 0.5);
return o;
@@ -223,4 +233,6 @@
default:
break;
}
+ if (!t) return;
+ e_widget_trans_preview_trans_set(cfdata->tp, t);
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
