Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/qgis/Quantum-GIS

  • Loading branch information
volaya committed Oct 17, 2012
2 parents c4c3fec + fa84588 commit bb3815f8c81d1a29df5883fb380d5ce64126973c
Showing with 67,460 additions and 8,391 deletions.
  1. +7 −6 doc/TRANSLATORS
  2. +1,639 −1,348 i18n/qgis_gl_ES.ts
  3. +5 −3 i18n/qgis_it.ts
  4. +55,238 −0 i18n/qgis_sr_Cyrl.ts
  5. +8,524 −5,474 i18n/{qgis_sr_CS-Latn.ts → qgis_sr_Latn.ts}
  6. BIN images/flags/{sr_CS-Latn.png → sr_Cyrl.png}
  7. BIN images/flags/sr_Latn.png
  8. +484 −483 images/images.qrc
  9. +12 −45 python/core/raster/qgsrasterdataprovider.sip
  10. +1 −1 python/core/raster/qgsrasteriterator.sip
  11. +7 −7 python/core/raster/qgsrasterlayer.sip
  12. +1 −1 python/gui/raster/qgsmultibandcolorrendererwidget.sip
  13. +2 −0 scripts/tsstat.pl
  14. +2 −2 src/app/CMakeLists.txt
  15. +15 −12 src/app/qgisapp.cpp
  16. +32 −9 src/app/qgsmaptoolidentify.cpp
  17. +52 −24 src/app/{qgsembedlayerdialog.cpp → qgsprojectlayergroupdialog.cpp}
  18. +16 −13 src/app/{qgsembedlayerdialog.h → qgsprojectlayergroupdialog.h}
  19. +116 −0 src/app/qgsprojectproperties.cpp
  20. +4 −0 src/app/qgsprojectproperties.h
  21. +10 −3 src/app/qgsrasterlayerproperties.cpp
  22. +26 −13 src/app/qgsvectorlayerproperties.cpp
  23. +2 −0 src/app/qgsvectorlayerproperties.h
  24. +46 −0 src/core/qgsvectorlayer.cpp
  25. +11 −0 src/core/qgsvectorlayer.h
  26. +0 −8 src/core/raster/qgspalettedrasterrenderer.cpp
  27. +83 −2 src/core/raster/qgsrasterblock.cpp
  28. +26 −7 src/core/raster/qgsrasterblock.h
  29. +226 −311 src/core/raster/qgsrasterdataprovider.cpp
  30. +37 −57 src/core/raster/qgsrasterdataprovider.h
  31. +8 −8 src/core/raster/qgsrasterfilewriter.cpp
  32. +4 −5 src/core/raster/qgsrasteriterator.cpp
  33. +0 −1 src/core/raster/qgsrasteriterator.h
  34. +4 −2 src/core/raster/qgsrasterlayer.cpp
  35. +4 −4 src/core/raster/qgsrasterlayer.h
  36. +1 −1 src/core/raster/qgsrasterprojector.cpp
  37. +3 −3 src/gui/raster/qgsmultibandcolorrendererwidget.cpp
  38. +1 −1 src/gui/raster/qgsmultibandcolorrendererwidget.h
  39. +5 −2 src/mapserver/qgsconfigparser.h
  40. +218 −28 src/mapserver/qgsprojectparser.cpp
  41. +15 −2 src/mapserver/qgsprojectparser.h
  42. +20 −20 src/mapserver/qgswfsserver.cpp
  43. +3 −3 src/mapserver/qgswfsserver.h
  44. +13 −12 src/mapserver/qgswmsserver.cpp
  45. +1 −1 src/mapserver/qgswmsserver.h
  46. +74 −89 src/providers/gdal/qgsgdalprovider.cpp
  47. +1 −27 src/providers/gdal/qgsgdalprovider.h
  48. +3 −2 src/providers/grass/qgis.g.info.c
  49. +31 −39 src/providers/grass/qgsgrassrasterprovider.cpp
  50. +4 −25 src/providers/grass/qgsgrassrasterprovider.h
  51. +54 −53 src/providers/wcs/qgswcsprovider.cpp
  52. +1 −4 src/providers/wcs/qgswcsprovider.h
  53. +62 −54 src/providers/wms/qgswmsprovider.cpp
  54. +2 −31 src/providers/wms/qgswmsprovider.h
  55. +2 −2 src/ui/{qgsembedlayerdialogbase.ui → qgsprojectlayergroupdialogbase.ui}
  56. +255 −133 src/ui/qgsprojectpropertiesbase.ui
  57. +3 −3 tests/src/python/CMakeLists.txt
  58. +14 −7 tests/src/python/test_qgsrasterlayer.py
  59. +30 −0 tests/testdata/raster/band3_byte_noct_epsg4326.tif.aux.xml
@@ -1,12 +1,12 @@
<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:8519 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:100px">100.0</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:8461 unfinished:5 untranslated:37" class="bartodo"><div class="bardone" style="width:99px">99.3</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:8519 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:99px">100.0</div></div></td><td>Jürgen E. Fischer, Stephan Holl, Otto Dassau, Werner Macho</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:99px">99.2</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/gl_ES.png"></td><td>Galician (Spain)</td><td><div title="finished:8414 unfinished:21 untranslated:84" class="bartodo"><div class="bardone" style="width:98px">98.9</div></div></td><td>Xan Vieiro</td></tr>
<tr><td><img src="qrc:/images/flags/nl.png"></td><td>Dutch</td><td><div title="finished:7573 unfinished:399 untranslated:543" class="bartodo"><div class="bardone" style="width:91px">91.2</div></div></td><td>Richard Duivenvoorde, Raymond Nijssen, Carlo van Rijswijk</td></tr>
<tr><td><img src="qrc:/images/flags/it.png"></td><td>Italian</td><td><div title="finished:7426 unfinished:444 untranslated:638" class="bartodo"><div class="bardone" style="width:89px">89.8</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>
<tr><td><img src="qrc:/images/flags/ja.png"></td><td>Japanese</td><td><div title="finished:7412 unfinished:461 untranslated:630" class="bartodo"><div class="bardone" style="width:89px">89.7</div></div></td><td>BABA Yoshihiko, Yoichi Kayama</td></tr>
<tr><td><img src="qrc:/images/flags/et_EE.png"></td><td>Estonian (Estonia)</td><td><div title="finished:7412 unfinished:452 untranslated:639" class="bartodo"><div class="bardone" style="width:89px">89.7</div></div></td><td>Veiko Viil</td></tr>
<tr><td><img src="qrc:/images/flags/et_EE.png"></td><td>Estonian (Estonia)</td><td><div title="finished:7412 unfinished:452 untranslated:639" class="bartodo"><div class="bardone" style="width:89px">89.6</div></div></td><td>Veiko Viil</td></tr>
<tr><td><img src="qrc:/images/flags/fr.png"></td><td>French</td><td><div title="finished:7407 unfinished:449 untranslated:647" class="bartodo"><div class="bardone" style="width:89px">89.6</div></div></td><td>Eve Rousseau, Marc Monnerat, Lionel Roubeyrie, Jean Roc Morreale, Benjamin Bohard, Jeremy Garniaux, Yves Jacolin, Benjamin Lerre, Stéphane Morel, Marie Silvestre, Tahir Tamba, Xavier M, Mayeul Kauffmann, Mehdi Semchaoui, Robin Cura, Etienne Tourigny, Mathieu Bossaert</td></tr>
<tr><td><img src="qrc:/images/flags/pt_BR.png"></td><td>Portuguese (Brazil)</td><td><div title="finished:7412 unfinished:429 untranslated:662" class="bartodo"><div class="bardone" style="width:89px">89.5</div></div></td><td>Arthur Nanni</td></tr>
<tr><td><img src="qrc:/images/flags/pl_PL.png"></td><td>Polish (Poland)</td><td><div title="finished:7412 unfinished:419 untranslated:672" class="bartodo"><div class="bardone" style="width:89px">89.5</div></div></td><td>Robert Szczepanek, Milena Nowotarska, Borys Jurgiel, Mateusz Loskot, Tomasz Paul, Andrzej Swiader </td></tr>
@@ -17,16 +17,17 @@
<tr><td><img src="qrc:/images/flags/sl_SI.png"></td><td>Slovenian (Slovenia)</td><td><div title="finished:6891 unfinished:395 untranslated:1217" class="bartodo"><div class="bardone" style="width:83px">83.2</div></div></td><td>Jože Detečnik, Dejan Gregor</td></tr>
<tr><td><img src="qrc:/images/flags/zh_CN.png"></td><td>Chinese (China)</td><td><div title="finished:6507 unfinished:323 untranslated:1673" class="bartodo"><div class="bardone" style="width:78px">78.3</div></div></td><td>Calvin Ngei, Zhang Jun</td></tr>
<tr><td><img src="qrc:/images/flags/lv.png"></td><td>Latvian</td><td><div title="finished:5906 unfinished:654 untranslated:1943" class="bartodo"><div class="bardone" style="width:73px">73.2</div></div></td><td>Maris Nartiss, Pēteris Brūns</td></tr>
<tr><td><img src="qrc:/images/flags/sr_Latn.png"></td><td>Serbian ()</td><td><div title="finished:5610 unfinished:921 untranslated:1989" class="bartodo"><div class="bardone" style="width:71px">71.2</div></div></td><td>Goran Ivanković</td></tr>
<tr><td><img src="qrc:/images/flags/sr_Cyrl.png"></td><td>Serbian ()</td><td><div title="finished:5646 unfinished:845 untranslated:2029" class="bartodo"><div class="bardone" style="width:71px">71.2</div></div></td><td>Goran Ivanković</td></tr>
<tr><td><img src="qrc:/images/flags/id.png"></td><td>Indonesian</td><td><div title="finished:4803 unfinished:936 untranslated:2764" class="bartodo"><div class="bardone" style="width:61px">61.9</div></div></td><td>Januar V. Simarmata, I Made Anombawa</td></tr>
<tr><td><img src="qrc:/images/flags/hr_HR.png"></td><td>Croatian (Croatia)</td><td><div title="finished:4914 unfinished:557 untranslated:3032" class="bartodo"><div class="bardone" style="width:60px">61.0</div></div></td><td>Zoran Jankovic</td></tr>
<tr><td><img src="qrc:/images/flags/sr_CS-Latn.png"></td><td>Serbian ()</td><td><div title="finished:4580 unfinished:1179 untranslated:2744" class="bartodo"><div class="bardone" style="width:60px">60.7</div></div></td><td></td></tr>
<tr><td><img src="qrc:/images/flags/hr_HR.png"></td><td>Croatian (Croatia)</td><td><div title="finished:4914 unfinished:557 untranslated:3032" class="bartodo"><div class="bardone" style="width:60px">60.9</div></div></td><td>Zoran Jankovic</td></tr>
<tr><td><img src="qrc:/images/flags/pt_PT.png"></td><td>Portuguese (Portugal)</td><td><div title="finished:3085 unfinished:3748 untranslated:1670" class="bartodo"><div class="bardone" style="width:58px">58.2</div></div></td><td>Giovanni Manghi, Joana Simoes, Duarte Carreira, Alexandre Neto, Pedro Pereira, Pedro Palheiro, Nelson Silva</td></tr>
<tr><td><img src="qrc:/images/flags/th.png"></td><td>Thai</td><td><div title="finished:4139 unfinished:1125 untranslated:3239" class="bartodo"><div class="bardone" style="width:55px">55.2</div></div></td><td>Man Chao</td></tr>
<tr><td><img src="qrc:/images/flags/sv.png"></td><td>Swedish</td><td><div title="finished:4039 unfinished:1119 untranslated:3360" class="bartodo"><div class="bardone" style="width:53px">54.0</div></div></td><td>Lars Luthman, Magnus Homann, Victor Axbom</td></tr>
<tr><td><img src="qrc:/images/flags/tr.png"></td><td>Turkish</td><td><div title="finished:3698 unfinished:938 untranslated:3867" class="bartodo"><div class="bardone" style="width:48px">48.9</div></div></td><td>Osman Yilmaz</td></tr>
<tr><td><img src="qrc:/images/flags/uk.png"></td><td>Ukrainian</td><td><div title="finished:3541 unfinished:1227 untranslated:3735" class="bartodo"><div class="bardone" style="width:48px">48.8</div></div></td><td>Сергей Якунин</td></tr>
<tr><td><img src="qrc:/images/flags/zh_TW.png"></td><td>Chinese (Taiwan, Province of China)</td><td><div title="finished:2447 unfinished:2630 untranslated:3426" class="bartodo"><div class="bardone" style="width:44px">44.2</div></div></td><td>Nung-yao Lin</td></tr>
<tr><td><img src="qrc:/images/flags/vi.png"></td><td>Vietnamese</td><td><div title="finished:2795 unfinished:1592 untranslated:4116" class="bartodo"><div class="bardone" style="width:42px">42.2</div></div></td><td>Bùi Hữu Mạnh</td></tr>
<tr><td><img src="qrc:/images/flags/vi.png"></td><td>Vietnamese</td><td><div title="finished:2795 unfinished:1592 untranslated:4116" class="bartodo"><div class="bardone" style="width:42px">42.1</div></div></td><td>Bùi Hữu Mạnh</td></tr>
<tr><td><img src="qrc:/images/flags/el_GR.png"></td><td>Greek, Modern (1453-) (Greece)</td><td><div title="finished:2989 unfinished:874 untranslated:4640" class="bartodo"><div class="bardone" style="width:40px">40.2</div></div></td><td>Evripidis Argyropoulos, Mike Pegnigiannis, Nikos Ves</td></tr>
<tr><td><img src="qrc:/images/flags/is.png"></td><td>Icelandic</td><td><div title="finished:2853 unfinished:662 untranslated:4988" class="bartodo"><div class="bardone" style="width:37px">37.4</div></div></td><td>Thordur Ivarsson</td></tr>
<tr><td><img src="qrc:/images/flags/mn.png"></td><td>Mongolian</td><td><div title="finished:2488 unfinished:1098 untranslated:4917" class="bartodo"><div class="bardone" style="width:35px">35.6</div></div></td><td>Bayarmaa Enkhtur</td></tr>

0 comments on commit bb3815f

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