Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_config_dialog.c e_ipc_handlers.h e_test.c
Log Message:
remove old test - not usable anymroe and add icons to advanced/basic buttons
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config_dialog.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_config_dialog.c 15 Oct 2005 03:09:46 -0000 1.6
+++ e_config_dialog.c 15 Oct 2005 05:38:27 -0000 1.7
@@ -82,7 +82,7 @@
ob = cfd->view.basic.create_widgets(cfd,
e_win_evas_get(cfd->dia->win), cfd->cfdata);
e_widget_list_object_append(o, ob, 1, 1, 0.0);
ob = e_widget_button_add(e_win_evas_get(cfd->dia->win),
- _("Advanced Settings"), NULL,
+ _("Advanced Settings"),
"widget/new_dialog",
_e_config_dialog_cb_advanced, cfd, NULL);
e_widget_list_object_append(o, ob, 0, 0, 1.0);
}
@@ -97,7 +97,7 @@
ob = cfd->view.advanced.create_widgets(cfd,
e_win_evas_get(cfd->dia->win), cfd->cfdata);
e_widget_list_object_append(o, ob, 1, 1, 0.0);
ob = e_widget_button_add(e_win_evas_get(cfd->dia->win),
- _("Basic Settings"), NULL,
+ _("Basic Settings"), "widget/new_dialog",
_e_config_dialog_cb_basic, cfd, NULL);
e_widget_list_object_append(o, ob, 0, 0, 1.0);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_ipc_handlers.h,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -3 -r1.97 -r1.98
--- e_ipc_handlers.h 10 Oct 2005 07:47:50 -0000 1.97
+++ e_ipc_handlers.h 15 Oct 2005 05:38:27 -0000 1.98
@@ -6395,7 +6395,7 @@
/****************************************************************************/
#define HDL E_IPC_OP_DEFAULT_ENGINE_SET
#if (TYPE == E_REMOTE_OPTIONS)
- OP("-default-engine-set", 1, "Set the default rendering engine to OPT1
(SOFTWARE, GL or XRENDER)", 0, HDL)
+ OP("-default-engine-set", 1, "Set the default rendering engine to OPT1
(SOFTWARE or XRENDER)", 0, HDL)
#elif (TYPE == E_REMOTE_OUT)
REQ_INT_START(HDL)
int value = 0;
@@ -6405,12 +6405,11 @@
value = E_EVAS_ENGINE_GL_X11;
printf("GL engine is disabled as default engine.\n");
exit(-1);
-
}
else if (!strcmp(params[0], "XRENDER")) value = E_EVAS_ENGINE_XRENDER_X11;
else
{
- printf("engine must be SOFTWARE, GL or XRENDER\n");
+ printf("engine must be SOFTWARE or XRENDER\n");
exit(-1);
}
REQ_INT_END(value, HDL);
@@ -6495,7 +6494,7 @@
/****************************************************************************/
#define HDL E_IPC_OP_ENGINE_SET
#if (TYPE == E_REMOTE_OPTIONS)
- OP("-engine-set", 2, "Set the rendering engine for OPT1 to OPT2 (SOFTWARE,
GL or XRENDER)", 0, HDL)
+ OP("-engine-set", 2, "Set the rendering engine for OPT1 to OPT2 (SOFTWARE
or XRENDER)", 0, HDL)
#elif (TYPE == E_REMOTE_OUT)
REQ_2INT_START(HDL)
int context = 0, engine = 0;
@@ -6515,11 +6514,16 @@
}
if (!strcmp(params[1], "DEFAULT")) engine = E_EVAS_ENGINE_DEFAULT;
else if (!strcmp(params[1], "SOFTWARE")) engine =
E_EVAS_ENGINE_SOFTWARE_X11;
- else if (!strcmp(params[1], "GL")) engine = E_EVAS_ENGINE_GL_X11;
+ else if (!strcmp(params[1], "GL"))
+ {
+ engine = E_EVAS_ENGINE_GL_X11;
+ printf("GL engine is disabled as default engine.\n");
+ exit(-1);
+ }
else if (!strcmp(params[1], "XRENDER")) engine = E_EVAS_ENGINE_XRENDER_X11;
else
{
- printf("engine must be DEFAULT, SOFTWARE, GL or XRENDER\n");
+ printf("engine must be DEFAULT, SOFTWARE or XRENDER\n");
exit(-1);
}
REQ_2INT_END(context, engine, HDL);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_test.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- e_test.c 13 Oct 2005 15:15:27 -0000 1.25
+++ e_test.c 15 Oct 2005 05:38:27 -0000 1.26
@@ -404,82 +404,6 @@
e_win_centered_set(dia->win, 1);
e_dialog_show(dia);
}
-#elif 0
-
-typedef struct _B_CFData {
- int val;
-} B_CFData;
-typedef struct _A_CFData {
- int val2;
-} A_CFData;
-
-static void *_b_create_data(void *cfdata_other, E_Config_Dialog_CFData_Type
type_other);
-static void _b_free_data(B_CFData *cfdata);
-static void _b_apply_data(B_CFData *cfdata);
-static Evas_Object *_b_create_widgets(Evas *evas, B_CFData *cfdata);
-static void *_a_create_data(void *cfdata_other, E_Config_Dialog_CFData_Type
type_other);
-static void _a_free_data(A_CFData *cfdata);
-static void _a_apply_data(A_CFData *cfdata);
-static Evas_Object *_a_create_widgets(Evas *evas, A_CFData *cfdata);
-
-static void *_b_create_data(void *cfdata_other, E_Config_Dialog_CFData_Type
type_other) {
- B_CFData *cfdata;
- cfdata = E_NEW(B_CFData, 1);
- if (cfdata_other) cfdata->val = ((A_CFData *)cfdata_other)->val2;
- return cfdata;
-}
-static void _b_free_data(B_CFData *cfdata) {
- printf("FREE BASIC\n");
- free(cfdata);
-}
-static void _b_apply_data(B_CFData *cfdata) {
- printf("APPLY BASIC %i\n", cfdata->val);
-}
-static Evas_Object *_b_create_widgets(Evas *evas, B_CFData *cfdata) {
- Evas_Object *o, *ob;
- o = e_widget_framelist_add(evas, "Basic Options", 0);
- ob = e_widget_check_add(evas, "Basic Checkbox", &(cfdata->val));
- e_widget_framelist_object_append(o, ob);
- return o;
-}
-
-static void *_a_create_data(void *cfdata_other, E_Config_Dialog_CFData_Type
type_other) {
- A_CFData *cfdata;
- cfdata = E_NEW(A_CFData, 1);
- if (cfdata_other) cfdata->val2 = ((B_CFData *)cfdata_other)->val;
- return cfdata;
-}
-static void _a_free_data(A_CFData *cfdata) {
- printf("FREE ADVANCED\n");
- free(cfdata);
-}
-static void _a_apply_data(A_CFData *cfdata) {
- printf("APPLY ADVANCED %i\n", cfdata->val2);
-}
-static Evas_Object *_a_create_widgets(Evas *evas, A_CFData *cfdata) {
- Evas_Object *o, *ob;
- o = e_widget_framelist_add(evas, "Advanced Options", 0);
- ob = e_widget_check_add(evas, "Advanced Checkbox", &(cfdata->val2));
- e_widget_framelist_object_append(o, ob);
- return o;
-}
-
-static void
-_e_test_internal(E_Container *con)
-{
- E_Config_Dialog *cfd;
- E_Config_Dialog_View a, b;
-
- b.create_cfdata = _b_create_data;
- b.free_cfdata = _b_free_data;
- b.apply_cfdata = _b_apply_data;
- b.create_widgets = _b_create_widgets;
- a.create_cfdata = _a_create_data;
- a.free_cfdata = _a_free_data;
- a.apply_cfdata = _a_apply_data;
- a.create_widgets = _a_create_widgets;
- cfd = e_config_dialog_new(con, "A test dialog", &b, &a);
-}
#else
static void
_e_test_internal(E_Container *con)
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
