[QGIS Commit] [qgis/Quantum-GIS] 28aa73: Rule-based renderer: fixed parent(), fixed drag'n'...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qgis/Quantum-GIS
  Commit: 28aa73525bb9d2e619476ece3d87f02cf2397c46
      https://github.com/qgis/Quantum-GIS/commit/28aa73525bb9d2e619476ece3d87f02cf2397c46
  Author: Martin Dobias <wonder.sk at gmail.com>
  Date:   2012-01-24 (Tue, 24 Jan 2012)

  Changed paths:
    M src/core/symbology-ng/qgsrulebasedrendererv2.cpp
  M src/core/symbology-ng/qgsrulebasedrendererv2.h
  M src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
  M src/ui/qgsrulebasedrendererv2widget.ui

  Log Message:
  -----------
  Rule-based renderer: fixed parent(), fixed drag'n'drop


  Commit: 1c3c02f832ddd5d03e6b9ed9ad22070c2481dc3e
      https://github.com/qgis/Quantum-GIS/commit/1c3c02f832ddd5d03e6b9ed9ad22070c2481dc3e
  Author: Martin Dobias <wonder.sk at gmail.com>
  Date:   2012-01-24 (Tue, 24 Jan 2012)

  Changed paths:
    M src/gui/CMakeLists.txt
  A tests/qt_modeltest/dynamictreemodel.cpp
  A tests/qt_modeltest/dynamictreemodel.h
  A tests/qt_modeltest/modeltest.cpp
  A tests/qt_modeltest/modeltest.h
  A tests/qt_modeltest/readme.txt
  A tests/qt_modeltest/tst_modeltest.cpp

  Log Message:
  -----------
  Add ModelTest: Qt tool for debugging custom models

Very handy to stay sane when your model goes crazy


  Commit: a7cf5e4b83dc0a1c60487ce2ecbbebcf45226e50
      https://github.com/qgis/Quantum-GIS/commit/a7cf5e4b83dc0a1c60487ce2ecbbebcf45226e50
  Author: Martin Dobias <wonder.sk at gmail.com>
  Date:   2012-01-24 (Tue, 24 Jan 2012)

  Changed paths:
    M python/core/symbology-ng-core.sip
  M python/gui/symbology-ng-gui.sip
  M src/core/qgsvectorlayer.cpp
  M src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
  M src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
  M src/core/symbology-ng/qgsrendererv2.cpp
  M src/core/symbology-ng/qgsrendererv2.h
  M src/core/symbology-ng/qgsrulebasedrendererv2.cpp
  M src/core/symbology-ng/qgsrulebasedrendererv2.h
  M src/core/symbology-ng/qgssinglesymbolrendererv2.h
  M src/gui/CMakeLists.txt
  M src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
  M src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h
  M src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
  M src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h
  M src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp
  M src/gui/symbology-ng/qgsrendererv2propertiesdialog.h
  M src/gui/symbology-ng/qgsrendererv2widget.cpp
  M src/gui/symbology-ng/qgsrendererv2widget.h
  M src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
  M src/gui/symbology-ng/qgsrulebasedrendererv2widget.h
  M src/gui/symbology-ng/qgssinglesymbolrendererv2widget.cpp
  M src/gui/symbology-ng/qgssinglesymbolrendererv2widget.h
  M src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp
  M src/gui/symbology-ng/qgssymbollevelsv2dialog.h
  M src/ui/qgsrendererrulepropsdialogbase.ui
  M src/ui/qgsrendererv2propsdialogbase.ui
  M src/ui/qgsrulebasedrendererv2widget.ui
  A tests/qt_modeltest/dynamictreemodel.cpp
  A tests/qt_modeltest/dynamictreemodel.h
  A tests/qt_modeltest/modeltest.cpp
  A tests/qt_modeltest/modeltest.h
  A tests/qt_modeltest/readme.txt
  A tests/qt_modeltest/tst_modeltest.cpp
  M tests/src/core/CMakeLists.txt
  A tests/src/core/testqgsrulebasedrenderer.cpp
  M tests/src/gui/CMakeLists.txt
  A tests/src/gui/testrendererv2gui.cpp
  A tests/src/gui/testrendererv2gui.h
  A tests/testdata/rulebasedrenderer_invalid.xml
  A tests/testdata/rulebasedrenderer_simple.xml

  Log Message:
  -----------
  [FEATURE] Merge branch 'rules' - new rule-based rendering

Conflicts:
	src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp


  Commit: 138d4a28fd5d736cd868378b1b537b2666d3ad80
      https://github.com/qgis/Quantum-GIS/commit/138d4a28fd5d736cd868378b1b537b2666d3ad80
  Author: Martin Dobias <wonder.sk at gmail.com>
  Date:   2012-01-24 (Tue, 24 Jan 2012)

  Changed paths:
    M src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp
  M src/gui/symbology-ng/qgssymbollevelsv2dialog.h

  Log Message:
  -----------
  Fixed symbol levels dialog


Compare: https://github.com/qgis/Quantum-GIS/compare/0b1fd34...138d4a2