Changeset 2016

Timestamp:

07/28/12 03:46:01 (10 months ago)

Author:

philmoz

Message:

Add confirmation message when new item added to User Menu, and warning when user menu is full (suggested by waterwingz).

Location:

trunk

Files:

• CHDK/LANG/english.lng (modified) (1 diff)
• core/gui_lang.h (modified) (1 diff)
• core/gui_user_menu.c (modified) (2 diffs)

trunk/CHDK/LANG/english.lng

@@ -692 +692 @@
 566 "Hide CHDK OSD while pressed"
 567 "  * - not available in <ALT> mode  "   // Len must be <= 35
+
+568 "'%s'\nadded to User Menu"
+569 "User Menu is full"

trunk/core/gui_lang.h

@@ -695 +695 @@
 #define LANG_HELP_NOT_ALT                       567
 
-#define GUI_LANG_ITEMS                          567
+#define LANG_USER_MENU_ITEM_ADDED                               568
+#define LANG_USER_MENU_FULL                                     569
+
+#define GUI_LANG_ITEMS                          569
 
 //-------------------------------------------------------------------

trunk/core/gui_user_menu.c

@@ -11 +11 @@
 #include "gui_draw.h"
 #include "gui_menu.h"
+#include "gui_mbox.h"
 #include "modules.h"
 #include "module_load.h"
@@ -55 +56 @@
         {
             user_submenu_items[i] = curr_menu_item;
-            break;
+            char buf[200];
+            sprintf(buf,lang_str(LANG_USER_MENU_ITEM_ADDED), lang_str(curr_menu_item.text));
+            gui_mbox_init(LANG_MENU_USER_MENU, (int)buf, MBOX_BTN_OK|MBOX_TEXT_CENTER, NULL);
+            return;
         }
     }
+    gui_mbox_init(LANG_MENU_USER_MENU, LANG_USER_MENU_FULL, MBOX_BTN_OK|MBOX_TEXT_CENTER, NULL);
 }