Skip to content
Permalink
Browse files
Merge branch 'master' into heatmap_kernels
  • Loading branch information
nyalldawson committed Mar 17, 2013
2 parents ec01afb + 9a81fa7 commit bf45cb29a84437196a326d2b420f3e5a05714984
Showing with 15,480 additions and 3,768 deletions.
  1. +1 −1 doc/TRANSLATORS
  2. +1,103 −1,046 i18n/qgis_de.ts
  3. +8 −0 images/images.qrc
  4. +742 −0 images/theme_originals/mActionDecreaseBrightness.svg
  5. +721 −0 images/theme_originals/mActionDecreaseContrast.svg
  6. +742 −0 images/theme_originals/mActionIncreaseBrightness.svg
  7. +741 −0 images/theme_originals/mActionIncreaseContrast.svg
  8. +742 −0 images/themes/default/mActionDecreaseBrightness.svg
  9. +721 −0 images/themes/default/mActionDecreaseContrast.svg
  10. +742 −0 images/themes/default/mActionIncreaseBrightness.svg
  11. +741 −0 images/themes/default/mActionIncreaseContrast.svg
  12. +742 −0 images/themes/gis/mActionDecreaseBrightness.svg
  13. +721 −0 images/themes/gis/mActionDecreaseContrast.svg
  14. +742 −0 images/themes/gis/mActionIncreaseBrightness.svg
  15. +741 −0 images/themes/gis/mActionIncreaseContrast.svg
  16. +8 −5 python/core/composer/qgscomposeritem.sip
  17. +12 −0 python/core/composer/qgscomposition.sip
  18. +50 −58 python/core/qgsexpression.sip
  19. +36 −9 python/core/qgsogcutils.sip
  20. +0 −40 python/core/qgsvectorlayer.sip
  21. +14 −0 python/core/raster/qgsrasterinterface.sip
  22. +1 −1 python/gui/qgsfieldvalidator.sip
  23. +7 −7 python/plugins/fTools/tools/doGeometry.py
  24. +2 −2 python/plugins/fTools/tools/doRandPoints.py
  25. +2 −2 python/plugins/fTools/tools/doRegPoints.py
  26. +15 −11 python/plugins/fTools/tools/doSpatialJoin.py
  27. +4 −7 python/plugins/fTools/tools/doSumLines.py
  28. +5 −3 python/plugins/fTools/tools/doVectorGrid.py
  29. +7 −2 python/plugins/sextante/gdal/scripts/sieve.py
  30. +18 −5 python/plugins/sextante/gui/BatchInputSelectionPanel.py
  31. +20 −10 python/plugins/sextante/gui/BatchProcessingDialog.py
  32. +3 −0 python/plugins/sextante/gui/FileSelectionPanel.py
  33. +4 −4 python/plugins/sextante/gui/SextanteToolbox.py
  34. +19 −0 python/plugins/sextante/otb/description/BinaryMorphologicalOperation.txt
  35. +11 −0 python/plugins/sextante/otb/description/ClassificationRegularization.txt
  36. +14 −0 python/plugins/sextante/otb/description/ComputeConfusionMatrix.txt
  37. +12 −0 python/plugins/sextante/otb/description/EdgeExtraction.txt
  38. +7 −0 python/plugins/sextante/otb/description/FusionOfClassifications.txt
  39. +11 −0 python/plugins/sextante/otb/description/GrayScaleMorphologicalOperation.txt
  40. +16 −0 python/plugins/sextante/otb/description/HaralickTextureExtraction.txt
  41. +9 −0 python/plugins/sextante/otb/description/LocalStatisticExtraction.txt
  42. +10 −0 python/plugins/sextante/otb/description/MorphologicalProfilesSegmentation_raster.txt
  43. +21 −0 python/plugins/sextante/otb/description/MorphologicalProfilesSegmentation_vector.txt
  44. +12 −0 python/plugins/sextante/otb/description/Pansharpening.txt
  45. +13 −0 python/plugins/sextante/otb/description/RadiometricIndices.txt
  46. +14 −0 python/plugins/sextante/otb/description/SFSTextureExtraction.txt
  47. +1 −1 python/plugins/sextante/r/RAlgorithm.py
  48. +7 −2 src/app/composer/qgscomposeritemwidget.cpp
  49. +1 −1 src/app/composer/qgscomposeritemwidget.h
  50. +0 −10 src/app/composer/qgscomposerlabelwidget.cpp
  51. +0 −1 src/app/composer/qgscomposerlabelwidget.h
  52. +4 −1 src/app/legend/qgslegend.cpp
  53. +2 −1 src/app/main.cpp
  54. +66 −0 src/app/qgisapp.cpp
  55. +20 −0 src/app/qgisapp.h
  56. +1 −1 src/app/qgisappstylesheet.cpp
  57. +18 −7 src/app/qgsaddattrdialog.cpp
  58. +2 −0 src/app/qgsaddattrdialog.h
  59. +2 −2 src/app/qgsattributedialog.cpp
  60. +17 −3 src/app/qgsattributetypedialog.cpp
  61. +12 −0 src/app/qgsattributetypedialog.h
  62. +13 −0 src/app/qgscustomization.cpp
  63. +3 −0 src/app/qgscustomization.h
  64. +13 −3 src/app/qgsfieldsproperties.cpp
  65. +1 −0 src/app/qgsfieldsproperties.h
  66. +10 −4 src/app/qgsidentifyresultsdialog.cpp
  67. +4 −3 src/core/CMakeLists.txt
  68. +19 −2 src/core/composer/qgscomposeritem.cpp
  69. +12 −7 src/core/composer/qgscomposeritem.h
  70. +13 −7 src/core/composer/qgscomposerlegend.cpp
  71. +2 −1 src/core/composer/qgscomposerlegend.h
  72. +66 −0 src/core/composer/qgscomposition.cpp
  73. +13 −0 src/core/composer/qgscomposition.h
  74. +5 −739 src/core/qgsexpression.cpp
  75. +57 −61 src/core/qgsexpression.h
  76. +14 −0 src/core/qgsfield.cpp
  77. +3 −0 src/core/qgsfield.h
  78. +1,391 −194 src/core/qgsogcutils.cpp
  79. +100 −24 src/core/qgsogcutils.h
  80. +34 −0 src/core/qgsprojectfiletransform.cpp
  81. +0 −4 src/core/qgsvectorfilewriter.h
  82. +22 −284 src/core/qgsvectorlayer.cpp
  83. +6 −36 src/core/qgsvectorlayer.h
  84. +195 −0 src/core/raster/qgsbrightnesscontrastfilter.cpp
  85. +64 −0 src/core/raster/qgsbrightnesscontrastfilter.h
  86. +5 −0 src/core/raster/qgsrasterinterface.h
  87. +24 −0 src/core/raster/qgsrasterlayer.cpp
  88. +3 −0 src/core/raster/qgsrasterlayer.h
  89. +13 −2 src/core/raster/qgsrasterpipe.cpp
  90. +6 −3 src/core/raster/qgsrasterpipe.h
  91. +0 −1 src/core/raster/qgsrasterrenderer.h
  92. +5 −5 src/core/raster/qgsrasterresamplefilter.cpp
  93. +1 −1 src/core/raster/qgsrasterresamplefilter.h
  94. +43 −10 src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
  95. +15 −0 src/core/symbology-ng/qgsellipsesymbollayerv2.h
  96. +187 −26 src/core/symbology-ng/qgsfillsymbollayerv2.cpp
  97. +63 −1 src/core/symbology-ng/qgsfillsymbollayerv2.h
  98. +98 −14 src/core/symbology-ng/qgslinesymbollayerv2.cpp
  99. +27 −0 src/core/symbology-ng/qgslinesymbollayerv2.h
  100. +66 −9 src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
  101. +7 −0 src/core/symbology-ng/qgsmarkersymbollayerv2.h
  102. +2 −1 src/core/symbology-ng/qgsrulebasedrendererv2.cpp
  103. +18 −2 src/core/symbology-ng/qgssymbollayerv2.cpp
  104. +18 −0 src/core/symbology-ng/qgssymbollayerv2.h
  105. +11 −7 src/core/symbology-ng/qgssymbollayerv2utils.cpp
  106. +39 −10 src/core/symbology-ng/qgssymbolv2.cpp
  107. +5 −6 src/core/symbology-ng/qgssymbolv2.h
  108. +23 −6 src/core/symbology-ng/qgsvectorfieldsymbollayer.cpp
  109. +7 −0 src/core/symbology-ng/qgsvectorfieldsymbollayer.h
  110. +13 −4 src/gui/attributetable/qgsattributetablemodel.cpp
  111. +69 −17 src/gui/qgsattributeeditor.cpp
  112. +68 −25 src/gui/qgscollapsiblegroupbox.cpp
  113. +4 −0 src/gui/qgscollapsiblegroupbox.h
  114. +16 −0 src/gui/qgscomposerview.cpp
  115. +3 −2 src/gui/qgsfieldvalidator.cpp
  116. +4 −1 src/gui/qgsfieldvalidator.h
  117. +19 −2 src/gui/qgsfilterlineedit.cpp
  118. +6 −1 src/gui/qgsfilterlineedit.h
  119. +30 −0 src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp
  120. +4 −0 src/gui/symbology-ng/qgsellipsesymbollayerv2widget.h
  121. +300 −1 src/gui/symbology-ng/qgssymbollayerv2widget.cpp
  122. +24 −0 src/gui/symbology-ng/qgssymbollayerv2widget.h
  123. +14 −0 src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp
  124. +1 −0 src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.h
  125. +6 −6 src/mapserver/qgsfilter.cpp
  126. +91 −50 src/mapserver/qgswfsserver.cpp
  127. +3 −8 src/mapserver/qgswfsserver.h
  128. +2 −1 src/providers/gdal/qgsgdalprovider.cpp
  129. +1 −1 src/providers/oracle/qgsoracleconn.cpp
  130. +9 −2 src/providers/oracle/qgsoracleprovider.cpp
  131. +13 −0 src/providers/postgres/qgspostgresprovider.cpp
  132. +0 −1 src/providers/wfs/CMakeLists.txt
  133. +4 −3 src/providers/wfs/qgswfscapabilities.cpp
  134. +3 −3 src/providers/wfs/qgswfsprovider.cpp
  135. +0 −127 src/providers/wfs/qgswfsutils.cpp
  136. +0 −30 src/providers/wfs/qgswfsutils.h
  137. +6 −3 src/providers/wms/qgswmsprovider.cpp
  138. +42 −1 src/ui/qgisapp.ui
  139. +19 −9 src/ui/qgsattributetypeedit.ui
  140. +17 −10 src/ui/qgscomposeritemwidgetbase.ui
  141. +163 −156 src/ui/qgscomposermapwidgetbase.ui
  142. +1 −1 src/ui/qgsgraduatedsymbolrendererv2widget.ui
  143. +4 −10 src/ui/qgssinglebandpseudocolorrendererwidgetbase.ui
  144. +98 −35 src/ui/symbollayer/widget_ellipse.ui
  145. +77 −32 src/ui/symbollayer/widget_fontmarker.ui
  146. +29 −8 src/ui/symbollayer/widget_linedecoration.ui
  147. +98 −32 src/ui/symbollayer/widget_linepatternfill.ui
  148. +28 −0 src/ui/symbollayer/widget_markerline.ui
  149. +120 −36 src/ui/symbollayer/widget_pointpatternfill.ui
  150. +81 −39 src/ui/symbollayer/widget_simplefill.ui
  151. +159 −132 src/ui/symbollayer/widget_simpleline.ui
  152. +89 −47 src/ui/symbollayer/widget_simplemarker.ui
  153. +73 −31 src/ui/symbollayer/widget_svgfill.ui
  154. +112 −49 src/ui/symbollayer/widget_svgmarker.ui
  155. +37 −16 src/ui/symbollayer/widget_vectorfield.ui
  156. +7 −114 tests/src/core/testqgsexpression.cpp
  157. +287 −6 tests/src/core/testqgsogcutils.cpp
@@ -1,7 +1,7 @@
<style>table {font-size:80%;}th {text-align:left; }.bartodo{ background-color:red;width:100px;height:20px;}.bardone{ background-color:green;width:80px;height:20px;font-size:80%;text-align:center;padding-top:4px;height:16px;color:white;}</style><table><tr><th colspan="2" style="width:250px;">Language</th><th>Finished %</th><th>Translators</th></tr>

<tr><td><img src="qrc:/images/flags/de.png"></td><td>German</td><td><div title="finished:9047 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:98px">99.0</div></div></td><td>Jürgen E. Fischer, Stephan Holl, Otto Dassau, Werner Macho</td></tr>
<tr><td><img src="qrc:/images/flags/da_DK.png"></td><td>Danish (Denmark)</td><td><div title="finished:9043 unfinished:1 untranslated:3" class="bartodo"><div class="bardone" style="width:98px">98.9</div></div></td><td>Jacob Overgaard Madsen, Preben Lisby</td></tr>
<tr><td><img src="qrc:/images/flags/de.png"></td><td>German</td><td><div title="finished:9040 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:98px">98.9</div></div></td><td>Jürgen E. Fischer, Stephan Holl, Otto Dassau, Werner Macho</td></tr>
<tr><td><img src="qrc:/images/flags/gl_ES.png"></td><td>Galician (Spain)</td><td><div title="finished:8530 unfinished:170 untranslated:347" class="bartodo"><div class="bardone" style="width:94px">94.2</div></div></td><td>Xan Vieiro</td></tr>
<tr><td><img src="qrc:/images/flags/es.png"></td><td>Spanish</td><td><div title="finished:8438 unfinished:22 untranslated:58" class="bartodo"><div class="bardone" style="width:92px">92.4</div></div></td><td>Carlos Dávila, Javier César Aldariz, Gabriela Awad, Edwin Amado, Mayeul Kauffmann, Diana Galindo</td></tr>
<tr><td><img src="qrc:/images/flags/it.png"></td><td>Italian</td><td><div title="finished:7975 unfinished:28 untranslated:515" class="bartodo"><div class="bardone" style="width:87px">87.4</div></div></td><td>Paolo Cavallini, Flavio Rigolon, Maurizio Napolitano, Roberto Angeletti, Alessandro Fanna, Michele Beneventi, Marco Braida, Luca Casagrande, Luca Delucchi, Anne Gishla</td></tr>

Large diffs are not rendered by default.

@@ -186,6 +186,10 @@
<file>themes/default/mActionZoomOut.png</file>
<file>themes/default/mActionZoomToLayer.png</file>
<file>themes/default/mActionZoomToSelected.png</file>
<file>themes/default/mActionIncreaseBrightness.svg</file>
<file>themes/default/mActionDecreaseBrightness.svg</file>
<file>themes/default/mActionIncreaseContrast.svg</file>
<file>themes/default/mActionDecreaseContrast.svg</file>
<file>themes/default/mIconClose.png</file>
<file>themes/default/mIconCollapse.png</file>
<file>themes/default/mIconConnect.png</file>
@@ -406,6 +410,10 @@
<file>themes/gis/mActionZoomOut.png</file>
<file>themes/gis/mActionZoomToLayer.png</file>
<file>themes/gis/mActionZoomToSelected.png</file>
<file>themes/gis/mActionIncreaseBrightness.svg</file>
<file>themes/gis/mActionDecreaseBrightness.svg</file>
<file>themes/gis/mActionIncreaseContrast.svg</file>
<file>themes/gis/mActionDecreaseContrast.svg</file>
<file>themes/gis/mIconClose.png</file>
<file>themes/gis/mIconEditable.png</file>
<file>themes/gis/mIconEditableEdits.png</file>

0 comments on commit bf45cb2

Please sign in to comment.