E CVS: proto lordchaos
Enlightenment CVS committal Author : lordchaos Project : e17 Module : proto Dir : e17/proto/entropy/src Modified Files: entropy_core.c Log Message: Actually, we don't want to do this === RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/entropy_core.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- entropy_core.c 29 Oct 2005 08:38:49 - 1.12 +++ entropy_core.c 1 Nov 2005 06:04:26 - 1.13 @@ -204,7 +204,7 @@ /*Initialize the descent hash - this should be loaded from EVFS - FIXME*/ /*Descent hash init - move this to a call to EVFS*/ core->descent_hash = ecore_hash_new(ecore_str_hash, ecore_str_compare); - ecore_hash_set(core->descent_hash, "application/x-tar", "tar"); + ecore_hash_set(core->descent_hash, "application/x-tar", "bzip2:///#tar"); --- This SF.Net email is sponsored by the JBoss Inc. Get Certified Today * Register for a JBoss Training Course Free Certification Exam for All Training Attendees Through End of 2005 Visit http://www.jboss.com/services/certification for more information ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl rbdpngn
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_embed.c ewl_embed.h ewl_misc.c ewl_misc.h
Log Message:
Cleanup some globals in the embed.
Add some limits to work done at garbage collection time.
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_embed.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ewl_embed.c 28 Oct 2005 05:00:55 - 1.17
+++ ewl_embed.c 1 Nov 2005 05:54:50 - 1.18
@@ -116,6 +116,19 @@
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
+void
+ewl_embed_shutdown(void)
+{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+
+ if (embedded_smart) {
+ evas_smart_free(embedded_smart);
+ embedded_smart = NULL;
+ }
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
/**
* @param emb: the embedded container to change the target evas
* @param evas: the new evas to draw the container and it's contents
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_embed.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_embed.h 28 Oct 2005 02:11:29 - 1.6
+++ ewl_embed.h 1 Nov 2005 05:54:50 - 1.7
@@ -70,7 +70,8 @@
};
Ewl_Widget *ewl_embed_new(void);
-int ewl_embed_init(Ewl_Embed *win);
+int ewl_embed_init(Ewl_Embed *emb);
+voidewl_embed_shutdown(void);
Evas_Object*ewl_embed_evas_set(Ewl_Embed *emb, Evas *evas,
Ewl_Embed_Evas_Window *evas_window);
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_misc.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ewl_misc.c 28 Oct 2005 05:00:55 - 1.24
+++ ewl_misc.c 1 Nov 2005 05:54:50 - 1.25
@@ -217,7 +217,7 @@
while ((emb = ecore_list_remove_first(ewl_embed_list)))
ewl_widget_destroy(emb);
- ewl_garbage_collect();
+ while (ewl_garbage_collect() > 0);
ecore_list_destroy(ewl_embed_list);
ewl_embed_list = NULL;
}
@@ -230,6 +230,7 @@
/*
* Shut down the various EWL subsystems cleanly.
*/
+ ewl_embed_shutdown();
ewl_callbacks_shutdown();
ewl_theme_shutdown();
ewl_config_shutdown();
@@ -315,6 +316,15 @@
edje_freeze();
/*
+* Freeze events on the evases to reduce overhead
+*/
+ ecore_list_goto_first(ewl_embed_list);
+ while ((emb = ecore_list_next(ewl_embed_list)) != NULL) {
+ if (REALIZED(emb) && emb->evas)
+ evas_event_freeze(emb->evas);
+ }
+
+ /*
* Clean out the unused widgets first, to avoid them being drawn or
* unnecessary work done from configuration. Then display new widgets,
* finally layout the widgets.
@@ -324,15 +334,6 @@
!ecore_list_is_empty(free_evas_object_list))
ewl_garbage_collect();
- /*
-* Freeze events on the evases to reduce overhead
-*/
- ecore_list_goto_first(ewl_embed_list);
- while ((emb = ecore_list_next(ewl_embed_list)) != NULL) {
- if (REALIZED(emb) && emb->evas)
- evas_event_freeze(emb->evas);
- }
-
if (!ecore_list_is_empty(realize_list))
ewl_realize_queue();
@@ -906,7 +907,13 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
+#define EWL_GC_LIMIT 300
+
+/**
+ * @return Returns TRUE if objects remain to be freed, otherwise false.
+ * @brief Free's all widgets that have been marked for destruction.
+ */
+int
ewl_garbage_collect(void)
{
Evas *evas;
@@ -921,7 +928,8 @@
if (print_gc_reap)
printf("---\n");
- while ((w = ecore_list_remove_first(destroy_list))) {
+ while ((cleanup < EWL_GC_LIMIT) &&
+ (w = ecore_list_remove_first(destroy_list))) {
if (ewl_object_queued_has(EWL_OBJECT(w),
EWL_FLAG_QUEUED_CSCHEDULED))
ewl_configure_cancel_request(w);
@@ -954,7 +962,7 @@
if (print_gc_reap)
printf("---\n");
- DLEAVE_FUNCTION(DLEVEL_STABLE);
+ DRETURN_INT(ecore_list_nodes(destroy_list), DLEVEL_STABLE);
}
int ewl_ecore_exit(void *data __UNUSED__, int type __UNUSED__,
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_misc.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ewl_misc.h 24 Oct 2005 04:53:53 - 1.6
+++ ewl_misc.h 1 Nov 2005 05:54:50 - 1.
E CVS: proto lordchaos
Enlightenment CVS committal Author : lordchaos Project : e17 Module : proto Dir : e17/proto/entropy/src/plugins Modified Files: filesystem.c structure_viewer.c Log Message: Actually, we don't want to do this === RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/plugins/filesystem.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- filesystem.c28 Oct 2005 22:45:41 - 1.7 +++ filesystem.c1 Nov 2005 06:04:27 - 1.8 @@ -305,7 +305,6 @@ break; } - //TODO Free EVENT! } === RCS file: /cvsroot/enlightenment/e17/proto/entropy/src/plugins/structure_viewer.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- structure_viewer.c 29 Oct 2005 08:38:49 - 1.7 +++ structure_viewer.c 1 Nov 2005 06:04:27 - 1.8 @@ -234,7 +234,7 @@ viewer->loaded_dirs = ecore_hash_new(ecore_direct_hash, ecore_direct_compare); viewer->row_folder_hash = ecore_hash_new(ecore_direct_hash, ecore_direct_compare); - ewl_object_fill_policy_set(EWL_OBJECT(EWL_TREE(viewer->tree)->scrollarea), EWL_FLAG_FILL_VFILL | EWL_FLAG_FILL_HFILL); + ewl_object_fill_policy_set(EWL_OBJECT(EWL_TREE(viewer->tree)->scrollarea), EWL_FLAG_FILL_HFILL); instance->gui_object = viewer->tree; --- This SF.Net email is sponsored by the JBoss Inc. Get Certified Today * Register for a JBoss Training Course Free Certification Exam for All Training Attendees Through End of 2005 Visit http://www.jboss.com/services/certification for more information ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl rbdpngn
Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_theme.c
Log Message:
Fix small theme data leak.
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_theme.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- ewl_theme.c 26 Oct 2005 01:25:31 - 1.17
+++ ewl_theme.c 1 Nov 2005 05:58:34 - 1.18
@@ -526,8 +526,10 @@
DCHECK_PARAM_PTR_RET("k", k, FALSE);
temp = ewl_theme_data_str_get(w, k);
- if (temp)
+ if (temp) {
ret = atoi(temp);
+ FREE(temp);
+ }
DRETURN_INT(ret, DLEVEL_STABLE);
}
---
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_callbacks.c edje_message_queue.c
Log Message:
remove excess calcs.
add faster missed job reaper timer
===
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_callbacks.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- edje_callbacks.c26 Jul 2005 19:27:02 - 1.20
+++ edje_callbacks.c1 Nov 2005 04:10:01 - 1.21
@@ -62,8 +62,9 @@
if (rp->events_to)
{
int x = 0, y = 0;
- Edje_Real_Part *events = rp->events_to;
-
+ Edje_Real_Part *events;
+
+ events = rp->events_to;
evas_object_geometry_get(rp->object, &x, &y, NULL, NULL);
if ((events->part->dragable.x) || (events->part->dragable.y))
@@ -86,11 +87,12 @@
ed->dirty = 1;
}
_edje_recalc(ed);
+/*
_edje_thaw(ed);
_edje_unref(ed);
_edje_ref(ed);
_edje_freeze(ed);
-
+*/
rp = events;
{
double dx = 0.0, dy = 0.0;
@@ -127,7 +129,7 @@
rp->clicked_button = ev->button;
rp->still_in = 1;
}
- _edje_recalc(ed);
+// _edje_recalc(ed);
_edje_thaw(ed);
_edje_unref(ed);
return;
@@ -149,6 +151,7 @@
snprintf(buf, sizeof(buf), "mouse,up,%i", ev->button);
_edje_ref(ed);
+ _edje_freeze(ed);
_edje_emit(ed, buf, rp->part->name);
if (rp->events_to)
@@ -156,7 +159,7 @@
rp = rp->events_to;
snprintf(buf, sizeof(buf), "mouse,up,%i", ev->button);
_edje_emit(ed, buf, rp->part->name);
- }
+ }
if ((rp->part->dragable.x) || (rp->part->dragable.y))
{
@@ -171,7 +174,6 @@
}
}
}
- _edje_freeze(ed);
if ((rp->still_in) && (rp->clicked_button == ev->button))
{
rp->clicked_button = 0;
@@ -179,7 +181,7 @@
snprintf(buf, sizeof(buf), "mouse,clicked,%i", ev->button);
_edje_emit(ed, buf, rp->part->name);
}
- _edje_recalc(ed);
+// _edje_recalc(ed);
_edje_thaw(ed);
_edje_unref(ed);
return;
@@ -197,11 +199,11 @@
ed = data;
rp = evas_object_data_get(obj, "real_part");
if (!rp) return;
- if (rp->events_to)
- {
- rp = rp->events_to;
- }
+ if (rp->events_to) rp = rp->events_to;
+ _edje_ref(ed);
+ _edje_emit(ed, "mouse,move", rp->part->name);
+
if (rp->still_in)
{
Evas_Coord x, y, w, h;
@@ -232,12 +234,7 @@
ed->dirty = 1;
}
}
- _edje_ref(ed);
- _edje_emit(ed, "mouse,move", rp->part->name);
-/* FIXME: this FUCKS up badly */
-/* ed->calc_only = 1; */
- _edje_recalc(ed);
-/* ed->calc_only = 0; */
+// _edje_recalc(ed);
if ((rp->part->dragable.x) || (rp->part->dragable.y))
{
if (rp->drag.down.count > 0)
@@ -252,7 +249,7 @@
rp->drag.val.y = dy;
_edje_emit(ed, "drag", rp->part->name);
ed->dirty = 1;
- _edje_recalc(ed);
+// _edje_recalc(ed);
}
}
}
===
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/lib/edje_message_queue.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- edje_message_queue.c28 Jul 2005 13:39:23 - 1.17
+++ edje_message_queue.c1 Nov 2005 04:10:01 - 1.18
@@ -279,7 +279,7 @@
// printf("no job... add\n");
job = ecore_job_add(_edje_job, NULL);
if (job_loss_timer) ecore_timer_del(job_loss_timer);
- job_loss_timer = ecore_timer_add(0.25, _edje_job_loss_timer, NULL);
+ job_loss_timer = ecore_timer_add(0.05, _edje_job_loss_timer, NULL);
}
em = _edje_message_new(ed, queue, type, id);
if (!em) return;
---
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_module.c
Log Message:
also use util strcmp
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_module.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- e_module.c 1 Nov 2005 02:41:58 - 1.44
+++ e_module.c 1 Nov 2005 02:44:08 - 1.45
@@ -253,7 +253,7 @@
E_Config_Module *em;
em = l->data;
-if (!strcmp(em->name, m->name))
+if (!e_util_strcmp(em->name, m->name))
{
em->enabled = 1;
e_config_save_queue();
@@ -282,7 +282,7 @@
E_Config_Module *em;
em = l->data;
- if (!strcmp(em->name, m->name))
+ if (!e_util_strcmp(em->name, m->name))
{
em->enabled = 0;
e_config_save_queue();
---
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_module.c e_test.c
Log Message:
if module doesnt init - give up.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_module.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- e_module.c 6 Oct 2005 18:49:53 - 1.43
+++ e_module.c 1 Nov 2005 02:41:58 - 1.44
@@ -245,20 +245,24 @@
E_OBJECT_TYPE_CHECK_RETURN(m, E_MODULE_TYPE, 0);
if ((m->enabled) || (m->error)) return 0;
m->data = m->func.init(m);
- if (m->data) m->enabled = 1;
- for (l = e_config->modules; l; l = l->next)
+ if (m->data)
{
- E_Config_Module *em;
-
- em = l->data;
- if (!strcmp(em->name, m->name))
+ m->enabled = 1;
+ for (l = e_config->modules; l; l = l->next)
{
-em->enabled = 1;
-e_config_save_queue();
-break;
+E_Config_Module *em;
+
+em = l->data;
+if (!strcmp(em->name, m->name))
+ {
+ em->enabled = 1;
+ e_config_save_queue();
+ break;
+ }
}
+ return 1;
}
- return 1;
+ return 0;
}
int
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_test.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- e_test.c30 Oct 2005 05:20:14 - 1.30
+++ e_test.c1 Nov 2005 02:41:58 - 1.31
@@ -327,7 +327,7 @@
e_dialog_title_set(dia, "A Test Dialog");
o = e_icon_add(dia->win->evas);
- e_icon_file_set(o, "/home/raster/t.png");
+// e_icon_file_set(o, "/home/raster/t.png");
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _e_test_click,
NULL);
evas_object_resize(o, 1024, 768);
evas_object_focus_set(o, 1);
@@ -352,6 +352,70 @@
evas_object_focus_set(o, 1);
}
+#elif 0
+static E_Dialog *
+_e_test_dia(E_Container *con)
+{
+ E_Dialog *dia;
+ Evas_Object *o, *o2, *o3;
+
+ dia = e_dialog_new(con);
+ e_dialog_title_set(dia, "A Test Dialog");
+
+ o = e_icon_add(dia->win->evas);
+// e_icon_file_set(o, "/home/raster/t.png");
+ evas_object_resize(o, 1024, 768);
+ evas_object_focus_set(o, 1);
+ evas_object_show(o);
+
+ o2 = e_scrollframe_add(dia->win->evas);
+// e_scrollframe_custom_theme_set(o2, "base/theme/widgets",
"widgets/scrollframe");
+ evas_object_resize(o2, 200, 300);
+ evas_object_show(o2);
+#if 0
+ o3 = e_pan_add(dia->win->evas);
+ e_pan_child_set(o3, o);
+ e_scrollframe_extern_pan_set(o2, o3, e_pan_set, e_pan_get, e_pan_max_get,
e_pan_child_size_get);
+#else
+ e_scrollframe_child_set(o2, o);
+#endif
+
+ e_dialog_content_set(dia, o2, 500, 300);
+ e_dialog_button_add(dia, "OK", NULL, NULL, NULL);
+ e_win_centered_set(dia->win, 1);
+ e_dialog_show(dia);
+
+ evas_object_focus_set(o, 1);
+ return dia;
+}
+
+static E_Container *tcon = NULL;
+
+static int
+_e_test_timer(void *data)
+{
+ E_Dialog *dia;
+
+ if (data == NULL)
+ {
+ dia = _e_test_dia(tcon);
+ ecore_timer_add(0.5, _e_test_timer, dia);
+ }
+ else
+ {
+ dia = data;
+ e_object_del(E_OBJECT(dia));
+ ecore_timer_add(0.5, _e_test_timer, NULL);
+ }
+ return 0;
+}
+
+static void
+_e_test_internal(E_Container *con)
+{
+ tcon = con;
+ _e_test_timer(NULL);
+}
#else
static void
_e_test_internal(E_Container *con)
---
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/evas vapier
Enlightenment CVS committal Author : vapier Project : e17 Module : libs/evas Dir : e17/libs/evas/src/bin Modified Files: evas_directfb_main.c Log Message: cut old code === RCS file: /cvsroot/enlightenment/e17/libs/evas/src/bin/evas_directfb_main.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- evas_directfb_main.c26 Oct 2005 20:22:26 - 1.7 +++ evas_directfb_main.c1 Nov 2005 01:40:20 - 1.8 @@ -26,11 +26,6 @@ IDirectFBEventBuffer *buffer; DFBResult err; DFBSurfaceDescription dsc; -//#if (DIRECTFB_MAJOR_VERSION == 0) && (DIRECTFB_MINOR_VERSION == 9) && (DIRECTFB_MICRO_VERSION < 23) -// DFBCardCapabilitiescaps; -//#else -// DFBGraphicsDeviceDescription caps; -//#endif DFBDisplayLayerConfig layer_config; DFBInputEvent evt; --- This SF.Net email is sponsored by the JBoss Inc. Get Certified Today * Register for a JBoss Training Course Free Certification Exam for All Training Attendees Through End of 2005 Visit http://www.jboss.com/services/certification for more information ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal
Author : moom16
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_button.c etk_entry.c etk_scale.c etk_widget.c etk_widget.h
Log Message:
* Add "focus_on_press" and "can_pass_focus" flags to Etk_Widget
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_button.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_button.c28 Oct 2005 14:06:25 - 1.2
+++ etk_button.c1 Nov 2005 00:18:40 - 1.3
@@ -87,7 +87,7 @@
*/
Etk_Widget *etk_button_new()
{
- return etk_widget_new(ETK_BUTTON_TYPE, "theme_group", "button",
"focusable", TRUE, NULL);
+ return etk_widget_new(ETK_BUTTON_TYPE, "theme_group", "button",
"focusable", TRUE, "focus_on_press", TRUE, NULL);
}
/**
@@ -96,7 +96,7 @@
*/
Etk_Widget *etk_button_new_with_label(const char *label)
{
- return etk_widget_new(ETK_BUTTON_TYPE, "theme_group", "button", "label",
label, "focusable", TRUE, NULL);
+ return etk_widget_new(ETK_BUTTON_TYPE, "theme_group", "button", "label",
label, "focusable", TRUE, "focus_on_press", TRUE, NULL);
}
/**
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_entry.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_entry.c 29 Oct 2005 19:57:20 - 1.4
+++ etk_entry.c 1 Nov 2005 00:18:41 - 1.5
@@ -22,7 +22,6 @@
static void _etk_entry_realize_cb(Etk_Object *object, void *data);
static void _etk_entry_unrealize_cb(Etk_Object *object, void *data);
static void _etk_entry_key_down_cb(Etk_Object *object, void *event, void
*data);
-static void _etk_entry_mouse_down_cb(Etk_Object *object,
Etk_Event_Mouse_Up_Down *event, void *data);
static void _etk_entry_mouse_in_cb(Etk_Object *object, Etk_Event_Mouse_In_Out
*event, void *data);
static void _etk_entry_mouse_out_cb(Etk_Object *object, Etk_Event_Mouse_In_Out
*event, void *data);
static void _etk_entry_focus_cb(Etk_Object *object, void *data);
@@ -60,7 +59,7 @@
*/
Etk_Widget *etk_entry_new()
{
- return etk_widget_new(ETK_ENTRY_TYPE, "theme_group", "entry", "focusable",
TRUE, NULL);
+ return etk_widget_new(ETK_ENTRY_TYPE, "theme_group", "entry", "focusable",
TRUE, "focus_on_press", TRUE, NULL);
}
/**
@@ -93,7 +92,6 @@
etk_signal_connect_after("realize", ETK_OBJECT(entry),
ETK_CALLBACK(_etk_entry_realize_cb), NULL);
etk_signal_connect("unrealize", ETK_OBJECT(entry),
ETK_CALLBACK(_etk_entry_unrealize_cb), NULL);
etk_signal_connect("key_down", ETK_OBJECT(entry),
ETK_CALLBACK(_etk_entry_key_down_cb), NULL);
- etk_signal_connect("mouse_down", ETK_OBJECT(entry),
ETK_CALLBACK(_etk_entry_mouse_down_cb), NULL);
etk_signal_connect("mouse_in", ETK_OBJECT(entry),
ETK_CALLBACK(_etk_entry_mouse_in_cb), NULL);
etk_signal_connect("mouse_out", ETK_OBJECT(entry),
ETK_CALLBACK(_etk_entry_mouse_out_cb), NULL);
etk_signal_connect("focus", ETK_OBJECT(entry),
ETK_CALLBACK(_etk_entry_focus_cb), NULL);
@@ -162,17 +160,6 @@
etk_signal_emit(_etk_entry_signals[ETK_ENTRY_TEXT_CHANGED_SIGNAL],
object, NULL);
}
-/* Called when the user presses the entry with the mouse */
-/* TODO: move the cursor under the mouse pointer */
-static void _etk_entry_mouse_down_cb(Etk_Object *object,
Etk_Event_Mouse_Up_Down *event, void *data)
-{
- Etk_Entry *entry;
-
- if (!(entry = ETK_ENTRY(object)))
- return;
- etk_widget_focus(ETK_WIDGET(entry));
-}
-
/* Called when the mouse enters the entry */
static void _etk_entry_mouse_in_cb(Etk_Object *object, Etk_Event_Mouse_In_Out
*event, void *data)
{
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_scale.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_scale.c 29 Oct 2005 19:57:20 - 1.3
+++ etk_scale.c 1 Nov 2005 00:18:41 - 1.4
@@ -68,7 +68,7 @@
Etk_Widget *etk_hscale_new(double lower, double upper, double value, double
step_increment, double page_increment)
{
return etk_widget_new(ETK_HSCALE_TYPE, "theme_group", "hscale",
"focusable", TRUE, "lower", lower, "upper", upper,
- "value", value, "step_increment", step_increment, "page_increment",
page_increment, NULL);
+ "value", value, "step_increment", step_increment, "page_increment",
page_increment, "focus_on_press", TRUE, NULL);
}
/**
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_widget.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_widget.c31 Oct 2005 21:36:40 - 1.7
+++ etk_widget.c1 Nov 2005 00:18:41 - 1.8
@@ -74,7 +74,9 @@
ETK_WIDGET_VISIBLE_PROPERTY,
ETK_WIDGET_REPEAT_EVENTS_PROPERTY,
ETK_WIDGET_PAS
E CVS: proto moom16
Enlightenment CVS committal
Author : moom16
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_scrolled_view.c etk_scrolled_view.h etk_types.h
Log Message:
* Add policies to the scrolled view to determine if the scrollbars
should appear
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_scrolled_view.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_scrolled_view.c 31 Oct 2005 21:44:33 - 1.1
+++ etk_scrolled_view.c 31 Oct 2005 23:45:32 - 1.2
@@ -14,7 +14,8 @@
enum _Etk_Scrolled_View_Property_Id
{
- ETK_SCROLLED_VIEW_POLICY_PROPERTY
+ ETK_SCROLLED_VIEW_HPOLICY_PROPERTY,
+ ETK_SCROLLED_VIEW_VPOLICY_PROPERTY
};
static void _etk_scrolled_view_constructor(Etk_Scrolled_View *scrolled_view);
@@ -44,7 +45,8 @@
{
scrolled_view_type = etk_type_new("Etk_Scrolled_View", ETK_BIN_TYPE,
sizeof(Etk_Scrolled_View), ETK_CONSTRUCTOR(_etk_scrolled_view_constructor),
ETK_DESTRUCTOR(_etk_scrolled_view_destructor), NULL);
- etk_type_property_add(scrolled_view_type, "policy",
ETK_SCROLLED_VIEW_POLICY_PROPERTY, ETK_PROPERTY_INT,
ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_int(0));
+ etk_type_property_add(scrolled_view_type, "hpolicy",
ETK_SCROLLED_VIEW_HPOLICY_PROPERTY, ETK_PROPERTY_INT,
ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_int(ETK_POLICY_AUTO));
+ etk_type_property_add(scrolled_view_type, "vpolicy",
ETK_SCROLLED_VIEW_VPOLICY_PROPERTY, ETK_PROPERTY_INT,
ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_int(ETK_POLICY_AUTO));
scrolled_view_type->property_set = _etk_scrolled_view_property_set;
scrolled_view_type->property_get = _etk_scrolled_view_property_get;
@@ -111,6 +113,51 @@
etk_container_add(ETK_CONTAINER(viewport), child);
}
+/**
+ * @brief Sets the policy of the hscrollbar and the vscrollbar of the scrolled
view. @n
+ * A policy describes when a scrollbar should appear: ETK_POLICY_SHOW always
shows the scrollbar, @n
+ * ETK_POLICY_HIDE always hides the scrollbar, and ETK_POLICY_AUTO determines
automatically if the scrollbar should appear
+ * @param scrolled_view a scrolled view
+ * @param hpolicy the policy to set for the hscrollbar
+ * @param vpolicy the policy to set for the vscrollbar
+ */
+void etk_scrolled_view_policy_set(Etk_Scrolled_View *scrolled_view,
Etk_Scrolled_View_Policy hpolicy, Etk_Scrolled_View_Policy vpolicy)
+{
+ if (!scrolled_view)
+ return;
+
+ if (scrolled_view->hpolicy != hpolicy)
+ {
+ scrolled_view->hpolicy = hpolicy;
+ etk_object_notify(ETK_OBJECT(scrolled_view), "hpolicy");
+ etk_widget_redraw_queue(ETK_WIDGET(scrolled_view));
+ }
+ if (scrolled_view->vpolicy != vpolicy)
+ {
+ scrolled_view->vpolicy = vpolicy;
+ etk_object_notify(ETK_OBJECT(scrolled_view), "vpolicy");
+ etk_widget_redraw_queue(ETK_WIDGET(scrolled_view));
+ }
+}
+
+/**
+ * @brief Fets the policy of the hscrollbar and the vscrollbar of the scrolled
view
+ * @param scrolled_view a scrolled view
+ * @param hpolicy the location where to set the policy of the hscrollbar
+ * @param vpolicy the location where to set the policy of the vscrollbar
+ */
+void etk_scrolled_view_policy_get(Etk_Scrolled_View *scrolled_view,
Etk_Scrolled_View_Policy *hpolicy, Etk_Scrolled_View_Policy *vpolicy)
+{
+ if (!scrolled_view)
+ return;
+
+ if (hpolicy)
+ *hpolicy = scrolled_view->hpolicy;
+ if (vpolicy)
+ *vpolicy = scrolled_view->vpolicy;
+}
+
+
/**
*
* Etk specific functions
@@ -123,6 +170,9 @@
if (!scrolled_view)
return;
+ scrolled_view->hpolicy = ETK_POLICY_AUTO;
+ scrolled_view->vpolicy = ETK_POLICY_AUTO;
+
scrolled_view->hscrollbar = etk_hscrollbar_new(0.0, 0.0, 0.0, 6.0, 40.0,
0.0);
etk_widget_parent_set(scrolled_view->hscrollbar,
ETK_CONTAINER(scrolled_view));
etk_widget_show(scrolled_view->hscrollbar);
@@ -159,8 +209,11 @@
switch (property_id)
{
- /* TODO */
- case ETK_SCROLLED_VIEW_POLICY_PROPERTY:
+ case ETK_SCROLLED_VIEW_HPOLICY_PROPERTY:
+ etk_scrolled_view_policy_set(scrolled_view,
etk_property_value_int_get(value), scrolled_view->vpolicy);
+ break;
+ case ETK_SCROLLED_VIEW_VPOLICY_PROPERTY:
+ etk_scrolled_view_policy_set(scrolled_view, scrolled_view->hpolicy,
etk_property_value_int_get(value));
break;
default:
break;
@@ -177,8 +230,11 @@
switch (property_id)
{
- /* TODO */
- case ETK_SCROLLED_VIEW_POLICY_PROPERTY:
+ case ETK_SCROLLED_VIEW_HPOLICY_PROPERTY:
+ etk_property_value_int_set(value, scrolled_view->hpolicy);
+ break;
+ case ETK_SCROLLED_VIEW_VPOLICY_PROPERTY:
+ etk_property_value_int_set(value, scrolled_view->vpolicy);
break;
default:
break;
@@ -230,16 +286,19 @
E CVS: e kwo
Enlightenment CVS committal Author : kwo Project : e16 Module : e Dir : e16/e/src Modified Files: eobj.c Log Message: Fix CM bug with InputOnly windows. === RCS file: /cvsroot/enlightenment/e16/e/src/eobj.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -3 -r1.56 -r1.57 --- eobj.c 27 Oct 2005 23:18:35 - 1.56 +++ eobj.c 31 Oct 2005 22:35:00 - 1.57 @@ -253,11 +253,13 @@ if (!eo) return eo; + if (attr.class == InputOnly) + eo->inputonly = 1; + EobjInit(eo, type, win, attr.x, attr.y, attr.width, attr.height, 0, NULL); + eo->name = ecore_x_icccm_title_get(win); eo->external = 1; - if (attr.class == InputOnly) - eo->inputonly = 1; #if 1 /* FIXME - TBD */ if (type == EOBJ_TYPE_EXT) --- This SF.Net email is sponsored by the JBoss Inc. Get Certified Today * Register for a JBoss Training Course Free Certification Exam for All Training Attendees Through End of 2005 Visit http://www.jboss.com/services/certification for more information ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal
Author : moom16
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/widgets
Modified Files:
scrollbar.edc tree.edc
Log Message:
* Clip the watermark in the tree theme
* Rewrite the scrollbar to take profit of the drag features of edje
* Add the ability to clip a widget against an evas object
* Add a scrolled view!!! :)
* Add a viewport to make every widgets scrollable
===
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/scrollbar.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- scrollbar.edc 23 Oct 2005 08:05:34 - 1.2
+++ scrollbar.edc 31 Oct 2005 21:36:40 - 1.3
@@ -28,14 +28,15 @@
visible: 0;
rel1 {
relative: 0.0 0.5;
- offset: 18 -6;
+ offset: 16 10;
}
rel2 {
relative: 1.0 0.5;
- offset: -35 7;
+ offset: -33 10;
}
}
}
+ SCROLLBAR_DRAG("drag", 20, 20, 1, 0, "scrollbar_hdrag_thumb.png")
SCROLLBAR_BUTTON("left_left_arrow", 0.0, 0.5, -1, -8,
"scrollbar_arrow_left.png")
SCROLLBAR_BUTTON("right_left_arrow", 1.0, 0.5, -34, -8,
"scrollbar_arrow_left.png")
SCROLLBAR_BUTTON("right_right_arrow", 1.0, 0.5, -18, -8,
"scrollbar_arrow_right.png")
@@ -46,13 +47,6 @@
SCROLLBAR_BUTTON_PROG("right_right_arrow", "right")
}
}
-group {
- name: "hscrollbar_drag";
- min: 14 0;
- parts {
- SCROLLBAR_DRAG("drag", 0.0, 0.0, -5, -2, 1.0, 1.0, 4, 1,
"scrollbar_hdrag_thumb.png")
- }
-}
group {
name: "vscrollbar";
@@ -84,14 +78,15 @@
visible: 0;
rel1 {
relative: 0.5 0.0;
- offset: -6 18;
+ offset: 10 16;
}
rel2 {
relative: 0.5 1.0;
- offset: 7 -35;
+ offset: 10 -33;
}
}
}
+ SCROLLBAR_DRAG("drag", 20, 20, 0, 1, "scrollbar_vdrag_thumb.png")
SCROLLBAR_BUTTON("up_up_arrow", 0.5, 0.0, -8, -1,
"scrollbar_arrow_up.png")
SCROLLBAR_BUTTON("down_up_arrow", 0.5, 1.0, -8, -34,
"scrollbar_arrow_down.png")
SCROLLBAR_BUTTON("down_down_arrow", 0.5, 1.0, -8, -18,
"scrollbar_arrow_down.png")
@@ -102,10 +97,3 @@
SCROLLBAR_BUTTON_PROG("down_down_arrow", "down")
}
}
-group {
- name: "vscrollbar_drag";
- min: 0 14;
- parts {
- SCROLLBAR_DRAG("drag", 0.0, 0.0, -2, -5, 1.0, 1.0, 1, 4,
"scrollbar_vdrag_thumb.png")
- }
-}
===
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/tree.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- tree.edc28 Oct 2005 14:06:25 - 1.4
+++ tree.edc31 Oct 2005 21:36:40 - 1.5
@@ -30,12 +30,27 @@
}
}
part {
+ name: "watermark_clip";
+ type: RECT;
+ mouse_events: 0;
+ description {
+state: "default" 0.0;
+rel1 {
+ relative: 0.0 0.0;
+ offset: 0 0;
+}
+rel2 {
+ relative: 1.0 1.0;
+ offset: -1 -1;
+}
+ }
+ }
+ part {
name: "watermark";
mouse_events: 0;
+ clip_to: "watermark_clip";
description {
state: "default" 0.0;
-visible: 1;
-color: 255 255 255 255;
rel1 {
relative: 1.0 1.0;
offset: -200 -138;
---
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal
Author : moom16
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/macros
Modified Files:
scrollbar.edc
Log Message:
* Clip the watermark in the tree theme
* Rewrite the scrollbar to take profit of the drag features of edje
* Add the ability to clip a widget against an evas object
* Add a scrolled view!!! :)
* Add a viewport to make every widgets scrollable
===
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/macros/scrollbar.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- scrollbar.edc 23 Oct 2005 08:05:34 - 1.1
+++ scrollbar.edc 31 Oct 2005 21:36:40 - 1.2
@@ -1,6 +1,6 @@
#define SCROLLBAR_BUTTON_SIZE 18
-#define SCROLLBAR_DRAG(part_name, rx1, ry1, ox1, oy1, rx2, ry2, ox2, oy2,
image_thumb) \
+#define SCROLLBAR_DRAG(part_name, minw, minh, xdir, ydir, image_thumb) \
part { \
name: part_name"_shadow2"; \
mouse_events: 0; \
@@ -45,15 +45,24 @@
} \
part { \
name: part_name; \
+ dragable { \
+ confine: "confine"; \
+ x: xdir xdir xdir; \
+ y: ydir ydir ydir; \
+ } \
description { \
state: "default" 0.0; \
+ min: minw minh; \
+ fixed: 1 1; \
rel1 { \
- relative: rx1 ry1; \
- offset: ox1 oy1; \
+ relative: 0.5 0.5; \
+ offset: 0 0; \
+ to: "confine"; \
} \
rel2 { \
- relative: rx2 ry2; \
- offset: ox2 oy2; \
+ relative: 0.5 0.5; \
+ offset: 0 0; \
+ to: "confine"; \
} \
image { \
normal: "scrollbar_button.png"; \
@@ -82,6 +91,17 @@
} \
}
+/*
+ rel1 { \
+ relative: rx1 ry1; \
+ offset: ox1 oy1; \
+ } \
+ rel2 { \
+ relative: rx2 ry2; \
+ offset: ox2 oy2; \
+ } \
+*/
+
#define SCROLLBAR_BUTTON(button_name, rx1, ry1, ox1, oy1, arrow_image) \
part { \
name: button_name"_shadow2"; \
---
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal
Author : moom16
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
Etk.h Makefile.am etk_range.c etk_range.h etk_scrollbar.c
etk_scrollbar.h etk_types.h etk_widget.c etk_widget.h
Added Files:
etk_viewport.c etk_viewport.h
Log Message:
* Clip the watermark in the tree theme
* Rewrite the scrollbar to take profit of the drag features of edje
* Add the ability to clip a widget against an evas object
* Add a scrolled view!!! :)
* Add a viewport to make every widgets scrollable
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/Etk.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Etk.h 30 Oct 2005 10:25:25 - 1.6
+++ Etk.h 31 Oct 2005 21:36:40 - 1.7
@@ -25,6 +25,8 @@
#include "etk_alignment.h"
#include "etk_frame.h"
#include "etk_paned.h"
+#include "etk_scrolled_view.h"
+#include "etk_viewport.h"
#include "etk_window.h"
#include "etk_label.h"
#include "etk_image.h"
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- Makefile.am 30 Oct 2005 10:25:25 - 1.9
+++ Makefile.am 31 Oct 2005 21:36:40 - 1.10
@@ -23,6 +23,7 @@
etk_container.h etk_bin.h etk_table.h etk_alignment.h \
etk_box.h etk_hbox.h etk_vbox.h \
etk_paned.h etk_frame.h \
+etk_scrolled_view.h etk_viewport.h \
etk_window.h \
etk_image.h \
etk_string.h etk_editable_text_object.h etk_label.h \
@@ -42,6 +43,7 @@
etk_container.c etk_bin.c etk_table.c etk_alignment.c \
etk_box.c etk_hbox.c etk_vbox.c \
etk_paned.c etk_frame.c \
+etk_scrolled_view.c etk_viewport.c \
etk_window.c \
etk_image.c \
etk_string.c etk_editable_text_object.c etk_label.c \
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_range.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_range.c 23 Oct 2005 08:05:34 - 1.3
+++ etk_range.c 31 Oct 2005 21:36:40 - 1.4
@@ -61,6 +61,7 @@
etk_type_property_add(range_type, "value", ETK_RANGE_VALUE_PROPERTY,
ETK_PROPERTY_DOUBLE, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_double(0.0));
etk_type_property_add(range_type, "step_increment",
ETK_RANGE_STEP_INC_PROPERTY, ETK_PROPERTY_DOUBLE,
ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_double(0.0));
etk_type_property_add(range_type, "page_increment",
ETK_RANGE_PAGE_INC_PROPERTY, ETK_PROPERTY_DOUBLE,
ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_double(0.0));
+ etk_type_property_add(range_type, "page_size",
ETK_RANGE_PAGE_SIZE_PROPERTY, ETK_PROPERTY_DOUBLE,
ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_double(0.0));
range_type->property_set = _etk_range_property_set;
range_type->property_get = _etk_range_property_get;
@@ -96,7 +97,7 @@
if (!range)
return;
- new_value = ETK_CLAMP(value, range->lower, range->upper);
+ new_value = ETK_CLAMP(value, range->lower, range->upper - range->page_size);
if (new_value != range->value)
{
etk_signal_emit(_etk_range_signals[ETK_RANGE_CHANGE_VALUE_SIGNAL],
ETK_OBJECT(range), &result, new_value);
@@ -119,8 +120,8 @@
if (!range)
return;
- if (upper < lower)
- upper = lower;
+ if (upper < lower + range->page_size)
+ upper = lower + range->page_size;
if (range->lower != lower)
{
@@ -159,6 +160,38 @@
}
}
+/**
+ * @brief Sets the page size of the range: this value will be used by the
scrollbars to know the size of the drag button
+ * @param range a range
+ * @param page_size the value to set
+ */
+void etk_range_page_size_set(Etk_Range *range, double page_size)
+{
+ if (!range)
+ return;
+
+ page_size = ETK_MIN(page_size, range->upper - range->lower);
+ if (page_size != range->page_size)
+ {
+ range->page_size = page_size;
+ etk_object_notify(ETK_OBJECT(range), "page_size");
+ etk_widget_redraw_queue(ETK_WIDGET(range));
+ }
+}
+
+/**
+ * @brief Gets the page size of the range
+ * @param range a range
+ * @return Returns the page size of the range
+ */
+double etk_scrollbar_page_size_get(Etk_Range *range)
+{
+ if (!range)
+ return 0.0;
+ return range->page_size;
+}
+
+
/**
*
* Etk specific functions
@@ -176,6 +209,7 @@
range->value = 0.0;
range->step_increment = 0.0;
range->page_increment = 0.0;
+ range->page_size = 0.0;
range->change_value = _etk_range_change_value_handler;
range->value_changed = NULL;
@@ -206,6 +240,9 @@
case ETK_RANGE_PAGE_INC_PROPERTY:
etk_range_increments_set(range, range->step_increment,
etk_property_value_double_get(value));
break;
+ case ETK
E CVS: proto moom16
Enlightenment CVS committal Author : moom16 Project : e17 Module : proto Dir : e17/proto/etk/src/lib Added Files: etk_scrolled_view.c etk_scrolled_view.h Log Message: Oops... --- This SF.Net email is sponsored by the JBoss Inc. Get Certified Today * Register for a JBoss Training Course Free Certification Exam for All Training Attendees Through End of 2005 Visit http://www.jboss.com/services/certification for more information ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom16
Enlightenment CVS committal
Author : moom16
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
Makefile.am etk_entry_test.c etk_test.c etk_test.h
Added Files:
etk_scrolled_view_test.c
Log Message:
* Clip the watermark in the tree theme
* Rewrite the scrollbar to take profit of the drag features of edje
* Add the ability to clip a widget against an evas object
* Add a scrolled view!!! :)
* Add a viewport to make every widgets scrollable
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 28 Oct 2005 14:06:25 - 1.3
+++ Makefile.am 31 Oct 2005 21:36:40 - 1.4
@@ -27,7 +27,8 @@
etk_canvas_test.c \
etk_colorpicker_test.c \
etk_tree_test.c \
-etk_paned_test.c
+etk_paned_test.c \
+etk_scrolled_view_test.c
etk_test_LDADD = $(top_builddir)/src/lib/libetk.la \
@ecore_libs@ @evas_libs@ @edje_libs@
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_entry_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_entry_test.c16 Oct 2005 00:05:57 - 1.2
+++ etk_entry_test.c31 Oct 2005 21:36:40 - 1.3
@@ -28,7 +28,7 @@
}
win = etk_window_new();
- etk_window_title_set(ETK_WINDOW(win), _("Etk Entry test"));
+ etk_window_title_set(ETK_WINDOW(win), _("Etk Entry Test"));
etk_signal_connect("delete_event", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_entry_window_deleted_cb), win);
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_test.c 28 Oct 2005 14:06:25 - 1.3
+++ etk_test.c 31 Oct 2005 21:36:40 - 1.4
@@ -39,6 +39,10 @@
{
"Paned",
etk_test_paned_window_create
+ },
+ {
+ "Scrolled View",
+ etk_test_scrolled_view_window_create
}
};
static int num_tests = sizeof(tests) / sizeof (tests[0]);
@@ -59,14 +63,14 @@
etk_window_title_set(ETK_WINDOW(win), _("Etk Test Application"));
etk_signal_connect("destroy", ETK_OBJECT(win),
ETK_CALLBACK(_etk_test_main_quit_cb), NULL);
- table = etk_table_new((num_tests + 2) / 3, 3, 1);
+ table = etk_table_new((num_tests + 3) / 4, 4, TRUE);
etk_container_add(ETK_CONTAINER(win), table);
for (i = 0; i < num_tests; i++)
{
button = etk_button_new_with_label(_(tests[i].name));
etk_signal_connect_swapped("clicked", ETK_OBJECT(button),
ETK_CALLBACK(tests[i].func), NULL);
- etk_table_attach_defaults(ETK_TABLE(table), button, i / 3, i / 3, i % 3,
i % 3);
+ etk_table_attach_defaults(ETK_TABLE(table), button, i / 4, i / 4, i % 4,
i % 4);
}
etk_widget_show_all(win);
}
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_test.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_test.h 28 Oct 2005 14:06:25 - 1.4
+++ etk_test.h 31 Oct 2005 21:36:40 - 1.5
@@ -19,5 +19,6 @@
void etk_test_canvas_window_create(void *data);
void etk_test_tree_window_create(void *data);
void etk_test_paned_window_create(void *data);
+void etk_test_scrolled_view_window_create(void *data);
#endif
---
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
dialog.c
Log Message:
Fix dialog layout bug.
===
RCS file: /cvsroot/enlightenment/e16/e/src/dialog.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -3 -r1.135 -r1.136
--- dialog.c30 Oct 2005 19:40:49 - 1.135
+++ dialog.c31 Oct 2005 20:46:08 - 1.136
@@ -1236,18 +1236,20 @@
for (i = 0; i < di->item.table.num_items; i++)
{
DItem *dii;
-int w, h, j, csum = 0;
+int w, h, j, ww;
dii = di->item.table.items[i];
w = dii->w + (dii->padding.left + dii->padding.right);
h = dii->h + (dii->padding.top + dii->padding.bottom);
+ww = 0;
for (j = 0; j < dii->col_span; j++)
- csum += col_size[c + j];
-if (w > csum)
+ ww += col_size[c + j];
+if (w > ww)
{
+ ww = (w + dii->col_span - 1) / dii->col_span;
for (j = 0; j < dii->col_span; j++)
-col_size[c + j] =
- (w + dii->col_span - 1) / dii->col_span;
+if (col_size[c + j] < ww)
+ col_size[c + j] = ww;
}
if (h > row_size[r])
row_size[r] = h;
---
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/epsilon codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : libs/epsilon
Dir : e17/libs/epsilon/src/lib
Modified Files:
Epsilon.c
Log Message:
- fix aspect ratio for NORMAL thumbs
===
RCS file: /cvsroot/enlightenment/e17/libs/epsilon/src/lib/Epsilon.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- Epsilon.c 31 Oct 2005 19:51:24 - 1.20
+++ Epsilon.c 31 Oct 2005 20:29:51 - 1.21
@@ -237,8 +237,7 @@
#ifdef HAVE_EPEG_H
len = strlen (e->thumb);
if ((len > 4) &&
- (!strcmp (&e->thumb[len - 3], "jpg") ||
- !strcmp (&e->thumb[len - 3], "JPG")) &&
+ !strcasecmp (&e->thumb[len - 3], "jpg") &&
(im = epeg_file_open (e->thumb)))
{
epeg_thumbnail_comments_get (im, &info);
@@ -424,7 +423,7 @@
{
int len = 0;
int iw, ih;
- int tw = THUMB_SIZE_LARGE, th = THUMB_SIZE_LARGE;
+ int tw, th;
char outfile[PATH_MAX];
#ifdef HAVE_EPEG_H
Epeg_Image *im;
@@ -433,11 +432,14 @@
if (!e || !e->src || !e->hash)
return (EPSILON_FAIL);
+
+ tw = e->tw;
+ th = e->th;
+
#ifdef HAVE_EPEG_H
len = strlen (e->src);
if ((len > 4) &&
- (!strcmp (&e->src[len - 3], "jpg") ||
- !strcmp (&e->src[len - 3], "JPG")) && (im = epeg_file_open (e->src)))
+ !strcasecmp (&e->src[len - 3], "jpg") && (im = epeg_file_open (e->src)))
{
char *dir;
if(e->tw == THUMB_SIZE_LARGE)
@@ -508,7 +510,7 @@
if (e->h > 0)
h = e->h;
else
- h = e->th;
+ h = e->tw;
ee = ecore_evas_buffer_new (w, h);
if (ee)
---
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/epsilon codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : libs/epsilon
Dir : e17/libs/epsilon/src/lib
Modified Files:
Epsilon.c Epsilon.h
Log Message:
- allow NORMAL or LARGE thumbs to be created or loaded
- if user requests NORMAL but it doesnt exist but LARGE does, dont load LARGE
and create his requested size
===
RCS file: /cvsroot/enlightenment/e17/libs/epsilon/src/lib/Epsilon.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- Epsilon.c 30 Oct 2005 01:20:36 - 1.19
+++ Epsilon.c 31 Oct 2005 19:51:24 - 1.20
@@ -17,7 +17,8 @@
#ifdef HAVE_EPEG_H
#include
#endif
-#define THUMBNAIL_SIZE 256
+#define THUMB_SIZE_NORMAL 128
+#define THUMB_SIZE_LARGE 256
#include "exiftags/exif.h"
#include
@@ -55,6 +56,8 @@
result = malloc (sizeof (Epsilon));
memset (result, 0, sizeof (Epsilon));
result->src = strdup (file);
+ result->tw = THUMB_SIZE_LARGE;
+ result->th = THUMB_SIZE_LARGE;
}
else
{
@@ -378,7 +381,10 @@
#ifdef HAVE_EPEG_H
snprintf (buf, sizeof(buf), "%s/.thumbnails/%s/%s.jpg", home,
dirs[i], e->hash);
- if (!stat (buf, &filestatus))
+ if (!stat (buf, &filestatus) &&
+((!strcmp(dirs[i], "large") && e->tw == THUMB_SIZE_LARGE) ||
+ (!strcmp(dirs[i], "large") && e->tw == THUMB_SIZE_NORMAL) ||
+ (!strcmp(dirs[i], "fail/epsilon"
{
ok = 1;
break;
@@ -386,7 +392,10 @@
#endif
snprintf (buf, sizeof(buf), "%s/.thumbnails/%s/%s.png", home,
dirs[i], e->hash);
- if (!stat (buf, &filestatus))
+ if (!stat (buf, &filestatus) &&
+((!strcmp(dirs[i], "large") && e->tw == THUMB_SIZE_LARGE) ||
+ (!strcmp(dirs[i], "large") && e->tw == THUMB_SIZE_NORMAL) ||
+ (!strcmp(dirs[i], "fail/epsilon"
{
ok = 2;
break;
@@ -415,7 +424,7 @@
{
int len = 0;
int iw, ih;
- int tw = THUMBNAIL_SIZE, th = THUMBNAIL_SIZE;
+ int tw = THUMB_SIZE_LARGE, th = THUMB_SIZE_LARGE;
char outfile[PATH_MAX];
#ifdef HAVE_EPEG_H
Epeg_Image *im;
@@ -430,17 +439,23 @@
(!strcmp (&e->src[len - 3], "jpg") ||
!strcmp (&e->src[len - 3], "JPG")) && (im = epeg_file_open (e->src)))
{
- snprintf (outfile, sizeof(outfile), "%s/.thumbnails/large/%s.jpg",
- getenv ("HOME"), e->hash);
+ char *dir;
+ if(e->tw == THUMB_SIZE_LARGE)
+dir = strdup("large");
+ else
+dir = strdup("normal");
+ snprintf (outfile, sizeof(outfile), "%s/.thumbnails/%s/%s.jpg",
+ getenv ("HOME"), dir, e->hash);
+ free(dir);
epeg_thumbnail_comments_get (im, &info);
epeg_size_get (im, &iw, &ih);
if (iw > ih)
{
- th = THUMBNAIL_SIZE * ((double) ih / (double) iw);
+ th = e->th * ((double) ih / (double) iw);
}
else
{
- tw = THUMBNAIL_SIZE * ((double) iw / (double) ih);
+ tw = e->tw * ((double) iw / (double) ih);
}
epeg_decode_size_set (im, tw, th);
epeg_quality_set (im, 100);
@@ -488,12 +503,12 @@
if (e->w > 0)
w = e->w;
else
- w = THUMBNAIL_SIZE;
+ w = e->tw;
if (e->h > 0)
h = e->h;
else
- h = THUMBNAIL_SIZE;
+ h = e->th;
ee = ecore_evas_buffer_new (w, h);
if (ee)
@@ -541,22 +556,28 @@
ih = imlib_image_get_height ();
if (iw > ih)
{
- th = THUMBNAIL_SIZE * ((double) ih / (double) iw);
+ th = e->th * ((double) ih / (double) iw);
}
else
{
- tw = THUMBNAIL_SIZE * ((double) iw / (double) ih);
+ tw = e->tw * ((double) iw / (double) ih);
}
imlib_context_set_cliprect (0, 0, tw, th);
if ((src = imlib_create_cropped_scaled_image (0, 0, iw, ih, tw, th)))
{
+ char *dir;
+ if(e->tw == THUMB_SIZE_LARGE)
+ dir = strdup("large");
+ else
+ dir = strdup("normal");
imlib_free_image_and_decache ();
imlib_context_set_image (src);
imlib_image_set_has_alpha (1);
imlib_image_set_format ("argb");
snprintf (uri, sizeof(uri), "file://%s", e->src);
- snprintf (outfile, sizeof(outfile), "%s/.thumbnails/large/%s.png",
- getenv ("HOME"), e->hash);
+ snprintf (outfile, sizeof(outfile), "%s/.thumbnails/%s/%s.png",
+ getenv ("HOME"), dir, e->hash);
+ free(dir);
if (!_epsilon_png_write (outfile,
imlib_image_get_data (), tw, th, iw, ih,
format, mtime, uri))
@@ -574,6 +595,25 @@
return (EPSILON_FAIL);
}
+void
+epsilon_thumb_size(Epsil
E CVS: libs/ewl codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : libs/ewl Dir : e17/libs/ewl Modified Files: TODO Log Message: bugs++ (checkbox) === RCS file: /cvsroot/enlightenment/e17/libs/ewl/TODO,v retrieving revision 1.33 retrieving revision 1.34 diff -u -3 -r1.33 -r1.34 --- TODO29 Oct 2005 03:35:42 - 1.33 +++ TODO31 Oct 2005 18:30:26 - 1.34 @@ -26,6 +26,8 @@ - all the themes need to be gone over, cleaned up and corrected. +- [BUG] Checkbox doesnt show check if its selected by default until you move +the mouse in / out of the box. - [BUG] Scrollbar jumps when trying to drag the button from its lower part - [BUG] The Ewl_Paned widget dosen't allow resizing to the right. One way only at the moment. --- This SF.Net email is sponsored by the JBoss Inc. Get Certified Today * Register for a JBoss Training Course Free Certification Exam for All Training Attendees Through End of 2005 Visit http://www.jboss.com/services/certification for more information ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: Disable esmart_textarea for now, mention that it needs to be fixed and re enabled. === RCS file: /cvsroot/enlightenment/e17/apps/e/TODO,v retrieving revision 1.282 retrieving revision 1.283 diff -u -3 -r1.282 -r1.283 --- TODO30 Oct 2005 11:05:57 - 1.282 +++ TODO31 Oct 2005 15:49:31 - 1.283 @@ -25,6 +25,14 @@ * BUG: if you have 2 zones and you fill up zone 2 (right) mostly and then run a big xev (xev -g 1280x1024) that wont fit it gets placed offscreen to the right of zone 2 +* FIX: Esmart_textarea has been disabled until it is updated to the new + textblock API. Affected files are - +e17/libs/esmart/configure.in +e17/libs/esmart/src/lib/Makefile.am +e17/apps/e_modules/src/modules/Makefile.am +e17/apps/e_modules/src/modules/notes/Makefile.am +e17/apps/e_utils/src/bin/exige/Makefile.am +e17/apps/eclair/src/eclair_subtitles.c ]]] [[[ --- This SF.Net email is sponsored by the JBoss Inc. Get Certified Today * Register for a JBoss Training Course Free Certification Exam for All Training Attendees Through End of 2005 Visit http://www.jboss.com/services/certification for more information ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl rbdpngn
Enlightenment CVS committal Author : rbdpngn Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_text.c Log Message: Set the initial refcount to 1 to avoid leaking contexts when decrementing the unsigned int and wrapping around from 0 to a positive number and failing the > 0 test. === RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_text.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -3 -r1.37 -r1.38 --- ewl_text.c 28 Oct 2005 03:57:44 - 1.37 +++ ewl_text.c 31 Oct 2005 15:24:10 - 1.38 @@ -3331,6 +3331,7 @@ DENTER_FUNCTION(DLEVEL_STABLE); tx = NEW(Ewl_Text_Context, 1); + tx->ref_count = 1; DRETURN_PTR(tx, DLEVEL_STABLE);; } --- This SF.Net email is sponsored by the JBoss Inc. Get Certified Today * Register for a JBoss Training Course Free Certification Exam for All Training Attendees Through End of 2005 Visit http://www.jboss.com/services/certification for more information ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e troback
Enlightenment CVS committal Author : troback Project : e17 Module : apps/e Dir : e17/apps/e/po Modified Files: sv.po Log Message: Minor update. === RCS file: /cvsroot/enlightenment/e17/apps/e/po/sv.po,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- sv.po 27 Oct 2005 12:46:20 - 1.6 +++ sv.po 31 Oct 2005 14:42:03 - 1.7 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2005-10-27 09:22+0200\n" -"PO-Revision-Date: 2005-10-27 13:44+0200\n" +"POT-Creation-Date: 2005-10-31 12:22+0100\n" +"PO-Revision-Date: 2005-10-31 13:58+0100\n" "Last-Translator: Anders Trobäck <[EMAIL PROTECTED]>\n" "Language-Team: Swedish\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgid "About Enlightenment" msgstr "Om Enlightenment" -#: src/bin/e_about.c:50 src/bin/e_main.c:559 +#: src/bin/e_about.c:50 src/bin/e_main.c:561 msgid "Enlightenment" msgstr "Enlightenment" @@ -62,13 +62,13 @@ msgid "No" msgstr "Nej" -#: src/bin/e_apps.c:413 src/bin/e_apps.c:1785 src/bin/e_fileman_file.c:352 -#: src/bin/e_fileman_file.c:403 src/bin/e_utils.c:222 +#: src/bin/e_apps.c:413 src/bin/e_apps.c:1782 src/bin/e_fileman_file.c:354 +#: src/bin/e_fileman_file.c:405 src/bin/e_utils.c:222 msgid "Run Error" msgstr "Körfel" -#: src/bin/e_apps.c:414 src/bin/e_fileman_file.c:353 -#: src/bin/e_fileman_file.c:404 src/bin/e_utils.c:223 +#: src/bin/e_apps.c:414 src/bin/e_fileman_file.c:355 +#: src/bin/e_fileman_file.c:406 src/bin/e_utils.c:223 #, c-format msgid "" "Enlightenment was unable fork a child process:\n" @@ -81,7 +81,7 @@ "%s\n" "\n" -#: src/bin/e_apps.c:1786 +#: src/bin/e_apps.c:1783 #, c-format msgid "" "Enlightenment was unable run the program:\n" @@ -96,96 +96,6 @@ "\n" "Kommandot gick inte att hitta\n" -#: src/bin/e_border.c:5770 -msgid "Always On Top" -msgstr "Alltid överst" - -#: src/bin/e_border.c:5780 src/modules/clock/e_mod_main.c:349 -#: src/modules/pager/e_mod_main.c:458 -msgid "Normal" -msgstr "Normal" - -#: src/bin/e_border.c:5790 -msgid "Always Below" -msgstr "Alltid underst" - -#: src/bin/e_border.c:5807 src/bin/e_int_border_locks.c:65 -msgid "Window Locks" -msgstr "Fönster LÃ¥s" - -#: src/bin/e_border.c:5814 -msgid "Remember" -msgstr "Fönster Minne" - -#: src/bin/e_border.c:5824 -msgid "Send to Desktop" -msgstr "Skicka till Skrivbord" - -#: src/bin/e_border.c:5835 src/bin/e_int_border_locks.c:319 -#: src/bin/e_int_border_locks.c:338 src/bin/e_int_border_remember.c:466 -msgid "Stacking" -msgstr "Stapla" - -#: src/bin/e_border.c:5845 -msgid "Shaded" -msgstr "Skymt" - -#: src/bin/e_border.c:5858 -msgid "Maximized" -msgstr "Maximerat" - -#: src/bin/e_border.c:5871 -msgid "Sticky" -msgstr "Klibbig" - -#: src/bin/e_border.c:5884 -msgid "Borderless" -msgstr "Ramlöst" - -#: src/bin/e_border.c:5897 -msgid "Fullscreen" -msgstr "Helskärm" - -#: src/bin/e_border.c:5911 -msgid "Skip Window List" -msgstr "Ignorera Fönsterlist" - -#: src/bin/e_border.c:5935 -msgid "Edit Icon" -msgstr "Ãndra ikon" - -#: src/bin/e_border.c:5962 -msgid "Create Icon" -msgstr "Skapa ikon" - -#: src/bin/e_border.c:5973 -msgid "Kill" -msgstr "Döda" - -#: src/bin/e_border.c:5986 -msgid "Iconify" -msgstr "Minimera" - -#: src/bin/e_border.c:5997 -msgid "Close" -msgstr "Stäng" - -#: src/bin/e_border.c:6087 -msgid "Icon Edit Error" -msgstr "Fel vid ändrande av ikon" - -#: src/bin/e_border.c:6088 -msgid "" -"Error starting icon editor\n" -"\n" -"please install e_util_eapp_edit\n" -"or make sure it is in your PATH\n" -msgstr "" -"Fel vid start av ikon redigeraren\n" -"\n" -"Installera e_util_eapp_edit\n" -"eller kontrollera att den finns i din sökväg (PATH)\n" - #: src/bin/e_config_dialog.c:86 msgid "Advanced Settings" msgstr "Avancerade inställningar" @@ -195,8 +105,8 @@ msgstr "Grundinställningar" #: src/bin/e_config_dialog.c:113 src/bin/e_error.c:196 src/bin/e_error.c:205 -#: src/bin/e_int_border_remember.c:236 src/bin/e_int_border_remember.c:310 -#: src/bin/e_int_border_remember.c:352 src/bin/e_module.c:399 +#: src/bin/e_int_border_remember.c:245 src/bin/e_int_border_remember.c:325 +#: src/bin/e_int_border_remember.c:367 src/bin/e_module.c:399 #: src/modules/ibar/e_mod_main.c:1682 msgid "OK" msgstr "OK" @@ -205,7 +115,7 @@ msgid "Apply" msgstr "Verkställ" -#: src/bin/e_config_dialog.c:115 src/bin/e_eap_editor.c:169 +#: src/bin/e_config_dialog.c:115 msgid "Cancel" msgstr "Avbryt" @@ -259,6 +169,10 @@ msgid "Enlightenment: Error!" msgstr "Enlightenment: Fel!" +#: src/bin/e_int_border_locks.c:65 src/bin/e_int_border_menu.c:77 +msgid "Window Locks" +msgstr "Fönster LÃ¥s" + #: src/bin/e_int_border_locks.c:289 msgid "Generic Locks" msgstr "Almänna LÃ¥s" @@ -290,28 +204,33 @@ msgstr "Hindra program att ändra:" #: src/bin/e_int_border_locks.c:315 src/bin/e_int_border_locks.c:334 -#: src/bin/
E CVS: apps/e handyande
Enlightenment CVS committal
Author : handyande
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_border_menu.c
Log Message:
remove double separator
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_border_menu.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_int_border_menu.c 31 Oct 2005 00:01:54 - 1.2
+++ e_int_border_menu.c 31 Oct 2005 10:27:06 - 1.3
@@ -199,9 +199,6 @@
if (bd->app)
{
mi = e_menu_item_new(m);
-e_menu_item_separator_set(mi, 1);
-
-mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _("Edit Icon"));
e_menu_item_callback_set(mi, _e_border_menu_cb_icon_edit,
bd->app->path);
e_menu_item_icon_edje_set(mi, bd->app->path, "icon");
---
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_fileman.edc
Log Message:
- change font when something is selected
===
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_fileman.edc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- default_fileman.edc 30 Oct 2005 08:48:07 - 1.15
+++ default_fileman.edc 31 Oct 2005 10:08:41 - 1.16
@@ -938,6 +938,7 @@
type: TEXT;
effect:SHADOW;
description {
+ state: "default" 0.0;
rel1 {
relative: 0.0 1.0;
offset: 5 -6;
@@ -956,6 +957,13 @@
// min: 1 1;
}
}
+description {
+ state: "clicked" 0.0;
+ inherit: "default" 0.0;
+ text {
+ font: "Edje-Vera-Bold";
+ }
+}
}
part {
name: "icon_event";
@@ -1018,11 +1026,19 @@
}
programs {
program {
-name: "button_click";
-signal: "mouse,down,1";
-source: "";
-action: SIGNAL_EMIT "clicked" "";
- }
+name: "clicked";
+signal: "clicked";
+source: "";
+action: STATE_SET "clicked" 0.0;
+target: "icon_title";
+ }
+ program {
+name: "unclicked";
+signal: "unclicked";
+source: "";
+action: STATE_SET "default" 0.0;
+target: "icon_title";
+ }
}
}
---
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
A NEW AnonCVS mirror
Thanks to our freinds at http://www.thinktux.net off in the Alps in Switzerland, we have a new Anonymous CVS Mirror. This will NOT ALLOW WRITES and it is not ALWAYS up to date with development CVS as it syncs every 30 minutes from development CVS, BUT it is at most 30 minutes behind, and apparently has a lot of bandwidth. So thanks om1n[A]e and null__ for helping set it up and managing it. You can check the details here: http://www.enlightenment.org/Enlightenment/Get_Enlightenment/index.html And you can check out a tree for e17 with this command: cvs -d :pserver:[EMAIL PROTECTED]/root co e17 So everyone having problems getting into sf.net anonymous CVS, this is another option. :) Again. Thanks to om1n[A]e and null__ :) -- - Codito, ergo sum - "I code, therefore I am" -- The Rasterman (Carsten Haitzler)[EMAIL PROTECTED] 裸好多 Tokyo, Japan (東京 日本) --- This SF.Net email is sponsored by the JBoss Inc. Get Certified Today * Register for a JBoss Training Course Free Certification Exam for All Training Attendees Through End of 2005 Visit http://www.jboss.com/services/certification for more information ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_eap_editor.c e_widget_iconsel.c
Log Message:
-bug fixes
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_eap_editor.c 31 Oct 2005 09:31:04 - 1.10
+++ e_eap_editor.c 31 Oct 2005 09:46:27 - 1.11
@@ -108,6 +108,7 @@
cfdata = E_NEW(E_App_Edit_CFData, 1);
if (!cfdata) return NULL;
cfdata->editor = cfd->data;
+ cfdata->image = NULL;
_e_eap_edit_fill_data(cfdata);
return cfdata;
}
@@ -214,17 +215,12 @@
o = e_widget_frametable_add(evas, _("Icon"), 0);
+ editor->img = e_icon_add(evas);
if(eap->path)
{
- editor->img = e_icon_add(evas);
e_icon_file_key_set(editor->img, eap->path, "images/0");
e_icon_fill_inside_set(editor->img, 1);
}
- else
- {
- editor->img = edje_object_add(evas);
- e_theme_edje_object_set(editor->img,
"base/theme/icons/enlightenment/e", "icons/enlightenment/e");
- }
editor->img_widget = e_widget_iconsel_add(evas, editor->img, 48, 48,
&(cfdata->image));
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_widget_iconsel.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_widget_iconsel.c 31 Oct 2005 09:31:05 - 1.4
+++ e_widget_iconsel.c 31 Oct 2005 09:46:27 - 1.5
@@ -3,6 +3,13 @@
*/
#include "e.h"
+/*- DESCRIPTION -*/
+/* Adds a pushable button with an icon preview which serves as an icon
+ * selector (could be extended to select certain file tyes.
+ * NOTE: The Evas_Object *icon object in the *_add functions is expected to
+ * be an e_icon.
+ */
+
typedef struct _E_Widget_Data E_Widget_Data;
struct _E_Widget_Data
{
---
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c e_eap_editor.c e_entry.c e_file_dialog.c
e_fileman_file.c e_fileman_icon.c e_fileman_smart.c e_thumb.c
e_widget_entry.c e_widget_iconsel.c
Log Message:
- fix warnings
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -3 -r1.99 -r1.100
--- e_apps.c31 Oct 2005 00:01:54 - 1.99
+++ e_apps.c31 Oct 2005 09:31:04 - 1.100
@@ -1077,7 +1077,7 @@
Evas *evasbuf;
Evas_Coord iw, ih;
Evas_Object *im;
- int *data;
+ const int *data;
buf = ecore_evas_buffer_new(1, 1);
evasbuf = ecore_evas_get(buf);
@@ -1095,7 +1095,7 @@
evas_object_move(im, 0, 0);
evas_object_show(im);
data = ecore_evas_buffer_pixels_get(buf);
-eet_data_image_write(ef, "images/0", data, 48, 48, alpha, 1, 0, 0);
+eet_data_image_write(ef, "images/0", (void *)data, 48, 48, alpha,
1, 0, 0);
}
}
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_eap_editor.c 31 Oct 2005 00:01:54 - 1.9
+++ e_eap_editor.c 31 Oct 2005 09:31:04 - 1.10
@@ -227,7 +227,7 @@
}
editor->img_widget = e_widget_iconsel_add(evas, editor->img, 48, 48,
-&cfdata->image);
+&(cfdata->image));
e_widget_iconsel_select_callback_add(editor->img_widget,
_e_eap_edit_select_cb, editor);
e_widget_frametable_object_append(o, editor->img_widget,
0, 0, 1, 1,
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_entry.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_entry.c 28 Oct 2005 02:56:26 - 1.11
+++ e_entry.c 31 Oct 2005 09:31:04 - 1.12
@@ -769,7 +769,7 @@
if(key_event->string && strcmp(key_event->keyname, "Escape"))
{
if(*(key_event->string) >= 32 && *(key_event->string) <= 126)
- e_entry_sd->change_func(e_entry_sd->change_data, obj,
key_event->string);
+ e_entry_sd->change_func(e_entry_sd->change_data, obj, (char
*)key_event->string);
}
}
}
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_file_dialog.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_file_dialog.c 31 Oct 2005 00:01:54 - 1.3
+++ e_file_dialog.c 31 Oct 2005 09:31:04 - 1.4
@@ -65,7 +65,7 @@
table = e_widget_table_add(evas, "Select File", 0);
- fm = e_widget_fileman_add(evas, dia->file);
+ fm = e_widget_fileman_add(evas, &(dia->file));
e_widget_table_object_append(table, fm, 0, 0, 4, 4, 1, 1, 1, 1);
e_widget_fileman_select_callback_add(fm, _e_file_dialog_file_select_cb,
dia);
@@ -90,7 +90,7 @@
void
e_file_dialog_title_set(E_File_Dialog *dia, const char *title)
{
- e_dialog_title_set(dia->dia, title);
+ e_dialog_title_set(dia->dia, (char *)title);
}
void
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_file.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_fileman_file.c29 Oct 2005 14:19:23 - 1.10
+++ e_fileman_file.c31 Oct 2005 09:31:04 - 1.11
@@ -62,7 +62,7 @@
if (!file) return NULL;
file->path = strdup(filename);
if (!file->path) goto error;
- file->name = strdup(ecore_file_get_file(filename));
+ file->name = strdup(ecore_file_get_file((char *)filename));
if (!file->name) goto error;
/* Get attributes */
file->device = st.st_dev;
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_icon.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_fileman_icon.c29 Oct 2005 11:48:18 - 1.10
+++ e_fileman_icon.c31 Oct 2005 09:31:04 - 1.11
@@ -162,7 +162,7 @@
sd = evas_object_smart_data_get(obj);
if (!sd) return;
E_FREE(sd->saved_title);
- sd->saved_title = E_NEW(char *, strlen(title) + 1);
+ sd->saved_title = E_NEW(char, strlen(title) + 1);
snprintf(sd->saved_title, strlen(title) + 1, "%s", title);
if (sd->icon_object) edje_object_part_text_set(sd->icon_object,
"icon_title", title);
}
===
R
E CVS: libs/ecore codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_file
Modified Files:
Ecore_File.h ecore_file.c
Log Message:
- char * to const char *
===
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_file/Ecore_File.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- Ecore_File.h23 Oct 2005 23:21:29 - 1.17
+++ Ecore_File.h31 Oct 2005 09:14:41 - 1.18
@@ -61,7 +61,7 @@
EAPI int ecore_file_mv (const char *src, const char *dst);
EAPI char *ecore_file_realpath (const char *file);
EAPI int ecore_file_unlink (const char *file);
- EAPI char *ecore_file_get_file (char *path);
+ EAPI const char *ecore_file_get_file (const char *path);
EAPI char *ecore_file_get_dir (char *path);
EAPI int ecore_file_can_exec (const char *file);
===
RCS file:
/cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_file/ecore_file.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- ecore_file.c24 Oct 2005 10:06:11 - 1.37
+++ ecore_file.c31 Oct 2005 09:14:41 - 1.38
@@ -212,8 +212,8 @@
return strdup(buf);
}
-char *
-ecore_file_get_file(char *path)
+const char *
+ecore_file_get_file(const char *path)
{
char *result = NULL;
---
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
