Read about our upcoming Code of Conduct on this issue

Commit 4692f569 authored by a1ex's avatar a1ex
Browse files

Cleanup

--HG--
branch : unified
parent b38fbcd1e961
......@@ -884,8 +884,6 @@ Adjusting the exposure parameters. Most of these settings only work in Manual (p
**Contrast/Saturation: -4..4**
Adjusts the contrast and the saturation of the current picture style.
``WARNING``: this will modify your current picture style.
.. _flash exposure compensation:
.. _Flash AEcomp:
......@@ -1076,7 +1074,8 @@ Miscellanous settings.
* ``ON``: LiveView display image reflects exposure of the final image.
* ``OFF``: LiveView display image does not reflect the exposure, but may be useful for framing and checking focus.
* ``Auto``: ExpSim is:
- disabled during zoom (x5, x10 and MagicZoom), if shutter is not pressed halfway;
- disabled during zoom (x5, x10 and MagicZoom), but only if shutter is not pressed halfway;
- enabled otherwise.
When ExpSim is off, zebra, histogram, waveform and false color are not displayed.
......@@ -1166,7 +1165,7 @@ you can uncomment them from ``debug.c`` and create a custom ``autoexec.bin``.
**Dim display: OFF / after X seconds**
In LiveView, if the camera is idle, Magic Lantern will reduce the LCD backlight power to minimum in order to save power.
In LiveView, if the camera is idle, Magic Lantern will reduce the LCD backlight level to minimum in order to save power.
**Turn off display: OFF / after X seconds**
......
......@@ -33,6 +33,7 @@ for l in f[1:]:
l = l.strip("\n").split(" ")
page, type, name = l[0], l[1], string.join(l[2:], " ")
page = int(page)
name = name.replace("$\leftrightarrow $", "<-->")
if type == "subsubsection": # each menu entry is a subsection
item = name.split(":")[0]
......
......@@ -69,7 +69,7 @@ def labelhack(file): # bug in rst2latex? it forgets to place labels in tex sourc
f.write(txt)
f.close()
nonewlineitems = ['Output volume', 'WBShift','Aperture','PictureStyle','Contrast','Focus delay', 'Focus A', 'Rack Focus', 'Hyperfocal', 'DOF', 'Lockup', 'ISO selection', 'Screenshot', 'Spy', 'Save config', 'Delete config', 'Movie REC', 'Movie Restart', 'Zebra when REC', 'Gain', 'AGC', 'Zoom in PLAY', "Swap MENU"]
nonewlineitems = ['Output volume', 'WBShift','Aperture','PictureStyle','Contrast','Focus delay', 'Focus A', 'Rack Focus', 'Hyperfocal', 'DOF', 'Lockup', 'ISO selection', 'Screenshot', 'Spy', 'Save config', 'Delete config', 'Movie REC', 'Movie Restart', 'Zebra when REC', 'Gain', 'AGC', 'Zoom in PLAY', "Swap MENU", "Turn off", "Flash AE"]
def should_add_newline(l):
for it in nonewlineitems:
if it in l:
......
......@@ -513,7 +513,7 @@ int can_lv_trap_focus_be_active()
if (gui_state != GUISTATE_IDLE) return 0;
if (get_silent_pic_mode()) return 0;
if (!is_manual_focus()) return 0;
bmp_printf(FONT_MED, 100, 100, "LVTF 1");
//~ bmp_printf(FONT_MED, 100, 100, "LVTF 1");
return 1;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment