Enlightenment CVS committal

Author  : sndev
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
        e_int_config_keybindings.c 


Log Message:

* some bug fixes wrt auto apply settings

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_config_keybindings.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_int_config_keybindings.c  25 Feb 2006 11:24:20 -0000      1.4
+++ e_int_config_keybindings.c  26 Feb 2006 15:17:37 -0000      1.5
@@ -508,7 +508,7 @@
       {
        //TODO: message box which should ask if we really should proceed.
        //If yes, then the current 'empty' binding will be deleted
-       _keybind_delete_keybinding(cfdata);
+       //_keybind_delete_keybinding(cfdata);
       }
 
   // here the removing of the old keybindings goes
@@ -697,22 +697,22 @@
 
        ob = e_widget_check_add(evas, _("Shift"), &(cfdata->bind_mod.shift));
        cfdata->gui.bind_mod_obj.shift = ob;
-       //e_widget_disabled_set(ob, 1);
+       e_widget_disabled_set(ob, 1);
        e_widget_frametable_object_append(oft1, ob, 0, 1, 1, 1, 1, 0, 1, 0);
 
        ob = e_widget_check_add(evas, _("Control"), &(cfdata->bind_mod.ctrl));
        cfdata->gui.bind_mod_obj.ctrl = ob;
-       //e_widget_disabled_set(ob, 1);
+       e_widget_disabled_set(ob, 1);
        e_widget_frametable_object_append(oft1, ob, 1, 1, 1, 1, 1, 0, 1, 0);
 
        ob = e_widget_check_add(evas, _("Alt"), &(cfdata->bind_mod.alt));
        cfdata->gui.bind_mod_obj.alt = ob;
-       //e_widget_disabled_set(ob, 1);
+       e_widget_disabled_set(ob, 1);
        e_widget_frametable_object_append(oft1, ob, 2, 1, 1, 1, 1, 0, 1, 0);
 
        ob = e_widget_check_add(evas, _("Win"), &(cfdata->bind_mod.win));
        cfdata->gui.bind_mod_obj.win = ob;
-       //e_widget_disabled_set(ob, 1);
+       e_widget_disabled_set(ob, 1);
        e_widget_frametable_object_append(oft1, ob, 3, 1, 1, 1, 1, 0, 1, 0);
       }
       e_widget_framelist_object_append(of2, oft1);
@@ -798,9 +798,6 @@
   wd = e_widget_data_get(cfdata->gui.bind_context[E_BINDING_CONTEXT_BORDER]);
   edje_object_signal_emit(wd->o_radio, "toggle_off", "");
 
-  wd = e_widget_data_get(cfdata->gui.bind_context[E_BINDING_CONTEXT_BORDER]);
-  edje_object_signal_emit(wd->o_radio, "toggle_off", "");
-
   wd = e_widget_data_get(cfdata->gui.bind_context[E_BINDING_CONTEXT_ZONE]);
   edje_object_signal_emit(wd->o_radio, "toggle_off", "");
 
@@ -822,6 +819,17 @@
   wd = e_widget_data_get(cfdata->gui.bind_context[E_BINDING_CONTEXT_ANY]);
   edje_object_signal_emit(wd->o_radio, "toggle_off", "");
 
+  e_widget_disabled_set(cfdata->gui.bind_context[E_BINDING_CONTEXT_NONE], 0);
+  e_widget_disabled_set(cfdata->gui.bind_context[E_BINDING_CONTEXT_UNKNOWN], 
0);
+  e_widget_disabled_set(cfdata->gui.bind_context[E_BINDING_CONTEXT_BORDER], 0);
+  e_widget_disabled_set(cfdata->gui.bind_context[E_BINDING_CONTEXT_ZONE], 0);
+  e_widget_disabled_set(cfdata->gui.bind_context[E_BINDING_CONTEXT_CONTAINER], 
0);
+  e_widget_disabled_set(cfdata->gui.bind_context[E_BINDING_CONTEXT_MANAGER], 
0);
+  e_widget_disabled_set(cfdata->gui.bind_context[E_BINDING_CONTEXT_MENU], 0);
+  e_widget_disabled_set(cfdata->gui.bind_context[E_BINDING_CONTEXT_WINLIST], 
0);
+  e_widget_disabled_set(cfdata->gui.bind_context[E_BINDING_CONTEXT_POPUP], 0);
+  e_widget_disabled_set(cfdata->gui.bind_context[E_BINDING_CONTEXT_ANY], 0);
+
   if (cfdata->cur_eckb == NULL) return;
   if (cfdata->cur_eckb->bk_list == NULL) return;
 
@@ -920,6 +928,11 @@
   if (cfdata->cur_eckb == NULL) return;
   if (cfdata->cur_eckb->bk_list == NULL) return;
 
+  e_widget_disabled_set(cfdata->gui.bind_mod_obj.ctrl, 0);
+  e_widget_disabled_set(cfdata->gui.bind_mod_obj.alt, 0);
+  e_widget_disabled_set(cfdata->gui.bind_mod_obj.shift, 0);
+  e_widget_disabled_set(cfdata->gui.bind_mod_obj.win, 0);
+
   if ((bk = evas_list_nth(cfdata->cur_eckb->bk_list, cfdata->cur_eckb_kb_sel)) 
== NULL )
     return;
 
@@ -1230,12 +1243,12 @@
     {
       bk = E_NEW(E_Config_Binding_Key, 1);
 
-      bk->key = NULL;
+      bk->key = strdup("");
       bk->modifiers = E_BINDING_MODIFIER_NONE;
       bk->any_mod = 0;
-      bk->action = actions_predefined_names[acn].action_cmd == NULL ? NULL :
+      bk->action = actions_predefined_names[acn].action_cmd == NULL ? 
strdup("") :
                                               
strdup(actions_predefined_names[acn].action_cmd);
-      bk->params = actions_predefined_names[acn].action_params == NULL ? NULL :
+      bk->params = actions_predefined_names[acn].action_params == NULL ? 
strdup("") :
                                               
strdup(actions_predefined_names[acn].action_params);
 
       cfdata->cur_eckb->bk_list = evas_list_append(cfdata->cur_eckb->bk_list, 
bk);
@@ -1411,8 +1424,8 @@
   if (!cfdata || !cfdata->cur_eckb)
     return -1;
 
-  if (cfdata->key_bind == NULL || strlen(cfdata->key_bind) == 0)
-    return -1;
+  /*if (cfdata->key_bind == NULL || strlen(cfdata->key_bind) == 0)
+    return -1;*/
 
   bk = evas_list_nth(cfdata->cur_eckb->bk_list, cfdata->cur_eckb_kb_sel);
   if (bk == NULL)




-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to