[QGIS Commit] r8594 - in docs/trunk/english_us/user_guide: . grass_integration_images map_composer_images

svn_qgis at osgeo.org svn_qgis at osgeo.org
Thu Jun 5 05:48:03 EDT 2008


Author: dassau
Date: 2008-06-05 05:48:02 -0400 (Thu, 05 Jun 2008)
New Revision: 8594

Added:
   docs/trunk/english_us/user_guide/grass_integration_images/grass_browser_raster_layer.png
   docs/trunk/english_us/user_guide/grass_integration_images/grass_browser_vector_layer.png
   docs/trunk/english_us/user_guide/grass_integration_images/grass_module_error.png
   docs/trunk/english_us/user_guide/grass_integration_images/grass_module_warning.png
   docs/trunk/english_us/user_guide/grass_integration_images/grass_region.png
   docs/trunk/english_us/user_guide/map_composer_images/mActionFilePrint.png
Modified:
   docs/trunk/english_us/user_guide/grass_integration.tex
   docs/trunk/english_us/user_guide/grass_integration_images/Makefile
   docs/trunk/english_us/user_guide/grass_integration_images/grass_close_mapset.png
   docs/trunk/english_us/user_guide/grass_integration_images/grass_new_mapset.png
   docs/trunk/english_us/user_guide/grass_integration_images/grass_new_vector_layer.png
   docs/trunk/english_us/user_guide/grass_integration_images/grass_open_mapset.png
   docs/trunk/english_us/user_guide/grass_integration_images/grass_tools.png
   docs/trunk/english_us/user_guide/map_composer.tex
   docs/trunk/english_us/user_guide/map_composer_images/Makefile
   docs/trunk/english_us/user_guide/mapserver_export.tex
Log:
added conventions to chapter 8-10 and updated GRASS toolbar icons from current qgis source


Modified: docs/trunk/english_us/user_guide/grass_integration.tex
===================================================================
--- docs/trunk/english_us/user_guide/grass_integration.tex	2008-06-05 09:30:48 UTC (rev 8593)
+++ docs/trunk/english_us/user_guide/grass_integration.tex	2008-06-05 09:48:02 UTC (rev 8594)
@@ -9,16 +9,16 @@
 plugin:
  
 \begin{itemize}
-\item \includegraphics[width=0.7cm]{add_grass_vector} Add GRASS vector layers
-\item \includegraphics[width=0.7cm]{add_grass_raster} Add GRASS raster layers
-\item \includegraphics[width=0.7cm]{grass_tools} GRASS Toolbox
-\item \includegraphics[width=0.7cm]{grass_region_edit} Changing the GRASS region
-\item \includegraphics[width=0.7cm]{grass_edit} Vector layers digitizing
-\item \includegraphics[width=0.7cm]{grass_open_mapset} Open existing mapset
-\item \includegraphics[width=0.7cm]{grass_new_mapset} Create new GRASS mapset
-\item \includegraphics[width=0.7cm]{grass_new_vector_layer} Create new GRASS
-vector layer
-\item \includegraphics[width=0.7cm]{grass_close_mapset} Close GRASS mapset
+\item \toolbox{add_grass_vector}{Add GRASS vector layer}
+\item \toolbox{add_grass_raster}{Add GRASS raster layer}
+\item \toolbox{grass_tools}{Open GRASS tools}
+\item \toolbox{grass_region}{Display current GRASS region} 
+\item \toolbox{grass_region_edit}{Edit current GRASS region}
+\item \toolbox{grass_edit}{Edit GRASS vector layer}
+\item \toolbox{grass_open_mapset}{Open mapset}
+\item \toolbox{grass_new_mapset}{New mapset}
+\item \toolbox{grass_new_vector_layer}{Create new GRASS vector}
+\item \toolbox{grass_close_mapset}{Close mapset}
 \end{itemize}
 
 \subsection{Starting QGIS with GRASS}\label{sec:starting_grass}
@@ -42,19 +42,21 @@
 
 \begin{enumerate}
   \item Download the spearfish\_grass60data-0.3.zip file
-  \item Create a new folder \textsl{grassdata} and unzip the spearfish\_grass60data-0.3.zip into it. 
+  \item Create a new folder \filename{grassdata} and unzip the spearfish\_grass60data-0.3.zip into it. 
   \item Start QGIS
-  \item In the GRASS toolbar, click on the \textsl{Open mapset} icon to bring 
-  up the \textsl{Select GRASS mapset} wizard.
-  \item For \textsl{Gisdbase} browse and enter the path to the newly created folder \textsl{grassdata}.
-  \item You should now be able to select the location \textsl{spearfish60} and the mapset 
-  \textsl{PERMANENT} or \textsl{user1}. 
-  \item Click \textsl{OK}. Notice that some of the tools in the GRASS toolbar that were 
-  disabled are now enabled.
-  \item Click on \textsl{Add GRASS raster layer}, choose the \textsl{map name} geology and click 
-  \textsl{OK}. The geology map will be visualized. 
-  \item Click on \textsl{Add GRASS vector layer}, choose the \textsl{map name} roads and click 
-  \textsl{OK}. Now the roads map will be overlayed on top of the geology.  
+  \item In the GRASS toolbar, click on the \toolbox{grass_open_mapset}{Open
+  mapset} icon to bring up the mapset wizard.
+  \item For \filename{Gisdbase} browse and enter the path to the newly
+  created folder \filename{grassdata}.
+  \item You should now be able to select the location \filename{spearfish60}
+  and the mapset \filename{PERMANENT} or \filename{user1}. 
+  \item Click \button{OK}. Notice that some of the tools in the GRASS toolbar
+  that were disabled are now enabled.
+  \item Click on \toolbox{add_grass_raster}{Add GRASS raster layer}, choose
+  the \filename{map name} geology and click \button{OK}. The geology map will be visualized. 
+  \item Click on \toolbox{add_grass_vector}{Add GRASS vector layer}, choose
+  the \filename{map name} roads and click \button{OK}. Now the roads map will
+  be overlayed on top of the geology.  
 \end{enumerate}
 
 As you see, it is very simple to load GRASS raster and vector layers in QGIS. See following sections 
@@ -71,7 +73,7 @@
 
 GRASS stores data in a ``location'' which represents a specific area with a 
 specific coordinate system. In order to use GRASS data, we must import it 
-into a \textsl{location}.\footnote{This is not strictly true - you can 
+into a \filename{location}.\footnote{This is not strictly true - you can 
 view external data sets without importing them}
 
 \begin{figure}[ht]
@@ -87,32 +89,32 @@
 \begin{enumerate}
   \item Start QGIS
   \item Make sure the GRASS plugin is loaded
-  \item Load the \textsl{alaska.shp} shapefile (see Section \ref{sec:load_shapefile}).
-  \item In the GRASS toolbar, click on the \textsl{New mapset} tool to bring 
-  up the mapset wizard
+  \item Load the \filename{alaska.shp} shapefile (see Section \ref{sec:load_shapefile}).
+  \item In the GRASS toolbar, click on the \toolbox{grass_open_mapset}{Open
+    mapset} icon to bring up the mapset wizard.
   \item Each location is stored in a directory. Select an existing data 
   directory or create a new one for storing the location
-  \item Click \textsl{Next} 
+  \item Click \button{Next} 
   \item We can use this wizard to create a new mapset within an existing 
   location or create a new location altogether. Click ``Create new location'' 
   radio button
   \item Enter a name for the location - we'll use Alaska
-  \item Click \textsl{Next} 
+  \item Click \button{Next} 
   \item Define the projection by clicking on the ``Projection'' radio button 
   to enable the projection list
   \item We are using Albers Equal Area Alaska (meters) projection. Since we happen to know that 
   its PostGIS SRID is 5000, we enter it in the search box. (If you want to repeat this process 
   for another layer and haven't memorized the PostGIS SRID, click on the projector icon in the 
   lower right-hand corner of the statusbar (see Section \ref{label_projstart}).)
-  \item Click \textsl{Find} to select the projection
-  \item Click \textsl{Next} 
+  \item Click \button{Find} to select the projection
+  \item Click \button{Next} 
   \item To define the default region, we have to enter the bounds in the north, south, 
-  east, and west direction. Here we simply click on the button \textsl{Set current QGIS extent}.
-  \item Click \textsl{Next} 
+  east, and west direction. Here we simply click on the button \button{Set current QGIS extent}.
+  \item Click \button{Next} 
   \item We need to define a mapset within our new location. Name it whatever 
   you like - your username is a good choice
   \item Check out the summary to make sure it's correct
-  \item Click \textsl{Finish} 
+  \item Click \button{Finish} 
   \item The mapset and location are created and opened as the current 
   working set
   \item Notice that some of the tools in the GRASS toolbar that were 
@@ -121,8 +123,8 @@
 
 If that seemed like a lot of steps, it's really not all that bad and a very 
 quick way to create a location. Our location is now ready for use. To view 
-the default region, zoom out. Clicking the \textsl{Display Current Grass Region} tool 
-toggles the display region on and off. 
+the default region, zoom out. Clicking the \toolbox{grass_region}{Display
+current GRASS region} icon toggles the display region on and off. 
 
 \subsection{Vector Data Model}\label{label_vectmodel}\index{GRASS!vector data
 model}
@@ -173,14 +175,15 @@
 \subsection{Digitizing and Editing Tools}\index{GRASS!digitizing tools}
 \label{grass_digitising}
 
-\includegraphics[width=0.7cm]{grass_edit} The digitizing tools for GRASS vector layers are accessed using the
-\textsl{Edit GRASS Vector Layer} tool on the toolbar. Make sure you have
-loaded a GRASS vector and it is the selected layer in the legend before
+The digitizing tools for GRASS vector layers are accessed using the
+\toolbox{grass_edit}{Edit GRASS vector layer} icon on the toolbar. Make sure
+you have loaded a GRASS vector and it is the selected layer in the legend before
 clicking on the edit tool. If you would like to create a new GRASS vector, 
-you need to use the toolbar-entry Plugins->GRASS->Create new GRASS vector layer
+you need to use the toolbar-entry \menuopt{Plugins} -> \menuopt{GRASS} ->
+\menuopt{Create new GRASS vector}.
 
-Figure \ref{fig:grass_edit} shows the GRASS Edit dialog that
-is displayed when you click on the edit tool. 
+Figure \ref{fig:grass_edit} shows the GRASS Edit dialog that is displayed
+when you click on the edit tool. 
 
 \begin{figure}[h]
    \begin{center}
@@ -209,7 +212,7 @@
 \hline \includegraphics[width=0.7cm]{grass_move_vertex} & Move vertex & select one vertex of existing line or boundary and
 identify new position\\
 \hline \includegraphics[width=0.7cm]{grass_add_vertex} & Add vertex & add a new vertex to existing line\\
-\hline \includegraphics[width=0.7cm]{grass_delete_vertex} & Delete vertex & delete one vertex from existing line (confirm selected
+\hline \includegraphics[width=0.7cm]{grass_delete_vertex} & Delete vertex & delete vertex from existing line (confirm selected
 vertex by another click)\\
 \hline \includegraphics[width=0.7cm]{grass_move_line} & Move line & select existing line and click on new position\\
 \hline \includegraphics[width=0.7cm]{grass_split_line} & Split line & split an existing line to 2 parts\\
@@ -273,18 +276,17 @@
 
 \subsection{Region Tool}\index{GRASS!region}
 
-\includegraphics[width=0.7cm]{grass_region_edit} The current region (window) in GRASS is very important for all 
+The current region (window) in GRASS is very important for all 
 raster modules. All newly-created rasters have the extension and resolution
-of the current region, regardless of their original region. 
-The region is stored in \$LOCATION/\$MAPSET/WIND file, and it defines
+of the current region, regardless of their original region. The region is
+stored in \filename{\$LOCATION/\$MAPSET/WIND} file, and it defines
 north, south, east, west, number of columns, number of rows, 
 horizontal and vertical spatial resolution.
 
 It is possible to switch on/off the GRASS region in the QGIS canvas
-using the \textsl{Display Current GRASS Region}
-button. \index{GRASS!region!display}
+using the \toolbox{grass_region}{Display current GRASS region} button. \index{GRASS!region!display}
 
-With the \textsl{Edit Current GRASS Region} you can open a tool 
+With the \toolbox{grass_region_edit}{Edit current GRASS region} you can open a tool 
 in which you can change the current region and symbology
 of the GRASS region rectangle on the QGIS canvas. When the tool is running,
 it is also possible to select a new region interactively with your mouse
@@ -334,7 +336,7 @@
 
 \minisec{Options}
 
-This tab provides you with a very simplified entry field where you need to 
+The \tab{Options} tab provides you with a very simplified entry field where you need to 
 select the needed maps and enter parameters to run the selected module.
 Note, that these options are kept as simple as possible in order to keep
 the structure clear. If you need more of the module's options, feel free to 
@@ -342,13 +344,13 @@
 
 \minisec{Output}
 
-This tab provides you with the output generated from the running module. After you hit the 
+The \tab{Output} tab provides you with the output generated from the running module. After you hit the 
 'run' button, the module switches to the Output-tab and you will see information about 
-the process. If all goes well, you will see \texttt{Successfully finished} at the end.
+the process. If all goes well, you will see \usertext{Successfully finished} at the end.
 
 \minisec{Manual}
 
-This tab shows the help page of each GRASS module. You can have a look at the manual-page
+The \tab{Manual} tab shows the help page of each GRASS module. You can have a look at the manual-page
 if you want to get a deeper knowledge about the purpose of the module.
 You may have recognized that some modules have more options and parameters than given in
 the 'Options' tab. This is correct and done by design. To keep the GUI simple as possible
@@ -375,12 +377,12 @@
 
 The toolbar inside the browser tab gives you the following tools for the selected dataset:
 \begin{itemize}
-\item \includegraphics[width=0.7cm]{grass_add_map} Add selected map to canvas
-\item \includegraphics[width=0.7cm]{grass_copy_map} Copy selected map
-\item \includegraphics[width=0.7cm]{grass_rename_map} Rename selected map
-\item \includegraphics[width=0.7cm]{grass_delete_map} Delete selected map
-\item \includegraphics[width=0.7cm]{grass_set_region} Set current region to selected map
-\item \includegraphics[width=0.7cm]{grass_refresh} Refresh browser window
+\item \toolbox{grass_add_map}{Add selected map to canvas}
+\item \toolbox{grass_copy_map}{Copy selected map}
+\item \toolbox{grass_rename_map}{Rename selected map}
+\item \toolbox{grass_delete_map}{Delete selected map}
+\item \toolbox{grass_set_region}{Set current region to selected map}
+\item \toolbox{grass_refresh}{Refresh browser window}
 \end{itemize}
 
 The 'Rename' and 'Delete' buttons are only available in your current mapset. All other tools also work on
@@ -404,7 +406,7 @@
 A brief description of adding new modules, changing the modules group, etc. can be found on the QGIS wiki
 at \url{http://wiki.qgis.org/qgiswiki/Adding\_New\_Tools\_to\_the\_GRASS\_Toolbox}.
 
-A sample XML file for generating the module \texttt{v.buffer} (v.buffer.qgm) looks like this:
+A sample XML file for generating the module \usertext{v.buffer} (v.buffer.qgm) looks like this:
 \begin{verbatim}
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
@@ -431,8 +433,8 @@
 With this version of QGIS it is also possible to create new vectors from within GRASS very
 easily.
 
-Just select \textsl{Plugins->GRASS->Create new GRASS layer} from the toolbar, give a new name
-in the text box and start digitizing.
+Just select \menuopt{Plugins} -> \menuopt{GRASS} -> \menuopt{Create new GRASS
+layer} from the toolbar, give a new name in the text box and start digitizing.
 If you encounter a greyed-out button, make sure you have a working mapset enabled. If you forgot
 how to enable a mapset have a look at Section \ref{sec:load_grassdata}.
 
@@ -444,9 +446,9 @@
 \item Make sure to create an attribute table with its needed columns before you start digitizing
 if you would like to assign attributes to your digitized object. 
 Go to the table tab inside the digitize window.
-\item If you plan to create a polygon layer, consider setting the mode to \textsl{No category}. 
+\item If you plan to create a polygon layer, consider setting the mode to \usertext{No category}. 
 Then start digitizing the boundaries which actually do not need an entry in the attribute table. 
-If you have done this, change back to \textsl{Next not used} and start digitizing the centroids, which 
+If you have done this, change back to \usertext{Next not used} and start digitizing the centroids, which 
 hold the attribute information of a polygon.
 
 \end{itemize}

Modified: docs/trunk/english_us/user_guide/grass_integration_images/Makefile
===================================================================
--- docs/trunk/english_us/user_guide/grass_integration_images/Makefile	2008-06-05 09:30:48 UTC (rev 8593)
+++ docs/trunk/english_us/user_guide/grass_integration_images/Makefile	2008-06-05 09:48:02 UTC (rev 8594)
@@ -25,6 +25,7 @@
 	grass_refresh.eps\
 	grass_add_map.eps\
 	grass_rename_map.eps\
+	grass_region.eps\
 	grass_set_region.eps\
 	vbuffer.eps\
 	grass_delete_vertex.eps\
@@ -44,7 +45,10 @@
 	grass_new_vector_layer.eps\
 	grass_open_mapset.eps\
 	grass_location.eps\
-		
+	grass_module_error.eps\
+	grass_module_warning.eps\
+	grass_browser_raster_layer.eps\
+	grass_browser_vector_layer.eps\
 	
 ##### TARGETS #####
 

Added: docs/trunk/english_us/user_guide/grass_integration_images/grass_browser_raster_layer.png
===================================================================
(Binary files differ)


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

Added: docs/trunk/english_us/user_guide/grass_integration_images/grass_browser_vector_layer.png
===================================================================
(Binary files differ)


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

Modified: docs/trunk/english_us/user_guide/grass_integration_images/grass_close_mapset.png
===================================================================
(Binary files differ)

Added: docs/trunk/english_us/user_guide/grass_integration_images/grass_module_error.png
===================================================================
(Binary files differ)


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

Added: docs/trunk/english_us/user_guide/grass_integration_images/grass_module_warning.png
===================================================================
(Binary files differ)


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

Modified: docs/trunk/english_us/user_guide/grass_integration_images/grass_new_mapset.png
===================================================================
(Binary files differ)

Modified: docs/trunk/english_us/user_guide/grass_integration_images/grass_new_vector_layer.png
===================================================================
(Binary files differ)

Modified: docs/trunk/english_us/user_guide/grass_integration_images/grass_open_mapset.png
===================================================================
(Binary files differ)

Added: docs/trunk/english_us/user_guide/grass_integration_images/grass_region.png
===================================================================
(Binary files differ)


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

Modified: docs/trunk/english_us/user_guide/grass_integration_images/grass_tools.png
===================================================================
(Binary files differ)

Modified: docs/trunk/english_us/user_guide/map_composer.tex
===================================================================
--- docs/trunk/english_us/user_guide/map_composer.tex	2008-06-05 09:30:48 UTC (rev 8593)
+++ docs/trunk/english_us/user_guide/map_composer.tex	2008-06-05 09:48:02 UTC (rev 8594)
@@ -8,8 +8,8 @@
 adjust the properties to create your layout. The result can be printed,
 exported as an image, or exported to SVG.
 
-To access the map composer, click on the \textit{Print} button in the toolbar
-or choose \textit{Print} from the \textit{File} menu.
+To access the map composer, click on the \toolbox{mActionFilePrint}{Print}
+button in the toolbar or choose \menuopt{Print} from the \menuopt{File} menu.
 
 \subsection{Using Map Composer}\label{label_usemapcomposer} 
 
@@ -29,12 +29,11 @@
 \ref{fig:map_composer_blank} shows the initial view of the map composer before
 any elements are added.
 
-The map composer has two tabs: \textit{General} and \textit{Item}. The
-\textit{General} tab allows you to set the paper size, orientation, and
-resolution for the map. The \textit{Item} tab displays the properties for the
-currently selected map element. By selecting an element on the map (eg.
-legend, scalebar, text, etc.) and clicking on the \textit{Item} tab, you can
-customize the settings.
+The map composer has two tabs: \tab{General} and \tab{Item}. The General tab
+allows you to set the paper size, orientation, and resolution for the map.
+The Item tab displays the properties for the currently selected map element.
+By selecting an element on the map (eg. legend, scalebar, text, etc.) and
+clicking on the \tab{Item} tab, you can customize the settings.
 
 You can add multiple elements to the composer. This allows you to have more
 than one map view and legend in the composer. Each element has its own
@@ -42,22 +41,21 @@
 
 \subsubsection{Adding a Map to the Composer}
 
-\includegraphics[width=0.7cm]{composer_add_image} To add
-the QGIS map canvas to the map composer, click on the \textit{Add a new
-map} button in toolbar. Drag a rectangle on the composer canvas to add the
-map. You can resize the map later by clicking on the \textit{Select/move item}
+To add the QGIS map canvas to the map composer, click on the
+\toolbox{composer_add_image}{Add a new map} button in toolbar. Drag a rectangle on the composer canvas to add the
+map. You can resize the map later by clicking on the \button{Select/move item}
 button, clicking on the map, and dragging one of the handles in the corner of
 the map. With the map selected, you can also resize the map by specifying the
 width and height on the Item properties tab.
 
 The map is linked to the QGIS map canvas. If you change the view on the map
 canvas by zooming or panning, you can update the map composer view by
-selecting the map in composer and clicking on the \textit{Set Extent} button.
+selecting the map in composer and clicking on the \button{Set Extent} button.
 You can also change the composer view by specifying a map scale. To set the
 view to a specific scale:
 
 \begin{enumerate}
-\item Choose \textit{Scale (calculate extent)} from the \textit{Set} drop-down
+\item Choose \menuopt{Scale (calculate extent)} from the \button{Set} drop-down
 box
 \item Enter the scale denominator in the scale box
 \item Press Enter
@@ -65,31 +63,30 @@
 
 \subsubsection{Adding other Elements to the Composer} 
  
-\includegraphics[width=0.7cm]{composer_open_template} Already existing QGIS templates 
-can be used to easily load and adapt map layouts. To open an existing 
-template, click on the \textit{Open Template} button. Choose a template and customize 
-its appearance. 
+Already existing QGIS templates can be used to easily load and adapt map
+layouts. To open an existing template, click on the
+\toolbox{composer_open_template}{Open Template} button. Choose a template and
+customize its appearance. 
 
-\includegraphics[width=0.7cm]{composer_add_image} To add a logo, north arrow or any 
-kind of image to the composer, click on the \textit{Add Image} button. The image will 
+To add a logo, north arrow or any  kind of image to the composer, click on
+the \toolbox{composer_add_image}{Add Image} button. The image will 
 be placed on the composer canvas and you can move it where you like. 
 
-\includegraphics[width=0.7cm]{composer_add_legend08} A
-legend can be added to the composer canvas and customized to show only the
-desired layers. To add a legend, click on the \textit{Add Vector Legend}
-button. The legend will be placed on the composer canvas and you can move it
-where you like. Click on the \textit{Items} tab to customize the appearance of
-the legend, including which layers are shown.
+A legend can be added to the composer canvas and customized to show only the
+desired layers. To add a legend, click on the
+\toolbox{composer_add_legend08}{Add Vector Legend} button. The legend will be
+placed on the composer canvas and you can move it where you like. Click on
+the \tab{Items} tab to customize the appearance of the legend, including
+which layers are shown.
 
-\includegraphics[width=0.7cm]{composer_add_scalebar08} To
-add a scalebar to the composer, click on the \textit{Add Scalebar} button. Use
-the \textit{Item} tab to customize the segment size, number of segments,
-scalebar units, size, and font for the scalebar.
+To add a scalebar to the composer, click on the
+\toolbox{composer_add_scalebar08}{Add Scalebar} button. Use the \tab{Item}
+tab to customize the segment size, number of segments, scalebar units, size,
+and font for the scalebar.
 
-\includegraphics[width=0.7cm]{composer_add_label} You can
-add text labels to the composer by clicking on the \textit{Add New Label}
-button. Use the \textit{Item} tab while the text is selected to customize the
-settings or change the default text.
+You can add text labels to the composer by clicking on the
+\toolbox{composer_add_label}{Add New Label} button. Use the \tab{Item} tab
+while the text is selected to customize the settings or change the default text.
 
 Figure \ref{fig:map_composer_complete} shows the map composer after adding
 each type of map element.
@@ -103,11 +100,11 @@
 \subsubsection{Other Features}
 
 The map composer has navigation tools to zoom in and out. To zoom in, click
-the \textit{Zoom in} tool. The map composer canvas will be scaled by a factor to 2. Use
+the \button{Zoom in} tool. The map composer canvas will be scaled by a factor to 2. Use
 the scrollbars to adjust the view to the area of interest. Zooming out works
 in a similar fashion.
 
-If you find the view in an inconsistent state, you can use the \textit{Refresh} button
+If you find the view in an inconsistent state, you can use the \button{Refresh} button
 to redraw the map composer canvas.
 
 \subsubsection{Creating Output}
@@ -115,15 +112,15 @@
 The map composer allows you to print the map to a printer, export to a PNG or
 export to SVG. Each of these functions is available from the composer toolbar.
 
-\includegraphics[width=0.7cm]{composer_save_template} To save the composer canvas 
-as a templates, click on the \textit{Save Template As} button. Browse to the directory 
+To save the composer canvas as a templates, click on the
+\toolbox{composer_save_template}{Save Template As} button. Browse to the directory 
 you like and save a template to use it again for another map canvas.
 
-\includegraphics[width=0.7cm]{composer_export_image} It is possible to export the result 
-as an image by clicking on the \textit{Export as image} button. 
+It is possible to export the result as an image by clicking on the
+\toolbox{composer_export_image}{Export as image} button. 
 
-\includegraphics[width=0.7cm]{composer_export_svg} To export the composer canvas as an 
-SVG (Scalable Vector Graphic), click on the \textit{Export as SVG} button. 
-\textbf{Note:} Currently the SVG output is very basic. This is not a QGIS problem, but a
+To export the composer canvas as an  SVG (Scalable Vector Graphic), click on
+the \toolbox{composer_export_svg}{Export as SVG} button. \textbf{Note:}
+Currently the SVG output is very basic. This is not a QGIS problem, but a
 problem of the underlaying Qt library. This will be sorted out in future versions.
  

Modified: docs/trunk/english_us/user_guide/map_composer_images/Makefile
===================================================================
--- docs/trunk/english_us/user_guide/map_composer_images/Makefile	2008-06-05 09:30:48 UTC (rev 8593)
+++ docs/trunk/english_us/user_guide/map_composer_images/Makefile	2008-06-05 09:48:02 UTC (rev 8594)
@@ -21,7 +21,8 @@
 	composer_export_image.eps\
 	composer_export_svg.eps\
 	composer_open_template.eps\
-	composer_save_template.eps
+	composer_save_template.eps\
+	mActionFilePrint.eps\
 	
 	
 ##### TARGETS #####

Added: docs/trunk/english_us/user_guide/map_composer_images/mActionFilePrint.png
===================================================================
(Binary files differ)


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

Modified: docs/trunk/english_us/user_guide/mapserver_export.tex
===================================================================
--- docs/trunk/english_us/user_guide/mapserver_export.tex	2008-06-05 09:30:48 UTC (rev 8593)
+++ docs/trunk/english_us/user_guide/mapserver_export.tex	2008-06-05 09:48:02 UTC (rev 8594)
@@ -30,16 +30,16 @@
 
 \subsection{Creating the Map File}
 
-The exporter tool (\textsl{msexport}) is installed in your QGIS binary directory and can be
+The exporter tool (\filename{msexport}) is installed in your QGIS binary directory and can be
 used independently of QGIS. 
 
-From QGIS you can start the exporter by choosing \textsl{Export to MapServer
-  Map...} from the \textsl{File} menu.
+From QGIS you can start the exporter by choosing \menuopt{Export to MapServer
+Map...} from the \menuopt{File} menu. 
 
-  Here is a summary of the input fields:
-  \begin{description}
+Here is a summary of the input fields:
 
-    \item [Map file] \mbox{}\\
+\begin{description}
+\item [Map file] \mbox{}\\
 Enter the name for the map file to be created. You can use the button at the right to browse for the directory where you want the map file created. 
 
 \item [Qgis project file] \mbox{}\\
@@ -69,19 +69,19 @@
 your project file, it may require some tweaking to get the results you
 want - but it's still way better than writing a map file from scratch.  
 
-\textbf{Creating a Map File}
+\minisec{Creating a Map File}
 
-Let's create a map file using the shape files \textsl{alaska}, \textsl{lakes} 
-and \textsl{rivers} layers from the qgis\_sample\_data:
+Let's create a map file using the shape files \filename{alaska}, \filename{lakes} 
+and \filename{rivers} layers from the qgis\_sample\_data:
 
 \begin{enumerate}
-  \item Load the \textsl{alaska}, \textsl{rivers} and \textsl{lakes} 
+  \item Load the \filename{alaska}, \filename{rivers} and \filename{lakes} 
   layers into QGIS
   \item Change the colors and symbolize the data as you like
-  \item Save the project using \textsl{Save Project} from the
-    \textsl{File} menu
-  \item Open the exporter by clicking on \textsl{Export to MapServer
-    Map...} in the \textsl{File} menu
+  \item Save the project using \menuopt{Save Project} from the
+    \menuopt{File} menu
+  \item Open the exporter by clicking on \menuopt{Export to MapServer
+    Map...} in the \menuopt{File} menu
   \item Enter a name for your new map file
   \item Browse and find the project file you just saved
   \item Enter a name for the map
@@ -89,7 +89,7 @@
   \item Our layers are in decimal degrees so we don't need to change the
     units
   \item Choose ``png'' for the image type
-  \item Click \textsl{OK} to generate the map file
+  \item Click \button{OK} to generate the map file
 \end{enumerate}
 
 
@@ -109,8 +109,8 @@
 
 \subsection{Testing the Map File}
 
-Let's test our work by using the \textsl{shp2img} command to create an image
-from the map file. The  \textsl{shp2img} utility is part of MapServer,
+Let's test our work by using the \filename{shp2img} command to create an image
+from the map file. The  \filename{shp2img} utility is part of MapServer,
 but is also distributed with FWTools. To create an image from our map:
 
 \begin{itemize}
@@ -121,8 +121,8 @@
 \item View the created image 
 \end{itemize}
  
-Assuming our map file was named \textsl{mapserver\_test.map}, the
-shp2img command is:
+Assuming our map file was named \filename{mapserver\_test.map}, the
+\filename{shp2img} command is:
 
 \begin{verbatim}
 shp2img -m mapserver_test.map -o mapserver_test.png



More information about the QGIS-commit mailing list