Enlightenment CVS committal
Author : pfritz
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/bin/tests
Modified Files:
ewl_media.c ewl_progressbar.c ewl_seeker.c ewl_spinner.c
ewl_text_editor.c ewl_theme.c
Log Message:
**API-BREAK**
- add ewl_range a new abstract widget to unify the api of seeker, spinner and
progressbar
- NOTE this breaks colorpicker hopefully for a short time
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/ewl_media.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_media.c 13 Jul 2006 19:43:24 -0000 1.6
+++ ewl_media.c 11 Aug 2006 04:00:57 -0000 1.7
@@ -160,7 +160,7 @@
t = data;
pos = ewl_media_position_get(EWL_MEDIA(video));
- ewl_seeker_value_set(EWL_SEEKER(seeker), pos);
+ ewl_range_value_set(EWL_RANGE(seeker), pos);
ewl_media_position_time_get(EWL_MEDIA(video), &h, &m, &s);
snprintf(buf, sizeof(buf), "%02i:%02i:%02.0f", h, m, s);
ewl_text_text_set(t, buf);
@@ -172,7 +172,7 @@
{
double val;
- val = ewl_seeker_value_get(EWL_SEEKER(seeker));
+ val = ewl_range_value_get(EWL_RANGE(seeker));
if (ewl_media_seekable_get(EWL_MEDIA(video)))
ewl_media_position_set(EWL_MEDIA(video), val);
}
@@ -200,7 +200,7 @@
if (file) free(file);
len = ewl_media_length_get(EWL_MEDIA(video));
- ewl_seeker_range_set(EWL_SEEKER(seeker), len);
+ ew_range_max_value_set(EWL_RANGE(seeker), len);
}
}
@@ -308,9 +308,9 @@
ewl_container_child_append(EWL_CONTAINER(b), seeker);
ewl_object_fill_policy_set(EWL_OBJECT(seeker),
EWL_FLAG_FILL_VSHRINK | EWL_FLAG_FILL_HFILL);
- ewl_seeker_value_set(EWL_SEEKER(seeker), 0.0);
- ewl_seeker_range_set(EWL_SEEKER(seeker), 0.0);
- ewl_seeker_step_set(EWL_SEEKER(seeker), 1.0);
+ ewl_range_value_set(EWL_RANGE(seeker), 0.0);
+ ewl_range_max_value_set(EWL_RANGE(seeker), 0.0);
+ ewl_range_step_set(EWL_RANGE(seeker), 1.0);
ewl_callback_append(seeker, EWL_CALLBACK_VALUE_CHANGED, seeker_move_cb,
video);
ewl_widget_show(seeker);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/ewl_progressbar.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_progressbar.c 13 Jul 2006 19:43:24 -0000 1.4
+++ ewl_progressbar.c 11 Aug 2006 04:00:57 -0000 1.5
@@ -48,8 +48,10 @@
*/
for (i = 0; i < 2; i++) {
progressbar[i] = ewl_progressbar_new();
- ewl_progressbar_value_set (EWL_PROGRESSBAR(progressbar[i]), 0);
- ewl_widget_show (progressbar[i]);
+ if (i == 0)
+ ewl_range_invert_set(EWL_RANGE(progressbar[0]), TRUE);
+ ewl_range_value_set(EWL_RANGE(progressbar[i]), 0);
+ ewl_widget_show(progressbar[i]);
progress_timer[i] = ecore_timer_add(0.1, cb_increment_progress,
(Ewl_Progressbar *) progressbar[i]);
@@ -62,8 +64,8 @@
* Third big progressbar
*/
progressbar[2] = ewl_progressbar_new();
- ewl_progressbar_value_set (EWL_PROGRESSBAR(progressbar[2]), 0);
- ewl_widget_show (progressbar[2]);
+ ewl_range_value_set(EWL_RANGE(progressbar[2]), 0);
+ ewl_widget_show(progressbar[2]);
progress_timer[2] = ecore_timer_add(0.1, cb_increment_progress,
(Ewl_Progressbar *) progressbar[2]);
@@ -105,12 +107,12 @@
double val, value, range;
char c[30];
int i;
- Ewl_Progressbar *p;
+ Ewl_Range *r;
- p = EWL_PROGRESSBAR(data);
- val = ewl_progressbar_value_get(p);
+ r = EWL_RANGE(data);
+ val = ewl_range_value_get(r);
- if (val >= p->range) {
+ if (val >= r->max_val) {
for (i = 0; i < 3; i++) {
if (progress_timer[i]) {
ecore_timer_del(progress_timer[i]);
@@ -121,27 +123,26 @@
}
val += 1;
- ewl_progressbar_value_set(p, val);
-
+ ewl_range_value_set(r, val);
if (val >= 20 && val < 35 ) {
- ewl_progressbar_custom_label_set (p,
+ ewl_progressbar_custom_label_set(EWL_PROGRESSBAR(r),
"%.0lf / %.0lf kbytes");
}
if (val >= 35 && val < 60) {
- value = ewl_progressbar_value_get (p);
- range = ewl_progressbar_range_get (p);
+ value = ewl_range_value_get(r);
+ range = ewl_range_max_val_get(r);
- snprintf (c, sizeof (c), "%.0lf of %.0lf beers", value, range);
- ewl_progressbar_label_set (p, c);
+ snprintf(c, sizeof (c), "%.0lf of %.0lf beers", value, range);
+ ewl_progressbar_label_set(EWL_PROGRESSBAR(r), c);
}
if (val == 60)
- ewl_progressbar_label_hide (p);
+ ewl_progressbar_label_hide(EWL_PROGRESSBAR(r));
if (val == 70)
- ewl_progressbar_label_show (p);
+ ewl_progressbar_label_show(EWL_PROGRESSBAR(r));
return 1;
}
@@ -170,9 +171,9 @@
printf ("New random value: %d\n", j);
for (i = 0; i < 3; i++) {
- ewl_progressbar_range_set(EWL_PROGRESSBAR(progressbar[i]), j);
+ ewl_range_max_val_set(EWL_RANGE(progressbar[i]), j);
- if (ewl_progressbar_value_get(EWL_PROGRESSBAR(progressbar[i]))
>= j)
+ if (ewl_range_value_get(EWL_RANGE(progressbar[i])) >= j)
cb_rerun_progressbars(EWL_WIDGET (progressbar[i]),
NULL, NULL);
}
@@ -191,7 +192,7 @@
* (since the auto label is turned off when you label manually)
*/
ewl_progressbar_label_show (EWL_PROGRESSBAR (progressbar[i]));
- ewl_progressbar_value_set (EWL_PROGRESSBAR (progressbar[i]), 0);
+ ewl_range_value_set(EWL_RANGE(progressbar[i]), 0);
if (progress_timer[i]) {
ecore_timer_del(progress_timer[i]);
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/ewl_seeker.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_seeker.c 13 Jul 2006 19:43:24 -0000 1.4
+++ ewl_seeker.c 11 Aug 2006 04:00:57 -0000 1.5
@@ -40,10 +40,10 @@
static void
cb_print_value(Ewl_Widget *w, void *ev __UNUSED__, void *data __UNUSED__)
{
- Ewl_Seeker *s;
+ Ewl_Range *r;
- s = EWL_SEEKER(w);
- printf("Seeker set to %g\n", ewl_seeker_value_get(s));
+ r = EWL_RANGE(w);
+ printf("Seeker set to %g\n", ewl_range_value_get(r));
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/ewl_spinner.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_spinner.c 13 Jul 2006 19:43:24 -0000 1.4
+++ ewl_spinner.c 11 Aug 2006 04:00:57 -0000 1.5
@@ -37,10 +37,10 @@
spinner[0] = ewl_spinner_new();
ewl_spinner_digits_set(EWL_SPINNER(spinner[0]), 0);
- ewl_spinner_min_val_set(EWL_SPINNER(spinner[0]), 0);
- ewl_spinner_max_val_set(EWL_SPINNER(spinner[0]), 1280);
- ewl_spinner_value_set(EWL_SPINNER(spinner[0]), 0.0);
- ewl_spinner_step_set(EWL_SPINNER(spinner[0]), 1.0);
+ ewl_range_min_val_set(EWL_RANGE(spinner[0]), 0);
+ ewl_range_max_val_set(EWL_RANGE(spinner[0]), 1280);
+ ewl_range_value_set(EWL_RANGE(spinner[0]), 0.0);
+ ewl_range_step_set(EWL_RANGE(spinner[0]), 1.0);
ewl_container_child_append(EWL_CONTAINER(spinner_row), spinner[0]);
ewl_widget_show(spinner[0]);
@@ -61,10 +61,10 @@
spinner[1] = ewl_spinner_new();
ewl_spinner_digits_set(EWL_SPINNER(spinner[1]), 0);
- ewl_spinner_min_val_set(EWL_SPINNER(spinner[1]), 0);
- ewl_spinner_max_val_set(EWL_SPINNER(spinner[1]), 1024);
- ewl_spinner_value_set(EWL_SPINNER(spinner[1]), 0.0);
- ewl_spinner_step_set(EWL_SPINNER(spinner[1]), 1.0);
+ ewl_range_min_val_set(EWL_RANGE(spinner[1]), 0);
+ ewl_range_max_val_set(EWL_RANGE(spinner[1]), 1024);
+ ewl_range_value_set(EWL_RANGE(spinner[1]), 0.0);
+ ewl_range_step_set(EWL_RANGE(spinner[1]), 1.0);
ewl_container_child_append(EWL_CONTAINER(spinner_row), spinner[1]);
ewl_widget_show(spinner[1]);
@@ -85,10 +85,10 @@
spinner[2] = ewl_spinner_new();
ewl_spinner_digits_set(EWL_SPINNER(spinner[2]), 0);
- ewl_spinner_min_val_set(EWL_SPINNER(spinner[2]), 0.0);
- ewl_spinner_max_val_set(EWL_SPINNER(spinner[2]), 1280);
- ewl_spinner_value_set(EWL_SPINNER(spinner[2]), 0.0);
- ewl_spinner_step_set(EWL_SPINNER(spinner[2]), 1.0);
+ ewl_range_min_val_set(EWL_RANGE(spinner[2]), 0.0);
+ ewl_range_max_val_set(EWL_RANGE(spinner[2]), 1280);
+ ewl_range_value_set(EWL_RANGE(spinner[2]), 0.0);
+ ewl_range_step_set(EWL_RANGE(spinner[2]), 1.0);
ewl_container_child_append(EWL_CONTAINER(spinner_row), spinner[2]);
ewl_widget_show(spinner[2]);
@@ -109,10 +109,10 @@
spinner[3] = ewl_spinner_new();
ewl_spinner_digits_set(EWL_SPINNER(spinner[3]), 0);
- ewl_spinner_min_val_set(EWL_SPINNER(spinner[3]), 0.0);
- ewl_spinner_max_val_set(EWL_SPINNER(spinner[3]), 1024);
- ewl_spinner_value_set(EWL_SPINNER(spinner[3]), 0.0);
- ewl_spinner_step_set(EWL_SPINNER(spinner[3]), 1.0);
+ ewl_range_min_val_set(EWL_RANGE(spinner[3]), 0.0);
+ ewl_range_max_val_set(EWL_RANGE(spinner[3]), 1024);
+ ewl_range_value_set(EWL_RANGE(spinner[3]), 0.0);
+ ewl_range_step_set(EWL_RANGE(spinner[3]), 1.0);
ewl_container_child_append(EWL_CONTAINER(spinner_row), spinner[3]);
ewl_widget_show(spinner[3]);
@@ -131,10 +131,10 @@
void *data __UNUSED__)
{
printf("X %d, Y %d, W %d, H %d\n",
- (int)ewl_spinner_value_get(EWL_SPINNER(spinner[0])),
- (int)ewl_spinner_value_get(EWL_SPINNER(spinner[1])),
- (int)ewl_spinner_value_get(EWL_SPINNER(spinner[2])),
- (int)ewl_spinner_value_get(EWL_SPINNER(spinner[3])));
+ (int)ewl_range_value_get(EWL_RANGE(spinner[0])),
+ (int)ewl_range_value_get(EWL_RANGE(spinner[1])),
+ (int)ewl_range_value_get(EWL_RANGE(spinner[2])),
+ (int)ewl_range_value_get(EWL_RANGE(spinner[3])));
}
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/ewl_text_editor.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ewl_text_editor.c 13 Jul 2006 19:43:24 -0000 1.5
+++ ewl_text_editor.c 11 Aug 2006 04:00:57 -0000 1.6
@@ -111,10 +111,10 @@
o = ewl_spinner_new();
ewl_container_child_append(EWL_CONTAINER(hbox), o);
ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_NONE);
- ewl_spinner_value_set(EWL_SPINNER(o), 12);
- ewl_spinner_min_val_set(EWL_SPINNER(o), 8);
- ewl_spinner_max_val_set(EWL_SPINNER(o), 72);
- ewl_spinner_step_set(EWL_SPINNER(o), 1);
+ ewl_range_value_set(EWL_RANGE(o), 12);
+ ewl_range_min_val_set(EWL_RANGE(o), 8);
+ ewl_range_max_val_set(EWL_RANGE(o), 72);
+ ewl_range_step_set(EWL_RANGE(o), 1);
ewl_spinner_digits_set(EWL_SPINNER(o), 0);
ewl_callback_append(o, EWL_CALLBACK_VALUE_CHANGED,
ete_cb_font_size, NULL);
@@ -328,13 +328,13 @@
ewl_text_cursor_position_set(EWL_TEXT(entry),
ewl_text_trigger_start_pos_get(selection));
ewl_text_font_size_apply(EWL_TEXT(entry),
- ewl_spinner_value_get(EWL_SPINNER(w)),
+ ewl_range_value_get(EWL_RANGE(w)),
ewl_text_trigger_length_get(selection));
ewl_text_cursor_position_set(EWL_TEXT(entry), cursor_pos);
}
else
ewl_text_font_size_set(EWL_TEXT(entry),
- ewl_spinner_value_get(EWL_SPINNER(w)));
+ ewl_range_value_get(EWL_RANGE(w)));
}
static void
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/ewl_theme.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_theme.c 13 Jul 2006 19:43:24 -0000 1.4
+++ ewl_theme.c 11 Aug 2006 04:00:57 -0000 1.5
@@ -164,10 +164,10 @@
misc = ewl_spinner_new();
ewl_spinner_digits_set(EWL_SPINNER(misc), 0);
- ewl_spinner_min_val_set(EWL_SPINNER(misc), 0);
- ewl_spinner_max_val_set(EWL_SPINNER(misc), 1024);
- ewl_spinner_step_set(EWL_SPINNER(misc), 1.0);
- ewl_spinner_value_set(EWL_SPINNER(misc), 15.0);
+ ewl_range_min_val_set(EWL_RANGE(misc), 0);
+ ewl_range_max_val_set(EWL_RANGE(misc), 1024);
+ ewl_range_step_set(EWL_RANGE(misc), 1.0);
+ ewl_range_value_set(EWL_RANGE(misc), 15.0);
ewl_object_alignment_set(EWL_OBJECT(misc), EWL_FLAG_ALIGN_LEFT);
ewl_container_child_append(EWL_CONTAINER(vbox), misc);
ewl_widget_show(misc);
@@ -177,9 +177,9 @@
ewl_widget_show(misc);
misc = ewl_hseeker_new();
- ewl_seeker_range_set(EWL_SEEKER(misc), 10);
- ewl_seeker_step_set(EWL_SEEKER(misc), 1.0);
- ewl_seeker_value_set(EWL_SEEKER(misc), 15.0);
+ ewl_range_max_val_set(EWL_RANGE(misc), 10.0);
+ ewl_range_step_set(EWL_RANGE(misc), 1.0);
+ ewl_range_value_set(EWL_RANGE(misc), 15.0);
ewl_object_alignment_set(EWL_OBJECT(misc), EWL_FLAG_ALIGN_LEFT);
ewl_container_child_append(EWL_CONTAINER(vbox), misc);
ewl_widget_show(misc);
-------------------------------------------------------------------------
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
