1 files changed, 77 insertions, 6 deletions

diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index f42550cc6a..5c99cb4cd4 100644
--- a/apps/menus/settings_menu.c
+++ b/apps/menus/settings_menu.c
@@ -49,12 +49,67 @@
 #include "dircache.h"
 #endif
 #include "folder_select.h"
-
+#ifndef HAS_BUTTON_HOLD
+#include "mask_select.h"
+#endif
 #if defined(DX50) || defined(DX90)
 #include "governor-ibasso.h"
 #include "usb-ibasso.h"
 #endif
 
+#ifndef HAS_BUTTON_HOLD
+static int selectivesoftlock_callback(int action,
+                                      const struct menu_item_ex *this_item)
+{
+    (void)this_item;
+
+    switch (action)
+    {
+        case ACTION_STD_MENU:
+        case ACTION_STD_CANCEL:
+        case ACTION_EXIT_MENUITEM:
+            set_selective_softlock_actions(
+                            global_settings.bt_selective_softlock_actions,
+                            global_settings.bt_selective_softlock_actions_mask);
+            break;
+    }
+
+    return action;
+}
+
+static int selectivesoftlock_set_mask(void* param)
+{
+    (void)param;
+int mask = global_settings.bt_selective_softlock_actions_mask;
+            struct s_mask_items maskitems[]={
+                                       {ID2P(LANG_VOLUME)     , SEL_ACTION_VOL},
+                                       {ID2P(LANG_ACTION_PLAY), SEL_ACTION_PLAY},
+                                       {ID2P(LANG_ACTION_SEEK), SEL_ACTION_SEEK},
+                                       {ID2P(LANG_ACTION_SKIP), SEL_ACTION_SKIP},
+ #ifdef HAVE_BACKLIGHT
+                            {ID2P(LANG_ACTION_AUTOLOCK_ON), SEL_ACTION_AUTOLOCK},
+ #endif
+ #if defined(HAVE_TOUCHPAD) || defined(HAVE_TOUCHSCREEN)
+                        {ID2P(LANG_ACTION_DISABLE_TOUCH) , SEL_ACTION_NOTOUCH},
+ #endif
+                         {ID2P(LANG_ACTION_DISABLE_NOTIFY), SEL_ACTION_NONOTIFY}
+                                            };
+
+            mask = mask_select(mask, ID2P(LANG_SOFTLOCK_SELECTIVE)
+                               , maskitems,ARRAYLEN(maskitems));
+
+            if (mask == SEL_ACTION_NONE)
+                global_settings.bt_selective_softlock_actions = false;
+            else if (global_settings.bt_selective_softlock_actions_mask != mask)
+                global_settings.bt_selective_softlock_actions = true;
+
+            global_settings.bt_selective_softlock_actions_mask = mask;
+
+    return true;
+}
+
+#endif /* !HAS_BUTTON_HOLD */
+
 /***********************************/
 /*    TAGCACHE MENU                */
 #ifdef HAVE_TAGCACHE
@@ -137,7 +192,7 @@ static int clear_start_directory(void)
     splash(HZ, ID2P(LANG_RESET_DONE_CLEAR));
     return false;
 }
-MENUITEM_FUNCTION(clear_start_directory_item, 0, ID2P(LANG_RESET_START_DIR), 
+MENUITEM_FUNCTION(clear_start_directory_item, 0, ID2P(LANG_RESET_START_DIR),
                   clear_start_directory, NULL, NULL, Icon_file_view_menu);
 static int fileview_callback(int action,const struct menu_item_ex *this_item)
 {
@@ -330,6 +385,19 @@ MENUITEM_SETTING(touchpad_deadzone, &global_settings.touchpad_deadzone, NULL);
 MENUITEM_SETTING(shortcuts_replaces_quickscreen, &global_settings.shortcuts_replaces_qs, NULL);
 #endif
 
+#ifndef HAS_BUTTON_HOLD
+
+MENUITEM_SETTING(bt_selective_actions,
+                 &global_settings.bt_selective_softlock_actions,
+                                                    selectivesoftlock_callback);
+MENUITEM_FUNCTION(sel_softlock_mask, 0, ID2P(LANG_SETTINGS),
+                  selectivesoftlock_set_mask, NULL,
+                                 selectivesoftlock_callback, Icon_Menu_setting);
+
+MAKE_MENU(sel_softlock, ID2P(LANG_SOFTLOCK_SELECTIVE),
+          NULL, Icon_Menu_setting, &bt_selective_actions, &sel_softlock_mask);
+#endif /* !HAS_BUTTON_HOLD */
+
 #if defined(DX50) || defined(DX90)
 MENUITEM_SETTING(governor, &global_settings.governor, NULL);
 MENUITEM_SETTING(usb_mode, &global_settings.usb_mode, NULL);
@@ -380,6 +448,9 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM),
 #ifdef HAVE_TOUCHPAD_DEADZONE
             &touchpad_deadzone,
 #endif
+#ifndef HAS_BUTTON_HOLD
+            &sel_softlock,
+#endif
 #ifdef USB_ENABLE_HID
             &usb_hid,
             &usb_keypad_mode,
@@ -544,7 +615,7 @@ MAKE_MENU(bookmark_settings_menu, ID2P(LANG_BOOKMARK_SETTINGS), 0,
 /***********************************/
 /*    AUTORESUME MENU              */
 #ifdef HAVE_TAGCACHE
-#if CONFIG_CODEC == SWCODEC 
+#if CONFIG_CODEC == SWCODEC
 
 static int autoresume_callback(int action, const struct menu_item_ex *this_item)
 {
@@ -557,7 +628,7 @@ static int autoresume_callback(int action, const struct menu_item_ex *this_item)
         static const char *lines[] = {ID2P(LANG_TAGCACHE_BUSY),
                                       ID2P(LANG_TAGCACHE_FORCE_UPDATE)};
         static const struct text_message message = {lines, 2};
-        
+
         if (gui_syncyesno_run(&message, NULL, NULL) == YESNO_YES)
             tagcache_rebuild_with_splash();
     }
@@ -672,9 +743,9 @@ MAKE_MENU(settings_menu_item, ID2P(LANG_GENERAL_SETTINGS), 0,
           &startup_shutdown_menu,
           &bookmark_settings_menu,
 #ifdef HAVE_TAGCACHE
-#if CONFIG_CODEC == SWCODEC 
+#if CONFIG_CODEC == SWCODEC
           &autoresume_menu,
-#endif          
+#endif
 #endif
           &browse_langs, &voice_settings_menu,
 #ifdef HAVE_HOTKEY