From 959fd8dec4cebda6f1e46e1e4f306ab5ee53493b Mon Sep 17 00:00:00 2001 From: Hugo Villeneuve Date: Tue, 25 Mar 2014 21:33:25 -0400 Subject: [PATCH] Move documentation images from C to images folder --- configure.ac | 2 +- doc/C/Makefile.am | 13 ----- doc/Makefile.am | 10 +++- doc/{C/grip.xml => hvgrip.xml} | 86 ++++++++++++++-------------- doc/images/Makefile.am | 56 ++++++++++++++++++ doc/{C => images}/cdconfig.png | Bin doc/{C => images}/cdplayer.png | Bin doc/{C => images}/cdplayersmall.png | Bin doc/{C => images}/cdscan.png | Bin doc/{C => images}/discdb.png | Bin doc/{C => images}/discdbconfig.png | Bin doc/{C => images}/editing.png | Bin doc/{C => images}/eject.png | Bin doc/{C => images}/encprog.png | Bin doc/{C => images}/ffwd.png | Bin doc/{C => images}/grip-logo.png | Bin doc/{C => images}/id3config.png | Bin doc/{C => images}/minmax.png | Bin doc/{C => images}/miscconfig.png | Bin doc/{C => images}/modeinterface.png | Bin doc/{C => images}/mp3config.png | Bin doc/{C => images}/mp3config2.png | Bin doc/{C => images}/multiartist.png | Bin doc/{C => images}/nexttrk.png | Bin doc/{C => images}/playloop.png | Bin doc/{C => images}/playnormal.png | Bin doc/{C => images}/playonce.png | Bin doc/{C => images}/playpause.png | Bin doc/{C => images}/playplaylist.png | Bin doc/{C => images}/playrandom.png | Bin doc/{C => images}/prevtrk.png | Bin doc/{C => images}/progtrack.png | Bin doc/{C => images}/proxyconfig.png | Bin doc/{C => images}/quit.png | Bin doc/{C => images}/rewind.png | Bin doc/{C => images}/ripconfig.png | Bin doc/{C => images}/ripconfig2.png | Bin doc/{C => images}/ripconfig3.png | Bin doc/{C => images}/ripping.png | Bin doc/{C => images}/ripprog.png | Bin doc/{C => images}/ripsmall.png | Bin doc/{C => images}/smile1.png | Bin doc/{C => images}/smile2.png | Bin doc/{C => images}/smile3.png | Bin doc/{C => images}/smile4.png | Bin doc/{C => images}/smile5.png | Bin doc/{C => images}/smile6.png | Bin doc/{C => images}/smile7.png | Bin doc/{C => images}/smile8.png | Bin doc/{C => images}/stop.png | Bin doc/{C => images}/trkedit.png | Bin doc/{C => images}/volume.png | Bin 52 files changed, 109 insertions(+), 58 deletions(-) delete mode 100644 doc/C/Makefile.am rename doc/{C/grip.xml => hvgrip.xml} (94%) create mode 100644 doc/images/Makefile.am rename doc/{C => images}/cdconfig.png (100%) rename doc/{C => images}/cdplayer.png (100%) rename doc/{C => images}/cdplayersmall.png (100%) rename doc/{C => images}/cdscan.png (100%) rename doc/{C => images}/discdb.png (100%) rename doc/{C => images}/discdbconfig.png (100%) rename doc/{C => images}/editing.png (100%) rename doc/{C => images}/eject.png (100%) rename doc/{C => images}/encprog.png (100%) rename doc/{C => images}/ffwd.png (100%) rename doc/{C => images}/grip-logo.png (100%) rename doc/{C => images}/id3config.png (100%) rename doc/{C => images}/minmax.png (100%) rename doc/{C => images}/miscconfig.png (100%) rename doc/{C => images}/modeinterface.png (100%) rename doc/{C => images}/mp3config.png (100%) rename doc/{C => images}/mp3config2.png (100%) rename doc/{C => images}/multiartist.png (100%) rename doc/{C => images}/nexttrk.png (100%) rename doc/{C => images}/playloop.png (100%) rename doc/{C => images}/playnormal.png (100%) rename doc/{C => images}/playonce.png (100%) rename doc/{C => images}/playpause.png (100%) rename doc/{C => images}/playplaylist.png (100%) rename doc/{C => images}/playrandom.png (100%) rename doc/{C => images}/prevtrk.png (100%) rename doc/{C => images}/progtrack.png (100%) rename doc/{C => images}/proxyconfig.png (100%) rename doc/{C => images}/quit.png (100%) rename doc/{C => images}/rewind.png (100%) rename doc/{C => images}/ripconfig.png (100%) rename doc/{C => images}/ripconfig2.png (100%) rename doc/{C => images}/ripconfig3.png (100%) rename doc/{C => images}/ripping.png (100%) rename doc/{C => images}/ripprog.png (100%) rename doc/{C => images}/ripsmall.png (100%) rename doc/{C => images}/smile1.png (100%) rename doc/{C => images}/smile2.png (100%) rename doc/{C => images}/smile3.png (100%) rename doc/{C => images}/smile4.png (100%) rename doc/{C => images}/smile5.png (100%) rename doc/{C => images}/smile6.png (100%) rename doc/{C => images}/smile7.png (100%) rename doc/{C => images}/smile8.png (100%) rename doc/{C => images}/stop.png (100%) rename doc/{C => images}/trkedit.png (100%) rename doc/{C => images}/volume.png (100%) diff --git a/configure.ac b/configure.ac index ec261fd..0e1d0e4 100644 --- a/configure.ac +++ b/configure.ac @@ -143,6 +143,6 @@ src/Makefile po/Makefile.in pixmaps/Makefile doc/Makefile -doc/C/Makefile +doc/images/Makefile contrib/Makefile ]) diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am deleted file mode 100644 index e283787..0000000 --- a/doc/C/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -grip_helpdir = $(datadir)/gnome/help/grip/C - -grip_help_DATA = \ - grip.xml \ - *.png - -EXTRA_DIST = \ - grip.xml \ - *.png - -CLEANFILES = *~ - -MAINTAINERCLEANFILES = Makefile.in diff --git a/doc/Makefile.am b/doc/Makefile.am index fd43c2e..ecb6880 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,12 @@ -SUBDIRS = C +SUBDIRS = images + +@PACKAGE@_helpdir = $(docdir) + +@PACKAGE@_help_DATA = \ + @PACKAGE@.xml + +EXTRA_DIST = \ + @PACKAGE@.xml CLEANFILES = *~ diff --git a/doc/C/grip.xml b/doc/hvgrip.xml similarity index 94% rename from doc/C/grip.xml rename to doc/hvgrip.xml index acaaceb..6453766 100644 --- a/doc/C/grip.xml +++ b/doc/hvgrip.xml @@ -44,7 +44,7 @@ + format="PNG" fileref="images/grip-logo.png"/> @@ -69,7 +69,7 @@ Grip as a CD Player + fileref="images/cdplayer.png"/> @@ -84,7 +84,7 @@ + fileref="images/playpause.png"/> Play/Pause — Causes the selected track to play if it is stopped or paused. If a track is currently @@ -93,7 +93,7 @@ + fileref="images/rewind.png"/> Rewind — While this button is held down, Grip will move backward in the currently playing track. @@ -102,7 +102,7 @@ + fileref="images/ffwd.png"/> FastForward — While this button is held down, Grip will more forward in the currently playing @@ -111,7 +111,7 @@ + fileref="images/prevtrk.png"/> Previous track — If a track is currently playing near the beginning of a track, this will @@ -122,7 +122,7 @@ + fileref="images/nexttrk.png"/> Next track — This will skip to the next track. @@ -130,7 +130,7 @@ + fileref="images/progtrack.png"/> Track Mode — This brings up the track mode interface, described in . @@ -139,14 +139,14 @@ + fileref="images/stop.png"/> Stop — Stops track playback. + fileref="images/eject.png"/> Eject — Opens or closes the cdrom tray. @@ -154,7 +154,7 @@ + fileref="images/cdscan.png"/> Scan disc contents — Causes Grip to force a scan of the current CD as if it were just inserted (useful @@ -163,7 +163,7 @@ + fileref="images/volume.png"/> Volume — Toggles display of the volume control slider interface. @@ -171,7 +171,7 @@ + fileref="images/trkedit.png"/> Track Edit — This brings up the track editing interface described in ... @@ -179,7 +179,7 @@ + fileref="images/discdb.png"/> DiscDB — This initiates lookup of the CD over the network, or aborts a disc lookup currently in @@ -188,7 +188,7 @@ + fileref="images/minmax.png"/> Min/Max — Toggles between the "full" and "cd-only" (shown in ) display @@ -199,7 +199,7 @@ Grip in "cd-only" mode. + fileref="images/cdplayersmall.png"/> @@ -209,7 +209,7 @@ + fileref="images/quit.png"/> Quit — Exits Grip. @@ -224,7 +224,7 @@ The Play Mode Interface + fileref="images/modeinterface.png"/> @@ -236,7 +236,7 @@ + fileref="images/playnormal.png"/> Normal Mode — In this mode, tracks will be played in normal, numbered order. @@ -244,7 +244,7 @@ + fileref="images/playrandom.png"/> Random Mode — In this mode, tracks will be played in a random order. @@ -252,7 +252,7 @@ + fileref="images/playplaylist.png"/> Playlist Mode — In this mode, track will be played in an order you specify. In the text @@ -262,7 +262,7 @@ + fileref="images/playloop.png"/> Loop Mode — In loop mode, when playback finishes it will then resume at the beginning @@ -271,7 +271,7 @@ + fileref="images/playonce.png"/> Single Play Mode — In this mode, when playback finishes it will not begin again. @@ -302,7 +302,7 @@ The ripping interface + fileref="images/ripping.png"/> @@ -361,51 +361,51 @@ + fileref="images/smile1.png"/> Normal operation, low/no jitter + fileref="images/smile2.png"/> Normal operation, considerable jitter + fileref="images/smile3.png"/> Read drift + fileref="images/smile4.png"/> Unreported loss of streaming in atomic read operation + fileref="images/smile5.png"/> Finding read problems at same point during reread; hard to correct + fileref="images/smile6.png"/> SCSI/ATAPI transport error + fileref="images/smile7.png"/> Scratch detected + fileref="images/smile8.png"/> Gave up trying to perform a correction @@ -426,7 +426,7 @@ Ripping in "small" mode + fileref="images/ripsmall.png"/> @@ -478,7 +478,7 @@ The "CD" config tab + fileref="images/cdconfig.png"/> @@ -553,7 +553,7 @@ The "Rip" config tab + fileref="images/ripconfig.png"/> @@ -620,7 +620,7 @@ Configuring an external ripper + fileref="images/ripconfig2.png"/> @@ -647,7 +647,7 @@ Additional ripping options + fileref="images/ripconfig3.png"/> @@ -734,7 +734,7 @@ The "Encode" config tab + fileref="images/mp3config.png"/> @@ -773,7 +773,7 @@ Additional encoding options + fileref="images/mp3config2.png"/> @@ -850,7 +850,7 @@ The "ID3" config tab + fileref="images/id3config.png"/> @@ -904,7 +904,7 @@ The "DiscDB" config tab + fileref="images/discdbconfig.png"/> @@ -966,7 +966,7 @@ The "Proxy" config tab + fileref="images/proxyconfig.png"/> @@ -1025,7 +1025,7 @@ The "Misc" config tab + fileref="images/miscconfig.png"/> diff --git a/doc/images/Makefile.am b/doc/images/Makefile.am new file mode 100644 index 0000000..a680518 --- /dev/null +++ b/doc/images/Makefile.am @@ -0,0 +1,56 @@ +imagedir = $(docdir)/images + +image_DATA = \ + cdconfig.png \ + cdplayer.png \ + cdplayersmall.png \ + cdscan.png \ + discdb.png \ + discdbconfig.png \ + editing.png \ + eject.png \ + encprog.png \ + ffwd.png \ + grip-logo.png \ + id3config.png \ + minmax.png \ + miscconfig.png \ + modeinterface.png \ + mp3config.png \ + mp3config2.png \ + multiartist.png \ + nexttrk.png \ + playloop.png \ + playnormal.png \ + playonce.png \ + playpause.png \ + playplaylist.png \ + playrandom.png \ + prevtrk.png \ + progtrack.png \ + proxyconfig.png \ + quit.png \ + rewind.png \ + ripconfig.png \ + ripconfig2.png \ + ripconfig3.png \ + ripping.png \ + ripprog.png \ + ripsmall.png \ + smile1.png \ + smile2.png \ + smile3.png \ + smile4.png \ + smile5.png \ + smile6.png \ + smile7.png \ + smile8.png \ + stop.png \ + trkedit.png \ + volume.png + +EXTRA_DIST = $(image_DATA) + +CLEANFILES = *~ + +MAINTAINERCLEANFILES = Makefile.in diff --git a/doc/C/cdconfig.png b/doc/images/cdconfig.png similarity index 100% rename from doc/C/cdconfig.png rename to doc/images/cdconfig.png diff --git a/doc/C/cdplayer.png b/doc/images/cdplayer.png similarity index 100% rename from doc/C/cdplayer.png rename to doc/images/cdplayer.png diff --git a/doc/C/cdplayersmall.png b/doc/images/cdplayersmall.png similarity index 100% rename from doc/C/cdplayersmall.png rename to doc/images/cdplayersmall.png diff --git a/doc/C/cdscan.png b/doc/images/cdscan.png similarity index 100% rename from doc/C/cdscan.png rename to doc/images/cdscan.png diff --git a/doc/C/discdb.png b/doc/images/discdb.png similarity index 100% rename from doc/C/discdb.png rename to doc/images/discdb.png diff --git a/doc/C/discdbconfig.png b/doc/images/discdbconfig.png similarity index 100% rename from doc/C/discdbconfig.png rename to doc/images/discdbconfig.png diff --git a/doc/C/editing.png b/doc/images/editing.png similarity index 100% rename from doc/C/editing.png rename to doc/images/editing.png diff --git a/doc/C/eject.png b/doc/images/eject.png similarity index 100% rename from doc/C/eject.png rename to doc/images/eject.png diff --git a/doc/C/encprog.png b/doc/images/encprog.png similarity index 100% rename from doc/C/encprog.png rename to doc/images/encprog.png diff --git a/doc/C/ffwd.png b/doc/images/ffwd.png similarity index 100% rename from doc/C/ffwd.png rename to doc/images/ffwd.png diff --git a/doc/C/grip-logo.png b/doc/images/grip-logo.png similarity index 100% rename from doc/C/grip-logo.png rename to doc/images/grip-logo.png diff --git a/doc/C/id3config.png b/doc/images/id3config.png similarity index 100% rename from doc/C/id3config.png rename to doc/images/id3config.png diff --git a/doc/C/minmax.png b/doc/images/minmax.png similarity index 100% rename from doc/C/minmax.png rename to doc/images/minmax.png diff --git a/doc/C/miscconfig.png b/doc/images/miscconfig.png similarity index 100% rename from doc/C/miscconfig.png rename to doc/images/miscconfig.png diff --git a/doc/C/modeinterface.png b/doc/images/modeinterface.png similarity index 100% rename from doc/C/modeinterface.png rename to doc/images/modeinterface.png diff --git a/doc/C/mp3config.png b/doc/images/mp3config.png similarity index 100% rename from doc/C/mp3config.png rename to doc/images/mp3config.png diff --git a/doc/C/mp3config2.png b/doc/images/mp3config2.png similarity index 100% rename from doc/C/mp3config2.png rename to doc/images/mp3config2.png diff --git a/doc/C/multiartist.png b/doc/images/multiartist.png similarity index 100% rename from doc/C/multiartist.png rename to doc/images/multiartist.png diff --git a/doc/C/nexttrk.png b/doc/images/nexttrk.png similarity index 100% rename from doc/C/nexttrk.png rename to doc/images/nexttrk.png diff --git a/doc/C/playloop.png b/doc/images/playloop.png similarity index 100% rename from doc/C/playloop.png rename to doc/images/playloop.png diff --git a/doc/C/playnormal.png b/doc/images/playnormal.png similarity index 100% rename from doc/C/playnormal.png rename to doc/images/playnormal.png diff --git a/doc/C/playonce.png b/doc/images/playonce.png similarity index 100% rename from doc/C/playonce.png rename to doc/images/playonce.png diff --git a/doc/C/playpause.png b/doc/images/playpause.png similarity index 100% rename from doc/C/playpause.png rename to doc/images/playpause.png diff --git a/doc/C/playplaylist.png b/doc/images/playplaylist.png similarity index 100% rename from doc/C/playplaylist.png rename to doc/images/playplaylist.png diff --git a/doc/C/playrandom.png b/doc/images/playrandom.png similarity index 100% rename from doc/C/playrandom.png rename to doc/images/playrandom.png diff --git a/doc/C/prevtrk.png b/doc/images/prevtrk.png similarity index 100% rename from doc/C/prevtrk.png rename to doc/images/prevtrk.png diff --git a/doc/C/progtrack.png b/doc/images/progtrack.png similarity index 100% rename from doc/C/progtrack.png rename to doc/images/progtrack.png diff --git a/doc/C/proxyconfig.png b/doc/images/proxyconfig.png similarity index 100% rename from doc/C/proxyconfig.png rename to doc/images/proxyconfig.png diff --git a/doc/C/quit.png b/doc/images/quit.png similarity index 100% rename from doc/C/quit.png rename to doc/images/quit.png diff --git a/doc/C/rewind.png b/doc/images/rewind.png similarity index 100% rename from doc/C/rewind.png rename to doc/images/rewind.png diff --git a/doc/C/ripconfig.png b/doc/images/ripconfig.png similarity index 100% rename from doc/C/ripconfig.png rename to doc/images/ripconfig.png diff --git a/doc/C/ripconfig2.png b/doc/images/ripconfig2.png similarity index 100% rename from doc/C/ripconfig2.png rename to doc/images/ripconfig2.png diff --git a/doc/C/ripconfig3.png b/doc/images/ripconfig3.png similarity index 100% rename from doc/C/ripconfig3.png rename to doc/images/ripconfig3.png diff --git a/doc/C/ripping.png b/doc/images/ripping.png similarity index 100% rename from doc/C/ripping.png rename to doc/images/ripping.png diff --git a/doc/C/ripprog.png b/doc/images/ripprog.png similarity index 100% rename from doc/C/ripprog.png rename to doc/images/ripprog.png diff --git a/doc/C/ripsmall.png b/doc/images/ripsmall.png similarity index 100% rename from doc/C/ripsmall.png rename to doc/images/ripsmall.png diff --git a/doc/C/smile1.png b/doc/images/smile1.png similarity index 100% rename from doc/C/smile1.png rename to doc/images/smile1.png diff --git a/doc/C/smile2.png b/doc/images/smile2.png similarity index 100% rename from doc/C/smile2.png rename to doc/images/smile2.png diff --git a/doc/C/smile3.png b/doc/images/smile3.png similarity index 100% rename from doc/C/smile3.png rename to doc/images/smile3.png diff --git a/doc/C/smile4.png b/doc/images/smile4.png similarity index 100% rename from doc/C/smile4.png rename to doc/images/smile4.png diff --git a/doc/C/smile5.png b/doc/images/smile5.png similarity index 100% rename from doc/C/smile5.png rename to doc/images/smile5.png diff --git a/doc/C/smile6.png b/doc/images/smile6.png similarity index 100% rename from doc/C/smile6.png rename to doc/images/smile6.png diff --git a/doc/C/smile7.png b/doc/images/smile7.png similarity index 100% rename from doc/C/smile7.png rename to doc/images/smile7.png diff --git a/doc/C/smile8.png b/doc/images/smile8.png similarity index 100% rename from doc/C/smile8.png rename to doc/images/smile8.png diff --git a/doc/C/stop.png b/doc/images/stop.png similarity index 100% rename from doc/C/stop.png rename to doc/images/stop.png diff --git a/doc/C/trkedit.png b/doc/images/trkedit.png similarity index 100% rename from doc/C/trkedit.png rename to doc/images/trkedit.png diff --git a/doc/C/volume.png b/doc/images/volume.png similarity index 100% rename from doc/C/volume.png rename to doc/images/volume.png -- 2.20.1