Showing with 8,153 additions and 1,578 deletions.
  1. +513 −417 i18n/qgis_de.ts
  2. +2 −2 python/core/qgscomposeritem.sip
  3. +125 −25 python/core/symbology-ng-core.sip
  4. +0 −2 python/gui/symbology-ng-gui.sip
  5. +1 −1 python/plugins/fTools/tools/doPointsInPolygon.py
  6. +3 −3 src/analysis/vector/qgszonalstatistics.cpp
  7. +3 −3 src/app/composer/qgscomposeritemwidget.cpp
  8. +2 −1 src/app/qgisapp.cpp
  9. +1 −1 src/app/qgsattributeactiondialog.cpp
  10. +1 −1 src/app/qgsfieldcalculator.cpp
  11. +1 −1 src/app/qgslabelinggui.cpp
  12. +24 −13 src/app/qgsmaptoolfeatureaction.cpp
  13. +72 −35 src/app/qgsmaptoolrotatepointsymbols.cpp
  14. +1 −1 src/app/qgsmaptoolrotatepointsymbols.h
  15. +31 −8 src/app/qgsvectorlayerproperties.cpp
  16. +3 −4 src/core/composer/qgscomposeritem.h
  17. +11 −8 src/core/qgsattributeaction.cpp
  18. +17 −0 src/core/qgscoordinatereferencesystem.cpp
  19. +9 −0 src/core/qgscoordinatereferencesystem.h
  20. +585 −0 src/core/qgsexpression.cpp
  21. +39 −0 src/core/qgsexpression.h
  22. +5 −3 src/core/qgsexpressionlexer.ll
  23. +139 −0 src/core/qgsmaplayer.cpp
  24. +7 −0 src/core/qgsmaplayer.h
  25. +53 −3 src/core/qgsvectorlayer.cpp
  26. +2 −0 src/core/qgsvectorlayer.h
  27. +47 −0 src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
  28. +9 −0 src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
  29. +113 −0 src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
  30. +4 −0 src/core/symbology-ng/qgsellipsesymbollayerv2.h
  31. +291 −0 src/core/symbology-ng/qgsfillsymbollayerv2.cpp
  32. +16 −0 src/core/symbology-ng/qgsfillsymbollayerv2.h
  33. +46 −0 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
  34. +9 −0 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
  35. +253 −0 src/core/symbology-ng/qgslinesymbollayerv2.cpp
  36. +9 −0 src/core/symbology-ng/qgslinesymbollayerv2.h
  37. +201 −2 src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
  38. +9 −0 src/core/symbology-ng/qgsmarkersymbollayerv2.h
  39. +30 −5 src/core/symbology-ng/qgspointdisplacementrenderer.cpp
  40. +5 −1 src/core/symbology-ng/qgspointdisplacementrenderer.h
  41. +120 −3 src/core/symbology-ng/qgsrendererv2.cpp
  42. +64 −10 src/core/symbology-ng/qgsrendererv2.h
  43. +6 −2 src/core/symbology-ng/qgsrendererv2registry.cpp
  44. +23 −1 src/core/symbology-ng/qgsrendererv2registry.h
  45. +616 −211 src/core/symbology-ng/qgsrulebasedrendererv2.cpp
  46. +133 −32 src/core/symbology-ng/qgsrulebasedrendererv2.h
  47. +83 −0 src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
  48. +8 −0 src/core/symbology-ng/qgssinglesymbolrendererv2.h
  49. +13 −0 src/core/symbology-ng/qgssymbollayerv2.cpp
  50. +10 −2 src/core/symbology-ng/qgssymbollayerv2.h
  51. +19 −11 src/core/symbology-ng/qgssymbollayerv2registry.cpp
  52. +20 −1 src/core/symbology-ng/qgssymbollayerv2registry.h
  53. +1,625 −1 src/core/symbology-ng/qgssymbollayerv2utils.cpp
  54. +108 −2 src/core/symbology-ng/qgssymbollayerv2utils.h
  55. +13 −0 src/core/symbology-ng/qgssymbolv2.cpp
  56. +5 −0 src/core/symbology-ng/qgssymbolv2.h
  57. +12 −0 src/core/symbology-ng/qgsvectorfieldsymbollayer.cpp
  58. +3 −0 src/core/symbology-ng/qgsvectorfieldsymbollayer.h
  59. +18 −1 src/gui/CMakeLists.txt
  60. +5 −5 src/gui/qgsexpressionbuilderdialog.cpp
  61. +2 −2 src/gui/qgsexpressionbuilderdialog.h
  62. +19 −18 src/gui/qgsexpressionbuilderwidget.cpp
  63. +2 −2 src/gui/qgsexpressionbuilderwidget.h
  64. +4 −0 src/gui/qgsexpressionhighlighter.cpp
  65. +8 −0 src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
  66. +2 −0 src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h
  67. +8 −0 src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
  68. +2 −0 src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h
  69. +0 −40 src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp
  70. +0 −4 src/gui/symbology-ng/qgsrendererv2propertiesdialog.h
  71. +26 −12 src/gui/symbology-ng/qgsrendererv2widget.cpp
  72. +6 −1 src/gui/symbology-ng/qgsrendererv2widget.h
  73. +437 −400 src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
  74. +55 −37 src/gui/symbology-ng/qgsrulebasedrendererv2widget.h
  75. +7 −0 src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp
  76. +2 −0 src/gui/symbology-ng/qgssinglesymbolrendererv2widget.h
  77. +28 −13 src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp
  78. +7 −2 src/gui/symbology-ng/qgssymbollevelsv2dialog.h
  79. +2 −2 src/mapserver/qgsconfigparser.cpp
  80. +27 −5 src/mapserver/qgswmsserver.cpp
  81. +2 −1 src/mapserver/qgswmsserver.h
  82. +3 −3 src/plugins/georeferencer/qgsgeorefplugingui.cpp
  83. +10 −2 src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp
  84. +1 −1 src/providers/wfs/qgswfssourceselect.cpp
  85. +3 −3 src/providers/wms/qgswmsprovider.cpp
  86. +4 −34 src/ui/qgsrendererrulepropsdialogbase.ui
  87. +0 −8 src/ui/qgsrendererv2propsdialogbase.ui
  88. +48 −166 src/ui/qgsrulebasedrendererv2widget.ui
  89. +336 −0 tests/qt_modeltest/dynamictreemodel.cpp
  90. +197 −0 tests/qt_modeltest/dynamictreemodel.h
  91. +566 −0 tests/qt_modeltest/modeltest.cpp
  92. +94 −0 tests/qt_modeltest/modeltest.h
  93. +7 −0 tests/qt_modeltest/readme.txt
  94. +309 −0 tests/qt_modeltest/tst_modeltest.cpp
  95. +1 −0 tests/src/core/CMakeLists.txt
  96. +19 −0 tests/src/core/testqgsexpression.cpp
  97. +149 −0 tests/src/core/testqgsrulebasedrenderer.cpp
  98. +22 −0 tests/src/gui/CMakeLists.txt
  99. +84 −0 tests/src/gui/testrendererv2gui.cpp
  100. +24 −0 tests/src/gui/testrendererv2gui.h
  101. +2 −0 tests/testdata/rulebasedrenderer_invalid.xml
  102. +32 −0 tests/testdata/rulebasedrenderer_simple.xml
Loading