enlightenment
/
enlightenment
10
8
Fork 12
Code Issues 21 Pull Requests 1 Projects Releases Wiki Activity

Store and handle action names correctly. (patch from Igor Murzov)

Browse Source 
SVN revision: 81049
devs/princeamd/enlightenment-0.17-elive
Massimo Maiurana 11 years ago
parent c4175e62ec
commit 9f1d6e067e
16 changed files with 89 additions and 89 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/bin/e_actions.c
  2. 4
      src/modules/backlight/e_mod_main.c
  3. 4
      src/modules/clock/e_mod_main.c
  4. 4
      src/modules/conf/e_mod_main.c
  5. 8
      src/modules/everything/e_mod_main.c
  6. 4
      src/modules/everything/evry_plugin.c
  7. 4
      src/modules/fileman/e_mod_main.c
  8. 4
      src/modules/gadman/e_mod_main.c
  9. 2
      src/modules/ibar/e_mod_main.c
  10. 14
      src/modules/mixer/e_mod_main.c
  11. 12
      src/modules/pager/e_mod_main.c
  12. 20
      src/modules/quickaccess/e_mod_quickaccess.c
  13. 6
      src/modules/shot/e_mod_main.c
  14. 4
      src/modules/syscon/e_mod_main.c
  15. 36
      src/modules/tiling/e_mod_tiling.c
  16. 48
      src/modules/winlist/e_mod_main.c

4
src/bin/e_actions.c
Unescape View File

@ -3221,11 +3221,11 @@ e_actions_init(void)
/* window_jump_to */
ACT_GO(window_jump_to);
e_action_predef_name_set(_("Window : List"), _("Jump to window..."),
e_action_predef_name_set(N_("Window : List"), N_("Jump to window..."),
"window_jump_to", NULL, "syntax: icccm window name, example: urxvt-mutt", 1);
ACT_GO(window_jump_to_or_start);
e_action_predef_name_set(_("Window : List"), _("Jump to window... or start..."),
e_action_predef_name_set(N_("Window : List"), N_("Jump to window... or start..."),
"window_jump_to_or_start", NULL, "syntax: icccm_window_name application", 1);

4
src/modules/backlight/e_mod_main.c
Unescape View File

@ -490,7 +490,7 @@ e_modapi_init(E_Module *m)
if (act)
{
act->func.go = _e_mod_action_cb;
e_action_predef_name_set(_("Screen"), _("Backlight Controls"), "backlight", NULL, NULL, 0);
e_action_predef_name_set(N_("Screen"), N_("Backlight Controls"), "backlight", NULL, NULL, 0);
}
return m;
}
@ -500,7 +500,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
{
if (act)
{
e_action_predef_name_del(_("Screen"), _("Backlight Controls"));
e_action_predef_name_del("Screen", "Backlight Controls");
e_action_del("backlight");
act = NULL;
}

4
src/modules/clock/e_mod_main.c
Unescape View File

@ -862,7 +862,7 @@ e_modapi_init(E_Module *m)
act->func.go_mouse = _e_mod_action_cb_mouse;
act->func.go_edge = _e_mod_action_cb_edge;
e_action_predef_name_set(_("Clock"), _("Toggle calendar"), "clock", "show_calendar", NULL, 0);
e_action_predef_name_set(N_("Clock"), N_("Toggle calendar"), "clock", "show_calendar", NULL, 0);
}
clock_config->module = m;
@ -900,7 +900,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
{
if (act)
{
e_action_predef_name_del(_("Clock"), _("Toggle calendar"));
e_action_predef_name_del("Clock", "Toggle calendar");
e_action_del("clock");
act = NULL;
}

4
src/modules/conf/e_mod_main.c
Unescape View File

@ -269,7 +269,7 @@ e_modapi_init(E_Module *m)
if (act)
{
act->func.go = _e_mod_action_conf_cb;
e_action_predef_name_set(_("Launch"), _("Settings Panel"),
e_action_predef_name_set(N_("Launch"), N_("Settings Panel"),
"configuration", NULL, NULL, 0);
}
maug =
@ -342,7 +342,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
/* remove module-supplied action */
if (act)
{
e_action_predef_name_del(_("Launch"), _("Settings Panel"));
e_action_predef_name_del("Launch", "Settings Panel");
e_action_del("configuration");
act = NULL;
}

8
src/modules/everything/e_mod_main.c
Unescape View File

@ -46,8 +46,8 @@ e_modapi_init(E_Module *m)
act->func.go = _e_mod_action_cb;
act->func.go_edge = _e_mod_action_cb_edge;
e_action_predef_name_set
(_("Everything Launcher"),
_("Show Everything Launcher"),
(N_("Everything Launcher"),
N_("Show Everything Launcher"),
"everything", "", NULL, 0);
}
@ -195,8 +195,8 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
if (act)
{
e_action_predef_name_del(_("Everything Launcher"),
_("Show Everything Launcher"));
e_action_predef_name_del("Everything Launcher",
"Show Everything Launcher");
e_action_del("everything");
}

4
src/modules/everything/evry_plugin.c
Unescape View File

@ -176,7 +176,7 @@ evry_plugin_register(Evry_Plugin *p, int type, int priority)
char buf[256];
snprintf(buf, sizeof(buf), _("Show %s Plugin"), p->name);
e_action_predef_name_set(_("Everything Launcher"), buf,
e_action_predef_name_set(N_("Everything Launcher"), buf,
"everything", p->name, NULL, 1);
}
@ -207,7 +207,7 @@ evry_plugin_unregister(Evry_Plugin *p)
char buf[256];
snprintf(buf, sizeof(buf), _("Show %s Plugin"), p->name);
e_action_predef_name_del(_("Everything Launcher"), buf);
e_action_predef_name_del("Everything Launcher", buf);
}
}

4
src/modules/fileman/e_mod_main.c
Unescape View File

@ -52,7 +52,7 @@ e_modapi_init(E_Module *m)
if (act)
{
act->func.go = _e_mod_action_fileman_cb;
e_action_predef_name_set(_("Launch"), _("File Manager"),
e_action_predef_name_set(N_("Launch"), N_("File Manager"),
"fileman", NULL, "syntax: /path/to/dir or ~/path/to/dir or favorites or desktop, examples: /boot/grub, ~/downloads", 1);
}
maug = e_int_menus_menu_augmentation_add_sorted("main/1", _("Navigate"), _e_mod_menu_add, NULL, NULL, NULL);
@ -130,7 +130,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
/* remove module-supplied action */
if (act)
{
e_action_predef_name_del(_("Launch"), _("File Manager"));
e_action_predef_name_del("Launch", "File Manager");
e_action_del("fileman");
act = NULL;
}

4
src/modules/gadman/e_mod_main.c
Unescape View File

@ -80,7 +80,7 @@ e_modapi_init(E_Module *m)
if (Man->action)
{
Man->action->func.go = _gadman_action_cb;
e_action_predef_name_set(_("Gadgets"), _("Show/hide gadgets"),
e_action_predef_name_set(N_("Gadgets"), N_("Show/hide gadgets"),
"gadman_toggle", NULL, NULL, 0);
}
@ -106,7 +106,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
}
if (Man->action)
{
e_action_predef_name_del(_("Gadgets"), _("Show/hide gadgets"));
e_action_predef_name_del("Gadgets", "Show/hide gadgets");
e_action_del("gadman_toggle");
Man->action = NULL;
}

2
src/modules/ibar/e_mod_main.c
Unescape View File

@ -1814,7 +1814,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
_ibar_go_unfocus();
e_action_del("ibar_focus");
e_action_predef_name_del(N_("IBar"), N_("Focus IBar"));
e_action_predef_name_del("IBar", "Focus IBar");
act_ibar_focus = NULL;
e_gadcon_provider_unregister(&_gadcon_class);

14
src/modules/mixer/e_mod_main.c
Unescape View File

@ -11,7 +11,7 @@ static char tmpbuf[4096]; /* general purpose buffer, just use immediately */
static const char _conf_domain[] = "module.mixer";
static const char _name[] = "mixer";
const char _e_mixer_Name[] = "Mixer";
const char _e_mixer_Name[] = N_("Mixer");
Eina_Bool _mixer_using_default = EINA_FALSE;
E_Mixer_Volume_Get_Cb e_mod_mixer_volume_get;
E_Mixer_Volume_Set_Cb e_mod_mixer_volume_set;
@ -1403,7 +1403,7 @@ _mixer_actions_register(E_Mixer_Module_Context *ctxt)
if (ctxt->actions.incr)
{
ctxt->actions.incr->func.go = _mixer_cb_volume_increase;
e_action_predef_name_set(_(_e_mixer_Name), _(_lbl_increase),
e_action_predef_name_set(_e_mixer_Name, _lbl_increase,
_act_increase, NULL, NULL, 0);
}
}
@ -1414,7 +1414,7 @@ _mixer_actions_register(E_Mixer_Module_Context *ctxt)
if (ctxt->actions.decr)
{
ctxt->actions.decr->func.go = _mixer_cb_volume_decrease;
e_action_predef_name_set(_(_e_mixer_Name), _(_lbl_decrease),
e_action_predef_name_set(_e_mixer_Name, _lbl_decrease,
_act_decrease, NULL, NULL, 0);
}
}
@ -1425,7 +1425,7 @@ _mixer_actions_register(E_Mixer_Module_Context *ctxt)
if (ctxt->actions.mute)
{
ctxt->actions.mute->func.go = _mixer_cb_volume_mute;
e_action_predef_name_set(_(_e_mixer_Name), _(_lbl_mute), _act_mute,
e_action_predef_name_set(_e_mixer_Name, _lbl_mute, _act_mute,
NULL, NULL, 0);
e_managers_keys_ungrab();
e_managers_keys_grab();
@ -1438,21 +1438,21 @@ _mixer_actions_unregister(E_Mixer_Module_Context *ctxt)
{
if (ctxt->actions.incr)
{
e_action_predef_name_del(_(_e_mixer_Name), _(_lbl_increase));
e_action_predef_name_del(_e_mixer_Name, _lbl_increase);
e_action_del(_act_increase);
ctxt->actions.incr = NULL;
}
if (ctxt->actions.decr)
{
e_action_predef_name_del(_(_e_mixer_Name), _(_lbl_decrease));
e_action_predef_name_del(_e_mixer_Name, _lbl_decrease);
e_action_del(_act_decrease);
ctxt->actions.decr = NULL;
}
if (ctxt->actions.mute)
{
e_action_predef_name_del(_(_e_mixer_Name), _(_lbl_mute));
e_action_predef_name_del(_e_mixer_Name, _lbl_mute);
e_action_del(_act_mute);
e_managers_keys_ungrab();
e_managers_keys_grab();

12
src/modules/pager/e_mod_main.c
Unescape View File

@ -2963,12 +2963,12 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
e_action_del("pager_show");
e_action_del("pager_switch");
e_action_predef_name_del(N_("Pager"), N_("Popup Desk Right"));
e_action_predef_name_del(N_("Pager"), N_("Popup Desk Left"));
e_action_predef_name_del(N_("Pager"), N_("Popup Desk Up"));
e_action_predef_name_del(N_("Pager"), N_("Popup Desk Down"));
e_action_predef_name_del(N_("Pager"), N_("Popup Desk Next"));
e_action_predef_name_del(N_("Pager"), N_("Popup Desk Previous"));
e_action_predef_name_del("Pager", "Popup Desk Right");
e_action_predef_name_del("Pager", "Popup Desk Left");
e_action_predef_name_del("Pager", "Popup Desk Up");
e_action_predef_name_del("Pager", "Popup Desk Down");
e_action_predef_name_del("Pager", "Popup Desk Next");
e_action_predef_name_del("Pager", "Popup Desk Previous");
E_FREE(pager_config);
E_CONFIG_DD_FREE(conf_edd);

20
src/modules/quickaccess/e_mod_quickaccess.c
Unescape View File

@ -4,10 +4,10 @@ EINTERN int _e_qa_log_dom = -1;
static E_Action *_e_qa_toggle = NULL;
static E_Action *_e_qa_add = NULL;
static E_Action *_e_qa_del = NULL;
static const char _e_qa_name[] = "Quickaccess";
static const char _lbl_toggle[] = "Toggle Visibility";
static const char _lbl_add[] = "Add Quickaccess For Current Window";
static const char _lbl_del[] = "Remove Quickaccess From Current Window";
static const char _e_qa_name[] = N_("Quickaccess");
static const char _lbl_toggle[] = N_("Toggle Visibility");
static const char _lbl_add[] = N_("Add Quickaccess For Current Window");
static const char _lbl_del[] = N_("Remove Quickaccess From Current Window");
const char *_act_toggle = NULL;
static const char _act_add[] = "qa_add";
static const char _act_del[] = "qa_del";
@ -1306,11 +1306,11 @@ e_qa_init(void)
#undef CB
_e_qa_toggle->func.go = _e_qa_toggle_cb;
e_action_predef_name_set(_(_e_qa_name), _(_lbl_toggle), _act_toggle, NULL, _("quick access name/identifier"), 1);
e_action_predef_name_set(_e_qa_name, _lbl_toggle, _act_toggle, NULL, _("quick access name/identifier"), 1);
_e_qa_add->func.go = _e_qa_add_cb;
e_action_predef_name_set(_(_e_qa_name), _(_lbl_add), _act_add, NULL, NULL, 0);
e_action_predef_name_set(_e_qa_name, _lbl_add, _act_add, NULL, NULL, 0);
_e_qa_del->func.go = _e_qa_del_cb;
e_action_predef_name_set(_(_e_qa_name), _(_lbl_del), _act_del, NULL, NULL, 0);
e_action_predef_name_set(_e_qa_name, _lbl_del, _act_del, NULL, NULL, 0);
INF("loaded qa module, registered %s action.", _act_toggle);
border_hook = e_int_border_menu_hook_add(_e_qa_bd_menu_hook, NULL);
@ -1324,21 +1324,21 @@ e_qa_shutdown(void)
{
if (_e_qa_toggle)
{
e_action_predef_name_del(_(_e_qa_name), _(_lbl_toggle));
e_action_predef_name_del(_e_qa_name, _lbl_toggle);
e_action_del(_act_toggle);
_e_qa_toggle = NULL;
}
if (_e_qa_add)
{
e_action_predef_name_del(_(_e_qa_name), _(_lbl_add));
e_action_predef_name_del(_e_qa_name, _lbl_add);
e_action_del(_act_add);
_e_qa_add = NULL;
}
if (_e_qa_del)
{
e_action_predef_name_del(_(_e_qa_name), _(_lbl_del));
e_action_predef_name_del(_e_qa_name, _lbl_del);
e_action_del(_act_del);
_e_qa_del = NULL;

6
src/modules/shot/e_mod_main.c
Unescape View File

@ -974,14 +974,14 @@ e_modapi_init(E_Module *m)
if (act)
{
act->func.go = _e_mod_action_cb;
e_action_predef_name_set(_("Screen"), _("Take Screenshot"),
e_action_predef_name_set(N_("Screen"), N_("Take Screenshot"),
"shot", NULL, NULL, 0);
}
border_act = e_action_add("border_shot");
if (border_act)
{
border_act->func.go = _e_mod_action_border_cb;
e_action_predef_name_set(_("Window : Actions"), _("Take Shot"),
e_action_predef_name_set(N_("Window : Actions"), N_("Take Shot"),
"border_shot", NULL, NULL, 0);
}
maug = e_int_menus_menu_augmentation_add_sorted
@ -1012,7 +1012,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
}
if (act)
{
e_action_predef_name_del(_("Screen"), _("Take Screenshot"));
e_action_predef_name_del("Screen", "Take Screenshot");
e_action_del("shot");
act = NULL;
}

4
src/modules/syscon/e_mod_main.c
Unescape View File

@ -28,7 +28,7 @@ e_modapi_init(E_Module *m)
if (act)
{
act->func.go = _e_mod_action_syscon_cb;
e_action_predef_name_set(_("System"), _("System Controls"), "syscon",
e_action_predef_name_set(N_("System"), N_("System Controls"), "syscon",
NULL, NULL, 0);
}
maug = e_int_menus_menu_augmentation_add_sorted
@ -57,7 +57,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
/* remove module-supplied action */
if (act)
{
e_action_predef_name_del(_("System"), _("System Controls"));
e_action_predef_name_del("System", "System Controls");
e_action_del("syscon");
act = NULL;
}

36
src/modules/tiling/e_mod_tiling.c
Unescape View File

@ -4077,62 +4077,62 @@ e_modapi_init(E_Module *m)
const char *_name = _value; \
if ((_action = e_action_add(_name))) { \
_action->func.go = _cb; \
e_action_predef_name_set(_("Tiling"), _(_title), _name, \
e_action_predef_name_set(N_("Tiling"), _title, _name, \
_params, _example, _editable); \
} \
}
/* Module's actions */
ACTION_ADD(_G.act_togglefloat, _e_mod_action_toggle_floating_cb,
"Toggle floating", "toggle_floating",
N_("Toggle floating"), "toggle_floating",
NULL, NULL, 0);
ACTION_ADD(_G.act_addstack, _e_mod_action_add_stack_cb,
"Add a stack", "add_stack",
N_("Add a stack"), "add_stack",
NULL, NULL, 0);
ACTION_ADD(_G.act_removestack, _e_mod_action_remove_stack_cb,
"Remove a stack", "remove_stack",
N_("Remove a stack"), "remove_stack",
NULL, NULL, 0);
ACTION_ADD(_G.act_tg_stack, _e_mod_action_tg_stack_cb,
"Toggle between rows and columns", "tg_cols_rows",
N_("Toggle between rows and columns"), "tg_cols_rows",
NULL, NULL, 0);
ACTION_ADD(_G.act_swap, _e_mod_action_swap_cb,
"Swap a window with an other", "swap",
N_("Swap a window with an other"), "swap",
NULL, NULL, 0);
ACTION_ADD(_G.act_move, _e_mod_action_move_cb,
"Move window", "move",
N_("Move window"), "move",
NULL, NULL, 0);
ACTION_ADD(_G.act_move_left, _e_mod_action_move_direct_cb,
"Move window to the left", "move_left",
N_("Move window to the left"), "move_left",
"left", NULL, 0);
ACTION_ADD(_G.act_move_right, _e_mod_action_move_direct_cb,
"Move window to the right", "move_right",
N_("Move window to the right"), "move_right",
"right", NULL, 0);
ACTION_ADD(_G.act_move_up, _e_mod_action_move_direct_cb,
"Move window up", "move_up",
N_("Move window up"), "move_up",
"up", NULL, 0);
ACTION_ADD(_G.act_move_down, _e_mod_action_move_direct_cb,
"Move window down", "move_down",
N_("Move window down"), "move_down",
"down", NULL, 0);
ACTION_ADD(_G.act_adjusttransitions, _e_mod_action_adjust_transitions,
"Adjust transitions", "adjust_transitions",
N_("Adjust transitions"), "adjust_transitions",
NULL, NULL, 0);
ACTION_ADD(_G.act_go, _e_mod_action_go_cb,
"Focus a particular window", "go",
N_("Focus a particular window"), "go",
NULL, NULL, 0);
ACTION_ADD(_G.act_send_ne, _e_mod_action_send_cb,
"Send to upper right corner", "send_ne",
N_("Send to upper right corner"), "send_ne",
"ne", NULL, 0);
ACTION_ADD(_G.act_send_nw, _e_mod_action_send_cb,
"Send to upper left corner", "send_nw",
N_("Send to upper left corner"), "send_nw",
"nw", NULL, 0);
ACTION_ADD(_G.act_send_se, _e_mod_action_send_cb,
"Send to lower right corner", "send_se",
N_("Send to lower right corner"), "send_se",
"se", NULL, 0);
ACTION_ADD(_G.act_send_sw, _e_mod_action_send_cb,
"Send to lower left corner", "send_sw",
N_("Send to lower left corner"), "send_sw",
"sw", NULL, 0);
#undef ACTION_ADD
@ -4279,7 +4279,7 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
#define ACTION_DEL(act, title, value) \
if (act) { \
e_action_predef_name_del(_("Tiling"), _(title)); \
e_action_predef_name_del("Tiling", title); \
e_action_del(value); \
act = NULL; \
}

48
src/modules/winlist/e_mod_main.c
Unescape View File

@ -34,29 +34,29 @@ e_modapi_init(E_Module *m)
_act_winlist->func.go = _e_mod_action_winlist_cb;
_act_winlist->func.go_mouse = _e_mod_action_winlist_mouse_cb;
_act_winlist->func.go_key = _e_mod_action_winlist_key_cb;
e_action_predef_name_set(_("Window : List"), _("Next Window"),
e_action_predef_name_set(N_("Window : List"), N_("Next Window"),
"winlist", "next", NULL, 0);
e_action_predef_name_set(_("Window : List"), _("Previous Window"),
e_action_predef_name_set(N_("Window : List"), N_("Previous Window"),
"winlist", "prev", NULL, 0);
e_action_predef_name_set(_("Window : List"),
_("Next window of same class"), "winlist",
e_action_predef_name_set(N_("Window : List"),
N_("Next window of same class"), "winlist",
"class-next", NULL, 0);
e_action_predef_name_set(_("Window : List"),
_("Previous window of same class"),
e_action_predef_name_set(N_("Window : List"),
N_("Previous window of same class"),
"winlist", "class-prev", NULL, 0);
e_action_predef_name_set(_("Window : List"),
_("Next window class"), "winlist",
e_action_predef_name_set(N_("Window : List"),
N_("Next window class"), "winlist",
"classes-next", NULL, 0);
e_action_predef_name_set(_("Window : List"),
_("Previous window class"),
e_action_predef_name_set(N_("Window : List"),
N_("Previous window class"),
"winlist", "classes-prev", NULL, 0);
e_action_predef_name_set(_("Window : List"), _("Window on the Left"),
e_action_predef_name_set(N_("Window : List"), N_("Window on the Left"),
"winlist", "left", NULL, 0);
e_action_predef_name_set(_("Window : List"), _("Window Down"),
e_action_predef_name_set(N_("Window : List"), N_("Window Down"),
"winlist", "down", NULL, 0);
e_action_predef_name_set(_("Window : List"), _("Window Up"),
e_action_predef_name_set(N_("Window : List"), N_("Window Up"),
"winlist", "up", NULL, 0);
e_action_predef_name_set(_("Window : List"), _("Window on the Right"),
e_action_predef_name_set(N_("Window : List"), N_("Window on the Right"),
"winlist", "right", NULL, 0);
}
e_module_delayed_set(m, 1);
@ -71,16 +71,16 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
/* remove module-supplied action */
if (_act_winlist)
{
e_action_predef_name_del(_("Window : List"), _("Previous Window"));
e_action_predef_name_del(_("Window : List"), _("Next Window"));
e_action_predef_name_del(_("Window : List"),
_("Previous window of same class"));
e_action_predef_name_del(_("Window : List"),
_("Next window of same class"));
e_action_predef_name_del(_("Window : List"), _("Window on the Left"));
e_action_predef_name_del(_("Window : List"), _("Window Down"));
e_action_predef_name_del(_("Window : List"), _("Window Up"));
e_action_predef_name_del(_("Window : List"), _("Window on the Right"));
e_action_predef_name_del("Window : List", "Previous Window");
e_action_predef_name_del("Window : List", "Next Window");
e_action_predef_name_del("Window : List",
"Previous window of same class");
e_action_predef_name_del("Window : List",
"Next window of same class");
e_action_predef_name_del("Window : List", "Window on the Left");
e_action_predef_name_del("Window : List", "Window Down");
e_action_predef_name_del("Window : List", "Window Up");
e_action_predef_name_del("Window : List", "Window on the Right");
e_action_del("winlist");
_act_winlist = NULL;
}

Write Preview
Loading…
Cancel
Save