Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_desklock.c e_ilist.c e_int_config_background.c
e_int_config_desklock.c e_int_config_display.c
e_int_config_fonts.c e_int_config_keybindings.c
e_int_config_theme.c e_int_shelf_config.c e_menu.c e_slider.c
e_tlist.c e_tlist.h e_utils.c e_widget_tlist.c
e_widget_tlist.h e_zone.c
Log Message:
illogict patches (minus a few that will break config despite fixing a typo)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_desklock.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_desklock.c 18 Apr 2006 03:14:29 -0000 1.13
+++ e_desklock.c 30 Apr 2006 04:31:42 -0000 1.14
@@ -171,7 +171,7 @@
/* everything failed - cant lock */
e_util_dialog_show(_("Lock Failed"),
_("Locking the desktop failed because some
application<br>"
- "has grabbed either they keyboard or the mouse or
both<br>"
+ "has grabbed either the keyboard or the mouse or
both<br>"
"and their grab is unable to be broken."));
ecore_x_window_del(edd->elock_wnd);
free(edd);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_ilist.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_ilist.c 13 Apr 2006 00:01:15 -0000 1.19
+++ e_ilist.c 30 Apr 2006 04:31:42 -0000 1.20
@@ -441,45 +441,92 @@
sd = data;
ev = event_info;
- if (!strcmp(ev->keyname, "Up"))
+ if ((!strcmp(ev->keyname, "Up")) ||
+ (!strcmp(ev->keyname, "KP_Up")))
{
int n, ns;
E_Smart_Item *si;
ns = e_ilist_selected_get(sd->smart_obj);
+ n = ns;
do
{
- n = e_ilist_selected_get(sd->smart_obj);
if (n == 0)
{
- e_ilist_selected_set(sd->smart_obj, ns);
+ n = ns;
break;
}
- e_ilist_selected_set(sd->smart_obj, n - 1);
- si = evas_list_nth(sd->items, sd->selected);
+ -- n;
+ si = evas_list_nth(sd->items, n);
}
while ((si) && (si->header));
+ if (n != ns) e_ilist_selected_set(sd->smart_obj, n);
}
- else if (!strcmp(ev->keyname, "Down"))
+ else if ((!strcmp(ev->keyname, "Down")) ||
+ (!strcmp(ev->keyname, "KP_Down")))
{
int n, ns;
E_Smart_Item *si;
ns = e_ilist_selected_get(sd->smart_obj);
+ n = ns;
do
{
- n = e_ilist_selected_get(sd->smart_obj);
if (n == (evas_list_count(sd->items) - 1))
{
- e_ilist_selected_set(sd->smart_obj, ns);
+ n = ns;
break;
}
- e_ilist_selected_set(sd->smart_obj, n + 1);
- si = evas_list_nth(sd->items, sd->selected);
+ ++ n;
+ si = evas_list_nth(sd->items, n);
}
while ((si) && (si->header));
+ if (n != ns) e_ilist_selected_set(sd->smart_obj, n);
+ }
+ else if ((!strcmp(ev->keyname, "Home")) ||
+ (!strcmp(ev->keyname, "KP_Home")))
+ {
+ int n, ns;
+ E_Smart_Item *si;
+
+ ns = e_ilist_selected_get(sd->smart_obj);
+ n = -1;
+ do
+ {
+ if (n == (evas_list_count(sd->items) - 1))
+ {
+ n = ns;
+ break;
+ }
+ ++ n;
+ si = evas_list_nth(sd->items, n);
+ }
+ while ((si) && (si->header));
+ if (n != ns) e_ilist_selected_set(sd->smart_obj, n);
+ }
+ else if ((!strcmp(ev->keyname, "End")) ||
+ (!strcmp(ev->keyname, "KP_End")))
+ {
+ int n, ns;
+ E_Smart_Item *si;
+
+ ns = e_ilist_selected_get(sd->smart_obj);
+ n = evas_list_count(sd->items);
+ do
+ {
+ if (n == 0)
+ {
+ n = ns;
+ break;
+ }
+ -- n;
+ si = evas_list_nth(sd->items, n);
+ }
+ while ((si) && (si->header));
+ if (n != ns) e_ilist_selected_set(sd->smart_obj, n);
}
else if ((!strcmp(ev->keyname, "Return")) ||
+ (!strcmp(ev->keyname, "KP_Enter")) ||
(!strcmp(ev->keyname, "space")))
{
E_Smart_Item *si;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_background.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- e_int_config_background.c 8 Apr 2006 21:56:03 -0000 1.45
+++ e_int_config_background.c 30 Apr 2006 04:31:42 -0000 1.46
@@ -276,6 +276,9 @@
Evas_List *bg_dirs, *bg;
Ecore_Evas *eebuf;
Evas *evasbuf;
+ E_Manager *man;
+ Ecore_X_Screen_Size size;
+
const char *f;
char *c;
int selnum = -1;
@@ -310,7 +313,9 @@
i++;
}
- im = e_widget_preview_add(cfd->dia->win->evas, 320, 240);
+ man = e_manager_current_get();
+ size = ecore_x_randr_current_screen_size_get(man->root);
+ im = e_widget_preview_add(cfd->dia->win->evas, 320, 320 * size.height /
size.width);
e_widget_preview_edje_set(im, f, "desktop/background");
evas_object_del(bg_obj);
// im = e_widget_preview_add_from_object(cfd->dia->win->evas, bg_obj, 320,
240);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_desklock.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_int_config_desklock.c 4 Apr 2006 16:51:25 -0000 1.13
+++ e_int_config_desklock.c 30 Apr 2006 04:31:42 -0000 1.14
@@ -45,7 +45,7 @@
#ifdef HAVE_PAM
static void _e_desklock_cb_syswide_auth_method(void *data, Evas_Object *obj,
const char *emission, const char
*source);
-static void _e_desklock_cb_personilized_auth_method(void *data, Evas_Object
*obj,
+static void _e_desklock_cb_personalized_auth_method(void *data, Evas_Object
*obj,
const char *emission, const
char *source);
#endif
@@ -275,7 +275,7 @@
rwd = e_widget_data_get(oc);
edje_object_signal_callback_add(rwd->o_radio, "toggle_on", "",
- _e_desklock_cb_personilized_auth_method,
cfdata);
+ _e_desklock_cb_personalized_auth_method,
cfdata);
}
e_widget_list_object_append(o, of, 1, 1, 0.5);
#endif
@@ -476,7 +476,7 @@
wd = e_widget_data_get(oc);
edje_object_signal_callback_add(wd->o_radio, "toggle_on", "",
-
_e_desklock_cb_personilized_auth_method, cfdata);
+
_e_desklock_cb_personalized_auth_method, cfdata);
}
e_widget_table_object_append(ot, of, 0, 2, 1, 1, 1, 1, 1, 1);
#endif
@@ -893,7 +893,7 @@
}
static void
-_e_desklock_cb_personilized_auth_method(void *data, Evas_Object *obj, const
char *emission,
+_e_desklock_cb_personalized_auth_method(void *data, Evas_Object *obj, const
char *emission,
const char *source)
{
E_Config_Dialog_Data *cfdata;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_display.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_int_config_display.c 12 Mar 2006 10:40:47 -0000 1.4
+++ e_int_config_display.c 30 Apr 2006 04:31:42 -0000 1.5
@@ -92,12 +92,24 @@
char buf[4096];
if (!sb->dia) return;
- snprintf(buf, sizeof(buf),
- _("Does this look OK? Press <hilight>Yes</hilight> if it does, or
No if not.<br>"
- "If you do not press a button the old resolution of<br>"
- "%dx%d at %d Hz will be restored in %d seconds."),
- sb->orig_size.width, sb->orig_size.height,
- sb->orig_rate.rate, sb->iterations);
+ if (sb->iterations > 1)
+ {
+ snprintf(buf, sizeof(buf),
+ _("Does this look OK? Press <hilight>Yes</hilight> if it does,
or No if not.<br>"
+ "If you do not press a button, the old resolution of<br>"
+ "%dx%d at %d Hz will be restored in %d seconds."),
+ sb->orig_size.width, sb->orig_size.height,
+ sb->orig_rate.rate, sb->iterations);
+ }
+ else
+ {
+ snprintf(buf, sizeof(buf),
+ _("Does this look OK? Press <hilight>Yes</hilight> if it does,
or No if not.<br>"
+ "If you do not press a button, the old resolution of<br>"
+ "%dx%d at %d Hz will be restored
<hilight>IMMEDIATELY</hilight>."),
+ sb->orig_size.width, sb->orig_size.height,
+ sb->orig_rate.rate);
+ }
e_dialog_text_set(sb->dia, buf);
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_fonts.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_int_config_fonts.c 24 Apr 2006 16:08:20 -0000 1.11
+++ e_int_config_fonts.c 30 Apr 2006 04:31:42 -0000 1.12
@@ -381,7 +381,7 @@
e_widget_list_object_append(o, of, 1, 1, 0.5);
/* Create Hinting Widgets */
- of = e_widget_framelist_add(evas, _("Hinting"), 0);
+ of = e_widget_framelist_add(evas, _("Hinting"), 1);
e_widget_framelist_content_align_set(of, 0.5, 0.5);
rg = e_widget_radio_group_new(&(cfdata->hinting));
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_keybindings.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_int_config_keybindings.c 17 Apr 2006 12:24:33 -0000 1.18
+++ e_int_config_keybindings.c 30 Apr 2006 04:31:42 -0000 1.19
@@ -12,7 +12,7 @@
#define BINDING_LIST_ICON_W 16
#define BINDING_LIST_ICON_H 16
-#define BTN_ASSIGN_KEYBINDING_TEXT _("Assign Key Binding...")
+#define BTN_ASSIGN_KEYBINDING_TEXT _("Assign Key Bindingâ¦")
#define TEXT_ACTION _("Action")
#define TEXT_NONE_ACTION_KEY _("<None>")
@@ -98,13 +98,13 @@
EDIT_RESTRICT_ACTION |
EDIT_RESTRICT_PARAMS },
{"Flip Desktop By", "desk_flip_by", NULL, _NONDEFAULT_ACTION,
EDIT_RESTRICT_ACTION },
{"Flip Desktop To", "desk_flip_to", NULL, _NONDEFAULT_ACTION,
EDIT_RESTRICT_ACTION },
-/* These fuck with a lot of bindings like firefox, irssi, bitchx etc...
+/* These fuck with a lot of bindings like firefox, irssi, bitchx etcâ¦
{"Switch To Left Desktop", "desk_linear_flip_by", "-1", _DEFAULT_ACTION,
EDIT_RESTRICT_ACTION |
EDIT_RESTRICT_PARAMS },
{"Switch To Right Desktop", "desk_linear_flip_by", "1", _DEFAULT_ACTION,
EDIT_RESTRICT_ACTION |
EDIT_RESTRICT_PARAMS },
*/
- {"Flip Desktop Linearly...", "desk_linear_flip_by", NULL, _NONDEFAULT_ACTION,
+ {"Flip Desktop Linearlyâ¦", "desk_linear_flip_by", NULL, _NONDEFAULT_ACTION,
EDIT_RESTRICT_ACTION },
{"Switch To Desktop 0", "desk_linear_flip_to", "0", _DEFAULT_ACTION,
EDIT_RESTRICT_ACTION |
EDIT_RESTRICT_PARAMS },
@@ -130,7 +130,7 @@
EDIT_RESTRICT_ACTION |
EDIT_RESTRICT_PARAMS },
{"Switch To Desktop 11", "desk_linear_flip_to", "11", _DEFAULT_ACTION,
EDIT_RESTRICT_ACTION |
EDIT_RESTRICT_PARAMS },
- {"Switch To Desktop...", "desk_linear_flip_to", NULL, _NONDEFAULT_ACTION,
EDIT_RESTRICT_ACTION },
+ {"Switch To Desktopâ¦", "desk_linear_flip_to", NULL, _NONDEFAULT_ACTION,
EDIT_RESTRICT_ACTION },
{"Run Command", "exebuf", NULL, _DEFAULT_ACTION, EDIT_RESTRICT_ACTION |
EDIT_RESTRICT_PARAMS },
{"Exit Enlightenment", "exit", NULL,
@@ -144,7 +144,7 @@
EDIT_RESTRICT_ACTION |
EDIT_RESTRICT_PARAMS },
{"Show Clients Menu", "menu_show", "clients", _DEFAULT_ACTION,
EDIT_RESTRICT_ACTION |
EDIT_RESTRICT_PARAMS },
- {"Show Menu...", "menu_show", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION
},
+ {"Show Menuâ¦", "menu_show", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION
},
{"Desktop Lock", "desk_lock", NULL, _DEFAULT_ACTION,
EDIT_RESTRICT_ACTION |
EDIT_RESTRICT_PARAMS },
@@ -161,7 +161,7 @@
EDIT_RESTRICT_ACTION |
EDIT_RESTRICT_PARAMS },
{"Window Move To Previous Desktop", "window_desk_move_by", "-1 0",
_DEFAULT_ACTION,
EDIT_RESTRICT_ACTION |
EDIT_RESTRICT_PARAMS },
- {"Window Move By Desktop...", "window_desk_move_by", NULL, _DEFAULT_ACTION,
+ {"Window Move By Desktopâ¦", "window_desk_move_by", NULL, _DEFAULT_ACTION,
EDIT_RESTRICT_ACTION },
{"Window Move To Desktop 0", "window_desk_move_to", "0", _DEFAULT_ACTION,
EDIT_RESTRICT_ACTION |
EDIT_RESTRICT_PARAMS },
@@ -187,7 +187,7 @@
EDIT_RESTRICT_ACTION |
EDIT_RESTRICT_PARAMS },
{"Window Move To Desktop 11", "window_desk_move_to", "11", _DEFAULT_ACTION,
EDIT_RESTRICT_ACTION |
EDIT_RESTRICT_PARAMS },
- {"Window Move To Desktop...", "window_desk_move_to", NULL,
_NONDEFAULT_ACTION,
+ {"Window Move To Desktopâ¦", "window_desk_move_to", NULL,
_NONDEFAULT_ACTION,
EDIT_RESTRICT_ACTION
},
{"Window Maximize", "window_maximized_toggle", NULL, _DEFAULT_ACTION,
EDIT_RESTRICT_ACTION },
{"Window Maximize Vertically", "window_maximized_toggle", "vertical",
_DEFAULT_ACTION,
@@ -218,15 +218,15 @@
{"Window Menu", "window_menu", NULL, _DEFAULT_ACTION,
EDIT_RESTRICT_ACTION |
EDIT_RESTRICT_PARAMS },
- {"Window Move...", "window_move", NULL, _NONDEFAULT_ACTION,
EDIT_RESTRICT_ACTION },
- {"Window Move To...", "window_move_to", NULL, _NONDEFAULT_ACTION,
EDIT_RESTRICT_ACTION },
- {"Window Move By...", "window_move_by", NULL, _NONDEFAULT_ACTION,
EDIT_RESTRICT_ACTION },
- {"Window Resize To...", "window_resize", NULL, _NONDEFAULT_ACTION,
EDIT_RESTRICT_ACTION },
- {"Window Resize By...", "window_resize_by", NULL, _NONDEFAULT_ACTION,
EDIT_RESTRICT_ACTION },
+ {"Window Moveâ¦", "window_move", NULL, _NONDEFAULT_ACTION,
EDIT_RESTRICT_ACTION },
+ {"Window Move Toâ¦", "window_move_to", NULL, _NONDEFAULT_ACTION,
EDIT_RESTRICT_ACTION },
+ {"Window Move Byâ¦", "window_move_by", NULL, _NONDEFAULT_ACTION,
EDIT_RESTRICT_ACTION },
+ {"Window Resize Toâ¦", "window_resize", NULL, _NONDEFAULT_ACTION,
EDIT_RESTRICT_ACTION },
+ {"Window Resize Byâ¦", "window_resize_by", NULL, _NONDEFAULT_ACTION,
EDIT_RESTRICT_ACTION },
{"Window Drag Icon", "window_drag_icon", NULL, _NONDEFAULT_ACTION,
EDIT_RESTRICT_ACTION },
{"Application", "app", NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_ACTION },
- {"User Defined Actions...", "exec", NULL, _NONDEFAULT_ACTION,
EDIT_RESTRICT_ACTION },
+ {"User Defined Actionsâ¦", "exec", NULL, _NONDEFAULT_ACTION,
EDIT_RESTRICT_ACTION },
// {"Unknown Action", NULL, NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_NONE },
{NULL, NULL, NULL, _NONDEFAULT_ACTION, EDIT_RESTRICT_NONE }
};
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_theme.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- e_int_config_theme.c 3 Apr 2006 14:01:00 -0000 1.22
+++ e_int_config_theme.c 30 Apr 2006 04:31:42 -0000 1.23
@@ -132,6 +132,8 @@
Ecore_Evas *eebuf;
Evas *evasbuf;
Evas_List *l, *paths;
+ E_Manager *man;
+ Ecore_X_Screen_Size size;
theme = edje_object_add(evas);
@@ -146,6 +148,9 @@
evasbuf = ecore_evas_get(eebuf);
o2 = edje_object_add(evasbuf);
+ man = e_manager_current_get();
+ size = ecore_x_randr_current_screen_size_get(man->root);
+
paths = e_path_dir_list_get(path_themes);
for (l = paths; l; l = l->next)
{
@@ -217,7 +222,7 @@
if (!(strcmp(themefile, cfdata->current_theme)))
{
selnum = i;
- im = e_widget_preview_add(evas, 320, 240);
+ im = e_widget_preview_add(evas, 320, 320 * size.height /
size.width);
e_widget_preview_edje_set(im, fulltheme,
"desktop/background");
// im = e_widget_image_add_from_object(evas, theme, 320,
240);
// e_widget_image_object_set(im,
e_thumb_evas_object_get(fulltheme, evas, 320, 240, 1));
@@ -239,7 +244,7 @@
if (im == NULL)
{
snprintf(fulltheme, sizeof(fulltheme),
PACKAGE_DATA_DIR"/data/themes/default.edj");
- im = e_widget_preview_add(evas, 320, 240);
+ im = e_widget_preview_add(evas, 320, 320 * size.height / size.width);
e_widget_preview_edje_set(im, fulltheme, "desktop/background");
// theme = e_thumb_generate_begin(fulltheme, 320, 240, evas, &theme, NULL,
NULL);
// im = e_widget_image_add_from_object(evas, theme, 320, 240);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_shelf_config.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_int_shelf_config.c 30 Apr 2006 03:43:47 -0000 1.3
+++ e_int_shelf_config.c 30 Apr 2006 04:31:42 -0000 1.4
@@ -178,22 +178,22 @@
of = e_widget_framelist_add(evas, _("Stacking"), 0);
rg = e_widget_radio_group_new(&(cfdata->layering));
- ob = e_widget_radio_add(evas, _("Below Everything"), 0, rg);
+ ob = e_widget_radio_add(evas, _("Above Everything"), 2, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Below Windows"), 1, rg);
e_widget_framelist_object_append(of, ob);
- ob = e_widget_radio_add(evas, _("Above Everything"), 2, rg);
+ ob = e_widget_radio_add(evas, _("Below Everything"), 0, rg);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o2, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Size"), 0);
ob = e_widget_check_add(evas, _("Shrink length fit contents"),
&(cfdata->fit_along));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_check_add(evas, _("Expand width to fit contents"),
&(cfdata->fit_size));
- e_widget_framelist_object_append(of, ob);
+// ob = e_widget_check_add(evas, _("Expand width to fit contents"),
&(cfdata->fit_size));
+// e_widget_framelist_object_append(of, ob);
ob = e_widget_label_add(evas, _("Shelf Size"));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_slider_add(evas, 1, 0, _("%3.0f pixels"), 4, 200, 4, 0, NULL,
&(cfdata->size), 200);
+ ob = e_widget_slider_add(evas, 1, 0, _("%3.0f pixels"), 4, 120, 4, 0, NULL,
&(cfdata->size), 200);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o2, of, 1, 1, 0.5);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_menu.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- e_menu.c 10 Feb 2006 12:21:22 -0000 1.49
+++ e_menu.c 30 Apr 2006 04:31:42 -0000 1.50
@@ -249,12 +249,12 @@
m->cur.y = y;
if ((m->cur.y + m->cur.h) > (m->zone->y + m->zone->h))
m->cur.y = y + h - m->cur.h;
- _e_menu_activate_first();
+// _e_menu_activate_first();
break;
case E_MENU_POP_DIRECTION_RIGHT:
m->cur.x = x + w;
- m->cur.y = y ;
- _e_menu_activate_first();
+ m->cur.y = y;
+// _e_menu_activate_first();
break;
case E_MENU_POP_DIRECTION_UP:
_e_menu_realize(m);
@@ -262,7 +262,7 @@
if ((m->cur.x + m->cur.w) > (m->zone->x + m->zone->w))
m->cur.x = x + w - m->cur.w;
m->cur.y = y - m->cur.h;
- _e_menu_activate_last();
+// _e_menu_activate_last();
break;
case E_MENU_POP_DIRECTION_DOWN:
_e_menu_realize(m);
@@ -272,7 +272,7 @@
m->cur.y = y + h;
if ((m->cur.y + m->cur.h) > (m->zone->y + m->zone->h))
m->cur.y = y + h - m->cur.h;
- _e_menu_activate_first();
+// _e_menu_activate_first();
break;
case E_MENU_POP_DIRECTION_AUTO:
_e_menu_auto_place(m, x, y, w, h);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_slider.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_slider.c 2 Mar 2006 12:03:48 -0000 1.6
+++ e_slider.c 30 Apr 2006 04:31:42 -0000 1.7
@@ -375,7 +375,9 @@
sd = data;
ev = event_info;
if ((!strcmp(ev->keyname, "Up")) ||
- (!strcmp(ev->keyname, "Left")))
+ (!strcmp(ev->keyname, "KP_Up")) ||
+ (!strcmp(ev->keyname, "Left")) ||
+ (!strcmp(ev->keyname, "KP_Left")))
{
if (sd->step_count > 0)
{
@@ -388,7 +390,9 @@
edje_object_part_drag_step(sd->edje_obj, "slider", -sd->step_size,
-sd->step_size);
}
else if ((!strcmp(ev->keyname, "Down")) ||
- (!strcmp(ev->keyname, "Right")))
+ (!strcmp(ev->keyname, "KP_Down")) ||
+ (!strcmp(ev->keyname, "Right")) ||
+ (!strcmp(ev->keyname, "KP_Right")))
{
if (sd->step_count > 0)
{
@@ -399,6 +403,16 @@
}
else
edje_object_part_drag_step(sd->edje_obj, "slider", sd->step_size,
sd->step_size);
+ }
+ else if ((!strcmp(ev->keyname, "Home")) ||
+ (!strcmp(ev->keyname, "KP_Home")))
+ {
+ edje_object_part_drag_value_set(sd->edje_obj, "slider", 0., 0.);
+ }
+ else if ((!strcmp(ev->keyname, "End")) ||
+ (!strcmp(ev->keyname, "KP_End")))
+ {
+ edje_object_part_drag_value_set(sd->edje_obj, "slider", 1., 1.);
}
}
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_tlist.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_tlist.c 4 Mar 2006 15:10:31 -0000 1.4
+++ e_tlist.c 30 Apr 2006 04:31:42 -0000 1.5
@@ -293,6 +293,22 @@
return evas_list_count(sd->items);
}
+EAPI void
+e_tlist_clear(Evas_Object *obj)
+{
+ INTERNAL_ENTRY;
+ while (sd->items)
+ {
+ E_Smart_Item *si;
+
+ si = sd->items->data;
+ sd->items = evas_list_remove_list(sd->items, sd->items);
+ evas_object_del(si->base_obj);
+ free(si);
+ }
+ sd->selected = -1;
+}
+
/* local subsystem functions */
static void
_e_tlist_append(Evas_Object * obj, char *label,
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_tlist.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_tlist.h 1 Mar 2006 05:41:57 -0000 1.2
+++ e_tlist.h 30 Apr 2006 04:31:42 -0000 1.3
@@ -35,6 +35,7 @@
EAPI void e_tlist_remove_num(Evas_Object * obj, int n);
EAPI void e_tlist_remove_label(Evas_Object * obj, char *label);
EAPI int e_tlist_count(Evas_Object * obj);
+EAPI void e_tlist_clear(Evas_Object * obj);
#endif
#endif
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_utils.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- e_utils.c 2 Mar 2006 12:03:48 -0000 1.40
+++ e_utils.c 30 Apr 2006 04:31:42 -0000 1.41
@@ -205,7 +205,7 @@
p2 = strrchr(penv_display, '.');
if ((p1) && (p2) && (p2 > p1)) /* "blah:x.y" */
{
- /* yes it could overflow... but who will voerflow DISPLAY eh? why? to
+ /* yes it could overflow... but who will overflow DISPLAY eh? why? to
* "exploit" your own applications running as you?
*/
strcpy(buf, penv_display);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_tlist.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_widget_tlist.c 4 Mar 2006 15:10:31 -0000 1.3
+++ e_widget_tlist.c 30 Apr 2006 04:31:42 -0000 1.4
@@ -194,6 +194,15 @@
evas_object_resize(wd->o_tlist, vw, mh);
}
+EAPI void
+e_widget_tlist_clear(Evas_Object *obj)
+{
+ E_Widget_Data *wd;
+
+ wd = e_widget_data_get(obj);
+ e_tlist_clear(wd->o_tlist);
+}
+
static void
_e_wid_del_hook(Evas_Object * obj)
{
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_tlist.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_widget_tlist.h 1 Mar 2006 05:41:57 -0000 1.2
+++ e_widget_tlist.h 30 Apr 2006 04:31:42 -0000 1.3
@@ -22,6 +22,7 @@
EAPI void e_widget_tlist_remove_num(Evas_Object * obj, int n);
EAPI void e_widget_tlist_remove_label(Evas_Object * obj, char
*label);
EAPI int e_widget_tlist_count(Evas_Object * obj);
+EAPI void e_widget_tlist_clear(Evas_Object * obj);
#endif
#endif
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_zone.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -3 -r1.93 -r1.94
--- e_zone.c 15 Apr 2006 12:48:21 -0000 1.93
+++ e_zone.c 30 Apr 2006 04:31:42 -0000 1.94
@@ -583,7 +583,7 @@
p2 = strrchr(penv_display, '.');
if ((p1) && (p2) && (p2 > p1)) /* "blah:x.y" */
{
- /* yes it could overflow... but who will voerflow DISPLAY eh? why? to
+ /* yes it could overflow... but who will overflow DISPLAY eh? why? to
* "exploit" your own applications running as you?
*/
strcpy(buf, penv_display);
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
