Skip to content
Permalink
Browse files

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

  • Loading branch information
pka committed Oct 7, 2012
2 parents 53fb95c + fccf9ac commit 277a4b446f72bbc0b6e780875ca9cdfbfdd7c7ea
Showing with 5,652 additions and 940 deletions.
  1. +263 −99 Doxyfile
  2. +1 −0 cmake/FindLibPython.py
  3. +2 −0 cmake/FindPyQt.py
  4. +2 −0 cmake/FindSIP.py
  5. +2 −0 cmake/PythonCompile.py
  6. +27 −27 doc/TRANSLATORS
  7. +2 −12 i18n/qgis_de.ts
  8. +4 −4 i18n/qgis_it.ts
  9. +510 −270 i18n/qgis_nl.ts
  10. BIN images/console/iconQtCoreConsole.png
  11. BIN images/console/iconQtGuiConsole.png
  12. +2 −0 images/images.qrc
  13. +14 −0 ms-windows/QGIS-Packager.bat
  14. +14 −0 ms-windows/osgeo4w/package-nightly.cmd
  15. +14 −0 ms-windows/osgeo4w/package.cmd
  16. +55 −14 python/console.py
  17. +129 −139 python/console_sci.py
  18. +63 −0 python/core/composer/qgsatlascomposition.sip
  19. +3 −0 python/core/composer/qgscomposerlabel.sip
  20. +34 −10 python/core/composer/qgscomposition.sip
  21. +1 −0 python/core/core.sip
  22. +12 −1 python/core/qgsexpression.sip
  23. +10 −0 python/core/raster/qgsrasterrenderer.sip
  24. +15 −1 python/core/raster/qgssinglebandpseudocolorrenderer.sip
  25. +1 −1 python/gui/raster/qgsrasterminmaxwidget.sip
  26. +4 −0 python/gui/raster/qgssinglebandpseudocolorrendererwidget.sip
  27. +11 −1 python/helpConsole/help.htm
  28. +2 −0 python/helpConsole/i18n/en_US.properties
  29. +2 −0 python/helpConsole/i18n/it.properties
  30. +2 −0 python/helpConsole/js/encoding.js
  31. +23 −0 python/plugins/GdalTools/tools/GdalTools_utils.py
  32. +24 −0 python/plugins/GdalTools/tools/dialogBase.py
  33. +24 −0 python/plugins/GdalTools/tools/dialogSRS.py
  34. +24 −0 python/plugins/GdalTools/tools/doBuildVRT.py
  35. +24 −0 python/plugins/GdalTools/tools/doClipper.py
  36. +24 −0 python/plugins/GdalTools/tools/doContour.py
  37. +24 −0 python/plugins/GdalTools/tools/doDEM.py
  38. +24 −0 python/plugins/GdalTools/tools/doExtractProj.py
  39. +24 −0 python/plugins/GdalTools/tools/doFillNodata.py
  40. +24 −0 python/plugins/GdalTools/tools/doGrid.py
  41. +24 −0 python/plugins/GdalTools/tools/doInfo.py
  42. +24 −0 python/plugins/GdalTools/tools/doMerge.py
  43. +24 −0 python/plugins/GdalTools/tools/doNearBlack.py
  44. +24 −0 python/plugins/GdalTools/tools/doOverview.py
  45. +24 −0 python/plugins/GdalTools/tools/doPctRgb.py
  46. +24 −0 python/plugins/GdalTools/tools/doPolygonize.py
  47. +24 −0 python/plugins/GdalTools/tools/doProjection.py
  48. +24 −0 python/plugins/GdalTools/tools/doProximity.py
  49. +24 −0 python/plugins/GdalTools/tools/doRasterize.py
  50. +24 −0 python/plugins/GdalTools/tools/doRgbPct.py
  51. +23 −0 python/plugins/GdalTools/tools/doSettings.py
  52. +24 −0 python/plugins/GdalTools/tools/doSieve.py
  53. +24 −0 python/plugins/GdalTools/tools/doTileIndex.py
  54. +24 −0 python/plugins/GdalTools/tools/doTranslate.py
  55. +24 −0 python/plugins/GdalTools/tools/doWarp.py
  56. +24 −0 python/plugins/GdalTools/tools/extentSelector.py
  57. +24 −0 python/plugins/GdalTools/tools/inOutSelector.py
  58. +24 −0 python/plugins/GdalTools/tools/optionsTable.py
  59. +24 −0 python/plugins/GdalTools/tools/widgetBatchBase.py
  60. +24 −0 python/plugins/GdalTools/tools/widgetPluginBase.py
  61. +25 −0 python/plugins/db_manager/db_plugins/postgis/sql_dictionary.py
  62. +25 −0 python/plugins/db_manager/db_plugins/spatialite/sql_dictionary.py
  63. +25 −0 python/plugins/db_manager/dlg_field_properties.py
  64. +25 −0 python/plugins/db_manager/sql_dictionary.py
  65. +2 −0 python/plugins/fTools/tools/voronoi.py
  66. +25 −9 python/plugins/osm/OsmPlugin.py
  67. +25 −8 python/plugins/osm/__init__.py
  68. +7 −2 python/plugins/plugin_installer/installer_data.py
  69. +38 −17 python/plugins/plugin_installer/installer_gui.py
  70. BIN python/plugins/plugin_installer/pluginExperimental.png
  71. +6 −1 python/plugins/plugin_installer/qgsplugininstallerbase.ui
  72. +1 −0 python/plugins/plugin_installer/resources.qrc
  73. +25 −0 python/plugins/sextante/about/AboutDialog.py
  74. +6 −7 python/plugins/sextante/mmqgisx/MMQGISXAlgorithmProvider.py
  75. +6 −7 python/plugins/sextante/mmqgisx/mmqgisx_library.py
  76. +2 −0 python/pyspatialite/lib/dump.py
  77. +22 −4 python/widgets_tree.py
  78. +12 −0 resources/function_help/$feature-en_US
  79. +12 −0 resources/function_help/$numfeatures-en_US
  80. +12 −0 resources/function_help/$numpages-en_US
  81. +12 −0 resources/function_help/$page-en_US
  82. +49 −1 scripts/addcopyright.sh
  83. +15 −0 scripts/astyle-all.sh
  84. +15 −0 scripts/astyle-rollback.sh
  85. +15 −0 scripts/astyle.sh
  86. +20 −0 scripts/chkcopyrights.sh
  87. +15 −0 scripts/create_new_ts.sh
  88. +14 −3 scripts/fixdiff.pl
  89. +15 −0 scripts/make_gource_video.sh
  90. +14 −0 scripts/qgm2cpp.pl
  91. +14 −0 scripts/qgsloggermig.pl
  92. +15 −1 scripts/remove_non_svn_files.sh
  93. +14 −0 scripts/scandeps.pl
  94. +14 −0 scripts/ts2cpp.pl
  95. +14 −0 scripts/tsstat.pl
  96. +15 −0 scripts/update-indent.sh
  97. +15 −1 scripts/update_ts_files.sh
  98. +2 −0 src/app/CMakeLists.txt
  99. +293 −0 src/app/composer/qgsatlascompositionwidget.cpp
  100. +58 −0 src/app/composer/qgsatlascompositionwidget.h
  101. +482 −67 src/app/composer/qgscomposer.cpp
  102. +2 −0 src/app/composer/qgscomposer.h
  103. +14 −0 src/app/composer/qgscomposerhtmlwidget.cpp
  104. +14 −0 src/app/composer/qgscomposerhtmlwidget.h
  105. +35 −0 src/app/composer/qgscomposerlabelwidget.cpp
  106. +1 −0 src/app/composer/qgscomposerlabelwidget.h
  107. +12 −0 src/app/composer/qgscomposermapwidget.cpp
  108. +7 −4 src/app/composer/qgscomposermapwidget.h
  109. +10 −10 src/app/qgsattributetabledialog.cpp
  110. +15 −0 src/app/qgsidentifyresults.cpp
  111. +2 −0 src/app/qgsidentifyresults.h
  112. +14 −0 src/app/qgssnappingdialog.cpp
  113. +2 −0 src/core/CMakeLists.txt
  114. +337 −0 src/core/composer/qgsatlascomposition.cpp
  115. +116 −0 src/core/composer/qgsatlascomposition.h
  116. +1 −0 src/core/composer/qgscomposeritem.h
  117. +21 −5 src/core/composer/qgscomposerlabel.cpp
  118. +10 −0 src/core/composer/qgscomposerlabel.h
  119. +4 −3 src/core/composer/qgscomposermap.cpp
  120. +2 −1 src/core/composer/qgscomposermap.h
  121. +69 −17 src/core/composer/qgscomposition.cpp
  122. +29 −3 src/core/composer/qgscomposition.h
  123. +107 −9 src/core/qgsexpression.cpp
  124. +19 −1 src/core/qgsexpression.h
  125. +16 −4 src/core/qgsexpressionparser.yy
  126. +3 −1 src/core/raster/qgsrasterdrawer.cpp
  127. +1 −1 src/core/raster/qgssinglebandpseudocolorrenderer.h
  128. +7 −7 src/gui/qgscomposerview.cpp
  129. +18 −2 src/gui/qgsexpressionbuilderwidget.cpp
  130. +14 −0 src/gui/qgsrasterlayersaveasdialog.cpp
  131. +14 −0 src/gui/qgsrasterlayersaveasdialog.h
  132. +3 −3 src/gui/raster/qgssinglebandpseudocolorrendererwidget.h
  133. +9 −7 src/gui/symbology-ng/qgsstylev2managerdialog.cpp
  134. +13 −1 src/plugins/dxf2shp_converter/getInsertions.cpp
  135. +11 −5 src/plugins/dxf2shp_converter/getInsertions.h
  136. +0 −4 src/plugins/grass/qtermwidget/ColorTables.h
  137. +0 −1 src/plugins/grass/qtermwidget/konsole_wcwidth.h
  138. +24 −13 src/plugins/grass/scripts/db.connect-login.pg.py
  139. +26 −8 src/plugins/grass/scripts/qgis.v.kernel.rast.py
  140. +25 −0 src/plugins/grass/scripts/r.external.all.py
  141. +26 −8 src/plugins/grass/scripts/v.out.ogr.pg.py
  142. +14 −0 src/providers/ows/qgsowsdataitems.cpp
  143. +14 −0 src/providers/ows/qgsowsdataitems.h
  144. +1 −1 src/ui/qgisapp.ui
  145. +198 −0 src/ui/qgsatlascompositionwidgetbase.ui
  146. +35 −2 src/ui/qgscomposeritemwidgetbase.ui
  147. +18 −11 src/ui/qgscomposerlabelwidgetbase.ui
  148. +5 −5 src/ui/qgscomposerlegendwidgetbase.ui
  149. +64 −61 src/ui/qgscomposermapwidgetbase.ui
  150. +1 −0 src/ui/qgsprojectpropertiesbase.ui
  151. +18 −0 tests/ctest2junix.xsl
  152. +3 −1 tests/src/core/CMakeLists.txt
  153. +227 −0 tests/src/core/testqgsatlascomposition.cpp
  154. +181 −0 tests/src/core/testqgscomposerlabel.cpp
  155. +2 −2 tests/src/core/testqgscomposerscalebar.cpp
  156. +27 −0 tests/src/core/testqgsexpression.cpp
  157. +14 −0 tests/src/gui/testrendererv2gui.cpp
  158. +14 −0 tests/src/gui/testrendererv2gui.h
  159. +4 −1 tests/src/python/CMakeLists.txt
  160. +0 −2 tests/src/python/qgscompositionchecker.py
  161. +169 −0 tests/src/python/test_qgsatlascomposition.py
  162. +113 −0 tests/src/python/test_qgscomposerlabel.py
  163. +42 −29 tests/src/python/test_qgscomposermap.py
  164. +1 −0 tests/src/python/test_qgsgeometry.py
  165. +53 −0 tests/src/python/test_qgspoint.py
  166. +25 −0 tests/src/python/test_qgssymbollayerv2.py
  167. BIN tests/testdata/control_images/expected_composerhtml/composerhtml_table.png
  168. BIN tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe1.png
  169. BIN tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe2.png
  170. BIN tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe3.png
  171. BIN tests/testdata/control_images/expected_composermap/composermap_landsat_overview.png
  172. BIN tests/testdata/control_images/expected_composermapatlas/autoscale_0.png
  173. BIN tests/testdata/control_images/expected_composermapatlas/autoscale_1.png
  174. BIN tests/testdata/control_images/expected_composermapatlas/fixedscale_0.png
  175. BIN tests/testdata/control_images/expected_composermapatlas/fixedscale_1.png
  176. BIN tests/testdata/control_images/expected_composermapatlas/hiding_0.png
  177. BIN tests/testdata/control_images/expected_composermapatlas/hiding_1.png
  178. BIN tests/testdata/france_parts.dbf
  179. +1 −0 tests/testdata/france_parts.prj
  180. +1 −0 tests/testdata/france_parts.qpj
  181. BIN tests/testdata/france_parts.shp
  182. BIN tests/testdata/france_parts.shx
  183. +14 −0 tools/qgis-qt3to4.pl
362 Doxyfile

Large diffs are not rendered by default.

@@ -1,3 +1,4 @@
# -*- coding: utf-8 -*-

# Copyright (c) 2007, Simon Edwards <simon@simonzone.com>
# Redistribution and use is allowed according to the terms of the BSD license.
@@ -1,3 +1,5 @@
# -*- coding: utf-8 -*-

# Copyright (c) 2007, Simon Edwards <simon@simonzone.com>
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
@@ -1,3 +1,5 @@
# -*- coding: utf-8 -*-

# FindSIP.py
#
# Copyright (c) 2007, Simon Edwards <simon@simonzone.com>
@@ -1,3 +1,5 @@
# -*- coding: utf-8 -*-

# By Simon Edwards <simon@simonzone.com>
# This file is in the public domain.
import py_compile
54 doc/TRANSLATORS 100644 → 100755

Large diffs are not rendered by default.

@@ -10269,18 +10269,8 @@ Aktueller Themenname: %5
Aktueller Themenpfad: %6
Voreingestellter-Themenpfad: %7
SVG-Suchpfads: %8
Benutzer-DB-Pfad: %9 {1
?} {2
?} {3
?} {4
?} {5
?} {6
?} {7
?} {8
?} {9
?} {2
or 3
?}</translation>
Benutzer-DB-Pfad: %9
</translation>
</message>
<message>
<source>Application state:
@@ -6461,23 +6461,23 @@ Cambiare questa situazione prima, perché il plugin OSM non quale layer è la de
<message>
<source>Are you sure you want to completely
delete the command history ?</source>
<translation type="obsolete">Sei sicuro di voler concellare completamente
<translation>Sei sicuro di voler concellare completamente
la cronologia dei comandi ?</translation>
</message>
<message>
<source>## History saved successfully ##</source>
<translation type="obsolete">## Storia comandi salvata con successo ##</translation>
<translation>## Storia comandi salvata con successo ##</translation>
</message>
<message>
<source>## History cleared successfully ##</source>
<translation type="obsolete">## Storia comandi cancellata con successo ##</translation>
<translation>## Storia comandi cancellata con successo ##</translation>
</message>
<message>
<source>## To access Quantum GIS environment from this console
## use qgis.utils.iface object (instance of QgisInterface class). Read help for more info.

</source>
<translation type="obsolete">## Per accedere all&apos;ambiente Quantum GIS da questa console
<translation>## Per accedere all&apos;ambiente Quantum GIS da questa console
## usa l&apos;oggetto qgis.utils.iface (istanza della classe QgisInterface). Consulta l&apos;aiuto per ottenere più informazioni.

</translation>

0 comments on commit 277a4b4

Please sign in to comment.
You can’t perform that action at this time.