Skip to content
Permalink
Browse files
Merge upstream/master; fix conflicts
  • Loading branch information
NathanW2 committed Nov 17, 2011
2 parents aabfdf9 + 0a17ad5 commit a0dad9c4f65ffdee62113e8495df40ea22b29d31
Showing with 85,597 additions and 4,915 deletions.
  1. +8 −4 CMakeLists.txt
  2. +6 −0 debian/changelog
  3. +5 −0 debian/rules
  4. +1 −0 doc/SPONSORS
  5. +1,350 −1,162 i18n/qgis_de.ts
  6. +5,031 −3,020 i18n/qgis_fr.ts
  7. +38,492 −0 i18n/qgis_gl_ES.ts
  8. +3 −3 i18n/qgis_it.ts
  9. +38,492 −0 i18n/qgis_no.ts
  10. BIN images/splash/splash.png
  11. BIN images/splash/splash.xcf.bz2
  12. +5 −1 ms-windows/osgeo4w/package-nightly.cmd
  13. +6 −1 python/CMakeLists.txt
  14. +1 −0 python/core/core.sip
  15. +60 −0 python/core/qgsvectorfieldsymbollayer.sip
  16. +10 −1 python/core/symbology-ng-core.sip
  17. +11 −0 python/plugins/GdalTools/GdalTools.py
  18. BIN python/plugins/GdalTools/icons/fillnodata.png
  19. +1 −0 python/plugins/GdalTools/resources.qrc
  20. +215 −0 python/plugins/GdalTools/tools/doFillNodata.py
  21. +22 −11 python/plugins/GdalTools/tools/doProjection.py
  22. +159 −0 python/plugins/GdalTools/tools/widgetFillNodata.ui
  23. 0 python/plugins/fTools/__init__.py
  24. +25 −7 python/plugins/fTools/fTools.py
  25. 0 python/plugins/fTools/tools/doDefineProj.py
  26. +4 −2 python/plugins/fTools/tools/doGeometry.py
  27. +49 −31 python/plugins/fTools/tools/doGeoprocessing.py
  28. +6 −2 python/plugins/fTools/tools/doIntersectLines.py
  29. +7 −3 python/plugins/fTools/tools/doMeanCoords.py
  30. 0 python/plugins/fTools/tools/doMergeShapes.py
  31. 0 python/plugins/fTools/tools/doPointDistance.py
  32. +8 −4 python/plugins/fTools/tools/doPointsInPolygon.py
  33. +8 −2 python/plugins/fTools/tools/doRandPoints.py
  34. 0 python/plugins/fTools/tools/doRandom.py
  35. +7 −2 python/plugins/fTools/tools/doRegPoints.py
  36. 0 python/plugins/fTools/tools/doSelectByLocation.py
  37. +249 −64 python/plugins/fTools/tools/doSimplify.py
  38. +223 −0 python/plugins/fTools/tools/doSpatialIndex.py
  39. 0 python/plugins/fTools/tools/doSpatialJoin.py
  40. 0 python/plugins/fTools/tools/doSubsetSelect.py
  41. +7 −3 python/plugins/fTools/tools/doSumLines.py
  42. +7 −2 python/plugins/fTools/tools/doVectorGrid.py
  43. 0 python/plugins/fTools/tools/doVectorSplit.py
  44. 0 python/plugins/fTools/tools/doVisual.py
  45. +6 −9 python/plugins/fTools/tools/frmSimplify.ui
  46. +127 −0 python/plugins/fTools/tools/frmSpatialIndex.ui
  47. 0 python/plugins/fTools/tools/ftools_utils.py
  48. 0 python/plugins/fTools/tools/voronoi.py
  49. +12 −1 python/plugins/plugin_installer/installer_data.py
  50. +27 −1 python/utils.py
  51. +4 −0 scripts/remove_svn_conflict_files.sh
  52. +15 −3 scripts/update_ts_files.sh
  53. +2 −0 src/analysis/vector/qgsgeometryanalyzer.cpp
  54. +17 −26 src/app/qgisapp.cpp
  55. +16 −3 src/app/qgsbrowserdockwidget.cpp
  56. +8 −5 src/app/qgslabelinggui.cpp
  57. +16 −8 src/app/qgsmaptoolnodetool.cpp
  58. +2 −2 src/app/qgsmaptoolsimplify.cpp
  59. +27 −82 src/app/spatialite/qgsnewspatialitelayerdialog.cpp
  60. +0 −3 src/app/spatialite/qgsnewspatialitelayerdialog.h
  61. +6 −2 src/core/CMakeLists.txt
  62. +13 −9 src/core/pal/feature.cpp
  63. +4 −1 src/core/qgsapplication.h
  64. +20 −21 src/core/qgsbrowsermodel.cpp
  65. +6 −1 src/core/qgsbrowsermodel.h
  66. +1 −1 src/core/qgscoordinatereferencesystem.cpp
  67. +7 −0 src/core/qgsdataitem.h
  68. +77 −0 src/core/qgsmimedatautils.cpp
  69. +34 −0 src/core/qgsmimedatautils.h
  70. +1 −1 src/core/raster/qgsrasterlayer.cpp
  71. +9 −5 src/gui/qgsprojectionselector.cpp
  72. +3 −0 src/gui/qgsprojectionselector.h
  73. +1 −1 src/mapserver/qgis_map_serv.cpp
  74. +159 −102 src/mapserver/qgsprojectparser.cpp
  75. +3 −0 src/mapserver/qgsprojectparser.h
  76. +2 −0 src/mapserver/qgssldparser.cpp
  77. +27 −1 src/mapserver/qgswmsserver.cpp
  78. +0 −1 src/plugins/grass/modules/v.generalize.qgm
  79. +1 −1 src/plugins/grass/modules/v.what.vect.qgm
  80. +15 −11 src/providers/postgres/qgspostgresdataitems.cpp
  81. +2 −3 src/providers/postgres/qgspostgresdataitems.h
  82. +5 −2 src/providers/postgres/qgspostgresprovider.cpp
  83. +1 −0 src/providers/spatialite/CMakeLists.txt
  84. +1 −0 src/providers/spatialite/qgsspatialiteconnection.h
  85. +109 −2 src/providers/spatialite/qgsspatialitedataitems.cpp
  86. +4 −0 src/providers/spatialite/qgsspatialitedataitems.h
  87. +91 −0 src/providers/spatialite/qgsspatialiteprovider.cpp
  88. +55 −67 src/ui/qgslabelingguibase.ui
  89. +20 −17 src/ui/qgsoptionsbase.ui
  90. +0 −9 tests/README
  91. +28 −42 tests/src/analysis/CMakeLists.txt
  92. +7 −5 tests/src/analysis/testqgsvectoranalyzer.cpp
  93. +4 −4 tests/src/core/CMakeLists.txt
  94. +5 −4 tests/src/core/regression992.cpp
  95. +3 −3 tests/src/core/testcontrastenhancements.cpp
  96. +8 −11 tests/src/core/testqgsapplication.cpp
  97. +1 −1 tests/src/core/testqgscoordinatereferencesystem.cpp
  98. +2 −2 tests/src/core/testqgsexpression.cpp
  99. +3 −3 tests/src/core/testqgsgeometry.cpp
  100. +3 −3 tests/src/core/testqgsmaprenderer.cpp
  101. +16 −8 tests/src/core/testqgspoint.cpp
  102. +4 −4 tests/src/core/testqgsrasterlayer.cpp
  103. +5 −18 tests/src/core/testqgsrenderers.cpp
  104. +3 −3 tests/src/core/testqgsvectorlayer.cpp
  105. BIN tests/testdata/expected_continuous.png
  106. BIN tests/testdata/expected_geometry_bufferCheck.png
  107. BIN tests/testdata/expected_geometry_differenceCheck1.png
  108. BIN tests/testdata/expected_geometry_differenceCheck2.png
  109. BIN tests/testdata/expected_geometry_intersectionCheck1.png
  110. BIN tests/testdata/expected_geometry_simplifyCheck1.png
  111. BIN tests/testdata/expected_geometry_unionCheck1.png
  112. BIN tests/testdata/expected_geometry_unionCheck2.png
  113. BIN tests/testdata/expected_graduated.png
  114. BIN tests/testdata/expected_landsat_875.png
  115. BIN tests/testdata/expected_landsat_basic.png
  116. BIN tests/testdata/expected_raster.png
  117. BIN tests/testdata/expected_raster_pseudo.png
  118. BIN tests/testdata/expected_rgbwcmyk01_YeGeo.jp2.png
  119. BIN tests/testdata/expected_single.png
  120. BIN tests/testdata/expected_uniquevalue.png
  121. +71 −78 tests/testdata/polys_uniquevalue_symbol.qml
@@ -1,8 +1,8 @@
SET(CPACK_PACKAGE_VERSION_MAJOR "1")
SET(CPACK_PACKAGE_VERSION_MINOR "8")
SET(CPACK_PACKAGE_VERSION_PATCH "0")
SET(CPACK_PACKAGE_VERSION_MINOR "9")
SET(CPACK_PACKAGE_VERSION_PATCH "90")
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
SET(RELEASE_NAME "Trunk")
SET(RELEASE_NAME "Alpha")
SET(PROJECT_VERSION ${COMPLETE_VERSION})
PROJECT(qgis${PROJECT_VERSION})
IF (APPLE)
@@ -88,7 +88,7 @@ ENDIF (WITH_GLOBE)
SET (PEDANTIC TRUE CACHE BOOL "Determines if we should compile in pedantic mode.")

# whether unit tests should be build
SET (ENABLE_TESTS FALSE CACHE BOOL "Build unit tests?")
SET (ENABLE_TESTS TRUE CACHE BOOL "Build unit tests?")

# hide this variable because building of python bindings might fail
# if set to other directory than expected
@@ -195,6 +195,8 @@ ENDIF ()
IF (ENABLE_TESTS)
SET( QT_USE_QTTEST TRUE )
ENABLE_TESTING()
# Define "make check" as alias for "make test" - thanks geos :-)
add_custom_target(check COMMAND ctest)
ENDIF (ENABLE_TESTS)


@@ -500,6 +502,8 @@ IF (ENABLE_TESTS)
#the test data. See CMakeLists in test dirs for more info
SET (TEST_DATA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tests/testdata")
ADD_SUBDIRECTORY(tests)
SET (CTEST_BINARY_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output/bin" )
MESSAGE (STATUS "Ctest Binary Directory set to: ${CTEST_BINARY_DIRECTORY}")
ENDIF (ENABLE_TESTS)

IF (APPLE)
@@ -1,3 +1,9 @@
qgis (1.9.90) UNRELEASED; urgency=low

* new development version 1.9.90 after branch of 1.8.0

-- Jürgen E. Fischer <jef@norbit.de> Wed, 16 Nov 2011 09:43:40 +0100

qgis (1.8.0) UNRELEASED; urgency=low

* new development version 1.8 after branch
@@ -106,6 +106,11 @@ build-stamp: debian/build/CMakeCache.txt
# Add here commands to compile the package.
$(MAKE) -C debian/build

ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
# Code to run the package test suite - and ignore the outcome for now
LD_LIBRARY_PATH=$(PWD)/debian/build/output/lib:$(LD_LIBRARY_PATH) $(MAKE) -C debian/build test || true
endif

touch $@

cleantemplates:
@@ -16,6 +16,7 @@ Please consider sponsoring the development of QuantumGIS.
See: http://qgis.org/en/sponsorship.html

SILVER
State of Vorarlberg, Austria (11.2011)|http://www.vorarlberg.at/
Kanton Solothurn, Switzerland (4.2011)|http://www.agi.so.ch/

BRONZE

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

@@ -1807,7 +1807,7 @@ http://trac.faunalia.it/GdalTools-plugin</source>
<translation>GDAL Tools (noto anche come Raster Tools) è un plugin per QuantumGIS che facilita l&apos;utilizzo di GDAL, fornendo un&apos;interfaccia grafica semplificata per i programmi più utilizzati.

Il plugin è sviluppato da Faunalia (http://faunalia.it) in collaborazione con GIS-lab (http://gis-lab.info).
Icone realizzare da Robert Szczepanek.
Icone realizzate da Robert Szczepanek.
Si ringrazia Silvio Grosso per la sponsorizzazione.

Aiutateci a testare il plugin, informandoci sui eventuali bug, migliorando il codice o supportandoci economicamente.
@@ -14793,7 +14793,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui" line="275"/>
<source>Start import at row</source>
<translation>Inizia l&apos;importazione dalla colonna</translation>
<translation>Inizia l&apos;importazione dalla riga</translation>
</message>
<message>
<location filename="../src/plugins/delimited_text/qgsdelimitedtextpluginguibase.ui" line="293"/>
@@ -22434,7 +22434,7 @@ Può essere o un problema della propria connessione di rete o sul lato del serve
<message>
<location filename="../src/app/qgsmaptoolsimplify.cpp" line="302"/>
<source>This feature cannot be simplified. Check if feature has enough vertices to be simplified.</source>
<translation>Questa geometria non può essere semplificata. Verificare se la geometria ha abbastanza vertifici per la semplificazione.</translation>
<translation>Questa geometria non può essere semplificata. Verificare se la geometria ha abbastanza vertici per la semplificazione.</translation>
</message>
</context>
<context>

0 comments on commit a0dad9c

Please sign in to comment.