summaryrefslogtreecommitdiff
path: root/data/elementary/config
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-08-23 12:03:24 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-08-26 14:42:47 +0200
commitc467dc6e813cf5725e9f45f86e2d6db6e5b5ae8f (patch)
tree7a3c435807dedfd8c0168717cb99e0294af5052e /data/elementary/config
parentc947485bd09426e6d7693de633a8ad5e4b9b2ba3 (diff)
efl_ui_item: add keybindings for selecting changes
This started as a small commit, when pressing enter -> set the item as selected. However, it was a bit more complex, it seems that there was never config update code to copy bindings into the user profile. Which lead to the fact that you are missing a lot of keyboard related features if you havnt wiped your config in the last 1-2 years. For me keybindings for Efl.Ui.Scroller Tab_Bar Image_Zoomable (Item) have been missing and were never inserted. WHich is a problem for a user just constantly updating. For now i created a function that copies over the bindings from the system config, and they are merged into the user config. Intentional leaving our of keybinding structs for a user-config will result in them beeing merged again on the next config update. If you want to get rid of key bindings as a user you can just keep the empty struct, which is the signal for "i know what i am doing, i do not want to have them". The problem that the system config is partly invalidated (due to moving the key bindings struct to the user config), is fixed due to the fact that the config is reloaded after that. This function should be called everytime someone updates the config in regards of the keybindings. Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Differential Revision: https://phab.enlightenment.org/D9723
Diffstat (limited to 'data/elementary/config')
-rw-r--r--data/elementary/config/default/base.src.in25
-rw-r--r--data/elementary/config/mobile/base.src.in25
-rw-r--r--data/elementary/config/standard/base.src.in25
3 files changed, 72 insertions, 3 deletions
diff --git a/data/elementary/config/default/base.src.in b/data/elementary/config/default/base.src.in
index 79f7a1bb55..c39aeeed70 100644
--- a/data/elementary/config/default/base.src.in
+++ b/data/elementary/config/default/base.src.in
@@ -1,5 +1,5 @@
1group "Elm_Config" struct { 1group "Elm_Config" struct {
2 value "config_version" int: 131093; 2 value "config_version" int: 131094;
3 value "entry_select_allow" uchar: 1; 3 value "entry_select_allow" uchar: 1;
4 value "engine" string: ""; 4 value "engine" string: "";
5 value "vsync" uchar: 0; 5 value "vsync" uchar: 0;
@@ -2635,6 +2635,29 @@ group "Elm_Config" struct {
2635 } 2635 }
2636 } 2636 }
2637 group "Elm_Config_Bindings_Widget" struct { 2637 group "Elm_Config_Bindings_Widget" struct {
2638 value "name" string: "Efl.Ui.Item";
2639 group "key_bindings" list {
2640 group "Elm_Config_Binding_Key" struct {
2641 value "context" int: 0;
2642 value "key" string: "Return";
2643 value "action" string: "select";
2644 value "params" string: "";
2645 }
2646 group "Elm_Config_Binding_Key" struct {
2647 value "context" int: 0;
2648 value "key" string: "KP_Enter";
2649 value "action" string: "select";
2650 value "params" string: "";
2651 }
2652 group "Elm_Config_Binding_Key" struct {
2653 value "context" int: 0;
2654 value "key" string: "space";
2655 value "action" string: "select";
2656 value "params" string: "";
2657 }
2658 }
2659 }
2660 group "Elm_Config_Bindings_Widget" struct {
2638 value "name" string: "Efl.Ui.Tab_Bar"; 2661 value "name" string: "Efl.Ui.Tab_Bar";
2639 group "key_bindings" list { 2662 group "key_bindings" list {
2640 group "Elm_Config_Binding_Key" struct { 2663 group "Elm_Config_Binding_Key" struct {
diff --git a/data/elementary/config/mobile/base.src.in b/data/elementary/config/mobile/base.src.in
index 9397150576..520ba90d73 100644
--- a/data/elementary/config/mobile/base.src.in
+++ b/data/elementary/config/mobile/base.src.in
@@ -1,5 +1,5 @@
1group "Elm_Config" struct { 1group "Elm_Config" struct {
2 value "config_version" int: 131093; 2 value "config_version" int: 131094;
3 value "entry_select_allow" uchar: 1; 3 value "entry_select_allow" uchar: 1;
4 value "engine" string: ""; 4 value "engine" string: "";
5 value "vsync" uchar: 0; 5 value "vsync" uchar: 0;
@@ -2632,6 +2632,29 @@ group "Elm_Config" struct {
2632 } 2632 }
2633 } 2633 }
2634 group "Elm_Config_Bindings_Widget" struct { 2634 group "Elm_Config_Bindings_Widget" struct {
2635 value "name" string: "Efl.Ui.Item";
2636 group "key_bindings" list {
2637 group "Elm_Config_Binding_Key" struct {
2638 value "context" int: 0;
2639 value "key" string: "Return";
2640 value "action" string: "select";
2641 value "params" string: "";
2642 }
2643 group "Elm_Config_Binding_Key" struct {
2644 value "context" int: 0;
2645 value "key" string: "KP_Enter";
2646 value "action" string: "select";
2647 value "params" string: "";
2648 }
2649 group "Elm_Config_Binding_Key" struct {
2650 value "context" int: 0;
2651 value "key" string: "space";
2652 value "action" string: "select";
2653 value "params" string: "";
2654 }
2655 }
2656 }
2657 group "Elm_Config_Bindings_Widget" struct {
2635 value "name" string: "Efl.Ui.Tab_Bar"; 2658 value "name" string: "Efl.Ui.Tab_Bar";
2636 group "key_bindings" list { 2659 group "key_bindings" list {
2637 group "Elm_Config_Binding_Key" struct { 2660 group "Elm_Config_Binding_Key" struct {
diff --git a/data/elementary/config/standard/base.src.in b/data/elementary/config/standard/base.src.in
index ccfa97b05e..0aa4e8f017 100644
--- a/data/elementary/config/standard/base.src.in
+++ b/data/elementary/config/standard/base.src.in
@@ -1,5 +1,5 @@
1group "Elm_Config" struct { 1group "Elm_Config" struct {
2 value "config_version" int: 131093; 2 value "config_version" int: 131094;
3 value "entry_select_allow" uchar: 1; 3 value "entry_select_allow" uchar: 1;
4 value "engine" string: ""; 4 value "engine" string: "";
5 value "vsync" uchar: 0; 5 value "vsync" uchar: 0;
@@ -2629,6 +2629,29 @@ group "Elm_Config" struct {
2629 } 2629 }
2630 } 2630 }
2631 group "Elm_Config_Bindings_Widget" struct { 2631 group "Elm_Config_Bindings_Widget" struct {
2632 value "name" string: "Efl.Ui.Item";
2633 group "key_bindings" list {
2634 group "Elm_Config_Binding_Key" struct {
2635 value "context" int: 0;
2636 value "key" string: "Return";
2637 value "action" string: "select";
2638 value "params" string: "";
2639 }
2640 group "Elm_Config_Binding_Key" struct {
2641 value "context" int: 0;
2642 value "key" string: "KP_Enter";
2643 value "action" string: "select";
2644 value "params" string: "";
2645 }
2646 group "Elm_Config_Binding_Key" struct {
2647 value "context" int: 0;
2648 value "key" string: "space";
2649 value "action" string: "select";
2650 value "params" string: "";
2651 }
2652 }
2653 }
2654 group "Elm_Config_Bindings_Widget" struct {
2632 value "name" string: "Efl.Ui.Tab_Bar"; 2655 value "name" string: "Efl.Ui.Tab_Bar";
2633 group "key_bindings" list { 2656 group "key_bindings" list {
2634 group "Elm_Config_Binding_Key" struct { 2657 group "Elm_Config_Binding_Key" struct {