E CVS: apps/e_utils onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/src/bin/e17genmenu
Modified Files:
global.h parse.c
Log Message:
New menu structure.
~/.e/e/applications/menu/all
~/.e/e/applications/menu/favorites
The first one is all the converted FDO menus, which will track changes
to those menus. The second one is the original favorites menu, which
the user can edit to their hearts content.
Updated to match.
===
RCS file: /cvs/e/e17/apps/e_utils/src/bin/e17genmenu/global.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- global.h17 Aug 2006 17:08:07 - 1.6
+++ global.h21 Aug 2006 04:47:56 - 1.7
@@ -10,7 +10,8 @@
#include
#include
-#define EFAVDIR "/.e/e/applications/favorite"
+#define EFAVDIR "/.e/e/applications/menu/favorite"
+#define EALLDIR "/.e/e/applications/menu/all"
#define EAPPDIR "/.e/e/applications/all"
#define DEFAULTICON PACKAGE_DATA_DIR"/data/e17genmenu/icons/e.png"
===
RCS file: /cvs/e/e17/apps/e_utils/src/bin/e17genmenu/parse.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- parse.c 19 Aug 2006 01:28:48 - 1.15
+++ parse.c 21 Aug 2006 04:47:56 - 1.16
@@ -216,7 +216,7 @@
category = NULL;
if (menu_path != NULL)
{
-snprintf(order_path, sizeof(order_path), "%s" EFAVDIR "/Converted
Menus/%s", home, menu_path);
+snprintf(order_path, sizeof(order_path), "%s" EALLDIR "/%s", home,
menu_path);
//modify_order(order_path, eap->eap_name);
modify_order(order_path, file);
}
-
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
E CVS: apps/e onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_actions.c e_int_menus.c e_int_menus.h e_main.c
Log Message:
New menu structure.
~/.e/e/applications/menu/all
~/.e/e/applications/menu/favorites
The first one is all the converted FDO menus, which will track changes
to those menus. The second one is the original favorites menu, which
the user can edit to their hearts content.
WARNING - will break your Favorite menus, coz it has moved.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -3 -r1.78 -r1.79
--- e_actions.c 20 Aug 2006 04:48:27 - 1.78
+++ e_actions.c 21 Aug 2006 04:35:52 - 1.79
@@ -1113,6 +1113,7 @@
{
if (!strcmp(name, "main")) return e_int_menus_main_new();
else if (!strcmp(name, "favorites")) return e_int_menus_favorite_apps_new();
+ else if (!strcmp(name, "all")) return e_int_menus_all_apps_new();
else if (!strcmp(name, "clients")) return e_int_menus_clients_new();
return NULL;
}
@@ -1738,6 +1739,8 @@
e_register_action_predef_name(_("Menu"), _("Show Main Menu"), "menu_show",
"main",
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS,
0);
e_register_action_predef_name(_("Menu"), _("Show Favorites Menu"),
"menu_show", "favorites",
+EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS,
0);
+ e_register_action_predef_name(_("Menu"), _("Show All Applications Menu"),
"menu_show", "all",
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS,
0);
e_register_action_predef_name(_("Menu"), _("Show Clients Menu"),
"menu_show", "clients",
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS,
0);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -3 -r1.148 -r1.149
--- e_int_menus.c 16 Aug 2006 09:37:14 - 1.148
+++ e_int_menus.c 21 Aug 2006 04:35:52 - 1.149
@@ -9,6 +9,7 @@
{
E_Menu *menu;
E_Menu *apps;
+ E_Menu *all_apps;
E_Menu *desktops;
E_Menu *clients;
// E_Menu *gadgets;
@@ -77,6 +78,13 @@
e_menu_item_label_set(mi, _("Favorite Applications"));
e_util_menu_item_edje_icon_set(mi, "enlightenment/favorites");
e_menu_item_submenu_set(mi, subm);
+
+ subm = e_int_menus_all_apps_new();
+ dat->all_apps = subm;
+ mi = e_menu_item_new(m);
+ e_menu_item_label_set(mi, _("All Applications"));
+ e_util_menu_item_edje_icon_set(mi, "enlightenment/all_applications");
+ e_menu_item_submenu_set(mi, subm);
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Run Command"));
@@ -186,7 +194,25 @@
homedir = e_user_homedir_get();
if (homedir)
{
- snprintf(buf, sizeof(buf), "%s/.e/e/applications/favorite", homedir);
+ snprintf(buf, sizeof(buf), "%s/.e/e/applications/menu/favorite",
homedir);
+ m = e_int_menus_apps_new(buf);
+ free(homedir);
+ return m;
+ }
+ return NULL;
+}
+
+EAPI E_Menu *
+e_int_menus_all_apps_new(void)
+{
+ E_Menu *m;
+ char buf[4096];
+ char *homedir;
+
+ homedir = e_user_homedir_get();
+ if (homedir)
+ {
+ snprintf(buf, sizeof(buf), "%s/.e/e/applications/menu/all", homedir);
m = e_int_menus_apps_new(buf);
free(homedir);
return m;
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e_int_menus.h 2 Mar 2006 12:03:48 - 1.15
+++ e_int_menus.h 21 Aug 2006 04:35:52 - 1.16
@@ -22,6 +22,7 @@
EAPI E_Menu *e_int_menus_clients_new(void);
EAPI E_Menu *e_int_menus_apps_new(const char *dir);
EAPI E_Menu *e_int_menus_favorite_apps_new(void);
+EAPI E_Menu *e_int_menus_all_apps_new(void);
EAPI E_Menu *e_int_menus_config_new(void);
EAPI E_Menu *e_int_menus_gadgets_new(void);
EAPI E_Menu *e_int_menus_themes_new(void);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -3 -r1.177 -r1.178
--- e_main.c20 Aug 2006 08:22:19 - 1.177
+++ e_main.c21 Aug 2006 04:35:52 - 1.178
@@ -834,7 +834,8 @@
"%s/.e/e/backgrounds",
"%s/.e/e/applications",
"%s/.e/e/applications/all",
- "%s/.e/e/applications/favorite",
+ "%s/.e/e/applications/menu/favorite",
+ "%s/.e/e/applications/menu/all",
"%s/.e/e/applications/bar",
"%s/.e/e/applications/bar/default",
"%s/.e/e/applications/startup",
-
Using Tomcat but n
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/data/other Modified Files: applications.tar.gz Log Message: New menu structure. ~/.e/e/applications/menu/all ~/.e/e/applications/menu/favorites The first one is all the converted FDO menus, which will track changes to those menus. The second one is the original favorites menu, which the user can edit to their hearts content. WARNING - will break your Favorite menus, coz it has moved. === RCS file: /cvs/e/e17/apps/e/data/other/applications.tar.gz,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 Binary files /tmp/cvslglLs6 and /tmp/cvs7g8M5E differ - 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
E CVS: apps/e rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_wallpaper_gradient.c
Log Message:
use new edje liner grad fills.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_gradient.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_int_config_wallpaper_gradient.c 20 Aug 2006 23:29:41 - 1.5
+++ e_int_config_wallpaper_gradient.c 21 Aug 2006 03:27:33 - 1.6
@@ -9,6 +9,9 @@
#define GRAD_DD 3
#define GRAD_RAD 4
+#define TYPE_LINEAR 0
+#define TYPE_RADIAL 1
+
typedef struct _Import Import;
struct _Import
@@ -249,8 +252,8 @@
FILE *f;
int angle;
- float fill_origin_x, fill_origin_y;
- char *type;
+ float rel1_rel_x, rel1_rel_y, rel2_rel_x, rel2_rel_y;
+ float rel1_off_x, rel1_off_y, rel2_off_x, rel2_off_y;
evas = e_win_evas_get(import->dia->win);
@@ -289,59 +292,57 @@
fstrip = strdup(e_util_filename_escape(file));
- type = "linear";
- angle = 0;
- fill_origin_x = 0;
- fill_origin_y = 0;
+ fprintf(f,
+"spectra { spectrum { name: \"gradient\"; color: %d %d %d 255 1;
color: %d %d %d 255 1; } }\n"
+"collections {\n"
+"group {\n"
+"name: \"desktop/background\";\n"
+"parts {\n"
+"part {\n"
+" name: \"gradient\";\n"
+" type: GRADIENT;\n"
+" description {\n"
+"state: \"default\" 0.0;\n"
+"gradient.spectrum: \"gradient\";\n",
+import->cfdata->color1->r, import->cfdata->color1->g,
import->cfdata->color1->b,
+import->cfdata->color2->r, import->cfdata->color2->g,
import->cfdata->color2->b);
+
switch (import->cfdata->mode)
{
case GRAD_H:
-angle = 270;
+fprintf(f,
+ "gradient.rel1.relative: 0 0.5;\n"
+ "gradient.rel1.offset: 0 0;\n"
+ "gradient.rel2.relative: 1 0.5;\n"
+ "gradient.rel2.offset: -1 0;\n");
break;
case GRAD_V:
-angle = 0;
break;
case GRAD_DU:
-angle = 225;
+fprintf(f,
+ "gradient.rel1.relative: 0 1;\n"
+ "gradient.rel1.offset: 0 -1;\n"
+ "gradient.rel2.relative: 1 0;\n"
+ "gradient.rel2.offset: -1 0;\n");
break;
case GRAD_DD:
-angle = 315;
+fprintf(f,
+ "gradient.rel1.relative: 0 0;\n"
+ "gradient.rel1.offset: 0 0;\n"
+ "gradient.rel2.relative: 1 1;\n"
+ "gradient.rel2.offset: -1 -1;\n");
break;
case GRAD_RAD:
-fill_origin_x = 0.5;
-fill_origin_y = 0.5;
-type = "radial";
+fprintf(f,
+ "gradient.type: \"radial\";\n"
+ "fill.origin.relative: 0.5 0.5;\n");
break;
default:
/* won't happen */
break;
+
}
-
- fprintf(f,
-"spectra { spectrum { name: \"gradient\"; color: %d %d %d 255 1;
color: %d %d %d 255 1; } }\n"
-"collections {\n"
-"group {\n"
-"name: \"desktop/background\";\n"
-"parts {\n"
-"part {\n"
-" name: \"gradient\";\n"
-" type: GRADIENT;\n"
-" description {\n"
-"state: \"default\" 0.0;\n"
-"gradient.spectrum: \"gradient\";\n"
-"fill.angle: %d;\n"
-"gradient.type: \"%s\";\n"
-"fill.origin.relative: %.2f %.2f;\n"
-" }\n"
-"}\n"
-"}\n",
-import->cfdata->color1->r, import->cfdata->color1->g,
import->cfdata->color1->b,
-import->cfdata->color2->r, import->cfdata->color2->g,
import->cfdata->color2->b,
-angle,
-type,
-fill_origin_x, fill_origin_y);
-
-
+ fprintf(f, "}\n");
free(fstrip);
fclose(f);
-
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
E CVS: libs/edje rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_cc_handlers.c
Log Message:
allow rel1.relative: 0 0; notation
set defaults
===
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc_handlers.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- edje_cc_handlers.c 21 Aug 2006 03:00:01 - 1.68
+++ edje_cc_handlers.c 21 Aug 2006 03:14:09 - 1.69
@@ -97,7 +97,6 @@
static void st_collections_group_parts_part_description_text_elipsis(void);
static void st_collections_group_parts_part_description_gradient_type(void);
static void
st_collections_group_parts_part_description_gradient_spectrum(void);
-static void ob_collections_group_parts_part_description_gradient_rel(void);
static void
st_collections_group_parts_part_description_gradient_rel1_relative(void);
static void
st_collections_group_parts_part_description_gradient_rel1_offset(void);
static void
st_collections_group_parts_part_description_gradient_rel2_relative(void);
@@ -395,8 +394,8 @@
{"collections.group.parts.part.description.styles", NULL}, /* dup */
{"collections.group.parts.part.description.styles.style",
ob_styles_style}, /* dup */
{"collections.group.parts.part.description.gradient", NULL},
- {"collections.group.parts.part.description.gradient.rel1",
ob_collections_group_parts_part_description_gradient_rel},
- {"collections.group.parts.part.description.gradient.rel2",
ob_collections_group_parts_part_description_gradient_rel},
+ {"collections.group.parts.part.description.gradient.rel1", NULL},
+ {"collections.group.parts.part.description.gradient.rel2", NULL},
{"collections.group.parts.part.description.color_classes", NULL}, /* dup
*/
{"collections.group.parts.part.description.color_classes.color_class",
ob_color_class}, /* dup */
{"collections.group.parts.part.description.program",
ob_collections_group_programs_program}, /* dup */
@@ -1108,6 +1107,14 @@
ed->text.align.y = 0.5;
ed->text.id_source = -1;
ed->text.id_text_source = -1;
+ ed->gradient.rel1.relative_x = 0;
+ ed->gradient.rel1.relative_y = 0;
+ ed->gradient.rel1.offset_x = 0;
+ ed->gradient.rel1.offset_y = 0;
+ ed->gradient.rel2.relative_x = 1;
+ ed->gradient.rel2.relative_y = 1;
+ ed->gradient.rel2.offset_x = -1;
+ ed->gradient.rel2.offset_y = -1;
}
static void
@@ -2361,33 +2368,6 @@
}
static void
-ob_collections_group_parts_part_description_gradient_rel(void)
-{
- Edje_Part_Collection *pc;
- Edje_Part *ep;
- Edje_Part_Description *ed;
-
- pc = evas_list_data(evas_list_last(edje_collections));
- ep = evas_list_data(evas_list_last(pc->parts));
-
- if (ep->type != EDJE_PART_TYPE_GRADIENT)
- {
- fprintf(stderr, "%s: Error. parse error %s:%i. "
- "gradient attributes in non-GRADIENT part.\n",
- progname, file_in, line - 1);
- exit(-1);
- }
-
- ed = ep->default_desc;
- if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
-
- {
- ed->gradient.use_rel = 1;
- }
-}
-
-
-static void
st_collections_group_parts_part_description_gradient_rel1_relative(void)
{
Edje_Part_Collection *pc;
@@ -2411,6 +2391,7 @@
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
{
+ ed->gradient.use_rel = 1;
ed->gradient.rel1.relative_x = parse_float(0);
ed->gradient.rel1.relative_y = parse_float(1);
}
@@ -2440,6 +2421,7 @@
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
{
+ ed->gradient.use_rel = 1;
ed->gradient.rel1.offset_x = parse_int(0);
ed->gradient.rel1.offset_y = parse_int(1);
}
@@ -2469,6 +2451,7 @@
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
{
+ ed->gradient.use_rel = 1;
ed->gradient.rel2.relative_x = parse_float(0);
ed->gradient.rel2.relative_y = parse_float(1);
}
@@ -2498,6 +2481,7 @@
if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
{
+ ed->gradient.use_rel = 1;
ed->gradient.rel2.offset_x = parse_int(0);
ed->gradient.rel2.offset_y = parse_int(1);
}
-
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
E CVS: libs/edje rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_cc_handlers.c
Log Message:
add linear gradient specific fill options
used (inside a part description) as follows:
Horizontal from left to right filling entire part:
gradient {
spectrum: "black_to_white";
rel1 {
relative: 0 0.5;
offset: 0 0;
}
rel2 {
relative: 1 0.5;
offset: -1 0;
}
}
Diagonal from top left to bottom right:
gradient {
spectrum: "black_to_white";
rel1 {
relative: 0 0;
offset: 0 0;
}
rel2 {
relative: 1 1;
offset: -1 -1;
}
}
If either rel1 or rel2 is present in the gradient block of a linear gradient,
these will override any angle/origin/size specified in the fill block ('spread'
is still honored).
===
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc_handlers.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- edje_cc_handlers.c 6 Aug 2006 01:45:45 - 1.67
+++ edje_cc_handlers.c 21 Aug 2006 03:00:01 - 1.68
@@ -97,6 +97,11 @@
static void st_collections_group_parts_part_description_text_elipsis(void);
static void st_collections_group_parts_part_description_gradient_type(void);
static void
st_collections_group_parts_part_description_gradient_spectrum(void);
+static void ob_collections_group_parts_part_description_gradient_rel(void);
+static void
st_collections_group_parts_part_description_gradient_rel1_relative(void);
+static void
st_collections_group_parts_part_description_gradient_rel1_offset(void);
+static void
st_collections_group_parts_part_description_gradient_rel2_relative(void);
+static void
st_collections_group_parts_part_description_gradient_rel2_offset(void);
static void ob_collections_group_programs_program(void);
static void st_collections_group_programs_program_name(void);
@@ -236,6 +241,10 @@
{"collections.group.parts.part.description.text.fonts.font",
st_fonts_font}, /* dup */
{"collections.group.parts.part.description.text.elipsis",
st_collections_group_parts_part_description_text_elipsis},
{"collections.group.parts.part.description.gradient.type",
st_collections_group_parts_part_description_gradient_type},
+ {"collections.group.parts.part.description.gradient.rel1.relative",
st_collections_group_parts_part_description_gradient_rel1_relative},
+ {"collections.group.parts.part.description.gradient.rel1.offset",
st_collections_group_parts_part_description_gradient_rel1_offset},
+ {"collections.group.parts.part.description.gradient.rel2.relative",
st_collections_group_parts_part_description_gradient_rel2_relative},
+ {"collections.group.parts.part.description.gradient.rel2.offset",
st_collections_group_parts_part_description_gradient_rel2_offset},
{"collections.group.parts.part.description.gradient.spectrum",
st_collections_group_parts_part_description_gradient_spectrum},
{"collections.group.parts.part.description.images.image",
st_images_image}, /* dup */
{"collections.group.parts.part.description.font", st_fonts_font}, /* dup
*/
@@ -386,6 +395,8 @@
{"collections.group.parts.part.description.styles", NULL}, /* dup */
{"collections.group.parts.part.description.styles.style",
ob_styles_style}, /* dup */
{"collections.group.parts.part.description.gradient", NULL},
+ {"collections.group.parts.part.description.gradient.rel1",
ob_collections_group_parts_part_description_gradient_rel},
+ {"collections.group.parts.part.description.gradient.rel2",
ob_collections_group_parts_part_description_gradient_rel},
{"collections.group.parts.part.description.color_classes", NULL}, /* dup
*/
{"collections.group.parts.part.description.color_classes.color_class",
ob_color_class}, /* dup */
{"collections.group.parts.part.description.program",
ob_collections_group_programs_program}, /* dup */
@@ -2349,6 +2360,148 @@
}
}
+static void
+ob_collections_group_parts_part_description_gradient_rel(void)
+{
+ Edje_Part_Collection *pc;
+ Edje_Part *ep;
+ Edje_Part_Description *ed;
+
+ pc = evas_list_data(evas_list_last(edje_collections));
+ ep = evas_list_data(evas_list_last(pc->parts));
+
+ if (ep->type != EDJE_PART_TYPE_GRADIENT)
+ {
+ fprintf(stderr, "%s: Error. parse error %s:%i. "
+ "gradient attributes in non-GRADIENT part.\n",
+ progname, file_in, line - 1);
+ exit(-1);
+ }
+
+ ed = ep->default_desc;
+ if (ep->other_desc) ed = evas_list_data(evas_list_last(ep->other_desc));
+
+ {
+ ed->gradient.use_rel = 1;
+ }
+}
+
+
+static void
+st_collections_group_parts_part_description_gradient_rel1_relative(void)
+{
+ Edje_Part_Collection *pc;
+ Edje_Part *ep;
+ Edje_Part_Description *ed;
+
+ check_arg_count(2);
+
+ pc = evas_list_data(evas
E CVS: libs/edje rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_calc.c edje_data.c edje_private.h
Log Message:
add linear gradient specific fill options
used (inside a part description) as follows:
Horizontal from left to right filling entire part:
gradient {
spectrum: "black_to_white";
rel1 {
relative: 0 0.5;
offset: 0 0;
}
rel2 {
relative: 1 0.5;
offset: -1 0;
}
}
Diagonal from top left to bottom right:
gradient {
spectrum: "black_to_white";
rel1 {
relative: 0 0;
offset: 0 0;
}
rel2 {
relative: 1 1;
offset: -1 -1;
}
}
If either rel1 or rel2 is present in the gradient block of a linear gradient,
these will override any angle/origin/size specified in the fill block ('spread'
is still honored).
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- edje_calc.c 8 Aug 2006 20:25:24 - 1.87
+++ edje_calc.c 21 Aug 2006 03:00:01 - 1.88
@@ -906,19 +906,69 @@
}
}
/* fill */
- params->smooth = desc->fill.smooth;
- if (flags & FLAG_X)
+
+ if (ep->part->type == EDJE_PART_TYPE_GRADIENT && desc->gradient.use_rel &&
(!desc->gradient.type || !strcmp(desc->gradient.type, "linear")))
{
- params->fill.x = desc->fill.pos_abs_x + (params->w *
desc->fill.pos_rel_x);
- params->fill.w = desc->fill.abs_x + (params->w * desc->fill.rel_x);
+ int x2, y2;
+ int dx, dy;
+ double m;
+ int angle;
+
+ params->fill.x = desc->gradient.rel1.offset_x + (params->w *
desc->gradient.rel1.relative_x);
+ params->fill.y = desc->gradient.rel1.offset_y + (params->h *
desc->gradient.rel1.relative_y);
+
+ x2 = desc->gradient.rel2.offset_x + (params->w *
desc->gradient.rel2.relative_x);
+ y2 = desc->gradient.rel2.offset_y + (params->h *
desc->gradient.rel2.relative_y);
+
+ params->fill.w = 1; /* doesn't matter for linear grads */
+
+ dy = y2 - params->fill.y;
+ dx = x2 - params->fill.x;
+ params->fill.h = sqrt(dx * dx + dy * dy);
+
+ params->fill.spread = desc->fill.spread;
+
+ if (dx == 0 && dy == 0)
+ {
+angle = 0;
+ }
+ else if (dx == 0)
+ {
+if (dy > 0) angle = 0;
+else angle = 180;
+ }
+ else if (dy == 0)
+ {
+if (dx > 0) angle = 270;
+else angle = 90;
+ }
+ else
+ {
+m = (double)dx / (double)dy;
+angle = atan(m) * 180 / M_PI;
+if (dy < 0)
+ angle = 180 - angle;
+else
+ angle = 360 - angle;
+ }
+ params->fill.angle = angle;
}
- if (flags & FLAG_Y)
+ else
{
- params->fill.y = desc->fill.pos_abs_y + (params->h *
desc->fill.pos_rel_y);
- params->fill.h = desc->fill.abs_y + (params->h * desc->fill.rel_y);
+ params->smooth = desc->fill.smooth;
+ if (flags & FLAG_X)
+ {
+params->fill.x = desc->fill.pos_abs_x + (params->w *
desc->fill.pos_rel_x);
+params->fill.w = desc->fill.abs_x + (params->w * desc->fill.rel_x);
+ }
+ if (flags & FLAG_Y)
+ {
+params->fill.y = desc->fill.pos_abs_y + (params->h *
desc->fill.pos_rel_y);
+params->fill.h = desc->fill.abs_y + (params->h * desc->fill.rel_y);
+ }
+ params->fill.angle = desc->fill.angle;
+ params->fill.spread = desc->fill.spread;
}
- params->fill.angle = desc->fill.angle;
- params->fill.spread = desc->fill.spread;
/* colors */
params->color.r = desc->color.r;
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_data.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- edje_data.c 2 Aug 2006 10:52:44 - 1.32
+++ edje_data.c 21 Aug 2006 03:00:01 - 1.33
@@ -322,6 +322,15 @@
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "text.elipsis", text.elipsis, EET_T_DOUBLE);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "gradient.id", gradient.id, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "gradient.type", gradient.type, EET_T_STRING);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "gradient.use_rel", gradient.use_rel, EET_T_INT);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Description, "gradient.rel1.relative_x", gradient.rel1.relative_x,
EET_T_DOUBLE);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description,
Edje_Part_Descripti
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_config.h Log Message: Bump it again, didn't notice that rephorm had bumped it earlier today. === RCS file: /cvs/e/e17/apps/e/src/bin/e_config.h,v retrieving revision 1.109 retrieving revision 1.110 diff -u -3 -r1.109 -r1.110 --- e_config.h 21 Aug 2006 02:30:10 - 1.109 +++ e_config.h 21 Aug 2006 02:36:53 - 1.110 @@ -50,7 +50,7 @@ /* increment this whenever a new set of config values are added but the users * config doesn't need top be wiped - simply new values need to be put in */ -#define E_CONFIG_FILE_GENERATION 0x0098 +#define E_CONFIG_FILE_GENERATION 0x0099 #define E_CONFIG_FILE_VERSION((E_CONFIG_FILE_EPOCH << 16) | E_CONFIG_FILE_GENERATION) #define E_EVAS_ENGINE_DEFAULT 0 - 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
E CVS: apps/e onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c e_config.c e_config.h e_int_config_icon_themes.c
Log Message:
Saves selected icon theme in e_config. I hope I did everything I need
to do when adding a new config string.
Doesn't actually update icons or clear caches yet, but new icons will be in
the selected theme.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -3 -r1.150 -r1.151
--- e_apps.c20 Aug 2006 03:51:54 - 1.150
+++ e_apps.c21 Aug 2006 02:30:10 - 1.151
@@ -1179,8 +1179,8 @@
if (desktop->icon)
{
/* FIXME: Should do this only when needed, is it can be
expensive. */
-/* FIXME: Use a real icon size and theme. */
-v = (char *) ecore_desktop_icon_find(desktop->icon, NULL,
NULL);
+/* FIXME: Use a real icon size. */
+v = (char *) ecore_desktop_icon_find(desktop->icon, NULL,
e_config->icon_theme);
if (v)
a->icon_path = evas_stringshare_add(v);
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -3 -r1.194 -r1.195
--- e_config.c 20 Aug 2006 22:30:44 - 1.194
+++ e_config.c 21 Aug 2006 02:30:10 - 1.195
@@ -471,6 +471,8 @@
E_CONFIG_VAL(D, T, border_raise_on_focus, INT);
E_CONFIG_VAL(D, T, desk_flip_wrap, INT);
+ E_CONFIG_VAL(D, T, icon_theme, STR);
+
E_CONFIG_VAL(D, T, wallpaper_import_last_dev, STR);
E_CONFIG_VAL(D, T, wallpaper_import_last_path, STR);
@@ -655,6 +657,8 @@
e_config->display_res_height = 0;
e_config->display_res_hz = 0;
e_config->display_res_rotation = 0;
+
+ e_config->icon_theme = evas_stringshare_add("hicolor");
{
E_Config_Module *em;
@@ -1873,6 +1877,7 @@
if (e_config->transition_desk)
evas_stringshare_del(e_config->transition_desk);
if (e_config->transition_change)
evas_stringshare_del(e_config->transition_change);
if (e_config->input_method)
evas_stringshare_del(e_config->input_method);
+ if (e_config->icon_theme) evas_stringshare_del(e_config->icon_theme);
E_FREE(e_config);
}
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.h,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -3 -r1.108 -r1.109
--- e_config.h 20 Aug 2006 22:30:44 - 1.108
+++ e_config.h 21 Aug 2006 02:30:10 - 1.109
@@ -233,6 +233,8 @@
int border_raise_on_mouse_action; // GUI
int border_raise_on_focus; // GUI
int desk_flip_wrap; // GUI
+
+ const char *icon_theme; // GUI
const char *wallpaper_import_last_dev; // INTERNAL
const char *wallpaper_import_last_path; // INTERNAL
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_icon_themes.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_int_config_icon_themes.c 20 Aug 2006 05:30:42 - 1.2
+++ e_int_config_icon_themes.c 21 Aug 2006 02:30:10 - 1.3
@@ -53,8 +53,8 @@
cfd = e_config_dialog_new(con,
_("Icon Theme Settings"),
- "E", "_config_icon_themes_dialog",
-"enlightenment/icon_themes", 0, v, NULL);
+ "E", "_config_icon_theme_dialog",
+"enlightenment/icon_theme", 0, v, NULL);
return cfd;
}
@@ -69,6 +69,13 @@
if (cfdata->icon_themes)
cfdata->icon_themes = evas_list_sort(cfdata->icon_themes,
evas_list_count(cfdata->icon_themes), _sort_icon_themes);
+ if (e_config->icon_theme)
+ cfdata->themename = strdup(e_config->icon_theme);
+ else
+ cfdata->themename = strdup("hicolor");
+
+printf("CURRENT ICON THEME - %s - %s\n", e_config->icon_theme,
cfdata->themename);
+
return;
}
@@ -101,75 +108,23 @@
free(cfdata);
}
+
static int
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- E_Module *m;
- const char *v;
- int i;
-
- v = cfdata->themename;
- if (!v) return 0;
-#if 0
- for (i = 0; i < evas_list_count(cfdata->icon_themes); i++)
- {
- CFIconTheme *cm;
-
- cm = evas_list_nth(cfdata->icon_themes, i);
- if ((cm) && (!strcmp(cm->name, v)))
- {
-if (cm->state != cfdata->state)
- {
- e_widget_disabled_set(cfdata->gui.configure, 1);
- e_widget_disabled_set(cfdata->gui.about, 1);
-
- m = e_icon_theme_find(v);
- if (!m)
-
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_widget.c Log Message: - update comment === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.c,v retrieving revision 1.96 retrieving revision 1.97 diff -u -3 -r1.96 -r1.97 --- ewl_widget.c21 Aug 2006 01:34:15 - 1.96 +++ ewl_widget.c21 Aug 2006 01:36:38 - 1.97 @@ -784,8 +784,9 @@ if (op) ewl_container_child_remove(op, w); /* -* Set this to the new parent here to avoid infinite recursion when -* called from ewl_container_child_remove. +* Set this to the new parent here as child_remove will try to call +* us again if our parent isn't NULL with a NULL parent. This makes +* sure the parent is set when the remove is done. */ w->parent = p; - 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
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_container.c ewl_widget.c
Log Message:
- fixup reparenting
- set into the new children list _after_ removing from the previous parent
- set the w->parent to the new container _after_ calling remove on the
previous parent. the child_remove from the previous parent will try to set
the parent to NULL, which was whiping out our parent
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_container.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- ewl_container.c 10 Aug 2006 08:21:22 - 1.46
+++ ewl_container.c 21 Aug 2006 01:34:15 - 1.47
@@ -195,8 +195,8 @@
while (pc->redirect)
pc = pc->redirect;
- ecore_dlist_append(pc->children, child);
ewl_widget_parent_set(child, EWL_WIDGET(pc));
+ ecore_dlist_append(pc->children, child);
ewl_container_child_add_call(pc, child);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -230,8 +230,8 @@
while (pc->redirect)
pc = pc->redirect;
- ecore_dlist_prepend(pc->children, child);
ewl_widget_parent_set(child, EWL_WIDGET(pc));
+ ecore_dlist_prepend(pc->children, child);
ewl_container_child_add_call(pc, child);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -279,8 +279,8 @@
ecore_dlist_next(pc->children);
}
- ecore_dlist_insert(pc->children, child);
ewl_widget_parent_set(child, EWL_WIDGET(pc));
+ ecore_dlist_insert(pc->children, child);
ewl_container_child_add_call(pc, child);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -380,9 +380,8 @@
/*
* If the child isn't found, then this isn't it's parent.
*/
- if (!temp) {
+ if (!temp)
DRETURN(DLEVEL_STABLE);
- }
/* get the index of the widget we are removing */
idx = ecore_dlist_index(pc->children);
@@ -393,8 +392,8 @@
ecore_dlist_remove(pc->children);
if (VISIBLE(child) && REALIZED(child))
ewl_container_child_hide_call(pc, child);
- ewl_container_child_remove_call(pc, child, idx);
+ ewl_container_child_remove_call(pc, child, idx);
ewl_widget_configure(EWL_WIDGET(pc));
DLEAVE_FUNCTION(DLEVEL_STABLE);
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -3 -r1.95 -r1.96
--- ewl_widget.c20 Aug 2006 21:01:57 - 1.95
+++ ewl_widget.c21 Aug 2006 01:34:15 - 1.96
@@ -756,12 +756,11 @@
if (op == EWL_CONTAINER(p))
DRETURN(DLEVEL_STABLE);
- if (!p)
- ewl_widget_obscure(w);
+ /* if no parent, obsure the widget */
+ if (!p) ewl_widget_obscure(w);
emb = ewl_embed_widget_find(w);
- if (emb)
- ewl_embed_info_widgets_cleanup(emb, w);
+ if (emb) ewl_embed_info_widgets_cleanup(emb, w);
/*
* Verify this will not result in recursively nested widgets.
@@ -775,18 +774,20 @@
tmp = tmp->parent;
}
- /*
-* Set this to the new parent here to avoid infinite recursion when
-* called from ewl_container_child_remove.
-*/
- w->parent = p;
+ /* set the parent to NULL before doing the child remove */
+ w->parent = NULL;
/*
* A widget cannot be the child of multiple widgets, so remove it
* from a previous parent before adding to this parent.
*/
- if (op)
- ewl_container_child_remove(op, w);
+ if (op) ewl_container_child_remove(op, w);
+
+ /*
+* Set this to the new parent here to avoid infinite recursion when
+* called from ewl_container_child_remove.
+*/
+ w->parent = p;
ewl_callback_call_with_event_data(w, EWL_CALLBACK_REPARENT, p);
-
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
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin/tests
Modified Files:
ewl_tree2.c
Log Message:
- add a scrollpane to tree2
- note, setting the header scrollable will cause ewl to loop forever on
shutdown. I think this is due to a container bug.
===
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/ewl_tree2.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ewl_tree2.c 20 Aug 2006 21:09:05 - 1.9
+++ ewl_tree2.c 21 Aug 2006 01:24:07 - 1.10
@@ -32,6 +32,9 @@
Ewl_Sort_Direction sort);
static int tree2_test_data_count_get(void *data);
+static void ewl_tree2_cb_scroll_headers(Ewl_Widget *w, void *ev, void *data);
+static void ewl_tree2_cb_scroll_visible(Ewl_Widget *w, void *ev, void *data);
+
void
test_info(Ewl_Test *test)
{
@@ -46,11 +49,17 @@
static int
create_test(Ewl_Container *box)
{
- Ewl_Widget *tree;
+ Ewl_Widget *tree, *o, *o2;
Ewl_Model *model;
Ewl_View *view;
void *data;
+ o2 = ewl_hbox_new();
+ ewl_container_child_append(box, o2);
+ ewl_object_fill_policy_set(EWL_OBJECT(o2),
+ EWL_FLAG_FILL_VSHRINK | EWL_FLAG_FILL_HFILL);
+ ewl_widget_show(o2);
+
/* create our data */
data = tree2_test_data_setup();
@@ -93,6 +102,22 @@
ewl_view_header_fetch_set(view, tree2_test_data_header_fetch);
ewl_tree2_column_append(EWL_TREE2(tree), model, view);
+ /* create the checkbuttons for the top box */
+ o = ewl_checkbutton_new();
+ ewl_button_label_set(EWL_BUTTON(o), "Scroll headers");
+ ewl_container_child_append(EWL_CONTAINER(o2), o);
+ ewl_callback_append(o, EWL_CALLBACK_CLICKED,
+ ewl_tree2_cb_scroll_headers, tree);
+ ewl_widget_show(o);
+
+ o = ewl_checkbutton_new();
+ ewl_button_label_set(EWL_BUTTON(o), "Scroll visible");
+ ewl_container_child_append(EWL_CONTAINER(o2), o);
+ ewl_checkbutton_checked_set(EWL_CHECKBUTTON(o), TRUE);
+ ewl_callback_append(o, EWL_CALLBACK_CLICKED,
+ ewl_tree2_cb_scroll_visible, tree);
+ ewl_widget_show(o);
+
return 1;
}
@@ -262,4 +287,25 @@
return d->count;
}
+
+static void
+ewl_tree2_cb_scroll_headers(Ewl_Widget *w, void *ev __UNUSED__, void *data)
+{
+ Ewl_Tree2 *tree;
+
+ tree = data;
+ ewl_tree2_scroll_headers_set(tree,
+ ewl_checkbutton_is_checked(EWL_CHECKBUTTON(w)));
+}
+
+static void
+ewl_tree2_cb_scroll_visible(Ewl_Widget *w, void *ev __UNUSED__, void *data)
+{
+ Ewl_Tree2 *tree;
+
+ tree = data;
+ ewl_tree2_scroll_visible_set(tree,
+ ewl_checkbutton_is_checked(EWL_CHECKBUTTON(w)));
+}
+
-
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
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_tree2.c ewl_tree2.h
Log Message:
- add a scrollpane to tree2
- note, setting the header scrollable will cause ewl to loop forever on
shutdown. I think this is due to a container bug.
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree2.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- ewl_tree2.c 20 Aug 2006 23:32:34 - 1.27
+++ ewl_tree2.c 21 Aug 2006 01:24:07 - 1.28
@@ -68,8 +68,15 @@
ewl_tree2_cb_header_changed, tree);
ewl_widget_show(tree->header);
+ tree->scroll_headers = FALSE;
+ tree->scroll_visible = TRUE;
+
+ tree->scroll = ewl_scrollpane_new();
+ ewl_container_child_append(EWL_CONTAINER(tree), tree->scroll);
+ ewl_widget_show(tree->scroll);
+
tree->rows = ewl_vbox_new();
- ewl_container_child_append(EWL_CONTAINER(tree), tree->rows);
+ ewl_container_child_append(EWL_CONTAINER(tree->scroll), tree->rows);
ewl_widget_show(tree->rows);
ewl_tree2_headers_visible_set(tree, TRUE);
@@ -450,6 +457,98 @@
}
/**
+ * @param tree: The tree to work with
+ * @param visible: The value to set the scroll visible setting too
+ * @return Returns no value
+ * @brief Sets if the scrollpane is visible in the tree or not
+ */
+void
+ewl_tree2_scroll_visible_set(Ewl_Tree2 *tree, unsigned int visible)
+{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR("tree", tree);
+ DCHECK_TYPE("tree", tree, EWL_TREE2_TYPE);
+
+ if (tree->scroll_visible == visible)
+ DRETURN(DLEVEL_STABLE);
+
+ tree->scroll_visible = visible;
+ if (tree->scroll_visible)
+ {
+
ewl_scrollpane_hscrollbar_flag_set(EWL_SCROLLPANE(tree->scroll),
+
EWL_SCROLLPANE_FLAG_AUTO_VISIBLE);
+
ewl_scrollpane_vscrollbar_flag_set(EWL_SCROLLPANE(tree->scroll),
+
EWL_SCROLLPANE_FLAG_AUTO_VISIBLE);
+ }
+ else
+ {
+
ewl_scrollpane_hscrollbar_flag_set(EWL_SCROLLPANE(tree->scroll),
+
EWL_SCROLLPANE_FLAG_ALWAYS_HIDDEN);
+
ewl_scrollpane_vscrollbar_flag_set(EWL_SCROLLPANE(tree->scroll),
+
EWL_SCROLLPANE_FLAG_ALWAYS_HIDDEN);
+ }
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+/**
+ * @param tree: The tree to work with
+ * @return Returns if the scrollarea is visible in the tree
+ * @brief Returns TRUE if the scrollarea is visible else returns FALSE
+ */
+unsigned int
+ewl_tree2_scroll_visible_get(Ewl_Tree2 *tree)
+{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR_RET("tree", tree, FALSE);
+ DCHECK_TYPE_RET("tree", tree, EWL_TREE2_TYPE, FALSE);
+
+ DRETURN_INT(tree->scroll_visible, DLEVEL_STABLE);
+}
+
+/**
+ * @param tree: The tree to work with
+ * @param scroll: If the headers should be scrolled
+ * @return Returns no value
+ * @brief Sets if the headers should be scrolled with the tree
+ */
+void
+ewl_tree2_scroll_headers_set(Ewl_Tree2 *tree, unsigned int scroll)
+{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR("tree", tree);
+ DCHECK_TYPE("tree", tree, EWL_TREE2_TYPE);
+
+ if (tree->scroll_headers == scroll)
+ DRETURN(DLEVEL_STABLE);
+
+ tree->scroll_headers = scroll;
+ if (tree->scroll_headers)
+ ewl_container_child_prepend(EWL_CONTAINER(tree->scroll),
+ tree->header);
+ else
+ ewl_container_child_prepend(EWL_CONTAINER(tree),
+ tree->header);
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+/**
+ * @param tree: The tree to work with
+ * @return Returns no value
+ * @brief Retrieves if the tree headers will be scrolled or not
+ */
+unsigned int
+ewl_tree2_scroll_headers_get(Ewl_Tree2 *tree)
+{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR_RET("tree", tree, FALSE);
+ DCHECK_TYPE_RET("tree", tree, EWL_TREE2_TYPE, FALSE);
+
+ DRETURN_INT(tree->scroll_headers, DLEVEL_STABLE);
+}
+
+/**
* @internal
* @param w: The widget to work with
* @param ev: UNUSED
@@ -487,7 +586,7 @@
void *data __UNUSED__)
{
Ewl_Tree2 *tree;
- int size;
+ int size = 0;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -496,13 +595,17 @@
tree = EWL_TREE2(w);
/* place the header */
- ewl_object_place(EWL_OBJECT(tree->header), CURRENT_X(tree),
- CURRENT_Y(tree), CURRENT_W(tree),
-
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/bin/tests Modified Files: Makefile.am Added Files: ewl_container.c Log Message: - add the start of a container test suite === RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/Makefile.am,v retrieving revision 1.37 retrieving revision 1.38 diff -u -3 -r1.37 -r1.38 --- Makefile.am 16 Aug 2006 15:04:50 - 1.37 +++ Makefile.am 21 Aug 2006 01:20:03 - 1.38 @@ -28,7 +28,7 @@ ewl_theme.la ewl_media.la ewl_menu.la ewl_imenu.la \ ewl_widget.la fullscreen.la modal.la ewl_layer.la \ ewl_list.la puzzle.la ewl_grid.la \ - ewl_icon_theme.la + ewl_icon_theme.la ewl_container.la ewl_border_la_SOURCES = ewl_border.c ewl_border_la_LIBADD= $(top_builddir)/src/lib/libewl.la @@ -359,6 +359,13 @@ -L$(top_builddir)/src/lib/.libs ewl_icon_theme_la_DEPENDENCIES = +ewl_container_la_SOURCES = ewl_container.c +ewl_container_la_LIBADD= $(top_builddir)/src/lib/libewl.la +ewl_container_la_LDFLAGS = -module -avoid-version \ + -L$(top_builddir)/src/lib \ + -L$(top_builddir)/src/lib/.libs +ewl_container_la_DEPENDENCIES = + FILES = $(ewl_border_la_SOURCES) $(ewl_box_la_SOURCES) \ $(ewl_button_la_SOURCES) $(ewl_colordialog_la_SOURCES) \ @@ -383,7 +390,7 @@ $(modal_la_SOURCES) $(ewl_layer_la_SOURCES) \ $(ewl_dnd_snoop_la_SOURCES) $(ewl_list_la_SOURCES) \ $(puzzle_la_SOURCES) $(ewl_grid_la_SOURCES) \ - $(ewl_icon_theme_la_SOURCES) + $(ewl_icon_theme_la_SOURCES) $(ewl_container_la_SOURCES) EXTRA_DIST = $(FILES) - 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
E CVS: proto lok
Enlightenment CVS committal
Author : lok
Project : e17
Module : proto
Dir : e17/proto/emphasis/src/bin
Modified Files:
emphasis_mpc.c emphasis_mpc.h
Log Message:
make it works
===
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_mpc.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- emphasis_mpc.c 20 Aug 2006 22:48:49 - 1.7
+++ emphasis_mpc.c 21 Aug 2006 01:04:41 - 1.8
@@ -500,7 +500,7 @@
MpdData *data;
Evas_List *list;
- data = mpd_database_get_playlist_content (mo, playlist_name);
+ data = mpd_database_get_pls_content (mo, playlist_name);
list = convert_mpd_data(data);
mpd_data_free(data);
@@ -572,3 +572,58 @@
return mpd_data_get_first(data);
}
+MpdData *mpd_database_get_pls_content(MpdObj *mi,char *playlist)
+{
+ MpdData *data = NULL;
+ mpd_InfoEntity *ent = NULL;
+ if(!mpd_check_connected(mi))
+ {
+ return NULL;
+ }
+ if(!mpd_server_check_version(mi, 0,12,0))
+ {
+ return NULL;
+ }
+ if(mpd_server_check_command_allowed(mi, "listplaylistinfo") !=
MPD_SERVER_COMMAND_ALLOWED)
+ {
+ return NULL;
+ }
+ if(mpd_lock_conn(mi))
+ {
+ return NULL;
+ }
+ mpd_sendListPlaylistInfoCommand(mi->connection, playlist);
+ while (( ent = mpd_getNextInfoEntity(mi->connection)) != NULL)
+ {
+ data = mpd_new_data_struct_append( data );
+ if(ent->type == MPD_INFO_ENTITY_TYPE_DIRECTORY)
+ {
+ data->type = MPD_DATA_TYPE_DIRECTORY;
+ data->directory = ent->info.directory->path;
+ ent->info.directory->path = NULL;
+ }
+ else if (ent->type == MPD_INFO_ENTITY_TYPE_SONG)
+ {
+ data->type = MPD_DATA_TYPE_SONG;
+ data->song = ent->info.song;
+ ent->info.song = NULL;
+ }
+ else if (ent->type == MPD_INFO_ENTITY_TYPE_PLAYLISTFILE)
+ {
+ data->type = MPD_DATA_TYPE_PLAYLIST;
+ data->playlist = ent->info.playlistFile->path;
+ ent->info.playlistFile->path = NULL;
+ }
+
+ mpd_freeInfoEntity(ent);
+ }
+ mpd_finishCommand(mi->connection);
+
+ /* unlock */
+ mpd_unlock_conn(mi);
+ if(data == NULL)
+ {
+ return NULL;
+ }
+ return mpd_data_get_first(data);
+}
===
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_mpc.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- emphasis_mpc.h 20 Aug 2006 22:48:49 - 1.5
+++ emphasis_mpc.h 21 Aug 2006 01:04:41 - 1.6
@@ -53,7 +53,9 @@
void mpc_load_playlist(char *playlist_name);
void mpc_delete_playlist(char *playlist_name);
+/* TEMP */
MpdData *mpd_database_list_playlist();
+MpdData *mpd_database_get_pls_content(MpdObj *mi,char *playlist);
/** @} */
#endif /* EMPHASIS_MPC_H_ */
-
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
E CVS: apps/e rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: TODO-- (moom got this one done) === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.402 retrieving revision 1.403 diff -u -3 -r1.402 -r1.403 --- TODO21 Aug 2006 00:45:44 - 1.402 +++ TODO21 Aug 2006 00:48:05 - 1.403 @@ -8,9 +8,6 @@ BUGS / FIXES --- -* BUG: e_entry/editable widget is pretty borken in sizing, clipping, initial - state and i think is also now causing segv's (not sure yet), but it needs - a complete going over if not a rewrite. :( * BUG: "match this window only" doesnt fall back to other unused remembers * BUG: if app asks for borderless in properties - borderless toggle in menu doesn't have any effect. - 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
E CVS: apps/e rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: update todo === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.401 retrieving revision 1.402 diff -u -3 -r1.401 -r1.402 --- TODO12 Aug 2006 13:25:29 - 1.401 +++ TODO21 Aug 2006 00:45:44 - 1.402 @@ -76,10 +76,8 @@ CLEANUPS --- -* bg needs a gradient dialog that can take a set of pre-drawn png's and edc - recipies and use colored rects and overlayed png's recolored with color - options to create vertical, horizontal, radial etc. gradients quickly and - save to an edc +* bg gradient dialog needs a preview widget. also edje needs to be updated so we can do proper fills for non 0 angles. +* wallpaper dialog needs to select an existing wallpaper when the current on e is deleted. (might need to add a hook to e_fm2 for delete events). * fsel could do with an optional preview pane for selected file (bigger icon, file info (permissions, modification date etc.) * clientinfo dialog could be nicer - then again it is an obsucre thing. @@ -103,6 +101,7 @@ per desktop (with stick windows considered to live on the "current" desk when winlist starts) * make it easy for modules to hook into ipc and extend it for themselves +* e_color_dialog needs to have an area for favorite and recently selected colors. store in config and use ilist? or store as color files and use e_fm2? or custom widget? ]]] [[[ - 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
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/data/themes/e17/bits
Modified Files:
treehead-groups.edc
Log Message:
- display a sorting arrow in the header of the tree.
- these seems to cause a slight sizing issue with the rows in the tree as
they get shifted left the width of the sort arrow.
===
RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/bits/treehead-groups.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- treehead-groups.edc 20 Aug 2006 20:53:42 - 1.3
+++ treehead-groups.edc 20 Aug 2006 23:32:34 - 1.4
@@ -39,3 +39,67 @@
}
}
+group {
+ name, "tree/header/ascending/body";
+ min, 16 16;
+
+ parts {
+ part {
+ name, "uback";
+ mouse_events, 0;
+ description {
+ state, "default" 0.0;
+ min, 16 16;
+ image {
+ normal, "stock-arrow_down.png";
+ }
+ fill {
+ smooth: 0;
+ }
+ }
+ }
+ }
+}
+
+group {
+ name, "tree/header/descending/body";
+ min, 16 16;
+ parts {
+ part {
+ name, "dback";
+ mouse_events, 0;
+ description {
+ state, "default" 0.0;
+ min, 16 16;
+ image {
+ normal, "stock-arrow_up.png";
+ }
+ fill {
+ smooth: 0;
+ }
+ }
+ }
+ }
+}
+
+group {
+ name, "tree/header/blank/body";
+ min, 16 16;
+ parts {
+ part {
+ name, "dback";
+ mouse_events, 0;
+ description {
+ state, "default" 0.0;
+ min, 16 16;
+ image {
+ normal, "blank.png";
+ }
+ fill {
+ smooth: 0;
+ }
+ }
+ }
+ }
+}
+
-
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
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes Modified Files: e17.edc Log Message: - display a sorting arrow in the header of the tree. - these seems to cause a slight sizing issue with the rows in the tree as they get shifted left the width of the sort arrow. === RCS file: /cvs/e/e17/libs/ewl/data/themes/e17.edc,v retrieving revision 1.47 retrieving revision 1.48 diff -u -3 -r1.47 -r1.48 --- e17.edc 14 Aug 2006 04:33:13 - 1.47 +++ e17.edc 20 Aug 2006 23:32:34 - 1.48 @@ -80,6 +80,10 @@ item, "/tree_header/button/group" "tree_header_label"; item, "/tree_header/grabber/vertical/group" "vline"; + item, "/tree_header/header/ascending/body/group" "tree/header/ascending/body"; + item, "/tree_header/header/descending/body/group" "tree/header/descending/body"; + item, "/tree_header/header/blank/body/group" "tree/header/blank/body"; + item, "/row/group" "row_background"; item, "/row/cell/label/group" "row_text"; item, "/node/check/group" "treenode"; - 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
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/e17/bits/images Modified Files: images.edc Added Files: blank.png Log Message: - display a sorting arrow in the header of the tree. - these seems to cause a slight sizing issue with the rows in the tree as they get shifted left the width of the sort arrow. === RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/bits/images/images.edc,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- images.edc 11 Aug 2006 02:52:41 - 1.19 +++ images.edc 20 Aug 2006 23:32:34 - 1.20 @@ -91,5 +91,6 @@ image: "e17_spinner_bottom_arrow.png" COMP; image: "entry_disabled.png" COMP; image: "row_select.png" COMP; + image: "blank.png" COMP; - 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
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_tree2.c
Log Message:
- display a sorting arrow in the header of the tree.
- these seems to cause a slight sizing issue with the rows in the tree as
they get shifted left the width of the sort arrow.
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree2.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- ewl_tree2.c 20 Aug 2006 21:09:05 - 1.26
+++ ewl_tree2.c 20 Aug 2006 23:32:34 - 1.27
@@ -530,9 +530,7 @@
ewl_tree2_cb_column_sort(Ewl_Widget *w, void *ev __UNUSED__, void *data)
{
Ewl_Tree2_Column *c, *col;
- Ewl_Widget *child;
- char *theme_str;
- int index = 0, count = 0;
+ int index = 0;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("data", data);
@@ -546,29 +544,17 @@
DRETURN(DLEVEL_STABLE);
}
- /* need to loop over the headers and reset the state */
- theme_str = "default";
- ewl_container_child_iterate_begin(EWL_CONTAINER(c->parent->header));
- while ((child =
ewl_container_child_next(EWL_CONTAINER(c->parent->header
- {
- /* don't bother signaling the clicked header as we'll do
-* that later anyway */
- if (child == w)
- {
- index = count;
- continue;
- }
-
- ewl_widget_state_set(child, theme_str, EWL_STATE_TRANSIENT);
- count ++;
- }
-
/* loop over the columns and reset the sort settings */
ecore_list_goto_first(c->parent->columns);
while ((col = ecore_list_next(c->parent->columns)))
{
/* skip the current column */
- if (col == c) continue;
+ if (col == c)
+ {
+ /* we're the index before the one we're now on */
+ index = ecore_list_index(c->parent->columns) - 1;
+ continue;
+ }
col->sort = EWL_SORT_DIRECTION_NONE;
}
@@ -578,15 +564,6 @@
c->sort = ((c->sort + 1) % EWL_SORT_DIRECTION_MAX);
if (!c->sort) c->sort ++;
- /* pick the theme setting for the sort direction and set on the
-* header */
- if (c->sort == EWL_SORT_DIRECTION_ASCENDING)
- theme_str = "ascending";
- else if (c->sort == EWL_SORT_DIRECTION_DESCENDING)
- theme_str = "descending";
-
- ewl_widget_state_set(w, theme_str, EWL_STATE_TRANSIENT);
-
c->model->sort(c->parent->data, index, c->sort);
/* force the tree to redraw */
@@ -612,20 +589,47 @@
while ((col = ecore_list_next(tree->columns)))
{
int r;
- Ewl_Widget *h;
+ char *theme_str;
+ Ewl_Widget *h, *c;
- h = col->view->header_fetch(tree->data, column);
- ewl_object_fill_policy_set(EWL_OBJECT(h),
- EWL_FLAG_FILL_HSHRINK | EWL_FLAG_FILL_HFILL);
+ h = ewl_hbox_new();
ewl_container_child_append(EWL_CONTAINER(tree->header), h);
+ ewl_widget_appearance_set(h, "header");
+ ewl_widget_show(h);
if (col->model->sort)
ewl_callback_append(h, EWL_CALLBACK_CLICKED,
ewl_tree2_cb_column_sort, col);
- column ++;
+
+ c = col->view->header_fetch(tree->data, column);
+ ewl_object_fill_policy_set(EWL_OBJECT(c),
+ EWL_FLAG_FILL_HSHRINK | EWL_FLAG_FILL_HFILL);
+ ewl_container_child_append(EWL_CONTAINER(h), c);
+
+ /* display the sort arrow if needed */
+ if (col->model->sort)
+ {
+ c = ewl_button_new();
+ ewl_container_child_append(EWL_CONTAINER(h), c);
+
+ if (col->sort == EWL_SORT_DIRECTION_ASCENDING)
+ theme_str = "ascending";
+ else if (col->sort == EWL_SORT_DIRECTION_DESCENDING)
+ theme_str = "descending";
+ else
+ theme_str = "blank";
+
+ ewl_widget_appearance_set(c, theme_str);
+ ewl_widget_internal_set(c, TRUE);
+ ewl_object_fill_policy_set(EWL_OBJECT(c),
EWL_FLAG_FILL_SHRINK);
+ ewl_object_alignment_set(EWL_OBJECT(c),
EWL_FLAG_ALIGN_RIGHT);
+ ewl_widget_show(c);
+ }
r = col->model->count(tree->data);
if (r > rows) rows = r;
+
+
E CVS: apps/e rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_color_dialog.c e_color_dialog.h
e_int_config_wallpaper_gradient.c e_widget_color_well.c
e_widget_csel.c e_widget_spectrum.c
Log Message:
* crosshairs show in proper place in spectrum initially
* a color well's dialog closes when the well is deleted
* the X border button calls the cancel cb for the color dialog
* the X on the grad dialog now works
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_color_dialog.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_color_dialog.c20 Aug 2006 22:15:27 - 1.2
+++ e_color_dialog.c20 Aug 2006 23:29:41 - 1.3
@@ -7,6 +7,7 @@
static void _e_color_dialog_button1_click(void *data, E_Dialog *edia);
static void _e_color_dialog_button2_click(void *data, E_Dialog *edia);
static void _e_color_dialog_free(E_Color_Dialog *dia);
+static void _e_color_dialog_dia_del(E_Object *obj);
/**
* Create a color selector dialog.
@@ -44,6 +45,9 @@
e_dialog_resizable_set(dia->dia, 1);
e_win_centered_set(dia->dia->win, 1);
+ dia->dia->data = dia;
+ e_object_del_attach_func_set(E_OBJECT(dia->dia), _e_color_dialog_dia_del);
+
return dia;
}
@@ -88,7 +92,7 @@
_e_color_dialog_button2_click(void *data, E_Dialog *edia)
{
E_Color_Dialog *dia;
-
+
dia = data;
if(dia->cancel_func && dia->color)
dia->cancel_func(dia, dia->color, dia->cancel_data);
@@ -98,8 +102,15 @@
static void
_e_color_dialog_free(E_Color_Dialog *dia)
{
- printf("DIALOG FREE!\n");
e_object_unref(E_OBJECT(dia->dia));
E_FREE(dia->color);
E_FREE(dia);
+}
+
+static void
+_e_color_dialog_dia_del(E_Object *obj)
+{
+ E_Dialog *dia = obj;
+ E_Color_Dialog *cdia = dia->data;
+ _e_color_dialog_button2_click(cdia, dia);
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_color_dialog.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_color_dialog.h20 Aug 2006 22:15:27 - 1.2
+++ e_color_dialog.h20 Aug 2006 23:29:41 - 1.3
@@ -19,7 +19,7 @@
E_Dialog*dia;
E_Color *color;
-
+
void (*select_func)(E_Color_Dialog *dia, E_Color *color, void *data);
void *select_data;
void (*cancel_func)(E_Color_Dialog *dia, E_Color *color, void *data);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_gradient.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_int_config_wallpaper_gradient.c 20 Aug 2006 22:33:31 - 1.4
+++ e_int_config_wallpaper_gradient.c 20 Aug 2006 23:29:41 - 1.5
@@ -58,6 +58,7 @@
static void _import_cb_close(void *data, E_Dialog *dia);
static void _import_cb_ok(void *data, E_Dialog *dia);
static void _import_config_save(Import *import);
+static void _import_cb_dia_del(E_Object *obj);
EAPI E_Dialog *
e_int_config_wallpaper_gradient(E_Config_Dialog *parent)
@@ -81,7 +82,9 @@
return NULL;
}
- dia->win->data = import;
+ dia->data = import;
+ e_object_del_attach_func_set(E_OBJECT(dia), _import_cb_dia_del);
+ e_win_centered_set(dia->win, 1);
cfdata = E_NEW(E_Config_Dialog_Data, 1);
cfdata->mode = GRAD_H;
@@ -96,7 +99,6 @@
import->parent = parent;
e_dialog_title_set(dia, _("Create a gradient..."));
- // e_win_delete_callback_set(dia->win, _import_cb_delete);
cfdata->color1 = calloc(1, sizeof(E_Color));
cfdata->color1->a = 255;
@@ -190,7 +192,7 @@
{
Import *import;
- import = dia->win->data;
+ import = dia->data;
_import_config_save(import);
if (import->exe_handler) ecore_event_handler_del(import->exe_handler);
@@ -376,11 +378,6 @@
}
static void
-_import_cb_delete(E_Win *win)
-{
-}
-
-static void
_import_cb_close(void *data, E_Dialog *dia)
{
e_int_config_wallpaper_gradient_del(dia);
@@ -391,7 +388,7 @@
{
Import *import;
- import = dia->win->data;
+ import = dia->data;
if (dia && import->cfdata->name)
{
@@ -401,3 +398,9 @@
e_int_config_wallpaper_gradient_del(dia);
}
+static void
+_import_cb_dia_del(E_Object *obj)
+{
+ E_Dialog *dia = obj;
+ e_int_config_wallpaper_gradient_del(dia);
+}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_color_well.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_widget_color_well.c 20 Aug 2006 22:15:27 - 1.3
+++ e_widget_color_well.c 20 Aug 2006 23:29:41 - 1.4
@@ -76,6 +76,7 @@
wd = e_widget_data_get(obj);
if (!wd) return;
+ if (wd->dia) e_object_unref(E_OBJECT(wd->dia));
E_FREE(wd);
}
==
E CVS: proto lok
Enlightenment CVS committal Author : lok Project : e17 Module : proto Dir : e17/proto/emphasis/src/emphasis_cover_editor Added Files: WARNING_README_FIRST Removed Files: WARNING README FIRST Log Message: So close to make it in one commit... - 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
E CVS: proto lok
Enlightenment CVS committal Author : lok Project : e17 Module : proto Dir : e17/proto/emphasis/data Added Files: config.glade Log Message: So close to make it in one commit... - 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
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_desklock.c e_int_config_wallpaper_import.c
Log Message:
fix import if dir contains special chars
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_desklock.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- e_int_config_desklock.c 14 Aug 2006 15:22:45 - 1.28
+++ e_int_config_desklock.c 20 Aug 2006 22:51:12 - 1.29
@@ -58,7 +58,7 @@
int zone_count; // local variable;
- char *cur_bg; // local variable;
+ char *bg; // local variable;
Evas *evas; // local variable
Evas_Object *preview_image; // local variable
@@ -144,9 +144,9 @@
cfdata->show_password = 0;
if (!e_config->desklock_background)
- cfdata->cur_bg = strdup(DEF_DESKLOCK_BACKGROUND);
+ cfdata->bg = strdup(DEF_DESKLOCK_BACKGROUND);
else
- cfdata->cur_bg = strdup(e_config->desklock_background);
+ cfdata->bg = strdup(e_config->desklock_background);
#ifdef HAVE_PAM
cfdata->auth_method = e_config->desklock_auth_method;
@@ -176,7 +176,7 @@
E_FREE(cfdata->desklock_passwd);
E_FREE(cfdata->desklock_passwd_cp);
- E_FREE(cfdata->cur_bg);
+ E_FREE(cfdata->bg);
free(cfdata);
}
@@ -296,11 +296,11 @@
}
e_config->desklock_personal_passwd = (char
*)evas_stringshare_add(cfdata->desklock_passwd_cp);
- if (cfdata->cur_bg)
+ if (cfdata->bg)
{
if (e_config->desklock_background)
evas_stringshare_del(e_config->desklock_background);
- e_config->desklock_background = (char
*)evas_stringshare_add(cfdata->cur_bg);
+ e_config->desklock_background = (char
*)evas_stringshare_add(cfdata->bg);
}
if (_e_desklock_zone_num_get() > 1)
@@ -343,7 +343,7 @@
/* start: bkg list */
cfdata->gui.bg_list = e_widget_ilist_add(evas, BG_LIST_ICON_SIZE_W,
- BG_LIST_ICON_SIZE_H,
&(cfdata->cur_bg));
+ BG_LIST_ICON_SIZE_H, &(cfdata->bg));
e_widget_ilist_selector_set(cfdata->gui.bg_list, 1);
e_widget_min_size_set(cfdata->gui.bg_list, 180, 200);
@@ -651,16 +651,16 @@
E_Config_Dialog_Data *cfdata;
cfdata = data;
- if (cfdata->cur_bg[0])
+ if (cfdata->bg[0])
{
- if (!strcmp(cfdata->cur_bg, DEF_DESKLOCK_BACKGROUND))
+ if (!strcmp(cfdata->bg, DEF_DESKLOCK_BACKGROUND))
{
const char *theme;
theme = e_theme_edje_file_get("base/theme/desklock",
"desklock/background");
e_widget_preview_edje_set(cfdata->preview_image, theme,
"desklock/background");
}
- else if (!strcmp(cfdata->cur_bg, DEF_THEME_BACKGROUND))
+ else if (!strcmp(cfdata->bg, DEF_THEME_BACKGROUND))
{
const char *theme;
@@ -668,7 +668,7 @@
e_widget_preview_edje_set(cfdata->preview_image, theme,
"desktop/background");
}
else
- e_widget_preview_edje_set(cfdata->preview_image, cfdata->cur_bg,
"desktop/background");
+ e_widget_preview_edje_set(cfdata->preview_image, cfdata->bg,
"desktop/background");
}
else
{
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_import.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_int_config_wallpaper_import.c 17 Aug 2006 16:58:32 - 1.14
+++ e_int_config_wallpaper_import.c 20 Aug 2006 22:51:12 - 1.15
@@ -336,7 +336,7 @@
if (!imgdir) ipart[0] = '\0';
else
{
- snprintf(ipart, sizeof(ipart), "-id %s", imgdir);
+ snprintf(ipart, sizeof(ipart), "-id %s",
e_util_filename_escape(imgdir));
free(imgdir);
}
-
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
E CVS: proto lok
Enlightenment CVS committal Author : lok Project : e17 Module : proto Dir : e17/proto/emphasis/data/images Modified Files: Makefile.am haricot_musique-g.png Added Files: haricot_musique-amor.png haricot_musique-lalaa.png haricot_musique-mario.png haricot_musique-mooo.png haricot_musique.png Log Message: Make it build. Handle mpd playlists. Config panel is now a glade. Pre-build eap added. Added a quick made cover editor (read the README). === RCS file: /cvs/e/e17/proto/emphasis/data/images/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 21 Jul 2006 04:05:27 - 1.2 +++ Makefile.am 20 Aug 2006 22:48:49 - 1.3 @@ -1,8 +1,15 @@ +MAINTAINERCLEANFILES = Makefile.in + FILES = \ note.png \ sound_low.png \ sound_high.png \ -haricot_musique-g.png +haricot_musique-amor.png \ +haricot_musique-g.png \ +haricot_musique-lalaa.png \ +haricot_musique-mario.png \ +haricot_musique-mooo.png \ +haricot_musique.png filesdir = $(pkgdatadir)/images files_DATA = $(FILES) === RCS file: /cvs/e/e17/proto/emphasis/data/images/haricot_musique-g.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsSYYrrB and /tmp/cvsZZX26c differ - 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
E CVS: proto lok
Enlightenment CVS committal Author : lok Project : e17 Module : proto Dir : e17/proto/emphasis Modified Files: AUTHORS Makefile.am README TODO configure.in Log Message: Make it build. Handle mpd playlists. Config panel is now a glade. Pre-build eap added. Added a quick made cover editor (read the README). === RCS file: /cvs/e/e17/proto/emphasis/AUTHORS,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- AUTHORS 21 Jul 2006 04:05:27 - 1.2 +++ AUTHORS 20 Aug 2006 22:48:49 - 1.3 @@ -1,7 +1,7 @@ Main author: Samuel 'lok' Mendes <[EMAIL PROTECTED]> -Jonathan 'aji' Aberman +Jonathan 'aji' Aberman <[EMAIL PROTECTED]> Floris 'any' Chabert Thanks: @@ -10,4 +10,4 @@ Simon 'MoOm' Treny <[EMAIL PROTECTED]> Misc EFL Carsten 'The Rasterman' Haitzler <[EMAIL PROTECTED]> + team TestingKevin 'KnX' Michel -Graphics Jonathan 'aji' Aberman +Graphics Jonathan 'aji' Aberman <[EMAIL PROTECTED]> === RCS file: /cvs/e/e17/proto/emphasis/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 8 Jul 2006 17:04:59 - 1.2 +++ Makefile.am 20 Aug 2006 22:48:49 - 1.3 @@ -4,11 +4,12 @@ SUBDIRS = src data MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \ - config.h.in config.sub configure install-sh \ - ltconfig ltmain.sh missing mkinstalldirs depcomp \ - stamp-h.in $(MYAPPNAME)_docs.tar \ - $(MYAPPNAME)_docs.tar.gz $(MYAPPNAME).c \ - debian/changelog + config.h.in config.h.in~ config.sub configure \ + install-sh \ + ltconfig ltmain.sh missing mkinstalldirs depcomp \ + stamp-h stamp-h.in $(MYAPPNAME)_docs.tar \ + $(MYAPPNAME)_docs.tar.gz $(MYAPPNAME).c \ + debian/changelog dist-hook: ./gendoc; \ === RCS file: /cvs/e/e17/proto/emphasis/README,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- README 21 Jul 2006 04:05:27 - 1.4 +++ README 20 Aug 2006 22:48:49 - 1.5 @@ -6,7 +6,7 @@ Double left click on a row of medialib treeview add it with a search to the playlist, and play it if the server is on status "stop". ex : double left click on an album row will add all this album - Double middle click remove them on the same principe, + Middle click remove them on the same principe, Select a row in the playlist and push "d" to delete it from the playlist. Right click open a contextual menu. A click on the progress bar seek the right time on the song. @@ -15,7 +15,6 @@ # Description: Emphasis is a simple MPD (Music Player Daemon) client writen in C/Etk. - It's a clone of MpcOS-X # Depends: === RCS file: /cvs/e/e17/proto/emphasis/TODO,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- TODO21 Jul 2006 04:05:27 - 1.4 +++ TODO20 Aug 2006 22:48:49 - 1.5 @@ -1,10 +1,21 @@ -*put the config dialog in the glade file +== Bugfix == +-Un-Leak the writing of the config +-Parse song title for & before put them in the label +-Change prototypes of row_clicked callbacks + +== Global == *Add crossfade config *Add a drag and drop to order the tree_pls *Make an OSD at song change *Make a special panel for stream support *Make a special panel for advanced search *Add bindings keys +*Add "crossfade" cover +*Fixe windows postion (not at startup) +*Parse Song name (emphasis hate special caract like '&') +*Add support of ID3 covers and path choose for cover +*Grab media-keys +*Add a theme or media_tab_icons == Later == -*Support XMMS 2 +*Support XMMS 2 (later later later) === RCS file: /cvs/e/e17/proto/emphasis/configure.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- configure.in21 Jul 2006 04:05:27 - 1.6 +++ configure.in20 Aug 2006 22:48:49 - 1.7 @@ -145,7 +145,7 @@ libxml2_cflags=`xml2-config --cflags` # add your required libs / include here -my_includes="$ecore_cflags $etk_cflags $enhance_cflags $libmpd_cflags $libxml2_cflags" +my_includes="$ecore_cflags $etk_cflags $enhance_cflags $libmpd_cflags $libxml2_cflags -DHAVE_STRNDUP" my_libs="$ecore_libs $etk_libs $enhance_libs $libmpd_libs $libxml2_libs -lpth
E CVS: proto lok
Enlightenment CVS committal Author : lok Project : e17 Module : proto Dir : e17/proto/emphasis/src Modified Files: Makefile.am Log Message: Make it build. Handle mpd playlists. Config panel is now a glade. Pre-build eap added. Added a quick made cover editor (read the README). === RCS file: /cvs/e/e17/proto/emphasis/src/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 6 Jun 2006 11:22:15 - 1.1 +++ Makefile.am 20 Aug 2006 22:48:49 - 1.2 @@ -1,3 +1,2 @@ -## Process this file with automake to produce Makefile.in - +MAINTAINERCLEANFILES = Makefile.in SUBDIRS = bin - 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
E CVS: proto lok
Enlightenment CVS committal Author : lok Project : e17 Module : proto Dir : e17/proto/emphasis/src/emphasis_cover_editor Added Files: WARNING README FIRST build.sh emphasis_cover_editor.c emphasis_cover_editor.glade Log Message: Make it build. Handle mpd playlists. Config panel is now a glade. Pre-build eap added. Added a quick made cover editor (read the README). - 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
E CVS: proto lok
Enlightenment CVS committal Author : lok Project : e17 Module : proto Dir : e17/proto/emphasis/data/eap Added Files: Makefile.am build.sh emphasis.edc haricot_eap.png Log Message: Make it build. Handle mpd playlists. Config panel is now a glade. Pre-build eap added. Added a quick made cover editor (read the README). - 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
E CVS: proto lok
Enlightenment CVS committal
Author : lok
Project : e17
Module : proto
Dir : e17/proto/emphasis/src/bin
Modified Files:
Makefile.am emphasis.c emphasis.h emphasis_callbacks.c
emphasis_callbacks.h emphasis_config_gui.c
emphasis_config_gui.h emphasis_cover_db.c emphasis_gui.c
emphasis_media.c emphasis_media.h emphasis_misc.c
emphasis_misc.h emphasis_mpc.c emphasis_mpc.h
emphasis_player.c emphasis_player.h
Log Message:
Make it build.
Handle mpd playlists.
Config panel is now a glade.
Pre-build eap added.
Added a quick made cover editor (read the README).
===
RCS file: /cvs/e/e17/proto/emphasis/src/bin/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 21 Jul 2006 04:05:27 - 1.4
+++ Makefile.am 20 Aug 2006 22:48:49 - 1.5
@@ -36,3 +36,5 @@
emphasis_data_list.c
emphasis_LDADD = @my_libs@
+
+MAINTAINERCLEANFILES = Makefile.in
===
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- emphasis.c 2 Aug 2006 05:53:58 - 1.7
+++ emphasis.c 20 Aug 2006 22:48:49 - 1.8
@@ -6,7 +6,7 @@
Emphasis_Gui *gui;
/* void */ enhance_init();
- if (!etk_init(&argc, &argv))
+ if(!etk_init(&argc, &argv))
{
fprintf(stderr, "Unable to init etk\n");
return 1;
@@ -32,7 +32,7 @@
etk_main();
- /* enhance_free(gui->player->en); *HUM* *HUM* */
+ enhance_free(gui->player->en);
return 0;
}
@@ -62,7 +62,7 @@
etk_tree_col_width_set(ETK_TREE_COL_GET(player->media.pls, 3),
config->colwidth.album);
- emphasis_player_mode_set(player, config->mode);
+ emphasis_player_force_mode_set(player, config->mode);
emphasis_player_info_set(player, NULL, "Not connected to MPD");
config_free(config);
===
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- emphasis.h 21 Jul 2006 04:05:27 - 1.4
+++ emphasis.h 20 Aug 2006 22:48:49 - 1.5
@@ -8,6 +8,7 @@
#include "config.h"
#include
+#include
#include
#include
===
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_callbacks.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- emphasis_callbacks.c15 Aug 2006 18:31:45 - 1.8
+++ emphasis_callbacks.c20 Aug 2006 22:48:49 - 1.9
@@ -5,7 +5,7 @@
/**
* @brief Quit the main loop
*/
-void
+Etk_Bool
cb_quit(Etk_Object *object, void *data)
{
/* TODO :
@@ -40,8 +40,10 @@
config_free(config);
mpc_disconnect();
- /* ecore_config_shutdown() *HUM* *HUM* */
+ ecore_config_shutdown();
etk_main_quit();
+
+ return ETK_TRUE;
}
/* TODO : doc */
@@ -138,6 +140,7 @@
void
cb_toggle_media(Etk_Object *object, void *data)
{
+ /* Okay, now I have an ETK_FALSE. */
Emphasis_Player_Gui *player;
Etk_Bool checked;
player = data;
@@ -145,13 +148,13 @@
checked =
etk_toggle_button_active_get(ETK_TOGGLE_BUTTON(object));
- if(checked == ETK_TRUE)
+ if(checked == ETK_FALSE)
{
- etk_widget_show_all(player->media.window);
+ etk_widget_show(player->media.window);
}
else
{
- etk_widget_hide_all(player->media.window);
+ etk_widget_hide(player->media.window);
}
}
@@ -178,7 +181,7 @@
Etk_Event_Mouse_Up_Down *event,
void *data)
{
- UNUSED(event)
+ UNUSED(event);
Emphasis_Player_Gui *player;
player = data;
@@ -202,6 +205,7 @@
{
UNUSED(object)
UNUSED(data)
+
mpc_change_vol(value);
}
@@ -519,26 +523,23 @@
cb_tree_mlib_clicked(Etk_Object *object, Etk_Tree_Row *row,
Etk_Event_Mouse_Up_Down *event, void *data)
{
- Etk_Widget *widget, *tree;
+ Emphasis_Player_Gui *player;
+ Emphasis_Type et;
char *str;
+ player = data;
+ et = (Emphasis_Type) etk_object_data_get(object, "Emphasis_Type");
if ((event->button == 1) && (event->flags & EVAS_BUTTON_DOUBLE_CLICK))
{
- emphasis_playlist_append_selected(ETK_TREE(object),
-(Emphasis_Type) data);
+ emphasis_playlist_append_selected(ETK_TREE(object), et);
mpc_play_if_stopped();
}
if (event->button == 2)
{
- widget = etk_widget_parent_get(ETK_WIDGET(object));
- widget = etk_widget_parent_get(ETK_WIDGET(widget));
- tree = etk_paned_child2_get(ETK_PANED(widget));
-
etk_tree_row_fields_get(row, etk_tree_nth_col_get(ETK_TREE(object), 0),
&str, NULL);
- emphasis_playlist_search_and_delete(ETK_TREE(tree), str,
-
E CVS: apps/e rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_wallpaper_gradient.c Log Message: start with proper hsv also... === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_gradient.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_int_config_wallpaper_gradient.c 20 Aug 2006 22:30:44 - 1.3 +++ e_int_config_wallpaper_gradient.c 20 Aug 2006 22:33:31 - 1.4 @@ -109,6 +109,8 @@ cfdata->color2->r = e_config->wallpaper_grad_c2_r; cfdata->color2->g = e_config->wallpaper_grad_c2_g; cfdata->color2->b = e_config->wallpaper_grad_c2_b; + e_color_update_rgb(cfdata->color1); + e_color_update_rgb(cfdata->color2); ol = e_widget_list_add(evas, 0, 0); - 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
E CVS: apps/e rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_config.c e_config.h e_int_config_wallpaper_gradient.c
Log Message:
save the last used gradient colors and use them the next time the dialog is
shown
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -3 -r1.193 -r1.194
--- e_config.c 20 Aug 2006 08:22:18 - 1.193
+++ e_config.c 20 Aug 2006 22:30:44 - 1.194
@@ -473,6 +473,13 @@
E_CONFIG_VAL(D, T, wallpaper_import_last_dev, STR);
E_CONFIG_VAL(D, T, wallpaper_import_last_path, STR);
+
+ E_CONFIG_VAL(D, T, wallpaper_grad_c1_r, INT);
+ E_CONFIG_VAL(D, T, wallpaper_grad_c1_g, INT);
+ E_CONFIG_VAL(D, T, wallpaper_grad_c1_b, INT);
+ E_CONFIG_VAL(D, T, wallpaper_grad_c2_r, INT);
+ E_CONFIG_VAL(D, T, wallpaper_grad_c2_g, INT);
+ E_CONFIG_VAL(D, T, wallpaper_grad_c2_b, INT);
e_config = e_config_domain_load("e", _e_config_edd);
if (e_config)
@@ -1167,6 +1174,15 @@
IFCFG(0x0096); /* the version # where this value(s) was introduced */
e_config->wallpaper_import_last_dev = evas_stringshare_add("~/");
e_config->wallpaper_import_last_path = evas_stringshare_add("/");
+ IFCFGEND;
+
+ IFCFG(0x0098);
+ e_config->wallpaper_grad_c1_r = 0;
+ e_config->wallpaper_grad_c1_g = 0;
+ e_config->wallpaper_grad_c1_b = 0;
+ e_config->wallpaper_grad_c2_r = 255;
+ e_config->wallpaper_grad_c2_g = 255;
+ e_config->wallpaper_grad_c2_b = 255;
IFCFGEND;
#if 0 /* example of new config */
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.h,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -3 -r1.107 -r1.108
--- e_config.h 15 Aug 2006 20:17:19 - 1.107
+++ e_config.h 20 Aug 2006 22:30:44 - 1.108
@@ -50,7 +50,7 @@
/* increment this whenever a new set of config values are added but the users
* config doesn't need top be wiped - simply new values need to be put in
*/
-#define E_CONFIG_FILE_GENERATION 0x0097
+#define E_CONFIG_FILE_GENERATION 0x0098
#define E_CONFIG_FILE_VERSION((E_CONFIG_FILE_EPOCH << 16) |
E_CONFIG_FILE_GENERATION)
#define E_EVAS_ENGINE_DEFAULT 0
@@ -236,6 +236,13 @@
const char *wallpaper_import_last_dev; // INTERNAL
const char *wallpaper_import_last_path; // INTERNAL
+
+ int wallpaper_grad_c1_r; // INTERNAL
+ int wallpaper_grad_c1_g; // INTERNAL
+ int wallpaper_grad_c1_b; // INTERNAL
+ int wallpaper_grad_c2_r; // INTERNAL
+ int wallpaper_grad_c2_g; // INTERNAL
+ int wallpaper_grad_c2_b; // INTERNAL
};
struct _E_Config_Module
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_gradient.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_int_config_wallpaper_gradient.c 20 Aug 2006 22:15:27 - 1.2
+++ e_int_config_wallpaper_gradient.c 20 Aug 2006 22:30:44 - 1.3
@@ -57,6 +57,7 @@
static void _import_cb_delete(E_Win *win);
static void _import_cb_close(void *data, E_Dialog *dia);
static void _import_cb_ok(void *data, E_Dialog *dia);
+static void _import_config_save(Import *import);
EAPI E_Dialog *
e_int_config_wallpaper_gradient(E_Config_Dialog *parent)
@@ -69,10 +70,10 @@
E_Radio_Group *rg;
Evas_Coord w, h;
E_Config_Dialog_Data *cfdata;
-
+
import = E_NEW(Import, 1);
if (!import) return NULL;
-
+
dia = e_dialog_new(parent->con, "E", "_wallpaper_gradient_dialog");
if (!dia)
{
@@ -89,26 +90,31 @@
import->dia = dia;
cfdata->name = strdup("gradient");
-
+
evas = e_win_evas_get(dia->win);
-
+
import->parent = parent;
e_dialog_title_set(dia, _("Create a gradient..."));
- // e_win_delete_callback_set(dia->win, _import_cb_delete);
-
+ // e_win_delete_callback_set(dia->win, _import_cb_delete);
+
cfdata->color1 = calloc(1, sizeof(E_Color));
cfdata->color1->a = 255;
cfdata->color2 = calloc(1, sizeof(E_Color));
cfdata->color2->a = 255;
- // XXX load last used colors from config.
+ cfdata->color1->r = e_config->wallpaper_grad_c1_r;
+ cfdata->color1->g = e_config->wallpaper_grad_c1_g;
+ cfdata->color1->b = e_config->wallpaper_grad_c1_b;
+ cfdata->color2->r = e_config->wallpaper_grad_c2_r;
+ cfdata->color2->g = e_config->wallpaper_grad_c2_g;
+ cfdata->color2->b = e_config->wallpaper_grad_c2_b;
ol = e_widget_list_add(evas, 0, 0);
ot = e_widget_table_add(evas, 0);
evas_object_show(ot);
-
+
o = e_widget_label_add(evas, _("Name:"));
evas_object_show(o);
e_widget_table_object_append(ot, o, 1, 1, 1, 1, 0, 1, 0, 1);
@@ -170,7 +176,7 @@
e_dialog_button_add(dia, _("OK"), NULL, _import_cb_ok, cfdata);
e_dialog_button_add(dia, _("Cancel"), NULL, _i
E CVS: apps/e moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_editable.c
Log Message:
* [E_Editable] Fix valgrind warnings and mem leak
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_editable.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_editable.c20 Aug 2006 09:48:13 - 1.8
+++ e_editable.c20 Aug 2006 22:24:16 - 1.9
@@ -966,22 +966,32 @@
/* Position of the start cursor (note, the start cursor can not be at
* the end of the editable object, and the editable object can not be
* empty, or it would have returned before)*/
-evas_object_text_char_pos_get(text_obj, start_pos, &cx, &cy, &cw, &ch);
+if (!evas_object_text_char_pos_get(text_obj, start_pos,
+ &cx, &cy, &cw, &ch))
+ return;
+
sx = tx + cx - 1;
sy = ty + cy;
+
/* Position of the end cursor (note, the editable object can not be
* empty, or it would have returned before)*/
if (end_pos >= sd->unicode_length)
{
- evas_object_text_char_pos_get(text_obj, sd->unicode_length - 1,
- &cx, &cy, &cw, &ch);
+ if (!evas_object_text_char_pos_get(text_obj,
+sd->unicode_length - 1,
+&cx, &cy, &cw, &ch))
+ return;
+
sw = (tx + cx + cw - 1) - sx;
sh = ch;
}
else
{
- evas_object_text_char_pos_get(text_obj, end_pos, &cx, &cy, &cw,
&ch);
+ if (!evas_object_text_char_pos_get(text_obj, end_pos,
+&cx, &cy, &cw, &ch))
+ return;
+
sw = (tx + cx - 1) - sx;
sh = ch;
}
@@ -1077,6 +1087,7 @@
{
Evas *evas;
E_Editable_Smart_Data *sd;
+ Evas_Coord ox, oy;
if ((!object) || !(evas = evas_object_evas_get(object)))
return;
@@ -1087,6 +1098,7 @@
_e_editable_smart_use++;
evas_object_smart_data_set(object, sd);
+ evas_object_geometry_get(object, &ox, &oy, NULL, NULL);
sd->text = malloc((E_EDITABLE_BLOCK_SIZE + 1) * sizeof(char));
sd->text[0] = '\0';
@@ -1106,26 +1118,31 @@
sd->password_mode = 0;
sd->clip_object = evas_object_rectangle_add(evas);
+ evas_object_move(sd->clip_object, ox, oy);
evas_object_smart_member_add(sd->clip_object, object);
sd->event_object = evas_object_rectangle_add(evas);
evas_object_color_set(sd->event_object, 255, 255, 255, 0);
evas_object_clip_set(sd->event_object, sd->clip_object);
+ evas_object_move(sd->event_object, ox, oy);
evas_object_smart_member_add(sd->event_object, object);
sd->text_object = edje_object_add(evas);
evas_object_pass_events_set(sd->text_object, 1);
evas_object_clip_set(sd->text_object, sd->clip_object);
+ evas_object_move(sd->text_object, ox, oy);
evas_object_smart_member_add(sd->text_object, object);
sd->selection_object = edje_object_add(evas);
evas_object_pass_events_set(sd->selection_object, 1);
evas_object_clip_set(sd->selection_object, sd->clip_object);
+ evas_object_move(sd->selection_object, ox, oy);
evas_object_smart_member_add(sd->selection_object, object);
sd->cursor_object = edje_object_add(evas);
evas_object_pass_events_set(sd->cursor_object, 1);
evas_object_clip_set(sd->cursor_object, sd->clip_object);
+ evas_object_move(sd->cursor_object, ox, oy);
evas_object_smart_member_add(sd->cursor_object, object);
_e_editable_cursor_update(object);
@@ -1145,7 +1162,7 @@
evas_object_del(sd->text_object);
evas_object_del(sd->cursor_object);
evas_object_del(sd->selection_object);
-
+ free(sd->text);
free(sd);
_e_editable_smart_use--;
-
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
E CVS: proto lok
Enlightenment CVS committal Author : lok Project : e17 Module : proto Dir : e17/proto/emphasis/data/eap Log Message: Directory /cvs/e/e17/proto/emphasis/data/eap added to the repository - 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
E CVS: apps/e rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_color.c e_color.h e_color_dialog.c e_color_dialog.h
e_int_config_wallpaper_gradient.c e_test.c
e_widget_color_well.c e_widget_color_well.h e_widget_csel.c
Log Message:
when clicking on a color well, initialize the color selector to the well's color
few other cleanups
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_color.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_color.c 16 Aug 2006 04:43:20 - 1.2
+++ e_color.c 20 Aug 2006 22:15:27 - 1.3
@@ -19,7 +19,7 @@
}
void
-e_color_copy(E_Color *from, E_Color *to)
+e_color_copy(const E_Color *from, E_Color *to)
{
if (!from || !to) return;
to->r = from->r;
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_color.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_color.h 16 Aug 2006 05:29:53 - 1.3
+++ e_color.h 20 Aug 2006 22:15:27 - 1.4
@@ -31,6 +31,6 @@
EAPI void e_color_update_rgb (E_Color *ec);
EAPI void e_color_update_hsv (E_Color *ec);
-EAPI void e_color_copy (E_Color *from, E_Color *to);
+EAPI void e_color_copy (const E_Color *from, E_Color *to);
#endif
#endif
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_color_dialog.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_color_dialog.c20 Aug 2006 21:18:29 - 1.1
+++ e_color_dialog.c20 Aug 2006 22:15:27 - 1.2
@@ -8,8 +8,14 @@
static void _e_color_dialog_button2_click(void *data, E_Dialog *edia);
static void _e_color_dialog_free(E_Color_Dialog *dia);
+/**
+ * Create a color selector dialog.
+ *
+ * @param con container to display on
+ * @param color color to initialize to (or NULL for black).
+ */
E_Color_Dialog *
-e_color_dialog_new (E_Container *con)
+e_color_dialog_new (E_Container *con, const E_Color *color)
{
E_Color_Dialog *dia;
Evas_Object *o;
@@ -21,7 +27,11 @@
e_dialog_title_set(dia->dia, "Color Selector");
dia->color = calloc(1, sizeof(E_Color));
- dia->color->a = 255;
+
+ if (color)
+ e_color_copy(color, dia->color);
+ else
+ dia->color->a = 255;
o = e_widget_csel_add(dia->dia->win->evas, dia->color);
evas_object_show(o);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_color_dialog.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_color_dialog.h20 Aug 2006 21:18:29 - 1.1
+++ e_color_dialog.h20 Aug 2006 22:15:27 - 1.2
@@ -26,7 +26,7 @@
void *cancel_data;
};
-EAPI E_Color_Dialog *e_color_dialog_new(E_Container *con);
+EAPI E_Color_Dialog *e_color_dialog_new(E_Container *con,
const E_Color *initial_color);
EAPI void e_color_dialog_show (E_Color_Dialog *dia);
EAPI void e_color_dialog_title_set (E_Color_Dialog *dia,
const char *title);
EAPI void e_color_dialog_select_callback_add(E_Color_Dialog *dia,
void (*func)(E_Color_Dialog *dia, E_Color *color, void *data), void *data);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_gradient.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_int_config_wallpaper_gradient.c 20 Aug 2006 21:18:29 - 1.1
+++ e_int_config_wallpaper_gradient.c 20 Aug 2006 22:15:27 - 1.2
@@ -129,17 +129,17 @@
evas_object_show(o);
e_widget_table_object_append(ot, o, 2, 1, 1, 1, 1, 1, 1, 1);
- o = e_widget_color_well_add(evas, cfdata->color1, parent->con);
+ o = e_widget_color_well_add(evas, cfdata->color1, 1);
evas_object_show(o);
e_widget_table_object_append(ot, o, 2, 2, 1, 1, 1, 1, 1, 1);
- o = e_widget_color_well_add(evas, cfdata->color2, parent->con);
+ o = e_widget_color_well_add(evas, cfdata->color2, 1);
evas_object_show(o);
e_widget_table_object_append(ot, o, 2, 3, 1, 1, 1, 1, 1, 1);
e_widget_list_object_append(ol, ot, 1, 1, 0.5);
- of = e_widget_framelist_add(evas, "Fill and Spread Options", 1);
+ of = e_widget_framelist_add(evas, "Fill Options", 1);
rg = e_widget_radio_group_new(&(cfdata->mode));
@@ -172,7 +172,7 @@
e_dialog_button_add(dia, _("Cancel"), NULL, _import_cb_close, cfdata);
_import_opt_disabled_set(import, 1);
- e_dialog_resizable_set(dia, 1);
+ e_dialog_resizable_set(dia, 0);
e_dialog_show(dia);
return dia;
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_test.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -
E CVS: apps/e rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default.edc default_icons.edc
Log Message:
add gradient dialog icons.
the diagonal up one looks a bit odd, but that's whats being generated right
now. need to fix edje gradient fills first.
===
RCS file: /cvs/e/e17/apps/e/data/themes/default.edc,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- default.edc 19 Aug 2006 19:09:05 - 1.70
+++ default.edc 20 Aug 2006 22:01:28 - 1.71
@@ -21,6 +21,15 @@
font: "VeraBd.ttf" "Edje-Vera-Bold";
}
+spectra {
+ spectrum {
+name: "black_to_trans";
+color: 0 0 0 255 1;
+color: 0 0 0 0 1;
+ }
+}
+
+
collections {
#include "default_background.edc"
#include "default_battery.edc"
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_icons.edc,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- default_icons.edc 9 Aug 2006 07:58:27 - 1.20
+++ default_icons.edc 20 Aug 2006 22:01:28 - 1.21
@@ -67,6 +67,7 @@
image: "e17_wallpaper_center.png" COMP;
image: "e17_wallpaper_screen.png" COMP;
image: "e17_wallpaper_center_flat.png" COMP;
+ image: "e17_wallpaper_grad_screen.png" COMP;
}
group {
@@ -1358,6 +1359,212 @@
aspect_preference: BOTH;
image {
normal: "e17_wallpaper_screen.png";
+ border: 2 2 2 2;
+ }
+}
+ }
+ }
+}
+
+group {
+ name: "icons/enlightenment/gradient_h";
+ max: 24 24;
+ parts {
+ part {
+name: "bg";
+ type: GRADIENT;
+mouse_events: 0;
+description {
+ state:"default" 0.0;
+
+ rel1 {
+ to: "screen";
+ }
+ rel2 {
+ to: "screen";
+ }
+gradient {
+ spectrum: "black_to_trans";
+}
+fill {
+ angle: 270;
+}
+}
+ }
+ part {
+name: "screen";
+mouse_events: 0;
+description {
+ state:"default" 0.0;
+ aspect: 1.0 1.0;
+ aspect_preference: BOTH;
+ image {
+ normal: "e17_wallpaper_grad_screen.png";
+ border: 2 2 2 2;
+ }
+}
+ }
+ }
+}
+
+group {
+ name: "icons/enlightenment/gradient_v";
+ max: 24 24;
+ parts {
+ part {
+name: "bg";
+ type: GRADIENT;
+mouse_events: 0;
+description {
+ state:"default" 0.0;
+
+ rel1 {
+ to: "screen";
+ }
+ rel2 {
+ to: "screen";
+ }
+gradient {
+ spectrum: "black_to_trans";
+}
+fill {
+ angle: 0;
+}
+}
+ }
+ part {
+name: "screen";
+mouse_events: 0;
+description {
+ state:"default" 0.0;
+ aspect: 1.0 1.0;
+ aspect_preference: BOTH;
+ image {
+ normal: "e17_wallpaper_grad_screen.png";
+ border: 2 2 2 2;
+ }
+}
+ }
+ }
+}
+
+group {
+ name: "icons/enlightenment/gradient_du";
+ max: 24 24;
+ parts {
+ part {
+name: "bg";
+ type: GRADIENT;
+mouse_events: 0;
+description {
+ state:"default" 0.0;
+
+ rel1 {
+ to: "screen";
+ }
+ rel2 {
+ to: "screen";
+ }
+gradient {
+ spectrum: "black_to_trans";
+}
+fill {
+ angle: 225;
+}
+}
+ }
+ part {
+name: "screen";
+mouse_events: 0;
+description {
+ state:"default" 0.0;
+ aspect: 1.0 1.0;
+ aspect_preference: BOTH;
+ image {
+ normal: "e17_wallpaper_grad_screen.png";
+ border: 2 2 2 2;
+ }
+}
+ }
+ }
+}
+
+group {
+ name: "icons/enlightenment/gradient_dd";
+ max: 24 24;
+ parts {
+ part {
+name: "bg";
+ type: GRADIENT;
+mouse_events: 0;
+description {
+ state:"default" 0.0;
+
+ rel1 {
+ to: "screen";
+ }
+ rel2 {
+ to: "screen";
+ }
+gradient {
+ spectrum: "black_to_trans";
+}
+fill {
+ angle: 315;
+}
+}
+ }
+ part {
+name: "screen";
+mouse_events: 0;
+description {
+ state:"de
E CVS: apps/e rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : apps/e Dir : e17/apps/e/data/themes/images Added Files: e17_wallpaper_grad_screen.png Log Message: add gradient dialog icons. the diagonal up one looks a bit odd, but that's whats being generated right now. need to fix edje gradient fills first. - 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
E CVS: proto lok
Enlightenment CVS committal Author : lok Project : e17 Module : proto Dir : e17/proto/emphasis/src/emphasis_cover_editor Log Message: Directory /cvs/e/e17/proto/emphasis/src/emphasis_cover_editor added to the repository - 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
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_enums.h ewl_model.h ewl_tree2.c ewl_tree2.h
Log Message:
- ewl_tree2 columns are now sortable. Clicking on the header (of a column
which has a sort cb) will sort it, clicking again sorts in the other
direction.
- This needs theme work to mark a header as sorted ascending or descending.
Currently sets the state of the header but no edc code to react to it yet.
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_enums.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- ewl_enums.h 15 Aug 2006 15:06:51 - 1.51
+++ ewl_enums.h 20 Aug 2006 21:09:05 - 1.52
@@ -694,6 +694,23 @@
typedef enum Ewl_Mouse_Cursor_Type Ewl_Mouse_Cursor_Type;
/**
+ * @enum Ewl_Sort_Direction
+ * The current sort direction
+ */
+enum Ewl_Sort_Direction
+{
+ EWL_SORT_DIRECTION_NONE = 0,
+ EWL_SORT_DIRECTION_ASCENDING,
+ EWL_SORT_DIRECTION_DESCENDING,
+ EWL_SORT_DIRECTION_MAX
+};
+
+/**
+ * The Ewl_Sort_Direction
+ */
+typedef enum Ewl_Sort_Direction Ewl_Sort_Direction;
+
+/**
* @}
*/
#endif /* __EWL_ENUMS_H__ */
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_model.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ewl_model.h 11 May 2006 04:01:20 - 1.10
+++ ewl_model.h 20 Aug 2006 21:09:05 - 1.11
@@ -45,7 +45,8 @@
/**
* A typedef to shorten the definition of the model_sort callbacks.
*/
-typedef void (*Ewl_Model_Sort)(void *data, unsigned int column);
+typedef void (*Ewl_Model_Sort)(void *data, unsigned int column,
+ Ewl_Sort_Direction sort);
/**
* @def EWL_MODEL_DATA_COUNT(f)
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree2.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ewl_tree2.c 20 Aug 2006 19:00:52 - 1.25
+++ ewl_tree2.c 20 Aug 2006 21:09:05 - 1.26
@@ -147,6 +147,7 @@
ewl_tree2_column_model_set(c, model);
ewl_tree2_column_view_set(c, view);
+ ewl_tree2_column_tree_set(c, tree);
ecore_list_append(tree->columns, c);
ewl_tree2_dirty_set(tree, TRUE);
@@ -181,6 +182,7 @@
ewl_tree2_column_model_set(c, model);
ewl_tree2_column_view_set(c, view);
+ ewl_tree2_column_tree_set(c, tree);
ecore_list_prepend(tree->columns, c);
ewl_tree2_dirty_set(tree, TRUE);
@@ -217,6 +219,7 @@
ewl_tree2_column_model_set(c, model);
ewl_tree2_column_view_set(c, view);
+ ewl_tree2_column_tree_set(c, tree);
ecore_list_goto_index(tree->columns, idx);
ecore_list_insert(tree->columns, c);
@@ -515,6 +518,84 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
+/**
+ * @internal
+ * @param w: The header that was clicked
+ * @param ev: UNUSED
+ * @param data: The column related to this header
+ * @return Returns no value
+ * @brief Sorts the tree by the given column
+ */
+void
+ewl_tree2_cb_column_sort(Ewl_Widget *w, void *ev __UNUSED__, void *data)
+{
+ Ewl_Tree2_Column *c, *col;
+ Ewl_Widget *child;
+ char *theme_str;
+ int index = 0, count = 0;
+
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR("data", data);
+
+ c = data;
+
+ /* sanity check */
+ if (!c->model || !c->model->sort)
+ {
+ DWARNING("In ewl_tree2_cb_column_sort without a sort cb.");
+ DRETURN(DLEVEL_STABLE);
+ }
+
+ /* need to loop over the headers and reset the state */
+ theme_str = "default";
+ ewl_container_child_iterate_begin(EWL_CONTAINER(c->parent->header));
+ while ((child =
ewl_container_child_next(EWL_CONTAINER(c->parent->header
+ {
+ /* don't bother signaling the clicked header as we'll do
+* that later anyway */
+ if (child == w)
+ {
+ index = count;
+ continue;
+ }
+
+ ewl_widget_state_set(child, theme_str, EWL_STATE_TRANSIENT);
+ count ++;
+ }
+
+ /* loop over the columns and reset the sort settings */
+ ecore_list_goto_first(c->parent->columns);
+ while ((col = ecore_list_next(c->parent->columns)))
+ {
+ /* skip the current column */
+ if (col == c) continue;
+
+ col->sort = EWL_SORT_DIRECTION_NONE;
+ }
+
+ /* update our sort direction and call the sort function, skipping
+* over SORT_NONE */
+ c->sort = ((c->sort + 1) % EWL_SORT_DIRECTION_MAX);
+ if (!c->sort) c->sort ++;
+
+ /* pick the theme setti
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_textblock.c etk_textblock.h etk_widget.c
Log Message:
* [Textblock] Fix a bug that appeared when we deleted a line of the
textblock (see estickies)
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_textblock.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- etk_textblock.c 4 Aug 2006 19:58:49 - 1.26
+++ etk_textblock.c 20 Aug 2006 20:41:20 - 1.27
@@ -77,6 +77,7 @@
static void _etk_tb_constructor(Etk_Textblock *tb);
static void _etk_tb_destructor(Etk_Textblock *tb);
+static void _etk_textblock_node_printf(Etk_Textblock_Node *node, int n_tabs);
static Etk_Textblock_Node *_etk_textblock_node_new(Etk_Textblock_Node *parent,
Etk_Textblock_Node *prev, Etk_Textblock_Node_Type node_type,
Etk_Textblock_Tag_Type tag_type);
static Etk_Textblock_Node *_etk_textblock_node_free(Etk_Textblock_Node *node);
static void _etk_textblock_node_type_set(Etk_Textblock_Node *node,
Etk_Textblock_Node_Type node_type, Etk_Textblock_Tag_Type tag_type);
@@ -651,7 +652,7 @@
Etk_Textblock_Iter *it;
Etk_Textblock_Node *start_line, *end_line, *line;
Etk_Textblock_Node *start_paragraph, *end_paragraph, *paragraph;
- Etk_Textblock_Node *n;
+ Etk_Textblock_Node *n, *new_node;
Evas_List *l;
Etk_Bool done;
@@ -732,7 +733,8 @@
{
if (it->node == start_iter->node && it->pos <= start_iter->pos)
continue;
-else if (it != end_iter && it->node == end_iter->node && it->pos >
end_iter->pos)
+
+if (it != end_iter && it->node == end_iter->node && it->pos >
end_iter->pos)
{
it->index -= end_iter->index;
it->pos -= end_iter->pos;
@@ -747,6 +749,24 @@
/* Merge the start and the end lines, and remove the other lines */
if (start_line != end_line)
{
+ /* Make sure the start line node has at least one child */
+ if (etk_string_length_get(start_line->text) > 0)
+ {
+ new_node = _etk_textblock_node_new(start_line, NULL,
ETK_TEXTBLOCK_NODE_NORMAL, ETK_TEXTBLOCK_TAG_DEFAULT);
+ new_node->text = start_line->text;
+ new_node->unicode_length = start_line->unicode_length;
+ start_line->text = NULL;
+ start_line->unicode_length = 0;
+
+ for (l = tb->iters; l; l = l->next)
+ {
+it = l->data;
+if (it->node == start_line)
+ it->node = new_node;
+ }
+ }
+
+ /* Add the children of the end line node to the start line node */
while (end_line->children)
_etk_textblock_node_attach(end_line->children, start_line,
start_line->last_child);
@@ -1295,6 +1315,30 @@
*w = tw / len;
}
+/**
+ * @brief Prints the textblock hierarchy for debug
+ * TODO: etk_textblock_printf(): Remove this function
+ */
+void etk_textblock_printf(Etk_Textblock *tb)
+{
+ Evas_List *l;
+ Etk_Textblock_Object_SD *sd;
+
+ if (!tb)
+ return;
+
+ printf("TEXTBLOCK PRINTF\n"
+ "\n");
+ _etk_textblock_node_printf(&tb->root, -1);
+ printf("\n");
+ for (l = tb->evas_objects; l; l = l->next)
+ {
+ sd = evas_object_smart_data_get(l->data);
+ printf("Iterator node: %d %d | %s\n", sd->cursor->node->type,
sd->cursor->node->tag.type,
+ etk_string_get(sd->cursor->node->text) ?
etk_string_get(sd->cursor->node->text) : "NULL");
+ }
+}
+
/**
*
* Etk specific functions
@@ -2401,9 +2445,9 @@
ETK_WARNING("The iterator is not attached to a textblock node");
return ETK_FALSE;
}
- else if (iter->node->children)
+ else if (iter->node->type == ETK_TEXTBLOCK_NODE_ROOT)
{
- ETK_WARNING("The node of the iterator is not a leaf");
+ ETK_WARNING("The iterator can't be attached to the root node");
return ETK_FALSE;
}
else if (iter->node->type == ETK_TEXTBLOCK_NODE_PARAGRAPH)
@@ -2411,9 +2455,9 @@
ETK_WARNING("The iterator can't be attached to a paragraph node");
return ETK_FALSE;
}
- else if (iter->node->type == ETK_TEXTBLOCK_NODE_ROOT)
+ else if (iter->node->children)
{
- ETK_WARNING("The iterator can't be attached to the root node");
+ ETK_WARNING("The node of the iterator is not a leaf");
return ETK_FALSE;
}
else if (iter->pos < 0 || iter->pos > iter->node->unicode_length ||
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_textblock.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- etk_textblock.h 27 Jul 2006 00:40:40 - 1.15
+++ etk_textblock.h 20 Aug 2006 20:41:20 - 1.16
@@ -249,6 +249,7 @@
int etk_textblock_unico
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin/tests
Modified Files:
ewl_tree2.c
Log Message:
- ewl_tree2 columns are now sortable. Clicking on the header (of a column
which has a sort cb) will sort it, clicking again sorts in the other
direction.
- This needs theme work to mark a header as sorted ascending or descending.
Currently sets the state of the header but no edc code to react to it yet.
===
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/ewl_tree2.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_tree2.c 11 Aug 2006 03:36:16 - 1.8
+++ ewl_tree2.c 20 Aug 2006 21:09:05 - 1.9
@@ -4,6 +4,8 @@
#include
#include
+#define TREE2_DATA_ELEMENTS 5
+
typedef struct Tree2_Test_Row_Data Tree2_Test_Row_Data;
struct Tree2_Test_Row_Data
{
@@ -26,7 +28,8 @@
int column);
static void *tree2_test_data_fetch(void *data, unsigned int row,
unsigned int column);
-static void tree2_test_data_sort(void *data, unsigned int column);
+static void tree2_test_data_sort(void *data, unsigned int column,
+ Ewl_Sort_Direction sort);
static int tree2_test_data_count_get(void *data);
void
@@ -78,6 +81,11 @@
ewl_view_header_fetch_set(view, tree2_test_data_header_fetch);
ewl_tree2_column_append(EWL_TREE2(tree), model, view);
+ /* we don't want this one sortable */
+ model = ewl_model_new();
+ewl_model_fetch_set(model, tree2_test_data_fetch);
+ewl_model_count_set(model, tree2_test_data_count_get);
+
/* create a view for the third column that has a custom widget */
view = ewl_view_new();
ewl_view_constructor_set(view, tree2_test_custom_new);
@@ -95,7 +103,7 @@
Tree2_Test_Row_Data **dt;
data = calloc(1, sizeof(Tree2_Test_Data));
-dt = calloc(3, sizeof(Tree2_Test_Row_Data *));
+dt = calloc(TREE2_DATA_ELEMENTS, sizeof(Tree2_Test_Row_Data *));
dt[0] = calloc(1, sizeof(Tree2_Test_Row_Data));
dt[0]->image = strdup(PACKAGE_DATA_DIR"/images/e-logo.png");
@@ -109,8 +117,16 @@
dt[2]->image = strdup(PACKAGE_DATA_DIR"/images/entrance.png");
dt[2]->text = strdup("The Entrance image");
+ dt[3] = calloc(1, sizeof(Tree2_Test_Row_Data));
+dt[3]->image = strdup(PACKAGE_DATA_DIR"/images/End.png");
+dt[3]->text = strdup("Zebra");
+
+ dt[4] = calloc(1, sizeof(Tree2_Test_Row_Data));
+dt[4]->image = strdup(PACKAGE_DATA_DIR"/images/banner-top.png");
+dt[4]->text = strdup("Ant");
+
data->rows = dt;
-data->count = 3;
+data->count = TREE2_DATA_ELEMENTS;
return data;
}
@@ -189,9 +205,52 @@
}
static void
-tree2_test_data_sort(void *data __UNUSED__, unsigned int column __UNUSED__)
+tree2_test_data_sort(void *data, unsigned int column, Ewl_Sort_Direction sort)
{
-printf("No sort yet.\n");
+ int i;
+Tree2_Test_Data *d;
+
+ /* just leave it if we're in sort none. */
+ if (sort == EWL_SORT_DIRECTION_NONE)
+ return;
+
+ d = data;
+
+ for (i = (TREE2_DATA_ELEMENTS - 1); i >= 0; i--)
+ {
+ int j;
+
+ for (j = 1; j <= i; j++)
+ {
+ char *a, *b;
+
+ if (column == 0)
+ {
+ a = d->rows[j - 1]->text;
+ b = d->rows[j]->text;
+ }
+ else
+ {
+ a = d->rows[j - 1]->image;
+ b = d->rows[j]->image;
+ }
+
+ if (((sort == EWL_SORT_DIRECTION_ASCENDING) &&
strcmp(a, b) > 0)
+ || ((sort ==
EWL_SORT_DIRECTION_DESCENDING)
+ && strcmp(a, b) < 0))
+ {
+ char *temp;
+
+ temp = d->rows[j - 1]->text;
+ d->rows[j - 1]->text = d->rows[j]->text;
+ d->rows[j]->text = temp;
+
+ temp = d->rows[j - 1]->image;
+ d->rows[j - 1]->image = d->rows[j]->image;
+ d->rows[j]->image = temp;
+ }
+ }
+ }
}
static int
-
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 Ser
E CVS: apps/e rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_wallpaper.c
Log Message:
close the gradient dialog when the wallpaper one is closed
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_int_config_wallpaper.c20 Aug 2006 21:18:29 - 1.6
+++ e_int_config_wallpaper.c20 Aug 2006 21:33:50 - 1.7
@@ -343,7 +343,7 @@
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
if (cfdata->win_import) e_int_config_wallpaper_del(cfdata->win_import);
- //if (cfdata->dia_gradient)
e_int_config_wallpaper_gradient_del(cfdata->dia_gradient);
+ if (cfdata->dia_gradient)
e_int_config_wallpaper_gradient_del(cfdata->dia_gradient);
E_FREE(cfdata->bg);
free(cfdata);
}
-
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
E CVS: apps/e rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_color_well.edc
Log Message:
forgot this..
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_color_well.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- default_color_well.edc 15 Aug 2006 00:54:32 - 1.1
+++ default_color_well.edc 20 Aug 2006 21:27:01 - 1.2
@@ -61,7 +61,7 @@
}
part {
name: "overlay";
-mouse_events: 0;
+mouse_events: 1;
description {
state:"default" 0.0;
image {
@@ -74,6 +74,13 @@
}
}
}
-
+ }
+ programs {
+program {
+ name: "send_click";
+ signal: "mouse,clicked,1";
+ source: "overlay";
+ action: SIGNAL_EMIT "click" "";
+}
}
}
-
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
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_widget.c
Log Message:
- print the appearance we're emiting the signal too
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -3 -r1.94 -r1.95
--- ewl_widget.c4 Aug 2006 03:30:33 - 1.94
+++ ewl_widget.c20 Aug 2006 21:01:57 - 1.95
@@ -722,7 +722,8 @@
if (w->theme_object) {
if (ewl_config.theme.print_signals)
- printf("Emitting: %s to %p\n", state, w);
+ printf("Emitting: %s to %p (%s)\n", state, w,
+ w->appearance);
edje_object_signal_emit(w->theme_object, state, "EWL");
}
-
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
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/data/themes/e17/bits
Modified Files:
treehead-groups.edc
Log Message:
- formatting
===
RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/bits/treehead-groups.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- treehead-groups.edc 11 Aug 2006 02:52:41 - 1.2
+++ treehead-groups.edc 20 Aug 2006 20:53:42 - 1.3
@@ -1,43 +1,41 @@
group {
- name: "tree_header";
- data {
- }
-parts {
-part {
- description {
- min: 23 23;
-state:"default" 0.0;
-image {
- normal: "e17_tree_head_bg.png";
- border: 8 8 8 8;
-}
- fill {
- smooth: 0;
- }
- }
- }
- }
+ name: "tree_header";
+ parts {
+ part {
+ description {
+ min: 23 23;
+ state: "default" 0.0;
+ image {
+ normal: "e17_tree_head_bg.png";
+ border: 8 8 8 8;
+ }
+ fill {
+ smooth: 0;
+ }
+ }
+ }
+ }
}
group {
- name: "tree_header_label";
- data {
- item, "inset/top" "2.5";
- }
+ name: "tree_header_label";
+ data {
+ item, "inset/top" "2.5";
+ }
- parts {
- part {
- name: "label";
- mouse_events: 0;
- description {
-state:"default" 0.0;
-image {
- normal: "e17_tranny.png";
-}
-fill {
- smooth: 0;
-}
- }
- }
- }
+ parts {
+ part {
+ name: "label";
+ mouse_events: 0;
+ description {
+ state: "default" 0.0;
+ image {
+ normal: "e17_tranny.png";
+ }
+ fill {
+ smooth: 0;
+ }
+ }
+ }
+ }
}
-
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
E CVS: apps/e rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_includes.h e_int_config_wallpaper.c e_spectrum.c
e_test.c e_widget_color_well.c e_widget_color_well.h
e_widget_csel.c e_widget_cslider.c e_widget_spectrum.c
Added Files:
e_color_dialog.c e_color_dialog.h
e_int_config_wallpaper_gradient.c
e_int_config_wallpaper_gradient.h
Log Message:
add gradient bg dialog.
finish up the color selector widgets (plug some leaks)
TODO:
* color_dialog needs a way of specifying initial color
* color_well needs to use this when showing its color dialog
* the grad dialog should remember the last selected colors
* the color dialog whould probably keep a list of favorite / recent colors
Also, it looks like there's a leak (according to valgrind at least) in
e_editable.c when you set the text and it reallocs.
===
RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -3 -r1.141 -r1.142
--- Makefile.am 20 Aug 2006 04:48:27 - 1.141
+++ Makefile.am 20 Aug 2006 21:18:29 - 1.142
@@ -172,7 +172,9 @@
e_widget_csel.h \
e_widget_color_well.h \
e_int_config_wallpaper.h \
-e_int_config_wallpaper_import.h
+e_int_config_wallpaper_import.h \
+e_int_config_wallpaper_gradient.h \
+e_color_dialog.h
enlightenment_src = \
e_user.c \
@@ -321,6 +323,8 @@
e_widget_color_well.c \
e_int_config_wallpaper.c \
e_int_config_wallpaper_import.c \
+e_int_config_wallpaper_gradient.c \
+e_color_dialog.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_SOURCES = \
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -3 -r1.119 -r1.120
--- e_includes.h20 Aug 2006 04:48:27 - 1.119
+++ e_includes.h20 Aug 2006 21:18:29 - 1.120
@@ -149,3 +149,4 @@
#include "e_widget_cslider.h"
#include "e_widget_color_well.h"
#include "e_widget_csel.h"
+#include "e_color_dialog.h"
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_int_config_wallpaper.c16 Aug 2006 12:24:23 - 1.5
+++ e_int_config_wallpaper.c20 Aug 2006 21:18:29 - 1.6
@@ -30,6 +30,7 @@
int all_this_desk_screen;
/* dialogs */
E_Win *win_import;
+ E_Dialog *dia_gradient;
};
EAPI E_Config_Dialog *
@@ -91,6 +92,15 @@
cfdata->win_import = NULL;
}
+EAPI void
+e_int_config_wallpaper_gradient_done(E_Config_Dialog *dia)
+{
+ E_Config_Dialog_Data *cfdata;
+
+ cfdata = dia->cfdata;
+ cfdata->dia_gradient = NULL;
+}
+
static void
_cb_button_up(void *data1, void *data2)
@@ -163,7 +173,6 @@
E_Config_Dialog_Data *cfdata;
cfdata = data;
- printf("SEL\n");
}
static void
@@ -255,8 +264,18 @@
else cfdata->win_import = e_int_config_wallpaper_import(cfdata->cfd);
}
-
-
+static void
+_cb_gradient(void *data1, void *data2)
+{
+ E_Config_Dialog_Data *cfdata;
+
+ cfdata = data1;
+ if (cfdata->dia_gradient)
+ {
+ e_win_raise(cfdata->dia_gradient->win);
+ }
+ else cfdata->dia_gradient = e_int_config_wallpaper_gradient(cfdata->cfd);
+}
static void
_fill_data(E_Config_Dialog_Data *cfdata)
@@ -324,6 +343,7 @@
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
if (cfdata->win_import) e_int_config_wallpaper_del(cfdata->win_import);
+ //if (cfdata->dia_gradient)
e_int_config_wallpaper_gradient_del(cfdata->dia_gradient);
E_FREE(cfdata->bg);
free(cfdata);
}
@@ -424,7 +444,7 @@
_cb_import, cfdata, NULL);
e_widget_list_object_append(ol, o, 1, 0, 0.5);
o = e_widget_button_add(evas, _("Gradient..."), "enlightenment/gradient",
- NULL, cfdata, NULL);
+ _cb_gradient, cfdata, NULL);
e_widget_list_object_append(ol, o, 1, 0, 0.5);
e_widget_list_object_append(il, ol, 1, 0, 0.5);
e_widget_list_object_append(of, il, 1, 0, 0.0);
@@ -564,7 +584,7 @@
_cb_import, cfdata, NULL);
e_widget_list_object_append(ol, o, 1, 0, 0.5);
o = e_widget_button_add(evas, _("Gradient..."), "enlightenment/gradient",
- NULL, cfdata, NULL);
+ _cb_gradient, cfdata, NULL);
e_widget_list_object_append(ol, o, 1, 0, 0.5);
e_widget_list_object_append(il, ol, 1, 0, 0.5);
e_widget_list_object_append(of, il, 1, 0, 0.0);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_spectrum.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_spectrum.c17 Aug 2006 16:58:32 -
E CVS: proto lok
Enlightenment CVS committal
Author : lok
Project : e17
Module : proto
Dir : e17/proto/enhance/src/lib
Modified Files:
enhance.c enhance_widget.c
Log Message:
Added property "adjustment" for sliders.
===
RCS file: /cvs/e/e17/proto/enhance/src/lib/enhance.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- enhance.c 20 Aug 2006 17:51:23 - 1.28
+++ enhance.c 20 Aug 2006 19:46:28 - 1.29
@@ -781,7 +781,26 @@
style = ETK_TOOLBAR_BOTH_HORIZ;
}
etk_toolbar_style_set(ETK_TOOLBAR(wid->wid), style);
- }
+ }
+
+ else if(!strcmp(name, "adjustment"))
+ {
+ PROPERTY_STR;
+ double val;
+ double lower;
+ double upper;
+ double step_incr;
+ double page_incr;
+ double page_size;
+
+ sscanf(value, "%lf %lf %lf %lf %lf %lf", &val, &lower, &upper,
&step_incr, &page_incr, &page_size);
+ etk_object_properties_set(ETK_OBJECT(wid->wid),
+"value", val,
+"lower", lower,
+"upper", upper,
+"step_increment", step_incr,
+"page_increment", page_incr, NULL);
+ }
}
void
===
RCS file: /cvs/e/e17/proto/enhance/src/lib/enhance_widget.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- enhance_widget.c17 Aug 2006 20:32:21 - 1.21
+++ enhance_widget.c20 Aug 2006 19:46:28 - 1.22
@@ -560,9 +560,9 @@
int value;
int min = 0;
int max = 0;
- int step_inc = 0;
- int page_inc = 0;
- int page_size = 0;
+ int step_inc = 1;
+ int page_inc = 1;
+ int page_size = 1;
id = ecore_hash_get(node->attributes, "id");
if(!id) return 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
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/config
Modified Files:
menus.cfg strings.c
Log Message:
Add combined configuration dialog.
===
RCS file: /cvs/e/e16/e/config/menus.cfg,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- menus.cfg 28 Apr 2006 18:12:19 - 1.13
+++ menus.cfg 20 Aug 2006 19:30:55 - 1.14
@@ -47,6 +47,7 @@
BEGIN_NEW_MENU("CONFIG_SUBMENU", "ROOT")
ADD_MENU_TITLE("Settings")
+ADD_MENU_TEXT_ITEM("Enlightenment Settings ...", __A_CMD, "misc cfg")
ADD_MENU_TEXT_ITEM("Focus Settings ...", __A_CMD, "focus cfg")
ADD_MENU_TEXT_ITEM("Move & Resize Settings ...", __A_CMD, "misc cfg
moveresize")
ADD_MENU_TEXT_ITEM("Window Placement Settings ...", __A_CMD, "misc cfg
placement")
===
RCS file: /cvs/e/e16/e/config/strings.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- strings.c 28 Jan 2006 14:58:54 - 1.7
+++ strings.c 20 Aug 2006 19:30:55 - 1.8
@@ -93,6 +93,7 @@
_("Query all cache usage"),
_("Regenerate Menus"),
_("Settings"),
+_("Enlightenment Settings ..."),
_("Focus Settings ..."),
_("Move & Resize Settings ..."),
_("Window Placement Settings ..."),
@@ -131,6 +132,7 @@
_("Max Size Toggle"),
_("Available Max Size Toggle"),
_("Absolute Max Size Toggle"),
+_("Span Xinerama Screens"),
_("Height"),
_("Width"),
_("Size"),
@@ -145,6 +147,7 @@
_("60%"),
_("80%"),
_("100%"),
+_("Opaque when focused"),
_("Toggle Shadows"),
_("Toggle Skip Window Lists"),
_("Toggle Fixed Position"),
-
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
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
dialog.c dialog.h mod-misc.c settings.c settings.h
Log Message:
Add combined configuration dialog.
===
RCS file: /cvs/e/e16/e/src/dialog.c,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -3 -r1.169 -r1.170
--- dialog.c20 Aug 2006 18:40:41 - 1.169
+++ dialog.c20 Aug 2006 19:30:55 - 1.170
@@ -249,6 +249,13 @@
XKeysymToKeycode(disp, XStringToKeysym(key));
}
+void
+DialogKeybindingsDestroy(Dialog * d)
+{
+ _EFREE(d->keybindings);
+ d->num_bindings = 0;
+}
+
Dialog *
DialogCreate(const char *name)
{
@@ -295,7 +302,7 @@
}
void
-DialogDestroyButtons(Dialog * d, int clean)
+DialogButtonsDestroy(Dialog * d, int clean)
{
int i;
@@ -318,15 +325,14 @@
Efree(d->title);
if (d->text)
Efree(d->text);
- DialogDestroyButtons(d, 0);
+ DialogButtonsDestroy(d, 0);
+ DialogKeybindingsDestroy(d);
if (d->item)
DialogItemDestroy(d->item, 0);
if (d->iclass)
ImageclassDecRefcount(d->iclass);
if (d->tclass)
TextclassDecRefcount(d->tclass);
- if (d->keybindings)
- Efree(d->keybindings);
FreePmapMask(&(d->pmm_bg));
EFreePixmap(d->pmap);
===
RCS file: /cvs/e/e16/e/src/dialog.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- dialog.h20 Aug 2006 17:39:32 - 1.16
+++ dialog.h20 Aug 2006 19:30:55 - 1.17
@@ -85,7 +85,8 @@
voidDialogClose(Dialog * d);
voidDialogArrange(Dialog * d, int resize);
-voidDialogDestroyButtons(Dialog * d, int clean);
+voidDialogButtonsDestroy(Dialog * d, int clean);
+voidDialogKeybindingsDestroy(Dialog * d);
voidDialogItemTableEmpty(DItem * di);
voidDialogShowSimple(const DialogDef * dd, void *data);
===
RCS file: /cvs/e/e16/e/src/mod-misc.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- mod-misc.c 11 Aug 2006 16:09:39 - 1.39
+++ mod-misc.c 20 Aug 2006 19:30:55 - 1.40
@@ -211,6 +211,8 @@
DialogShowSimple(&DlgRemember, NULL);
else if (!strncmp(prm, "session", 2))
DialogShowSimple(&DlgSession, NULL);
+ else if (prm[0] == '\0')
+ SettingsConfiguration();
}
else if (!strncmp(cmd, "arrange", 3))
{
===
RCS file: /cvs/e/e16/e/src/settings.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -3 -r1.155 -r1.156
--- settings.c 8 Aug 2006 03:58:42 - 1.155
+++ settings.c 20 Aug 2006 19:30:55 - 1.156
@@ -616,3 +616,91 @@
DialogShowSimple(&DlgComposite, NULL);
}
#endif
+
+/*
+ * Combined configuration dialog
+ */
+
+static const DialogDef *dialogs[] = {
+ &DlgFocus,
+ &DlgMoveResize,
+ &DlgPlacement,
+ &DlgDesks,
+ &DlgAreas,
+ &DlgPagers,
+ &DlgMenus,
+ &DlgAutoraise,
+ &DlgTooltips,
+ &DlgSound,
+ &DlgGroupDefaults,
+ &DlgRemember,
+ &DlgFx,
+ &DlgBackground,
+ &DlgThemeTrans,
+#if USE_COMPOSITE
+ &DlgComposite,
+#endif
+ &DlgSession,
+ &DlgMisc,
+};
+#define N_CFG_DLGS (sizeof(dialogs)/sizeof(DialogDef*))
+
+static void
+CB_DlgSelect(Dialog * d, int val, void *data)
+{
+ const DialogDef*dd = dialogs[val];
+ DItem *table = data;
+
+ if (!table)
+ return;
+ if (!dd->fill)
+ return;
+
+ DialogItemTableEmpty(table);
+ DialogButtonsDestroy(d, 1);
+ DialogKeybindingsDestroy(d);
+
+ DialogSetTitle(d, _(dd->title));
+ DialogFill(d, table, dd, NULL);
+
+ DialogArrange(d, 1);
+}
+
+static void
+_DlgFillConfiguration(Dialog * d, DItem * table, void *data __UNUSED__)
+{
+ DItem *di, *buttons, *content;
+ unsigned inti;
+
+ DialogItemTableSetOptions(table, 2, 0, 0, 0);
+
+ buttons = DialogAddItem(table, DITEM_TABLE);
+ content = DialogAddItem(table, DITEM_TABLE);
+
+ for (i = 0; i < N_CFG_DLGS; i++)
+ {
+ di = DialogAddItem(buttons, DITEM_BUTTON);
+ DialogItemSetPadding(di, 2, 2, 0, 0);
+ DialogItemSetText(di, dialogs[i]->label);
+ DialogItemSetCallback(di, CB_DlgSelect, i, content);
+ }
+
+ DialogFill(d, content, dialogs[0], NULL);
+}
+
+static const DialogDef DlgConfiguration = {
+ "CONFIGURE_ALL",
+ NULL,
+ N_("Enlightenment Settings"),
+ "SOUND_SETTINGS_ALL",
+ NULL,
+ NULL,
+ _DlgFillConfiguration,
+ 0, NULL,
+};
+
+void
+SettingsConfiguration(void)
+{
+ DialogShowSimple(&DlgConfiguration, NULL);
+}
===
RCS file: /cvs/e/e16/e/src/settings.h,v
retri
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_tree2.c
Log Message:
- break the configure into two functions
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree2.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ewl_tree2.c 15 Aug 2006 17:54:56 - 1.24
+++ ewl_tree2.c 20 Aug 2006 19:00:52 - 1.25
@@ -3,6 +3,7 @@
#include "ewl_debug.h"
#include "ewl_macros.h"
+static void ewl_tree2_build_tree(Ewl_Tree2 *tree);
static void ewl_tree2_cb_column_free(void *data);
static void ewl_tree2_cb_header_changed(Ewl_Widget *w, void *ev,
void *data);
@@ -483,8 +484,7 @@
void *data __UNUSED__)
{
Ewl_Tree2 *tree;
- Ewl_Tree2_Column *col;
- int column = 0, rows = 0, i, size;
+ int size;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
@@ -509,6 +509,22 @@
if (!ewl_tree2_dirty_get(tree))
DRETURN(DLEVEL_STABLE);
+ ewl_tree2_build_tree(tree);
+ ewl_tree2_dirty_set(tree, FALSE);
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+static void
+ewl_tree2_build_tree(Ewl_Tree2 *tree)
+{
+ Ewl_Tree2_Column *col;
+ int column = 0, rows = 0, i;
+
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR("tree", tree);
+ DCHECK_TYPE("tree", tree, EWL_TREE2_TYPE);
+
/* setup the headers */
ewl_container_reset(EWL_CONTAINER(tree->header));
ecore_list_goto_first(tree->columns);
@@ -576,8 +592,6 @@
column ++;
}
}
-
- ewl_tree2_dirty_set(tree, FALSE);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-
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
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_icon_theme.h Log Message: - put in blank comments to keep doxygen happy === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_icon_theme.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ewl_icon_theme.h16 Aug 2006 15:04:50 - 1.1 +++ ewl_icon_theme.h20 Aug 2006 18:59:35 - 1.2 @@ -13,271 +13,271 @@ const char *ewl_icon_theme_icon_path_get(const char *icon, const char *size); -#define EWL_ICON_SIZE_SMALL "16x16" -#define EWL_ICON_SIZE_MEDIUM "22x22" -#define EWL_ICON_SIZE_LARGE "24x24" - -#define EWL_ICON_ADDRESS_BOOK_NEW "address-book-new" -#define EWL_ICON_APPLICATION_EXIT "application-exit" -#define EWL_ICON_APPOINTMENT_NEW "appointment-new" -#define EWL_ICON_CONTACT_NEW "contact-new" -#define EWL_ICON_DIALOG_CANCEL "dialog-cancel" -#define EWL_ICON_DIALOG_CLOSE "dialog-close" -#define EWL_ICON_DIALOG_OK "dialog-ok" -#define EWL_ICON_DOCUMENT_NEW "document-new" -#define EWL_ICON_DOCUMENT_OPEN "document-open" -#define EWL_ICON_DOCUMENT_OPEN_RECENT "document-open-recent" -#define EWL_ICON_DOCUMENT_PAGE_SETUP "document-page-setup" -#define EWL_ICON_DOCUMENT_PRINT "document-print" -#define EWL_ICON_DOCUMENT_PRINT_PREVIEW "document-print-preview" -#define EWL_ICON_DOCUMENT_PROPERTIES "document-properties" -#define EWL_ICON_DOCUMENT_REVERT "document-revert" -#define EWL_ICON_DOCUMENT_SAVE "document-save" -#define EWL_ICON_DOCUMENT_SAVE_AS "document-save-as" -#define EWL_ICON_EDIT_COPY "edit-copy" -#define EWL_ICON_EDIT_CUT "edit-cut" -#define EWL_ICON_EDIT_DELETE "edit-delete" -#define EWL_ICON_EDIT_FIND "edit-find" -#define EWL_ICON_EDIT_FIND_REPLACE "edit-find-replace" -#define EWL_ICON_EDIT_PASTE "edit-paste" -#define EWL_ICON_EDIT_REDO "edit-redo" -#define EWL_ICON_EDIT_SELECT_ALL "edit-select-all" -#define EWL_ICON_EDIT_UNDO "edit-undo" -#define EWL_ICON_FORMAT_INDENT_LESS "format-indent-less" -#define EWL_ICON_FORMAT_INDENT_MORE "format-indent-more" -#define EWL_ICON_FORMAT_JUSTIFY_CENTER "format-justify-center" -#define EWL_ICON_FORMAT_JUSTIFY_FILL "format-justify-fill" -#define EWL_ICON_FORMAT_JUSTIFY_LEFT "format-justify-left" -#define EWL_ICON_FORMAT_JUSTIFY_RIGHT "format-justify-right" -#define EWL_ICON_FORMAT_TEXT_DIRECTION_LTR "format-text-direction-ltr" -#define EWL_ICON_FORMAT_TEXT_DIRECTION_RTL "format-text-direction-rtl" -#define EWL_ICON_FORMAT_TEXT_BOLD "format-text-bold" -#define EWL_ICON_FORMAT_TEXT_ITALIC "format-text-italic" -#define EWL_ICON_FORMAT_TEXT_UNDERLINE "format-text-underline" -#define EWL_ICON_FORMAT_TEXT_STRIKETHROUGH "format-text-strikethrough" -#define EWL_ICON_GO_BOTTOM "go-bottom" -#define EWL_ICON_GO_DOWN "go-down" -#define EWL_ICON_GO_FIRST "go-first" -#define EWL_ICON_GO_HOME "go-home" -#define EWL_ICON_GO_JUMP "go-jump" -#define EWL_ICON_GO_LAST "go-last" -#define EWL_ICON_GO_NEXT "go-next" -#define EWL_ICON_GO_PREVIOUS "go-previous" -#define EWL_ICON_GO_TOP "go-top" -#define EWL_ICON_GO_UP "go-up" -#define EWL_ICON_HELP_ABOUT "help-about" -#define EWL_ICON_HELP_CONTENTS "help-contents" -#define EWL_ICON_HELP_FAQ "help-faq" -#define EWL_ICON_INSERT_IMAGE "insert-image" -#define EWL_ICON_INSERT_LINK "insert-link" -#define EWL_ICON_INSERT_OBJECT "insert-object" -#define EWL_ICON_INSERT_TEXT "insert-text" -#define EWL_ICON_LIST_ADD "list-add" -#define EWL_ICON_LIST_REMOVE "list-remove" -#define EWL_ICON_MAIL_FORWARD "mail-forward" -#define EWL_ICON_MAIL_MARK_IMPORTANT "mail-mark-important" -#define EWL_ICON_MAIL_MARK_JUNK "mail-mark-junk" -#define EWL_ICON_MAIL_MARK_NOTJUNK "mail-mark-notjunk" -#define EWL_ICON_MAIL_MARK_READ "mail-mark-read" -#define EWL_ICON_MAIL_MARK_UNREAD "mail-mark-unread" -#define EWL_ICON_MAIL_MESSAGE_NEW "mail-message-new" -#define EWL_ICON_MAIL_REPLY_ALL "mail-reply-all" -#define EWL_ICON_MAIL_REPLY_SENDER "mail-reply-sender" -#define EWL_ICON_MAIL_SEND_RECEIVE "mail-send-receive" -#define EWL_ICON_MEDIA_EJECT "media-eject" -#define EWL_ICON_MEDIA_PLAYBACK_PAUSE "media-playback-pause" -#define EWL_ICON_MEDIA_PLAYBACK_START "media-playback-start" -#define EWL_ICON_MEDIA_PLAYBACK_STOP "media-playback-stop" -#define EWL_ICON_MEDIA_RECORD "media-record" -#define EWL_ICON_MEDIA_SEEK_BACKWARD "media-seek-backward" -#define EWL_ICON_MEDIA_SEEK_FORWARD "media-seek-forward" -#define EWL_ICON_MEDIA_SKIP_BACKWARD "media-skip-backward" -#define EWL_ICON_MEDIA_SKIP_FORWARD "media-skip-forward" -#define EWL_ICON_SYSTEM_LOCK_SCREEN "system-lock-screen" -#define EWL_ICON_SYSTEM_LOG_OUT "system-log-out" -#define EWL_ICON_SYSTEM_RUN "system-run" -#define EWL_ICON_SYSTEM_SEARCH "system-search" -#define EWL_ICON_TOOLS_CHECK_SPELLING "tools-check-spelling" -#define EWL_ICON_VIEW_FULLSCREEN "view-fullscreen" -#define EWL_ICON_VIEW_REFRESH "view-refresh" -#define
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
dialog.c
Log Message:
Use table with normal buttons in dialog footer (for now).
===
RCS file: /cvs/e/e16/e/src/dialog.c,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -3 -r1.168 -r1.169
--- dialog.c20 Aug 2006 17:39:32 - 1.168
+++ dialog.c20 Aug 2006 18:40:41 - 1.169
@@ -948,10 +948,10 @@
{
DItem *table, *di;
- /* FIXME - Center table horizontally */
table = DialogAddItem(parent, DITEM_TABLE);
DialogItemTableSetOptions(table, 2, 0, 0, 0);
DialogItemSetAlign(table, 512, 0);
+ DialogItemSetFill(table, 0, 0);
di = DialogAddItem(table, DITEM_IMAGE);
DialogItemImageSetFile(di, img);
@@ -962,31 +962,63 @@
di = DialogAddItem(parent, DITEM_SEPARATOR);
}
+/*
+ * Hacky wrapper to get the dialog closed as needed
+ * val = 0: Ok (apply, close)
+ * 1: Apply
+ * 2: Close
+ */
+static void
+DialogCallbackWrapper(Dialog * d, int val, void *data)
+{
+ DialogCallbackFunc *cb = data;
+
+ cb(d, val, NULL);
+
+ if (val == 0)
+ DialogClose(d);
+}
+
static void
DialogAddFooter(Dialog * d, DItem * parent, int flags, DialogCallbackFunc * cb)
{
DItem *table, *di;
+ int n_buttons;
di = DialogAddItem(parent, DITEM_SEPARATOR);
table = DialogAddItem(parent, DITEM_TABLE);
- DialogItemTableSetOptions(table, 1, 0, 0, 0);
DialogItemSetAlign(table, 512, 0);
+ DialogItemSetFill(table, 0, 0);
+ /* FIXME - The "real" dialog buttons are slightly different */
+ n_buttons = 0;
if (flags & 4)
{
- DialogAddButton(d, _("OK"), cb, 1, DLG_BUTTON_OK);
+ di = DialogAddItem(table, DITEM_BUTTON);
+ DialogItemSetText(di, _("OK"));
+ DialogItemSetCallback(di, DialogCallbackWrapper, 0, cb);
+ n_buttons++;
}
if (flags & 2)
{
- DialogAddButton(d, _("Apply"), cb, 0, DLG_BUTTON_APPLY);
- DialogBindKey(d, "Return", cb, 0, NULL);
+ di = DialogAddItem(table, DITEM_BUTTON);
+ DialogItemSetText(di, _("Apply"));
+ DialogItemSetCallback(di, DialogCallbackWrapper, 1, cb);
+ DialogBindKey(d, "Return", DialogCallbackWrapper, 1, cb);
+ n_buttons++;
}
if (flags & 1)
{
- DialogAddButton(d, _("Close"), cb, 1, DLG_BUTTON_CLOSE);
+ di = DialogAddItem(table, DITEM_BUTTON);
+ DialogItemSetText(di, _("Close"));
+ DialogItemSetCallback(di, DialogCallbackClose, 0, NULL);
DialogBindKey(d, "Escape", DialogCallbackClose, 0, NULL);
+ n_buttons++;
}
+
+ DialogItemTableSetOptions(table, n_buttons, 0, 1, 0);
+
DialogSetExitFunction(d, cb, 2);
}
@@ -1714,6 +1746,21 @@
dii->update = 1;
DialogDrawItem(d, dii);
}
+
+#if 0 /* Debug */
+ {
+ XGCValues gcv;
+ GC gc;
+
+ pad = ImageclassGetPadding(d->iclass);
+ gcv.subwindow_mode = IncludeInferiors;
+ gc = EXCreateGC(d->pmap, GCSubwindowMode, &gcv);
+ XSetForeground(disp, gc, BlackPixel(disp, VRoot.scr));
+ XDrawRectangle(disp, d->pmap, gc, pad->left + di->x,
+pad->top + di->y, di->w, di->h);
+ EXFreeGC(gc);
+ }
+#endif
}
break;
@@ -2558,6 +2605,9 @@
DItemEventMouseOut(win, di, ev);
break;
}
+
+ if (di->dlg->close)
+ _DialogClose(di->dlg);
}
static void
-
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
E CVS: proto lok
Enlightenment CVS committal
Author : lok
Project : e17
Module : proto
Dir : e17/proto/enhance/src/lib
Modified Files:
enhance.c
Log Message:
Glade-3 stock_size compatibility.
===
RCS file: /cvs/e/e17/proto/enhance/src/lib/enhance.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- enhance.c 18 Aug 2006 21:22:02 - 1.27
+++ enhance.c 20 Aug 2006 17:51:23 - 1.28
@@ -632,11 +632,27 @@
else if(!strcmp(name, "icon_size"))
{
- PROPERTY_INT;
- Etk_Stock_Id id = ETK_STOCK_MEDIUM;
- if (value <= 2) id = ETK_STOCK_SMALL;
- else if (value >= 5) id = ETK_STOCK_BIG;
- etk_object_properties_set(ETK_OBJECT(wid->wid), "stock_size", id, NULL);
+ PROPERTY_STR;
+ int size_value = 0;
+ Etk_Stock_Size size = ETK_STOCK_MEDIUM;
+
+ if (strlen(value) > 14)
+ {
+value = &value[14];
+if (!strcmp(value, "DIALOG") || !strcmp(value, "DND"))
+ size = ETK_STOCK_BIG;
+else if (!strcmp(value, "LARGE_TOOLBAR") || !strcmp(value,
"BUTTON"))
+ size = ETK_STOCK_MEDIUM;
+else if (!strcmp(value, "SMALL_TOOLBAR") || !strcmp(value, "MENU"))
+ size = ETK_STOCK_BIG;
+ }
+ else
+ {
+size_value = atoi(value);
+if (size_value <= 2) size = ETK_STOCK_SMALL;
+else if (size_value >= 5) size = ETK_STOCK_BIG;
+ }
+ etk_object_properties_set(ETK_OBJECT(wid->wid), "stock_size", size,
NULL);
}
else if(!strcmp(name, "icon_name"))
-
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
E CVS: proto lok
Enlightenment CVS committal
Author : lok
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_button.c etk_toolbar.c etk_toolbar.h
Log Message:
[Etk_Button] Only the button's image is changed on etk_button_stock_size_set
The button's label wasn't centered horizontaly
[Etk_Toolbar] stock_size propertie added
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_button.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- etk_button.c16 Aug 2006 22:04:29 - 1.26
+++ etk_button.c20 Aug 2006 17:49:20 - 1.27
@@ -375,7 +375,7 @@
if (stock_id == ETK_STOCK_NO_STOCK)
return;
- etk_button_set_from_stock(ETK_BUTTON(button), stock_id);
+ etk_image_set_from_stock(button->image, stock_id, size);
etk_object_notify(ETK_OBJECT(button), "stock_size");
}
@@ -662,7 +662,7 @@
etk_container_add(ETK_CONTAINER(button->alignment), button->box);
etk_signal_connect("child_removed", ETK_OBJECT(button->box),
ETK_CALLBACK(_etk_button_image_removed_cb), button);
- etk_label_alignment_set(ETK_LABEL(button->label), 0.0, 0.5);
+ etk_label_alignment_set(ETK_LABEL(button->label), 0.5, 0.5);
etk_box_append(ETK_BOX(button->box), button->label, ETK_BOX_END,
ETK_BOX_NONE, 0);
if (button->style == ETK_BUTTON_ICON)
etk_widget_hide(button->label);
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_toolbar.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etk_toolbar.c 16 Aug 2006 06:05:53 - 1.5
+++ etk_toolbar.c 20 Aug 2006 17:49:20 - 1.6
@@ -16,7 +16,8 @@
enum Etk_Window_Property_Id
{
ETK_TOOLBAR_ORIENTATION_PROPERTY,
- ETK_TOOLBAR_STYLE_PROPERTY
+ ETK_TOOLBAR_STYLE_PROPERTY,
+ ETK_TOOLBAR_STOCK_SIZE_PROPERTY
};
static void _etk_toolbar_constructor(Etk_Toolbar *toolbar);
@@ -47,6 +48,7 @@
etk_type_property_add(toolbar_type, "orientation",
ETK_TOOLBAR_ORIENTATION_PROPERTY, ETK_PROPERTY_INT,
ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_int(ETK_TOOLBAR_HORIZ));
etk_type_property_add(toolbar_type, "style", ETK_TOOLBAR_STYLE_PROPERTY,
ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(ETK_TOOLBAR_BOTH_VERT));
+ etk_type_property_add(toolbar_type, "stock_size",
ETK_TOOLBAR_STOCK_SIZE_PROPERTY, ETK_PROPERTY_INT,
ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_int(ETK_STOCK_SMALL));
toolbar_type->property_set = _etk_toolbar_property_set;
toolbar_type->property_get = _etk_toolbar_property_get;
@@ -96,6 +98,7 @@
break;
}
etk_button_style_set(ETK_BUTTON(widget), button_style);
+ etk_button_stock_size_set(ETK_BUTTON(widget), toolbar->stock_size);
}
etk_box_append(ETK_BOX(toolbar->box), widget, ETK_BOX_START, ETK_BOX_NONE,
0);
}
@@ -251,6 +254,50 @@
return toolbar->style;
}
+/**
+ * @brief Sets the toolbar's stock size
+ * @param toolbar a toolbar
+ * @param style the stock size
+ */
+void etk_toolbar_stock_size_set(Etk_Toolbar *toolbar, Etk_Stock_Size size)
+{
+ Evas_List *child;
+ Etk_Button *button;
+
+ if (!toolbar)
+ return;
+
+ if (toolbar->stock_size == size)
+ return;
+
+ toolbar->stock_size = size;
+
+ child = etk_container_children_get(ETK_CONTAINER(toolbar->box));
+
+ while (child)
+ {
+ if (ETK_IS_BUTTON(evas_list_data(child)))
+ {
+button = ETK_BUTTON(evas_list_data(child));
+etk_button_stock_size_set(button, size);
+ }
+ child = evas_list_next(child);
+ }
+ etk_object_notify(ETK_OBJECT(toolbar), "stock_size");
+}
+
+/**
+ * @brief Gets the size of the toolbar's stock
+ * @param toolbar a toolbar
+ * @return Returns the toolbar's stock size
+ */
+Etk_Stock_Size etk_toolbar_stock_size_get(Etk_Toolbar *toolbar)
+{
+ if (!toolbar)
+ return ETK_STOCK_SMALL;
+
+ return toolbar->stock_size;
+}
/**
*
* Etk specific functions
@@ -265,6 +312,7 @@
toolbar->style = ETK_TOOLBAR_BOTH_VERT;
toolbar->orientation = ETK_TOOLBAR_HORIZ;
+ toolbar->stock_size = ETK_STOCK_SMALL;
ETK_WIDGET(toolbar)->size_request = _etk_toolbar_size_request;
ETK_WIDGET(toolbar)->size_allocate = _etk_toolbar_size_allocate;
@@ -301,6 +349,9 @@
case ETK_TOOLBAR_STYLE_PROPERTY:
etk_toolbar_style_set(toolbar, etk_property_value_int_get(value));
break;
+ case ETK_TOOLBAR_STOCK_SIZE_PROPERTY:
+ etk_toolbar_stock_size_set(toolbar,
etk_property_value_int_get(value));
+ break;
default:
break;
}
@@ -321,6 +372,9 @@
break;
case ETK_TOOLBAR_STYLE_PROPERTY:
etk_property_value_int_set(v
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
actions.c backgrounds.c dialog.c dialog.h session.c
Log Message:
Add data parameter to dialog keybinding callback.
===
RCS file: /cvs/e/e16/e/src/actions.c,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -3 -r1.205 -r1.206
--- actions.c 8 Aug 2006 03:58:41 - 1.205
+++ actions.c 20 Aug 2006 17:39:32 - 1.206
@@ -312,8 +312,8 @@
DialogItemSetText(di, buf);
DialogAddButton(d, _("OK"), NULL, 1, DLG_BUTTON_OK);
- DialogBindKey(d, "Return", DialogCallbackClose, 0);
- DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+ DialogBindKey(d, "Return", DialogCallbackClose, 0, NULL);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 0, NULL);
}
static const DialogDef DlgAbout = {
===
RCS file: /cvs/e/e16/e/src/backgrounds.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- backgrounds.c 8 Aug 2006 03:58:41 - 1.82
+++ backgrounds.c 20 Aug 2006 17:39:32 - 1.83
@@ -2036,7 +2036,7 @@
di = DialogAddItem(table2, DITEM_BUTTON);
DialogItemSetText(di, _("Move to Front\n"));
DialogItemSetCallback(di, CB_ConfigureFrontBG, 0, NULL);
- DialogBindKey(d, "F", CB_ConfigureFrontBG, 0);
+ DialogBindKey(d, "F", CB_ConfigureFrontBG, 0, NULL);
di = DialogAddItem(table2, DITEM_BUTTON);
DialogItemSetText(di, _("Duplicate\n"));
@@ -2049,8 +2049,8 @@
di = DialogAddItem(table2, DITEM_BUTTON);
DialogItemSetText(di, _("Delete File\n"));
DialogItemSetCallback(di, CB_ConfigureDelBG, 0, NULL);
- DialogBindKey(d, "D", CB_ConfigureDelBG, 0);
- DialogBindKey(d, "Delete", CB_ConfigureDelBG, 1);
+ DialogBindKey(d, "D", CB_ConfigureDelBG, 0, NULL);
+ DialogBindKey(d, "Delete", CB_ConfigureDelBG, 1, NULL);
di = DialogAddItem(table, DITEM_TEXT);
DialogItemSetFill(di, 0, 0);
@@ -2204,15 +2204,15 @@
DialogItemSetFill(di, 0, 0);
DialogItemSetText(di, "<-");
DialogItemSetCallback(di, CB_BGNext, -1, NULL);
- DialogBindKey(d, "Left", CB_BGNext, -1);
- DialogBindKey(d, "BackSpace", CB_BGNext, -1);
+ DialogBindKey(d, "Left", CB_BGNext, -1, NULL);
+ DialogBindKey(d, "BackSpace", CB_BGNext, -1, NULL);
di = DialogAddItem(table2, DITEM_BUTTON);
DialogItemSetFill(di, 0, 0);
DialogItemSetText(di, "->");
DialogItemSetCallback(di, CB_BGNext, 1, NULL);
- DialogBindKey(d, "Right", CB_BGNext, 1);
- DialogBindKey(d, "space", CB_BGNext, 1);
+ DialogBindKey(d, "Right", CB_BGNext, 1, NULL);
+ DialogBindKey(d, "space", CB_BGNext, 1, NULL);
di = DialogAddItem(table, DITEM_BUTTON);
DialogItemSetFill(di, 0, 0);
===
RCS file: /cvs/e/e16/e/src/dialog.c,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -3 -r1.167 -r1.168
--- dialog.c20 Aug 2006 13:53:55 - 1.167
+++ dialog.c20 Aug 2006 17:39:32 - 1.168
@@ -175,8 +175,9 @@
typedef struct
{
KeyCode key;
- int val;
DialogCallbackFunc *func;
+ int val;
+ void *data;
} DKeyBind;
struct _dialog
@@ -232,7 +233,8 @@
static char dialog_update_pending = 0;
void
-DialogBindKey(Dialog * d, const char *key, DialogCallbackFunc * func, int val)
+DialogBindKey(Dialog * d, const char *key, DialogCallbackFunc * func, int val,
+ void *data)
{
d->num_bindings++;
if (!d->keybindings)
@@ -242,6 +244,7 @@
Erealloc(d->keybindings, sizeof(DKeyBind) * d->num_bindings);
d->keybindings[d->num_bindings - 1].val = val;
d->keybindings[d->num_bindings - 1].func = func;
+ d->keybindings[d->num_bindings - 1].data = data;
d->keybindings[d->num_bindings - 1].key =
XKeysymToKeycode(disp, XStringToKeysym(key));
}
@@ -960,8 +963,7 @@
}
static void
-DialogAddFooter(Dialog * d, DItem * parent __UNUSED__, int flags,
- DialogCallbackFunc * cb)
+DialogAddFooter(Dialog * d, DItem * parent, int flags, DialogCallbackFunc * cb)
{
DItem *table, *di;
@@ -978,12 +980,12 @@
if (flags & 2)
{
DialogAddButton(d, _("Apply"), cb, 0, DLG_BUTTON_APPLY);
- DialogBindKey(d, "Return", cb, 0);
+ DialogBindKey(d, "Return", cb, 0, NULL);
}
if (flags & 1)
{
DialogAddButton(d, _("Close"), cb, 1, DLG_BUTTON_CLOSE);
- DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+ DialogBindKey(d, "Escape", DialogCallbackClose, 0, NULL);
}
DialogSetExitFunction(d, cb, 2);
}
@@ -2216,8 +2218,8 @@
DialogSetText(d, txt);
DialogAddButton(d, _("OK"), NULL, 1, DLG_BUTTON_OK);
- DialogBindKey(d, "Return", DialogCallbackClose, 0);
- DialogBindKey(d, "Escape", DialogCallbackClose, 0);
+
E CVS: apps/e onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_configure.c
Log Message:
You can only use one icon theme at a time.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_configure.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- e_configure.c 20 Aug 2006 03:51:54 - 1.50
+++ e_configure.c 20 Aug 2006 16:57:02 - 1.51
@@ -67,7 +67,7 @@
e_configure_standard_item_add(eco, "enlightenment/background",
_("Wallpaper"), e_int_config_wallpaper);
e_configure_standard_item_add(eco, "enlightenment/themes", _("Theme"),
e_int_config_theme);
e_configure_standard_item_add(eco, "enlightenment/fonts", _("Fonts"),
e_int_config_fonts);
- e_configure_standard_item_add(eco, "enlightenment/icon_themes", _("Icon
Themes"), e_int_config_icon_themes);
+ e_configure_standard_item_add(eco, "enlightenment/icon_themes", _("Icon
Theme"), e_int_config_icon_themes);
e_configure_standard_item_add(eco, "enlightenment/mouse", _("Mouse
Cursor"), e_int_config_cursor);
e_configure_standard_item_add(eco, "enlightenment/windows", _("Window
Display"), e_int_config_window_display);
e_configure_standard_item_add(eco, "enlightenment/shelf", _("Shelves"),
e_int_config_shelf);
-
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
E CVS: libs/ecore onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_desktop
Modified Files:
ecore_desktop_icon.c
Log Message:
More defense, FDO specs are not real standards, so they tend to get
loosely followed.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop_icon.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ecore_desktop_icon.c20 Aug 2006 03:45:53 - 1.11
+++ ecore_desktop_icon.c20 Aug 2006 16:40:45 - 1.12
@@ -514,24 +514,36 @@
{
char *value;
-result->path = theme_path;
-result->name = (char
*)ecore_hash_get(result->group, "Name");
-result->comment = (char
*)ecore_hash_get(result->group, "Comment");
-result->inherits = (char
*)ecore_hash_get(result->group, "Inherits");
-result->directories = (char
*)ecore_hash_get(result->group, "Directories");
-value = (char *)ecore_hash_get(result->group,
"Example");
+ /* According to the spec, name and comment are
required, but we can fake those easily enough. */
+value = (char *)ecore_hash_get(result->group,
"Name");
if (!value)
- value = "exec";
-result->example = strdup(value);
-
-ecore_hash_set(icon_theme_cache,
strdup(icon_theme), result);
+ value = (char *) icon_theme;
+result->name = strdup(value);
+value = (char *)ecore_hash_get(result->group,
"Comment");
+if (!value)
+ value = "No comment provided.";
+result->comment = strdup(value);
+result->directories = (char
*)ecore_hash_get(result->group, "Directories");
+ /* FIXME: Directories is also required, don't
feel like faking it for now. */
+ if (result->directories)
+ {
+ result->inherits = (char
*)ecore_hash_get(result->group, "Inherits");
+ value = (char
*)ecore_hash_get(result->group, "Example");
+ if (!value)
+ value = "exec";
+ result->example = strdup(value);
+
+ /* This passes the basic validation tests,
mark it as real and cache it. */
+ result->path = theme_path;
+ ecore_hash_set(icon_theme_cache,
strdup(icon_theme), result);
+ }
}
}
if (!result->path)
{
+ _ecore_desktop_icon_theme_destroy(result);
free(theme_path);
- free(result);
result = NULL;
}
}
@@ -562,6 +574,8 @@
_ecore_desktop_icon_theme_destroy(Ecore_Desktop_Icon_Theme * icon_theme)
{
if (icon_theme->path) free(icon_theme->path);
+ if (icon_theme->name) free(icon_theme->name);
+ if (icon_theme->comment) free(icon_theme->comment);
if (icon_theme->example) free(icon_theme->example);
free(icon_theme);
}
-
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
E CVS: titan titan
Enlightenment CVS committal Author : titan Project : devs Module : titan Dir : devs/titan Modified Files: info.txt Log Message: Update my info. === RCS file: /cvs/e/devs/titan/info.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- info.txt5 Jun 2006 05:39:41 - 1.3 +++ info.txt20 Aug 2006 16:30:46 - 1.4 @@ -1,7 +1,8 @@ -Login:titansoccer15 -IRC Nick: LinuxTitan/TitanSoccer15 +Login:LinuxTitan +IRC Nick: LinuxTitan Name: Stephen Houston Location: Mississippi, USA E-Mail: [EMAIL PROTECTED] WWW: http://www.ecoding.org -Managing: ephoto, ewl patches & theme, e_util_eapp_edit work. +Managing: ephoto, ewl patches & theme, eapp_edit, entropy ewl, + e widget work - 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
E CVS: libs/evas raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas/src/lib/engines/common/evas_op_blend Modified Files: op_blend_pixel_.c Log Message: use already loaded var :) === RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_op_blend/op_blend_pixel_.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- op_blend_pixel_.c 2 May 2006 07:28:47 - 1.1 +++ op_blend_pixel_.c 20 Aug 2006 14:51:10 - 1.2 @@ -67,7 +67,7 @@ *d = *s; break; default: - a = 1 + (*s >> 24); + a = 1 + (a >> 24); *d = BLEND_RGB_256(a, *s, *d); break; } - 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
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
dialog.c dialog.h
Log Message:
Dialog filling tweaks.
===
RCS file: /cvs/e/e16/e/src/dialog.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -3 -r1.166 -r1.167
--- dialog.c19 Aug 2006 12:01:59 - 1.166
+++ dialog.c20 Aug 2006 13:53:55 - 1.167
@@ -222,6 +222,11 @@
static void DialogUpdate(Dialog * d);
+static void DialogAddFooter(Dialog * d, DItem * parent,
+ int flags, DialogCallbackFunc * cb);
+static void DialogAddHeader(Dialog * d, DItem * parent,
+ const char *img, const char *txt);
+
static Ecore_List *dialog_list = NULL;
static char dialog_update_pending = 0;
@@ -730,11 +735,6 @@
EwinHide(d->ewin);
}
-static void DialogAddHeader(DItem * parent, const char *img,
- const char *txt);
-static void DialogAddFooter(Dialog * d, int flags,
- DialogCallbackFunc * cb);
-
void
DialogShowSimple(const DialogDef * dd, void *data)
{
@@ -742,6 +742,24 @@
}
void
+DialogFill(Dialog * d, DItem * parent, const DialogDef * dd, void *data)
+{
+ DItem *content;
+
+ if (Conf.dialogs.headers && (dd->header_image || dd->header_text))
+ DialogAddHeader(d, parent, dd->header_image, _(dd->header_text));
+
+ content = DialogAddItem(parent, DITEM_TABLE);
+ if (!content)
+ return;
+
+ dd->fill(d, content, data);
+
+ if (dd->func)
+ DialogAddFooter(d, parent, dd->flags, dd->func);
+}
+
+void
DialogShowSimpleWithName(const DialogDef * dd, const char *name, void *data)
{
Dialog *d;
@@ -766,17 +784,7 @@
if (!table)
return;
- if (Conf.dialogs.headers && (dd->header_image || dd->header_text))
- DialogAddHeader(table, dd->header_image, _(dd->header_text));
-
- table = DialogAddItem(d->item, DITEM_TABLE);
- if (!table)
- return;
-
- dd->fill(d, table, data);
-
- if (dd->func)
- DialogAddFooter(d, dd->flags, dd->func);
+ DialogFill(d, table, dd, data);
DialogShow(d);
}
@@ -932,13 +940,13 @@
}
static void
-DialogAddHeader(DItem * parent, const char *img, const char *txt)
+DialogAddHeader(Dialog * d __UNUSED__, DItem * parent, const char *img,
+ const char *txt)
{
DItem *table, *di;
/* FIXME - Center table horizontally */
table = DialogAddItem(parent, DITEM_TABLE);
- DialogItemSetColSpan(table, 1);
DialogItemTableSetOptions(table, 2, 0, 0, 0);
DialogItemSetAlign(table, 512, 0);
@@ -952,12 +960,16 @@
}
static void
-DialogAddFooter(Dialog * d, int flags, DialogCallbackFunc * cb)
+DialogAddFooter(Dialog * d, DItem * parent __UNUSED__, int flags,
+ DialogCallbackFunc * cb)
{
- DItem *di;
+ DItem *table, *di;
+
+ di = DialogAddItem(parent, DITEM_SEPARATOR);
- di = DialogAddItem(d->item, DITEM_SEPARATOR);
- DialogItemSetColSpan(di, d->item->item.table.num_columns);
+ table = DialogAddItem(parent, DITEM_TABLE);
+ DialogItemTableSetOptions(table, 1, 0, 0, 0);
+ DialogItemSetAlign(table, 512, 0);
if (flags & 4)
{
===
RCS file: /cvs/e/e16/e/src/dialog.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- dialog.h19 Aug 2006 12:01:59 - 1.14
+++ dialog.h20 Aug 2006 13:53:55 - 1.15
@@ -90,6 +90,8 @@
voidDialogShowSimple(const DialogDef * dd, void *data);
voidDialogShowSimpleWithName(const DialogDef * dd,
const char *name, void *data);
+voidDialogFill(Dialog * d, DItem * parent, const DialogDef *
dd,
+ void *data);
voidDialogAddButton(Dialog * d, const char *text,
DialogCallbackFunc * func, char doclose,
-
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
E CVS: apps/e moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_entry.c
Log Message:
* [Entry] Double click on the entry selects all the text of the entry
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_entry.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- e_entry.c 20 Aug 2006 12:27:33 - 1.26
+++ e_entry.c 20 Aug 2006 12:51:56 - 1.27
@@ -392,7 +392,7 @@
changed = e_editable_delete(editable, start_pos, end_pos);
}
}
-else if (strcmp(event->keyname, "v") == 0)
+else if ((sd->enabled) && (strcmp(event->keyname, "v") == 0))
{
if ((win = e_win_evas_object_win_get(obj)))
ecore_x_selection_clipboard_request(win->evas_win,
@@ -426,17 +426,25 @@
if (!(event = event_info))
return;
- evas_object_geometry_get(sd->editable_object, &ox, &oy, NULL, NULL);
- pos = e_editable_pos_get_from_coords(sd->editable_object,
-event->canvas.x - ox,
-event->canvas.y - oy);
- if (pos >= 0)
+ if (event->button == 1)
{
-e_editable_cursor_pos_set(sd->editable_object, pos);
-if (!evas_key_modifier_is_set(event->modifiers, "Shift"))
- e_editable_selection_pos_set(sd->editable_object, pos);
-
-sd->selection_dragging = 1;
+if (event->flags & EVAS_BUTTON_DOUBLE_CLICK)
+ e_editable_select_all(sd->editable_object);
+else
+ {
+ evas_object_geometry_get(sd->editable_object, &ox, &oy, NULL,
NULL);
+ pos = e_editable_pos_get_from_coords(sd->editable_object,
+ event->canvas.x - ox,
+ event->canvas.y - oy);
+ if (pos >= 0)
+ {
+ e_editable_cursor_pos_set(sd->editable_object, pos);
+ if (!evas_key_modifier_is_set(event->modifiers, "Shift"))
+e_editable_selection_pos_set(sd->editable_object, pos);
+
+ sd->selection_dragging = 1;
+ }
+ }
}
}
-
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
E CVS: apps/e moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_entry.c
Log Message:
* [Entry] You can now paste some text in the entry
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_entry.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- e_entry.c 20 Aug 2006 09:48:13 - 1.25
+++ e_entry.c 20 Aug 2006 12:27:33 - 1.26
@@ -9,6 +9,7 @@
{
Evas_Object *entry_object;
Evas_Object *editable_object;
+ Ecore_Event_Handler *selection_handler;
int enabled;
int focused;
@@ -23,6 +24,7 @@
static void _e_entry_mouse_down_cb(void *data, Evas *e, Evas_Object *obj, void
*event_info);
static void _e_entry_mouse_up_cb(void *data, Evas *e, Evas_Object *obj, void
*event_info);
static void _e_entry_mouse_move_cb(void *data, Evas *e, Evas_Object *obj, void
*event_info);
+static int _e_entry_selection_notify_handler(void *data, int type, void
*event);
static void _e_entry_smart_add(Evas_Object *object);
static void _e_entry_smart_del(Evas_Object *object);
@@ -391,9 +393,11 @@
}
}
else if (strcmp(event->keyname, "v") == 0)
-{
- //ecore_x_selection_clipboard_request();
-}
+ {
+ if ((win = e_win_evas_object_win_get(obj)))
+ ecore_x_selection_clipboard_request(win->evas_win,
+
ECORE_X_SELECTION_TARGET_UTF8_STRING);
+ }
}
/* Otherwise, we insert the corresponding character */
else if ((event->string) &&
@@ -472,6 +476,52 @@
}
}
+/* Called when the the "selection_notify" event is emitted */
+static int
+_e_entry_selection_notify_handler(void *data, int type, void *event)
+{
+ Evas_Object *entry;
+ E_Entry_Smart_Data *sd;
+ Ecore_X_Event_Selection_Notify *ev;
+ Ecore_X_Selection_Data *selection_data;
+ Evas_Object *editable;
+ int cursor_pos, selection_pos;
+ int start_pos, end_pos;
+ int selecting;
+ int changed = 0;
+
+ if ((!(entry = data)) || (!(sd = evas_object_smart_data_get(entry
+ return 1;
+ if (!sd->focused)
+ return 1;
+
+ editable = sd->editable_object;
+ cursor_pos = e_editable_cursor_pos_get(editable);
+ selection_pos = e_editable_selection_pos_get(editable);
+ start_pos = (cursor_pos <= selection_pos) ? cursor_pos : selection_pos;
+ end_pos = (cursor_pos >= selection_pos) ? cursor_pos : selection_pos;
+ selecting = (start_pos != end_pos);
+
+ ev = event;
+ if (ev->selection == ECORE_X_SELECTION_CLIPBOARD)
+ {
+if (strcmp(ev->target, ECORE_X_SELECTION_TARGET_UTF8_STRING) == 0)
+ {
+ Ecore_X_Selection_Data_Text *text_data;
+
+ text_data = ev->data;
+ if (selecting)
+ changed = e_editable_delete(editable, start_pos, end_pos);
+ changed |= e_editable_insert(editable, start_pos,
text_data->text);
+ }
+ }
+
+ if (changed)
+ evas_object_smart_callback_call(entry, "changed", NULL);
+
+ return 1;
+}
+
/* Editable object's smart methods */
static void _e_entry_smart_add(Evas_Object *object)
@@ -518,6 +568,10 @@
_e_entry_mouse_up_cb, NULL);
evas_object_event_callback_add(object, EVAS_CALLBACK_MOUSE_MOVE,
_e_entry_mouse_move_cb, NULL);
+ sd->selection_handler = ecore_event_handler_add(
+ ECORE_X_EVENT_SELECTION_NOTIFY,
+ _e_entry_selection_notify_handler,
+ object);
}
static void _e_entry_smart_del(Evas_Object *object)
@@ -527,8 +581,10 @@
if ((!object) || !(sd = evas_object_smart_data_get(object)))
return;
+ ecore_event_handler_del(sd->selection_handler);
evas_object_del(sd->editable_object);
evas_object_del(sd->entry_object);
+ free(sd);
}
static void _e_entry_smart_move(Evas_Object *object, Evas_Coord x, Evas_Coord
y)
-
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
E CVS: apps/e moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_entry.edc
Log Message:
* [Entry] Fix the blinking of the cursor
* [Entry] Support Copy/Cut. Paste will come later
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_entry.edc,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- default_entry.edc 19 Aug 2006 19:08:09 - 1.9
+++ default_entry.edc 20 Aug 2006 09:48:13 - 1.10
@@ -120,9 +120,18 @@
}
programs {
program {
- name: "cursor_show";
-signal: "show";
+ name: "on_cursor_show";
+signal: "cursor_show";
source: "";
+ action: ACTION_STOP;
+ target: "cursor_show";
+ target: "cursor_hide";
+ target: "cursor_show_timer";
+ target: "cursor_hide_timer";
+ after: "cursor_show";
+ }
+ program {
+ name: "cursor_show";
action: STATE_SET "visible" 0.0;
target: "cursor";
after: "cursor_show_timer";
@@ -135,7 +144,7 @@
}
program {
name: "cursor_show_timer";
- in: 1.25 0.0;
+ in: 1.0 0.0;
after: "cursor_hide";
}
program {
-
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
E CVS: apps/e moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_editable.c e_entry.c
Log Message:
* [Entry] Fix the blinking of the cursor
* [Entry] Support Copy/Cut. Paste will come later
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_editable.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_editable.c19 Aug 2006 20:29:02 - 1.7
+++ e_editable.c20 Aug 2006 09:48:13 - 1.8
@@ -485,7 +485,11 @@
return;
sd->cursor_visible = 1;
- evas_object_show(sd->cursor_object);
+ if (evas_object_visible_get(editable))
+ {
+evas_object_show(sd->cursor_object);
+edje_object_signal_emit(sd->cursor_object, "cursor_show", "");
+ }
}
/**
@@ -922,8 +926,11 @@
}
}
- if (sd->cursor_visible)
- evas_object_show(sd->cursor_object);
+ if (sd->cursor_visible && evas_object_visible_get(editable))
+ {
+evas_object_show(sd->cursor_object);
+edje_object_signal_emit(sd->cursor_object, "cursor_show", "");
+ }
_e_editable_selection_update(editable);
_e_editable_text_position_update(editable, -1);
@@ -1107,14 +1114,17 @@
evas_object_smart_member_add(sd->event_object, object);
sd->text_object = edje_object_add(evas);
+ evas_object_pass_events_set(sd->text_object, 1);
evas_object_clip_set(sd->text_object, sd->clip_object);
evas_object_smart_member_add(sd->text_object, object);
sd->selection_object = edje_object_add(evas);
+ evas_object_pass_events_set(sd->selection_object, 1);
evas_object_clip_set(sd->selection_object, sd->clip_object);
evas_object_smart_member_add(sd->selection_object, object);
sd->cursor_object = edje_object_add(evas);
+ evas_object_pass_events_set(sd->cursor_object, 1);
evas_object_clip_set(sd->cursor_object, sd->clip_object);
evas_object_smart_member_add(sd->cursor_object, object);
@@ -1200,7 +1210,10 @@
evas_object_show(sd->text_object);
if (sd->cursor_visible)
- evas_object_show(sd->cursor_object);
+ {
+evas_object_show(sd->cursor_object);
+edje_object_signal_emit(sd->cursor_object, "cursor_show", "");
+ }
if ((sd->selection_visible) && (sd->cursor_pos != sd->selection_pos))
evas_object_show(sd->selection_object);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_entry.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- e_entry.c 19 Aug 2006 20:29:02 - 1.24
+++ e_entry.c 20 Aug 2006 09:48:13 - 1.25
@@ -283,6 +283,7 @@
int selecting;
int changed = 0;
char *range;
+ E_Win *win;
if ((!obj) || (!(sd = evas_object_smart_data_get(obj
return;
@@ -379,7 +380,10 @@
range = e_editable_text_range_get(editable, start_pos,
end_pos);
if (range)
{
- //ecore_x_selection_clipboard_set();
+ if ((win = e_win_evas_object_win_get(obj)))
+ecore_x_selection_clipboard_set(win->evas_win,
+range,
+strlen(range) + 1);
free(range);
}
if ((sd->enabled) && (strcmp(event->keyname, "x") == 0))
-
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
E CVS: apps/evfs chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : apps/evfs
Dir : e17/apps/evfs/src/bin
Modified Files:
evfs_server_handle.c
Log Message:
* Oops - strncat on an unterminated string
===
RCS file: /cvs/e/e17/apps/evfs/src/bin/evfs_server_handle.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- evfs_server_handle.c20 Aug 2006 04:13:56 - 1.72
+++ evfs_server_handle.c20 Aug 2006 09:42:09 - 1.73
@@ -535,6 +535,7 @@
/*Handle the root dir*/
if (strcmp(newdir_rewrite->path, "/")) {
newdir_rewrite->path[origlen] = '/';
+newdir_rewrite->path[origlen+1] = '\0';
strncat(&newdir_rewrite->path[origlen+1],
pos+1, strlen(pos)-1);
} else {
strncat(&newdir_rewrite->path[origlen],
pos+1, strlen(pos)-1);
-
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
E CVS: proto leviathan
Enlightenment CVS committal
Author : leviathan
Project : e17
Module : proto
Dir : e17/proto/etk-perl
Modified Files:
Changes Etk.xs EtkTypes.c MANIFEST META.yml Makefile.PL README
Removed Files:
const-c.inc const-xs.inc ppport.h
Log Message:
removed unneeded stuff in preparation for make dist and upload to CPAN
===
RCS file: /cvs/e/e17/proto/etk-perl/Changes,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Changes 6 Aug 2006 14:56:12 - 1.3
+++ Changes 20 Aug 2006 09:34:33 - 1.4
@@ -1,5 +1,12 @@
Revision history for Perl extension Etk.
+0.04 Sun Aug 20 12:19:10 GMT+2 2006
+ - Followed etk changes
+ - fixed Tree implementation
+ - put required dependency in Makefile.PL
+ - autogenerate ppport.h from Makefile.PL
+ - removed unneeded const-* and fallback
+
0.03 Sun Aug 6 12:09:59 GMT+2 2006
- removed Etk/Object.pm and replaced the function conversion with
ALIASes in XS
- Followed changes to etk
===
RCS file: /cvs/e/e17/proto/etk-perl/Etk.xs,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- Etk.xs 19 Aug 2006 10:42:19 - 1.45
+++ Etk.xs 20 Aug 2006 09:34:33 - 1.46
@@ -12,8 +12,6 @@
#include
#include
-#include "const-c.inc"
-
#include "EtkTypes.h"
#include "EtkSignals.h"
@@ -378,8 +376,6 @@
MODULE = Etk PACKAGE = Etk PREFIX = etk_
-
-INCLUDE: const-xs.inc
Etk_Bool
etk_init()
===
RCS file: /cvs/e/e17/proto/etk-perl/EtkTypes.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- EtkTypes.c 19 Aug 2006 10:42:19 - 1.9
+++ EtkTypes.c 20 Aug 2006 09:34:33 - 1.10
@@ -564,8 +564,7 @@
S_STORE("string", ev->string)
I_STORE("timestamp", newSVuv(ev->timestamp))
- printf("New Event (%p)\n", hv);
- return newRV_noinc((SV*)hv);
+ return newRV_inc((SV*)hv);
}
SV * newSVEventMouseWheel(Etk_Event_Mouse_Wheel *ev) {
===
RCS file: /cvs/e/e17/proto/etk-perl/MANIFEST,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- MANIFEST16 Aug 2006 20:21:56 - 1.7
+++ MANIFEST20 Aug 2006 09:34:33 - 1.8
@@ -6,11 +6,8 @@
EtkSignals.h
Makefile.PL
MANIFEST
-ppport.h
README
typemap
-const-c.inc
-const-xs.inc
etk_test/etk_test.pl
etk_test/images/1star.png
etk_test/images/2stars.png
@@ -37,8 +34,6 @@
t/Etk/Notebook.t
t/Etk/Object.t
t/Etk/Window.t
-fallback/const-c.inc
-fallback/const-xs.inc
lib/Etk.pm
lib/Etk/Stock.pm
lib/Etk/Constants.pm
===
RCS file: /cvs/e/e17/proto/etk-perl/META.yml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- META.yml6 Aug 2006 14:56:13 - 1.3
+++ META.yml20 Aug 2006 09:34:33 - 1.4
@@ -1,7 +1,7 @@
# http://module-build.sourceforge.net/META-spec.html
#XXX This is a prototype!!! It will change in the future!!! X#
name: Etk
-version: 0.03
+version: 0.04
version_from: lib/Etk.pm
installdirs: site
requires:
===
RCS file: /cvs/e/e17/proto/etk-perl/Makefile.PL,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.PL 11 Aug 2006 18:36:53 - 1.7
+++ Makefile.PL 20 Aug 2006 09:34:33 - 1.8
@@ -1,10 +1,13 @@
use 5.008004;
use ExtUtils::MakeMaker;
+use Devel::PPPort;
# dependency check
my $etklib = `etk-config --version`;
die "I can't run etk-config, make sure that etk is installed, and that
etk-config is in your path" unless $etklib;
+Devel::PPPort::WriteFile();
+
WriteMakefile(
DISTNAME => 'Etk-Perl',
NAME => 'Etk',
@@ -18,28 +21,8 @@
INC => "-g -I. `etk-config --cflags`",
XSPROTOARG=> '-noprototypes',
test => {TESTS=>'t/Etk/*.t'},
+clean => {FILES=>"ppport.h"},
OBJECT=> '$(O_FILES)',
);
-if (eval {require ExtUtils::Constant; 1}) {
- # If you edit these definitions to change the constants used by this module,
- # you will need to use the generated const-c.inc and const-xs.inc
- # files to replace their "fallback" counterparts before distributing your
- # changes.
- my @names = (qw());
- ExtUtils::Constant::WriteConstants(
- NAME => 'Etk',
- NAMES=> [EMAIL PROTECTED],
- DEFAULT_TYPE => 'IV',
- C_FILE => 'const-c.inc',
-
E CVS: proto leviathan
Enlightenment CVS committal
Author : leviathan
Project : e17
Module : proto
Dir : e17/proto/etk-perl/lib
Modified Files:
Etk.pm
Log Message:
removed unneeded stuff in preparation for make dist and upload to CPAN
===
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- Etk.pm 19 Aug 2006 10:42:19 - 1.19
+++ Etk.pm 20 Aug 2006 09:34:33 - 1.20
@@ -5,7 +5,7 @@
use warnings;
use Carp;
-our $VERSION = '0.03';
+our $VERSION = '0.04';
require XSLoader;
XSLoader::load('Etk', $VERSION);
-
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
E CVS: proto leviathan
Enlightenment CVS committal Author : leviathan Project : e17 Module : proto Dir : e17/proto/etk-perl/fallback Removed Files: const-c.inc const-xs.inc Log Message: removed unneeded stuff in preparation for make dist and upload to CPAN - 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
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_config.c e_main.c e_signals.c
Log Message:
fix some env vars to use namespacing
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -3 -r1.192 -r1.193
--- e_config.c 20 Aug 2006 04:48:27 - 1.192
+++ e_config.c 20 Aug 2006 08:22:18 - 1.193
@@ -45,7 +45,7 @@
EAPI int
e_config_init(void)
{
- _e_config_profile = getenv("CONF_PROFILE");
+ _e_config_profile = getenv("E_CONF_PROFILE");
if (!_e_config_profile)
{
Eet_File *ef;
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -3 -r1.176 -r1.177
--- e_main.c20 Aug 2006 04:48:27 - 1.176
+++ e_main.c20 Aug 2006 08:22:19 - 1.177
@@ -95,8 +95,8 @@
sigaction(SIGABRT, &action, NULL);
t = ecore_time_get();
- s = getenv("START_TIME");
- if ((s) && (getenv("CRASHED")))
+ s = getenv("E_START_TIME");
+ if ((s) && (!getenv("E_RESTART_OK")))
{
tstart = atof(s);
if ((t - tstart) < 5.0)
@@ -104,11 +104,10 @@
safe_mode = 1;
}
}
- e_util_env_set("CRASHED", NULL);
tstart = t;
snprintf(buf, sizeof(buf), "%1.1f", tstart);
- e_util_env_set("START_TIME", buf);
+ e_util_env_set("E_START_TIME", buf);
/* FIXME: this is the init code for letting e be relocatable. right now
* its not used - so i want to see if it can reliably determine its exe
@@ -159,12 +158,12 @@
/* for debugging by redirecting stdout of e to a log file to tail */
setvbuf(stdout, NULL, _IONBF, 0);
- if (getenv("NOSTARTUP")) nostartup = 1;
- if (getenv("RESTART")) after_restart = 1;
+ if (getenv("E_RESTART")) after_restart = 1;
if (getenv("DESKTOP_STARTUP_ID")) e_util_env_set("DESKTOP_STARTUP_ID",
NULL);
- e_util_env_set("RESTART", "1");
+ e_util_env_set("E_RESTART_OK", NULL);
+ e_util_env_set("E_RESTART", "1");
/* envrionment varabiles so you know E is running/launched you */
e_util_env_set("PANTS", "ON");
@@ -194,22 +193,24 @@
{
good = 1;
evil = 0;
+printf("LA LA LA\n");
}
else if (!strcmp(argv[i], "-evil"))
{
good = 0;
evil = 1;
+printf("MUHAHAHAHHAHAHAHAHA\n");
}
else if (!strcmp(argv[i], "-psychotic"))
{
good = 1;
evil = 1;
+printf("MUHAHALALALALALALALA\n");
}
else if ((!strcmp(argv[i], "-profile")) && (i < (argc - 1)))
{
i++;
-
-e_util_env_set("CONF_PROFILE", argv[i]);
+e_util_env_set("E_CONF_PROFILE", argv[i]);
}
else if ((!strcmp(argv[i], "-h")) ||
(!strcmp(argv[i], "-help")) ||
@@ -734,6 +735,7 @@
e_app_unmonitor_all();
e_ipc_shutdown();
ecore_file_shutdown();
+ e_util_env_set("E_RESTART_OK", "1");
ecore_app_restart();
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_signals.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_signals.c 30 Jul 2006 19:34:05 - 1.13
+++ e_signals.c 20 Aug 2006 08:22:19 - 1.14
@@ -25,7 +25,6 @@
ecore_x_keyboard_ungrab();
ecore_x_ungrab();
ecore_x_sync();
- e_util_env_set("CRASHED", "SEGV");
e_alert_show("This is very bad. Enlightenment has segfaulted.\n"
"This is not meant to happen and is likely a sign of a\n"
"bug in Enlightenment or the libraries it relies on.\n"
@@ -51,7 +50,6 @@
ecore_x_keyboard_ungrab();
ecore_x_ungrab();
ecore_x_sync();
- e_util_env_set("CRASHED", "SEGV");
e_alert_show("This is very bad. Enlightenment has segfaulted.\n"
"This is not meant to happen and is likely a sign of a\n"
"bug in Enlightenment or the libraries it relies on.\n"
@@ -78,7 +76,6 @@
ecore_x_keyboard_ungrab();
ecore_x_ungrab();
ecore_x_sync();
- e_util_env_set("CRASHED", "ILL");
e_alert_show("This is very bad. Enlightenment has executed and illegal\n"
"instruction. This is most likely because Enlightenment or\n"
"a library it depends on has been compiled for a CPU type\n"
@@ -105,7 +102,6 @@
ecore_x_keyboard_ungrab();
ecore_x_ungrab();
ecore_x_sync();
- e_util_env_set("CRASHED", "FPE");
e_alert_show("This is very bad. Enlightenment has recieved a floating\n"
"point exception. This is probably due to a divide by 0\n"
"in Enlightenment or a library it depe
E CVS: libs/ecore raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore
Modified Files:
ecore_app.c
Log Message:
app restart has fixed buffer - doesnt need malloc for a restart now (safer)
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore/ecore_app.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ecore_app.c 6 Jan 2006 17:58:12 - 1.6
+++ ecore_app.c 20 Aug 2006 08:16:34 - 1.7
@@ -46,18 +46,15 @@
* using the command-line arguments stored by ecore_app_args_set(). This is
* an easy way for a program to restart itself for cleanup purposes,
* configuration reasons or in the event of a crash.
- *
- * FIXME: Currently not implimented.
*/
EAPI void
ecore_app_restart(void)
{
- char **args;
+ char *args[4096];
int i;
if ((app_argc < 1) || (!app_argv)) return;
- args = malloc((app_argc + 1) * sizeof(char *));
- if (!args) return;
+ if (app_argc >= 4096) return;
for (i = 0; i < app_argc; i++) args[i] = app_argv[i];
args[i] = NULL;
execvp(app_argv[0], args);
-
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
