Enlightenment CVS committal
Author : lordchaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
ewl_icon_local_viewer.c layout_ewl_simple.c
Log Message:
* TitanSoccer15's layout patch (reworking of subtree nesting on left layout
pane)
* Revert to empty default background now the default BG for iconbox is nicer.
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/entropy/src/plugins/ewl_icon_local_viewer.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- ewl_icon_local_viewer.c 22 Dec 2005 04:34:42 -0000 1.41
+++ ewl_icon_local_viewer.c 28 Dec 2005 00:14:16 -0000 1.42
@@ -803,7 +803,7 @@
ewl_iconbox_background_set(EWL_ICONBOX(view->iconbox),
entropy_config_str_get("iconbox_viewer", view->current_dir));
view->default_bg = 0;
} else { /*if (!view->default_bg) {*/
- ewl_iconbox_background_set(EWL_ICONBOX(view->iconbox),
DEFAULT_BG);
+ ewl_iconbox_background_set(EWL_ICONBOX(view->iconbox),
NULL);
view->default_bg = 1;
}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/proto/entropy/src/plugins/layout_ewl_simple.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- layout_ewl_simple.c 22 Dec 2005 04:34:43 -0000 1.20
+++ layout_ewl_simple.c 28 Dec 2005 00:14:17 -0000 1.21
@@ -294,35 +294,21 @@
void* (*structure_plugin_init)(entropy_core* core,
entropy_gui_component_instance*, void* data);
entropy_layout_gui* gui = ((entropy_layout_gui*)instance->data);
- Ewl_Widget* label = ewl_text_new();
Ewl_Widget* tree= gui->tree;
//printf("Add URI: %s\n", uri);
- ewl_text_text_set(EWL_TEXT(label), name);
- image = ewl_image_new();
- ewl_image_file_set(EWL_IMAGE(image), "../icons/chardevice.png", NULL);
- hbox = ewl_hbox_new();
- ewl_container_child_append(EWL_CONTAINER(hbox), image);
- ewl_container_child_append(EWL_CONTAINER(hbox), label);
-
- ewl_widget_show(label);
- ewl_widget_show(image);
+ hbox = ewl_border_new();
+ ewl_border_text_set(EWL_BORDER(hbox), name);
+ ewl_container_child_append(EWL_CONTAINER(tree), hbox);
ewl_widget_show(hbox);
- children[0] = hbox;
- children[1] = NULL;
- row = ewl_tree_row_add(EWL_TREE(tree), NULL, children);
- ewl_object_fill_policy_set(EWL_OBJECT(row), EWL_FLAG_FILL_VSHRINK );
- ewl_widget_show(row);
-
-
+
+
/*Now attach an object to it*/
structure =
entropy_plugins_type_get_first(ENTROPY_PLUGIN_GUI_COMPONENT,
ENTROPY_PLUGIN_GUI_COMPONENT_STRUCTURE_VIEW);
if (structure) {
- Ewl_Widget* children[2];
Ewl_Widget* visual;
- Ewl_Widget* srow;
entropy_generic_file* file = entropy_core_parse_uri(uri);
@@ -341,12 +327,9 @@
printf("Alert! - Visual component not found\n");
else
;// printf("Visual component found\n");
- children[0] = EWL_WIDGET(visual);
- children[1] = NULL;
- srow = ewl_tree_row_add(EWL_TREE(tree), EWL_ROW(row),
children);
- ewl_object_fill_policy_set(EWL_OBJECT(srow),
EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_VFILL );
- ewl_object_fill_policy_set(EWL_OBJECT(visual),
EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_VFILL);
- ewl_widget_show(srow);
+ ewl_container_child_append(EWL_CONTAINER(hbox), visual);
+ ewl_object_fill_policy_set(EWL_OBJECT(visual),
EWL_FLAG_FILL_HFILL | EWL_FLAG_FILL_HSHRINK);
+ ewl_widget_show(visual);
}
}
}
@@ -527,7 +510,8 @@
expand_button = ewl_button_new();
ewl_button_label_set(EWL_BUTTON(expand_button), ">");
- tree = ewl_tree_new(1);
+ tree = ewl_scrollpane_new();
+ ewl_box_spacing_set(EWL_BOX(EWL_SCROLLPANE(tree)->box), 5);
gui->tree = tree;
paned = ewl_hpaned_new();
@@ -538,8 +522,7 @@
ewl_object_maximum_size_set(EWL_OBJECT(contract_button), 20, 10);
ewl_object_maximum_size_set(EWL_OBJECT(expand_button), 20, 10);
- ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_VSHRINK);
-
+
/*Main menu setup*/
menubar = ewl_menubar_new();
ewl_widget_show(menubar);
@@ -626,11 +609,7 @@
/*This is cheating - break OO convention by accessing the internals of
the struct.. but it doesn't work without this*/
- ewl_object_fill_policy_set(EWL_OBJECT(EWL_PANED(paned)->second),
EWL_FLAG_FILL_NORMAL);
- ewl_object_fill_policy_set(EWL_OBJECT(EWL_PANED(paned)->first),
EWL_FLAG_FILL_HSHRINK | EWL_FLAG_FILL_VFILL );
- ewl_object_fill_policy_set(EWL_OBJECT(paned), EWL_FLAG_FILL_NORMAL);
-
-
+
if (!(tmp = entropy_config_str_get("layout_ewl_simple",
"structure_bar"))) {
//printf ("Creating initial view for ewl_simple layout..\n");
layout_ewl_simple_config_create(core);
@@ -651,7 +630,6 @@
ewl_widget_show(paned);
ewl_widget_show(tree);
- ewl_object_fill_policy_set(EWL_OBJECT(win), EWL_FLAG_FILL_ALL);
ewl_container_child_append(EWL_CONTAINER(win), box);
ewl_callback_append(win, EWL_CALLBACK_DELETE_WINDOW,
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
