E CVS: apps/e dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_startup.c Log Message: - this was causing e to segv under valgrind. I'm assuming full_path is the correct thing to thumb (and it seems to work) but c was never set to anything, so it was wrong. === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_startup.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_int_config_startup.c 5 Jun 2006 12:09:21 - 1.6 +++ e_int_config_startup.c 6 Jun 2006 03:39:42 - 1.7 @@ -133,7 +133,6 @@ int i = 0; int selnum = -1; const char *s; - char *c; char *homedir; if (!il) return; @@ -147,7 +146,6 @@ im = e_widget_preview_add(cfd->dia->win->evas, 320, (320 * e_zone_current_get(cfd->dia->win->container)->h) / e_zone_current_get(cfd->dia->win->container)->w); - /* Load inits */ init_dirs = e_path_dir_list_get(path_init); @@ -198,7 +196,7 @@ if (ecore_file_is_dir(full_path)) continue; if (!e_util_edje_collection_exists(full_path, "init/splash")) continue; -if (!e_thumb_exists(c)) +if (!e_thumb_exists(full_path)) ic = e_thumb_generate_begin(full_path, 48, 48, cfd->dia->win->evas, &ic, NULL, NULL); else ic = e_thumb_evas_object_get(full_path, cfd->dia->win->evas, 48, 48, 1); @@ -224,7 +222,6 @@ } evas_list_free(init); if (init_dirs) e_path_dir_list_free(init_dirs); - free(c); cfd->data = im; e_widget_ilist_go(il); if (selnum >= 0) ___ 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 Modified Files: AUTHORS Log Message: Just updating my email address. === RCS file: /cvs/e/e17/apps/e/AUTHORS,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- AUTHORS 30 Apr 2006 11:54:04 - 1.23 +++ AUTHORS 3 Jun 2006 21:42:11 - 1.24 @@ -7,7 +7,7 @@ Tilman Sauerbeck <[EMAIL PROTECTED]> Aleksej Struk <[EMAIL PROTECTED]> Brian Mattern <[EMAIL PROTECTED]> -Christopher Michael <[EMAIL PROTECTED]> +Christopher Michael <[EMAIL PROTECTED]> Viktor Kojouharov <[EMAIL PROTECTED]> ilLogict <[EMAIL PROTECTED]> Stafford Horne <[EMAIL PROTECTED]> ___ 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:
x.c
Log Message:
Cleanups.
===
RCS file: /cvs/e/e16/e/src/x.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -3 -r1.145 -r1.146
--- x.c 3 Jun 2006 14:11:34 - 1.145
+++ x.c 4 Jun 2006 12:57:30 - 1.146
@@ -1075,13 +1075,13 @@
#define DEBUG_SHAPE_OPS 0
#define DEBUG_SHAPE_PROPAGATE 0
-#if DEBUG_SHAPE_OPS
+#if DEBUG_SHAPE_OPS || DEBUG_SHAPE_PROPAGATE
static void
-EShapeShow(const char *txt, XRectangle * pr, int nr)
+EShapeShow(const char *txt, Window xwin, XRectangle * pr, int nr)
{
int i;
- Eprintf("%s nr=%d\n", txt, nr);
+ Eprintf("%s %#lx nr=%d\n", txt, xwin, nr);
for (i = 0; i < nr; i++)
Eprintf(" %d - %4d,%4d %4dx%4d\n", i,
pr[i].x, pr[i].y, pr[i].width, pr[i].height);
@@ -1089,7 +1089,7 @@
#endif
static void
-ExShapeUpdate(EXID * xid)
+EShapeUpdate(EXID * xid)
{
if (xid->rects)
{
@@ -1117,7 +1117,7 @@
}
else if (xid->num_rect > 4096)
{
-Eprintf("*** ExShapeUpdate: nrect=%d - Not likely, ignoring.\n",
+Eprintf("*** EShapeUpdate: nrect=%d - Not likely, ignoring.\n",
xid->num_rect);
XShapeCombineMask(disp, xid->xwin, ShapeBounding, 0, 0, None,
ShapeSet);
@@ -1131,7 +1131,7 @@
xid->num_rect = -1;
}
#if DEBUG_SHAPE_OPS
- EShapeShow("ExShapeUpdate", xid->rects, xid->num_rect);
+ EShapeShow("EShapeUpdate", xid->xwin, xid->rects, xid->num_rect);
#endif
}
@@ -1159,7 +1159,7 @@
if (pmap)
{
XShapeCombineMask(disp, xid->xwin, dest, x, y, pmap, op);
- ExShapeUpdate(xid);
+ EShapeUpdate(xid);
}
else if (wasshaped)
XShapeCombineMask(disp, xid->xwin, dest, x, y, pmap, op);
@@ -1223,15 +1223,7 @@
XShapeCombineRectangles(disp, xid->xwin, ShapeBounding, 0, 0, &r,
1, ShapeIntersect, Unsorted);
}
- ExShapeUpdate(xid);
-}
-
-static void
-ExShapeCombineShape(EXID * xdst, int dest, int x, int y,
- EXID * xsrc, int src_kind, int op)
-{
- XShapeCombineShape(disp, xdst->xwin, dest, x, y, xsrc->xwin, src_kind, op);
- ExShapeUpdate(xdst);
+ EShapeUpdate(xid);
}
XRectangle *
@@ -1293,7 +1285,7 @@
return 0;
if (xsrc->attached)
- ExShapeUpdate(xsrc);
+ EShapeUpdate(xsrc);
rn = xsrc->num_rect;
rl = xsrc->rects;
@@ -1301,8 +1293,8 @@
if (rn < 0)
{
/* Source has empty shape */
- ExShapeCombineShape(xdst, ShapeBounding, 0, 0,
- xsrc, ShapeBounding, ShapeSet);
+ EShapeCombineShape(xdst, ShapeBounding, 0, 0,
+ xsrc, ShapeBounding, ShapeSet);
}
else if (rn == 0)
{
@@ -1319,14 +1311,14 @@
}
else
{
-ExShapeCombineShape(xdst, ShapeBounding, 0, 0,
-xsrc, ShapeBounding, ShapeSet);
+EShapeCombineShape(xdst, ShapeBounding, 0, 0,
+ xsrc, ShapeBounding, ShapeSet);
}
}
else
{
- ExShapeCombineShape(xdst, ShapeBounding, 0, 0,
- xsrc, ShapeBounding, ShapeSet);
+ EShapeCombineShape(xdst, ShapeBounding, 0, 0,
+ xsrc, ShapeBounding, ShapeSet);
}
return rn != 0;
@@ -1410,10 +1402,7 @@
}
#if DEBUG_SHAPE_PROPAGATE
- Eprintf("EShapePropagate %#lx nr=%d\n", win, num_rects);
- for (i = 0; i < num_rects; i++)
- Eprintf("%3d %4d,%4d %4dx%4d\n", i, rects[i].x, rects[i].y,
- rects[i].width, rects[i].height);
+ EShapeShow("EShapePropagate", win->xwin, rects, num_rects);
#endif
/* set the rects as the shape mask */
@@ -1443,7 +1432,7 @@
return;
XShapeCombineShape(disp, win->xwin, dest, x, y, src_win->xwin, src_kind,
op);
- ExShapeUpdate(xid);
+ EShapeUpdate(xid);
}
int
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_utils titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/src/bin/eapp_edit
Modified Files:
eapp_edit_main.c
Log Message:
Redo the layout/look of eapp_edit. It looks very nice now.
===
RCS file: /cvs/e/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- eapp_edit_main.c25 May 2006 17:50:34 - 1.44
+++ eapp_edit_main.c5 Jun 2006 05:21:09 - 1.45
@@ -14,7 +14,7 @@
static void eapp_usage(void);
static int eapp_ui_init(char *file, char *lang, char *winclass);
-static int eapp_populate(Ewl_Tree *tree, char *file, char *lang, char
*winclass);
+static int eapp_populate(Ewl_Widget *vbox, char *file, char *lang, char
*winclass);
static char *eapp_eet_read(Eet_File *ef, char *key, char *lang);
static void eapp_eet_write(Eet_File *ef, char *key, char *lang, char *val, int
size);
static void eapp_engrave_write(char *file);
@@ -34,17 +34,17 @@
};
static Eapp_Item keys[] = {
-{"app/info/name", "App Name", 0},
-{"app/info/generic", "Generic Info", 0},
-{"app/info/comment", "Comment", 0},
-{"app/info/exe", "Executable", 0},
-{"app/window/name", "Window Name", 0},
-{"app/window/title", "Window Title", 0},
-{"app/window/role", "Window Role", 0},
-{"app/window/class", "Window Class", 0},
-{"app/icon/class", "Icon Class", 0},
+{"app/info/name", "App Name", 0},
+ {"app/info/exe","Executable", 0},
+{"app/info/generic","Generic Info", 0},
+{"app/info/comment","Comment", 0},
+ {"app/icon/class", "Icon Class", 0},
+{"app/window/name", "Window Name", 0},
+{"app/window/class","Window Class", 0},
+{"app/window/title","Window Title", 0},
+{"app/window/role", "Window Role", 0},
{"app/info/startup_notify", "Startup Notify", 1},
-{"app/info/wait_exit", "Wait Exit", 1}
+{"app/info/wait_exit", "Wait Exit", 1}
};
int
@@ -157,33 +157,25 @@
static int
eapp_ui_init(char *file, char *lang, char *winclass)
{
-Ewl_Widget *win, *vbox, *hbox, *tree, *o;
+Ewl_Widget *win, *vbox, *hbox, *o;
char tmp[PATH_MAX];
-const char *headers[] = { "Property Name", "Value" };
-
+
snprintf(tmp, PATH_MAX, "%s/data/e_utils_eapp_edit/default.edj",
PACKAGE_DATA_DIR);
win = ewl_window_new();
ewl_window_title_set(EWL_WINDOW(win), "Eapp Editor");
ewl_window_class_set(EWL_WINDOW(win), "Eapp Editor");
ewl_window_name_set(EWL_WINDOW(win), "Eapp_Editor");
-ewl_object_size_request(EWL_OBJECT(win), 300, 450);
+ewl_object_size_request(EWL_OBJECT(win), 445, 315);
ewl_callback_append(win, EWL_CALLBACK_DELETE_WINDOW, eapp_cb_quit, NULL);
ewl_widget_show(win);
vbox = ewl_vbox_new();
ewl_container_child_append(EWL_CONTAINER(win), vbox);
+ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_ALL);
ewl_widget_show(vbox);
-tree = ewl_tree_new(TREE_COLS);
-ewl_container_child_append(EWL_CONTAINER(vbox), tree);
-ewl_tree_headers_set(EWL_TREE(tree), (char **)headers);
-//ewl_tree_headers_visible_set(EWL_TREE(tree), FALSE);
-ewl_theme_data_str_set(tree, "/cell/file", tmp);
-ewl_theme_data_str_set(tree, "/cell/group", "moocow");
-ewl_widget_show(tree);
-
-if (!eapp_populate(EWL_TREE(tree), file, lang, winclass))
+if (!eapp_populate(EWL_WIDGET(vbox), file, lang, winclass))
{
fprintf(stderr, "Error getting eap info.\n");
return 0;
@@ -218,12 +210,13 @@
}
static int
-eapp_populate(Ewl_Tree *tree, char *file, char *lang, char *winclass)
+eapp_populate(Ewl_Widget *vbox, char *file, char *lang, char *winclass)
{
-Ewl_Widget *row[TREE_COLS];
+Ewl_Widget *hbox, *icon_border, *icon, *basic, *o, *hsep, *label, *entry,
*general,
+ *icon_theme, *window, *misc, *checkbutton;
Eet_File *ef = NULL;
char *v;
-int i;
+int i = 0;
if (ecore_file_exists(file))
{
@@ -235,59 +228,210 @@
}
}
-row[0] = ewl_label_new();
-ewl_label_text_set(EWL_LABEL(row[0]), "Set Icon");
-ewl_object_alignment_set(EWL_OBJECT(row[0]), EWL_FLAG_ALIGN_LEFT);
-ewl_object_fill_policy_set(EWL_OBJECT(row[0]), EWL_FLAG_FILL_NONE);
-ewl_widget_show(row[0]);
+hbox = ewl_hbox_new();
+ewl_container_child_append(EWL_CONTAINER(vbox), hbox);
+ewl_widget_show(hbox);
+
+icon_border = ewl_border_new();
+ewl_border_text_set(EWL_BORDER(icon_border), "Icon");
+ewl_border_label_alignment_set(EWL_BORDER(icon_border),
EWL_FLAG_ALIGN_LEFT);
+ewl_c
E CVS: libs/ewl dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_window.c Log Message: - fix doxy warnings === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_window.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -3 -r1.50 -r1.51 --- ewl_window.c5 Jun 2006 07:28:42 - 1.50 +++ ewl_window.c5 Jun 2006 20:12:21 - 1.51 @@ -284,7 +284,7 @@ /** * @param win: the window - * @param override: TRUE or FALSE to indicate dialog state. + * @param dialog: TRUE or FALSE to indicate dialog state. * @return Returns no value. * @brief Changes the dialog state on the specified window. * @@ -372,7 +372,7 @@ } /** - * @params win: The window to work with + * @param win: The window to work with * @return Returns TRUE if the window is fullscreen, FALSE otherwise * @brief Retrieve the fullscreen setting for the window */ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_utils titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/eapp_edit Modified Files: eapp_edit_main.c Log Message: Lets make sure the checkbox stuff reads existing eaps correctly. === RCS file: /cvs/e/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -3 -r1.49 -r1.50 --- eapp_edit_main.c5 Jun 2006 06:49:43 - 1.49 +++ eapp_edit_main.c5 Jun 2006 06:58:46 - 1.50 @@ -318,10 +318,11 @@ checkbutton = ewl_checkbutton_new(); ewl_button_label_set(EWL_BUTTON(checkbutton), misc_keys[i].name); -ewl_object_alignment_set(EWL_OBJECT(checkbutton), EWL_FLAG_ALIGN_LEFT); + ewl_object_alignment_set(EWL_OBJECT(checkbutton), EWL_FLAG_ALIGN_LEFT); ewl_container_child_append(EWL_CONTAINER(misc), checkbutton); ewl_widget_name_set(checkbutton, misc_keys[i].key); ewl_widget_show(checkbutton); + ewl_checkbutton_checked_set(EWL_CHECKBUTTON(checkbutton), v[0] == 1); } if (v) free(v); ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_utils dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/src/bin/eapp_edit
Modified Files:
eapp_edit_main.c
Log Message:
- cleanup
===
RCS file: /cvs/e/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- eapp_edit_main.c5 Jun 2006 18:32:47 - 1.54
+++ eapp_edit_main.c5 Jun 2006 18:42:44 - 1.55
@@ -31,7 +31,7 @@
static void eapp_cb_fd_show(Ewl_Widget *w, void *ev, void *data);
static void eapp_cb_fd_hide(Ewl_Widget *w, void *ev, void *data);
static void eapp_cb_fd_changed(Ewl_Widget *w, void *ev, void *data);
-static void eapp_create_content(Eet_File *ef, char *key, char *name,
+static void eapp_create_content(Eet_File *ef, Eapp_Item *item,
char *lang, char *winclass,
Ewl_Widget *parent);
Ewl_Widget *eapp_border_get(Ewl_Widget *parent, char *title, int left_align);
@@ -231,7 +231,7 @@
{
Ewl_Widget *hbox, *icon_border, *icon, *basic, *o;
Ewl_Widget *hsep, *general;
-Ewl_Widget *icon_theme, *window, *misc, *checkbutton;
+Ewl_Widget *icon_theme, *window, *misc;
Eet_File *ef = NULL;
char *v;
int i;
@@ -290,37 +290,20 @@
misc = eapp_border_get(hbox, "Misc", 0);
for (i = 0; basic_keys[i].key; i++)
-eapp_create_content(ef, basic_keys[i].key, basic_keys[i].name,
-lang, winclass, basic);
+eapp_create_content(ef, &(basic_keys[i]), lang, winclass, basic);
for (i = 0; general_keys[i].key; i++)
-eapp_create_content(ef, general_keys[i].key, general_keys[i].name,
-lang, winclass, general);
+eapp_create_content(ef, &(general_keys[i]), lang, winclass, general);
for (i = 0; icon_theme_keys[i].key; i++)
-eapp_create_content(ef, icon_theme_keys[i].key,
-icon_theme_keys[i].name, lang,
+eapp_create_content(ef, &(icon_theme_keys[i]), lang,
winclass, icon_theme);
for (i = 0; window_keys[i].key; i++)
- eapp_create_content(ef, window_keys[i].key, window_keys[i].name,
-lang, winclass, window);
+ eapp_create_content(ef, &(window_keys[i]), lang, winclass, window);
for (i = 0; misc_keys[i].key; i++)
-{
-v = eapp_eet_read(ef, misc_keys[i].key, lang);
-
-checkbutton = ewl_checkbutton_new();
-ewl_button_label_set(EWL_BUTTON(checkbutton), misc_keys[i].name);
-ewl_object_alignment_set(EWL_OBJECT(checkbutton), EWL_FLAG_ALIGN_LEFT);
-ewl_container_child_append(EWL_CONTAINER(misc), checkbutton);
-ewl_checkbutton_checked_set(EWL_CHECKBUTTON(checkbutton), v[0] == 1);
-ewl_widget_name_set(checkbutton, misc_keys[i].key);
-ewl_widget_show(checkbutton);
-
-if (v) free(v);
-v = NULL;
-}
+eapp_create_content(ef, &(misc_keys[i]), lang, winclass, misc);
if (ef) eet_close(ef);
@@ -349,38 +332,55 @@
static void
-eapp_create_content(Eet_File *ef, char *key, char *name, char *lang,
+eapp_create_content(Eet_File *ef, Eapp_Item *item, char *lang,
char *winclass, Ewl_Widget *parent)
{
Ewl_Widget *hbox, *label, *entry;
char *v;
-hbox = ewl_hbox_new();
-ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_ALL);
-ewl_container_child_append(EWL_CONTAINER(parent), hbox);
-ewl_widget_show(hbox);
+v = eapp_eet_read(ef, item->key, lang);
-v = eapp_eet_read(ef, key, lang);
+if (item->checkbox)
+{
+Ewl_Widget *checkbutton;
-if ((!strcmp(key, "app/window/class")) && (winclass))
-v = winclass;
+v = eapp_eet_read(ef, item->key, lang);
-label = ewl_label_new();
-ewl_label_text_set(EWL_LABEL(label), name);
-ewl_object_fill_policy_set(EWL_OBJECT(label), EWL_FLAG_FILL_NONE);
-ewl_object_alignment_set(EWL_OBJECT(label), EWL_FLAG_ALIGN_LEFT);
-ewl_container_child_append(EWL_CONTAINER(hbox), label);
-ewl_object_minimum_size_set(EWL_OBJECT(label), 75, 15);
-ewl_object_maximum_size_set(EWL_OBJECT(label), 75, 15);
-ewl_widget_show(label);
-
-entry = ewl_entry_new();
-ewl_text_text_set(EWL_TEXT(entry), v);
-ewl_object_maximum_size_set(EWL_OBJECT(entry), 9, 8);
-ewl_container_child_append(EWL_CONTAINER(hbox), entry);
-ewl_object_alignment_set(EWL_OBJECT(entry), EWL_FLAG_ALIGN_RIGHT);
-ewl_widget_name_set(entry, key);
-ewl_widget_show(entry);
+checkbutton = ewl_checkbutton_new();
+ewl_button_label_set(EWL_BUTTON(checkbutton), item->name);
+ewl_object_alignment_set(EWL_OBJECT(checkbutton), EWL_FLAG_ALIGN_LEFT);
+
E CVS: apps/e_utils titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/eapp_edit Modified Files: eapp_edit_main.c Log Message: Whoops. Lets make sure we can see the image when opening an existing eap. === RCS file: /cvs/e/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v retrieving revision 1.45 retrieving revision 1.46 diff -u -3 -r1.45 -r1.46 --- eapp_edit_main.c5 Jun 2006 05:21:09 - 1.45 +++ eapp_edit_main.c5 Jun 2006 05:35:04 - 1.46 @@ -245,7 +245,7 @@ ewl_widget_appearance_set(icon, "button"); ewl_image_file_set(EWL_IMAGE(icon), file, "icon"); ewl_image_proportional_set(EWL_IMAGE(icon), TRUE); -ewl_image_constrain_set(EWL_IMAGE(icon), 49); +ewl_image_size_set(EWL_IMAGE(icon), 49, 49); ewl_widget_name_set(icon, "icon"); ewl_container_child_append(EWL_CONTAINER(icon_border), icon); ewl_callback_append(icon, EWL_CALLBACK_CLICKED, eapp_cb_fd_show, NULL); ___ 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 ewl_window.c ewl_window.h
Log Message:
- put in fullscreen functions. Don't use them as they don't work right at
the moment.
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_enums.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- ewl_enums.h 25 May 2006 18:27:18 - 1.45
+++ ewl_enums.h 5 Jun 2006 04:12:30 - 1.46
@@ -256,7 +256,8 @@
EWL_WINDOW_USER_CONFIGURE = 0x2,/**< User configure */
EWL_WINDOW_GRAB_POINTER = 0x4, /**< Window grabs pointer */
EWL_WINDOW_GRAB_KEYBOARD = 0x8, /**< Window grabs keyboard */
- EWL_WINDOW_OVERRIDE = 0x10 /**< Window override setting */
+ EWL_WINDOW_OVERRIDE = 0x10, /**< Window override setting */
+ EWL_WINDOW_FULLSCREEN = 0x20/**< Window is fullscreen */
};
/**
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_window.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- ewl_window.c26 May 2006 19:01:56 - 1.45
+++ ewl_window.c5 Jun 2006 04:12:30 - 1.46
@@ -283,6 +283,54 @@
}
/**
+ * @param win: The window to work with
+ * @param fullscreen: The fullscreen setting to use
+ * @return Returns no value
+ * @brief Sets the fullscreen setting for the window
+ */
+void
+ewl_window_fullscreen_set(Ewl_Window *win, unsigned int fullscreen)
+{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR("win", win);
+ DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+
+ /* do nothing if already set */
+ if (fullscreen == ewl_window_fullscreen_get(win))
+ DRETURN(DLEVEL_STABLE);
+
+ if (fullscreen)
+ win->flags |= EWL_WINDOW_FULLSCREEN;
+ else
+ win->flags &= ~EWL_WINDOW_FULLSCREEN;
+
+#ifdef ENABLE_EWL_SOFTWARE_X11
+ if (REALIZED(win) && strstr(win->render, "x11")) {
+ ecore_x_netwm_state_request_send((Ecore_X_Window)win->window,
+ NULL, ECORE_X_WINDOW_STATE_FULLSCREEN,
+ ECORE_X_WINDOW_STATE_UNKNOWN, TRUE);
+ }
+#endif
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+/**
+ * @params win: The window to work with
+ * @return Returns TRUE if the window is fullscreen, FALSE otherwise
+ * @brief Retrieve the fullscreen setting for the window
+ */
+unsigned int
+ewl_window_fullscreen_get(Ewl_Window *win)
+{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR_RET("win", win, FALSE);
+ DCHECK_TYPE_RET("win", win, EWL_WINDOW_TYPE, FALSE);
+
+ DRETURN_INT((!!(win->flags & EWL_WINDOW_FULLSCREEN)), DLEVEL_STABLE);
+}
+
+/**
* @param win: the window to move
* @param x: the x coordinate of the new position
* @param y: the y coordinate of the new position
@@ -696,6 +744,14 @@
if (window->flags & EWL_WINDOW_BORDERLESS)
ecore_x_mwm_borderless_set(xwin, 1);
+
+ if (window->flags & EWL_WINDOW_FULLSCREEN)
+ {
+ Ecore_X_Window_State states[] =
+ {ECORE_X_WINDOW_STATE_FULLSCREEN};
+
+ ecore_x_netwm_window_state_set(xwin, states, 1);
+ }
width = ewl_object_maximum_w_get(EWL_OBJECT(window));
height = ewl_object_maximum_h_get(EWL_OBJECT(window));
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_window.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ewl_window.h12 Apr 2006 06:41:55 - 1.15
+++ ewl_window.h5 Jun 2006 04:12:30 - 1.16
@@ -66,6 +66,9 @@
voidewl_window_class_set(Ewl_Window *win, const char *classname);
char *ewl_window_class_get(Ewl_Window *win);
voidewl_window_borderless_set(Ewl_Window *win);
+voidewl_window_fullscreen_set(Ewl_Window *win,
+ unsigned int fullscreen);
+unsigned intewl_window_fullscreen_get(Ewl_Window *win);
voidewl_window_move(Ewl_Window *win, int x, int y);
voidewl_window_raise(Ewl_Window *win);
voidewl_window_lower(Ewl_Window *win);
@@ -76,8 +79,8 @@
int ewl_window_pointer_grab_get(Ewl_Window *win);
voidewl_window_override_set(Ewl_Window *win, int override);
int ewl_window_override_get(Ewl_Window *win);
-void ewl_window_dnd_aware_set(Ewl_Window *win);
-void ewl_window_selection_text_set(Ewl_Window *win, const char *txt);
+voidewl_window_dnd_aware_set(Ewl_Window *win);
+vo
E CVS: mbar devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mbar
Dir : e_modules/mbar
Modified Files:
e_mod_main.h e_mod_main.c Makefile.am
Added Files:
module.eap
Log Message:
Make mbar module work again :)
===
RCS file: /cvs/e/e_modules/mbar/e_mod_main.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_mod_main.h5 Apr 2006 17:48:49 - 1.4
+++ e_mod_main.h4 Jun 2006 12:59:16 - 1.5
@@ -108,7 +108,6 @@
EAPI void *e_modapi_init(E_Module *m);
EAPI int e_modapi_shutdown(E_Module *m);
EAPI int e_modapi_save(E_Module *m);
-EAPI int e_modapi_info(E_Module *m);
EAPI int e_modapi_about(E_Module *m);
EAPI int e_modapi_config(E_Module *m);
===
RCS file: /cvs/e/e_modules/mbar/e_mod_main.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_mod_main.c8 Apr 2006 00:12:30 - 1.20
+++ e_mod_main.c4 Jun 2006 12:59:16 - 1.21
@@ -138,7 +138,6 @@
/* actually init mbar */
mb = _mbar_new();
- m->config_menu = mb->config_menu;
return mb;
}
@@ -147,9 +146,6 @@
{
MBar *mb;
- if (m->config_menu)
- m->config_menu = NULL;
-
mb = m->data;
if (!mb)
return 1;
@@ -170,13 +166,6 @@
mb = m->data;
e_config_domain_save("module.mbar", conf_edd, mb->conf);
- return 1;
-}
-
-EAPI int
-e_modapi_info(E_Module *m)
-{
- m->icon_file = strdup(PACKAGE_DATA_DIR "/module_icon.png");
return 1;
}
===
RCS file: /cvs/e/e_modules/mbar/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 15 Mar 2006 00:26:18 - 1.1
+++ Makefile.am 4 Jun 2006 12:59:16 - 1.2
@@ -5,7 +5,8 @@
# data files for the module
filesdir = $(datadir)
files_DATA = \
-module_icon.png
+module_icon.png \
+module.eap
EXTRA_DIST = $(files_DATA)
___
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
Log Message:
Just strip the extension once in the beginning as we may use it in two places.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_background.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- e_int_config_background.c 4 Jun 2006 13:57:27 - 1.52
+++ e_int_config_background.c 5 Jun 2006 03:05:29 - 1.53
@@ -481,6 +481,7 @@
evas = e_win_evas_get(cfd->dia->win);
file = (char *)ecore_file_get_file((char *)path);
+ noext = ecore_file_strip_ext(file);
if (event == ECORE_FILE_EVENT_CREATED_FILE)
{
if (e_util_edje_collection_exists((char *)path, "desktop/background"))
@@ -489,14 +490,11 @@
ic = e_thumb_generate_begin((char *)path, 48, 48, evas, &ic,
NULL, NULL);
else
ic = e_thumb_evas_object_get((char *)path, evas, 48, 48, 1);
-e_widget_ilist_append(il, ic, ecore_file_strip_ext(file),
_ilist_cb_bg_selected, cfd, (char *)path);
+e_widget_ilist_append(il, ic, noext, _ilist_cb_bg_selected, cfd,
(char *)path);
}
}
else if (event == ECORE_FILE_EVENT_DELETED_FILE)
- {
- noext = ecore_file_strip_ext(file);
- e_widget_ilist_remove_label(il, noext);
- }
+ e_widget_ilist_remove_label(il, noext);
}
static int
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/epsilon codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : libs/epsilon Dir : e17/libs/epsilon/src/plugins Modified Files: Makefile.am Log Message: Modify include path so that plugins can find Epsilon.h === RCS file: /cvs/e/e17/libs/epsilon/src/plugins/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 3 Jun 2006 11:20:00 - 1.2 +++ Makefile.am 4 Jun 2006 22:13:57 - 1.3 @@ -2,7 +2,8 @@ AUTOMAKE_OPTIONS = 1.7 foreign LDFLAGS = -rdynamic -shared -INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src/include +INCLUDES = -I. -I$(top_srcdir) -I$(top_srcdir)/src/include \ + -I$(top_srcdir)/src/lib pkgdir = $(libdir)/epsilon/plugins/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_utils dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/src/bin/eapp_edit
Modified Files:
eapp_edit_main.c
Log Message:
- formatting and cleanups
===
RCS file: /cvs/e/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- eapp_edit_main.c5 Jun 2006 06:58:46 - 1.50
+++ eapp_edit_main.c5 Jun 2006 16:42:39 - 1.51
@@ -31,9 +31,10 @@
static void eapp_cb_fd_show(Ewl_Widget *w, void *ev, void *data);
static void eapp_cb_fd_hide(Ewl_Widget *w, void *ev, void *data);
static void eapp_cb_fd_changed(Ewl_Widget *w, void *ev, void *data);
-static void eapp_create_content(Eet_File *ef, char *key, char *name, char
*lang,
- char *winclass, Ewl_Widget
*parent);
-Ewl_Widget *eapp_border_get(Ewl_Widget *parent, char *title, char *align);
+static void eapp_create_content(Eet_File *ef, char *key, char *name,
+char *lang, char *winclass,
+Ewl_Widget *parent);
+Ewl_Widget *eapp_border_get(Ewl_Widget *parent, char *title, int left_align);
static Eapp_Item basic_keys[] = {
{"app/info/name", "App Name", 0},
@@ -268,7 +269,7 @@
ewl_callback_append(icon, EWL_CALLBACK_CLICKED, eapp_cb_fd_show, NULL);
ewl_widget_show(icon);
-basic = eapp_border_get(hbox, "Basic Info", "right");
+basic = eapp_border_get(hbox, "Basic Info", 0);
hsep = ewl_hseparator_new();
ewl_container_child_append(EWL_CONTAINER(vbox), hsep);
@@ -278,39 +279,32 @@
ewl_container_child_append(EWL_CONTAINER(vbox), hbox);
ewl_widget_show(hbox);
-general = eapp_border_get(hbox, "General", "left");
-
-icon_theme = eapp_border_get(hbox, "Icon Theme", "right");
+general = eapp_border_get(hbox, "General", 1);
+icon_theme = eapp_border_get(hbox, "Icon Theme", 0);
hbox = ewl_hbox_new();
ewl_container_child_append(EWL_CONTAINER(vbox), hbox);
ewl_widget_show(hbox);
-window = eapp_border_get(hbox, "Window", "left");
-
-misc = eapp_border_get(hbox, "Misc", "Right");
+window = eapp_border_get(hbox, "Window", 1);
+misc = eapp_border_get(hbox, "Misc", 0);
for (i = 0; basic_keys[i].key; i++)
-{
-eapp_create_content(ef, basic_keys[i].key, basic_keys[i].name, lang,
winclass, basic);
-}
+eapp_create_content(ef, basic_keys[i].key, basic_keys[i].name,
+lang, winclass, basic);
for (i = 0; general_keys[i].key; i++)
-{
-eapp_create_content(ef, general_keys[i].key, general_keys[i].name,
lang, winclass,
-
general);
-}
+eapp_create_content(ef, general_keys[i].key, general_keys[i].name,
+lang, winclass, general);
for (i = 0; icon_theme_keys[i].key; i++)
-{
- eapp_create_content(ef, icon_theme_keys[i].key,
icon_theme_keys[i].name, lang,
-
winclass, icon_theme);
-}
+eapp_create_content(ef, icon_theme_keys[i].key,
+icon_theme_keys[i].name, lang,
+winclass, icon_theme);
for (i = 0; window_keys[i].key; i++)
-{
- eapp_create_content(ef, window_keys[i].key, window_keys[i].name, lang,
winclass, window);
-}
+ eapp_create_content(ef, window_keys[i].key, window_keys[i].name,
+lang, winclass, window);
for (i = 0; misc_keys[i].key; i++)
{
@@ -318,11 +312,11 @@
checkbutton = ewl_checkbutton_new();
ewl_button_label_set(EWL_BUTTON(checkbutton), misc_keys[i].name);
- ewl_object_alignment_set(EWL_OBJECT(checkbutton), EWL_FLAG_ALIGN_LEFT);
+ewl_object_alignment_set(EWL_OBJECT(checkbutton), EWL_FLAG_ALIGN_LEFT);
ewl_container_child_append(EWL_CONTAINER(misc), checkbutton);
+ewl_checkbutton_checked_set(EWL_CHECKBUTTON(checkbutton), v[0] == 1);
ewl_widget_name_set(checkbutton, misc_keys[i].key);
ewl_widget_show(checkbutton);
- ewl_checkbutton_checked_set(EWL_CHECKBUTTON(checkbutton), v[0] == 1);
}
if (v) free(v);
@@ -334,7 +328,7 @@
}
Ewl_Widget *
-eapp_border_get(Ewl_Widget *parent, char *title, char *align)
+eapp_border_get(Ewl_Widget *parent, char *title, int left_align)
{
Ewl_Widget *border;
@@ -342,19 +336,21 @@
ewl_border_text_set(EWL_BORDER(border), title);
ewl_border_label_alignment_set(EWL_BORDER(border), EWL_FLAG_ALIGN_LEFT);
ewl_container_child_append(EWL_CONTAINER(parent), border);
-ewl_widget_show(border);
-if (strcmp
E CVS: apps/e sndev
Enlightenment CVS committal
Author : sndev
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_desklock.edc
Log Message:
* fixing desklock cfg dialog bug.
* removing comments.
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_desklock.edc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- default_desklock.edc19 Mar 2006 12:24:19 - 1.6
+++ default_desklock.edc5 Jun 2006 16:47:55 - 1.7
@@ -202,206 +202,3 @@
}
}
-/*group {
- name, "widgets/desklock/main";
- parts
- {
- part {
- name: "background_image";
- description {
- state: "default" 0.0;
- image {
-normal: "e17_brushed.png";
- }
- fill {
-size {
- relative: 0 0;
- offset: 400 300;
-}
- }
- }
- }
- part {
- name: "reflection_shadow_overlay";
- description {
- state: "default" 0.0;
- image {
-normal: "e17_"SM"reflection_shadow_overlay.png";
- }
- }
- }
- part
- {
-name: "logo";
-mouse_events: 0;
-description
- {
- state: "default" 0.0;
- min: 64 64;
- max: 64 64;
- //align: 0.5 0.0;
- rel1
- {
- relative: 0.45 0.5;
- offset: 0 0;
- }
- rel2
- {
- relative: 0.45 0.5;
- offset: 0 0;
- }
- image
- {
- normal: "e17_logo.png";
- }
- }
- }
- part
- {
-name: "label";
-type: TEXT;
-effect: SHADOW;
-description {
- state: "default" 0.0;
- color: 0 0 0 255;
- fixed: 0 1;
- align: 0.0 0.5;
- rel1
- {
-relative: 1.0 0.0;
-offset: 20 0;
-to: "logo";
- }
- rel2
- {
-relative: 1.0 0.3;
-offset: 0 0;
-to: "logo";
- }
-
- color: 0 0 0 255;
- color3: 255 255 255 128;
- text {
- text: "Please enter your unlock password";
- font: "Edje-Vera-Bold";
- size: 10;
- align: 0.0 0.5;
- min: 1 1;
- text_class: "desklock_title";
- }
-}
- }
- part
- {
-name: "passwd_entry_clip";
-type: RECT;
-mouse_events: 0;
-description
- {
- state: "default" 0.0;
- visible: 1;
- rel1
- {
- relative: 0.0 0.0;
- offset: 10 10;
- to: "passwd_border";
- }
- rel2
- {
- relative: 1.0 1.0;
- offset: -17 -10;
- to: "passwd_border";
- }
- }
- }
- part
- {
-name: "passwd";
-type: TEXT;
-effect: SHADOW;
-clip_to: "passwd_entry_clip";
-description {
- state: "default" 0.0;
- color: 0 0 0 255;
- fixed: 0 1;
- align: 0.0 0.5;
-
- rel1
- {
-relative: 0.0 0.0;
-offset: 0 0;
-to: "passwd_entry_clip";
- }
- rel2
- {
-relative: 0.0 1.0;
-offset: 0 0;
-to: "passwd_entry_clip";
- }
-
- color: 0 0 0 255;
- color3: 255 255 255 128;
- text {
- text: "";
- font: "Edje-Vera-Bold";
- size: 16;
- align: 0.0 0.5;
- min: 1 1;
- text_class: "desklock_passwd";
- }
-}
- }
- part
- {
-name: "cursor";
-mouse_events: 0;
-clip_to: "passwd_entry_clip";
-description {
- state: "default" 0.0;
- min: 16 16;
- max: 16 16;
- align: 0.0 0.5;
-
E CVS: bling xcomputerman
Enlightenment CVS committal Author : xcomputerman Project : e_modules Module : bling Dir : e_modules/bling Removed Files: .compmgr.c.swm .compmgr.c.swn .compmgr.c.swo .compmgr.c.swp .e_mod_main.c.swo .e_mod_main.c.swp .exrc .xcompmgr.c.swp Log Message: ick, swap files ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : apps/e Dir : e17/apps/e/src/lib Modified Files: e_main.c Log Message: - fix warning === RCS file: /cvs/e/e17/apps/e/src/lib/e_main.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -3 -r1.39 -r1.40 --- e_main.c10 Mar 2006 05:48:46 - 1.39 +++ e_main.c6 Jun 2006 03:52:52 - 1.40 @@ -636,4 +636,5 @@ free(e); } -#endif \ No newline at end of file +#endif + ___ 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/bin/tests
Modified Files:
Makefile.am ewl_widget.c
Added Files:
fullscreen.c
Log Message:
- put in fullscreen functions. Don't use them as they don't work right at
the moment.
===
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- Makefile.am 10 Apr 2006 04:43:17 - 1.27
+++ Makefile.am 5 Jun 2006 04:12:30 - 1.28
@@ -25,7 +25,7 @@
ewl_tree.la ewl_table.la ewl_notebook.la \
ewl_scrollpane.la ewl_spinner.la ewl_progressbar.la \
ewl_theme.la ewl_media.la ewl_menu.la ewl_imenu.la \
- ewl_widget.la
+ ewl_widget.la fullscreen.la
ewl_border_la_SOURCES = ewl_border.c
ewl_border_la_LIBADD= $(top_builddir)/src/lib/libewl.la
@@ -300,6 +300,13 @@
-L$(top_builddir)/src/lib/.libs
ewl_widget_la_DEPENDENCIES =
+fullscreen_la_SOURCES = fullscreen.c
+fullscreen_la_LIBADD= $(top_builddir)/src/lib/libewl.la
+fullscreen_la_LDFLAGS = -module -avoid-version \
+ -L$(top_builddir)/src/lib \
+ -L$(top_builddir)/src/lib/.libs
+fullscreen_la_DEPENDENCIES =
+
FILES = $(ewl_border_la_SOURCES) $(ewl_box_la_SOURCES) \
$(ewl_button_la_SOURCES) $(ewl_colordialog_la_SOURCES) \
$(ewl_datepicker_la_SOURCES) $(ewl_freebox_la_SOURCES) \
@@ -319,7 +326,7 @@
$(ewl_progressbar_la_SOURCES) $(ewl_theme_la_SOURCES) \
$(ewl_media_la_SOURCES) $(ewl_menu_la_SOURCES) \
$(ewl_imenu_la_SOURCES) $(ewl_widget_la_SOURCES) \
- $(ewl_image_thumbnail_la_SOURCES)
+ $(ewl_image_thumbnail_la_SOURCES) $(fullscreen_la_SOURCES)
EXTRA_DIST = $(FILES)
===
RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/ewl_widget.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_widget.c27 May 2006 23:39:55 - 1.4
+++ ewl_widget.c5 Jun 2006 04:12:30 - 1.5
@@ -8,6 +8,8 @@
static void ewl_widget_cb_toggle(Ewl_Widget *w, void *ev, void *data);
static void ewl_widget_cb_first_click(Ewl_Widget *w, void *ev, void *data);
static void ewl_widget_cb_second_click(Ewl_Widget *w, void *ev, void *data);
+static void ewl_widget_cb_toggle_fullscreen(Ewl_Widget *w, void *ev,
+ void *data);
static int appearance_test_set_get(char *buf, int len);
@@ -65,6 +67,17 @@
ewl_container_child_append(EWL_CONTAINER(b2), o);
ewl_widget_show(o);
+ b2 = ewl_hbox_new();
+ ewl_container_child_append(EWL_CONTAINER(vbox), b2);
+ ewl_widget_show(b2);
+
+ o = ewl_button_new();
+ ewl_button_label_set(EWL_BUTTON(o), "Change fullscreen setting");
+ ewl_callback_append(o, EWL_CALLBACK_CLICKED,
+ ewl_widget_cb_toggle_fullscreen, NULL);
+ ewl_container_child_append(EWL_CONTAINER(b2), o);
+ ewl_widget_show(o);
+
return 1;
}
@@ -99,6 +112,16 @@
ewl_widget_cb_second_click(Ewl_Widget *w, void *ev, void *data)
{
printf("second clicked\n");
+}
+
+static void
+ewl_widget_cb_toggle_fullscreen(Ewl_Widget *w, void *ev, void *data)
+{
+ Ewl_Embed *win;
+
+ win = ewl_embed_widget_find(w);
+ ewl_window_fullscreen_set(EWL_WINDOW(win),
+ !ewl_window_fullscreen_get(EWL_WINDOW(win)));
}
static int
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl quan74
Enlightenment CVS committal Author : quan74 Project : e17 Module : libs/ewl Dir : e17/libs/ewl Modified Files: ewl.spec.in Log Message: macro fix for release === RCS file: /cvs/e/e17/libs/ewl/ewl.spec.in,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- ewl.spec.in 26 May 2006 21:36:20 - 1.10 +++ ewl.spec.in 6 Jun 2006 03:05:18 - 1.11 @@ -3,7 +3,7 @@ Summary: Enlightenment Widget Library Name: @PACKAGE@ Version: @VERSION@ -Release: 0.$(date '+%Y%m%d') +Release: 0.%(date '+%Y%m%d') License: BSD Group: User Interface/X URL: http://www.enlightenment.org/pages/ewl.html ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: titan titan
Enlightenment CVS committal Author : titan Project : devs Module : titan Dir : devs/titan Modified Files: info.txt Log Message: Update my info. === RCS file: /cvs/e/devs/titan/info.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- info.txt4 Jun 2006 22:14:04 - 1.2 +++ info.txt5 Jun 2006 05:39:41 - 1.3 @@ -4,4 +4,4 @@ Location: Mississippi, USA E-Mail: [EMAIL PROTECTED] WWW: http://www.ecoding.org -Managing: ephoto, ewl theme. +Managing: ephoto, ewl patches & theme, e_util_eapp_edit work. ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl pfritz
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_window.c Log Message: oops, make it compile again === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_window.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -3 -r1.49 -r1.50 --- ewl_window.c5 Jun 2006 06:16:30 - 1.49 +++ ewl_window.c5 Jun 2006 07:28:42 - 1.50 @@ -316,8 +316,8 @@ ecore_x_netwm_window_type_set( (Ecore_X_Window)win->window, ECORE_X_WINDOW_TYPE_NORMAL); -#endif } +#endif DLEAVE_FUNCTION(DLEVEL_STABLE); } ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e sndev
Enlightenment CVS committal
Author : sndev
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_desklock.c
Log Message:
* fixing desklock cfg dialog bug.
* removing comments.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_desklock.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_int_config_desklock.c 1 Jun 2006 04:09:33 - 1.18
+++ e_int_config_desklock.c 5 Jun 2006 16:47:55 - 1.19
@@ -523,6 +523,7 @@
eebuf = ecore_evas_buffer_new(1, 1);
evasbuf = ecore_evas_get(eebuf);
+ ic = NULL;
/* Desklock background */
o = edje_object_add(evasbuf);
f1 = e_theme_edje_file_get("base/theme/desklock", "desklock/background");
@@ -535,19 +536,19 @@
ic = e_thumb_generate_begin(c, BG_LIST_ICON_SIZE_W,
BG_LIST_ICON_SIZE_H,
cfdata->evas, &ic, NULL, NULL);
else
- ic = e_thumb_evas_object_get(c, cfdata->evas, BG_LIST_ICON_SIZE_W,
BG_LIST_ICON_SIZE_H, 1);
-
-
+ ic = e_thumb_evas_object_get(c, cfdata->evas, BG_LIST_ICON_SIZE_W,
+ BG_LIST_ICON_SIZE_H, 1);
+
e_widget_ilist_append(cfdata->gui.bg_list, ic, _("Theme Desklock
Background"),
_ibg_list_cb_bg_selected, cfdata,
DEF_DESKLOCK_BACKGROUND);
}
- if ((!e_config->desklock_background) ||
+ if ((e_config->desklock_background) &&
(!strcmp(e_config->desklock_background, DEF_DESKLOCK_BACKGROUND)))
- e_widget_ilist_selected_set(cfdata->gui.bg_list, 0);
+ e_widget_ilist_selected_set(cfdata->gui.bg_list, 1);
im = e_widget_preview_add(cfdata->evas, BG_PREVIEW_W, BG_PREVIEW_H);
- e_widget_preview_edje_set(im, c, "desktop/background");
+ e_widget_preview_edje_set(im, c, "desklock/background");
evas_object_del(o);
ecore_evas_free(eebuf);
@@ -561,22 +562,25 @@
o = edje_object_add(evasbuf);
f = e_theme_edje_file_get("base/theme/backgrounds", "desktop/background");
c = strdup(f);
+ ic = NULL;
if (edje_object_file_set(o, f, "desktop/background"))
{
if (!e_thumb_exists(c))
ic = e_thumb_generate_begin(c, BG_LIST_ICON_SIZE_W,
BG_LIST_ICON_SIZE_H,
cfdata->evas, &ic, NULL, NULL);
else
- ic = e_thumb_evas_object_get(c, cfdata->evas, BG_LIST_ICON_SIZE_W,
BG_LIST_ICON_SIZE_H, 1);
+ ic = e_thumb_evas_object_get(c, cfdata->evas, BG_LIST_ICON_SIZE_W,
+ BG_LIST_ICON_SIZE_H, 1);
- e_widget_ilist_append(cfdata->gui.bg_list, ic, _("Theme Background"),
_ibg_list_cb_bg_selected,
- cfdata, DEF_THEME_BACKGROUND);
+ e_widget_ilist_append(cfdata->gui.bg_list, ic, _("Theme Background"),
+ _ibg_list_cb_bg_selected, cfdata,
DEF_THEME_BACKGROUND);
}
if ((e_config->desklock_background) &&
(!strcmp(e_config->desklock_background, DEF_THEME_BACKGROUND)))
{
- e_widget_ilist_selected_set(cfdata->gui.bg_list, 1);
+ e_widget_ilist_selected_set(cfdata->gui.bg_list, 2);
+ evas_object_del(im);
im = e_widget_preview_add(cfdata->evas, BG_PREVIEW_W, BG_PREVIEW_H);
e_widget_preview_edje_set(im, c, "desktop/background");
}
@@ -652,7 +656,7 @@
const char *theme;
theme = e_theme_edje_file_get("base/theme/desklock",
"desklock/background");
-e_widget_preview_edje_set(cfdata->preview_image, theme,
"desktop/background");
+e_widget_preview_edje_set(cfdata->preview_image, theme,
"desklock/background");
}
else if (!strcmp(cfdata->cur_bg, DEF_THEME_BACKGROUND))
{
@@ -669,7 +673,7 @@
const char *theme;
theme = e_theme_edje_file_get("base/theme/desklock",
"desklock/background");
- e_widget_preview_edje_set(cfdata->preview_image, theme,
"desktop/background");
+ e_widget_preview_edje_set(cfdata->preview_image, theme,
"desklock/background");
}
}
___
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/bin/tests Modified Files: .cvsignore Log Message: - simple .cvsignore file === RCS file: /cvs/e/e17/libs/ewl/src/bin/tests/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- .cvsignore 13 Apr 2006 06:40:31 - 1.21 +++ .cvsignore 6 Jun 2006 02:59:25 - 1.22 @@ -2,85 +2,5 @@ Makefile.in .libs .deps -ewl_border.la -ewl_border.lo -ewl_box.la -ewl_box.lo -ewl_button.la -ewl_button.lo -ewl_colordialog.la -ewl_colordialog.lo -ewl_datepicker.la -ewl_datepicker.lo -ewl_entry.la -ewl_entry.lo -ewl_freebox.la -ewl_freebox.lo -ewl_paned.la -ewl_paned.lo -ewl_text.la -ewl_text.lo -ewl_text_editor.la -ewl_text_editor.lo -ewl_calendar.la -ewl_calendar.lo -ewl_colorpicker.la -ewl_colorpicker.lo -ewl_combo.la -ewl_combo.lo -ewl_dialog.la -ewl_dialog.lo -ewl_filedialog.la -ewl_filedialog.lo -ewl_filepicker.la -ewl_filepicker.lo -ewl_fileselector.la -ewl_fileselector.lo -ewl_floater.la -ewl_floater.lo -ewl_icon.la -ewl_icon.lo -ewl_iconbox.la -ewl_iconbox.lo -ewl_image_thumbnail.la -ewl_image_thumbnail.lo -ewl_tooltip.lo -ewl_tooltip.la -ewl_scrollbar.la -ewl_scrollbar.lo -ewl_seeker.la -ewl_seeker.lo -ewl_statusbar.la -ewl_statusbar.lo -ewl_password.la -ewl_password.lo -ewl_menubar.la -ewl_menubar.lo -ewl_tree2.la -ewl_tree2.lo -ewl_image.la -ewl_image.lo -ewl_tree.lo -ewl_tree.la -ewl_table.la -ewl_table.lo -ewl_notebook.la -ewl_notebook.lo -ewl_scrollpane.la -ewl_scrollpane.lo -ewl_spinner.la -ewl_spinner.lo -ewl_progressbar.la -ewl_progressbar.lo -ewl_menu.lo -ewl_menu.la -ewl_theme.la -ewl_theme.lo -ewl_media.la -ewl_media.lo -ewl_imenu.la -ewl_imenu.lo -ewl_widget.la -ewl_widget.lo -ewl_image_thumbnail.la -ewl_image_thumbnail.lo +*.la +*.lo ___ 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/modules/ibar
Modified Files:
e_mod_config.c
Log Message:
Fix Add/Delete button positions.
Add code for disabling radio buttons if not showing labels.
===
RCS file: /cvs/e/e17/apps/e/src/modules/ibar/e_mod_config.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- e_mod_config.c 2 Jun 2006 19:09:08 - 1.24
+++ e_mod_config.c 4 Jun 2006 09:29:15 - 1.25
@@ -12,6 +12,9 @@
int eap_label;
Evas_Object *tlist;
+ Evas_Object *radio_name;
+ Evas_Object *radio_comment;
+ Evas_Object *radio_generic;
};
/* Protos */
@@ -24,6 +27,7 @@
static void _cb_entry_ok(char *text, void *data);
static void _cb_confirm_dialog_yes(void *data);
static void _load_tlist(E_Config_Dialog_Data *cfdata);
+static void _show_label_cb_change(void *data, Evas_Object *obj);
void
_config_ibar_module(Config_Item *ci)
@@ -87,31 +91,41 @@
o = e_widget_list_add(evas, 0, 0);
of = e_widget_frametable_add(evas, _("Selected Bar Source"), 0);
-
ol = e_widget_tlist_add(evas, &(cfdata->dir));
cfdata->tlist = ol;
_load_tlist(cfdata);
- e_widget_min_size_set(ol, 160, 160);
- e_widget_frametable_object_append(of, ol, 0, 0, 1, 2, 1, 0, 1, 0);
-
+ e_widget_min_size_set(ol, 140, 140);
+// e_widget_framelist_object_append(of, ol);
+
+ e_widget_frametable_object_append(of, ol, 0, 0, 1, 2, 1, 1, 1, 0);
+
+ ot = e_widget_table_add(evas, 0);
ob = e_widget_button_add(evas, _("Add"), "widget/add", _cb_add, cfdata,
NULL);
- e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 1, 1, 1, 0);
+ e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 1, 1, 0);
ob = e_widget_button_add(evas, _("Delete"), "widget/del", _cb_del, cfdata,
NULL);
- e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 0);
-
- e_widget_list_object_append(o, of, 1, 1, 0.5);
-
+ e_widget_table_object_append(ot, ob, 0, 1, 1, 1, 1, 1, 1, 0);
+ e_widget_frametable_object_append(of, ot, 1, 0, 1, 1, 1, 1, 1, 0);
+ e_widget_list_object_append(o, of, 1, 1, 0.5);
+
of = e_widget_framelist_add(evas, _("Icon Labels"), 0);
ob = e_widget_check_add(evas, _("Show Icon Label"), &(cfdata->show_label));
+ e_widget_on_change_hook_set(ob, _show_label_cb_change, cfdata);
e_widget_framelist_object_append(of, ob);
rg = e_widget_radio_group_new(&(cfdata->eap_label));
- ob = e_widget_radio_add(evas, _("Display Eap Name"), 0, rg);
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Display Eap Comment"), 1, rg);
- e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Display Eap Generic"), 2, rg);
- e_widget_framelist_object_append(of, ob);
+
+ cfdata->radio_name = e_widget_radio_add(evas, _("Display Eap Name"), 0, rg);
+ e_widget_framelist_object_append(of, cfdata->radio_name);
+ if (!cfdata->show_label) e_widget_disabled_set(cfdata->radio_name, 1);
+
+ cfdata->radio_comment = e_widget_radio_add(evas, _("Display Eap Comment"),
1, rg);
+ e_widget_framelist_object_append(of, cfdata->radio_comment);
+ if (!cfdata->show_label) e_widget_disabled_set(cfdata->radio_comment, 1);
+
+ cfdata->radio_generic = e_widget_radio_add(evas, _("Display Eap Generic"),
2, rg);
+ e_widget_framelist_object_append(of, cfdata->radio_generic);
+ if (!cfdata->show_label) e_widget_disabled_set(cfdata->radio_generic, 1);
+
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
@@ -240,4 +254,17 @@
e_widget_tlist_go(cfdata->tlist);
if (selnum >= 0)
e_widget_tlist_selected_set(cfdata->tlist, selnum);
+}
+
+static void
+_show_label_cb_change(void *data, Evas_Object *obj)
+{
+ E_Config_Dialog_Data *cfdata;
+
+ cfdata = data;
+ if (!cfdata) return;
+
+ e_widget_disabled_set(cfdata->radio_name, !cfdata->show_label);
+ e_widget_disabled_set(cfdata->radio_comment, !cfdata->show_label);
+ e_widget_disabled_set(cfdata->radio_generic, !cfdata->show_label);
}
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : libs/edje Dir : e17/libs/edje/src/lib Modified Files: edje_data.c Log Message: Patch from drexil to fix a leak in edje_data.c === RCS file: /cvs/e/e17/libs/edje/src/lib/edje_data.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- edje_data.c 19 Feb 2006 11:14:49 - 1.30 +++ edje_data.c 5 Jun 2006 13:11:08 - 1.31 @@ -36,6 +36,7 @@ FREED(_edje_edd_edje_file); FREED(_edje_edd_edje_style); FREED(_edje_edd_edje_style_tag); + FREED(_edje_edd_edje_color_class); FREED(_edje_edd_edje_data); FREED(_edje_edd_edje_font_directory); FREED(_edje_edd_edje_font_directory_entry); ___ 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
Log Message:
Only fetch homedir once, not every time we list a background as homedir
shouldn't change.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_background.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- e_int_config_background.c 31 May 2006 18:58:26 - 1.50
+++ e_int_config_background.c 4 Jun 2006 13:56:34 - 1.51
@@ -276,6 +276,7 @@
Evas_List *bg_dirs, *bg;
Ecore_Evas *eebuf;
Evas *evasbuf;
+ char *homedir;
const char *f;
char *c;
@@ -283,6 +284,8 @@
int i = 0;
if (!il) return;
+
+ homedir = e_user_homedir_get();
evas = evas_object_evas_get(il);
bg_obj = edje_object_add(cfd->dia->win->evas);
@@ -328,7 +331,6 @@
int detected;
char *bg_file;
Ecore_List *bgs;
- char *homedir;
d = bg->data;
if (!ecore_file_is_dir(d->dir)) continue;
@@ -336,7 +338,6 @@
if (!bgs) continue;
detected = 0;
- homedir = e_user_homedir_get();
if (homedir)
{
if (!strncmp(d->dir, homedir, strlen(homedir)))
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: bling xcomputerman
Enlightenment CVS committal Author : xcomputerman Project : e_modules Module : bling Dir : e_modules/bling Log Message: Chuck this stuff into CVS while it is still semi-usable. DO NOT USE THIS MODULE! Development only. Status: Vendor Tag: e Release Tags: start N e_modules/bling/compmgr.c N e_modules/bling/e_mod_main.h N e_modules/bling/aclocal.m4 N e_modules/bling/AUTHORS N e_modules/bling/autogen.sh N e_modules/bling/ChangeLog N e_modules/bling/config.h.in N e_modules/bling/config.sub N e_modules/bling/configure.in N e_modules/bling/COPYING N e_modules/bling/e_mod_config.c N e_modules/bling/e_mod_config.h N e_modules/bling/e_mod_main.c N e_modules/bling/compmgr.h N e_modules/bling/INSTALL N e_modules/bling/Makefile.am N e_modules/bling/module_icon.png N e_modules/bling/NEWS N e_modules/bling/README N e_modules/bling/TODO N e_modules/bling/.indent.pro N e_modules/bling/.compmgr.c.swp N e_modules/bling/module.eap N e_modules/bling/.TODO.swp N e_modules/bling/.compmgr.c.swo N e_modules/bling/.exrc N e_modules/bling/.e_mod_main.c.swp N e_modules/bling/.compmgr.c.swm N e_modules/bling/.compmgr.c.swn N e_modules/bling/.xcompmgr.c.swp N e_modules/bling/.e_mod_main.c.swo No conflicts created by this import ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl pfritz
Enlightenment CVS committal
Author : pfritz
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_window.c
Log Message:
fix warning
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_window.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- ewl_window.c5 Jun 2006 05:05:31 - 1.47
+++ ewl_window.c5 Jun 2006 05:16:20 - 1.48
@@ -363,7 +363,7 @@
#ifdef ENABLE_EWL_SOFTWARE_X11
if (REALIZED(win) && strstr(win->render, "x11")) {
ecore_x_netwm_state_request_send((Ecore_X_Window)win->window,
- NULL, ECORE_X_WINDOW_STATE_FULLSCREEN,
+ 0, ECORE_X_WINDOW_STATE_FULLSCREEN,
ECORE_X_WINDOW_STATE_UNKNOWN, TRUE);
}
#endif
___
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
Log Message:
And free homedir when done.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_background.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- e_int_config_background.c 4 Jun 2006 13:56:34 - 1.51
+++ e_int_config_background.c 4 Jun 2006 13:57:27 - 1.52
@@ -346,7 +346,6 @@
i++;
detected = 1;
}
-free(homedir);
}
if (!detected)
{
@@ -400,6 +399,8 @@
e_widget_ilist_go(il);
if (selnum >= 0)
e_widget_ilist_selected_set(il, selnum);
+
+ free(homedir);
}
void
___
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.c e_config.h e_ipc_handlers.h e_ipc_handlers_list.h
Log Message:
Added Font Hinting and Init Screen (get/set) to enlightenment_remote.
Formatting of ipc_handlers.
Init Screen setting via e_remote tries to be proactive and checks for the
init collection to verify it's a valid init screen before setting.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -3 -r1.175 -r1.176
--- e_config.c 5 Jun 2006 03:16:16 - 1.175
+++ e_config.c 5 Jun 2006 10:50:33 - 1.176
@@ -315,7 +315,7 @@
/**/ /* == already configurable via ipc */
E_CONFIG_VAL(D, T, config_version, INT); /**/
E_CONFIG_VAL(D, T, show_splash, INT); /**/
- E_CONFIG_VAL(D, T, init_default_theme, STR);
+ E_CONFIG_VAL(D, T, init_default_theme, STR); /**/
E_CONFIG_VAL(D, T, desktop_default_background, STR); /**/
E_CONFIG_VAL(D, T, desktop_default_name, STR); /**/
E_CONFIG_LIST(D, T, desktop_backgrounds, _e_config_desktop_bg_edd); /**/
@@ -451,7 +451,7 @@
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_VAL(D, T, font_hinting, INT);
+ E_CONFIG_VAL(D, T, font_hinting, INT); /**/
E_CONFIG_VAL(D, T, desklock_personal_passwd, STR);
E_CONFIG_VAL(D, T, desklock_background, STR);
E_CONFIG_VAL(D, T, desklock_auth_method, INT);
@@ -460,7 +460,6 @@
E_CONFIG_VAL(D, T, desklock_use_timeout, INT);
E_CONFIG_VAL(D, T, desklock_timeout, DOUBLE);
E_CONFIG_VAL(D, T, desklock_disable_screensaver, INT);
-
E_CONFIG_VAL(D, T, display_res_restore, INT);
E_CONFIG_VAL(D, T, display_res_width, INT);
E_CONFIG_VAL(D, T, display_res_height, INT);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.h,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -3 -r1.99 -r1.100
--- e_config.h 5 Jun 2006 03:16:16 - 1.99
+++ e_config.h 5 Jun 2006 10:50:33 - 1.100
@@ -75,7 +75,7 @@
{
int config_version;
int show_splash; //GUI
- const char *init_default_theme;
+ const char *init_default_theme; // GUI
const char *desktop_default_background; // GUI
Evas_List *desktop_backgrounds; // GUI
const char *desktop_default_name;
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_ipc_handlers.h,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -3 -r1.129 -r1.130
--- e_ipc_handlers.h16 May 2006 07:32:37 - 1.129
+++ e_ipc_handlers.h5 Jun 2006 10:50:33 - 1.130
@@ -945,6 +945,7 @@
#elif (TYPE == E_REMOTE_IN)
#endif
#undef HDL
+
//
#define HDL E_IPC_EAP_EDIT_START
#if (TYPE == E_REMOTE_OPTIONS)
@@ -970,6 +971,7 @@
#elif (TYPE == E_REMOTE_IN)
#endif
#undef HDL
+
//
#define HDL E_IPC_OP_MODULE_LOAD
#if (TYPE == E_REMOTE_OPTIONS)
@@ -1413,11 +1415,6 @@
#elif (TYPE == E_REMOTE_IN)
#endif
#undef HDL
-
-
-
-
-
//
#define HDL E_IPC_OP_RESTART
@@ -1433,6 +1430,7 @@
#elif (TYPE == E_REMOTE_IN)
#endif
#undef HDL
+
//
#define HDL E_IPC_OP_SHUTDOWN
#if (TYPE == E_REMOTE_OPTIONS)
@@ -1538,9 +1536,6 @@
#endif
#undef HDL
-
-
-
//
#define HDL E_IPC_OP_DIRS_LIST
#if (TYPE == E_REMOTE_OPTIONS)
@@ -1738,7 +1733,6 @@
#endif
#undef HDL
-
//
#define HDL E_IPC_OP_MENUS_SCROLL_SPEED_SET
#if (TYPE == E_REMOTE_OPTIONS)
@@ -1778,7 +1772,6 @@
END_DOUBLE;
#endif
#undef HDL
-
//
#define HDL E_IPC_OP_FOCUS_POLICY_SET
@@ -2243,7 +2236,7 @@
#endif
#undef HDL
-
//
+//
#define HDL E_IPC_OP_BORDER_SHADE_TRANSITION_SET
#if (TYPE == E_REMOTE_OPTIONS)
OP("-border-shade-transition-set", 1, "Set the shading animation algorithm
(0, 1, 2 or 3)", 0, HDL)
@@ -2487,7 +2480,6 @@
#undef HDL
//
-
#define HDL E_IPC_OP_BINDING_MOUSE_LIST
#if (TYPE == E_REMOTE_OPTIONS)
/* e_remote define command line args */
@@ -2509,7 +2501,6 @@
#undef HD
E CVS: libs/epsilon quan74
Enlightenment CVS committal
Author : quan74
Project : e17
Module : libs/epsilon
Dir : e17/libs/epsilon
Modified Files:
epsilon.spec.in
Log Message:
added plugin libs to package
===
RCS file: /cvs/e/e17/libs/epsilon/epsilon.spec.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- epsilon.spec.in 29 Mar 2006 02:54:40 - 1.3
+++ epsilon.spec.in 6 Jun 2006 02:32:58 - 1.4
@@ -63,6 +63,7 @@
%{_libdir}/libepsilon.so.*
%{_libdir}/libepsilon.la
%{_libdir}/pkgconfig/epsilon.pc
+%{_libdir}/%{name}/plugins/*.so
%{_bindir}/epsilon
%{_bindir}/epsilon_thumb_test
%{_bindir}/epsilon_thumbd
@@ -72,6 +73,8 @@
%doc doc/html
%{_libdir}/libepsilon.so
%{_libdir}/libepsilon.a
+%{_libdir}/%{name}/plugins/*.a
+%{_libdir}/%{name}/plugins/*.la
%{_includedir}/Epsilon.h
%{_includedir}/Epsilon_Request.h
%{_bindir}/epsilon-config
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: onefang onefang
Enlightenment CVS committal Author : onefang Project : devs Module : onefang Dir : devs/onefang Modified Files: info.txt Log Message: I'm the new monkey. === RCS file: /cvs/e/devs/onefang/info.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- info.txt28 Mar 2006 07:33:19 - 1.2 +++ info.txt4 Jun 2006 12:19:13 - 1.3 @@ -7,4 +7,4 @@ Managing: emu module, e_utils/e17genmenu, ecore_exe, e_apps_error, e_tlist, e_widget_tlist, enlightenment.org FAQs, get-e.org web site, edevelop.org, #get-e & ##enlightenment FAQ bot, .cvsignore monkey, - Witch Finder General. + Witch Finder General, assistant e_modules code monkey. ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: titan titan
Enlightenment CVS committal Author : titan Project : devs Module : titan Dir : devs/titan Modified Files: info.txt Log Message: Update my info. === RCS file: /cvs/e/devs/titan/info.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- info.txt27 Mar 2006 20:20:08 - 1.1 +++ info.txt4 Jun 2006 22:14:04 - 1.2 @@ -2,6 +2,6 @@ IRC Nick: LinuxTitan/TitanSoccer15 Name: Stephen Houston Location: Mississippi, USA -E-Mail: [EMAIL PROTECTED] -WWW: http://www.assistix.org +E-Mail: [EMAIL PROTECTED] +WWW: http://www.ecoding.org Managing: ephoto, ewl theme. ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: tclock rephorm
Enlightenment CVS committal
Author : rephorm
Project : e_modules
Module : tclock
Dir : e_modules/tclock
Modified Files:
tclock.edc
Log Message:
Keep time and date at the center of the vertical space given to them.
This keeps them from splitting apart in large shelves or overlapping in small
ones (although they will go outside the shelf bounds instead on small shelves).
We'll probably need to make the font scale for small shelves.
===
RCS file: /cvs/e/e_modules/tclock/tclock.edc,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- tclock.edc 22 May 2006 07:54:42 - 1.17
+++ tclock.edc 5 Jun 2006 00:57:49 - 1.18
@@ -27,6 +27,7 @@
{
state: "default" 0.0;
visible: 0;
+ align: 0.5 1.0;
rel1
{
relative: 0.0 0.0;
@@ -45,7 +46,7 @@
font: "VeraMono";
size: 10;
min: 1 1;
- align:0.5 0.5;
+ align:0.5 1.0;
text_class: "module_large";
}
}
@@ -73,10 +74,11 @@
{
state: "default" 0.0;
visible: 0;
+ align: 0.5 0.0;
rel1
{
relative: 0.0 0.5;
- offset: 0 0;
+ offset: 0 2;
}
rel2
{
@@ -91,7 +93,7 @@
font: "VeraMono";
size: 9;
min: 1 1;
- align:0.5 1.0;
+ align:0.5 0.0;
text_class: "module_small";
}
}
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_utils dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/src/bin/eapp_edit
Modified Files:
eapp_edit_main.c
Log Message:
- formatting
- make it more maintainable
===
RCS file: /cvs/e/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- eapp_edit_main.c5 Jun 2006 05:56:49 - 1.47
+++ eapp_edit_main.c5 Jun 2006 06:00:23 - 1.48
@@ -10,7 +10,13 @@
#include
#include
-#define TREE_COLS 2
+typedef struct Eapp_Item Eapp_Item;
+struct Eapp_Item
+{
+char *key;
+char *name;
+int checkbox;
+};
static void eapp_usage(void);
static int eapp_ui_init(char *file, char *lang, char *winclass);
@@ -18,6 +24,7 @@
static char *eapp_eet_read(Eet_File *ef, char *key, char *lang);
static void eapp_eet_write(Eet_File *ef, char *key, char *lang, char *val, int
size);
static void eapp_engrave_write(char *file);
+static void eapp_write_keys(Eet_File *ef, Eapp_Item *keys, char *lang);
static void eapp_cb_quit(Ewl_Widget *w, void *ev, void *data);
static void eapp_cb_save(Ewl_Widget *w, void *ev, void *data);
@@ -25,26 +32,35 @@
static void eapp_cb_fd_hide(Ewl_Widget *w, void *ev, void *data);
static void eapp_cb_fd_changed(Ewl_Widget *w, void *ev, void *data);
-typedef struct Eapp_Item Eapp_Item;
-struct Eapp_Item
-{
-char *key;
-char *name;
-int checkbox;
-};
+static Eapp_Item basic_keys[] = {
+{"app/info/name", "App Name", 0},
+{"app/info/exe", "Executable", 0},
+{NULL, NULL, 0}
+};
-static Eapp_Item keys[] = {
-{"app/info/name", "App Name", 0},
- {"app/info/exe","Executable", 0},
-{"app/info/generic","Generic Info", 0},
-{"app/info/comment","Comment", 0},
- {"app/icon/class", "Icon Class", 0},
-{"app/window/name", "Window Name", 0},
-{"app/window/class","Window Class", 0},
-{"app/window/title","Window Title", 0},
-{"app/window/role", "Window Role", 0},
+static Eapp_Item general_keys[] = {
+{"app/info/generic", "Generic Info", 0},
+{"app/info/comment", "Comment", 0},
+{NULL, NULL, 0}
+};
+
+static Eapp_Item icon_theme_keys[] = {
+ {"app/icon/class", "Icon Class", 0},
+{NULL, NULL, 0}
+};
+
+static Eapp_Item window_keys[] = {
+{"app/window/name", "Window Name", 0},
+{"app/window/class", "Window Class", 0},
+{"app/window/title", "Window Title", 0},
+{"app/window/role", "Window Role", 0},
+{NULL, NULL, 0}
+};
+
+static Eapp_Item misc_keys[] = {
{"app/info/startup_notify", "Startup Notify", 1},
-{"app/info/wait_exit", "Wait Exit", 1}
+{"app/info/wait_exit", "Wait Exit", 1},
+{NULL, NULL, 0}
};
int
@@ -158,10 +174,7 @@
eapp_ui_init(char *file, char *lang, char *winclass)
{
Ewl_Widget *win, *vbox, *hbox, *o;
-char tmp[PATH_MAX];
-snprintf(tmp, PATH_MAX, "%s/data/e_utils_eapp_edit/default.edj",
-PACKAGE_DATA_DIR);
win = ewl_window_new();
ewl_window_title_set(EWL_WINDOW(win), "Eapp Editor");
ewl_window_class_set(EWL_WINDOW(win), "Eapp Editor");
@@ -212,8 +225,9 @@
static int
eapp_populate(Ewl_Widget *vbox, char *file, char *lang, char *winclass)
{
-Ewl_Widget *hbox, *icon_border, *icon, *basic, *o, *hsep, *label, *entry,
*general,
- *icon_theme, *window, *misc, *checkbutton;
+Ewl_Widget *hbox, *icon_border, *icon, *basic, *o;
+Ewl_Widget *hsep, *label, *entry, *general;
+Ewl_Widget *icon_theme, *window, *misc, *checkbutton;
Eet_File *ef = NULL;
char *v;
int i = 0;
@@ -223,7 +237,7 @@
ef = eet_open(file, EET_FILE_MODE_READ);
if (!ef)
{
-fprintf(stderr, "Error, unable to open eap file.");
+fprintf(stderr, "Error, unable to open eap file.\n");
return 0;
}
}
@@ -262,34 +276,32 @@
ewl_container_child_append(EWL_CONTAINER(vbox), hsep);
ewl_widget_show(hsep);
-/* add all the eet data */
-while ( i <= 1 ) {
- hbox = ewl_hbox_new();
- ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_ALL);
- ewl_container_child_append(EWL_CONTAINER(basic), hbox);
- ewl_widget_show(hbox);
+for (i = 0; basic_keys[i].key; i++)
+{
+hbox = ewl_hbox_new();
+ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_ALL);
+ewl_container_child_append(EWL_CONTAINER(basic), hbox);
+ewl_widget_show(hbox);
- v = eapp_eet_read(ef, keys[i].key, lang);
+v =
E CVS: apps/e_utils dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin Modified Files: Makefile.am Log Message: - rename e_utils_eapp_edit to just eap_edit. nothing else in e_utils uses a e_utils prefix - remove the eapp_edit files from the data/ directory as it dosen't use custom themeing anymore === RCS file: /cvs/e/e17/apps/e_utils/src/bin/Makefile.am,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- Makefile.am 7 Mar 2006 21:58:24 - 1.10 +++ Makefile.am 5 Jun 2006 17:02:09 - 1.11 @@ -4,7 +4,7 @@ e17genmenu_subdir = e17genmenu endif -if BUILD_EAPP_EDIT +if BUILD_EAP_EDIT eapp_edit_subdir = eapp_edit endif ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_utils dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/src/bin/eapp_edit
Modified Files:
.cvsignore Makefile.am eapp_edit_main.c
Log Message:
- rename e_utils_eapp_edit to just eap_edit. nothing else in e_utils uses a
e_utils prefix
- remove the eapp_edit files from the data/ directory as it dosen't use
custom themeing anymore
===
RCS file: /cvs/e/e17/apps/e_utils/src/bin/eapp_edit/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- .cvsignore 19 Dec 2005 20:13:54 - 1.3
+++ .cvsignore 5 Jun 2006 17:02:09 - 1.4
@@ -2,4 +2,4 @@
.libs
Makefile
Makefile.in
-e_util_eapp_edit
+eap_edit
===
RCS file: /cvs/e/e17/apps/e_utils/src/bin/eapp_edit/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Makefile.am 19 Dec 2005 20:13:54 - 1.8
+++ Makefile.am 5 Jun 2006 17:02:09 - 1.9
@@ -9,10 +9,10 @@
@ECORE_CFLAGS@ \
@ENGRAVE_CFLAGS@
-bin_PROGRAMS = e_util_eapp_edit
+bin_PROGRAMS = eap_edit
-e_util_eapp_edit_SOURCES = \
+eap_edit_SOURCES = \
eapp_edit_main.c
-e_util_eapp_edit_LDADD = @EWL_LIBS@ @EET_LIBS@ @ECORE_LIBS@ @ENGRAVE_LIBS@
+eap_edit_LDADD = @EWL_LIBS@ @EET_LIBS@ @ECORE_LIBS@ @ENGRAVE_LIBS@
===
RCS file: /cvs/e/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -3 -r1.51 -r1.52
--- eapp_edit_main.c5 Jun 2006 16:42:39 - 1.51
+++ eapp_edit_main.c5 Jun 2006 17:02:09 - 1.52
@@ -98,7 +98,7 @@
}
else
{
-fprintf(stderr, "Error, missing argument for lang.\n");
+fprintf(stderr, "Error, missing argument for --lang.\n");
goto ARGS_SHUTDOWN;
}
}
@@ -111,7 +111,7 @@
}
else
{
-fprintf(stderr, "Error, missing argument for win-class.\n");
+fprintf(stderr, "Error, missing argument for --win-class.\n");
goto ARGS_SHUTDOWN;
}
}
@@ -137,7 +137,7 @@
if (!eapp_ui_init(file, lang, winclass))
{
-fprintf(stderr, "Error initializing e_utils_eapp_edit.\n");
+fprintf(stderr, "Error initializing eap_edit.\n");
goto EET_SHUTDOWN;
}
@@ -159,7 +159,7 @@
static void
eapp_usage(void)
{
-printf("usage: e_util_eapp_edit [OPTIONS] file.eap\n"
+printf("usage: eap_edit [OPTIONS] \n"
"\t if doesn't exist a new file will be created\n\n"
" [OPTIONS]\n"
" -h \t - view this help screen.\n"
@@ -180,9 +180,9 @@
Ewl_Widget *win, *vbox, *hbox, *o;
win = ewl_window_new();
-ewl_window_title_set(EWL_WINDOW(win), "Eapp Editor");
-ewl_window_class_set(EWL_WINDOW(win), "Eapp Editor");
-ewl_window_name_set(EWL_WINDOW(win), "Eapp_Editor");
+ewl_window_title_set(EWL_WINDOW(win), "Eap Editor");
+ewl_window_class_set(EWL_WINDOW(win), "Eap Editor");
+ewl_window_name_set(EWL_WINDOW(win), "Eap_Editor");
ewl_object_size_request(EWL_OBJECT(win), 445, 315);
ewl_callback_append(win, EWL_CALLBACK_DELETE_WINDOW, eapp_cb_quit, NULL);
ewl_widget_show(win);
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_utils titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/src/bin/eapp_edit
Modified Files:
eapp_edit_main.c
Log Message:
Pull out the common stuff and do it only once.
===
RCS file: /cvs/e/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- eapp_edit_main.c5 Jun 2006 06:00:23 - 1.48
+++ eapp_edit_main.c5 Jun 2006 06:49:43 - 1.49
@@ -31,6 +31,9 @@
static void eapp_cb_fd_show(Ewl_Widget *w, void *ev, void *data);
static void eapp_cb_fd_hide(Ewl_Widget *w, void *ev, void *data);
static void eapp_cb_fd_changed(Ewl_Widget *w, void *ev, void *data);
+static void eapp_create_content(Eet_File *ef, char *key, char *name, char
*lang,
+ char *winclass, Ewl_Widget
*parent);
+Ewl_Widget *eapp_border_get(Ewl_Widget *parent, char *title, char *align);
static Eapp_Item basic_keys[] = {
{"app/info/name", "App Name", 0},
@@ -226,7 +229,7 @@
eapp_populate(Ewl_Widget *vbox, char *file, char *lang, char *winclass)
{
Ewl_Widget *hbox, *icon_border, *icon, *basic, *o;
-Ewl_Widget *hsep, *label, *entry, *general;
+Ewl_Widget *hsep, *general;
Ewl_Widget *icon_theme, *window, *misc, *checkbutton;
Eet_File *ef = NULL;
char *v;
@@ -265,164 +268,48 @@
ewl_callback_append(icon, EWL_CALLBACK_CLICKED, eapp_cb_fd_show, NULL);
ewl_widget_show(icon);
-basic = ewl_border_new();
-ewl_border_text_set(EWL_BORDER(basic), "Basic Info");
-ewl_border_label_alignment_set(EWL_BORDER(basic), EWL_FLAG_ALIGN_LEFT);
-ewl_container_child_append(EWL_CONTAINER(hbox), basic);
-ewl_object_alignment_set(EWL_OBJECT(basic), EWL_FLAG_ALIGN_RIGHT);
-ewl_widget_show(basic);
+basic = eapp_border_get(hbox, "Basic Info", "right");
hsep = ewl_hseparator_new();
ewl_container_child_append(EWL_CONTAINER(vbox), hsep);
ewl_widget_show(hsep);
-for (i = 0; basic_keys[i].key; i++)
-{
-hbox = ewl_hbox_new();
-ewl_object_fill_policy_set(EWL_OBJECT(hbox), EWL_FLAG_FILL_ALL);
-ewl_container_child_append(EWL_CONTAINER(basic), hbox);
-ewl_widget_show(hbox);
-
-v = eapp_eet_read(ef, basic_keys[i].key, lang);
-
-label = ewl_label_new();
-ewl_label_text_set(EWL_LABEL(label), basic_keys[i].name);
-ewl_object_fill_policy_set(EWL_OBJECT(label), EWL_FLAG_FILL_NONE);
-ewl_object_alignment_set(EWL_OBJECT(label), EWL_FLAG_ALIGN_LEFT);
-ewl_container_child_append(EWL_CONTAINER(hbox), label);
-ewl_object_minimum_size_set(EWL_OBJECT(label), 65, 15);
-ewl_object_maximum_size_set(EWL_OBJECT(label), 65, 15);
-ewl_widget_show(label);
-
-entry = ewl_entry_new();
-ewl_text_text_set(EWL_TEXT(entry), v);
-ewl_object_maximum_size_set(EWL_OBJECT(entry), 9, 8);
-ewl_object_alignment_set(EWL_OBJECT(entry), EWL_FLAG_ALIGN_RIGHT);
-ewl_container_child_append(EWL_CONTAINER(hbox), entry);
-ewl_widget_name_set(entry, basic_keys[i].key);
-ewl_widget_show(entry);
-}
-
hbox = ewl_hbox_new();
ewl_container_child_append(EWL_CONTAINER(vbox), hbox);
ewl_widget_show(hbox);
-general = ewl_border_new();
-ewl_border_text_set(EWL_BORDER(general), "General");
-ewl_border_label_alignment_set(EWL_BORDER(general), EWL_FLAG_ALIGN_LEFT);
-ewl_container_child_append(EWL_CONTAINER(hbox), general);
-ewl_object_alignment_set(EWL_OBJECT(general), EWL_FLAG_ALIGN_LEFT);
-ewl_widget_show(general);
-
-icon_theme = ewl_border_new();
-ewl_border_text_set(EWL_BORDER(icon_theme), "Icon Theme");
-ewl_border_label_alignment_set(EWL_BORDER(icon_theme),
EWL_FLAG_ALIGN_LEFT);
-ewl_container_child_append(EWL_CONTAINER(hbox), icon_theme);
-ewl_object_alignment_set(EWL_OBJECT(icon_theme), EWL_FLAG_ALIGN_RIGHT);
-ewl_widget_show(icon_theme);
+general = eapp_border_get(hbox, "General", "left");
+
+icon_theme = eapp_border_get(hbox, "Icon Theme", "right");
hbox = ewl_hbox_new();
ewl_container_child_append(EWL_CONTAINER(vbox), hbox);
ewl_widget_show(hbox);
-window = ewl_border_new();
-ewl_border_text_set(EWL_BORDER(window), "Window");
-ewl_border_label_alignment_set(EWL_BORDER(window), EWL_FLAG_ALIGN_LEFT);
-ewl_container_child_append(EWL_CONTAINER(hbox), window);
-ewl_object_alignment_set(EWL_OBJECT(window), EWL_FLAG_ALIGN_LEFT);
-ewl_widget_show(window);
-
-misc = ewl_border_new();
-ewl_border_text_set(EWL_BORDER(misc), "Misc");
-ewl_border_label_alignment_set(EWL_BORDER(misc), EWL_FLAG_ALIGN_LEFT);
-ewl_container_child_append(EWL_CONTAINER(hbox), misc);
-ewl_object_alignment_set(EWL_OBJECT(misc), EWL_FLAG_ALIGN_RIGHT);
-ewl_widge
E CVS: e kwo
Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
session.c
Log Message:
Fix shutdown when using session manager.
===
RCS file: /cvs/e/e16/e/src/session.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -3 -r1.126 -r1.127
--- session.c 1 Jun 2006 19:09:37 - 1.126
+++ session.c 3 Jun 2006 23:23:43 - 1.127
@@ -282,9 +282,7 @@
if (EventDebug(EDBUG_TYPE_SESSION))
Eprintf("callback_die\n");
- if (Mode.wm.master)
- SoundPlay("SOUND_EXIT");
- EExit(0);
+ SessionExit(EEXIT_EXIT, NULL);
}
static void
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: wlan devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : wlan
Dir : e_modules/wlan
Modified Files:
e_mod_main.h e_mod_main.c Makefile.am
Added Files:
module.eap
Log Message:
Make wlan module compile again :)
===
RCS file: /cvs/e/e_modules/wlan/e_mod_main.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_mod_main.h5 Apr 2006 17:48:50 - 1.7
+++ e_mod_main.h4 Jun 2006 12:54:47 - 1.8
@@ -55,7 +55,6 @@
EAPI void *e_modapi_init(E_Module *m);
EAPI int e_modapi_shutdown(E_Module *m);
EAPI int e_modapi_save(E_Module *m);
-EAPI int e_modapi_info(E_Module *m);
EAPI int e_modapi_about(E_Module *m);
EAPI int e_modapi_config(E_Module *m);
===
RCS file: /cvs/e/e_modules/wlan/e_mod_main.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- e_mod_main.c5 Apr 2006 17:48:50 - 1.22
+++ e_mod_main.c4 Jun 2006 12:54:47 - 1.23
@@ -41,7 +41,6 @@
if (!n)
return NULL;
- m->config_menu = n->config_menu;
return n;
}
@@ -54,12 +53,6 @@
if (!n)
return 0;
- if (m->config_menu)
- {
-e_menu_deactivate(m->config_menu);
-e_object_del(E_OBJECT(m->config_menu));
-m->config_menu = NULL;
- }
if (n->cfd)
{
e_object_del(E_OBJECT(n->cfd));
@@ -78,13 +71,6 @@
if (!n)
return 0;
e_config_domain_save("module.wlan", conf_edd, n->conf);
- return 1;
-}
-
-EAPI int
-e_modapi_info(E_Module *m)
-{
- m->icon_file = strdup(PACKAGE_DATA_DIR "/module_icon.png");
return 1;
}
===
RCS file: /cvs/e/e_modules/wlan/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 9 Mar 2006 11:42:09 - 1.3
+++ Makefile.am 4 Jun 2006 12:54:47 - 1.4
@@ -12,6 +12,7 @@
files_DATA = \
module_icon.png \
+module.eap \
wlan.edj \
wlan.edc \
VeraMono.ttf
___
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: ewin-ops.c Log Message: Fix shape update when client resizes after changing shape. === RCS file: /cvs/e/e16/e/src/ewin-ops.c,v retrieving revision 1.98 retrieving revision 1.99 diff -u -3 -r1.98 -r1.99 --- ewin-ops.c 3 May 2006 21:04:08 - 1.98 +++ ewin-ops.c 4 Jun 2006 12:54:49 - 1.99 @@ -486,6 +486,8 @@ HintsSetWindowState(ewin); } } + if (resize && ewin->state.shaped) + ewin->update.shape = 1; } EwinPropagateShapes(ewin); ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
layout_etk_simple.c
Log Message:
* Make the menus a bit more logical
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- layout_etk_simple.c 3 Jun 2006 11:04:02 - 1.47
+++ layout_etk_simple.c 4 Jun 2006 05:06:12 - 1.48
@@ -100,6 +100,68 @@
}
+
+/*Function to make standard menu items*/
+static Etk_Widget *_entropy_etk_menu_item_new(Etk_Menu_Item_Type item_type,
const char *label,
+ Etk_Stock_Id stock_id, Etk_Menu_Shell *menu_shell, Etk_Widget *statusbar)
+{
+ Etk_Widget *menu_item = NULL;
+
+ switch (item_type)
+ {
+ case ETK_MENU_ITEM_NORMAL:
+ menu_item = etk_menu_item_image_new_with_label(label);
+ break;
+ case ETK_MENU_ITEM_SEPARATOR:
+ menu_item = etk_menu_item_separator_new();
+ break;
+ default:
+ return NULL;
+ }
+ if (stock_id != ETK_STOCK_NO_STOCK)
+ {
+ Etk_Widget *image;
+
+ image = etk_image_new_from_stock(stock_id, ETK_STOCK_SMALL);
+ etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(menu_item),
ETK_IMAGE(image));
+ }
+ etk_menu_shell_append(menu_shell, ETK_MENU_ITEM(menu_item));
+
+ /*etk_signal_connect("selected", ETK_OBJECT(menu_item),
ETK_CALLBACK(_etk_test_menu_item_selected_cb), statusbar);
+ etk_signal_connect("deselected", ETK_OBJECT(menu_item),
ETK_CALLBACK(_etk_test_menu_item_deselected_cb), statusbar);*/
+
+ return menu_item;
+}
+
+/*Function to make checkbox menu items*/
+static Etk_Widget *_entropy_etk_menu_check_item_new(const char *label,
Etk_Menu_Shell *menu_shell)
+{
+ Etk_Widget *menu_item;
+
+ if (!menu_shell)
+ return NULL;
+
+ menu_item = etk_menu_item_check_new_with_label(label);
+ etk_menu_shell_append(menu_shell, ETK_MENU_ITEM(menu_item));
+
+ return menu_item;
+}
+
+/*Function to make radio items*/
+static Etk_Widget *_entropy_etk_radio_item_new(const char *label,
Etk_Menu_Item_Radio *group_item, Etk_Menu_Shell *menu_shell)
+{
+ Etk_Widget *menu_item;
+
+ if (!menu_shell)
+ return NULL;
+
+ menu_item = etk_menu_item_radio_new_with_label_from_widget(label,
group_item);
+ etk_menu_shell_append(menu_shell, ETK_MENU_ITEM(menu_item));
+
+ return menu_item;
+}
+
+
static void _etk_layout_location_delete_confirm_cb(Etk_Object * object, void
*data)
{
entropy_gui_component_instance* instance = data;
@@ -142,37 +204,6 @@
}
-static Etk_Widget *_entropy_etk_menu_item_new(Etk_Menu_Item_Type item_type,
const char *label,
- Etk_Stock_Id stock_id, Etk_Menu_Shell *menu_shell, Etk_Widget *statusbar)
-{
- Etk_Widget *menu_item = NULL;
-
- switch (item_type)
- {
- case ETK_MENU_ITEM_NORMAL:
- menu_item = etk_menu_item_image_new_with_label(label);
- break;
- case ETK_MENU_ITEM_SEPARATOR:
- menu_item = etk_menu_item_separator_new();
- break;
- default:
- return NULL;
- }
- if (stock_id != ETK_STOCK_NO_STOCK)
- {
- Etk_Widget *image;
-
- image = etk_image_new_from_stock(stock_id, ETK_STOCK_SMALL);
- etk_menu_item_image_set(ETK_MENU_ITEM_IMAGE(menu_item),
ETK_IMAGE(image));
- }
- etk_menu_shell_append(menu_shell, ETK_MENU_ITEM(menu_item));
-
- /*etk_signal_connect("selected", ETK_OBJECT(menu_item),
ETK_CALLBACK(_etk_test_menu_item_selected_cb), statusbar);
- etk_signal_connect("deselected", ETK_OBJECT(menu_item),
ETK_CALLBACK(_etk_test_menu_item_deselected_cb), statusbar);*/
-
- return menu_item;
-}
-
Entropy_Plugin*
entropy_plugin_init (entropy_core * core)
{
@@ -663,15 +694,20 @@
menu_item = _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _("View"),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menubar), NULL);
menu = etk_menu_new();
etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu));
- menu_item = _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _("Tree View"),
ETK_STOCK_SYSTEM_SHUTDOWN, ETK_MENU_SHELL(menu), NULL);
+ menu_item = _entropy_etk_menu_check_item_new(_("Tree View"),
ETK_MENU_SHELL(menu));
+ etk_menu_item_check_active_set(ETK_MENU_ITEM_CHECK(menu_item),1 );
etk_signal_connect("activated", ETK_OBJECT(menu_item),
ETK_CALLBACK(entropy_etk_layout_tree_cb), layout);
+
- menu_item = _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _("List View"),
ETK_STOCK_SYSTEM_SHUTDOWN, ETK_MENU_SHELL(menu), NULL);
+ _entropy_etk_menu_item_new(ETK_MENU_ITEM_SEPARATOR, NULL,
+ ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL);
+
+ menu_item = _entropy_etk_radio_item_new(_("List View"), NULL,
ETK_MENU_SHELL(menu));
etk_object_data_set(ETK_OBJECT(menu_item), "VISUAL", gui->list_viewer);
etk_signal_connect("activated", ETK_OBJ
E CVS: apps/evfs chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : apps/evfs
Dir : e17/apps/evfs/src/plugins/file
Modified Files:
evfs_fs_samba.c
Log Message:
* Slight bugfix to samba authentication structures
===
RCS file: /cvs/e/e17/apps/evfs/src/plugins/file/evfs_fs_samba.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evfs_fs_samba.c 28 Apr 2006 15:18:49 - 1.2
+++ evfs_fs_samba.c 5 Jun 2006 12:14:10 - 1.3
@@ -251,7 +251,7 @@
//struct stat* file_stat = calloc(1,sizeof(struct stat));
//
/*Does this command have an attached authentication object? */
- if (command->file_command.files[0]->username)
+ if (command->file_command.files[number]->username)
{
printf("We have a username, adding to hash..\n");
evfs_auth_structure_add(auth_cache,
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_icon_viewer.c
Log Message:
* Add a slider to resize icons
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_icon_viewer.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- etk_icon_viewer.c 3 Jun 2006 12:54:07 - 1.10
+++ etk_icon_viewer.c 4 Jun 2006 12:47:10 - 1.11
@@ -16,6 +16,8 @@
{
Etk_Widget *iconbox;
Etk_Widget* parent_visual;
+ Etk_Widget* vbox;
+ Etk_Widget* slider;
Ecore_Hash* gui_hash;
@@ -166,6 +168,26 @@
return base;
}
+void _entropy_etk_icon_viewer_slider_cb(Etk_Object *object, double value, void
*data)
+{
+ entropy_gui_component_instance *instance;
+ entropy_etk_iconbox_viewer *viewer;
+
+ instance = data;
+ viewer = instance->data;
+
+
etk_iconbox_model_geometry_set(etk_iconbox_current_model_get(ETK_ICONBOX(viewer->iconbox)),
+ (value*2) + 14,
+ value + 22,
+ 5, 4);
+
etk_iconbox_model_icon_geometry_set(etk_iconbox_current_model_get(ETK_ICONBOX(viewer->iconbox)),
+ 26,0, value, value, 1, 1);
+
+
+
etk_iconbox_model_label_geometry_set(etk_iconbox_current_model_get(ETK_ICONBOX(viewer->iconbox)),
+ 0, value + 2, (value*2) + 4, 12, 0.5,0);
+}
+
void _etk_entropy_click_cb(Etk_Object *object, void *event_info, void *data)
{
entropy_gui_component_instance *instance;
@@ -394,10 +416,28 @@
viewer->gui_hash = ecore_hash_new(ecore_direct_hash,ecore_direct_compare);
+
+ /*Make the various widgets*/
+ viewer->vbox = etk_vbox_new(ETK_FALSE,0);
+
+ /*Make the slider*/
+ viewer->slider = etk_hslider_new(10,128, 48, 1, 1);
+ etk_box_pack_start(ETK_BOX(viewer->vbox), viewer->slider, ETK_FALSE,
ETK_FALSE,0);
+ etk_signal_connect("value_changed", ETK_OBJECT(viewer->slider),
+ ETK_CALLBACK(_entropy_etk_icon_viewer_slider_cb), instance);
+
viewer->iconbox = etk_iconbox_new();
+ etk_box_pack_start(ETK_BOX(viewer->vbox), viewer->iconbox,
ETK_TRUE,ETK_TRUE,0);
+
+
+
+
/*etk_iconbox_model_icon_geometry_set(etk_iconbox_current_model_get(ETK_ICONBOX(viewer->iconbox)),
+ 0,0,64,64,1,1);*/
+
+
etk_signal_connect("mouse_up", ETK_OBJECT(viewer->iconbox),
ETK_CALLBACK(_etk_entropy_click_cb), instance);
- instance->gui_object = viewer->iconbox;
+ instance->gui_object = viewer->vbox;
instance->core = core;
instance->data = viewer;
instance->layout_parent = layout;
@@ -446,7 +486,7 @@
(ENTROPY_GUI_EVENT_THUMBNAIL_AVAILABLE));
- etk_widget_show_all(viewer->iconbox);
+ etk_widget_show_all(viewer->vbox);
return instance;
}
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl pfritz
Enlightenment CVS committal
Author : pfritz
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_enums.h ewl_window.c ewl_window.h
Log Message:
add ewl_window_dialog_set/get
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_enums.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- ewl_enums.h 5 Jun 2006 04:12:30 - 1.46
+++ ewl_enums.h 5 Jun 2006 05:05:31 - 1.47
@@ -257,7 +257,8 @@
EWL_WINDOW_GRAB_POINTER = 0x4, /**< Window grabs pointer */
EWL_WINDOW_GRAB_KEYBOARD = 0x8, /**< Window grabs keyboard */
EWL_WINDOW_OVERRIDE = 0x10, /**< Window override setting */
- EWL_WINDOW_FULLSCREEN = 0x20/**< Window is fullscreen */
+ EWL_WINDOW_FULLSCREEN = 0x20, /**< Window is fullscreen */
+ EWL_WINDOW_DIALOG = 0x40/**< Window has no max and min
buttons */
};
/**
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_window.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- ewl_window.c5 Jun 2006 04:12:30 - 1.46
+++ ewl_window.c5 Jun 2006 05:05:31 - 1.47
@@ -283,6 +283,62 @@
}
/**
+ * @param win: the window
+ * @param override: TRUE or FALSE to indicate dialog state.
+ * @return Returns no value.
+ * @brief Changes the dialog state on the specified window.
+ *
+ * A dialog window has not a iconify and/or maximize button.
+ */
+void
+ewl_window_dialog_set(Ewl_Window *win, int dialog)
+{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR("win", win);
+ DCHECK_TYPE("win", win, EWL_WINDOW_TYPE);
+
+ /* do nothing if already set */
+ if (dialog == ewl_window_dialog_get(win))
+ DRETURN(DLEVEL_STABLE);
+
+ if (dialog)
+ win->flags |= EWL_WINDOW_DIALOG;
+ else
+ win->flags &= ~EWL_WINDOW_DIALOG;
+
+#ifdef ENABLE_EWL_SOFTWARE_X11
+ if (REALIZED(win) && strstr(win->render, "x11")) {
+ if (dialog)
+ ecore_x_netwm_window_type_set(
+ (Ecore_X_Window)win->window,
+ ECORE_X_WINDOW_TYPE_DIALOG);
+ else
+ ecore_x_netwm_window_type_set(
+ (Ecore_X_Window)win->window,
+ ECORE_X_WINDOW_TYPE_NORMAL);
+#endif
+ }
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+/**
+ * @param win: window to retrieve dialog state
+ * @return Returns TRUE if window is an dialog window, FALSE otherwise.
+ * @brief Retrieves the current dialog state on a window.
+ */
+int
+ewl_window_dialog_get(Ewl_Window *win)
+{
+ DENTER_FUNCTION(DLEVEL_STABLE);
+ DCHECK_PARAM_PTR_RET("win", win, FALSE);
+ DCHECK_TYPE_RET("win", win, EWL_WINDOW_TYPE, FALSE);
+
+ DRETURN_INT((!!(win->flags & EWL_WINDOW_DIALOG)), DLEVEL_STABLE);
+}
+
+
+/**
* @param win: The window to work with
* @param fullscreen: The fullscreen setting to use
* @return Returns no value
@@ -744,6 +800,12 @@
if (window->flags & EWL_WINDOW_BORDERLESS)
ecore_x_mwm_borderless_set(xwin, 1);
+ if (window->flags & EWL_WINDOW_DIALOG)
+ ecore_x_netwm_window_type_set(xwin,
+ ECORE_X_WINDOW_TYPE_DIALOG);
+ else
+ ecore_x_netwm_window_type_set(xwin,
+ ECORE_X_WINDOW_TYPE_NORMAL);
if (window->flags & EWL_WINDOW_FULLSCREEN)
{
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_window.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- ewl_window.h5 Jun 2006 04:12:30 - 1.16
+++ ewl_window.h5 Jun 2006 05:05:31 - 1.17
@@ -66,6 +66,8 @@
voidewl_window_class_set(Ewl_Window *win, const char *classname);
char *ewl_window_class_get(Ewl_Window *win);
voidewl_window_borderless_set(Ewl_Window *win);
+voidewl_window_dialog_set(Ewl_Window *win, int dialog);
+int ewl_window_dialog_get(Ewl_Window *win);
voidewl_window_fullscreen_set(Ewl_Window *win,
unsigned int fullscreen);
unsigned intewl_window_fullscreen_get(Ewl_Window *win);
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_utils titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/eapp_edit Modified Files: eapp_edit_main.c Log Message: Lets spice it up and use some stock icons. === RCS file: /cvs/e/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -3 -r1.46 -r1.47 --- eapp_edit_main.c5 Jun 2006 05:35:04 - 1.46 +++ eapp_edit_main.c5 Jun 2006 05:56:49 - 1.47 @@ -189,7 +189,7 @@ ewl_widget_show(hbox); o = ewl_button_new(); -ewl_button_label_set(EWL_BUTTON(o), "Save"); +ewl_button_stock_type_set(EWL_BUTTON(o), EWL_STOCK_SAVE); ewl_container_child_append(EWL_CONTAINER(hbox), o); ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_SHRINK); ewl_object_alignment_set(EWL_OBJECT(o), EWL_FLAG_ALIGN_CENTER); @@ -199,7 +199,7 @@ ewl_widget_show(o); o = ewl_button_new(); -ewl_button_label_set(EWL_BUTTON(o), "Cancel"); +ewl_button_stock_type_set(EWL_BUTTON(o), EWL_STOCK_CANCEL); ewl_container_child_append(EWL_CONTAINER(hbox), o); ewl_object_fill_policy_set(EWL_OBJECT(o), EWL_FLAG_FILL_SHRINK); ewl_object_alignment_set(EWL_OBJECT(o), EWL_FLAG_ALIGN_CENTER); ___ 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_startup.c
Log Message:
Removed the "Theme" Section, just get edj files from path_init (Personal and
System).
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_startup.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_int_config_startup.c 5 Jun 2006 11:48:26 - 1.5
+++ e_int_config_startup.c 5 Jun 2006 12:09:21 - 1.6
@@ -126,7 +126,7 @@
_load_inits(E_Config_Dialog *cfd, Evas_Object *il)
{
Evas *evas;
- Evas_Object *ic, *im, *o, *init_obj;
+ Evas_Object *im, *o, *init_obj;
Evas_List *init_dirs, *init;
Ecore_Evas *eebuf;
Evas *evasbuf;
@@ -141,44 +141,15 @@
homedir = e_user_homedir_get();
evas = evas_object_evas_get(il);
- init_obj = edje_object_add(cfd->dia->win->evas);
eebuf = ecore_evas_buffer_new(1, 1);
evasbuf = ecore_evas_get(eebuf);
- o = edje_object_add(evasbuf);
-
- e_widget_ilist_header_append(il, NULL, _("Theme"));
- i++;
- /* Load the init */
- s = e_path_find(path_init, "init.edj");
- c = strdup(s);
- if (edje_object_file_set(o, s, "init/splash"))
- {
- Evas_Object *ic = NULL;
-
- if (!e_thumb_exists(c))
- ic = e_thumb_generate_begin(c, 48, 48, cfd->dia->win->evas, &ic,
NULL, NULL);
- else
- ic = e_thumb_evas_object_get(c, cfd->dia->win->evas, 48, 48, 1);
-
- e_widget_ilist_append(il, ic, _("Theme Init"), _ilist_cb_init_selected,
cfd, "");
- if (!e_config->init_default_theme)
- selnum = i;
-
- i++;
- }
im = e_widget_preview_add(cfd->dia->win->evas, 320,
(320 *
e_zone_current_get(cfd->dia->win->container)->h) /
e_zone_current_get(cfd->dia->win->container)->w);
- e_widget_preview_edje_set(im, s, "init/splash");
- evas_object_del(init_obj);
-
- evas_object_del(o);
- ecore_evas_free(eebuf);
- if (s) evas_stringshare_del(s);
- /* Load other inits */
+ /* Load inits */
init_dirs = e_path_dir_list_get(path_init);
for (init = init_dirs; init; init = init->next)
{
@@ -220,6 +191,7 @@
while ((init_file = ecore_list_next(inits)))
{
+Evas_Object *ic = NULL;
char full_path[4096];
snprintf(full_path, sizeof(full_path), "%s/%s", d->dir, init_file);
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: devian devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : devian
Dir : e_modules/devian/src/module
Modified Files:
e_mod_main.h e_mod_main.c
Log Message:
Make devian module build again.
Kiwi: this was broken for a few days and getting a lot of "Is devian broken"
comments. Hope you don't mind me fixing ;)
===
RCS file: /cvs/e/e_modules/devian/src/module/e_mod_main.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_main.h25 Apr 2006 10:32:07 - 1.3
+++ e_mod_main.h4 Jun 2006 12:56:34 - 1.4
@@ -6,7 +6,6 @@
EAPI void *e_modapi_init(E_Module *m);
EAPI int e_modapi_shutdown(E_Module *m);
EAPI int e_modapi_save(E_Module *m);
-EAPI int e_modapi_info(E_Module *m);
EAPI int e_modapi_about(E_Module *m);
EAPI int e_modapi_config(E_Module *m);
===
RCS file: /cvs/e/e_modules/devian/src/module/e_mod_main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_main.c2 May 2006 14:24:23 - 1.3
+++ e_mod_main.c4 Jun 2006 12:56:34 - 1.4
@@ -43,16 +43,6 @@
}
EAPI int
-e_modapi_info(E_Module *m)
-{
- char buf[DEVIAN_MAX_PATH];
-
- snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(m));
- m->icon_file = strdup(buf);
- return 1;
-}
-
-EAPI int
e_modapi_about(E_Module *m)
{
char buf[4096];
___
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_startup.c e_thumb.c
Log Message:
Add thumbnailing for init screens :) (Thanks CodeWarrior)
Make Startup config dialog use static thumbnails in list now.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_startup.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_int_config_startup.c 5 Jun 2006 03:16:16 - 1.4
+++ e_int_config_startup.c 5 Jun 2006 11:48:26 - 1.5
@@ -156,13 +156,10 @@
{
Evas_Object *ic = NULL;
- ic = edje_object_add(evas);
- e_util_edje_icon_set(ic, "enlightenment/run");
-
- /*
- ic = e_widget_preview_add(evas, 48, 48);
- e_widget_preview_edje_set(ic, s, "init/splash");
- */
+ if (!e_thumb_exists(c))
+ ic = e_thumb_generate_begin(c, 48, 48, cfd->dia->win->evas, &ic,
NULL, NULL);
+ else
+ ic = e_thumb_evas_object_get(c, cfd->dia->win->evas, 48, 48, 1);
e_widget_ilist_append(il, ic, _("Theme Init"), _ilist_cb_init_selected,
cfd, "");
if (!e_config->init_default_theme)
@@ -229,26 +226,10 @@
if (ecore_file_is_dir(full_path)) continue;
if (!e_util_edje_collection_exists(full_path, "init/splash"))
continue;
-ic = edje_object_add(evas);
-e_util_edje_icon_set(ic, "enlightenment/run");
-
-/*
- * Using live previews for icons in list here
- * really drains resources. */
-
-/*
-ic = e_widget_preview_add(evas, 48, 48);
-e_widget_preview_edje_set(ic, full_path, "init/splash");
-*/
-
-/* e_thumb_generate cannot handle init splash yet */
-
-/*
-if (!e_thumb_exists(full_path))
- ic = e_thumb_generate_begin(full_path, 48, 48, evas, &ic, NULL,
NULL);
-else
- ic = e_thumb_evas_object_get(full_path, evas, 48, 48, 1);
-*/
+if (!e_thumb_exists(c))
+ ic = e_thumb_generate_begin(full_path, 48, 48,
cfd->dia->win->evas, &ic, NULL, NULL);
+else
+ ic = e_thumb_evas_object_get(full_path, cfd->dia->win->evas, 48,
48, 1);
e_widget_ilist_append(il, ic, ecore_file_strip_ext(init_file),
_ilist_cb_init_selected, cfd, full_path);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_thumb.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- e_thumb.c 2 Mar 2006 12:03:48 - 1.25
+++ e_thumb.c 5 Jun 2006 11:48:26 - 1.26
@@ -280,9 +280,10 @@
_e_thumb_etheme_create(char *file, Evas_Coord w, Evas_Coord h, int *ww, int
*hh, int *alpha, Evas_Object **im, Ecore_Evas **buf)
{
Evas *evasbuf;
- Evas_Object *wallpaper, *window, *clock, *start, **pager;
+ Evas_Object *wallpaper, *window, *clock, *start, **pager, *init;
const int *pixels;
-
+ int is_init;
+
*ww = 640;
*hh = 480;
*alpha = 0;
@@ -292,63 +293,77 @@
*buf = ecore_evas_buffer_new(w, h);
evasbuf = ecore_evas_get(*buf);
-
- wallpaper = edje_object_add(evasbuf);
- window= edje_object_add(evasbuf);
- clock = edje_object_add(evasbuf);
- start = edje_object_add(evasbuf);
- pager = E_NEW(Evas_Object*, 3);
- pager[0] = edje_object_add(evasbuf);
- pager[1] = edje_object_add(evasbuf);
- pager[2] = edje_object_add(evasbuf);
-
- edje_object_file_set(wallpaper, file, "desktop/background");
- edje_object_file_set(window,file, "widgets/border/default/border");
- edje_object_file_set(clock, file, "modules/clock/main");
- edje_object_file_set(clock, file, "modules/clock/main");
- edje_object_file_set(start, file, "modules/start/main");
- edje_object_file_set(pager[0], file, "modules/pager/main");
- edje_object_file_set(pager[1], file, "modules/pager/desk");
- edje_object_file_set(pager[2], file, "modules/pager/window");
- edje_object_part_text_set(window, "title_text", file);
- edje_object_part_swallow(pager[0], "items", pager[1]);
- edje_object_part_swallow(pager[1], "items", pager[2]);
-
- /* wallpaper */
- evas_object_move(wallpaper, 0, 0);
- evas_object_resize(wallpaper, w, h);
- /* main window */
- evas_object_move(window, (w * 0.1), (h * 0.05));
- evas_object_resize(window, w * 0.8, h * 0.75);
- /* clock */
- evas_object_move(clock, (w * 0.9), (h * 0.9));
- evas_object_resize(clock, w * 0.1, h * 0.1);
- /* start */
- evas_object_move(start, 0.1, (h * 0.9));
- evas_object_resize(start, w * 0.1, h * 0.1);
- /* pager */
- evas_object_move(pager[0], (w * 0.3), (h * 0.9));
E CVS: apps/e_utils titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : apps/e_utils
Dir : e17/apps/e_utils/src/bin/eapp_edit
Modified Files:
eapp_edit_main.c
Log Message:
Lets make sure we free the value after we get it.
===
RCS file: /cvs/e/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- eapp_edit_main.c5 Jun 2006 17:02:09 - 1.52
+++ eapp_edit_main.c5 Jun 2006 17:55:43 - 1.53
@@ -234,8 +234,8 @@
Ewl_Widget *icon_theme, *window, *misc, *checkbutton;
Eet_File *ef = NULL;
char *v;
-int i = 0;
-
+int i;
+
if (ecore_file_exists(file))
{
ef = eet_open(file, EET_FILE_MODE_READ);
@@ -318,10 +318,9 @@
ewl_widget_name_set(checkbutton, misc_keys[i].key);
ewl_widget_show(checkbutton);
}
-
+
if (v) free(v);
v = NULL;
-
if (ef) eet_close(ef);
return 1;
@@ -381,6 +380,9 @@
ewl_object_alignment_set(EWL_OBJECT(entry), EWL_FLAG_ALIGN_RIGHT);
ewl_widget_name_set(entry, key);
ewl_widget_show(entry);
+
+if (v) free(v);
+v = NULL;
return;
}
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_utils dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/data/eapp_edit/fonts Removed Files: VeraBd.ttf Log Message: - rename e_utils_eapp_edit to just eap_edit. nothing else in e_utils uses a e_utils prefix - remove the eapp_edit files from the data/ directory as it dosen't use custom themeing anymore ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_utils dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/data/eapp_edit/default Removed Files: .cvsignore Makefile.am default.edc Log Message: - rename e_utils_eapp_edit to just eap_edit. nothing else in e_utils uses a e_utils prefix - remove the eapp_edit files from the data/ directory as it dosen't use custom themeing anymore ___ 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.c e_config.h e_init.c e_int_config_startup.c
Log Message:
-Added new config item for init screens into e_config.h/c.
-Bumped e_config.h File_Generation to coincide with added config value.
-Fixed e_init.c to look for config value instead of hard-coded init.edj.
-Newer Config Startup dialog that allows selecting (with previews) of the init.
New init screens can now be copied into the init search directories, and
easily selected via dialog.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -3 -r1.174 -r1.175
--- e_config.c 24 May 2006 02:49:07 - 1.174
+++ e_config.c 5 Jun 2006 03:16:16 - 1.175
@@ -315,6 +315,7 @@
/**/ /* == already configurable via ipc */
E_CONFIG_VAL(D, T, config_version, INT); /**/
E_CONFIG_VAL(D, T, show_splash, INT); /**/
+ E_CONFIG_VAL(D, T, init_default_theme, STR);
E_CONFIG_VAL(D, T, desktop_default_background, STR); /**/
E_CONFIG_VAL(D, T, desktop_default_name, STR); /**/
E_CONFIG_LIST(D, T, desktop_backgrounds, _e_config_desktop_bg_edd); /**/
@@ -509,6 +510,7 @@
#define IFCFGEND }
IFCFG(0x008d);
e_config->show_splash = 1;
+ e_config->init_default_theme = NULL;
e_config->desktop_default_background = NULL;
e_config->desktop_default_name = evas_stringshare_add(_("Desktop %i, %i"));
e_config->menus_scroll_speed = 1000.0;
@@ -1784,6 +1786,7 @@
if (cc->name) evas_stringshare_del(cc->name);
E_FREE(cc);
}
+ if (e_config->init_default_theme)
evas_stringshare_del(e_config->init_default_theme);
if (e_config->desktop_default_background)
evas_stringshare_del(e_config->desktop_default_background);
if (e_config->desktop_default_name)
evas_stringshare_del(e_config->desktop_default_name);
if (e_config->language) evas_stringshare_del(e_config->language);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.h,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -3 -r1.98 -r1.99
--- e_config.h 16 May 2006 07:32:37 - 1.98
+++ e_config.h 5 Jun 2006 03:16:16 - 1.99
@@ -47,10 +47,10 @@
* defaults for e to work.
*/
#define E_CONFIG_FILE_EPOCH 0x
-/* increment this whenever a new set of configvalues are added but the users
+/* increment this whenever a new set of config values are added but the users
* config doesn't need top be wiped - simply new values need to be put in
*/
-#define E_CONFIG_FILE_GENERATION 0x0093
+#define E_CONFIG_FILE_GENERATION 0x0094
#define E_CONFIG_FILE_VERSION((E_CONFIG_FILE_EPOCH << 16) |
E_CONFIG_FILE_GENERATION)
#define E_EVAS_ENGINE_DEFAULT 0
@@ -75,6 +75,7 @@
{
int config_version;
int show_splash; //GUI
+ const char *init_default_theme;
const char *desktop_default_background; // GUI
Evas_List *desktop_backgrounds; // GUI
const char *desktop_default_name;
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_init.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- e_init.c2 Mar 2006 12:03:48 - 1.34
+++ e_init.c5 Jun 2006 03:16:16 - 1.35
@@ -67,8 +67,10 @@
/* first screen */
if (l == screens)
{
- /* FIXME: "init.edj" needs to come from config */
- s = e_path_find(path_init, "init.edj"),
+ if (!e_config->init_default_theme)
+ s = e_path_find(path_init, "init.edj");
+ else
+ s = e_path_find(path_init, e_config->init_default_theme);
edje_object_file_set(o, s, "init/splash");
if (s) evas_stringshare_del(s);
_e_init_object = o;
@@ -76,8 +78,10 @@
/* other screens */
else
{
- /* FIXME: "init.edj" needs to come from config */
- s = e_path_find(path_init, "init.edj"),
+ if (!e_config->init_default_theme)
+ s = e_path_find(path_init, "init.edj");
+ else
+ s = e_path_find(path_init, e_config->init_default_theme);
edje_object_file_set(o, s, "init/extra_screen");
if (s) evas_stringshare_del(s);
}
@@ -89,8 +93,10 @@
else
{
o = edje_object_add(_e_init_evas);
- /* FIXME: "init.edj" needs to come from config */
- s = e_path_find(path_init, "init.edj"),
+ if (!e_config->init_default_theme)
+ s = e_path_find(path_init, "init.edj");
+ else
+ s = e_path_find(path_init, e_config->init_
E CVS: libs/ecore xcomputerman
Enlightenment CVS committal Author : xcomputerman Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_x Modified Files: Ecore_X.h ecore_x.c Log Message: Add Visual to window attributes struct === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/Ecore_X.h,v retrieving revision 1.167 retrieving revision 1.168 diff -u -3 -r1.167 -r1.168 --- Ecore_X.h 19 May 2006 15:02:54 - 1.167 +++ Ecore_X.h 4 Jun 2006 05:30:37 - 1.168 @@ -44,6 +44,7 @@ #ifndef _ECORE_X_WINDOW_PREDEF typedef Ecore_X_ID Ecore_X_Window; #endif +typedef void * Ecore_X_Visual; typedef Ecore_X_ID Ecore_X_Pixmap; typedef Ecore_X_ID Ecore_X_Drawable; typedef void * Ecore_X_GC; @@ -1384,11 +1385,10 @@ Ecore_X_Gravitywindow_gravity; Ecore_X_Gravitypixel_gravity; Ecore_X_Colormap colormap; + Ecore_X_Visual visual; /* FIXME: missing -* Colormap comormap; * int map_installed; * Screen *screen; -* Visual *visual; */ } Ecore_X_Window_Attributes; === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_x/ecore_x.c,v retrieving revision 1.111 retrieving revision 1.112 diff -u -3 -r1.111 -r1.112 --- ecore_x.c 19 May 2006 15:09:50 - 1.111 +++ ecore_x.c 4 Jun 2006 05:30:37 - 1.112 @@ -1097,6 +1097,7 @@ att_ret->window_gravity = att.win_gravity; att_ret->pixel_gravity = att.win_gravity; att_ret->colormap = att.colormap; + att_ret->visual = att.visual; return 1; } ___ 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_window.c
Log Message:
- this needs the X11 engine
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_window.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- ewl_window.c5 Jun 2006 05:16:20 - 1.48
+++ ewl_window.c5 Jun 2006 06:16:30 - 1.49
@@ -1094,6 +1094,7 @@
DCHECK_TYPE("w", w, EWL_WIDGET_TYPE);
win = EWL_WINDOW(w);
+#ifdef ENABLE_EWL_SOFTWARE_X11
if (win->flags & EWL_WINDOW_GRAB_KEYBOARD)
ecore_x_keyboard_grab((Ecore_X_Window)win->window);
@@ -1110,6 +,7 @@
else if (grabval == GrabInvalidTime)
printf("GrabInvalidTime\n");
}
+#endif
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_icon_viewer.c
Log Message:
* Disable dnd in icon view, until such time as iconbox supports it properly
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_icon_viewer.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- etk_icon_viewer.c 4 Jun 2006 12:47:10 - 1.11
+++ etk_icon_viewer.c 4 Jun 2006 13:09:38 - 1.12
@@ -443,11 +443,11 @@
instance->layout_parent = layout;
/*DND Setup*/
- dnd_types_num = 1;
+ /* dnd_types_num = 1;
dnd_types = entropy_malloc(dnd_types_num* sizeof(char*));
dnd_types[0] = strdup("text/uri-list");
etk_widget_dnd_source_set(viewer->iconbox, ETK_TRUE);
- etk_signal_connect("drag_begin", ETK_OBJECT(viewer->iconbox) ,
ETK_CALLBACK(_entropy_etk_icon_viewer_drag_begin_cb), instance);
+ etk_signal_connect("drag_begin", ETK_OBJECT(viewer->iconbox) ,
ETK_CALLBACK(_entropy_etk_icon_viewer_drag_begin_cb), instance);*/
/*Register out interest in receiving folder notifications */
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_utils dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/data/eapp_edit Removed Files: .cvsignore Makefile.am Log Message: - rename e_utils_eapp_edit to just eap_edit. nothing else in e_utils uses a e_utils prefix - remove the eapp_edit files from the data/ directory as it dosen't use custom themeing anymore ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: cpu devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : cpu
Dir : e_modules/cpu
Modified Files:
Makefile.am e_mod_main.h e_mod_main.c
Added Files:
module.eap
Log Message:
Make cpu module build again at elvelind's request, and show in module list.
No shelf code yet, draws to the desktop.
Note: This module will be removed when E gets its "official" cpu load module.
===
RCS file: /cvs/e/e_modules/cpu/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Makefile.am 13 May 2006 02:00:54 - 1.5
+++ Makefile.am 4 Jun 2006 09:58:41 - 1.6
@@ -9,6 +9,7 @@
cpu.edc \
VeraMono.ttf \
cpu.png \
+module.eap \
e_modules-cpu.spec e_modules-cpu.spec.in
# data files for the module
@@ -16,6 +17,7 @@
files_DATA = \
module_icon.png \
+module.eap \
cpu.edj
# the module .so file
===
RCS file: /cvs/e/e_modules/cpu/e_mod_main.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_mod_main.h5 Apr 2006 17:48:48 - 1.8
+++ e_mod_main.h4 Jun 2006 09:58:41 - 1.9
@@ -56,7 +56,6 @@
EAPI void *e_modapi_init(E_Module *m);
EAPI int e_modapi_shutdown(E_Module *m);
EAPI int e_modapi_save(E_Module *m);
-EAPI int e_modapi_info(E_Module *m);
EAPI int e_modapi_about(E_Module *m);
EAPI int e_modapi_config(E_Module *m);
===
RCS file: /cvs/e/e_modules/cpu/e_mod_main.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_mod_main.c5 Apr 2006 17:48:48 - 1.18
+++ e_mod_main.c4 Jun 2006 09:58:41 - 1.19
@@ -42,7 +42,6 @@
if (!c)
return NULL;
- m->config_menu = c->config_menu;
return c;
}
@@ -55,12 +54,6 @@
if (!c)
return 0;
- if (m->config_menu)
- {
-e_menu_deactivate(m->config_menu);
-e_object_del(E_OBJECT(m->config_menu));
-m->config_menu = NULL;
- }
if (c->cfd)
{
e_object_del(E_OBJECT(c->cfd));
@@ -79,13 +72,6 @@
if (!c)
return 0;
e_config_domain_save("module.cpu", c->conf_edd, c->conf);
- return 1;
-}
-
-EAPI int
-e_modapi_info(E_Module *m)
-{
- m->icon_file = strdup(PACKAGE_DATA_DIR "/module_icon.png");
return 1;
}
___
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_eap_editor.c e_int_border_menu.c
Log Message:
Make internal eap editor stop using weird names if possible, and use a name
from the border icccm.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- e_eap_editor.c 31 May 2006 18:58:26 - 1.27
+++ e_eap_editor.c 5 Jun 2006 15:36:02 - 1.28
@@ -160,7 +160,7 @@
eap->width = 128;
eap->height = 128;
- if ((eap->name) && (eap->exe))
+ if ((eap->name) && (eap->exe))
e_app_fields_save(eap);
return 1;
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_menu.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_int_border_menu.c 3 Jun 2006 02:47:54 - 1.21
+++ e_int_border_menu.c 5 Jun 2006 15:36:02 - 1.22
@@ -562,7 +562,7 @@
E_App *a;
E_Border *bd;
char *bname = NULL, *bclass = NULL;
-
+ char path[4096];
bd = data;
a = bd->app;
@@ -574,9 +574,16 @@
if (!a)
{
- a = e_app_empty_new(NULL);
- if (a)
+ if (bname)
{
+snprintf(path, sizeof(path), "%s/.e/e/applications/all/%s.eap",
getenv("HOME"), bname);
+a = e_app_empty_new(path);
+ }
+ else
+ a = e_app_empty_new(NULL);
+
+ if (a)
+ {
if (bname) a->win_name = evas_stringshare_add(bname);
if (bclass) a->win_class = evas_stringshare_add(bclass);
if (bd->client.icccm.window_role)
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_utils titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils Modified Files: AUTHORS Log Message: Redo the layout/look of eapp_edit. It looks very nice now. === RCS file: /cvs/e/e17/apps/e_utils/AUTHORS,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- AUTHORS 7 Mar 2006 22:03:19 - 1.6 +++ AUTHORS 5 Jun 2006 05:21:09 - 1.7 @@ -4,6 +4,7 @@ eapp_edit: Andrew (HandyAndE) Elcock +Stephen (LinuxTitan) Houston <[EMAIL PROTECTED]> emblem: entangle: ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_utils titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/eapp_edit Modified Files: eapp_edit_main.c Log Message: More free work. === RCS file: /cvs/e/e17/apps/e_utils/src/bin/eapp_edit/eapp_edit_main.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -3 -r1.53 -r1.54 --- eapp_edit_main.c5 Jun 2006 17:55:43 - 1.53 +++ eapp_edit_main.c5 Jun 2006 18:32:47 - 1.54 @@ -317,10 +317,11 @@ ewl_checkbutton_checked_set(EWL_CHECKBUTTON(checkbutton), v[0] == 1); ewl_widget_name_set(checkbutton, misc_keys[i].key); ewl_widget_show(checkbutton); + +if (v) free(v); +v = NULL; } - -if (v) free(v); -v = NULL; + if (ef) eet_close(ef); return 1; @@ -381,7 +382,7 @@ ewl_widget_name_set(entry, key); ewl_widget_show(entry); -if (v) free(v); +if (v && v != winclass) free(v); v = NULL; return; ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_utils dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/data Modified Files: Makefile.am Log Message: - rename e_utils_eapp_edit to just eap_edit. nothing else in e_utils uses a e_utils prefix - remove the eapp_edit files from the data/ directory as it dosen't use custom themeing anymore === RCS file: /cvs/e/e17/apps/e_utils/data/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- Makefile.am 7 Mar 2006 21:58:24 - 1.6 +++ Makefile.am 5 Jun 2006 17:02:08 - 1.7 @@ -4,10 +4,6 @@ e17genmenu_subdir = e17genmenu endif -if BUILD_EAPP_EDIT -eapp_edit_subdir = eapp_edit -endif - if BUILD_ENTANGLE entangle_subdir = entangle endif @@ -20,5 +16,5 @@ exige_subdir = exige endif -SUBDIRS = $(e17genmenu_subdir) $(eapp_edit_subdir) $(entangle_subdir) $(emblem_subdir) $(exige_subdir) +SUBDIRS = $(e17genmenu_subdir) $(entangle_subdir) $(emblem_subdir) $(exige_subdir) ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_utils dj2
Enlightenment CVS committal Author : dj2 Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils Modified Files: configure.in Log Message: - rename e_utils_eapp_edit to just eap_edit. nothing else in e_utils uses a e_utils prefix - remove the eapp_edit files from the data/ directory as it dosen't use custom themeing anymore === RCS file: /cvs/e/e17/apps/e_utils/configure.in,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- configure.in20 Apr 2006 02:34:40 - 1.24 +++ configure.in5 Jun 2006 17:02:08 - 1.25 @@ -138,7 +138,7 @@ ) build_e17genmenu="no" -build_eapp_edit="no" +build_eap_edit="no" build_e17setroot="no" build_entangle="no" build_emblem="no" @@ -146,7 +146,7 @@ build_ethemes="no" if test "x$have_ewl" = "xyes" -a "x$have_engrave" = "xyes"; then - build_eapp_edit="yes" + build_eap_edit="yes" fi if test "x$have_eet" = "xyes" -a "x$have_ecore" = "xyes" -a "x$have_engrave" = "xyes"; then @@ -174,7 +174,7 @@ fi AM_CONDITIONAL(BUILD_E17GENMENU, test "x$build_e17genmenu" = "xyes") -AM_CONDITIONAL(BUILD_EAPP_EDIT, test "x$build_eapp_edit" = "xyes") +AM_CONDITIONAL(BUILD_EAP_EDIT, test "x$build_eap_edit" = "xyes") AM_CONDITIONAL(BUILD_E17SETROOT, test "x$build_e17setroot" = "xyes") AM_CONDITIONAL(BUILD_ENTANGLE, test "x$build_entangle" = "xyes") AM_CONDITIONAL(BUILD_EMBLEM, test "x$build_emblem" = "xyes") @@ -209,8 +209,6 @@ data/entangle/default/Makefile data/exige/Makefile data/exige/default/Makefile -data/eapp_edit/Makefile -data/eapp_edit/default/Makefile src/Makefile src/bin/Makefile src/bin/e17genmenu/Makefile @@ -250,7 +248,7 @@ echo "Utilities that will be built:" echo echo " e17genmenu..: "$build_e17genmenu -echo " Eapp_Edit...: "$build_eapp_edit +echo " eap_edit: "$build_eap_edit echo " E17 Setroot.: "$build_e17setroot echo " Entangle: "$build_entangle echo " Emblem..: "$build_emblem ___ 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:
ecompmgr.c ecompmgr.h eobj.c eobj.h menus.c stacking.c
Log Message:
Fix incorrect damage region when raise actually lowers and vice versa
(do clip region update at proper point in sequence of things).
===
RCS file: /cvs/e/e16/e/src/ecompmgr.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -3 -r1.119 -r1.120
--- ecompmgr.c 1 Jun 2006 20:18:40 - 1.119
+++ ecompmgr.c 5 Jun 2006 20:57:07 - 1.120
@@ -1619,25 +1619,17 @@
}
void
-ECompMgrWinRaise(EObj * eo)
+ECompMgrWinRaiseLower(EObj * eo, int delta)
{
ECmWinInfo *cw = eo->cmhook;
- D1printf("ECompMgrWinRaise %#lx\n", EobjGetXwin(eo));
-
- _ECM_SET_STACK_CHANGED();
- ECompMgrDamageMergeObject(eo, cw->extents, 0);
-}
-
-void
-ECompMgrWinLower(EObj * eo)
-{
- ECmWinInfo *cw = eo->cmhook;
-
- D1printf("ECompMgrWinLower %#lx\n", EobjGetXwin(eo));
+ D1printf("ECompMgrWinRaiseLower %#lx delta=%d\n", EobjGetXwin(eo), delta);
+ if (delta < 0) /* Raise */
+ _ECM_SET_STACK_CHANGED();
ECompMgrDamageMergeObject(eo, cw->extents, 0);
- _ECM_SET_STACK_CHANGED();
+ if (delta > 0) /* Lower */
+ _ECM_SET_STACK_CHANGED();
}
void
@@ -2534,7 +2526,7 @@
if (eo && eo->type == EOBJ_TYPE_EXT && eo->cmhook)
{
eo->shown = 1;
-EobjListStackRaise(eo);
+EobjListStackRaise(eo, 0);
ECompMgrWinMap(eo);
}
break;
===
RCS file: /cvs/e/e16/e/src/ecompmgr.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- ecompmgr.h 1 Jun 2006 20:18:40 - 1.30
+++ ecompmgr.h 5 Jun 2006 20:57:07 - 1.31
@@ -49,8 +49,7 @@
voidECompMgrWinDamageArea(EObj * eo, int x, int y, int w,
int h);
voidECompMgrWinReparent(EObj * eo, Desk * dsk, int change_xy);
-voidECompMgrWinRaise(EObj * eo);
-voidECompMgrWinLower(EObj * eo);
+voidECompMgrWinRaiseLower(EObj * eo, int delta);
voidECompMgrWinChangeShape(EObj * eo);
voidECompMgrWinChangeOpacity(EObj * eo, unsigned int opacity);
Pixmap ECompMgrWinGetPixmap(const EObj * eo);
===
RCS file: /cvs/e/e16/e/src/eobj.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -3 -r1.78 -r1.79
--- eobj.c 3 Jun 2006 14:11:33 - 1.78
+++ eobj.c 5 Jun 2006 20:57:07 - 1.79
@@ -352,7 +352,7 @@
eo->shown = 1;
if (raise)
- EobjListStackRaise(eo);
+ EobjListStackRaise(eo, 0);
if (eo->stacked <= 0 || raise > 1)
DeskRestack(eo->desk);
@@ -472,13 +472,19 @@
{
int num;
- num = EobjListStackRaise(eo);
+ num = EobjListStackRaise(eo, 1);
if (num == 0)
return num;
+
+ if (num < 0)
+ num = EobjListStackRaise(eo, 0);
#if USE_COMPOSITE
if (eo->shown && eo->cmhook)
- ECompMgrWinRaise(eo);
+ ECompMgrWinRaiseLower(eo, num);
#endif
+ if (num > 0)
+ num = EobjListStackRaise(eo, 0);
+
return num;
}
@@ -487,13 +493,19 @@
{
int num;
- num = EobjListStackLower(eo);
+ num = EobjListStackLower(eo, 1);
if (num == 0)
return num;
+
+ if (num < 0)
+ num = EobjListStackLower(eo, 0);
#if USE_COMPOSITE
if (eo->shown && eo->cmhook)
- ECompMgrWinLower(eo);
+ ECompMgrWinRaiseLower(eo, num);
#endif
+ if (num > 0)
+ num = EobjListStackLower(eo, 0);
+
return num;
}
===
RCS file: /cvs/e/e16/e/src/eobj.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- eobj.h 21 May 2006 12:09:14 - 1.29
+++ eobj.h 5 Jun 2006 20:57:07 - 1.30
@@ -166,8 +166,8 @@
/* stacking.c */
voidEobjListStackAdd(EObj * eo, int ontop);
voidEobjListStackDel(EObj * eo);
-int EobjListStackRaise(EObj * eo);
-int EobjListStackLower(EObj * eo);
+int EobjListStackRaise(EObj * eo, int test);
+int EobjListStackLower(EObj * eo, int test);
int EobjListStackCheck(EObj * eo);
EObj *EobjListStackFind(Window win);
EObj *const *EobjListStackGet(int *num);
===
RCS file: /cvs/e/e16/e/src/menus.c,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -3 -r1.248 -r1.249
--- menus.c 3 Jun 2006 14:11:33 - 1.248
+++ menus.c 5 Jun 2006 20:57:07 - 1.249
@@ -984,7 +984,6 @@
E
