Skip to content
Permalink
Browse files

remove QgsColorButton in favor of V2

  • Loading branch information
3nids committed Aug 4, 2016
1 parent 138e113 commit 3e197ae74a91f607cd9eb159cd4e07fd44e7e85e
Showing with 1,168 additions and 2,278 deletions.
  1. +4 −3 doc/api_break.dox
  2. +1 −1 python/core/qgscolorscheme.sip
  3. +1 −1 python/gui/gui.sip
  4. +253 −56 python/gui/qgscolorbutton.sip
  5. +0 −329 python/gui/qgscolorbuttonv2.sip
  6. +2 −2 src/app/composer/qgscomposertablebackgroundcolorsdialog.h
  7. +1 −1 src/app/qgslabelinggui.cpp
  8. +1 −1 src/core/qgscolorscheme.h
  9. +0 −3 src/customwidgets/CMakeLists.txt
  10. +0 −2 src/customwidgets/qgiscustomwidgets.cpp
  11. +1 −1 src/customwidgets/qgscolorbuttonplugin.cpp
  12. +4 −4 src/customwidgets/qgscolorbuttonplugin.h
  13. +0 −97 src/customwidgets/qgscolorbuttonv2plugin.cpp
  14. +0 −55 src/customwidgets/qgscolorbuttonv2plugin.h
  15. +0 −2 src/gui/CMakeLists.txt
  16. +4 −4 src/gui/editorwidgets/qgscolorwidgetwrapper.cpp
  17. +2 −2 src/gui/editorwidgets/qgscolorwidgetwrapper.h
  18. +382 −266 src/gui/qgscolorbutton.cpp
  19. +303 −92 src/gui/qgscolorbutton.h
  20. +0 −715 src/gui/qgscolorbuttonv2.cpp
  21. +0 −432 src/gui/qgscolorbuttonv2.h
  22. +16 −16 src/gui/qgscompoundcolorwidget.cpp
  23. +1 −1 src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp
  24. +3 −3 src/providers/grass/qgsgrassoptionsbase.ui
  25. +4 −4 src/ui/composer/qgscomposerarrowwidgetbase.ui
  26. +6 −6 src/ui/composer/qgscomposerattributetablewidgetbase.ui
  27. +4 −4 src/ui/composer/qgscomposeritemwidgetbase.ui
  28. +3 −3 src/ui/composer/qgscomposerlabelwidgetbase.ui
  29. +4 −4 src/ui/composer/qgscomposerlegendwidgetbase.ui
  30. +6 −6 src/ui/composer/qgscomposermapwidgetbase.ui
  31. +4 −4 src/ui/composer/qgscomposerpicturewidgetbase.ui
  32. +6 −6 src/ui/composer/qgscomposerscalebarwidgetbase.ui
  33. +12 −12 src/ui/composer/qgscomposertablebackgroundstyles.ui
  34. +5 −5 src/ui/composer/qgscomposertablewidgetbase.ui
  35. +3 −3 src/ui/effects/widget_coloreffects.ui
  36. +3 −3 src/ui/effects/widget_glow.ui
  37. +3 −3 src/ui/effects/widget_shadoweffect.ui
  38. +4 −4 src/ui/qgsannotationwidgetbase.ui
  39. +18 −18 src/ui/qgscompoundcolorwidget.ui
  40. +3 −3 src/ui/qgsdecorationcopyrightdialog.ui
  41. +3 −3 src/ui/qgsdecorationscalebardialog.ui
  42. +4 −4 src/ui/qgsdiagrampropertiesbase.ui
  43. +4 −4 src/ui/qgsfieldconditionalformatwidget.ui
  44. +8 −8 src/ui/qgslabelingguibase.ui
  45. +4 −4 src/ui/qgslabelpropertydialogbase.ui
  46. +9 −9 src/ui/qgsoptionsbase.ui
  47. +4 −4 src/ui/qgspointdisplacementrendererwidgetbase.ui
  48. +4 −4 src/ui/qgsprojectpropertiesbase.ui
  49. +3 −3 src/ui/qgsrasterlayerpropertiesbase.ui
  50. +3 −3 src/ui/qgsrendererrasterpropswidgetbase.ui
  51. +3 −3 src/ui/qgstextannotationdialogbase.ui
  52. +4 −4 src/ui/qgsvectorgradientcolorrampv2dialogbase.ui
  53. +5 −5 src/ui/symbollayer/qgs25drendererwidgetbase.ui
  54. +4 −4 src/ui/symbollayer/widget_ellipse.ui
  55. +4 −4 src/ui/symbollayer/widget_fontmarker.ui
  56. +4 −4 src/ui/symbollayer/widget_gradientfill.ui
  57. +4 −4 src/ui/symbollayer/widget_shapeburstfill.ui
  58. +4 −4 src/ui/symbollayer/widget_simplefill.ui
  59. +3 −3 src/ui/symbollayer/widget_simpleline.ui
  60. +4 −4 src/ui/symbollayer/widget_simplemarker.ui
  61. +4 −4 src/ui/symbollayer/widget_svgfill.ui
  62. +4 −4 src/ui/symbollayer/widget_svgmarker.ui
  63. +3 −3 src/ui/symbollayer/widget_symbolslist.ui
  64. +1 −1 tests/src/python/CMakeLists.txt
  65. +4 −4 tests/src/python/{test_qgscolorbuttonv2.py → test_qgscolorbutton.py}
@@ -21,12 +21,13 @@ This page tries to maintain a list with incompatible changes that happened in pr
\subsection qgis_api_break_3_0_removed_classes Removed Classes

<ul>
<li>QgsLabel and QgsLabelAttributes. Replaced by labeling based on PAL library, see QgsLabelingEngineV2.</li>
<li>QgsMapCanvasMap. It is an internal class used by map canvas.</li>
<li>QgsMapRenderer. It has been replaced by QgsMapRendererJob with subclasses and QgsMapSettings.</li>
<li>QgsColorbutton was removed. QgsColorButtonV2 has now been renamed to QgsColorButton. Hence, QgsColorButtonV2 does not exist anymore.
<li>QgsCRSCache was removed. QgsCoordinateReferenceSystem now internally uses a cache for CRS creation,
so there is no longer a need for the separate cache class. Code which previously called QgsCRSCache::updateCRSCache()
should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinateTransformCache::instance()->invalidateCrs( authid ).</li>
<li>QgsLabel and QgsLabelAttributes. Replaced by labeling based on PAL library, see QgsLabelingEngineV2.</li>
<li>QgsMapCanvasMap. It is an internal class used by map canvas.</li>
<li>QgsMapRenderer. It has been replaced by QgsMapRendererJob with subclasses and QgsMapSettings.</li>
<li>QgsPseudoColorShader. This shader has been broken for some time and was replaced by QgsSingleBandPseudoColorRenderer.</li>
</ul>

@@ -5,7 +5,7 @@ typedef QList< QPair< QColor, QString > > QgsNamedColorList;
* \class QgsColorScheme
* \brief Abstract base class for color schemes
*
* A color scheme for display in QgsColorButtonV2. Color schemes return lists
* A color scheme for display in QgsColorButton. Color schemes return lists
* of colors with an optional associated color name. The colors returned
* can be generated using an optional base color.
* \note Added in version 2.5
@@ -46,7 +46,7 @@
%End
%Include qgscharacterselectdialog.sip
%Include qgscolorbutton.sip
%Include qgscolorbuttonv2.sip
%Include qgscolorbutton.sip
%Include qgscolordialog.sip
%Include qgscolorschemelist.sip
%Include qgscolorswatchgrid.sip

0 comments on commit 3e197ae

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