E CVS: proto essiene

[Enlightenment C. <no...@cv...>]

Enlightenment CVS committal

Author  : essiene
Project : e17
Module  : proto

Dir     : e17/proto/entrance_edit_gui/src/widgets


Modified Files:
	ew_checkbox.c ew_checkbox.h ew_entry.c ew_entry.h 


Log Message:
- Add temporary fix to ew_entry bug. I think MoOM is going to rewrite etk_entry sometime, that will be _the_ permanent fix :)
- make xsettings dialog work well with it. It now displays ok, but its not yet hooked up to libentrance_edit.
- Modified ew_checkbox to be fit for consumption. It was theoritically okay before, but actually using it felt clumsy. I feel happier now :) [moral lesson - never design and api and leave it be without actually using it. The taste of the eating is in the pudding... no wait! there's something wrong with that statement :P]
- Code up Behaviour dialog. Works poifectly!!!
- Added widgets stub to gui/layouts.c
- Rearranged main config ui order of items.
- TODO

===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_checkbox.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ew_checkbox.c	15 Aug 2006 13:52:07 -0000	1.1
+++ ew_checkbox.c	16 Aug 2006 04:18:03 -0000	1.2
@@ -1,8 +1,9 @@
 #include <Etk.h>
 #include "Entrance_Widgets.h"
 
+
 Entrance_Widget
-ew_checkbox_new(char *label, void (*function)(void *, void *), void *data) {
+ew_checkbox_new(char *label) {
 	Entrance_Widget ew = ew_new();
 	if(!ew)
 		return NULL;
@@ -10,9 +11,18 @@
 	ew->owner = etk_check_button_new();
 	if(label)
 		ew_button_label_set(ew, label);
-	if(function)
-		ew_button_onclick_set(ew, function, data);
 
 	return ew;
 }
 
+int
+ew_checkbox_is_active(Entrance_Widget ew)
+{
+	return (int) etk_toggle_button_active_get(ETK_TOGGLE_BUTTON(ew->owner));
+}
+
+void
+ew_checkbox_toggle(Entrance_Widget ew)
+{
+	etk_toggle_button_toggle(ETK_TOGGLE_BUTTON(ew->owner));
+}
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_checkbox.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ew_checkbox.h	15 Aug 2006 13:52:07 -0000	1.1
+++ ew_checkbox.h	16 Aug 2006 04:18:03 -0000	1.2
@@ -1,6 +1,10 @@
 #ifndef _EW_CHECKBOX_H
 #define _EW_CHECKBOX_H
 
-Entrance_Widget ew_checkbox_new(char *label, void (*click_function)(void *, void *), void *data);
+
+Entrance_Widget ew_checkbox_new(char *label);
+
+int ew_checkbox_is_active(Entrance_Widget ew);
+void ew_checkbox_toggle(Entrance_Widget ew);
 
 #endif
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_entry.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ew_entry.c	15 Aug 2006 19:57:27 -0000	1.4
+++ ew_entry.c	16 Aug 2006 04:18:03 -0000	1.5
@@ -41,12 +41,13 @@
 
 	etk_box_append(ETK_BOX(ew->owner), ew->control, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
 	if(text)
+	{
 		ew_entry_set(ew, text);
-
+	} 
 	return ew;
 }
 
-const char*
+char*
 ew_entry_get(Entrance_Entry ew)
 {
 	return etk_entry_text_get(ETK_ENTRY(ew->control));
@@ -71,4 +72,12 @@
 {
 	if(ew)
 		etk_entry_password_set(ETK_ENTRY(ew->control),  ETK_FALSE);
+}
+
+void
+ew_entry_bugfix_makeshow(Entrance_Entry ew)
+{
+	/*this is a work around till the etk_entry rewrite*/
+	etk_widget_focus(ETK_WIDGET(ew->control));
+	etk_widget_unfocus(ETK_WIDGET(ew->control));
 }
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/widgets/ew_entry.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ew_entry.h	15 Aug 2006 15:01:33 -0000	1.3
+++ ew_entry.h	16 Aug 2006 04:18:03 -0000	1.4
@@ -34,7 +34,7 @@
 else \
 
 Entrance_Entry ew_entry_new(const char *label, const char *text, int ispassword);
-const char* ew_entry_get(Entrance_Entry);
+char* ew_entry_get(Entrance_Entry);
 void ew_entry_set(Entrance_Entry ew, const char *text);
 void ew_entry_password_set(Entrance_Entry ew);
 void ew_entry_password_clear(Entrance_Entry ew);