[QGIS Commit] [qgis/Quantum-GIS] 4b1b2f: Move BlendMode enum and functions to QgsMapRendere...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 4b1b2fbab2639b55c916164e4d73e1e485c13dfa
      https://github.com/qgis/Quantum-GIS/commit/4b1b2fbab2639b55c916164e4d73e1e485c13dfa
  Author: Nyall Dawson <nyall.dawson at gmail.com>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

  Changed paths:
    M src/app/qgsrasterlayerproperties.cpp
    M src/core/qgsmaplayer.cpp
    M src/core/qgsmaplayer.h
    M src/core/qgsmaprenderer.cpp
    M src/core/qgsmaprenderer.h
    M src/core/qgsvectorlayer.cpp
    M src/core/raster/qgsrasterlayer.cpp
    M src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp

  Log Message:
  -----------
  Move BlendMode enum and functions to QgsMapRenderer


  Commit: 8793d388b1fd0f315f55b0f56f5ee8462ea6df13
      https://github.com/qgis/Quantum-GIS/commit/8793d388b1fd0f315f55b0f56f5ee8462ea6df13
  Author: Nyall Dawson <nyall.dawson at gmail.com>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

  Changed paths:
    M src/app/qgslabelinggui.cpp
    M src/core/qgspallabeling.cpp
    M src/core/qgspallabeling.h
    M src/ui/qgslabelingguibase.ui

  Log Message:
  -----------
  [FEATURE] Blend modes for labels and label buffers


  Commit: c9ef27c39b9d55fb278c1d6b1ef9e9c9e6035d5e
      https://github.com/qgis/Quantum-GIS/commit/c9ef27c39b9d55fb278c1d6b1ef9e9c9e6035d5e
  Author: Nyall Dawson <nyall.dawson at gmail.com>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

  Changed paths:
    M debian/changelog
    M debian/qgis.install
    M doc/index.html
    M images/images.qrc
    A images/themes/gis/mActionFilter.svg
    A images/themes/gis/mIconExpressionFilter.svg
    A images/themes/gis/mIconExpressionPreview.svg
    A images/themes/gis/mIconExpressionSelect.svg
    A images/themes/gis/mIconSelectAdd.svg
    A images/themes/gis/mIconSelectIntersect.svg
    A images/themes/gis/mIconSelectRemove.svg
    M python/core/core.sip
    A python/core/qgsvectorlayercache.sip
    R python/gui/attributetable/qgsattributetablemodel.sip
    M python/gui/attributetable/qgsattributetableview.sip
    M python/gui/gui.sip
    M src/app/CMakeLists.txt
    M src/app/qgisapp.cpp
    M src/app/qgisapp.h
    M src/app/qgisappinterface.cpp
    R src/app/qgsattributedialog.cpp
    R src/app/qgsattributedialog.h
    M src/app/qgsattributetabledialog.cpp
    M src/app/qgsattributetabledialog.h
    M src/app/qgsdiagramproperties.cpp
    M src/app/qgsfeatureaction.cpp
    R src/app/qgshighlight.cpp
    R src/app/qgshighlight.h
    M src/app/qgsoptions.cpp
    M src/browser/qgsbrowser.cpp
    M src/browser/qgsbrowser.h
    M src/core/CMakeLists.txt
    M src/core/composer/qgscomposerlegend.cpp
    M src/core/diagram/qgspiediagram.cpp
    A src/core/qgscachedfeatureiterator.cpp
    A src/core/qgscachedfeatureiterator.h
    A src/core/qgscacheindex.cpp
    A src/core/qgscacheindex.h
    A src/core/qgscacheindexfeatureid.cpp
    A src/core/qgscacheindexfeatureid.h
    M src/core/qgsdiagramrendererv2.cpp
    M src/core/qgsdiagramrendererv2.h
    M src/core/qgsexpression.h
    M src/core/qgsfeature.h
    A src/core/qgsgeometrycache.cpp
    A src/core/qgsgeometrycache.h
    M src/core/qgsvectorlayer.cpp
    M src/core/qgsvectorlayer.h
    M src/core/qgsvectorlayercache.cpp
    M src/core/qgsvectorlayercache.h
    M src/core/qgsvectorlayereditutils.cpp
    M src/core/qgsvectorlayereditutils.h
    M src/core/qgsvectorlayerundocommand.cpp
    M src/core/qgsvectorlayerundocommand.h
    M src/gui/CMakeLists.txt
    M src/gui/attributetable/qgsattributetabledelegate.cpp
    M src/gui/attributetable/qgsattributetabledelegate.h
    M src/gui/attributetable/qgsattributetablefiltermodel.cpp
    M src/gui/attributetable/qgsattributetablefiltermodel.h
    R src/gui/attributetable/qgsattributetableidcolumnpair.cpp
    R src/gui/attributetable/qgsattributetableidcolumnpair.h
    R src/gui/attributetable/qgsattributetablememorymodel.cpp
    R src/gui/attributetable/qgsattributetablememorymodel.h
    M src/gui/attributetable/qgsattributetablemodel.cpp
    M src/gui/attributetable/qgsattributetablemodel.h
    M src/gui/attributetable/qgsattributetableview.cpp
    M src/gui/attributetable/qgsattributetableview.h
    A src/gui/attributetable/qgsdualview.cpp
    A src/gui/attributetable/qgsdualview.h
    A src/gui/attributetable/qgsfeaturelistmodel.cpp
    A src/gui/attributetable/qgsfeaturelistmodel.h
    A src/gui/attributetable/qgsfeaturelistview.cpp
    A src/gui/attributetable/qgsfeaturelistview.h
    A src/gui/attributetable/qgsfeaturelistviewdelegate.cpp
    A src/gui/attributetable/qgsfeaturelistviewdelegate.h
    A src/gui/qgsattributedialog.cpp
    A src/gui/qgsattributedialog.h
    A src/gui/qgsexpressionselectiondialog.cpp
    A src/gui/qgsexpressionselectiondialog.h
    A src/gui/qgshighlight.cpp
    A src/gui/qgshighlight.h
    M src/plugins/topology/topol.cpp
    M src/plugins/topology/topolTest.h
    M src/ui/qgisapp.ui
    M src/ui/qgsattributetabledialog.ui
    M src/ui/qgsdiagrampropertiesbase.ui
    A src/ui/qgsdualviewbase.ui
    A src/ui/qgsexpressionselectiondialogbase.ui
    M tests/src/core/CMakeLists.txt
    A tests/src/core/testqgsvectorlayercache.cpp
    M tests/src/gui/CMakeLists.txt
    A tests/src/gui/testqgsdualview.cpp

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into blend_modes


  Commit: 2304350d49f97123c7afae606485874854f29a29
      https://github.com/qgis/Quantum-GIS/commit/2304350d49f97123c7afae606485874854f29a29
  Author: Nathan Woodrow <madmanwoo at gmail.com>
  Date:   2013-03-27 (Wed, 27 Mar 2013)

  Changed paths:
    M src/app/qgslabelinggui.cpp
    M src/app/qgsrasterlayerproperties.cpp
    M src/core/qgsmaplayer.cpp
    M src/core/qgsmaplayer.h
    M src/core/qgsmaprenderer.cpp
    M src/core/qgsmaprenderer.h
    M src/core/qgspallabeling.cpp
    M src/core/qgspallabeling.h
    M src/core/qgsvectorlayer.cpp
    M src/core/raster/qgsrasterlayer.cpp
    M src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp
    M src/ui/qgslabelingguibase.ui

  Log Message:
  -----------
  Merge pull request #485 from nyalldawson/blend_modes

Blend modes pt 3 - blend modes for labels


Compare: https://github.com/qgis/Quantum-GIS/compare/d1825ece2a95...2304350d49f9