summaryrefslogtreecommitdiff
path: root/apps/keymaps
diff options
context:
space:
mode:
Diffstat (limited to 'apps/keymaps')
-rw-r--r--apps/keymaps/keymap-h10.c15
-rw-r--r--apps/keymaps/keymap-h1x0_h3x0.c63
-rw-r--r--apps/keymaps/keymap-ifp7xx.c13
-rw-r--r--apps/keymaps/keymap-ipod.c23
-rw-r--r--apps/keymaps/keymap-ondio.c10
-rw-r--r--apps/keymaps/keymap-recorder.c6
-rw-r--r--apps/keymaps/keymap-x5.c15
7 files changed, 94 insertions, 51 deletions
diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c
index 029615f..db55f82 100644
--- a/apps/keymaps/keymap-h10.c
+++ b/apps/keymaps/keymap-h10.c
@@ -100,7 +100,7 @@ const struct button_mapping button_context_tree_scroll_lr[] = {
{ ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
{ ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT },
{ ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT },
- LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1),
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
}; /* button_context_tree_scroll_lr */
const struct button_mapping button_context_yesno[] = {
@@ -122,7 +122,7 @@ const struct button_mapping button_context_quickscreen[] = {
LAST_ITEM_IN_LIST
}; /* button_context_quickscreen */
-const struct button_mapping button_context_settingsgraphical[] = {
+const struct button_mapping button_context_settings_r_is_inc[] = {
{ ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
{ ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
@@ -135,7 +135,7 @@ const struct button_mapping button_context_settingsgraphical[] = {
{ ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
LAST_ITEM_IN_LIST
-}; /* button_context_settingsgraphical */
+}; /* button_context_settings_r_is_inc */
const struct button_mapping button_context_pitchscreen[] = {
{ ACTION_PS_INC_SMALL, BUTTON_SCROLL_UP, BUTTON_NONE },
@@ -165,8 +165,11 @@ const struct button_mapping* get_context_mapping(int context)
case CONTEXT_WPS:
return button_context_wps;
- case CONTEXT_SETTINGSGRAPHICAL:
- return button_context_settingsgraphical;
+ case CONTEXT_SETTINGS_EQ:
+ case CONTEXT_SETTINGS_TIME:
+ case CONTEXT_SETTINGS_COLOURCHOOSER:
+ case CONTEXT_CUSTOM|CONTEXT_SETTINGS:
+ return button_context_settings_r_is_inc;
case CONTEXT_SETTINGS:
return button_context_settings;
@@ -177,7 +180,7 @@ const struct button_mapping* get_context_mapping(int context)
if (global_settings.hold_lr_for_scroll_in_list)
return button_context_tree_scroll_lr;
/* else fall through to CUSTOM|1 */
- case CONTEXT_CUSTOM|1:
+ case CONTEXT_CUSTOM|CONTEXT_TREE:
return button_context_tree;
case CONTEXT_QUICKSCREEN:
return button_context_quickscreen;
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c
index d7096cb..b68aed8 100644
--- a/apps/keymaps/keymap-h1x0_h3x0.c
+++ b/apps/keymaps/keymap-h1x0_h3x0.c
@@ -38,7 +38,9 @@
/* CONTEXT_CUSTOM's used in this file...
CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions)
-
+CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker screens
+ i.e where up/down is inc/dec
+ CONTEXT_SETTINGS = up/down is prev/next, l/r is inc/dec
*/
@@ -51,12 +53,14 @@ const struct button_mapping button_context_standard[] = {
{ ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE },
{ ACTION_STD_CANCEL, BUTTON_OFF, BUTTON_NONE },
+
{ ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT },
{ ACTION_STD_QUICKSCREEN, BUTTON_MODE|BUTTON_REPEAT, BUTTON_MODE },
{ ACTION_STD_MENU, BUTTON_MODE|BUTTON_REL, BUTTON_MODE },
{ ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
{ ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE },
+ { ACTION_STD_OK, BUTTON_ON|BUTTON_REL, BUTTON_NONE },
LAST_ITEM_IN_LIST
}; /* button_context_standard */
@@ -138,13 +142,16 @@ const struct button_mapping button_context_settings[] = {
{ ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE },
{ ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
- { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
- { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE },
+ { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE },
+ { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
+ { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_SETTINGS_RESET, BUTTON_ON, BUTTON_NONE },
LAST_ITEM_IN_LIST
}; /* button_context_settings */
-const struct button_mapping button_context_settingsgraphical[] = {
+const struct button_mapping button_context_settings_right_is_inc[] = {
{ ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
{ ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
@@ -153,6 +160,7 @@ const struct button_mapping button_context_settingsgraphical[] = {
{ ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE },
{ ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_SETTINGS_RESET, BUTTON_ON, BUTTON_NONE },
LAST_ITEM_IN_LIST
}; /* button_context_settingsgraphical */
@@ -162,10 +170,26 @@ const struct button_mapping button_context_yesno[] = {
LAST_ITEM_IN_LIST
}; /* button_context_settings_yesno */
+const struct button_mapping button_context_colorchooser[] = {
+ { ACTION_STD_OK, BUTTON_ON|BUTTON_REL, BUTTON_NONE },
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
+}; /* button_context_settings_bmark */
+
+const struct button_mapping button_context_eq[] = {
+ { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE },
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
+}; /* button_context_settings_bmark */
+
const struct button_mapping button_context_bmark[] = {
- { ACTION_BMARK_DELETE, BUTTON_REC, BUTTON_NONE },
+ { ACTION_BMS_DELETE, BUTTON_REC, BUTTON_NONE },
{ ACTION_STD_OK, BUTTON_SELECT, BUTTON_NONE },
- LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGSGRAPHICAL),
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
+}; /* button_context_settings_bmark */
+
+const struct button_mapping button_context_time[] = {
+ { ACTION_STD_CANCEL, BUTTON_OFF, BUTTON_NONE },
+ { ACTION_STD_OK, BUTTON_ON, BUTTON_NONE },
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
}; /* button_context_settings_bmark */
const struct button_mapping button_context_quickscreen[] = {
@@ -419,15 +443,15 @@ const struct button_mapping *button_context_yesno_h300lcdremote =
button_context_yesno_h100remote;
const struct button_mapping button_context_bmark_h100remote[] = {
- { ACTION_BMARK_DELETE, BUTTON_RC_REC, BUTTON_NONE },
+ { ACTION_BMS_DELETE, BUTTON_RC_REC, BUTTON_NONE },
{ ACTION_STD_OK, BUTTON_RC_ON, BUTTON_NONE },
- LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGSGRAPHICAL|CONTEXT_REMOTE),
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS|CONTEXT_REMOTE),
}; /* button_context_settings_bmark */
const struct button_mapping button_context_bmark_h300lcdremote[] = {
- { ACTION_BMARK_DELETE, BUTTON_RC_REC, BUTTON_NONE },
+ { ACTION_BMS_DELETE, BUTTON_RC_REC, BUTTON_NONE },
{ ACTION_STD_OK, BUTTON_RC_MENU, BUTTON_NONE },
- LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGSGRAPHICAL|CONTEXT_REMOTE),
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS|CONTEXT_REMOTE),
};
const struct button_mapping button_context_quickscreen_h100remote[] = {
@@ -669,9 +693,6 @@ const struct button_mapping* get_context_mapping_remote(int context)
return remote_btn_ctxt_listtree_scroll_w_cmb;
case CONTEXT_CUSTOM|CONTEXT_TREE:
return remote_btn_ctxt_tree;
-
- case CONTEXT_SETTINGSGRAPHICAL:
- return remote_btn_ctxt_settingsgrph;
case CONTEXT_SETTINGS:
return remote_btn_ctxt_settings;
@@ -713,16 +734,22 @@ const struct button_mapping* get_context_mapping(int context)
return button_context_listtree_scroll_with_combo;
case CONTEXT_CUSTOM|CONTEXT_TREE:
return button_context_tree;
-
- case CONTEXT_SETTINGSGRAPHICAL:
- return button_context_settingsgraphical;
case CONTEXT_SETTINGS:
return button_context_settings;
+ case CONTEXT_CUSTOM|CONTEXT_SETTINGS:
+ return button_context_settings_right_is_inc;
+
+ case CONTEXT_SETTINGS_COLOURCHOOSER:
+ return button_context_colorchooser;
+ case CONTEXT_SETTINGS_EQ:
+ return button_context_eq;
- case CONTEXT_YESNOSCREEN:
- return button_context_yesno;
+ case CONTEXT_SETTINGS_TIME:
+ return button_context_time;
+ case CONTEXT_YESNOSCREEN:
+ return button_context_yesno;
case CONTEXT_BOOKMARKSCREEN:
return button_context_bmark;
case CONTEXT_QUICKSCREEN:
diff --git a/apps/keymaps/keymap-ifp7xx.c b/apps/keymaps/keymap-ifp7xx.c
index 1da4f09..359aa5b 100644
--- a/apps/keymaps/keymap-ifp7xx.c
+++ b/apps/keymaps/keymap-ifp7xx.c
@@ -82,7 +82,7 @@ const struct button_mapping button_context_settings[] = {
LAST_ITEM_IN_LIST
}; /* button_context_settings */
-const struct button_mapping button_context_settingsgraphical[] = {
+const struct button_mapping button_context_settings_r_is_inc[] = {
{ ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
{ ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
@@ -101,9 +101,9 @@ const struct button_mapping button_context_yesno[] = {
}; /* button_context_settings_yesno */
const struct button_mapping button_context_bmark[] = {
- { ACTION_BMARK_DELETE, BUTTON_MODE, BUTTON_NONE },
+ { ACTION_BMS_DELETE, BUTTON_MODE, BUTTON_NONE },
{ ACTION_STD_OK, BUTTON_SELECT, BUTTON_NONE },
- LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGSGRAPHICAL),
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
}; /* button_context_settings_bmark */
const struct button_mapping button_context_quickscreen[] = {
@@ -143,8 +143,11 @@ const struct button_mapping* get_context_mapping(int context)
return button_context_standard;
case CONTEXT_WPS:
return button_context_wps;
- case CONTEXT_SETTINGSGRAPHICAL:
- return button_context_settingsgraphical;
+ case CONTEXT_CUSTOM|CONTEXT_SETTINGS:
+ case CONTEXT_SETTINGS_EQ:
+ case CONTEXT_SETTINGS_COLOURCHOOSER:
+ case CONTEXT_SETTINGS_TIME:
+ return button_context_settings_r_is_inc;
case CONTEXT_SETTINGS:
return button_context_settings;
case CONTEXT_YESNOSCREEN:
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c
index 6cc6de6..4f4ac4a 100644
--- a/apps/keymaps/keymap-ipod.c
+++ b/apps/keymaps/keymap-ipod.c
@@ -32,7 +32,7 @@
/* CONTEXT_CUSTOM's used in this file...
-CONTEXT_CUSTOM|1 = the standard list/tree defines (without directions)
+CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions)
*/
@@ -45,11 +45,11 @@ const struct button_mapping button_context_standard[] = {
{ ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE },
{ ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE },
- { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
+ { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE },
{ ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
{ ACTION_STD_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
- { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT },
- { ACTION_STD_CANCEL, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
+ { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_STD_CANCEL, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE },
LAST_ITEM_IN_LIST
}; /* button_context_standard */
@@ -69,7 +69,7 @@ const struct button_mapping button_context_tree_scroll_lr[] = {
{ ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
{ ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT },
- LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1),
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
};
const struct button_mapping button_context_wps[] = {
@@ -102,7 +102,8 @@ const struct button_mapping button_context_settings[] = {
{ ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
{ ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
- { ACTION_STD_CANCEL, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, /* rel so bmark screen works */
+ { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE },
+ { ACTION_STD_CANCEL, BUTTON_MENU|BUTTON_REL, BUTTON_MENU },
LAST_ITEM_IN_LIST
}; /* button_context_settings */
@@ -113,7 +114,7 @@ const struct button_mapping button_context_yesno[] = {
}; /* button_context_settings_yesno */
const struct button_mapping button_context_bmark[] = {
- { ACTION_BMARK_DELETE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
+ { ACTION_BMS_DELETE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
}; /* button_context_settings_bmark */
@@ -157,15 +158,17 @@ const struct button_mapping* get_context_mapping(int context)
case CONTEXT_TREE:
if (global_settings.hold_lr_for_scroll_in_list)
return button_context_tree_scroll_lr;
- /* else fall through to CUSTOM|1 */
- case CONTEXT_CUSTOM|1:
+ /* else fall through to CUSTOM|CONTEXT_TREE */
+ case CONTEXT_CUSTOM|CONTEXT_TREE:
return button_context_tree;
case CONTEXT_LIST:
case CONTEXT_MAINMENU:
break;
+ case CONTEXT_SETTINGS_EQ:
+ case CONTEXT_SETTINGS_COLOURCHOOSER:
+ case CONTEXT_SETTINGS_TIME:
case CONTEXT_SETTINGS:
- case CONTEXT_SETTINGSGRAPHICAL:
return button_context_settings;
case CONTEXT_YESNOSCREEN:
return button_context_yesno;
diff --git a/apps/keymaps/keymap-ondio.c b/apps/keymaps/keymap-ondio.c
index 57bdcc3..141d23b 100644
--- a/apps/keymaps/keymap-ondio.c
+++ b/apps/keymaps/keymap-ondio.c
@@ -27,7 +27,7 @@
/* CONTEXT_CUSTOM's used in this file...
-CONTEXT_CUSTOM|1 = the standard list/tree defines (without directions)
+CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions)
*/
@@ -95,7 +95,7 @@ const struct button_mapping button_context_tree_scroll_lr[] = {
{ ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT },
- LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1),
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
};
const struct button_mapping button_context_yesno[] = {
@@ -106,7 +106,7 @@ const struct button_mapping button_context_yesno[] = {
struct button_mapping button_context_bmark[] = {
{ ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
- { ACTION_BMARK_DELETE, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT },
+ { ACTION_BMS_DELETE, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT },
{ ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
@@ -160,8 +160,8 @@ const struct button_mapping* get_context_mapping( int context )
case CONTEXT_TREE:
if (global_settings.hold_lr_for_scroll_in_list)
return button_context_tree_scroll_lr;
- /* else fall through to CUSTOM|1 */
- case CONTEXT_CUSTOM|1:
+ /* else fall through to CUSTOM|CONTEXT_TREE */
+ case CONTEXT_CUSTOM|CONTEXT_TREE:
return button_context_tree;
case CONTEXT_RECSCREEN:
return button_context_recscreen;
diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c
index 72e0407..3e6eda9 100644
--- a/apps/keymaps/keymap-recorder.c
+++ b/apps/keymaps/keymap-recorder.c
@@ -86,6 +86,10 @@ static const struct button_mapping button_context_settings[] = {
{ ACTION_SETTINGS_INCREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE },
{ ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE },
+ { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
+ { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
LAST_ITEM_IN_LIST
};
@@ -204,7 +208,7 @@ const struct button_mapping* get_context_mapping( int context )
{
case CONTEXT_WPS:
return button_context_wps;
-
+ case CONTEXT_SETTINGS_TIME:
case CONTEXT_SETTINGS:
return button_context_settings;
diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c
index 3752b35..e92baf4 100644
--- a/apps/keymaps/keymap-x5.c
+++ b/apps/keymaps/keymap-x5.c
@@ -29,7 +29,7 @@
/* CONTEXT_CUSTOM's used in this file...
-CONTEXT_CUSTOM|1 = the standard list/tree defines (without directions)
+CONTEXT_CUSTOM|CONTEXT_TREE = the standard list/tree defines (without directions)
*/
@@ -104,7 +104,7 @@ const struct button_mapping button_context_tree_scroll_lr[] = {
{ ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
{ ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT },
- LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|1),
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
};
const struct button_mapping button_context_yesno[] = {
@@ -126,7 +126,7 @@ const struct button_mapping button_context_quickscreen[] = {
LAST_ITEM_IN_LIST
}; /* button_context_quickscreen */
-const struct button_mapping button_context_settingsgraphical[] = {
+const struct button_mapping button_context_settings_r_is_inc[] = {
{ ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
{ ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE },
@@ -246,8 +246,10 @@ const struct button_mapping* get_context_mapping( int context )
case CONTEXT_WPS:
return button_context_wps;
- case CONTEXT_SETTINGSGRAPHICAL:
- return button_context_settingsgraphical;
+ case CONTEXT_SETTINGS_EQ:
+ case CONTEXT_SETTINGS_COLOURCHOOSER:
+ case CONTEXT_SETTINGS_TIME:
+ return button_context_settings_r_is_inc;
case CONTEXT_SETTINGS:
return button_context_settings;
@@ -259,7 +261,8 @@ const struct button_mapping* get_context_mapping( int context )
if (global_settings.hold_lr_for_scroll_in_list)
return button_context_tree_scroll_lr;
/* else fall through to CUSTOM|1 */
- case CONTEXT_CUSTOM|1:
+ case CONTEXT_CUSTOM|CONTEXT_TREE
+ :
return button_context_tree;
case CONTEXT_QUICKSCREEN:
return button_context_quickscreen;
generated by cgit v1.1 at 2026-04-25 12:26:35 +0000