Skip to content
Permalink
Browse files

merge from trunk r11400:11450

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11888 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder
wonder committed Nov 2, 2009
1 parent 2425621 commit 7d3257eded74267f7d1f7e12829f9c88631cf960
Showing with 5,709 additions and 19,762 deletions.
  1. +8 −8 CMakeLists.txt
  2. +1 −1 DONORS
  3. +4 −1 cmake/Bison.cmake
  4. +4 −3 cmake/Flex.cmake
  5. +84 −0 cmake/Python.cmake
  6. +5 −1 debian/changelog
  7. +1 −1 debian/control
  8. +1,075 −1,936 i18n/qgis_de.ts
  9. +139 −68 i18n/qgis_fr.ts
  10. +1 −1 i18n/qgis_it.ts
  11. +1,689 −1,185 i18n/qgis_ru.ts
  12. +1,875 −1,448 i18n/qgis_sv.ts
  13. BIN images/themes/gis/mActionAddImage.png
  14. BIN images/themes/gis/mActionAddLegend.png
  15. BIN images/themes/gis/mActionAddMap.png
  16. BIN images/themes/gis/mActionDeletePart.png
  17. BIN images/themes/gis/mActionDeleteRing.png
  18. BIN images/themes/gis/mActionGroupItems.png
  19. BIN images/themes/gis/mActionLabel.png
  20. BIN images/themes/gis/mActionMergeFeatures.png
  21. BIN images/themes/gis/mActionMoveItemContent.png
  22. BIN images/themes/gis/mActionNodeTool.png
  23. BIN images/themes/gis/mActionRedo.png
  24. BIN images/themes/gis/mActionSaveAsSVG.png
  25. BIN images/themes/gis/mActionSaveMapAsImage.png
  26. BIN images/themes/gis/mActionScaleBar.png
  27. BIN images/themes/gis/mActionSelectPan.png
  28. BIN images/themes/gis/mActionSimplify.png
  29. BIN images/themes/gis/mActionUndo.png
  30. BIN images/themes/gis/mActionUngroupItems.png
  31. +52 −151 mac/xcode/Qgis.xcodeproj/project.pbxproj
  32. +34 −25 ms-windows/osgeo4w/package.cmd
  33. +2 −11 python/CMakeLists.txt
  34. +1 −1 python/core/qgsgraduatedsymbolrenderer.sip
  35. +1 −20 python/core/qgslegendmodel.sip
  36. +10 −13 python/plugins/fTools/CMakeLists.txt
  37. +2 −2 python/plugins/fTools/doAbout.py
  38. +1 −2 python/plugins/fTools/fTools.py
  39. +0 −92 python/plugins/fTools/frmAbout.py
  40. +1 −48 python/plugins/fTools/icons/gis/CMakeLists.txt
  41. BIN python/plugins/fTools/icons/gis/nodes.png
  42. +0 −8,504 python/plugins/fTools/resources.py
  43. +9 −60 python/plugins/fTools/tools/CMakeLists.txt
  44. +1 −1 python/plugins/fTools/tools/doDefineProj.py
  45. +1 −1 python/plugins/fTools/tools/doGeometry.py
  46. +1 −1 python/plugins/fTools/tools/doGeoprocessing.py
  47. +1 −1 python/plugins/fTools/tools/doIntersectLines.py
  48. +1 −1 python/plugins/fTools/tools/doJoinAttributes.py
  49. +1 −1 python/plugins/fTools/tools/doMeanCoords.py
  50. +1 −1 python/plugins/fTools/tools/doPointDistance.py
  51. +1 −1 python/plugins/fTools/tools/doPointsInPolygon.py
  52. +1 −1 python/plugins/fTools/tools/doRandPoints.py
  53. +1 −1 python/plugins/fTools/tools/doRandom.py
  54. +1 −1 python/plugins/fTools/tools/doReProject.py
  55. +1 −1 python/plugins/fTools/tools/doRegPoints.py
  56. +3 −3 python/plugins/fTools/tools/doSelectByLocation.py
  57. +1 −1 python/plugins/fTools/tools/doSpatialJoin.py
  58. +1 −1 python/plugins/fTools/tools/doSubsetSelect.py
  59. +1 −1 python/plugins/fTools/tools/doSumLines.py
  60. +1 −1 python/plugins/fTools/tools/doVectorGrid.py
  61. +1 −1 python/plugins/fTools/tools/doVectorSplit.py
  62. +1 −1 python/plugins/fTools/tools/doVisual.py
  63. +0 −116 python/plugins/fTools/tools/frmGeometry.py
  64. +0 −164 python/plugins/fTools/tools/frmGeoprocessing.py
  65. +0 −120 python/plugins/fTools/tools/frmIntersectLines.py
  66. +0 −175 python/plugins/fTools/tools/frmJoinAttributes.py
  67. +0 −120 python/plugins/fTools/tools/frmMeanCoords.py
  68. +0 −159 python/plugins/fTools/tools/frmPointDistance.py
  69. +0 −109 python/plugins/fTools/tools/frmPointsInPolygon.py
  70. +0 −197 python/plugins/fTools/tools/frmRandPoints.py
  71. +0 −97 python/plugins/fTools/tools/frmRandom.py
  72. +0 −135 python/plugins/fTools/tools/frmReProject.py
  73. +0 −199 python/plugins/fTools/tools/frmRegPoints.py
  74. +0 −167 python/plugins/fTools/tools/frmSpatialJoin.py
  75. +0 −122 python/plugins/fTools/tools/frmSubsetSelect.py
  76. +0 −109 python/plugins/fTools/tools/frmSumLines.py
  77. +0 −215 python/plugins/fTools/tools/frmVectorGrid.py
  78. +0 −82 python/plugins/fTools/tools/frmVectorSplit.py
  79. +0 −93 python/plugins/fTools/tools/frmVisual.py
  80. +6 −4 python/plugins/mapserver_export/CMakeLists.txt
  81. +1 −1 python/plugins/mapserver_export/mapserverexport.py
  82. +1 −1 python/plugins/mapserver_export/mapserverexportdialog.py
  83. +0 −283 python/plugins/mapserver_export/resources.py
  84. +0 −253 python/plugins/mapserver_export/ui_mapserverexport.py
  85. +3 −20 python/plugins/osm/CMakeLists.txt
  86. +1 −1 python/plugins/osm/OsmAddRelationDlg.py
  87. +1 −1 python/plugins/osm/OsmDownloadDlg.py
  88. +1 −1 python/plugins/osm/OsmFeatureDW.py
  89. +1 −1 python/plugins/osm/OsmImportDlg.py
  90. +1 −1 python/plugins/osm/OsmLoadDlg.py
  91. +1 −1 python/plugins/osm/OsmPlugin.py
  92. +1 −1 python/plugins/osm/OsmSaveDlg.py
  93. +1 −1 python/plugins/osm/OsmUndoRedoDW.py
  94. +1 −1 python/plugins/osm/OsmUploadDlg.py
  95. +0 −1,685 python/plugins/osm/resources.py
  96. +15 −14 python/plugins/plugin_installer/CMakeLists.txt
  97. +5 −5 python/plugins/plugin_installer/installer_gui.py
  98. +1 −1 python/plugins/plugin_installer/installer_plugin.py
  99. +0 −293 python/plugins/plugin_installer/qgsplugininstallerbase.py
  100. +0 −85 python/plugins/plugin_installer/qgsplugininstallerfetchingbase.py
  101. +0 −73 python/plugins/plugin_installer/qgsplugininstallerinstallingbase.py
  102. +0 −68 python/plugins/plugin_installer/qgsplugininstallerpluginerrorbase.py
  103. +0 −122 python/plugins/plugin_installer/qgsplugininstallerrepositorybase.py
  104. +0 −580 python/plugins/plugin_installer/resources_rc.py
  105. +16 −0 resources/README
  106. BIN resources/srs.db
  107. +13 −13 scripts/postprocess_srs.sql
  108. +278 −0 scripts/qgis_srs.sh
  109. +3 −3 scripts/update_ts_files.sh
  110. +11 −2 src/app/legend/qgslegend.cpp
  111. +14 −1 src/app/qgisapp.cpp
  112. +2 −2 src/app/qgsbookmarks.cpp
  113. +26 −0 src/app/qgsclipboard.cpp
  114. +24 −1 src/app/qgsclipboard.h
  115. +68 −130 src/app/qgscustomprojectiondialog.cpp
  116. +6 −6 src/app/qgsoptions.cpp
  117. +34 −14 src/core/composer/qgscomposerlegend.cpp
  118. +6 −5 src/core/composer/qgscomposerlegend.h
  119. +29 −10 src/core/composer/qgslegendmodel.cpp
  120. +1 −1 src/core/composer/qgslegendmodel.h
  121. +52 −41 src/core/qgscoordinatereferencesystem.cpp
  122. +18 −26 src/core/qgscoordinatetransform.cpp
  123. +2 −2 src/core/qgsdistancearea.cpp
  124. +4 −4 src/core/qgsmaplayer.cpp
  125. +12 −2 src/core/qgsprojectversion.cpp
  126. +1 −0 src/core/qgsvectorlayer.cpp
  127. +3 −1 src/core/symbology/qgssymbol.cpp
  128. +9 −9 src/gui/qgsprojectionselector.cpp
  129. +1 −1 src/helpviewer/qgshelpviewer.cpp
  130. +1 −1 src/plugins/grass/modules-common/r.recode.qgm
  131. +3 −2 src/plugins/grass/qgsgrassattributes.cpp
  132. +2 −2 src/providers/grass/qgsgrassprovider.cpp
  133. +9 −4 src/providers/spatialite/qgsspatialiteprovider.cpp
@@ -187,7 +187,7 @@ FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
# enable warnings

IF (PEDANTIC)
MESSAGE ("-- Pedantic compiler settings enabled")
MESSAGE (STATUS "Pedantic compiler settings enabled")
IF(MSVC)
ADD_DEFINITIONS( /W4 )

@@ -204,10 +204,10 @@ IF (PEDANTIC)
ENDIF (MSVC)
ENDIF (PEDANTIC)

IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_CONFIGURATION_TYPE MATCHES RelWithDebInfo)
MESSAGE ("-- Debug output enabled")
IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
MESSAGE (STATUS "Debug output enabled")
ADD_DEFINITIONS(-DQGISDEBUG=1)
ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_CONFIGURATION_TYPE MATCHES RelWithDebInfo)
ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)

#############################################################
# platform specific stuff
@@ -233,10 +233,10 @@ IF (WIN32)
ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
ADD_DEFINITIONS(-D_CRT_NONSTDC_NO_WARNINGS)

IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_CONFIGURATION_TYPE MATCHES RelWithDebInfo)
MESSAGE ("-- Generating browse files")
IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
MESSAGE (STATUS "Generating browse files")
ADD_DEFINITIONS( /FR )
ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_CONFIGURATION_TYPE MATCHES RelWithDebInfo)
ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)

IF (INSTALL_DEPS)
INSTALL(DIRECTORY ${INSTALL_DEPS} DESTINATION .)
@@ -365,7 +365,7 @@ SUBDIRS(src doc images resources i18n)
IF (HAVE_PYTHON AND WITH_BINDINGS)
SUBDIRS (python)
ELSE (HAVE_PYTHON AND WITH_BINDINGS)
MESSAGE ("Python not being built")
MESSAGE (STATUS "Python not being built")
ENDIF (HAVE_PYTHON AND WITH_BINDINGS)

IF (ENABLE_TESTS)
2 DONORS
@@ -32,7 +32,7 @@ Ivan Marchesini|http://www.gfosservices.it/
James Crone
Jaroslaw Kowalczyk
Jason Jorgenson
John C. Tull
John C. Tull|http://www.wildnevada.org
John Dean
Kanton Solothurn SOGIS
Kevin Shook
@@ -4,7 +4,10 @@
MACRO(FIND_BISON)
IF(NOT BISON_EXECUTABLE)
IF (MSVC)
FIND_PROGRAM(BISON_EXECUTABLE "$ENV{LIB_DIR}/bin/bison.exe")
FIND_PROGRAM(BISON_EXECUTABLE PATHS
NAMES bison.exe
PATHS $ENV{LIB_DIR}/bin $ENV{PROGRAMFILES}/GnuWin32/bin
)
ELSE (MSVC)
FIND_PROGRAM(BISON_EXECUTABLE bison)
ENDIF (MSVC)
@@ -4,9 +4,10 @@
MACRO(FIND_FLEX)
IF(NOT FLEX_EXECUTABLE)
IF (MSVC)
FIND_PROGRAM(FLEX_EXECUTABLE
"$ENV{LIB_DIR}/bin/flex.exe"
)
FIND_PROGRAM(FLEX_EXECUTABLE
NAMES flex.exe
PATHS $ENV{LIB_DIR}/bin $ENV{PROGRAMFILES}/GnuWin32/bin
)
ELSE(MSVC)
FIND_PROGRAM(FLEX_EXECUTABLE flex)
ENDIF (MSVC)
@@ -7,6 +7,77 @@
FIND_PACKAGE(PythonLibs) # MapServer export tool
FIND_PACKAGE(PythonInterp) # test for sip and PyQt4

IF(NOT PYUIC4_PROGRAM)
IF (MSVC)
FIND_PROGRAM(PYUIC4_PROGRAM
NAMES pyuic4.bat
PATHS $ENV{LIB_DIR}/bin
)
ELSE(MSVC)
FIND_PROGRAM(PYUIC4_PROGRAM pyuic4)
ENDIF (MSVC)

IF (NOT PYUIC4_PROGRAM)
MESSAGE(FATAL_ERROR "pyuic4 not found - aborting")
ENDIF (NOT PYUIC4_PROGRAM)
ENDIF(NOT PYUIC4_PROGRAM)

# Adapted from QT4_WRAP_UI
MACRO(PYQT4_WRAP_UI outfiles )
FOREACH(it ${ARGN})
GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.py)
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${PYUIC4_PROGRAM} ${infile} -o ${outfile}
MAIN_DEPENDENCY ${infile}
)
SET(${outfiles} ${${outfiles}} ${outfile})
ENDFOREACH(it)
ENDMACRO(PYQT4_WRAP_UI)

IF(NOT PYRCC4_PROGRAM)
IF (MSVC)
FIND_PROGRAM(PYRCC4_PROGRAM
NAMES pyrcc4.exe
PATHS $ENV{LIB_DIR}/bin
)
ELSE(MSVC)
FIND_PROGRAM(PYRCC4_PROGRAM pyrcc4)
ENDIF (MSVC)

IF (NOT PYRCC4_PROGRAM)
MESSAGE(FATAL_ERROR "pyrcc4 not found - aborting")
ENDIF (NOT PYRCC4_PROGRAM)
ENDIF(NOT PYRCC4_PROGRAM)

# Adapted from QT4_ADD_RESOURCES
MACRO (PYQT4_ADD_RESOURCES outfiles )
FOREACH (it ${ARGN})
GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
GET_FILENAME_COMPONENT(rc_path ${infile} PATH)
SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/${outfile}_rc.py)
# parse file for dependencies
# all files are absolute paths or relative to the location of the qrc file
FILE(READ "${infile}" _RC_FILE_CONTENTS)
STRING(REGEX MATCHALL "<file[^<]+" _RC_FILES "${_RC_FILE_CONTENTS}")
SET(_RC_DEPENDS)
FOREACH(_RC_FILE ${_RC_FILES})
STRING(REGEX REPLACE "^<file[^>]*>" "" _RC_FILE "${_RC_FILE}")
STRING(REGEX MATCH "^/|([A-Za-z]:/)" _ABS_PATH_INDICATOR "${_RC_FILE}")
IF(NOT _ABS_PATH_INDICATOR)
SET(_RC_FILE "${rc_path}/${_RC_FILE}")
ENDIF(NOT _ABS_PATH_INDICATOR)
SET(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}")
ENDFOREACH(_RC_FILE)
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
COMMAND ${PYRCC4_PROGRAM} -name ${outfile} -o ${outfile} ${infile}
MAIN_DEPENDENCY ${infile}
DEPENDS ${_RC_DEPENDS})
SET(${outfiles} ${${outfiles}} ${outfile})
ENDFOREACH (it)
ENDMACRO (PYQT4_ADD_RESOURCES)

MACRO (TRY_RUN_PYTHON RESULT CMD)
IF (PYTHONINTERP_FOUND)
@@ -32,6 +103,19 @@ MACRO (TRY_RUN_PYTHON RESULT CMD)
ENDIF (PYTHONINTERP_FOUND)
ENDMACRO (TRY_RUN_PYTHON)

IF(MSVC)
FIND_PROGRAM(SIP_MAKE_PROGRAM
NAMES nmake.exe
PATHS "$ENV{VCINSTALLDIR}/bin" "$ENV{PROGRAMFILES}/Microsoft Visual 9.0/VC/bin"
)
IF(NOT SIP_MAKE_PROGRAM)
MESSAGE(FATAL_ERROR "nmake not found")
ENDIF(NOT SIP_MAKE_PROGRAM)
ELSE (MSVC)
SET(SIP_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM})
ENDIF (MSVC)


# enable/disable python support (mapserver export tool and bindings)
IF (PYTHON_LIBRARIES AND PYTHON_INCLUDE_PATH)
SET (PYTHON_FOUND TRUE)
@@ -1,8 +1,12 @@
qgis (1.2.0) UNRELEASED; urgency=low

* new development version after 1.1 branch
* add new build dependency to pyqt4-dev-tools
* update SONAMEs to 1.2.0
* add python dependency to qgis-plugin-grass-common
* include osm provider and evis plugin

-- Juergen E. Fischer <jef@norbit.de> Sun, 03 May 2009 22:52:09 +0200
-- Jürgen E. Fischer <jef@norbit.de> Tue, 18 Aug 2009 08:20:18 +0200

qgis (1.1.0-5) UNRELEASED; urgency=low

@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
sharutils, sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
python-sip4-dev (>= 4.5.0), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev,
libsm-dev
libsm-dev, pyqt4-dev-tools
Build-Conflicts: libqgis1.2.0-dev, qgis-dev
Standards-Version: 3.8.0
XS-Python-Version: current

0 comments on commit 7d3257e

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