Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
ewl_list_viewer.c layout_ewl_simple.c structure_viewer.c
Log Message:
Mucho cleanup on structure viewer and list viewer... still needs lots more, but
looks much better.
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/ewl_list_viewer.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ewl_list_viewer.c 13 Aug 2006 01:20:45 -0000 1.17
+++ ewl_list_viewer.c 27 Aug 2006 03:30:28 -0000 1.18
@@ -467,7 +467,7 @@
entropy_plugin_gui_instance_new (entropy_core * core,
entropy_gui_component_instance * layout)
{
- char *headers[6];
+ char *headers[5];
entropy_gui_component_instance *instance =
entropy_gui_component_instance_new ();
@@ -479,15 +479,14 @@
instance->data = viewer;
instance->layout_parent = layout;
- viewer->list = ewl_tree_new (5);
+ viewer->list = ewl_tree_new (4);
ewl_tree_mode_set (EWL_TREE (viewer->list), EWL_TREE_MODE_MULTI);
headers[0] = "Icon";
headers[1] = "Filename";
headers[2] = "Size";
headers[3] = "Date Modified";
- headers[4] = " ";
- headers[5] = NULL;
+ headers[4] = NULL;
ewl_tree_headers_set (EWL_TREE (viewer->list), headers);
@@ -579,7 +578,7 @@
entropy_generic_file * list_item, int do_mime)
{
entropy_icon_viewer *view = comp->data;
- Ewl_Widget *text[6];
+ Ewl_Widget *text[5];
char buf[50];
@@ -592,9 +591,9 @@
text[0] = ewl_image_new ();
ewl_image_file_set (EWL_IMAGE (text[0]),
- PACKAGE_DATA_DIR "/icons/default.png", 0);
- ewl_image_constrain_set (EWL_IMAGE (text[0]), 15);
- ewl_object_minimum_w_set(EWL_OBJECT(text[0]), 15);
+ PACKAGE_DATA_DIR "/icons/folder.png", NULL);
+ ewl_image_constrain_set (EWL_IMAGE (text[0]), 20);
+ ewl_image_proportional_set(EWL_IMAGE(text[0]), TRUE);
ewl_widget_show (text[0]);
@@ -629,11 +628,7 @@
ewl_widget_show (text[3]); /*Mod time */
}
ewl_object_minimum_w_set(EWL_OBJECT(text[3]), 40);
-
- text[4] = ewl_label_new ();
- ewl_label_text_set (EWL_LABEL (text[4]), "...");
- ewl_widget_show (text[4]);
- text[5] = NULL;
+ text[4] = NULL;
icon = ewl_tree_row_add (EWL_TREE (view->list), NULL, text);
ewl_widget_draggable_set (icon, 1, entropy_list_data_get);
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_ewl_simple.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- layout_ewl_simple.c 27 Aug 2006 02:53:50 -0000 1.61
+++ layout_ewl_simple.c 27 Aug 2006 03:30:28 -0000 1.62
@@ -246,7 +246,11 @@
Ewl_Widget *menubar;
Ewl_Widget *menu;
Ewl_Widget *menu_item;
+ char *header[1];
+ header[0] = "Folders";
+ header[1] = NULL;
+
Ecore_List *structures;
Entropy_Config_Structure *structure;
@@ -327,7 +331,9 @@
gui->tree = ewl_tree_new(1);
ewl_container_child_append(EWL_CONTAINER(gui->paned), gui->tree);
ewl_object_size_request(EWL_OBJECT(gui->tree),
ENTROPY_EWL_WINDOW_PANE_DEFAULT_X, 50);
-
+ ewl_tree_headers_visible_set(EWL_TREE(gui->tree), TRUE);
+ ewl_tree_headers_set(EWL_TREE(gui->tree), header);
+
gui->localshell = ewl_vbox_new();
ewl_container_child_append(EWL_CONTAINER(gui->paned), gui->localshell);
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/structure_viewer.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- structure_viewer.c 13 Aug 2006 01:58:18 -0000 1.39
+++ structure_viewer.c 27 Aug 2006 03:30:28 -0000 1.40
@@ -298,7 +298,9 @@
image = ewl_image_new ();
ewl_image_file_set (EWL_IMAGE (image),
- PACKAGE_DATA_DIR "/icons/folder_structure.png", NULL);
+ PACKAGE_DATA_DIR "/icons/folder.png", NULL);
+ ewl_image_constrain_set(EWL_IMAGE(image), 20);
+ ewl_image_proportional_set(EWL_IMAGE(image), TRUE);
ewl_widget_show (image);
/*printf (" Added %s'\n", file->filename); */
@@ -315,15 +317,14 @@
children[0] = hbox;
children[1] = NULL;
+ ewl_object_minimum_size_set(EWL_OBJECT(row), 20, 20);
/*printf("Adding row %s to existing row\n", file->filename); */
row = ewl_tree_row_add (EWL_TREE (viewer->parent_visual), prow, children);
-
+
ewl_object_fill_policy_set (EWL_OBJECT (row),
EWL_FLAG_FILL_VSHRINK | EWL_FLAG_FILL_HFILL);
ewl_container_callback_intercept (EWL_CONTAINER (row),
EWL_CALLBACK_MOUSE_DOWN);
-
- ewl_object_custom_h_set (EWL_OBJECT (row), 15);
ewl_widget_show (row);
event = entropy_malloc (sizeof (event_file_core));
@@ -423,8 +424,6 @@
row = structure_viewer_add_row (instance, (entropy_generic_file *) data,
NULL);
instance->gui_object = row;
-
-
ewl_widget_show (row);
return instance;
-------------------------------------------------------------------------
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
