5 files changed, 53 insertions, 0 deletions

diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 2e3adc256e..757fa58bb6 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -11716,3 +11716,37 @@
     recording: "Stop Recording And Shutdown"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_TOUCHPAD_SENSITIVITY
+  desc: touchpad sensitivity setting
+  user: 
+  <source>
+    *: none
+    gigabeatf: "Touchpad Sensitivity"
+  </source>
+  <dest>
+    *: none
+    gigabeatf: "Touchpad Sensitivity"
+  </dest>
+  <voice>
+    *: none
+    gigabeatf: "Touchpad Sensitivity"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HIGH
+  desc: in settings_menu
+  user:
+  <source>
+    *: none
+    gigabeatf: "High"
+  </source>
+  <dest>
+    *: none
+    gigabeatf: "High"
+  </dest>
+  <voice>
+    *: none
+    gigabeatf: "High"
+  </voice>
+</phrase>
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index 0dbea54496..05cfd23e32 100644
--- a/apps/menus/settings_menu.c
+++ b/apps/menus/settings_menu.c
@@ -361,6 +361,10 @@ MENUITEM_SETTING(buttonlight_timeout, &global_settings.buttonlight_timeout, NULL
 MENUITEM_SETTING(buttonlight_brightness, &global_settings.buttonlight_brightness, NULL);
 #endif
 
+#ifdef HAVE_TOUCHPAD_SENSITIVITY_SETTING
+MENUITEM_SETTING(touchpad_sensitivity, &global_settings.touchpad_sensitivity, NULL);
+#endif
+
 
 MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), 
           0, Icon_System_menu,
@@ -400,6 +404,9 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM),
 #if CONFIG_CODEC == SWCODEC
             &keyclick_menu,
 #endif
+#ifdef HAVE_TOUCHPAD_SENSITIVITY_SETTING
+            &touchpad_sensitivity,
+#endif
          );
 
 /*    SYSTEM MENU                  */
diff --git a/apps/settings.c b/apps/settings.c
index 1a857eacd8..340adba5b8 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -929,6 +929,10 @@ void settings_apply(bool read_disk)
 #endif
 #endif /* HAVE_BACKLIGHT */
 
+#ifdef HAVE_TOUCHPAD_SENSITIVITY_SETTING
+    touchpad_set_sensitivity(global_settings.touchpad_sensitivity);
+#endif
+
     /* This should stay last */
 #if defined(HAVE_RECORDING) && CONFIG_CODEC == SWCODEC
     enc_global_settings_apply();
diff --git a/apps/settings.h b/apps/settings.h
index 320e2b0517..a7772a6937 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -740,6 +740,9 @@ struct user_settings
     unsigned char playlist_catalog_dir[MAX_FILENAME+1];
     bool study_mode; /* study mode enabled */
     int study_hop_step; /* hop step in study mode, in seconds */
+#ifdef HAVE_TOUCHPAD_SENSITIVITY_SETTING
+    int touchpad_sensitivity;
+#endif
 };
 
 /** global variables **/
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 8576c5b926..48e3758ef7 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1321,6 +1321,11 @@ const struct settings_list settings[] = {
 #endif /* CONFIG_CODEC == SWCODEC */
     FILENAME_SETTING(0, playlist_catalog_dir, "playlist catalog directory",
                      PLAYLIST_CATALOG_DEFAULT_DIR, NULL, NULL, MAX_FILENAME+1),
+#ifdef HAVE_TOUCHPAD_SENSITIVITY_SETTING
+    CHOICE_SETTING(0, touchpad_sensitivity, LANG_TOUCHPAD_SENSITIVITY, 0,
+                   "touchpad sensitivity", "normal,high", touchpad_set_sensitivity, 2,
+                   ID2P(LANG_NORMAL), ID2P(LANG_HIGH)),
+#endif
 };
 
 const int nb_settings = sizeof(settings)/sizeof(*settings);