Merge branch 'master' of git://github.com/qgis/Quantum-GIS

qgis · May 24, 2011 · a421ec2 · a421ec2
2 parents a075104 + b610620
commit a421ec2
Show file tree

Hide file tree

Showing 297 changed files with 13,551 additions and 5,628 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,7 @@ ms-windows/untgz/
 scripts/astyle.exe
 # vim temporary files
 .*.swp
+*.aux
+*.out
+*.tex
+*.toc
diff --git a/cmake/Txt2Tags.cmake b/cmake/Txt2Tags.cmake
@@ -46,6 +46,14 @@ MACRO(ADD_TXT2TAGS_FILES _sources)
       COMMENT "Building ${_out}.html from ${_in}"
       )
 
+    ADD_CUSTOM_COMMAND(
+      OUTPUT ${_out}.tex
+      COMMAND ${TXT2TAGS_EXECUTABLE}
+      ARGS -o${_out}.tex -t tex ${_in}
+      DEPENDS ${_in}
+      COMMENT "Building ${_out}.tex from ${_in}"
+      )
+
     SET(${_sources} ${${_sources}} ${_out} ${_out}.html)
   ENDFOREACH (_current_FILE)
 ENDMACRO(ADD_TXT2TAGS_FILES)
diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,9 @@
 qgis (1.8.0) UNRELEASED; urgency=low
 
   * new development version 1.8 after branch
+  * add qgis browser (qbrowser)
 
- -- Jürgen E. Fischer <jef@norbit.de>  Sat, 07 May 2011 00:47:20 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Mon, 23 May 2011 18:08:18 +0200
 
 qgis (1.7.0) UNRELEASED; urgency=low
 

diff --git a/debian/control.intrepid b/debian/control.intrepid
@@ -148,6 +148,7 @@ Description: Quantum GIS mapserver
 
 Package: qgis-api-doc
 Architecture: all
+Section: doc
 Description: Quantum GIS API documentation
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

diff --git a/debian/control.jaunty b/debian/control.jaunty
@@ -148,6 +148,7 @@ Description: Quantum GIS mapserver
 
 Package: qgis-api-doc
 Architecture: all
+Section: doc
 Description: Quantum GIS API documentation
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

diff --git a/debian/control.karmic b/debian/control.karmic
@@ -148,6 +148,7 @@ Description: Quantum GIS mapserver
 
 Package: qgis-api-doc
 Architecture: all
+Section: doc
 Description: Quantum GIS API documentation
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

diff --git a/debian/control.lenny b/debian/control.lenny
@@ -186,6 +186,7 @@ Description: Quantum GIS sql anywhere plugin and provider
 
 Package: qgis-api-doc
 Architecture: all
+Section: doc
 Description: Quantum GIS API documentation
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

diff --git a/debian/control.lucid b/debian/control.lucid
@@ -187,6 +187,7 @@ Description: Quantum GIS sql anywhere plugin and provider
 
 Package: qgis-api-doc
 Architecture: all
+Section: doc
 Description: Quantum GIS API documentation
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

diff --git a/debian/control.maverick b/debian/control.maverick
@@ -188,6 +188,7 @@ Description: Quantum GIS sql anywhere plugin and provider
 
 Package: qgis-api-doc
 Architecture: all
+Section: doc
 Description: Quantum GIS API documentation
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

diff --git a/debian/control.natty b/debian/control.natty
@@ -188,6 +188,7 @@ Description: Quantum GIS sql anywhere plugin and provider
 
 Package: qgis-api-doc
 Architecture: all
+Section: doc
 Description: Quantum GIS API documentation
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

diff --git a/debian/control.sid b/debian/control.sid
@@ -188,6 +188,7 @@ Description: Quantum GIS sql anywhere plugin and provider
 
 Package: qgis-api-doc
 Architecture: all
+Section: doc
 Description: Quantum GIS API documentation
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

diff --git a/debian/control.squeeze b/debian/control.squeeze
@@ -187,6 +187,7 @@ Description: Quantum GIS sql anywhere plugin and provider
 
 Package: qgis-api-doc
 Architecture: all
+Section: doc
 Description: Quantum GIS API documentation
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

diff --git a/debian/qgis-plugin-grass.postrm b/debian/qgis-plugin-grass.postrm
@@ -4,6 +4,7 @@ set -e
 
 if [ "$1" = "remove" ]; then
 	dpkg-divert --package qgis-plugin-grass --remove --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
+	dpkg-divert --package qgis-plugin-grass --remove --rename --divert /usr/bin/qbrowser.bin /usr/bin/qbrowser
 fi
 
 #DEBHELPER#

diff --git a/debian/qgis-plugin-grass.preinst b/debian/qgis-plugin-grass.preinst
@@ -4,6 +4,7 @@ set -e
 
 if [ "$1" = "install" -o "$1" = "upgrade" ]; then
 	dpkg-divert --package qgis-plugin-grass --add --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
+	dpkg-divert --package qgis-plugin-grass --add --rename --divert /usr/bin/qbrowser.bin /usr/bin/qbrowser
 fi
 
 #DEBHELPER#

diff --git a/debian/rules b/debian/rules
@@ -150,9 +150,11 @@ binary-arch: build install
 
 	install -o root -g root -m 755 -d $(CURDIR)/debian/qgis/usr/bin
 	install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qgis $(CURDIR)/debian/qgis/usr/bin
+	install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qbrowser $(CURDIR)/debian/qgis/usr/bin
 
 	install -o root -g root -m 755 -d $(CURDIR)/debian/qgis-plugin-grass/usr/bin
 	install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis
+	install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qbrowser
 
 	dh_pycentral
 	dh_installmenu

diff --git a/doc/CODING.t2t b/doc/CODING.t2t
@@ -12,11 +12,37 @@ Developers guide for QGIS
 %! PostProc(txt): '(?i)(\t)' '  '
 %! encoding: iso-8859-1
 
+%
+% Tex processing
+%
+% Make sure this is first
+%! PostProc(tex): '\\includegraphics' '\\includegraphics[width=100mm]'
+% scartcl is from the koma script document class (apt-get install texlive-latex-recommended ttf-komatuna)
+% setlength parindent suppresses first line of paragraph idents
+% parskip puts blank space between paragraphs
+% title pic stuff used to put a logo on the front page
+%! PostProc(tex): '\\documentclass{article}' '\\documentclass{scrartcl}\n\\setlength{\\parindent}{0pt}\n\\setlength{\\parskip}{2ex}'
+% use the color table and table packages so we can pimp the tables a little
+%! PostProc(tex): '\\usepackage{style.css}  % user defined' '\\usepackage{fancyvrb}\n\\usepackage{colortbl} \n\\usepackage [table]{xcolor}\n\\definecolor{tableShade}{HTML}{cecece}\n\\definecolor{qgis-green}{HTML}{0E7300}\n\\usepackage{wallpaper}\n\\LRCornerWallPaper{1}{WALLPAPER-IMAGE}\n\\usepackage{hyperref}\n\\hypersetup{linkcolor=qgis-green,urlcolor=qgis-green}\\renewcommand\\thesection{\\color{qgis-green}\\thechapter\\arabic{section}}'
+% Make the header row of tables have a dark background. light text
+%! PostProc(tex): '\\hline \\textbf' '\\hline \\rowcolor[rgb]{0,0,0} \\color{white} \\textbf'
+%! PostProc(tex): '& \\textbf' '& \\color{white} \\textbf'
+% Make verbatim text a little smaller and use fancyvrb package to draw it in a box
+% Note Verbatim with capital V for fancyvrb to work
+%! PostProc(tex): '\\begin{verbatim}' '{\\scriptsize\\begin{Verbatim}[frame=single,rulecolor=\\color{qgis-green}, framesep=4mm, label=\\fbox{\\small\\emph{Listing}}]'
+%! PostProc(tex): '\\end{verbatim}' '\\end{Verbatim}\n}'
+%! PostProc(tex): '\\section' '\\newpage\\section'
+%! PostProc(tex): 'section{' 'section{\\color{qgis-green}'
+%! PostProc(tex): NEWPAGE  '\\newpage'
+% Give alternating table rows different colours and use a smaller font in tables (\tiny)
+%! PostProc(tex): '\\begin{tabular}' '\\rowcolors{2}{tableShade}{white} \n\\tiny\\begin{tabular}'
+%! encoding: iso-8859-1
 
+%! PostProc(tex): WALLPAPER-IMAGE 'qgis-footer.png'
 % These are comments and will not be generated in any output
 % -------------------
 
-%This document is in text2tags format. You can generate html, plain text and
+%This document is in txt2tags format. You can generate html, plain text and
 %moinmoin formatted documentation by running txt2tags on this document. See the
 %txt2tags home page for more details.  Please insert manual line breaks in this
 %document as it makes diffing for changes much easier. To do this in vim 
@@ -26,12 +52,13 @@ Developers guide for QGIS
 
 % To generate the text version of this document:
 % txt2tags -t txt -o CODING CODING.t2t
-% To generate the moinmoin version of this document:
-% txt2tags -t moin -o CODING.moin CODING.t2t
+% To generate the mediawiki version of this document:
+% txt2tags -t wiki --no-enum-title -o CODING.wiki CODING.t2t
 % To generate the html version of this document:
 % txt2tags -t html -o CODING.html CODING.t2t
 % To generate the LaTeX version of this document:
-% txt2tags -t tex -o CODING.tex CODING.t2t
+% txt2tags -t tex -o CODING.tex CODING.t2t; pdflatex CODING.tex
+
 %
 % End of comments
 % -------------------

diff --git a/doc/INSTALL.t2t b/doc/INSTALL.t2t
@@ -1,7 +1,6 @@
 Quantum GIS (QGIS)
-
 Building QGIS from source - step by step
-
+%%date(%A %B %d, %Y)
 
 %! target       : html
 %! style        : style.css
@@ -12,6 +11,33 @@ Building QGIS from source - step by step
 % Next line will replace tabs with 2 spaces in txt generated outputs
 %! PostProc(txt): '(?i)(\t)' '  '
 %! encoding: iso-8859-1
+%
+% Tex processing
+%
+% Make sure this is first
+%! PostProc(tex): '\\includegraphics' '\\includegraphics[width=100mm]'
+% scartcl is from the koma script document class (apt-get install texlive-latex-recommended ttf-komatuna)
+% setlength parindent suppresses first line of paragraph idents
+% parskip puts blank space between paragraphs
+% title pic stuff used to put a logo on the front page
+%! PostProc(tex): '\\documentclass{article}' '\\documentclass{scrartcl}\n\\setlength{\\parindent}{0pt}\n\\setlength{\\parskip}{2ex}'
+% use the color table and table packages so we can pimp the tables a little
+%! PostProc(tex): '\\usepackage{style.css}  % user defined' '\\usepackage{fancyvrb}\n\\usepackage{colortbl} \n\\usepackage [table]{xcolor}\n\\definecolor{tableShade}{HTML}{cecece}\n\\definecolor{qgis-green}{HTML}{0E7300}\n\\usepackage{wallpaper}\n\\LRCornerWallPaper{1}{WALLPAPER-IMAGE}\n\\usepackage{hyperref}\n\\hypersetup{linkcolor=qgis-green,urlcolor=qgis-green}\\renewcommand\\thesection{\\color{qgis-green}\\thechapter\\arabic{section}}'
+% Make the header row of tables have a dark background. light text
+%! PostProc(tex): '\\hline \\textbf' '\\hline \\rowcolor[rgb]{0,0,0} \\color{white} \\textbf'
+%! PostProc(tex): '& \\textbf' '& \\color{white} \\textbf'
+% Make verbatim text a little smaller and use fancyvrb package to draw it in a box
+% Note Verbatim with capital V for fancyvrb to work
+%! PostProc(tex): '\\begin{verbatim}' '{\\scriptsize\\begin{Verbatim}[frame=single,rulecolor=\\color{qgis-green}, framesep=4mm, label=\\fbox{\\small\\emph{Listing}}]'
+%! PostProc(tex): '\\end{verbatim}' '\\end{Verbatim}\n}'
+%! PostProc(tex): '\\section' '\\newpage\\section'
+%! PostProc(tex): 'section{' 'section{\\color{qgis-green}'
+%! PostProc(tex): NEWPAGE  '\\newpage'
+% Give alternating table rows different colours and use a smaller font in tables (\tiny)
+%! PostProc(tex): '\\begin{tabular}' '\\rowcolors{2}{tableShade}{white} \n\\tiny\\begin{tabular}'
+%! encoding: iso-8859-1
+
+%! PostProc(tex): WALLPAPER-IMAGE 'qgis-footer.png'
 % These are comments and will not be generated in any output
 % -------------------
 
@@ -30,13 +56,13 @@ Building QGIS from source - step by step
 % To generate the html version of this document:
 % txt2tags -t html -o INSTALL.html INSTALL.t2t
 % To generate the LaTeX version of this document:
-% txt2tags -t tex -o INSTALL.tex INSTALL.t2t
+% txt2tags -t tex -o INSTALL.tex INSTALL.t2t; pdflatex INSTALL.tex
 
 % End of comments
 % -------------------
 
-Last update: %%date
-Last change: %%mtime
+Last Updated: %%date(%A %B %d, %Y)
+Last Change : %%mtime(%A %B %d, %Y)
 
 %%toc
 

diff --git a/doc/iauthors.t2t b/doc/iauthors.t2t
@@ -26,3 +26,6 @@ The following people have contributed to this document:
 - GNU/Linux Section
  - Tim Sutton 2006
  - Debian package section: Juergen Fischer 2008
+
+- Latex Generator
+ - Tim Sutton 2011
diff --git a/doc/qgis-footer.png b/doc/qgis-footer.png
diff --git a/doc/qgis-footer.xcf b/doc/qgis-footer.xcf
diff --git a/i18n/qgis_af.ts b/i18n/qgis_af.ts
@@ -19154,7 +19154,7 @@ This may be a problem in your network connection or at the WMS server.</source>
     </message>
     <message>
         <location filename="../src/core/qgsmaplayer.cpp" line="714"/>
-        <source>The directory containing your dataset needs to be writeable!</source>
+        <source>The directory containing your dataset needs to be writable!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -23931,7 +23931,7 @@ Result: %3 (%4)</source>
     </message>
     <message>
         <location filename="../src/core/qgsproject.cpp" line="982"/>
-        <source>%1 is not writeable. Please adjust permissions (if possible) and try again.</source>
+        <source>%1 is not writable. Please adjust permissions (if possible) and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -25390,7 +25390,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../src/app/qgsrasterlayerproperties.cpp" line="1560"/>
-        <source>The file was not writeable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
+        <source>The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/i18n/qgis_ar.ts b/i18n/qgis_ar.ts
@@ -19657,7 +19657,7 @@ This may be a problem in your network connection or at the WMS server.</source>
     </message>
     <message>
         <location filename="../src/core/qgsmaplayer.cpp" line="714"/>
-        <source>The directory containing your dataset needs to be writeable!</source>
+        <source>The directory containing your dataset needs to be writable!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -24415,7 +24415,7 @@ Result: %3 (%4)</source>
     </message>
     <message>
         <location filename="../src/core/qgsproject.cpp" line="982"/>
-        <source>%1 is not writeable. Please adjust permissions (if possible) and try again.</source>
+        <source>%1 is not writable. Please adjust permissions (if possible) and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -25929,7 +25929,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../src/app/qgsrasterlayerproperties.cpp" line="1560"/>
-        <source>The file was not writeable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
+        <source>The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/i18n/qgis_bg.ts b/i18n/qgis_bg.ts
@@ -20797,7 +20797,7 @@ This may be a problem in your network connection or at the WMS server.</source>
     </message>
     <message>
         <location filename="../src/core/qgsmaplayer.cpp" line="714"/>
-        <source>The directory containing your dataset needs to be writeable!</source>
+        <source>The directory containing your dataset needs to be writable!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -25574,7 +25574,7 @@ Result: %3 (%4)</source>
     </message>
     <message>
         <location filename="../src/core/qgsproject.cpp" line="982"/>
-        <source>%1 is not writeable. Please adjust permissions (if possible) and try again.</source>
+        <source>%1 is not writable. Please adjust permissions (if possible) and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -27033,7 +27033,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../src/app/qgsrasterlayerproperties.cpp" line="1560"/>
-        <source>The file was not writeable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
+        <source>The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/i18n/qgis_ca_ES.ts b/i18n/qgis_ca_ES.ts
@@ -19158,7 +19158,7 @@ This may be a problem in your network connection or at the WMS server.</source>
     </message>
     <message>
         <location filename="../src/core/qgsmaplayer.cpp" line="714"/>
-        <source>The directory containing your dataset needs to be writeable!</source>
+        <source>The directory containing your dataset needs to be writable!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -23935,7 +23935,7 @@ Result: %3 (%4)</source>
     </message>
     <message>
         <location filename="../src/core/qgsproject.cpp" line="982"/>
-        <source>%1 is not writeable. Please adjust permissions (if possible) and try again.</source>
+        <source>%1 is not writable. Please adjust permissions (if possible) and try again.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -25395,7 +25395,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../src/app/qgsrasterlayerproperties.cpp" line="1560"/>
-        <source>The file was not writeable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
+        <source>The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/i18n/qgis_cs_CZ.ts b/i18n/qgis_cs_CZ.ts
@@ -21850,7 +21850,7 @@ To může být problém vašeho síťového nastavení nebo WMS serveru.</numeru
     </message>
     <message>
         <location filename="../src/core/qgsmaplayer.cpp" line="714"/>
-        <source>The directory containing your dataset needs to be writeable!</source>
+        <source>The directory containing your dataset needs to be writable!</source>
         <translation>Adresář obsahující Váš dataset potřebuje mít práva zápisu!</translation>
     </message>
     <message>
@@ -26922,7 +26922,7 @@ SQL: %3</translation>
     </message>
     <message>
         <location filename="../src/core/qgsproject.cpp" line="982"/>
-        <source>%1 is not writeable. Please adjust permissions (if possible) and try again.</source>
+        <source>%1 is not writable. Please adjust permissions (if possible) and try again.</source>
         <translation>%1 není zapisovatelný. Nastavte prosím oprávnění (pokud je to možné) a zkuste znovu.</translation>
     </message>
     <message>
@@ -28564,7 +28564,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../src/app/qgsrasterlayerproperties.cpp" line="1560"/>
-        <source>The file was not writeable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
+        <source>The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
         <translation>Soubor není přepisovatelný. Některé formáty nepodporují pyramidové přehledy. Pochybnosti konzultujte s dokumentací GDAL.</translation>
     </message>
     <message>