Changeset 424

Timestamp:

06/18/08 07:30:51 (2 years ago)

Author:

Jucifer

Message:

+ added cyril42e's "display zebra only when necessary" and "don't show script params if no param" tweaks, http://chdk.setepontos.com/index.php/topic,1687.msg15345.html#msg15345

Files:

• branches/juciphox/core/gui_lang.c (modified) (1 diff)
• branches/juciphox/core/gui_osd.c (modified) (4 diffs)
• branches/juciphox/core/script.c (modified) (1 diff)
• branches/juciphox/lang/english.lng (modified) (14 diffs)
• branches/juciphox/platform/a720/sub/100c/boot.c (modified) (1 diff)

branches/juciphox/core/gui_lang.c

@@ -158 +158 @@
-
-"106 \"*** Build Info ***\"\n"
-, #
+ 
-
-"108 \"*** Memory Info ***\"\n"

branches/juciphox/core/gui_osd.c

@@ -244 +244 @@
-    static int need_restore=0;
-    int viewport_height;
-
+
+
-    color cls[] = {
-        COLOR_TRANSPARENT,
@@ -287 +288 @@
-                break;
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-            int step_x, step_v;
-            over = 255-conf.zebra_over;
@@ -322 +310 @@
-                        else if (((conf.zebra_mode == ZEBRA_MODE_ZEBRA_1 || conf.zebra_mode == ZEBRA_MODE_ZEBRA_2) && (y-x-timer)&f)) buf[s]=COLOR_TRANSPARENT;
-                             else buf[s]=(yy>over)?cl_over:(yy<conf.zebra_under)?cl_under:COLOR_TRANSPARENT;
+                        if (buf[s] != COLOR_TRANSPARENT && !zebra_drawn) zebra_drawn = 1;
-                    }
-                    s+=screen_buffer_width-screen_width;
@@ -329 +318 @@
-                    }
-                }
+            if (!zebra_drawn) f=0;
+        }
+        if (!f) {
+            if (need_restore) {
+                if (conf.zebra_restore_screen || conf.zebra_restore_osd) {
+                    draw_restore();
+                } else {
+                    memset(buf, COLOR_TRANSPARENT, screen_buffer_size);
+                    gui_osd_draw_zebra_osd();
+                    memcpy(scr_buf, buf, screen_buffer_size);
+                    memcpy(scr_buf+screen_buffer_size, buf, screen_buffer_size);
+                }
+                need_restore=0;
+            }
+            return !(conf.zebra_restore_screen && conf.zebra_restore_osd);
+        } else {
-            
-            

branches/juciphox/core/script.c

@@ -153 +153 @@
-        if (script_params[i][0]) break;
-    }
-
+/*
-        for (i=0; i<3; ++i) {
-            strcpy(script_params[i], "Var. ? value");
-            script_params[i][5]='a'+i;
-        }
-
+*/
-}
-

branches/juciphox/lang/english.lng

@@ -7 +7 @@
-  1 "Main Menu"
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 10 "Reset Options to Default..."
- 11 "Save Options Now..."
-
-
+
+
-
-
@@ -39 +48 @@
- 26 "Show Clock"
- 27 "OSD Layout Editor"
-
+
+
-
-
@@ -96 +106 @@
- 68 "File Browser"
- 69 "Calendar"
-
-
+
+
+
+
- 72 "Flashlight"
- 73 "Show Splash Screen on Load"
@@ -148 +160 @@
-
-106 "*** Build Info ***"
-, #
+ 
-
-108 "*** Memory Info ***"
@@ -274 +286 @@
-201 "Load Grid from File..."
-202 "Grid Lines"
-
+
+
-204 "Select Grid File"
-205 "Current Grid"
-
-Noise Redu
+Dark Frame Substra
-
-207 "Override Grid Colors"
@@ -285 +298 @@
-
-210 "DOF Calculator"
-
+
+
-212 "Canon Subj. Dist. as Near Limit" 
-213 "Use EXIF Subj. Dist. (PC65)"
@@ -296 +310 @@
-
-219 "Miscellaneous Values"
-
+
+
-221 "Show in Review Mode"       
-222 "Show Zoom"         
@@ -311 +326 @@
-
-233 "Video Parameters"
-
+
+
-235 "Video Mode"
-236 "Video Bitrate"
@@ -318 +334 @@
-
-238 "Extra Photo Operations"
-
+
+
-240 "Override Shutter Speed Value"
-241 "    Value Factor"
@@ -328 +345 @@
-
-247 "Bracketing in Continuous Mode"
-
+
+
-249 "TV Bracketing Value"
-250 "AV Bracketing Value"
@@ -341 +359 @@
-
-258 "Exposure Control (No Flash)"
-
+
+
-260 "Recalc Exposure"
-261 "TV Exposure Recalc Order"
@@ -407 +426 @@
-309 "  Warning threshold"
-310 "Enable Optical Zoom"
-
+
+
-312 "Clock Settings"
-313 "Clock format"
@@ -415 +435 @@
-
-317 "Raw showing settings"
-
+
+
-
-319 "Filespace showing settings"
-
+
+
-
-321 "Custom Auto ISO"
-
+
+
-323 "Enable Custom Auto ISO"
-324 "Minimal Shutter speed"
@@ -442 +465 @@
-339 "RAWconv"
-
+340 "Override"
+341 "Override Background"
+342 "Disable Overrides"
+343 "  Include AutoIso & Bracketing?"
+344 "  Hide in Playback?"
+345 "  Disable @ Video Rec?"
+346 "Show remaining videotime?"
+347 "  Refreshrate (~sec)"
+348 "Remaining video time"
+349 "Clear videoparams on Start?"
+350 "Enable Fast Ev switch?"
+351 "   Step size (1 EV)?"
+352 "EV correction"
+353 "Are you SURE to delete ALL\nRAW files without corresponding JPG\nin DCIM folder?"
+354 "Are you SURE to delete ALL\nRAW files without corresponding JPG\nin selected folder?"
+355 "Are you SURE to delete RAW files\nwithout corresponding JPG?\n(Excluding marked)"
+356 "Purge RAW feature\ndoes not apply to this item"
+357 "*** Purge RAW files ***"
+358 "Purge RAW"
+ 
+359 "User Menu as Root"
+
+360 "Symbol font"
+361 "Select Symbol file"
+362 "Enable Symbols"
+363 "Symbol Text Color" 
+364 "Symbol Background Color"
+
+365 "Custom curves"
+//"366 "Custom curves ->"
+366 "Custom curves"
+367 "Load curve profile..."
+368 "Enable curve"
+369 "Select curve file"
+
+370 "Edge overlay"
+371 "Edge overlay"
+
+372 "Enable edge overlay"
+373 "Edge overlay threshold"
+374 "Edge overlay color"
+
+375 "Remote parameters"
+376 "Remote parameters"
+377 "Enable Remote"
+378 "Enable Synch"
+379 "Enable Synch Delay"
+380 "Synch Delay 0.1ms"
+381 "Synch Delay 0.1s"
+

branches/juciphox/platform/a720/sub/100c/boot.c

@@ -21 +21 @@
-    long *canon_data_src = (void*)0xFFE9C5D0;
-    long *canon_data_dst = (void*)0x1900;
-c0
-c0
-c0
+0c
+0c
+0c
-
-    long i;