Skip to content
Permalink
Browse files

merge from trunk r11800:11850

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11900 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder
wonder committed Nov 2, 2009
1 parent daf2b0f commit 2f04214646a4a42d3c5c850245937b0644d71289
Showing with 7,677 additions and 6,077 deletions.
  1. +117 −117 i18n/qgis_nl.ts
  2. +65 −65 i18n/qgis_pl_PL.ts
  3. +4,695 −4,660 i18n/qgis_th.ts
  4. BIN images/splash/splash.xcf.bz2
  5. +18 −4 mac/xcode/Qgis.xcodeproj/project.pbxproj
  6. +5 −2 ms-windows/QGIS-Installer.nsi
  7. +4 −0 ms-windows/plugins.nsh
  8. +9 −5 ms-windows/ui.nsh
  9. +11 −6 python/core/qgis.sip
  10. +126 −0 python/core/qgscomposermap.sip
  11. +7 −0 python/core/qgsmaplayer.sip
  12. +8 −0 python/core/qgsmaplayerregistry.sip
  13. +8 −0 python/core/qgspoint.sip
  14. +2 −0 src/app/CMakeLists.txt
  15. +18 −2 src/app/attributetable/qgsattributetabledialog.cpp
  16. +4 −0 src/app/attributetable/qgsattributetabledialog.h
  17. +2 −0 src/app/composer/qgscomposer.cpp
  18. +77 −12 src/app/composer/qgscomposermapwidget.cpp
  19. +8 −4 src/app/composer/qgscomposermapwidget.h
  20. +14 −11 src/app/composer/qgscomposerpicturewidget.cpp
  21. +2 −2 src/app/composer/qgscompositionwidget.h
  22. +1 −1 src/app/legend/qgslegendlayerfile.cpp
  23. +54 −6 src/app/qgisapp.cpp
  24. +9 −4 src/app/qgsattributetypedialog.cpp
  25. +60 −0 src/app/qgsavoidintersectionsdialog.cpp
  26. +21 −0 src/app/qgsavoidintersectionsdialog.h
  27. +14 −0 src/app/qgsfieldcalculator.cpp
  28. +4 −4 src/app/qgsgraduatedsymboldialog.cpp
  29. +64 −8 src/app/qgsmaptooladdfeature.cpp
  30. +5 −0 src/app/qgsmaptooladdfeature.h
  31. +2 −0 src/app/qgsmeasuredialog.cpp
  32. +62 −0 src/app/qgsoptions.cpp
  33. +12 −0 src/app/qgsoptions.h
  34. +37 −9 src/app/qgsprojectproperties.cpp
  35. +9 −1 src/app/qgsprojectproperties.h
  36. +3 −0 src/app/qgsrasterlayerproperties.cpp
  37. +1 −1 src/app/qgsspatialitesourceselect.cpp
  38. +0 −38 src/app/qgstable.h
  39. +20 −17 src/app/qgsuniquevaluedialog.cpp
  40. +4 −1 src/app/qgsvectorlayerproperties.cpp
  41. +2 −2 src/app/qgswmssourceselect.cpp
  42. +1 −0 src/core/CMakeLists.txt
  43. +14 −9 src/core/composer/qgscomposeritem.cpp
  44. +5 −2 src/core/composer/qgscomposeritem.h
  45. +528 −193 src/core/composer/qgscomposermap.cpp
  46. +99 −13 src/core/composer/qgscomposermap.h
  47. +1 −0 src/core/composer/qgscomposition.cpp
  48. +4 −0 src/core/composer/qgscomposition.h
  49. +10 −5 src/core/qgis.h
  50. +27 −2 src/core/qgsapplication.cpp
  51. +6 −1 src/core/qgsapplication.h
  52. +6 −7 src/core/qgsgeometry.cpp
  53. +16 −1 src/core/qgsmaplayer.cpp
  54. +14 −0 src/core/qgsmaplayer.h
  55. +10 −0 src/core/qgsmaplayerregistry.cpp
  56. +7 −0 src/core/qgsmaplayerregistry.h
  57. +117 −20 src/core/qgsmaprenderer.cpp
  58. +7 −0 src/core/qgsmaprenderer.h
  59. +26 −0 src/core/qgspoint.cpp
  60. +8 −0 src/core/qgspoint.h
  61. +11 −1 src/core/qgsscalecalculator.cpp
  62. +3 −6 src/core/qgssearchtreenode.cpp
  63. +6 −0 src/core/qgsvectorlayer.cpp
  64. +33 −15 src/core/symbology/qgsmarkercatalogue.cpp
  65. +38 −27 src/core/symbology/qgssymbol.cpp
  66. +6 −4 src/providers/ogr/qgsogrprovider.cpp
  67. +107 −89 src/ui/qgsattributetabledialog.ui
  68. +66 −0 src/ui/qgsavoidintersectionsdialogbase.ui
  69. +41 −40 src/ui/qgscomposeritemwidgetbase.ui
  70. +201 −210 src/ui/qgscomposermapwidgetbase.ui
  71. +6 −0 src/ui/qgslabeldialogbase.ui
  72. +149 −87 src/ui/qgsoptionsbase.ui
  73. +164 −171 src/ui/qgsprojectpropertiesbase.ui
  74. +197 −192 src/ui/qgssinglesymboldialogbase.ui
  75. +22 −0 tests/src/core/CMakeLists.txt
  76. +137 −0 tests/src/core/testqgspoint.cpp

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

BIN -1.3 MB (55%) images/splash/splash.xcf.bz2
Binary file not shown.
@@ -189,6 +189,7 @@
720383800F8BA8C50083B883 /* priorityqueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382F70F8B8B540083B883 /* priorityqueue.cpp */; };
720383810F8BA8C50083B883 /* problem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382F90F8B8B540083B883 /* problem.cpp */; };
720383820F8BA8C50083B883 /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 720382FD0F8B8B540083B883 /* util.cpp */; };
72038CA310893F3100439C44 /* qgscomposition.h in Sources */ = {isa = PBXBuildFile; fileRef = 7209E6730F39E57A003DC336 /* qgscomposition.h */; };
7209F03B0F39E6A1003DC336 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7209F03A0F39E6A1003DC336 /* ApplicationServices.framework */; };
7209F1D70F39EA3E003DC336 /* qgsprovidercountcalcevent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209E6B90F39E57A003DC336 /* qgsprovidercountcalcevent.cpp */; };
7209F1D80F39EA3E003DC336 /* qgsprovidermetadata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7209E6BD0F39E57A003DC336 /* qgsprovidermetadata.cpp */; };
@@ -580,6 +581,8 @@
72267A4E0F9A1D1D00010C18 /* mActionZoomNext.png in Copy - theme-gis */ = {isa = PBXBuildFile; fileRef = 72267A4D0F9A1D1400010C18 /* mActionZoomNext.png */; };
72267A510F9A1D3D00010C18 /* mActionZoomNext.png in Copy - theme-nkids */ = {isa = PBXBuildFile; fileRef = 72267A500F9A1D3100010C18 /* mActionZoomNext.png */; };
723FD05F0FBCB87900EFA55D /* qgspalgeometry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 723FD05D0FBCB85D00EFA55D /* qgspalgeometry.cpp */; };
72442AEB1095DD4C00B54796 /* qgsavoidintersectionsdialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 72442AE91095DCFC00B54796 /* qgsavoidintersectionsdialog.cpp */; };
72442AEC1095DD4C00B54796 /* qgsavoidintersectionsdialog.h in Sources */ = {isa = PBXBuildFile; fileRef = 72442AEA1095DCFC00B54796 /* qgsavoidintersectionsdialog.h */; };
724C9FE21019EE0000A1E1D4 /* mActionSaveAsPDF.png in Copy - theme-default */ = {isa = PBXBuildFile; fileRef = 724C9FE11019EDE700A1E1D4 /* mActionSaveAsPDF.png */; };
724C9FED1019EE3700A1E1D4 /* mActionSaveAsPDF.png in Copy - theme-gis */ = {isa = PBXBuildFile; fileRef = 724C9FEC1019EE2500A1E1D4 /* mActionSaveAsPDF.png */; };
7256F2D70F4146AC0022BE1F /* qgis_new_80pct.png in Copy - doc-images */ = {isa = PBXBuildFile; fileRef = 7209F0190F39E5DA003DC336 /* qgis_new_80pct.png */; };
@@ -4015,6 +4018,7 @@
720383580F8B905D0083B883 /* libdiagramoverlayplugin.so */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = libdiagramoverlayplugin.so; sourceTree = BUILT_PRODUCTS_DIR; };
7203835A0F8B90B50083B883 /* qgsapplydialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsapplydialog.h; path = ../../src/plugins/qgsapplydialog.h; sourceTree = SOURCE_ROOT; };
7203835B0F8B90B50083B883 /* qgsvectoroverlayplugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsvectoroverlayplugin.h; path = ../../src/plugins/qgsvectoroverlayplugin.h; sourceTree = SOURCE_ROOT; };
72038CA210893EA900439C44 /* testqgscoordinatereferencesystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testqgscoordinatereferencesystem.cpp; path = ../../tests/src/core/testqgscoordinatereferencesystem.cpp; sourceTree = SOURCE_ROOT; };
7209E56E0F39E477003DC336 /* qgis_settings.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = qgis_settings.xcconfig; sourceTree = SOURCE_ROOT; };
7209E56F0F39E481003DC336 /* qgis_user.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = qgis_user.xcconfig; sourceTree = SOURCE_ROOT; };
7209E5BC0F39E57A003DC336 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = ../../src/app/CMakeLists.txt; sourceTree = SOURCE_ROOT; };
@@ -4169,7 +4173,6 @@
7209E6580F39E57A003DC336 /* qgssinglesymboldialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgssinglesymboldialog.h; path = ../../src/app/qgssinglesymboldialog.h; sourceTree = SOURCE_ROOT; };
7209E6590F39E57A003DC336 /* qgssnappingdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgssnappingdialog.cpp; path = ../../src/app/qgssnappingdialog.cpp; sourceTree = SOURCE_ROOT; };
7209E65A0F39E57A003DC336 /* qgssnappingdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgssnappingdialog.h; path = ../../src/app/qgssnappingdialog.h; sourceTree = SOURCE_ROOT; };
7209E65B0F39E57A003DC336 /* qgstable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgstable.h; path = ../../src/app/qgstable.h; sourceTree = SOURCE_ROOT; };
7209E65C0F39E57A003DC336 /* qgsuniquevaluedialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsuniquevaluedialog.cpp; path = ../../src/app/qgsuniquevaluedialog.cpp; sourceTree = SOURCE_ROOT; };
7209E65D0F39E57A003DC336 /* qgsuniquevaluedialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsuniquevaluedialog.h; path = ../../src/app/qgsuniquevaluedialog.h; sourceTree = SOURCE_ROOT; };
7209E65E0F39E57A003DC336 /* qgsvectorlayerproperties.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsvectorlayerproperties.cpp; path = ../../src/app/qgsvectorlayerproperties.cpp; sourceTree = SOURCE_ROOT; };
723FD05E0FBCB85D00EFA55D /* qgspalgeometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgspalgeometry.h; path = ../../src/core/qgspalgeometry.h; sourceTree = SOURCE_ROOT; };
723FD0660FBCB94600EFA55D /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CMakeLists.txt; path = ../../src/plugins/grass/scripts/CMakeLists.txt; sourceTree = SOURCE_ROOT; };
723FD0670FBCB94600EFA55D /* db.connect-login.pg.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = "db.connect-login.pg.py"; path = "../../src/plugins/grass/scripts/db.connect-login.pg.py"; sourceTree = SOURCE_ROOT; };
72442AE71095DCAF00B54796 /* testqgspoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testqgspoint.cpp; path = ../../tests/src/core/testqgspoint.cpp; sourceTree = SOURCE_ROOT; };
72442AE81095DCD800B54796 /* qgsavoidintersectionsdialogbase.ui */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = qgsavoidintersectionsdialogbase.ui; path = ../../src/ui/qgsavoidintersectionsdialogbase.ui; sourceTree = SOURCE_ROOT; };
72442AE91095DCFC00B54796 /* qgsavoidintersectionsdialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qgsavoidintersectionsdialog.cpp; path = ../../src/app/qgsavoidintersectionsdialog.cpp; sourceTree = SOURCE_ROOT; };
72442AEA1095DCFC00B54796 /* qgsavoidintersectionsdialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qgsavoidintersectionsdialog.h; path = ../../src/app/qgsavoidintersectionsdialog.h; sourceTree = SOURCE_ROOT; };
724C9FE11019EDE700A1E1D4 /* mActionSaveAsPDF.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionSaveAsPDF.png; path = ../../images/themes/default/mActionSaveAsPDF.png; sourceTree = SOURCE_ROOT; };
724C9FEC1019EE2500A1E1D4 /* mActionSaveAsPDF.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = mActionSaveAsPDF.png; path = ../../images/themes/gis/mActionSaveAsPDF.png; sourceTree = SOURCE_ROOT; };
7256F2DC0F4147890022BE1F /* TODO */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = TODO; path = ../../TODO; sourceTree = SOURCE_ROOT; };
72D0A537101896AA00EE6279 /* qgsattributetypeloaddialog.cpp */,
72D0A538101896AA00EE6279 /* qgsattributetypedialog.h */,
72D0A539101896AA00EE6279 /* qgsattributetypedialog.cpp */,
72442AE91095DCFC00B54796 /* qgsavoidintersectionsdialog.cpp */,
72442AEA1095DCFC00B54796 /* qgsavoidintersectionsdialog.h */,
7209E5FB0F39E57A003DC336 /* qgsbookmarkitem.cpp */,
7209E5FC0F39E57A003DC336 /* qgsbookmarkitem.h */,
7209E5FD0F39E57A003DC336 /* qgsbookmarks.cpp */,
7209E6580F39E57A003DC336 /* qgssinglesymboldialog.h */,
7209E6590F39E57A003DC336 /* qgssnappingdialog.cpp */,
7209E65A0F39E57A003DC336 /* qgssnappingdialog.h */,
7209E65B0F39E57A003DC336 /* qgstable.h */,
7209E65C0F39E57A003DC336 /* qgsuniquevaluedialog.cpp */,
7209E65D0F39E57A003DC336 /* qgsuniquevaluedialog.h */,
7209E65E0F39E57A003DC336 /* qgsvectorlayerproperties.cpp */,
7209EC8D0F39E57B003DC336 /* qgsattributedialogbase.ui */,
72D0A53F1018975800EE6279 /* qgsattributetypeedit.ui */,
72D0A5401018975800EE6279 /* qgsattributeloadfrommap.ui */,
72442AE81095DCD800B54796 /* qgsavoidintersectionsdialogbase.ui */,
7209EC8F0F39E57B003DC336 /* qgsbookmarksbase.ui */,
7209EC900F39E57B003DC336 /* qgscomposerbase.ui */,
7209EC910F39E57B003DC336 /* qgscomposeritemwidgetbase.ui */,
7209ECE70F39E5D8003DC336 /* test_suite_builder.sh */,
7209ECE80F39E5D8003DC336 /* test_template.cpp */,
7209ECE90F39E5D8003DC336 /* testcontrastenhancements.cpp */,
72038CA210893EA900439C44 /* testqgscoordinatereferencesystem.cpp */,
7209ECEA0F39E5D8003DC336 /* testqgsapplication.cpp */,
7209ECEB0F39E5D8003DC336 /* testqgsgeometry.cpp */,
7209ECEC0F39E5D8003DC336 /* testqgsmaplayer.cpp */,
7209ECED0F39E5D8003DC336 /* testqgsmaprenderer.cpp */,
72442AE71095DCAF00B54796 /* testqgspoint.cpp */,
7209ECEE0F39E5D8003DC336 /* testqgsrasterlayer.cpp */,
7209ECEF0F39E5D8003DC336 /* testqgsrenderers.cpp */,
7209ECF00F39E5D8003DC336 /* testqgsvectorfilewriter.cpp */,
729287460F71C2CB006D9489 /* qgscomposermap.h in Sources */,
729287470F71C2CB006D9489 /* qgscomposerpicture.h in Sources */,
729287480F71C2CB006D9489 /* qgscomposerscalebar.h in Sources */,
72038CA310893F3100439C44 /* qgscomposition.h in Sources */,
729287490F71C2CB006D9489 /* qgscontexthelp.h in Sources */,
7292874A0F71C2CB006D9489 /* qgscoordinatetransform.h in Sources */,
7292874B0F71C2CB006D9489 /* qgsdataprovider.h in Sources */,
727E6B150FEAA14C00DF6F64 /* x_qgsspatialitesourceselect.h in Sources */,
72AA0BE9107394D900D00B43 /* qgsfieldcalculator.cpp in Sources */,
72AA0BEA107394D900D00B43 /* qgsfieldcalculator.h in Sources */,
72442AEB1095DD4C00B54796 /* qgsavoidintersectionsdialog.cpp in Sources */,
72442AEC1095DD4C00B54796 /* qgsavoidintersectionsdialog.h in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
COPY_PHASE_STRIP = NO;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
QGIS_VERSION_BUILD = 20090930;
QGIS_VERSION_BUILD = 20091026;
STRIP_INSTALLED_PRODUCT = NO;
};
name = Debug;
buildSettings = {
COPY_PHASE_STRIP = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
QGIS_VERSION_BUILD = 20090930;
QGIS_VERSION_BUILD = 20091026;
STRIP_INSTALLED_PRODUCT = YES;
};
name = Release;
@@ -15,8 +15,8 @@

;Version variables

!define RELEASE_VERSION_NUMBER "1.3.0"
!define RELEASE_VERSION_NAME "Mimas"
!define RELEASE_VERSION_NUMBER "1.4.0"
!define RELEASE_VERSION_NAME "Trunk-Test-Build"
!define RELEASE_SVN_REVISION "11639"
!define RELEASE_BINARY_REVISION "0"

@@ -27,6 +27,9 @@

; Added by Tim to get optimal compression
SetCompressor /SOLID lzma
; Added by Tim to allow priveledge elevation in vista
RequestExecutionLevel admin

;----------------------------------------------------------------------------------------------------------------------------

;Don't modify the following lines
@@ -22,5 +22,9 @@ WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\Plugins" "scalebarplugin
WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\Plugins" "spitplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\Plugins" "wfsplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\Plugins" "grassplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\Plugins" "diagramoverlay" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\Plugins" "oracleplugin" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\Plugins" "evis" "true"
WriteRegStr HKEY_CURRENT_USER "Software\QuantumGIS\QGIS\Plugins" "rasterterrainplugin" "true"

############################### reg2nsis end #################################

0 comments on commit 2f04214

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