5 files changed, 35 insertions, 0 deletions

diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index fb19485d43..e8dcf4867d 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -10776,6 +10776,23 @@
   </voice>
 </phrase>
 <phrase>
+  id: LANG_BUTTONLIGHT_BRIGHTNESS
+  desc: in settings_menu
+  user:
+  <source>
+    *: ""
+    gigabeatf: "Button Light Brightness"
+  </source>
+  <dest>
+    *: ""
+    gigabeatf: "Button Light Brightness"
+  </dest>
+  <voice>
+    *: ""
+    gigabeatf: "Button Light Brightness"
+  </voice>
+</phrase>
+<phrase>
   id: LANG_PLAYLISTVIEWER_SETTINGS
   desc: title for the playlist viewer settings menus
   user:
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index 528587dffb..6d962824f1 100644
--- a/apps/menus/settings_menu.c
+++ b/apps/menus/settings_menu.c
@@ -323,6 +323,10 @@ MENUITEM_SETTING(start_screen, &global_settings.start_in_screen, NULL);
 MENUITEM_SETTING(button_light_timeout, &global_settings.button_light_timeout, NULL);
 #endif
 
+#ifdef HAVE_BUTTONLIGHT_BRIGHTNESS
+MENUITEM_SETTING(buttonlight_brightness, &global_settings.buttonlight_brightness, NULL);
+#endif
+
 MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), 
           0, Icon_System_menu,
             &start_screen,
@@ -352,6 +356,9 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM),
 #ifdef HAVE_BUTTON_LIGHT
             &button_light_timeout,
 #endif
+#ifdef HAVE_BUTTONLIGHT_BRIGHTNESS
+            &buttonlight_brightness
+#endif
          );
 
 /*    SYSTEM MENU                  */
diff --git a/apps/settings.c b/apps/settings.c
index 35a063bf96..81dbe71491 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -713,6 +713,9 @@ void settings_apply(void)
 #ifdef HAVE_BUTTON_LIGHT
     button_backlight_set_timeout(global_settings.button_light_timeout);
 #endif
+#ifdef HAVE_BUTTONLIGHT_BRIGHTNESS
+    buttonlight_set_brightness(global_settings.buttonlight_brightness);
+#endif
 #ifdef HAVE_BACKLIGHT_BRIGHTNESS
     backlight_set_brightness(global_settings.brightness);
 #endif
diff --git a/apps/settings.h b/apps/settings.h
index 13291be3df..5e9da84bae 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -720,6 +720,9 @@ struct user_settings
 #ifdef HAVE_BUTTON_LIGHT
     int button_light_timeout;
 #endif
+#ifdef HAVE_BUTTONLIGHT_BRIGHTNESS
+    int buttonlight_brightness;
+#endif
 };
 
 /** global variables **/
diff --git a/apps/settings_list.c b/apps/settings_list.c
index e781c51be0..d39779607d 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1183,6 +1183,11 @@ const struct settings_list settings[] = {
         0, 18, 1, backlight_formatter, backlight_getlang, 
         button_backlight_set_timeout),
 #endif
+#ifdef HAVE_BUTTONLIGHT_BRIGHTNESS
+    INT_SETTING(0, buttonlight_brightness, LANG_BUTTONLIGHT_BRIGHTNESS, DEFAULT_BRIGHTNESS_SETTING,
+        "button light brightness",UNIT_INT, MIN_BRIGHTNESS_SETTING, MAX_BRIGHTNESS_SETTING, 1,
+        NULL, NULL, buttonlight_set_brightness),
+#endif
 };
 
 const int nb_settings = sizeof(settings)/sizeof(*settings);