Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
layout_etk_simple.c
Log Message:
* More config work
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- layout_etk_simple.c 1 Sep 2006 11:07:51 -0000 1.58
+++ layout_etk_simple.c 1 Sep 2006 11:27:35 -0000 1.59
@@ -49,6 +49,7 @@
Etk_Widget* popup;
Etk_Widget* localshell;
+ Etk_Widget* trackback_shell;
Ecore_Hash* progress_hash; /*Track progress events->dialogs*/
Ecore_Hash* properties_request_hash;
@@ -278,10 +279,11 @@
entropy_gui_component_instance* instance = data;
entropy_layout_gui* gui = instance->data;
- if (!etk_widget_is_visible(gui->trackback->gui_object)) {
- etk_widget_show_all(gui->trackback->gui_object);
+ if (etk_container_is_child(ETK_CONTAINER(gui->trackback_shell),
gui->trackback->gui_object) == ETK_FALSE) {
+ etk_box_append(ETK_BOX(gui->trackback_shell),
gui->trackback->gui_object, ETK_BOX_START, ETK_BOX_NONE,0);
+ etk_widget_show_all(ETK_WIDGET(gui->trackback->gui_object));
} else {
- etk_widget_hide(gui->trackback->gui_object);
+ etk_container_remove(ETK_CONTAINER(gui->trackback_shell),
gui->trackback->gui_object);
}
}
@@ -536,7 +538,6 @@
Etk_Widget *window;
entropy_layout_gui *gui;
entropy_gui_component_instance *layout;
- entropy_gui_component_instance* instance= NULL;
void *(*local_plugin_init) (entropy_core * core,
entropy_gui_component_instance *,
@@ -653,6 +654,9 @@
gui->localshell = etk_vbox_new(ETK_TRUE,0);
etk_paned_child2_set(ETK_PANED(gui->paned), gui->localshell, ETK_TRUE);
+ /*Trackback container init*/
+ gui->trackback_shell = etk_vbox_new(ETK_TRUE,0);
+
/*Popup init*/
gui->popup = etk_menu_new();
etk_signal_connect("row_clicked", ETK_OBJECT( gui->tree ),
@@ -726,6 +730,10 @@
gui->trackback = (*local_plugin_init)(core, layout,NULL);
gui->trackback->plugin = trackback;
gui->trackback->active=1;
+
+ if (entropy_config_misc_is_set("general.trackback")) {
+ etk_box_append(ETK_BOX(gui->trackback_shell),
gui->trackback->gui_object, ETK_BOX_START, ETK_BOX_NONE, 0);
+ }
}
@@ -807,11 +815,7 @@
etk_box_append(ETK_BOX(vbox), menubar, ETK_BOX_START, ETK_BOX_NONE, 0);
-
- if (trackback) {
- etk_box_append(ETK_BOX(vbox), gui->trackback->gui_object,
ETK_BOX_START, ETK_BOX_NONE, 0);
- }
-
+ etk_box_append(ETK_BOX(vbox), gui->trackback_shell, ETK_BOX_START,
ETK_BOX_NONE, 0);
etk_box_append(ETK_BOX(vbox), gui->paned, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
/*---------------------------*/
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
