Skip to content
Permalink
Browse files
Merge branch 'master' of github.com:qgis/Quantum-GIS
  • Loading branch information
mhugent committed Jan 4, 2013
2 parents 3359870 + fb763a7 commit 9385ac9470d72e2e9d762518d4a5d6c2d6bf1114
Showing with 1,675 additions and 1,406 deletions.
  1. +1 −0 .gitignore
  2. +20 −20 cmake/FindGEOS.cmake
  3. +1 −8 doc/SPONSORS
  4. +30 −30 doc/TRANSLATORS
  5. +1,057 −929 i18n/qgis_de.ts
  6. +18 −18 images/images.qrc
  7. BIN images/{ → themes/default}/console/iconAboutConsole.png
  8. BIN images/{ → themes/default}/console/iconClassConsole.png
  9. BIN images/{ → themes/default}/console/iconClearConsole.png
  10. BIN images/{ → themes/default}/console/iconCodepadConsole.png
  11. BIN images/{ → themes/default}/console/iconHelpConsole.png
  12. BIN images/{ → themes/default}/console/iconHideToolConsole.png
  13. BIN images/{ → themes/default}/console/iconIfaceConsole.png
  14. BIN images/{ → themes/default}/console/iconOpenConsole.png
  15. BIN images/{ → themes/default}/console/iconQtCoreConsole.png
  16. BIN images/{ → themes/default}/console/iconQtGuiConsole.png
  17. BIN images/{ → themes/default}/console/iconRunConsole.png
  18. BIN images/{ → themes/default}/console/iconSaveConsole.png
  19. BIN images/{ → themes/default}/console/iconScriptConsole.png
  20. BIN images/{ → themes/default}/console/iconSettingsConsole.png
  21. BIN images/{ → themes/default}/console/iconSextanteConsole.png
  22. BIN images/{ → themes/default}/console/imgHelpConsole.png
  23. BIN images/{ → themes/default}/console/imgHelpDialog.png
  24. BIN images/{ → themes/default}/console/imgHelpMenu.png
  25. BIN images/themes/default/mActionSaveEdits.png
  26. +2 −3 python/CMakeLists.txt
  27. +7 −7 python/console/CMakeLists.txt
  28. +26 −0 python/console/__init__.py
  29. +13 −12 python/console/console.py
  30. +15 −15 python/console/console_help/help.htm
  31. +5 −4 python/console/console_output.py
  32. 0 python/console/console_sci.py
  33. +2 −0 python/gui/qgisinterface.sip
  34. +1 −1 python/gui/qgsmessagebar.sip
  35. +1 −1 python/plugins/GdalTools/tools/GdalTools_utils.py
  36. +3 −3 python/plugins/GdalTools/tools/inOutSelector.py
  37. +50 −25 python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/__init__.py
  38. +1 −1 python/plugins/db_manager/ui/DlgExportVector.ui
  39. +1 −1 python/plugins/db_manager/ui/DlgImportVector.ui
  40. +2 −2 python/plugins/fTools/tools/doEliminate.py
  41. +4 −0 python/plugins/fTools/tools/doMergeShapes.py
  42. +1 −1 python/plugins/fTools/tools/doRandPoints.py
  43. +1 −1 python/plugins/fTools/tools/doRegPoints.py
  44. +2 −2 python/plugins/fTools/tools/doValidate.py
  45. +4 −4 python/plugins/osm/OsmDatabaseManager.py
  46. +1 −1 python/plugins/osm/OsmDownloadDlg.py
  47. +1 −1 python/plugins/osm/OsmFeatureDW.py
  48. +46 −112 python/plugins/sextante/algs/ftools/Dissolve.py
  49. +13 −0 src/app/legend/qgslegend.cpp
  50. +1 −1 src/app/legend/qgslegend.h
  51. +5 −0 src/app/legend/qgslegendlayer.cpp
  52. +0 −2 src/app/nodetool/qgsselectedfeature.h
  53. +39 −11 src/app/qgisapp.cpp
  54. +45 −39 src/app/qgisapp.h
  55. +1 −0 src/app/qgisappinterface.cpp
  56. +2 −0 src/app/qgisappinterface.h
  57. +11 −4 src/app/qgsattributetabledialog.cpp
  58. +1 −1 src/app/qgsfieldsproperties.cpp
  59. +7 −0 src/app/qgsmaptoolselectrectangle.cpp
  60. +7 −0 src/core/composer/qgscomposeritem.cpp
  61. +3 −0 src/core/composer/qgscomposeritem.h
  62. +1 −1 src/core/composer/qgscomposerlegend.cpp
  63. +1 −1 src/core/qgscoordinatereferencesystem.cpp
  64. +1 −1 src/core/qgscoordinatereferencesystem.h
  65. +70 −67 src/core/raster/qgsrasterfilewriter.cpp
  66. +1 −0 src/core/raster/qgsrasterfilewriter.h
  67. +30 −13 src/core/symbology-ng/qgsstylev2.cpp
  68. +0 −1 src/core/symbology-ng/qgssymbollayerv2utils.cpp
  69. +2 −0 src/gui/qgisinterface.h
  70. +9 −1 src/gui/qgsmessagebar.cpp
  71. +7 −2 src/gui/symbology-ng/qgssymbolslistwidget.cpp
  72. +3 −3 src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
  73. +24 −0 src/plugins/grass/qgis_grass_test.py
  74. +21 −15 src/providers/gdal/qgsgdalprovider.cpp
  75. +6 −4 src/providers/wms/qgswmssourceselect.cpp
  76. +3 −0 src/providers/wms/qgswmssourceselect.h
  77. +14 −0 src/ui/qgisapp.ui
  78. +7 −5 src/ui/qgsattributetabledialog.ui
  79. +1 −4 src/ui/qgscustomizationdialogbase.ui
  80. +1 −1 src/ui/qgsgpsinformationwidgetbase.ui
  81. +3 −22 src/ui/qgssponsorsbase.ui
  82. +3 −0 src/ui/symbollayer/widget_symbolslist.ui
  83. +3 −1 tests/src/core/testqgsrastersublayer.cpp
  84. +13 −4 tests/src/providers/testqgswcsprovider.cpp
@@ -48,3 +48,4 @@ i18n/*.qm
.idea
/python/plugins/sextante/resources_rc.py
/python/plugins/sextante/about/ui_aboutdialogbase.py
scripts/qgisstyle
@@ -12,7 +12,7 @@
# GEOS_INCLUDE_DIR
# GEOS_LIBRARY
#

INCLUDE (@CMAKE_SOURCE_DIR@/cmake/MacPlistMacros.cmake)

IF(WIN32)
@@ -24,21 +24,21 @@ 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
FIND_LIBRARY(GEOS_LIBRARY NAMES geos geos_c_i geos_c PATHS
"$ENV{LIB_DIR}/lib"
$ENV{LIB}
)
IF (GEOS_LIBRARY)
SET (
GEOS_LIBRARY
GEOS_LIBRARY;odbc32;odbccp32
GEOS_LIBRARY
GEOS_LIBRARY;odbc32;odbccp32
CACHE STRING INTERNAL)
ENDIF (GEOS_LIBRARY)
ENDIF (MSVC)

ELSE(WIN32)

IF(UNIX)
IF(UNIX)

# try to use framework on mac
# want clean framework path, not unix compatibility path
@@ -80,7 +80,7 @@ ELSE(WIN32)
#MESSAGE("DBG GEOS_CONFIG ${GEOS_CONFIG}")

IF (GEOS_CONFIG)

EXEC_PROGRAM(${GEOS_CONFIG}
ARGS --version
OUTPUT_VARIABLE GEOS_VERSION)
@@ -90,34 +90,34 @@ ELSE(WIN32)
IF (GEOS_VERSION_MAJOR LESS 3)
MESSAGE (FATAL_ERROR "GEOS version is too old (${GEOS_VERSION}). Use 3.0.0 or higher.")
ENDIF (GEOS_VERSION_MAJOR LESS 3)

# set INCLUDE_DIR to prefix+include
EXEC_PROGRAM(${GEOS_CONFIG}
ARGS --prefix
OUTPUT_VARIABLE GEOS_PREFIX)

FIND_PATH(GEOS_INCLUDE_DIR
geos_c.h
FIND_PATH(GEOS_INCLUDE_DIR
geos_c.h
${GEOS_PREFIX}/include
/usr/local/include
/usr/include
/usr/local/include
/usr/include
)

## extract link dirs for rpath
## extract link dirs for rpath
EXEC_PROGRAM(${GEOS_CONFIG}
ARGS --libs
OUTPUT_VARIABLE GEOS_CONFIG_LIBS )

## split off the link dirs (for rpath)
## use regular expression to match wildcard equivalent "-L*<endchar>"
## with <endchar> is a space or a semicolon
STRING(REGEX MATCHALL "[-][L]([^ ;])+"
GEOS_LINK_DIRECTORIES_WITH_PREFIX
STRING(REGEX MATCHALL "[-][L]([^ ;])+"
GEOS_LINK_DIRECTORIES_WITH_PREFIX
"${GEOS_CONFIG_LIBS}" )
#MESSAGE("DBG GEOS_LINK_DIRECTORIES_WITH_PREFIX=${GEOS_LINK_DIRECTORIES_WITH_PREFIX}")

## remove prefix -L because we need the pure directory for LINK_DIRECTORIES

IF (GEOS_LINK_DIRECTORIES_WITH_PREFIX)
STRING(REGEX REPLACE "[-][L]" "" GEOS_LINK_DIRECTORIES ${GEOS_LINK_DIRECTORIES_WITH_PREFIX} )
ENDIF (GEOS_LINK_DIRECTORIES_WITH_PREFIX)
@@ -126,15 +126,15 @@ ELSE(WIN32)
## split off the name
## use regular expression to match wildcard equivalent "-l*<endchar>"
## with <endchar> is a space or a semicolon
#STRING(REGEX MATCHALL "[-][l]([^ ;])+"
# GEOS_LIB_NAME_WITH_PREFIX
#STRING(REGEX MATCHALL "[-][l]([^ ;])+"
# GEOS_LIB_NAME_WITH_PREFIX
# "${GEOS_CONFIG_LIBS}" )
#MESSAGE("DBG GEOS_CONFIG_LIBS=${GEOS_CONFIG_LIBS}")
#MESSAGE("DBG GEOS_LIB_NAME_WITH_PREFIX=${GEOS_LIB_NAME_WITH_PREFIX}")
SET(GEOS_LIB_NAME_WITH_PREFIX -lgeos_c CACHE STRING INTERNAL)

## remove prefix -l because we need the pure name

IF (GEOS_LIB_NAME_WITH_PREFIX)
STRING(REGEX REPLACE "[-][l]" "" GEOS_LIB_NAME ${GEOS_LIB_NAME_WITH_PREFIX} )
ENDIF (GEOS_LIB_NAME_WITH_PREFIX)
@@ -151,7 +151,7 @@ ELSE(WIN32)
SET(GEOS_LIBRARY ${GEOS_LINK_DIRECTORIES}/lib${GEOS_LIB_NAME}.so CACHE STRING INTERNAL)
ENDIF (APPLE)
#MESSAGE("DBG GEOS_LIBRARY=${GEOS_LIBRARY}")

ELSE(GEOS_CONFIG)
MESSAGE("FindGEOS.cmake: geos-config not found. Please set it manually. GEOS_CONFIG=${GEOS_CONFIG}")
ENDIF(GEOS_CONFIG)
@@ -15,11 +15,4 @@
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
City of Uster, Switzerland (11.2011)|http://gis.uster.ch/
Studio Associato Gfosservices|http://www.gfosservices.com
NEXTGIS|http://nextgis.org
See: http://qgis.org/en/sponsorship/sponsors.html for an updated list of sponsors.

Large diffs are not rendered by default.

0 comments on commit 9385ac9

Please sign in to comment.