Enlightenment CVS committal
Author : urandom
Project : e17
Module : proto
Dir : e17/proto/edje_viewer/src/bin
Modified Files:
conf.c conf.h edje_etk.c edje_etk.h etk_gui.c
Log Message:
more cleanup. layout corrections
===================================================================
RCS file: /cvs/e/e17/proto/edje_viewer/src/bin/conf.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- conf.c 8 Jul 2006 03:24:51 -0000 1.2
+++ conf.c 8 Jul 2006 14:43:31 -0000 1.3
@@ -50,7 +50,7 @@
return val;
}
-void edje_viewer_config_recent_set(char *path)
+void edje_viewer_config_recent_set(const char *path)
{
int count, key_length, i;
char *key, *val, *cwd, *new_path;
@@ -59,16 +59,18 @@
count = edje_viewer_config_count_get();
new_path = malloc(PATH_MAX);
- if (strcmp(path, "/")) {
+ if (!(path[0] == '/')) {
cwd = malloc(PATH_MAX);
getcwd(cwd, PATH_MAX);
snprintf(new_path, PATH_MAX, "%s/%s", cwd, path);
FREE(cwd);
+ } else {
+ new_path = strdup(path);
}
- key_length = strlen("/recent/") + 4;
+ key_length = strlen("/recent/") + 8;
key = malloc(key_length * sizeof(key));
for (i = 0; i < count; i++)
{
===================================================================
RCS file: /cvs/e/e17/proto/edje_viewer/src/bin/conf.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- conf.h 3 Jul 2006 01:16:09 -0000 1.1
+++ conf.h 8 Jul 2006 14:43:31 -0000 1.2
@@ -6,4 +6,4 @@
void edje_viewer_config_count_set(int count);
char *edje_viewer_config_recent_get(int number);
-void edje_viewer_config_recent_set(char *path);
+void edje_viewer_config_recent_set(const char *path);
===================================================================
RCS file: /cvs/e/e17/proto/edje_viewer/src/bin/edje_etk.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- edje_etk.c 8 Jul 2006 03:24:51 -0000 1.6
+++ edje_etk.c 8 Jul 2006 14:43:31 -0000 1.7
@@ -117,7 +117,7 @@
}
}
-void list_entries(char *file, Etk_Tree *tree, Etk_Tree *output,
+void list_entries(const char *file, Etk_Tree *tree, Etk_Tree *output,
Etk_Canvas *canvas)
{
Evas_List *entries;
===================================================================
RCS file: /cvs/e/e17/proto/edje_viewer/src/bin/edje_etk.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- edje_etk.h 27 Jun 2006 20:52:06 -0000 1.3
+++ edje_etk.h 8 Jul 2006 14:43:31 -0000 1.4
@@ -38,7 +38,7 @@
void bg_setup(Etk_Canvas *canvas);
void canvas_resize_cb(Etk_Object *canvas, const char *property_name,
void *data);
-void list_entries(char *file, Etk_Tree *tree, Etk_Tree *output,
+void list_entries(const char *file, Etk_Tree *tree, Etk_Tree *output,
Etk_Canvas *canvas);
Demo_Edje *edje_part_create(Etk_Tree *output, Etk_Canvas *canvas,
char *file, char *name);
===================================================================
RCS file: /cvs/e/e17/proto/edje_viewer/src/bin/etk_gui.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_gui.c 8 Jul 2006 03:24:51 -0000 1.7
+++ etk_gui.c 8 Jul 2006 14:43:31 -0000 1.8
@@ -93,7 +93,8 @@
col2 = etk_tree_col_new(ETK_TREE(gui->tree), _("Visibility"),
etk_tree_model_checkbox_new(ETK_TREE(gui->tree)), 30);
etk_tree_build(ETK_TREE(gui->tree));
- etk_paned_child1_set(ETK_PANED(paned), gui->tree, ETK_TRUE);
+ etk_widget_size_request_set(gui->tree, 300, 0);
+ etk_paned_child1_set(ETK_PANED(paned), gui->tree, ETK_FALSE);
scrollview = etk_scrolled_view_new();
etk_paned_child2_set(ETK_PANED(paned), scrollview, ETK_TRUE);
@@ -110,6 +111,7 @@
etk_tree_model_text_new(ETK_TREE(gui->output)), 200);
etk_tree_col_expand_set(col, ETK_TRUE);
etk_tree_build(ETK_TREE(gui->output));
+ etk_widget_size_request_set(gui->output, 0, 100);
etk_paned_child2_set(ETK_PANED(vpaned), gui->output, ETK_FALSE);
hbox = etk_hbox_new(ETK_FALSE, 0);
@@ -318,8 +320,6 @@
gui->path = strdup(dir);
gui->path = strcat(gui->path, "/");
gui->path = strcat(gui->path, file);
- FREE(dir);
- FREE(file);
list_entries(gui->path, ETK_TREE(gui->tree), ETK_TREE(gui->output),
ETK_CANVAS(gui->canvas));
etk_window_hide_on_delete(ETK_OBJECT(gui->fm_dialog), NULL);
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
