enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

'everything' added a more emacs styled quick nav version 

SVN revision: 47908
This commit is contained in:
Hannes Janetzek 2010-04-10 23:44:11 +00:00
parent a2dde82e7f
commit eb612dbaf7
3 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/modules/everything/evry.c
View File

@ -1335,7 +1335,8 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
old = ev->key;
if (evry_conf->quick_nav && (ev->modifiers & ECORE_EVENT_MODIFIER_ALT))
if (((evry_conf->quick_nav == 1) && (ev->modifiers & ECORE_EVENT_MODIFIER_ALT)) ||
((evry_conf->quick_nav == 2) && (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)))
{
if (!strcmp(ev->key, "k") || (!strcmp(ev->key, "K")))
key = eina_stringshare_add("Up");
@ -1356,9 +1357,34 @@ _evry_cb_key_down(void *data __UNUSED__, int type __UNUSED__, void *event)
else
key = eina_stringshare_add(ev->key);
ev->key = key;
}
else if (((evry_conf->quick_nav == 3) && (ev->modifiers & ECORE_EVENT_MODIFIER_ALT)) ||
((evry_conf->quick_nav == 4) && (ev->modifiers & ECORE_EVENT_MODIFIER_CTRL)))
{
if (!strcmp(ev->key, "p") || (!strcmp(ev->key, "P")))
key = eina_stringshare_add("Up");
else if (!strcmp(ev->key, "n") || (!strcmp(ev->key, "N")))
key = eina_stringshare_add("Down");
/* else if (!strcmp(ev->key, "f") || (!strcmp(ev->key, "f")))
* key = eina_stringshare_add("Next");
* else if (!strcmp(ev->key, "b") || (!strcmp(ev->key, "B")))
* key = eina_stringshare_add("Prior"); */
else if (!strcmp(ev->key, "f") || (!strcmp(ev->key, "F")))
key = eina_stringshare_add("Right");
else if (!strcmp(ev->key, "b") || (!strcmp(ev->key, "B")))
key = eina_stringshare_add("Left");
else if (!strcmp(ev->key, "i") || (!strcmp(ev->key, "I")))
key = eina_stringshare_add("Tab");
else if (!strcmp(ev->key, "m") || (!strcmp(ev->key, "M")))
key = eina_stringshare_add("Return");
else
key = eina_stringshare_add(ev->key);
ev->key = key;
}
else
{
key = eina_stringshare_add(ev->key);
ev->key = key;

11
src/modules/everything/evry_config.c
View File

@ -241,8 +241,15 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
&(cfdata->hide_list));
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, _("Quick Navigation (ALT + h,j,k,l,n,p,m,i)"),
&(cfdata->quick_nav));
ob = e_widget_label_add(evas, _("Quick Navigation"));
e_widget_framelist_object_append(of, ob);
rg = e_widget_radio_group_new(&cfdata->quick_nav);
ob = e_widget_radio_add(evas, _("Off"), 0, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Emacs style (ALT + n,p,f,b,m,i)"), 3, rg);
e_widget_framelist_object_append(of, ob);
ob = e_widget_radio_add(evas, _("Vi style (ALT + h,j,k,l,n,p,m,i)"), 1, rg);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);

6
src/modules/everything/evry_view_plugin_tabs.c
View File

@ -106,11 +106,11 @@ _tabs_update(Tab_View *v)
if (eina_list_count(s->cur_plugins) == 2)
e_box_pack_options_set(o, 1, 1, 0, 0, 0.0, 0.5,
120, 10, 120, 9999);
140, 10, 140, 9999);
else
e_box_pack_options_set(o, 1, 1, 1, 0, 0.0, 0.5,
(tab->mw < tab->cw ? tab->cw : tab->mw), 10,
(w ? w/3 : 120), 9999);
(w ? w/3 : 140), 9999);
if (s->plugin == p)
edje_object_signal_emit(o, "e,state,selected", "e");
else
@ -243,7 +243,7 @@ _tabs_key_down(Tab_View *v, const Ecore_Event_Key *ev)
_plugin_prev(v);
return 1;
}
else if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
else if (ev->modifiers & ECORE_EVENT_MODIFIER_SHIFT)
{
if (!strcmp(key, "Left"))
{