Enlightenment CVS committal
Author : lok
Project : e17
Module : proto
Dir : e17/proto/enhance/src/lib
Modified Files:
enhance.c enhance_widget.c
Log Message:
[Etk_Table] Added glade-3 compatibility for x/y_options
===================================================================
RCS file: /cvs/e/e17/proto/enhance/src/lib/enhance.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- enhance.c 20 Aug 2006 19:46:28 -0000 1.29
+++ enhance.c 8 Sep 2006 23:06:35 -0000 1.30
@@ -948,6 +948,13 @@
else if(!strcmp("shrink", str))
IF_TRUE_FALSE_ASSIGN(node->value, packing->shrink);
}
+ if(str != NULL && !node->value)
+ {
+ if (!strcmp("x_options", str))
+ packing->x_options = strdup("");
+ if (!strcmp("y_options", str))
+ packing->x_options = strdup("");
+ }
}
while((tag = exml_next_nomove(xml)) != NULL);
===================================================================
RCS file: /cvs/e/e17/proto/enhance/src/lib/enhance_widget.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- enhance_widget.c 20 Aug 2006 19:46:28 -0000 1.22
+++ enhance_widget.c 8 Sep 2006 23:06:35 -0000 1.23
@@ -1060,13 +1060,14 @@
y_padding = child->packing->y_padding;
if(child->packing->x_options)
{
+ /* Glade 2 compatibility */
if(child->packing->x_options
&& strstr(child->packing->x_options, "fill"))
{
fill_policy = ETK_TABLE_HFILL;
flags_set = 1;
}
- else if(child->packing->y_options
+ else if(child->packing->x_options
&& strstr(child->packing->x_options, "expand"))
{
if(flags_set)
@@ -1091,6 +1092,43 @@
fill_policy |= ETK_TABLE_VEXPAND;
else
fill_policy = ETK_TABLE_VEXPAND;
+ flags_set = 1;
+ }
+ /* Glade 3 compatibility */
+ else if(child->packing->x_options
+ && strstr(child->packing->x_options, "GTK_EXPAND"))
+ {
+ fill_policy = (fill_policy ^ ETK_TABLE_HFILL) &
fill_policy;
+ flags_set = 1;
+ }
+ else if(child->packing->x_options
+ && strstr(child->packing->x_options, "GTK_FILL"))
+ {
+ fill_policy = (fill_policy ^ ETK_TABLE_HEXPAND) &
fill_policy;
+ flags_set = 1;
+ }
+ else if(child->packing->x_options
+ && strstr(child->packing->x_options, ""))
+ {
+ fill_policy = (fill_policy ^ (ETK_TABLE_HEXPAND |
ETK_TABLE_HFILL)) & fill_policy;
+ flags_set = 1;
+ }
+ else if(child->packing->y_options
+ && strstr(child->packing->y_options, "GTK_EXPAND"))
+ {
+ fill_policy = (fill_policy ^ ETK_TABLE_VFILL) &
fill_policy;
+ flags_set = 1;
+ }
+ else if(child->packing->y_options
+ && strstr(child->packing->y_options, "GTK_FILL"))
+ {
+ fill_policy = (fill_policy ^ ETK_TABLE_VEXPAND) &
fill_policy;
+ flags_set = 1;
+ }
+ else if(child->packing->y_options
+ && strstr(child->packing->y_options, ""))
+ {
+ fill_policy = (fill_policy ^ (ETK_TABLE_VEXPAND |
ETK_TABLE_VFILL)) & fill_policy;
flags_set = 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=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
