Skip to content
Permalink
Browse files

master merge

  • Loading branch information
blazek committed Aug 6, 2012
2 parents 53da893 + 3b3f674 commit e09a0a5529e7fce2a72ff95a916de08813038e34
Showing with 11,335 additions and 4,219 deletions.
  1. +276 −32 INSTALL
  2. +1 −1 cmake/Bison.cmake
  3. +1 −7 cmake/FindFcgi.cmake
  4. +1 −4 cmake/FindGEOS.cmake
  5. +3 −10 cmake/FindGSL.cmake
  6. +0 −7 cmake/FindIconv.cmake
  7. +2 −9 cmake/FindProj.cmake
  8. +1 −1 cmake/FindQwt.cmake
  9. +5 −10 cmake/FindSPATIALITE.cmake
  10. +4 −12 cmake/FindSqlite3.cmake
  11. +1 −1 cmake/Flex.cmake
  12. +346 −51 doc/INSTALL.html
  13. +37 −37 doc/TRANSLATORS
  14. +46 −3 doc/osx.t2t
  15. +1,216 −1,070 i18n/qgis_de.ts
  16. +2,259 −1,613 i18n/qgis_gl_ES.ts
  17. +5 −1 images/icons/mac/browser/CMakeLists.txt
  18. +8 −0 images/images.qrc
  19. +76 −0 images/themes/default/mActionPanToSelected.svg
  20. +85 −0 images/themes/default/mActionRotateLabel.svg
  21. +94 −0 images/themes/default/mActionSelectPolygon.svg
  22. +81 −0 images/themes/default/mActionSplitFeatures.svg
  23. +606 −0 images/themes/gis/mActionPanToSelected.svg
  24. +604 −0 images/themes/gis/mActionRotateLabel.svg
  25. +585 −0 images/themes/gis/mActionSelectPolygon.svg
  26. +710 −0 images/themes/gis/mActionSplitFeatures.svg
  27. +5 −0 mac/cmake/1qt.cmake.in
  28. +125 −110 python/core/qgis.sip
  29. +37 −27 python/core/qgsapplication.sip
  30. +124 −113 python/core/qgsdatasourceuri.sip
  31. +111 −103 python/core/qgsgeometry.sip
  32. +76 −71 python/core/qgspoint.sip
  33. +3 −4 python/plugins/db_manager/db_plugins/plugin.py
  34. +0 −1 python/plugins/db_manager/db_plugins/postgis/plugin.py
  35. +1 −3 python/plugins/db_manager/dlg_sql_window.py
  36. +41 −14 python/plugins/db_manager/ui/DlgSqlWindow.ui
  37. +1 −1 python/plugins/fTools/tools/doMergeShapes.py
  38. +13 −0 resources/function_help/title-de_DE
  39. +14 −0 resources/function_help/title_en_US
  40. +1 −1 scripts/prepare-commit.sh
  41. +3 −3 src/analysis/vector/qgsgeometryanalyzer.cpp
  42. +1 −1 src/app/composer/qgscomposer.cpp
  43. +2 −2 src/app/legend/qgslayerorder.cpp
  44. +23 −23 src/app/legend/qgslegend.cpp
  45. +1 −1 src/app/legend/qgslegendgroup.cpp
  46. +2 −2 src/app/nodetool/qgsmaptoolnodetool.cpp
  47. +3 −3 src/app/nodetool/qgsselectedfeature.cpp
  48. +1 −1 src/app/ogr/qgsogrsublayersdialog.cpp
  49. +36 −27 src/app/qgisapp.cpp
  50. +1 −1 src/app/qgsattributedialog.cpp
  51. +2 −2 src/app/qgsattributetabledialog.cpp
  52. +2 −2 src/app/qgsattributetypedialog.cpp
  53. +1 −1 src/app/qgsattributetypeloaddialog.cpp
  54. +2 −2 src/app/qgsbookmarks.cpp
  55. +11 −11 src/app/qgscustomization.cpp
  56. +37 −19 src/app/qgsfieldcalculator.cpp
  57. +2 −2 src/app/qgshandlebadlayers.cpp
  58. +15 −3 src/app/qgsidentifyresults.cpp
  59. +2 −0 src/app/qgsidentifyresults.h
  60. +1 −1 src/app/qgsmaptoolcapture.cpp
  61. +1 −1 src/app/qgsmaptoolfeatureaction.cpp
  62. +14 −7 src/app/qgsmaptoolfreezelabels.cpp
  63. +71 −6 src/app/qgsmaptoollabel.cpp
  64. +16 −2 src/app/qgsmaptoollabel.h
  65. +1 −1 src/app/qgsmaptoolmovefeature.cpp
  66. +21 −1 src/app/qgsmaptoolmovelabel.cpp
  67. +0 −58 src/app/qgsmaptoolrotatelabel.cpp
  68. +0 −10 src/app/qgsmaptoolrotatelabel.h
  69. +0 −2 src/app/qgsmeasuredialog.cpp
  70. +9 −8 src/app/qgsoptions.cpp
  71. +2 −2 src/app/qgspluginregistry.cpp
  72. +27 −44 src/app/qgsprojectproperties.cpp
  73. +1 −1 src/app/qgsrasterlayerproperties.cpp
  74. +1 −1 src/app/qgsshortcutsmanager.cpp
  75. +2 −2 src/app/qgssnappingdialog.cpp
  76. +64 −5 src/app/qgsvectorlayerproperties.cpp
  77. +7 −0 src/app/qgsvectorlayerproperties.h
  78. +5 −0 src/astyle/ASResource.cpp
  79. +1 −1 src/core/CMakeLists.txt
  80. +3 −3 src/core/gps/qgsgpsdetector.cpp
  81. +9 −0 src/core/gps/qgsgpsdetector.h
  82. +12 −9 src/core/qgis.h
  83. +3 −1 src/core/qgsapplication.h
  84. +4 −4 src/core/qgsbrowsermodel.cpp
  85. +2 −2 src/core/qgsclipper.cpp
  86. +3 −3 src/core/qgscoordinatereferencesystem.cpp
  87. +12 −12 src/core/qgsdataitem.cpp
  88. +4 −4 src/core/qgsdatasourceuri.cpp
  89. +28 −16 src/core/qgsexpression.cpp
  90. +6 −6 src/core/qgsexpression.h
  91. +6 −1 src/core/qgsgeometry.cpp
  92. +13 −8 src/core/qgsgeometry.h
  93. +1 −1 src/core/qgsmaplayerregistry.cpp
  94. +1 −1 src/core/qgsmimedatautils.cpp
  95. +2 −2 src/core/qgsnetworkaccessmanager.cpp
  96. +13 −3 src/core/qgspallabeling.cpp
  97. +3 −3 src/core/qgspluginlayerregistry.cpp
  98. +19 −0 src/core/qgspoint.cpp
  99. +7 −0 src/core/qgspoint.h
  100. +1 −1 src/core/qgsproviderregistry.cpp
  101. +4 −4 src/core/qgsrasterdataprovider.cpp
  102. +3 −3 src/core/qgsrasterdataprovider.h
  103. +4 −15 src/core/qgsscalecalculator.cpp
  104. +1 −1 src/core/qgsvectordataprovider.cpp
  105. +2 −2 src/core/qgsvectorfilewriter.cpp
  106. +7 −7 src/core/qgsvectorlayer.cpp
  107. +4 −1 src/core/raster/qgsrasterfilewriter.cpp
  108. +2 −2 src/core/raster/qgsrasterlayer.cpp
  109. +1 −1 src/core/raster/qgsrasterpipe.cpp
  110. +3 −3 src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
  111. +446 −13 src/core/symbology-ng/{qgscolorbrewerpalette.h → qgscolorrampv2data.h}
  112. +5 −5 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
  113. +2 −2 src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
  114. +7 −7 src/core/symbology-ng/qgsrendererv2.cpp
  115. +1 −1 src/core/symbology-ng/qgsrendererv2registry.cpp
  116. +38 −25 src/core/symbology-ng/qgsrulebasedrendererv2.cpp
  117. +1 −1 src/core/symbology-ng/qgsrulebasedrendererv2.h
  118. +26 −2 src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
  119. +2 −2 src/core/symbology-ng/qgssymbollayerv2.cpp
  120. +1 −1 src/core/symbology-ng/qgssymbollayerv2registry.cpp
  121. +17 −1 src/core/symbology-ng/qgssymbollayerv2utils.cpp
  122. +3 −0 src/core/symbology-ng/qgssymbollayerv2utils.h
  123. +4 −4 src/core/symbology-ng/qgssymbologyv2conversion.cpp
  124. +541 −3 src/core/symbology-ng/qgsvectorcolorrampv2.cpp
  125. +82 −0 src/core/symbology-ng/qgsvectorcolorrampv2.h
  126. +2 −2 src/core/symbology/qgsmarkercatalogue.cpp
  127. +1 −1 src/crssync/CMakeLists.txt
  128. +2 −0 src/gui/CMakeLists.txt
  129. +1 −1 src/gui/attributetable/qgsattributetablemodel.cpp
  130. +1 −1 src/gui/qgisgui.cpp
  131. +3 −3 src/gui/qgsexpressionbuilderwidget.cpp
  132. +3 −3 src/gui/qgsexpressionhighlighter.cpp
  133. +1 −1 src/gui/qgsmapcanvas.cpp
  134. +54 −8 src/gui/qgsmaptip.cpp
  135. +4 −0 src/gui/qgsmaptip.h
  136. +1 −1 src/gui/qgsowssourceselect.cpp
  137. +2 −2 src/gui/qgsprojectionselector.cpp
  138. +5 −5 src/gui/qgsrasterformatsaveoptionswidget.cpp
  139. +1 −1 src/gui/qgsrasterlayersaveasdialog.cpp
  140. +4 −0 src/gui/qgsscalecombobox.cpp
  141. +2 −0 src/gui/raster/qgsmultibandcolorrendererwidget.cpp
  142. +9 −5 src/gui/raster/qgsrasterhistogramwidget.cpp
  143. +1 −1 src/gui/raster/qgsrasterminmaxwidget.cpp
  144. +34 −1 src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp
  145. +385 −0 src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp
  146. +53 −0 src/gui/symbology-ng/qgscptcitycolorrampv2dialog.h
  147. +1 −1 src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp
  148. +1 −1 src/gui/symbology-ng/qgsrendererv2widget.cpp
  149. +10 −10 src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
  150. +27 −1 src/gui/symbology-ng/qgsstylev2managerdialog.cpp
  151. +2 −2 src/gui/symbology-ng/qgsvectorcolorbrewercolorrampv2dialog.cpp
  152. +1 −1 src/mapserver/qgsconfigcache.cpp
  153. +8 −8 src/mapserver/qgsconfigparser.cpp
  154. +3 −0 src/mapserver/qgsconfigparser.h
  155. +1 −1 src/mapserver/qgshttprequesthandler.cpp
  156. +1 −1 src/mapserver/qgsmslayerbuilder.cpp
  157. +2 −2 src/mapserver/qgsmslayercache.cpp
  158. +25 −4 src/mapserver/qgsprojectparser.cpp
  159. +2 −0 src/mapserver/qgsprojectparser.h
  160. +1 −1 src/mapserver/qgssldparser.cpp
  161. +1 −1 src/mapserver/qgswfsserver.cpp
  162. +63 −58 src/mapserver/qgswmsserver.cpp
  163. +3 −0 src/mapserver/qgswmsserver.h
  164. +1 −1 src/plugins/diagram_overlay/qgssvgdiagramfactorywidget.cpp
  165. +2 −2 src/plugins/georeferencer/qgsgeorefplugingui.cpp
  166. +1 −1 src/plugins/georeferencer/qgstransformsettingsdialog.cpp
  167. +4 −4 src/plugins/grass/qgsgrassbrowser.cpp
  168. +2 −2 src/plugins/heatmap/heatmapgui.cpp
  169. +1 −1 src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp
  170. +1 −1 src/providers/gdal/qgsgdaldataitems.cpp
  171. +10 −6 src/providers/gdal/qgsgdalprovider.cpp
  172. +4 −4 src/providers/grass/qgsgrassprovidermodule.cpp
  173. +6 −3 src/providers/grass/qgsgrassrasterprovider.cpp
  174. +11 −11 src/providers/mssql/qgsmssqldataitems.cpp
  175. +1 −1 src/providers/mssql/qgsmssqlprovider.cpp
  176. +11 −11 src/providers/mssql/qgsmssqlsourceselect.cpp
  177. +3 −3 src/providers/mssql/qgsmssqltablemodel.cpp
  178. +1 −1 src/providers/ogr/qgsogrdataitems.cpp
  179. +7 −7 src/providers/ogr/qgsogrprovider.cpp
  180. +1 −1 src/providers/osm/osmprovider.cpp
  181. +7 −7 src/providers/ows/qgsowsdataitems.cpp
  182. +1 −1 src/providers/postgres/qgscolumntypethread.cpp
  183. +11 −11 src/providers/postgres/qgspgsourceselect.cpp
  184. +3 −3 src/providers/postgres/qgspgtablemodel.cpp
  185. +3 −3 src/providers/postgres/qgspostgresdataitems.cpp
  186. +11 −14 src/providers/postgres/qgspostgresprovider.cpp
  187. +3 −3 src/providers/spatialite/qgsspatialitedataitems.cpp
  188. +1 −2 src/providers/spatialite/qgsspatialiteprovider.cpp
  189. +2 −2 src/providers/spatialite/qgsspatialitesourceselect.cpp
  190. +2 −2 src/providers/wfs/qgswfsdataitems.cpp
  191. +2 −2 src/providers/wfs/qgswfssourceselect.cpp
  192. +1 −1 src/providers/wms/qgstilescalewidget.cpp
  193. +5 −5 src/providers/wms/qgswmsdataitems.cpp
  194. +7 −10 src/providers/wms/qgswmsprovider.cpp
  195. +10 −10 src/providers/wms/qgswmssourceselect.cpp
  196. +1 −1 src/python/qgspythonutilsimpl.cpp
  197. +1 −1 src/ui/qgisapp.ui
  198. +298 −0 src/ui/qgscptcitycolorrampv2dialogbase.ui
  199. +140 −92 src/ui/qgsprojectpropertiesbase.ui
  200. +62 −6 src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui
  201. +247 −63 src/ui/qgsvectorlayerpropertiesbase.ui
  202. +1 −1 tests/bench/main.cpp
  203. +1 −1 tests/qt_modeltest/dynamictreemodel.cpp
  204. +2 −2 tests/qt_modeltest/tst_modeltest.cpp
  205. +1 −0 tests/src/core/CMakeLists.txt
  206. +3 −2 tests/src/core/testqgsexpression.cpp
  207. +98 −0 tests/src/core/testqgsrasterlayer.cpp
  208. +4 −4 tests/src/core/testqgsrulebasedrenderer.cpp
  209. +209 −0 tests/src/core/testqgsstylev2.cpp
  210. +15 −15 tests/src/core/testziplayer.cpp
  211. +1 −1 tests/src/gui/testqgsrasterhistogram.cpp
  212. +1 −1 tests/src/gui/testrendererv2gui.cpp
  213. +2 −1 tests/src/python/CMakeLists.txt
  214. +36 −0 tests/src/python/test_qgsgeometry.py
  215. BIN tests/testdata/control_images/expected_raster_colorRamp1/expected_raster_colorRamp1.png
  216. BIN tests/testdata/control_images/expected_raster_colorRamp2/expected_raster_colorRamp2.png
  217. BIN tests/testdata/control_images/expected_raster_colorRamp3/expected_raster_colorRamp3.png
  218. +0 −2 tests/testdata/zip/points3.geojson.gz.properties
308 INSTALL

Large diffs are not rendered by default.

@@ -12,7 +12,7 @@ MACRO(FIND_BISON)
IF (MSVC)
FIND_PROGRAM(BISON_EXECUTABLE PATHS
NAMES bison.exe
PATHS $ENV{LIB_DIR}/bin $ENV{PROGRAMFILES}/GnuWin32/bin
PATHS $ENV{LIB_DIR}/bin c:/cygwin/bin $ENV{PROGRAMFILES}/GnuWin32/bin
)
ELSE (MSVC)
FIND_PROGRAM(BISON_EXECUTABLE bison)
@@ -10,20 +10,14 @@ FIND_PATH(FCGI_INCLUDE_DIR
/usr/include
/usr/local/include
/usr/include/fastcgi
#MSVC
"$ENV{LIB_DIR}/include"
$ENV{INCLUDE}
#mingw
c:/msys/local/include
)
FIND_LIBRARY(FCGI_LIBRARY NAMES fcgi libfcgi PATHS
/usr/local/lib
/usr/lib
#MSVC
"$ENV{LIB_DIR}/lib"
$ENV{LIB}
#mingw
c:/msys/local/lib
"$ENV{LIB}"
)

IF (FCGI_INCLUDE_DIR AND FCGI_LIBRARY)
@@ -25,11 +25,8 @@ IF(WIN32)
IF (MSVC)
FIND_PATH(GEOS_INCLUDE_DIR geos_c.h $ENV{LIB_DIR}/include $ENV{INCLUDE})
FIND_LIBRARY(GEOS_LIBRARY NAMES geos geos_c_i PATHS
"$ENV{LIB}/lib"
"$ENV{LIB_DIR}/lib"
$ENV{LIB}
#mingw
c:/msys/local/lib
NO_DEFAULT_PATH
)
IF (GEOS_LIBRARY)
SET (
@@ -23,25 +23,18 @@
##

IF(WIN32)

SET(GSL_MINGW_PREFIX "c:/msys/local" )
SET(GSL_MSVC_PREFIX "$ENV{LIB_DIR}")

FIND_PATH(GSL_INCLUDE_DIR gsl/gsl_blas.h
${GSL_MINGW_PREFIX}/include
${GSL_MSVC_PREFIX}/include
${LIB_DIR}/include
$ENV{INCLUDE}
)

FIND_LIBRARY(GSL_LIB gsl PATHS
${GSL_MINGW_PREFIX}/lib
${GSL_MSVC_PREFIX}/lib
${LIB_DIR}/lib
$ENV{LIB}
)

FIND_LIBRARY(GSLCBLAS_LIB gslcblas cblas PATHS
${GSL_MINGW_PREFIX}/lib
${GSL_MSVC_PREFIX}/lib
${LIB_DIR}/lib
$ENV{LIB}
)

@@ -22,20 +22,13 @@ FIND_PATH(ICONV_INCLUDE_DIR iconv.h
$ENV{INCLUDE}
/usr/local/include
/usr/include
#mingw
c:/msys/local/include
NO_DEFAULT_PATH
)
FIND_PATH(ICONV_INCLUDE_DIR iconv.h)

FIND_LIBRARY(ICONV_LIBRARY NAMES iconv libiconv PATHS
"$ENV{LIB_DIR}/lib"
$ENV{LIB}
/usr/local/lib
/usr/lib
#mingw
c:/msys/local/lib
NO_DEFAULT_PATH
)

IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARY)
@@ -37,21 +37,14 @@ IF (APPLE)
ENDIF (APPLE)

FIND_PATH(PROJ_INCLUDE_DIR proj_api.h
"$ENV{LIB_DIR}/include/proj"
"$ENV{INCLUDE}"
"$ENV{LIB_DIR}/include"
#mingw
c:/msys/local/include
NO_DEFAULT_PATH
)
FIND_PATH(PROJ_INCLUDE_DIR proj_api.h)

FIND_LIBRARY(PROJ_LIBRARY NAMES proj proj_i PATHS
"$ENV{LIB}"
"$ENV{LIB_DIR}/lib"
#mingw
c:/msys/local/lib
NO_DEFAULT_PATH
)
FIND_LIBRARY(PROJ_LIBRARY NAMES proj)

IF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY)
SET(PROJ_FOUND TRUE)
@@ -24,7 +24,7 @@ FIND_LIBRARY(QWT_LIBRARY NAMES qwt qwt5 qwt-qt4 qwt5-qt4 PATHS
/usr/lib
/usr/local/lib
"$ENV{LIB_DIR}/lib"
"$ENV{LIB}/lib"
"$ENV{LIB}"
)

IF (QWT_INCLUDE_DIR AND QWT_LIBRARY)
@@ -39,21 +39,16 @@ IF (APPLE)
ENDIF (APPLE)

FIND_PATH(SPATIALITE_INCLUDE_DIR spatialite.h
"$ENV{INCLUDE}"
"$ENV{LIB_DIR}/include"
"$ENV{LIB_DIR}/include/spatialite"
#mingw
c:/msys/local/include
NO_DEFAULT_PATH
)
FIND_PATH(SPATIALITE_INCLUDE_DIR spatialite.h)

FIND_LIBRARY(SPATIALITE_LIBRARY NAMES spatialite PATHS
"$ENV{LIB_DIR}/lib"
#mingw
c:/msys/local/lib
NO_DEFAULT_PATH
MESSAGE(STATUS "LIB:${LIB} LIB_DIR:${LIB_DIR}")
FIND_LIBRARY(SPATIALITE_LIBRARY NAMES spatialite spatialite_i PATHS
$ENV{LIB}
$ENV{LIB_DIR}/lib
)
FIND_LIBRARY(SPATIALITE_LIBRARY NAMES spatialite)

IF (SPATIALITE_INCLUDE_DIR AND SPATIALITE_LIBRARY)
SET(SPATIALITE_FOUND TRUE)
@@ -40,27 +40,19 @@ ENDIF (APPLE)
FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h
"$ENV{LIB_DIR}/include"
"$ENV{LIB_DIR}/include/sqlite"
#mingw
c:/msys/local/include
NO_DEFAULT_PATH
)
FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h)
"$ENV{INCLUDE}"
)

FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 sqlite3_i PATHS
FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3_i sqlite3 PATHS
"$ENV{LIB_DIR}/lib"
#mingw
c:/msys/local/lib
NO_DEFAULT_PATH
"$ENV{LIB}/lib"
)
FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3)

IF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
SET(SQLITE3_FOUND TRUE)
ENDIF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)


IF (SQLITE3_FOUND)

IF (NOT SQLITE3_FIND_QUIETLY)
MESSAGE(STATUS "Found Sqlite3: ${SQLITE3_LIBRARY}")
ENDIF (NOT SQLITE3_FIND_QUIETLY)
@@ -12,7 +12,7 @@ MACRO(FIND_FLEX)
IF (MSVC)
FIND_PROGRAM(FLEX_EXECUTABLE
NAMES flex.exe
PATHS $ENV{LIB_DIR}/bin $ENV{PROGRAMFILES}/GnuWin32/bin
PATHS $ENV{LIB_DIR}/bin c:/cygwin/bin $ENV{PROGRAMFILES}/GnuWin32/bin
)
ELSE(MSVC)
FIND_PROGRAM(FLEX_EXECUTABLE flex)

0 comments on commit e09a0a5

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