summaryrefslogtreecommitdiffstats
path: root/manual
diff options
context:
space:
mode:
authorTeruaki Kawashima <teru@rockbox.org>2011-01-16 11:40:47 +0000
committerTeruaki Kawashima <teru@rockbox.org>2011-01-16 11:40:47 +0000
commit5c09844d54c7adba80fd261e83a4c895d007a576 (patch)
tree9498be0d64be8da4e81ea93fd4c1c32e23565dd6 /manual
parente9fa68a5c005e679f59bfc53b93ba77cfe1a0b7b (diff)
downloadrockbox-5c09844d54c7adba80fd261e83a4c895d007a576.tar.gz
rockbox-5c09844d54c7adba80fd261e83a4c895d007a576.tar.bz2
rockbox-5c09844d54c7adba80fd261e83a4c895d007a576.zip
Update manual for image viewer plugin.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29065 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'manual')
-rw-r--r--manual/plugins/imageviewer.tex11
-rw-r--r--manual/plugins/main.tex7
-rw-r--r--manual/plugins/ppmviewer.tex9
3 files changed, 11 insertions, 16 deletions
diff --git a/manual/plugins/imageviewer.tex b/manual/plugins/imageviewer.tex
index 28ef62e3a6..e3603fa6ce 100644
--- a/manual/plugins/imageviewer.tex
+++ b/manual/plugins/imageviewer.tex
@@ -3,12 +3,15 @@
This plugin opens image files from the \setting{File Browser} to display them\nopt{lcd_color}{ using Rockbox's greyscale library}. Supported formats are as follows.
\begin{table}
- \begin{rbtabular}{.60\textwidth}{llX}%
+ \begin{rbtabular}{.60\textwidth}{lX}%
{\textbf{Format}& \textbf{File-extension(s)}}%
{}{}
BMP & \fname{.bmp} \\
JPEG & \fname{.jpg, .jpe, .jpeg} \\
PNG & \fname{.png} \\
+ \opt{lcd_color}{
+ PPM & \fname{.ppm} \\
+ }
\end{rbtabular}
\end{table}
@@ -139,4 +142,10 @@ for JPEG images.
Progressive scan and other unusual JPEG files are not supported, and will
result in various ``unsupported xx'' messages. Processing could also fail if the
image is too big to decode which will be explained by a respective message.
+
+\opt{lcd_color}{
+ Supported PPM files are both ASCII PPM (P3) and raw PPM (P6).
+ For more information about PPM files, see
+ \url{http://netpbm.sourceforge.net/doc/ppm.html}
+}
}
diff --git a/manual/plugins/main.tex b/manual/plugins/main.tex
index bc48bd229f..49dccdf2f9 100644
--- a/manual/plugins/main.tex
+++ b/manual/plugins/main.tex
@@ -140,7 +140,7 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
Shortcuts & \fname{.link} & \\
Chip-8 Emulator & \fname{.ch8} & \\
Frotz & \fname{.z1 - .z8} & \\
- Image Viewer & \fname{.bmp, .jpg, .jpeg, .png} & \\
+ Image Viewer & \fname{.bmp, .jpg, .jpeg, .png\opt{lcd_color}{, .ppm}} & \\
Lua scripting language& \fname{.lua} & \\
\opt{swcodec}{\nopt{lowmem}{
Midiplay & \fname{.mid, .midi} & \\
@@ -154,9 +154,6 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
Movie Player & \fname{.rvf} & \\
}
}
- \opt{lcd_color}{
- PPM viewer & \fname{.ppm} & \\
- }
\opt{lcd_bitmap}{
\nopt{ondio}{% not enough buttons
Rockboy & \fname{.gb, .gbc} & \\
@@ -193,8 +190,6 @@ option from the \setting{Context Menu} (see \reference{ref:Contextmenu}).}
\opt{swcodec}{\nopt{lowmem}{\input{plugins/mp3_encoder.tex}}}
-\opt{lcd_color}{\input{plugins/ppmviewer.tex}}
-
\opt{archosrecorder,archosfmrecorder,ondio}{\input{plugins/rockbox_flash.tex}}
\opt{lcd_bitmap}{\nopt{%
diff --git a/manual/plugins/ppmviewer.tex b/manual/plugins/ppmviewer.tex
deleted file mode 100644
index 11a8dfc625..0000000000
--- a/manual/plugins/ppmviewer.tex
+++ /dev/null
@@ -1,9 +0,0 @@
-% $Id$ %
-\subsection{PPM viewer}
-This plugin opens \fname{.ppm} files from the \setting{File Browser}
-to display them. Exit the ppm viewer plugin by pressing any button.
-
-\note{Both ASCII PPM (P3) and raw PPM (P6) files are supported.}
-
-For more information about PPM files, see
-\url{http://netpbm.sourceforge.net/doc/ppm.html}