Changeset 1998

Timestamp:

07/18/12 19:05:44 (10 months ago)

Author:

tsv

Message:

Update Simple mode: help files are respect locale, shoot act as cancel, default incrementor for focus is 100

Location:

branches/tsvstar-uitest

Files:

• CHDK/CHDK.HLP (deleted)
• CHDK/HELP (added)
• CHDK/HELP/ENGLISH.HLP (added)
• CHDK/HELP/russian.hlp (added)
• core/gui.c (modified) (3 diffs)
• core/gui_lang.h (modified) (1 diff)
• core/gui_menu.c (modified) (4 diffs)
• tools/makelang.c (modified) (1 diff)

branches/tsvstar-uitest/core/gui.c

@@ -2704 +2704 @@
 }
 
+static void copy_fname_w_new_ext( char* tgt, char* src, char* ext )
+{
+        if ( !src || !tgt ) return;
+
+        // copy filename
+        char *str = strrchr( src, '/' );
+        if (!str ) { str = src; } else { str++;}
+        strcpy( tgt, str );
+
+        // replce extension
+        str = strrchr( tgt, '.' );
+        if ( !str ) { str = tgt+strlen(tgt); }
+        strcpy(  str, ext );
+
+                
+}
+
+
 // Called from the GUI task code to set the ALT mode state
 void gui_activate_alt_mode()
@@ -2712 +2730 @@
 
                 // "Newbie" mode mean start help file
+                // Break regular ALT sequence only if module ok and help exists 
                 if ( conf.chdk_gui_mode_enum == CHDK_MODE_NEWBIE &&  !state_kbd_script_run )
                 {
@@ -2717 +2736 @@
                         conf_save();
 
-                        // Break regular ALT sequence only if module ok and help exists
-                        unsigned int argv[] ={ (unsigned int)"A/CHDK/CHDK.HLP" };
+                        // make path to help file
+
+                        char path_buf[60];
+                        unsigned int argv[] ={ (unsigned int)path_buf };
+                        strcpy( path_buf, "A/CHDK/HELP/");
+
+                        char* helpfile_name = path_buf + strlen(path_buf);
+
+                        // if not success, try to load "_current_locale_.hlp"
+                        if ( conf.lang_file[0] ) {
+                                copy_fname_w_new_ext( helpfile_name, conf.lang_file, ".hlp");
+
+                                if ( module_run("txtread.flt", 0, sizeof(argv)/sizeof(argv[0]), argv, UNLOAD_IF_ERR) == 0 )
+                                        break;
+                        }
+
+                        // if not success, try to load "_base_language_.hlp"
+                        copy_fname_w_new_ext( helpfile_name, gui_lang_source_filename, ".hlp");
+                        if ( module_run("txtread.flt", 0, sizeof(argv)/sizeof(argv[0]), argv, UNLOAD_IF_ERR) == 0 )
+                                break;
+
+                        //if not success, try to load "english.hlp"
+                        argv[0] = (unsigned int)"A/CHDK/HELP/ENGLISH.HLP";
                         if ( module_run("txtread.flt", 0, sizeof(argv)/sizeof(argv[0]), argv, UNLOAD_IF_ERR) == 0 )
                                 break;

branches/tsvstar-uitest/core/gui_lang.h

@@ -703 +703 @@
 extern void gui_lang_init();
 
+extern char* gui_lang_source_filename;
+
 //-------------------------------------------------------------------
 #endif

branches/tsvstar-uitest/core/gui_menu.c

@@ -105 +105 @@
                 int itemid = lang_strhash31( curr_menu->menu[gui_menu_curr_item].text );
                 if ( itemid == LANG_MENU_SUBJ_DIST_BRACKET_VALUE ||
-                         itemid == LANG_MENU_ISO_BRACKET_VALUE ||
-                         itemid == LANG_MENU_OVERRIDE_SUBJ_DIST_VALUE ||
+                         itemid == LANG_MENU_OVERRIDE_SUBJ_DIST_VALUE )
+                {
+                        int_incr = 100;
+                }
+                else if ( itemid == LANG_MENU_ISO_BRACKET_VALUE ||
                          itemid == LANG_MENU_OVERRIDE_ISO_VALUE )
                 {
@@ -631 +634 @@
 }
 
+
+// Purpose: cancel edit mode without apply changes
+void gui_menu_cancel_editmode()
+{
+        // cancel change
+    int *valueptr = menuitem_get_valueptr(curr_menu,gui_menu_curr_item);
+
+    if ( valueptr )
+        *valueptr = item_prev_value;
+
+    gui_menu_set_editmode(0);
+    gui_menu_left(0);   // process bounds and callbacks
+
+        // keep quickdisable state on cancel
+        if ( item_prev_value < 0 )
+                turn_current_item_off();
+}
+
 //-------------------------------------------------------------------
 // Process button presses when in GUI_MODE_MENU mode
@@ -641 +662 @@
         case KEY_SHOOT_HALF:
 #endif
+                        if ( flag_editmode ) {
+                                gui_menu_cancel_editmode();
+                                break;
+                        }
+
             if (conf.user_menu_enable == 3) {
                 if (curr_menu->title != LANG_MENU_USER_MENU) {
@@ -815 +841 @@
         case KEY_DISPLAY:
                 if ( flag_editmode ) {
-
-                    // cancel change
-                    int *valueptr = menuitem_get_valueptr(curr_menu,gui_menu_curr_item);
-
-                    if ( valueptr )
-                        *valueptr = item_prev_value;
-
-                    gui_menu_set_editmode(0);
-                    gui_menu_left(0);   // process bounds and callbacks
-
-                                        // keep quickdisable state on cancel
-                                        if ( item_prev_value < 0 )
-                                                turn_current_item_off();
-                                          
+                                        gui_menu_cancel_editmode();                                       
                 } else {
                         gui_menu_back();

branches/tsvstar-uitest/tools/makelang.c

@@ -60 +60 @@
         lang_load_from_mem ( file2 );
 
+
+        char* lng_filename = (argc>2 && file2) ? argv[2] : argv[1];
+
         int num_empty_lines=0;
         char buf[200];
 
-        printf("//Auto generated file. Do not edit the contents of this file.\n//Update the CHDK/LANG/*.lng files to make changes.\n//Generated from %s\n\n",(argc>2)?argv[2]:argv[1]);
+        printf("//Auto generated file. Do not edit the contents of this file.\n//Update the CHDK/LANG/*.lng files to make changes.\n//Generated from %s\n\n",lng_filename);
+
+        printf("char* gui_lang_source_filename=\"");
+        for (i=0;i<8 && lng_filename[i] && lng_filename[i]!='.'; i++)
+          printf("%c",lng_filename[i]);
+        printf("\";\n\n");
+
         printf("static char* gui_lang_default = \\\n");