Skip to content
Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information
mbernasocchi committed Apr 10, 2013
2 parents 76f8d60 + 212aea7 commit e3451bb58a42f104776ce41195d998657eefb163
Showing with 6,434 additions and 4,100 deletions.
  1. +1 −0 cmake/FindOSGEARTH.cmake
  2. +1 −1 doc/TRANSLATORS
  3. +1,901 −2,058 i18n/qgis_de.ts
  4. +2 −0 images/images.qrc
  5. +915 −0 images/themes/gis/mIconDeselected.svg
  6. +915 −0 images/themes/gis/mIconSelected.svg
  7. +2 −0 python/core/core.sip
  8. +47 −0 python/core/qgserror.sip
  9. +2 −2 python/core/qgsmaplayer.sip
  10. +2 −1 python/core/raster/qgsrasterdataprovider.sip
  11. +32 −0 python/core/raster/qgsrasteridentifyresult.sip
  12. +10 −5 python/plugins/sextante/core/Sextante.py
  13. +19 −0 python/plugins/sextante/core/SilentProgress.py
  14. +1 −1 python/plugins/sextante/gui/BatchProcessingDialog.py
  15. +1 −20 python/plugins/sextante/gui/UnthreadedAlgorithmExecutor.py
  16. +2 −2 python/plugins/sextante/modeler/models/notinorder.model
  17. +0 −1 python/plugins/sextante/script/scripts/A_script_that_returns_a_number.py
  18. +15 −18 python/plugins/sextante/tests/GeoAlgorithmTest.py
  19. +20 −7 python/plugins/sextante/tests/ModelerAlgorithmTest.py
  20. +4 −7 python/plugins/sextante/tests/QgisAlgsTest.py
  21. +5 −6 python/plugins/sextante/tests/SagaTest.py
  22. +26 −0 python/plugins/sextante/tests/SextanteTests.py
  23. +59 −0 python/plugins/sextante/tests/SextanteToolsTest.py
  24. +1 −1 src/app/composer/qgscomposeritemwidget.cpp
  25. +10 −15 src/app/qgsattributetabledialog.cpp
  26. +7 −6 src/app/qgsattributetabledialog.h
  27. +1 −2 src/app/qgsfieldcalculator.cpp
  28. +6 −6 src/app/qgslabelinggui.cpp
  29. +3 −2 src/app/qgsrasterlayerproperties.cpp
  30. +17 −7 src/app/qgsvectorlayerproperties.cpp
  31. +2 −0 src/core/CMakeLists.txt
  32. +6 −6 src/core/composer/qgscomposeritem.cpp
  33. +3 −3 src/core/composer/qgscomposeritem.h
  34. +2 −0 src/core/composer/qgscomposerlabel.cpp
  35. +6 −4 src/core/composer/qgscomposerlegend.cpp
  36. +1 −1 src/core/composer/qgscomposerlegend.h
  37. +1 −1 src/core/qgscrscache.h
  38. +4 −3 src/core/qgsgml.cpp
  39. +14 −3 src/core/qgsmaplayer.cpp
  40. +5 −3 src/core/qgsmaplayer.h
  41. +1 −1 src/core/qgsmaprenderer.cpp
  42. +36 −10 src/core/qgsvectorlayer.cpp
  43. +23 −2 src/core/qgsvectorlayer.h
  44. +11 −5 src/core/raster/qgsrasterdataprovider.cpp
  45. +7 −4 src/core/raster/qgsrasterdataprovider.h
  46. +47 −0 src/core/raster/qgsrasteridentifyresult.cpp
  47. +94 −0 src/core/raster/qgsrasteridentifyresult.h
  48. +2 −2 src/core/raster/qgsrasterlayer.cpp
  49. +20 −5 src/core/symbology-ng/qgspointdisplacementrenderer.cpp
  50. +15 −1 src/gui/attributetable/qgsattributetablefiltermodel.cpp
  51. +21 −0 src/gui/attributetable/qgsattributetablefiltermodel.h
  52. +5 −1 src/gui/attributetable/qgsattributetablemodel.cpp
  53. +22 −17 src/gui/attributetable/qgsattributetableview.cpp
  54. +12 −16 src/gui/attributetable/qgsattributetableview.h
  55. +66 −35 src/gui/attributetable/qgsdualview.cpp
  56. +12 −0 src/gui/attributetable/qgsdualview.h
  57. +10 −0 src/gui/attributetable/qgsfeaturelistmodel.cpp
  58. +15 −0 src/gui/attributetable/qgsfeaturelistmodel.h
  59. +20 −5 src/gui/attributetable/qgsfeaturelistview.cpp
  60. +6 −0 src/gui/attributetable/qgsfeaturelistview.h
  61. +23 −21 src/gui/attributetable/qgsfeaturelistviewdelegate.cpp
  62. +2 −2 src/gui/attributetable/qgsfeaturelistviewdelegate.h
  63. +6 −6 src/gui/qgsblendmodecombobox.cpp
  64. +6 −4 src/gui/qgsblendmodecombobox.h
  65. +3 −2 src/gui/qgsmaptoolidentify.cpp
  66. +1 −1 src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp
  67. +12 −0 src/mapserver/qgssldparser.cpp
  68. +2 −0 src/mapserver/qgssldparser.h
  69. +5 −22 src/mapserver/qgswmsserver.cpp
  70. +0 −2 src/mapserver/qgswmsserver.h
  71. +4 −0 src/plugins/globe/CMakeLists.txt
  72. +12 −0 src/plugins/globe/globe_plugin.cpp
  73. +15 −0 src/plugins/globe/globe_plugin.h
  74. +6 −6 src/plugins/topology/checkDock.cpp
  75. +106 −92 src/plugins/topology/rulesDialog.cpp
  76. +17 −15 src/plugins/topology/rulesDialog.h
  77. +3 −3 src/plugins/topology/rulesDialog.ui
  78. +13 −9 src/providers/gdal/qgsgdalprovider.cpp
  79. +1 −1 src/providers/gdal/qgsgdalprovider.h
  80. +13 −5 src/providers/grass/qgsgrassrasterprovider.cpp
  81. +1 −1 src/providers/grass/qgsgrassrasterprovider.h
  82. +11 −7 src/providers/wcs/qgswcsprovider.cpp
  83. +1 −1 src/providers/wcs/qgswcsprovider.h
  84. +9 −4 src/providers/wms/qgswmsprovider.cpp
  85. +1 −1 src/providers/wms/qgswmsprovider.h
  86. +39 −13 src/ui/qgssymbolv2selectordialogbase.ui
  87. +175 −156 src/ui/symbollayer/widget_ellipse.ui
  88. +103 −92 src/ui/symbollayer/widget_fontmarker.ui
  89. +42 −54 src/ui/symbollayer/widget_linedecoration.ui
  90. +120 −129 src/ui/symbollayer/widget_linepatternfill.ui
  91. +124 −133 src/ui/symbollayer/widget_markerline.ui
  92. +138 −147 src/ui/symbollayer/widget_pointpatternfill.ui
  93. +126 −147 src/ui/symbollayer/widget_simplefill.ui
  94. +160 −151 src/ui/symbollayer/widget_simpleline.ui
  95. +137 −150 src/ui/symbollayer/widget_simplemarker.ui
  96. +111 −97 src/ui/symbollayer/widget_svgfill.ui
  97. +165 −155 src/ui/symbollayer/widget_svgmarker.ui
  98. +9 −3 src/ui/symbollayer/widget_svgselector.ui
  99. +3 −42 src/ui/symbollayer/widget_symbolslist.ui
  100. +184 −127 src/ui/symbollayer/widget_vectorfield.ui
  101. +8 −2 tests/src/core/testziplayer.cpp
  102. +1 −1 tests/src/python/test_qgsrasterlayer.py
@@ -44,6 +44,7 @@ ENDMACRO( FIND_OSGEARTH_INCLUDE THIS_OSGEARTH_INCLUDE_DIR THIS_OSGEARTH_INCLUDE_

FIND_OSGEARTH_INCLUDE( OSGEARTH_GEN_INCLUDE_DIR osgEarth/Common )
FIND_OSGEARTH_INCLUDE( OSGEARTH_INCLUDE_DIR osgEarth/TileSource )
FIND_OSGEARTH_INCLUDE( OSGEARTH_ELEVATION_QUERY osgEarth/ElevationQuery )

###### libraries ######

@@ -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:9357 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:99px">99.5</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:9333 unfinished:32 untranslated:37" class="bartodo"><div class="bardone" style="width:99px">99.4</div></div></td><td>Xan Vieiro</td></tr>
<tr><td><img src="qrc:/images/flags/de.png"></td><td>German</td><td><div title="finished:9329 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:99px">99.2</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:96px">96.2</div></div></td><td>Jacob Overgaard Madsen, Preben Lisby</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:89px">89.9</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:84px">85.0</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.

@@ -545,6 +545,8 @@
<file>themes/gis/mIconSelectAdd.svg</file>
<file>themes/gis/mIconSelectIntersect.svg</file>
<file>themes/gis/mIconSelectRemove.svg</file>
<file>themes/gis/mIconSelected.svg</file>
<file>themes/gis/mIconDeselected.svg</file>
</qresource>
<qresource prefix="/images/tips">
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

0 comments on commit e3451bb

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