Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/enhance/src/lib
Modified Files:
enhance.c enhance_widget.c
Log Message:
patch from AJiProd:
- etk_text_view
- handle pixbuf tag
- toogle/check button default state
- some stocks / button enhancements
===================================================================
RCS file: /cvs/e/e17/proto/enhance/src/lib/enhance.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- enhance.c 14 Jul 2006 16:24:32 -0000 1.9
+++ enhance.c 15 Jul 2006 00:27:19 -0000 1.10
@@ -280,6 +280,7 @@
{ "gtk-media-forward", ETK_STOCK_MEDIA_SEEK_FORWARD},
{ "gtk-media-previous", ETK_STOCK_MEDIA_SKIP_BACKWARD},
{ "gtk-media-next", ETK_STOCK_MEDIA_SKIP_FORWARD},
+ { "gtk-media-stop", ETK_STOCK_MEDIA_PLAYBACK_STOP},
{ "gtk-stop", ETK_STOCK_PROCESS_STOP},
{ "gtk-quit", ETK_STOCK_SYSTEM_LOG_OUT},
{ "gtk-refresh", ETK_STOCK_VIEW_REFRESH},
@@ -447,6 +448,9 @@
else if(!strcmp(name, "text"))
{
PROPERTY_STR;
+
+ IF_PARENT_CLASS("GtkTextView")
+ return;
etk_object_properties_set(ETK_OBJECT(wid->wid), "text", value, NULL);
}
@@ -540,12 +544,6 @@
etk_window_skip_pager_hint_set(ETK_WINDOW(wid-wid), value);
}
- else if(!strcmp(name, "label"))
- {
- IF_PARENT_CLASS("GtkButton")
- etk_button_label_set(ETK_BUTTON(wid->wid), node->value);
- }
-
else if(!strcmp(name, "items"))
{
IF_PARENT_CLASS("GtkComboBox")
@@ -638,9 +636,22 @@
label = (char
*)etk_menu_item_label_get(ETK_MENU_ITEM(wid->wid));
id = (Etk_Stock_Id)ecore_hash_get(_en_stock_items_hash,
label);
if (id != ETK_STOCK_NO_STOCK)
- etk_menu_item_set_from_stock(ETK_MENU_ITEM_IMAGE(wid->wid),
(Etk_Stock_Id)id);
+ etk_menu_item_set_from_stock(ETK_MENU_ITEM(wid->wid),
(Etk_Stock_Id)id);
}
}
+ }
+
+ else if(!strcmp(name, "pixbuf"))
+ {
+ PROPERTY_STR;
+ /* TODO : edj? */
+
+ etk_image_set_from_file(ETK_IMAGE(wid->wid), value);
+ }
+ else if(!strcmp(name, "active"))
+ {
+ PROPERTY_BOOL
+ etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(wid->wid), value);
}
}
===================================================================
RCS file: /cvs/e/e17/proto/enhance/src/lib/enhance_widget.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- enhance_widget.c 11 Jul 2006 03:23:11 -0000 1.9
+++ enhance_widget.c 15 Jul 2006 00:27:19 -0000 1.10
@@ -31,6 +31,7 @@
static E_Widget *_e_widget_vseparator_handle(Enhance *en, EXML_Node *node);
static E_Widget *_e_widget_hslider_handle(Enhance *en, EXML_Node *node);
static E_Widget *_e_widget_vslider_handle(Enhance *en, EXML_Node *node);
+static E_Widget *_e_widget_textview_handle(Enhance *en, EXML_Node *node);
static EXML_Node *find_node(EXML_Node *node, char *key, char *value)
{
@@ -752,6 +753,20 @@
return slider;
}
+static E_Widget *
+_e_widget_textview_handle(Enhance *en, EXML_Node *node)
+{
+ E_Widget *tview;
+ char *id;
+
+ id = ecore_hash_get(node->attributes, "id");
+ if(!id) return NULL;
+
+ tview = _e_widget_new(en, node, etk_text_view_new(), id);
+
+ return tview;
+}
+
E_Widget *
_e_widget_handle(Enhance *en, EXML_Node *node)
{
@@ -829,7 +844,9 @@
else if(!strcmp(class, "GtkHScale"))
return _e_widget_hslider_handle(en, node);
else if(!strcmp(class, "GtkVScale"))
- return _e_widget_vslider_handle(en, node);
+ return _e_widget_vslider_handle(en, node);
+ else if(!strcmp(class, "GtkTextView"))
+ return _e_widget_textview_handle(en, node);
return NULL;
}
@@ -889,7 +906,7 @@
if((w = etk_paned_child1_get(ETK_PANED(parent->wid))) != NULL)
etk_paned_child2_set(ETK_PANED(parent->wid), child->wid, expand);
else
- etk_paned_child1_set(ETK_PANED(parent->wid), child->wid, expand);
+ etk_paned_child1_set(ETK_PANED(parent->wid), child->wid, expand);
}
if(!strcmp(parent_class, "GtkNotebook"))
{
@@ -1031,5 +1048,12 @@
etk_table_attach(ETK_TABLE(parent->wid), child->wid, left_attach,
right_attach, top_attach, bottom_attach,
x_padding, y_padding, fill_policy);
+ }
+ else if(!strcmp(parent_class, "GtkButton") ||
+ !strcmp(parent_class, "GtkToggleButton") ||
+ !strcmp(parent_class, "GtkCheckButton"))
+ {
+ if(ETK_IS_IMAGE(child->wid))
+ etk_button_image_set(ETK_BUTTON(parent->wid), ETK_IMAGE(child->wid));
}
}
-------------------------------------------------------------------------
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
