Skip to content
Permalink
Browse files

Merge remote-tracking branch 'origin/master' into blend_modes

  • Loading branch information
nyalldawson committed Mar 27, 2013
2 parents 8793d38 + d1825ec commit c9ef27c39b9d55fb278c1d6b1ef9e9c9e6035d5e
Showing with 11,609 additions and 1,848 deletions.
  1. +2 −1 debian/changelog
  2. +1 −0 debian/qgis.install
  3. +1 −1 doc/index.html
  4. +8 −0 images/images.qrc
  5. +927 −0 images/themes/gis/mActionFilter.svg
  6. +952 −0 images/themes/gis/mIconExpressionFilter.svg
  7. +974 −0 images/themes/gis/mIconExpressionPreview.svg
  8. +935 −0 images/themes/gis/mIconExpressionSelect.svg
  9. +947 −0 images/themes/gis/mIconSelectAdd.svg
  10. +938 −0 images/themes/gis/mIconSelectIntersect.svg
  11. +948 −0 images/themes/gis/mIconSelectRemove.svg
  12. +1 −0 python/core/core.sip
  13. +31 −0 python/core/qgsvectorlayercache.sip
  14. +0 −164 python/gui/attributetable/qgsattributetablemodel.sip
  15. +7 −4 python/gui/attributetable/qgsattributetableview.sip
  16. +0 −1 python/gui/gui.sip
  17. +0 −3 src/app/CMakeLists.txt
  18. +23 −0 src/app/qgisapp.cpp
  19. +3 −0 src/app/qgisapp.h
  20. +8 −1 src/app/qgisappinterface.cpp
  21. +297 −543 src/app/qgsattributetabledialog.cpp
  22. +32 −94 src/app/qgsattributetabledialog.h
  23. +21 −1 src/app/qgsdiagramproperties.cpp
  24. +12 −1 src/app/qgsfeatureaction.cpp
  25. +8 −6 src/app/qgsoptions.cpp
  26. +36 −4 src/browser/qgsbrowser.cpp
  27. +2 −1 src/browser/qgsbrowser.h
  28. +11 −0 src/core/CMakeLists.txt
  29. +1 −0 src/core/composer/qgscomposerlegend.cpp
  30. +2 −2 src/core/diagram/qgspiediagram.cpp
  31. +89 −0 src/core/qgscachedfeatureiterator.cpp
  32. +115 −0 src/core/qgscachedfeatureiterator.h
  33. +31 −0 src/core/qgscacheindex.cpp
  34. +73 −0 src/core/qgscacheindex.h
  35. +24 −0 src/core/qgscacheindexfeatureid.cpp
  36. +36 −0 src/core/qgscacheindexfeatureid.h
  37. +3 −0 src/core/qgsdiagramrendererv2.cpp
  38. +1 −0 src/core/qgsdiagramrendererv2.h
  39. +2 −0 src/core/qgsexpression.h
  40. +1 −0 src/core/qgsfeature.h
  41. +39 −0 src/core/qgsgeometrycache.cpp
  42. +46 −0 src/core/qgsgeometrycache.h
  43. +20 −4 src/core/qgsvectorlayer.cpp
  44. +12 −3 src/core/qgsvectorlayer.h
  45. +277 −24 src/core/qgsvectorlayercache.cpp
  46. +229 −40 src/core/qgsvectorlayercache.h
  47. +1 −1 src/core/qgsvectorlayereditutils.cpp
  48. +2 −1 src/core/qgsvectorlayereditutils.h
  49. +1 −1 src/core/qgsvectorlayerundocommand.cpp
  50. +2 −1 src/core/qgsvectorlayerundocommand.h
  51. +23 −5 src/gui/CMakeLists.txt
  52. +5 −2 src/gui/attributetable/qgsattributetabledelegate.cpp
  53. +1 −0 src/gui/attributetable/qgsattributetabledelegate.h
  54. +307 −10 src/gui/attributetable/qgsattributetablefiltermodel.cpp
  55. +156 −15 src/gui/attributetable/qgsattributetablefiltermodel.h
  56. +0 −47 src/gui/attributetable/qgsattributetableidcolumnpair.cpp
  57. +0 −38 src/gui/attributetable/qgsattributetableidcolumnpair.h
  58. +0 −147 src/gui/attributetable/qgsattributetablememorymodel.cpp
  59. +0 −94 src/gui/attributetable/qgsattributetablememorymodel.h
  60. +76 −283 src/gui/attributetable/qgsattributetablemodel.cpp
  61. +61 −48 src/gui/attributetable/qgsattributetablemodel.h
  62. +156 −37 src/gui/attributetable/qgsattributetableview.cpp
  63. +102 −10 src/gui/attributetable/qgsattributetableview.h
  64. +363 −0 src/gui/attributetable/qgsdualview.cpp
  65. +168 −0 src/gui/attributetable/qgsdualview.h
  66. +234 −0 src/gui/attributetable/qgsfeaturelistmodel.cpp
  67. +94 −0 src/gui/attributetable/qgsfeaturelistmodel.h
  68. +198 −0 src/gui/attributetable/qgsfeaturelistview.cpp
  69. +140 −0 src/gui/attributetable/qgsfeaturelistview.h
  70. +90 −0 src/gui/attributetable/qgsfeaturelistviewdelegate.cpp
  71. +45 −0 src/gui/attributetable/qgsfeaturelistviewdelegate.h
  72. +28 −18 src/{app → gui}/qgsattributedialog.cpp
  73. +6 −3 src/{app → gui}/qgsattributedialog.h
  74. +211 −0 src/gui/qgsexpressionselectiondialog.cpp
  75. +91 −0 src/gui/qgsexpressionselectiondialog.h
  76. 0 src/{app → gui}/qgshighlight.cpp
  77. +1 −1 src/{app → gui}/qgshighlight.h
  78. +4 −4 src/plugins/topology/topol.cpp
  79. +1 −1 src/plugins/topology/topolTest.h
  80. +13 −0 src/ui/qgisapp.ui
  81. +307 −169 src/ui/qgsattributetabledialog.ui
  82. +24 −14 src/ui/qgsdiagrampropertiesbase.ui
  83. +137 −0 src/ui/qgsdualviewbase.ui
  84. +91 −0 src/ui/qgsexpressionselectiondialogbase.ui
  85. +1 −0 tests/src/core/CMakeLists.txt
  86. +206 −0 tests/src/core/testqgsvectorlayercache.cpp
  87. +1 −0 tests/src/gui/CMakeLists.txt
  88. +136 −0 tests/src/gui/testqgsdualview.cpp
@@ -13,8 +13,9 @@ qgis (1.9.0) UNRELEASED; urgency=low
* add support for ubuntu quantal and raring
* remove js files and add libjs-jquery/libjs-underscore dependency
* add spatialite qt sql driver
* include topology plugin

-- Jürgen E. Fischer <jef@norbit.de> Thu, 21 Feb 2013 12:11:31 +0100
-- Jürgen E. Fischer <jef@norbit.de> Wed, 27 Mar 2013 11:03:31 +0100

qgis (1.8.0) UNRELEASED; urgency=low

@@ -14,6 +14,7 @@ usr/lib/qgis/plugins/libofflineeditingplugin.so
usr/lib/qgis/plugins/libroadgraphplugin.so
usr/lib/qgis/plugins/libzonalstatisticsplugin.so
usr/lib/qgis/plugins/libheatmapplugin.so
usr/lib/qgis/plugins/libtopolplugin.so
usr/lib/qgis/qgis_help
usr/share/pixmaps/qgis-icon.xpm
usr/share/pixmaps/qgis-mime-icon.png
@@ -10,7 +10,7 @@
</td>
<td valign="center">
<span class="header">Quantum GIS Documentation</span><br>
<span class="subheader">Version 1.7.0 <i>Wrocław</i></span><br>
<span class="subheader">Use Help inside functions or:</span><br>
<span class="warning">You can find a <a href="http://www.qgis.org/en/documentation/manuals.html">PDF manual of the current version</a> on the QGIS website.</span>
</td>
</tr>
@@ -332,6 +332,7 @@
<file>themes/gis/mActionFilePrint.png</file>
<file>themes/gis/mActionFileSaveAs.png</file>
<file>themes/gis/mActionFileSave.png</file>
<file>themes/gis/mActionFilter.svg</file>
<file>themes/gis/mActionFolder.png</file>
<file>themes/gis/mActionFormAnnotation.png</file>
<file>themes/gis/mActionGroupItems.png</file>
@@ -428,6 +429,7 @@
<file>themes/gis/plugins/dxf2shp_converter.png</file>
<file>themes/gis/plugins/gps_importer/create_gpx.png</file>
<file>themes/gis/plugins/gps_importer/import_gpx.png</file>
<file>themes/gis/plugins/gps_importer.png</file>
<file>themes/gis/plugins/interpolation.png</file>
<file>themes/gis/plugins/mapserver_export.png</file>
<file>themes/gis/plugins/mGeorefRun.png</file>
@@ -537,6 +539,12 @@
<file>flags/eu_ES.png</file>
<file>flags/ml_IN.png</file>
<file>flags/km.png</file>
<file>themes/gis/mIconExpressionFilter.svg</file>
<file>themes/gis/mIconExpressionPreview.svg</file>
<file>themes/gis/mIconExpressionSelect.svg</file>
<file>themes/gis/mIconSelectAdd.svg</file>
<file>themes/gis/mIconSelectIntersect.svg</file>
<file>themes/gis/mIconSelectRemove.svg</file>
</qresource>
<qresource prefix="/images/tips">
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>

0 comments on commit c9ef27c

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