Adjust screenshot macro for use of device specific images. This makes it possible to share resolution dependent images (like plugins) and also put in device specific one. Solves the recorder vs. ondio problem as mentioned in FS#5458.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10042 a1c6a512-1295-4272-9138-f99709370657

13 files changed, 45 insertions, 17 deletions

diff --git a/manual/platform/h1xx.tex b/manual/platform/h1xx.tex
index 413fc57..e616b7e 100644
--- a/manual/platform/h1xx.tex
+++ b/manual/platform/h1xx.tex
@@ -1,3 +1,4 @@
+% $Id$ %
 \def\UseOption{h1xx}
 \edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
 \edef\UseOption{\UseOption,HAVE_RECORDING}
@@ -9,6 +10,7 @@
 \newcommand{\playertype}{H1xx}
 \newcommand{\playerlongtype}{iHP100, iHP115, iHP120, iHP140, H120 and H140}
 \newcommand{\genericimg}{160x128x2}
+\newcommand{\specimg}{h1xx}
 %Used to name the player, e.g. ...to the \dap
 \newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
diff --git a/manual/platform/h300.tex b/manual/platform/h300.tex
index b777e16..5fa549a 100644
--- a/manual/platform/h300.tex
+++ b/manual/platform/h300.tex
@@ -1,3 +1,4 @@
+% $Id$ %
 \def\UseOption{h300}
 \edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
 \edef\UseOption{\UseOption,HAVE_RECORDING}
@@ -10,6 +11,7 @@
 \newcommand{\playertype}{H3xx}
 \newcommand{\playerlongtype}{H320 and H340}
 \newcommand{\genericimg}{220x176x16}
+\newcommand{\specimg}{h300}
 %Used to name the player, e.g. ...to the \dap
 \newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
@@ -24,4 +26,4 @@
 \newcommand{\ButtonMode}{A-B}
 \newcommand{\ButtonRec}{Rec}
 \newcommand{\ButtonOn}{Play}
-\newcommand{\ButtonOff}{Stop}
\ No newline at end of file
+\newcommand{\ButtonOff}{Stop}
diff --git a/manual/platform/ipod4g.tex b/manual/platform/ipod4g.tex
index b71b5cb..95664bf 100644
--- a/manual/platform/ipod4g.tex
+++ b/manual/platform/ipod4g.tex
@@ -1,3 +1,4 @@
+% $Id$ %
 \def\UseOption{ipod4g}
 \edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
 \edef\UseOption{\UseOption,CONFIG_RTC}
@@ -8,6 +9,7 @@
 \newcommand{\playertype}{4G}
 \newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{160x128x2}
+\newcommand{\specimg}{ipod4g}
 %Used to name the player, e.g. ...to the \dap
 \newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
@@ -20,4 +22,4 @@
 \newcommand{\ButtonPlay}{Play}
 \newcommand{\ButtonSelect}{Select}
 \newcommand{\ButtonScrollFwd}{Scroll Fwd}
-\newcommand{\ButtonScrollBack}{Scroll Back}
\ No newline at end of file
+\newcommand{\ButtonScrollBack}{Scroll Back}
diff --git a/manual/platform/ipodcolor.tex b/manual/platform/ipodcolor.tex
index 84cd37a..ed6094f 100644
--- a/manual/platform/ipodcolor.tex
+++ b/manual/platform/ipodcolor.tex
@@ -1,3 +1,4 @@
+% $Id$ %
 \def\UseOption{ipodcolor}
 \edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
 \edef\UseOption{\UseOption,CONFIG_RTC}
@@ -8,6 +9,7 @@
 \newcommand{\playertype}{Color}
 \newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{220x176x16}
+\newcommand{\specimg}{ipodcolor}
 %Used to name the player, e.g. ...to the \dap
 \newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
@@ -20,4 +22,4 @@
 \newcommand{\ButtonPlay}{Play}
 \newcommand{\ButtonSelect}{Select}
 \newcommand{\ButtonScrollFwd}{Scroll Fwd}
-\newcommand{\ButtonScrollBack}{Scroll Back}
\ No newline at end of file
+\newcommand{\ButtonScrollBack}{Scroll Back}
diff --git a/manual/platform/ipodmini.tex b/manual/platform/ipodmini.tex
index 9d9c16a..857ef73 100644
--- a/manual/platform/ipodmini.tex
+++ b/manual/platform/ipodmini.tex
@@ -1,3 +1,4 @@
+% $Id$ %
 \def\UseOption{ipodmini}
 \edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
 \edef\UseOption{\UseOption,CONFIG_RTC}
@@ -8,6 +9,7 @@
 \newcommand{\playertype}{Mini}
 \newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{138x110x2}
+\newcommand{\specimg}{ipodmini}
 %Used to name the player, e.g. ...to the \dap
 \newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
@@ -20,4 +22,4 @@
 \newcommand{\ButtonPlay}{Play}
 \newcommand{\ButtonSelect}{Select}
 \newcommand{\ButtonScrollFwd}{Scroll Fwd}
-\newcommand{\ButtonScrollBack}{Scroll Back}
\ No newline at end of file
+\newcommand{\ButtonScrollBack}{Scroll Back}
diff --git a/manual/platform/ipodnano.tex b/manual/platform/ipodnano.tex
index 116efd7..4dcbc06 100644
--- a/manual/platform/ipodnano.tex
+++ b/manual/platform/ipodnano.tex
@@ -1,3 +1,4 @@
+% $Id$ %
 \def\UseOption{ipodnano}
 \edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
 \edef\UseOption{\UseOption,CONFIG_RTC}
@@ -8,6 +9,7 @@
 \newcommand{\playertype}{Nano}
 \newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{176x132x16}
+\newcommand{\specimg}{ipodnano}
 %Used to name the player, e.g. ...to the \dap
 \newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
@@ -20,4 +22,4 @@
 \newcommand{\ButtonPlay}{Play}
 \newcommand{\ButtonSelect}{Select}
 \newcommand{\ButtonScrollFwd}{Scroll Fwd}
-\newcommand{\ButtonScrollBack}{Scroll Back}
\ No newline at end of file
+\newcommand{\ButtonScrollBack}{Scroll Back}
diff --git a/manual/platform/ipodvideo.tex b/manual/platform/ipodvideo.tex
index 0a73946..490d7b8 100644
--- a/manual/platform/ipodvideo.tex
+++ b/manual/platform/ipodvideo.tex
@@ -1,3 +1,4 @@
+% $Id$ %
 \def\UseOption{ipodvideo}
 \edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
 \edef\UseOption{\UseOption,CONFIG_RTC}
@@ -8,6 +9,7 @@
 \newcommand{\playertype}{Video}
 \newcommand{\playerlongtype}{\playertype}
 \newcommand{\genericimg}{320x240x16}
+\newcommand{\specimg}{ipodvideo}
 %Used to name the player, e.g. ...to the \dap
 \newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
@@ -20,4 +22,4 @@
 \newcommand{\ButtonPlay}{Play}
 \newcommand{\ButtonSelect}{Select}
 \newcommand{\ButtonScrollFwd}{Scroll Fwd}
-\newcommand{\ButtonScrollBack}{Scroll Back}
\ No newline at end of file
+\newcommand{\ButtonScrollBack}{Scroll Back}
diff --git a/manual/platform/ondio.tex b/manual/platform/ondio.tex
index 84d682d..0fe84b2dd 100644
--- a/manual/platform/ondio.tex
+++ b/manual/platform/ondio.tex
@@ -1,3 +1,4 @@
+% $Id$ %
 %platform file for the Ondio SP,FM
 \def\UseOption{ondio}
 \edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
@@ -10,6 +11,7 @@
 \newcommand{\playertype}{Ondio}
 \newcommand{\playerlongtype}{Ondio SP, FM}
 \newcommand{\genericimg}{112x64x1}
+\newcommand{\specimg}{ondio}
 %Used to name the player, e.g. ...to the \dap
 \newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
@@ -21,4 +23,4 @@
 \newcommand{\ButtonOff}{Off}
 \newcommand{\ButtonUp}{Up}
 \newcommand{\ButtonDown}{Down}
-\newcommand{\ButtonMenu}{Mode}
\ No newline at end of file
+\newcommand{\ButtonMenu}{Mode}
diff --git a/manual/platform/player.tex b/manual/platform/player.tex
index 1aae185..93a71f7 100644
--- a/manual/platform/player.tex
+++ b/manual/platform/player.tex
@@ -1,3 +1,4 @@
+% $Id$ %
 \def\UseOption{player}
 \edef\UseOption{\UseOption,MASCODEC}
 \edef\UseOption{\UseOption,PLAYER_PAD}
@@ -6,6 +7,7 @@
 \newcommand{\playertype}{Studio/Player}
 \newcommand{\playerlongtype}{Jukebox Studio 5000, 6000, Player 10 and 20}
 \newcommand{\genericimg}{charx11x1}
+\newcommand{\specimg}{player}
 %Used to name the player, e.g. ...to the \dap
 \newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
@@ -17,4 +19,4 @@
 \newcommand{\ButtonOn}{On}
 \newcommand{\ButtonMenu}{Menu}
 \newcommand{\ButtonPlay}{Play}
-\newcommand{\ButtonStop}{Stop}
\ No newline at end of file
+\newcommand{\ButtonStop}{Stop}
diff --git a/manual/platform/recorder.tex b/manual/platform/recorder.tex
index c26a722..6eff1c1 100644
--- a/manual/platform/recorder.tex
+++ b/manual/platform/recorder.tex
@@ -1,3 +1,4 @@
+% $Id$ %
 \def\UseOption{recorder}
 \edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
 \edef\UseOption{\UseOption,HAVE_RECORDING}
@@ -9,6 +10,7 @@
 \newcommand{\playertype}{Recorder}
 \newcommand{\playerlongtype}{Recorder 6, 10, 15 and 20}
 \newcommand{\genericimg}{112x64x1}
+\newcommand{\specimg}{recorder}
 %Used to name the player, e.g. ...to the \dap
 \newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
@@ -24,4 +26,4 @@
 \newcommand{\ButtonRight}{Right}
 \newcommand{\ButtonFOne}{F1}
 \newcommand{\ButtonFTwo}{F2}
-\newcommand{\ButtonFThree}{F3}
\ No newline at end of file
+\newcommand{\ButtonFThree}{F3}
diff --git a/manual/platform/recorderv2fm.tex b/manual/platform/recorderv2fm.tex
index 9fc9391..3dfa2e4 100644
--- a/manual/platform/recorderv2fm.tex
+++ b/manual/platform/recorderv2fm.tex
@@ -1,3 +1,4 @@
+% $Id$ %
 \def\UseOption{recorderv2fm}
 \edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
 \edef\UseOption{\UseOption,HAVE_RECORDING}
@@ -10,6 +11,7 @@
 \newcommand{\playertype}{Recorder V2/FM}
 \newcommand{\playertypelong}{Recorder V2 and FM Recorder}
 \newcommand{\genericimg}{112x64x1}
+\newcommand{\specimg}{recorderv2fm}
 %Used to name the player, e.g. ...to the \dap
 \newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
@@ -25,4 +27,4 @@
 \newcommand{\ButtonRight}{Right}
 \newcommand{\ButtonFOne}{F1}
 \newcommand{\ButtonFTwo}{F2}
-\newcommand{\ButtonFThree}{F3}
\ No newline at end of file
+\newcommand{\ButtonFThree}{F3}
diff --git a/manual/platform/x5.tex b/manual/platform/x5.tex
index 3fc7ee9..d0ce41d 100644
--- a/manual/platform/x5.tex
+++ b/manual/platform/x5.tex
@@ -1,3 +1,4 @@
+% $Id$ %
 \def\UseOption{x5}
 \edef\UseOption{\UseOption,HAVE_LCD_BITMAP}
 \edef\UseOption{\UseOption,HAVE_RECORDING}
@@ -10,6 +11,7 @@
 \newcommand{\playertype}{X5}
 \newcommand{\playerlongtype}{\playerman\ \playertype}
 \newcommand{\genericimg}{160x128x16}
+\newcommand{\specimg}{x5}
 %Used to name the player, e.g. ...to the \dap
 \newcommand{\dap}{player}
 %For use when referring to the player. E.g. the \daps\ capacity ...
diff --git a/manual/preamble.tex b/manual/preamble.tex
index 595b17e..100fac1 100644
--- a/manual/preamble.tex
+++ b/manual/preamble.tex
@@ -110,13 +110,17 @@
 \newcommand{\screenshot}[3]{
   \begin{figure}[H]
     \begin{center}
-      \IfFileExists{#1-\genericimg.png}
-        {\includegraphics[width=4cm]{#1-\genericimg.png}}
-        {\IfFileExists{#1}
-          {\includegraphics[width=4cm]{#1}
-           \typeout{Warning: deprecated plain image name used}}%
-          {\typeout{Missing image: #1 (\genericimg)}%
-           \color{red}{\textbf{WARNING!} Image not found}%
+      \IfFileExists{#1-\genericimg-\specimg.png}
+        {\includegraphics[width=4cm]{#1-\genericimg-\specimg.png}
+         \typeout{Note: device specific image used}}
+        {\IfFileExists{#1-\genericimg.png}
+          {\includegraphics[width=4cm]{#1-\genericimg.png}}
+          {\IfFileExists{#1}
+            {\includegraphics[width=4cm]{#1}
+             \typeout{Warning: deprecated plain image name used}}%
+            {\typeout{Missing image: #1 (\genericimg) (\specimg)}%
+             \color{red}{\textbf{WARNING!} Image not found}%
+            }
           }
         }
       \if\blank{#3}\else{\label{#3}}\fi\if\blank{#2}\else{%