Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_scrollbar.c ewl_scrollbar.h ewl_combo.c
Log Message:
Slight naming convention change.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_scrollbar.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_scrollbar.c 8 Oct 2005 06:22:59 -0000 1.6
+++ ewl_scrollbar.c 17 Oct 2005 14:45:38 -0000 1.7
@@ -85,24 +85,24 @@
/*
* Create the basic widgets that are contained in the scrollbar.
*/
- s->button_decrement = ewl_button_new();
- ewl_widget_internal_set(s->button_decrement, TRUE);
- ewl_object_alignment_set(EWL_OBJECT(s->button_decrement),
+ s->decrement = ewl_button_new();
+ ewl_widget_internal_set(s->decrement, TRUE);
+ ewl_object_alignment_set(EWL_OBJECT(s->decrement),
EWL_FLAG_ALIGN_CENTER);
- ewl_object_fill_policy_set(EWL_OBJECT(s->button_decrement),
+ ewl_object_fill_policy_set(EWL_OBJECT(s->decrement),
EWL_FLAG_FILL_NONE);
- ewl_widget_show(s->button_decrement);
+ ewl_widget_show(s->decrement);
/*
* Create the increment button.
*/
- s->button_increment = ewl_button_new();
- ewl_widget_internal_set(s->button_increment, TRUE);
- ewl_object_alignment_set(EWL_OBJECT(s->button_increment),
+ s->increment = ewl_button_new();
+ ewl_widget_internal_set(s->increment, TRUE);
+ ewl_object_alignment_set(EWL_OBJECT(s->increment),
EWL_FLAG_ALIGN_CENTER);
- ewl_object_fill_policy_set(EWL_OBJECT(s->button_increment),
+ ewl_object_fill_policy_set(EWL_OBJECT(s->increment),
EWL_FLAG_FILL_NONE);
- ewl_widget_show(s->button_increment);
+ ewl_widget_show(s->increment);
/*
* Setup the seeker portion
@@ -118,21 +118,21 @@
* Attach callbacks to the buttons and seeker to handle the various
* events.
*/
- ewl_callback_append(s->button_increment, EWL_CALLBACK_MOUSE_DOWN,
+ ewl_callback_append(s->increment, EWL_CALLBACK_MOUSE_DOWN,
ewl_scrollbar_scroll_start_cb, s);
- ewl_callback_append(s->button_increment, EWL_CALLBACK_MOUSE_UP,
+ ewl_callback_append(s->increment, EWL_CALLBACK_MOUSE_UP,
ewl_scrollbar_scroll_stop_cb, s);
- ewl_callback_append(s->button_decrement, EWL_CALLBACK_MOUSE_DOWN,
+ ewl_callback_append(s->decrement, EWL_CALLBACK_MOUSE_DOWN,
ewl_scrollbar_scroll_start_cb, s);
- ewl_callback_append(s->button_decrement, EWL_CALLBACK_MOUSE_UP,
+ ewl_callback_append(s->decrement, EWL_CALLBACK_MOUSE_UP,
ewl_scrollbar_scroll_stop_cb, s);
/*
* Set the default alignment for the buttons.
*/
- ewl_object_alignment_set(EWL_OBJECT(s->button_decrement),
+ ewl_object_alignment_set(EWL_OBJECT(s->decrement),
EWL_FLAG_ALIGN_CENTER);
- ewl_object_alignment_set(EWL_OBJECT(s->button_increment),
+ ewl_object_alignment_set(EWL_OBJECT(s->increment),
EWL_FLAG_ALIGN_CENTER);
/*
@@ -162,8 +162,8 @@
/*
* Set the appearance strings for the parts of the scrollbar
*/
- ewl_widget_appearance_set(s->button_decrement, "button_decrement");
- ewl_widget_appearance_set(s->button_increment, "button_increment");
+ ewl_widget_appearance_set(s->decrement, "decrement");
+ ewl_widget_appearance_set(s->increment, "increment");
if (s->buttons_alignment & EWL_FLAG_ALIGN_LEFT) {
@@ -171,9 +171,9 @@
* Place in decrement, increment, seeker order.
*/
ewl_container_child_append(EWL_CONTAINER(s),
- s->button_decrement);
+ s->decrement);
ewl_container_child_append(EWL_CONTAINER(s),
- s->button_increment);
+ s->increment);
ewl_container_child_append(EWL_CONTAINER(s), s->seeker);
}
else if (s->buttons_alignment & EWL_FLAG_ALIGN_RIGHT) {
@@ -183,9 +183,9 @@
*/
ewl_container_child_append(EWL_CONTAINER(s), s->seeker);
ewl_container_child_append(EWL_CONTAINER(s),
- s->button_decrement);
+ s->decrement);
ewl_container_child_append(EWL_CONTAINER(s),
- s->button_increment);
+ s->increment);
}
else {
@@ -193,10 +193,10 @@
* Place in decrement, seeker, increment order.
*/
ewl_container_child_append(EWL_CONTAINER(s),
- s->button_decrement);
+ s->decrement);
ewl_container_child_append(EWL_CONTAINER(s), s->seeker);
ewl_container_child_append(EWL_CONTAINER(s),
- s->button_increment);
+ s->increment);
}
/*
@@ -249,8 +249,8 @@
s->buttons_alignment = ewl_theme_data_int_get(EWL_WIDGET(s),
"button_order");
- ewl_container_child_remove(EWL_CONTAINER(s), s->button_decrement);
- ewl_container_child_remove(EWL_CONTAINER(s), s->button_increment);
+ ewl_container_child_remove(EWL_CONTAINER(s), s->decrement);
+ ewl_container_child_remove(EWL_CONTAINER(s), s->increment);
ewl_container_child_remove(EWL_CONTAINER(s), s->seeker);
ewl_seeker_orientation_set(EWL_SEEKER(s->seeker), o);
@@ -267,9 +267,9 @@
* Place in decrement, increment, seeker order.
*/
ewl_container_child_append(EWL_CONTAINER(s),
- s->button_decrement);
+ s->decrement);
ewl_container_child_append(EWL_CONTAINER(s),
- s->button_increment);
+ s->increment);
ewl_container_child_append(EWL_CONTAINER(s), s->seeker);
}
else if (s->buttons_alignment & EWL_FLAG_ALIGN_RIGHT) {
@@ -279,9 +279,9 @@
*/
ewl_container_child_append(EWL_CONTAINER(s), s->seeker);
ewl_container_child_append(EWL_CONTAINER(s),
- s->button_decrement);
+ s->decrement);
ewl_container_child_append(EWL_CONTAINER(s),
- s->button_increment);
+ s->increment);
}
else {
@@ -289,10 +289,10 @@
* Place in decrement, seeker, increment order.
*/
ewl_container_child_append(EWL_CONTAINER(s),
- s->button_decrement);
+ s->decrement);
ewl_container_child_append(EWL_CONTAINER(s), s->seeker);
ewl_container_child_append(EWL_CONTAINER(s),
- s->button_increment);
+ s->increment);
}
}
@@ -304,9 +304,9 @@
* Place in increment, decrement, seeker order.
*/
ewl_container_child_append(EWL_CONTAINER(s),
- s->button_increment);
+ s->increment);
ewl_container_child_append(EWL_CONTAINER(s),
- s->button_decrement);
+ s->decrement);
ewl_container_child_append(EWL_CONTAINER(s), s->seeker);
}
else if (s->buttons_alignment & EWL_FLAG_ALIGN_BOTTOM) {
@@ -316,9 +316,9 @@
*/
ewl_container_child_append(EWL_CONTAINER(s), s->seeker);
ewl_container_child_append(EWL_CONTAINER(s),
- s->button_increment);
+ s->increment);
ewl_container_child_append(EWL_CONTAINER(s),
- s->button_decrement);
+ s->decrement);
}
else {
@@ -326,10 +326,10 @@
* Place in increment, seeker, decrement order.
*/
ewl_container_child_append(EWL_CONTAINER(s),
- s->button_increment);
+ s->increment);
ewl_container_child_append(EWL_CONTAINER(s), s->seeker);
ewl_container_child_append(EWL_CONTAINER(s),
- s->button_decrement);
+ s->decrement);
}
}
@@ -472,7 +472,7 @@
DCHECK_PARAM_PTR("w", w);
s = EWL_SCROLLBAR(user_data);
- if (w == s->button_increment)
+ if (w == s->increment)
s->direction = 1;
else
s->direction = -1;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_scrollbar.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_scrollbar.h 8 Oct 2005 06:22:59 -0000 1.4
+++ ewl_scrollbar.h 17 Oct 2005 14:45:38 -0000 1.5
@@ -48,15 +48,15 @@
Ewl_Box box; /**< Inherit from Ewl_Box */
Ewl_Widget *seeker; /**< The internal Ewl_Seeker */
- Ewl_Widget *button_decrement; /**< The internal decrement button */
- Ewl_Widget *button_increment; /**< The internal increment button */
+ Ewl_Widget *decrement; /**< The internal decrement button */
+ Ewl_Widget *increment; /**< The internal increment button */
unsigned int buttons_alignment; /**< The ordering of buttons */
double fill_percentage; /**< Ratio of size for draggable */
double start_time; /**< Time scrolling began */
Ecore_Timer *timer; /**< Repeating timer for scrolling */
- signed char direction; /**< */
- signed char invert; /**< Invert the scrolling direction */
+ signed char direction; /**< */
+ signed char invert; /**< Invert the scrolling direction
*/
};
Ewl_Widget *ewl_scrollbar_new(void);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_combo.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_combo.c 10 Oct 2005 18:43:31 -0000 1.8
+++ ewl_combo.c 17 Oct 2005 14:45:38 -0000 1.9
@@ -62,7 +62,7 @@
ewl_container_redirect_set( EWL_CONTAINER(combo), NULL );
combo->button = ewl_button_new();
- ewl_widget_appearance_set(combo->button, "button_decrement");
+ ewl_widget_appearance_set(combo->button, "decrement");
ewl_object_alignment_set(EWL_OBJECT(combo->button),
EWL_FLAG_ALIGN_RIGHT);
ewl_container_child_append(EWL_CONTAINER(combo), combo->button);
ewl_widget_show(combo->button);
@@ -167,7 +167,7 @@
ewl_combo_selected_set(combo, w);
ewl_widget_hide(EWL_MENU_BASE(combo)->popup);
- ewl_widget_appearance_set(combo->button, "button_decrement");
+ ewl_widget_appearance_set(combo->button, "decrement");
ewl_callback_del(EWL_MENU_BASE(combo)->popbox, EWL_CALLBACK_FOCUS_OUT,
ewl_combo_collapse_cb);
ewl_callback_del(combo->button, EWL_CALLBACK_MOUSE_DOWN,
@@ -231,7 +231,7 @@
DENTER_FUNCTION(DLEVEL_STABLE);
combo = EWL_COMBO(user_data);
- ewl_widget_appearance_set(combo->button, "button_increment");
+ ewl_widget_appearance_set(combo->button, "increment");
ewl_menu_base_expand_cb(EWL_WIDGET(combo), ev_data, NULL);
if (!REALIZED(combo->base.popup)) {
@@ -276,7 +276,7 @@
combo = EWL_COMBO(user_data);
ewl_widget_hide(EWL_MENU_BASE(combo)->popup);
- ewl_widget_appearance_set(combo->button, "button_decrement");
+ ewl_widget_appearance_set(combo->button, "decrement");
ewl_callback_del(EWL_MENU_BASE(combo)->popbox, EWL_CALLBACK_FOCUS_OUT,
ewl_combo_collapse_cb);
ewl_callback_del(combo->button, EWL_CALLBACK_MOUSE_DOWN,
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
