E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_widget.c
Log Message:
- speed up ewl_widget_type_is. This makes things ~10% faster when in DEBUG
and there are a lot of widgets (opening a directory with 1 files)
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- ewl_widget.c24 Jul 2006 23:51:54 - 1.91
+++ ewl_widget.c1 Aug 2006 21:32:16 - 1.92
@@ -295,19 +295,19 @@
*/
void ewl_widget_obscure(Ewl_Widget *w)
{
-DENTER_FUNCTION(DLEVEL_STABLE);
-DCHECK_PARAM_PTR(w, w);
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR(w, w);
if (OBSCURED(w))
DRETURN(DLEVEL_STABLE);
-ewl_object_visible_add(EWL_OBJECT(w), EWL_FLAG_VISIBLE_OBSCURED);
+ ewl_object_visible_add(EWL_OBJECT(w), EWL_FLAG_VISIBLE_OBSCURED);
-if (REALIZED(w) || ewl_object_queued_has(EWL_OBJECT(w),
-EWL_FLAG_QUEUED_RSCHEDULED))
-ewl_callback_call(w, EWL_CALLBACK_OBSCURE);
+ if (REALIZED(w) || ewl_object_queued_has(EWL_OBJECT(w),
+ EWL_FLAG_QUEUED_RSCHEDULED))
+ ewl_callback_call(w, EWL_CALLBACK_OBSCURE);
-DLEAVE_FUNCTION(DLEVEL_STABLE);
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
}
/**
@@ -1579,7 +1579,6 @@
ewl_widget_type_is(Ewl_Widget *widget, const char *type)
{
int found = FALSE;
- int end;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET(widget, widget, FALSE);
@@ -1587,14 +1586,35 @@
/* we don't check the type of the widget in here or we'll get into
* an infinate loop ... */
- end = strlen(type);
- if (widget-inheritance) {
- char *match;
+ if (widget-inheritance)
+ {
+ char *match, *end;
+
match = (char *)widget-inheritance;
- while ((match = strstr(match, type))) {
- if ((*(match - 1) == ':') (*(match + end) == ':'))
+ end = match + 1;
+
+ while (*end != '\0')
+ {
+ int count = 0;
+
+ /* while the type still matches the current part of
+* the string */
+ while ((*(type + count) == *end) (*end != ':'))
+ {
+ count ++;
+ end ++;
+ }
+
+ /* if we ended with the : then this is a match */
+ if (*end == ':')
+ {
found = TRUE;
- match++;
+ break;
+ }
+
+ /* move to the next set of :s and then move past it */
+ while ((*end != '\0') (*end != ':')) end ++;
+ while (*end == ':') end ++;
}
}
@@ -2178,7 +2198,7 @@
*/
void
ewl_widget_reveal_cb(Ewl_Widget *w, void *ev_data __UNUSED__,
- void *user_data __UNUSED__)
+ void *user_data __UNUSED__)
{
Ewl_Embed *emb;
@@ -2219,7 +2239,7 @@
/*
* Attempt to load a cached object first, fallback to adding a
* new one.
- */
+*/
w-theme_object = ewl_embed_object_request(emb, edje);
if (!w-theme_object) {
w-theme_object = edje_object_add(emb-evas);
@@ -2342,7 +2362,7 @@
*/
void
ewl_widget_obscure_cb(Ewl_Widget *w, void *ev_data __UNUSED__,
- void *user_data __UNUSED__)
+ void *user_data __UNUSED__)
{
Ewl_Embed *emb;
Ewl_Container *pc;
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl ningerso
Enlightenment CVS committal
Author : ningerso
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_engines.c
Log Message:
Additional engine hook points, these are not yet implemented in any engine yet.
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_engines.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ewl_engines.c 12 Jul 2006 11:13:16 - 1.10
+++ ewl_engines.c 1 Aug 2006 23:33:15 - 1.11
@@ -978,6 +978,195 @@
DRETURN_PTR(NULL, DLEVEL_STABLE);
}
+/**
+ * @return Returns a new theme object on success, NULL on failure
+ * @brief Add a theme object.
+ */
+void *
+ewl_engine_theme_object_add(Ewl_Embed *embed)
+{
+ Ewl_Engine_Cb_Theme_Object_Add theme_object_add;
+
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR_RET(embed, embed, NULL);
+ DCHECK_TYPE_RET(embed, embed, EWL_EMBED_TYPE, NULL);
+
+ theme_object_add = ewl_engine_hook_get(embed,
+ EWL_ENGINE_THEME_OBJECT_ADD);
+ if (theme_object_add)
+ DRETURN_PTR(theme_object_add(embed), DLEVEL_STABLE);
+
+ DRETURN_PTR(NULL, DLEVEL_STABLE);
+}
+
+/**
+ * @return Returns a new theme object on success, NULL on failure
+ * @brief Del a theme object.
+ */
+void
+ewl_engine_theme_object_del(Ewl_Embed *embed, void *obj)
+{
+ Ewl_Engine_Cb_Theme_Object_Del theme_object_del;
+
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR(obj, obj);
+
+ theme_object_del = ewl_engine_hook_get(embed,
+ EWL_ENGINE_THEME_OBJECT_DEL);
+ if (theme_object_del)
+ theme_object_del(obj);
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+/**
+ * @return Returns no value.
+ * @brief Move a theme object.
+ */
+void
+ewl_engine_theme_object_move(Ewl_Embed *embed, void *obj, int x, int y)
+{
+ Ewl_Engine_Cb_Theme_Object_Move theme_object_move;
+
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR(embed, embed);
+ DCHECK_TYPE(embed, embed, EWL_EMBED_TYPE);
+
+ theme_object_move = ewl_engine_hook_get(EWL_EMBED(embed),
+ EWL_ENGINE_THEME_OBJECT_MOVE);
+ if (theme_object_move)
+ theme_object_move(obj, x, y);
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+/**
+ * @return Returns no value.
+ * @brief Resize a theme object.
+ */
+void
+ewl_engine_theme_object_resize(Ewl_Embed *embed, void *obj, int width, int
height)
+{
+ Ewl_Engine_Cb_Theme_Object_Resize theme_object_resize;
+
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR(embed, embed);
+ DCHECK_TYPE(embed, embed, EWL_WIDGET_TYPE);
+
+ theme_object_resize = ewl_engine_hook_get(embed,
+ EWL_ENGINE_THEME_OBJECT_RESIZE);
+ if (theme_object_resize)
+ theme_object_resize(obj, width, height);
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+/**
+ * @return Returns no value.
+ * @brief Show a theme object.
+ */
+void
+ewl_engine_theme_object_show(Ewl_Embed *embed, void *obj)
+{
+ Ewl_Engine_Cb_Theme_Object_Show theme_object_show;
+
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR(embed, embed);
+ DCHECK_TYPE(embed, embed, EWL_EMBED_TYPE);
+
+ theme_object_show = ewl_engine_hook_get(embed,
+ EWL_ENGINE_THEME_OBJECT_SHOW);
+ if (theme_object_show)
+ theme_object_show(obj);
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+/**
+ * @return Returns no value.
+ * @brief Hide a theme object.
+ */
+void
+ewl_engine_theme_object_hide(Ewl_Embed *embed, void *obj)
+{
+ Ewl_Engine_Cb_Theme_Object_Hide theme_object_hide;
+
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR(embed, embed);
+ DCHECK_TYPE(embed, embed, EWL_EMBED_TYPE);
+
+ theme_object_hide = ewl_engine_hook_get(embed,
+ EWL_ENGINE_THEME_OBJECT_HIDE);
+ if (theme_object_hide)
+ theme_object_hide(obj);
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+/**
+ * @return Returns no value.
+ * @brief Clip set a theme object.
+ */
+void
+ewl_engine_theme_object_clip_set(Ewl_Embed *embed, void *obj, void *clip)
+{
+ Ewl_Engine_Cb_Theme_Object_Clip_Set theme_object_clip_set;
+
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR(embed, embed);
+ DCHECK_TYPE(embed, embed, EWL_EMBED_TYPE);
+
+ theme_object_clip_set = ewl_engine_hook_get(embed,
+ EWL_ENGINE_THEME_OBJECT_CLIP_SET);
+ if (theme_object_clip_set)
+ theme_object_clip_set(obj, clip);
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+/**
+ * @return Returns no value.
+ * @brief Clip unset a theme object.
+ */
+void
+ewl_engine_theme_object_clip_unset(Ewl_Embed
E CVS: libs/ewl ningerso
Enlightenment CVS committal Author : ningerso Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_engines.h Log Message: Fix definition of engine hook callbacks. === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_engines.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- ewl_engines.h 12 Jul 2006 11:13:16 - 1.8 +++ ewl_engines.h 1 Aug 2006 23:35:58 - 1.9 @@ -210,8 +210,8 @@ typedef void (*Ewl_Engine_Cb_Theme_Object_Del)(void *obj); typedef void (*Ewl_Engine_Cb_Theme_Object_Move)(void *obj, int x, int y); typedef void (*Ewl_Engine_Cb_Theme_Object_Resize)(void *obj, int w, int h); -typedef void *(*Ewl_Engine_Cb_Theme_Object_Show)(void *obj, void *clip); -typedef void *(*Ewl_Engine_Cb_Theme_Object_Hide)(void *obj, void *clip); +typedef void *(*Ewl_Engine_Cb_Theme_Object_Show)(void *obj); +typedef void *(*Ewl_Engine_Cb_Theme_Object_Hide)(void *obj); typedef void *(*Ewl_Engine_Cb_Theme_Object_Clip_Set)(void *obj, void *clip); typedef void *(*Ewl_Engine_Cb_Theme_Object_Clip_Unset)(void *obj); typedef void (*Ewl_Engine_Cb_Theme_Object_Stack_Add)(Ewl_Widget *w); - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_list.c ewl_list.h ewl_widget.c
Log Message:
- Make sure we have read the entire type string before assuming a match.
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_list.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_list.c 17 Jul 2006 04:39:06 - 1.3
+++ ewl_list.c 2 Aug 2006 00:40:48 - 1.4
@@ -3,6 +3,13 @@
#include ewl_macros.h
#include ewl_private.h
+static void ewl_list_cb_highlight_configure(Ewl_Widget *w,
+ void *ev, void *data);
+static void ewl_list_cb_highlighted_destroy(Ewl_Widget *w,
+ void *ev, void *data);
+static void ewl_list_cb_highlight_destroy(Ewl_Widget *w,
+ void *ev, void *data);
+
/**
* @return Returns a new Ewl_Widget on success or NULL on failure
* @brief Creates and initializes a new Ewl_List widget
@@ -206,12 +213,38 @@
DCHECK_PARAM_PTR(list, list);
DCHECK_TYPE(list, list, EWL_LIST_TYPE);
- if (list-selected == w)
+ if (list-selected.widget == w)
DRETURN(DLEVEL_STABLE);
- /* XXX probably need to do some theme thing here to highlight as
-* selected */
- list-selected = w;
+ if (list-selected.highlight)
+ ewl_widget_destroy(list-selected.highlight);
+
+ list-selected.widget = w;
+
+ if (w)
+ {
+ Ewl_Widget *f;
+ int width, height;
+
+ f = ewl_floater_new();
+ ewl_widget_internal_set(f, TRUE);
+ ewl_widget_appearance_set(f, highlight);
+ ewl_floater_follow_set(EWL_FLOATER(f), w);
+ ewl_object_current_size_get(EWL_OBJECT(w), width, height);
+ ewl_object_size_request(EWL_OBJECT(f), width, height);
+
+ ewl_callback_append(w, EWL_CALLBACK_CONFIGURE,
+ ewl_list_cb_highlight_configure, f);
+ ewl_callback_prepend(w, EWL_CALLBACK_DESTROY,
+ ewl_list_cb_highlighted_destroy, f);
+ ewl_callback_prepend(f, EWL_CALLBACK_DESTROY,
+ ewl_list_cb_highlight_destroy, w);
+ ewl_container_child_append(EWL_CONTAINER(list), f);
+ ewl_widget_show(f);
+
+ list-selected.highlight = f;
+ }
+
ewl_callback_call(EWL_WIDGET(list), EWL_CALLBACK_VALUE_CHANGED);
@@ -230,7 +263,7 @@
DCHECK_PARAM_PTR_RET(list, list, NULL);
DCHECK_TYPE_RET(list, list, EWL_LIST_TYPE, NULL);
- DRETURN_PTR(list-selected, DLEVEL_STABLE);
+ DRETURN_PTR(list-selected.widget, DLEVEL_STABLE);
}
/**
@@ -272,10 +305,11 @@
DCHECK_PARAM_PTR_RET(list, list, -1);
DCHECK_TYPE_RET(list, list, EWL_LIST_TYPE, -1);
- if (!list-selected)
+ if (!list-selected.widget)
DRETURN_INT(-1, DLEVEL_STABLE);
- idx = ewl_container_child_index_get(EWL_CONTAINER(list),
list-selected);
+ idx = ewl_container_child_index_get(EWL_CONTAINER(list),
+ list-selected.widget);
DRETURN_INT(idx, DLEVEL_STABLE);
}
@@ -340,6 +374,10 @@
DCHECK_TYPE(c, c, EWL_CONTAINER_TYPE);
DCHECK_TYPE(w, w, EWL_WIDGET_TYPE);
+ /* the highlight floaters are internal */
+ if (ewl_widget_internal_is(w))
+ DRETURN(DLEVEL_STABLE);
+
ewl_callback_append(w, EWL_CALLBACK_CLICKED,
ewl_list_cb_item_clicked, c);
@@ -366,7 +404,7 @@
DCHECK_TYPE(w, w, EWL_WIDGET_TYPE);
list = EWL_LIST(c);
- if (list-selected == w)
+ if (list-selected.widget == w)
ewl_list_selected_widget_set(list, NULL);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -391,7 +429,7 @@
DCHECK_TYPE(w, w, EWL_WIDGET_TYPE);
list = EWL_LIST(c);
- if (list-selected == w)
+ if (list-selected.widget == w)
ewl_list_selected_widget_set(list, NULL);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -418,6 +456,62 @@
list = data;
ewl_list_selected_widget_set(list, w);
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+static void
+ewl_list_cb_highlight_configure(Ewl_Widget *w, void *ev, void *data)
+{
+ Ewl_Object *f;
+ int width, height;
+
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR(w, w);
+ DCHECK_PARAM_PTR(data, data);
+ DCHECK_TYPE(w, w, EWL_WIDGET_TYPE);
+ DCHECK_TYPE(data, data, EWL_FLOATER_TYPE);
+
+ f = data;
+ ewl_object_current_size_get(EWL_OBJECT(w), width, height);
+ ewl_object_size_request(f, width, height);
+
+
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_list.c ewl_list.h
Log Message:
- that wasn't suppost to go in there
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_list.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_list.c 2 Aug 2006 00:40:48 - 1.4
+++ ewl_list.c 2 Aug 2006 00:44:32 - 1.5
@@ -3,13 +3,6 @@
#include ewl_macros.h
#include ewl_private.h
-static void ewl_list_cb_highlight_configure(Ewl_Widget *w,
- void *ev, void *data);
-static void ewl_list_cb_highlighted_destroy(Ewl_Widget *w,
- void *ev, void *data);
-static void ewl_list_cb_highlight_destroy(Ewl_Widget *w,
- void *ev, void *data);
-
/**
* @return Returns a new Ewl_Widget on success or NULL on failure
* @brief Creates and initializes a new Ewl_List widget
@@ -213,38 +206,12 @@
DCHECK_PARAM_PTR(list, list);
DCHECK_TYPE(list, list, EWL_LIST_TYPE);
- if (list-selected.widget == w)
+ if (list-selected == w)
DRETURN(DLEVEL_STABLE);
- if (list-selected.highlight)
- ewl_widget_destroy(list-selected.highlight);
-
- list-selected.widget = w;
-
- if (w)
- {
- Ewl_Widget *f;
- int width, height;
-
- f = ewl_floater_new();
- ewl_widget_internal_set(f, TRUE);
- ewl_widget_appearance_set(f, highlight);
- ewl_floater_follow_set(EWL_FLOATER(f), w);
- ewl_object_current_size_get(EWL_OBJECT(w), width, height);
- ewl_object_size_request(EWL_OBJECT(f), width, height);
-
- ewl_callback_append(w, EWL_CALLBACK_CONFIGURE,
- ewl_list_cb_highlight_configure, f);
- ewl_callback_prepend(w, EWL_CALLBACK_DESTROY,
- ewl_list_cb_highlighted_destroy, f);
- ewl_callback_prepend(f, EWL_CALLBACK_DESTROY,
- ewl_list_cb_highlight_destroy, w);
- ewl_container_child_append(EWL_CONTAINER(list), f);
- ewl_widget_show(f);
-
- list-selected.highlight = f;
- }
-
+ /* XXX probably need to do some theme thing here to highlight as
+* selected */
+ list-selected = w;
ewl_callback_call(EWL_WIDGET(list), EWL_CALLBACK_VALUE_CHANGED);
@@ -263,7 +230,7 @@
DCHECK_PARAM_PTR_RET(list, list, NULL);
DCHECK_TYPE_RET(list, list, EWL_LIST_TYPE, NULL);
- DRETURN_PTR(list-selected.widget, DLEVEL_STABLE);
+ DRETURN_PTR(list-selected, DLEVEL_STABLE);
}
/**
@@ -305,11 +272,10 @@
DCHECK_PARAM_PTR_RET(list, list, -1);
DCHECK_TYPE_RET(list, list, EWL_LIST_TYPE, -1);
- if (!list-selected.widget)
+ if (!list-selected)
DRETURN_INT(-1, DLEVEL_STABLE);
- idx = ewl_container_child_index_get(EWL_CONTAINER(list),
- list-selected.widget);
+ idx = ewl_container_child_index_get(EWL_CONTAINER(list),
list-selected);
DRETURN_INT(idx, DLEVEL_STABLE);
}
@@ -374,10 +340,6 @@
DCHECK_TYPE(c, c, EWL_CONTAINER_TYPE);
DCHECK_TYPE(w, w, EWL_WIDGET_TYPE);
- /* the highlight floaters are internal */
- if (ewl_widget_internal_is(w))
- DRETURN(DLEVEL_STABLE);
-
ewl_callback_append(w, EWL_CALLBACK_CLICKED,
ewl_list_cb_item_clicked, c);
@@ -404,7 +366,7 @@
DCHECK_TYPE(w, w, EWL_WIDGET_TYPE);
list = EWL_LIST(c);
- if (list-selected.widget == w)
+ if (list-selected == w)
ewl_list_selected_widget_set(list, NULL);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -429,7 +391,7 @@
DCHECK_TYPE(w, w, EWL_WIDGET_TYPE);
list = EWL_LIST(c);
- if (list-selected.widget == w)
+ if (list-selected == w)
ewl_list_selected_widget_set(list, NULL);
DLEAVE_FUNCTION(DLEVEL_STABLE);
@@ -456,62 +418,6 @@
list = data;
ewl_list_selected_widget_set(list, w);
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-static void
-ewl_list_cb_highlight_configure(Ewl_Widget *w, void *ev, void *data)
-{
- Ewl_Object *f;
- int width, height;
-
- DENTER_FUNCTION(DLEVEL_STABLE);
- DCHECK_PARAM_PTR(w, w);
- DCHECK_PARAM_PTR(data, data);
- DCHECK_TYPE(w, w, EWL_WIDGET_TYPE);
- DCHECK_TYPE(data, data, EWL_FLOATER_TYPE);
-
- f = data;
- ewl_object_current_size_get(EWL_OBJECT(w), width, height);
- ewl_object_size_request(f, width, height);
-
- DLEAVE_FUNCTION(DLEVEL_STABLE);
-}
-
-static
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit.h exhibit_comment.c exhibit_comment.h exhibit_image.c
exhibit_image.h exhibit_main.c exhibit_main.h exhibit_menus.c
exhibit_menus.h exhibit_tab.c exhibit_tab.h
Log Message:
more work from balony (saving, deleting), some cleanups
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- exhibit.h 29 Jul 2006 19:50:04 - 1.20
+++ exhibit.h 2 Aug 2006 03:10:43 - 1.21
@@ -1,3 +1,6 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
+ */
#ifndef _EX_H
#define _EX_H
@@ -72,7 +75,13 @@
{
char *dir;
char cur_path[PATH_MAX];
- char cur_file[PATH_MAX];
+
+ /* Path and filename of the dir to the
+ currently set image */
+ char *set_img_path;
+ char *cur_file;
+ intimage_loaded;
+
intnum;
Etk_Bool fit_window;
@@ -85,6 +94,7 @@
Etk_Widget*itree;
Etk_Widget*scrolled_view;
Etk_Widget*alignment;
+ Etk_Widget*dialog;
Etk_Tree_Col *dcol;
Etk_Tree_Col *icol;
@@ -167,7 +177,8 @@
Etk_Widget *win;
Etk_Widget *filechooser;
Etk_Widget *entry;
- Etk_Image *im;
+ Etk_Image *im;
+ Exhibit *e;
};
struct _Ex_Config_Version
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_comment.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- exhibit_comment.c 29 Jul 2006 19:50:04 - 1.8
+++ exhibit_comment.c 2 Aug 2006 03:10:43 - 1.9
@@ -1,3 +1,6 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
+ */
#include exhibit.h
static void _ex_comment_save_clicked_cb(Etk_Object *obj, void *data);
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_comment.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- exhibit_comment.h 14 Mar 2006 01:01:15 - 1.2
+++ exhibit_comment.h 2 Aug 2006 03:10:43 - 1.3
@@ -1,3 +1,6 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
+ */
#ifndef _EX_COMMENT_H
#define _EX_COMMENT_H
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- exhibit_image.c 29 Jul 2006 21:18:37 - 1.24
+++ exhibit_image.c 2 Aug 2006 03:10:43 - 1.25
@@ -1,3 +1,6 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
+ */
#include exhibit.h
#include Ecore_File.h
#include Ecore_Evas.h
@@ -173,7 +176,8 @@
data2 = malloc(w * h * sizeof(unsigned int));
memcpy(data2, data, w * h * sizeof(unsigned int));
etk_object_data_set(ETK_OBJECT(im), undo, data2);
- printf(Undo: setting data %p size %d\n, data, w * h * sizeof(unsigned
int));
+ printf(Undo: setting data %p size %d, image %p\n, data,
+w * h * sizeof(unsigned int), im);
return data2;
}
@@ -193,7 +197,7 @@
if (data)
{
- printf(Undo: getting data %p\n, data);
+ printf(Undo: getting data %p, image %p\n, data, im);
evas_object_image_data_set(im-image_object, data);
evas_object_image_data_update_add(im-image_object, 0, 0, w, h);
etk_object_data_set(ETK_OBJECT(im), undo, NULL);
@@ -530,7 +534,7 @@
{
Etk_Event_Key_Up_Down *ev = event;
- if(!strcmp(ev-key, Return) || !strcmp(ev-key, KP_Enter))
+ if (!strcmp(ev-key, Return) || !strcmp(ev-key, KP_Enter))
_ex_image_save_as_cb(data);
}
@@ -538,46 +542,49 @@
_ex_image_save_as_cb(void *data)
{
Ex_Filedialog *fd = data;
- pid_t pid;
char file[1024];
const char *basename;
const char *dir;
+ Etk_Image *im = ETK_IMAGE(fd-e-cur_tab-image);
basename = etk_entry_text_get(ETK_ENTRY(fd-entry));
dir = etk_filechooser_widget_current_folder_get
- (ETK_FILECHOOSER_WIDGET(fd-filechooser));
+ (ETK_FILECHOOSER_WIDGET(fd-filechooser));
- if (!basename || !dir)
- return;
-
- sprintf(file, %s/%s, dir, basename);
+ if (!dir || !basename)
+return;
+
+ sprintf(file, %s/%s, dir, basename);
printf(Saving: %s\n, file);
-
- pid = fork();
- if(!pid)
+
+ /* Dont fork for the tree polulating to work */
+ evas_object_image_save(im-image_object, file, NULL, NULL);
+
+ /* Refresh list if the file is saved in our dir */
+ if (!strcmp(fd-e-cur_tab-set_img_path, fd-e-cur_tab-cur_path))
{
- evas_object_image_save(fd-im-image_object, file, NULL, NULL);
- exit(0);
+
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/exhibit Modified Files: TODO Log Message: more work from balony (saving, deleting), some cleanups === RCS file: /cvs/e/e17/proto/exhibit/TODO,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- TODO10 Mar 2006 12:05:55 - 1.6 +++ TODO2 Aug 2006 03:10:43 - 1.7 @@ -1,6 +1,10 @@ -TODO (release version 1.0.0 when this is done): -=== + +* RELEASE 0.1.0: + + +o TODO: + -- -menus * new window * save image as @@ -14,26 +18,43 @@ - options * slide show speed - * path to favorites * comments visibile / hidden by default (with remembering last state) -- wallpaper setting - center, stretch, tile - -- andy's comments feature - * gui bits - * comment code - - key shotcuts * x - fit / unfit to window +- save window geometry between sessions + +o DONE: + -- ++ andy's comments feature + sorting + wheel changing / zooming + dnd + fix .spec file + make argv work with /path/to/image.png and not only /path/to/dir -BUGS: -= += +* RELEASSE 0.2.0: += + +o TODO: + -- +- integrate with evfs for file tagging and categories +- integrate with libgphoto for digicam interaction + + +* MISC FEATURES: + + +o TODO: + -- +- wallpaper setting - center, stretch, tile +- path to favorites (will be replace by evfs) + +=== +* BUGS: +=== - fix autocomplete (combobox?) - if we're scrolled to the end of the dir tree, clicking on a dir needs to - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e shorne
Enlightenment CVS committal Author : shorne Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_widget_button.c Log Message: Allow the icon to be clicked by passing events. Why was this not done before? === RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_button.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_widget_button.c 28 Jul 2006 13:42:03 - 1.10 +++ e_widget_button.c 2 Aug 2006 04:40:46 - 1.11 @@ -90,6 +90,7 @@ edje_object_part_swallow(wd-o_button, icon_swallow, icon); edje_object_signal_emit(wd-o_button, icon_visible, ); edje_object_message_signal_process(wd-o_button); + evas_object_pass_events_set(icon, 1); evas_object_show(icon); e_widget_sub_object_add(obj, icon); } - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/data/themes
Modified Files:
e17.edc
Log Message:
- cleanup
===
RCS file: /cvs/e/e17/libs/ewl/data/themes/e17.edc,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- e17.edc 30 Jun 2006 00:33:09 - 1.41
+++ e17.edc 2 Aug 2006 05:13:08 - 1.42
@@ -39,11 +39,17 @@
data {
item, /label/group label;
item, /label/textpart text;
+
+item, /border/group border;
+item, /border/label/group border/label;
+
item, /button/group button;
+
item, /radio/group radio;
+item, /radiobutton/group checkbutton;
+
item, /check/group checkbox;
item, /checkbutton/group checkbutton;
-item, /radiobutton/group checkbutton;
item, /entry/group entry;
item, /entry/color/a 255;
@@ -51,6 +57,11 @@
item, /entry/font_size 10;
item, /cursor/group cursor;
+item, /text/color/a 255;
+item, /text/font Vera;
+item, /text/font_size 10;
+item, /text/style none;
+
item, /hseparator/group hline;
item, /vseparator/group vline;
@@ -59,21 +70,17 @@
item, /icon/group icon;
-item, /text/color/a 255;
-item, /text/font Vera;
-item, /text/font_size 10;
-item, /text/style none;
-
item, /freebox/auto/padding 5;
-item, /tree/group tree_background;
item, /tree2/group tree_background;
-item, /row/group row_background;
-item, /row/cell/label/group row_text;
-
+item, /tree/group tree_background;
item, /tree/paned/button/group tree_header;
item, /tree/paned/grabber/vertical/group vline;
+
item, /node/check/group treenode;
+
+item, /row/group row_background;
+item, /row/cell/label/group row_text;
item, /progressbar_bar/group progressbar_bar;
item, /progressbar/group progressbar;
@@ -111,7 +118,7 @@
item, /spacer/group spacer;
-item, /notebook2/group notebook;
+item, /notebook/group notebook;
item, /tabbar/tab/group tab;
item, /tabbar/tab/label/group tab/label;
@@ -129,26 +136,26 @@
item, /vseeker/vbutton/group vscrollbar_drag;
item, /hseeker/hbutton/group hscrollbar_drag;
-item, /border/group border;
-item, /border/label/group border/label;
-
+item, /menubar/group menubar;
item, /imenu/group menu;
item, /menu/group menu;
item, /menu/vbox/menu_container/body/label/group submenuitem;
+item, /menu_item/body/label/group menuitem;
-item, /statusbar/group statusbar;
+item, /scrollpane/group box;
-item, /menubar/group menubar;
-item, /menu_item/body/label/group menuitem;
+item, /statusbar/group statusbar;
item, /tooltip/offset 15;
item, /tooltip/delay 1.0;
item, /tooltip/group window;
item, /window/group window;
-item, /scrollpane/group box;
-item, /theme/author dj2 (www.everburning.com) and LinuxTitan
(www.ecoding.org);
+
+item, /theme/name e17;
+item, /theme/author dj2 (www.everburning.com);
+item, /theme/contributors LinuxTitan (www.ecoding.org);
item, /theme/font_path fonts;
item, /theme/license Creative Commons License:
http://creativecommons.org/licenses/bg-sa/1.0;;
-item, /theme/name e17;
}
+
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto turran
Enlightenment CVS committal Author : turran Project : e17 Module : proto Dir : e17/proto/extrackt/src/bin/etk_fe Modified Files: gui.c Log Message: Etk === + API changed: etk_init(int *argc, char *** argv). + etk_argument: now it modifies the parameters on the detected arguments Rest of etk apps, change etk_init(engine) with the new one. === RCS file: /cvs/e/e17/proto/extrackt/src/bin/etk_fe/gui.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- gui.c 27 Jul 2006 01:41:11 - 1.7 +++ gui.c 2 Aug 2006 05:54:00 - 1.8 @@ -840,7 +840,7 @@ //E_Gui_Etk *gui; enhance_init(); - etk_init(ecore_evas_software_x11); + etk_init(NULL,NULL); /* create main window */ gui = calloc(1, sizeof(E_Gui_Etk)); - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto turran
Enlightenment CVS committal
Author : turran
Project : e17
Module : proto
Dir : e17/proto/emphasis/src/bin
Modified Files:
emphasis.c
Log Message:
Etk
===
+ API changed: etk_init(int *argc, char *** argv).
+ etk_argument: now it modifies the parameters on the detected arguments
Rest of etk apps, change etk_init(engine) with the new one.
===
RCS file: /cvs/e/e17/proto/emphasis/src/bin/emphasis.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- emphasis.c 27 Jul 2006 02:03:05 - 1.6
+++ emphasis.c 2 Aug 2006 05:53:58 - 1.7
@@ -6,7 +6,7 @@
Emphasis_Gui *gui;
/* void */ enhance_init();
- if (!etk_init(ecore_evas_software_x11))
+ if (!etk_init(argc, argv))
{
fprintf(stderr, Unable to init etk\n);
return 1;
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto turran
Enlightenment CVS committal
Author : turran
Project : e17
Module : proto
Dir : e17/proto/edje_viewer/src/bin
Modified Files:
main.c
Log Message:
Etk
===
+ API changed: etk_init(int *argc, char *** argv).
+ etk_argument: now it modifies the parameters on the detected arguments
Rest of etk apps, change etk_init(engine) with the new one.
===
RCS file: /cvs/e/e17/proto/edje_viewer/src/bin/main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- main.c 27 Jul 2006 01:49:38 - 1.3
+++ main.c 2 Aug 2006 05:53:58 - 1.4
@@ -6,7 +6,7 @@
int main(int argc, char **argv)
{
- if (!etk_init(ecore_evas_software_x11))
+ if (!etk_init(argc, argv))
{
fprintf(stderr, Could not init etk. Exiting...\n);
return 0;
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto turran
Enlightenment CVS committal Author : turran Project : e17 Module : proto Dir : e17/proto/edvi/src/bin Modified Files: edvi_etk_test.c Log Message: Etk === + API changed: etk_init(int *argc, char *** argv). + etk_argument: now it modifies the parameters on the detected arguments Rest of etk apps, change etk_init(engine) with the new one. === RCS file: /cvs/e/e17/proto/edvi/src/bin/edvi_etk_test.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- edvi_etk_test.c 27 Jul 2006 01:50:32 - 1.2 +++ edvi_etk_test.c 2 Aug 2006 05:53:58 - 1.3 @@ -35,7 +35,7 @@ return -1; } - etk_init (ecore_evas_software_x11); + etk_init (argc, argv); dvi = etk_dvi_new (); etk_dvi_file_set (ETK_DVI (dvi), argv[1]); - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto turran
Enlightenment CVS committal
Author : turran
Project : e17
Module : proto
Dir : e17/proto/entropy/utils
Modified Files:
entropy_queuer.c
Log Message:
Etk
===
+ API changed: etk_init(int *argc, char *** argv).
+ etk_argument: now it modifies the parameters on the detected arguments
Rest of etk apps, change etk_init(engine) with the new one.
===
RCS file: /cvs/e/e17/proto/entropy/utils/entropy_queuer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- entropy_queuer.c22 Jul 2006 10:50:42 - 1.1
+++ entropy_queuer.c2 Aug 2006 05:53:59 - 1.2
@@ -81,7 +81,7 @@
int attempts = 0;
int i;
- ecore_init();
+ ecore_init(NULL, NULL);
ecore_ipc_init();
if (argc == 1 || strcmp(argv[1], --enqueue)) {
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto turran
Enlightenment CVS committal
Author : turran
Project : e17
Module : proto
Dir : e17/proto/epdf/src/bin
Modified Files:
epdf_etk_test.c
Log Message:
Etk
===
+ API changed: etk_init(int *argc, char *** argv).
+ etk_argument: now it modifies the parameters on the detected arguments
Rest of etk apps, change etk_init(engine) with the new one.
===
RCS file: /cvs/e/e17/proto/epdf/src/bin/epdf_etk_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- epdf_etk_test.c 17 Apr 2006 18:06:10 - 1.2
+++ epdf_etk_test.c 2 Aug 2006 05:53:59 - 1.3
@@ -57,7 +57,7 @@
int page_count;
int i;
- etk_init ();
+ etk_init (NULL,NULL);
if (argc == 1) {
printf (Usage: %s pdf_file\n, argv[0]);
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto turran
Enlightenment CVS committal Author : turran Project : e17 Module : proto Dir : e17/proto/entropy/src/plugins Modified Files: layout_etk_simple.c Log Message: Etk === + API changed: etk_init(int *argc, char *** argv). + etk_argument: now it modifies the parameters on the detected arguments Rest of etk apps, change etk_init(engine) with the new one. === RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -3 -r1.52 -r1.53 --- layout_etk_simple.c 27 Jul 2006 01:48:08 - 1.52 +++ layout_etk_simple.c 2 Aug 2006 05:53:59 - 1.53 @@ -215,7 +215,7 @@ Entropy_Plugin* base; /*Init etk */ - etk_init (ecore_evas_software_x11); + etk_init (NULL, NULL); plugin = entropy_malloc(sizeof(Entropy_Plugin_Gui)); base = ENTROPY_PLUGIN(plugin); - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto turran
Enlightenment CVS committal
Author : turran
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_argument.c etk_argument.h etk_main.c etk_main.h
etk_menu_bar.c
Log Message:
Etk
===
+ API changed: etk_init(int *argc, char *** argv).
+ etk_argument: now it modifies the parameters on the detected arguments
Rest of etk apps, change etk_init(engine) with the new one.
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_argument.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_argument.c 15 Mar 2006 12:38:41 - 1.6
+++ etk_argument.c 2 Aug 2006 05:53:59 - 1.7
@@ -44,19 +44,24 @@
*
* int main(int argc, char **argv)
* {
- *etk_arguments_parse(args, argc, argv);
+ *etk_arguments_parse(args, argc, argv);
*
*return 0;
* }
* @endcode
*/
-int etk_arguments_parse(Etk_Argument *args, int argc, char **argv)
+int etk_arguments_parse(Etk_Argument *args, int *argc, char ***argv)
{
int i;
+ int ret_argc;
+ char **ret_argv;
+ int *delete; /* 1 delete, 0 keep */
Etk_Argument *arg;
-
+
+ if(!args || !argc || !argv)
+ return ETK_ARGUMENT_RETURN_OK_NONE_PARSED;
/* no arguments */
- if(argc 2)
+ if(*argc 2)
{
/* check for required arguments */
i = 0;
@@ -72,18 +77,22 @@
}
return ETK_ARGUMENT_RETURN_OK_NONE_PARSED;
}
-
- for(i = 1; i argc; i++)
+ /* create the array */
+ delete = calloc(*argc, sizeof(int));
+
+ /* arguments */
+ for(i = 1; i *argc; i++)
{
char *cur;
- cur = argv[i];
+ cur = (*argv)[i];
if(!cur) continue;
/* min length is 2, anything less is invalid */
if(strlen(cur) 2 cur[0] == '-')
{
-printf(_(Argument %d '%s' is too short\n), i, argv[i]);
+printf(_(Argument %d '%s' is too short\n), i, (*argv)[i]);
+free(delete);
return ETK_ARGUMENT_RETURN_MALFORMED;
}
@@ -99,14 +108,15 @@
{
/* check to see if arg needs value */
if((arg-flags ETK_ARGUMENT_FLAG_VALUE_REQUIRED)
- i + 1 argc)
+ i + 1 *argc)
{
- char *val = argv[i + 1];
+ char *val = (*argv)[i + 1];
/* if no value is present, report error */
if(val[0] == '-')
{
printf(_(Argument %d '%s' requires a value\n), i, cur);
+free(delete);
return ETK_ARGUMENT_RETURN_REQUIRED_VALUE_NOT_FOUND;
}
@@ -114,20 +124,22 @@
arg-flags |= ETK_ARGUMENT_FLAG_PRIV_SET;
_etk_argument_status = 1;
++i;
+ delete[i] = delete[i+1] = 1;
}
else if (arg-flags ETK_ARGUMENT_FLAG_VALUE_REQUIRED
-i + 1 = argc)
+i + 1 = *argc)
{
/* if no value is present, report error */
printf(_(Argument %d '%s' requires a value\n), i, cur);
+ free(delete);
return ETK_ARGUMENT_RETURN_REQUIRED_VALUE_NOT_FOUND;
}
else if(!(arg-flags ETK_ARGUMENT_FLAG_VALUE_REQUIRED))
{
arg-flags |= ETK_ARGUMENT_FLAG_PRIV_SET;
_etk_argument_status = 1;
+ delete[i] = 1;
}
-
}
++arg;
}
@@ -161,12 +173,12 @@
{
/* check to see if arg needs value */
if((arg-flags ETK_ARGUMENT_FLAG_VALUE_REQUIRED)
- ((i + 1 argc) || (tmp != NULL)))
+ ((i + 1 *argc) || (tmp != NULL)))
{
char *val;
if(!tmp)
- val = argv[i + 1];
+ val = (*argv)[i + 1];
else
val = tmp + 1;
@@ -174,37 +186,45 @@
if(val[0] == '-')
{
printf(_(Argument %d '%s' requires a value\n), i, cur);
+free(delete);
return ETK_ARGUMENT_RETURN_REQUIRED_VALUE_NOT_FOUND;
}
arg-data = evas_list_append(arg-data, val);
arg-flags |= ETK_ARGUMENT_FLAG_PRIV_SET;
- _etk_argument_status = 1;
+ _etk_argument_status = 1;
+ delete[i] = 1;
if(!tmp)
+ {
++i;
+ delete[i+1] = 1;
+ }
+
}
E CVS: proto turran
Enlightenment CVS committal Author : turran Project : e17 Module : proto Dir : e17/proto/estickies/src/bin Modified Files: stickies.c Log Message: Etk === + API changed: etk_init(int *argc, char *** argv). + etk_argument: now it modifies the parameters on the detected arguments Rest of etk apps, change etk_init(engine) with the new one. === RCS file: /cvs/e/e17/proto/estickies/src/bin/stickies.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- stickies.c 31 Jul 2006 00:31:45 - 1.2 +++ stickies.c 2 Aug 2006 05:53:59 - 1.3 @@ -435,7 +435,7 @@ ss-stickies = NULL; eet_init(); - etk_init(ecore_evas_software_x11); + etk_init(argc, argv); //etk_tooltips_enable(); _e_config_init(); _e_config_load(ss); - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto turran
Enlightenment CVS committal Author : turran Project : e17 Module : proto Dir : e17/proto/enhance/examples Modified Files: enhance_test.c Log Message: Etk === + API changed: etk_init(int *argc, char *** argv). + etk_argument: now it modifies the parameters on the detected arguments Rest of etk apps, change etk_init(engine) with the new one. === RCS file: /cvs/e/e17/proto/enhance/examples/enhance_test.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- enhance_test.c 27 Jul 2006 01:48:56 - 1.7 +++ enhance_test.c 2 Aug 2006 05:53:59 - 1.8 @@ -33,7 +33,7 @@ data = string1; enhance_init(); - etk_init(ecore_evas_software_x11); + etk_init(NULL,NULL); en = enhance_new(); enhance_callback_data_set(en, rip_only_clicked, data); - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto turran
Enlightenment CVS committal
Author : turran
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_test.c
Log Message:
Etk
===
+ API changed: etk_init(int *argc, char *** argv).
+ etk_argument: now it modifies the parameters on the detected arguments
Rest of etk apps, change etk_init(engine) with the new one.
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_test.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- etk_test.c 31 Jul 2006 23:23:12 - 1.25
+++ etk_test.c 2 Aug 2006 05:53:59 - 1.26
@@ -127,24 +127,11 @@
int main(int argc, char *argv[])
{
- /* TODO
-* + change etk_init to receive argc and argv
-* + make a parser for argv
-*/
- char *engine;
- if (argc 1)
- {
- if(!strcmp(argv[1], -fb))
- engine = strdup(ecore_fb);
- else
- engine = strdup(ecore_evas_software_x11);
- }
- if (!etk_init(engine))
+ if (!etk_init(argc, argv))
{
fprintf(stderr, Could not init etk. Exiting...\n);
return 1;
};
-
etk_tooltips_enable();
_etk_test_main_window();
etk_main();
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto turran
Enlightenment CVS committal Author : turran Project : e17 Module : proto Dir : e17/proto/empower/src/bin/etk Modified Files: empower_gui_etk.c Log Message: Etk === + API changed: etk_init(int *argc, char *** argv). + etk_argument: now it modifies the parameters on the detected arguments Rest of etk apps, change etk_init(engine) with the new one. === RCS file: /cvs/e/e17/proto/empower/src/bin/etk/empower_gui_etk.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- empower_gui_etk.c 27 Jul 2006 01:55:15 - 1.4 +++ empower_gui_etk.c 2 Aug 2006 05:53:59 - 1.5 @@ -6,7 +6,7 @@ Etk_Widget *button_cancel; Etk_Size size; - etk_init(ecore_evas_software_x11); + etk_init(NULL, NULL); em-dialog = etk_dialog_new(); em-hbox = etk_hbox_new(ETK_FALSE, 0); - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto turran
Enlightenment CVS committal
Author : turran
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_main.c
Log Message:
Etk
===
+ API changed: etk_init(int *argc, char *** argv).
+ etk_argument: now it modifies the parameters on the detected arguments
Rest of etk apps, change etk_init(engine) with the new one.
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- exhibit_main.c 2 Aug 2006 03:10:43 - 1.56
+++ exhibit_main.c 2 Aug 2006 05:54:00 - 1.57
@@ -1175,7 +1175,7 @@
int
main(int argc, char *argv[])
{
- if (!etk_init(ecore_evas_software_x11))
+ if (!etk_init(argc, argv))
{
fprintf(stderr, Could not init etk. Exiting...\n);
return 0;
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto turran
Enlightenment CVS committal
Author : turran
Project : e17
Module : proto
Dir : e17/proto/enity/src/bin
Modified Files:
enity.c
Log Message:
Etk
===
+ API changed: etk_init(int *argc, char *** argv).
+ etk_argument: now it modifies the parameters on the detected arguments
Rest of etk apps, change etk_init(engine) with the new one.
===
RCS file: /cvs/e/e17/proto/enity/src/bin/enity.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- enity.c 27 Jul 2006 01:54:03 - 1.11
+++ enity.c 2 Aug 2006 05:53:59 - 1.12
@@ -594,7 +594,7 @@
int main(int argc, char **argv)
{
- etk_init(ecore_evas_software_x11);
+ etk_init(argc, argv);
if(etk_arguments_parse(args, argc, argv) != ETK_ARGUMENT_RETURN_OK)
{
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore raster
Enlightenment CVS committal Author : raster Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_x Modified Files: ecore_x.c Log Message: remove modifier masks if they clash === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x.c,v retrieving revision 1.112 retrieving revision 1.113 diff -u -3 -r1.112 -r1.113 --- ecore_x.c 4 Jun 2006 05:30:37 - 1.112 +++ ecore_x.c 2 Aug 2006 07:55:01 - 1.113 @@ -375,6 +375,11 @@ if (!ECORE_X_MODIFIER_WIN) ECORE_X_MODIFIER_WIN = _ecore_x_key_mask_get(XK_Meta_L); + if (ECORE_X_MODIFIER_WIN == ECORE_X_MODIFIER_ALT) + ECORE_X_MODIFIER_WIN = 0; + if (ECORE_X_MODIFIER_ALT == ECORE_X_MODIFIER_CTRL) + ECORE_X_MODIFIER_ALT = 0; + ECORE_X_LOCK_SCROLL= _ecore_x_key_mask_get(XK_Scroll_Lock); ECORE_X_LOCK_NUM = _ecore_x_key_mask_get(XK_Num_Lock); ECORE_X_LOCK_CAPS = _ecore_x_key_mask_get(XK_Caps_Lock); - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_calc.c edje_data.c edje_load.c edje_private.h
Log Message:
Add initial support for edje gradients. See data/src/gradient.edc for an
example.
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- edje_calc.c 23 Jul 2006 21:18:28 - 1.84
+++ edje_calc.c 2 Aug 2006 10:52:44 - 1.85
@@ -899,6 +899,8 @@
params-fill.y = desc-fill.pos_abs_y + (params-h *
desc-fill.pos_rel_y);
params-fill.h = desc-fill.abs_y + (params-h * desc-fill.rel_y);
}
+ params-fill.angle = desc-fill.angle;
+ params-fill.spread = desc-fill.angle;
/* colors */
params-color.r = desc-color.r;
@@ -960,6 +962,8 @@
params-text.align.y = desc-text.align.y;
}
params-text.elipsis = desc-text.elipsis;
+ params-gradient.id = desc-gradient.id;
+ params-gradient.type = desc-gradient.type;
}
static void
@@ -1066,6 +1070,8 @@
p3.fill.y = (p1.fill.y * (1.0 - pos)) + (p2.fill.y * (pos));
p3.fill.w = (p1.fill.w * (1.0 - pos)) + (p2.fill.w * (pos));
p3.fill.h = (p1.fill.h * (1.0 - pos)) + (p2.fill.h * (pos));
+ p3.fill.angle = (p1.fill.angle * (1.0 - pos)) + (p2.fill.angle * (pos));
+ p3.fill.spread = pos 0.5 ? p2.fill.spread : p1.fill.spread;
p3.color.r = (p1.color.r * (1.0 - pos)) + (p2.color.r * (pos));
p3.color.g = (p1.color.g * (1.0 - pos)) + (p2.color.g * (pos));
@@ -1090,6 +1096,9 @@
p3.text.align.x = (p1.text.align.x * (1.0 - pos)) + (p2.text.align.x *
(pos));
p3.text.align.y = (p1.text.align.y * (1.0 - pos)) + (p2.text.align.y *
(pos));
p3.text.elipsis = (p1.text.elipsis * (1.0 - pos)) + (p2.text.elipsis *
(pos));
+
+ p3.gradient.id = pos 0.5 ? p2.gradient.id : p1.gradient.id;
+ p3.gradient.type = pos 0.5 ? p2.gradient.type : p1.gradient.type;
}
else
{
@@ -1202,6 +1211,40 @@
{
evas_object_move(ep-object, ed-x + p3.x, ed-y + p3.y);
evas_object_resize(ep-object, p3.w, p3.h);
+ }
+ else if (ep-part-type == EDJE_PART_TYPE_GRADIENT)
+ {
+evas_object_move(ep-object, ed-x + p3.x, ed-y + p3.y);
+evas_object_resize(ep-object, p3.w, p3.h);
+evas_object_color_set(ep-object, p3.color.r, p3.color.g,
p3.color.b, p3.color.a);
+if (p3.visible) evas_object_show(ep-object);
+else evas_object_hide(ep-object);
+
+evas_object_gradient_angle_set(ep-object, p3.fill.angle);
+evas_object_gradient_spread_set(ep-object, p3.fill.spread);
+evas_object_gradient_fill_set(ep-object, p3.fill.x, p3.fill.y,
p3.fill.w, p3.fill.h);
+
+if (p3.gradient.type p3.gradient.type[0])
+ evas_object_gradient_type_set(ep-object, p3.gradient.type,
NULL);
+
+if (ed-file-spectrum_dir ed-file-spectrum_dir-entries)
+ {
+ Edje_Spectrum_Directory_Entry *se;
+ Evas_List *l;
+
+ se = evas_list_nth(ed-file-spectrum_dir-entries,
p3.gradient.id);
+ if (se)
+ {
+ // XXX only do this if we NEED to (e.g. gradient changed)
+ evas_object_gradient_colors_clear(ep-object);
+ for (l = se-color_list; l; l = l-next)
+{
+ Edje_Spectrum_Color *sc = l-data;
+ evas_object_gradient_color_add(ep-object, sc-r,
sc-g, sc-b, sc-a, sc-d);
+
+}
+ }
+ }
}
if (ep-swallowed_object)
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_data.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- edje_data.c 5 Jun 2006 13:11:08 - 1.31
+++ edje_data.c 2 Aug 2006 10:52:44 - 1.32
@@ -10,6 +10,9 @@
EAPI Eet_Data_Descriptor *_edje_edd_edje_font_directory_entry = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_image_directory = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_image_directory_entry = NULL;
+EAPI Eet_Data_Descriptor *_edje_edd_edje_spectrum_directory = NULL;
+EAPI Eet_Data_Descriptor *_edje_edd_edje_spectrum_directory_entry = NULL;
+EAPI Eet_Data_Descriptor *_edje_edd_edje_spectrum_color = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_program = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_program_target = NULL;
EAPI Eet_Data_Descriptor *_edje_edd_edje_program_after = NULL;
@@ -42,6 +45,9 @@
FREED(_edje_edd_edje_font_directory_entry);
FREED(_edje_edd_edje_image_directory);
FREED(_edje_edd_edje_image_directory_entry);
+
E CVS: libs/edje rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/edje Dir : e17/libs/edje/data/src Added Files: gradient.edc Log Message: Add initial support for edje gradients. See data/src/gradient.edc for an example. - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje rephorm
Enlightenment CVS committal Author : rephorm Project : e17 Module : libs/edje Dir : e17/libs/edje/data Modified Files: edc.vim Log Message: Add initial support for edje gradients. See data/src/gradient.edc for an example. === RCS file: /cvs/e/e17/libs/edje/data/edc.vim,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- edc.vim 30 Sep 2005 20:32:36 - 1.10 +++ edc.vim 2 Aug 2006 10:52:44 - 1.11 @@ -1,7 +1,7 @@ Vim syntax file - Language:C - Maintainer: Bram Moolenaar [EMAIL PROTECTED] - Last Change: 2002 Mar 18 + Language:EDC + Maintainer: no one? + Last Change: 2005 For version 5.x: Clear all syntax items For version 6.x: Quit when a syntax file was already loaded - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_cc_handlers.c edje_cc_out.c
Log Message:
Add initial support for edje gradients. See data/src/gradient.edc for an
example.
===
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc_handlers.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -3 -r1.65 -r1.66
--- edje_cc_handlers.c 11 Jan 2006 03:19:45 - 1.65
+++ edje_cc_handlers.c 2 Aug 2006 10:52:44 - 1.66
@@ -21,6 +21,11 @@
static void st_color_class_color2(void);
static void st_color_class_color3(void);
+static void ob_spectrum(void);
+/*static void st_spectrum(void);*/
+static void st_spectrum_name(void);
+static void st_spectrum_color(void);
+
static void ob_collections(void);
static void ob_collections_group(void);
@@ -73,6 +78,8 @@
static void
st_collections_group_parts_part_description_fill_origin_offset(void);
static void
st_collections_group_parts_part_description_fill_size_relative(void);
static void st_collections_group_parts_part_description_fill_size_offset(void);
+static void st_collections_group_parts_part_description_fill_angle(void);
+static void st_collections_group_parts_part_description_fill_spread(void);
static void st_collections_group_parts_part_description_color_class(void);
static void st_collections_group_parts_part_description_color(void);
static void st_collections_group_parts_part_description_color2(void);
@@ -88,6 +95,8 @@
static void st_collections_group_parts_part_description_text_source(void);
static void st_collections_group_parts_part_description_text_text_source(void);
static void st_collections_group_parts_part_description_text_elipsis(void);
+static void st_collections_group_parts_part_description_gradient_type(void);
+static void
st_collections_group_parts_part_description_gradient_spectrum(void);
static void ob_collections_group_programs_program(void);
static void st_collections_group_programs_program_name(void);
@@ -115,6 +124,9 @@
{color_classes.color_class.color, st_color_class_color},
{color_classes.color_class.color2, st_color_class_color2},
{color_classes.color_class.color3, st_color_class_color3},
+ /*{spectra.spectrum, st_spectrum},*/
+ {spectra.spectrum.name, st_spectrum_name},
+ {spectra.spectrum.color, st_spectrum_color},
{collections.image, st_images_image}, /* dup */
{collections.images.image, st_images_image}, /* dup */
{collections.font, st_fonts_font}, /* dup */
@@ -204,6 +216,8 @@
{collections.group.parts.part.description.fill.origin.offset,
st_collections_group_parts_part_description_fill_origin_offset},
{collections.group.parts.part.description.fill.size.relative,
st_collections_group_parts_part_description_fill_size_relative},
{collections.group.parts.part.description.fill.size.offset,
st_collections_group_parts_part_description_fill_size_offset},
+ {collections.group.parts.part.description.fill.angle,
st_collections_group_parts_part_description_fill_angle},
+ {collections.group.parts.part.description.fill.spread,
st_collections_group_parts_part_description_fill_spread},
{collections.group.parts.part.description.color_class,
st_collections_group_parts_part_description_color_class},
{collections.group.parts.part.description.color,
st_collections_group_parts_part_description_color},
{collections.group.parts.part.description.color2,
st_collections_group_parts_part_description_color2},
@@ -221,6 +235,8 @@
{collections.group.parts.part.description.text.font, st_fonts_font}, /*
dup */
{collections.group.parts.part.description.text.fonts.font,
st_fonts_font}, /* dup */
{collections.group.parts.part.description.text.elipsis,
st_collections_group_parts_part_description_text_elipsis},
+ {collections.group.parts.part.description.gradient.type,
st_collections_group_parts_part_description_gradient_type},
+ {collections.group.parts.part.description.gradient.spectrum,
st_collections_group_parts_part_description_gradient_spectrum},
{collections.group.parts.part.description.images.image,
st_images_image}, /* dup */
{collections.group.parts.part.description.font, st_fonts_font}, /* dup
*/
{collections.group.parts.part.description.fonts.font, st_fonts_font},
/* dup */
@@ -322,6 +338,8 @@
{styles.style, ob_styles_style},
{color_classes, NULL},
{color_classes.color_class, ob_color_class},
+ {spectra, NULL},
+ {spectra.spectrum, ob_spectrum},
{collections, ob_collections},
{collections.images, NULL}, /* dup */
{collections.fonts, NULL}, /* dup */
@@ -367,6 +385,7 @@
{collections.group.parts.part.description.fonts, NULL}, /* dup */
{collections.group.parts.part.description.styles, NULL}, /* dup */
