Hello!
After a long time without e hacking (ah, school ;D), here are some
patches...
>e_config_screen_ratio_support.patch: the preview ratio in background
and theme config windows will match your screen's: useful with
widescreens :) e_ilist-slider_more_keys_support.patch: enables to use
>[home] and [end] keys with ilist and slider, as well as keypad
equivalents. Something *really* weird is that it works even if NumLock
is enabled ??? Haven't really checked that, will do it asap.
>e_tlist_cleareance_support.patch: adds clearing for tlist
>e_typos.patch: various typos correction.
Cheers!
ilLogict
Index: apps/e/src/bin/e_int_config_background.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_int_config_background.c,v
retrieving revision 1.45
diff -u -r1.45 e_int_config_background.c
--- apps/e/src/bin/e_int_config_background.c 8 Apr 2006 21:56:03 -0000 1.45
+++ apps/e/src/bin/e_int_config_background.c 25 Apr 2006 21:27:31 -0000
@@ -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);
Index: apps/e/src/bin/e_int_config_theme.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_int_config_theme.c,v
retrieving revision 1.22
diff -u -r1.22 e_int_config_theme.c
--- apps/e/src/bin/e_int_config_theme.c 3 Apr 2006 14:01:00 -0000 1.22
+++ apps/e/src/bin/e_int_config_theme.c 25 Apr 2006 21:27:32 -0000
@@ -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);
Index: apps/e/src/bin/e_ilist.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_ilist.c,v
retrieving revision 1.19
diff -u -r1.19 e_ilist.c
--- apps/e/src/bin/e_ilist.c 13 Apr 2006 00:01:15 -0000 1.19
+++ apps/e/src/bin/e_ilist.c 25 Apr 2006 21:27:30 -0000
@@ -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;
Index: apps/e/src/bin/e_slider.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_slider.c,v
retrieving revision 1.6
diff -u -r1.6 e_slider.c
--- apps/e/src/bin/e_slider.c 2 Mar 2006 12:03:48 -0000 1.6
+++ apps/e/src/bin/e_slider.c 25 Apr 2006 21:27:36 -0000
@@ -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)
{
@@ -400,6 +404,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.);
+ }
}
static void
Index: apps/e/src/bin/e_tlist.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_tlist.c,v
retrieving revision 1.4
diff -u -r1.4 e_tlist.c
--- apps/e/src/bin/e_tlist.c 4 Mar 2006 15:10:31 -0000 1.4
+++ apps/e/src/bin/e_tlist.c 25 Apr 2006 21:27:36 -0000
@@ -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,
Index: apps/e/src/bin/e_tlist.h
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_tlist.h,v
retrieving revision 1.2
diff -u -r1.2 e_tlist.h
--- apps/e/src/bin/e_tlist.h 1 Mar 2006 05:41:57 -0000 1.2
+++ apps/e/src/bin/e_tlist.h 25 Apr 2006 21:27:36 -0000
@@ -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
Index: apps/e/src/bin/e_widget_tlist.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_widget_tlist.c,v
retrieving revision 1.3
diff -u -r1.3 e_widget_tlist.c
--- apps/e/src/bin/e_widget_tlist.c 4 Mar 2006 15:10:31 -0000 1.3
+++ apps/e/src/bin/e_widget_tlist.c 25 Apr 2006 21:27:37 -0000
@@ -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)
{
Index: apps/e/src/bin/e_widget_tlist.h
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_widget_tlist.h,v
retrieving revision 1.2
diff -u -r1.2 e_widget_tlist.h
--- apps/e/src/bin/e_widget_tlist.h 1 Mar 2006 05:41:57 -0000 1.2
+++ apps/e/src/bin/e_widget_tlist.h 25 Apr 2006 21:27:37 -0000
@@ -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
Index: apps/e/src/bin/e_config.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.166
diff -u -r1.166 e_config.c
--- apps/e/src/bin/e_config.c 21 Apr 2006 06:58:11 -0000 1.166
+++ apps/e/src/bin/e_config.c 25 Apr 2006 21:27:30 -0000
@@ -319,7 +319,7 @@
E_CONFIG_LIST(D, T, desktop_backgrounds, _e_config_desktop_bg_edd); /**/
E_CONFIG_LIST(D, T, desktop_names, _e_config_desktop_name_edd); /**/
E_CONFIG_VAL(D, T, menus_scroll_speed, DOUBLE); /**/
- E_CONFIG_VAL(D, T, menus_fast_mouse_move_threshhold, DOUBLE); /**/
+ E_CONFIG_VAL(D, T, menus_fast_mouse_move_threshold, DOUBLE); /**/
E_CONFIG_VAL(D, T, menus_click_drag_timeout, DOUBLE); /**/
E_CONFIG_VAL(D, T, border_shade_animate, INT); /**/
E_CONFIG_VAL(D, T, border_shade_transition, INT); /**/
@@ -510,7 +510,7 @@
e_config->desktop_default_background = NULL;
e_config->desktop_default_name = evas_stringshare_add("Desktop %i, %i");
e_config->menus_scroll_speed = 1000.0;
- e_config->menus_fast_mouse_move_threshhold = 300.0;
+ e_config->menus_fast_mouse_move_threshold = 300.0;
e_config->menus_click_drag_timeout = DEF_MENUCLICK;
e_config->border_shade_animate = 1;
e_config->border_shade_transition = E_TRANSITION_DECELERATE;
@@ -1128,7 +1128,7 @@
E_CONFIG_LIMIT(e_config->menus_scroll_speed, 1.0, 20000.0);
E_CONFIG_LIMIT(e_config->show_splash, 0, 1);
- E_CONFIG_LIMIT(e_config->menus_fast_mouse_move_threshhold, 1.0, 2000.0);
+ E_CONFIG_LIMIT(e_config->menus_fast_mouse_move_threshold, 1.0, 2000.0);
E_CONFIG_LIMIT(e_config->menus_click_drag_timeout, 0.0, 10.0);
E_CONFIG_LIMIT(e_config->border_shade_animate, 0, 1);
E_CONFIG_LIMIT(e_config->border_shade_transition, 0, 3);
Index: apps/e/src/bin/e_config.h
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_config.h,v
retrieving revision 1.95
diff -u -r1.95 e_config.h
--- apps/e/src/bin/e_config.h 20 Apr 2006 11:30:23 -0000 1.95
+++ apps/e/src/bin/e_config.h 25 Apr 2006 21:27:30 -0000
@@ -80,7 +80,7 @@
const char *desktop_default_name;
Evas_List *desktop_names;
double menus_scroll_speed; // GUI
- double menus_fast_mouse_move_threshhold; // GUI
+ double menus_fast_mouse_move_threshold; // GUI
double menus_click_drag_timeout; // GUI
int border_shade_animate; // GUI
int border_shade_transition; // GUI
Index: apps/e/src/bin/e_desklock.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_desklock.c,v
retrieving revision 1.13
diff -u -r1.13 e_desklock.c
--- apps/e/src/bin/e_desklock.c 18 Apr 2006 03:14:29 -0000 1.13
+++ apps/e/src/bin/e_desklock.c 25 Apr 2006 21:27:30 -0000
@@ -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);
Index: apps/e/src/bin/e_int_config_desklock.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_int_config_desklock.c,v
retrieving revision 1.13
diff -u -r1.13 e_int_config_desklock.c
--- apps/e/src/bin/e_int_config_desklock.c 4 Apr 2006 16:51:25 -0000 1.13
+++ apps/e/src/bin/e_int_config_desklock.c 25 Apr 2006 21:27:31 -0000
@@ -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;
Index: apps/e/src/bin/e_int_config_display.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_int_config_display.c,v
retrieving revision 1.4
diff -u -r1.4 e_int_config_display.c
--- apps/e/src/bin/e_int_config_display.c 12 Mar 2006 10:40:47 -0000 1.4
+++ apps/e/src/bin/e_int_config_display.c 25 Apr 2006 21:27:31 -0000
@@ -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);
}
Index: apps/e/src/bin/e_int_config_keybindings.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_int_config_keybindings.c,v
retrieving revision 1.18
diff -u -r1.18 e_int_config_keybindings.c
--- apps/e/src/bin/e_int_config_keybindings.c 17 Apr 2006 12:24:33 -0000 1.18
+++ apps/e/src/bin/e_int_config_keybindings.c 25 Apr 2006 21:27:32 -0000
@@ -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 }
};
Index: apps/e/src/bin/e_int_config_menus.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_int_config_menus.c,v
retrieving revision 1.5
diff -u -r1.5 e_int_config_menus.c
--- apps/e/src/bin/e_int_config_menus.c 13 Feb 2006 15:36:56 -0000 1.5
+++ apps/e/src/bin/e_int_config_menus.c 25 Apr 2006 21:27:32 -0000
@@ -15,7 +15,7 @@
/* Advanced */
double menus_scroll_speed;
- double menus_fast_mouse_move_threshhold;
+ double menus_fast_mouse_move_threshold;
double menus_click_drag_timeout;
int menu_autoscroll_margin;
int menu_autoscroll_cursor_margin;
@@ -47,7 +47,7 @@
cfdata->menu_eap_generic_show = e_config->menu_eap_generic_show;
cfdata->menu_eap_comment_show = e_config->menu_eap_comment_show;
cfdata->menus_scroll_speed = e_config->menus_scroll_speed;
- cfdata->menus_fast_mouse_move_threshhold = e_config->menus_fast_mouse_move_threshhold;
+ cfdata->menus_fast_mouse_move_threshold = e_config->menus_fast_mouse_move_threshold;
cfdata->menus_click_drag_timeout = e_config->menus_click_drag_timeout;
cfdata->menu_autoscroll_margin = e_config->menu_autoscroll_margin;
cfdata->menu_autoscroll_cursor_margin = e_config->menu_autoscroll_cursor_margin;
@@ -90,10 +90,10 @@
of = e_widget_framelist_add(evas, _("Menu Settings"), 0);
ob = e_widget_check_add(evas, _("Show Name In Menu"), &(cfdata->menu_eap_name_show));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_check_add(evas, _("Show Comment In Menu"), &(cfdata->menu_eap_comment_show));
- e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Show Generic In Menu"), &(cfdata->menu_eap_generic_show));
e_widget_framelist_object_append(of, ob);
+ ob = e_widget_check_add(evas, _("Show Comment In Menu"), &(cfdata->menu_eap_comment_show));
+ e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
return o;
}
@@ -111,10 +111,10 @@
else
e_config->menus_scroll_speed = cfdata->menus_scroll_speed;
- if (cfdata->menus_fast_mouse_move_threshhold == 0)
- e_config->menus_fast_mouse_move_threshhold = 1.0;
+ if (cfdata->menus_fast_mouse_move_threshold == 0)
+ e_config->menus_fast_mouse_move_threshold = 1.0;
else
- e_config->menus_fast_mouse_move_threshhold = cfdata->menus_fast_mouse_move_threshhold;
+ e_config->menus_fast_mouse_move_threshold = cfdata->menus_fast_mouse_move_threshold;
e_config->menus_click_drag_timeout = cfdata->menus_click_drag_timeout;
e_config->menu_autoscroll_margin = cfdata->menu_autoscroll_margin;
@@ -133,10 +133,10 @@
of = e_widget_framelist_add(evas, _("Menu Settings"), 0);
ob = e_widget_check_add(evas, _("Show Name In Menu"), &(cfdata->menu_eap_name_show));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_check_add(evas, _("Show Comment In Menu"), &(cfdata->menu_eap_comment_show));
- e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Show Generic In Menu"), &(cfdata->menu_eap_generic_show));
e_widget_framelist_object_append(of, ob);
+ ob = e_widget_check_add(evas, _("Show Comment In Menu"), &(cfdata->menu_eap_comment_show));
+ e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
of = e_widget_framelist_add(evas, _("Autoscroll Settings"), 0);
@@ -155,9 +155,9 @@
e_widget_framelist_object_append(of, ob);
ob = e_widget_slider_add(evas, 1, 0, _("%5.0f pixels/sec"), 0.0, 20000.0, 100.0, 0, &(cfdata->menus_scroll_speed), NULL, 200);
e_widget_framelist_object_append(of, ob);
- ob = e_widget_label_add(evas, _("Fast Mouse Move Threshhold"));
+ ob = e_widget_label_add(evas, _("Fast Mouse Move Threshold"));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_slider_add(evas, 1, 0, _("%4.0f pixels/sec"), 0.0, 2000.0, 10.0, 0, &(cfdata->menus_fast_mouse_move_threshhold), NULL, 200);
+ ob = e_widget_slider_add(evas, 1, 0, _("%4.0f pixels/sec"), 0.0, 2000.0, 10.0, 0, &(cfdata->menus_fast_mouse_move_threshold), NULL, 200);
e_widget_framelist_object_append(of, ob);
ob = e_widget_label_add(evas, _("Click Drag Timeout"));
e_widget_framelist_object_append(of, ob);
Index: apps/e/src/bin/e_ipc_handlers.h
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_ipc_handlers.h,v
retrieving revision 1.128
diff -u -r1.128 e_ipc_handlers.h
--- apps/e/src/bin/e_ipc_handlers.h 9 Apr 2006 11:55:18 -0000 1.128
+++ apps/e/src/bin/e_ipc_handlers.h 25 Apr 2006 21:27:35 -0000
@@ -2131,8 +2131,8 @@
REQ_DOUBLE(atof(params[0]), HDL);
#elif (TYPE == E_WM_IN)
START_DOUBLE(val, HDL);
- e_config->menus_fast_mouse_move_threshhold = val;
- E_CONFIG_LIMIT(e_config->menus_fast_mouse_move_threshhold, 1.0, 2000.0);
+ e_config->menus_fast_mouse_move_threshold = val;
+ E_CONFIG_LIMIT(e_config->menus_fast_mouse_move_threshold, 1.0, 2000.0);
SAVE;
END_DOUBLE;
#elif (TYPE == E_REMOTE_IN)
@@ -2146,7 +2146,7 @@
#elif (TYPE == E_REMOTE_OUT)
REQ_NULL(HDL);
#elif (TYPE == E_WM_IN)
- SEND_DOUBLE(e_config->menus_fast_mouse_move_threshhold, E_IPC_OP_MENUS_FAST_MOVE_THRESHOLD_GET_REPLY, HDL);
+ SEND_DOUBLE(e_config->menus_fast_mouse_move_threshold, E_IPC_OP_MENUS_FAST_MOVE_THRESHOLD_GET_REPLY, HDL);
#elif (TYPE == E_REMOTE_IN)
#endif
#undef HDL
Index: apps/e/src/bin/e_utils.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_utils.c,v
retrieving revision 1.40
diff -u -r1.40 e_utils.c
--- apps/e/src/bin/e_utils.c 2 Mar 2006 12:03:48 -0000 1.40
+++ apps/e/src/bin/e_utils.c 25 Apr 2006 21:27:37 -0000
@@ -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);
Index: apps/e/src/bin/e_zone.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_zone.c,v
retrieving revision 1.93
diff -u -r1.93 e_zone.c
--- apps/e/src/bin/e_zone.c 15 Apr 2006 12:48:21 -0000 1.93
+++ apps/e/src/bin/e_zone.c 25 Apr 2006 21:27:37 -0000
@@ -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);
Index: apps/e/src/bin/e_menu.c
===================================================================
RCS file: /var/cvs/e/e17/apps/e/src/bin/e_menu.c,v
retrieving revision 1.49
diff -u -r1.49 e_menu.c
--- apps/e/src/bin/e_menu.c 10 Feb 2006 12:21:22 -0000 1.49
+++ apps/e/src/bin/e_menu.c 25 Apr 2006 21:27:36 -0000
@@ -253,7 +253,7 @@
break;
case E_MENU_POP_DIRECTION_RIGHT:
m->cur.x = x + w;
- m->cur.y = y ;
+ m->cur.y = y;
_e_menu_activate_first();
break;
case E_MENU_POP_DIRECTION_UP:
@@ -282,8 +282,6 @@
m->cur.y = y + h;
break;
}
- pmi = _e_menu_item_active_get();
- if (pmi) e_menu_item_active_set(pmi, 0);
}
EAPI void
@@ -2585,7 +2583,7 @@
ev = event;
if (ev->win != _e_menu_win) return 1;
- fast_move_threshold = e_config->menus_fast_mouse_move_threshhold;
+ fast_move_threshold = e_config->menus_fast_mouse_move_threshold;
dx = ev->x - _e_menu_x;
dy = ev->y - _e_menu_y;
d = (dx * dx) + (dy * dy);
