Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_actions.c e_int_config_keybindings.c
e_int_config_keybindings.h
Log Message:
todo....
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_actions.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- e_actions.c 15 Jun 2006 14:21:35 -0000 1.68
+++ e_actions.c 16 Jun 2006 09:37:32 -0000 1.69
@@ -1786,12 +1786,12 @@
/* exec */
ACT_GO(exec);
- e_register_action_predef_name(_("Enlightenment"), _("User Defined
Actions"), "exec", NULL,
+ e_register_action_predef_name(_("Launch"), _("Defined Command"), "exec",
NULL,
EDIT_RESTRICT_ACTION, 0);
/* app */
ACT_GO(app);
- e_register_action_predef_name(_("Enlightenment"), _("Application"), "app",
NULL,
+ e_register_action_predef_name(_("Launch"), _("Application"), "app", NULL,
EDIT_RESTRICT_ACTION, 0);
/* winlist */
@@ -1826,7 +1826,7 @@
/* exebuf */
ACT_GO(exebuf);
- e_register_action_predef_name(_("Enlightenment"), _("Run Command"),
"exebuf", NULL,
+ e_register_action_predef_name(_("Launch"), _("Run Command Dialog"),
"exebuf", NULL,
EDIT_RESTRICT_ACTION | EDIT_RESTRICT_PARAMS,
0);
/* desk_lock */
ACT_GO(desk_lock);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_keybindings.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- e_int_config_keybindings.c 8 Jun 2006 19:33:45 -0000 1.28
+++ e_int_config_keybindings.c 16 Jun 2006 09:37:32 -0000 1.29
@@ -65,12 +65,12 @@
typedef struct _action2
{
- const char *action_name;
- const char *action_cmd;
- const char *action_params;
- int def_action;
- int restrictions;
- Evas_List *key_bindings;
+ const char *action_name;
+ const char *action_cmd;
+ const char *action_params;
+ int def_action;
+ int restrictions;
+ Evas_List *key_bindings;
} ACTION2;
typedef struct _action_group
@@ -126,7 +126,7 @@
const char
*action_name,
const char *action_cmd,
const char
*action_params,
- act_restrict_t
restrictions,
+ E_Keybindings_Restrict
restrictions,
int flag)
{
ACTION_GROUP *actg = NULL;
@@ -175,7 +175,8 @@
act = E_NEW(ACTION2, 1);
if (!act)
return 0;
- act->action_name = action_name == NULL ? NULL :
evas_stringshare_add(action_name);
+
+ act->action_name = evas_stringshare_add(action_name);
act->action_cmd = action_cmd == NULL ? NULL :
evas_stringshare_add(action_cmd);
act->action_params = action_params == NULL ? NULL :
evas_stringshare_add(action_params);
act->restrictions = restrictions;
@@ -425,26 +426,26 @@
}
}
}
- cfdata->locals.keybind_win = 0;
- cfdata->locals.handlers = NULL;
- cfdata->locals.dia = NULL;
- cfdata->changed = 0;
+ cfdata->locals.keybind_win = 0;
+ cfdata->locals.handlers = NULL;
+ cfdata->locals.dia = NULL;
+ cfdata->changed = 0;
}
static void *
_create_data(E_Config_Dialog *cfd)
{
- E_Config_Dialog_Data *cfdata;
-
- cfdata = E_NEW(E_Config_Dialog_Data, 1);
-
- cfdata->binding_context = -1;//E_BINDING_CONTEXT_ANY;
- cfdata->key_action = strdup("");
- cfdata->key_params = strdup("");
-
- _fill_data(cfdata);
- cfdata->cfd = cfd;
-
- return cfdata;
+ E_Config_Dialog_Data *cfdata;
+
+ cfdata = E_NEW(E_Config_Dialog_Data, 1);
+
+ cfdata->binding_context = -1;//E_BINDING_CONTEXT_ANY;
+ cfdata->key_action = strdup("");
+ cfdata->key_params = strdup("");
+
+ _fill_data(cfdata);
+ cfdata->cfd = cfd;
+
+ return cfdata;
}
static void
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_keybindings.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_int_config_keybindings.h 6 May 2006 09:35:05 -0000 1.2
+++ e_int_config_keybindings.h 16 Jun 2006 09:37:32 -0000 1.3
@@ -12,10 +12,13 @@
#define e_unregister_all_action_predef_names \
e_int_config_keybindings_unregister_all_action_predef_names
-typedef enum{EDIT_RESTRICT_NONE = (0 << 0), // allows to edit action and
params in config dialog
- EDIT_RESTRICT_ACTION = (1 << 0), // denies to edit action in
config dialog
- EDIT_RESTRICT_PARAMS = (1 << 1) // denies to edit params in config
dialog
- }act_restrict_t;
+typedef enum
+{
+ EDIT_RESTRICT_NONE = (0 << 0), // allows to edit action and params in
config dialog
+ EDIT_RESTRICT_ACTION = (1 << 0), // denies to edit action in config dialog
+ EDIT_RESTRICT_PARAMS = (1 << 1) // denies to edit params in config dialog
+}
+E_Keybindings_Restrict;
EAPI E_Config_Dialog *e_int_config_keybindings(E_Container *con);
@@ -23,7 +26,7 @@
const char
*action_name,
const char *action_cmd,
const char
*action_params,
- act_restrict_t
restrictions,
+ E_Keybindings_Restrict
restrictions,
int flag);
int e_int_config_keybindings_unregister_action_predef_name(const char
*action_group,
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
