E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_config.c e_config.h e_main.c e_shelf.c e_shelf.h
Log Message:
working on shelf config
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -3 -r1.144 -r1.145
--- e_config.c 16 Feb 2006 05:08:17 - 1.144
+++ e_config.c 16 Feb 2006 06:32:54 - 1.145
@@ -37,6 +37,8 @@
static E_Config_DD *_e_config_color_class_edd = NULL;
static E_Config_DD *_e_config_gadcon_edd = NULL;
static E_Config_DD *_e_config_gadcon_client_edd = NULL;
+static E_Config_DD *_e_config_shelf_edd = NULL;
+static E_Config_DD *_e_config_shelf_config_edd = NULL;
/* externally accessible functions */
@@ -98,6 +100,32 @@
E_CONFIG_VAL(D, T, id, STR);
E_CONFIG_LIST(D, T, clients, _e_config_gadcon_client_edd);
+ _e_config_shelf_config_edd = E_CONFIG_DD_NEW("E_Config_Shelf_Config",
E_Config_Shelf_Config);
+#undef T
+#undef D
+#define T E_Config_Shelf_Config
+#define D _e_config_shelf_config_edd
+ E_CONFIG_VAL(D, T, res.w, INT);
+ E_CONFIG_VAL(D, T, res.h, INT);
+ E_CONFIG_VAL(D, T, x, INT);
+ E_CONFIG_VAL(D, T, y, INT);
+ E_CONFIG_VAL(D, T, w, INT);
+ E_CONFIG_VAL(D, T, h, INT);
+ E_CONFIG_VAL(D, T, orient, INT);
+ E_CONFIG_VAL(D, T, style, STR);
+
+ _e_config_shelf_edd = E_CONFIG_DD_NEW("E_Config_Shelf", E_Config_Shelf);
+#undef T
+#undef D
+#define T E_Config_Shelf
+#define D _e_config_shelf_edd
+ E_CONFIG_VAL(D, T, name, STR);
+ E_CONFIG_VAL(D, T, container, INT);
+ E_CONFIG_VAL(D, T, zone, INT);
+ E_CONFIG_VAL(D, T, layer, INT);
+ E_CONFIG_VAL(D, T, popup, UCHAR);
+ E_CONFIG_LIST(D, T, configs, _e_config_shelf_config_edd);
+
_e_config_desktop_bg_edd = E_CONFIG_DD_NEW("E_Config_Desktop_Background",
E_Config_Desktop_Background);
#undef T
#undef D
@@ -428,6 +456,7 @@
E_CONFIG_VAL(D, T, cfgdlg_auto_apply, INT); /**/
E_CONFIG_VAL(D, T, cfgdlg_default_mode, INT); /**/
E_CONFIG_LIST(D, T, gadcons, _e_config_gadcon_edd);
+ E_CONFIG_LIST(D, T, shelves, _e_config_shelf_edd);
e_config = e_config_domain_load("e", _e_config_edd);
if (e_config)
@@ -582,6 +611,30 @@
/* FIXME: fill up default gadcons! */
{
+E_Config_Shelf *cf_es;
+E_Config_Shelf_Config *cf_escf;
+
+cf_es = E_NEW(E_Config_Shelf, 1);
+cf_es->name = evas_stringshare_add("shelf");
+cf_es->container = 0;
+cf_es->zone = 0;
+cf_es->popup = 1;
+cf_es->layer = 200;
+e_config->shelves = evas_list_append(e_config->shelves, cf_es);
+
+cf_escf = E_NEW(E_Config_Shelf_Config, 1);
+cf_escf->res.w = 800;
+cf_escf->res.h = 600;
+cf_escf->x = 0;
+cf_escf->y = 0;
+cf_escf->w = 800;
+cf_escf->h = 32;
+cf_escf->orient = E_GADCON_ORIENT_TOP;
+cf_escf->style = evas_stringshare_add("default");
+cf_es->configs = evas_list_append(cf_es->configs, cf_escf);
+ }
+
+ {
E_Config_Gadcon *cf_gc;
E_Config_Gadcon_Client *cf_gcc;
@@ -1628,6 +1681,8 @@
E_CONFIG_DD_FREE(_e_config_remember_edd);
E_CONFIG_DD_FREE(_e_config_gadcon_edd);
E_CONFIG_DD_FREE(_e_config_gadcon_client_edd);
+ E_CONFIG_DD_FREE(_e_config_shelf_edd);
+ E_CONFIG_DD_FREE(_e_config_shelf_config_edd);
return 1;
}
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.h,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -3 -r1.81 -r1.82
--- e_config.h 16 Feb 2006 05:08:16 - 1.81
+++ e_config.h 16 Feb 2006 06:32:54 - 1.82
@@ -35,6 +35,8 @@
typedef struct _E_Config_Desktop_Name E_Config_Desktop_Name;
typedef struct _E_Config_Gadcon E_Config_Gadcon;
typedef struct _E_Config_Gadcon_Client E_Config_Gadcon_Client;
+typedef struct _E_Config_Shelf E_Config_Shelf;
+typedef struct _E_Config_Shelf_Config E_Config_Shelf_Config;
typedef Eet_Data_Descriptor E_Config_DD;
@@ -47,7 +49,7 @@
* versioning feature. the value of this is really irrelevant - just as
* long as it increases every time we change something
*/
-#define E_CONFIG_FILE_VERSION 137
+#define E_CONFIG_FILE_VERSION 138
#define E_EVAS_ENGINE_DEFAULT 0
#define E_EVAS_ENGINE_SOFTWARE_X11 1
@@ -207,6 +209,7 @@
int cfgdlg_auto_apply; // GUI
int cfgdlg_default_mode; // GUI
Evas_List *gadcons;
+ Evas_List *shelves;
};
struct _E_Config_Module
@@ -295,6 +298,25 @@
} geom;
};
+struct _E_Config_Shelf
+{
+ char *name;
+ int container, zone;
+ int layer;
+ un
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_winlist.c
Log Message:
Fix Bug: If we're not Warp While Selecting, then don't warp
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_winlist.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- e_winlist.c 7 Feb 2006 06:37:04 - 1.41
+++ e_winlist.c 16 Feb 2006 06:03:50 - 1.42
@@ -578,6 +578,21 @@
if (!animator)
animator = ecore_animator_add(_e_winlist_animator, NULL);
}
+ else
+ {
+warp_to = 0;
+if (warp_timer)
+ {
+ ecore_timer_del(warp_timer);
+ warp_timer = NULL;
+ }
+if (animator)
+ {
+ ecore_animator_del(animator);
+ animator = NULL;
+ }
+ }
+
if ((!ww->border->lock_user_stacking) &&
(e_config->winlist_list_raise_while_selecting))
e_border_raise(ww->border);
if ((!ww->border->lock_focus_out) &&
(e_config->winlist_list_focus_while_selecting))
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore Modified Files: ecore_exe.c Log Message: Brain fart-- === RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore/ecore_exe.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -3 -r1.55 -r1.56 --- ecore_exe.c 15 Feb 2006 04:55:14 - 1.55 +++ ecore_exe.c 16 Feb 2006 05:31:21 - 1.56 @@ -1381,7 +1381,7 @@ int count; /* check whether we need to write anything at all. */ - if ((!exe->child_fd_write != -1) && (!exe->write_data_buf)) return; + if ((exe->child_fd_write == -1) || (!exe->write_data_buf)) return; if (exe->write_data_size == exe->write_data_offset) return; count = write(exe->child_fd_write, --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_config.h e_config.c
Log Message:
Update what is GUId and IPCd
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.h,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- e_config.h 15 Feb 2006 20:28:31 - 1.80
+++ e_config.h 16 Feb 2006 05:08:16 - 1.81
@@ -169,8 +169,8 @@
int resize_info_follows; // GUI
int move_info_visible; // GUI
int resize_info_visible; // GUI
- int focus_last_focused_per_desktop;
- int focus_revert_on_hide_or_close;
+ int focus_last_focused_per_desktop; // GUI
+ int focus_revert_on_hide_or_close; // GUI
int use_e_cursor; // GUI
int cursor_size; //GUI
int menu_autoscroll_margin; // GUI
@@ -189,7 +189,7 @@
int menu_eap_name_show; // GUI
int menu_eap_generic_show; // GUI
int menu_eap_comment_show; // GUI
- int fullscreen_policy;
+ int fullscreen_policy; // GUI
int exebuf_max_exe_list; // GUI
int exebuf_max_eap_list; // GUI
int exebuf_scroll_animate; // GUI
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -3 -r1.143 -r1.144
--- e_config.c 15 Feb 2006 20:28:31 - 1.143
+++ e_config.c 16 Feb 2006 05:08:17 - 1.144
@@ -425,8 +425,8 @@
E_CONFIG_VAL(D, T, exebuf_pos_max_h, INT);
E_CONFIG_LIST(D, T, color_classes, _e_config_color_class_edd);
E_CONFIG_VAL(D, T, use_app_icon, INT);
- E_CONFIG_VAL(D, T, cfgdlg_auto_apply, INT);
- E_CONFIG_VAL(D, T, cfgdlg_default_mode, INT);
+ E_CONFIG_VAL(D, T, cfgdlg_auto_apply, INT); /**/
+ E_CONFIG_VAL(D, T, cfgdlg_default_mode, INT); /**/
E_CONFIG_LIST(D, T, gadcons, _e_config_gadcon_edd);
e_config = e_config_domain_load("e", _e_config_edd);
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e jlzapata
Enlightenment CVS committal
Author : jlzapata
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_mime.c e_fileman_mime.h e_fileman_smart.c
e_fileman_smart.h
Log Message:
efm:
- two more states for the fileman edje, hover - unhover
- implemented hover functions when dragging
- relative actions / default relative action in place (not working yet)
- there is SERIOUS BUG when using multiple windows of efm, when dragging
or using the band on 2+ windows for the first time segvs, i think this
was also before my changes.
- still there are lots of things to be coded, dont expect to work
cleanly yet
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_mime.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_fileman_mime.c15 Feb 2006 14:18:06 - 1.4
+++ e_fileman_mime.c16 Feb 2006 03:13:30 - 1.5
@@ -349,7 +349,7 @@
}
else
{
- command =
_e_fm_mime_string_tokenizer(sd->operation.files,sd->operation.dir,action->cmd);
+ command =
_e_fm_mime_string_tokenizer(sd->operation.files,sd->operation.hover,action->cmd);
printf("going to execute %s\n", command);
exe = ecore_exe_run(command, NULL);
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_mime.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_fileman_mime.h14 Feb 2006 19:39:39 - 1.3
+++ e_fileman_mime.h16 Feb 2006 03:13:30 - 1.4
@@ -30,6 +30,7 @@
int level; /* the level on the three for easy
search/comparsion */
E_Fm_Mime_Entry *parent;
E_Fm_Mime_Action *action_default; /* the default action also exists on the
actions list */
+ E_Fm_Mime_Action *action_default_relative;
Evas_List*actions;
/* the autodetect features */
char *suffix;
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -3 -r1.131 -r1.132
--- e_fileman_smart.c 15 Feb 2006 14:18:06 - 1.131
+++ e_fileman_smart.c 16 Feb 2006 03:13:30 - 1.132
@@ -3,6 +3,16 @@
*/
#include "e.h"
+/* mouse use
+ * =
+ *
+ *
+ *
+ *
+ *
+ */
+
+
/* TODO:
*
* - if we resize efm while we're generating files, we crash
@@ -2125,6 +2135,7 @@
evas_object_hide(sd->selection.band.obj);
sd->selection.band.files = evas_list_free(sd->selection.band.files);
}
+ printf("mouse up on the window\n");
}
static void
@@ -2151,57 +2162,11 @@
icon->sd->operation.files = NULL;
_e_fm_selections_clear(icon->sd);
_e_fm_selections_add(icon, evas_list_find_list(icon->sd->icons,
icon));
-icon->sd->operation.dir = icon->sd->dir;
+icon->sd->operation.hover = NULL;
icon->sd->operation.files =
evas_list_append(icon->sd->operation.files, icon->file);
icon->sd->operation.mime = icon->file->mime;
e_fm_mime_action_default_call(icon->sd);
}
-
-
-#if 0
- if (icon->file->type == E_FM_FILE_TYPE_DIRECTORY && (ev->flags ==
EVAS_BUTTON_DOUBLE_CLICK))
- {
-char *fullname;
-
-if(icon->sd->win)
- icon->sd->drag.start = 0;
-
-if (!strcmp(icon->file->name, ".")) return; /* this case cant
happen!? */
-
-if (!strcmp(icon->file->name, ".."))
- {
- fullname = _e_fm_dir_pop(icon->sd->dir);
- }
-else
- {
- fullname = strdup(icon->file->path);
- }
-
- /* FIXME: we need to fix this, uber hack alert */
-if (fullname)
- {
- if (icon->sd->win)
- e_win_title_set(icon->sd->win, fullname);
- _e_fm_dir_set(icon->sd, fullname);
- free(fullname);
- }
- }
- else if (icon->file->type == E_FM_FILE_TYPE_FILE && (ev->flags ==
EVAS_BUTTON_DOUBLE_CLICK))
- {
-if(icon->sd->win)
- icon->sd->drag.start = 0;
-
-if(icon->sd->is_selector)
- {
- _e_fm_selector_send_file(icon);
- return;
- }
-
-/*if ((!e_fm_file_assoc_exec(icon->file)) &&
-(e_fm_file_can_exec(icon->file)))
- e_fm_file_exec(icon->file);*/
- }
-#endif
else
{
if(icon->sd->is_selector && icon->file->type ==
E_FM_FILE_TYPE_FILE)
@@ -2213,8 +2178,8 @@
evas_object_geometry_get(icon->icon_obj, &x, &y, NULL, NULL);
- icon->sd->drag.start
E CVS: apps/e jlzapata
Enlightenment CVS committal
Author : jlzapata
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_fileman.edc
Log Message:
efm:
- two more states for the fileman edje, hover - unhover
- implemented hover functions when dragging
- relative actions / default relative action in place (not working yet)
- there is SERIOUS BUG when using multiple windows of efm, when dragging
or using the band on 2+ windows for the first time segvs, i think this
was also before my changes.
- still there are lots of things to be coded, dont expect to work
cleanly yet
===
RCS file: /cvsroot/enlightenment/e17/apps/e/data/themes/default_fileman.edc,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- default_fileman.edc 11 Feb 2006 22:54:06 - 1.32
+++ default_fileman.edc 16 Feb 2006 03:13:30 - 1.33
@@ -1129,6 +1129,11 @@
inherit: "default" 0.0;
color: 10 10 10 30;
}
+ description {
+ state: "hover" 0.0;
+ inherit: "default" 0.0;
+ color: 10 10 10 30;
+ }
}
part {
name: "icon_box";
@@ -1264,6 +1269,24 @@
target: "icon_title";
target: "icon_overlay";
}
+ program {
+name: "hover";
+signal: "hover";
+source: "";
+action: STATE_SET "hover" 0.0;
+transition: LINEAR 0.2;
+target: "icon_title";
+ target: "icon_overlay";
+ }
+ program {
+name: "unhover";
+signal: "unhover";
+source: "";
+action: STATE_SET "default" 0.0;
+transition: LINEAR 0.2;
+target: "icon_title";
+ target: "icon_overlay";
+ }
}
}
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
___
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_paned.c ewl_paned.h
Log Message:
- make the grabber orientation code relative to the paned
- shuffle some code around
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_paned.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- ewl_paned.c 8 Feb 2006 04:52:52 - 1.19
+++ ewl_paned.c 16 Feb 2006 02:15:54 - 1.20
@@ -9,10 +9,6 @@
void *data);
static void ewl_paned_grabber_cb_mouse_move(Ewl_Widget *w, void *ev,
void *data);
-static void ewl_paned_grabber_cb_mouse_in(Ewl_Widget *w, void *ev,
- void *data);
-static void ewl_paned_grabber_cb_mouse_out(Ewl_Widget *w, void *ev,
- void *data);
static void ewl_paned_configure_horizontal(Ewl_Paned *p);
static void ewl_paned_configure_vertical(Ewl_Paned *p);
@@ -128,7 +124,6 @@
ewl_paned_orientation_set(Ewl_Paned *p, Ewl_Orientation o)
{
Ewl_Widget *child;
- Ewl_Orientation sep;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("p", p);
@@ -137,11 +132,6 @@
if (p->orientation == o)
DRETURN(DLEVEL_STABLE);
- if (o == EWL_ORIENTATION_HORIZONTAL)
- sep = EWL_ORIENTATION_VERTICAL;
- else
- sep = EWL_ORIENTATION_HORIZONTAL;
-
ecore_list_goto_first(EWL_CONTAINER(p)->children);
while ((child = ecore_list_next(EWL_CONTAINER(p)->children)))
{
@@ -149,8 +139,8 @@
* appearance/orientation. XXX This assumes that all
* internal widgets will be grabbers ... */
if (ewl_widget_internal_is(child))
- ewl_paned_grabber_orientation_set(
- EWL_PANED_GRABBER(child), sep);
+ ewl_paned_grabber_paned_orientation_set(
+ EWL_PANED_GRABBER(child), o);
}
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -189,22 +179,9 @@
DRETURN(DLEVEL_STABLE);
/* create the required grabber */
- if (EWL_PANED(c)->orientation == EWL_ORIENTATION_HORIZONTAL)
- idx = EWL_ORIENTATION_VERTICAL;
- else
- idx = EWL_ORIENTATION_HORIZONTAL;
-
o = ewl_paned_grabber_new();
- ewl_paned_grabber_orientation_set(EWL_PANED_GRABBER(o), idx);
-
- ewl_callback_append(o, EWL_CALLBACK_MOUSE_DOWN,
- ewl_paned_grabber_cb_mouse_down, c);
- ewl_callback_append(o, EWL_CALLBACK_MOUSE_UP,
- ewl_paned_grabber_cb_mouse_up, c);
- ewl_callback_append(o, EWL_CALLBACK_MOUSE_IN,
- ewl_paned_grabber_cb_mouse_in, c);
- ewl_callback_append(o, EWL_CALLBACK_MOUSE_OUT,
- ewl_paned_grabber_cb_mouse_out, c);
+ ewl_paned_grabber_paned_orientation_set(EWL_PANED_GRABBER(o),
+ EWL_PANED(c)->orientation);
idx = ewl_container_child_index_get(c, w);
ewl_container_child_insert(c, o, idx);
@@ -728,16 +705,153 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
+/*
+ * Ewl_Paned_Grabber stuff
+ */
+
+/**
+ * @return Returns a new Ewl_Paned_Grabber widget or NULL on failure
+ */
+Ewl_Widget *
+ewl_paned_grabber_new(void)
+{
+ Ewl_Widget *w;
+
+ DENTER_FUNCTION(DLEVEL_STABLE);
+
+ w = NEW(Ewl_Paned_Grabber, 1);
+ if (!w)
+ DRETURN_PTR(NULL, DLEVEL_STABLE);
+
+ if (!ewl_paned_grabber_init(EWL_PANED_GRABBER(w)))
+ {
+ ewl_widget_destroy(w);
+ DRETURN_PTR(NULL, DLEVEL_STABLE);
+ }
+
+ DRETURN_PTR(w, DLEVEL_STABLE);
+}
+
+/**
+ * @param g: The Ewl_Paned_Grabber to initialize
+ * @return Returns TRUE on success or FALSE on failure
+ */
+int
+ewl_paned_grabber_init(Ewl_Paned_Grabber *g)
+{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR_RET("g", g, FALSE);
+
+ if (!ewl_separator_init(EWL_SEPARATOR(g)))
+ DRETURN_INT(FALSE, DLEVEL_STABLE);
+
+ ewl_widget_inherit(EWL_WIDGET(g), EWL_PANED_GRABBER_TYPE);
+ ewl_paned_grabber_paned_orientation_set(g, EWL_ORIENTATION_VERTICAL);
+
+ ewl_callback_append(EWL_WIDGET(g), EWL_CALLBACK_MOUSE_DOWN,
+ ewl_paned_grabber_cb_mouse_down, NULL);
+ ewl_callback_append(EWL_WIDGET(g), EWL_CALLBACK_MOUSE_UP,
+ ewl_paned_grabber_cb_mouse_up, NULL);
+
+ /* grabber is always internal to the paned */
+ ewl_widget_internal_set(EWL_WIDGET(g), TRUE);
+
+ DRETURN_INT(TRUE, DLEVEL_STABLE);
+}
+
+/**
+ * @param g
E CVS: libs/evas raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_object_text.c
Log Message:
text objects never drew with offsets to account for style padding - done now :)
===
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_text.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- evas_object_text.c 14 Jan 2006 09:26:22 - 1.51
+++ evas_object_text.c 16 Feb 2006 02:06:55 - 1.52
@@ -1218,9 +1218,11 @@
{1, 3, 4, 3, 1},
{0, 1, 2, 1, 0}
};
+ int sl = 0, st = 0;
/* render object to surface with context, and offxet by x,y */
o = (Evas_Object_Text *)(obj->object_data);
+ evas_text_style_pad_get(o->cur.style, &sl, NULL, &st, NULL);
ENFN->context_multiplier_unset(output, context);
/*
ENFN->context_color_set(output,
@@ -1277,9 +1279,9 @@
context, \
surface, \
o->engine_data, \
-obj->cur.cache.geometry.x + x + ox - \
+obj->cur.cache.geometry.x + x + sl + ox - \
ENFN->font_inset_get(ENDT, o->engine_data, o->cur.text), \
-obj->cur.cache.geometry.y + y + oy + \
+obj->cur.cache.geometry.y + y + st + oy + \
(int) \
(((o->max_ascent * obj->cur.cache.geometry.h) /
obj->cur.geometry.h) - 0.5), \
obj->cur.cache.geometry.w, \
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_dnd.c etk_drag.c etk_drag.h etk_toplevel_widget.h
etk_widget.c etk_window.c
Log Message:
- add parent widget property to Etk_Drag
- add cursor support for dragging
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_dnd.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- etk_dnd.c 15 Feb 2006 15:03:17 - 1.9
+++ etk_dnd.c 16 Feb 2006 01:40:16 - 1.10
@@ -9,6 +9,7 @@
#include "etk_widget.h"
#include "etk_toplevel_widget.h"
#include "etk_window.h"
+#include "etk_drag.h"
#include "config.h"
/* Some notes for when we're developing this:
@@ -494,13 +495,11 @@
if(!ev->will_accept)
{
- //
etk_toplevel_widget_pointer_pop(etk_widget_toplevel_parent_get(ETK_WIDGET(_etk_drag_widget)),
ETK_POINTER_RESIZE_BR);
+
etk_toplevel_widget_pointer_push(etk_widget_toplevel_parent_get(etk_drag_parent_widget_get(ETK_DRAG(_etk_drag_widget))),
ETK_POINTER_DEFAULT);
return 1;
}
-//
etk_toplevel_widget_pointer_push(etk_widget_toplevel_parent_get(ETK_WIDGET(_etk_drag_widget)),
ETK_POINTER_RESIZE_BR);
-
etk_toplevel_widget_pointer_push(ETK_TOPLEVEL_WIDGET(ETK_WINDOW(_etk_drag_widget)),
ETK_POINTER_RESIZE_BR);
-
+
etk_toplevel_widget_pointer_push(etk_widget_toplevel_parent_get(etk_drag_parent_widget_get(ETK_DRAG(_etk_drag_widget))),
ETK_POINTER_DND_DROP);
return 1;
}
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_drag.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_drag.c 15 Feb 2006 15:03:17 - 1.1
+++ etk_drag.c 16 Feb 2006 01:40:16 - 1.2
@@ -9,12 +9,24 @@
#include "etk_window.h"
#include "config.h"
+/**
+ * @addtogroup Etk_Ddrag
+ * @{
+ */
+
+enum _Etk_Drag_Propery_Id
+{
+ ETK_DRAG_PARENT_WIDGET_PROPERTY
+};
+
Etk_Drag*_etk_drag_widget = NULL;
static Ecore_Event_Handler *_etk_drag_mouse_move_handler;
static Ecore_Event_Handler *_etk_drag_mouse_up_handler;
static void _etk_drag_constructor(Etk_Drag *drag);
+static void _etk_drag_property_set(Etk_Object *object, int property_id,
Etk_Property_Value *value);
+static void _etk_drag_property_get(Etk_Object *object, int property_id,
Etk_Property_Value *value);
static int _etk_drag_mouse_up_cb(void *data, int type, void *event);
static int _etk_drag_mouse_move_cb(void *data, int type, void *event);
@@ -28,7 +40,13 @@
if(!drag_type)
{
- drag_type = etk_type_new("Etk_Drag", ETK_WINDOW_TYPE, sizeof(Etk_Drag),
ETK_CONSTRUCTOR(_etk_drag_constructor), NULL);
+ drag_type = etk_type_new("Etk_Drag", ETK_WINDOW_TYPE, sizeof(Etk_Drag),
ETK_CONSTRUCTOR(_etk_drag_constructor), NULL);
+
+ etk_type_property_add(drag_type, "parent_widget",
ETK_DRAG_PARENT_WIDGET_PROPERTY, ETK_PROPERTY_POINTER,
ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_pointer(NULL));
+
+ drag_type->property_set = _etk_drag_property_set;
+ drag_type->property_get = _etk_drag_property_get;
+
}
return drag_type;
@@ -36,11 +54,12 @@
/**
* @brief Create a new drag widget
+ * @param widget the parent widget of this drag
* @return Returns the new drag widget
*/
-Etk_Widget *etk_drag_new()
+Etk_Widget *etk_drag_new(Etk_Widget *widget)
{
- return etk_widget_new(ETK_DRAG_TYPE, NULL);
+ return etk_widget_new(ETK_DRAG_TYPE, "parent_widget", widget, NULL);
}
void etk_drag_types_set(Etk_Drag *drag, const char **types, unsigned int
num_types)
@@ -73,6 +92,32 @@
_etk_drag_mouse_up_handler =
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_UP, _etk_drag_mouse_up_cb,
drag);
}
+/**
+ * @brief Sets the parent widget of a drag
+ * @param drag a drag
+ * @param widget a widget
+ */
+void etk_drag_parent_widget_set(Etk_Drag *drag, Etk_Widget *widget)
+{
+ if(!drag || !widget)
+ return;
+
+ drag->widget = widget;
+}
+
+/**
+ * @brief Gets the parent widget of a drag
+ * @param drag a drag
+ * @return Returns the parent widget of the drag
+ */
+Etk_Widget *etk_drag_parent_widget_get(Etk_Drag *drag)
+{
+ if(!drag)
+ return NULL;
+
+ return drag->widget;
+}
+
/**
*
* Etk specific functions
@@ -85,11 +130,53 @@
if (!drag)
return;
+ drag->widget = NULL;
+ drag->types = NULL;
+ drag->num_types = 0;
+ drag->data = NULL;
+ drag->data_size = 0;
+
etk_window_decorated_set(ETK_WINDOW(drag), ETK_FALSE);
etk_window_shaped_set(ETK_WINDOW(drag), ETK_TRUE);
etk_window_skip_pager_hint_set(ETK_WINDOW(drag), ETK_TRUE);
etk_window_skip_taskbar_hint_set(ETK_WINDOW(drag), ETK_TRUE);
- ecore_x_dnd_aware_set((ETK_WINDOW(drag))->x_window, 1);
+ ecore_x_dnd
E CVS: apps/e_utils rbdpngn
Enlightenment CVS committal Author : rbdpngn Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/eapp_edit Modified Files: eapp_edit_main.c Log Message: Cut down some confusion on where the user needs to click to set the icon. === RCS file: /cvsroot/enlightenment/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -3 -r1.38 -r1.39 --- eapp_edit_main.c31 Dec 2005 18:17:32 - 1.38 +++ eapp_edit_main.c15 Feb 2006 23:34:10 - 1.39 @@ -246,14 +246,14 @@ ewl_image_file_set(EWL_IMAGE(row[1]), file, "icon"); ewl_image_proportional_set(EWL_IMAGE(row[1]), TRUE); ewl_image_scale_to(EWL_IMAGE(row[1]), 32, 32); -ewl_callback_append(row[1], EWL_CALLBACK_CLICKED, eapp_cb_fd_show, NULL); /* FIXME: This can give it a decent background, but introduces a sizing * issue to track down * ewl_widget_appearance_set(row[1], "entry"); */ ewl_widget_name_set(row[1], "icon"); ewl_widget_show(row[1]); -ewl_tree_row_add(tree, NULL, row); +row[0] = ewl_tree_row_add(tree, NULL, row); +ewl_callback_append(row[0], EWL_CALLBACK_CLICKED, eapp_cb_fd_show, NULL); /* add all the eet data */ for (i = 0; i < (sizeof(keys) / sizeof(keys[0])); i++) --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ 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:
pager.c
Log Message:
Tweak pager scaling on resolution change.
===
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -3 -r1.193 -r1.194
--- pager.c 11 Feb 2006 12:57:34 - 1.193
+++ pager.c 15 Feb 2006 22:50:58 - 1.194
@@ -37,6 +37,8 @@
#define DEBUG_PAGER 0
+#define USE_PAGER_BACKGROUND_CACHE 1
+
#define EwinGetVX(ew) (ew->vx)
#define EwinGetVY(ew) (ew->vy)
#define EwinGetVX2(ew) (ew->vx + EoGetW(ew))
@@ -482,9 +484,9 @@
ICCCM_SetSizeConstraints(p->ewin,
VRoot.w / 64 * ax, VRoot.h / 64 * ay,
VRoot.w / 4 * ax, VRoot.h / 4 * ay,
- 0, 0, 8 * ax, (int)(8 / aspect * ay),
- aspect * ((double)ax / (double)ay) - .1,
- aspect * ((double)ax / (double)ay) + .1);
+ 0, 0, ax, ay,
+ aspect * ((double)ax / (double)ay),
+ aspect * ((double)ax / (double)ay));
if (apply)
EwinResize(p->ewin, w, h);
@@ -507,8 +509,9 @@
pmap = p->bgpmap = ECreatePixmap(p->win, p->dw, p->dh, VRoot.depth);
bg = DeskBackgroundGet(p->dsk);
- if (bg && Conf_pagers.snap)
+ if (bg)
{
+#if USE_PAGER_BACKGROUND_CACHE
chars[4096];
char *uniq;
Imlib_Image*im;
@@ -528,7 +531,9 @@
}
else
{
+#endif
BackgroundApplyPmap(bg, pmap, p->dw, p->dh);
+#if USE_PAGER_BACKGROUND_CACHE
imlib_context_set_drawable(pmap);
im = imlib_create_image_from_drawable(0, 0, 0, p->dw, p->dh, 1);
imlib_context_set_image(im);
@@ -536,6 +541,7 @@
imlib_save_image(s);
imlib_free_image_and_decache();
}
+#endif
return;
}
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
___
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/images Modified Files: tab.png Log Message: * Tab image improved. Thanks to Swishy :) === RCS file: /cvsroot/enlightenment/e17/proto/etk/data/themes/default/images/tab.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsnhdjZC and /tmp/cvs8up1XC differ --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : proto Dir : e17/proto/epdf Modified Files: README Log Message: some instructions === RCS file: /cvsroot/enlightenment/e17/proto/epdf/README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- README 15 Feb 2006 21:45:08 - 1.1 +++ README 15 Feb 2006 22:31:36 - 1.2 @@ -0,0 +1,17 @@ + +Instructions for compilation: + +1) Download Poppler [1] from CVS: + +cvs -d :pserver:[EMAIL PROTECTED]:/cvs/poppler login +cvs -d :pserver:[EMAIL PROTECTED]:/cvs/poppler co poppler + +2) Install poppler with the following option to autogen.sh + or configure: + +./configure --enable-xpdf-headers + +3) Evas and Ecore are needed. Ewl and Etk are optional + + +[1] http://poppler.freedesktop.org/ --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : proto Dir : e17/proto/epdf/src/bin Added Files: Makefile.am Log Message: missing file --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : proto Dir : e17/proto/epdf Modified Files: AUTHORS Log Message: add myself as author === RCS file: /cvsroot/enlightenment/e17/proto/epdf/AUTHORS,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- AUTHORS 15 Feb 2006 21:45:08 - 1.1 +++ AUTHORS 15 Feb 2006 21:49:02 - 1.2 @@ -0,0 +1,2 @@ +Main Authors: + Vincent 'caro' Torri <[EMAIL PROTECTED]> --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : proto Dir : e17/proto/epdf/src/bin Added Files: epdf_esmart_test.c epdf_etk_test.c epdf_evas_test.c epdf_ewl_test.c Log Message: epdf, a evas frontend for poppler, a pdf library parser and renderer --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : proto Dir : e17/proto/epdf/src Added Files: Makefile.am Log Message: epdf, a evas frontend for poppler, a pdf library parser and renderer --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : proto Dir : e17/proto/epdf Added Files: AUTHORS ChangeLog INSTALL Makefile.am NEWS README autogen.sh configure.in epdf-config.in epdf.pc.in Log Message: epdf, a evas frontend for poppler, a pdf library parser and renderer --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : proto Dir : e17/proto/epdf/src/lib Added Files: Evas_Poppler.h Makefile.am esmart_pdf.c esmart_pdf.h etk_pdf.c etk_pdf.h ewl_pdf.c ewl_pdf.h poppler.cpp poppler.h poppler_document.cpp poppler_document.h poppler_enum.h poppler_fontinfo.cpp poppler_fontinfo.h poppler_forward.h poppler_index.cpp poppler_index.h poppler_page.cpp poppler_page.h poppler_page_transition.cpp poppler_page_transition.h poppler_private.h Log Message: epdf, a evas frontend for poppler, a pdf library parser and renderer --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : proto Dir : e17/proto/epdf/m4 Added Files: ac_path_generic.m4 Log Message: epdf, a evas frontend for poppler, a pdf library parser and renderer --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : proto Dir : e17/proto/epdf/m4 Log Message: Directory /cvsroot/enlightenment/e17/proto/epdf/m4 added to the repository --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : proto Dir : e17/proto/epdf/src/lib Log Message: Directory /cvsroot/enlightenment/e17/proto/epdf/src/lib added to the repository --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : proto Dir : e17/proto/epdf Log Message: Directory /cvsroot/enlightenment/e17/proto/epdf added to the repository --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : proto Dir : e17/proto/epdf/src Log Message: Directory /cvsroot/enlightenment/e17/proto/epdf/src added to the repository --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto doursse
Enlightenment CVS committal Author : doursse Project : e17 Module : proto Dir : e17/proto/epdf/src/bin Log Message: Directory /cvsroot/enlightenment/e17/proto/epdf/src/bin added to the repository --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ 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_container.c ewl_container.h ewl_datepicker.c
ewl_datepicker.h ewl_debug.h ewl_dialog.c ewl_dialog.h
Log Message:
- documentation
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_container.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- ewl_container.c 9 Feb 2006 18:07:53 - 1.34
+++ ewl_container.c 15 Feb 2006 21:25:01 - 1.35
@@ -492,6 +492,7 @@
* @param parent: The container to get the child from
* @param index: The child index to return
* @return Returns the widget at the given index, or NULL if not found
+ * @brief Retrieve the child at the given index in the container.
*/
Ewl_Widget *
ewl_container_child_get(Ewl_Container *parent, int index)
@@ -512,6 +513,8 @@
* @param index: The child index to return
* @return Returns the widget at the given index including internal widgets,
* or NULL if not found
+ * @brief Retrieves the child at the given index in the container taking
+ * internal widgets into account.
*/
Ewl_Widget *
ewl_container_child_internal_get(Ewl_Container *parent, int index)
@@ -558,6 +561,7 @@
* @param parent: The container to search
* @param w: The child to search for
* @return Returns the index of the child in the parent
+ * @brief Retrieves the index of the given child in the container
*/
unsigned int
ewl_container_child_index_get(Ewl_Container *parent, Ewl_Widget *w)
@@ -580,6 +584,8 @@
* @param w: The child to search for
* @return Returns the index of the child in the parent including internal
* widgets
+ * @brief Retrieves the index of the given child in the container taking
+ * internal widgets into account
*/
unsigned int
ewl_container_child_index_internal_get(Ewl_Container *parent, Ewl_Widget *w)
@@ -983,6 +989,8 @@
/**
* @param c: the container to use the child size sum in a specified direction
* @param o: the orientation direction of the sum to use
+ * @return Returns no value
+ * @brief Set the sum orientation of the container
*/
void
ewl_container_sum_prefer(Ewl_Container *c, Ewl_Orientation o)
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_container.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_container.h 9 Feb 2006 18:07:55 - 1.16
+++ ewl_container.h 15 Feb 2006 21:25:01 - 1.17
@@ -1,9 +1,8 @@
-#ifndef __EWL_CONTAINER_H__
-#define __EWL_CONTAINER_H__
+#ifndef EWL_CONTAINER_H
+#define EWL_CONTAINER_H
/**
- * @file ewl_container.h
- * @defgroup Ewl_Container Container: Widgets Holding Other Widgets
+ * @defgroup Ewl_Container Ewl_Container: Widgets Holding Other Widgets
* @brief Define the Ewl_Container class which inherits from Ewl_Widget and
adds
* the ability to nest Ewl_Widget's inside.
*
@@ -170,4 +169,4 @@
* @}
*/
-#endif /* __EWL_CONTAINER_H__ */
+#endif
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_datepicker.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_datepicker.c12 Jan 2006 18:21:18 - 1.8
+++ ewl_datepicker.c15 Feb 2006 21:25:01 - 1.9
@@ -34,6 +34,7 @@
/**
* @param db: The Ewl_Datepicker to initialize
* @return Returns TRUE on success or FALSE on failure
+ * @brief Initialize the date picker to default values.
*/
int
ewl_datepicker_init(Ewl_Datepicker *dp)
@@ -80,7 +81,7 @@
}
void
-ewl_datepicker_destroy_cb(Ewl_Widget *w, void *ev_data __UNUSED__,
+ewl_datepicker_destroy_cb(Ewl_Widget *w, void *ev __UNUSED__,
void *user_data __UNUSED__)
{
Ewl_Datepicker *dp;
@@ -97,7 +98,7 @@
}
void
-ewl_datepicker_configure_cb(Ewl_Widget *w, void *ev_data __UNUSED__,
+ewl_datepicker_configure_cb(Ewl_Widget *w, void *ev __UNUSED__,
void *user_data __UNUSED__)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -110,7 +111,7 @@
}
void
-ewl_datepicker_value_changed_cb(Ewl_Widget *w __UNUSED__, void *ev_data
__UNUSED__,
+ewl_datepicker_value_changed_cb(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__,
void *user_data)
{
char *date;
@@ -130,7 +131,7 @@
}
void
-ewl_datepicker_realize_cb(Ewl_Widget *w, void *ev_data __UNUSED__,
+ewl_datepicker_realize_cb(Ewl_Widget *w, void *ev __UNUSED__,
void *user_data __UNUSED__)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -166,7 +167,7 @@
}
static void
-ewl_datepicker_dropdown_cb(Ewl_Widget *w, void *ev_data __UNUSED__,
+ewl_datepicker_dropdown_cb(Ewl_Widget
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_ipc_handlers.h e_ipc_handlers_list.h
Log Message:
Add New Config Dialogue options to enlightenment_remote
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_ipc_handlers.h,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -3 -r1.118 -r1.119
--- e_ipc_handlers.h3 Feb 2006 06:13:32 - 1.118
+++ e_ipc_handlers.h15 Feb 2006 21:22:45 - 1.119
@@ -7314,7 +7314,7 @@
//
#define HDL E_IPC_OP_COLOR_CLASS_LIST
#if (TYPE == E_REMOTE_OPTIONS)
- OP("-color-class-list", 0, "List all color classes used by currently loaded
edje objects.", 1, HDL)
+ OP("-color-class-list", 0, "List all color classes used by currently loaded
edje objects", 1, HDL)
#elif (TYPE == E_REMOTE_OUT)
REQ_NULL(HDL);
#elif (TYPE == E_WM_IN)
@@ -7343,5 +7343,90 @@
END_GENERIC();
#endif
#undef HDL
+//
+#define HDL E_IPC_OP_CFGDLG_AUTO_APPLY_SET
+#if (TYPE == E_REMOTE_OPTIONS)
+ OP("-cfgdlg-auto-apply-set", 1, "Set config dialogs to use auto apply, 1
for enabled 0 for disabled", 0, HDL)
+#elif (TYPE == E_REMOTE_OUT)
+ REQ_INT(atoi(params[0]), HDL);
+#elif (TYPE == E_WM_IN)
+ START_INT(policy, HDL);
+ e_config->cfgdlg_auto_apply = policy;
+ E_CONFIG_LIMIT(e_config->cfgdlg_auto_apply, 0, 1);
+ SAVE;
+ END_INT;
+#elif (TYPE == E_REMOTE_IN)
+#endif
+#undef HDL
+//
+#define HDL E_IPC_OP_CFGDLG_AUTO_APPLY_GET
+#if (TYPE == E_REMOTE_OPTIONS)
+ OP("-cfgdlg-auto-apply-get", 0, "Get config dialogs use auto apply policy,
1 for enabled 0 for disabled", 1, HDL)
+#elif (TYPE == E_REMOTE_OUT)
+ REQ_NULL(HDL);
+#elif (TYPE == E_WM_IN)
+ SEND_INT(e_config->cfgdlg_auto_apply, E_IPC_OP_CFGDLG_AUTO_APPLY_GET_REPLY,
HDL);
+#elif (TYPE == E_REMOTE_IN)
+#endif
+#undef HDL
//
+#define HDL E_IPC_OP_CFGDLG_AUTO_APPLY_GET_REPLY
+#if (TYPE == E_REMOTE_OPTIONS)
+#elif (TYPE == E_REMOTE_OUT)
+#elif (TYPE == E_WM_IN)
+#elif (TYPE == E_REMOTE_IN)
+ START_INT(policy, HDL);
+ printf("REPLY: POLICY=%d\n", policy);
+ END_INT;
+#endif
+#undef HDL
+//
+#define HDL E_IPC_OP_CFGDLG_DEFAULT_MODE_SET
+#if (TYPE == E_REMOTE_OPTIONS)
+ OP("-cfgdlg-default-mode-set", 1, "Set default mode for config dialogs.
OPT1 = BASIC or ADVANCED", 0, HDL)
+#elif (TYPE == E_REMOTE_OUT)
+ REQ_INT_START(HDL)
+ int value = 0;
+ if (!strcmp(params[0], "BASIC")) value = E_CONFIG_DIALOG_CFDATA_TYPE_BASIC;
+ else if (!strcmp(params[0], "ADVANCED")) value =
E_CONFIG_DIALOG_CFDATA_TYPE_ADVANCED;
+ else
+ {
+printf("default mode must be BASIC or ADVANCED\n");
+exit(-1);
+ }
+ REQ_INT_END(value, HDL);
+#elif (TYPE == E_WM_IN)
+ START_INT(value, HDL);
+ e_config->cfgdlg_default_mode = value;
+ E_CONFIG_LIMIT(e_config->cfgdlg_default_mode,
E_CONFIG_DIALOG_CFDATA_TYPE_BASIC, E_CONFIG_DIALOG_CFDATA_TYPE_ADVANCED);
+ SAVE;
+ END_INT
+#elif (TYPE == E_REMOTE_IN)
+#endif
+#undef HDL
+//
+#define HDL E_IPC_OP_CFGDLG_DEFAULT_MODE_GET
+#if (TYPE == E_REMOTE_OPTIONS)
+ OP("-cfgdlg-default-mode-get", 0, "Get default mode for config dialogs", 1,
HDL)
+#elif (TYPE == E_REMOTE_OUT)
+ REQ_NULL(HDL);
+#elif (TYPE == E_WM_IN)
+ SEND_INT(e_config->cfgdlg_default_mode,
E_IPC_OP_CFGDLG_DEFAULT_MODE_GET_REPLY, HDL);
+#elif (TYPE == E_REMOTE_IN)
+#endif
+#undef HDL
+//
+#define HDL E_IPC_OP_CFGDLG_DEFAULT_MODE_GET_REPLY
+#if (TYPE == E_REMOTE_OPTIONS)
+#elif (TYPE == E_REMOTE_OUT)
+#elif (TYPE == E_WM_IN)
+#elif (TYPE == E_REMOTE_IN)
+ START_INT(policy, HDL);
+ if (policy == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC)
+ printf("REPLY: BASIC\n");
+ else if (policy == E_CONFIG_DIALOG_CFDATA_TYPE_ADVANCED)
+ printf("REPLY: ADVANCED\n");
+ END_INT
+#endif
+#undef HDL
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_ipc_handlers_list.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- e_ipc_handlers_list.h 17 Jan 2006 18:31:16 - 1.42
+++ e_ipc_handlers_list.h 15 Feb 2006 21:22:46 - 1.43
@@ -365,3 +365,11 @@
#define E_IPC_OP_COLOR_CLASS_DEL 341
#define E_IPC_OP_COLOR_CLASS_LIST 342
#define E_IPC_OP_COLOR_CLASS_LIST_REPLY 343
+
+#define E_IPC_OP_CFGDLG_AUTO_APPLY_SET 344
+#define E_IPC_OP_CFGDLG_AUTO_APPLY_GET 345
+#define E_IPC_OP_CF
E CVS: proto moom16
Enlightenment CVS committal
Author : moom16
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_text_view.c etk_textblock.c etk_textblock.h etk_widget.c
Log Message:
* More work on the text view (it still far from being usable!!)
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_text_view.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_text_view.c 15 Feb 2006 18:36:55 - 1.2
+++ etk_text_view.c 15 Feb 2006 21:01:33 - 1.3
@@ -19,6 +19,7 @@
};
static void _etk_text_view_constructor(Etk_Text_View *text_view);
+static void _etk_text_view_destructor(Etk_Text_View *text_view);
static void _etk_text_view_size_allocate(Etk_Widget *widget, Etk_Geometry
geometry);
static void _etk_text_view_realize_cb(Etk_Object *object, void *data);
static void _etk_text_view_unrealize_cb(Etk_Object *object, void *data);
@@ -41,8 +42,7 @@
if (!text_view_type)
{
- /* TODO: destructor */
- text_view_type = etk_type_new("Etk_Text_View", ETK_WIDGET_TYPE,
sizeof(Etk_Text_View), ETK_CONSTRUCTOR(_etk_text_view_constructor), NULL);
+ text_view_type = etk_type_new("Etk_Text_View", ETK_WIDGET_TYPE,
sizeof(Etk_Text_View), ETK_CONSTRUCTOR(_etk_text_view_constructor),
ETK_DESTRUCTOR(_etk_text_view_destructor));
_etk_text_view_signals[ETK_TEXT_VIEW_TEXT_CHANGED_SIGNAL] =
etk_signal_new("text_changed", text_view_type, -1, etk_marshaller_VOID__VOID,
NULL, NULL);
}
@@ -66,7 +66,7 @@
*
**/
-/* Initializes the default values of the text_view */
+/* Initializes the default values of the text view */
static void _etk_text_view_constructor(Etk_Text_View *text_view)
{
if (!text_view)
@@ -79,6 +79,15 @@
etk_signal_connect("unrealize", ETK_OBJECT(text_view),
ETK_CALLBACK(_etk_text_view_unrealize_cb), NULL);
}
+/* Destroys the text view */
+static void _etk_text_view_destructor(Etk_Text_View *text_view)
+{
+ if (!text_view)
+ return;
+ etk_object_destroy(ETK_OBJECT(text_view->textblock));
+ text_view->textblock = NULL;
+}
+
/* TODO: Renders the textblock object */
static void _etk_text_view_size_allocate(Etk_Widget *widget, Etk_Geometry
geometry)
{
@@ -87,9 +96,8 @@
if (!(text_view = ETK_TEXT_VIEW(widget)))
return;
- printf("text_view_size_allocate\n");
- evas_object_move(text_view->textblock->textblock_object, geometry.x,
geometry.y);
- evas_object_resize(text_view->textblock->textblock_object, geometry.w,
geometry.h);
+ evas_object_move(text_view->textblock->smart_object, geometry.x,
geometry.y);
+ evas_object_resize(text_view->textblock->smart_object, geometry.w,
geometry.h);
}
/**
@@ -107,8 +115,9 @@
if (!(text_view = ETK_TEXT_VIEW(object)) || !(evas =
etk_widget_toplevel_evas_get(ETK_WIDGET(text_view
return;
- //etk_textblock_realize(text_view->textblock, evas);
- etk_widget_member_object_add(ETK_WIDGET(text_view),
text_view->textblock->textblock_object);
+ etk_textblock_realize(text_view->textblock, evas);
+ etk_widget_member_object_add(ETK_WIDGET(text_view),
text_view->textblock->smart_object);
+ evas_object_show(text_view->textblock->smart_object);
}
/* Called when the text view is unrealized */
@@ -119,8 +128,11 @@
if (!(text_view = ETK_TEXT_VIEW(object)))
return;
- etk_widget_member_object_del(ETK_WIDGET(text_view),
text_view->textblock->textblock_object);
- //etk_textblock_unrealize(text_view->textblock);
+ if (text_view->textblock)
+ {
+ etk_widget_member_object_del(ETK_WIDGET(text_view),
text_view->textblock->smart_object);
+ etk_textblock_unrealize(text_view->textblock);
+ }
}
/** @} */
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_textblock.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_textblock.c 15 Feb 2006 18:36:55 - 1.1
+++ etk_textblock.c 15 Feb 2006 21:01:33 - 1.2
@@ -10,10 +10,19 @@
static void _etk_textblock_constructor(Etk_Textblock *textblock);
static void _etk_textblock_destructor(Etk_Textblock *textblock);
+static void _etk_textblock_object_evas_set(Etk_Textblock *textblock, Evas
*new_evas);
+
+static void _etk_textblock_smart_move_cb(Evas_Object *obj, Evas_Coord x,
Evas_Coord y);
+static void _etk_textblock_smart_resize_cb(Evas_Object *obj, Evas_Coord w,
Evas_Coord h);
+static void _etk_textblock_smart_show_cb(Evas_Object *obj);
+static void _etk_textblock_smart_hide_cb(Evas_Object *obj);
+static void _etk_textblock_smart_clip_set_cb(Evas_Object *obj, Evas_Object
*clip);
+static void _etk_textblock_smart_clip_unset_cb(Evas_Object *obj);
static Evas *_etk_textblock_evas = NULL;
static unsigned char _etk_textblock_pixel_buffer[ETK_TEXTBLOCK_EVAS_SIZE *
ETK_
E CVS: proto moom16
Enlightenment CVS committal
Author : moom16
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/widgets
Modified Files:
text_view.edc
Log Message:
* More work on the text view (it still far from being usable!!)
===
RCS file:
/cvsroot/enlightenment/e17/proto/etk/data/themes/default/widgets/text_view.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- text_view.edc 11 Feb 2006 00:28:31 - 1.1
+++ text_view.edc 15 Feb 2006 21:01:33 - 1.2
@@ -1,6 +1,9 @@
group {
name: "text_view";
min: 120 18;
+ data {
+ item: "inset" "6 6 6 6";
+ }
parts {
part {
name: "text_view_bg";
@@ -23,7 +26,7 @@
}
}
}
- part {
+ /*part {
name: "text_area";
type: SWALLOW;
description {
@@ -37,7 +40,7 @@
offset: -5 -3;
}
}
- }
+ }*/
part {
name: "text_view_over";
description {
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
___
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_test.c etk_test.h
Added Files:
etk_text_view_test.c
Log Message:
* More work on the text view (it still far from being usable!!)
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Makefile.am 11 Feb 2006 20:35:49 - 1.10
+++ Makefile.am 15 Feb 2006 21:01:33 - 1.11
@@ -35,7 +35,8 @@
etk_notebook_test.c \
etk_progress_bar_test.c \
etk_spin_button_test.c \
-etk_xdnd_test.c
+etk_xdnd_test.c \
+etk_text_view_test.c
etk_test_LDADD = $(top_builddir)/src/lib/libetk.la \
@EVAS_LIBS@ @ECORE_LIBS@ @EDJE_LIBS@
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_test.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- etk_test.c 12 Feb 2006 20:56:03 - 1.15
+++ etk_test.c 15 Feb 2006 21:01:33 - 1.16
@@ -106,6 +106,11 @@
"X Drag / Drop",
etk_test_xdnd_window_create,
ETK_TEST_MISC
+ },
+ {
+ "Text View",
+ etk_test_text_view_window_create,
+ ETK_TEST_ADVANCED_WIDGET
}
};
static int _etk_test_num_examples = sizeof(_etk_test_examples) / sizeof
(_etk_test_examples[0]);
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_test.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- etk_test.h 12 Feb 2006 20:56:03 - 1.11
+++ etk_test.h 15 Feb 2006 21:01:33 - 1.12
@@ -19,5 +19,6 @@
void etk_test_progress_bar_window_create(void *data);
void etk_test_spin_button_window_create(void *data);
void etk_test_xdnd_window_create(void *data);
+void etk_test_text_view_window_create(void *data);
#endif
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_border_locks.c e_int_border_remember.c
e_int_border_border.c
Log Message:
Disable Auto-Apply on the border config dialogs
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_border_locks.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_int_border_locks.c14 Feb 2006 09:39:26 - 1.10
+++ e_int_border_locks.c15 Feb 2006 20:40:55 - 1.11
@@ -61,6 +61,7 @@
v->basic.create_widgets= _basic_create_widgets;
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
+v->override_auto_apply = 1;
/* create config diaolg for bd object/data */
cfd = e_config_dialog_new(bd->zone->container,
_("Window Locks"), NULL, 0, v, bd);
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_border_remember.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_int_border_remember.c 14 Feb 2006 09:42:23 - 1.8
+++ e_int_border_remember.c 15 Feb 2006 20:40:55 - 1.9
@@ -63,6 +63,8 @@
v->basic.create_widgets= _basic_create_widgets;
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
+v->override_auto_apply = 1;
+
/* create config dialog for bd object/data */
cfd = e_config_dialog_new(bd->zone->container,
_("Window Remember"), NULL, 0, v, bd);
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_border_border.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_int_border_border.c 14 Feb 2006 09:38:22 - 1.9
+++ e_int_border_border.c 15 Feb 2006 20:40:55 - 1.10
@@ -41,6 +41,8 @@
v->free_cfdata = _free_data;
v->basic.apply_cfdata = _basic_apply_data;
v->basic.create_widgets= _basic_create_widgets;
+v->override_auto_apply = 1;
+
/* create config diaolg for bd object/data */
cfd = e_config_dialog_new(bd->zone->container,
_("Window Border Selection"), NULL, 0, v, bd);
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_cursor.c
Log Message:
General Fixies
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_cursor.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_int_config_cursor.c 30 Jan 2006 02:49:09 - 1.3
+++ e_int_config_cursor.c 15 Feb 2006 20:32:28 - 1.4
@@ -47,6 +47,7 @@
E_Config_Dialog_Data *cfdata;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
+ _fill_data(cfdata);
return cfdata;
}
@@ -87,20 +88,17 @@
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
*cfdata)
{
Evas_Object *o, *of, *ob;
-
- _fill_data(cfdata);
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Cursor Settings"), 0);
- ob = e_widget_check_add(evas, _("Use E Cursor"), &(cfdata->use_e_cursor));
+ ob = e_widget_check_add(evas, _("Use Enlightenment Cursor"),
&(cfdata->use_e_cursor));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
}
-
static int
_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
@@ -136,13 +134,11 @@
_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *ob, *of;
-
- _fill_data(cfdata);
-
+
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Cursor Settings"), 0);
- ob = e_widget_check_add(evas, _("Use E Cursor"), &(cfdata->use_e_cursor));
+ ob = e_widget_check_add(evas, _("Use Enlightenment Cursor"),
&(cfdata->use_e_cursor));
e_widget_framelist_object_append(of, ob);
ob = e_widget_label_add(evas, _("Cursor Size"));
e_widget_framelist_object_append(of, ob);
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_background.c e_int_config_theme.c
e_int_config_display.c e_int_config_modules.c
Log Message:
Disable Auto-Apply for these dialogs.
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_background.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- e_int_config_background.c 4 Feb 2006 20:04:20 - 1.38
+++ e_int_config_background.c 15 Feb 2006 20:30:59 - 1.39
@@ -52,7 +52,7 @@
v->advanced.apply_cfdata = _advanced_apply_data;
v->advanced.create_widgets = _advanced_create_widgets;
v->close_cfdata= _bg_dialog_close;
-
+ v->override_auto_apply = 1;
cfd = e_config_dialog_new(con, _("Background Settings"), NULL, 0, v, NULL);
return cfd;
}
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_theme.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- e_int_config_theme.c4 Feb 2006 20:05:26 - 1.15
+++ e_int_config_theme.c15 Feb 2006 20:30:59 - 1.16
@@ -18,7 +18,6 @@
char *theme;
char *current_theme;
/*- ADVANCED -*/
-
};
struct _E_Cfg_Theme_Data
@@ -42,6 +41,8 @@
v->free_cfdata = _free_data;
v->basic.apply_cfdata = _basic_apply_data;
v->basic.create_widgets= _basic_create_widgets;
+ v->override_auto_apply = 1;
+
/* create config diaolg for NULL object/data */
cfd = e_config_dialog_new(con, _("Theme Selector"), NULL, 0, v, NULL);
return cfd;
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_display.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_int_config_display.c 3 Feb 2006 21:58:28 - 1.1
+++ e_int_config_display.c 15 Feb 2006 20:30:59 - 1.2
@@ -43,6 +43,7 @@
v->free_cfdata = _free_data;
v->basic.apply_cfdata = _basic_apply_data;
v->basic.create_widgets = _basic_create_widgets;
+ v->override_auto_apply = 1;
cfd = e_config_dialog_new(con, _("Display Settings"), NULL, 0, v, NULL);
e_dialog_resizable_set(cfd->dia, 1);
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_modules.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_int_config_modules.c 15 Feb 2006 15:47:51 - 1.23
+++ e_int_config_modules.c 15 Feb 2006 20:30:59 - 1.24
@@ -62,7 +62,8 @@
v->free_cfdata = _free_data;
v->basic.create_widgets= _basic_create_widgets;
/* v->basic.apply_cfdata = _basic_apply_data; */
-
+ v->override_auto_apply = 1;
+
cfd = e_config_dialog_new(con, _("Module Settings"), NULL, 0, v, NULL);
return cfd;
}
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_window_manipulation.c
Log Message:
Some fixes for Window Manipulation dialog.
===
RCS file:
/cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_window_manipulation.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_int_config_window_manipulation.c 13 Feb 2006 15:36:56 - 1.6
+++ e_int_config_window_manipulation.c 15 Feb 2006 20:30:08 - 1.7
@@ -15,17 +15,14 @@
struct _E_Config_Dialog_Data
{
/*- BASIC -*/
- int auto_raise;
- int resist;
- int maximize;
- /*- ADVANCED -*/
int use_auto_raise;
- double auto_raise_delay;
int use_resist;
+ int maximize_policy;
+ /*- ADVANCED -*/
+ double auto_raise_delay;
int desk_resist;
int window_resist;
int gadget_resist;
- int maximize_policy;
int allow_shading;
};
@@ -63,9 +60,6 @@
cfdata->maximize_policy = e_config->maximize_policy;
if (cfdata->maximize_policy == E_MAXIMIZE_NONE)
cfdata->maximize_policy = E_MAXIMIZE_FULLSCREEN;
- if (cfdata->use_auto_raise) cfdata->auto_raise = 1;
- if (cfdata->use_resist) cfdata->resist = 1;
- cfdata->maximize = cfdata->maximize_policy;
cfdata->allow_shading = e_config->allow_shading;
}
@@ -95,9 +89,9 @@
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
/* Actually take our cfdata settings and apply them in real life */
- e_config->use_auto_raise = cfdata->auto_raise;
- cfdata->use_resist = cfdata->resist;
- e_config->maximize_policy = cfdata->maximize;
+ e_config->use_auto_raise = cfdata->use_auto_raise;
+ e_config->use_resist = cfdata->use_resist;
+ e_config->maximize_policy = cfdata->maximize_policy;
e_config_save_queue();
return 1; /* Apply was OK */
}
@@ -129,14 +123,14 @@
o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, _("Miscellaneous Options"), 0);
- ob = e_widget_check_add(evas, _("Automatically raise windows on mouse
over"), &(cfdata->auto_raise));
+ ob = e_widget_check_add(evas, _("Automatically raise windows on mouse
over"), &(cfdata->use_auto_raise));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_check_add(evas, _("When moving or resizing windows, resist at
the boundaries"), &(cfdata->resist));
+ ob = e_widget_check_add(evas, _("When moving or resizing windows, resist at
the boundaries"), &(cfdata->use_resist));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Maximize Policy"), 0);
- rg = e_widget_radio_group_new(&(cfdata->maximize));
+ rg = e_widget_radio_group_new(&(cfdata->maximize_policy));
ob = e_widget_radio_add(evas, _("Fullscreen"), E_MAXIMIZE_FULLSCREEN, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Smart expansion"), E_MAXIMIZE_SMART, rg);
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
___
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_combo.h ewl_config.h
Log Message:
- more docs
- remove unused mtime from ewl_config
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_combo.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewl_combo.h 12 Jan 2006 18:21:18 - 1.7
+++ ewl_combo.h 15 Feb 2006 20:29:47 - 1.8
@@ -1,9 +1,8 @@
-#ifndef __EWL_COMBO_H__
-#define __EWL_COMBO_H__
+#ifndef EWL_COMBO_H
+#define EWL_COMBO_H
/**
- * @file ewl_combo.h
- * @defgroup Ewl_Combo Combo: A Simple Internal Combo Box
+ * @defgroup Ewl_Combo Ewl_Combo: A Simple Combo Box
* Defines a combo box used internally. The contents on the box are not drawn
* outside of the Evas.
*
@@ -59,4 +58,4 @@
* @}
*/
-#endif /* __EWL_COMBO_H__ */
+#endif
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_config.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewl_config.h15 Feb 2006 03:00:58 - 1.7
+++ ewl_config.h15 Feb 2006 20:29:47 - 1.8
@@ -1,44 +1,47 @@
-#ifndef __EWL_CONFIG_H__
-#define __EWL_CONFIG_H__
+#ifndef EWL_CONFIG_H
+#define EWL_CONFIG_H
/**
- * @file ewl_config.h
- * @defgroup Ewl_Config Config: Functions for Manipulating Configuration Data
+ * @defgroup Ewl_Config Ewl_Config: Functions for Manipulating Configuration
Data
*
* @{
*/
typedef struct Ewl_Config Ewl_Config;
+/**
+ * @struct Ewl_Config
+ * The Ewl_Config stuct holds configuration data for the EWL library
+ */
struct Ewl_Config
{
- time_t mtime;
- struct {
- int enable;
- int level;
- int indent_lvl;
-
- int segv;
- int backtrace;
- int gc_reap;
- } debug;
struct {
- int font_cache;
- int image_cache;
- int engine;
- char *render_method;
- } evas;
+ int enable; /**< Is debugging enabled */
+ int level; /**< Current debug level */
+ int indent_lvl; /**< How far to indent */
+
+ int segv; /**< Segv on warning */
+ int backtrace; /**< Backtrace on warning */
+ int gc_reap;/**< Log on garbage collection */
+ } debug;/**< Debuggin configuration */
+
struct {
- char *name;
- int cache;
- int cclass_override;
- int print_keys;
- int print_signals;
- } theme;
+ int font_cache; /**< Font cache size */
+ int image_cache;/**< Image cache size */
+ int engine; /**< Engines available */
+ char *render_method;/**< Current render method */
+ } evas; /**< Evas configuration */
+ struct {
+ char *name; /**< Theme name */
+ int cache; /**< Cache size */
+ int cclass_override;/**< Colour class override */
+ int print_keys; /**< Print theme keys as accessed */
+ int print_signals; /**< Print theme signals as accessed */
+ } theme;/**< Theme configuration */
};
-extern Ewl_Config ewl_config;
+extern Ewl_Config ewl_config; /**< The global configuration data */
int ewl_config_init(void);
voidewl_config_shutdown(void);
@@ -54,4 +57,4 @@
* @}
*/
-#endif /* __EWL_CONFIG_H__ */
+#endif
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_config_dialog.h e_config_dialog.c
Log Message:
Allow Auto-Apply Settings and Default Mode for Config Dialogues
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config_dialog.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_config_dialog.h 13 Feb 2006 15:36:56 - 1.9
+++ e_config_dialog.h 15 Feb 2006 20:29:33 - 1.10
@@ -21,13 +21,15 @@
struct _E_Config_Dialog_View
{
+ int override_auto_apply;
+
void *(*create_cfdata) (E_Config_Dialog *cfd);
void(*free_cfdata) (E_Config_Dialog *cfd,
E_Config_Dialog_Data *cfdata);
int (*close_cfdata) (E_Config_Dialog *cfd,
E_Config_Dialog_Data *cfdata);
struct {
int (*apply_cfdata) (E_Config_Dialog *cfd,
E_Config_Dialog_Data *cfdata);
Evas_Object *(*create_widgets)(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata);
- } basic, advanced;
+ } basic, advanced;
};
struct _E_Config_Dialog
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config_dialog.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_config_dialog.c 13 Feb 2006 15:36:56 - 1.21
+++ e_config_dialog.c 15 Feb 2006 20:29:33 - 1.22
@@ -35,11 +35,38 @@
cfd->data = data;
cfd->hide_buttons = 1;
cfd->cfg_changed = 0;
-
- if ((cfd->view->basic.apply_cfdata) || (cfd->view->advanced.apply_cfdata))
- cfd->hide_buttons = 0;
- _e_config_dialog_go(cfd, E_CONFIG_DIALOG_CFDATA_TYPE_BASIC);
+ if (cfd->view->override_auto_apply)
+ {
+ /* Dialog Requested To Not Auto-Apply */
+ if ((cfd->view->basic.apply_cfdata) ||
(cfd->view->advanced.apply_cfdata))
+ cfd->hide_buttons = 0;
+ }
+ else
+ {
+ /* Ok To Override, Or Not Specified. Use Config Value */
+ if (e_config->cfgdlg_auto_apply)
+ cfd->hide_buttons = 1;
+ else
+ {
+if ((cfd->view->basic.apply_cfdata) ||
(cfd->view->advanced.apply_cfdata))
+ cfd->hide_buttons = 0;
+ }
+ }
+
+ switch (e_config->cfgdlg_default_mode)
+ {
+ case E_CONFIG_DIALOG_CFDATA_TYPE_BASIC:
+ if (cfd->view->basic.create_widgets)
+ _e_config_dialog_go(cfd, E_CONFIG_DIALOG_CFDATA_TYPE_BASIC);
+ break;
+ case E_CONFIG_DIALOG_CFDATA_TYPE_ADVANCED:
+ if (cfd->view->advanced.create_widgets)
+ _e_config_dialog_go(cfd, E_CONFIG_DIALOG_CFDATA_TYPE_ADVANCED);
+ else if (cfd->view->basic.create_widgets)
+ _e_config_dialog_go(cfd, E_CONFIG_DIALOG_CFDATA_TYPE_BASIC);
+ break;
+ }
return cfd;
}
@@ -207,7 +234,7 @@
{
if (cfd->view->advanced.apply_cfdata)
ok = cfd->view->advanced.apply_cfdata(cfd, cfd->cfdata);
- }
+ }
if ((ok) && (!cfd->hide_buttons))
{
cfd->cfg_changed = 0;
@@ -238,6 +265,7 @@
_e_config_dialog_cb_changed(void *data, Evas_Object *obj)
{
E_Config_Dialog *cfd;
+ int ok = 0;
cfd = data;
if (!cfd->hide_buttons)
@@ -246,6 +274,19 @@
e_dialog_button_disable_num_set(cfd->dia, 0, 0);
e_dialog_button_disable_num_set(cfd->dia, 1, 0);
}
+ else
+ {
+ if (cfd->view_type == E_CONFIG_DIALOG_CFDATA_TYPE_BASIC)
+ {
+if (cfd->view->basic.apply_cfdata)
+ ok = cfd->view->basic.apply_cfdata(cfd, cfd->cfdata);
+ }
+ else
+ {
+if (cfd->view->advanced.apply_cfdata)
+ ok = cfd->view->advanced.apply_cfdata(cfd, cfd->cfdata);
+ }
+ }
}
static void
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_configure.c
Log Message:
Added config option for setting config dialog options
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_configure.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- e_configure.c 13 Feb 2006 13:35:53 - 1.35
+++ e_configure.c 15 Feb 2006 20:28:55 - 1.36
@@ -66,6 +66,7 @@
e_configure_standard_item_add(eco, "enlightenment/desktops", _("Background
Settings"), e_int_config_background);
e_configure_standard_item_add(eco, "enlightenment/themes", _("Theme
Selector"), e_int_config_theme);
e_configure_standard_item_add(eco, "enlightenment/modules", _("Module
Settings"), e_int_config_modules);
+ e_configure_standard_item_add(eco, "enlightenment/configuration", _("Config
Dialog Settings"), e_int_config_cfgdialogs);
e_configure_standard_item_add(eco, "enlightenment/mouse", _("Cursor
Settings"), e_int_config_cursor);
e_configure_standard_item_add(eco, "enlightenment/desktops", _("Desktop
Settings"), e_int_config_desks);
e_configure_standard_item_add(eco, "enlightenment/desktops", _("Display
Settings"), e_int_config_display);
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_config.h e_config.c
Log Message:
Added config options for cfgdlg_auto_apply and cfgdlg_default_mode. Bumped
config version
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.h,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -3 -r1.79 -r1.80
--- e_config.h 13 Feb 2006 13:39:24 - 1.79
+++ e_config.h 15 Feb 2006 20:28:31 - 1.80
@@ -47,7 +47,7 @@
* versioning feature. the value of this is really irrelevant - just as
* long as it increases every time we change something
*/
-#define E_CONFIG_FILE_VERSION 136
+#define E_CONFIG_FILE_VERSION 137
#define E_EVAS_ENGINE_DEFAULT 0
#define E_EVAS_ENGINE_SOFTWARE_X11 1
@@ -204,6 +204,8 @@
int exebuf_pos_max_h; // GUI
Evas_List *color_classes;
int use_app_icon; // GUI
+ int cfgdlg_auto_apply; // GUI
+ int cfgdlg_default_mode; // GUI
Evas_List *gadcons;
};
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -3 -r1.142 -r1.143
--- e_config.c 13 Feb 2006 06:32:26 - 1.142
+++ e_config.c 15 Feb 2006 20:28:31 - 1.143
@@ -425,7 +425,10 @@
E_CONFIG_VAL(D, T, exebuf_pos_max_h, INT);
E_CONFIG_LIST(D, T, color_classes, _e_config_color_class_edd);
E_CONFIG_VAL(D, T, use_app_icon, INT);
+ E_CONFIG_VAL(D, T, cfgdlg_auto_apply, INT);
+ E_CONFIG_VAL(D, T, cfgdlg_default_mode, INT);
E_CONFIG_LIST(D, T, gadcons, _e_config_gadcon_edd);
+
e_config = e_config_domain_load("e", _e_config_edd);
if (e_config)
{
@@ -573,6 +576,8 @@
e_config->exebuf_pos_max_h = 320;
e_config->color_classes = NULL;
e_config->use_app_icon = 0;
+ e_config->cfgdlg_auto_apply = 0;
+ e_config->cfgdlg_default_mode = 0;
e_config->gadcons = NULL;
/* FIXME: fill up default gadcons! */
@@ -1599,6 +1604,8 @@
E_CONFIG_LIMIT(e_config->menu_eap_generic_show, 0, 1);
E_CONFIG_LIMIT(e_config->menu_eap_comment_show, 0, 1);
E_CONFIG_LIMIT(e_config->use_app_icon, 0, 1);
+ E_CONFIG_LIMIT(e_config->cfgdlg_auto_apply, 0, 1);
+ E_CONFIG_LIMIT(e_config->cfgdlg_default_mode, 0, 1);
return 1;
}
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: Makefile.am e_includes.h Log Message: Include new Config Dialog Settings === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v retrieving revision 1.107 retrieving revision 1.108 diff -u -3 -r1.107 -r1.108 --- Makefile.am 14 Feb 2006 00:40:57 - 1.107 +++ Makefile.am 15 Feb 2006 20:27:45 - 1.108 @@ -134,6 +134,7 @@ e_int_config_winlist.h \ e_int_config_display.h \ e_int_config_exebuf.h \ +e_int_config_cfgdialogs.h \ e_deskpreview.h \ e_exebuf.h \ e_int_config_modules.h \ @@ -258,6 +259,7 @@ e_int_config_winlist.c \ e_int_config_display.c \ e_int_config_exebuf.c \ +e_int_config_cfgdialogs.c \ e_deskpreview.c \ e_exebuf.c \ e_int_config_modules.c \ === RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_includes.h,v retrieving revision 1.89 retrieving revision 1.90 diff -u -3 -r1.89 -r1.90 --- e_includes.h14 Feb 2006 00:40:57 - 1.89 +++ e_includes.h15 Feb 2006 20:27:45 - 1.90 @@ -112,6 +112,7 @@ #include "e_int_config_winlist.h" #include "e_int_config_display.h" #include "e_int_config_exebuf.h" +#include "e_int_config_cfgdialogs.h" #include "e_deskpreview.h" #include "e_exebuf.h" #include "e_int_config_modules.h" --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ 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 Modified Files: Doxyfile Log Message: - change doxygen defaults === RCS file: /cvsroot/enlightenment/e17/libs/ewl/Doxyfile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- Doxyfile17 Feb 2005 19:14:45 - 1.7 +++ Doxyfile15 Feb 2006 20:27:27 - 1.8 @@ -17,13 +17,13 @@ HHC_LOCATION = GENERATE_CHI = NO BINARY_TOC = NO -TOC_EXPAND = NO +TOC_EXPAND = YES DISABLE_INDEX = NO EXTRACT_ALL= NO EXTRACT_PRIVATE= NO EXTRACT_STATIC = NO EXTRACT_LOCAL_CLASSES = NO -HIDE_UNDOC_MEMBERS = YES +HIDE_UNDOC_MEMBERS = NO HIDE_UNDOC_CLASSES = YES HIDE_FRIEND_COMPOUNDS = YES BRIEF_MEMBER_DESC = YES @@ -61,7 +61,7 @@ WARNINGS = YES WARN_IF_UNDOCUMENTED = YES WARN_FORMAT= "$file:$line: $text" -WARN_LOGFILE = +WARN_LOGFILE = ewl_doxy_warnings.txt FILE_PATTERNS = RECURSIVE = NO EXCLUDE= @@ -72,10 +72,10 @@ EXAMPLE_RECURSIVE = NO INPUT_FILTER = FILTER_SOURCE_FILES= NO -SOURCE_BROWSER = NO +SOURCE_BROWSER = YES INLINE_SOURCES = NO -REFERENCED_BY_RELATION = YES -REFERENCES_RELATION= YES +REFERENCED_BY_RELATION = NO +REFERENCES_RELATION= NO ALPHABETICAL_INDEX = YES COLS_IN_ALPHA_INDEX= 2 IGNORE_PREFIX = @@ -90,7 +90,7 @@ EXTRA_PACKAGES = LATEX_HEADER = PDF_HYPERLINKS = YES -USE_PDFLATEX = NO +USE_PDFLATEX = YES LATEX_BATCHMODE= NO GENERATE_RTF = NO RTF_OUTPUT = rtf @@ -120,15 +120,15 @@ ALLEXTERNALS = NO EXTERNAL_GROUPS= YES PERL_PATH = /usr/bin/perl -CLASS_DIAGRAMS = NO +CLASS_DIAGRAMS = YES HIDE_UNDOC_RELATIONS = YES -HAVE_DOT = NO -CLASS_GRAPH= NO -COLLABORATION_GRAPH= NO +HAVE_DOT = YES +CLASS_GRAPH= YES +COLLABORATION_GRAPH= YES TEMPLATE_RELATIONS = NO -INCLUDE_GRAPH = NO -INCLUDED_BY_GRAPH = NO -GRAPHICAL_HIERARCHY= NO +INCLUDE_GRAPH = YES +INCLUDED_BY_GRAPH = YES +GRAPHICAL_HIERARCHY= YES DOT_IMAGE_FORMAT = png DOT_PATH = DOTFILE_DIRS = --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Added Files: e_int_config_cfgdialogs.h e_int_config_cfgdialogs.c Log Message: New Config Dialog for setting options about Config Dialogs, hehe. Can set if changes are auto-applied and also the default mode to open a config dialog in (Basic/Advanced) --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ 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_colorpicker.c ewl_colorpicker.h
Log Message:
- documentation
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_colorpicker.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ewl_colorpicker.c 12 Jan 2006 18:21:18 - 1.15
+++ ewl_colorpicker.c 15 Feb 2006 20:04:59 - 1.16
@@ -9,6 +9,7 @@
/**
* @return Returns a new Ewl_Colorpicker widget or NULL on failure
+ * @brief Creates a new Ewl_Colorpicker widget
*/
Ewl_Widget *
ewl_colorpicker_new(void)
@@ -35,6 +36,7 @@
/**
* @param cp: The Ewl_Colorpicker to initialize
* @return Returns TRUE on success or FALSE on failure
+ * @brief Initializes the @p cp color picker widget
*/
int
ewl_colorpicker_init(Ewl_Colorpicker *cp)
@@ -355,7 +357,8 @@
* @param cp: The colour picker to set the has_alpha flag on.
* @param alpha: Value to set the has_alpha param too. (TRUE or FALSE)
* @return Returns no value.
- **/
+ * @brief Set if the color picker displays alpha information
+ */
void
ewl_colorpicker_has_alpha_set(Ewl_Colorpicker *cp, unsigned int alpha)
{
@@ -371,6 +374,7 @@
/**
* @param cp: The colour picker to get the has_alpha flag from
* @return Returns the value of the has_alpha flag (TRUE or FALSE)
+ * @brief Retrieves if the color picker displays alpha information
*/
unsigned int
ewl_colorpicker_has_alpha_get(Ewl_Colorpicker *cp)
@@ -385,6 +389,7 @@
/**
* @param cp: the colourpicker to set the alpha value too
* @param alpha: The alpha value to set.
+ * @brief Set the alpha value into the color picker
*/
void
ewl_colorpicker_alpha_set(Ewl_Colorpicker *cp, unsigned int alpha)
@@ -402,6 +407,7 @@
/**
* @param cp: The colourpicker to get the alpha value from
* @return Returns the alpha value of the colorpicker (0-255)
+ * @brief Retrive the alpha value from the color picker
*/
unsigned int
ewl_colorpicker_alpha_get(Ewl_Colorpicker *cp)
@@ -423,6 +429,7 @@
* @param g: The green value to set
* @param b: The blue value to set
* @return Returns no value.
+ * @brief Set the current RGB values into the color picker
*/
void
ewl_colorpicker_current_rgb_set(Ewl_Colorpicker *cp, unsigned int r,
@@ -454,6 +461,7 @@
* @param g: Where to store the green value
* @param b: Where to store the blue value
* @return Returns no value
+ * @brief Retrieve the current RGB values from the color picker
*/
void
ewl_colorpicker_current_rgb_get(Ewl_Colorpicker *cp, unsigned int *r,
@@ -474,6 +482,7 @@
* @param g: The green value to set
* @param b: The blue value to set
* @return Returns no value.
+ * @brief Set the previous RBG values into the color picker
*/
void
ewl_colorpicker_previous_rgb_set(Ewl_Colorpicker *cp, unsigned int r,
@@ -498,6 +507,7 @@
* @param g: Where to store the green value
* @param b: Where to store the blue value
* @return Returns no value.
+ * @brief Retrieve the previous RGB values from the color picker
*/
void
ewl_colorpicker_previous_rgb_get(Ewl_Colorpicker *cp, unsigned int *r,
@@ -518,6 +528,7 @@
* @param cp: The colorpicker to set the mode on
* @param mode: The mode to set on the colorpicker
* @return Returns no value.
+ * @brief Set the color mode of the color picker
*/
void
ewl_colorpicker_color_mode_set(Ewl_Colorpicker *cp, Ewl_Color_Mode mode)
@@ -536,6 +547,7 @@
/**
* @param cp: The colorpicker to get the mode from
* @return Returns the Ewl_Color_Mode of the colorpicker
+ * @brief Get the color mode of the color picker
*/
Ewl_Color_Mode
ewl_colorpicker_color_mode_get(Ewl_Colorpicker *cp)
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_colorpicker.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ewl_colorpicker.h 12 Jan 2006 18:21:18 - 1.12
+++ ewl_colorpicker.h 15 Feb 2006 20:04:59 - 1.13
@@ -2,8 +2,7 @@
#define EWL_COLORPICKER_H
/**
- * @file ewl_colorpicker.h
- * @defgroup Ewl_Colorpicker Colorpicker: The colour picking widget
+ * @defgroup Ewl_Colorpicker Ewl_Colorpicker: The colour picking widget
*
* @{
*/
@@ -16,46 +15,53 @@
*/
#define EWL_COLORPICKER(cp) ((Ewl_Colorpicker *) cp)
+/**
+ * The Ewl_Colorpicker
+ */
typedef struct Ewl_Colorpicker Ewl_Colorpicker;
+/**
+ * @struct Ewl_Colorpicker
+ * This inherits from Ewl_Box to produce a color picker widget
+ */
struct Ewl_Colorpicker
{
- Ewl_Box box;
+ Ewl_Box box;/**< Inherit from Ewl_Box */
struct
{
- Ewl_Widget *square;
- Ewl_Widget *vertical;
- } picker;
+ Ewl_Widget *square; /**< The square picker box */
+ Ewl_Widget *vertical; /**< The vertical picker box */
+
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_text_view.c etk_text_view.h etk_types.h
Added Files:
etk_textblock.c etk_textblock.h
Removed Files:
etk_text_buffer.c etk_text_buffer.h etk_text_iter.c
etk_text_iter.h
Log Message:
* Start the work on the text view
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/Etk.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- Etk.h 15 Feb 2006 15:03:17 - 1.22
+++ Etk.h 15 Feb 2006 18:36:55 - 1.23
@@ -38,9 +38,8 @@
#include "etk_toggle_button.h"
#include "etk_check_button.h"
#include "etk_radio_button.h"
-#include "etk_text_buffer.h"
-#include "etk_text_iter.h"
#include "etk_editable_text_object.h"
+#include "etk_textblock.h"
#include "etk_entry.h"
#include "etk_text_view.h"
#include "etk_canvas.h"
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- Makefile.am 15 Feb 2006 15:03:17 - 1.26
+++ Makefile.am 15 Feb 2006 18:36:55 - 1.27
@@ -17,6 +17,7 @@
ETKHEADERS = \
Etk.h etk_types.h etk_main.h etk_utils.h \
+etk_string.h \
etk_type.h etk_object.h etk_property.h \
etk_signal.h etk_signal_callback.h etk_marshallers.h \
etk_theme.h etk_cache.h \
@@ -29,7 +30,7 @@
etk_image.h \
etk_stock.h \
etk_label.h \
-etk_string.h etk_text_buffer.h etk_text_iter.h etk_editable_text_object.h \
+etk_textblock.h etk_editable_text_object.h \
etk_button.h etk_toggle_button.h etk_check_button.h etk_radio_button.h \
etk_entry.h etk_text_view.h \
etk_canvas.h \
@@ -50,6 +51,7 @@
libetk_la_SOURCES = \
etk_main.c etk_utils.c \
+etk_string.c \
etk_type.c etk_object.c etk_property.c \
etk_signal.c etk_signal_callback.c etk_marshallers.c \
etk_theme.c etk_cache.c \
@@ -62,7 +64,7 @@
etk_image.c \
etk_stock.c \
etk_label.c \
-etk_string.c etk_text_buffer.c etk_text_iter.c etk_editable_text_object.c \
+etk_textblock.c etk_editable_text_object.c \
etk_button.c etk_toggle_button.c etk_check_button.c etk_radio_button.c \
etk_entry.c etk_text_view.c \
etk_canvas.c \
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_text_view.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_text_view.c 11 Feb 2006 00:28:34 - 1.1
+++ etk_text_view.c 15 Feb 2006 18:36:55 - 1.2
@@ -5,8 +5,7 @@
#include
#include "etk_signal.h"
#include "etk_signal_callback.h"
-#include "etk_text_buffer.h"
-#include "etk_string.h"
+#include "etk_textblock.h"
/**
* @addtogroup Etk_Text_View
@@ -22,6 +21,7 @@
static void _etk_text_view_constructor(Etk_Text_View *text_view);
static void _etk_text_view_size_allocate(Etk_Widget *widget, Etk_Geometry
geometry);
static void _etk_text_view_realize_cb(Etk_Object *object, void *data);
+static void _etk_text_view_unrealize_cb(Etk_Object *object, void *data);
static Etk_Signal *_etk_text_view_signals[ETK_TEXT_VIEW_NUM_SIGNALS];
@@ -72,11 +72,11 @@
if (!text_view)
return;
- text_view->text_buffer = etk_text_buffer_new();
- text_view->textblock_object = NULL;
+ text_view->textblock = etk_textblock_new();
ETK_WIDGET(text_view)->size_allocate = _etk_text_view_size_allocate;
etk_signal_connect("realize", ETK_OBJECT(text_view),
ETK_CALLBACK(_etk_text_view_realize_cb), NULL);
+ etk_signal_connect("unrealize", ETK_OBJECT(text_view),
ETK_CALLBACK(_etk_text_view_unrealize_cb), NULL);
}
/* TODO: Renders the textblock object */
@@ -88,7 +88,8 @@
return;
printf("text_view_size_allocate\n");
- evas_object_textblock_text_markup_set(text_view->textblock_object,
etk_string_get(text_view->text_buffer->formatted_buffer));
+ evas_object_move(text_view->textblock->textblock_object, geometry.x,
geometry.y);
+ evas_object_resize(text_view->textblock->textblock_object, geometry.w,
geometry.h);
}
/**
@@ -97,25 +98,29 @@
*
**/
-/* Called when the text_view is realized */
+/* Called when the text view is realized */
static void _etk_text_view_realize_cb(Etk_Object *object, void *data)
{
- Evas_Textblock_Style *text_style;
Etk_Text_View *text_view;
- Etk_Widget *text_view_widget;
Evas *evas;
- if (!(text_view_widget = ETK_WIDGET(object)) || !(evas =
etk_widget_toplevel_evas_get(text_view_widget)))
+ if (!(text_view = ETK_TEXT_VIEW(object)) || !(evas =
etk_widget_toplevel_evas_get(ETK_WIDGET(text_view
return;
- text_view = ETK_TEXT_VIEW(text_view_widget);
- text_view->textblock_object = evas_object_textblock_add(evas);
- text_style = evas_te
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_colordialog.c ewl_colordialog.h
Log Message:
- doxygen fixes
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_colordialog.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ewl_colordialog.c 12 Jan 2006 18:21:18 - 1.21
+++ ewl_colordialog.c 15 Feb 2006 18:25:05 - 1.22
@@ -7,9 +7,7 @@
/**
* @return Returns a new Ewl_Colordialog widget
- *
- * This will display a colorpicker inside a window with an Ok and Cancel
- * button. When the user hits one of the buttons
+ * @brief Create a new Ewl_Colordialog widget
*/
Ewl_Widget *
ewl_colordialog_new(void)
@@ -87,6 +85,12 @@
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
+/**
+ * @param cd: The color dialog to set the alpha value on
+ * @param alpha: If the color dialog should show the alpha option
+ * @return Returns no value
+ * @brief This will set if the color dialog will show the alpha information
+ */
void
ewl_colordialog_has_alpha_set(Ewl_Colordialog *cd, unsigned int alpha)
{
@@ -99,6 +103,12 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
+/**
+ * @param cd: The color dialog to get the alpha information from
+ * @return Returns TRUE if the color dialog is showing alpha information
+ * @brief This retrieves weither or not the color dialog is showing alpha
+ * information.
+ */
unsigned int
ewl_colordialog_has_alpha_get(Ewl_Colordialog *cd)
{
@@ -113,6 +123,12 @@
DRETURN_INT(alpha, DLEVEL_STABLE);
}
+/**
+ * @param cd: The color dialog to set the alpha into
+ * @param alpha: The alpha value to set into the color dialog
+ * @return Returns no value
+ * @brief Sets the alpha value of the @p cd dialog to @p alpha
+ */
void
ewl_colordialog_alpha_set(Ewl_Colordialog *cd, unsigned int alpha)
{
@@ -125,6 +141,11 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
+/**
+ * @param cd: The color dialog to get the alpha value from
+ * @return Returns the current alpha value selected in the dialog
+ * @brief This retrieves the current alpha value selected in the dialog
+ */
unsigned int
ewl_colordialog_alpha_get(Ewl_Colordialog *cd)
{
@@ -139,6 +160,14 @@
DRETURN_INT(alpha, DLEVEL_STABLE);
}
+/**
+ * @param cd: The color dialog to set the rgb values into
+ * @param r: The red value to set
+ * @param g: The green value to set
+ * @param b: The blue value to set
+ * @return Returns no value.
+ * @brief This sets the given rbg information into the color dialog
+ */
void
ewl_colordialog_current_rgb_set(Ewl_Colordialog *cd, unsigned int r,
unsigned int g, unsigned int b)
@@ -152,6 +181,14 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
+/**
+ * @param cd: The color dialog to get the rgb information from
+ * @param r: Where to store the red value
+ * @param g: Where to store the green value
+ * @param b: Where to store the blue value
+ * @return Returns no value.
+ * @brief This will retrieve the rgb values from the color dialog
+ */
void
ewl_colordialog_current_rgb_get(Ewl_Colordialog *cd, unsigned int *r,
unsigned int *g, unsigned int *b)
@@ -165,6 +202,15 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
+/**
+ * @param cd: The color dialog to set the previous rgb values into
+ * @param r: The red value to set
+ * @param g: The green value to set
+ * @param b: The blue value to set
+ * @return Returns no value.
+ * @brief This sets the given rgb values as the color to display in the
+ * previous color box of the color dialog.
+ */
void
ewl_colordialog_previous_rgb_set(Ewl_Colordialog *cd, unsigned int r,
unsigned int g, unsigned int b)
@@ -178,6 +224,15 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
+/**
+ * @param cd: The color dialog to get the rgb information from
+ * @param r: Where to store the red value
+ * @param g: Where to store the green value
+ * @param b: Where to store the blue value
+ * @return Returns no value.
+ * @brief This will retrieve the value current set into the previous color box
of
+ * the color dialog rgb values from the color dialog
+ */
void
ewl_colordialog_previous_rgb_get(Ewl_Colordialog *cd, unsigned int *r,
unsigned int *g, unsigned int *b)
@@ -191,6 +246,12 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
+/**
+ * @param cd: The color dialog to set the mode of
+ * @param type: The mode to set on the color dialog
+ * @return Returns no value.
+ * @brief Sets the color dialog mode to @p type
+ */
void
ewl_colordialog_color_mode_set(Ewl_Colordialog *cd, Ewl_Color_Mode type)
{
@@ -203,6 +264,12 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
+/**
+ * @param cd: The color dialog to get the mode from
+ * @return Returns the current mode of the color dialog
+ * @brief This will retrive the current Ew
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_checkbutton.c ewl_checkbutton.h ewl_radiobutton.c
ewl_radiobutton.h
Log Message:
- change Ewl_CheckButton -> Ewl_Checkbutton for consistency
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_checkbutton.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_checkbutton.c 12 Jan 2006 18:21:18 - 1.8
+++ ewl_checkbutton.c 15 Feb 2006 17:53:25 - 1.9
@@ -10,11 +10,11 @@
Ewl_Widget *
ewl_checkbutton_new(void)
{
- Ewl_CheckButton *b;
+ Ewl_Checkbutton *b;
DENTER_FUNCTION(DLEVEL_STABLE);
- b = NEW(Ewl_CheckButton, 1);
+ b = NEW(Ewl_Checkbutton, 1);
if (!b)
DRETURN_PTR(NULL, DLEVEL_STABLE);
@@ -35,7 +35,7 @@
* default values.
*/
int
-ewl_checkbutton_init(Ewl_CheckButton *cb)
+ewl_checkbutton_init(Ewl_Checkbutton *cb)
{
Ewl_Button *b;
Ewl_Widget *w;
@@ -74,7 +74,7 @@
* @return Returns no value.
* @brief Update the checked state of the check button.
*/
-void ewl_checkbutton_checked_set(Ewl_CheckButton *cb, int c)
+void ewl_checkbutton_checked_set(Ewl_Checkbutton *cb, int c)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("cb", cb);
@@ -88,7 +88,7 @@
/**
* @brief Retrieve the checked state of a check button.
*/
-int ewl_checkbutton_is_checked(Ewl_CheckButton *cb)
+int ewl_checkbutton_is_checked(Ewl_Checkbutton *cb)
{
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET("cb", cb, FALSE);
@@ -107,7 +107,7 @@
* Changes the position of the label associated with the check button.
*/
void
-ewl_checkbutton_label_position_set(Ewl_CheckButton *cb, Ewl_Position p)
+ewl_checkbutton_label_position_set(Ewl_Checkbutton *cb, Ewl_Position p)
{
Ewl_Button *b;
@@ -148,7 +148,7 @@
ewl_checkbutton_clicked_cb(Ewl_Widget *w, void *ev_data __UNUSED__,
void *user_data __UNUSED__)
{
- Ewl_CheckButton *cb;
+ Ewl_Checkbutton *cb;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR("w", w);
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_checkbutton.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ewl_checkbutton.h 12 Jan 2006 18:21:18 - 1.7
+++ ewl_checkbutton.h 15 Feb 2006 17:53:25 - 1.8
@@ -1,10 +1,9 @@
-#ifndef __EWL_CHECKBUTTON_H__
-#define __EWL_CHECKBUTTON_H__
+#ifndef EWL_CHECKBUTTON_H
+#define EWL_CHECKBUTTON_H
/**
- * @file ewl_checkbutton.h
- * @defgroup Ewl_CheckButton CheckButton: A CheckButton with Label
- * @brief Defines an Ewl_CheckButton that inherits from Ewl_Widget and
+ * @defgroup Ewl_Checkbutton Ewl_Checkbutton: An Ewl_Checkbutton with Label
+ * @brief Defines an Ewl_Checkbutton that inherits from Ewl_Widget and
* provides an Ewl_Check that changes value on each click.
*
* @{
@@ -21,35 +20,32 @@
* The button class is a basic button with a label. This class is inherited by
* the check button and radio button classes.
*/
-typedef struct Ewl_CheckButton Ewl_CheckButton;
+typedef struct Ewl_Checkbutton Ewl_Checkbutton;
/**
* @def EWL_CHECKBUTTON(button)
- * Typecasts a pointer to an Ewl_CheckButton pointer.
+ * Typecasts a pointer to an Ewl_Checkbutton pointer.
*/
-#define EWL_CHECKBUTTON(button) ((Ewl_CheckButton *) button)
+#define EWL_CHECKBUTTON(button) ((Ewl_Checkbutton *) button)
/**
- * @struct Ewl_CheckButton
+ * @struct Ewl_Checkbutton
* Inherits from Ewl_Widget and expands to provide a stateful check button.
*/
-struct Ewl_CheckButton
+struct Ewl_Checkbutton
{
Ewl_Button button; /**< Inherit the basic button properties */
-
-
Ewl_Positionlabel_position; /**< Order of label and check */
-
Ewl_Widget *check; /**< Check widget represented */
};
Ewl_Widget *ewl_checkbutton_new(void);
-int ewl_checkbutton_init(Ewl_CheckButton *cb);
+int ewl_checkbutton_init(Ewl_Checkbutton *cb);
-voidewl_checkbutton_checked_set(Ewl_CheckButton *cb, int checked);
-int ewl_checkbutton_is_checked(Ewl_CheckButton *cb);
+voidewl_checkbutton_checked_set(Ewl_Checkbutton *cb, int checked);
+int ewl_checkbutton_is_checked(Ewl_Checkbutton *cb);
-voidewl_checkbutton_label_position_set(Ewl_CheckButton *cb,
+voidewl_checkbutton_label_position_set(Ewl_Checkbutton *cb,
Ewl_Position p);
/*
@@ -62,4 +58,4 @@
* @}
*/
-#endif /* __EWL_CHECKBUTTON_H__ */
+#endif
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl
E CVS: libs/ewl dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_box.h ewl_button.c ewl_button.h ewl_calendar.c
ewl_calendar.h ewl_callback.h ewl_cell.h ewl_check.h
Log Message:
- documentation fixes
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_box.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ewl_box.h 12 Jan 2006 18:21:18 - 1.8
+++ ewl_box.h 15 Feb 2006 17:40:49 - 1.9
@@ -1,9 +1,8 @@
-#ifndef __EWL_BOX_H__
-#define __EWL_BOX_H__
+#ifndef EWL_BOX_H
+#define EWL_BOX_H
/**
- * @file ewl_box.h
- * @defgroup Ewl_Box Box: The Box Layout Container.
+ * @defgroup Ewl_Box Ewl_Box: The Box Layout Container.
* @brief Defines the Ewl_Box class used for laying out Ewl_Widget's in a
* horizontal or vertical line.
*
@@ -77,4 +76,4 @@
* @}
*/
-#endif /* __EWL_BOX_H__ */
+#endif
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_button.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- ewl_button.c6 Feb 2006 16:32:10 - 1.25
+++ ewl_button.c15 Feb 2006 17:40:49 - 1.26
@@ -155,6 +155,7 @@
* @param b: The button to set the stock type on
* @param stock: The Ewl_Stock_Type to set on the button
* @return Returns no value.
+ * @brief Set the type of the stock button to use
*/
void
ewl_button_stock_type_set(Ewl_Button *b, Ewl_Stock_Type stock)
@@ -195,6 +196,7 @@
/**
* @param b: The button to get the stock type from
* @return Returns the Ewl_Stock_Type of the button
+ * @brief Get the stock button type in use
*/
Ewl_Stock_Type
ewl_button_stock_type_get(Ewl_Button *b)
@@ -211,6 +213,7 @@
* @param file: The file to use for the image
* @param key: The edje key to use for the image (or NULL if not using edje)
* @return Returns no value.
+ * @brief Set the image file @p file and the image key @p key to use
*/
void
ewl_button_image_set(Ewl_Button *b, const char *file, const char *key)
@@ -235,6 +238,7 @@
/**
* @param b: The button to the the image file from
* @return Returns the image file used in the button or NULL on failure
+ * @brief Get the image file used by the button
*/
const char *
ewl_button_image_get(Ewl_Button *b)
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_button.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ewl_button.h12 Jan 2006 18:21:18 - 1.9
+++ ewl_button.h15 Feb 2006 17:40:49 - 1.10
@@ -1,9 +1,8 @@
-#ifndef __EWL_BUTTON_H__
-#define __EWL_BUTTON_H__
+#ifndef EWL_BUTTON_H
+#define EWL_BUTTON_H
/**
- * @file ewl_button.h
- * @defgroup Ewl_Button Button: The Basic Button
+ * @defgroup Ewl_Button Ewl_Button: The Basic Button
* @brief The button class is a basic button with a label. This class inherits
* from the Ewl_Box to allow for placing any other widget inside the button.
*
@@ -38,7 +37,7 @@
struct Ewl_Button
{
Ewl_Box box;/**< Inherit from the box for adding
widgets */
- Ewl_Widget *body;
+ Ewl_Widget *body; /**< The body of the button */
Ewl_Widget *label_object; /**< Labels are common, make it easy */
Ewl_Widget *image_object; /**< Add an image to the button if
needed */
Ewl_Stock_Type stock_type; /**< The stock type of the button */
@@ -64,5 +63,5 @@
* @}
*/
-#endif /* __EWL_BUTTON_H__ */
+#endif
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_calendar.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ewl_calendar.c 12 Jan 2006 18:21:18 - 1.14
+++ ewl_calendar.c 15 Feb 2006 17:40:49 - 1.15
@@ -156,6 +156,7 @@
/**
* @param c: The Ewl_Calendar to get the day from
* @return Returns the day currently selected in the calendar
+ * @brief Returns the current day selected in the calendar
*/
int
ewl_calendar_day_get(Ewl_Calendar *c)
@@ -170,6 +171,7 @@
/**
* @param c: The Ewl_Calendar to get the month from
* @return Returns the month currently selected in the calendar
+ * @brief Returns the month selected in the calendar
*/
int
ewl_calendar_month_get(Ewl_Calendar *c)
@@ -184,6 +186,7 @@
/**
* @param c: The Ewl_Calendar to get the year from
* @return Returns the current year selected in the calendar
+ * @brief Returns the year currently selected in the calendar
*/
int
ewl_calendar_year_get(Ewl_Calendar *c)
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_ca
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_attach.h Log Message: - spelling === RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_attach.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- ewl_attach.h15 Feb 2006 16:52:18 - 1.6 +++ ewl_attach.h15 Feb 2006 16:57:20 - 1.7 @@ -36,14 +36,14 @@ /** * @def ewl_attach_tooltip_text_set(w, data) - * Conviencice method to set a tooltip text attachment + * Convenience method to set a tooltip text attachment */ #define ewl_attach_tooltip_text_set(w, data) \ ewl_attach_text_set(w, EWL_ATTACH_TYPE_TOOLTIP, data) /** * @def ewl_attach_tooltip_widget_set(w, data) - * Convience method to set a tooltip widget attachement + * Convenience method to set a tooltip widget attachement */ #define ewl_attach_tooltip_widget_set(w, data) \ ewl_attach_widget_set(w, EWL_ATTACH_TYPE_TOOLTIP, data) @@ -51,7 +51,7 @@ /** * @def ewl_attach_mouse_pointer_set(w, data) - * Convience method to set a pointer widget attachment + * Convenience method to set a pointer widget attachment */ #define ewl_attach_mouse_cursor_set(w, data) \ ewl_attach_other_set(w, EWL_ATTACH_TYPE_MOUSE_CURSOR, \ @@ -59,42 +59,42 @@ /** * @def ewl_attach_color_set(w, data) - * Convience method to set a colour widget attachment + * Convenience method to set a colour widget attachment */ #define ewl_attach_color_set(w, data) \ ewl_attach_other_set(w, EWL_ATTACH_TYPE_COLOR, data) /** * @def ewl_attach_color_get(w) - * Convience method to get a colour attachment back + * Convenience method to get a colour attachment back */ #define ewl_attach_color_get(w) \ ewl_attach_get(w, EWL_ATTACH_TYPE_COLOR) /** * @def ewl_attach_name_set(w, data) - * Convience method to set a widget name attachment + * Convenience method to set a widget name attachment */ #define ewl_attach_name_set(w, data) \ ewl_attach_text_set(w, EWL_ATTACH_TYPE_NAME, data) /** * @def ewl_attach_name_get(w) - * Convience method to get a widgets name attachment + * Convenience method to get a widgets name attachment */ #define ewl_attach_name_get(w) \ ewl_attach_get(w, EWL_ATTACH_TYPE_NAME) /** * @def ewl_attach_notebook_data_set(w, data) - * Convience method to attach data to a notebook item + * Convenience method to attach data to a notebook item */ #define ewl_attach_notebook_data_set(w, data) \ ewl_attach_other_set(w, EWL_ATTACH_TYPE_NOTEBOOK_DATA, data) /** * @def ewl_attach_notebook_data_get(w) - * Convience method to get the data attached to a notebook item + * Convenience method to get the data attached to a notebook item */ #define ewl_attach_notebook_data_get(w) \ ewl_attach_get(w, EWL_ATTACH_TYPE_NOTEBOOK_DATA) --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ 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_attach.c ewl_attach.h ewl_border.c ewl_border.h
Log Message:
- move some of the attach functions to be static
- doxygen fixes
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_attach.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- ewl_attach.c12 Jan 2006 18:21:18 - 1.26
+++ ewl_attach.c15 Feb 2006 16:52:17 - 1.27
@@ -20,6 +20,19 @@
Ewl_Widget *to;
};
+static Ewl_Attach_List *ewl_attach_list_new(void);
+static void ewl_attach_list_free(Ewl_Attach_List *list);
+
+static void ewl_attach_list_add(Ewl_Attach_List *list, Ewl_Widget *parent,
+ Ewl_Attach *attach);
+static void *ewl_attach_list_get(Ewl_Attach_List *list, Ewl_Attach_Type type);
+
+static Ewl_Attach *ewl_attach_new(Ewl_Attach_Type t,
+ Ewl_Attach_Data_Type dt, void *data);
+static int ewl_attach_init(Ewl_Attach *attach, Ewl_Attach_Type t,
+ Ewl_Attach_Data_Type dt, void *data);
+static void ewl_attach_free(Ewl_Attach *attach);
+
static void ewl_attach_parent_setup(Ewl_Widget *w);
static void ewl_attach_cb_parent_destroy(Ewl_Widget *w, void *ev, void *data);
static void ewl_attach_attach_type_setup(Ewl_Widget *w, Ewl_Attach *attach);
@@ -41,6 +54,7 @@
* @param t: The type of the attachment
* @param data: The text to set as the attachment
* @return Returns no value
+ * @brief Attaches the text @p data to the widget @p w
*/
void
ewl_attach_text_set(Ewl_Widget *w, Ewl_Attach_Type t, const char *data)
@@ -72,6 +86,7 @@
* @param t: The type of data being attached
* @param data: The wiget to attach
* @return Returns no value
+ * @brief Attaches a widget @p data to the widget @p w
*/
void
ewl_attach_widget_set(Ewl_Widget *w, Ewl_Attach_Type t, Ewl_Widget *data)
@@ -104,6 +119,8 @@
* @param t: The type of attachment
* @param data: The data to attach
* @return Returns no value
+ * @brief Attaches the data @p data to the widget @p w with the attache type
+ * of @p t
*/
void
ewl_attach_other_set(Ewl_Widget *w, Ewl_Attach_Type t, void *data)
@@ -133,6 +150,7 @@
* @param w: The widget to get the attachment from
* @param t: The type of attachment to get
* @return Returns the data for the given attachment type
+ * @brief Get the attachment of type @p t from the widget @p w
*/
void *
ewl_attach_get(Ewl_Widget *w, Ewl_Attach_Type t)
@@ -156,7 +174,7 @@
DRETURN_PTR(NULL, DLEVEL_STABLE);
}
-Ewl_Attach_List *
+static Ewl_Attach_List *
ewl_attach_list_new(void)
{
Ewl_Attach_List *list;
@@ -168,7 +186,7 @@
DRETURN_PTR(list, DLEVEL_STABLE);
}
-void
+static void
ewl_attach_list_free(Ewl_Attach_List *list)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -193,7 +211,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void
+static void
ewl_attach_list_add(Ewl_Attach_List *list, Ewl_Widget *parent, Ewl_Attach
*attach)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -280,6 +298,12 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
+/**
+ * @param list: The Ewl_Attach_List to delete
+ * @param type: The Ewl_Attach_Type to delete
+ * @return Returns no value
+ * @brief Deletes the given type @p type from the list @p list
+ */
void
ewl_attach_list_del(Ewl_Attach_List *list, Ewl_Attach_Type type)
{
@@ -333,7 +357,7 @@
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
-void *
+static void *
ewl_attach_list_get(Ewl_Attach_List *list, Ewl_Attach_Type type)
{
DENTER_FUNCTION(DLEVEL_STABLE);
@@ -372,7 +396,7 @@
DRETURN_PTR(NULL, DLEVEL_STABLE);
}
-Ewl_Attach *
+static Ewl_Attach *
ewl_attach_new(Ewl_Attach_Type t, Ewl_Attach_Data_Type dt, void *data)
{
Ewl_Attach *attach;
@@ -393,7 +417,7 @@
DRETURN_PTR(attach, DLEVEL_STABLE);
}
-int
+static int
ewl_attach_init(Ewl_Attach *attach, Ewl_Attach_Type t,
Ewl_Attach_Data_Type dt, void *data)
{
@@ -411,7 +435,7 @@
DRETURN_INT(TRUE, DLEVEL_STABLE);
}
-void
+static void
ewl_attach_free(Ewl_Attach *attach)
{
DENTER_FUNCTION(DLEVEL_STABLE);
===
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_attach.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- ewl_attach.h3 Feb 2006 18:14:30 - 1.5
+++ ewl_attach.h15 Feb 2006 16:52:18 - 1.6
@@ -2,25 +2,36 @@
#define EWL_ATTACH_H
/**
- * @file ewl_attach.h
- * @defgroup Ewl_Attach Attachments: The attachment mechanisms
- * Defines methods for attaching data to widgets
+ * @defgroup Ewl_Attach Ewl_Attach: A mechanism to attach data to widgets.
+ * @brief Defines methods for attaching data to widgets
*
* @{
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_modules.c
Log Message:
Rework Modules Config Dialogue a bit. No need to click Apply button anymore.
Just click the radios to enable/load/unload. Old apply code left but commented
in case we want to revert. RFC on this :) -devilhorns
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_modules.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- e_int_config_modules.c 5 Feb 2006 11:25:01 - 1.22
+++ e_int_config_modules.c 15 Feb 2006 15:47:51 - 1.23
@@ -7,20 +7,21 @@
#define MOD_LOADED 1
#define MOD_UNLOADED 2
-/* PROTOTYPES - same all the time */
typedef struct _CFModule CFModule;
typedef struct _E_Widget_Data E_Widget_Data;
static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
-static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data
*cfdata);
+/* static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data
*cfdata); */
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata);
static void _ilist_cb_change(void *data, Evas_Object *obj);
static int _sort_modules(void *data1, void *data2);
-
static void _module_configure(void *data, void *data2);
static void _module_about(void *data, void *data2);
+static void _enabled_cb_change(void *data, Evas_Object *obj);
+static void _loaded_cb_change(void *data, Evas_Object *obj);
+static void _unloaded_cb_change(void *data, Evas_Object *obj);
struct _E_Widget_Data
{
@@ -36,7 +37,6 @@
int state;
};
-/* Actual config data we will be playing with whil the dialog is active */
struct _E_Config_Dialog_Data
{
E_Config_Dialog *cfd;
@@ -44,13 +44,12 @@
int state;
struct
{
- Evas_Object *configure, *enabled, *about;
- Evas_Object *loaded, *unloaded, *list;
+ Evas_Object *configure, *about;
+ Evas_Object *enabled, *loaded, *unloaded, *list;
}
gui;
};
-/* a nice easy setup function that does the dirty work */
EAPI E_Config_Dialog *
e_int_config_modules(E_Container *con)
{
@@ -59,12 +58,11 @@
v = E_NEW(E_Config_Dialog_View, 1);
- /* methods */
v->create_cfdata = _create_data;
v->free_cfdata = _free_data;
- v->basic.apply_cfdata = _basic_apply_data;
v->basic.create_widgets= _basic_create_widgets;
- /* create config diaolg for NULL object/data */
+ /* v->basic.apply_cfdata = _basic_apply_data; */
+
cfd = e_config_dialog_new(con, _("Module Settings"), NULL, 0, v, NULL);
return cfd;
}
@@ -103,7 +101,6 @@
}
}
-/**--CREATE--**/
static void
_fill_data(E_Config_Dialog_Data *cfdata)
{
@@ -153,10 +150,6 @@
static void *
_create_data(E_Config_Dialog *cfd)
{
- /* Create cfdata - cfdata is a temporary block of config data that this
-* dialog will be dealing with while configuring. it will be applied to
-* the running systems/config in the apply methods
-*/
E_Config_Dialog_Data *cfdata;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
@@ -183,7 +176,7 @@
free(cfdata);
}
-/**--APPLY--**/
+/*
static int
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
@@ -252,14 +245,13 @@
break;
}
}
- return 1; /* Apply was OK */
+ return 1;
}
+*/
-/**--GUI--**/
static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
*cfdata)
{
- /* generate the core widget layout for a basic dialog */
Evas_Object *o, *of, *ob, *oc, *ot, *ilist;
E_Radio_Group *rg;
E_Module *m;
@@ -306,14 +298,17 @@
ob = e_widget_radio_add(evas, _("Enabled"), MOD_ENABLED, rg);
cfdata->gui.enabled = ob;
e_widget_table_object_append(ot, ob, 1, 0, 1, 1, 1, 0, 1, 0);
+ e_widget_on_change_hook_set(ob, _enabled_cb_change, cfdata);
ob = e_widget_radio_add(evas, _("Loaded"), MOD_LOADED, rg);
cfdata->gui.loaded = ob;
e_widget_table_object_append(ot, ob, 1, 1, 1, 1, 1, 0, 1, 0);
+ e_widget_on_change_hook_set(ob, _loaded_cb_change, cfdata);
ob = e_widget_radio_add(evas, _("Unloaded"), MOD_UNLOADED, rg);
cfdata->gui.unloaded = ob;
e_widget_table_object_append(ot, ob, 1, 2, 1, 1, 1, 0, 1, 0);
+ e_widget_on_change_hook_set(ob, _unloaded_cb_change, cfdata);
ob = e_widget_button_add(evas, _("Configure"), NULL, _module_configure,
ilist, NULL);
cfdata->gui.configure = ob;
@@ -408,3 +403,139 @@
m2 = data2;
return (strcmp((const char*)m1->name, (const char*)m2->name));
}
+
+static void
+_enabled_cb_change(void *data, Evas_Object *obj)
+{
+ E_Config_Dialog_Data *cfdata;
+ E_Module *m;
+ CFModule *cm;
+ const char *v;
+ int i;
+
+ cfdata
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_dialog.h Log Message: - fix dox === RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_dialog.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- ewl_dialog.h15 Feb 2006 03:00:58 - 1.7 +++ ewl_dialog.h15 Feb 2006 15:32:24 - 1.8 @@ -33,7 +33,7 @@ #define EWL_DIALOG(dialog) ((Ewl_Dialog *) dialog) /** - * @struct _Ewl_Dialog + * @struct Ewl_Dialog * Extends the Ewl_Window class. Add two boxes to hold massages (vbox) * and buttons (action_area). The action_area could be on top, bottom, * right or left of the window. The boxes could be separated by a line. --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ 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_enums.h Log Message: - formatting === RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_enums.h,v retrieving revision 1.34 retrieving revision 1.35 diff -u -3 -r1.34 -r1.35 --- ewl_enums.h 3 Feb 2006 06:00:12 - 1.34 +++ ewl_enums.h 15 Feb 2006 15:14:01 - 1.35 @@ -21,8 +21,8 @@ EWL_CALLBACK_UNREALIZE, /**< When a widget is no longer drawn */ EWL_CALLBACK_SHOW, /**< A widget has been marked visible */ EWL_CALLBACK_HIDE, /**< A widget is marked hidden */ -EWL_CALLBACK_OBSCURE, /**< Widget is offscreen */ -EWL_CALLBACK_REVEAL, /**< Widget returned to screen */ + EWL_CALLBACK_OBSCURE, /**< Widget is offscreen */ + EWL_CALLBACK_REVEAL, /**< Widget returned to screen */ EWL_CALLBACK_DESTROY, /**< The widget is freed */ EWL_CALLBACK_DELETE_WINDOW, /**< The window is being closed */ EWL_CALLBACK_CONFIGURE, /**< The object is being resized */ --- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
Etk.h Makefile.am etk_dnd.c etk_dnd.h etk_widget.c
etk_widget.h
Added Files:
etk_drag.c etk_drag.h
Log Message:
- move Etk_Drag code to its own files
- implement several drag / widget helpers
- reflect changes in dnd test
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/Etk.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- Etk.h 13 Feb 2006 00:00:01 - 1.21
+++ Etk.h 15 Feb 2006 15:03:17 - 1.22
@@ -65,5 +65,6 @@
#include "etk_dnd.h"
#include "etk_clipboard.h"
#include "etk_selection.h"
+#include "etk_drag.h"
#endif
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/Makefile.am,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- Makefile.am 13 Feb 2006 00:00:01 - 1.25
+++ Makefile.am 15 Feb 2006 15:03:17 - 1.26
@@ -45,7 +45,8 @@
etk_spin_button.h \
etk_dnd.h \
etk_clipboard.h \
-etk_selection.h
+etk_selection.h \
+etk_drag.h
libetk_la_SOURCES = \
etk_main.c etk_utils.c \
@@ -78,6 +79,7 @@
etk_dnd.c \
etk_clipboard.c \
etk_selection.c \
+etk_drag.c \
$(ETKHEADERS)
installed_headersdir = $(prefix)/include/etk
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_dnd.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- etk_dnd.c 15 Feb 2006 03:13:54 - 1.8
+++ etk_dnd.c 15 Feb 2006 15:03:17 - 1.9
@@ -36,8 +36,8 @@
#define ETK_DND_INSIDE(x, y, xx, yy, ww, hh) (((x) < ((xx) + (ww))) && ((y) <
((yy) + (hh))) && ((x) >= (xx)) && ((y) >= (yy)))
extern Etk_Widget *_etk_selection_widget;
+extern Etk_Widget *_etk_drag_widget;
-static Etk_Drag*_etk_drag_widget= NULL;
static char **_etk_dnd_types = NULL;
static int _etk_dnd_types_num = 0;
static Etk_Widget *_etk_dnd_widget = NULL;
@@ -78,7 +78,6 @@
_etk_dnd_handlers = evas_list_append(_etk_dnd_handlers,
ecore_event_handler_add(ECORE_X_EVENT_SELECTION_NOTIFY,
_etk_xdnd_selection_handler, NULL));
_etk_dnd_handlers = evas_list_append(_etk_dnd_handlers,
ecore_event_handler_add(ECORE_X_EVENT_XDND_STATUS, _etk_xdnd_status_handler,
NULL));
_etk_dnd_handlers = evas_list_append(_etk_dnd_handlers,
ecore_event_handler_add(ECORE_X_EVENT_XDND_FINISHED,
_etk_xdnd_finished_handler, NULL));
-
#endif
return ETK_TRUE;
@@ -98,123 +97,6 @@
#endif
}
-/
- * TEMPORARY CODE BEGIN *
- /
-
-static Ecore_Event_Handler *_etk_drag_mouse_move_handler;
-static Ecore_Event_Handler *_etk_drag_mouse_up_handler;
-
-static void _etk_drag_constructor(Etk_Drag *drag);
-
-static int _etk_drag_mouse_up_cb(void *data, int type, void *event);
-static int _etk_drag_mouse_move_cb(void *data, int type, void *event);
-
-/**
- * @brief Gets the type of an Etk_Drag
- * @return Returns the type on an Etk_Drag
- */
-Etk_Type *etk_drag_type_get()
-{
- static Etk_Type *drag_type = NULL;
-
- if(!drag_type)
- {
- drag_type = etk_type_new("Etk_Drag", ETK_WINDOW_TYPE, sizeof(Etk_Drag),
ETK_CONSTRUCTOR(_etk_drag_constructor), NULL);
- }
-
- return drag_type;
-}
-
-
-/**
- * @brief Create a new drag widget
- * @return Returns the new drag widget
- */
-Etk_Widget *etk_drag_new()
-{
- return etk_widget_new(ETK_DRAG_TYPE, NULL);
-}
-
-void etk_drag_types_set(Etk_Drag *drag, const char **types, unsigned int
num_types)
-{
- int i;
-
- drag->types = malloc(num_types * sizeof(char *));
-
- for (i = 0; i < num_types; i++)
- drag->types[i] = strdup(types[i]);
-
- drag->num_types = num_types;
-}
-
-void etk_drag_data_set(Etk_Drag *drag, void *data, int size)
-{
- drag->data = data;
- drag->data_size = size;
-}
-
-void etk_drag_begin(Etk_Drag *drag)
-{
- _etk_drag_widget = drag;
-
- etk_widget_show_all(ETK_WIDGET(drag));
- ecore_evas_ignore_events_set((ETK_WINDOW(drag))->ecore_evas, 1);
- ecore_x_dnd_types_set((ETK_WINDOW(drag))->x_window, drag->types,
drag->num_types);
- ecore_x_dnd_begin((ETK_WINDOW(drag))->x_window, drag->data,
drag->data_size);
- _etk_drag_mouse_move_handler =
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_MOVE, _etk_drag_mouse_move_cb,
drag);
- _etk_drag_mouse_up_handler =
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_BUTTON_UP, _etk_drag_mouse_up_cb,
drag);
-}
-
-static int _etk_drag_mouse_up_cb(void *data, int type, void *event)
-{
- Etk_Drag *drag;
-
- drag = data;
- etk_widget_hide_all(ETK_WIDGET(drag));
- ecore_event_handler_del(_etk_drag_mouse_move_handler);
- ecore_event_handler_del(_etk_drag_mouse_up_handler);
-
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_xdnd_test.c
Log Message:
- move Etk_Drag code to its own files
- implement several drag / widget helpers
- reflect changes in dnd test
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/bin/etk_xdnd_test.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- etk_xdnd_test.c 15 Feb 2006 03:13:54 - 1.9
+++ etk_xdnd_test.c 15 Feb 2006 15:03:15 - 1.10
@@ -3,9 +3,6 @@
#include
#include "config.h"
-static Etk_Widget *drag;
-static int start = 1;
-
static void _etk_test_xdnd_drag_drop_cb(Etk_Object *object, void *event, void
*data);
static void _etk_test_xdnd_drag_motion_cb(Etk_Object *object, void *data);
static void _etk_test_xdnd_drag_leave_cb(Etk_Object *object, void *data);
@@ -17,8 +14,6 @@
static void _etk_test_xdnd_selection_text_request_cb(Etk_Object *object, void
*event, void *data);
static void _etk_test_xdnd_button_selection_set_cb(Etk_Object *object, void
*data);
static void _etk_test_xdnd_button_selection_get_cb(Etk_Object *object, void
*data);
-static void _etk_test_xdnd_mouse_move_cb(Etk_Object *object, void *event, void
*data);
-static void _etk_test_xdnd_drag_end_cb(Etk_Object *object, void *data);
/* Creates the window for the xdnd test */
void etk_test_xdnd_window_create(void *data)
@@ -103,11 +98,9 @@
etk_box_pack_start(ETK_BOX(vbox2), sep, ETK_FALSE, ETK_FALSE, 0);
button = etk_button_new_with_label(_("Drag Me!"));
- etk_signal_connect("mouse_move", ETK_OBJECT(button),
ETK_CALLBACK(_etk_test_xdnd_mouse_move_cb), NULL);
- drag = etk_drag_new();
- etk_signal_connect("drag_end", ETK_OBJECT(drag),
ETK_CALLBACK(_etk_test_xdnd_drag_end_cb), NULL);
- label = etk_label_new(_("Dragged Text!"));
- etk_container_add(ETK_CONTAINER(drag), etk_button_new_with_label("Foo!"));
+ etk_widget_dnd_source_set(button, ETK_TRUE);
+ etk_widget_dnd_drag_widget_set(button, etk_button_new_with_label("This is a
test!"));
+ etk_widget_dnd_drag_data_set(button, dnd_types, dnd_types_num, "This is the
drag data!", strlen("This is the drag data!") + 1);
etk_box_pack_start(ETK_BOX(vbox2), button, ETK_FALSE, ETK_FALSE, 0);
@@ -289,33 +282,3 @@
if(text)
etk_selection_text_set(ETK_WIDGET(data), text, strlen(text) + 1);
}
-
-static void _etk_test_xdnd_mouse_move_cb(Etk_Object *object, void *event, void
*data)
-{
- Etk_Event_Mouse_Move *ev;
-
- ev = event;
-
- if(ev->buttons & 0x001 && start)
- {
- const char **types;
- unsigned int num_types;
- char *data;
-
- start = 0;
- types = calloc(1, sizeof(char*));
- num_types = 1;
- types[0] = strdup("text/plain");
- data = strdup("This is the drag data!");
-
- etk_drag_types_set(ETK_DRAG(drag), types, num_types);
- etk_drag_data_set(ETK_DRAG(drag), data, strlen(data) + 1);
- etk_drag_begin(ETK_DRAG(drag));
- }
-}
-
-static void _etk_test_xdnd_drag_end_cb(Etk_Object *object, void *data)
-{
- start = 1;
-}
-
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e stffrdhrn
Enlightenment CVS committal
Author : stffrdhrn
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fileman_smart.c e_fileman_mime.c
Log Message:
Some fileman work:
* Free a list which had a FIXME note, looks like no need to free data
* Fix a bug when right clicking on directories (do a NULL check)
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_smart.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -3 -r1.130 -r1.131
--- e_fileman_smart.c 14 Feb 2006 19:39:39 - 1.130
+++ e_fileman_smart.c 15 Feb 2006 14:18:06 - 1.131
@@ -2257,7 +2257,6 @@
E_Fm_Icon *icon;
Evas_Event_Mouse_Up *ev;
Evas_List *l;
- Evas_List *mimes = NULL;
ev = event_info;
icon = data;
@@ -2314,8 +2313,21 @@
/* the xdnd_drop will handle this case */
if(icon->sd->drag.doing)
break;
- /* FIXME if it isnt null free the list */
- icon->sd->operation.files = NULL;
+
+ /* Free file list before recreating */
+ while (icon->sd->operation.files)
+ {
+E_Fm_File *file;
+
+file = icon->sd->operation.files->data;
+icon->sd->operation.files = evas_list_remove_list(
+ icon->sd->operation.files, icon->sd->operation.files);
+/*
+ * FIXME: should this be freed, it looks like we just need to free
the list here?
+ * e_object_del(E_OBJECT(file));
+*/
+ }
+
/* set the operation files equal to the selected icons */
for(l = icon->sd->selection.icons; l; l = l->next)
{
===
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_fileman_mime.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_fileman_mime.c14 Feb 2006 19:39:39 - 1.3
+++ e_fileman_mime.c15 Feb 2006 14:18:06 - 1.4
@@ -264,9 +264,12 @@
E_Fm_Mime_Entry *entry;
Evas_List *l;
+ if (files == NULL)
+ return NULL;
+
file = (E_Fm_Mime_Entry *)files->data;
entry = file->mime;
- for(l = files->next; l; l = l->next)
+ for (l = files->next; l; l = l->next)
{
E_Fm_Mime_Entry *eme;
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_tree.c
Log Message:
- free at the end.
===
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_tree.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- etk_tree.c 14 Feb 2006 18:39:05 - 1.32
+++ etk_tree.c 15 Feb 2006 12:48:39 - 1.33
@@ -770,13 +770,14 @@
break;
}
}
- _etk_tree_row_free(row);
if (!row->tree->frozen)
{
etk_signal_emit_by_name("scroll_size_changed",
ETK_OBJECT(row->tree->grid), NULL);
etk_widget_redraw_queue(ETK_WIDGET(row->tree->grid));
}
+
+ _etk_tree_row_free(row);
}
/**
---
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
