E CVS: libs/eet raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/eet
Dir : e17/libs/eet/src/lib
Modified Files:
eet_lib.c
Log Message:
eet return ferror right
===
RCS file: /cvs/e/e17/libs/eet/src/lib/eet_lib.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- eet_lib.c 25 Jul 2006 09:47:47 - 1.67
+++ eet_lib.c 15 Aug 2006 06:45:51 - 1.68
@@ -367,21 +367,31 @@
return EET_ERROR_NONE;
write_error:
- fclose(ef-fp);
- ef-fp = NULL;
switch (ferror(ef-fp))
{
case EFBIG:
+ fclose(ef-fp);
+ ef-fp = NULL;
return EET_ERROR_WRITE_ERROR_FILE_TOO_BIG;
case EIO:
+ fclose(ef-fp);
+ ef-fp = NULL;
return EET_ERROR_WRITE_ERROR_IO_ERROR;
case ENOSPC:
+ fclose(ef-fp);
+ ef-fp = NULL;
return EET_ERROR_WRITE_ERROR_OUT_OF_SPACE;
case EPIPE:
+ fclose(ef-fp);
+ ef-fp = NULL;
return EET_ERROR_WRITE_ERROR_FILE_CLOSED;
default:
+ fclose(ef-fp);
+ ef-fp = NULL;
return EET_ERROR_WRITE_ERROR;
}
+ fclose(ef-fp);
+ ef-fp = NULL;
return EET_ERROR_WRITE_ERROR;
}
-
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=lnkkid=120709bid=263057dat=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_widget_fsel.c
Log Message:
config wites are atomic - either all or nothing. if nothing - u keep your old
config.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -3 -r1.189 -r1.190
--- e_config.c 14 Aug 2006 11:08:40 - 1.189
+++ e_config.c 15 Aug 2006 06:47:22 - 1.190
@@ -15,7 +15,7 @@
static int _e_config_save_cb(void *data);
static void _e_config_free(void);
static int _e_config_cb_timer(void *data);
-static void _e_config_eet_close_handle(Eet_File *ef, char *file);
+static int _e_config_eet_close_handle(Eet_File *ef, char *file);
/* local subsystem globals */
static int _e_config_save_block = 0;
@@ -1496,7 +1496,7 @@
e_config_profile_save(void)
{
Eet_File *ef;
- char buf[4096];
+ char buf[4096], buf2[4096];
char *homedir;
int ok = 0;
@@ -1504,14 +1504,18 @@
homedir = e_user_homedir_get();
snprintf(buf, sizeof(buf), %s/.e/e/config/profile.cfg,
homedir);
+ snprintf(buf2, sizeof(buf2), %s.tmp, buf);
free(homedir);
- ef = eet_open(buf, EET_FILE_MODE_WRITE);
+ ef = eet_open(buf2, EET_FILE_MODE_WRITE);
if (ef)
{
ok = eet_write(ef, config, _e_config_profile,
strlen(_e_config_profile), 0);
- _e_config_eet_close_handle(ef, buf);
+ if (_e_config_eet_close_handle(ef, buf2))
+ ecore_file_mv(buf2, buf);
+ else
+ ecore_file_unlink(buf2);
}
return ok;
}
@@ -1520,7 +1524,7 @@
e_config_domain_save(char *domain, E_Config_DD *edd, void *data)
{
Eet_File *ef;
- char buf[4096];
+ char buf[4096], buf2[4096];
char *homedir;
int ok = 0;
@@ -1532,12 +1536,16 @@
ecore_file_mkpath(buf);
snprintf(buf, sizeof(buf), %s/.e/e/config/%s/%s.cfg,
homedir, _e_config_profile, domain);
+ snprintf(buf2, sizeof(buf2), %s.tmp, buf);
E_FREE(homedir);
ef = eet_open(buf, EET_FILE_MODE_WRITE);
if (ef)
{
ok = eet_data_write(ef, edd, config, data, 1);
- _e_config_eet_close_handle(ef, buf);
+ if (_e_config_eet_close_handle(ef, buf2))
+ ecore_file_mv(buf2, buf);
+ else
+ ecore_file_unlink(buf2);
}
return ok;
}
@@ -1860,7 +1868,7 @@
return 0;
}
-static void
+static int
_e_config_eet_close_handle(Eet_File *ef, char *file)
{
Eet_Error err;
@@ -1935,5 +1943,7 @@
ecore_file_unlink(file);
e_util_dialog_show(_(Enlightenment Configration Write Problems),
erstr, file);
+ return 0;
}
+ return 1;
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_fsel.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_widget_fsel.c 15 Aug 2006 01:43:00 - 1.14
+++ e_widget_fsel.c 15 Aug 2006 06:47:22 - 1.15
@@ -172,7 +172,7 @@
}
wd-path = strdup(buf);
if (wd-preview)
- _e_wid_fsel_preview_file(wd);
+ _e_wid_fsel_preview_file(wd);
e_widget_entry_text_set(wd-o_entry, ici-file);
evas_list_free(selected);
if (wd-chg_func) wd-chg_func(wd-chg_data, wd-obj);
@@ -194,7 +194,8 @@
EAPI Evas_Object *
e_widget_fsel_add(Evas *evas, char *dev, char *path, char *selected, char
*filter,
void (*sel_func) (void *data, Evas_Object *obj), void
*sel_data,
- void (*chg_func) (void *data, Evas_Object *obj), void
*chg_data, int preview)
+ void (*chg_func) (void *data, Evas_Object *obj), void
*chg_data,
+ int preview)
{
Evas_Object *obj, *o;
E_Widget_Data *wd;
-
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=lnkkid=120709bid=263057dat=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
Log Message:
and now work right - atomic save
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -3 -r1.190 -r1.191
--- e_config.c 15 Aug 2006 06:47:22 - 1.190
+++ e_config.c 15 Aug 2006 06:59:55 - 1.191
@@ -1513,9 +1513,11 @@
ok = eet_write(ef, config, _e_config_profile,
strlen(_e_config_profile), 0);
if (_e_config_eet_close_handle(ef, buf2))
- ecore_file_mv(buf2, buf);
- else
- ecore_file_unlink(buf2);
+ {
+rename(buf2, buf);
+/* FIXME: get rename err */
+ }
+ ecore_file_unlink(buf2);
}
return ok;
}
@@ -1538,14 +1540,16 @@
homedir, _e_config_profile, domain);
snprintf(buf2, sizeof(buf2), %s.tmp, buf);
E_FREE(homedir);
- ef = eet_open(buf, EET_FILE_MODE_WRITE);
+ ef = eet_open(buf2, EET_FILE_MODE_WRITE);
if (ef)
{
ok = eet_data_write(ef, edd, config, data, 1);
if (_e_config_eet_close_handle(ef, buf2))
- ecore_file_mv(buf2, buf);
- else
- ecore_file_unlink(buf2);
+ {
+rename(buf2, buf);
+/* FIXME: get rename err */
+ }
+ ecore_file_unlink(buf2);
}
return ok;
}
-
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=lnkkid=120709bid=263057dat=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/plugins/vfolder
Modified Files:
evfs_vfolder_trash.c
Log Message:
* Actually write the trash files
===
RCS file: /cvs/e/e17/apps/evfs/src/plugins/vfolder/evfs_vfolder_trash.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evfs_vfolder_trash.c14 Aug 2006 21:45:52 - 1.3
+++ evfs_vfolder_trash.c15 Aug 2006 08:22:56 - 1.4
@@ -78,16 +78,33 @@
while ( (file = ecore_list_remove_first(info_files))) {
Ecore_Hash* trash;
evfs_filereference* ref;
+ char* pos;
snprintf(parser, PATH_MAX, %s/%s, evfs_trash_home, file);
Ecore_Desktop* desk = ecore_desktop_get(parser, NULL);
-
- snprintf(parser, PATH_MAX, trash:///#file://%s, desk-path);
- printf(Parsing %s\n, parser);
- ref = evfs_parse_uri_single(parser);
- if (ref)
- ecore_list_append(*list, ref);
+ if (desk-path) {
+ pos = strrchr(desk-path, '/');
+ if (pos ) {
+
+ /*First check if this is a complete uri path in
.info*/
+ /*We need to find someway to reference the
.info file we're talking
+* about - Note the following section is
redundant for now*/
+ if (!(ref = evfs_parse_uri_single(desk-path)))
{
+ snprintf(parser, PATH_MAX,
trash:///%s, pos+1);
+ printf(Parsing %s\n, parser);
+ ref = evfs_parse_uri_single(parser);
+ } else {
+ evfs_cleanup_filereference(ref);
+ snprintf(parser, PATH_MAX,
trash:///%s, pos+1);
+ printf(Parsing %s\n, parser);
+ ref = evfs_parse_uri_single(parser);
+ }
+
+ if (ref)
+ ecore_list_append(*list, ref);
+ }
+ }
}
}
-
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=lnkkid=120709bid=263057dat=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/include Modified Files: evfs_plugin.h Log Message: * Actually write the trash files === RCS file: /cvs/e/e17/apps/evfs/src/include/evfs_plugin.h,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- evfs_plugin.h 12 Aug 2006 12:34:25 - 1.16 +++ evfs_plugin.h 15 Aug 2006 08:22:56 - 1.17 @@ -36,6 +36,8 @@ int (*evfs_file_write) (evfs_filereference * command, char *bytes, long size); int (*evfs_file_close) (evfs_filereference * command); + + void (*evfs_file_notify_create) (evfs_filereference* file); int (*evfs_file_create) (evfs_filereference * file); int (*evfs_file_mkdir) (evfs_filereference * 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=lnkkid=120709bid=263057dat=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_operation_tasks.c
Log Message:
* Actually write the trash files
===
RCS file: /cvs/e/e17/apps/evfs/src/bin/evfs_operation_tasks.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- evfs_operation_tasks.c 14 Aug 2006 11:33:07 - 1.11
+++ evfs_operation_tasks.c 15 Aug 2006 08:22:56 - 1.12
@@ -62,6 +62,8 @@
if (copy-file_to-fd == 0 copy-file_to-fd_p == NULL) {
/*printf(Creating destination file..\n);*/
+if
(*EVFS_PLUGIN_FILE(copy-file_to-plugin)-functions-evfs_file_notify_create)
+
(*EVFS_PLUGIN_FILE(copy-file_to-plugin)-functions-evfs_file_notify_create)
(copy-file_from);
(*EVFS_PLUGIN_FILE(copy-file_to-plugin)-functions-evfs_file_create)
(copy-file_to);
}
-
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=lnkkid=120709bid=263057dat=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/plugins/file
Modified Files:
evfs_fs_trash.c
Log Message:
* Actually write the trash files
===
RCS file: /cvs/e/e17/apps/evfs/src/plugins/file/evfs_fs_trash.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evfs_fs_trash.c 14 Aug 2006 11:07:48 - 1.2
+++ evfs_fs_trash.c 15 Aug 2006 08:22:56 - 1.3
@@ -48,6 +48,8 @@
#include Ecore_File.h
/*All these homedir variables need to be consolidated - TODO*/
+static char* next_trash_file;
+static char* next_trash_path;
static char evfs_fs_trash_info[PATH_MAX];
static char evfs_fs_trash_files[PATH_MAX];
static evfs_plugin* posix_plugin;
@@ -65,19 +67,71 @@
int evfs_file_read(evfs_client * client, evfs_filereference * file,
char *bytes, long size);
int evfs_file_write(evfs_filereference * file, char *bytes, long size);
+
+void evfs_file_notify_create(evfs_filereference* file);
int evfs_file_create(evfs_filereference * file);
int evfs_file_mkdir(evfs_filereference * file);
void evfs_dir_list(evfs_client * client, evfs_command * command,
Ecore_List ** directory_list);
+
+/*Internal functions*/
+char* evfs_fs_trash_filename_get(evfs_filereference* ref)
+{
+ time_t res;
+ int fulllen;
+ char* newname;
+ int i;
+
+ fulllen = strlen(ref-path) + 1 + 11 /*time() length*/;
+ newname = calloc(fulllen, 1);
+
+
+
+ res = time(NULL);
+ snprintf(newname, fulllen, %s.%d, ref-path, res);
+ for (i=0;istrlen(newname);i++)
+ if (newname[i] == '/') newname[i] = '_';
+
+ return newname;
+}
+
+void evfs_fs_trash_infofile_create(evfs_filereference* ref, char* newname,
char* path)
+{
+ int origlen;
+ FILE* file;
+ char* fullpath;
+
+ /* 1 for '/', 1 for \0 */
+ origlen = strlen(evfs_fs_trash_info) + 1 + strlen(newname)+10+1;
+ fullpath = malloc(origlen);
+ snprintf(fullpath, origlen, %s/%s, evfs_fs_trash_info, newname,
.trashinfo);
+
+ printf(Create info file: '%s'\n, fullpath);
+
+ /*Should we use the evfs wrappers here? Faster not to..*/
+ if (file = fopen(fullpath, w+) ){
+ fprintf(file, [Trash Info]\n);
+ fprintf(file, Path=%s\n, path);
+ fprintf(file, DeletionDate=20040831T22:32:08\n);
+
+ fclose(file);
+ } else {
+ printf(Could not open trash info file\n);
+ }
+
+ free(fullpath);
+}
+
evfs_plugin_functions *
evfs_plugin_init()
{
printf(Initialising the file plugin..\n);
- snprintf(evfs_fs_trash_info, sizeof(evfs_fs_trash_info), %s/.Trash/info,
getenv(HOME));
- snprintf(evfs_fs_trash_files, sizeof(evfs_fs_trash_files),
%s/.Trash/files, getenv(HOME));
+ snprintf(evfs_fs_trash_info, PATH_MAX, %s/.Trash/info, getenv(HOME));
+ snprintf(evfs_fs_trash_files, PATH_MAX, %s/.Trash/files, getenv(HOME));
posix_plugin = evfs_get_plugin_for_uri(evfs_server_get(), file);
+ next_trash_file = NULL;
evfs_plugin_functions *functions = calloc(1, sizeof(evfs_plugin_functions));
functions-evfs_client_disconnect = evfs_client_disconnect;
@@ -95,7 +149,10 @@
functions-evfs_file_seek = evfs_file_seek;
functions-evfs_file_read = evfs_file_read;
functions-evfs_file_write = evfs_file_write;
+
functions-evfs_file_create = evfs_file_create;
+ functions-evfs_file_notify_create = evfs_file_notify_create;
+
functions-evfs_file_mkdir = evfs_file_mkdir;
/*functions-evfs_file_rename = evfs_file_rename;*/
return functions;
@@ -169,29 +226,46 @@
printf(Trash file not opened with trash plugin\n);
}
+void evfs_file_notify_create(evfs_filereference* ref)
+{
+ if (next_trash_file) {
+ free(next_trash_file);
+ next_trash_file = NULL;
+ }
+ next_trash_file = evfs_fs_trash_filename_get(ref);
+ next_trash_path = evfs_filereference_to_string(ref);
+ printf(Next trash path is : %s\n, next_trash_path);
+}
+
int
evfs_file_create(evfs_filereference * file)
{
evfs_filereference* file_trash = evfs_filereference_clone(file);
int fd;
int size;
-
+
+ /*Make a proxy file, and send this to the posix plugin create*/
free(file_trash-path);
- size= strlen(evfs_fs_trash_files) + strlen(file-path) +2;
+ size= strlen(evfs_fs_trash_files) + strlen(next_trash_file) +2;
file_trash-path = calloc(size, 1);
- snprintf(file_trash-path, size, %s/%s, evfs_fs_trash_files,
file-path);
+ snprintf(file_trash-path, size, %s/%s, evfs_fs_trash_files,
next_trash_file);
free(file_trash-plugin_uri);
file_trash-plugin_uri = strdup(file);
file_trash-plugin = posix_plugin;
-
E CVS: apps/evfs chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : apps/evfs
Dir : e17/apps/evfs/src/plugins/vfolder
Modified Files:
evfs_vfolder_trash.c
Log Message:
* 'Attach' the info file that we are viewing, so we can ref this in
evfs_fs_trash
===
RCS file: /cvs/e/e17/apps/evfs/src/plugins/vfolder/evfs_vfolder_trash.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- evfs_vfolder_trash.c15 Aug 2006 08:22:56 - 1.4
+++ evfs_vfolder_trash.c15 Aug 2006 09:04:00 - 1.5
@@ -86,20 +86,13 @@
if (desk-path) {
pos = strrchr(desk-path, '/');
if (pos ) {
+ char* file_dup = strdup(parser);
/*First check if this is a complete uri path in
.info*/
- /*We need to find someway to reference the
.info file we're talking
-* about - Note the following section is
redundant for now*/
- if (!(ref = evfs_parse_uri_single(desk-path)))
{
- snprintf(parser, PATH_MAX,
trash:///%s, pos+1);
- printf(Parsing %s\n, parser);
- ref = evfs_parse_uri_single(parser);
- } else {
- evfs_cleanup_filereference(ref);
- snprintf(parser, PATH_MAX,
trash:///%s, pos+1);
- printf(Parsing %s\n, parser);
- ref = evfs_parse_uri_single(parser);
- }
+ snprintf(parser, PATH_MAX, trash:///%s,
pos+1);
+ printf(Parsing %s\n, parser);
+ ref = evfs_parse_uri_single(parser);
+ ref-attach = file_dup;
if (ref)
ecore_list_append(*list, ref);
-
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=lnkkid=120709bid=263057dat=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/common Modified Files: evfs_cleanup.c Log Message: * 'Attach' the info file that we are viewing, so we can ref this in evfs_fs_trash === RCS file: /cvs/e/e17/apps/evfs/src/common/evfs_cleanup.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- evfs_cleanup.c 6 Aug 2006 09:56:27 - 1.25 +++ evfs_cleanup.c 15 Aug 2006 09:04:00 - 1.26 @@ -60,6 +60,8 @@ free(ref-username); if (ref-password) free(ref-password); + + /*Do we assume this is just a string?*/ if (ref-attach) free(ref-attach); free(ref); - 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=lnkkid=120709bid=263057dat=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_operation.c evfs_operation_tasks.c
Log Message:
* Make copy cancel work properly
===
RCS file: /cvs/e/e17/apps/evfs/src/bin/evfs_operation.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- evfs_operation.c14 Aug 2006 11:33:07 - 1.15
+++ evfs_operation.c15 Aug 2006 09:06:30 - 1.16
@@ -393,6 +393,9 @@
if (task-status == EVFS_OPERATION_TASK_STATUS_ERROR) {
op-status = EVFS_OPERATION_STATUS_ERROR;
return;
+ } else if (task-status == EVFS_OPERATION_TASK_STATUS_CANCEL) {
+ op-status = EVFS_OPERATION_STATUS_COMPLETED;
+ return;
}
OPERATION_TASK_EXIT:
===
RCS file: /cvs/e/e17/apps/evfs/src/bin/evfs_operation_tasks.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- evfs_operation_tasks.c 15 Aug 2006 08:22:56 - 1.12
+++ evfs_operation_tasks.c 15 Aug 2006 09:06:30 - 1.13
@@ -47,7 +47,6 @@
if (EVFS_OPERATION_TASK(copy)-status ==
EVFS_OPERATION_TASK_STATUS_CANCEL) {
printf( Cancelling copy via user request\n);
- EVFS_OPERATION_TASK(copy)-status =
EVFS_OPERATION_TASK_STATUS_COMMITTED;
return copy-source_stat.st_size;
}
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: uptime maxerba
Enlightenment CVS committal Author : maxerba Project : e_modules Module : uptime Dir : e_modules/uptime/po Modified Files: ja.po Log Message: === RCS file: /cvs/e/e_modules/uptime/po/ja.po,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- ja.po 2 Aug 2006 20:10:38 - 1.4 +++ ja.po 15 Aug 2006 10:26:57 - 1.5 @@ -8,7 +8,7 @@ msgstr Project-Id-Version: Uptime\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2006-07-31 00:35+0900\n +POT-Creation-Date: 2006-08-14 21:07+0900\n PO-Revision-Date: 2006-07-31 11:04+0900\n Last-Translator: Yasufumi Haga [EMAIL PROTECTED]\n Language-Team: LANGUAGE [EMAIL PROTECTED]\n @@ -32,33 +32,33 @@ msgid Check Interval: msgstr ç£è¦éé -#: e_mod_main.c:160 +#: e_mod_main.c:161 msgid Uptime msgstr -#: e_mod_main.c:200 +#: e_mod_main.c:201 msgid Configuration msgstr è¨å® -#: e_mod_main.c:401 +#: e_mod_main.c:402 msgid Enlightenment Uptime Monitor Module msgstr Enlightenment uptime ç£è¦ã¢ã¸ã¥ã¼ã« -#: e_mod_main.c:402 +#: e_mod_main.c:403 msgid This module is used to monitor uptime. msgstr ãã㯠uptime ãç£è¦ããã¢ã¸ã¥ã¼ã«ã§ã. -#: e_mod_main.c:573 +#: e_mod_main.c:574 #, c-format msgid up: %d days, %d:%02d:%02ld -msgstr up: %dæ¥, %d:%02d:%02ld +msgstr up: %dæ¥ %d:%02d:%02ld -#: e_mod_main.c:580 +#: e_mod_main.c:581 #, c-format msgid la: %.2f %.2f %.2f msgstr -#: e_mod_main.c:585 +#: e_mod_main.c:586 #, c-format msgid users: %d msgstr ã¦ã¼ã¶ã¼: %d - 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=lnkkid=120709bid=263057dat=121642___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rhapsodhy
Enlightenment CVS committal
Author : rhapsodhy
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui/src/widgets
Modified Files:
ew_messagebox.c
Log Message:
Added the other messageboxes too
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_messagebox.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ew_messagebox.c 14 Aug 2006 18:38:41 - 1.2
+++ ew_messagebox.c 15 Aug 2006 11:30:46 - 1.3
@@ -5,14 +5,11 @@
#include config.h
static void _ew_messagebox_cb_ok(void *, int, void *);
-static Entrance_Dialog _ew_messagebox_new(const char *type, const char *title,
const char *message);
-static Entrance_Dialog ew;
-
-static Entrance_Dialog
+Entrance_Dialog
_ew_messagebox_new(const char *title, const char *message, const char *icon)
{
- ew = ew_notice_new(title);
+ Entrance_Dialog ew = ew_notice_new(title);
Entrance_Widget group;
Entrance_Widget _image;
Entrance_Widget _text;
@@ -47,9 +44,31 @@
Entrance_Dialog
ew_messagebox_ok(const char *title, const char *message, const char *icon)
{
- _ew_messagebox_new(title, message, icon);
+ Entrance_Dialog ew = _ew_messagebox_new(title, message, icon);
ew_notice_ok_button_add(ew, _ew_messagebox_cb_ok, NULL);
ew_notice_show(ew);
+}
+
+Entrance_Dialog
+ew_messagebox_ok_cancel(const char *title, const char *message, const char
*icon, void (*funct)(void *, int *, void *)) {
+ Entrance_Dialog ew = _ew_messagebox_new(title, message, icon);
+ ew_notice_ok_button_add(ew, funct, NULL);
+ ew_notice_cancel_button_add(ew, NULL, NULL);
+}
+
+Entrance_Dialog
+ew_messagebox_yes_no(const char *title, const char *message, const char *icon,
void (*funct)(void *, int *, void *)) {
+ Entrance_Dialog ew = _ew_messagebox_new(title, message, icon);
+ ew_notice_yes_button_add(ew, funct, NULL);
+ ew_notice_no_button_add(ew, NULL, NULL);
+}
+
+Entrance_Dialog
+ew_messagebox_yes_no_cancel(const char *title, const char *message, const char
*icon, void (*funct)(void *, int *, void *)) {
+ Entrance_Dialog ew = _ew_messagebox_new(title, message, icon);
+ ew_notice_yes_button_add(ew, funct, NULL);
+ ew_notice_no_button_add(ew, NULL, NULL);
+ ew_notice_cancel_button_add(ew, NULL, NULL);
}
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rhapsodhy
Enlightenment CVS committal Author : rhapsodhy Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui Modified Files: TODO Log Message: Added the other messageboxes too === RCS file: /cvs/e/e17/proto/entrance_edit_gui/TODO,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- TODO15 Aug 2006 04:52:22 - 1.6 +++ TODO15 Aug 2006 11:30:46 - 1.7 @@ -9,7 +9,7 @@ - ew_imagelist - Entrance_List needs to be refactored to use as common a base as possible. Also, we need to select the first row by default when adding to a list. - group types are currently hash defined'd ints. should be enums -- use etk_window to build ew_dialog, so we can set modality, fixed size, etc, basically, more options +- use etk_window to build ew_dialog, so we can set modality, fixed size, etc, basically, more options (under discussion) - Fix up Fileselector widget. This may probably need to refactor out the buttons used by ew_notice as ew_reponse_buttons ? - use ecore_lists to hold buttons and other *low life* widgets used on composite widgets. - There is a bug in ew_entry. I've not been albe to programmatically add text to the widget and display it. - 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=lnkkid=120709bid=263057dat=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/plugins/file
Modified Files:
evfs_fs_posix.c evfs_fs_trash.c
Log Message:
* Implement a 'stat' proxy for the trash_fs
===
RCS file: /cvs/e/e17/apps/evfs/src/plugins/file/evfs_fs_posix.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evfs_fs_posix.c 14 Aug 2006 11:07:48 - 1.2
+++ evfs_fs_posix.c 15 Aug 2006 12:04:32 - 1.3
@@ -393,7 +393,6 @@
{
int res;
- //printf(Getting file stat...\n);
#ifdef __USE_LARGEFILE64
res = stat64(command-file_command.files[file_number]-path, file_stat);
#else
===
RCS file: /cvs/e/e17/apps/evfs/src/plugins/file/evfs_fs_trash.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evfs_fs_trash.c 15 Aug 2006 08:22:56 - 1.3
+++ evfs_fs_trash.c 15 Aug 2006 12:04:32 - 1.4
@@ -75,6 +75,25 @@
Ecore_List ** directory_list);
+evfs_filereference* evfs_fs_trash_proxy_create(evfs_filereference* ref, char*
newpath)
+{
+ int size;
+ evfs_filereference* newfile = evfs_filereference_clone(ref);
+
+ /*Make a proxy file, and send this to the posix plugin create*/
+ free(newfile-path);
+
+ size= strlen(evfs_fs_trash_files) + strlen(newpath) +2;
+ newfile-path = calloc(size, 1);
+ snprintf(newfile-path, size, %s/%s, evfs_fs_trash_files, newpath);
+ free(newfile-plugin_uri);
+
+ newfile-plugin_uri = strdup(file);
+ newfile-plugin = posix_plugin;
+
+ return newfile;
+}
+
/*Internal functions*/
char* evfs_fs_trash_filename_get(evfs_filereference* ref)
{
@@ -105,7 +124,7 @@
/* 1 for '/', 1 for \0 */
origlen = strlen(evfs_fs_trash_info) + 1 + strlen(newname)+10+1;
fullpath = malloc(origlen);
- snprintf(fullpath, origlen, %s/%s, evfs_fs_trash_info, newname,
.trashinfo);
+ snprintf(fullpath, origlen, %s/%s%s, evfs_fs_trash_info, newname,
.trashinfo);
printf(Create info file: '%s'\n, fullpath);
@@ -175,10 +194,45 @@
int
evfs_file_stat(evfs_command * command, struct stat *file_stat, int file_number)
{
+ evfs_filereference* ref = command-file_command.files[file_number];
+
/*FIXME - if we're asking for the root - it's a directory*/
- if (!strcmp(command-file_command.files[file_number]-path, /)) {
+ if (!strcmp(ref-path, /)) {
file_stat-st_mode |= S_IFDIR;
return EVFS_SUCCESS;
+ } else {
+ if (ref-attach) {
+ evfs_filereference* proxy;
+ char* pos;
+ char* slashpos;
+
+ pos = strstr(ref-attach, .trashinfo);
+ slashpos = strrchr(ref-attach, '/');
+ if (pos slashpos) {
+ char* newfile = NULL;
+ evfs_command* command_proxy;
+ int res;
+ int newsize;
+
+ newsize= strlen(slashpos) -
strlen(.trashinfo);
+ newfile = malloc(newsize);
+ strncpy(newfile, slashpos+1 , newsize);
+ newfile[newsize-1] = '\0';
+ proxy = evfs_fs_trash_proxy_create(ref,
newfile);
+ free(newfile);
+
+ command_proxy =
evfs_file_command_single_build(proxy);
+
+ res =
(*EVFS_PLUGIN_FILE(proxy-plugin)-functions-evfs_file_stat)
+ (command_proxy, file_stat, 0);
+
+
evfs_cleanup_command(command_proxy,EVFS_CLEANUP_FREE_COMMAND);
+
+ return res;
+ } else {
+ printf(Attach data did not contain
trashinfo\n);
+ }
+ }
}
return EVFS_ERROR;
@@ -240,20 +294,13 @@
int
evfs_file_create(evfs_filereference * file)
{
- evfs_filereference* file_trash = evfs_filereference_clone(file);
+ evfs_filereference* file_trash;
int fd;
- int size;
- /*Make a proxy file, and send this to the posix plugin create*/
- free(file_trash-path);
- size= strlen(evfs_fs_trash_files) + strlen(next_trash_file) +2;
- file_trash-path = calloc(size, 1);
- snprintf(file_trash-path, size, %s/%s, evfs_fs_trash_files,
next_trash_file);
- free(file_trash-plugin_uri);
-
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
filesystem.c thumbnail_system.c
Log Message:
* Minor api changes
* Test trash menu
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/filesystem.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -3 -r1.74 -r1.75
--- filesystem.c6 Aug 2006 10:01:10 - 1.74
+++ filesystem.c15 Aug 2006 12:04:53 - 1.75
@@ -163,16 +163,31 @@
entropy_gui_component_instance *instance;
entropy_file_stat *file_stat;
entropy_file_listener* listener;
+ evfs_filereference* ref;
char* md5;
+ char *folder, *filename;
+ char* pos;
- char *folder =
- strdup ((char *) data-resp_command.file_command.files[0]-path);
- char *pos = rindex (folder, '/');
- *pos = '\0';
+ ref = data-resp_command.file_command.files[0];
+
+ pos = rindex (ref-path, '/');
+ /*Set the file's filename*/
+ filename = strdup (pos + 1);
+
+ if (pos - ref-path == 0 ref-path[0] == '/')
+ folder = strdup(/);
+ else {
+ folder = calloc(pos - ref-path +1, 1 );
+ strncpy(folder, ref-path, pos - ref-path);
+ }
+
+
+
+ /*printf(Path: '%s' - pos+1: '%s'\n, (char *)
data-resp_command.file_command.files[0]-path, pos+1);*/
//printf(Folder: '%s'\nFilename: '%s'\n, folder, pos+1);
- md5 = md5_entropy_path_file
(data-resp_command.file_command.files[0]-plugin_uri, folder, pos + 1);
+ md5 = md5_entropy_path_file (ref-plugin_uri, folder, filename);
instance = ecore_hash_get (evfs_dir_requests,
(long*)data-resp_command.client_identifier );
/*Build a file-stat structure to pass to requester */
@@ -215,7 +230,7 @@
entropy_core_layout_notify_event (instance, gui_event,
ENTROPY_EVENT_LOCAL);
} else {
- printf(Error! Couldn't fine listener for '%s'\n,
data-resp_command.file_command.files[0]-path);
+ printf(Error! Couldn't find listener for '%s' '%s'
'%s'\n,data-resp_command.file_command.files[0]-plugin_uri, folder, filename);
}
/*Do some freeing */
@@ -224,6 +239,7 @@
ecore_hash_remove (evfs_dir_requests,
(long*)data-resp_command.client_identifier);
entropy_free (folder);
+ entropy_free (filename);
entropy_free (md5);
/*No need to free event - notify_event frees it for us */
@@ -260,6 +276,10 @@
/*printf((%s) Received file type for file: %d\n,
ref-path, ref-file_type); */
pos = rindex (ref-path, '/');
+
+ /*Set the file's filename*/
+ filename = strdup (pos + 1);
+
if (pos - ref-path == 0 ref-path[0] == '/')
folder = strdup(/);
else {
@@ -267,9 +287,6 @@
strncpy(folder, ref-path, pos - ref-path);
}
- /*Set the file's filename*/
- filename = strdup (pos + 1);
-
/*Look for an existing file we have cached */
char *md5 = md5_entropy_path_file (ref-plugin_uri,
folder, filename);
@@ -297,7 +314,7 @@
}
/*Set the attached data - icon_hint, if there*/
- if (ref-attach) file-icon_hint =
strdup(ref-attach);
+ if (ref-attach) file-attach = strdup(ref-attach);
if (calling_request
(calling_request-drill_down
@@ -657,18 +674,18 @@
struct stat *
filestat_get (entropy_file_request * request)
{
- evfs_file_uri_path *path;
+ evfs_filereference *path;
char *uri = uri = entropy_core_generic_file_uri_create (request-file, 0);
long id;
- //printf(Getting a stat from evfs...\n);
-
+ path = evfs_parse_uri_single (uri);
+ if (request-file-attach)
+ path-attach = strdup(request-file-attach);
- path = evfs_parse_uri (uri);
- id = evfs_client_file_stat (con, path-files[0]);
-ecore_hash_set (evfs_dir_requests, (long*)id, request-requester);
+ id = evfs_client_file_stat (con, path);
+ ecore_hash_set (evfs_dir_requests, (long*)id, request-requester);
- evfs_cleanup_file_uri_path (path);
+ evfs_cleanup_filereference (path);
free(uri);
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/thumbnail_system.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- thumbnail_system.c 20 Jul 2006 15:19:19 - 1.10
+++ thumbnail_system.c 15 Aug 2006 12:04:53 - 1.11
@@ -55,15 +55,15 @@
entropy_thumbnail *thumb =
E CVS: apps/evfs chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : apps/evfs
Dir : e17/apps/evfs/src/common
Modified Files:
evfs_cleanup.c
Log Message:
* Implement a 'stat' proxy for the trash_fs
===
RCS file: /cvs/e/e17/apps/evfs/src/common/evfs_cleanup.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- evfs_cleanup.c 15 Aug 2006 09:04:00 - 1.26
+++ evfs_cleanup.c 15 Aug 2006 12:04:32 - 1.27
@@ -32,9 +32,7 @@
if (command-file_command.files) {
for (i = 0; i command-file_command.num_files; i++) {
- free(command-file_command.files[i]-path);
- free(command-file_command.files[i]-plugin_uri);
- free(command-file_command.files[i]);
+ evfs_cleanup_filereference(command-file_command.files[i]);
}
free(command-file_command.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=lnkkid=120709bid=263057dat=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:
* Implement a 'stat' proxy for the trash_fs
===
RCS file: /cvs/e/e17/apps/evfs/src/bin/evfs_server_handle.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- evfs_server_handle.c9 Aug 2006 16:27:54 - 1.66
+++ evfs_server_handle.c15 Aug 2006 12:04:32 - 1.67
@@ -268,6 +268,8 @@
{
(*(EVFS_PLUGIN_FILE(plugin)-functions-evfs_file_stat)) (command,
file_stat, 0);
+ printf(Size: %lld for '%s'\n, file_stat.st_size,
command-file_command.files[0]-path);
+
evfs_stat_event_create(client, command, file_stat);
}
}
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/dialogs
Modified Files:
etk_file_context_menu.c
Log Message:
* Minor api changes
* Test trash menu
===
RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_file_context_menu.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- etk_file_context_menu.c 11 Aug 2006 11:11:59 - 1.13
+++ etk_file_context_menu.c 15 Aug 2006 12:04:53 - 1.14
@@ -203,6 +203,33 @@
}
static void
+_entropy_etk_context_menu_trash_copy_cb(Etk_Object *object, void *data)
+{
+ Ecore_List* files = ecore_list_new();
+
+ if (_entropy_etk_context_menu_mode == 0) {
+ ecore_list_append(files,_entropy_etk_context_menu_current_file);
+ } else {
+ entropy_generic_file* file;
+
+ ecore_list_goto_first(_entropy_etk_context_menu_selected_files);
+ while ( (file =
ecore_list_next(_entropy_etk_context_menu_selected_files))) {
+ ecore_list_append(files,file);
+ }
+
+ }
+
+ if (ecore_list_nodes(files) 0) {
+ entropy_plugin_filesystem_file_copy_multi(files, trash:///,
+ _entropy_etk_context_menu_current_instance);
+ }
+
+
+
+ ecore_list_destroy(files);
+}
+
+static void
_entropy_etk_context_menu_group_file_add_remove_cb(Etk_Object *object, void
*data)
{
const char* label;
@@ -414,6 +441,12 @@
menu_item = _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL,
_(Folder..), ETK_STOCK_EDIT_COPY, ETK_MENU_SHELL(new_menu),NULL);
etk_signal_connect(activated, ETK_OBJECT(menu_item),
ETK_CALLBACK(_entropy_etk_context_menu_directory_add_cb), NULL);
+
+
+ /*TEST: TRASH*/
+ menu_item = _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL,
_(Copy to trash (test)), ETK_STOCK_EDIT_COPY, ETK_MENU_SHELL(menu),NULL);
+ etk_signal_connect(activated, ETK_OBJECT(menu_item),
+
ETK_CALLBACK(_entropy_etk_context_menu_trash_copy_cb), 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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src
Modified Files:
entropy_file.c
Log Message:
* Minor api changes
* Test trash menu
===
RCS file: /cvs/e/e17/proto/entropy/src/entropy_file.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- entropy_file.c 20 Jul 2006 15:19:18 - 1.13
+++ entropy_file.c 15 Aug 2006 12:04:53 - 1.14
@@ -27,11 +27,11 @@
/*If the file has a parent, remove a reference, because we
added one when we got here..*/
if (file-parent) {
//TODO fix this - we need to detatch this from
threading issues*/
-
//entropy_core_file_cache_remove_reference(entropy_core_get_core(),
file-parent-md5);
+
entropy_core_file_cache_remove_reference(file-parent-md5);
}
if (file-md5) entropy_free(file-md5);
- if (file-icon_hint) entropy_free(file-icon_hint);
+ if (file-attach) entropy_free(file-attach);
entropy_free(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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/include Modified Files: entropy_generic.h Log Message: * Minor api changes * Test trash menu === RCS file: /cvs/e/e17/proto/entropy/src/include/entropy_generic.h,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- entropy_generic.h 20 Jul 2006 15:19:18 - 1.22 +++ entropy_generic.h 15 Aug 2006 12:04:53 - 1.23 @@ -32,7 +32,7 @@ char* md5; /*A reference to the md5sum made for this file*/ - char* icon_hint; + char* attach; }; typedef struct entropy_file_listener entropy_file_listener; - 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=lnkkid=120709bid=263057dat=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_wallpaper.c e_widget_radio.c
Log Message:
simplify wallpaper dialog down to 1 list - and a radio toggle to flip sources.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_int_config_wallpaper.c14 Aug 2006 15:22:45 - 1.3
+++ e_int_config_wallpaper.c15 Aug 2006 13:16:52 - 1.4
@@ -18,11 +18,12 @@
Evas_Object *o_usrbg_frame;
Evas_Object *o_usrbg_fm;
Evas_Object *o_usrbg_up_button;
- Evas_Object *o_sysbg_frame;
- Evas_Object *o_sysbg_fm;
- Evas_Object *o_sysbg_up_button;
Evas_Object *o_preview;
Evas_Object *o_theme_bg;
+ Evas_Object *o_personal;
+ Evas_Object *o_system;
+ int fmdir;
+
int use_theme_bg;
char *bg;
/* advanced */
@@ -62,6 +63,8 @@
cfdata = dia-cfdata;
homedir = e_user_homedir_get();
if (!homedir) return;
+ cfdata-fmdir = 1;
+ e_widget_radio_toggle_set(cfdata-o_personal, 1);
snprintf(path, sizeof(path), %s/.e/e/backgrounds, homedir);
E_FREE(cfdata-bg);
cfdata-bg = strdup(file);
@@ -77,8 +80,6 @@
cfdata-use_theme_bg = 0;
if (cfdata-o_usrbg_frame)
e_widget_change(cfdata-o_usrbg_frame);
- if (cfdata-o_sysbg_fm)
- e_fm2_select_set(cfdata-o_sysbg_fm, , 0);
}
EAPI void
@@ -88,7 +89,6 @@
cfdata = dia-cfdata;
cfdata-win_import = NULL;
- printf(DONE!\n);
}
@@ -155,7 +155,6 @@
cfdata-use_theme_bg = 0;
if (cfdata-o_usrbg_frame)
e_widget_change(cfdata-o_usrbg_frame);
- e_fm2_select_set(cfdata-o_sysbg_fm, , 0);
}
static void
@@ -193,127 +192,47 @@
e_fm2_file_show(cfdata-o_usrbg_fm, p);
}
-
static void
-_cb_sysbg_button_up(void *data1, void *data2)
-{
- E_Config_Dialog_Data *cfdata;
-
- cfdata = data1;
- if (cfdata-o_sysbg_fm)
- e_fm2_parent_go(cfdata-o_sysbg_fm);
- if (cfdata-o_sysbg_frame)
- e_widget_scrollframe_child_pos_set(cfdata-o_sysbg_frame, 0, 0);
-}
-
-static void
-_cb_sysbg_files_changed(void *data, Evas_Object *obj, void *event_info)
+_cb_theme_wallpaper(void *data, Evas_Object *obj, void *event_info)
{
E_Config_Dialog_Data *cfdata;
+ const char *f;
cfdata = data;
- if (!cfdata-o_sysbg_fm) return;
- if (!e_fm2_has_parent_get(cfdata-o_sysbg_fm))
+ if (cfdata-use_theme_bg)
{
- if (cfdata-o_sysbg_up_button)
- e_widget_disabled_set(cfdata-o_sysbg_up_button, 1);
+ f = e_theme_edje_file_get(base/theme/backgrounds,
desktop/background);
+ if (cfdata-o_preview)
+ e_widget_preview_edje_set(cfdata-o_preview, f, desktop/background);
}
else
{
- if (cfdata-o_sysbg_up_button)
- e_widget_disabled_set(cfdata-o_sysbg_up_button, 0);
- }
- if (cfdata-o_sysbg_frame)
- e_widget_scrollframe_child_pos_set(cfdata-o_sysbg_frame, 0, 0);
-}
-
-static void
-_cb_sysbg_files_selection_change(void *data, Evas_Object *obj, void
*event_info)
-{
- E_Config_Dialog_Data *cfdata;
- Evas_List *selected;
- E_Fm2_Icon_Info *ici;
- const char *realpath;
- char buf[4096];
-
- cfdata = data;
- if (!cfdata-o_sysbg_fm) return;
- selected = e_fm2_selected_list_get(cfdata-o_sysbg_fm);
- if (!selected) return;
- ici = selected-data;
- realpath = e_fm2_real_path_get(cfdata-o_sysbg_fm);
- if (!strcmp(realpath, /))
- snprintf(buf, sizeof(buf), /%s, ici-file);
- else
- snprintf(buf, sizeof(buf), %s/%s, realpath, ici-file);
- evas_list_free(selected);
- if (ecore_file_is_dir(buf)) return;
- E_FREE(cfdata-bg);
- cfdata-bg = strdup(buf);
- if (cfdata-o_preview)
- e_widget_preview_edje_set(cfdata-o_preview, buf, desktop/background);
- if (cfdata-o_theme_bg)
- e_widget_check_checked_set(cfdata-o_theme_bg, 0);
- cfdata-use_theme_bg = 0;
- if (cfdata-o_sysbg_frame)
- e_widget_change(cfdata-o_sysbg_frame);
- e_fm2_select_set(cfdata-o_usrbg_fm, , 0);
-}
-
-static void
-_cb_sysbg_files_selected(void *data, Evas_Object *obj, void *event_info)
-{
- E_Config_Dialog_Data *cfdata;
-
- cfdata = data;
-}
-
-static void
-_cb_sysbg_files_files_changed(void *data, Evas_Object *obj, void *event_info)
-{
- E_Config_Dialog_Data *cfdata;
- char *p, buf[4096];
-
- cfdata = data;
- if (!cfdata-bg) return;
- if (!cfdata-o_sysbg_fm) return;
- p = (char *)e_fm2_real_path_get(cfdata-o_sysbg_fm);
- if (p)
- {
- if (strncmp(p, cfdata-bg, strlen(p))) return;
+ if (cfdata-bg)
+ {
+if (cfdata-o_preview)
+ e_widget_preview_edje_set(cfdata-o_preview, cfdata-bg,
desktop/background);
+ }
}
- snprintf(buf, sizeof(buf), %s/data/backgrounds, e_prefix_data_get());
- if (!strncmp(cfdata-bg, buf, strlen(buf)))
- p = cfdata-bg + strlen(buf) +
E CVS: proto rhapsodhy
Enlightenment CVS committal
Author : rhapsodhy
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui/src/widgets
Modified Files:
Entrance_Widgets.h Makefile.am ew_button.c ew_button.h
ew_messagebox.c ew_messagebox.h
Added Files:
ew_checkbox.c ew_checkbox.h ew_radio_button.c
ew_radio_button.h ew_toggle_button.c ew_toggle_button.h
Log Message:
Whee! We now have checkbox, radio button, toggle button, and all of the
messageboxes. Also you can modify the label of the button. Should do something
with these stuff, though:D
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/Entrance_Widgets.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Entrance_Widgets.h 15 Aug 2006 02:36:45 - 1.6
+++ Entrance_Widgets.h 15 Aug 2006 13:52:07 - 1.7
@@ -14,5 +14,8 @@
#include ew_label.h
#include ew_entry.h
#include ew_button.h
+#include ew_radio_button.h
+#include ew_toggle_button.h
+#include ew_checkbox.h
#endif
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 15 Aug 2006 02:36:45 - 1.7
+++ Makefile.am 15 Aug 2006 13:52:07 - 1.8
@@ -20,7 +20,10 @@
ew_image.h \
ew_label.h \
ew_entry.h \
- ew_button.h
+ ew_button.h \
+ ew_toggle_button.h \
+ ew_radio_button.h \
+ ew_checkbox.h
libentrance_widgets_ladir = $(prefix)/include
@@ -38,6 +41,9 @@
ew_label.c \
ew_entry.c \
ew_button.c \
+ ew_toggle_button.c \
+ ew_radio_button.c \
+ ew_checkbox.c \
$(libentrance_widgets_la_HEADERS)
libentrance_widgets_la_LIBADD = @etk_libs@
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_button.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ew_button.c 15 Aug 2006 02:36:45 - 1.1
+++ ew_button.c 15 Aug 2006 13:52:07 - 1.2
@@ -24,3 +24,12 @@
etk_signal_connect(clicked, ETK_OBJECT(ew-owner),
ETK_CALLBACK(func), data);
}
+void
+ew_button_label_set(Entrance_Widget ew, char *label) {
+ etk_button_label_set(ETK_BUTTON(ew-owner), label);
+}
+
+const char *
+ew_button_label_get(Entrance_Widget ew) {
+ return etk_button_label_get(ETK_BUTTON(ew-owner));
+}
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_button.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ew_button.h 15 Aug 2006 02:36:45 - 1.1
+++ ew_button.h 15 Aug 2006 13:52:07 - 1.2
@@ -3,5 +3,7 @@
Entrance_Widget ew_button_new(const char *label, void (*func)(void *, void*),
void *data);
void ew_button_onclick_set(Entrance_Widget ew, void (*func)(void*, void*),
void *data);
+void ew_button_label_set(Entrance_Widget ew, char *label);
+const char *ew_button_label_get(Entrance_Widget ew);
#endif
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_messagebox.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ew_messagebox.c 15 Aug 2006 11:30:46 - 1.3
+++ ew_messagebox.c 15 Aug 2006 13:52:07 - 1.4
@@ -45,34 +45,43 @@
ew_messagebox_ok(const char *title, const char *message, const char *icon)
{
Entrance_Dialog ew = _ew_messagebox_new(title, message, icon);
- ew_notice_ok_button_add(ew, _ew_messagebox_cb_ok, NULL);
+ ew_notice_ok_button_add(ew, _ew_messagebox_cb_ok, ew);
ew_notice_show(ew);
+
+ return ew;
}
Entrance_Dialog
-ew_messagebox_ok_cancel(const char *title, const char *message, const char
*icon, void (*funct)(void *, int *, void *)) {
+ew_messagebox_ok_cancel(const char *title, const char *message, const char
*icon, void (*funct)(void *, int, void *)) {
Entrance_Dialog ew = _ew_messagebox_new(title, message, icon);
ew_notice_ok_button_add(ew, funct, NULL);
ew_notice_cancel_button_add(ew, NULL, NULL);
+
+ return ew;
}
Entrance_Dialog
-ew_messagebox_yes_no(const char *title, const char *message, const char *icon,
void (*funct)(void *, int *, void *)) {
+ew_messagebox_yes_no(const char *title, const char *message, const char *icon,
void (*funct)(void *, int, void *)) {
Entrance_Dialog ew = _ew_messagebox_new(title, message, icon);
ew_notice_yes_button_add(ew, funct, NULL);
ew_notice_no_button_add(ew, NULL, NULL);
+
+ return ew;
}
Entrance_Dialog
-ew_messagebox_yes_no_cancel(const char *title, const char *message, const char
*icon, void (*funct)(void *, int *, void *)) {
E CVS: proto rhapsodhy
Enlightenment CVS committal Author : rhapsodhy Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui Modified Files: TODO Log Message: Ooops, i forgot the todo update === RCS file: /cvs/e/e17/proto/entrance_edit_gui/TODO,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- TODO15 Aug 2006 11:30:46 - 1.7 +++ TODO15 Aug 2006 13:55:58 - 1.8 @@ -2,10 +2,7 @@ === - No proper tracking of objects is being done, hence no proper freeing is being done. - Need more widgets... yesterday!!! - - radio button - - check box - - More Message Boxes. - okcancel(), yesno(), yesnocancel() + - fileselector - ew_imagelist - Entrance_List needs to be refactored to use as common a base as possible. Also, we need to select the first row by default when adding to a list. - group types are currently hash defined'd ints. should be enums - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rhapsodhy
Enlightenment CVS committal
Author : rhapsodhy
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui/src/widgets
Modified Files:
ew_dialog.c ew_notice.c
Log Message:
Use action area instead of hboxes.
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_dialog.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ew_dialog.c 15 Aug 2006 02:36:45 - 1.5
+++ ew_dialog.c 15 Aug 2006 14:29:08 - 1.6
@@ -35,8 +35,6 @@
ew-box = etk_vbox_new(0, 10);
etk_container_border_width_set(ETK_CONTAINER(ew-owner), 5); /*its
hardcoded and bad. i know, but just to keep things uniform*/
- ew-hbox = etk_hbox_new(0,10);
-
if(toplevel)
etk_signal_connect(destroyed, ETK_OBJECT(ew-owner),
ETK_CALLBACK(_ew_cb_destroy), NULL);
return ew;
@@ -45,7 +43,6 @@
void
ew_dialog_show(Entrance_Dialog ew)
{
- etk_box_pack_start(ETK_BOX(ew-box), ew-hbox, ETK_TRUE, ETK_TRUE, 0);
etk_dialog_pack_in_main_area(ETK_DIALOG(ew-owner), ew-box, ETK_TRUE,
ETK_TRUE,
0, ETK_FALSE);
etk_widget_show_all(ew-owner);
@@ -119,6 +116,6 @@
_ew_dialog_add_bottom(Entrance_Dialog d, Entrance_Widget ew)
{
if(d ew)
- etk_box_pack_start(ETK_BOX(d-hbox), ew-owner, ETK_TRUE,
ETK_TRUE, 0);
+ etk_dialog_pack_widget_in_action_area(ETK_DIALOG(d-owner),
ETK_WIDGET(ew-owner), ETK_TRUE, ETK_TRUE, 10, ETK_TRUE);
}
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_notice.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ew_notice.c 14 Aug 2006 17:08:55 - 1.2
+++ ew_notice.c 15 Aug 2006 14:29:08 - 1.3
@@ -23,13 +23,6 @@
ew_dialog_show(ew);
}
-/*void
-ew_dialog_add(Entrance_Dialog d, Entrance_Widget ew)
-{
- if(d ew)
- etk_box_pack_start(ETK_BOX(d-box), ew-box, ETK_TRUE,
ETK_TRUE, 0);
-}*/
-
Entrance_Widget
ew_notice_group_add(Entrance_Dialog d, const char *title, int direction)
{
@@ -47,10 +40,9 @@
void
ew_notice_button_add(Entrance_Dialog ew, const char *name, int response_id,
void (*response_event)(void *, int, void *), void *data)
{
- Etk_Widget *btn = etk_dialog_button_add(ETK_DIALOG(ew-owner), name,
response_id);
+ etk_dialog_button_add(ETK_DIALOG(ew-owner), name, response_id);
if(response_event)
etk_signal_connect(response, ETK_OBJECT(ew-owner),
ETK_CALLBACK(response_event), data);
- etk_box_pack_start(ETK_BOX(ew-hbox), btn, ETK_TRUE, ETK_TRUE, 0);
}
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rhapsodhy
Enlightenment CVS committal Author : rhapsodhy Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui Modified Files: TODO Log Message: Use action area instead of hboxes. === RCS file: /cvs/e/e17/proto/entrance_edit_gui/TODO,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- TODO15 Aug 2006 13:55:58 - 1.8 +++ TODO15 Aug 2006 14:29:08 - 1.9 @@ -10,6 +10,7 @@ - Fix up Fileselector widget. This may probably need to refactor out the buttons used by ew_notice as ew_reponse_buttons ? - use ecore_lists to hold buttons and other *low life* widgets used on composite widgets. - There is a bug in ew_entry. I've not been albe to programmatically add text to the widget and display it. +- We can add a group in egui_graphics_selector.c that only shows up when for the 'Theme' dialog. GUI - 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=lnkkid=120709bid=263057dat=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_embed.c ewl_widget.h
Log Message:
- store a flag to specify if this widget is in the tab order already. if it
isn't, we can skip checking the list. gives a really good speed boost in
some test cases
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- ewl_embed.c 11 Jul 2006 01:06:39 - 1.73
+++ ewl_embed.c 15 Aug 2006 14:30:38 - 1.74
@@ -1106,7 +1106,7 @@
current_idx = ecore_dlist_index(e-tab_order);
/* make sure this widget isn't already in the list */
- if (ecore_dlist_goto(e-tab_order, w)) {
+ if (w-in_tab_order ecore_dlist_goto(e-tab_order, w)) {
int del_idx;
/* if this widget was before or at our current focused
@@ -1125,6 +1125,8 @@
if (current_idx = (int)idx) current_idx ++;
ecore_dlist_goto_index(e-tab_order, current_idx);
+ w-in_tab_order = 1;
+
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1217,6 +1219,8 @@
if (ecore_dlist_goto(e-tab_order, w))
ecore_dlist_remove(e-tab_order);
+
+ w-in_tab_order = 0;
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- ewl_widget.h13 Jul 2006 00:20:29 - 1.44
+++ ewl_widget.h15 Aug 2006 14:30:38 - 1.45
@@ -143,6 +143,8 @@
int layer;/** the layer relative to the parent */
int toplayered; /** Indicates if the widget should
be on the top of the layer
stack */
+ unsigned charin_tab_order:1; /** Has the widget been inserted
+ into the tab order */
Ecore_Hash *theme;/** Overriding theme settings */
Ewl_Pair_Listtheme_text; /** Overriding text in 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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rhapsodhy
Enlightenment CVS committal
Author : rhapsodhy
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui/src/widgets
Modified Files:
ew_messagebox.c ew_messagebox.h ew_notice.c ew_notice.h
Log Message:
Instead of using response events, attach the clicked events to the buttons.
This is easier,
and you don't have to pay attention to so much things.:D
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_messagebox.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ew_messagebox.c 15 Aug 2006 13:52:07 - 1.4
+++ ew_messagebox.c 15 Aug 2006 14:46:35 - 1.5
@@ -4,7 +4,7 @@
#include stdlib.h
#include config.h
-static void _ew_messagebox_cb_ok(void *, int, void *);
+static void _ew_messagebox_cb_ok(void *, void *);
Entrance_Dialog
_ew_messagebox_new(const char *title, const char *message, const char *icon)
@@ -52,36 +52,35 @@
}
Entrance_Dialog
-ew_messagebox_ok_cancel(const char *title, const char *message, const char
*icon, void (*funct)(void *, int, void *)) {
+ew_messagebox_ok_cancel(const char *title, const char *message, const char
*icon, void (*funct)(void *, void *)) {
Entrance_Dialog ew = _ew_messagebox_new(title, message, icon);
ew_notice_ok_button_add(ew, funct, NULL);
- ew_notice_cancel_button_add(ew, NULL, NULL);
+ ew_notice_cancel_button_add(ew, funct, NULL);
return ew;
}
Entrance_Dialog
-ew_messagebox_yes_no(const char *title, const char *message, const char *icon,
void (*funct)(void *, int, void *)) {
+ew_messagebox_yes_no(const char *title, const char *message, const char *icon,
void (*funct)(void *, void *)) {
Entrance_Dialog ew = _ew_messagebox_new(title, message, icon);
ew_notice_yes_button_add(ew, funct, NULL);
- ew_notice_no_button_add(ew, NULL, NULL);
+ ew_notice_no_button_add(ew, funct, NULL);
return ew;
}
Entrance_Dialog
-ew_messagebox_yes_no_cancel(const char *title, const char *message, const char
*icon, void (*funct)(void *, int, void *)) {
+ew_messagebox_yes_no_cancel(const char *title, const char *message, const char
*icon, void (*funct)(void *, void *)) {
Entrance_Dialog ew = _ew_messagebox_new(title, message, icon);
ew_notice_yes_button_add(ew, funct, NULL);
- ew_notice_no_button_add(ew, NULL, NULL);
- ew_notice_cancel_button_add(ew, NULL, NULL);
+ ew_notice_no_button_add(ew, funct, NULL);
+ ew_notice_cancel_button_add(ew, funct, NULL);
return ew;
}
static void
-_ew_messagebox_cb_ok(void *win, int response, void *data) {
+_ew_messagebox_cb_ok(void *win, void *data) {
Entrance_Dialog ew = data;
- if(response == EW_NOTICE_OK_BUTTON)
- ew_dialog_destroy(ew);
+ ew_dialog_destroy(ew);
}
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_messagebox.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ew_messagebox.h 15 Aug 2006 13:52:07 - 1.3
+++ ew_messagebox.h 15 Aug 2006 14:46:35 - 1.4
@@ -8,9 +8,9 @@
#define EW_MESSAGEBOX_ICON_ERROR error
Entrance_Dialog ew_messagebox_ok(const char *type, const char *title, const
char *message);
-Entrance_Dialog ew_messagebox_ok_cancel(const char *, const char *, const char
*, void (*)(void *, int, void *));
-Entrance_Dialog ew_messagebox_yes_no(const char *, const char *, const char *,
void (*)(void *, int, void *));
-Entrance_Dialog ew_messagebox_yes_no_cancel(const char *, const char *, const
char *, void (*)(void *, int, void *));
+Entrance_Dialog ew_messagebox_ok_cancel(const char *, const char *, const char
*, void (*)(void *, void *));
+Entrance_Dialog ew_messagebox_yes_no(const char *, const char *, const char *,
void (*)(void *, void *));
+Entrance_Dialog ew_messagebox_yes_no_cancel(const char *, const char *, const
char *, void (*)(void *, void *));
#endif
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_notice.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ew_notice.c 15 Aug 2006 14:29:08 - 1.3
+++ ew_notice.c 15 Aug 2006 14:46:35 - 1.4
@@ -38,43 +38,43 @@
}
void
-ew_notice_button_add(Entrance_Dialog ew, const char *name, int response_id,
void (*response_event)(void *, int, void *), void *data)
+ew_notice_button_add(Entrance_Dialog ew, const char *name, int response_id,
void (*response_event)(void *, void *), void *data)
{
- etk_dialog_button_add(ETK_DIALOG(ew-owner), name, response_id);
+ Etk_Widget *btn = etk_dialog_button_add(ETK_DIALOG(ew-owner), name,
response_id);
if(response_event)
- etk_signal_connect(response, ETK_OBJECT(ew-owner),
ETK_CALLBACK(response_event),
E CVS: proto rhapsodhy
Enlightenment CVS committal Author : rhapsodhy Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/data Modified Files: icons.edc Log Message: Some fixes by rookmoot === RCS file: /cvs/e/e17/proto/entrance_edit_gui/data/icons.edc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- icons.edc 14 Aug 2006 18:38:41 - 1.2 +++ icons.edc 15 Aug 2006 15:01:31 - 1.3 @@ -40,5 +40,6 @@ STOCK_ICON(48x48/status/dialog-information.png, icons/dialog/information, 48) STOCK_ICON(48x48/status/dialog-warning.png, icons/dialog/warning, 48) STOCK_ICON(48x48/status/dialog-question.png, icons/dialog/quiestion, 48) + STOCK_ICON(48x48/mimetypes/package-x-generic.png, icons/main/modules, 48) } - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rhapsodhy
Enlightenment CVS committal Author : rhapsodhy Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/src/gui Modified Files: Makefile.am main.c Log Message: Some fixes by rookmoot === RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/Makefile.am,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- Makefile.am 13 Aug 2006 23:55:55 - 1.9 +++ Makefile.am 15 Aug 2006 15:01:31 - 1.10 @@ -13,13 +13,13 @@ Egui.h entrance_edit_gui_CFLAGS = \ - -I$(top_srcdir)/src/widgets \ [EMAIL PROTECTED]@ \ [EMAIL PROTECTED]@ + -I$(top_srcdir)/src/widgets \ + @etk_cflags@ \ + @entrance_edit_cflags@ entrance_edit_gui_LDFLAGS = \ - -L$(top_srcdir)/src/widgets + -L$(top_srcdir)/src/widgets entrance_edit_gui_LDADD = \ - -lentrance_widgets \ - @entrance_edit_libs@ + -lentrance_widgets \ + @entrance_edit_libs@ === RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/main.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- main.c 15 Aug 2006 02:36:45 - 1.8 +++ main.c 15 Aug 2006 15:01:33 - 1.9 @@ -37,6 +37,7 @@ ew_edjelist_add(tree, _(Behavior), edjefile, icons/main/behavior, NULL, 0, egui_behavior_dialog_show); ew_edjelist_add(tree, _(Sessions),edjefile, icons/main/sessions, NULL, 0, egui_sessions_dialog_show); ew_edjelist_add(tree, _(X settings), edjefile, icons/main/xsettings,NULL, 0, egui_x_settings_dialog_show); + ew_edjelist_add(tree, _(Modules), edjefile, icons/main/modules,NULL, 0, NULL); Entrance_Widget group = ew_dialog_group_add(dialog, _(Configuration), EW_GROUP_VERTICAL); ew_group_add(group, tree); - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rhapsodhy
Enlightenment CVS committal Author : rhapsodhy Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/src/widgets Modified Files: ew_entry.h Log Message: Some fixes by rookmoot === RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_entry.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- ew_entry.h 15 Aug 2006 03:50:04 - 1.2 +++ ew_entry.h 15 Aug 2006 15:01:33 - 1.3 @@ -33,7 +33,7 @@ } \ else \ -Entrance_Entry ew_entry_new(const char*, const char *, int); +Entrance_Entry ew_entry_new(const char *label, const char *text, int ispassword); const char* ew_entry_get(Entrance_Entry); void ew_entry_set(Entrance_Entry ew, const char *text); void ew_entry_password_set(Entrance_Entry ew); - 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=lnkkid=120709bid=263057dat=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_embed.c ewl_enums.h ewl_object.h ewl_widget.h
Log Message:
- move the in_tab_order over to be in the ewl flags mask.
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -3 -r1.74 -r1.75
--- ewl_embed.c 15 Aug 2006 14:30:38 - 1.74
+++ ewl_embed.c 15 Aug 2006 15:06:51 - 1.75
@@ -1106,7 +1106,8 @@
current_idx = ecore_dlist_index(e-tab_order);
/* make sure this widget isn't already in the list */
- if (w-in_tab_order ecore_dlist_goto(e-tab_order, w)) {
+ if (ewl_object_in_tab_list_get(EWL_OBJECT(w))
+ecore_dlist_goto(e-tab_order, w)) {
int del_idx;
/* if this widget was before or at our current focused
@@ -1125,7 +1126,7 @@
if (current_idx = (int)idx) current_idx ++;
ecore_dlist_goto_index(e-tab_order, current_idx);
- w-in_tab_order = 1;
+ ewl_object_in_tab_list_set(EWL_OBJECT(w), TRUE);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -1219,8 +1220,8 @@
if (ecore_dlist_goto(e-tab_order, w))
ecore_dlist_remove(e-tab_order);
-
- w-in_tab_order = 0;
+
+ ewl_object_in_tab_list_set(EWL_OBJECT(w), FALSE);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_enums.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- ewl_enums.h 12 Jul 2006 03:44:19 - 1.50
+++ ewl_enums.h 15 Aug 2006 15:06:51 - 1.51
@@ -138,33 +138,33 @@
EWL_FLAG_PROPERTY_INTERNAL = 0x4000,/** Widget is internal */
EWL_FLAG_PROPERTY_BLOCK_TAB_FOCUS = 0x8000, /** Widget will block
tab focus changes */
EWL_FLAG_PROPERTY_FOCUSABLE = 0x1, /** Widget is focusable */
+ EWL_FLAG_PROPERTY_IN_TAB_LIST = 0x2, /** Widget is in the tab
order */
/*
* Flags to indicate queues this object is on.
*/
- EWL_FLAG_QUEUED_CSCHEDULED = 0x2, /** Configure scheduled */
- EWL_FLAG_QUEUED_RSCHEDULED = 0x4, /** Reveal scheduled */
- EWL_FLAG_QUEUED_DSCHEDULED = 0x8, /** Delete scheduled */
-
- EWL_FLAG_QUEUED_CPROCESS = 0x10,/** Configure in progress */
- EWL_FLAG_QUEUED_RPROCESS = 0x20,/** Reveal in progress */
- EWL_FLAG_QUEUED_DPROCESS = 0x40,/** Delete in progress */
+ EWL_FLAG_QUEUED_CSCHEDULED = 0x4, /** Configure scheduled */
+ EWL_FLAG_QUEUED_RSCHEDULED = 0x8, /** Reveal scheduled */
+ EWL_FLAG_QUEUED_DSCHEDULED = 0x10, /** Delete scheduled */
+
+ EWL_FLAG_QUEUED_CPROCESS = 0x20,/** Configure in progress */
+ EWL_FLAG_QUEUED_RPROCESS = 0x40,/** Reveal in progress */
+ EWL_FLAG_QUEUED_DPROCESS = 0x80,/** Delete in progress */
/*
* The state enum specifies the current state of a widget, ie. has it
* been clicked, does it have the keyboard focus, etc.
*/
EWL_FLAG_STATE_NORMAL = 0, /** Widget state normal */
- EWL_FLAG_STATE_MOUSE_IN = 0x80, /** Mouse is in the widget */
- EWL_FLAG_STATE_PRESSED = 0x100, /** Widget is pressed */
- EWL_FLAG_STATE_FOCUSED = 0x2000,/** Widget has focus */
- EWL_FLAG_STATE_DND = 0x400, /** Widget is engaged in DND */
- EWL_FLAG_STATE_DISABLED = 0x800,/** Widget is disabled */
-
- EWL_FLAG_PROPERTY_DND_AWARE = 0x1000, /** Widget is DND
aware */
- EWL_FLAG_PROPERTY_DRAGGABLE = 0x2000, /** Widget is dragable
*/
- EWL_FLAG_STATE_DND_WAIT = 0x4000, /** Widget is in DND
wait state */
-
+ EWL_FLAG_STATE_MOUSE_IN = 0x100,/** Mouse is in the widget */
+ EWL_FLAG_STATE_PRESSED = 0x200, /** Widget is pressed */
+ EWL_FLAG_STATE_FOCUSED = 0x4000,/** Widget has focus */
+ EWL_FLAG_STATE_DND = 0x800, /** Widget is engaged in DND */
+ EWL_FLAG_STATE_DISABLED = 0x1000, /** Widget is disabled */
+
+ EWL_FLAG_PROPERTY_DND_AWARE = 0x2000, /** Widget is DND
aware */
+ EWL_FLAG_PROPERTY_DRAGGABLE = 0x4000, /** Widget is dragable
*/
+ EWL_FLAG_STATE_DND_WAIT = 0x8000, /** Widget is in DND
wait state */
};
/**
@@ -203,7 +203,8 @@
#define EWL_FLAGS_PROPERTY_MASK (EWL_FLAG_PROPERTY_RECURSIVE | \
EWL_FLAG_PROPERTY_TOPLEVEL | EWL_FLAG_PROPERTY_INTERNAL | \
EWL_FLAG_PROPERTY_BLOCK_TAB_FOCUS | EWL_FLAG_PROPERTY_FOCUSABLE
| \
- EWL_FLAG_PROPERTY_DND_AWARE | EWL_FLAG_PROPERTY_DRAGGABLE )
+
E CVS: proto rhapsodhy
Enlightenment CVS committal Author : rhapsodhy Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/data/icons/48x48/mimetypes Log Message: Directory /cvs/e/e17/proto/entrance_edit_gui/data/icons/48x48/mimetypes 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rhapsodhy
Enlightenment CVS committal Author : rhapsodhy Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/data/icons/48x48/mimetypes Added Files: Makefile.am package-x-generic.png Log Message: I always forget something - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rhapsodhy
Enlightenment CVS committal Author : rhapsodhy Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/data/icons/48x48 Modified Files: Makefile.am Log Message: I always forget something === RCS file: /cvs/e/e17/proto/entrance_edit_gui/data/icons/48x48/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 14 Aug 2006 18:38:41 - 1.2 +++ Makefile.am 15 Aug 2006 15:08:07 - 1.3 @@ -2,4 +2,5 @@ SUBDIRS = apps \ categories \ devices \ - status + status \ + mimetypes - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto rhapsodhy
Enlightenment CVS committal Author : rhapsodhy Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui Modified Files: configure.in Log Message: I have to update configure.in as well... === RCS file: /cvs/e/e17/proto/entrance_edit_gui/configure.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- configure.in14 Aug 2006 18:38:41 - 1.10 +++ configure.in15 Aug 2006 15:11:58 - 1.11 @@ -137,5 +137,6 @@ data/icons/48x48/categories/Makefile \ data/icons/48x48/devices/Makefile \ data/icons/48x48/status/Makefile \ +data/icons/48x48/mimetypes/Makefile \ debian/changelog ]) - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_box.c etk_box.h etk_button.c etk_dialog.c
etk_message_dialog.c etk_toolbar.c
Log Message:
** BIG API BREAK **
The API of Etk_Box has been changed, etk_box_pack_start() and
etk_box_pack_end() doesn't exist anymore and have been replaced by a
bunch of other functions.
Most (probably all) of the apps are broken, you need to fix them! :)
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_box.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- etk_box.c 13 May 2006 23:44:40 - 1.12
+++ etk_box.c 15 Aug 2006 15:59:01 - 1.13
@@ -11,10 +11,9 @@
typedef struct Etk_Box_Cell
{
Etk_Widget *child;
+ Etk_Box_Group group;
+ Etk_Box_Fill_Policy fill_policy;
int padding;
- Etk_Bool expand;
- Etk_Bool fill;
- Etk_Bool pack_end;
} Etk_Box_Cell;
enum Etk_Box_Property_Id
@@ -30,7 +29,6 @@
static void _etk_box_child_add(Etk_Container *container, Etk_Widget *widget);
static void _etk_box_child_remove(Etk_Container *container, Etk_Widget
*widget);
static Evas_List *_etk_box_children_get(Etk_Container *container);
-static void _etk_box_pack_full(Etk_Box *box, Etk_Widget *child, Etk_Bool
expand, Etk_Bool fill, int padding, Etk_Bool pack_end);
static void _etk_hbox_constructor(Etk_HBox *hbox);
static void _etk_hbox_size_request(Etk_Widget *widget, Etk_Size *size);
@@ -40,6 +38,10 @@
static void _etk_vbox_size_request(Etk_Widget *widget, Etk_Size *size);
static void _etk_vbox_size_allocate(Etk_Widget *widget, Etk_Geometry geometry);
+static void _etk_box_insert_after_cell(Etk_Box *box, Etk_Widget *child,
Etk_Box_Group group, Etk_Box_Cell *after, Etk_Box_Fill_Policy fill_policy, int
padding);
+static Etk_Box_Cell *_etk_box_cell_get(Etk_Box *box, Etk_Widget *widget);
+
+
/**
*
* Implementation
@@ -126,123 +128,228 @@
}
/**
- * @brief Adds the child at the start of the box. @n
- * Repeated calls to etk_box_pack_start() will pack widgets from start to end
- * (left to right for an Etk_HBbox, top to bottom for an Etk_VBox)
+ * @brief Packs a widget at the start of one of the two groups of children of
the box
* @param box a box
- * @param child the child to add
- * @param expand if @a expand == ETK_TRUE, the cell that contains the child
will take all the available space
- * @param fill if @a fill == ETK_TRUE, the child will fill all the available
space in its cell
- * @param padding the amount of free space on the two sides of the child
+ * @param child the widget to pack
+ * @param group the group in which the child will be packed
+ * @param fill_policy the fill policy of the child
+ * @param padding the amount of free space on the two sides of the child, in
pixels
*/
-void etk_box_pack_start(Etk_Box *box, Etk_Widget *child, Etk_Bool expand,
Etk_Bool fill, int padding)
+void etk_box_prepend(Etk_Box *box, Etk_Widget *child, Etk_Box_Group group,
Etk_Box_Fill_Policy fill_policy, int padding)
{
- _etk_box_pack_full(box, child, expand, fill, padding, ETK_FALSE);
+ if (!box || !child)
+ return;
+ _etk_box_insert_after_cell(box, child, group, NULL, fill_policy, padding);
}
/**
- * @brief Adds the child at the end of the box. @n
- * Repeated calls to etk_box_pack_end() will pack widgets from end to start
- * (right to left for Etk_HBbox, bottom to top for Etk_VBox)
+ * @brief Packs a widget at the end of one of the groups of children of the box
* @param box a box
- * @param child the child to add
- * @param expand if @a expand == ETK_TRUE, the cell that contains the child
will take all the available space
- * @param fill if @a fill == ETK_TRUE, the child will fill all the available
space in its cell
- * @param padding the amount of free space on the two sides of the child
- * @note To pack several widgets in a specific order, at the end of a box, you
have to call etk_box_pack_end() in
- * the reverse order
+ * @param child the widget to pack
+ * @param group the group in which the child will be packed
+ * @param fill_policy the fill policy of the child
+ * @param padding the amount of free space on the two sides of the child, in
pixels
*/
-void etk_box_pack_end(Etk_Box *box, Etk_Widget *child, Etk_Bool expand,
Etk_Bool fill, int padding)
+void etk_box_append(Etk_Box *box, Etk_Widget *child, Etk_Box_Group group,
Etk_Box_Fill_Policy fill_policy, int padding)
{
- _etk_box_pack_full(box, child, expand, fill, padding, ETK_TRUE);
+ Etk_Box_Cell *after_cell;
+
+ if (!box || !child)
+ return;
+
+ after_cell = evas_list_data(evas_list_last(box-cells[group]));
+ _etk_box_insert_after_cell(box, child, group, after_cell, fill_policy,
padding);
}
/**
- * @brief Sets the packing settings of a child of the box
+ * @brief Packs a widget after another widget, in one of
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/bin Modified Files: etk_button_test.c etk_canvas_test.c etk_combobox_test.c etk_menu_test.c etk_notebook_test.c etk_paned_test.c etk_progress_bar_test.c etk_scrolled_view_test.c etk_slider_test.c etk_table_test.c etk_test.c etk_text_view_test.c etk_tree_test.c etk_xdnd_test.c Log Message: ** BIG API BREAK ** The API of Etk_Box has been changed, etk_box_pack_start() and etk_box_pack_end() doesn't exist anymore and have been replaced by a bunch of other functions. Most (probably all) of the apps are broken, you need to fix them! :) === RCS file: /cvs/e/e17/proto/etk/src/bin/etk_button_test.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- etk_button_test.c 24 Jun 2006 17:54:06 - 1.11 +++ etk_button_test.c 15 Aug 2006 15:59:01 - 1.12 @@ -28,41 +28,41 @@ button_normal = etk_button_new_with_label(Normal button); etk_tooltips_tip_set(button_normal, This is a normal button); - etk_box_pack_start(ETK_BOX(vbox), button_normal, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(vbox), button_normal, ETK_BOX_START, ETK_BOX_NONE, 0); image = etk_image_new_from_file(PACKAGE_DATA_DIR /images/e_icon.png); button_normal = etk_button_new_with_label(Button with an image); etk_tooltips_tip_set(button_normal, This is a normal button with an image); etk_button_image_set(ETK_BUTTON(button_normal), ETK_IMAGE(image)); - etk_box_pack_start(ETK_BOX(vbox), button_normal, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(vbox), button_normal, ETK_BOX_START, ETK_BOX_NONE, 0); button_normal = etk_button_new(); etk_tooltips_tip_set(button_normal, This is a normal button with nothing); - etk_box_pack_start(ETK_BOX(vbox), button_normal, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(vbox), button_normal, ETK_BOX_START, ETK_BOX_NONE, 0); button_check = etk_check_button_new_with_label(Check button); etk_tooltips_tip_set(button_check, This is a check button); - etk_box_pack_start(ETK_BOX(vbox), button_check, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(vbox), button_check, ETK_BOX_START, ETK_BOX_NONE, 0); button_check = etk_check_button_new(); etk_tooltips_tip_set(button_check, This is another check button); - etk_box_pack_start(ETK_BOX(vbox), button_check, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(vbox), button_check, ETK_BOX_START, ETK_BOX_NONE, 0); button_radio = etk_radio_button_new_with_label(Radio button, NULL); etk_tooltips_tip_set(button_radio, This is a radio button); - etk_box_pack_start(ETK_BOX(vbox), button_radio, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(vbox), button_radio, ETK_BOX_START, ETK_BOX_NONE, 0); button_radio = etk_radio_button_new_from_widget(ETK_RADIO_BUTTON(button_radio)); etk_tooltips_tip_set(button_radio, This is another radio button); - etk_box_pack_start(ETK_BOX(vbox), button_radio, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(vbox), button_radio, ETK_BOX_START, ETK_BOX_NONE, 0); button_toggle = etk_toggle_button_new_with_label(Toggle button); etk_tooltips_tip_set(button_toggle, This is a toggle button); - etk_box_pack_start(ETK_BOX(vbox), button_toggle, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(vbox), button_toggle, ETK_BOX_START, ETK_BOX_NONE, 0); button_toggle = etk_toggle_button_new(); etk_tooltips_tip_set(button_toggle, This is another toggle button); - etk_box_pack_start(ETK_BOX(vbox), button_toggle, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(vbox), button_toggle, ETK_BOX_START, ETK_BOX_NONE, 0); etk_widget_show_all(win); } === RCS file: /cvs/e/e17/proto/etk/src/bin/etk_canvas_test.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- etk_canvas_test.c 24 Jun 2006 17:54:06 - 1.8 +++ etk_canvas_test.c 15 Aug 2006 15:59:01 - 1.9 @@ -27,11 +27,11 @@ canvas = etk_canvas_new(); etk_widget_size_request_set(canvas, 300, 200); - etk_box_pack_start(ETK_BOX(vbox), canvas, ETK_TRUE, ETK_TRUE, 0); + etk_box_append(ETK_BOX(vbox), canvas, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); button = etk_button_new_with_label(Add object); etk_signal_connect_swapped(clicked, ETK_OBJECT(button), ETK_CALLBACK(_etk_test_canvas_object_add), canvas); - etk_box_pack_start(ETK_BOX(vbox), button, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(vbox), button, ETK_BOX_START, ETK_BOX_NONE, 0); etk_widget_show_all(win); } === RCS file: /cvs/e/e17/proto/etk/src/bin/etk_combobox_test.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/lib Modified Files: etk_colorpicker.c etk_container.h etk_table.c etk_table.h Log Message: New API BREAK!! :) * Change the name of the fill policy flags the table: e.g. ETK_FILL_POLICY_HEXPAND -- ETK_TABLE_HEXPAND also, 3 more convenient flags: ETK_TABLE_EXPAND = ETK_TABLE_HEXPAND | ETK_TABLE_VEXPAND ETK_TABLE_FILL = ETK_TABLE_HFILL | ETK_TABLE_VFILL ETK_TABLE_EXPAND_FILL = ETK_TABLE_FILL | ETK_TABLE_EXPAND * etk_table_attach_defaults() -- etk_table_attach_default() === RCS file: /cvs/e/e17/proto/etk/src/lib/etk_colorpicker.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- etk_colorpicker.c 13 Aug 2006 22:42:23 - 1.19 +++ etk_colorpicker.c 15 Aug 2006 16:33:26 - 1.20 @@ -303,14 +303,12 @@ etk_widget_show(cp-main_table); cp-picker_widget = etk_widget_new(ETK_WIDGET_TYPE, theme_group, picker, NULL); - etk_table_attach(ETK_TABLE(cp-main_table), cp-picker_widget, 0, 0, 0, 0, - 0, 0, ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VFILL | ETK_FILL_POLICY_HEXPAND | ETK_FILL_POLICY_VEXPAND); + etk_table_attach_default(ETK_TABLE(cp-main_table), cp-picker_widget, 0, 0, 0, 0); etk_widget_visibility_locked_set(cp-picker_widget, ETK_TRUE); etk_widget_show(cp-picker_widget); cp-component_table = etk_table_new(3, 6, ETK_FALSE); - etk_table_attach(ETK_TABLE(cp-main_table), cp-component_table, 1, 1, 0, 0, - 0, 0, ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VFILL | ETK_FILL_POLICY_HEXPAND | ETK_FILL_POLICY_VEXPAND); + etk_table_attach_default(ETK_TABLE(cp-main_table), cp-component_table, 1, 1, 0, 0); etk_widget_visibility_locked_set(cp-component_table, ETK_TRUE); etk_widget_show(cp-component_table); @@ -322,13 +320,13 @@ else cp-radios[i] = etk_radio_button_new_with_label_from_widget(labels[i], ETK_RADIO_BUTTON(cp-radios[0])); etk_table_attach(ETK_TABLE(cp-component_table), cp-radios[i], 0, 0, i, i, - 0, 0, ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VEXPAND); + 0, 0, ETK_TABLE_HFILL | ETK_TABLE_VEXPAND); etk_widget_visibility_locked_set(cp-radios[i], ETK_TRUE); etk_widget_show(cp-radios[i]); cp-sliders[i] = etk_hslider_new(0.0, values[i], 0.0, steps[i], steps[i] * 5); etk_table_attach(ETK_TABLE(cp-component_table), cp-sliders[i], 1, 1, i, i, - 0, 0, ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_HEXPAND | ETK_FILL_POLICY_VEXPAND); + 0, 0, ETK_TABLE_HFILL | ETK_TABLE_EXPAND); etk_widget_visibility_locked_set(cp-sliders[i], ETK_TRUE); etk_widget_show(cp-sliders[i]); @@ -337,7 +335,7 @@ cp-value_labels[i] = etk_label_new(0); etk_table_attach(ETK_TABLE(cp-component_table), cp-value_labels[i], 2, 2, i, i, - 0, 0, ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VEXPAND); + 0, 0, ETK_TABLE_HFILL | ETK_TABLE_VEXPAND); etk_widget_size_request_set(cp-value_labels[i], 28, -1); etk_widget_visibility_locked_set(cp-value_labels[i], ETK_TRUE); etk_widget_show(cp-value_labels[i]); @@ -355,20 +353,20 @@ /* We create the widgets for the color preview */ cp-color_table = etk_table_new(2, 1, ETK_FALSE); etk_table_attach(ETK_TABLE(cp-main_table), cp-color_table, 0, 0, 1, 1, - 0, 0, ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VFILL | ETK_FILL_POLICY_HEXPAND); + 0, 0, ETK_TABLE_FILL | ETK_TABLE_HEXPAND); etk_widget_visibility_locked_set(cp-color_table, ETK_TRUE); etk_widget_show(cp-color_table); /* Current color preview */ cp-current_color_label = etk_label_new(_(Current)); etk_table_attach(ETK_TABLE(cp-color_table), cp-current_color_label, 0, 0, 0, 0, - 0, 0, ETK_FILL_POLICY_HFILL); + 0, 0, ETK_TABLE_HFILL); etk_widget_visibility_locked_set(cp-current_color_label, ETK_TRUE); etk_widget_show(cp-current_color_label); cp-current_color_widget = etk_widget_new(ETK_WIDGET_TYPE, theme_group, color_preview, NULL); etk_table_attach(ETK_TABLE(cp-color_table), cp-current_color_widget, 1, 1, 0, 0, - 0, 0, ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_HEXPAND); + 0, 0, ETK_TABLE_HFILL | ETK_TABLE_HEXPAND); etk_widget_visibility_locked_set(cp-current_color_widget, ETK_TRUE); etk_widget_show(cp-current_color_widget); === RCS file: /cvs/e/e17/proto/etk/src/lib/etk_container.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- etk_container.h 25 May 2006 21:07:00 - 1.7 +++ etk_container.h 15 Aug 2006 16:33:26 - 1.8 @@ -19,18 +19,6 @@ /** Checks if the object is an Etk_Container */ #define ETK_IS_CONTAINER(obj)(ETK_OBJECT_CHECK_TYPE((obj), ETK_CONTAINER_TYPE)) -/** @brief Describes how a child
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_embed_test.c etk_entry_test.c etk_image_test.c
etk_notebook_test.c etk_slider_test.c etk_table_test.c
etk_test.c etk_tree_test.c
Log Message:
New API BREAK!! :)
* Change the name of the fill policy flags the table:
e.g. ETK_FILL_POLICY_HEXPAND -- ETK_TABLE_HEXPAND
also, 3 more convenient flags:
ETK_TABLE_EXPAND = ETK_TABLE_HEXPAND | ETK_TABLE_VEXPAND
ETK_TABLE_FILL = ETK_TABLE_HFILL | ETK_TABLE_VFILL
ETK_TABLE_EXPAND_FILL = ETK_TABLE_FILL | ETK_TABLE_EXPAND
* etk_table_attach_defaults() -- etk_table_attach_default()
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_embed_test.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etk_embed_test.c2 Jul 2006 04:01:19 - 1.5
+++ etk_embed_test.c15 Aug 2006 16:33:26 - 1.6
@@ -121,19 +121,19 @@
table = etk_table_new(2, 10, ETK_FALSE);
- etk_table_attach(ETK_TABLE(table), image, 0, 0, 0, 0, 0, 0,
ETK_FILL_POLICY_NONE);
- etk_table_attach(ETK_TABLE(table), buttons[0], 1, 1, 0, 0, 0, 0,
ETK_FILL_POLICY_HEXPAND);
+ etk_table_attach(ETK_TABLE(table), image, 0, 0, 0, 0, 0, 0, ETK_TABLE_NONE);
+ etk_table_attach(ETK_TABLE(table), buttons[0], 1, 1, 0, 0, 0, 0,
ETK_TABLE_HEXPAND);
for (i = 0; i 6; i++)
{
- etk_table_attach(ETK_TABLE(table), labels[i], 0, 0, 2 + i, 2 + i, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), entries[i], 1, 1, 2 + i, 2 +
i);
+ etk_table_attach(ETK_TABLE(table), labels[i], 0, 0, 2 + i, 2 + i, 0, 0,
ETK_TABLE_HFILL);
+ etk_table_attach_default(ETK_TABLE(table), entries[i], 1, 1, 2 + i, 2 +
i);
}
- etk_table_attach(ETK_TABLE(table), labels[6], 0, 0, 8, 8, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), buttons[1], 1, 1, 8, 8);
- etk_table_attach(ETK_TABLE(table), labels[7], 0, 0, 9, 9, 0, 0,
ETK_FILL_POLICY_HFILL);
- etk_table_attach_defaults(ETK_TABLE(table), buttons[2], 1, 1, 9, 9);
+ etk_table_attach(ETK_TABLE(table), labels[6], 0, 0, 8, 8, 0, 0,
ETK_TABLE_HFILL);
+ etk_table_attach_default(ETK_TABLE(table), buttons[1], 1, 1, 8, 8);
+ etk_table_attach(ETK_TABLE(table), labels[7], 0, 0, 9, 9, 0, 0,
ETK_TABLE_HFILL);
+ etk_table_attach_default(ETK_TABLE(table), buttons[2], 1, 1, 9, 9);
embed = etk_embed_new(evas, NULL, NULL);
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_entry_test.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- etk_entry_test.c24 Jun 2006 17:54:06 - 1.8
+++ etk_entry_test.c15 Aug 2006 16:33:26 - 1.9
@@ -27,18 +27,18 @@
etk_container_add(ETK_CONTAINER(win), table);
entry = etk_entry_new();
- etk_table_attach(ETK_TABLE(table), entry, 0, 0, 0, 0, 0, 0,
ETK_FILL_POLICY_HEXPAND | ETK_FILL_POLICY_HFILL);
+ etk_table_attach(ETK_TABLE(table), entry, 0, 0, 0, 0, 0, 0,
ETK_TABLE_HEXPAND | ETK_TABLE_HFILL);
button = etk_button_new_with_label(Print text);
- etk_table_attach(ETK_TABLE(table), button, 1, 1, 0, 0, 0, 0,
ETK_FILL_POLICY_NONE);
+ etk_table_attach(ETK_TABLE(table), button, 1, 1, 0, 0, 0, 0,
ETK_TABLE_NONE);
etk_signal_connect(clicked, ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_entry_print_clicked), NULL);
button = etk_toggle_button_new_with_label(Toggle password);
- etk_table_attach(ETK_TABLE(table), button, 2, 2, 0, 0, 0, 0,
ETK_FILL_POLICY_NONE);
+ etk_table_attach(ETK_TABLE(table), button, 2, 2, 0, 0, 0, 0,
ETK_TABLE_NONE);
etk_signal_connect(toggled, ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_entry_password_toggled), NULL);
label = etk_label_new( );
- etk_table_attach(ETK_TABLE(table), label, 0, 1, 1, 1, 0, 0,
ETK_FILL_POLICY_HEXPAND | ETK_FILL_POLICY_HFILL);
+ etk_table_attach(ETK_TABLE(table), label, 0, 1, 1, 1, 0, 0,
ETK_TABLE_HEXPAND | ETK_TABLE_HFILL);
etk_widget_show_all(win);
}
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_image_test.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_image_test.c24 Jun 2006 17:54:06 - 1.6
+++ etk_image_test.c15 Aug 2006 16:33:26 - 1.7
@@ -28,10 +28,10 @@
labels[1] = etk_label_new(Don't keep aspect);
table = etk_table_new(2, 2, ETK_FALSE);
- etk_table_attach_defaults(ETK_TABLE(table), images[0], 0, 0, 0, 0);
- etk_table_attach_defaults(ETK_TABLE(table), images[1], 1, 1, 0, 0);
- etk_table_attach(ETK_TABLE(table), labels[0], 0, 0, 1, 1, 2, 0,
ETK_FILL_POLICY_HEXPAND);
- etk_table_attach(ETK_TABLE(table), labels[1], 1, 1, 1, 1, 2, 0,
ETK_FILL_POLICY_HEXPAND);
+ etk_table_attach_default(ETK_TABLE(table), images[0], 0, 0, 0, 0);
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_slider.c
Log Message:
The VSlider now gets focused on click
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_slider.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- etk_slider.c8 Aug 2006 18:51:22 - 1.10
+++ etk_slider.c15 Aug 2006 16:38:46 - 1.11
@@ -85,7 +85,7 @@
Etk_Widget *etk_vslider_new(double lower, double upper, double value, double
step_increment, double page_increment)
{
return etk_widget_new(ETK_VSLIDER_TYPE, theme_group, vslider,
focusable, ETK_TRUE, lower, lower, upper, upper,
- value, value, step_increment, step_increment, page_increment,
page_increment, NULL);
+ value, value, step_increment, step_increment, page_increment,
page_increment, focus_on_click, ETK_TRUE, 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=lnkkid=120709bid=263057dat=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_dnd.c
Log Message:
- fix doxy
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_dnd.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ewl_dnd.c 6 Aug 2006 10:01:57 - 1.15
+++ ewl_dnd.c 15 Aug 2006 16:41:51 - 1.16
@@ -188,6 +188,11 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
+/**
+ * @param type: The type to check for
+ * @return Returns TRUE if the given type is supported, FALSE otherwise
+ * @brief Checks if the given type @a type is supported
+ */
int
ewl_dnd_type_supported(char *type)
{
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/enhance/src/lib
Modified Files:
enhance_widget.c
Log Message:
* Fix enhance
===
RCS file: /cvs/e/e17/proto/enhance/src/lib/enhance_widget.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- enhance_widget.c14 Aug 2006 19:50:38 - 1.15
+++ enhance_widget.c15 Aug 2006 17:13:28 - 1.16
@@ -962,19 +962,23 @@
else if(!strcmp(parent_class, GtkVBox) || !strcmp(parent_class,
GtkHBox) ||
!strcmp(parent_class, GtkVButtonBox) || !strcmp(parent_class,
GtkHButtonBox))
{
- Etk_Bool expand = ETK_TRUE;
- Etk_Bool fill= ETK_TRUE;
- int padding = 0;
+Etk_Box_Fill_Policy fill_policy;
+ int padding;
if(child-packing)
{
-expand = child-packing-expand;
-fill = child-packing-fill;
+ fill_policy = child-packing-expand ? ETK_BOX_EXPAND :
ETK_BOX_NONE;
+ fill_policy |= child-packing-fill ? ETK_BOX_FILL : ETK_BOX_NONE;
padding = child-packing-padding;
}
+else
+ {
+ fill_policy = ETK_BOX_EXPAND_FILL;
+ padding = 0;
+ }
- etk_box_pack_start(ETK_BOX(parent-wid), child-wid,
- expand, fill, padding);
+ etk_box_append(ETK_BOX(parent-wid), child-wid, ETK_BOX_START,
+ fill_policy, padding);
}
else if(!strcmp(parent_class, GtkTable))
@@ -986,7 +990,7 @@
int x_padding = 0;
int y_padding = 0;
int flags_set = 0;
- Etk_Fill_Policy_Flags fill_policy = ETK_FILL_POLICY_NONE;
+ Etk_Table_Fill_Policy fill_policy = ETK_TABLE_NONE;
if(child-packing)
{
@@ -1006,38 +1010,37 @@
{
if(strstr(child-packing-x_options, fill))
{
- fill_policy = ETK_FILL_POLICY_HFILL;
+ fill_policy = ETK_TABLE_HFILL;
flags_set = 1;
}
else if(strstr(child-packing-x_options, expand))
{
if(flags_set)
-fill_policy |= ETK_FILL_POLICY_HEXPAND;
+fill_policy |= ETK_TABLE_HEXPAND;
else
-fill_policy = ETK_FILL_POLICY_HEXPAND;
+fill_policy = ETK_TABLE_HEXPAND;
flags_set = 1;
}
else if(strstr(child-packing-y_options, fill))
{
if(flags_set)
-fill_policy |= ETK_FILL_POLICY_VFILL;
+fill_policy |= ETK_TABLE_VFILL;
else
-fill_policy = ETK_FILL_POLICY_VFILL;
+fill_policy = ETK_TABLE_VFILL;
flags_set = 1;
}
else if(strstr(child-packing-y_options, expand))
{
if(flags_set)
-fill_policy |= ETK_FILL_POLICY_VEXPAND;
+fill_policy |= ETK_TABLE_VEXPAND;
else
-fill_policy = ETK_FILL_POLICY_VEXPAND;
+fill_policy = ETK_TABLE_VEXPAND;
flags_set = 1;
}
}
if(!flags_set)
- fill_policy = ETK_FILL_POLICY_VFILL|ETK_FILL_POLICY_HFILL|
-ETK_FILL_POLICY_VEXPAND|ETK_FILL_POLICY_HEXPAND;
+ fill_policy = ETK_TABLE_EXPAND_FILL;
}
/* NOTE: we have a problem here:
-
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=lnkkid=120709bid=263057dat=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 enhance_widget.c enhance_widget.h
Log Message:
Added box_group support.
===
RCS file: /cvs/e/e17/proto/enhance/src/lib/enhance.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- enhance.c 14 Aug 2006 20:09:17 - 1.21
+++ enhance.c 15 Aug 2006 17:30:05 - 1.22
@@ -773,6 +773,7 @@
packing-padding = 0;
packing-expand= ETK_TRUE;
packing-fill = ETK_TRUE;
+ packing-box_group = ETK_BOX_START;
packing-left_attach = 0;
packing-right_attach = 0;
packing-top_attach= 0;
@@ -792,7 +793,15 @@
variable = ETK_FALSE; \
} \
while(0)
-
+#define IF_PACK_TYPE_ASSIGN(value, variable) \
+ do \
+ { \
+ if(!strcmp(value, GTK_PACK_START)) \
+variable = ETK_BOX_START; \
+ else if (!strcmp(value, GTK_PACK_END)) \
+variable = ETK_BOX_END; \
+ } \
+ while (0)
do
{
char *str = NULL;
@@ -808,6 +817,8 @@
IF_TRUE_FALSE_ASSIGN(node-value, packing-expand);
else if(!strcmp(fill, str))
IF_TRUE_FALSE_ASSIGN(node-value, packing-fill);
+ else if(!strcmp(pack_type, str))
+ IF_PACK_TYPE_ASSIGN(node-value, packing-box_group);
else if(!strcmp(left_attach, str))
packing-left_attach = atoi(node-value);
else if(!strcmp(right_attach, str))
===
RCS file: /cvs/e/e17/proto/enhance/src/lib/enhance_widget.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- enhance_widget.c15 Aug 2006 17:13:28 - 1.16
+++ enhance_widget.c15 Aug 2006 17:30:05 - 1.17
@@ -977,7 +977,7 @@
padding = 0;
}
- etk_box_append(ETK_BOX(parent-wid), child-wid, ETK_BOX_START,
+ etk_box_append(ETK_BOX(parent-wid), child-wid,
child-packing-box_group,
fill_policy, padding);
}
===
RCS file: /cvs/e/e17/proto/enhance/src/lib/enhance_widget.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- enhance_widget.h7 Feb 2006 00:34:32 - 1.1
+++ enhance_widget.h15 Aug 2006 17:30:05 - 1.2
@@ -17,7 +17,8 @@
int padding;
Etk_Bool expand;
Etk_Bool fill;
-
+ Etk_Box_Group box_group;
+
/* Table packing */
int left_attach;
int right_attach;
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_toolbar.c etk_toolbar.h
Log Message:
add functions to get / set orientation. add insets. add some separators for
show.
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_toolbar.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_toolbar.c 15 Aug 2006 15:59:01 - 1.2
+++ etk_toolbar.c 15 Aug 2006 17:43:29 - 1.3
@@ -85,6 +85,55 @@
etk_box_prepend(ETK_BOX(toolbar-box), widget, ETK_BOX_START, ETK_BOX_NONE,
0);
}
+/**
+ * @brief Sets the toolbar's orientation (horizontal or vertical)
+ * @param toolbar the toolbar
+ * @param orientation the orientation
+ */
+void etk_toolbar_orientation_set(Etk_Toolbar *toolbar, int orientation)
+{
+ Evas_List *children;
+ Evas_List *l;
+
+ if (!toolbar || toolbar-orientation == orientation ||
+ (orientation != ETK_TOOLBAR_ORIENTATION_HORIZONTAL
+ orientation != ETK_TOOLBAR_ORIENTATION_VERTICAL))
+ return;
+
+ children = etk_container_children_get(ETK_CONTAINER(toolbar-box));
+
+ for (l = children; l; l = l-next)
+ etk_container_remove(ETK_CONTAINER(toolbar-box), ETK_WIDGET(l-data));
+
+ etk_object_destroy(ETK_OBJECT(toolbar-box));
+
+ toolbar-orientation = orientation;
+ if (toolbar-orientation == ETK_TOOLBAR_ORIENTATION_VERTICAL)
+ toolbar-box = etk_vbox_new(ETK_FALSE, 0);
+ else
+ toolbar-box = etk_hbox_new(ETK_FALSE, 0);
+
+ etk_widget_parent_set(toolbar-box, ETK_WIDGET(toolbar));
+ etk_widget_visibility_locked_set(ETK_WIDGET(toolbar-box), ETK_TRUE);
+ etk_widget_show(toolbar-box);
+
+ for (l = children; l; l = l-next)
+ etk_box_append(ETK_BOX(toolbar-box), ETK_WIDGET(l-data),
ETK_BOX_START, ETK_BOX_NONE, 0);
+}
+
+/**
+ * @brief Gets the toolbar's orientation (horizontal or vertical)
+ * @param toolbar the toolbar
+ * @return the orientation
+ */
+int etk_toolbar_orientation_get(Etk_Toolbar *toolbar)
+{
+ if (!toolbar)
+ return ETK_FALSE;
+
+ return toolbar-orientation;
+}
+
/**
*
* Etk specific functions
@@ -131,7 +180,7 @@
switch (property_id)
{
case ETK_TOOLBAR_ORIENTATION_PROPERTY:
- //etk_window_title_set(window, etk_property_value_string_get(value));
+ etk_toolbar_orientation_set(toolbar,
etk_property_value_int_get(value));
break;
default:
break;
@@ -149,7 +198,7 @@
switch (property_id)
{
case ETK_TOOLBAR_ORIENTATION_PROPERTY:
- //etk_property_value_string_set(value, etk_window_title_get(window));
+ etk_property_value_int_set(value, toolbar-orientation);
break;
default:
break;
@@ -171,10 +220,14 @@
static void _etk_toolbar_size_allocate(Etk_Widget *widget, Etk_Geometry
geometry)
{
Etk_Toolbar *toolbar;
+ Etk_Size size;
if (!(toolbar = ETK_TOOLBAR(widget)))
return;
-
+
+ etk_widget_size_request(toolbar-box, size);
+ geometry.w = ETK_MAX(geometry.w, size.w);
+ geometry.h = ETK_MAX(geometry.h, size.h);
etk_widget_size_allocate(ETK_WIDGET(toolbar-box), geometry);
}
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_toolbar.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_toolbar.h 13 Aug 2006 15:33:17 - 1.1
+++ etk_toolbar.h 15 Aug 2006 17:43:29 - 1.2
@@ -5,6 +5,7 @@
#include etk_widget.h
#include etk_box.h
#include etk_types.h
+#include etk_utils.h
/**
* @defgroup Etk_Toolbar Etk_Toolbar
@@ -50,6 +51,9 @@
void etk_toolbar_append(Etk_Toolbar *toolbar, Etk_Widget *widget);
void etk_toolbar_prepend(Etk_Toolbar *toolbar, Etk_Widget *widget);
+
+void etk_toolbar_orientation_set(Etk_Toolbar *toolbar, int orientation);
+int etk_toolbar_orientation_get(Etk_Toolbar *toolbar);
/** @} */
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_menu_test.c
Log Message:
add functions to get / set orientation. add insets. add some separators for
show.
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_menu_test.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- etk_menu_test.c 15 Aug 2006 15:59:01 - 1.15
+++ etk_menu_test.c 15 Aug 2006 17:43:29 - 1.16
@@ -23,7 +23,8 @@
Etk_Widget *radio_item;
Etk_Widget *label;
Etk_Widget *toolbar;
- Etk_Widget *button;
+ Etk_Widget *button;
+ Etk_Widget *sep;
if (win)
{
@@ -34,7 +35,7 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), Etk Menu Test);
etk_signal_connect(delete_event, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
- etk_widget_size_request_set(win, 300, 200);
+ etk_widget_size_request_set(win, 325, 240);
/
* The window
@@ -52,20 +53,27 @@
button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_COPY);
etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
+
button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_CUT);
etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_PASTE);
etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
- button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_FIND);
- etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
+ sep = etk_vseparator_new();
+ etk_toolbar_append(ETK_TOOLBAR(toolbar), sep);
button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_UNDO);
etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_REDO);
- etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
+ etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
+
+ sep = etk_vseparator_new();
+ etk_toolbar_append(ETK_TOOLBAR(toolbar), sep);
+
+ button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_FIND);
+ etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
/* Window body */
label = etk_label_new(Click me! :));
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/widgets
Modified Files:
toolbar.edc
Log Message:
add functions to get / set orientation. add insets. add some separators for
show.
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/toolbar.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- toolbar.edc 13 Aug 2006 15:33:17 - 1.1
+++ toolbar.edc 15 Aug 2006 17:43:29 - 1.2
@@ -1,5 +1,8 @@
group {
name: toolbar;
+ data {
+ item: inset 1 1 2 2;
+ }
parts {
part {
name: toolbar;
-
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=lnkkid=120709bid=263057dat=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: - alternate row colours === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_tree2.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- ewl_tree2.c 14 Aug 2006 22:00:19 - 1.23 +++ ewl_tree2.c 15 Aug 2006 17:54:56 - 1.24 @@ -539,6 +539,11 @@ ewl_container_child_append(EWL_CONTAINER(tree-rows), row); ewl_widget_show(row); + if (i % 2) + ewl_widget_state_set(row, odd, EWL_STATE_PERSISTENT); + else + ewl_widget_state_set(row, even, EWL_STATE_PERSISTENT); + column = 0; ecore_list_goto_first(tree-columns); while((col = ecore_list_next(tree-columns))) - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/enity/src/bin
Modified Files:
enity.c
Log Message:
Fix enity
===
RCS file: /cvs/e/e17/proto/enity/src/bin/enity.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- enity.c 5 Aug 2006 02:52:51 - 1.13
+++ enity.c 15 Aug 2006 18:00:36 - 1.14
@@ -463,7 +463,7 @@
value = 0;
slider = etk_hslider_new((double)min_value, (double)max_value,
(double)value, (double)step_value, 10.0);
- etk_box_pack_start(ETK_BOX(slider_hbox), slider, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(slider_hbox), slider, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
if(!en_argument_is_set(args, hide-value, ' '))
{
@@ -472,7 +472,7 @@
snprintf(str, sizeof(str), %d, (int)value);
slider_label = etk_label_new(str);
etk_signal_connect(value_changed, ETK_OBJECT(slider),
ETK_CALLBACK(_en_slider_value_changed), slider_label);
- etk_box_pack_start(ETK_BOX(slider_hbox), slider_label, ETK_TRUE,
ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(slider_hbox), slider_label, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
}
etk_dialog_pack_in_main_area(ETK_DIALOG(dialog), label, ETK_FALSE,
ETK_FALSE, 3, ETK_FALSE);
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=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_callbacks.c emphasis_config_gui.c Log Message: new box api. === RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_callbacks.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- emphasis_callbacks.c21 Jul 2006 04:05:27 - 1.7 +++ emphasis_callbacks.c15 Aug 2006 18:31:45 - 1.8 @@ -836,9 +836,9 @@ etk_widget_hide_all(player-media.window); etk_container_remove(ETK_CONTAINER(player-media.window), player-media.root); - etk_box_pack_start(ETK_BOX(player-full.root), + etk_box_append(ETK_BOX(player-full.root), player-media.root, - ETK_TRUE, ETK_TRUE, 0); + ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); emphasis_player_toggle_full(player, ETK_TRUE); === RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis_config_gui.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- emphasis_config_gui.c 21 Jul 2006 04:05:27 - 1.1 +++ emphasis_config_gui.c 15 Aug 2006 18:31:45 - 1.2 @@ -17,8 +17,8 @@ etk_container_add(ETK_CONTAINER(gui-window), gui-vbox); gui-connection_frame = etk_frame_new(Connection settings); - etk_box_pack_start(ETK_BOX(gui-vbox), gui-connection_frame, - ETK_TRUE, ETK_TRUE, 0); + etk_box_append(ETK_BOX(gui-vbox), gui-connection_frame, + ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); gui-connection_vbox = etk_vbox_new(ETK_TRUE, 5); etk_container_add(ETK_CONTAINER(gui-connection_frame), gui-connection_vbox); @@ -26,38 +26,38 @@ gui-hostname_hbox = etk_hbox_new(ETK_TRUE, 0); gui-hostname_label = etk_label_new(Hostname :); gui-hostname_entry = etk_entry_new(); - etk_box_pack_start(ETK_BOX(gui-hostname_hbox), gui-hostname_label, - ETK_TRUE, ETK_TRUE, 0); - etk_box_pack_start(ETK_BOX(gui-hostname_hbox), gui-hostname_entry, - ETK_TRUE, ETK_TRUE, 0); - etk_box_pack_start(ETK_BOX(gui-connection_vbox), gui-hostname_hbox, - ETK_TRUE, ETK_TRUE, 5); + etk_box_append(ETK_BOX(gui-hostname_hbox), gui-hostname_label, + ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); + etk_box_append(ETK_BOX(gui-hostname_hbox), gui-hostname_entry, + ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); + etk_box_append(ETK_BOX(gui-connection_vbox), gui-hostname_hbox, + ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); gui-port_hbox = etk_hbox_new(ETK_TRUE, 0); gui-port_label = etk_label_new(Port :); // gui-port_spin = etk_spin_button_new(0, 65536, 1); - etk_box_pack_start(ETK_BOX(gui-port_hbox), gui-port_label, - ETK_TRUE, ETK_TRUE, 0); -/* etk_box_pack_start(ETK_BOX(gui-port_hbox), gui-port_spin, - ETK_TRUE, ETK_TRUE, 0);*/ - etk_box_pack_start(ETK_BOX(gui-connection_vbox), gui-port_hbox, - ETK_TRUE, ETK_TRUE, 5); + etk_box_append(ETK_BOX(gui-port_hbox), gui-port_label, + ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); +/* etk_box_append(ETK_BOX(gui-port_hbox), gui-port_spin, + ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); */ + etk_box_append(ETK_BOX(gui-connection_vbox), gui-port_hbox, + ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); gui-password_hbox = etk_hbox_new(ETK_TRUE, 0); gui-password_label = etk_label_new(password :); gui-password_entry = etk_entry_new(); etk_entry_password_set(ETK_ENTRY(gui-password_entry), ETK_TRUE); - etk_box_pack_start(ETK_BOX(gui-password_hbox), gui-password_label, - ETK_TRUE, ETK_TRUE, 0); - etk_box_pack_start(ETK_BOX(gui-password_hbox), gui-password_entry, - ETK_TRUE, ETK_TRUE, 0); - etk_box_pack_start(ETK_BOX(gui-connection_vbox), gui-password_hbox, - ETK_TRUE, ETK_TRUE, 5); + etk_box_append(ETK_BOX(gui-password_hbox), gui-password_label, + ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); + etk_box_append(ETK_BOX(gui-password_hbox), gui-password_entry, + ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); + etk_box_append(ETK_BOX(gui-connection_vbox), gui-password_hbox, + ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); /**/ gui-interface_frame = etk_frame_new(Interface settings); - etk_box_pack_start(ETK_BOX(gui-vbox), gui-interface_frame, - ETK_TRUE, ETK_TRUE, 0); + etk_box_append(ETK_BOX(gui-vbox), gui-interface_frame, + ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); gui-interface_vbox = etk_vbox_new(ETK_TRUE, 5); etk_container_add(ETK_CONTAINER(gui-interface_frame), gui-interface_vbox); @@ -65,25 +65,25 @@ gui-rowheight_hbox = etk_hbox_new(ETK_TRUE,
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/exhibit/src/bin Modified Files: exhibit_comment.c exhibit_image.c exhibit_main.c exhibit_menus.c exhibit_options.c exhibit_tab.c Log Message: Fix exhibit === RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_comment.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- exhibit_comment.c 11 Aug 2006 02:30:57 - 1.10 +++ exhibit_comment.c 15 Aug 2006 18:45:51 - 1.11 @@ -22,12 +22,12 @@ } if (e-cur_tab-fit_window) - etk_box_pack_start(ETK_BOX(e-cur_tab-comment.vbox), e-cur_tab-alignment, ETK_TRUE, ETK_TRUE, 0); + etk_box_append(ETK_BOX(e-cur_tab-comment.vbox), e-cur_tab-alignment, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); else - etk_box_pack_start(ETK_BOX(e-cur_tab-comment.vbox), e-cur_tab-scrolled_view, ETK_TRUE, ETK_TRUE, 0); + etk_box_append(ETK_BOX(e-cur_tab-comment.vbox), e-cur_tab-scrolled_view, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); e-cur_tab-comment.frame = etk_frame_new(_(Image Comments)); - etk_box_pack_start(ETK_BOX(e-cur_tab-comment.vbox), e-cur_tab-comment.frame, ETK_FALSE, ETK_FALSE, 3); + etk_box_append(ETK_BOX(e-cur_tab-comment.vbox), e-cur_tab-comment.frame, ETK_BOX_START, ETK_BOX_NONE, 3); e-cur_tab-comment.textview = etk_text_view_new(); etk_widget_size_request_set(e-cur_tab-comment.textview, -1, 50); @@ -41,11 +41,11 @@ etk_container_add(ETK_CONTAINER(e-cur_tab-comment.frame), e-cur_tab-comment.vbox2); - etk_box_pack_start(ETK_BOX(e-cur_tab-comment.vbox2), e-cur_tab-comment.textview, ETK_TRUE, ETK_TRUE, 0); - etk_box_pack_start(ETK_BOX(e-cur_tab-comment.vbox2), e-cur_tab-comment.hbox, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(e-cur_tab-comment.vbox2), e-cur_tab-comment.textview, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); + etk_box_append(ETK_BOX(e-cur_tab-comment.vbox2), e-cur_tab-comment.hbox, ETK_BOX_START, ETK_BOX_NONE, 0); - etk_box_pack_start(ETK_BOX(e-cur_tab-comment.hbox), e-cur_tab-comment.revert, ETK_FALSE, ETK_FALSE, 0); - etk_box_pack_start(ETK_BOX(e-cur_tab-comment.hbox), e-cur_tab-comment.save, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(e-cur_tab-comment.hbox), e-cur_tab-comment.revert, ETK_BOX_START, ETK_BOX_NONE, 0); + etk_box_append(ETK_BOX(e-cur_tab-comment.hbox), e-cur_tab-comment.save, ETK_BOX_START, ETK_BOX_NONE, 0); e-cur_tab-comment.visible = ETK_TRUE; === RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -3 -r1.32 -r1.33 --- exhibit_image.c 13 Aug 2006 22:59:01 - 1.32 +++ exhibit_image.c 15 Aug 2006 18:45:51 - 1.33 @@ -634,13 +634,13 @@ etk_container_add(ETK_CONTAINER(vbox), fd-filechooser); label = etk_label_new(Filename:); - etk_box_pack_start(ETK_BOX(vbox), label, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(vbox), label, ETK_BOX_START, ETK_BOX_NONE, 0); D((Selected original filename: %s\n, e-cur_tab-cur_file)); fd-entry = etk_entry_new(); etk_entry_text_set(ETK_ENTRY(fd-entry), e-cur_tab-cur_file); - etk_box_pack_start(ETK_BOX(vbox), fd-entry, ETK_TRUE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(vbox), fd-entry, ETK_BOX_START, ETK_BOX_EXPAND, 0); etk_signal_connect(key_down, ETK_OBJECT(fd-entry), ETK_CALLBACK(_ex_image_save_as_entry_cb), fd); @@ -648,12 +648,12 @@ etk_container_add(ETK_CONTAINER(vbox), hbox); btn = etk_button_new_with_label(Save); - etk_box_pack_start(ETK_BOX(hbox), btn, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(hbox), btn, ETK_BOX_START, ETK_BOX_NONE, 0); etk_signal_connect_swapped(clicked, ETK_OBJECT(btn), ETK_CALLBACK(_ex_image_save_as_cb), fd); btn = etk_button_new_with_label(Cancel); - etk_box_pack_start(ETK_BOX(hbox), btn, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(hbox), btn, ETK_BOX_START, ETK_BOX_NONE, 0); etk_signal_connect_swapped(clicked, ETK_OBJECT(btn), ETK_CALLBACK(etk_widget_hide), fd-win); === RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v retrieving revision 1.65 retrieving revision 1.66 diff -u -3 -r1.65 -r1.66 --- exhibit_main.c 13 Aug 2006 22:59:01 - 1.65 +++ exhibit_main.c 15 Aug 2006 18:45:51 - 1.66 @@ -657,7 +657,7 @@ e-hpaned = etk_hpaned_new(); //etk_container_add(ETK_CONTAINER(e-win), e-hpaned); - etk_box_pack_start(ETK_BOX(e-vbox), e-hpaned, ETK_TRUE, ETK_TRUE, 0); + etk_box_append(ETK_BOX(e-vbox), e-hpaned, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); e-vpaned =
E CVS: apps/e sebastid
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_spectrum.c
Log Message:
Formatting
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_spectrum.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_spectrum.c14 Aug 2006 23:30:31 - 1.5
+++ e_spectrum.c15 Aug 2006 19:36:21 - 1.6
@@ -1,3 +1,6 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
+ */
#include e.h
Evas_Smart *_e_spectrum_smart = NULL;
@@ -23,7 +26,7 @@
_e_spectrum_smart_add(Evas_Object *o)
{
E_Spectrum *sp;
- sp = calloc(1, sizeof(E_Spectrum));
+ sp = E_NEW(E_Spectrum, 1);
if (!sp) return;
@@ -151,51 +154,51 @@
Evas_Smart *smart;
if ( _e_spectrum_smart ) return;
_e_spectrum_smart = evas_smart_new(e_spectrum,
-_e_spectrum_smart_add,
-_e_spectrum_smart_del,
-NULL, NULL, NULL, NULL, NULL,
-_e_spectrum_smart_move,
-_e_spectrum_smart_resize,
-_e_spectrum_smart_show,
-_e_spectrum_smart_hide,
-_e_spectrum_smart_color_set,
-_e_spectrum_smart_clip_set,
-_e_spectrum_smart_clip_unset,
-NULL);
+ _e_spectrum_smart_add,
+ _e_spectrum_smart_del,
+ NULL, NULL, NULL, NULL, NULL,
+ _e_spectrum_smart_move,
+ _e_spectrum_smart_resize,
+ _e_spectrum_smart_show,
+ _e_spectrum_smart_hide,
+ _e_spectrum_smart_color_set,
+ _e_spectrum_smart_clip_set,
+ _e_spectrum_smart_clip_unset,
+ NULL);
}
void
_e_spectrum_color_calc(E_Spectrum *sp, float vx, float vy, float vz, int *r,
int *g, int *b)
{
switch (sp-mode)
- {
+ {
case E_COLOR_COMPONENT_R:
- *r = 255 * vz;
- *g = 255 * vy;
- *b = 255 * vx;
- break;
+*r = 255 * vz;
+*g = 255 * vy;
+*b = 255 * vx;
+break;
case E_COLOR_COMPONENT_G:
- *r = 255 * vx;
- *g = 255 * vz;
- *b = 255 * vy;
- break;
+*r = 255 * vx;
+*g = 255 * vz;
+*b = 255 * vy;
+break;
case E_COLOR_COMPONENT_B:
- *r = 255 * vy;
- *g = 255 * vx;
- *b = 255 * vz;
- break;
+*r = 255 * vy;
+*g = 255 * vx;
+*b = 255 * vz;
+break;
case E_COLOR_COMPONENT_H:
- evas_color_hsv_to_rgb(vz * 360.0, vy, vx, r, g, b);
- break;
+evas_color_hsv_to_rgb(vz * 360.0, vy, vx, r, g, b);
+break;
case E_COLOR_COMPONENT_S:
- evas_color_hsv_to_rgb(vx * 360.0, vz, vy, r, g, b);
- break;
+evas_color_hsv_to_rgb(vx * 360.0, vz, vy, r, g, b);
+break;
case E_COLOR_COMPONENT_V:
- evas_color_hsv_to_rgb(vy * 360.0, vx, vz, r, g, b);
- break;
+evas_color_hsv_to_rgb(vy * 360.0, vx, vz, r, g, b);
+break;
default:
- break;
- }
+break;
+ }
}
void
@@ -207,41 +210,41 @@
if (!sp || !sp-cv) return;
switch (sp-mode)
- {
-case E_COLOR_COMPONENT_R:
- rr = sp-cv-r;
- gg = (1 - (y / (double)(sp-ih))) * 255;
- bb = (x / (double)(sp-iw)) * 255;
- break;
-case E_COLOR_COMPONENT_G:
- rr = (x / (double)(sp-iw)) * 255;
- gg = sp-cv-g;
- bb = (1 - (y / (double)(sp-ih))) * 255;
- break;
-case E_COLOR_COMPONENT_B:
- rr = (1 - (y / (double)(sp-ih))) * 255;
- gg = (x / (double)(sp-iw)) * 255;
- bb = sp-cv-b;
- break;
-case E_COLOR_COMPONENT_H:
- h = sp-cv-h;
- s = 1 - (y / (double)(sp-ih));
- v = x / (double)(sp-iw);
- evas_color_hsv_to_rgb(h, s, v, rr, gg, bb);
- break;
-case E_COLOR_COMPONENT_S:
- s = sp-cv-s;
- v = 1 - (y / (double)(sp-ih));
- h = x / (double)(sp-iw) * 360;
- evas_color_hsv_to_rgb(h, s, v, rr, gg, bb);
- break;
-case E_COLOR_COMPONENT_V:
- v = sp-cv-v;
- h = (1 - (y / (double)(sp-ih))) * 360;
- s = x / (double)(sp-iw);
- evas_color_hsv_to_rgb(h, s, v, rr, gg, bb);
- break;
- }
+{
+ case E_COLOR_COMPONENT_R:
+ rr = sp-cv-r;
+ gg = (1 - (y / (double)(sp-ih))) * 255;
+ bb = (x / (double)(sp-iw)) * 255;
+ break;
+ case E_COLOR_COMPONENT_G:
+ rr = (x / (double)(sp-iw)) * 255;
+
E CVS: proto essiene
Enlightenment CVS committal
Author : essiene
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui/src/widgets
Modified Files:
_ew_list.c ew_dialog.c ew_entry.c ew_group.c ew_notice.c
Log Message:
Update wrt to etk API change by MoOM. This means you should get the lattest etk
before building the lattest entrance_edit_gui.
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/_ew_list.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- _ew_list.c 13 Aug 2006 06:17:27 - 1.4
+++ _ew_list.c 15 Aug 2006 19:57:27 - 1.5
@@ -51,12 +51,13 @@
{
hbox = etk_hbox_new(0, 0);
- etk_box_pack_start(ETK_BOX(hbox), label, ETK_TRUE,
ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(hbox), label, ETK_TRUE,
ETK_FALSE, 0);
+ etk_box_append(ETK_BOX(ew-hbox), label, ETK_BOX_START,
ETK_BOX_EXPAND, 0);
} */
ew-box = etk_vbox_new(0,10);
- /*etk_box_pack_start(ETK_BOX(ew-box), hbox, ETK_TRUE, ETK_TRUE,
0);*/
- etk_box_pack_start(ETK_BOX(ew-box), ew-owner, ETK_TRUE, ETK_TRUE,
0);
+ /*etk_box_append(ETK_BOX(ew-box), hbox, ETK_BOX_START,
ETK_BOX_EXPAND, 0);*/
+ etk_box_append(ETK_BOX(ew-box), ew-owner, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
return ew;
}
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_dialog.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ew_dialog.c 15 Aug 2006 14:29:08 - 1.6
+++ ew_dialog.c 15 Aug 2006 19:57:27 - 1.7
@@ -59,7 +59,7 @@
return;
}
- etk_box_pack_start(ETK_BOX(d-box), ew-owner, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(d-box), ew-owner, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
return ew;
}
@@ -68,7 +68,7 @@
ew_dialog_add(Entrance_Dialog d, Entrance_Widget ew)
{
if(d ew)
- etk_box_pack_start(ETK_BOX(d-box), ew-box, ETK_TRUE,
ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(d-box), ew-box, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
}*/
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_entry.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ew_entry.c 15 Aug 2006 04:52:23 - 1.3
+++ ew_entry.c 15 Aug 2006 19:57:27 - 1.4
@@ -36,10 +36,10 @@
if(label)
{
ew-label = etk_label_new(label);
- etk_box_pack_start(ETK_BOX(ew-owner), ew-label, ETK_TRUE,
ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(ew-owner), ew-label, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
}
- etk_box_pack_start(ETK_BOX(ew-owner), ew-control, ETK_TRUE, ETK_TRUE,
0);
+ etk_box_append(ETK_BOX(ew-owner), ew-control, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
if(text)
ew_entry_set(ew, text);
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_group.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ew_group.c 14 Aug 2006 17:08:55 - 1.3
+++ ew_group.c 15 Aug 2006 19:57:27 - 1.4
@@ -33,6 +33,6 @@
}
Entrance_Widget ew = w;
- etk_box_pack_start(ETK_BOX(g-box), ew-owner, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(g-box), ew-owner, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
}
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_notice.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ew_notice.c 15 Aug 2006 14:46:35 - 1.4
+++ ew_notice.c 15 Aug 2006 19:57:27 - 1.5
@@ -32,7 +32,7 @@
return;
}
- etk_box_pack_start(ETK_BOX(d-box), ew-owner, ETK_TRUE, ETK_TRUE, 0);
+ etk_box_append(ETK_BOX(d-box), ew-owner, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
return ew;
}
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto essiene
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/src/widgets Modified Files: ew_messagebox.c Log Message: Meh! Bad rhapsodhy forgot to ew_notice_show() the message boxes :) === RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_messagebox.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- ew_messagebox.c 15 Aug 2006 14:46:35 - 1.5 +++ ew_messagebox.c 15 Aug 2006 20:11:12 - 1.6 @@ -57,6 +57,7 @@ ew_notice_ok_button_add(ew, funct, NULL); ew_notice_cancel_button_add(ew, funct, NULL); + ew_notice_show(ew); return ew; } @@ -66,6 +67,7 @@ ew_notice_yes_button_add(ew, funct, NULL); ew_notice_no_button_add(ew, funct, NULL); + ew_notice_show(ew); return ew; } @@ -76,6 +78,7 @@ ew_notice_no_button_add(ew, funct, NULL); ew_notice_cancel_button_add(ew, funct, NULL); + ew_notice_show(ew); return ew; } - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e sebastid
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm.c
Log Message:
Correct function definitions.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- e_fm.c 14 Aug 2006 15:22:45 - 1.30
+++ e_fm.c 15 Aug 2006 20:14:56 - 1.31
@@ -155,11 +155,11 @@
static void _e_fm2_new_directory(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_fm2_new_directory_delete_cb(void *obj);
static void _e_fm2_new_directory_yes_cb(char *text, void *data);
-static void _e_fm2_new_directory_no_cb(char *text, void *data);
+static void _e_fm2_new_directory_no_cb(void *data);
static void _e_fm2_file_rename(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_fm2_file_rename_delete_cb(void *obj);
static void _e_fm2_file_rename_yes_cb(char *text, void *data);
-static void _e_fm2_file_rename_no_cb(char *text, void *data);
+static void _e_fm2_file_rename_no_cb(void *data);
static void _e_fm2_file_delete(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_fm2_file_delete_delete_cb(void *obj);
static void _e_fm2_file_delete_yes_cb(void *data, E_Dialog *dialog);
@@ -2614,7 +2614,7 @@
}
static void
-_e_fm2_new_directory_no_cb(char *text, void *data)
+_e_fm2_new_directory_no_cb(void *data)
{
E_Fm2_Smart_Data *sd;
@@ -2702,7 +2702,7 @@
}
static void
-_e_fm2_file_rename_no_cb(char *text, void *data)
+_e_fm2_file_rename_no_cb(void *data)
{
E_Fm2_Icon *ic;
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e sebastid
Enlightenment CVS committal Author : sebastid Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_config.h Log Message: Use const char with stringshare. === RCS file: /cvs/e/e17/apps/e/src/bin/e_config.h,v retrieving revision 1.106 retrieving revision 1.107 diff -u -3 -r1.106 -r1.107 --- e_config.h 14 Aug 2006 11:24:45 - 1.106 +++ e_config.h 15 Aug 2006 20:17:19 - 1.107 @@ -234,8 +234,8 @@ int border_raise_on_focus; // GUI int desk_flip_wrap; // GUI - char *wallpaper_import_last_dev; // INTERNAL - char *wallpaper_import_last_path; // INTERNAL + const char *wallpaper_import_last_dev; // INTERNAL + const char *wallpaper_import_last_path; // INTERNAL }; struct _E_Config_Module - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e sebastid
Enlightenment CVS committal Author : sebastid Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_desklock.c Log Message: SIG_DFL is a handler, not a sigaction === RCS file: /cvs/e/e17/apps/e/src/bin/e_desklock.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -3 -r1.20 -r1.21 --- e_desklock.c12 Aug 2006 13:25:29 - 1.20 +++ e_desklock.c15 Aug 2006 20:20:33 - 1.21 @@ -586,7 +586,7 @@ char *current_user, *p; struct sigaction action; - action.sa_sigaction = SIG_DFL; + action.sa_handler = SIG_DFL; action.sa_flags = SA_ONSTACK | SA_NODEFER | SA_RESETHAND | SA_SIGINFO; sigemptyset(action.sa_mask); sigaction(SIGSEGV, action, 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_box.c etk_box.h etk_property.h etk_table.h
Log Message:
Update the doc of the Box
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_box.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- etk_box.c 15 Aug 2006 15:59:01 - 1.13
+++ etk_box.c 15 Aug 2006 20:20:43 - 1.14
@@ -301,7 +301,7 @@
* @brief Sets the packing settings of a child of the box
* @param box a box
* @param child a child of the box. If @a child is not packed in the box, this
function has no effect
- * @param fill policy the fill policy of the child
+ * @param fill_policy the fill policy of the child
* @param padding the amount of free space on the two sides of the child, in
pixels
*/
void etk_box_child_packing_set(Etk_Box *box, Etk_Widget *child,
Etk_Box_Fill_Policy fill_policy, int padding)
@@ -323,9 +323,9 @@
* @brief Gets the packing settings of a child of the box
* @param box a box
* @param child a child of the box
- * @param fill policy the location where to store the fill policy of the child
+ * @param fill_policy the location where to store the fill policy of the child
* @param padding the location where to store the padding of the child
- * @param Returns ETK_TRUE on success, and ETK_FALSE on failure (because @a
child is not packed in @a box)
+ * @return Returns ETK_TRUE on success, and ETK_FALSE on failure (because @a
child is not packed in @a box)
*/
Etk_Bool etk_box_child_packing_get(Etk_Box *box, Etk_Widget *child,
Etk_Box_Fill_Policy *fill_policy, int *padding)
{
@@ -1077,10 +1077,14 @@
*
* Etk_Box is the base class for Etk_HBox and Etk_VBox:
* in an Etk_HBox, the children are packed horizontally, and in an Etk_VBox,
the children are packed vertically. @n
- * A child can be packed at the start of the box (left for the hbox, top for
the vbox),
- * or at the end of the box (right for the hbox, bottom for the vbox). @n @n
- * The homogeneous setting controls whether or not all the children of the
box should take the same amount of space. @n
+ * You can pack a child in two differen groups of widgets: the start-group and
the end-group. The children of the
+ * start-group are packed at the start of the box (left for the hbox, top for
the vbox) and the children of the
+ * end are packed at the end of the box (right for the hbox, bottom for the
vbox). @n
+ * Widgets can be packed with the functions etk_box_prepend(),
etk_box_append(), etk_box_insert() and
+ * etk_box_insert_at(). @n @n
+ * The homogeneous setting determines whether or not all the children of the
box take up the same amount of space. @n
* The spacing setting determines the amount of space between two children.
+ *
*
* \par Object Hierarchy:
* - Etk_Object
@@ -1091,7 +1095,7 @@
* - Etk_VBox
*
* \par Properties:
- * @prop_name homogeneous: Whether or not the children of the box should
take the same amount of space
+ * @prop_name homogeneous: Whether or not the children of the box take up
the same amount of space
* @prop_type Boolean
* @prop_rw
* @prop_val ETK_FALSE
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_box.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_box.h 15 Aug 2006 15:59:01 - 1.6
+++ etk_box.h 15 Aug 2006 20:20:43 - 1.7
@@ -34,7 +34,8 @@
/** Checks if the object is an Etk_VBox */
#define ETK_IS_VBOX(obj)(ETK_OBJECT_CHECK_TYPE((obj), ETK_VBOX_TYPE))
-/** @brief The two groups where the children could be packed: the start-group
and the end-group */
+
+/** @brief The two groups where the children can be packed: the start-group
and the end-group */
typedef enum Etk_Box_Group
{
ETK_BOX_START,/** The start-group of children: the children in this
group are displayed
@@ -46,14 +47,14 @@
/** @brief Describes how a child of the box expands and fills the space */
typedef enum Etk_Box_Fill_Policy
{
- ETK_BOX_NONE = 1 0, /** The child does not fill or expand */
- ETK_BOX_EXPAND = 1 1, /** The child will fill all the available
space in its cell */
- ETK_BOX_FILL = 1 2, /** The cell containing the child will expand
to take all the available space */
+ ETK_BOX_NONE = 0,/** The child does not fill or expand */
+ ETK_BOX_EXPAND = 1 0, /** The cell containing the child will expand
to take all the available space */
+ ETK_BOX_FILL = 1 1, /** The child will fill all the available
space in its cell */
ETK_BOX_EXPAND_FILL = ETK_BOX_EXPAND | ETK_BOX_FILL, /** Equivalent to
ETK_BOX_EXPAND | ETK_BOX_FILL */
} Etk_Box_Fill_Policy;
/**
- * @brief @widget The structure of a box
+ * @brief @widget An abstract class for a box
* @structinfo
*/
struct
E CVS: apps/e sebastid
Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_entry_dialog.c
Log Message:
Add return value.
Free e objects with e_object_del
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_entry_dialog.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_entry_dialog.c14 Aug 2006 15:22:44 - 1.5
+++ e_entry_dialog.c15 Aug 2006 20:23:26 - 1.6
@@ -29,8 +29,8 @@
dia = e_dialog_new(e_container_current_get(e_manager_current_get()), E,
_entry_dialog);
if (!dia)
{
- E_FREE(ed);
- return;
+ e_object_del(E_OBJECT(ed));
+ return NULL;
}
dia-data = ed;
ed-dia = dia;
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl ningerso
Enlightenment CVS committal Author : ningerso Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_entry.c Log Message: Patch from Andrew Hanson to fix warnings when deleting or backspacing with empty text. === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_entry.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -3 -r1.61 -r1.62 --- ewl_entry.c 3 Jul 2006 00:37:43 - 1.61 +++ ewl_entry.c 15 Aug 2006 20:46:33 - 1.62 @@ -629,7 +629,8 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR(e, e); DCHECK_TYPE(e, e, EWL_ENTRY_TYPE); - + if(!EWL_TEXT(e)-text) + DRETURN(DLEVEL_STABLE); pos1 = ewl_entry_cursor_position_get(EWL_ENTRY_CURSOR(e-cursor)); pos2 = ewl_text_utf_char_position_prev(EWL_TEXT(e)-text, pos1); ewl_entry_cursor_position_set(EWL_ENTRY_CURSOR(e-cursor), pos2); @@ -651,7 +652,8 @@ DENTER_FUNCTION(DLEVEL_STABLE); DCHECK_PARAM_PTR(e, e); DCHECK_TYPE(e, e, EWL_ENTRY_TYPE); - + if(!EWL_TEXT(e)-text) + DRETURN(DLEVEL_STABLE); pos1 = ewl_entry_cursor_position_get(EWL_ENTRY_CURSOR(e-cursor)); pos2 = ewl_text_utf_char_position_next(EWL_TEXT(e)-text, pos1); ewl_text_text_delete(EWL_TEXT(e), pos2 - pos1); - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
Etk.h etk_button.c etk_button.h etk_tool_button.c
etk_toolbar.c etk_toolbar.h
Log Message:
- buttons now have a stock_size property
- buttons now have a style property that can control their appearence (icon,
text, icon + text horiz, or icon + text vert)
- toolbar can change its orientation (horiz or vert)
- toolbar gets a style property that will affect its children's property
(icons, text, both, both vert)
- toolbar will automatically change the orientation of any separators it holds
once its orientation changes
===
RCS file: /cvs/e/e17/proto/etk/src/lib/Etk.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- Etk.h 13 Aug 2006 15:33:17 - 1.36
+++ Etk.h 15 Aug 2006 20:56:19 - 1.37
@@ -26,7 +26,6 @@
#include etk_stock.h
#include etk_bin.h
#include etk_box.h
-#include etk_toolbar.h
#include etk_table.h
#include etk_alignment.h
#include etk_frame.h
@@ -42,6 +41,7 @@
#include etk_toggle_button.h
#include etk_check_button.h
#include etk_radio_button.h
+#include etk_toolbar.h
#include etk_tool_button.h
#include etk_editable_text_object.h
#include etk_textblock.h
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_button.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- etk_button.c15 Aug 2006 15:59:01 - 1.24
+++ etk_button.c15 Aug 2006 20:56:19 - 1.25
@@ -29,7 +29,8 @@
ETK_BUTTON_IMAGE_PROPERTY,
ETK_BUTTON_XALIGN_PROPERTY,
ETK_BUTTON_YALIGN_PROPERTY,
- ETK_BUTTON_TOOL_PROPERTY
+ ETK_BUTTON_STYLE_PROPERTY,
+ ETK_BUTTON_STOCK_SIZE_PROPERTY
};
static void _etk_button_constructor(Etk_Button *button);
@@ -83,8 +84,10 @@
ETK_PROPERTY_FLOAT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_float(0.5));
etk_type_property_add(button_type, yalign, ETK_BUTTON_YALIGN_PROPERTY,
ETK_PROPERTY_FLOAT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_float(0.5));
- etk_type_property_add(button_type, tool, ETK_BUTTON_TOOL_PROPERTY,
- ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_bool(ETK_FALSE));
+ etk_type_property_add(button_type, style, ETK_BUTTON_STYLE_PROPERTY,
+ ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(ETK_BUTTON_BOTH_VERT));
+ etk_type_property_add(button_type, stock_size,
ETK_BUTTON_STOCK_SIZE_PROPERTY,
+ ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(ETK_STOCK_SMALL));
button_type-property_set = _etk_button_property_set;
button_type-property_get = _etk_button_property_get;
@@ -243,10 +246,7 @@
if (!button)
return;
- if (button-tool)
- image = etk_image_new_from_stock(stock_id, ETK_STOCK_MEDIUM);
- else
- image = etk_image_new_from_stock(stock_id, ETK_STOCK_SMALL);
+ image = etk_image_new_from_stock(stock_id, button-stock_size);
etk_widget_show(image);
etk_widget_visibility_locked_set(image, ETK_TRUE);
label = etk_stock_label_get(stock_id);
@@ -308,19 +308,19 @@
}
/**
- * @brief Sets wether the button is a toolbar button or not
+ * @brief Sets the style of the button (icon, text, both vertically, both
horizontally
* @param button a button
- * @param tool ETK_TRUE for a toolbar button, ETK_FALSE otherwise
+ * @param style the style to give the button
*/
-void etk_button_tool_set(Etk_Button *button, Etk_Bool tool)
+void etk_button_style_set(Etk_Button *button, Etk_Button_Style style)
{
if (!button)
return;
- if (button-tool == tool)
+ if (button-style == style)
return;
- button-tool = tool;
+ button-style = style;
if (button-box)
{
if (button-image)
@@ -331,20 +331,62 @@
button-box = NULL;
}
_etk_button_children_create(button);
- etk_object_notify(ETK_OBJECT(button), tool);
+ etk_object_notify(ETK_OBJECT(button), style);
}
/**
- * @brief Gets wether the button is a toolbar button or not
+ * @brief Sets the style of the button (icon, text, both vertically, both
horizontally
* @param button a button
- * @return Returns a boolean indication of its a toolbar button or not
+ * @return Returns the button's style
*/
-Etk_Bool etk_button_tool_get(Etk_Button *button)
+Etk_Button_Style etk_button_style_get(Etk_Button *button)
{
if (!button)
return ETK_FALSE;
- return button-tool;
+ return button-style;
+}
+
+/**
+ * @brief Sets the button's stock size
+ * @param button a button
+ * @param style the stock size
+ */
+void etk_button_stock_size_set(Etk_Button *button, Etk_Stock_Size size)
+{
+ Etk_Stock_Id stock_id;
+ Etk_Stock_Size stock_size;
+
+ if (!button)
+
E CVS: engage handyande
Enlightenment CVS committal Author : handyande Project : misc Module : engage Dir : misc/engage/data/themes/gentoo/images Modified Files: engage-bottomlayer.png Log Message: more power to Hannes :) === RCS file: /cvs/e/misc/engage/data/themes/gentoo/images/engage-bottomlayer.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsaWJycO and /tmp/cvsVbpTky 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: engage handyande
Enlightenment CVS committal Author : handyande Project : misc Module : engage Dir : misc/engage Modified Files: AUTHORS Log Message: more power to Hannes :) === RCS file: /cvs/e/misc/engage/AUTHORS,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- AUTHORS 12 Dec 2005 14:05:15 - 1.4 +++ AUTHORS 15 Aug 2006 21:39:03 - 1.5 @@ -12,3 +12,6 @@ elm: much work on items from TODO list + +Hannes Janetzek: +Composite 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto balony
Enlightenment CVS committal
Author : balony
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit.h exhibit_image.c exhibit_main.c exhibit_menus.c
exhibit_menus.h exhibit_slideshow.c exhibit_tab.c
exhibit_tab.h
Log Message:
Some tab removal code, not working correct yet.
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- exhibit.h 13 Aug 2006 20:04:43 - 1.30
+++ exhibit.h 15 Aug 2006 22:21:47 - 1.31
@@ -154,8 +154,6 @@
Etk_Tree_Col *dcol;
Etk_Tree_Col *icol;
- Exhibit *e;
-
struct {
Etk_Boolvisible;
Etk_Widget *vbox;
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- exhibit_image.c 15 Aug 2006 18:45:51 - 1.33
+++ exhibit_image.c 15 Aug 2006 22:21:47 - 1.34
@@ -770,7 +770,7 @@
}
E_FREE(newpath);
-E_FREE(oldpath);
+ E_FREE(oldpath);
break;
default:
break;
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- exhibit_main.c 15 Aug 2006 18:45:51 - 1.66
+++ exhibit_main.c 15 Aug 2006 22:21:47 - 1.67
@@ -413,10 +413,7 @@
{
D((Number of tabs: %d\n, evas_list_count(e-tabs)));
if(evas_list_count(e-tabs) 1)
- {
- _ex_main_window_tab_remove(e-cur_tab);
_ex_tab_delete(e-cur_tab);
- }
}
else if(!strcmp(ev-key, q))
{
@@ -479,17 +476,12 @@
tab = evas_list_nth(e-tabs,
etk_notebook_current_page_get(ETK_NOTEBOOK(object)));
e-cur_tab = tab;
+ D((Selecting tab %d\n, e-cur_tab-num));
_ex_tab_select(tab);
etk_entry_text_set(ETK_ENTRY(e-entry[0]), e-cur_tab-cur_path);
}
void
-_ex_main_window_tab_remove(Ex_Tab *tab)
-{
- D((_ex_main_window_tab_remove\n));
-}
-
-void
_ex_main_window_tab_append(Exhibit *e, Ex_Tab *tab)
{
if(evas_list_count(e-tabs) == 1)
@@ -685,7 +677,6 @@
submenu = etk_menu_new();
etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(submenu));
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Window),
ETK_STOCK_WINDOW_NEW, ETK_MENU_SHELL(submenu),
ETK_CALLBACK(_ex_menu_new_window_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Tab), ETK_STOCK_TAB_NEW,
ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_menu_new_tab_cb), NULL);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Save image),
ETK_STOCK_DOCUMENT_SAVE, ETK_MENU_SHELL(menu),
ETK_CALLBACK(_ex_menu_save_image_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Save image as),
ETK_STOCK_DOCUMENT_SAVE, ETK_MENU_SHELL(menu),
ETK_CALLBACK(_ex_menu_save_image_as_cb), e);
@@ -700,7 +691,6 @@
submenu = etk_menu_new();
etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(submenu));
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Window),
ETK_STOCK_WINDOW_NEW, ETK_MENU_SHELL(submenu),
ETK_CALLBACK(_ex_menu_close_window_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Tab), ETK_STOCK_TAB_NEW,
ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_menu_delete_tab_cb), NULL);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Quit),
ETK_STOCK_DIALOG_CLOSE, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_quit_cb),
e);
@@ -767,7 +757,6 @@
menu_item = _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Help),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(e-menu_bar), NULL, NULL);
menu = etk_menu_new();
etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu));
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Release notes),
ETK_STOCK_TEXT_X_GENERIC, ETK_MENU_SHELL(menu),
ETK_CALLBACK(_ex_menu_release_notes_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(About),
ETK_STOCK_HELP_BROWSER, ETK_MENU_SHELL(menu), ETK_CALLBACK(_ex_menu_about_cb),
e);
}
@@ -837,7 +826,7 @@
e-cur_tab = tab;
e-tabs = evas_list_append(e-tabs, tab);
_ex_tab_select(tab);
- etk_paned_child2_set(ETK_PANED(tab-e-hpaned), tab-scrolled_view,
ETK_TRUE);
+ etk_paned_child2_set(ETK_PANED(e-hpaned), tab-scrolled_view, ETK_TRUE);
_ex_main_populate_files(e, file);
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_menus.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- exhibit_menus.c 15 Aug 2006 18:45:51 - 1.29
+++ exhibit_menus.c 15 Aug 2006 22:21:47 - 1.30
@@ -88,14
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_bin.c etk_bin.h etk_box.c etk_notebook.c etk_notebook.h
etk_paned.c etk_paned.h
Log Message:
* Notebook, box and paned now correctly emit child_added and
child_removed
* Fix etk_notebook_page_remove() (not tested though)
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_bin.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- etk_bin.c 13 Aug 2006 22:42:23 - 1.13
+++ etk_bin.c 15 Aug 2006 22:26:55 - 1.14
@@ -244,7 +244,6 @@
if (!(bin = ETK_BIN(object)) || !bin-child)
return;
- /* TODO; warnings? */
etk_widget_swallow_widget(ETK_WIDGET(bin), swallow_area, bin-child);
}
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_bin.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_bin.h 13 May 2006 12:04:00 - 1.6
+++ etk_bin.h 15 Aug 2006 22:26:55 - 1.7
@@ -23,7 +23,7 @@
#define ETK_IS_BIN(obj)(ETK_OBJECT_CHECK_TYPE((obj), ETK_BIN_TYPE))
/**
- * @brief @widget The structure of a bin
+ * @brief @widget A container that can contain only one child
* @structinfo
*/
struct Etk_Bin
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_box.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- etk_box.c 15 Aug 2006 20:20:43 - 1.14
+++ etk_box.c 15 Aug 2006 22:26:55 - 1.15
@@ -1,6 +1,8 @@
/** @file etk_box.c */
#include etk_box.h
#include stdlib.h
+#include etk_signal.h
+#include etk_signal_callback.h
#include etk_utils.h
/**
@@ -514,6 +516,8 @@
etk_widget_parent_set_full(widget, NULL, ETK_FALSE);
etk_widget_size_recalc_queue(box_widget);
free(cell);
+
+ etk_signal_emit_by_name(child_removed, ETK_OBJECT(box), NULL, widget);
}
}
@@ -1040,6 +1044,7 @@
}
etk_widget_parent_set(child, ETK_WIDGET(box));
+ etk_signal_emit_by_name(child_added, ETK_OBJECT(box), NULL, child);
}
/* Gets the cell of the box containing the widget */
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_notebook.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- etk_notebook.c 8 Aug 2006 18:51:22 - 1.27
+++ etk_notebook.c 15 Aug 2006 22:26:55 - 1.28
@@ -2,10 +2,10 @@
#include etk_notebook.h
#include stdlib.h
#include string.h
-#include etk_utils.h
+#include etk_radio_button.h
#include etk_signal.h
#include etk_signal_callback.h
-#include etk_radio_button.h
+#include etk_utils.h
/**
* @addtogroup Etk_Notebook
@@ -35,6 +35,8 @@
static void _etk_notebook_child_remove(Etk_Container *container, Etk_Widget
*widget);
static Evas_List *_etk_notebook_children_get(Etk_Container *container);
+static void _etk_notebook_frame_child_added_cb(Etk_Object *object, Etk_Widget
*child, void *data);
+static void _etk_notebook_frame_child_removed_cb(Etk_Object *object,
Etk_Widget *child, void *data);
static void _etk_notebook_tab_toggled_cb(Etk_Object *object, void *data);
static void _etk_notebook_tab_bar_focused_cb(Etk_Object *object, void *data);
static void _etk_notebook_tab_bar_unfocused_cb(Etk_Object *object, void *data);
@@ -129,7 +131,7 @@
}
/**
- * @brief Creates a new page and inserts it to the notebook at the given
position
+ * @brief Creates a new page and inserts it to the notebook at a given position
* @param notebook a notebook
* @param tab_label the text to set to the tab's label
* @param page_child the child of the new page. This widget will be shown when
the page is set as the current one
@@ -162,29 +164,40 @@
* @brief Removes from the notebook the page corresponding to the index
* @param notebook a notebook
* @param page_num the index of the page to remove
+ * @warning The widget of the child of the page will be automatically
destroyed too.
+ * To avoid this, call etk_notebook_page_child_set(notebook, page_num, NULL);
before
*/
void etk_notebook_page_remove(Etk_Notebook *notebook, int page_num)
{
Evas_List *l;
- Etk_Notebook_Page *page;
+ Etk_Notebook_Page *page, *new_current = NULL;
if (!notebook || !(l = evas_list_nth_list(notebook-pages, page_num)))
return;
-
+
page = l-data;
- etk_widget_parent_set(page-frame, NULL);
etk_object_destroy(ETK_OBJECT(page-frame));
- etk_widget_parent_set(page-tab, NULL);
etk_object_destroy(ETK_OBJECT(page-tab));
- free(page);
+
+ if (notebook-current_page == page)
+ {
+ if (l-next)
+ new_current = l-next-data;
+ else if (l-prev)
+ new_current = l-prev-data;
+ }
+
notebook-pages =
E CVS: proto lok
Enlightenment CVS committal
Author : lok
Project : e17
Module : proto
Dir : e17/proto/ruby-efl/src/etk
Modified Files:
config.rb
Log Message:
Little change on the autoconnect.
Renamed class FileChooser in FilechooserWidget.
===
RCS file: /cvs/e/e17/proto/ruby-efl/src/etk/config.rb,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- config.rb 11 Aug 2006 11:47:07 - 1.1
+++ config.rb 15 Aug 2006 23:02:15 - 1.2
@@ -66,7 +66,7 @@
{ :name = 'Table', :child_of = 'Container' } ,
{ :name = 'Entry', :child_of = 'Widget' } ,
-{ :name = 'FileChooser', :child_of = 'Widget' } ,
+{ :name = 'FilechooserWidget', :wraps =
'filechooser_widget', :child_of = 'Widget' } ,
{ :name = 'IconBox', :child_of = 'Widget' } ,
{ :name = 'Image', :child_of = 'Widget' } ,
{ :name = 'Label', :child_of = 'Widget' } ,
@@ -102,4 +102,4 @@
:ignore = [
'etk_object_new_valist'
]
-}
\ No newline at end of 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=lnkkid=120709bid=263057dat=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/ruby-efl/src/enhance/examples Modified Files: test.rb Log Message: Little change on the autoconnect. Renamed class FileChooser in FilechooserWidget. === RCS file: /cvs/e/e17/proto/ruby-efl/src/enhance/examples/test.rb,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- test.rb 14 Aug 2006 20:33:19 - 1.2 +++ test.rb 15 Aug 2006 23:02:15 - 1.3 @@ -38,6 +38,7 @@ end def on_window1_delete_event(target, data) EtkBase.main_quit + puts(coin) end end h = Event_Handlers.new(en) @@ -48,8 +49,8 @@ win.show EtkBase.main -EtkBase.shutdown -en.free +#en.free EnhanceBase.shutdown +EtkBase.shutdown - 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=lnkkid=120709bid=263057dat=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/lib
Modified Files:
evfs_commands.c
Log Message:
* Fix the mass copy function. No guarantees as to if this works completely -
we need unit tests here
===
RCS file: /cvs/e/e17/apps/evfs/src/lib/evfs_commands.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- evfs_commands.c 6 Aug 2006 09:56:27 - 1.33
+++ evfs_commands.c 15 Aug 2006 23:32:53 - 1.34
@@ -202,6 +202,47 @@
}
+/*FIXME: This is dup'ed code from ^^ . Rationalise this*/
+long
+evfs_client_file_move_multi(evfs_connection * conn, Ecore_List* files,
+ evfs_filereference* to)
+{
+ evfs_command *command = evfs_client_command_new();
+ long id = command-client_identifier;
+ long count = 0;
+ long cfile = 0;
+ evfs_filereference* ref;
+ char* str;
+
+ count = ecore_list_nodes(files);
+
+ command-type = EVFS_CMD_FILE_MOVE;
+ command-file_command.num_files = count+1;
+ command-file_command.files = malloc(sizeof(evfs_filereference *) *
(count+1));
+
+ printf(Sending %d files for multi move...\n, count+1);
+ ecore_list_goto_first(files);
+ while ((ref = ecore_list_next(files))) {
+ command-file_command.files[cfile] = ref;
+ cfile++;
+
+ str = evfs_filereference_to_string(ref);
+ printf(Added %s to multi move\n, str);
+ free(str);
+ }
+ command-file_command.files[cfile] = to;
+
+ evfs_write_command(conn, command);
+
+ free(command-file_command.files);
+ free(command);
+
+ return id;
+
+}
+
+
+
long
evfs_client_file_open(evfs_connection * conn, evfs_filereference * 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=lnkkid=120709bid=263057dat=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:
* Fix the mass copy function. No guarantees as to if this works completely -
we need unit tests here
===
RCS file: /cvs/e/e17/apps/evfs/src/bin/evfs_server_handle.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- evfs_server_handle.c15 Aug 2006 12:04:32 - 1.67
+++ evfs_server_handle.c15 Aug 2006 23:32:53 - 1.68
@@ -502,9 +502,31 @@
} else {
Ecore_List *directory_list = NULL;
+int newlen;
+int origlen;
+char* pos;
+
+evfs_filereference* newdir_rewrite;
+
+newdir_rewrite =
evfs_filereference_clone(command-file_command.files[num_files-1]);
+if (command == root_command S_ISDIR(dest_stat.st_mode))
{
+origlen = strlen(newdir_rewrite-path);
+printf(Origlen is: %d (%s)\n, origlen,
newdir_rewrite-path);
+pos =
strrchr(command-file_command.files[c_file]-path, '/');
+printf(String after pos: '%s'\n, pos+1);
+newlen =
strlen(newdir_rewrite-path)+1+strlen(pos+1)+1;
+printf(Newlen is: %d\n, newlen);
+newdir_rewrite-path =
realloc(newdir_rewrite-path, newlen);
+newdir_rewrite-path[origlen] = '/';
+strncat(newdir_rewrite-path[origlen+1], pos+1,
strlen(pos)-1);
+}
+
+
+printf(Done: '%s %s'\n, newdir_rewrite-plugin_uri,
newdir_rewrite-path);
+
+
- evfs_operation_mkdir_task_add(EVFS_OPERATION(op),
-
evfs_filereference_clone(command-file_command.files[num_files-1]));
+evfs_operation_mkdir_task_add(EVFS_OPERATION(op),
newdir_rewrite);
/*First, we need a directory list... */
(*EVFS_PLUGIN_FILE(plugin)-functions-evfs_dir_list)
(client, command,
@@ -518,23 +540,23 @@
evfs_command *recursive_command =
NEW(evfs_command);
snprintf(destination_file, PATH_MAX, %s%s,
-
command-file_command.files[num_files-1]-path,
+ newdir_rewrite-path,
strrchr(file-path, '/'));
source-path = strdup(file-path);
source-plugin_uri =
strdup(command-file_command.files[c_file]-plugin_uri);
source-parent = NULL; /*TODO - handle nested
uris */
+
dest-path = strdup(destination_file);
- dest-plugin_uri =
-
strdup(command-file_command.files[num_files-1]-plugin_uri);
+ dest-plugin_uri =
strdup(newdir_rewrite-plugin_uri);
dest-parent = NULL; /*TODO - handle nested
uris */
recursive_command-file_command.files =
malloc(sizeof(evfs_filereference *) * 2);
recursive_command-type = EVFS_CMD_FILE_COPY;
- recursive_command-file_command.files[c_file] =
source;
-
recursive_command-file_command.files[num_files-1] = dest;
+ recursive_command-file_command.files[0] =
source;
+ recursive_command-file_command.files[1] = dest;
recursive_command-file_command.num_files = 2;
//printf(Copy file '%s' to %s\n, file-path,
destination_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=lnkkid=120709bid=263057dat=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/include Modified Files: evfs_commands.h Log Message: * Fix the mass copy function. No guarantees as to if this works completely - we need unit tests here === RCS file: /cvs/e/e17/apps/evfs/src/include/evfs_commands.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- evfs_commands.h 6 Aug 2006 09:56:27 - 1.19 +++ evfs_commands.h 15 Aug 2006 23:32:53 - 1.20 @@ -13,6 +13,9 @@ evfs_filereference * to); long evfs_client_file_copy_multi(evfs_connection * conn, Ecore_List* files, evfs_filereference* to); +long +evfs_client_file_move_multi(evfs_connection * conn, Ecore_List* files, + evfs_filereference* to); long evfs_client_file_move(evfs_connection * conn, evfs_filereference * from, evfs_filereference * to); long evfs_client_file_read(evfs_connection * conn, evfs_filereference * 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=lnkkid=120709bid=263057dat=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/edje_viewer/src/bin Modified Files: etk_gui.c Log Message: Fix edje_viewer === RCS file: /cvs/e/e17/proto/edje_viewer/src/bin/etk_gui.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- etk_gui.c 8 Jul 2006 23:32:00 - 1.10 +++ etk_gui.c 16 Aug 2006 00:27:31 - 1.11 @@ -55,8 +55,8 @@ etk_container_add(ETK_CONTAINER(gui-win), vbox); menubar = etk_menu_bar_new(); - etk_box_pack_start(ETK_BOX(vbox), menubar, - ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(vbox), menubar, + ETK_BOX_START, ETK_BOX_NONE, 0); menuitem = _gui_menubar_item_new(gui, _(File), ETK_MENU_SHELL(menubar)); menu = etk_menu_new(); @@ -104,7 +104,7 @@ paned = etk_hpaned_new(); vpaned = etk_vpaned_new(); - etk_box_pack_start(ETK_BOX(vbox), vpaned, ETK_TRUE, ETK_TRUE, 0); + etk_box_append(ETK_BOX(vbox), vpaned, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); etk_paned_child1_set(ETK_PANED(vpaned), paned, ETK_TRUE); gui-tree = etk_tree_new(); @@ -138,30 +138,30 @@ etk_paned_child2_set(ETK_PANED(vpaned), gui-output, ETK_FALSE); hbox = etk_hbox_new(ETK_FALSE, 0); - etk_box_pack_start(ETK_BOX(vbox), hbox, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_NONE, 0); signal_label = etk_label_new(Signal: ); - etk_box_pack_start(ETK_BOX(hbox), signal_label, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(hbox), signal_label, ETK_BOX_START, ETK_BOX_NONE, 0); signal_entry = etk_entry_new(); - etk_box_pack_start(ETK_BOX(hbox), signal_entry, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(hbox), signal_entry, ETK_BOX_START, ETK_BOX_NONE, 0); gui-signal_entry = signal_entry; source_label = etk_label_new(Source: ); - etk_box_pack_start(ETK_BOX(hbox), source_label, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(hbox), source_label, ETK_BOX_START, ETK_BOX_NONE, 0); source_entry = etk_entry_new(); - etk_box_pack_start(ETK_BOX(hbox), source_entry, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(hbox), source_entry, ETK_BOX_START, ETK_BOX_NONE, 0); gui-source_entry = source_entry; send_button = etk_button_new_with_label(Send); etk_button_alignment_set(ETK_BUTTON(send_button), 1.0, 0.5); - etk_box_pack_end(ETK_BOX(hbox), send_button, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(hbox), send_button, ETK_BOX_END, ETK_BOX_NONE, 0); etk_signal_connect(clicked, ETK_OBJECT(send_button), ETK_CALLBACK(_gui_send_clicked_cb), gui); gui-status = etk_statusbar_new(); - etk_box_pack_end(ETK_BOX(vbox), gui-status, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(vbox), gui-status, ETK_BOX_END, ETK_BOX_NONE, 0); bg_setup(ETK_CANVAS(gui-canvas)); etk_widget_show_all(gui-win); - 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=lnkkid=120709bid=263057dat=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/empower/src/bin/etk
Modified Files:
empower_cb_etk.c empower_gui_etk.c
Log Message:
Fix empower_etk
===
RCS file: /cvs/e/e17/proto/empower/src/bin/etk/empower_cb_etk.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- empower_cb_etk.c5 Apr 2006 17:27:22 - 1.3
+++ empower_cb_etk.c16 Aug 2006 00:37:12 - 1.4
@@ -38,7 +38,7 @@
{
etk_window_center_on_window(ETK_WINDOW(object), NULL);
etk_widget_focus(em-entry);
- etk_window_focus(ETK_WINDOW(object));
+ etk_window_focused_set(ETK_WINDOW(object), ETK_TRUE);
_em_centered = ETK_TRUE;
}
}
===
RCS file: /cvs/e/e17/proto/empower/src/bin/etk/empower_gui_etk.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- empower_gui_etk.c 2 Aug 2006 05:53:59 - 1.5
+++ empower_gui_etk.c 16 Aug 2006 00:37:12 - 1.6
@@ -24,9 +24,9 @@
etk_entry_password_set(ETK_ENTRY(em-entry), ETK_TRUE);
etk_dialog_pack_in_main_area(ETK_DIALOG(em-dialog), em-hbox, ETK_FALSE,
ETK_FALSE, 4, ETK_FALSE);
- etk_box_pack_start(ETK_BOX(em-hbox), em-icon, ETK_FALSE, ETK_FALSE, 3);
- etk_box_pack_start(ETK_BOX(em-hbox), em-label, ETK_FALSE, ETK_FALSE, 2);
- etk_box_pack_start(ETK_BOX(em-hbox), em-entry, ETK_FALSE, ETK_FALSE, 2);
+ etk_box_append(ETK_BOX(em-hbox), em-icon, ETK_BOX_START, ETK_BOX_NONE, 3);
+ etk_box_append(ETK_BOX(em-hbox), em-label, ETK_BOX_START, ETK_BOX_NONE,
2);
+ etk_box_append(ETK_BOX(em-hbox), em-entry, ETK_BOX_START, ETK_BOX_NONE,
2);
button_cancel = etk_dialog_button_add_from_stock(ETK_DIALOG(em-dialog),
ETK_STOCK_DIALOG_CANCEL, 0);
button_ok = etk_dialog_button_add_from_stock(ETK_DIALOG(em-dialog),
ETK_STOCK_DIALOG_OK, 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=lnkkid=120709bid=263057dat=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/exorcist/src/bin Modified Files: etk_main_window.c Log Message: Fix exorcist === RCS file: /cvs/e/e17/proto/exorcist/src/bin/etk_main_window.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- etk_main_window.c 14 May 2006 15:29:52 - 1.5 +++ etk_main_window.c 16 Aug 2006 00:45:53 - 1.6 @@ -410,11 +410,11 @@ etk_widget_show (vbox); menu_bar = _exo_etk_menu_bar (data); - etk_box_pack_start (ETK_BOX (vbox), menu_bar, ETK_FALSE, ETK_FALSE, 0); + etk_box_append (ETK_BOX (vbox), menu_bar, ETK_BOX_START, ETK_BOX_NONE, 0); etk_widget_show (menu_bar); hbox = etk_hbox_new (ETK_FALSE, 0); - etk_box_pack_start (ETK_BOX (vbox), hbox, ETK_TRUE, ETK_TRUE, 0); + etk_box_append (ETK_BOX (vbox), hbox, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); etk_widget_show (hbox); etk_tree_headers_visible_set (ETK_TREE (data-list_pages), ETK_FALSE); @@ -426,13 +426,13 @@ etk_tree_model_int_new (ETK_TREE (data-list_pages)), 60); etk_tree_build (ETK_TREE (data-list_pages)); - etk_box_pack_start (ETK_BOX (hbox), data-list_pages, ETK_FALSE, ETK_TRUE, 0); + etk_box_append (ETK_BOX (hbox), data-list_pages, ETK_BOX_START, ETK_BOX_FILL, 0); etk_widget_show (data-list_pages); popup = _exo_etk_menu_options (data); scrollview = etk_scrolled_view_new (); - etk_box_pack_start (ETK_BOX (hbox), scrollview, ETK_TRUE, ETK_TRUE, 0); + etk_box_append (ETK_BOX (hbox), scrollview, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); etk_widget_show (scrollview); etk_scrolled_view_add_with_viewport (ETK_SCROLLED_VIEW (scrollview), data-pdf); - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/dialogs Modified Files: etk_directory_add_dialog.c Log Message: * New etk api === RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_directory_add_dialog.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- etk_directory_add_dialog.c 11 Mar 2006 07:11:34 - 1.1 +++ etk_directory_add_dialog.c 16 Aug 2006 00:51:41 - 1.2 @@ -53,25 +53,25 @@ etk_container_add(ETK_CONTAINER(dialog-window), vbox); hbox = etk_hbox_new(ETK_FALSE,0); - etk_box_pack_start(ETK_BOX(vbox), hbox, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_NONE, 0); label = etk_label_new(Directory Name); - etk_box_pack_start(ETK_BOX(hbox), label, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0); dialog-entry = etk_entry_new(); - etk_box_pack_start(ETK_BOX(hbox), dialog-entry, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(hbox), dialog-entry, ETK_BOX_START, ETK_BOX_NONE, 0); hbox = etk_hbox_new(ETK_FALSE,0); - etk_box_pack_start(ETK_BOX(vbox), hbox, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_NONE, 0); button = etk_button_new_with_label(Create); - etk_box_pack_start(ETK_BOX(hbox), button, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_NONE, 0); etk_signal_connect(pressed, ETK_OBJECT(button), ETK_CALLBACK(etk_directory_add_dialog_create_cb), dialog); button = etk_button_new_with_label(Cancel); - etk_box_pack_start(ETK_BOX(hbox), button, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_NONE, 0); etk_signal_connect(pressed, ETK_OBJECT(button), ETK_CALLBACK(etk_directory_add_dialog_cancel_cb), dialog); - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto essiene
Enlightenment CVS committal
Author : essiene
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui/src/gui
Modified Files:
Egui.h background.c egui_graphics_selector.c theme.c
Log Message:
- Add pointer options dialog to egui_graphics_selector. It only shows for the
theme dialog. Not working yet as file selector is not ready yet.
- TODO--
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/Egui.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Egui.h 13 Aug 2006 23:11:47 - 1.4
+++ Egui.h 16 Aug 2006 01:05:52 - 1.5
@@ -10,6 +10,7 @@
char *entrance_edit_key;
int use_full_path;
+ int show_pointer_options;
} Egui_Graphics_Selector;
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/background.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- background.c13 Aug 2006 23:11:47 - 1.7
+++ background.c16 Aug 2006 01:05:52 - 1.8
@@ -16,7 +16,8 @@
Entrance Configuration - Background,
Backgrounds,
ENTRANCE_EDIT_KEY_CLIENT_BACKGROUND_STR,
- 1
+ 1,
+ 0
};
egui_gs_dialog_show(background_egs);
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/egui_graphics_selector.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- egui_graphics_selector.c15 Aug 2006 03:50:04 - 1.8
+++ egui_graphics_selector.c16 Aug 2006 01:05:52 - 1.9
@@ -19,12 +19,15 @@
static Entrance_Dialog win;
static Entrance_Widget img_preview;
+static Entrance_Widget pointer_preview;
static Entrance_List list_thumbs;
static Entrance_Entry browse_entry;
static Entrance_Widget browse_button;
+static Entrance_Widget pointer_browse_button;
static Entrance_Widget group_graphics;
static Entrance_Widget group_preview;
static Entrance_Widget group_options;
+static Entrance_Widget group_pointer;
static Egui_Graphics_Selector egs;
@@ -59,6 +62,17 @@
browse_button = ew_button_new(_(Browse...), _gs_cb_browse, NULL);
ew_group_add(group_options, browse_button);
+
+ if(egs.show_pointer_options)
+ {
+ group_pointer = ew_dialog_group_add(win, _(Pointer Options),
EW_GROUP_HORIZONTAL);
+
+ pointer_preview = ew_image_new(100, 50);
+ ew_group_add(group_pointer, pointer_preview);
+
+ pointer_browse_button = ew_button_new(_(Browse...), _gs_cb_browse,
NULL);
+ ew_group_add(group_pointer, pointer_browse_button);
+ }
ew_dialog_close_button_add(win, _gs_cb_close, NULL);
ew_dialog_apply_button_add(win, _gs_cb_apply, NULL);
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/theme.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- theme.c 13 Aug 2006 23:11:47 - 1.8
+++ theme.c 16 Aug 2006 01:05:52 - 1.9
@@ -16,7 +16,8 @@
Entrance Configuration - Themes,
Themes,
ENTRANCE_EDIT_KEY_CLIENT_THEME_STR,
- 0
+ 0,
+ 1
};
egui_gs_dialog_show(theme_egs);
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto essiene
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui Modified Files: TODO Log Message: - Add pointer options dialog to egui_graphics_selector. It only shows for the theme dialog. Not working yet as file selector is not ready yet. - TODO-- === RCS file: /cvs/e/e17/proto/entrance_edit_gui/TODO,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- TODO15 Aug 2006 14:29:08 - 1.9 +++ TODO16 Aug 2006 01:05:52 - 1.10 @@ -10,7 +10,7 @@ - Fix up Fileselector widget. This may probably need to refactor out the buttons used by ew_notice as ew_reponse_buttons ? - use ecore_lists to hold buttons and other *low life* widgets used on composite widgets. - There is a bug in ew_entry. I've not been albe to programmatically add text to the widget and display it. -- We can add a group in egui_graphics_selector.c that only shows up when for the 'Theme' dialog. +- AT some point, we'll need to use tables to layout stuff. Free flowing with parralel hboxes just pains the eyes GUI - 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=lnkkid=120709bid=263057dat=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 Removed Files: e_gadget.c e_gadget.h Log Message: Nuke old unused gadget code. === RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v retrieving revision 1.137 retrieving revision 1.138 diff -u -3 -r1.137 -r1.138 --- Makefile.am 15 Aug 2006 00:54:32 - 1.137 +++ Makefile.am 16 Aug 2006 01:09:34 - 1.138 @@ -55,7 +55,6 @@ e_startup.h \ e_hints.h \ e_gadman.h \ -e_gadget.h \ e_signals.h \ e_xinerama.h \ e_table.h \ @@ -173,7 +172,8 @@ 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 enlightenment_src = \ e_user.c \ @@ -204,7 +204,6 @@ e_startup.c \ e_hints.c \ e_gadman.c \ -e_gadget.c \ e_signals.c \ e_xinerama.c \ e_table.c \ @@ -323,6 +322,7 @@ e_widget_color_well.c \ e_int_config_wallpaper.c \ e_int_config_wallpaper_import.c \ +e_int_config_wallpaper_gradient.c \ $(ENLIGHTENMENTHEADERS) enlightenment_SOURCES = \ === RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v retrieving revision 1.116 retrieving revision 1.117 diff -u -3 -r1.116 -r1.117 --- e_includes.h15 Aug 2006 00:54:32 - 1.116 +++ e_includes.h16 Aug 2006 01:09:34 - 1.117 @@ -32,7 +32,6 @@ #include e_startup.h #include e_hints.h #include e_gadman.h -#include e_gadget.h #include e_signals.h #include e_xinerama.h #include e_table.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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/plugins Modified Files: etk_icon_viewer.c etk_list_viewer.c etk_trackback.c layout_etk_simple.c Log Message: * ETK box api updates === RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_icon_viewer.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- etk_icon_viewer.c 4 Jun 2006 13:09:38 - 1.12 +++ etk_icon_viewer.c 16 Aug 2006 01:20:53 - 1.13 @@ -358,11 +358,11 @@ } etk_image_keep_aspect_set(ETK_IMAGE(image), ETK_TRUE); etk_widget_size_request_set(image, 48, 48); -etk_box_pack_start(ETK_BOX(vbox), image, ETK_FALSE, ETK_FALSE, 0); +etk_box_append(ETK_BOX(vbox), image, ETK_BOX_START, ETK_BOX_NONE, 0); - etk_box_pack_start(ETK_BOX(vbox), label, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(vbox), label, ETK_BOX_START, ETK_BOX_NONE, 0); etk_table_attach(ETK_TABLE(table), vbox, l, r, t, b, 3, 3, - ETK_FILL_POLICY_NONE); + ETK_TABLE_NONE); ++l; ++r; added_object++; @@ -422,12 +422,12 @@ /*Make the slider*/ viewer-slider = etk_hslider_new(10,128, 48, 1, 1); - etk_box_pack_start(ETK_BOX(viewer-vbox), viewer-slider, ETK_FALSE, ETK_FALSE,0); + etk_box_append(ETK_BOX(viewer-vbox), viewer-slider, ETK_BOX_START, ETK_BOX_NONE, 0); etk_signal_connect(value_changed, ETK_OBJECT(viewer-slider), ETK_CALLBACK(_entropy_etk_icon_viewer_slider_cb), instance); viewer-iconbox = etk_iconbox_new(); - etk_box_pack_start(ETK_BOX(viewer-vbox), viewer-iconbox, ETK_TRUE,ETK_TRUE,0); + etk_box_append(ETK_BOX(viewer-vbox), viewer-iconbox, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); === RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v retrieving revision 1.68 retrieving revision 1.69 diff -u -3 -r1.68 -r1.69 --- etk_list_viewer.c 18 Jul 2006 14:09:52 - 1.68 +++ etk_list_viewer.c 16 Aug 2006 01:20:53 - 1.69 @@ -285,13 +285,13 @@ } etk_image_keep_aspect_set(ETK_IMAGE(image), ETK_TRUE); etk_widget_size_request_set(image, 48, 48); -etk_box_pack_start(ETK_BOX(vbox), image, ETK_FALSE, ETK_FALSE, 0); +etk_box_append(ETK_BOX(vbox), image, ETK_BOX_START, ETK_BOX_NONE, 0); - etk_box_pack_start(ETK_BOX(vbox), label, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(vbox), label, ETK_BOX_START, ETK_BOX_NONE, 0); etk_table_attach(ETK_TABLE(table), vbox, l, r, t, b, 3, 3, - ETK_FILL_POLICY_NONE); + ETK_TABLE_NONE); ++l; ++r; added_object++; === RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_trackback.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- etk_trackback.c 24 Apr 2006 14:28:26 - 1.3 +++ etk_trackback.c 16 Aug 2006 01:20:53 - 1.4 @@ -195,7 +195,7 @@ etk_object_data_set(ETK_OBJECT(combo), COMP, comp); etk_widget_show_all(combo); - etk_box_pack_start(ETK_BOX(trackback-hbox), combo, ETK_FALSE,ETK_FALSE,0); + etk_box_append(ETK_BOX(trackback-hbox), combo, ETK_BOX_START, ETK_BOX_NONE, 0); ecore_list_prepend(trackback-levels, combo); @@ -226,8 +226,8 @@ etk_signal_connect(pressed, ETK_OBJECT(button), ETK_CALLBACK(_entropy_etk_trackback_up_cb), instance); trackback-label = etk_label_new(); - etk_box_pack_start(ETK_BOX(trackback-hbox), button, ETK_FALSE,ETK_FALSE,0); - etk_box_pack_start(ETK_BOX(trackback-hbox), trackback-label, ETK_FALSE,ETK_FALSE,0); + etk_box_append(ETK_BOX(trackback-hbox), button, ETK_BOX_START, ETK_BOX_NONE, 0); + etk_box_append(ETK_BOX(trackback-hbox), trackback-label, ETK_BOX_START, ETK_BOX_NONE, 0); instance-gui_object = trackback-hbox; === RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -3 -r1.54 -r1.55 --- layout_etk_simple.c 6 Aug 2006 05:33:50 - 1.54 +++ layout_etk_simple.c 16 Aug 2006 01:20:53 - 1.55 @@ -336,7 +336,7 @@
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/dialogs Modified Files: etk_location_add_dialog.c etk_mime_dialog_main.c etk_properties_dialog.c Log Message: * ETK box api updates === RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_location_add_dialog.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- etk_location_add_dialog.c 15 Jul 2006 12:50:55 - 1.11 +++ etk_location_add_dialog.c 16 Aug 2006 01:20:53 - 1.12 @@ -230,56 +230,56 @@ label = etk_label_new(Location Name); etk_table_attach(ETK_TABLE(dialog-vbox2), label,0,0,0,0, 0,0, - ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VFILL | ETK_FILL_POLICY_HEXPAND); + ETK_TABLE_HFILL | ETK_TABLE_VFILL | ETK_TABLE_HEXPAND); dialog-name_entry = etk_entry_new(); etk_entry_text_set(ETK_ENTRY(dialog-name_entry), _(New Location)); etk_table_attach(ETK_TABLE(dialog-vbox2), dialog-name_entry,1,1,0,0, 0,0, - ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VFILL | ETK_FILL_POLICY_HEXPAND); + ETK_TABLE_HFILL | ETK_TABLE_VFILL | ETK_TABLE_HEXPAND); label = etk_label_new(Path); etk_table_attach(ETK_TABLE(dialog-vbox2), label,0,0,1,1, 0,0, - ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VFILL | ETK_FILL_POLICY_HEXPAND); + ETK_TABLE_HFILL | ETK_TABLE_VFILL | ETK_TABLE_HEXPAND); dialog-path_entry = etk_entry_new(); etk_table_attach(ETK_TABLE(dialog-vbox2), dialog-path_entry,1,1,1,1, 0,0, - ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VFILL | ETK_FILL_POLICY_HEXPAND); + ETK_TABLE_HFILL | ETK_TABLE_VFILL | ETK_TABLE_HEXPAND); /*Optional Elements*/ dialog-host_widget_label = etk_label_new(Host); etk_table_attach(ETK_TABLE(dialog-vbox2), dialog-host_widget_label,0,0,2,2, 0,0, - ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VFILL | ETK_FILL_POLICY_HEXPAND); + ETK_TABLE_HFILL | ETK_TABLE_VFILL | ETK_TABLE_HEXPAND); dialog-host_widget_entry = etk_entry_new(); etk_table_attach(ETK_TABLE(dialog-vbox2), dialog-host_widget_entry,1,1,2,2, 0,0, - ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VFILL | ETK_FILL_POLICY_HEXPAND); + ETK_TABLE_HFILL | ETK_TABLE_VFILL | ETK_TABLE_HEXPAND); dialog-username_widget_label = etk_label_new(Username); etk_table_attach(ETK_TABLE(dialog-vbox2), dialog-username_widget_label,0,0,3,3, 0,0, - ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VFILL | ETK_FILL_POLICY_HEXPAND); + ETK_TABLE_HFILL | ETK_TABLE_VFILL | ETK_TABLE_HEXPAND); dialog-username_widget_entry = etk_entry_new(); etk_table_attach(ETK_TABLE(dialog-vbox2), dialog-username_widget_entry,1,1,3,3, 0,0, - ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VFILL | ETK_FILL_POLICY_HEXPAND); + ETK_TABLE_HFILL | ETK_TABLE_VFILL | ETK_TABLE_HEXPAND); dialog-password_widget_label = etk_label_new(Password); etk_table_attach(ETK_TABLE(dialog-vbox2), dialog-password_widget_label,0,0,4,4, 0,0, - ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VFILL | ETK_FILL_POLICY_HEXPAND); + ETK_TABLE_HFILL | ETK_TABLE_VFILL | ETK_TABLE_HEXPAND); dialog-password_widget_entry = etk_entry_new(); etk_table_attach(ETK_TABLE(dialog-vbox2), dialog-password_widget_entry,1,1,4,4, 0,0, - ETK_FILL_POLICY_HFILL | ETK_FILL_POLICY_VFILL | ETK_FILL_POLICY_HEXPAND); + ETK_TABLE_HFILL | ETK_TABLE_VFILL | ETK_TABLE_HEXPAND); @@ -287,7 +287,7 @@ hbox = etk_hbox_new(ETK_FALSE,0); dialog_button = etk_button_new_with_label(Back); - etk_box_pack_start(ETK_BOX(hbox), dialog_button, ETK_FALSE, ETK_FALSE, 5); + etk_box_append(ETK_BOX(hbox), dialog_button, ETK_BOX_START, ETK_BOX_NONE, 5); dialog_button = etk_button_new_with_label(Next ); === RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_mime_dialog_main.c,v retrieving revision 1.11 retrieving revision
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/dialogs Modified Files: etk_file_cache_debug_dialog.c etk_file_rename_dialog.c etk_interaction_dialog.c etk_mime_dialog_main.c etk_progress_dialog.c etk_properties_dialog.c Log Message: * More etk box api changes === RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_file_cache_debug_dialog.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- etk_file_cache_debug_dialog.c 13 Mar 2006 00:40:22 - 1.4 +++ etk_file_cache_debug_dialog.c 16 Aug 2006 01:50:20 - 1.5 @@ -97,7 +97,7 @@ tree = etk_tree_new(); - etk_box_pack_start(ETK_BOX(vbox), tree, ETK_TRUE, ETK_TRUE, 0); + etk_box_append(ETK_BOX(vbox), tree, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); etk_tree_mode_set(ETK_TREE(tree), ETK_TREE_MODE_LIST); tree_col = etk_tree_col_new(ETK_TREE(tree), _(Listeners), @@ -118,7 +118,7 @@ etk_signal_connect(pressed, ETK_OBJECT(button), ETK_CALLBACK(_etk_file_cache_dialog_refresh_cb), tree); - etk_box_pack_end(ETK_BOX(vbox), button, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(vbox), button, ETK_BOX_END, ETK_BOX_NONE, 0); etk_signal_connect (delete_event, ETK_OBJECT (window), === RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_file_rename_dialog.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- etk_file_rename_dialog.c18 Apr 2006 12:19:55 - 1.1 +++ etk_file_rename_dialog.c16 Aug 2006 01:50:20 - 1.2 @@ -51,25 +51,25 @@ etk_container_add(ETK_CONTAINER(dialog-window), vbox); hbox = etk_hbox_new(ETK_FALSE,0); - etk_box_pack_start(ETK_BOX(vbox), hbox, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_NONE, 0); label = etk_label_new(New Filename); - etk_box_pack_start(ETK_BOX(hbox), label, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0); dialog-entry = etk_entry_new(); - etk_box_pack_start(ETK_BOX(hbox), dialog-entry, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(hbox), dialog-entry, ETK_BOX_START, ETK_BOX_NONE, 0); hbox = etk_hbox_new(ETK_FALSE,0); - etk_box_pack_start(ETK_BOX(vbox), hbox, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_NONE, 0); button = etk_button_new_with_label(Rename); - etk_box_pack_start(ETK_BOX(hbox), button, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_NONE, 0); etk_signal_connect(pressed, ETK_OBJECT(button), ETK_CALLBACK(etk_file_rename_dialog_create_cb), dialog); button = etk_button_new_with_label(Cancel); - etk_box_pack_start(ETK_BOX(hbox), button, ETK_FALSE, ETK_FALSE, 0); + etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_NONE, 0); etk_signal_connect(pressed, ETK_OBJECT(button), ETK_CALLBACK(etk_file_rename_dialog_cancel_cb), dialog); etk_widget_show_all(dialog-window); === RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_interaction_dialog.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- etk_interaction_dialog.c3 Apr 2006 10:11:11 - 1.7 +++ etk_interaction_dialog.c16 Aug 2006 01:50:20 - 1.8 @@ -34,8 +34,8 @@ etk_container_add(ETK_CONTAINER(window), vbox); label = etk_label_new(buf); - etk_box_pack_start(ETK_BOX(vbox), label, ETK_TRUE, ETK_TRUE, 5); - etk_box_pack_start(ETK_BOX(vbox), hbox, ETK_FALSE, ETK_FALSE, 5); + etk_box_append(ETK_BOX(vbox), label, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 5); + etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 5); button = etk_button_new_with_label(Yes); etk_container_add(ETK_CONTAINER(hbox), button); === RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_mime_dialog_main.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- etk_mime_dialog_main.c 16 Aug 2006 01:20:53 - 1.12 +++ etk_mime_dialog_main.c 16 Aug 2006 01:50:20 - 1.13 @@ -491,7 +491,7 @@ etk_container_add(ETK_CONTAINER(mime_dialog_window), vbox); hbox = etk_hbox_new(ETK_FALSE,0); - etk_box_pack_start(ETK_BOX(vbox), hbox, ETK_TRUE, ETK_TRUE, 0); + etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); /*Build the
E CVS: proto essiene
Enlightenment CVS committal
Author : essiene
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui/src/widgets
Modified Files:
ew_checkbox.c ew_checkbox.h ew_entry.c ew_entry.h
Log Message:
- Add temporary fix to ew_entry bug. I think MoOM is going to rewrite etk_entry
sometime, that will be _the_ permanent fix :)
- make xsettings dialog work well with it. It now displays ok, but its not yet
hooked up to libentrance_edit.
- Modified ew_checkbox to be fit for consumption. It was theoritically okay
before, but actually using it felt clumsy. I feel happier now :) [moral lesson
- never design and api and leave it be without actually using it. The taste of
the eating is in the pudding... no wait! there's something wrong with that
statement :P]
- Code up Behaviour dialog. Works poifectly!!!
- Added widgets stub to gui/layouts.c
- Rearranged main config ui order of items.
- TODO
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_checkbox.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ew_checkbox.c 15 Aug 2006 13:52:07 - 1.1
+++ ew_checkbox.c 16 Aug 2006 04:18:03 - 1.2
@@ -1,8 +1,9 @@
#include Etk.h
#include Entrance_Widgets.h
+
Entrance_Widget
-ew_checkbox_new(char *label, void (*function)(void *, void *), void *data) {
+ew_checkbox_new(char *label) {
Entrance_Widget ew = ew_new();
if(!ew)
return NULL;
@@ -10,9 +11,18 @@
ew-owner = etk_check_button_new();
if(label)
ew_button_label_set(ew, label);
- if(function)
- ew_button_onclick_set(ew, function, data);
return ew;
}
+int
+ew_checkbox_is_active(Entrance_Widget ew)
+{
+ return (int) etk_toggle_button_active_get(ETK_TOGGLE_BUTTON(ew-owner));
+}
+
+void
+ew_checkbox_toggle(Entrance_Widget ew)
+{
+ etk_toggle_button_toggle(ETK_TOGGLE_BUTTON(ew-owner));
+}
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_checkbox.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ew_checkbox.h 15 Aug 2006 13:52:07 - 1.1
+++ ew_checkbox.h 16 Aug 2006 04:18:03 - 1.2
@@ -1,6 +1,10 @@
#ifndef _EW_CHECKBOX_H
#define _EW_CHECKBOX_H
-Entrance_Widget ew_checkbox_new(char *label, void (*click_function)(void *,
void *), void *data);
+
+Entrance_Widget ew_checkbox_new(char *label);
+
+int ew_checkbox_is_active(Entrance_Widget ew);
+void ew_checkbox_toggle(Entrance_Widget ew);
#endif
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_entry.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ew_entry.c 15 Aug 2006 19:57:27 - 1.4
+++ ew_entry.c 16 Aug 2006 04:18:03 - 1.5
@@ -41,12 +41,13 @@
etk_box_append(ETK_BOX(ew-owner), ew-control, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
if(text)
+ {
ew_entry_set(ew, text);
-
+ }
return ew;
}
-const char*
+char*
ew_entry_get(Entrance_Entry ew)
{
return etk_entry_text_get(ETK_ENTRY(ew-control));
@@ -71,4 +72,12 @@
{
if(ew)
etk_entry_password_set(ETK_ENTRY(ew-control), ETK_FALSE);
+}
+
+void
+ew_entry_bugfix_makeshow(Entrance_Entry ew)
+{
+ /*this is a work around till the etk_entry rewrite*/
+ etk_widget_focus(ETK_WIDGET(ew-control));
+ etk_widget_unfocus(ETK_WIDGET(ew-control));
}
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_entry.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ew_entry.h 15 Aug 2006 15:01:33 - 1.3
+++ ew_entry.h 16 Aug 2006 04:18:03 - 1.4
@@ -34,7 +34,7 @@
else \
Entrance_Entry ew_entry_new(const char *label, const char *text, int
ispassword);
-const char* ew_entry_get(Entrance_Entry);
+char* ew_entry_get(Entrance_Entry);
void ew_entry_set(Entrance_Entry ew, const char *text);
void ew_entry_password_set(Entrance_Entry ew);
void ew_entry_password_clear(Entrance_Entry ew);
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto essiene
Enlightenment CVS committal Author : essiene Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui Modified Files: TODO Log Message: - Add temporary fix to ew_entry bug. I think MoOM is going to rewrite etk_entry sometime, that will be _the_ permanent fix :) - make xsettings dialog work well with it. It now displays ok, but its not yet hooked up to libentrance_edit. - Modified ew_checkbox to be fit for consumption. It was theoritically okay before, but actually using it felt clumsy. I feel happier now :) [moral lesson - never design and api and leave it be without actually using it. The taste of the eating is in the pudding... no wait! there's something wrong with that statement :P] - Code up Behaviour dialog. Works poifectly!!! - Added widgets stub to gui/layouts.c - Rearranged main config ui order of items. - TODO === RCS file: /cvs/e/e17/proto/entrance_edit_gui/TODO,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- TODO16 Aug 2006 01:05:52 - 1.10 +++ TODO16 Aug 2006 04:18:03 - 1.11 @@ -9,15 +9,17 @@ - use etk_window to build ew_dialog, so we can set modality, fixed size, etc, basically, more options (under discussion) - Fix up Fileselector widget. This may probably need to refactor out the buttons used by ew_notice as ew_reponse_buttons ? - use ecore_lists to hold buttons and other *low life* widgets used on composite widgets. -- There is a bug in ew_entry. I've not been albe to programmatically add text to the widget and display it. - AT some point, we'll need to use tables to layout stuff. Free flowing with parralel hboxes just pains the eyes +- ew_entry_bugfix_makeshow() will only be around till the etk_entry rewrite :) +- show that we either need or do not need radio buttons / toggle buttons. +- add cleaner interface for radio groups handling. GUI == - implement layout screen - implement sessions screen -- implement behavior screen -- implement x-settings screen -- theme and background dialogs need a way to browse filesystem to grab from arbitrary locations. + theme and background dialogs need a way to browse filesystem to grab from arbitrary locations. - The PREVIEW window is just CRAP! We actually should be loading Entrance itself with the config changes into a canvas and displaying that canvas or something. Basically, entrance -T shows us a preview of entrance without running the code, we should be able to kidnap and enslave that functionality in the gui config panel, i'm smelling a libentrance here. no? +- hook up xsetting screen into libentrance_edit, use the flow in behaviour dialog as a template. *very* important as it opens up doors to more refactorings/optimisations later. +- Modify egui_graphics_selector and reorganize the code in conformance with behaviour dialog. - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto essiene
Enlightenment CVS committal
Author : essiene
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui/src/gui
Modified Files:
behavior.c layout.c main.c x_settings.c
Log Message:
- Add temporary fix to ew_entry bug. I think MoOM is going to rewrite etk_entry
sometime, that will be _the_ permanent fix :)
- make xsettings dialog work well with it. It now displays ok, but its not yet
hooked up to libentrance_edit.
- Modified ew_checkbox to be fit for consumption. It was theoritically okay
before, but actually using it felt clumsy. I feel happier now :) [moral lesson
- never design and api and leave it be without actually using it. The taste of
the eating is in the pudding... no wait! there's something wrong with that
statement :P]
- Code up Behaviour dialog. Works poifectly!!!
- Added widgets stub to gui/layouts.c
- Rearranged main config ui order of items.
- TODO
===
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/behavior.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- behavior.c 13 Aug 2006 02:48:19 - 1.2
+++ behavior.c 16 Aug 2006 04:18:03 - 1.3
@@ -1,7 +1,332 @@
+#include limits.h
#include Entrance_Widgets.h
+#include Entrance_Edit.h
#include stdio.h
+static void _cb_close(void*, void*);
+static void _cb_apply(void*, void*);
+static void _cb_ok(void*, void*);
+
+static void _close(void);
+static int _apply(void);
+static int _save_to_file(void);
+
+static Entrance_Dialog win;
+
+static Entrance_Widget group_login;
+static Entrance_Widget login_autologin_mode;
+static Entrance_Entry login_autologin_user;
+
+static int val_login_mode;
+static char* val_login_user;
+
+static void _build_group_login(void);
+static void _load_login(void);
+static void _save_login(void);
+
+static Entrance_Widget group_presel;
+static Entrance_Widget presel_mode;
+static Entrance_Entry presel_prevuser;
+
+static int val_presel_mode;
+static char* val_presel_prevuser;
+
+static void _build_group_presel(void);
+static void _load_presel(void);
+static void _save_presel(void);
+
+static Entrance_Widget group_remember;
+static Entrance_Widget remember_user_remember;
+static Entrance_Entry remember_remember_count;
+static Entrance_Entry remember_user_count;
+
+static int val_user_remember;
+static int val_user_remember_count;
+static int val_user_count;
+
+static void _build_group_remember(void);
+static void _load_remember(void);
+static void _save_remember(void);
+
+
+static Entrance_Widget group_others;
+static Entrance_Widget others_auth;
+static Entrance_Widget others_engine;
+static Entrance_Widget others_reboot;
+static Entrance_Widget others_halt;
+
+static int val_auth;
+static int val_engine;
+static int val_reboot;
+static int val_halt;
+
+static void _build_group_others(void);
+static void _load_others(void);
+static void _save_others(void);
+
void
egui_behavior_dialog_show() {
- printf(Behavior clicked\n);
+ win = ew_dialog_new(_(Entrance Configuration - Behaviour), EW_FALSE);
+
+ _build_group_login();
+ _build_group_presel();
+ _build_group_remember();
+ _build_group_others();
+
+ ew_dialog_close_button_add(win, _cb_close, NULL);
+ ew_dialog_apply_button_add(win, _cb_apply, NULL);
+ ew_dialog_ok_button_add(win, _cb_ok, NULL);
+
+ ew_dialog_show(win);
+
+ ew_entry_bugfix_makeshow(login_autologin_user);
+ ew_entry_bugfix_makeshow(presel_prevuser);
+ ew_entry_bugfix_makeshow(remember_user_count);
+ ew_entry_bugfix_makeshow(remember_remember_count);
+}
+
+static void
+_build_group_login(void)
+{
+ group_login = ew_dialog_group_add(win, _(AutoLogin),
EW_GROUP_VERTICAL);
+
+ val_login_user = NULL;
+
+ _load_login();
+
+ login_autologin_mode = ew_checkbox_new(_(Enable Autologin));
+ if(val_login_mode)
+ ew_checkbox_toggle(login_autologin_mode);
+ ew_group_add(group_login, login_autologin_mode);
+
+ login_autologin_user = ew_entry_new(_(Autologin User),
val_login_user, EW_FALSE);
+ ew_group_add(group_login, login_autologin_user);
+}
+
+
+static void
+_build_group_presel(void)
+{
+ group_presel = ew_dialog_group_add(win, _(Preselect),
EW_GROUP_VERTICAL);
+
+ val_presel_prevuser = NULL;
+ _load_presel();
+
+ presel_mode = ew_checkbox_new(_(Enable Preselect Mode));
+ if(val_presel_mode)
+ ew_checkbox_toggle(presel_mode);
+ ew_group_add(group_presel, presel_mode);
+
+ presel_prevuser = ew_entry_new(_(Previous Preselect User),
val_presel_prevuser, EW_FALSE);
+ ew_group_add(group_presel, presel_prevuser);
+}
+
+
+
+static void
+_build_group_others(void)
+{
+ group_others = ew_dialog_group_add(win, _(Others), EW_GROUP_VERTICAL);
+
+ _load_others();
+
+ others_auth = ew_checkbox_new(_(Use Authentication));
+ if(val_auth)
+
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
Log Message:
formatting, EAPI and add a copy function
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_color.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_color.c 14 Aug 2006 04:38:49 - 1.1
+++ e_color.c 16 Aug 2006 04:43:20 - 1.2
@@ -17,3 +17,16 @@
else
evas_color_hsv_to_rgb(ec-h, ec-s, ec-v, (ec-r), (ec-g), (ec-b));
}
+
+void
+e_color_copy(E_Color *from, E_Color *to)
+{
+ if (!from || !to) return;
+ to-r = from-r;
+ to-g = from-g;
+ to-b = from-b;
+ to-h = from-h;
+ to-s = from-s;
+ to-v = from-v;
+ to-a = from-a;
+}
-
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=lnkkid=120709bid=263057dat=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.h
Log Message:
formatting, EAPI and add a copy function
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_color.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_color.h 14 Aug 2006 04:38:49 - 1.1
+++ e_color.h 16 Aug 2006 04:43:57 - 1.2
@@ -1,6 +1,13 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
+ */
+#ifdef E_TYPEDEFS
+
+typedef enum _E_Color_Component E_Color_Component;
+
+#else
#ifndef E_COLOR_HEADER
#define E_COLOR_HEADER
-typedef enum _E_Color_Component E_Color_Component;
enum _E_Color_Component
{
@@ -22,6 +29,8 @@
int a;
};
-void e_color_update_rgb(E_Color *ec);
-void e_color_update_hsv(E_Color *ec);
+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);
+#endif
#endif
-
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=lnkkid=120709bid=263057dat=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.h
Log Message:
oops.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_color.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_color.h 16 Aug 2006 04:43:57 - 1.2
+++ e_color.h 16 Aug 2006 05:29:53 - 1.3
@@ -4,6 +4,7 @@
#ifdef E_TYPEDEFS
typedef enum _E_Color_Component E_Color_Component;
+typedef struct _E_Color E_Color;
#else
#ifndef E_COLOR_HEADER
@@ -21,7 +22,6 @@
};
// used so that a single color struct can be shared by all elements of the
color dialog
-typedef struct _E_Color E_Color;
struct _E_Color
{
int r, g, b;
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
