Enlightenment CVS committal

Author  : moom
Project : e17
Module  : libs/etk

Dir     : e17/libs/etk/src/bin


Modified Files:
        etk_slider_test.c 


Log Message:
* [Slider] Sliders can now have labels directly in their theme-object, 
like e17's sliders.


===================================================================
RCS file: /cvs/e/e17/libs/etk/src/bin/etk_slider_test.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- etk_slider_test.c   28 Nov 2006 21:40:06 -0000      1.8
+++ etk_slider_test.c   20 Feb 2007 20:50:19 -0000      1.9
@@ -1,15 +1,13 @@
 #include "etk_test.h"
 
-static void _etk_test_slider_value_changed(Etk_Object *object, double value, 
void *data);
-
 /* Creates the window for the slider test */
 void etk_test_slider_window_create(void *data)
 {
    static Etk_Widget *win = NULL;
    Etk_Widget *table;
    Etk_Widget *slider;
-   Etk_Widget *label;
    Etk_Widget *spinner;
+   Etk_Widget *separator;
    
    if (win)
    {
@@ -25,38 +23,24 @@
    table = etk_table_new(2, 3, ETK_FALSE);
    etk_container_add(ETK_CONTAINER(win), table);
    
+   /* Create the horizontal slider */
    slider = etk_hslider_new(0.0, 255.0, 128.0, 1.0, 10.0);
+   etk_slider_label_set(ETK_SLIDER(slider), "%.0f");
    etk_widget_size_request_set(slider, 130, 130);
    etk_table_attach_default(ETK_TABLE(table), slider, 0, 0, 0, 0);
    
-   label = etk_label_new("128.00");
-   etk_table_attach(ETK_TABLE(table), label, 0, 0, 1, 1, 0, 0, ETK_TABLE_NONE);
-   etk_signal_connect("value_changed", ETK_OBJECT(slider), 
ETK_CALLBACK(_etk_test_slider_value_changed), label);
-   
-   spinner = etk_spinner_new(0.0, 255.0, 128.00, 1.0, 10.0);
-   etk_table_attach(ETK_TABLE(table), spinner, 0, 0, 2, 2, 0, 0, 
ETK_TABLE_NONE);
-   //etk_signal_connect("value_changed", ETK_OBJECT(spinner), 
ETK_CALLBACK(_etk_test_spinner_value_changed), label);
-   
+   /* Create the vertical slider */
    slider = etk_vslider_new(0.0, 255.0, 128.0, 1.0, 10.0);
+   etk_slider_label_set(ETK_SLIDER(slider), "%.0f");
    etk_widget_size_request_set(slider, 130, 130);
    etk_table_attach_default(ETK_TABLE(table), slider, 1, 1, 0, 0);
-
-   label = etk_label_new("128.00");
-   etk_table_attach(ETK_TABLE(table), label, 1, 1, 1, 1, 0, 0, ETK_TABLE_NONE);
-   etk_signal_connect("value_changed", ETK_OBJECT(slider), 
ETK_CALLBACK(_etk_test_slider_value_changed), label);
    
+   separator = etk_hseparator_new();
+   etk_table_attach_default(ETK_TABLE(table), separator, 0, 1, 1, 1);
+   
+   /* Create the spinner */
    spinner = etk_spinner_new(0.0, 255.0, 128.00, 1.0, 10.0);
-   etk_table_attach(ETK_TABLE(table), spinner, 1, 1, 2, 2, 0, 0, 
ETK_TABLE_NONE);
-   //etk_signal_connect("value_changed", ETK_OBJECT(spinner), 
ETK_CALLBACK(_etk_test_spinner_value_changed), label);
+   etk_table_attach(ETK_TABLE(table), spinner, 0, 1, 2, 2, 0, 0, 
ETK_TABLE_NONE);
    
    etk_widget_show_all(win);
-}
-
-/* Called when the value of the slider is changed */
-static void _etk_test_slider_value_changed(Etk_Object *object, double value, 
void *data)
-{
-   char string[256];
-
-   snprintf(string, 255, "%'.2f", value);
-   etk_label_set(ETK_LABEL(data), string);
 }



-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to