Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_button.c etk_combobox.c etk_entry.c etk_iconbox.c
etk_notebook.c etk_slider.c etk_text_view.c etk_tree.c
etk_widget.c etk_widget.h
Log Message:
* [Widget] Property "focus_on_press" --> "focus_on_click"
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_button.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- etk_button.c 8 Aug 2006 18:03:01 -0000 1.19
+++ etk_button.c 8 Aug 2006 18:51:22 -0000 1.20
@@ -97,7 +97,7 @@
Etk_Widget *etk_button_new()
{
return etk_widget_new(ETK_BUTTON_TYPE, "theme_group", "button",
- "focusable", ETK_TRUE, "focus_on_press", ETK_TRUE, NULL);
+ "focusable", ETK_TRUE, "focus_on_click", ETK_TRUE, NULL);
}
/**
@@ -107,7 +107,7 @@
Etk_Widget *etk_button_new_with_label(const char *label)
{
return etk_widget_new(ETK_BUTTON_TYPE, "theme_group", "button",
- "label", label, "focusable", ETK_TRUE, "focus_on_press", ETK_TRUE, NULL);
+ "label", label, "focusable", ETK_TRUE, "focus_on_click", ETK_TRUE, NULL);
}
/**
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_combobox.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- etk_combobox.c 8 Aug 2006 18:03:01 -0000 1.22
+++ etk_combobox.c 8 Aug 2006 18:51:22 -0000 1.23
@@ -115,7 +115,7 @@
Etk_Widget *etk_combobox_new()
{
return etk_widget_new(ETK_COMBOBOX_TYPE, "theme_group", "combobox",
- "focusable", ETK_TRUE, "focus_on_press", ETK_TRUE, NULL);
+ "focusable", ETK_TRUE, "focus_on_click", ETK_TRUE, NULL);
}
/**
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_entry.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- etk_entry.c 2 Aug 2006 19:17:00 -0000 1.16
+++ etk_entry.c 8 Aug 2006 18:51:22 -0000 1.17
@@ -73,7 +73,7 @@
*/
Etk_Widget *etk_entry_new()
{
- return etk_widget_new(ETK_ENTRY_TYPE, "theme_group", "entry", "focusable",
ETK_TRUE, "focus_on_press", ETK_TRUE, NULL);
+ return etk_widget_new(ETK_ENTRY_TYPE, "theme_group", "entry", "focusable",
ETK_TRUE, "focus_on_click", ETK_TRUE, NULL);
}
/**
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_iconbox.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- etk_iconbox.c 8 Aug 2006 17:02:48 -0000 1.10
+++ etk_iconbox.c 8 Aug 2006 18:51:22 -0000 1.11
@@ -137,7 +137,7 @@
Etk_Widget *etk_iconbox_new()
{
return etk_widget_new(ETK_ICONBOX_TYPE, "theme_group", "iconbox",
- "focusable", ETK_TRUE, "focus_on_press", ETK_TRUE, NULL);
+ "focusable", ETK_TRUE, "focus_on_click", ETK_TRUE, NULL);
}
/**
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_notebook.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- etk_notebook.c 8 Aug 2006 17:02:48 -0000 1.26
+++ etk_notebook.c 8 Aug 2006 18:51:22 -0000 1.27
@@ -763,7 +763,7 @@
if (!notebook)
return;
- notebook->tab_bar = etk_widget_new(ETK_WIDGET_TYPE, "focusable", ETK_TRUE,
"focus_on_press", ETK_TRUE, NULL);
+ notebook->tab_bar = etk_widget_new(ETK_WIDGET_TYPE, "focusable", ETK_TRUE,
"focus_on_click", ETK_TRUE, NULL);
etk_widget_parent_set(notebook->tab_bar, ETK_WIDGET(notebook));
etk_widget_visibility_locked_set(notebook->tab_bar, ETK_TRUE);
etk_widget_show(notebook->tab_bar);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_slider.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- etk_slider.c 26 Jul 2006 14:57:18 -0000 1.9
+++ etk_slider.c 8 Aug 2006 18:51:22 -0000 1.10
@@ -61,7 +61,7 @@
Etk_Widget *etk_hslider_new(double lower, double upper, double value, double
step_increment, double page_increment)
{
return etk_widget_new(ETK_HSLIDER_TYPE, "theme_group", "hslider",
"focusable", ETK_TRUE, "lower", lower, "upper", upper,
- "value", value, "step_increment", step_increment, "page_increment",
page_increment, "focus_on_press", ETK_TRUE, NULL);
+ "value", value, "step_increment", step_increment, "page_increment",
page_increment, "focus_on_click", ETK_TRUE, NULL);
}
/**
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_text_view.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- etk_text_view.c 26 Jul 2006 14:57:18 -0000 1.11
+++ etk_text_view.c 8 Aug 2006 18:51:22 -0000 1.12
@@ -60,7 +60,7 @@
Etk_Widget *etk_text_view_new()
{
return etk_widget_new(ETK_TEXT_VIEW_TYPE, "theme_group", "text_view",
"focusable", ETK_TRUE,
- "focus_on_press", ETK_TRUE, NULL);
+ "focus_on_click", ETK_TRUE, NULL);
}
/**
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_tree.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- etk_tree.c 8 Aug 2006 17:02:48 -0000 1.70
+++ etk_tree.c 8 Aug 2006 18:51:22 -0000 1.71
@@ -212,7 +212,7 @@
*/
Etk_Widget *etk_tree_new()
{
- return etk_widget_new(ETK_TREE_TYPE, "theme_group", "tree", "focusable",
ETK_TRUE, "focus_on_press", ETK_TRUE, NULL);
+ return etk_widget_new(ETK_TREE_TYPE, "theme_group", "tree", "focusable",
ETK_TRUE, "focus_on_click", ETK_TRUE, NULL);
}
/**
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_widget.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- etk_widget.c 8 Aug 2006 18:03:02 -0000 1.68
+++ etk_widget.c 8 Aug 2006 18:51:22 -0000 1.69
@@ -82,7 +82,7 @@
ETK_WIDGET_PASS_MOUSE_EVENTS_PROPERTY,
ETK_WIDGET_HAS_EVENT_OBJECT_PROPERTY,
ETK_WIDGET_FOCUSABLE_PROPERTY,
- ETK_WIDGET_FOCUS_ON_PRESS_PROPERTY
+ ETK_WIDGET_FOCUS_ON_CLICK_PROPERTY
};
static void _etk_widget_constructor(Etk_Widget *widget);
@@ -262,7 +262,7 @@
ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_bool(ETK_FALSE));
etk_type_property_add(widget_type, "focusable",
ETK_WIDGET_FOCUSABLE_PROPERTY,
ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_bool(ETK_FALSE));
- etk_type_property_add(widget_type, "focus_on_press",
ETK_WIDGET_FOCUS_ON_PRESS_PROPERTY,
+ etk_type_property_add(widget_type, "focus_on_click",
ETK_WIDGET_FOCUS_ON_CLICK_PROPERTY,
ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_bool(ETK_FALSE));
etk_type_property_add(widget_type, "repeat_mouse_events",
ETK_WIDGET_REPEAT_MOUSE_EVENTS_PROPERTY,
ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_bool(ETK_FALSE));
@@ -1911,7 +1911,7 @@
widget->visible = ETK_FALSE;
widget->visibility_locked = ETK_FALSE;
widget->focusable = ETK_FALSE;
- widget->focus_on_press = ETK_FALSE;
+ widget->focus_on_click = ETK_FALSE;
widget->use_focus_order = ETK_FALSE;
widget->has_event_object = ETK_FALSE;
widget->repeat_mouse_events = ETK_FALSE;
@@ -2025,10 +2025,9 @@
widget->focusable = etk_property_value_bool_get(value);
etk_object_notify(object, "focusable");
break;
- /* TODO: rename it to "focus_on_click" */
- case ETK_WIDGET_FOCUS_ON_PRESS_PROPERTY:
- widget->focus_on_press = etk_property_value_bool_get(value);
- etk_object_notify(object, "focus_on_press");
+ case ETK_WIDGET_FOCUS_ON_CLICK_PROPERTY:
+ widget->focus_on_click = etk_property_value_bool_get(value);
+ etk_object_notify(object, "focus_on_click");
break;
default:
break;
@@ -2084,8 +2083,8 @@
case ETK_WIDGET_FOCUSABLE_PROPERTY:
etk_property_value_bool_set(value, widget->focusable);
break;
- case ETK_WIDGET_FOCUS_ON_PRESS_PROPERTY:
- etk_property_value_bool_set(value, widget->focus_on_press);
+ case ETK_WIDGET_FOCUS_ON_CLICK_PROPERTY:
+ etk_property_value_bool_set(value, widget->focus_on_click);
break;
default:
break;
@@ -2318,9 +2317,10 @@
{
Etk_Widget *widget;
- if (!(widget = ETK_WIDGET(object)) || !widget->focus_on_press)
+ if (!(widget = ETK_WIDGET(object)))
return;
- etk_widget_focus(widget);
+ if (widget->focus_on_click)
+ etk_widget_focus(widget);
}
/* Evas Callback: Called when the widget is released by the mouse */
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_widget.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- etk_widget.h 8 Aug 2006 17:02:48 -0000 1.35
+++ etk_widget.h 8 Aug 2006 18:51:22 -0000 1.36
@@ -186,7 +186,7 @@
unsigned int pass_mouse_events : 1;
unsigned int has_event_object : 1;
unsigned int focusable : 1;
- unsigned int focus_on_press : 1;
+ unsigned int focus_on_click : 1;
unsigned int use_focus_order : 1;
unsigned int need_size_recalc : 1;
unsigned int need_redraw : 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
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
