summaryrefslogtreecommitdiff
path: root/src/modules/conf_keybindings
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-06-08 10:10:16 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-06-08 10:10:16 +0000
commit207c0aed10b33bf004c1033b7bd020b4bbaec25c (patch)
treeb3eba9e97f88acc754338c57e732b68ba4626363 /src/modules/conf_keybindings
parent4c5e4226a2c2924af15954c61bfcde5496b31aaa (diff)
rename E_BINDING_CONTEXT_BORDER to E_BINDING_CONTEXT_WINDOW: technically this is in reference to an E_Border, but it gets confusing when looking at code that deals with both windows (E_Borders) and window borders/frames themselves. this name change will clarify the difference
SVN revision: 71841
Diffstat (limited to 'src/modules/conf_keybindings')
-rw-r--r--src/modules/conf_keybindings/e_int_config_mousebindings.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/modules/conf_keybindings/e_int_config_mousebindings.c b/src/modules/conf_keybindings/e_int_config_mousebindings.c
index 6b4e08e80..c267a26c2 100644
--- a/src/modules/conf_keybindings/e_int_config_mousebindings.c
+++ b/src/modules/conf_keybindings/e_int_config_mousebindings.c
@@ -319,7 +319,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
319 cfdata->gui.context.o_any = ob; 319 cfdata->gui.context.o_any = ob;
320 e_widget_disabled_set(ob, 1); 320 e_widget_disabled_set(ob, 1);
321 e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1); 321 e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 1, 1, 1);
322 ob = e_widget_radio_add(evas, _("Window"), E_BINDING_CONTEXT_BORDER, rg); 322 ob = e_widget_radio_add(evas, _("Window"), E_BINDING_CONTEXT_WINDOW, rg);
323 cfdata->gui.context.o_window = ob; 323 cfdata->gui.context.o_window = ob;
324 e_widget_disabled_set(ob, 1); 324 e_widget_disabled_set(ob, 1);
325 e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1); 325 e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 1, 1, 1);
@@ -588,9 +588,9 @@ _restore_mouse_binding_defaults_cb(void *data, void *data2 __UNUSED__)
588 eb->params = _params == NULL ? NULL : eina_stringshare_add(_params); \ 588 eb->params = _params == NULL ? NULL : eina_stringshare_add(_params); \
589 cfdata->binding.mouse = eina_list_append(cfdata->binding.mouse, eb) 589 cfdata->binding.mouse = eina_list_append(cfdata->binding.mouse, eb)
590 590
591 CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_BORDER, 1, E_BINDING_MODIFIER_ALT, 0, "window_move", NULL); 591 CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_WINDOW, 1, E_BINDING_MODIFIER_ALT, 0, "window_move", NULL);
592 CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_BORDER, 2, E_BINDING_MODIFIER_ALT, 0, "window_resize", NULL); 592 CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_WINDOW, 2, E_BINDING_MODIFIER_ALT, 0, "window_resize", NULL);
593 CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_BORDER, 3, E_BINDING_MODIFIER_ALT, 0, "window_menu", NULL); 593 CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_WINDOW, 3, E_BINDING_MODIFIER_ALT, 0, "window_menu", NULL);
594 CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_ZONE, 1, 0, 0, "menu_show", "main"); 594 CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_ZONE, 1, 0, 0, "menu_show", "main");
595 CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_ZONE, 2, 0, 0, "menu_show", "clients"); 595 CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_ZONE, 2, 0, 0, "menu_show", "clients");
596 CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_ZONE, 3, 0, 0, "menu_show", "favorites"); 596 CFG_MOUSEBIND_DFLT(E_BINDING_CONTEXT_ZONE, 3, 0, 0, "menu_show", "favorites");
@@ -614,13 +614,13 @@ _restore_mouse_binding_defaults_cb(void *data, void *data2 __UNUSED__)
614 "desk_linear_flip_by", "1"); 614 "desk_linear_flip_by", "1");
615 CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_CONTAINER, 1, 1, E_BINDING_MODIFIER_ALT, 0, 615 CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_CONTAINER, 1, 1, E_BINDING_MODIFIER_ALT, 0,
616 "desk_linear_flip_by", "1"); 616 "desk_linear_flip_by", "1");
617 CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_BORDER, 0, -1, E_BINDING_MODIFIER_ALT, 0, 617 CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_WINDOW, 0, -1, E_BINDING_MODIFIER_ALT, 0,
618 "desk_linear_flip_by", "-1"); 618 "desk_linear_flip_by", "-1");
619 CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_BORDER, 1, -1, E_BINDING_MODIFIER_ALT, 0, 619 CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_WINDOW, 1, -1, E_BINDING_MODIFIER_ALT, 0,
620 "desk_linear_flip_by", "-1"); 620 "desk_linear_flip_by", "-1");
621 CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_BORDER, 0, 1, E_BINDING_MODIFIER_ALT, 0, 621 CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_WINDOW, 0, 1, E_BINDING_MODIFIER_ALT, 0,
622 "desk_linear_flip_by", "1"); 622 "desk_linear_flip_by", "1");
623 CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_BORDER, 1, 1, E_BINDING_MODIFIER_ALT, 0, 623 CFG_WHEELBIND_DFLT(E_BINDING_CONTEXT_WINDOW, 1, 1, E_BINDING_MODIFIER_ALT, 0,
624 "desk_linear_flip_by", "1"); 624 "desk_linear_flip_by", "1");
625 625
626 eina_stringshare_del(cfdata->locals.cur); 626 eina_stringshare_del(cfdata->locals.cur);
@@ -979,7 +979,7 @@ _update_binding_context(E_Config_Dialog_Data *cfdata)
979 979
980 if (ctxt == E_BINDING_CONTEXT_ANY) 980 if (ctxt == E_BINDING_CONTEXT_ANY)
981 e_widget_radio_toggle_set(cfdata->gui.context.o_any, 1); 981 e_widget_radio_toggle_set(cfdata->gui.context.o_any, 1);
982 else if (ctxt == E_BINDING_CONTEXT_BORDER) 982 else if (ctxt == E_BINDING_CONTEXT_WINDOW)
983 e_widget_radio_toggle_set(cfdata->gui.context.o_window, 1); 983 e_widget_radio_toggle_set(cfdata->gui.context.o_window, 1);
984 else if (ctxt == E_BINDING_CONTEXT_MENU) 984 else if (ctxt == E_BINDING_CONTEXT_MENU)
985 e_widget_radio_toggle_set(cfdata->gui.context.o_menu, 1); 985 e_widget_radio_toggle_set(cfdata->gui.context.o_menu, 1);