Skip to content
Permalink
Browse files

merge from trunk r11600:11650

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11892 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder
wonder committed Nov 2, 2009
1 parent f289661 commit 74739565d2741d88ba7dbb2e30cfc709ec5bed0e
Showing with 12,834 additions and 3,396 deletions.
  1. +4 −4 CMakeLists.txt
  2. +6 −6 CONTRIBUTORS
  3. +3 −0 DONORS
  4. +90 −90 cmake/FindPostgres.cmake
  5. +50 −50 cmake/FindSqlite3.cmake
  6. +4 −2 debian/changelog
  7. +1 −1 debian/control
  8. +3 −0 debian/qgis-common.install
  9. +37 −12 doc/index.html
  10. +798 −654 i18n/qgis_de.ts
  11. +1,470 −749 i18n/qgis_pl_PL.ts
  12. +272 −267 i18n/qgis_uk.ts
  13. +7,994 −0 i18n/qt_uk.ts
  14. BIN images/splash/splash.png
  15. BIN images/splash/splash.xcf.bz2
  16. BIN images/splash/splash_mask.png
  17. BIN images/splash/web_banner.jpg
  18. BIN images/splash/web_banner.xcf.bz2
  19. +24 −24 images/svg/CMakeLists.txt
  20. +9 −9 images/themes/default/CMakeLists.txt
  21. +15 −3 mac/xcode/Qgis.xcodeproj/project.pbxproj
  22. +3 −3 mac/xcode/qgis_settings.xcconfig
  23. +7 −5 ms-windows/QGIS-Installer.nsi
  24. +1 −0 ms-windows/osgeo4w/package.cmd
  25. +5 −0 ms-windows/osgeo4w/postinstall.bat
  26. +19 −0 ms-windows/osgeo4w/qgis-dev.reg.tmpl
  27. +72 −72 python/core/qgsdatasourceuri.sip
  28. +72 −72 python/core/qgsproviderregistry.sip
  29. +13 −3 python/plugins/osm/OsmAddRelationDlg.py
  30. +73 −26 python/plugins/osm/OsmDatabaseManager.py
  31. +18 −10 python/plugins/osm/OsmFeatureDW.py
  32. +3 −4 python/plugins/osm/OsmLoadDlg.py
  33. +30 −0 python/plugins/osm/OsmPlugin.py
  34. +208 −59 python/plugins/osm/OsmSaveDlg.py
  35. +1 −1 python/plugins/osm/OsmUndoRedoDW.py
  36. +2 −2 python/plugins/osm/OsmUploadDlg.py
  37. +2 −3 python/plugins/osm/__init__.py
  38. BIN python/plugins/osm/images/osm_clearUndoRedo.png
  39. BIN python/plugins/osm/images/osm_generateTags.png
  40. BIN python/plugins/osm/images/osm_identify.png
  41. BIN python/plugins/osm/images/osm_move.png
  42. BIN python/plugins/osm/images/osm_questionMark.png
  43. BIN python/plugins/osm/images/osm_removeFeat.png
  44. BIN python/plugins/osm/images/osm_removeMember.png
  45. BIN python/plugins/osm/images/osm_removeTag.png
  46. BIN python/plugins/osm/images/osm_urDetails.png
  47. +13 −1 python/plugins/osm/resources.qrc
  48. +57 −29 python/plugins/osm/styles/big_scale.style
  49. +62 −37 python/plugins/osm/styles/medium_scale.style
  50. +60 −20 python/plugins/osm/styles/small_scale.style
  51. +50 −5 python/plugins/osm/ui_files/OsmAddRelationDlg.ui
  52. +40 −13 python/plugins/osm/ui_files/OsmFeatureDW.ui
  53. +10 −10 src/CMakeLists.txt
  54. +1 −1 src/analysis/CMakeLists.txt
  55. +155 −0 src/analysis/vector/qgsgeometryanalyzer.cpp
  56. +46 −27 src/analysis/vector/qgsgeometryanalyzer.h
  57. +3 −3 src/app/attributetable/qgsattributetabledialog.cpp
  58. +8 −7 src/app/composer/qgscomposermapwidget.cpp
  59. +31 −108 src/app/qgisapp.cpp
  60. +43 −54 src/app/qgsabout.cpp
  61. +0 −1 src/app/qgsabout.h
  62. +66 −10 src/app/qgsidentifyresults.cpp
  63. +3 −0 src/app/qgsidentifyresults.h
  64. +2 −0 src/app/qgsoptions.cpp
  65. +7 −0 src/core/qgsapplication.cpp
  66. +6 −0 src/core/qgsapplication.h
  67. +97 −97 src/plugins/evis/CMakeLists.txt
  68. 0 src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialogbase.h
  69. +0 −162 src/plugins/raster_terrain_analysis/ui_qgsrasterterrainanalysisdialogbase.h
  70. +18 −18 src/providers/CMakeLists.txt
  71. +3 −12 src/providers/osm/osmhandler.cpp
  72. +50 −44 src/providers/osm/osmprovider.cpp
  73. +4 −3 src/providers/osm/osmprovider.h
  74. +5 −0 src/python/qgspythonutilsimpl.cpp
  75. +163 −159 src/ui/qgsabout.ui
  76. +522 −444 src/ui/qgsoptionsbase.ui
@@ -1,12 +1,12 @@
SET(CPACK_PACKAGE_VERSION_MAJOR "1")
SET(CPACK_PACKAGE_VERSION_MINOR "3")
SET(CPACK_PACKAGE_VERSION_MINOR "4")
SET(CPACK_PACKAGE_VERSION_PATCH "0")
SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
SET(RELEASE_NAME "Unstable")
SET(RELEASE_NAME "Trunk")
SET(PROJECT_VERSION ${COMPLETE_VERSION})
PROJECT(qgis${PROJECT_VERSION})
# Note the version no is Mmmpp for Major/minor/patch, 0-padded, thus '10100' for 1.1.0
SET(QGIS_VERSION_INT 10300)
SET(QGIS_VERSION_INT 10400)

# TODO:
# - install includes for libs
@@ -395,7 +395,7 @@ ENDIF (ENABLE_TESTS)
#############################################################
# install stuff

INSTALL (FILES AUTHORS SPONSORS DONORS TRANSLATORS INSTALL CODING
INSTALL (FILES AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS INSTALL CODING
DESTINATION ${QGIS_DATA_DIR}/doc)

# manual page - makes sense only on unix systems
@@ -1,7 +1,9 @@
The following people have submitted code, patches, graphics, comments,
feedback, reviews and/or many other things that have aided the development of
QGIS:

# This file will be used to populate the contributors tab in the about dialog
# Lines prefixed with # will be ignored
# The following people have submitted code, patches, graphics, comments,
# feedback, reviews and/or many other things that have aided the development of
# QGIS:
#
Arthur Nanni
Baba Yoshihiko
Brent Wood
@@ -17,12 +19,10 @@ Hyao (IRC nickname)
Ivan Lucena
Jean-Denis Giguere
Jerrit Collord
Jürgen E. Fischer
Magnus Homann
Markus Neteler
Maurizio Napolitano
Paul Ramsey
Peter Ersts
Richard Kostecky
Stefanie Tellex
Tom Russo
3 DONORS
@@ -24,8 +24,10 @@ Carl Nelson
D R Arbib
David Enns|http://www.mapitout.com/
Ecotrust|http://www.ecotrust.org/
Emanuele Zamprogno
Ferdinando Urbano
Flavio Rigolon
FOSSGIS e.V.|http://www.fossgis.de/
Fred Watchorn
Glasic S.r.l.|http://www.glasic.it/
Ivan Marchesini|http://www.gfosservices.it/
@@ -34,6 +36,7 @@ Jaroslaw Kowalczyk
Jason Jorgenson
John C. Tull|http://www.wildnevada.org
John Dean
Jorge Pinto
Kanton Solothurn SOGIS
Kevin Shook
Laura Burnette
@@ -1,90 +1,90 @@

# CMake module to search for PostgreSQL library
#
# pg_config is searched for in POSTGRES_CONFIG dir,
# default /usr/bin
#
# If it's found it sets POSTGRES_FOUND to TRUE
# and following variables are set:
# POSTGRES_INCLUDE_DIR
# POSTGRES_LIBRARY

IF(WIN32)
IF (NOT POSTGRES_INCLUDE_DIR)
FIND_PATH(POSTGRES_INCLUDE_DIR libpq-fe.h
/usr/local/include
/usr/include
c:/msys/local/include
"$ENV{LIB_DIR}/include/postgresql"
"$ENV{LIB_DIR}/include"
)
ENDIF (NOT POSTGRES_INCLUDE_DIR)

IF (NOT POSTGRES_LIBRARY)
FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq libpq libpqdll PATHS
/usr/local/lib
/usr/lib
c:/msys/local/lib
"$ENV{LIB_DIR}/lib"
)
ENDIF (NOT POSTGRES_LIBRARY)

ELSE(WIN32)
IF(UNIX)

SET(POSTGRES_CONFIG_PREFER_PATH "$ENV{POSTGRES_HOME}/bin" CACHE STRING "preferred path to PG (pg_config)")
FIND_PROGRAM(POSTGRES_CONFIG pg_config
${POSTGRES_CONFIG_PREFER_PATH}
/usr/bin/
)
# MESSAGE("DBG POSTGRES_CONFIG ${POSTGRES_CONFIG}")

IF (POSTGRES_CONFIG)
# set INCLUDE_DIR
EXEC_PROGRAM(${POSTGRES_CONFIG}
ARGS --includedir
OUTPUT_VARIABLE PG_TMP)
SET(POSTGRES_INCLUDE_DIR ${PG_TMP} CACHE STRING INTERNAL)

# set LIBRARY_DIR
EXEC_PROGRAM(${POSTGRES_CONFIG}
ARGS --libdir
OUTPUT_VARIABLE PG_TMP)
IF (APPLE)
SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.dylib CACHE STRING INTERNAL)
ELSE (APPLE)
SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.so CACHE STRING INTERNAL)
ENDIF (APPLE)
ENDIF(POSTGRES_CONFIG)

ENDIF(UNIX)
ENDIF(WIN32)

IF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
SET(POSTGRES_FOUND TRUE)
IF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
SET(HAVE_PGCONFIG TRUE)
ELSE(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
SET(HAVE_PGCONFIG FALSE)
ENDIF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
ENDIF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)


IF (POSTGRES_FOUND)

IF (NOT POSTGRES_FIND_QUIETLY)
MESSAGE(STATUS "Found PostgreSQL: ${POSTGRES_LIBRARY}")
ENDIF (NOT POSTGRES_FIND_QUIETLY)

ELSE (POSTGRES_FOUND)

#SET (POSTGRES_INCLUDE_DIR "")
#SET (POSTGRES_LIBRARY "")

IF (POSTGRES_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find PostgreSQL")
ELSE (POSTGRES_FIND_REQUIRED)
MESSAGE(STATUS "Could not find PostgreSQL")
ENDIF (POSTGRES_FIND_REQUIRED)

ENDIF (POSTGRES_FOUND)

# CMake module to search for PostgreSQL library
#
# pg_config is searched for in POSTGRES_CONFIG dir,
# default /usr/bin
#
# If it's found it sets POSTGRES_FOUND to TRUE
# and following variables are set:
# POSTGRES_INCLUDE_DIR
# POSTGRES_LIBRARY

IF(WIN32)
IF (NOT POSTGRES_INCLUDE_DIR)
FIND_PATH(POSTGRES_INCLUDE_DIR libpq-fe.h
/usr/local/include
/usr/include
c:/msys/local/include
"$ENV{LIB_DIR}/include/postgresql"
"$ENV{LIB_DIR}/include"
)
ENDIF (NOT POSTGRES_INCLUDE_DIR)

IF (NOT POSTGRES_LIBRARY)
FIND_LIBRARY(POSTGRES_LIBRARY NAMES pq libpq libpqdll PATHS
/usr/local/lib
/usr/lib
c:/msys/local/lib
"$ENV{LIB_DIR}/lib"
)
ENDIF (NOT POSTGRES_LIBRARY)

ELSE(WIN32)
IF(UNIX)

SET(POSTGRES_CONFIG_PREFER_PATH "$ENV{POSTGRES_HOME}/bin" CACHE STRING "preferred path to PG (pg_config)")
FIND_PROGRAM(POSTGRES_CONFIG pg_config
${POSTGRES_CONFIG_PREFER_PATH}
/usr/bin/
)
# MESSAGE("DBG POSTGRES_CONFIG ${POSTGRES_CONFIG}")

IF (POSTGRES_CONFIG)
# set INCLUDE_DIR
EXEC_PROGRAM(${POSTGRES_CONFIG}
ARGS --includedir
OUTPUT_VARIABLE PG_TMP)
SET(POSTGRES_INCLUDE_DIR ${PG_TMP} CACHE STRING INTERNAL)

# set LIBRARY_DIR
EXEC_PROGRAM(${POSTGRES_CONFIG}
ARGS --libdir
OUTPUT_VARIABLE PG_TMP)
IF (APPLE)
SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.dylib CACHE STRING INTERNAL)
ELSE (APPLE)
SET(POSTGRES_LIBRARY ${PG_TMP}/libpq.so CACHE STRING INTERNAL)
ENDIF (APPLE)
ENDIF(POSTGRES_CONFIG)

ENDIF(UNIX)
ENDIF(WIN32)

IF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)
SET(POSTGRES_FOUND TRUE)
IF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
SET(HAVE_PGCONFIG TRUE)
ELSE(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
SET(HAVE_PGCONFIG FALSE)
ENDIF(EXISTS "${POSTGRES_INCLUDE_DIR}/pg_config.h")
ENDIF (POSTGRES_INCLUDE_DIR AND POSTGRES_LIBRARY)


IF (POSTGRES_FOUND)

IF (NOT POSTGRES_FIND_QUIETLY)
MESSAGE(STATUS "Found PostgreSQL: ${POSTGRES_LIBRARY}")
ENDIF (NOT POSTGRES_FIND_QUIETLY)

ELSE (POSTGRES_FOUND)

#SET (POSTGRES_INCLUDE_DIR "")
#SET (POSTGRES_LIBRARY "")

IF (POSTGRES_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find PostgreSQL")
ELSE (POSTGRES_FIND_REQUIRED)
MESSAGE(STATUS "Could not find PostgreSQL")
ENDIF (POSTGRES_FIND_REQUIRED)

ENDIF (POSTGRES_FOUND)
@@ -1,50 +1,50 @@

# CMake module to search for Sqlite3 library
#
# If it's found it sets SQLITE3_FOUND to TRUE
# and following variables are set:
# SQLITE3_INCLUDE_DIR
# SQLITE3_LIBRARY


# FIND_PATH and FIND_LIBRARY normally search standard locations
# before the specified paths. To search non-standard paths first,
# FIND_* is invoked first with specified paths and NO_DEFAULT_PATH
# and then again with no specified paths to search the default
# locations. When an earlier FIND_* succeeds, subsequent FIND_*s
# searching for the same item do nothing.
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)

FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 sqlite3_i PATHS
"$ENV{LIB_DIR}/lib"
#mingw
c:/msys/local/lib
NO_DEFAULT_PATH
)
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)

ELSE (SQLITE3_FOUND)

IF (SQLITE3_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find Sqlite3")
ENDIF (SQLITE3_FIND_REQUIRED)

ENDIF (SQLITE3_FOUND)

# CMake module to search for Sqlite3 library
#
# If it's found it sets SQLITE3_FOUND to TRUE
# and following variables are set:
# SQLITE3_INCLUDE_DIR
# SQLITE3_LIBRARY


# FIND_PATH and FIND_LIBRARY normally search standard locations
# before the specified paths. To search non-standard paths first,
# FIND_* is invoked first with specified paths and NO_DEFAULT_PATH
# and then again with no specified paths to search the default
# locations. When an earlier FIND_* succeeds, subsequent FIND_*s
# searching for the same item do nothing.
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)

FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 sqlite3_i PATHS
"$ENV{LIB_DIR}/lib"
#mingw
c:/msys/local/lib
NO_DEFAULT_PATH
)
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)

ELSE (SQLITE3_FOUND)

IF (SQLITE3_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find Sqlite3")
ENDIF (SQLITE3_FIND_REQUIRED)

ENDIF (SQLITE3_FOUND)
@@ -1,10 +1,12 @@
qgis (1.3.0) UNRELEASED; urgency=low

* new development version after 1.2 branch
* new upstream release
* add analysis library and raster terrain analysis plugin
* alternativly depend on libgdal1-1.6.0-grass
* include CONTRIBUTORS, TRANSLATORS and DONORS
* reverse order of libgdal1-*-grass dependencies

-- Jürgen E. Fischer <jef@norbit.de> Sat, 05 Sep 2009 17:45:21 +0200
-- Jürgen E. Fischer <jef@norbit.de> Sat, 12 Sep 2009 22:09:18 +0200

qgis (1.2.0) UNRELEASED; urgency=low

@@ -70,7 +70,7 @@ Description: Quantum GIS - development files

Package: qgis-plugin-grass
Architecture: any
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.4.0-grass | libgdal1-1.5.0-grass | libgdal1-1.6.0-grass
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.6.0-grass | libgdal1-1.5.0-grass | libgdal1-1.4.0-grass
Description: GRASS plugin for Quantum GIS
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -4,6 +4,9 @@ usr/share/qgis/doc/index.html
usr/share/qgis/doc/qgisdoc.css
usr/share/qgis/doc/AUTHORS
usr/share/qgis/doc/SPONSORS
usr/share/qgis/doc/CONTRIBUTORS
usr/share/qgis/doc/TRANSLATORS
usr/share/qgis/doc/DONORS
usr/share/qgis/doc/images
usr/share/qgis/i18n/*
usr/share/qgis/images/*

0 comments on commit 7473956

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