Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_includes.h e_test.c e_widget_csel.c
e_widget_cslider.c e_widget_spectrum.c
Added Files:
e_widget_color_well.c e_widget_color_well.h
Log Message:
more csel work. theme it up a bit.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -3 -r1.136 -r1.137
--- Makefile.am 14 Aug 2006 15:28:44 -0000 1.136
+++ Makefile.am 15 Aug 2006 00:54:32 -0000 1.137
@@ -171,6 +171,7 @@
e_widget_spectrum.h \
e_widget_cslider.h \
e_widget_csel.h \
+e_widget_color_well.h \
e_int_config_wallpaper.h \
e_int_config_wallpaper_import.h
@@ -319,6 +320,7 @@
e_widget_spectrum.c \
e_widget_cslider.c \
e_widget_csel.c \
+e_widget_color_well.c \
e_int_config_wallpaper.c \
e_int_config_wallpaper_import.c \
$(ENLIGHTENMENTHEADERS)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -3 -r1.115 -r1.116
--- e_includes.h 14 Aug 2006 15:28:44 -0000 1.115
+++ e_includes.h 15 Aug 2006 00:54:32 -0000 1.116
@@ -148,4 +148,5 @@
#include "e_spectrum.h"
#include "e_widget_spectrum.h"
#include "e_widget_cslider.h"
+#include "e_widget_color_well.h"
#include "e_widget_csel.h"
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_test.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- e_test.c 14 Aug 2006 23:30:31 -0000 1.66
+++ e_test.c 15 Aug 2006 00:54:32 -0000 1.67
@@ -823,11 +823,12 @@
e_dialog_content_set(dia, o, mw, mh);
/* buttons at the bottom */
+ e_dialog_button_add(dia, "Cancel", NULL, NULL, NULL);
e_dialog_button_add(dia, "OK", NULL, NULL, NULL);
e_dialog_resizable_set(dia, 1);
e_win_centered_set(dia->win, 1);
e_dialog_show(dia);
- e_win_resize(dia->win, 460, 230);
+ e_win_resize(dia->win, 460, 260);
}
#else
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_csel.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_widget_csel.c 14 Aug 2006 23:30:32 -0000 1.3
+++ e_widget_csel.c 15 Aug 2006 00:54:33 -0000 1.4
@@ -9,7 +9,7 @@
Evas_Object *obj;
Evas_List *sliders;
Evas_List *entries;
- Evas_Object *spectrum, *vert, *current;
+ Evas_Object *spectrum, *vert, *well;
E_Color *cv;
char **values;
int mode;
@@ -96,7 +96,7 @@
}
}
- // and update the sepctrum
+ // update the spectrum
if (o != wd->spectrum && changed != -1)
{
if (wd->mode == changed ||
@@ -107,6 +107,8 @@
e_widget_spectrum_update(wd->spectrum, 0);
}
+ e_widget_color_well_update(wd->well);
+
// now update the text fields to show current values
for(l = wd->entries, i = 0; l; l = l->next, i++)
{
@@ -124,7 +126,7 @@
snprintf(buf, 10, "%i", wd->cv->b);
break;
case E_COLOR_COMPONENT_H:
- snprintf(buf, 10, "%.2f", wd->cv->h);
+ snprintf(buf, 10, "%.0f", wd->cv->h);
break;
case E_COLOR_COMPONENT_S:
snprintf(buf, 10, "%.2f", wd->cv->s);
@@ -231,6 +233,13 @@
e_widget_table_object_append(table, o, 2, 1, 1, 1, 1, 1, 0, 1);
e_widget_table_object_append(table, frame, 3, 1, 1, 1, 1, 1, 1, 1);
+
+ o = e_widget_color_well_add(evas, cv);
+ e_widget_sub_object_add(obj, o);
+ evas_object_show(o);
+ wd->well = o;
+ e_widget_table_object_append(table, o, 3, 2, 1, 1, 1, 1, 1, 1);
+
return obj;
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_cslider.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_widget_cslider.c 14 Aug 2006 04:38:49 -0000 1.1
+++ e_widget_cslider.c 15 Aug 2006 00:54:33 -0000 1.2
@@ -86,7 +86,7 @@
evas_object_show(o);
e_widget_sub_object_add(obj, o);
wd->o_grad = o;
- edje_object_part_swallow(wd->o_cslider, "gradient", o);
+ edje_object_part_swallow(wd->o_cslider, "content", o);
evas_object_intercept_resize_callback_add(o, _e_wid_resize, wd);
evas_object_intercept_move_callback_add(o, _e_wid_move, wd);
_e_wid_update(wd);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_spectrum.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_widget_spectrum.c 14 Aug 2006 04:38:49 -0000 1.1
+++ e_widget_spectrum.c 15 Aug 2006 00:54:33 -0000 1.2
@@ -66,14 +66,13 @@
evas_object_intercept_resize_callback_add(o, _e_wid_resize, wd);
evas_object_intercept_move_callback_add(o, _e_wid_move, wd);
-
o = e_spectrum_add(evas);
e_spectrum_color_value_set(o, cv);
e_spectrum_mode_set(o, mode);
e_widget_sub_object_add(obj, o);
evas_object_show(o);
wd->o_spectrum = o;
- edje_object_part_swallow(wd->o_edje, "spectrum", o);
+ edje_object_part_swallow(wd->o_edje, "content", o);
edje_extern_object_min_size_set(o, 100, 100);
o = evas_object_rectangle_add(evas);
-------------------------------------------------------------------------
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
