Skip to content
Permalink
Browse files

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

  • Loading branch information
timlinux committed May 23, 2011
2 parents 7c0e900 + b610620 commit 4d5455f5b18ecff2081c0e7bee573cb89b95ab2e
Showing with 6,332 additions and 5,583 deletions.
  1. +2 −1 debian/changelog
  2. +1 −0 debian/control.intrepid
  3. +1 −0 debian/control.jaunty
  4. +1 −0 debian/control.karmic
  5. +1 −0 debian/control.lenny
  6. +1 −0 debian/control.lucid
  7. +1 −0 debian/control.maverick
  8. +1 −0 debian/control.natty
  9. +1 −0 debian/control.sid
  10. +1 −0 debian/control.squeeze
  11. +1 −0 debian/qgis-plugin-grass.postrm
  12. +1 −0 debian/qgis-plugin-grass.preinst
  13. +2 −0 debian/rules
  14. +3 −3 i18n/qgis_af.ts
  15. +3 −3 i18n/qgis_ar.ts
  16. +3 −3 i18n/qgis_bg.ts
  17. +3 −3 i18n/qgis_ca_ES.ts
  18. +3 −3 i18n/qgis_cs_CZ.ts
  19. +2,105 −1,924 i18n/qgis_de.ts
  20. +3 −3 i18n/qgis_el_GR.ts
  21. +3 −3 i18n/qgis_es.ts
  22. +3 −3 i18n/qgis_fa.ts
  23. +3 −3 i18n/qgis_fi.ts
  24. +3 −3 i18n/qgis_fr.ts
  25. +3 −3 i18n/qgis_he.ts
  26. +3 −3 i18n/qgis_hr_HR.ts
  27. +3 −3 i18n/qgis_hu.ts
  28. +3 −3 i18n/qgis_id.ts
  29. +3 −3 i18n/qgis_is.ts
  30. +3 −3 i18n/qgis_it.ts
  31. +3 −3 i18n/qgis_ja.ts
  32. +3 −3 i18n/qgis_ka_GE.ts
  33. +3 −3 i18n/qgis_lo.ts
  34. +3 −3 i18n/qgis_lt.ts
  35. +3 −3 i18n/qgis_lv.ts
  36. +3 −3 i18n/qgis_mn.ts
  37. +3 −3 i18n/qgis_nl.ts
  38. +3 −3 i18n/qgis_pl_PL.ts
  39. +3 −3 i18n/qgis_pt_BR.ts
  40. +3 −3 i18n/qgis_pt_PT.ts
  41. +3 −3 i18n/qgis_ro.ts
  42. +3 −3 i18n/qgis_ru.ts
  43. +3 −3 i18n/qgis_sk.ts
  44. +3 −3 i18n/qgis_sl_SI.ts
  45. +3 −3 i18n/qgis_sq_AL.ts
  46. +3 −3 i18n/qgis_sr_CS-Latn.ts
  47. +3 −3 i18n/qgis_sv.ts
  48. +3 −3 i18n/qgis_ta.ts
  49. +3 −3 i18n/qgis_th.ts
  50. +3 −3 i18n/qgis_tr.ts
  51. +3 −3 i18n/qgis_uk.ts
  52. +3 −3 i18n/qgis_vi.ts
  53. +3 −3 i18n/qgis_xh.ts
  54. +3 −3 i18n/qgis_zh_CN.ts
  55. +3 −3 i18n/qgis_zh_TW.ts
  56. +1 −0 ms-windows/osgeo4w/package-nightly.cmd
  57. +1 −0 ms-windows/osgeo4w/package.cmd
  58. +3 −0 ms-windows/osgeo4w/postinstall.bat
  59. +3 −0 ms-windows/osgeo4w/preremove.bat
  60. +1 −1 python/core/qgsproviderregistry.sip
  61. +9 −9 scripts/astyle-all.sh
  62. +1 −0 scripts/spelling.dat
  63. +0 −5 src/analysis/interpolation/DualEdgeTriangulation.cc
  64. +1 −1 src/analysis/interpolation/ParametricLine.h
  65. +1 −1 src/app/attributetable/qgsattributetabledialog.cpp
  66. +6 −3 src/app/composer/qgscomposer.cpp
  67. +8 −4 src/app/composer/qgscomposermapwidget.cpp
  68. +3 −2 src/app/legend/qgslegend.cpp
  69. +4 −4 src/app/main.cpp
  70. +21 −18 src/app/qgisapp.cpp
  71. +12 −6 src/app/qgsabout.cpp
  72. +2 −2 src/app/qgsattributeactiondialog.cpp
  73. +4 −2 src/app/qgsconfigureshortcutsdialog.cpp
  74. +296 −278 src/app/qgscustomization.cpp
  75. +22 −22 src/app/qgscustomization.h
  76. +3 −0 src/app/qgsmaptooladdpart.cpp
  77. +2 −1 src/app/qgspluginmanager.cpp
  78. +16 −9 src/app/qgspluginregistry.cpp
  79. +1 −1 src/app/qgsrasterlayerproperties.cpp
  80. +7 −7 src/browser/main.cpp
  81. +122 −115 src/browser/qgsbrowser.cpp
  82. +8 −8 src/browser/qgsbrowser.h
  83. +7 −4 src/browser/qgsbrowsermodel.cpp
  84. +8 −8 src/browser/qgsbrowsermodel.h
  85. +0 −18 src/browser/template.cpp
  86. +0 −22 src/browser/template.h
  87. +1 −1 src/core/pal/rtree.hpp
  88. +2 −1 src/core/qgsapplication.cpp
  89. +4 −2 src/core/qgscoordinatereferencesystem.cpp
  90. +4 −2 src/core/qgscoordinatetransform.cpp
  91. +24 −12 src/core/qgsdataitem.cpp
  92. +1 −1 src/core/qgsdataitem.h
  93. +6 −3 src/core/qgsdistancearea.cpp
  94. +1 −1 src/core/qgsmaplayer.cpp
  95. +1 −1 src/core/qgsmaplayer.h
  96. +5 −3 src/core/qgspallabeling.cpp
  97. +1 −1 src/core/qgsproject.cpp
  98. +16 −16 src/core/qgsproviderregistry.cpp
  99. +7 −7 src/core/qgsproviderregistry.h
  100. +1 −1 src/core/qgspythonrunner.cpp
  101. +2 −2 src/core/qgspythonrunner.h
  102. +2 −1 src/core/qgsrasterdataprovider.cpp
  103. +35 −22 src/core/qgsrasterprojector.cpp
  104. +1 −1 src/core/qgsrasterprojector.h
  105. +12 −6 src/core/qgsrectangle.cpp
  106. +10 −5 src/core/qgssearchtreenode.cpp
  107. +8 −4 src/core/qgsvectorlayer.cpp
  108. +8 −4 src/core/raster/qgscontrastenhancement.cpp
  109. +12 −6 src/core/raster/qgsrasterlayer.cpp
  110. +6 −3 src/core/symbology-ng/qgscolorbrewerpalette.h
  111. +4 −2 src/core/symbology-ng/qgsfillsymbollayerv2.cpp
  112. +4 −2 src/core/symbology-ng/qgslinesymbollayerv2.cpp
  113. +4 −2 src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
  114. +2 −1 src/core/symbology-ng/qgssymbollayerv2utils.cpp
  115. +2 −1 src/core/symbology-ng/qgsvectorcolorrampv2.cpp
  116. +2 −1 src/core/symbology/qgsmarkercatalogue.cpp
  117. +0 −1 src/gui/CMakeLists.txt
  118. +1 −1 src/gui/attributetable/qgsattributetableview.cpp
  119. +4 −2 src/gui/qgsdetaileditemdelegate.cpp
  120. +1 −1 src/gui/qgsdetaileditemdelegate.h
  121. +1 −1 src/gui/qgsdetaileditemwidget.h
  122. +34 −17 src/gui/qgsmanageconnectionsdialog.cpp
  123. +2 −1 src/gui/qgsmapcanvas.cpp
  124. +12 −6 src/gui/qgsmapoverviewcanvas.cpp
  125. +6 −9 src/gui/qgsquickprint.cpp
  126. +14 −7 src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
  127. +18 −9 src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp
  128. +23 −8 src/gui/symbology-ng/qgsstylev2managerdialog.cpp
  129. +9 −8 src/gui/symbology-ng/qgssymbolv2propertiesdialog.cpp
  130. +3 −3 src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
  131. +2 −2 src/mapserver/qgis_map_serv.cpp
  132. +4 −4 src/mapserver/qgscapabilitiescache.cpp
  133. +1 −1 src/mapserver/qgscapabilitiescache.h
  134. +8 −4 src/mapserver/qgswmsserver.cpp
  135. +12 −6 src/plugins/delimited_text/qgsdelimitedtextplugingui.cpp
  136. +4 −2 src/plugins/diagram_overlay/qgssvgdiagramfactorywidget.cpp
  137. +14 −7 src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp
  138. +10 −8 src/plugins/evis/idtool/eviseventidtool.cpp
  139. +2 −1 src/plugins/georeferencer/qgsgcplist.cpp
  140. +14 −5 src/plugins/georeferencer/qgsgeorefplugingui.cpp
  141. +6 −4 src/plugins/georeferencer/qgsgeoreftransform.cpp
  142. +15 −9 src/plugins/georeferencer/qgsimagewarper.cpp
  143. +4 −2 src/plugins/georeferencer/qgstransformsettingsdialog.cpp
  144. +4 −8 src/plugins/gps_importer/qgsgpsplugin.cpp
  145. +8 −4 src/plugins/grass/qgsgrassattributes.cpp
  146. +16 −8 src/plugins/grass/qgsgrassbrowser.cpp
  147. +76 −38 src/plugins/grass/qgsgrassedit.cpp
  148. +4 −2 src/plugins/grass/qgsgrassedittools.cpp
  149. +100 −49 src/plugins/grass/qgsgrassmapcalc.cpp
  150. +40 −20 src/plugins/grass/qgsgrassmodel.cpp
  151. +130 −62 src/plugins/grass/qgsgrassmodule.cpp
  152. +2 −2 src/plugins/grass/qgsgrassmodule.h
  153. +46 −23 src/plugins/grass/qgsgrassnewmapset.cpp
  154. +12 −6 src/plugins/grass/qgsgrassplugin.cpp
  155. +22 −11 src/plugins/grass/qgsgrassregion.cpp
  156. +28 −14 src/plugins/grass/qgsgrassselect.cpp
  157. +11 −6 src/plugins/grass/qgsgrasstools.cpp
  158. +6 −7 src/plugins/grass/qgsgrassutils.cpp
  159. +11 −4 src/plugins/scale_bar/plugin.cpp
  160. +4 −1 src/plugins/sqlanywhere/sadbtablemodel.cpp
  161. +2 −1 src/plugins/sqlanywhere/sasourceselect.cpp
  162. +14 −7 src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
  163. +34 −26 src/providers/gdal/qgsgdalprovider.cpp
  164. +3 −3 src/providers/gdal/qgsgdalprovider.h
  165. +4 −2 src/providers/grass/qgis.g.info.c
  166. +35 −18 src/providers/grass/qgsgrass.cpp
  167. +70 −45 src/providers/grass/qgsgrassprovider.cpp
  168. +4 −2 src/providers/grass/qgsgrassrasterprovider.cpp
  169. +4 −2 src/providers/memory/qgsmemoryprovider.cpp
  170. +124 −114 src/providers/ogr/qgsogrprovider.cpp
  171. +4 −4 src/providers/ogr/qgsogrprovider.h
  172. +2,098 −2,098 src/providers/spatialite/qgsspatialiteprovider.cpp
  173. +26 −26 src/providers/spatialite/qgsspatialiteprovider.h
  174. +6 −3 src/providers/sqlanywhere/qgssqlanywhereprovider.cpp
  175. +20 −10 src/providers/sqlanywhere/sqlanyconnection/sqlanyconnection.cpp
  176. +34 −17 src/providers/sqlanywhere/sqlanyconnection/sqlanystatement.cpp
  177. +5 −5 src/providers/wms/qgswmsconnection.cpp
  178. +2 −2 src/providers/wms/qgswmsconnection.h
  179. +56 −52 src/providers/wms/qgswmsprovider.cpp
  180. +13 −13 src/providers/wms/qgswmsprovider.h
  181. +16 −15 src/providers/wms/qgswmssourceselect.cpp
  182. +10 −10 src/providers/wms/qgswmssourceselect.h
@@ -1,8 +1,9 @@
qgis (1.8.0) UNRELEASED; urgency=low

* new development version 1.8 after branch
* add qgis browser (qbrowser)

-- Jürgen E. Fischer <jef@norbit.de> Sat, 07 May 2011 00:47:20 +0200
-- Jürgen E. Fischer <jef@norbit.de> Mon, 23 May 2011 18:08:18 +0200

qgis (1.7.0) UNRELEASED; urgency=low

@@ -148,6 +148,7 @@ Description: Quantum GIS mapserver

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -148,6 +148,7 @@ Description: Quantum GIS mapserver

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -148,6 +148,7 @@ Description: Quantum GIS mapserver

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -186,6 +186,7 @@ Description: Quantum GIS sql anywhere plugin and provider

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -187,6 +187,7 @@ Description: Quantum GIS sql anywhere plugin and provider

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -188,6 +188,7 @@ Description: Quantum GIS sql anywhere plugin and provider

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -188,6 +188,7 @@ Description: Quantum GIS sql anywhere plugin and provider

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -188,6 +188,7 @@ Description: Quantum GIS sql anywhere plugin and provider

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -187,6 +187,7 @@ Description: Quantum GIS sql anywhere plugin and provider

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -4,6 +4,7 @@ set -e

if [ "$1" = "remove" ]; then
dpkg-divert --package qgis-plugin-grass --remove --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
dpkg-divert --package qgis-plugin-grass --remove --rename --divert /usr/bin/qbrowser.bin /usr/bin/qbrowser
fi

#DEBHELPER#
@@ -4,6 +4,7 @@ set -e

if [ "$1" = "install" -o "$1" = "upgrade" ]; then
dpkg-divert --package qgis-plugin-grass --add --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
dpkg-divert --package qgis-plugin-grass --add --rename --divert /usr/bin/qbrowser.bin /usr/bin/qbrowser
fi

#DEBHELPER#
@@ -150,9 +150,11 @@ binary-arch: build install

install -o root -g root -m 755 -d $(CURDIR)/debian/qgis/usr/bin
install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qgis $(CURDIR)/debian/qgis/usr/bin
install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qbrowser $(CURDIR)/debian/qgis/usr/bin

install -o root -g root -m 755 -d $(CURDIR)/debian/qgis-plugin-grass/usr/bin
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qbrowser

dh_pycentral
dh_installmenu
</message>
<message>
<location filename="../src/core/qgsmaplayer.cpp" line="714"/>
<source>The directory containing your dataset needs to be writeable!</source>
<source>The directory containing your dataset needs to be writable!</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/core/qgsproject.cpp" line="982"/>
<source>%1 is not writeable. Please adjust permissions (if possible) and try again.</source>
<source>%1 is not writable. Please adjust permissions (if possible) and try again.</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/app/qgsrasterlayerproperties.cpp" line="1560"/>
<source>The file was not writeable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
<source>The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/core/qgsmaplayer.cpp" line="714"/>
<source>The directory containing your dataset needs to be writeable!</source>
<source>The directory containing your dataset needs to be writable!</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/core/qgsproject.cpp" line="982"/>
<source>%1 is not writeable. Please adjust permissions (if possible) and try again.</source>
<source>%1 is not writable. Please adjust permissions (if possible) and try again.</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/app/qgsrasterlayerproperties.cpp" line="1560"/>
<source>The file was not writeable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
<source>The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/core/qgsmaplayer.cpp" line="714"/>
<source>The directory containing your dataset needs to be writeable!</source>
<source>The directory containing your dataset needs to be writable!</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/core/qgsproject.cpp" line="982"/>
<source>%1 is not writeable. Please adjust permissions (if possible) and try again.</source>
<source>%1 is not writable. Please adjust permissions (if possible) and try again.</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/app/qgsrasterlayerproperties.cpp" line="1560"/>
<source>The file was not writeable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
<source>The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/core/qgsmaplayer.cpp" line="714"/>
<source>The directory containing your dataset needs to be writeable!</source>
<source>The directory containing your dataset needs to be writable!</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/core/qgsproject.cpp" line="982"/>
<source>%1 is not writeable. Please adjust permissions (if possible) and try again.</source>
<source>%1 is not writable. Please adjust permissions (if possible) and try again.</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/app/qgsrasterlayerproperties.cpp" line="1560"/>
<source>The file was not writeable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
<source>The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
<message>
<location filename="../src/core/qgsmaplayer.cpp" line="714"/>
<source>The directory containing your dataset needs to be writeable!</source>
<source>The directory containing your dataset needs to be writable!</source>
<translation>Adresář obsahující Váš dataset potřebuje mít práva zápisu!</translation>
</message>
<message>
</message>
<message>
<location filename="../src/core/qgsproject.cpp" line="982"/>
<source>%1 is not writeable. Please adjust permissions (if possible) and try again.</source>
<source>%1 is not writable. Please adjust permissions (if possible) and try again.</source>
<translation>%1 není zapisovatelný. Nastavte prosím oprávnění (pokud je to možné) a zkuste znovu.</translation>
</message>
<message>
</message>
<message>
<location filename="../src/app/qgsrasterlayerproperties.cpp" line="1560"/>
<source>The file was not writeable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
<source>The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt.</source>
<translation>Soubor není přepisovatelný. Některé formáty nepodporují pyramidové přehledy. Pochybnosti konzultujte s dokumentací GDAL.</translation>
</message>
<message>

0 comments on commit 4d5455f

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