[QGIS Commit] r8892 - in docs/trunk/english_us/user_guide: . grass_integration_screenies

[svn_qgis at osgeo.org]

Author: dassau
Date: 2008-07-24 09:25:00 -0400 (Thu, 24 Jul 2008)
New Revision: 8892

Added:
   docs/trunk/english_us/user_guide/grass_integration_screenies/create_grass_location.png
Modified:
   docs/trunk/english_us/user_guide/Makefile
   docs/trunk/english_us/user_guide/conventions.tex
   docs/trunk/english_us/user_guide/grass_integration.tex
   docs/trunk/english_us/user_guide/grass_integration_screenies/Makefile
Log:
added macro to add in figures for Windows, Linux and MacOSX
small makefile fixes to clean properly
 


Modified: docs/trunk/english_us/user_guide/Makefile
===================================================================
--- docs/trunk/english_us/user_guide/Makefile	2008-07-24 09:08:48 UTC (rev 8891)
+++ docs/trunk/english_us/user_guide/Makefile	2008-07-24 13:25:00 UTC (rev 8892)
@@ -98,12 +98,13 @@
 	<a href=http://www.qgis.org>QGIS Project</a> \
 	<br>Last modified: `/bin/date +%d-%m-%Y`" $(FILE)
 
-clean: cleanpics
+clean:
 	rm -f *.log *.aux $(FILE).dvi *.bbl *.tip *.lox *.blg *.ind \
 	*.ilg *.toc *.tof *.lof *.lot *.pdf *.ps *.idx *.brf *.out *~
 	rm -rf $(FILE)
 	rm -rf ./finalpix
 	(cd ./appendices && rm -f *.aux)
+	make cleanpics
 
 cleanpics:
 	(cd ./images && make clean)

Modified: docs/trunk/english_us/user_guide/conventions.tex
===================================================================
--- docs/trunk/english_us/user_guide/conventions.tex	2008-07-24 09:08:48 UTC (rev 8891)
+++ docs/trunk/english_us/user_guide/conventions.tex	2008-07-24 13:25:00 UTC (rev 8892)
@@ -27,10 +27,18 @@
 %\newcommand{\nix}[1]{Under GNU/Linix, #1}
 %\newcommand{\win}[1]{Under MS Windows, #1}
 %\newcommand{\osx}[1]{Under Mac OS X, #1}
+
+% add operation system icons to figure \caption
+% usage \caption{Text \wincaption}
+\newcommand{\nixcaption}{\protect\includegraphics[height=4mm]{nix.eps}}
+\newcommand{\wincaption}{\protect\includegraphics[height=4mm]{win.eps}}
+\newcommand{\osxcaption}{\protect\includegraphics[height=4mm]{osx.eps}}
+
 % new versions
 \newcommand{\nix}[1]{\includegraphics[height=5mm]{nix.eps} #1}
 \newcommand{\win}[1]{\includegraphics[height=5mm]{win.eps} #1}
 \newcommand{\osx}[1]{\includegraphics[height=5mm]{osx.eps} #1}
+
 % button
 \renewcommand{\button}[1]{%
 \raisebox{-6pt}{%

Modified: docs/trunk/english_us/user_guide/grass_integration.tex
===================================================================
--- docs/trunk/english_us/user_guide/grass_integration.tex	2008-07-24 09:08:48 UTC (rev 8891)
+++ docs/trunk/english_us/user_guide/grass_integration.tex	2008-07-24 13:25:00 UTC (rev 8892)
@@ -79,8 +79,8 @@
 
 \begin{figure}[ht]
    \begin{center}
-   \caption{Creating a GRASS location in QGIS}\label{fig:grass_location}\smallskip
-   \includegraphics[clip=true, width=8cm]{grass_location}
+   \caption{Creating a GRASS location in QGIS \nixcaption}\label{fig:grass_location}\smallskip
+   \includegraphics[clip=true]{create_grass_location}
 \end{center}  
 \end{figure}
 

Modified: docs/trunk/english_us/user_guide/grass_integration_screenies/Makefile
===================================================================
--- docs/trunk/english_us/user_guide/grass_integration_screenies/Makefile	2008-07-24 09:08:48 UTC (rev 8891)
+++ docs/trunk/english_us/user_guide/grass_integration_screenies/Makefile	2008-07-24 13:25:00 UTC (rev 8892)
@@ -11,7 +11,8 @@
 # JPG=qgis_icon_new_verylarge.eps\
 	nextfile.eps
 
-#PNG=grassedit.eps\
+PNG=create_grass_location.eps\
+#	grassedit.eps\
 #	grasstoolbar.eps\
 #	grassbrowser.eps\
 #	grassshell.eps\
@@ -44,7 +45,7 @@
 #	grass_new_mapset.eps\
 #	grass_new_vector_layer.eps\
 #	grass_open_mapset.eps\
-#	grass_location.eps\
+#	create_grass_location.eps\
 #	grass_module_error.eps\
 #	grass_module_warning.eps\
 #	grass_browser_raster_layer.eps\

Added: docs/trunk/english_us/user_guide/grass_integration_screenies/create_grass_location.png
===================================================================
(Binary files differ)


Property changes on: docs/trunk/english_us/user_guide/grass_integration_screenies/create_grass_location.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream